From 0deb8c4c5dcae01e1da772e2e1540aa989e8af8b Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sun, 2 Jun 2024 16:19:54 +0200 Subject: [PATCH] package/ncftp: bump to version 3.2.7 Change download location as the new version is not available at the old location. Remove already upstreamed patch. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/ncftp/0001-fix-gcc-10.patch | 24 ------------------------ package/ncftp/ncftp.hash | 2 +- package/ncftp/ncftp.mk | 8 +++----- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/ncftp/0001-fix-gcc-10.patch diff --git a/.checkpackageignore b/.checkpackageignore index 25ad6f1d63..c3de61111f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1086,7 +1086,6 @@ package/musl/0001-avoid-kernel-if_ether.h.patch lib_patch.Upstream package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream package/nanocom/0001-fix-build-with-gcc-10.patch lib_patch.Upstream -package/ncftp/0001-fix-gcc-10.patch lib_patch.Upstream package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch lib_patch.Upstream package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch lib_patch.Upstream package/ne10/0002-fix-build-without-C.patch lib_patch.Upstream diff --git a/package/ncftp/0001-fix-gcc-10.patch b/package/ncftp/0001-fix-gcc-10.patch deleted file mode 100644 index 8ff9c44c50..0000000000 --- a/package/ncftp/0001-fix-gcc-10.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build with gcc 10 - -Add missing extern to gBm to fix the following build failure with --fno-common which is enabled by default with gcc 10: - -/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: bookmark.o:(.bss+0x10): multiple definition of `gBm'; gpshare.o:(.bss+0x24): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/78822bc0e0039e8f8949011a256cac022863276f - -Signed-off-by: Fabrice Fontaine - -diff -Nura ncftp-3.2.6-orig/sh_util/gpshare.c ncftp-3.2.6/sh_util/gpshare.c ---- ncftp-3.2.6-orig/sh_util/gpshare.c 2020-08-21 10:46:34.173816750 +0200 -+++ ncftp-3.2.6/sh_util/gpshare.c 2020-08-21 10:52:25.407976319 +0200 -@@ -28,7 +28,7 @@ - - static int gIsAtty1 = 1, gIsAtty2 = 1; - extern int gLoadedBm, gBookmarkMatchMode; --Bookmark gBm; -+extern Bookmark gBm; - - double - FileSize(double size, const char **uStr0, double *uMult0) diff --git a/package/ncftp/ncftp.hash b/package/ncftp/ncftp.hash index 3ab27df5cc..3e390b1015 100644 --- a/package/ncftp/ncftp.hash +++ b/package/ncftp/ncftp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 129e5954850290da98af012559e6743de193de0012e972ff939df9b604f81c23 ncftp-3.2.6-src.tar.gz +sha256 d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8 ncftp-3.2.7-src.tar.xz sha256 4fe2f063d25d79c49712a272ebb68e050c703eed9c66c80108427edfe3285580 doc/LICENSE.txt diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 676a9c5895..a3aa3fb194 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -4,11 +4,9 @@ # ################################################################################ -NCFTP_VERSION = 3.2.6 -# use .gz as upstream .xz tarball has changed after the hash was added for -# 2017.02. Can be changed back to .xz when version is bumped -NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz -NCFTP_SITE = ftp://ftp.ncftp.com/ncftp +NCFTP_VERSION = 3.2.7 +NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz +NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp NCFTP_TARGET_BINS = ncftp NCFTP_LICENSE = Clarified Artistic License NCFTP_LICENSE_FILES = doc/LICENSE.txt