pcr/multipath-tools: updated to 0.7.4

2 files changed, 30 insertions, 41 deletions

diff --git a/pcr/multipath-tools/PKGBUILD b/pcr/multipath-tools/PKGBUILD
index 24bb27921..906f118f3 100644
--- a/pcr/multipath-tools/PKGBUILD
+++ b/pcr/multipath-tools/PKGBUILD
@@ -1,56 +1,49 @@
-# Maintainer (Arch): Justin Dray <justin@dray.be>
-# Contributor (Arch):  Patrick McCarty <pnorcks at gmail dot com>
-# Contributor (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor (Arch): Thomas S Hatch <thatch45 ar gmail dot com>
-# Contributor (Arch): Michael P <ptchinster@archlinux.us>
-# Contributor (Arch): Matt Heagney <matt@heagney.com>
+# Maintainer (AUR):  Michael Lass <bevan@bi-co.net>
+# Contributor (AUR): Justin Dray <justin@dray.be>
+# Contributor (AUR): Patrick McCarty <pnorcks at gmail dot com>
+# Contributor (AUR): Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor (AUR): Thomas S Hatch <thatch45 ar gmail dot com>
+# Contributor (AUR): Michael P <ptchinster@archlinux.us>
+# Contributor (AUR): Matt Heagney <matt@heagney.com>
+
+# This PKGBUILD is maintained on github:
+# https://github.com/michaellass/AUR
+
+# parabola changes and rationale:
+#  - removed buildtime optdepends
 
 pkgname=multipath-tools
-pkgver=0.5.0
+pkgver=0.7.4
 pkgrel=1
 pkgdesc='Multipath tools for Linux (including kpartx)'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
 url="http://christophe.varoqui.free.fr/"
 license=('GPL2')
-depends=('libaio' 'device-mapper')
+depends=('libaio' 'device-mapper' 'json-c' 'liburcu')
+makedepends=('git')
 conflicts=('multipath-tools-git')
-backup=('etc/multipath.conf')
 install=multipath-tools.install
-options=(!emptydirs)
-source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2
-	buffer-overflows.patch
-	blacklist-cciss-devices.patch)
-md5sums=('faf261d4cc717bf4c979557dc7bf5f52'
-         '869942bdd31decc696f9cf4af24df65b'
-         'c81422ccf5fd5ca6208dfbdd66ff323c')
+source=("multipath-tools::git+http://git.opensvc.com/multipath-tools/.git#tag=${pkgver}")
+sha256sums=('SKIP')
 
 prepare() {
-  cd  "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/buffer-overflows.patch"
-  patch -Np1 -i "${srcdir}/blacklist-cciss-devices.patch"
-
-  sed -i 's|/etc/udev/rules.d|/usr/lib/udev|g' Makefile.inc kpartx/Makefile kpartx/kpartx.rules
-  sed -i 's|${prefix}/lib/udev|${prefix}/usr/lib/udev|g' Makefile.inc
-  sed -i 's|/sbin|/usr/bin|g' Makefile.inc multipathd/multipathd.service
-  sed -i '/Before/d' multipathd/multipathd.service
+  cd  "${srcdir}/${pkgname}"
+
+  # Fix bindir in Makefile
+  sed -i 's|$(exec_prefix)/sbin|$(exec_prefix)/bin|g' Makefile.inc
 }
 
 build() {
-  cd  "${srcdir}/${pkgname}-${pkgver}"
+  cd  "${srcdir}/${pkgname}"
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make LIB="/usr/lib" \
+  cd "${srcdir}/${pkgname}"
+
+  make \
        DESTDIR="${pkgdir}" \
+       exec_prefix="/usr" \
+       LIB="/usr/lib" \
        install
-
-  install -d "${pkgdir}/usr/share/multipath/examples"
-  install -Dm644 "multipath.conf.annotated" "${pkgdir}/usr/share/multipath/examples/multipath.conf.annotated"
-  install -Dm644 "multipath.conf.defaults" "${pkgdir}/usr/share/multipath/examples/multipath.conf.defaults"
-  install -Dm644 "multipath.conf.synthetic" "${pkgdir}/usr/share/multipath/examples/multipath.conf.synthetic"
-  install -Dm644 "multipath.conf.defaults" "${pkgdir}/etc/multipath.conf"
-  rm "${pkgdir}/usr/lib/libmpathpersist.so"
-  ln -s "${pkgdir}/usr/lib/libmpathpersist.so.0" "libmpathpersist.so"
 }
diff --git a/pcr/multipath-tools/multipath-tools.install b/pcr/multipath-tools/multipath-tools.install
index 8ef2efaca..95df1b7ee 100644
--- a/pcr/multipath-tools/multipath-tools.install
+++ b/pcr/multipath-tools/multipath-tools.install
@@ -1,9 +1,5 @@
 post_install() {
-
 	cat <<-EOF
-	 * For full functonality ensure that the dm_multipath kernel module is loaded"
-	 * Make sure to create /etc/multipath.conf based off of the defaults found in
-	   /usr/share/multipath/examples
+	 * For full functonality ensure that the dm_multipath kernel module is loaded
 	EOF
-
 }