Control: tags 1097645 + patch pending

Dear maintainer,

to fix the issues with this package, I've prepared an NMU for ppp
(versioned as 2.5.2-1+1.1), debdiff below. An upload to DELAYED/10 will
follow shortly. Please feel free to tell me if I should delay it
longer.

Regards,

    Christoph

diff -Nru ppp-2.5.2/debian/changelog ppp-2.5.2/debian/changelog
--- ppp-2.5.2/debian/changelog  2025-02-17 23:11:36.000000000 +0100
+++ ppp-2.5.2/debian/changelog  2025-09-07 20:08:41.000000000 +0200
@@ -1,3 +1,10 @@
+ppp (2.5.2-1+1.1) unstable; urgency=high
+
+  * Non-maintainer upload
+  * Fix build with GCC-15. Closes: #1097645
+
+ -- Christoph Biedl <[email protected]>  Sun, 07 Sep 2025 
20:08:41 +0200
+
 ppp (2.5.2-1+1) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru ppp-2.5.2/debian/patches/series ppp-2.5.2/debian/patches/series
--- ppp-2.5.2/debian/patches/series     2025-02-17 23:11:36.000000000 +0100
+++ ppp-2.5.2/debian/patches/series     2025-09-07 18:14:14.000000000 +0200
@@ -14,3 +14,4 @@
 pppd-soname-hack.patch
 
 # upstream backports
+v2.5.2-4-g0536169.pppdump-fixed-building-with-gcc-15-548.patch
diff -Nru 
ppp-2.5.2/debian/patches/v2.5.2-4-g0536169.pppdump-fixed-building-with-gcc-15-548.patch
 
ppp-2.5.2/debian/patches/v2.5.2-4-g0536169.pppdump-fixed-building-with-gcc-15-548.patch
--- 
ppp-2.5.2/debian/patches/v2.5.2-4-g0536169.pppdump-fixed-building-with-gcc-15-548.patch
     1970-01-01 01:00:00.000000000 +0100
+++ 
ppp-2.5.2/debian/patches/v2.5.2-4-g0536169.pppdump-fixed-building-with-gcc-15-548.patch
     2025-09-07 18:15:11.000000000 +0200
@@ -0,0 +1,65 @@
+Subject: Pppdump: Fixed building with GCC 15 (#548)
+Origin: upstream, commit v2.5.2-4-g0536169 
<https://github.com/ppp-project/ppp/commit/0536169>
+Author: Jaroslav Škarvada <[email protected]>
+Date: Thu Feb 27 23:00:16 2025 +0100
+Bug-Debian: https://bugs.debian.org/1097645
+
+    GCC 15 defaults to C23 which does not allow K&R declarations.
+
+    Credit Yaakov Selkowitz in:
+    https://src.fedoraproject.org/rpms/ppp/pull-request/12
+
+    Signed-off-by: Jaroslav Škarvada <[email protected]>
+
+--- a/pppdump/pppdump.c
++++ b/pppdump/pppdump.c
+@@ -42,14 +42,12 @@
+ extern int optind;
+ extern char *optarg;
+ 
+-void dumplog();
+-void dumpppp();
+-void show_time();
++void dumplog(FILE *);
++void dumpppp(FILE *);
++void show_time(FILE *, int);
+ 
+ int
+-main(ac, av)
+-    int ac;
+-    char **av;
++main(int ac, char **av)
+ {
+     int i;
+     char *p;
+@@ -97,8 +95,7 @@
+ }
+ 
+ void
+-dumplog(f)
+-    FILE *f;
++dumplog(FILE *f)
+ {
+     int c, n, k, col;
+     int nb, c2;
+@@ -241,8 +238,7 @@
+ unsigned char dbuf[8192];
+ 
+ void
+-dumpppp(f)
+-    FILE *f;
++dumpppp(FILE *f)
+ {
+     int c, n, k;
+     int nb, nl, dn, proto, rv;
+@@ -375,9 +371,7 @@
+ }
+ 
+ void
+-show_time(f, c)
+-    FILE *f;
+-    int c;
++show_time(FILE *f, int c)
+ {
+     time_t t;
+     int n;

Attachment: signature.asc
Description: PGP signature

Reply via email to