mirrors/aports
2
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2024-09-20 11:23:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

main/ncftp: upgrade to 3.2.7, fix build with gcc14

Browse source 
use -fpermissive due to the autoconf stuff appears to be non-trivial to
fix.

enable loongarch64

fixes commit fba7150c2d (main/ncftp: temp disable on loongarch64)
This commit is contained in:
Natanael Copa 2024-09-02 14:39:04 +02:00
parent f58aca1739
commit 4589d09e43
2 changed files with 8 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
main/ncftp/APKBUILD
View file

@ -1,21 +1,19 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=ncftp
pkgver=3.2.6
pkgrel=6
pkgver=3.2.7
pkgrel=0
pkgdesc="A set of free application programs implementing FTP"
url="https://www.ncftp.com/"
# enable loongarch support when gcc14 builds are fixed
arch="all !loongarch64"
arch="all"
options="!check" # No test suite.
license="ClArtistic"
makedepends="ncurses-dev"
subpackages="$pkgname-doc $pkgname-bookmarks $pkgname-dev"
source="https://dev.alpinelinux.org/archive/ncftp/ncftp-$pkgver-src.tar.xz
gcc-10.patch
"
source="https://www.ncftp.com/public_ftp/ncftp/ncftp-$pkgver-src.tar.xz"
build() {
./configure \
CFLAGS="-fpermissive" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@ -43,5 +41,6 @@ bookmarks() {
"$subpkgdir"/usr/bin/
}
sha512sums="8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382 ncftp-3.2.6-src.tar.xz
b0225946f66d21e870216ce19ee229eaceb0b44179af9a16237e41de48bb9344f807829ab3229e96e8a4e39e914d4ac581da377d0239af96775e618372c61084 gcc-10.patch"
sha512sums="
b755385a57ac2487625c15985f091d9e1b71073b2593faffe1f2bbba34e691cfff9ffd8448b048f223ea08428e890f30c49a903e4f938393e3c0e4ae03ddab37 ncftp-3.2.7-src.tar.xz
"

71
main/ncftp/gcc-10.patch
View file

@ -1,71 +0,0 @@
Upstream: Should be, taken from Gentoo
Reason: Fixes compilation with -fno-common
--- 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