Control: tags 1074938 + pending

Dear maintainer,

I've prepared an NMU for epic4 (versioned as 1:2.10.10-1.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.


-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   
diff -Nru epic4-2.10.10/debian/changelog epic4-2.10.10/debian/changelog
--- epic4-2.10.10/debian/changelog	2024-04-19 18:46:14.000000000 +0200
+++ epic4-2.10.10/debian/changelog	2024-08-10 04:03:31.000000000 +0200
@@ -1,3 +1,13 @@
+epic4 (1:2.10.10-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-14":
+    - Niko Tyni: Run dh_autoreconf before the build.
+    - Niko Tyni: add patch fix-configure-probes-for-sockaddr_storag.patch
+    (Closes: #1074938)
+
+ -- gregor herrmann <[email protected]>  Sat, 10 Aug 2024 04:03:31 +0200
+
 epic4 (1:2.10.10-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru epic4-2.10.10/debian/control epic4-2.10.10/debian/control
--- epic4-2.10.10/debian/control	2020-08-24 15:15:16.000000000 +0200
+++ epic4-2.10.10/debian/control	2024-08-10 04:00:38.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Kurt Roeckx <[email protected]>
 Standards-Version: 3.8.3
-Build-depends: debhelper (>= 5), libncurses5-dev, libssl-dev, libperl-dev
+Build-depends: debhelper (>= 5), libncurses5-dev, libssl-dev, libperl-dev, dh-autoreconf
 Homepage: http://www.epicsol.org/
 
 Package: epic4
diff -Nru epic4-2.10.10/debian/patches/fix-configure-probes-for-sockaddr_storag.patch epic4-2.10.10/debian/patches/fix-configure-probes-for-sockaddr_storag.patch
--- epic4-2.10.10/debian/patches/fix-configure-probes-for-sockaddr_storag.patch	1970-01-01 01:00:00.000000000 +0100
+++ epic4-2.10.10/debian/patches/fix-configure-probes-for-sockaddr_storag.patch	2024-08-10 03:57:34.000000000 +0200
@@ -0,0 +1,54 @@
+From: Niko Tyni <[email protected]>
+Date: Fri, 2 Aug 2024 09:31:19 +0100
+X-Dgit-Generated: 1:2.10.10-1.1 0171eb699acbdd8569c31b2a5ebe0ac173571ed3
+Subject: Fix configure probes for sockaddr_storage et al on glibc >= 2.39
+
+glibc 2.39 changed the socket headers to include the may_alias attribute
+in https://sourceware.org/git/?p=glibc.git;a=commit;h=26e7005728
+
+  -struct sockaddr
+  +struct __attribute_struct_may_alias__ sockaddr
+
+This makes the tightly specified regex in the corresponding
+AC_EGREP_HEADER probe miss the definition.
+
+Pre-emptively loosen other AC_EGREP_HEADER as well.
+
+---
+
+diff --git a/configure.in b/configure.in
+index 50cc684..d1e5fd4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -297,7 +297,7 @@ dnl check for struct linger
+ dnl
+ 
+ AC_MSG_CHECKING(for struct linger)
+-AC_EGREP_HEADER([struct( |	)*linger], sys/socket.h, 
++AC_EGREP_HEADER([struct.*linger], sys/socket.h, 
+   AC_MSG_RESULT(yes), 
+   AC_DEFINE(NO_STRUCT_LINGER) 
+   AC_MSG_RESULT(no. ugh.))
+@@ -518,19 +518,19 @@ AC_ARG_WITH(ipv6,
+ ],[AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(for struct sockaddr_storage)
+-AC_EGREP_HEADER([struct( |	)*sockaddr_storage], sys/socket.h, 
++AC_EGREP_HEADER([struct.*sockaddr_storage], sys/socket.h, 
+   AC_MSG_RESULT(yes) 
+   AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE),
+   AC_MSG_RESULT(no))
+ 
+ AC_MSG_CHECKING(for struct sockaddr_in6)
+-AC_EGREP_HEADER([struct( |	)*sockaddr_in6], netinet/in.h,
++AC_EGREP_HEADER([struct.*sockaddr_in6], netinet/in.h,
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6),
+   AC_MSG_RESULT(no))
+ 
+ AC_MSG_CHECKING(for struct addrinfo)
+-AC_EGREP_HEADER([struct( |	)*addrinfo], netdb.h,
++AC_EGREP_HEADER([struct.*addrinfo], netdb.h,
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(HAVE_STRUCT_ADDRINFO),
+   AC_MSG_RESULT(no))
diff -Nru epic4-2.10.10/debian/patches/series epic4-2.10.10/debian/patches/series
--- epic4-2.10.10/debian/patches/series	2024-04-19 18:46:14.000000000 +0200
+++ epic4-2.10.10/debian/patches/series	2024-08-10 04:01:00.000000000 +0200
@@ -5,3 +5,4 @@
 man.patch
 reproducible_build.patch
 implicit-function-declarations.patch
+fix-configure-probes-for-sockaddr_storag.patch
diff -Nru epic4-2.10.10/debian/rules epic4-2.10.10/debian/rules
--- epic4-2.10.10/debian/rules	2020-08-24 15:15:16.000000000 +0200
+++ epic4-2.10.10/debian/rules	2024-08-10 04:00:38.000000000 +0200
@@ -11,6 +11,7 @@
 build-indep: build-stamp
 build-stamp:
 	dh_testdir
+	dh_autoreconf
 	./configure --prefix=/usr --mandir=/usr/share/man \
 	  --with-ssl \
 	  --with-ipv6 \

Attachment: signature.asc
Description: Digital Signature

Reply via email to