[arch-commits] Commit in lvm2/trunk (2 files)

[Eric Bélanger]

    Date: Sunday, July 27, 2014 @ 21:31:09
  Author: eric
Revision: 218243

upgpkg: lvm2 2.02.108-1

Upstream update, Remove old patch

Modified:
  lvm2/trunk/PKGBUILD
Deleted:
  lvm2/trunk/libdm-fix-double-const-for-value-in-dm_report_reserv.patch

------------------------------------------------------------+
 PKGBUILD                                                   |   14 ++---
 libdm-fix-double-const-for-value-in-dm_report_reserv.patch |   27 -----------
 2 files changed, 5 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-27 18:59:55 UTC (rev 218242)
+++ PKGBUILD	2014-07-27 19:31:09 UTC (rev 218243)
@@ -4,8 +4,8 @@
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.107
-pkgrel=2
+pkgver=2.02.108
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -16,16 +16,14 @@
         lvm2_hook
         sd-lvm2
         11-dm-initramfs.rules
-        lvm2-make-sockets-static.patch
-	libdm-fix-double-const-for-value-in-dm_report_reserv.patch)
-sha1sums=('95e99c04ac1b5b987de41d4e31cca982caaee5f9'
+        lvm2-make-sockets-static.patch)
+sha1sums=('fc133c93f5250ae94fbf19df03b658eb0382a632'
           'SKIP'
           'be3b7db02e76d31d4742dc853b2fa3f898368ff8'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           '86c18852409dc03f38bdd734ac3e7b54bed9c4ce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'b084512af42f2e16cdccd8b7ee4de27b574d1f94'
-          '3628a39b49162d08da87cf52a830eb2f8dff4995')
+          'b084512af42f2e16cdccd8b7ee4de27b574d1f94')
 
 prepare() {
   cd LVM2.${pkgver}
@@ -33,8 +31,6 @@
   sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
   # make systemd sockets static
   patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch"
-  # fix virtualbox building (merged upstream)
-  patch -p1 -i "${srcdir}/libdm-fix-double-const-for-value-in-dm_report_reserv.patch"
 }
 
 build() {

Deleted: libdm-fix-double-const-for-value-in-dm_report_reserv.patch
===================================================================
--- libdm-fix-double-const-for-value-in-dm_report_reserv.patch	2014-07-27 18:59:55 UTC (rev 218242)
+++ libdm-fix-double-const-for-value-in-dm_report_reserv.patch	2014-07-27 19:31:09 UTC (rev 218243)
@@ -1,27 +0,0 @@
-From 100342605ce4a304b397665682d2ec555af5aa27 Mon Sep 17 00:00:00 2001
-From: Peter Rajnoha <prajnoha at redhat.com>
-Date: Mon, 30 Jun 2014 09:44:23 +0200
-Subject: [PATCH] libdm: fix double const for "value" in
- dm_report_reserved_value structure
-
-C++ may have
----
- libdm/libdevmapper.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
-index 90e0b51..ad504da 100644
---- a/libdm/libdevmapper.h
-+++ b/libdm/libdevmapper.h
-@@ -1660,7 +1660,7 @@ struct dm_report_field_type {
- 
- struct dm_report_reserved_value {
- 	const unsigned type;		/* DM_REPORT_FIELD_TYPE_* */
--	const void const *value;	/* reserved value:
-+	const void *value;		/* reserved value:
- 						uint64_t for DM_REPORT_FIELD_TYPE_NUMBER
- 						uint64_t for DM_REPORT_FIELD_TYPE_SIZE (number of 512-byte sectors)
- 						uint64_t for DM_REPORT_FIELD_TYPE_PERCENT
--- 
-2.0.1
-