From 7227c83e806a41e7cf74efc32ca75d0c86fb828f Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Tue, 9 Apr 2024 13:25:27 -0700 Subject: ncftp: Upgrade to 3.2.7 Switch the SRC_URI from "ftp:" to "https:". Drop the obsolete SRC_URI[md5sum]. Drop ncftp-3.2.5-gcc10.patch since we're using gcc13 and upstream has fixed the build to work by adding an extern to sh_util/gpshare.c for example. Signed-off-by: Randy MacLeod Signed-off-by: Khem Raj --- .../ncftp/ncftp/ncftp-3.2.5-gcc10.patch | 83 ---------------------- .../recipes-daemons/ncftp/ncftp_3.2.6.bb | 32 --------- .../recipes-daemons/ncftp/ncftp_3.2.7.bb | 30 ++++++++ 3 files changed, 30 insertions(+), 115 deletions(-) delete mode 100644 meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch delete mode 100644 meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb create mode 100644 meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch b/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch deleted file mode 100644 index 5dee824d7a..0000000000 --- a/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch +++ /dev/null @@ -1,83 +0,0 @@ -Fix build with -fno-common - -Patch from https://src.fedoraproject.org/rpms/ncftp/raw/master/f/ncftp-3.2.5-gcc10.patch - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- a/ncftp/bookmark.h -+++ b/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__) ---- a/ncftp/cmds.c -+++ b/ncftp/cmds.c -@@ -98,7 +98,7 @@ extern char gPager[], gHome[], gShell[]; - extern char gOS[]; - extern int gAutoResume; - extern int gAutoSaveChangesToExistingBookmarks; --extern Bookmark gBm; -+//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,7 @@ extern int gUnprocessedJobs; - char gLocalCWD[512], gPrevLocalCWD[512]; - - extern char gRemoteCWD[512], gPrevRemoteCWD[512]; --extern Bookmark gBm; -+//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,7 @@ - - static int gIsAtty1 = 1, gIsAtty2 = 1; - extern int gLoadedBm, gBookmarkMatchMode; --Bookmark gBm; -+//Bookmark gBm; - - double - FileSize(double size, const char **uStr0, double *uMult0) ---- a/sh_util/ncftpget.c -+++ b/sh_util/ncftpget.c -@@ -40,7 +40,7 @@ extern unsigned int gFirewallPort; - extern char gFirewallExceptionList[256]; - extern int gFwDataPortMode; - extern const char gOS[], gVersion[]; --extern Bookmark gBm; -+//extern Bookmark gBm; - - static void - #if (defined(__GNUC__)) && (__GNUC__ >= 2) ---- a/sh_util/ncftpls.c -+++ b/sh_util/ncftpls.c -@@ -39,7 +39,7 @@ extern unsigned int gFirewallPort; - extern char gFirewallExceptionList[256]; - extern int gFwDataPortMode; - extern const char gOS[], gVersion[]; --extern Bookmark gBm; -+//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 unsigned int gFirewallPort; - extern char gFirewallExceptionList[256]; - extern int gFwDataPortMode; - extern const char gOS[], gVersion[]; --extern Bookmark gBm; - extern int gSendfileInProgress; - - static void diff --git a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb deleted file mode 100644 index e66325c838..0000000000 --- a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "A sophisticated console ftp client" -HOMEPAGE = "http://ncftp.com/" -SECTION = "net" -LICENSE = "ClArtistic" -LIC_FILES_CHKSUM = "file://ncftp/cmds.c;beginline=3;endline=4;md5=9c2390809f71465aa7ff76e03dc14d91" -DEPENDS = "ncurses" - -SRC_URI = "ftp://ftp.ncftp.com/${BPN}/${BP}-src.tar.xz \ - file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \ - file://unistd.patch \ - file://ncftp-3.2.5-gcc10.patch \ - file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \ - " -SRC_URI[md5sum] = "42d0f896d69a4d603ec097546444245f" -SRC_URI[sha256sum] = "5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d" - -inherit autotools-brokensep pkgconfig - -CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,," - -EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar" -ACLOCALEXTRAPATH:append = " -I ${S}/autoconf_local" - -do_install () { - install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} - oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \ - 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ - install -} diff --git a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb new file mode 100644 index 0000000000..15bb00a3af --- /dev/null +++ b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "A sophisticated console ftp client" +HOMEPAGE = "http://ncftp.com/" +SECTION = "net" +LICENSE = "ClArtistic" +LIC_FILES_CHKSUM = "file://ncftp/cmds.c;beginline=3;endline=4;md5=9c2390809f71465aa7ff76e03dc14d91" +DEPENDS = "ncurses" + +SRC_URI = "https://www.ncftp.com/public_ftp/ncftp/${BP}-src.tar.xz \ + file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \ + file://unistd.patch \ + file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \ + " +SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8" + +inherit autotools-brokensep pkgconfig + +CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,," + +EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar" +ACLOCALEXTRAPATH:append = " -I ${S}/autoconf_local" + +do_install () { + install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} + oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \ + 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ + install +} -- cgit v1.2.3-54-g00ecf