1Fix build with -fno-common
2
3Patch from https://src.fedoraproject.org/rpms/ncftp/raw/master/f/ncftp-3.2.5-gcc10.patch
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8--- a/ncftp/bookmark.h
9+++ b/ncftp/bookmark.h
10@@ -29,6 +29,8 @@ typedef struct Bookmark {
11     int             reserved;
12 } Bookmark;
13
14+extern Bookmark gBm;
15+
16 #define kBookmarkVersion		8
17 #define kBookmarkMinVersion		3
18 #if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
19--- a/ncftp/cmds.c
20+++ b/ncftp/cmds.c
21@@ -98,7 +98,7 @@ extern char gPager[], gHome[], gShell[];
22 extern char gOS[];
23 extern int gAutoResume;
24 extern int gAutoSaveChangesToExistingBookmarks;
25-extern Bookmark gBm;
26+//extern Bookmark gBm;
27 extern int gLoadedBm, gConfirmClose, gSavePasswords, gScreenColumns;
28 extern char gLocalCWD[512], gPrevLocalCWD[512];
29 extern int gMayCancelJmp;
30--- a/ncftp/main.c
31+++ b/ncftp/main.c
32@@ -38,7 +38,7 @@ extern int gUnprocessedJobs;
33 char gLocalCWD[512], gPrevLocalCWD[512];
34
35 extern char gRemoteCWD[512], gPrevRemoteCWD[512];
36-extern Bookmark gBm;
37+//extern Bookmark gBm;
38 extern int gLoadedBm;
39 extern int gFirewallType;
40 extern char gAutoAscii[];
41--- a/sh_util/gpshare.c
42+++ b/sh_util/gpshare.c
43@@ -28,7 +28,7 @@
44
45 static int gIsAtty1 = 1, gIsAtty2 = 1;
46 extern int gLoadedBm, gBookmarkMatchMode;
47-Bookmark gBm;
48+//Bookmark gBm;
49
50 double
51 FileSize(double size, const char **uStr0, double *uMult0)
52--- a/sh_util/ncftpget.c
53+++ b/sh_util/ncftpget.c
54@@ -40,7 +40,7 @@ extern unsigned int gFirewallPort;
55 extern char gFirewallExceptionList[256];
56 extern int gFwDataPortMode;
57 extern const char gOS[], gVersion[];
58-extern Bookmark gBm;
59+//extern Bookmark gBm;
60
61 static void
62 #if (defined(__GNUC__)) && (__GNUC__ >= 2)
63--- a/sh_util/ncftpls.c
64+++ b/sh_util/ncftpls.c
65@@ -39,7 +39,7 @@ extern unsigned int gFirewallPort;
66 extern char gFirewallExceptionList[256];
67 extern int gFwDataPortMode;
68 extern const char gOS[], gVersion[];
69-extern Bookmark gBm;
70+//extern Bookmark gBm;
71
72 static int FTPRemoteRecursiveMList(FTPCIPtr cip, const char *const rdir, /* FTPFileInfoListPtr files, */ FTPLineListPtr lines);
73
74--- a/sh_util/ncftpput.c
75+++ b/sh_util/ncftpput.c
76@@ -41,7 +41,6 @@ extern unsigned int gFirewallPort;
77 extern char gFirewallExceptionList[256];
78 extern int gFwDataPortMode;
79 extern const char gOS[], gVersion[];
80-extern Bookmark gBm;
81 extern int gSendfileInProgress;
82
83 static void
84