Control: tags 1096461 + patch
Control: tags 1096461 + pending
Control: tags 1106986 + patch
Control: tags 1106986 + pending
Dear maintainer,
I've prepared an NMU for conserver (versioned as 8.2.7-3.1) and uploaded
it to DELAYED/2. Please feel free to tell me if I should cancel it.
cu
Adrian
diffstat for conserver-8.2.7 conserver-8.2.7
changelog | 8 +++
control | 1
patches/0001-Don-t-reference-true.patch | 85 ++++++++++++++++++++++++++++++++
patches/series | 1
4 files changed, 95 insertions(+)
diff -Nru conserver-8.2.7/debian/changelog conserver-8.2.7/debian/changelog
--- conserver-8.2.7/debian/changelog 2024-10-02 01:48:02.000000000 +0300
+++ conserver-8.2.7/debian/changelog 2025-09-21 12:52:57.000000000 +0300
@@ -1,3 +1,11 @@
+conserver (8.2.7-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream fix for FTBFS with GCC 15. (Closes: #1096461)
+ * Build-Depends: libcrypt-dev (Closes: #1106986)
+
+ -- Adrian Bunk <b...@debian.org> Sun, 21 Sep 2025 12:52:57 +0300
+
conserver (8.2.7-3) unstable; urgency=medium
[ Bjørn Mork ]
diff -Nru conserver-8.2.7/debian/control conserver-8.2.7/debian/control
--- conserver-8.2.7/debian/control 2024-10-02 01:48:02.000000000 +0300
+++ conserver-8.2.7/debian/control 2025-09-21 12:52:57.000000000 +0300
@@ -4,6 +4,7 @@
Maintainer: Conserver Maintainers <conser...@packages.debian.org>
Uploaders: Jörgen Hägg <j...@debian.org>, Bernhard Schmidt <be...@debian.org>
Build-Depends: debhelper-compat (= 12),
+ libcrypt-dev,
libfreeipmi-dev,
libipmiconsole-dev,
libkrb5-dev,
diff -Nru conserver-8.2.7/debian/patches/0001-Don-t-reference-true.patch conserver-8.2.7/debian/patches/0001-Don-t-reference-true.patch
--- conserver-8.2.7/debian/patches/0001-Don-t-reference-true.patch 1970-01-01 02:00:00.000000000 +0200
+++ conserver-8.2.7/debian/patches/0001-Don-t-reference-true.patch 2025-09-21 12:50:53.000000000 +0300
@@ -0,0 +1,85 @@
+From 440ebf619098d382a5dcd5be6bf396615ae342c2 Mon Sep 17 00:00:00 2001
+From: Stanisław Pitucha <stan.pitu...@envato.com>
+Date: Fri, 15 Jul 2022 16:06:29 +1000
+Subject: Don't reference `true`
+
+`true` coming from some macos configurations is a define in `stdbool`. This
+means it can't be redefined or turned into a reference.
+
+Use a different variable name.
+---
+ conserver/group.c | 8 ++++----
+ conserver/master.c | 10 +++++-----
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/conserver/group.c b/conserver/group.c
+index 27c102b..0c5435b 100644
+--- a/conserver/group.c
++++ b/conserver/group.c
+@@ -5038,7 +5038,7 @@ Spawn(GRPENT *pGE, int msfd)
+ struct sockaddr_in lstn_port;
+ # endif
+ # if HAVE_SETSOCKOPT
+- int true = 1;
++ int sock_opt_true = 1;
+ # endif
+ unsigned short portInc = 0;
+ #else
+@@ -5065,8 +5065,8 @@ Spawn(GRPENT *pGE, int msfd)
+ }
+ # if HAVE_SETSOCKOPT
+ if (setsockopt
+- (sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
+- sizeof(true)) < 0) {
++ (sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
++ sizeof(sock_opt_true)) < 0) {
+ Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
+ strerror(errno));
+ return;
+@@ -5197,7 +5197,7 @@ Spawn(GRPENT *pGE, int msfd)
+ }
+ # if HAVE_SETSOCKOPT
+ if (setsockopt
+- (sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true, sizeof(true))
++ (sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true, sizeof(sock_opt_true))
+ < 0) {
+ Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
+ strerror(errno));
+diff --git a/conserver/master.c b/conserver/master.c
+index cebd5ba..6684ae3 100644
+--- a/conserver/master.c
++++ b/conserver/master.c
+@@ -690,7 +690,7 @@ Master(void)
+ struct sockaddr_in master_port;
+ # endif
+ # if HAVE_SETSOCKOPT
+- int true = 1;
++ int sock_opt_true = 1;
+ # endif
+ #else
+ struct sockaddr_un master_port;
+@@ -750,8 +750,8 @@ Master(void)
+
+ # if HAVE_SETSOCKOPT
+ if (setsockopt
+- (msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
+- sizeof(true)) < 0)
++ (msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
++ sizeof(sock_opt_true)) < 0)
+ goto fail;
+ # endif
+ if (!SetFlags(msfd, O_NONBLOCK, 0))
+@@ -821,8 +821,8 @@ Master(void)
+ }
+ # if HAVE_SETSOCKOPT
+ if (setsockopt
+- (msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
+- sizeof(true)) < 0) {
++ (msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
++ sizeof(sock_opt_true)) < 0) {
+ Error("Master(): setsockopt(%u,SO_REUSEADDR): %s", msfd,
+ strerror(errno));
+ return;
+--
+2.30.2
+
diff -Nru conserver-8.2.7/debian/patches/series conserver-8.2.7/debian/patches/series
--- conserver-8.2.7/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ conserver-8.2.7/debian/patches/series 2025-09-21 12:52:57.000000000 +0300
@@ -0,0 +1 @@
+0001-Don-t-reference-true.patch
