summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-03-08 09:11:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-03-08 09:11:53 +0000
commita02440ceefe91c9160d58a92e92d1163739a618b (patch)
treeb8a6c832c381ce77c1d444a7378ef76f4cae9ce5
parentReleasing progress-linux version 3.1.6-1~progress6+u1. (diff)
downloadcorosync-a02440ceefe91c9160d58a92e92d1163739a618b.tar.xz
corosync-a02440ceefe91c9160d58a92e92d1163739a618b.zip
Merging debian version 3.1.6-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog15
-rw-r--r--debian/corosync-notifyd.maintscript1
-rw-r--r--debian/corosync.maintscript1
-rw-r--r--debian/libcorosync-common4.lintian-overrides2
-rw-r--r--debian/patches/Remove-bashism-from-configure-script.patch45
-rw-r--r--debian/patches/series1
6 files changed, 62 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index b304f98..d375ed5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+corosync (3.1.6-2) unstable; urgency=medium
+
+ [ Debian Janitor ]
+ * [290ca16] Remove 2 obsolete maintscript entries in 2 files.
+ Changes-By: lintian-brush
+ * [8d89318] Update renamed lintian tag names in lintian overrides.
+ Changes-By: lintian-brush
+ Fixes: lintian: renamed-tag
+ See-also: https://lintian.debian.org/tags/renamed-tag.html
+
+ [ Ferenc Wágner ]
+ * [f8c32e7] New patch: Remove bashism from configure script (Closes: #998785)
+
+ -- Ferenc Wágner <wferi@debian.org> Sun, 06 Mar 2022 20:07:05 +0100
+
corosync (3.1.6-1~progress6+u1) fuchur-backports; urgency=medium
* Uploading to fuchur-backports, remaining changes:
diff --git a/debian/corosync-notifyd.maintscript b/debian/corosync-notifyd.maintscript
deleted file mode 100644
index 1e9792b..0000000
--- a/debian/corosync-notifyd.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile /etc/init/corosync-notifyd.conf 2.4.3-1~
diff --git a/debian/corosync.maintscript b/debian/corosync.maintscript
deleted file mode 100644
index 3bf2748..0000000
--- a/debian/corosync.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile /etc/init/corosync.conf 2.4.3-1~
diff --git a/debian/libcorosync-common4.lintian-overrides b/debian/libcorosync-common4.lintian-overrides
index c16d52c..5ebe5fe 100644
--- a/debian/libcorosync-common4.lintian-overrides
+++ b/debian/libcorosync-common4.lintian-overrides
@@ -1,2 +1,2 @@
# This tiny library does not even need libc
-shared-lib-without-dependency-information usr/lib/*/libcorosync_common.so.4.0.0
+shared-library-lacks-prerequisites usr/lib/*/libcorosync_common.so.4.0.0
diff --git a/debian/patches/Remove-bashism-from-configure-script.patch b/debian/patches/Remove-bashism-from-configure-script.patch
new file mode 100644
index 0000000..f813f41
--- /dev/null
+++ b/debian/patches/Remove-bashism-from-configure-script.patch
@@ -0,0 +1,45 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
+Date: Sat, 4 Dec 2021 15:36:36 +0100
+Subject: Remove bashism from configure script
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+This was the real problem behind 384d168: Debian experimental now
+sports a dash with LINENO support, so configure does not fall back to
+using bash instead, choking on such bash-only constructs. Unfortunately
+this didn't bail out cleanly, just unexpectedly set link_all_deplibs to
+no, and the error message
+
+./configure: 13158: test: yes: unexpected operator
+
+stayed unnoticed in the logs. Actually, link_all_deplibs=no is the
+default in Debian, reducing overlinking and causing confusion overall,
+see https://debbugs.gnu.org/db/13/13920.html for example.
+
+I think being explicit about used interfaces has its merit, so now that
+Corosync has it, it might be advantageous to disable link_all_deplibs
+by default across the board (after this patch re-enables it as a side
+effect).
+
+Signed-off-by: Ferenc Wágner <wferi@debian.org>
+Reviewed-by: Jan Friesse <jfriesse@redhat.com>
+
+Closes: #998785
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f32e0de..c36e9ee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,7 +34,7 @@ AC_ARG_ENABLE(interlib-deps,
+ [enable_interlib_deps="yes"])
+
+ AC_MSG_NOTICE([enable inter-library dependencies: $enable_interlib_deps])
+-if test "${enable_interlib_deps}" == "yes"; then
++if test "x${enable_interlib_deps}" = "xyes"; then
+ link_all_deplibs=yes
+ link_all_deplibs_CXX=yes
+ else
diff --git a/debian/patches/series b/debian/patches/series
index 4eda149..be28941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
Fix-various-typos-in-ChangeLog.patch
Enable-PrivateTmp-in-the-systemd-service-files.patch
Make-the-example-config-valid.patch
+Remove-bashism-from-configure-script.patch