ncftp: upgrade 3.2.7 -> 3.3.0

Add a patch fixing the autoconf 2.13-era idioms that abort autom4te under autoconf 2.73, and regenerate the existing patches so they apply without fuzz. Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
2026-07-15 16:07:26 +00:00 · 2026-06-09 21:17:21 -07:00
parent ed02dad69f
commit e499a8feb8
6 changed files with 43 additions and 66 deletions
@@ -11,11 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/configure.in b/configure.in
-index c3ef568..a320c56 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -44,7 +44,7 @@ wi_EXTRA_SYSV_SUNOS_DIRS	dnl	For better curses library on SunOS 4
- 
+@@ -37,7 +37,7 @@
+ wi_EXTRA_SYSV_SUNOS_DIRS	dnl	For better curses library on SunOS 4
 dnl Try to use PATH rather than hardcode the installation path, if possible.
 if test "${prefix-NONE}" != "NONE" && test "$prefix" != "/usr/local" && test "$prefix" != "/usr"; then
 -	AC_DEFINE_UNQUOTED(PREFIX_BINDIR, "$prefix/bin")
@@ -1,20 +0,0 @@
-fix select arg detection
-
-Reference:
- https://bugs.gentoo.org/921487
-
-Upstream-Status: Inappropriate [unresponsive contact email address]
-
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/autoconf_local/aclocal.m4
-+++ b/autoconf_local/aclocal.m4
-@@ -4196,7 +4196,7 @@ AC_MSG_CHECKING([types of arguments for
- #include <sys/select.h>
- #endif
- #include <sys/socket.h>	/* 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
@@ -10,9 +10,10 @@ Upstream-Status: Inappropriate [unresponsive contact email address]

 Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+diff --git a/autoconf_local/aclocal.m4 b/autoconf_local/aclocal.m4
 --- a/autoconf_local/aclocal.m4
 +++ b/autoconf_local/aclocal.m4
-@@ -3057,6 +3057,7 @@ AC_TRY_LINK([
+@@ -3139,6 +3139,7 @@
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -20,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ],[
 struct sockaddr_un uaddr;
 
-@@ -3285,6 +3286,7 @@ AC_TRY_LINK([
+@@ -3364,6 +3365,7 @@
 #ifdef HAVE_RESOLV_H
 #	include <resolv.h>
 #endif
@@ -28,43 +29,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ],[
 	/* function-body */
 	int len;
-@@ -3363,6 +3365,7 @@ else
- #include <stdio.h>
- #include <stdlib.h>
- 		 
-+			int
- 			main(int argc, char **argv)
- 			{
- 				/* Note:  don't actually call readline,
-@@ -5144,6 +5147,7 @@ do
- #ifdef HAVE_STDLIB_H
- #	include <stdlib.h>
- #endif
-+#include <string.h>
- 
- #ifdef HAVE_NCURSES_H
- #	define NCURSES_OPAQUE 0
-@@ -5175,6 +5179,7 @@ do
- #endif
- 
-  
-+int
- main(int argc, char **argv)
- {
- 	/* Note:  don't actually call curses, since it may block;
-@@ -6509,7 +6514,6 @@ char *malloc();
- #endif
- #endif			/* MG */
- 
-int
- int  main(void)
- {
- 	char *data, *data2, *data3;
-@@ -6606,8 +6610,9 @@ else
- 	AC_CACHE_CHECK(whether setvbuf arguments are reversed,
- 	  ac_cv_func_setvbuf_reversed,
+@@ -6609,7 +6611,7 @@
 	[AC_TRY_RUN([#include <stdio.h>
-+	$include <stdlib.h>
+ #include <stdlib.h>
 	/* If setvbuf has the reversed format, exit 0. */
 -	main () {
 +	int main (void) {
@@ -0,0 +1,29 @@
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 24 Jun 2026 00:00:00 +0000
+Subject: [PATCH] aclocal: fix AC_LANG usage for autoconf 2.73
+
+wi_TRY_RUN_NATIVE used the autoconf 2.13-era idiom
+"ifelse(AC_LANG, CPLUSPLUS, ...)". In modern autoconf AC_LANG is a macro
+that sets the current language rather than expanding to its name, so
+expanding it bare aborts autom4te ("m4 failed with exit status 1").
+ncftp is built as C, so emit the harmless C++ guard unconditionally.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+--- a/autoconf_local/aclocal.m4
+++ b/autoconf_local/aclocal.m4
+@@ -416,10 +416,10 @@
+ [cat > conftest.$ac_ext <<EOF
+ [#]line __oline__ "configure"
+ #include "confdefs.h"
+-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+#ifdef __cplusplus
+ extern "C" void exit(int);
+ #endif
+-])dnl
+dnl
+ wi_STD_INCLUDES
+ [$1]
+ EOF
@@ -18,11 +18,13 @@ Upstream-Status: Pending
 Signed-of-by: Khem Raj <raj.khem@gmail.com>
 --- a/autoconf_local/aclocal.m4
 +++ b/autoconf_local/aclocal.m4
-@@ -4220,7 +4220,6 @@ changequote({{, }})dnl
+@@ -4400,9 +4400,6 @@ cat << 'EOF' > "$wi_tmpdir/unistd.c"
 cat << 'EOF' > "$wi_tmpdir/unistd.c"
 #include <confdefs.h>
 
-#include <unistd.h>
+-#ifdef HAVE_UNISTD_H
+-#	include <unistd.h>
+-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -5,14 +5,14 @@ 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/older_versions/${BP}-src.tar.gz \
+SRC_URI = "https://www.ncftp.com/public_ftp/ncftp/${BP}-src.tar.gz \
           file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
           file://unistd.patch \
           file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \
-           file://0001-ncftp-3.2.7-fix-gcc14.patch \
           file://0002-ncftp-3.2.7-fix-clang.patch \
+           file://0003-aclocal-fix-AC_LANG-usage-for-autoconf-2.73.patch \
           "
-SRC_URI[sha256sum] = "dbde0d3b4d28ba3a445621e10deaee57a6ba3ced277cc9dbce4052bcddf6cb2a"
+SRC_URI[sha256sum] = "7920f884c2adafc82c8e41c46d6f3d22698785c7b3f56f5677a8d5c866396386"

 # Doesn't use automake
 inherit autotools-brokensep pkgconfig