update to latest STABLE32

diff --git a/Makefile b/Makefile
index 30d26ae4a83d9ac9e743c96923194526319a79d5..affecd1fc42d5a408020575510b4d6ce95dda591 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
-RELEASE=2.2
+RELEASE=3.0
 
-RHCVER=3.1.93
+RHCVER=3.2.0
 RHCBRANCH=STABLE32
 
 RHCDIR=cluster-${RHCVER}
 RHCSRC=${RHCDIR}.tar.gz
 
 PACKAGE=redhat-cluster-pve
-PKGREL=2
+PKGREL=1
 
 DEBS=                                                                  \
        ${PACKAGE}_${RHCVER}-${PKGREL}_amd64.deb                        \
@@ -22,7 +22,7 @@ ${DEBS}: ${RHCSRC}
        cp -a debian ${RHCDIR}/debian
        cat ${RHCDIR}/doc/COPYRIGHT >>${RHCDIR}/debian/copyright
        cd ${RHCDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
-       lintian ${DEBS}
+       lintian -X copyright-file ${DEBS}
 
 ${RHCSRC} download:
        rm -rf ${RHCDIR} cluster.git

diff --git a/cluster-3.1.93.tar.gz b/cluster-3.1.93.tar.gz
deleted file mode 100644 (file)
index 29191d4..0000000
Binary files a/cluster-3.1.93.tar.gz and /dev/null differ

diff --git a/cluster-3.2.0.tar.gz b/cluster-3.2.0.tar.gz
new file mode 100644 (file)
index 0000000..43922f8
Binary files /dev/null and b/cluster-3.2.0.tar.gz differ

diff --git a/debian/changelog b/debian/changelog
index d31b178fd22342421c7bfd1cd794b0885be919fd..b557304760bf385f6ebccb10da7dca5bfbac5bf1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+redhat-cluster-pve (3.2.0-1) unstable; urgency=low
+
+  * update to latest STABLE32 (3.2.0, commit
+    6ac07a7ec331e8f9c1b238e49144731cd48c0150)
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Mar 2013 07:19:00 +0100
+
 redhat-cluster-pve (3.1.93-2) unstable; urgency=low
 
   * correct init script dependency, so that open-iscsi is stopped after

diff --git a/debian/control b/debian/control
index d15afc60b6b1d6fa4019825bbe02fc555fa8cf5f..28dfc8ed7eed0fbc4ffce1e73cf5f405df9dfee5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7), autotools-dev,
  libcorosync-pve-dev,
  libopenais-pve-dev,
  xsltproc,
- pve-headers-2.6.32-16-pve
+ pve-headers-2.6.32-19-pve
 
 Package: redhat-cluster-pve
 Architecture: any

diff --git a/debian/patches/do-not-stop-when-start-fails.patch b/debian/patches/do-not-stop-when-start-fails.patch
index b457359323cf9c12d9f64c8ba56718d3ea31f080..231eb093d7f367be1430fabc988eb0a23fdadab9 100644 (file)
--- a/debian/patches/do-not-stop-when-start-fails.patch
+++ b/debian/patches/do-not-stop-when-start-fails.patch
@@ -5,17 +5,17 @@ Revert commit 65a0eef71377d2de4ad94e8f20065c4467a441e9 form upstream. We want to
 
 Index: new/cman/init.d/cman.in
 ===================================================================
---- new.orig/cman/init.d/cman.in       2012-10-02 11:07:02.000000000 +0200
-+++ new/cman/init.d/cman.in    2012-10-02 11:07:38.000000000 +0200
-@@ -231,9 +231,9 @@
+--- new.orig/cman/init.d/cman.in       2013-03-15 07:27:17.000000000 +0100
++++ new/cman/init.d/cman.in    2013-03-15 07:30:40.000000000 +0100
+@@ -228,9 +228,9 @@
        echo -e "$errmsg"
        failure
        echo
 -      if [ "$currentaction" = "start" ]; then
--              $thisinvokation stop
+-              stop && rm -f $LOCK_FILE
 -      fi
 +#     if [ "$currentaction" = "start" ]; then
-+#             $thisinvokation stop
++#             stop && rm -f $LOCK_FILE
 +#     fi
        exit 1
  }

diff --git a/debian/patches/fix-cman-init.diff b/debian/patches/fix-cman-init.diff
index 405f702e357a87a3e12f94f584a018e6a2c7bd66..7c8ed79dbf7276e882cfccde63d871fa39e0f893 100644 (file)
--- a/debian/patches/fix-cman-init.diff
+++ b/debian/patches/fix-cman-init.diff
@@ -3,18 +3,18 @@
 
 Index: new/cman/init.d/cman.in
 ===================================================================
---- new.orig/cman/init.d/cman.in       2012-10-02 10:58:00.000000000 +0200
-+++ new/cman/init.d/cman.in    2012-10-02 11:07:02.000000000 +0200
-@@ -22,6 +22,8 @@
- # save invokation for rollback ops
- thisinvokation="$0"
+--- new.orig/cman/init.d/cman.in       2013-03-15 07:21:53.000000000 +0100
++++ new/cman/init.d/cman.in    2013-03-15 07:27:17.000000000 +0100
+@@ -19,6 +19,8 @@
+ # set secure PATH
+ PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
  
 +test -x @SBINDIR@/cman_tool || exit 0
 +
  chkconfig2()
  {
        case "$1" in
-@@ -146,7 +148,7 @@
+@@ -143,7 +145,7 @@
  #     DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
  #     Please note that clusters without fencing are not 
  #     supported by Red Hat except for MRG installations.

diff --git a/debian/patches/fix-lsb-header.diff b/debian/patches/fix-lsb-header.diff
index 8c40ac67b70a086a3592d9116be6186ac654d4e3..fc58182c790d532652425a001c921b3a3ad3406d 100644 (file)
--- a/debian/patches/fix-lsb-header.diff
+++ b/debian/patches/fix-lsb-header.diff
@@ -1,26 +1,26 @@
 Index: new/cman/init.d/cman.in
 ===================================================================
---- new.orig/cman/init.d/cman.in       2012-11-14 06:12:44.000000000 +0100
-+++ new/cman/init.d/cman.in    2012-11-14 06:33:35.000000000 +0100
+--- new.orig/cman/init.d/cman.in       2013-03-15 07:31:33.000000000 +0100
++++ new/cman/init.d/cman.in    2013-03-15 07:35:36.000000000 +0100
 @@ -8,10 +8,11 @@
  #
  ### BEGIN INIT INFO
  # Provides:           cman
--# Required-Start:     $network $time
--# Required-Stop:      $network $time
+-# Required-Start:     $network $time fence_sanlockd
+-# Required-Stop:      $network $time fence_sanlockd
 -# Default-Start:
 -# Default-Stop:
-+# Required-Start:     $remote_fs pve-cluster
-+# Required-Stop:      $remote_fs pve-cluster
++# Required-Start:     $network $time $remote_fs pve-cluster
++# Required-Stop:      $network $time $remote_fs pve-cluster
 +# Should-Stop:                iscsi umountiscsi.sh
 +# Default-Start:        2 3 4 5
 +# Default-Stop:         0 1 6
  # Short-Description:  Starts and stops cman
  # Description:                Starts and stops the Cluster Manager set of daemons
  ### END INIT INFO
-@@ -22,7 +23,10 @@
- # save invokation for rollback ops
- thisinvokation="$0"
+@@ -19,7 +20,10 @@
+ # set secure PATH
+ PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
  
 +CCFG="/etc/cluster/cluster.conf"
 +
@@ -29,7 +29,7 @@ Index: new/cman/init.d/cman.in
  
  chkconfig2()
  {
-@@ -71,8 +75,7 @@
+@@ -68,8 +72,7 @@
  
  # deb based distros
  if [ ! -d /etc/sysconfig ]; then

diff --git a/debian/rules b/debian/rules
index 0f4ef28938981db88d029d600e20a5df3f27b301..0e16ac61362a2974cbbe59c280903d91db1eda53 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_auto_configure:
        ./configure --prefix=/usr \
                    --libexecdir=/usr/lib \
                    --disable_dbus \
-                   --kernel_src=/usr/src/linux-headers-2.6.32-16-pve/
+                   --kernel_src=/usr/src/linux-headers-2.6.32-19-pve/
 
 override_dh_auto_install:
        $(MAKE) install DESTDIR=$(BUILDROOT)/debian/tmp/