update to lvm 2.02.95

diff --git a/LVM2.2.02.95.tgz b/LVM2.2.02.95.tgz
new file mode 100644 (file)
index 0000000..0cf67f6
Binary files /dev/null and b/LVM2.2.02.95.tgz differ

diff --git a/Makefile b/Makefile
index 5c7df95e53eda1ae0456f3365818743e12b2d9b4..c1c11ffde6b22e8d1e0cbee9c7b3c837134ac085 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,19 @@
 RELEASE=2.0
 
-LVMVERSION=2.02.88
-DMVERSION=1.02.67
-DEBRELEASE=2
+LVMVERSION=2.02.95
+DMVERSION=1.02.74
+DEBRELEASE=1
 # also update debian changelog patch
-PVERELEASE=${DEBRELEASE}pve2
+PVERELEASE=${DEBRELEASE}pve1
 PVEVER=${LVMVERSION}-${PVERELEASE}
 DMVER=${DMVERSION}-${PVERELEASE}
 
-LVMDIR=lvm2-${LVMVERSION}
-LVMSRC=lvm2_${LVMVERSION}.orig.tar.gz
-LVMDEBSRC=lvm2_${LVMVERSION}-${DEBRELEASE}.debian.tar.gz
+LVMDIR=LVM2.${LVMVERSION}
+LVMSRC=LVM2.${LVMVERSION}.tgz
+
+# NOTE: we use debian package definitions from debian testing
+# but use latest upstream sources
+LVMDEBSRC=lvm2_2.02.88-2.debian.tar.gz
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -43,7 +46,7 @@ deb ${DEBS}: ${LVMSRC} ${LVMDEBSRC}
 .PHONY: download
 download:
        rm -f ${LVMSRC} ${LVMDEBSRC}
-       wget http://ftp.de.debian.org/debian/pool/main/l/lvm2/${LVMSRC}
+       wget ftp://sources.redhat.com/pub/lvm2/${LVMSRC}
        wget http://ftp.de.debian.org/debian/pool/main/l/lvm2/${LVMDEBSRC}
 
 .PHONY: upload

diff --git a/lvm2_2.02.88.orig.tar.gz b/lvm2_2.02.88.orig.tar.gz
deleted file mode 100644 (file)
index 83a2e35..0000000
Binary files a/lvm2_2.02.88.orig.tar.gz and /dev/null differ

diff --git a/patchdir/allow-new-symbols.patch b/patchdir/allow-new-symbols.patch
new file mode 100644 (file)
index 0000000..7c9ce90
--- /dev/null
+++ b/patchdir/allow-new-symbols.patch
@@ -0,0 +1,21 @@
+Index: LVM2.2.02.95/debian/rules
+===================================================================
+--- LVM2.2.02.95.orig/debian/rules     2012-04-23 09:06:04.000000000 +0200
++++ LVM2.2.02.95/debian/rules  2012-04-23 10:33:59.000000000 +0200
+@@ -82,6 +82,7 @@
+               --enable-cmdlib \
+               --enable-pkgconfig \
+               --enable-readline \
++              --enable-udev_rules \
+               --enable-udev_sync
+       touch $@
+ 
+@@ -183,7 +184,7 @@
+       dh_makeshlibs \
+               --add-udeb 'libdevmapper$(DEVMAPPER_ABINAME)-udeb' \
+               "-Vlibdevmapper$(DEVMAPPER_ABINAME) (>= $(DEVMAPPER_VERSION))" \
+-              -- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c2
++              -- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c1
+       +$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+ 
+ install_libdevmapper-dev: export DH_OPTIONS = -plibdevmapper-dev

diff --git a/patchdir/fix-changelog.patch b/patchdir/fix-changelog.patch
index fd29d88e4b0bba2602e956db5db4580a37619cd5..a85ed053c7e8eb0887b5373130ea80b7ed48c514 100644 (file)
--- a/patchdir/fix-changelog.patch
+++ b/patchdir/fix-changelog.patch
@@ -1,8 +1,14 @@
-Index: lvm2-2.02.88/debian/changelog
+Index: LVM2.2.02.95/debian/changelog
 ===================================================================
---- lvm2-2.02.88.orig/debian/changelog 2011-11-26 18:51:44.000000000 +0100
-+++ lvm2-2.02.88/debian/changelog      2012-03-09 09:56:19.000000000 +0100
-@@ -1,3 +1,29 @@
+--- LVM2.2.02.95.orig/debian/changelog 2011-11-26 18:51:44.000000000 +0100
++++ LVM2.2.02.95/debian/changelog      2012-04-23 07:54:36.000000000 +0200
+@@ -1,3 +1,35 @@
++lvm2 (2.02.95-1pve1) unstable; urgency=low
++
++  * update to latest available lvm 2.0.95
++
++ -- Proxmox Support Team <support@proxmox.com>  Mon, 23 Apr 2012 07:54:36 +0200
++
 +lvm2 (2.02.88-2pve2) unstable; urgency=low
 +
 +  * enable issue_discard in default lvm.conf
@@ -32,7 +38,7 @@ Index: lvm2-2.02.88/debian/changelog
  lvm2 (2.02.88-2) unstable; urgency=low
  
    * Enable corosync and openais support. (closes: #563320)
-@@ -76,7 +102,7 @@
+@@ -76,7 +108,7 @@
  
    * Import upstream version 2.02.72:
      - CVE-2010-2526: Fix insecure communication between lvm2 and clvmd.
@@ -41,7 +47,7 @@ Index: lvm2-2.02.88/debian/changelog
      - Only use single node clvm if explicitly requested.
  
   -- Bastian Blank <waldi@debian.org>  Thu, 19 Aug 2010 14:44:02 +0200
-@@ -543,7 +569,7 @@
+@@ -543,7 +575,7 @@
    * Don't make /lib/lvm2 the default library directory as it causes initrd
      troubles.
      Closes: #287042
@@ -50,7 +56,7 @@ Index: lvm2-2.02.88/debian/changelog
   -- Patrick Caulfield <patrick@debian.org>  Fri, 24 Dec 2004 12:27:05 +0000
  
  lvm2 (2.00.31-1) unstable; urgency=low
-@@ -571,7 +597,7 @@
+@@ -571,7 +603,7 @@
    * Remove "is not recommended for production use" from package description.
      Closes: #278919
    * Add lvm2create_initrd to documentation directory.
@@ -59,7 +65,7 @@ Index: lvm2-2.02.88/debian/changelog
   -- Patrick Caulfield <patrick@debian.org>  Wed,  3 Nov 2004 09:37:56 +0000
  
  lvm2 (2.00.24-2) unstable; urgency=low
-@@ -616,7 +642,7 @@
+@@ -616,7 +648,7 @@
      Closes: #260700
    * Add Czech debconf translation
      Closes: #265545
@@ -68,7 +74,7 @@ Index: lvm2-2.02.88/debian/changelog
   -- Patrick Caulfield <patrick@debian.org>  Fri, 20 Aug 2004 10:44:11 +0100
  
  lvm2 (2.00.19-3) unstable; urgency=low
-@@ -756,7 +782,7 @@
+@@ -756,7 +788,7 @@
   -- Andres Salomon <dilinger@voxel.net>  Thu, 07 Aug 2003 01:04:59 -0400
  
  lvm2 (1.95.15-2) unstable; urgency=low
@@ -77,7 +83,7 @@ Index: lvm2-2.02.88/debian/changelog
    * Calm-before-the-storm release; the next one will either be 2.00 (once
      the kill-yer-VGs bug is fixed) or 1.95 with lvm10 compatibility (once
      patrick returns from vacation).
-@@ -832,7 +858,7 @@
+@@ -832,7 +864,7 @@
    * Add dmsetup as a suggestion.
    * Add /etc/lvm/lvm.conf conffile.
    * Add undocumented(7) for the commands missing manpages.

diff --git a/patchdir/fix-udev-rules.patch b/patchdir/fix-udev-rules.patch
new file mode 100644 (file)
index 0000000..8bcf13f
--- /dev/null
+++ b/patchdir/fix-udev-rules.patch
@@ -0,0 +1,14 @@
+ Use udev rules provided by upstream packages
+
+ The debian version 55-dm.rules triggers bug #127 with our setup (rhel kernel).
+
+Index: LVM2.2.02.95/debian/dmsetup.install
+===================================================================
+--- LVM2.2.02.95.orig/debian/dmsetup.install   2010-03-16 20:58:19.000000000 +0100
++++ LVM2.2.02.95/debian/dmsetup.install        2012-04-23 11:22:04.000000000 +0200
+@@ -1,3 +1,4 @@
+-../../tree/dmsetup/* /
++../../tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules /lib/udev/rules.d
++lib/udev/rules.d/
+ sbin/dmsetup
+ usr/share/man/man8/dmsetup.8

diff --git a/patchdir/series b/patchdir/series
index 2f960c1a59542ed2b4832ab13f1e4300f6191e3b..12b6394698b2c87df91de5f6df6c040ca5a59fcc 100644 (file)
--- a/patchdir/series
+++ b/patchdir/series
@@ -9,3 +9,5 @@ fix-lvm2-init-script-patch
 fix-libdevmapper-priority.patch
 remove-openais-clvm.patch
 enable-issue-discard.patch
+allow-new-symbols.patch
+fix-udev-rules.patch