Hello community, here is the log from the commit of package ncftp for openSUSE:Factory checked in at 2020-06-09 00:07:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncftp (Old) and /work/SRC/openSUSE:Factory/.ncftp.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncftp" Tue Jun 9 00:07:52 2020 rev:22 rq:812540 version:3.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ncftp/ncftp.changes 2018-06-19 12:01:17.715307781 +0200 +++ /work/SRC/openSUSE:Factory/.ncftp.new.3606/ncftp.changes 2020-06-09 00:09:47.526371611 +0200 @@ -1,0 +2,7 @@ +Mon Jun 8 09:16:08 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonza...@suse.com> + +- Fix build with GCC 10: + * Set gBm as extern only in bookmark.h +- Add ncftp-gcc10-gBm.patch + +------------------------------------------------------------------- New: ---- ncftp-gcc10-gBm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncftp.spec ++++++ --- /var/tmp/diff_new_pack.ItKEYU/_old 2020-06-09 00:09:48.190373649 +0200 +++ /var/tmp/diff_new_pack.ItKEYU/_new 2020-06-09 00:09:48.190373649 +0200 @@ -1,7 +1,7 @@ # # spec file for package ncftp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,13 +22,14 @@ Summary: A Comfortable FTP Program License: ClArtistic Group: Productivity/Networking/Ftp/Clients -Url: http://www.ncftp.com/ +URL: https://www.ncftp.com/ Source: ftp://ftp.ncftp.com/ncftp/%{name}-%{version}-src.tar.xz Patch0: ncftp-3.1.8-locale.diff Patch2: ncftp-3.1.8-implicit_decl.diff Patch3: ncftp-3.2.5-no-date.patch # PATCH-FIX-OPENSUSE make build reproducible (boo#1084909) Patch4: ncftp-3.2.6-no-uname.patch +Patch5: ncftp-gcc10-gBm.patch BuildRequires: dos2unix BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +47,7 @@ %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build export CFLAGS="%{optflags} -D_LARGEFILE64_SOURCE" ++++++ ncftp-gcc10-gBm.patch ++++++ Index: ncftp-3.2.6/ncftp/bookmark.h =================================================================== --- ncftp-3.2.6.orig/ncftp/bookmark.h +++ ncftp-3.2.6/ncftp/bookmark.h @@ -29,6 +29,8 @@ typedef struct Bookmark { int reserved; } Bookmark; +extern Bookmark gBm; + #define kBookmarkVersion 8 #define kBookmarkMinVersion 3 #if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__) Index: ncftp-3.2.6/ncftp/cmds.c =================================================================== --- ncftp-3.2.6.orig/ncftp/cmds.c +++ ncftp-3.2.6/ncftp/cmds.c @@ -98,7 +98,6 @@ extern char gPager[], gHome[], gShell[]; 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; Index: ncftp-3.2.6/ncftp/main.c =================================================================== --- ncftp-3.2.6.orig/ncftp/main.c +++ ncftp-3.2.6/ncftp/main.c @@ -40,7 +40,6 @@ extern int gUnprocessedJobs; char gLocalCWD[512], gPrevLocalCWD[512]; extern char gRemoteCWD[512], gPrevRemoteCWD[512]; -extern Bookmark gBm; extern int gLoadedBm; extern int gFirewallType; extern char gAutoAscii[]; Index: ncftp-3.2.6/sh_util/gpshare.c =================================================================== --- ncftp-3.2.6.orig/sh_util/gpshare.c +++ ncftp-3.2.6/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) Index: ncftp-3.2.6/sh_util/ncftpget.c =================================================================== --- ncftp-3.2.6.orig/sh_util/ncftpget.c +++ ncftp-3.2.6/sh_util/ncftpget.c @@ -40,7 +40,6 @@ extern unsigned int gFirewallPort; extern char gFirewallExceptionList[256]; extern int gFwDataPortMode; extern const char gOS[], gVersion[]; -extern Bookmark gBm; static void #if (defined(__GNUC__)) && (__GNUC__ >= 2) Index: ncftp-3.2.6/sh_util/ncftpls.c =================================================================== --- ncftp-3.2.6.orig/sh_util/ncftpls.c +++ ncftp-3.2.6/sh_util/ncftpls.c @@ -39,7 +39,6 @@ extern unsigned int gFirewallPort; 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); Index: ncftp-3.2.6/sh_util/ncftpput.c =================================================================== --- ncftp-3.2.6.orig/sh_util/ncftpput.c +++ ncftp-3.2.6/sh_util/ncftpput.c @@ -41,7 +41,6 @@ extern unsigned int gFirewallPort; extern char gFirewallExceptionList[256]; extern int gFwDataPortMode; extern const char gOS[], gVersion[]; -extern Bookmark gBm; extern int gSendfileInProgress; static void
