Adding debian version 3.1.8-1.debian/3.1.8-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 263 insertions, 0 deletions

diff --git a/debian/patches/Enable-PrivateTmp-in-the-systemd-service-files.patch b/debian/patches/Enable-PrivateTmp-in-the-systemd-service-files.patch
new file mode 100644
index 0000000..0df50b6
--- /dev/null
+++ b/debian/patches/Enable-PrivateTmp-in-the-systemd-service-files.patch
@@ -0,0 +1,33 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
+Date: Mon, 10 Dec 2018 18:55:40 +0100
+Subject: Enable PrivateTmp in the systemd service files
+
+---
+ init/corosync-notifyd.service.in | 1 +
+ init/corosync.service.in         | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/init/corosync-notifyd.service.in b/init/corosync-notifyd.service.in
+index 410a683..9247cbc 100644
+--- a/init/corosync-notifyd.service.in
++++ b/init/corosync-notifyd.service.in
+@@ -9,6 +9,7 @@ EnvironmentFile=-@INITCONFIGDIR@/corosync-notifyd
+ ExecStart=@SBINDIR@/corosync-notifyd -f $OPTIONS
+ Type=notify
+ Restart=on-failure
++PrivateTmp=yes
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/init/corosync.service.in b/init/corosync.service.in
+index bd2a48a..f59bddb 100644
+--- a/init/corosync.service.in
++++ b/init/corosync.service.in
+@@ -29,6 +29,7 @@ StandardError=null
+ #RestartSec=70
+ #  rewrite according to environment.
+ #ExecStartPre=/sbin/modprobe softdog
++PrivateTmp=yes
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/debian/patches/Fix-various-typos-in-ChangeLog.patch b/debian/patches/Fix-various-typos-in-ChangeLog.patch
new file mode 100644
index 0000000..a11de04
--- /dev/null
+++ b/debian/patches/Fix-various-typos-in-ChangeLog.patch
@@ -0,0 +1,85 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@niif.hu>
+Date: Mon, 29 Aug 2016 21:19:32 +0200
+Subject: Fix various typos in ChangeLog
+
+This file isn't present in the upstream VCS, but generated from the Git
+commit messages during the release process.  Thus fixing typos in it
+isn't upstreamable.
+---
+ ChangeLog | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 23f0232..04efcaf 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -9965,7 +9965,7 @@
+ 
+ 2012-02-07  Fabio M. Di Nitto  <fdinitto@redhat.com>
+ 
+-	votequorum: fix quorum_ringid setting before any delivery occours
++	votequorum: fix quorum_ringid setting before any delivery occurs
+ 	Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
+ 
+ 2012-02-07  Angus Salkeld  <asalkeld@redhat.com>
+@@ -10150,7 +10150,7 @@
+ 
+ 	Honor exec_init_fn call
+ 	exec_init_fn now either returns NULL (success) or a string which indicates
+-	the error that occured during service engine initialization.  If an error
++	the error that occurred during service engine initialization.  If an error
+ 	occurs, corosync will exit.  This patch adds ykd and makes other suggestions
+ 	from Fabio Di Nitto.
+ 
+@@ -11514,7 +11514,7 @@
+ 
+ 	start 5 nodes randomly at about same time, start 5 nodes randomly at about
+ 	same time, wait 10 seconds and attempt to send a message.  If message blocks
+-	on "TRY_AGAIN" likely a message loss has occured.  Wait a few minutes without
++	on "TRY_AGAIN" likely a message loss has occurred.  Wait a few minutes without
+ 	cyclng the nodes and see if the TRY_AGAIN state becomes unblocked.
+ 
+ 	If it doesn't the test case has failed
+@@ -11905,7 +11905,7 @@
+ 	is these last messages should be delivered after a transitional
+ 	configuration to maintain SAFE agreement.  We don't have support for
+ 	SAFE atm, so it is probably safe just to throw these messages away.  Without
+-	this change, the new message queue on a new configuraton change is out of sync.
++	this change, the new message queue on a new configuration change is out of sync.
+ 
+ 	Tested-by: Tim Beale <tlbeale@gmail.com>
+ 	Reviewed-by: Jan Friesse <jfriesse@redhat.com>
+@@ -19653,7 +19653,7 @@
+ 
+ 2007-08-11  Steven Dake  <sdake@redhat.com>
+ 
+-	Patch to not overwrite defualt configuration file or amf.conf file when executing make install
++	Patch to not overwrite default configuration file or amf.conf file when executing make install
+ 	git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1420 fd59a12c-fef9-0310-b244-a6a79926bd2f
+ 
+ 	Allow make doxygen to work properly
+@@ -19996,7 +19996,7 @@
+ 
+ 2006-11-10  Steven Dake  <sdake@redhat.com>
+ 
+-	Update checkpoint service from all qualifications that have occured in whitetank branch.
++	Update checkpoint service from all qualifications that have occurred in whitetank branch.
+ 	git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1299 fd59a12c-fef9-0310-b244-a6a79926bd2f
+ 
+ 	Recovery algorithms described in this document.
+@@ -26170,13 +26170,13 @@
+ 
+ 2004-07-12  Steven Dake  <sdake@broked.org>
+ 
+-	Retransmit orf token if no multicast or token received within a timeout period.  This could mean that the token was lost, but no configuration change has really occured.  Rather then execute the heavyweight membership protocol, just retry the token and if it fails after the token timeout, execute a configuration change sequence.
++	Retransmit orf token if no multicast or token received within a timeout period.  This could mean that the token was lost, but no configuration change has really occurred.  Rather then execute the heavyweight membership protocol, just retry the token and if it fails after the token timeout, execute a configuration change sequence.
+ 	BKrev: 40f21082dvUxH0aOPvKmpqoqlkEgEA
+ 
+ 
+ 	git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@99 fd59a12c-fef9-0310-b244-a6a79926bd2f
+ 
+-	Add retransmit of token if no multicast or token received within a timeout period (100 msec).  This helps avoid a reconfiguration when only the token is lost, but no real configuration changes have occured.
++	Add retransmit of token if no multicast or token received within a timeout period (100 msec).  This helps avoid a reconfiguration when only the token is lost, but no real configuration changes have occurred.
+ 	(Logical change 1.32)
+ 
+ 
diff --git a/debian/patches/Make-the-example-config-valid.patch b/debian/patches/Make-the-example-config-valid.patch
new file mode 100644
index 0000000..5c2182f
--- /dev/null
+++ b/debian/patches/Make-the-example-config-valid.patch
@@ -0,0 +1,64 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
+Date: Sun, 16 Dec 2018 22:51:46 +0100
+Subject: Make the example config valid
+
+---
+ conf/corosync.conf.example | 22 +++++++---------------
+ 1 file changed, 7 insertions(+), 15 deletions(-)
+
+diff --git a/conf/corosync.conf.example b/conf/corosync.conf.example
+index 4658a86..91de572 100644
+--- a/conf/corosync.conf.example
++++ b/conf/corosync.conf.example
+@@ -2,8 +2,10 @@
+ totem {
+ 	version: 2
+ 
+-	# Set name of the cluster
+-	cluster_name: ExampleCluster
++	# Corosync itself works without a cluster name, but DLM needs one.
++	# The cluster name is also written into the VG metadata of newly
++	# created shared LVM volume groups, if lvmlockd uses DLM locking.
++	cluster_name: debian
+ 
+ 	# crypto_cipher and crypto_hash: Used for mutual node authentication.
+ 	# If you choose to enable this, then do remember to create a shared
+@@ -25,7 +27,7 @@ logging {
+ 	# Log to a log file. When set to "no", the "logfile" option
+ 	# must not be set.
+ 	to_logfile: yes
+-	logfile: /var/log/cluster/corosync.log
++	logfile: /var/log/corosync/corosync.log
+ 	# Log to the system log daemon. When in doubt, set to yes.
+ 	to_syslog: yes
+ 	# Log debug messages (very verbose). When in doubt, leave off.
+@@ -41,7 +43,7 @@ logging {
+ quorum {
+ 	# Enable and configure quorum subsystem (default: off)
+ 	# see also corosync.conf.5 and votequorum.5
+-	#provider: corosync_votequorum
++	provider: corosync_votequorum
+ }
+ 
+ nodelist {
+@@ -53,19 +55,9 @@ nodelist {
+ 		# Cluster membership node identifier
+ 		nodeid: 1
+ 		# Address of first link
+-		#ring0_addr: 192.168.0.1
++		ring0_addr: 127.0.0.1
+ 		# When knet transport is used it's possible to define up to 8 links
+ 		#ring1_addr: 192.168.1.1
+ 	}
+-	node {
+-		# Hostname of the node
+-		name: node2
+-		# Cluster membership node identifier
+-		nodeid: 2
+-		# Address of first link
+-		#ring0_addr: 192.168.0.2
+-		# When knet transport is used it's possible to define up to 8 links
+-		#ring1_addr: 192.168.1.2
+-	}
+ 	# ...
+ }
diff --git a/debian/patches/Move-corosync-notifyd-policy-file-into-usr-share-dbus-1-s.patch b/debian/patches/Move-corosync-notifyd-policy-file-into-usr-share-dbus-1-s.patch
new file mode 100644
index 0000000..79dc623
--- /dev/null
+++ b/debian/patches/Move-corosync-notifyd-policy-file-into-usr-share-dbus-1-s.patch
@@ -0,0 +1,27 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
+Date: Sun, 26 May 2024 11:57:40 +0200
+Subject: Move corosync-notifyd policy file into /usr/share/dbus-1/system.d
+
+As per dbus-daemon(1):
+
+> Third-party packages would historically install XML files into
+> /etc/dbus-1/system.d, but this practice is now considered to be
+> deprecated: that directory should be treated as reserved for the
+> system administrator.
+---
+ conf/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf/Makefile.am b/conf/Makefile.am
+index 44581eb..d02cd21 100644
+--- a/conf/Makefile.am
++++ b/conf/Makefile.am
+@@ -60,7 +60,7 @@ mib_DATA		= COROSYNC-MIB.txt
+ endif
+ 
+ if INSTALL_DBUSCONF
+-dbusdir			= $(sysconfdir)/dbus-1/system.d
++dbusdir			= $(datadir)/dbus-1/system.d
+ dbus_DATA		= corosync-signals.conf
+ endif
+ 
diff --git a/debian/patches/Revert-logrotate-Use-copytruncate-method-by-default.patch b/debian/patches/Revert-logrotate-Use-copytruncate-method-by-default.patch
new file mode 100644
index 0000000..cf977e6
--- /dev/null
+++ b/debian/patches/Revert-logrotate-Use-copytruncate-method-by-default.patch
@@ -0,0 +1,49 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <ferenc.wagner@balabit.com>
+Date: Sun, 15 Jan 2023 11:44:31 +0100
+Subject: Revert "logrotate: Use copytruncate method by default"
+
+This reverts commit 04362046c4a9d7307feb5b68341d567b7d0b94d6.
+
+The copytruncate documentation says that it should not be used to avoid
+losing logging data.  The drawbacks mentioned in the reverted commit are
+not relevant, because they involve hiding problems which should be fixed
+at their respective origins instead.
+---
+ conf/logrotate/Makefile.am        | 7 +++++++
+ conf/logrotate/corosync-reopen.in | 5 -----
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/conf/logrotate/Makefile.am b/conf/logrotate/Makefile.am
+index 35efa2d..4f7b753 100644
+--- a/conf/logrotate/Makefile.am
++++ b/conf/logrotate/Makefile.am
+@@ -34,9 +34,16 @@ MAINTAINERCLEANFILES    = Makefile.in
+ 
+ EXTRA_DIST		= corosync-reopen.in corosync-copytruncate.in
+ 
++if HAVE_QB_LOG_FILE_REOPEN
++corosync: corosync-reopen.in
++	$(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \
++	       -e 's#@''SBINDIR@#$(sbindir)#g' \
++	       $< > $@
++else
+ corosync: corosync-copytruncate.in
+ 	$(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \
+ 	       $< > $@
++endif
+ 
+ logrotatecorosyncdir    = ${LOGROTATEDIR}
+ logrotatecorosync_DATA  = corosync
+diff --git a/conf/logrotate/corosync-reopen.in b/conf/logrotate/corosync-reopen.in
+index 730fb74..839c5da 100644
+--- a/conf/logrotate/corosync-reopen.in
++++ b/conf/logrotate/corosync-reopen.in
+@@ -1,8 +1,3 @@
+-# This logrotate method has two main problems and it's kept only for reference:
+-# 1. It does fail when corosync is not running (solvable by adding "|| true")
+-# 2. If (for some reason) cfgtool -L fails, logrotate fails and corosync keeps
+-#    logging into old file. Added "|| true" makes situation even worse
+-#    because logrotate removes file but corosync keeps logging into it.
+ @LOGDIR@/corosync.log {
+ 	missingok
+ 	compress
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ca0a09a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+Fix-various-typos-in-ChangeLog.patch
+Enable-PrivateTmp-in-the-systemd-service-files.patch
+Make-the-example-config-valid.patch
+Revert-logrotate-Use-copytruncate-method-by-default.patch
+Move-corosync-notifyd-policy-file-into-usr-share-dbus-1-s.patch