[pve-devel] [PATCH corosync-pve 03/10] build: revert upstream switch to DH 11

Wed Nov 7 14:26:30 CET 2018

not yet available in Debian Stretch without backports

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 ...-Switch-to-Debhelper-compat-level-11.patch | 70 +++++++++++++++++++
 ...t-after-package-upgrade-is-complete.patch} |  8 +--
 ...pt.patch => 0005-remove-init-script.patch} |  0
 ...postinst-for-restart-on-dist-upgrad.patch} |  0
 ...bcorosync4-pve-transitional-package.patch} |  4 +-
 ...art-corosync.service-if-conf-exists.patch} |  0
 ...-and-problematic-corosync-qdevice.i.patch} |  0
 ...emcrypto-Check-length-of-the-packet.patch} |  0
 ...ients-about-left-nodes-during-pause.patch} |  0
 patches/series                                | 17 ++---
 10 files changed, 85 insertions(+), 14 deletions(-)
 create mode 100644 patches/0003-Revert-Switch-to-Debhelper-compat-level-11.patch
 rename patches/{0003-restart-after-package-upgrade-is-complete.patch => 0004-restart-after-package-upgrade-is-complete.patch} (78%)
 rename patches/{0004-remove-init-script.patch => 0005-remove-init-script.patch} (100%)
 rename patches/{0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch => 0006-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch} (100%)
 rename patches/{0006-add-libcorosync4-pve-transitional-package.patch => 0007-add-libcorosync4-pve-transitional-package.patch} (92%)
 rename patches/{0007-only-start-corosync.service-if-conf-exists.patch => 0008-only-start-corosync.service-if-conf-exists.patch} (100%)
 rename patches/{0008-remove-unecessary-and-problematic-corosync-qdevice.i.patch => 0009-remove-unecessary-and-problematic-corosync-qdevice.i.patch} (100%)
 rename patches/{0009-totemcrypto-Check-length-of-the-packet.patch => 0010-totemcrypto-Check-length-of-the-packet.patch} (100%)
 rename patches/{0010-cpg-Inform-clients-about-left-nodes-during-pause.patch => 0011-cpg-Inform-clients-about-left-nodes-during-pause.patch} (100%)

diff --git a/patches/0003-Revert-Switch-to-Debhelper-compat-level-11.patch b/patches/0003-Revert-Switch-to-Debhelper-compat-level-11.patch
new file mode 100644
index 0000000..c8a3689
--- /dev/null
+++ b/patches/0003-Revert-Switch-to-Debhelper-compat-level-11.patch
@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
+Date: Wed, 24 Oct 2018 12:36:41 +0200
+Subject: [PATCH] Revert "Switch to Debhelper compat level 11"
+
+This reverts commit e11ae7f2f329dab7acf6cb0d70980494a81ad1b2.
+---
+ debian/compat  |  2 +-
+ debian/control |  4 +++-
+ debian/rules   | 12 ++++++------
+ 3 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/debian/compat b/debian/compat
+index b4de3947..ec635144 100644
+--- a/debian/compat
++++ b/debian/compat
+@@ -1 +1 @@
+-11
++9
+diff --git a/debian/control b/debian/control
+index 8a2ed29e..888bc650 100644
+--- a/debian/control
++++ b/debian/control
+@@ -8,9 +8,11 @@ Uploaders:
+ Standards-Version: 4.1.4
+ Build-Depends:
+  augeas-tools,
+- debhelper (>= 11~),
++ debhelper (>= 9~),
+  dctrl-tools,
++ dh-autoreconf,
+  dh-exec,
++ dh-systemd,
+  groff,
+  libdbus-1-dev,
+  libnss3-dev,
+diff --git a/debian/rules b/debian/rules
+index 7108d92c..d863e8e8 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -28,7 +28,7 @@ initscript-dir=etc/init.d
+ endif
+ 
+ %:
+-	dh $@
++	dh $@ --parallel --with autoreconf,systemd
+ 
+ # Avoid useless dependencies in the libraries
+ override_dh_autoreconf:
+@@ -71,15 +71,15 @@ override_dh_auto_install-arch:
+ 	   debian/tmp/$(initscript-dir)/corosync-qnetd \
+ 	   debian/tmp/usr/share/doc/corosync/LICENSE
+ 
+-override_dh_missing:
+-	dh_missing --fail-missing
++override_dh_install:
++	dh_install --fail-missing
+ 
+ override_dh_installchangelogs:
+ 	dh_installchangelogs ChangeLog
+ 
+-override_dh_installsystemd:
+-	dh_installsystemd -p corosync-qdevice --no-enable --no-start
+-	dh_installsystemd --remaining-packages
++override_dh_systemd_enable:
++	dh_systemd_enable -p corosync-qdevice --no-enable
++	dh_systemd_enable --remaining-packages
+ 
+ override_dh_strip:
+ 	dh_strip --dbgsym-migration=corosync-dbg
diff --git a/patches/0003-restart-after-package-upgrade-is-complete.patch b/patches/0004-restart-after-package-upgrade-is-complete.patch
similarity index 78%
rename from patches/0003-restart-after-package-upgrade-is-complete.patch
rename to patches/0004-restart-after-package-upgrade-is-complete.patch
index 24e4574..992c923 100644
--- a/patches/0003-restart-after-package-upgrade-is-complete.patch
+++ b/patches/0004-restart-after-package-upgrade-is-complete.patch
@@ -12,12 +12,12 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/debian/rules b/debian/rules
-index 7108d92c..871ba8d0 100755
+index d863e8e8..366f6ac9 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -81,6 +81,9 @@ override_dh_installsystemd:
- 	dh_installsystemd -p corosync-qdevice --no-enable --no-start
- 	dh_installsystemd --remaining-packages
+@@ -81,6 +81,9 @@ override_dh_systemd_enable:
+ 	dh_systemd_enable -p corosync-qdevice --no-enable
+ 	dh_systemd_enable --remaining-packages
  
 +override_dh_systemd_start:
 +	dh_systemd_start -r --restart-after-upgrade
diff --git a/patches/0004-remove-init-script.patch b/patches/0005-remove-init-script.patch
similarity index 100%
rename from patches/0004-remove-init-script.patch
rename to patches/0005-remove-init-script.patch
diff --git a/patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch b/patches/0006-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
similarity index 100%
rename from patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
rename to patches/0006-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
diff --git a/patches/0006-add-libcorosync4-pve-transitional-package.patch b/patches/0007-add-libcorosync4-pve-transitional-package.patch
similarity index 92%
rename from patches/0006-add-libcorosync4-pve-transitional-package.patch
rename to patches/0007-add-libcorosync4-pve-transitional-package.patch
index c501e52..c6ba969 100644
--- a/patches/0006-add-libcorosync4-pve-transitional-package.patch
+++ b/patches/0007-add-libcorosync4-pve-transitional-package.patch
@@ -12,10 +12,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/debian/control b/debian/control
-index 8a2ed29e..15e1cf7e 100644
+index 888bc650..b4063466 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -49,6 +49,11 @@ Architecture: all
+@@ -51,6 +51,11 @@ Architecture: all
  Depends: corosync (= ${binary:Version})
  Description: Transitional package.
  
diff --git a/patches/0007-only-start-corosync.service-if-conf-exists.patch b/patches/0008-only-start-corosync.service-if-conf-exists.patch
similarity index 100%
rename from patches/0007-only-start-corosync.service-if-conf-exists.patch
rename to patches/0008-only-start-corosync.service-if-conf-exists.patch
diff --git a/patches/0008-remove-unecessary-and-problematic-corosync-qdevice.i.patch b/patches/0009-remove-unecessary-and-problematic-corosync-qdevice.i.patch
similarity index 100%
rename from patches/0008-remove-unecessary-and-problematic-corosync-qdevice.i.patch
rename to patches/0009-remove-unecessary-and-problematic-corosync-qdevice.i.patch
diff --git a/patches/0009-totemcrypto-Check-length-of-the-packet.patch b/patches/0010-totemcrypto-Check-length-of-the-packet.patch
similarity index 100%
rename from patches/0009-totemcrypto-Check-length-of-the-packet.patch
rename to patches/0010-totemcrypto-Check-length-of-the-packet.patch
diff --git a/patches/0010-cpg-Inform-clients-about-left-nodes-during-pause.patch b/patches/0011-cpg-Inform-clients-about-left-nodes-during-pause.patch
similarity index 100%
rename from patches/0010-cpg-Inform-clients-about-left-nodes-during-pause.patch
rename to patches/0011-cpg-Inform-clients-about-left-nodes-during-pause.patch
diff --git a/patches/series b/patches/series
index 7931482..1cbfb27 100644
--- a/patches/series
+++ b/patches/series
@@ -1,10 +1,11 @@
 0001-add-Provides-Replaces-corosync-pve.patch
 0002-don-t-install-default-corosync.conf.patch
-0003-restart-after-package-upgrade-is-complete.patch
-0004-remove-init-script.patch
-0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
-0006-add-libcorosync4-pve-transitional-package.patch
-0007-only-start-corosync.service-if-conf-exists.patch
-0008-remove-unecessary-and-problematic-corosync-qdevice.i.patch
-0009-totemcrypto-Check-length-of-the-packet.patch
-0010-cpg-Inform-clients-about-left-nodes-during-pause.patch
+0003-Revert-Switch-to-Debhelper-compat-level-11.patch
+0004-restart-after-package-upgrade-is-complete.patch
+0005-remove-init-script.patch
+0006-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
+0007-add-libcorosync4-pve-transitional-package.patch
+0008-only-start-corosync.service-if-conf-exists.patch
+0009-remove-unecessary-and-problematic-corosync-qdevice.i.patch
+0010-totemcrypto-Check-length-of-the-packet.patch
+0011-cpg-Inform-clients-about-left-nodes-during-pause.patch
-- 
2.19.1



