From 6b0e4d82c31ee04e8a6abb48323252a7cd97c177 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 26 Mar 2025 09:05:06 +0100 Subject: [PATCH] package/ncftp: bump to version 3.2.9 Remove upstreamed patches. Autoreconf is broken. Hence, use the configure script directly. Fixes: https://autobuild.buildroot.org/results/60c3dbe02af354ff9820258ffd00eec088114d69/ Signed-off-by: Yegor Yefremov Signed-off-by: Julien Olivain (cherry picked from commit f8bc27111531e9607f79121414f61c0c2d5f83c0) --- .../ncftp/0001-ncftp-3.2.7-fix-gcc14.patch | 19 ----- .../ncftp/0002-ncftp-3.2.7-fix-clang.patch | 72 ------------------- package/ncftp/ncftp.hash | 2 +- package/ncftp/ncftp.mk | 13 +--- 4 files changed, 3 insertions(+), 103 deletions(-) delete mode 100644 package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch delete mode 100644 package/ncftp/0002-ncftp-3.2.7-fix-clang.patch diff --git a/package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch b/package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch deleted file mode 100644 index e2cda631d4..0000000000 --- a/package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch +++ /dev/null @@ -1,19 +0,0 @@ -fix select arg detection - -Reference: - https://bugs.gentoo.org/921487 - -Upstream: N/A, unresponsive contact email address. - -Signed-off-by: Yegor Yefremov ---- a/autoconf_local/aclocal.m4 -+++ b/autoconf_local/aclocal.m4 -@@ -4196,7 +4196,7 @@ - #include - #endif - #include /* MG: always incl */ --extern select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl -+extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl - [ac_not_found=no ; break 3],ac_not_found=yes) - done - done diff --git a/package/ncftp/0002-ncftp-3.2.7-fix-clang.patch b/package/ncftp/0002-ncftp-3.2.7-fix-clang.patch deleted file mode 100644 index bed103609c..0000000000 --- a/package/ncftp/0002-ncftp-3.2.7-fix-clang.patch +++ /dev/null @@ -1,72 +0,0 @@ -Fix compilation with clang-16 - -aclocal.m4 contains code that no longer compiles: missing headers and missing -return types. - -Reference: - https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.7-fix-clang.patch - -Upstream: N/A, unresponsive contact email address. - -Signed-off-by: Yegor Yefremov ---- a/autoconf_local/aclocal.m4 -+++ b/autoconf_local/aclocal.m4 -@@ -3057,6 +3057,7 @@ - #include - #include - #include -+#include - ],[ - struct sockaddr_un uaddr; - -@@ -3285,6 +3286,7 @@ - #ifdef HAVE_RESOLV_H - # include - #endif -+#include - ],[ - /* function-body */ - int len; -@@ -3363,6 +3365,7 @@ - #include - #include - -+ int - main(int argc, char **argv) - { - /* Note: don't actually call readline, -@@ -5145,6 +5148,7 @@ - #ifdef HAVE_STDLIB_H - # include - #endif -+#include - - #ifdef HAVE_NCURSES_H - # define NCURSES_OPAQUE 0 -@@ -5176,6 +5180,7 @@ - #endif - - -+int - main(int argc, char **argv) - { - /* Note: don't actually call curses, since it may block; -@@ -6510,7 +6515,6 @@ - #endif - #endif /* MG */ - --int - int main(void) - { - char *data, *data2, *data3; -@@ -6607,8 +6611,9 @@ - AC_CACHE_CHECK(whether setvbuf arguments are reversed, - ac_cv_func_setvbuf_reversed, - [AC_TRY_RUN([#include -+ $include - /* If setvbuf has the reversed format, exit 0. */ -- main () { -+ int main (void) { - /* This call has the arguments reversed. - A reversed system may check and see that the address of main - is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ diff --git a/package/ncftp/ncftp.hash b/package/ncftp/ncftp.hash index 3e390b1015..a9414d62f5 100644 --- a/package/ncftp/ncftp.hash +++ b/package/ncftp/ncftp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8 ncftp-3.2.7-src.tar.xz +sha256 f1108e77782376f8aec691f68297a3364a9a7c2d9bb12e326f550ff9770f47a7 ncftp-3.2.9-src.tar.gz sha256 4fe2f063d25d79c49712a272ebb68e050c703eed9c66c80108427edfe3285580 doc/LICENSE.txt diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 57c3a5d08b..fa46bc3339 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -4,8 +4,8 @@ # ################################################################################ -NCFTP_VERSION = 3.2.7 -NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz +NCFTP_VERSION = 3.2.9 +NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp NCFTP_TARGET_BINS = ncftp NCFTP_LICENSE = ClArtistic @@ -14,15 +14,6 @@ NCFTP_LICENSE_FILES = doc/LICENSE.txt NCFTP_DEPENDENCIES = host-autoconf NCFTP_CONF_OPTS = --disable-ccdv -# The bundled configure script is generated by autoconf 2.13 and doesn't -# detect cross-compilation correctly. Therefore, we have to regenerate it. -# We need to pass -I because of the non-standard m4 directory name, and -# none of the other autotools are used, so the below is the easiest. -define NCFTP_RUN_AUTOCONF - (cd $(@D); $(AUTOCONF) -I$(@D)/autoconf_local/) -endef -NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF - ifeq ($(BR2_PACKAGE_NCFTP_GET),y) NCFTP_TARGET_BINS += ncftpget endif