Date: Wednesday, October 26, 2022 @ 12:24:07 Author: eworm Revision: 1335180
upgpkg: multipath-tools 0.9.2-2: new upstream release + crash fix Modified: multipath-tools/trunk/PKGBUILD ----------+ PKGBUILD | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-26 12:24:06 UTC (rev 1335179) +++ PKGBUILD 2022-10-26 12:24:07 UTC (rev 1335180) @@ -8,8 +8,8 @@ # Contributor: Matt Heagney <[email protected]> pkgname=multipath-tools -_tag='3db6872d9a418261b02be4755258a9928b6bb7ac' # git rev-parse ${pkgver} -pkgver=0.9.1 +_tag='66664cdb52f548b821b2ea28e49613c068e9375d' # git rev-parse ${pkgver} +pkgver=0.9.2 pkgrel=2 pkgdesc='Multipath tools for Linux (including kpartx)' arch=('x86_64') @@ -23,11 +23,10 @@ prepare() { cd "${pkgname}" - # Fix systemd version detection in Makefile - sed -i 's/sed -n .*$/head -n1 | cut -d" " -f2\)/g' Makefile.inc + # https://github.com/opensvc/multipath-tools/issues/47 + git merge --ff-only '7da868c008624dd33ef8264a958e9c9f592fe52e' - # Fix bindir in Makefile - sed -i 's|$(exec_prefix)/sbin|$(exec_prefix)/bin|g' Makefile.inc + sed -i -e '/^bindir/c bindir=/usr/bin' Makefile.inc } build() { @@ -34,7 +33,8 @@ cd "${pkgname}" make \ - FORTIFY_OPT="" + LIB='/usr/lib' \ + FORTIFY_OPT='' } package() { @@ -42,8 +42,7 @@ make -j1 \ DESTDIR="${pkgdir}" \ - exec_prefix="/usr" \ - LIB="/usr/lib" \ + LIB='/usr/lib' \ install install -D -m0644 -t "${pkgdir}/usr/share/doc/${pkgname}" README*
