diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-28 11:07:30 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-28 11:07:36 +0000 |
| commit | f6357dfa9e8a8d65fc18299cccaeb1df7bc87571 (patch) | |
| tree | d2a6b55f3c50ab95ea3a6afb84f60b9b021e67cc /testing/resource-agents | |
| parent | 8ae7dfd8cc676be9ad8cb180060de67e48102a7d (diff) | |
| download | aports-f6357dfa9e8a8d65fc18299cccaeb1df7bc87571.tar.bz2 aports-f6357dfa9e8a8d65fc18299cccaeb1df7bc87571.tar.xz | |
testing/resource-agents: upgrade to 3.9.5
Diffstat (limited to 'testing/resource-agents')
| -rw-r--r-- | testing/resource-agents/APKBUILD | 22 | ||||
| -rw-r--r-- | testing/resource-agents/fix-bashism.patch | 12 |
2 files changed, 27 insertions, 7 deletions
diff --git a/testing/resource-agents/APKBUILD b/testing/resource-agents/APKBUILD index ed75607dec..d2bf3cb7c3 100644 --- a/testing/resource-agents/APKBUILD +++ b/testing/resource-agents/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=resource-agents -pkgver=3.9.2 +pkgver=3.9.5 pkgrel=0 pkgdesc="Open Source HA Reusable Cluster Resource Scripts" url="http://www.linux-ha.org/wiki/Resource_Agents" @@ -12,9 +12,11 @@ depends_dev="cluster-glue-dev libxslt-dev libnet-dev" makedepends="$depends_dev automake autoconf perl docbook-xsl wget bash" install="" subpackages="$pkgname-dev $pkgname-doc" -source="saveas-https://github.com/ClusterLabs/resource-agents/tarball/v3.9.2/resouce-agents-3.9.2.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/ClusterLabs/resource-agents/tarball/v$pkgver + fix-bashism.patch + " -_builddir="$srcdir"/ClusterLabs-resource-agents-b735277 +_builddir="$srcdir"/ClusterLabs-resource-agents-ac806fd prepare() { local i cd "$_builddir" @@ -23,12 +25,13 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - sed -i 's/export -n/export/g' configure.ac + sed -i 's/export -n/export/g' configure.ac || return 1 + aclocal && autoheader && autoconf && automake --add-missing \ + || return 1 } build() { cd "$_builddir" - ./autogen.sh ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -41,8 +44,13 @@ build() { package() { cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install_sh=install install || return 1 rm -f "$pkgdir"/usr/lib/*.la } -md5sums="3b5790e8041f2a459d8a0ff310682bfe resouce-agents-3.9.2.tar.gz" +md5sums="86ec112decf29906afb755016990f56f resource-agents-3.9.5.tar.gz +b609cdaa30571a1e637a55b42abe5af8 fix-bashism.patch" +sha256sums="e893812a2f5e179d129badb001b2d25364e65a7dd9e97903e1f911bb6eb99d91 resource-agents-3.9.5.tar.gz +b5d19d9268121d25f0a96b1e63c04c4aa3cab958bffe0906ddbb2ef0d05164af fix-bashism.patch" +sha512sums="d7d0926d64ca93f8735522d4e4a068ae680e77dbfc5a326042fc5b1d7775ec3bde712958a260c264d688e739793b87495c6cb6adf94a16e427edbe4c52393589 resource-agents-3.9.5.tar.gz +25949952f66f78af05179ac7c3ab5d2666600d0b26931c8579447b0c1a47463de5f39e31914df2a3971a7d60ebddcefcbe133f76411dac523fbc5a67ff2da3b9 fix-bashism.patch" diff --git a/testing/resource-agents/fix-bashism.patch b/testing/resource-agents/fix-bashism.patch new file mode 100644 index 0000000000..ca63c2d1a3 --- /dev/null +++ b/testing/resource-agents/fix-bashism.patch @@ -0,0 +1,12 @@ +--- ./heartbeat/ocf-shellfuncs.in.orig ++++ ./heartbeat/ocf-shellfuncs.in +@@ -691,8 +691,7 @@ + # OCF_TRACE_FILE is set to a path. + # + ocf_is_bash4() { +- echo "$SHELL" | grep bash > /dev/null && +- [ ${BASH_VERSINFO[0]} = "4" ] ++ [ "${BASH_VERSION%%.*}" = "4" ] + } + ocf_trace_redirect_to_file() { + local dest=$1 |