Bug#957582: ncftp: diff for NMU version 2:3.2.5-2.2

2020-08-19 Thread Noël Köthe
Hello Sudip,

Am Dienstag, den 18.08.2020, 18:29 +0100 schrieb Sudip Mukherjee:

> I've prepared an NMU for ncftp (versioned as 2:3.2.5-2.2) and
> uploaded it to DELAYED/2. Please feel free to tell me if I
> should cancel it.

No, please go ahead.
Thanks for your work.;)

Regards

Noël


signature.asc
Description: This is a digitally signed message part


Bug#957582: ncftp: diff for NMU version 2:3.2.5-2.2

2020-08-18 Thread Sudip Mukherjee
Control: tags 957582 + patch
Control: tags 957582 + pending

Dear maintainer,

I've prepared an NMU for ncftp (versioned as 2:3.2.5-2.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should cancel it.

--
Regards
Sudip

diff -Nru ncftp-3.2.5/debian/changelog ncftp-3.2.5/debian/changelog
--- ncftp-3.2.5/debian/changelog2018-06-24 15:41:59.0 +0100
+++ ncftp-3.2.5/debian/changelog2020-08-18 18:17:17.0 +0100
@@ -1,3 +1,10 @@
+ncftp (2:3.2.5-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ftbfs with GCC-10. (Closes: #957582)
+
+ -- Sudip Mukherjee   Tue, 18 Aug 2020 18:17:17 
+0100
+
 ncftp (2:3.2.5-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru ncftp-3.2.5/debian/patches/fix_ftbfs.patch 
ncftp-3.2.5/debian/patches/fix_ftbfs.patch
--- ncftp-3.2.5/debian/patches/fix_ftbfs.patch  1970-01-01 01:00:00.0 
+0100
+++ ncftp-3.2.5/debian/patches/fix_ftbfs.patch  2020-08-18 18:16:51.0 
+0100
@@ -0,0 +1,19 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee 
+Bug-Debian: https://bugs.debian.org/957582
+Forwarded: no
+
+---
+
+--- ncftp-3.2.5.orig/sh_util/gpshare.c
 ncftp-3.2.5/sh_util/gpshare.c
+@@ -28,7 +28,7 @@
+ 
+ static int gIsAtty1 = 1, gIsAtty2 = 1;
+ extern int gLoadedBm, gBookmarkMatchMode;
+-Bookmark gBm;
++extern Bookmark gBm;
+ 
+ double
+ FileSize(double size, const char **uStr0, double *uMult0)
diff -Nru ncftp-3.2.5/debian/patches/series ncftp-3.2.5/debian/patches/series
--- ncftp-3.2.5/debian/patches/series   2018-06-24 15:40:13.0 +0100
+++ ncftp-3.2.5/debian/patches/series   2020-08-18 18:13:36.0 +0100
@@ -1,3 +1,4 @@
 ncftp-352425.patch
 ncftp-reproducible.patch
 autoreconf.patch
+fix_ftbfs.patch