Date: Thursday, September 28, 2017 @ 20:22:57 Author: eworm Revision: 306454
upgpkg: lvm2 2.02.174-2 toollib: fix parentheses in assignment + comparison (FS#55760) Added: lvm2/trunk/0001-lvm2-make-sockets-static.patch (from rev 306453, lvm2/trunk/01-lvm2-make-sockets-static.patch) lvm2/trunk/0002-toollib_fix_parentheses_in_assignment_comparison.patch Modified: lvm2/trunk/PKGBUILD Deleted: lvm2/trunk/01-lvm2-make-sockets-static.patch -------------------------------------------------------------+ 0001-lvm2-make-sockets-static.patch | 20 ++++++++++ 0002-toollib_fix_parentheses_in_assignment_comparison.patch | 19 +++++++++ 01-lvm2-make-sockets-static.patch | 20 ---------- PKGBUILD | 13 ++++-- 4 files changed, 48 insertions(+), 24 deletions(-) Copied: lvm2/trunk/0001-lvm2-make-sockets-static.patch (from rev 306453, lvm2/trunk/01-lvm2-make-sockets-static.patch) =================================================================== --- 0001-lvm2-make-sockets-static.patch (rev 0) +++ 0001-lvm2-make-sockets-static.patch 2017-09-28 20:22:57 UTC (rev 306454) @@ -0,0 +1,20 @@ +diff -Nur LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in +--- LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in 2014-04-10 17:38:46.000000000 +0200 ++++ LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in 2014-04-26 14:21:10.097269315 +0200 +@@ -8,6 +8,3 @@ + ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-client + SocketMode=0600 + RemoveOnStop=true +- +-[Install] +-WantedBy=sockets.target +diff -Nur LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in +--- LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 2014-04-10 17:38:46.000000000 +0200 ++++ LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 2014-04-26 14:21:15.287156152 +0200 +@@ -7,6 +7,3 @@ + ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket + SocketMode=0600 + RemoveOnStop=true +- +-[Install] +-WantedBy=sysinit.target Added: 0002-toollib_fix_parentheses_in_assignment_comparison.patch =================================================================== --- 0002-toollib_fix_parentheses_in_assignment_comparison.patch (rev 0) +++ 0002-toollib_fix_parentheses_in_assignment_comparison.patch 2017-09-28 20:22:57 UTC (rev 306454) @@ -0,0 +1,19 @@ +commit 5407327bc6fff77dabb6dd55150832373ba163a7 +Author: David Teigland <teigl...@redhat.com> +Date: Tue Sep 19 09:19:24 2017 -0500 + + toollib: fix parentheses in assignment + comparison + +diff --git a/tools/toollib.c b/tools/toollib.c +index 1799bc91c..bf3e9d643 100644 +--- a/tools/toollib.c ++++ b/tools/toollib.c +@@ -4464,7 +4464,7 @@ int process_each_pv(struct cmd_context *cmd, + * from all VGs are processed first, removing them from all_devices. Then + * any devs remaining in all_devices are processed. + */ +- if ((ret = _get_all_devices(cmd, &all_devices) != ECMD_PROCESSED)) { ++ if ((ret = _get_all_devices(cmd, &all_devices)) != ECMD_PROCESSED) { + ret_max = ret; + goto_out; + } Deleted: 01-lvm2-make-sockets-static.patch =================================================================== --- 01-lvm2-make-sockets-static.patch 2017-09-28 19:01:49 UTC (rev 306453) +++ 01-lvm2-make-sockets-static.patch 2017-09-28 20:22:57 UTC (rev 306454) @@ -1,20 +0,0 @@ -diff -Nur LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in ---- LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in 2014-04-10 17:38:46.000000000 +0200 -+++ LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in 2014-04-26 14:21:10.097269315 +0200 -@@ -8,6 +8,3 @@ - ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-client - SocketMode=0600 - RemoveOnStop=true -- --[Install] --WantedBy=sockets.target -diff -Nur LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in ---- LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 2014-04-10 17:38:46.000000000 +0200 -+++ LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 2014-04-26 14:21:15.287156152 +0200 -@@ -7,6 +7,3 @@ - ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket - SocketMode=0600 - RemoveOnStop=true -- --[Install] --WantedBy=sysinit.target Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-09-28 19:01:49 UTC (rev 306453) +++ PKGBUILD 2017-09-28 20:22:57 UTC (rev 306454) @@ -5,7 +5,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.174 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -17,7 +17,8 @@ lvm2_hook sd-lvm2_install 11-dm-initramfs.rules - 01-lvm2-make-sockets-static.patch) + 0001-lvm2-make-sockets-static.patch + 0002-toollib_fix_parentheses_in_assignment_comparison.patch) sha256sums=('fb6ecec0408cb14ac4923c87cb0a356481122d7d0ae3fee6e94d2edb9d170a8b' 'SKIP' 'd3097296bdfd9912dbef6ac78b908f7017b0a668a5347f0811f1c3aaacdca0cf' @@ -24,7 +25,8 @@ '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80' 'ca25d7d827823ed88c5ed662d561ad9de0123ca6e8e5b568fe9eec3c89918614' 'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0' - 'ff2c21d8f1c01c5e889a61109a152dcbd15da017bb942cf598c82e2e18ad22fa') + 'ff2c21d8f1c01c5e889a61109a152dcbd15da017bb942cf598c82e2e18ad22fa' + '9883be237acb9fc49f229621d0c025fd9c29a4d0f43bfbe87ab6eb76bf389338') prepare() { cd LVM2.${pkgver} @@ -33,7 +35,10 @@ sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in # make systemd sockets static - patch -p1 -i "${srcdir}/01-lvm2-make-sockets-static.patch" + patch -p1 -i "${srcdir}/0001-lvm2-make-sockets-static.patch" + + # toollib: fix parentheses in assignment + comparison + patch -p1 -i "${srcdir}/0002-toollib_fix_parentheses_in_assignment_comparison.patch" } build() {