summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-03-31 17:54:57 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-03-31 17:55:05 +0000
commitfd86518b2183de4bf9a40c8a5ea1c4f4507e3cec (patch)
tree39db4543fe570c54ada8c294196c76b60a9fb799
parentMerging upstream version 3.0.3. (diff)
downloadcorosync-fd86518b2183de4bf9a40c8a5ea1c4f4507e3cec.tar.xz
corosync-fd86518b2183de4bf9a40c8a5ea1c4f4507e3cec.zip
Merging debian version 3.0.3-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog11
-rw-r--r--debian/control17
-rw-r--r--debian/corosync-vqsim.install2
-rw-r--r--debian/patches/Fix-various-typos-in-ChangeLog.patch16
-rw-r--r--debian/patches/man-fix-typo-avaialable.patch2
-rwxr-xr-xdebian/rules2
6 files changed, 40 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index 7d860b9..b1d5d34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+corosync (3.0.3-1) unstable; urgency=medium
+
+ * [d103a33] New upstream release (3.0.3)
+ * [e6f6831] Refresh our patches
+ * [f1e85a3] Enable nozzle support
+ * [19d3dd3] Package the votequorum simulator in corosync-vqsim
+ * [8ae3235] Update Standards-Version to 4.4.1 (no changes required)
+ * [bfd9560] Advertise Rules-Requires-Root: no
+
+ -- Ferenc Wágner <wferi@debian.org> Sat, 07 Dec 2019 23:02:16 +0100
+
corosync (3.0.2-1~progress5+u1) engywuck-backports; urgency=medium
* Initial upload to engywuck-backports.
diff --git a/debian/control b/debian/control
index 02ed188..33185ea 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ XSBC-Original-Uploaders:
Adrian Vondendriesch <adrian.vondendriesch@credativ.de>,
Ferenc Wágner <wferi@debian.org>,
Bugs: mailto:maintainers@lists.progress-linux.org
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
Build-Depends:
augeas-tools,
debhelper-compat (= 12),
@@ -16,8 +16,10 @@ Build-Depends:
groff,
libdbus-1-dev,
libknet-dev,
+ libnozzle-dev,
# protect backports from silent log loss (#898266):
libqb-dev (>= 1.0.3),
+ libreadline-dev,
libsnmp-dev,
# libstatgrab is Linux-only until #823899 and #823900 gets fixed:
libstatgrab-dev [linux-any],
@@ -28,6 +30,7 @@ Build-Depends:
Build-Depends-Indep:
doxygen,
graphviz,
+Rules-Requires-Root: no
Homepage: https://corosync.github.io/corosync/
Vcs-Browser: https://git.progress-linux.org/distributions/engywuck-backports/packages/corosync
Vcs-Git: https://git.progress-linux.org/distributions/engywuck-backports/packages/corosync
@@ -76,6 +79,18 @@ Description: cluster engine notification daemon
.
This package contains the DBus/SNMP notification daemon for Corosync events.
+Package: corosync-vqsim
+Architecture: any
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+Description: cluster engine votequorum simulator
+ ${S:X-Common-Description}
+ .
+ This package contains the Corosync votequorum simulator. It
+ can simulate multiple nodes, network splits and a basic quorum device.
+
Package: corosync-doc
Section: doc
Architecture: all
diff --git a/debian/corosync-vqsim.install b/debian/corosync-vqsim.install
new file mode 100644
index 0000000..fa0a600
--- /dev/null
+++ b/debian/corosync-vqsim.install
@@ -0,0 +1,2 @@
+usr/bin/corosync-vqsim
+usr/share/man/man8/corosync-vqsim.8
diff --git a/debian/patches/Fix-various-typos-in-ChangeLog.patch b/debian/patches/Fix-various-typos-in-ChangeLog.patch
index 20e433b..a29daec 100644
--- a/debian/patches/Fix-various-typos-in-ChangeLog.patch
+++ b/debian/patches/Fix-various-typos-in-ChangeLog.patch
@@ -10,10 +10,10 @@ isn't upstreamable.
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
-index 1b79f3c..299bad8 100644
+index f43ebf2..1b84695 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -8321,7 +8321,7 @@
+@@ -8628,7 +8628,7 @@
2012-02-07 Fabio M. Di Nitto <fdinitto@redhat.com>
@@ -22,7 +22,7 @@ index 1b79f3c..299bad8 100644
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
2012-02-07 Angus Salkeld <asalkeld@redhat.com>
-@@ -8506,7 +8506,7 @@
+@@ -8813,7 +8813,7 @@
Honor exec_init_fn call
exec_init_fn now either returns NULL (success) or a string which indicates
@@ -31,7 +31,7 @@ index 1b79f3c..299bad8 100644
occurs, corosync will exit. This patch adds ykd and makes other suggestions
from Fabio Di Nitto.
-@@ -9870,7 +9870,7 @@
+@@ -10177,7 +10177,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
@@ -40,7 +40,7 @@ index 1b79f3c..299bad8 100644
cyclng the nodes and see if the TRY_AGAIN state becomes unblocked.
If it doesn't the test case has failed
-@@ -10261,7 +10261,7 @@
+@@ -10568,7 +10568,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
@@ -49,7 +49,7 @@ index 1b79f3c..299bad8 100644
Tested-by: Tim Beale <tlbeale@gmail.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
-@@ -18009,7 +18009,7 @@
+@@ -18316,7 +18316,7 @@
2007-08-11 Steven Dake <sdake@redhat.com>
@@ -58,7 +58,7 @@ index 1b79f3c..299bad8 100644
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1420 fd59a12c-fef9-0310-b244-a6a79926bd2f
Allow make doxygen to work properly
-@@ -18352,7 +18352,7 @@
+@@ -18659,7 +18659,7 @@
2006-11-10 Steven Dake <sdake@redhat.com>
@@ -67,7 +67,7 @@ index 1b79f3c..299bad8 100644
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1299 fd59a12c-fef9-0310-b244-a6a79926bd2f
Recovery algorithms described in this document.
-@@ -24526,13 +24526,13 @@
+@@ -24833,13 +24833,13 @@
2004-07-12 Steven Dake <sdake@broked.org>
diff --git a/debian/patches/man-fix-typo-avaialable.patch b/debian/patches/man-fix-typo-avaialable.patch
index 5709c1f..8801fbc 100644
--- a/debian/patches/man-fix-typo-avaialable.patch
+++ b/debian/patches/man-fix-typo-avaialable.patch
@@ -8,7 +8,7 @@ By slightly rewording the documentation of knet_compression_model.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/man/corosync.conf.5 b/man/corosync.conf.5
-index 3b77733..a175646 100644
+index 3e6f629..7a322c7 100644
--- a/man/corosync.conf.5
+++ b/man/corosync.conf.5
@@ -402,9 +402,9 @@ The default is 238 milliseconds for two nodes cluster. Three or more nodes refer
diff --git a/debian/rules b/debian/rules
index 52ff469..adf98d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,9 +38,11 @@ override_dh_auto_configure:
$(enable-monitoring) \
$(enable-watchdog) \
--enable-augeas \
+ --enable-nozzle \
--enable-snmp \
--enable-xmlconf \
$(enable-systemd) \
+ --enable-vqsim \
--disable-static
override_dh_auto_build-indep: