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}
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 <pkg-lvm-maintainers@lists.alioth.debian.org>
-Uploaders: Bastian Blank <waldi@debian.org>
--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 <support@proxmox.com>
-+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.
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 <support@proxmox.com> Fri, 09 Dec 2011 06:50:49 +0100
++
+lvm2 (2.02.86-1pve2) unstable; urgency=low
+
+ * disable clvmd by default
+
+ -- Proxmox Support Team <support@proxmox.com> 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.
- Only use single node clvm if explicitly requested.
-- Bastian Blank <waldi@debian.org> 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
-- Patrick Caulfield <patrick@debian.org> 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.
-- Patrick Caulfield <patrick@debian.org> 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
-- Patrick Caulfield <patrick@debian.org> 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 <dilinger@voxel.net> Thu, 07 Aug 2003 01:04:59 -0400
lvm2 (1.95.15-2) unstable; urgency=low
* 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.
-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
# 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)'
+$(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.
-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 \
-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
--- /dev/null
+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 \
-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.
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).
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
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 $@
$(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 $@
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
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
projects / lvm.git / commitdiff