mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
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 <Randy.MacLeod@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -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 <raj.khem@gmail.com>
|
|
||||||
|
|
||||||
--- 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
|
|
||||||
+2
-4
@@ -5,14 +5,12 @@ LICENSE = "ClArtistic"
|
|||||||
LIC_FILES_CHKSUM = "file://ncftp/cmds.c;beginline=3;endline=4;md5=9c2390809f71465aa7ff76e03dc14d91"
|
LIC_FILES_CHKSUM = "file://ncftp/cmds.c;beginline=3;endline=4;md5=9c2390809f71465aa7ff76e03dc14d91"
|
||||||
DEPENDS = "ncurses"
|
DEPENDS = "ncurses"
|
||||||
|
|
||||||
SRC_URI = "ftp://ftp.ncftp.com/${BPN}/${BP}-src.tar.xz \
|
SRC_URI = "https://www.ncftp.com/public_ftp/ncftp/${BP}-src.tar.xz \
|
||||||
file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
|
file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
|
||||||
file://unistd.patch \
|
file://unistd.patch \
|
||||||
file://ncftp-3.2.5-gcc10.patch \
|
|
||||||
file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \
|
file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "42d0f896d69a4d603ec097546444245f"
|
SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8"
|
||||||
SRC_URI[sha256sum] = "5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d"
|
|
||||||
|
|
||||||
inherit autotools-brokensep pkgconfig
|
inherit autotools-brokensep pkgconfig
|
||||||
|
|
||||||
Reference in New Issue
Block a user