From 3832cef3c8477be60890fa5c678d4a94a55f21a7 Mon Sep 17 00:00:00 2001
From: Eric Sandall
Date: Fri, 9 Jul 2021 11:55:13 -0700
Subject: ncftp: Fix compilation with GCC 10+

See https://bugs.gentoo.org/722550 where I found the fix
From https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch
---
 ftp/ncftp/HISTORY                      |  6 +++
 ftp/ncftp/PRE_BUILD                    |  5 +++
 ftp/ncftp/ncftp-3.2.6-fno-common.patch | 70 ++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 ftp/ncftp/ncftp-3.2.6-fno-common.patch

(limited to 'ftp')

diff --git a/ftp/ncftp/HISTORY b/ftp/ncftp/HISTORY
index cbb2d94cc5..7930830747 100644
--- a/ftp/ncftp/HISTORY
+++ b/ftp/ncftp/HISTORY
@@ -1,3 +1,9 @@
+2021-07-09 Eric Sandall <sandalle@sourcemage.org>
+	* PRE_BUILD: Apply ncftp-3.2.6-fno-common.patch
+	* ncftp-3.2.6-fno-common.patch: Fix compilation with GCC 10+
+	  See https://bugs.gentoo.org/722550 where I found the fix
+	  From https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch
+
 2019-08-27 Ismael Luceno <ismael@sourcemage.org>
 	* DETAILS: Simplified VERSION substitution for SOURCE2
 
diff --git a/ftp/ncftp/PRE_BUILD b/ftp/ncftp/PRE_BUILD
index 64ffc4f977..98e7bad939 100755
--- a/ftp/ncftp/PRE_BUILD
+++ b/ftp/ncftp/PRE_BUILD
@@ -1,6 +1,11 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+# Fix compilation with GCC 10+
+# See https://bugs.gentoo.org/722550 where I found the fix
+message "${MESSAGE_COLOR}Fixing compilationg for GCC 10+...${DEFAULT_COLOR}" &&
+patch -p1 < "${SCRIPT_DIRECTORY}"/ncftp-3.2.6-fno-common.patch &&
+
 if [[ "$NCFTP_IPV6" == "y" ]]; then
   gzip -cd "$SOURCE_CACHE/$SOURCE2" | patch -p1
 fi
diff --git a/ftp/ncftp/ncftp-3.2.6-fno-common.patch b/ftp/ncftp/ncftp-3.2.6-fno-common.patch
new file mode 100644
index 0000000000..168e294a68
--- /dev/null
+++ b/ftp/ncftp/ncftp-3.2.6-fno-common.patch
@@ -0,0 +1,70 @@
+# From https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch
+--- a/ncftp/bookmark.h
++++ b/ncftp/bookmark.h
+@@ -59,3 +59,5 @@
+ void DefaultBookmarkName(char *, size_t, char *);
+ void DisposeBookmarkTable(void);
+ int AddNewItemToBookmarkTable(void);
++
++extern Bookmark gBm;
+--- a/ncftp/cmds.c
++++ b/ncftp/cmds.c
+@@ -91,7 +91,6 @@
+ extern char gOS[];
+ extern int gAutoResume;
+ extern int gAutoSaveChangesToExistingBookmarks;
+-extern Bookmark gBm;
+ extern int gLoadedBm, gConfirmClose, gSavePasswords, gScreenColumns;
+ extern char gLocalCWD[512], gPrevLocalCWD[512];
+ extern int gMayCancelJmp;
+--- a/ncftp/main.c
++++ b/ncftp/main.c
+@@ -38,7 +38,6 @@
+ char gLocalCWD[512], gPrevLocalCWD[512];
+ 
+ extern char gRemoteCWD[512], gPrevRemoteCWD[512];
+-extern Bookmark gBm;
+ extern int gLoadedBm;
+ extern int gFirewallType;
+ extern char gAutoAscii[];
+--- a/sh_util/gpshare.c
++++ b/sh_util/gpshare.c
+@@ -28,7 +28,6 @@
+ 
+ static int gIsAtty1 = 1, gIsAtty2 = 1;
+ extern int gLoadedBm, gBookmarkMatchMode;
+-Bookmark gBm;
+ 
+ double
+ FileSize(double size, const char **uStr0, double *uMult0)
+--- a/sh_util/ncftpget.c
++++ b/sh_util/ncftpget.c
+@@ -40,7 +40,6 @@
+ extern char gFirewallExceptionList[256];
+ extern int gFwDataPortMode;
+ extern const char gOS[], gVersion[];
+-extern Bookmark gBm;
+ 
+ static void
+ Usage(void)
+--- a/sh_util/ncftpls.c
++++ b/sh_util/ncftpls.c
+@@ -39,7 +39,6 @@
+ extern char gFirewallExceptionList[256];
+ extern int gFwDataPortMode;
+ extern const char gOS[], gVersion[];
+-extern Bookmark gBm;
+ 
+ static int FTPRemoteRecursiveMList(FTPCIPtr cip, const char *const rdir, /* FTPFileInfoListPtr files, */ FTPLineListPtr lines);
+ 
+--- a/sh_util/ncftpput.c
++++ b/sh_util/ncftpput.c
+@@ -41,7 +41,6 @@
+ extern char gFirewallExceptionList[256];
+ extern int gFwDataPortMode;
+ extern const char gOS[], gVersion[];
+-extern Bookmark gBm;
+ extern int gSendfileInProgress;
+ 
+ static void
+
-- 
cgit v1.2.3