Control: tags 1074972 + pending

Dear maintainer,

I've prepared an NMU for ftpmirror (versioned as 1.96+dfsg-16.1) 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 ftpmirror-1.96+dfsg/debian/changelog ftpmirror-1.96+dfsg/debian/changelog
--- ftpmirror-1.96+dfsg/debian/changelog	2018-09-14 14:10:15.000000000 +0200
+++ ftpmirror-1.96+dfsg/debian/changelog	2024-08-10 03:39:18.000000000 +0200
@@ -1,3 +1,11 @@
+ftpmirror (1.96+dfsg-16.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-14": add patch from ntyni to fix type confusion with
+    Fan::Usage::LOG (Closes: #1074972)
+
+ -- gregor herrmann <[email protected]>  Sat, 10 Aug 2024 03:39:18 +0200
+
 ftpmirror (1.96+dfsg-16) unstable; urgency=medium
 
   * Package refreshment.
diff -Nru ftpmirror-1.96+dfsg/debian/patches/fix-type-confusion-with-fanusagelog.patch ftpmirror-1.96+dfsg/debian/patches/fix-type-confusion-with-fanusagelog.patch
--- ftpmirror-1.96+dfsg/debian/patches/fix-type-confusion-with-fanusagelog.patch	1970-01-01 01:00:00.000000000 +0100
+++ ftpmirror-1.96+dfsg/debian/patches/fix-type-confusion-with-fanusagelog.patch	2024-08-10 03:37:42.000000000 +0200
@@ -0,0 +1,25 @@
+From: Niko Tyni <[email protected]>
+Date: Mon, 5 Aug 2024 08:04:58 +0100
+X-Dgit-Generated: 1.96+dfsg-16 9f666f759b9329781768efe594624838e1f5810a
+Subject: Fix type confusion with Fan::Usage::LOG
+
+The default is 5 in both DESTROY() below, and on the Perl side in
+Usage.pm. So presumably it's fine here as well.
+
+Bug-Debian: https://bugs.debian.org/1074972
+
+---
+
+diff --git a/Fan/Usage/Usage.xs b/Fan/Usage/Usage.xs
+index 0d45cc1..9c21876 100644
+--- a/Fan/Usage/Usage.xs
++++ b/Fan/Usage/Usage.xs
+@@ -64,7 +64,7 @@ getrusage(who = RUSAGE_SELF)
+     CODE:
+ 	{
+ 	    SV *sv = perl_get_sv("Fan::Usage::LOG", FALSE);
+-	    int log = sv ? SvIV(sv) : NULL;
++	    int log = sv ? SvIV(sv) : 5;
+ 
+ 	    if (!(RETVAL = malloc(sizeof(Usage))))
+ 		XSRETURN_UNDEF;
diff -Nru ftpmirror-1.96+dfsg/debian/patches/series ftpmirror-1.96+dfsg/debian/patches/series
--- ftpmirror-1.96+dfsg/debian/patches/series	2018-09-14 13:13:22.000000000 +0200
+++ ftpmirror-1.96+dfsg/debian/patches/series	2024-08-10 03:37:42.000000000 +0200
@@ -5,3 +5,4 @@
 06-translated-files.diff
 07-deal_with_unresolved_UIDs_and_GIDs.diff
 00-fix-makefile.diff
+fix-type-confusion-with-fanusagelog.patch

Attachment: signature.asc
Description: Digital Signature

Reply via email to