[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hotfix_udevsync.patch)

[Eric Bélanger]

    Date: Sunday, February 6, 2011 @ 15:14:00
  Author: eric
Revision: 109156

upgpkg: lvm2 2.02.83-1
Upstream update, Removed patch included upstream

Modified:
  lvm2/trunk/PKGBUILD
Deleted:
  lvm2/trunk/lvm2_hotfix_udevsync.patch

----------------------------+
 PKGBUILD                   |   18 +++++++-----------
 lvm2_hotfix_udevsync.patch |   16 ----------------
 2 files changed, 7 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-06 16:57:56 UTC (rev 109155)
+++ PKGBUILD	2011-02-06 20:14:00 UTC (rev 109156)
@@ -4,9 +4,9 @@
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.82
+pkgver=2.02.83
 _pkgverlvm=${pkgver}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -14,19 +14,15 @@
 conflicts=('mkinitcpio<0.5.99')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
         lvm2_install
-        lvm2_hook
-        lvm2_hotfix_udevsync.patch)
-md5sums=('21c0ea7bb961d9340cd8bde2de5e2389' 'e29bc80d636ed17b617d9b384a5f3aa0'\
-         '7103e3fef1180478811ac4e32aec540d'
-         '438dde628a7abed5de3ea03713f05898')
-sha1sums=('fa6258c307b5da807747d2b58d3cbc9b3ac99fa1' '662fc54ce291fd79bd09701e4c3e10854f325282'\
-         '769767d84c73674cbb68c765460e57c428c314a0'
-         '1728f06ef116d9428bcf32037fafa08ef16c7b22')
+        lvm2_hook)
+md5sums=('18e7d89be4a38475c1c1df821b139551' 'e29bc80d636ed17b617d9b384a5f3aa0'\
+         '7103e3fef1180478811ac4e32aec540d')
+sha1sums=('478e0e2756150b201dd32a33eecb41aeb396fe9f' '662fc54ce291fd79bd09701e4c3e10854f325282'\
+         '769767d84c73674cbb68c765460e57c428c314a0')
 
 build() {
   cd "${srcdir}/LVM2.${_pkgverlvm}"
   sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
-  patch -p1 -i "${srcdir}"/lvm2_hotfix_udevsync.patch
   unset LDFLAGS
   ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
     --includedir=/usr/include --with-usrlibdir=/usr/lib \

Deleted: lvm2_hotfix_udevsync.patch
===================================================================
--- lvm2_hotfix_udevsync.patch	2011-02-06 16:57:56 UTC (rev 109155)
+++ lvm2_hotfix_udevsync.patch	2011-02-06 20:14:00 UTC (rev 109156)
@@ -1,16 +0,0 @@
---- a/lib/locking/locking.h
-+++ b/lib/locking/locking.h
-@@ -143,7 +143,12 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);
- 		lock_vol(cmd, (lv)->lvid.s, flags | LCK_LV_CLUSTERED(lv)) : \
- 		0)
- 
--#define unlock_vg(cmd, vol)	lock_vol(cmd, vol, LCK_VG_UNLOCK)
-+#define unlock_vg(cmd, vol)	\
-+	do {\
-+		sync_local_dev_names(cmd); \
-+		lock_vol(cmd, vol, LCK_VG_UNLOCK); \
-+	} while (0)
-+
- #define unlock_and_free_vg(cmd, vg, vol) \
- 	do { \
- 		unlock_vg(cmd, vol); \</pre>