Signed-off-by: Fabian Grünbichler <[email protected]> --- ...1-add-Provides-Replaces-corosync-pve.patch | 17 +++++----- ...-don-t-install-default-corosync.conf.patch | 9 ++---- ...rt-after-package-upgrade-is-complete.patch | 11 +++---- patches/0004-remove-init-script.patch | 5 +-- ...-postinst-for-restart-on-dist-upgrad.patch | 3 -- ...ibcorosync4-pve-transitional-package.patch | 7 ++--- ...tart-corosync.service-if-conf-exists.patch | 25 +++------------ ...y-and-problematic-corosync-qdevice.i.patch | 14 +++------ ...temcrypto-Check-length-of-the-packet.patch | 31 +++++-------------- ...lients-about-left-nodes-during-pause.patch | 9 ++---- 10 files changed, 37 insertions(+), 94 deletions(-)
diff --git a/patches/0001-add-Provides-Replaces-corosync-pve.patch b/patches/0001-add-Provides-Replaces-corosync-pve.patch index 3b467f9..5601724 100644 --- a/patches/0001-add-Provides-Replaces-corosync-pve.patch +++ b/patches/0001-add-Provides-Replaces-corosync-pve.patch @@ -12,12 +12,12 @@ Signed-off-by: Fabian Grünbichler <[email protected]> 1 file changed, 7 insertions(+) diff --git a/debian/control b/debian/control -index fad56353..d11dc18c 100644 +index e105b0b2..8a2ed29e 100644 --- a/debian/control +++ b/debian/control -@@ -31,6 +31,11 @@ Homepage: http://corosync.github.io/corosync/ - Vcs-Git: https://anonscm.debian.org/git/debian-ha/corosync.git - Vcs-Browser: https://anonscm.debian.org/cgit/debian-ha/corosync.git +@@ -44,6 +44,11 @@ X-Common-Description: The Corosync Cluster Engine is a Group Communication + * A quorum system that notifies applications when quorum is achieved + or lost. +Package: corosync-pve +Architecture: all @@ -27,15 +27,12 @@ index fad56353..d11dc18c 100644 Package: corosync Architecture: any Pre-Depends: ${misc:Pre-Depends} -@@ -39,6 +44,8 @@ Depends: ${shlibs:Depends}, +@@ -52,6 +57,8 @@ Depends: ${shlibs:Depends}, lsb-base (>= 3.0-6), adduser, xsltproc +Provides: corosync-pve (= ${binary:Version}) +Replaces: corosync-pve (<< 2.4.2-2) Description: cluster engine daemon and utilities - ${DESCRIPTION} - This package contains the Corosync daemon and some administration tools. --- -2.14.2 - + ${S:X-Common-Description} + . diff --git a/patches/0002-don-t-install-default-corosync.conf.patch b/patches/0002-don-t-install-default-corosync.conf.patch index 5ad2c47..2e5a72c 100644 --- a/patches/0002-don-t-install-default-corosync.conf.patch +++ b/patches/0002-don-t-install-default-corosync.conf.patch @@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler <[email protected]> --- - debian/corosync.conf | 111 ------------------------------------------------ + debian/corosync.conf | 111 ---------------------------------------- debian/corosync.install | 1 - 2 files changed, 112 deletions(-) delete mode 100644 debian/corosync.conf @@ -131,16 +131,13 @@ index 04444322..00000000 - expected_votes: 2 -} diff --git a/debian/corosync.install b/debian/corosync.install -index da4efa17..3c03c3f6 100755 +index 027a58db..f38d1f78 100755 --- a/debian/corosync.install +++ b/debian/corosync.install -@@ -31,6 +31,5 @@ usr/share/augeas/lenses/corosync.aug +@@ -30,6 +30,5 @@ usr/share/augeas/lenses/corosync.aug usr/share/augeas/lenses/tests/test_corosync.aug etc/corosync/corosync.*example* usr/share/doc/corosync/examples etc/corosync/uidgid.d -debian/corosync.conf etc/corosync usr/share/corosync/xml2conf.xsl var/lib/corosync --- -2.14.2 - diff --git a/patches/0003-restart-after-package-upgrade-is-complete.patch b/patches/0003-restart-after-package-upgrade-is-complete.patch index 5545d81..24e4574 100644 --- a/patches/0003-restart-after-package-upgrade-is-complete.patch +++ b/patches/0003-restart-after-package-upgrade-is-complete.patch @@ -12,12 +12,12 @@ Signed-off-by: Fabian Grünbichler <[email protected]> 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules -index d43bf29b..f45847cc 100755 +index 7108d92c..871ba8d0 100755 --- a/debian/rules +++ b/debian/rules -@@ -86,6 +86,9 @@ override_dh_systemd_enable: - dh_systemd_enable -p corosync-qdevice --no-enable - dh_systemd_enable --remaining-packages +@@ -81,6 +81,9 @@ override_dh_installsystemd: + dh_installsystemd -p corosync-qdevice --no-enable --no-start + dh_installsystemd --remaining-packages +override_dh_systemd_start: + dh_systemd_start -r --restart-after-upgrade @@ -25,6 +25,3 @@ index d43bf29b..f45847cc 100755 override_dh_strip: dh_strip --dbgsym-migration=corosync-dbg --- -2.14.2 - diff --git a/patches/0004-remove-init-script.patch b/patches/0004-remove-init-script.patch index 3a2e381..bbc85a2 100644 --- a/patches/0004-remove-init-script.patch +++ b/patches/0004-remove-init-script.patch @@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler <[email protected]> --- - debian/corosync.init | 122 --------------------------------------------------- + debian/corosync.init | 122 ------------------------------------------- 1 file changed, 122 deletions(-) delete mode 100644 debian/corosync.init @@ -140,6 +140,3 @@ index f7b813a5..00000000 -esac - -: --- -2.14.2 - diff --git a/patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch b/patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch index 8a31781..ae25a75 100644 --- a/patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch +++ b/patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch @@ -30,6 +30,3 @@ index 00000000..f282563f + fi + fi +fi --- -2.14.2 - diff --git a/patches/0006-add-libcorosync4-pve-transitional-package.patch b/patches/0006-add-libcorosync4-pve-transitional-package.patch index bdb0599..c501e52 100644 --- a/patches/0006-add-libcorosync4-pve-transitional-package.patch +++ b/patches/0006-add-libcorosync4-pve-transitional-package.patch @@ -12,10 +12,10 @@ Signed-off-by: Fabian Grünbichler <[email protected]> 1 file changed, 5 insertions(+) diff --git a/debian/control b/debian/control -index d11dc18c..bae42c6a 100644 +index 8a2ed29e..15e1cf7e 100644 --- a/debian/control +++ b/debian/control -@@ -36,6 +36,11 @@ Architecture: all +@@ -49,6 +49,11 @@ Architecture: all Depends: corosync (= ${binary:Version}) Description: Transitional package. @@ -27,6 +27,3 @@ index d11dc18c..bae42c6a 100644 Package: corosync Architecture: any Pre-Depends: ${misc:Pre-Depends} --- -2.14.2 - diff --git a/patches/0007-only-start-corosync.service-if-conf-exists.patch b/patches/0007-only-start-corosync.service-if-conf-exists.patch index 62e0271..d6068d3 100644 --- a/patches/0007-only-start-corosync.service-if-conf-exists.patch +++ b/patches/0007-only-start-corosync.service-if-conf-exists.patch @@ -8,33 +8,18 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler <[email protected]> --- - init/corosync.service.in | 1 + - .../patches/Add-Documentation-URIs-to-the-systemd-service-files.patch | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) + init/corosync.service.in | 1 + + 1 file changed, 1 insertion(+) diff --git a/init/corosync.service.in b/init/corosync.service.in -index d71a8572..3b8316a7 100644 +index 7733a98c..1b65c94b 100644 --- a/init/corosync.service.in +++ b/init/corosync.service.in -@@ -1,6 +1,7 @@ - [Unit] +@@ -2,6 +2,7 @@ Description=Corosync Cluster Engine + Documentation=man:corosync man:corosync.conf man:corosync_overview ConditionKernelCommandLine=!nocluster +ConditionPathExists=/etc/corosync/corosync.conf Requires=network-online.target After=network-online.target -diff --git a/debian/patches/Add-Documentation-URIs-to-the-systemd-service-files.patch b/debian/patches/Add-Documentation-URIs-to-the-systemd-service-files.patch -index d77faae9..e9f25e45 100644 ---- a/debian/patches/Add-Documentation-URIs-to-the-systemd-service-files.patch -+++ b/debian/patches/Add-Documentation-URIs-to-the-systemd-service-files.patch -@@ -52,5 +52,5 @@ index d71a857..12193b1 100644 - Description=Corosync Cluster Engine - +Documentation=man:corosync man:corosync.conf man:corosync_overview - ConditionKernelCommandLine=!nocluster -+ ConditionPathExists=/etc/corosync/corosync.conf - Requires=network-online.target -- After=network-online.target --- -2.14.2 - diff --git a/patches/0008-remove-unecessary-and-problematic-corosync-qdevice.i.patch b/patches/0008-remove-unecessary-and-problematic-corosync-qdevice.i.patch index c37216c..8c3201d 100644 --- a/patches/0008-remove-unecessary-and-problematic-corosync-qdevice.i.patch +++ b/patches/0008-remove-unecessary-and-problematic-corosync-qdevice.i.patch @@ -1,20 +1,17 @@ -From f1b91ad6c1659477b72853666cde930932279d6c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht <[email protected]> Date: Wed, 29 Mar 2017 09:35:19 +0200 -Subject: [PATCH 8/8] remove unecessary and problematic corosync-qdevice.init -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Subject: [PATCH] remove unecessary and problematic corosync-qdevice.init Signed-off-by: Thomas Lamprecht <[email protected]> --- - debian/corosync-qdevice.init | 55 -------------------------------------------- + debian/corosync-qdevice.init | 55 ------------------------------------ 1 file changed, 55 deletions(-) delete mode 100755 debian/corosync-qdevice.init diff --git a/debian/corosync-qdevice.init b/debian/corosync-qdevice.init deleted file mode 100755 -index 344666a..0000000 +index 344666ad..00000000 --- a/debian/corosync-qdevice.init +++ /dev/null @@ -1,55 +0,0 @@ @@ -73,6 +70,3 @@ index 344666a..0000000 - rm -f $PIDFILE - return $RETVAL -} --- -2.1.4 - diff --git a/patches/0009-totemcrypto-Check-length-of-the-packet.patch b/patches/0009-totemcrypto-Check-length-of-the-packet.patch index 42650b8..7463e9c 100644 --- a/patches/0009-totemcrypto-Check-length-of-the-packet.patch +++ b/patches/0009-totemcrypto-Check-length-of-the-packet.patch @@ -16,28 +16,16 @@ Reviewed-by: Christine Caulfield <[email protected]> (cherry picked from commit fc1d5418533c1faf21616b282c2559bed7d361c4) Signed-off-by: Fabian Grünbichler <[email protected]> --- - exec/totemcrypto.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) + exec/totemcrypto.c | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/exec/totemcrypto.c b/exec/totemcrypto.c -index a97ba62f..bf30ffc2 100644 +index 9f8f083c..d8d0fcae 100644 --- a/exec/totemcrypto.c +++ b/exec/totemcrypto.c -@@ -627,6 +627,11 @@ static int authenticate_nss_2_3 ( - unsigned char tmp_hash[hash_len[instance->crypto_hash_type]]; - int datalen = *buf_len - hash_len[instance->crypto_hash_type]; - -+ if (*buf_len <= hash_len[instance->crypto_hash_type]) { -+ log_printf(instance->log_level_security, "Received message is too short... ignoring"); -+ return -1; -+ } -+ - if (calculate_nss_hash(instance, buf, datalen, tmp_hash) < 0) { - return -1; - } -@@ -736,6 +741,12 @@ int crypto_authenticate_and_decrypt (struct crypto_instance *instance, - { - struct crypto_config_header *cch = (struct crypto_config_header *)buf; +@@ -864,6 +864,12 @@ int crypto_authenticate_and_decrypt (struct crypto_instance *instance, + return (-1); + } + if (*buf_len <= sizeof(struct crypto_config_header)) { + log_printf(instance->log_level_security, "Received message is too short... ignoring"); @@ -46,8 +34,5 @@ index a97ba62f..bf30ffc2 100644 + } + if (cch->crypto_cipher_type != CRYPTO_CIPHER_TYPE_2_3) { - log_printf(instance->log_level_security, - "Incoming packet has different crypto type. Rejecting"); --- -2.14.2 - + guessed_str = NULL; + diff --git a/patches/0010-cpg-Inform-clients-about-left-nodes-during-pause.patch b/patches/0010-cpg-Inform-clients-about-left-nodes-during-pause.patch index 2e745c7..3d843f6 100644 --- a/patches/0010-cpg-Inform-clients-about-left-nodes-during-pause.patch +++ b/patches/0010-cpg-Inform-clients-about-left-nodes-during-pause.patch @@ -49,7 +49,7 @@ idea of using heuristics to choose same downlist on all nodes. Signed-off-by: Jan Friesse <[email protected]> Signed-off-by: Thomas Lamprecht <[email protected]> --- - exec/cpg.c | 164 +++++-------------------------------------------------------- + exec/cpg.c | 164 ++++------------------------------------------------- 1 file changed, 11 insertions(+), 153 deletions(-) diff --git a/exec/cpg.c b/exec/cpg.c @@ -279,7 +279,7 @@ index 78ac1e9e..b851cba3 100644 - struct list_head *iter; - struct downlist_msg *stored_msg; - int found; - +- - if (downlist_state != CPG_DOWNLIST_WAITING_FOR_MESSAGES) { - log_printf (LOGSYS_LEVEL_WARNING, "downlist left_list: %d received in state %d", - req_exec_cpg_downlist->left_nodes, downlist_state); @@ -310,13 +310,10 @@ index 78ac1e9e..b851cba3 100644 - return; - } - } -- + - downlist_master_choose_and_send (); + log_printf (LOGSYS_LEVEL_WARNING, "downlist left_list: %d received", + req_exec_cpg_downlist->left_nodes); } --- -2.14.2 - -- 2.19.1 _______________________________________________ pve-devel mailing list [email protected] https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
