[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2-make-sockets-static.patch)

[Felix Yan]

    Date: Thursday, July 3, 2014 @ 17:47:07
  Author: fyan
Revision: 216407

upgpkg: lvm2 2.02.107-1

- new upstream release

Modified:
  lvm2/trunk/PKGBUILD
  lvm2/trunk/lvm2-make-sockets-static.patch

--------------------------------+
 PKGBUILD                       |   12 ++++--------
 lvm2-make-sockets-static.patch |   10 +++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-03 14:56:19 UTC (rev 216406)
+++ PKGBUILD	2014-07-03 15:47:07 UTC (rev 216407)
@@ -4,8 +4,8 @@
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.106
-pkgrel=2
+pkgver=2.02.107
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -16,23 +16,19 @@
         lvm2_hook
         sd-lvm2
         11-dm-initramfs.rules
-        lvm2-fix-pvscan-service.patch
         lvm2-make-sockets-static.patch)
-sha1sums=('0943d1c401675dfdc2118b9ad4fd4d7fb50eaaff'
+sha1sums=('95e99c04ac1b5b987de41d4e31cca982caaee5f9'
           'SKIP'
           'be3b7db02e76d31d4742dc853b2fa3f898368ff8'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           '86c18852409dc03f38bdd734ac3e7b54bed9c4ce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'ec22d30fed5fb5ec836932b070ee65b34bbe875b'
-          'f9e96af741ef6d0b4bb3c302faa5f6b29f9ef04a')
+          'b084512af42f2e16cdccd8b7ee4de27b574d1f94')
 
 prepare() {
   cd LVM2.${pkgver}
   # enable lvmetad
   sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
-  # fix pvscan at .service for initramfs
-  patch -p1 -i "${srcdir}/lvm2-fix-pvscan-service.patch"
   # make systemd sockets static
   patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch"
 }

Modified: lvm2-make-sockets-static.patch
===================================================================
--- lvm2-make-sockets-static.patch	2014-07-03 14:56:19 UTC (rev 216406)
+++ lvm2-make-sockets-static.patch	2014-07-03 15:47:07 UTC (rev 216407)
@@ -1,10 +1,10 @@
 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
-@@ -7,6 +7,3 @@
- ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-server
+@@ -8,6 +8,3 @@
  ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-client
  SocketMode=0600
+ RemoveOnStop=true
 -
 -[Install]
 -WantedBy=sockets.target
@@ -11,10 +11,10 @@
 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
-@@ -6,6 +6,3 @@
- [Socket]
+@@ -7,6 +7,3 @@
  ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket
  SocketMode=0600
+ RemoveOnStop=true
 -
 -[Install]
--WantedBy=sockets.target
+-WantedBy=sysinit.target