From: Dietmar Maurer Date: Fri, 9 Dec 2011 05:34:43 +0000 (+0100) Subject: update to 2.02.88 X-Git-Url: https://git.proxmox.com/?p=lvm.git;a=commitdiff_plain;h=24a510c53551e122ed6a36f7804edda9d6042927 update to 2.02.88 --- diff --git a/Makefile b/Makefile index 2ec39bb..70f979d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ RELEASE=2.0 -LVMVERSION=2.02.86 -DMVERSION=1.02.65 -DEBRELEASE=1 +LVMVERSION=2.02.88 +DMVERSION=1.02.67 +DEBRELEASE=2 # also update debian changelog patch -PVERELEASE=${DEBRELEASE}pve2 +PVERELEASE=${DEBRELEASE}pve1 PVEVER=${LVMVERSION}-${PVERELEASE} DMVER=${DMVERSION}-${PVERELEASE} diff --git a/lvm2_2.02.86-1.debian.tar.gz b/lvm2_2.02.86-1.debian.tar.gz deleted file mode 100644 index a46d82e..0000000 Binary files a/lvm2_2.02.86-1.debian.tar.gz and /dev/null differ diff --git a/lvm2_2.02.86.orig.tar.gz b/lvm2_2.02.86.orig.tar.gz deleted file mode 100644 index 55c1cc6..0000000 Binary files a/lvm2_2.02.86.orig.tar.gz and /dev/null differ diff --git a/lvm2_2.02.88-2.debian.tar.gz b/lvm2_2.02.88-2.debian.tar.gz new file mode 100644 index 0000000..f0c9da3 Binary files /dev/null and b/lvm2_2.02.88-2.debian.tar.gz differ diff --git a/lvm2_2.02.88.orig.tar.gz b/lvm2_2.02.88.orig.tar.gz new file mode 100644 index 0000000..83a2e35 Binary files /dev/null and b/lvm2_2.02.88.orig.tar.gz differ diff --git a/patchdir/fix-build-dependencies.patch b/patchdir/fix-build-dependencies.patch index 0982205..ec77a0d 100644 --- a/patchdir/fix-build-dependencies.patch +++ b/patchdir/fix-build-dependencies.patch @@ -1,25 +1,36 @@ Index: new/debian/control =================================================================== ---- new.orig/debian/control 2011-09-20 12:49:53.000000000 +0200 -+++ new/debian/control 2011-09-20 12:52:06.000000000 +0200 +--- new.orig/debian/control 2011-12-09 06:57:00.000000000 +0100 ++++ new/debian/control 2011-12-09 07:04:40.000000000 +0100 @@ -1,9 +1,8 @@ Source: lvm2 Section: admin Priority: optional -Maintainer: Debian LVM Team -Uploaders: Bastian Blank --Build-Depends: debhelper (>> 7), automake, libcman-dev (>> 2), libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config, quilt +-Build-Depends: debhelper (>> 7), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config +Maintainer: Proxmox Support Team -+Build-Depends: debhelper (>> 7), automake, redhat-cluster-pve-dev, libreadline6-dev, libselinux1-dev, libudev-dev, pkg-config, quilt ++Build-Depends: debhelper (>> 7), automake, libcorosync-pve-dev, redhat-cluster-pve-dev, libreadline6-dev, libselinux1-dev, libudev-dev, libopenais-pve-dev, pkg-config, quilt Standards-Version: 3.9.1 Homepage: http://sources.redhat.com/lvm2/ Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/ -@@ -39,7 +38,7 @@ +@@ -11,8 +10,8 @@ + + Package: lvm2 + Architecture: any +-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, dmsetup (>> 2:1.02.47), initscripts (>= 2.88dsf-13.3) +-Breaks: initramfs-tools (<< 0.99) ++Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, dmsetup (>> 2:1.02.47), initscripts (>= 2.88dsf-13.1) ++#Breaks: initramfs-tools (<< 0.99) + Description: Linux Logical Volume Manager + This is LVM2, the rewrite of The Linux Logical Volume Manager. LVM + supports enterprise level volume management of disk and disk subsystems +@@ -37,7 +36,7 @@ Package: clvm Priority: extra Architecture: any --Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base, cman +-Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base, corosync | cman +Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base, redhat-cluster-pve Description: Cluster LVM Daemon for lvm2 - This package provides the clustering interface for lvm2, when used with - Red Hat's "cman" cluster infrastructure. It allows logical volumes to + This package provides the clustering interface for lvm2, when used with + Red Hat's "cman" or corosync based (eg Pacemaker) cluster infrastructure. diff --git a/patchdir/fix-changelog.patch b/patchdir/fix-changelog.patch index ce2ce87..859d392 100644 --- a/patchdir/fix-changelog.patch +++ b/patchdir/fix-changelog.patch @@ -1,8 +1,14 @@ Index: new/debian/changelog =================================================================== ---- new.orig/debian/changelog 2011-11-25 08:39:04.000000000 +0100 -+++ new/debian/changelog 2011-11-25 08:46:06.000000000 +0100 -@@ -1,3 +1,17 @@ +--- new.orig/debian/changelog 2011-12-09 06:48:43.000000000 +0100 ++++ new/debian/changelog 2011-12-09 06:51:08.000000000 +0100 +@@ -1,3 +1,23 @@ ++lvm2 (2.02.88-2pve1) unstable; urgency=low ++ ++ * update to 2.02.88-2 ++ ++ -- Proxmox Support Team Fri, 09 Dec 2011 06:50:49 +0100 ++ +lvm2 (2.02.86-1pve2) unstable; urgency=low + + * disable clvmd by default @@ -17,10 +23,10 @@ Index: new/debian/changelog + + -- Proxmox Support Team Tue, 20 Sep 2011 12:53:25 +0200 + - lvm2 (2.02.86-1) unstable; urgency=low + lvm2 (2.02.88-2) unstable; urgency=low - * New upstream version. -@@ -56,7 +70,7 @@ + * Enable corosync and openais support. (closes: #563320) +@@ -76,7 +96,7 @@ * Import upstream version 2.02.72: - CVE-2010-2526: Fix insecure communication between lvm2 and clvmd. @@ -29,7 +35,7 @@ Index: new/debian/changelog - Only use single node clvm if explicitly requested. -- Bastian Blank Thu, 19 Aug 2010 14:44:02 +0200 -@@ -523,7 +537,7 @@ +@@ -543,7 +563,7 @@ * Don't make /lib/lvm2 the default library directory as it causes initrd troubles. Closes: #287042 @@ -38,7 +44,7 @@ Index: new/debian/changelog -- Patrick Caulfield Fri, 24 Dec 2004 12:27:05 +0000 lvm2 (2.00.31-1) unstable; urgency=low -@@ -551,7 +565,7 @@ +@@ -571,7 +591,7 @@ * Remove "is not recommended for production use" from package description. Closes: #278919 * Add lvm2create_initrd to documentation directory. @@ -47,7 +53,7 @@ Index: new/debian/changelog -- Patrick Caulfield Wed, 3 Nov 2004 09:37:56 +0000 lvm2 (2.00.24-2) unstable; urgency=low -@@ -596,7 +610,7 @@ +@@ -616,7 +636,7 @@ Closes: #260700 * Add Czech debconf translation Closes: #265545 @@ -56,7 +62,7 @@ Index: new/debian/changelog -- Patrick Caulfield Fri, 20 Aug 2004 10:44:11 +0100 lvm2 (2.00.19-3) unstable; urgency=low -@@ -736,7 +750,7 @@ +@@ -756,7 +776,7 @@ -- Andres Salomon Thu, 07 Aug 2003 01:04:59 -0400 lvm2 (1.95.15-2) unstable; urgency=low @@ -65,7 +71,7 @@ Index: new/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). -@@ -812,7 +826,7 @@ +@@ -832,7 +852,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-clvm-init-script.patch b/patchdir/fix-clvm-init-script.patch index d8ea94b..b31929e 100644 --- a/patchdir/fix-clvm-init-script.patch +++ b/patchdir/fix-clvm-init-script.patch @@ -1,7 +1,7 @@ -Index: new/debian/clvm.init +Index: lvm2-2.02.88/debian/clvm.init =================================================================== ---- new.orig/debian/clvm.init 2011-11-25 08:39:04.000000000 +0100 -+++ new/debian/clvm.init 2011-11-25 08:42:54.000000000 +0100 +--- lvm2-2.02.88.orig/debian/clvm.init 2010-10-30 18:03:53.000000000 +0200 ++++ lvm2-2.02.88/debian/clvm.init 2011-12-09 06:16:44.000000000 +0100 @@ -4,8 +4,8 @@ # Provides: clvm # Required-Start: $remote_fs lvm2 cman @@ -84,11 +84,11 @@ Index: new/debian/clvm.init # deactivate volumes... log_daemon_msg "Deactivating VG $vg:" do_deactivate -Index: new/debian/rules +Index: lvm2-2.02.88/debian/rules =================================================================== ---- new.orig/debian/rules 2011-11-25 08:39:04.000000000 +0100 -+++ new/debian/rules 2011-11-25 08:39:39.000000000 +0100 -@@ -160,7 +160,7 @@ +--- lvm2-2.02.88.orig/debian/rules 2011-11-06 17:56:55.000000000 +0100 ++++ lvm2-2.02.88/debian/rules 2011-12-09 06:16:44.000000000 +0100 +@@ -156,7 +156,7 @@ install_clvm: DIR = $(BUILD_DIR)/install_deb install_clvm: $(STAMPS_DIR)/install_deb +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)' @@ -97,10 +97,10 @@ Index: new/debian/rules +$(MAKE_SELF) install-base install_dmsetup: export DH_OPTIONS = -pdmsetup -Index: new/debian/clvm.default +Index: lvm2-2.02.88/debian/clvm.default =================================================================== ---- new.orig/debian/clvm.default 2011-11-25 08:39:04.000000000 +0100 -+++ new/debian/clvm.default 2011-11-25 08:42:26.000000000 +0100 +--- lvm2-2.02.88.orig/debian/clvm.default 2008-11-19 11:49:38.000000000 +0100 ++++ lvm2-2.02.88/debian/clvm.default 2011-12-09 06:16:44.000000000 +0100 @@ -1,8 +1,11 @@ # Bourne shell compatible script, sourced by /etc/init.d/clvm to set # additional arguments for clvmd. diff --git a/patchdir/fix-fsadm-install.patch b/patchdir/fix-fsadm-install.patch index 24d0009..7d138a6 100644 --- a/patchdir/fix-fsadm-install.patch +++ b/patchdir/fix-fsadm-install.patch @@ -1,21 +1,21 @@ -Index: new/debian/lvm2.install +Index: lvm2-2.02.88/debian/lvm2.install =================================================================== ---- new.orig/debian/lvm2.install 2011-09-21 06:48:45.000000000 +0200 -+++ new/debian/lvm2.install 2011-09-21 06:49:33.000000000 +0200 +--- lvm2-2.02.88.orig/debian/lvm2.install 2010-03-16 20:58:19.000000000 +0100 ++++ lvm2-2.02.88/debian/lvm2.install 2011-12-09 06:21:37.000000000 +0100 @@ -8,3 +8,5 @@ usr/share/man/man8/pv* usr/share/man/man8/vg* usr/share/man/man5 +usr/share/man/man8/fsadm.8 + -Index: new/debian/rules +Index: lvm2-2.02.88/debian/rules =================================================================== ---- new.orig/debian/rules 2011-09-21 06:50:35.000000000 +0200 -+++ new/debian/rules 2011-09-21 06:51:15.000000000 +0200 -@@ -81,6 +81,7 @@ - --with-device-uid=0 \ - --with-device-gid=6 \ +--- lvm2-2.02.88.orig/debian/rules 2011-12-09 06:16:44.000000000 +0100 ++++ lvm2-2.02.88/debian/rules 2011-12-09 06:22:58.000000000 +0100 +@@ -77,6 +77,7 @@ --with-device-mode=0660 \ + --with-default-run-dir=/run/lvm \ + --with-default-locking-dir=/run/lock/lvm \ + --enable-fsadm \ --enable-applib \ --enable-cmdlib \ diff --git a/patchdir/fix-libdevmapper-priority.patch b/patchdir/fix-libdevmapper-priority.patch index ff50ae0..934ac43 100644 --- a/patchdir/fix-libdevmapper-priority.patch +++ b/patchdir/fix-libdevmapper-priority.patch @@ -1,8 +1,8 @@ -Index: new/debian/control +Index: lvm2-2.02.88/debian/control =================================================================== ---- new.orig/debian/control 2011-09-22 10:21:22.000000000 +0200 -+++ new/debian/control 2011-09-22 10:21:53.000000000 +0200 -@@ -47,7 +47,7 @@ +--- lvm2-2.02.88.orig/debian/control 2011-12-09 06:23:56.000000000 +0100 ++++ lvm2-2.02.88/debian/control 2011-12-09 06:29:54.000000000 +0100 +@@ -46,7 +46,7 @@ Package: libdevmapper1.02.1 Section: libs diff --git a/patchdir/remove-openais-clvm.patch b/patchdir/remove-openais-clvm.patch new file mode 100644 index 0000000..7266473 --- /dev/null +++ b/patchdir/remove-openais-clvm.patch @@ -0,0 +1,13 @@ +Index: new/debian/rules +=================================================================== +--- new.orig/debian/rules 2011-12-09 06:44:17.000000000 +0100 ++++ new/debian/rules 2011-12-09 06:44:40.000000000 +0100 +@@ -70,7 +70,7 @@ + ./configure CFLAGS="$(CFLAGS)" \ + $(CONFIGURE_FLAGS) \ + --with-optimisation="" \ +- --with-clvmd=cman,corosync,openais \ ++ --with-clvmd=cman,corosync \ + --with-cluster=internal \ + --with-device-uid=0 \ + --with-device-gid=6 \ diff --git a/patchdir/remove-udebs.patch b/patchdir/remove-udebs.patch index 22b2e2b..cc3d49f 100644 --- a/patchdir/remove-udebs.patch +++ b/patchdir/remove-udebs.patch @@ -1,8 +1,8 @@ -Index: new/debian/control +Index: lvm2-2.02.88/debian/control =================================================================== ---- new.orig/debian/control 2011-09-21 07:05:16.000000000 +0200 -+++ new/debian/control 2011-09-21 07:06:32.000000000 +0200 -@@ -21,20 +21,6 @@ +--- lvm2-2.02.88.orig/debian/control 2011-12-09 06:16:23.000000000 +0100 ++++ lvm2-2.02.88/debian/control 2011-12-09 06:23:56.000000000 +0100 +@@ -19,20 +19,6 @@ volume groups can be allocated to logical volumes, which are accessed as regular block devices. @@ -23,7 +23,7 @@ Index: new/debian/control Package: clvm Priority: extra Architecture: any -@@ -78,20 +64,6 @@ +@@ -77,20 +63,6 @@ device-mapper; it allows usage of the device-mapper through a clean, consistent interface (as opposed to through kernel ioctls). @@ -44,7 +44,7 @@ Index: new/debian/control Package: dmsetup Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>> 2.16) -@@ -99,20 +71,6 @@ +@@ -98,20 +70,6 @@ Description: Linux Kernel Device Mapper userspace library The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management) Team's implementation of a minimalistic kernel-space driver that handles @@ -65,11 +65,11 @@ Index: new/debian/control volume management, while keeping knowledge of the underlying device layout in user-space. This makes it useful for not only LVM, but EVMS, software raid, and other drivers that create "virtual" block devices. -Index: new/debian/rules +Index: lvm2-2.02.88/debian/rules =================================================================== ---- new.orig/debian/rules 2011-09-21 07:09:37.000000000 +0200 -+++ new/debian/rules 2011-09-21 07:15:09.000000000 +0200 -@@ -65,7 +65,7 @@ +--- lvm2-2.02.88.orig/debian/rules 2011-12-09 06:22:58.000000000 +0100 ++++ lvm2-2.02.88/debian/rules 2011-12-09 06:25:31.000000000 +0100 +@@ -59,7 +59,7 @@ cd $(DIR); autoreconf touch $@ @@ -78,7 +78,7 @@ Index: new/debian/rules $(STAMPS_DIR)/setup_deb: SOURCE_DIR = $(BUILD_DIR)/source $(STAMPS_DIR)/setup_deb: DIR = $(BUILD_DIR)/build_deb -@@ -105,7 +105,7 @@ +@@ -101,7 +101,7 @@ --disable-selinux touch $@ @@ -87,12 +87,12 @@ Index: new/debian/rules build_deb: $(STAMPS_DIR)/build_deb build_udeb: $(STAMPS_DIR)/build_udeb -@@ -240,7 +240,7 @@ +@@ -223,7 +223,7 @@ +$(MAKE_SELF) install-base binary-indep: --binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-dev dmsetup dmsetup-udeb liblvm2app liblvm2cmd liblvm2-dev lvm2 lvm2-udeb clvm) -+binary-arch: $(addprefix install_,libdevmapper libdevmapper-dev dmsetup liblvm2app liblvm2cmd liblvm2-dev lvm2 clvm) +-binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-dev dmsetup dmsetup-udeb liblvm2 lvm2 lvm2-udeb clvm) ++binary-arch: $(addprefix install_,libdevmapper libdevmapper-dev dmsetup liblvm2 lvm2 clvm) binary: binary-indep binary-arch diff --git a/patchdir/series b/patchdir/series index f88fe54..754efc1 100644 --- a/patchdir/series +++ b/patchdir/series @@ -4,6 +4,7 @@ fix-changelog.patch fix-fsadm-install.patch remove-udebs.patch #autodetect-locking-type.patch -suppress-error-messages.patch +#suppress-error-messages.patch fix-lvm2-init-script-patch fix-libdevmapper-priority.patch +remove-openais-clvm.patch