Not a minimal fix, but a possibility if we don't come up with anything
simpler. I've generated a tar from lftp git using updated gnulib, and
that fixes the build issue we're running into.
There are quite a few commits since mid-2020 when lftp last updated
gnulib and it's a slow enough process to regenerate gnulib and build
that I haven't bisected to find which gnulib commit fixes things. I
skimmed through the commit log but nothing jumped out at me.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.132
diff -u -p -r1.132 Makefile
--- Makefile 11 Mar 2022 19:46:13 -0000 1.132
+++ Makefile 28 Oct 2022 21:05:54 -0000
@@ -1,10 +1,10 @@
COMMENT= shell-like command line ftp and sftp client
-DISTNAME= lftp-4.9.2
-REVISION= 1
+DISTNAME= lftp-4.9.2.12-cb80-dirty
+PKGNAME= lftp-4.9.2pl20221028
CATEGORIES= net
-HOMEPAGE= https://lftp.tech/
+HOMEPAGE= https://lftp.yar.ru/
MAINTAINER= Rafael Sadowski <rsadowski@openbsd.org>
@@ -23,8 +23,10 @@ LIB_DEPENDS= devel/libidn2 \
devel/gettext,-runtime \
devel/readline>=6.1p2
-MASTER_SITES= http://lftp.yar.ru/ftp/ \
- ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
+MASTER_SITES= https://spacehopper.org/mirrors/
+PORTROACH= site:https://lftp.yar.ru/ftp/
+#MASTER_SITES= https://lftp.yar.ru/ftp/ \
+# ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
LIBTOOL_FLAGS= --tag=disable-shared
CONFIGURE_STYLE= gnu
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo 24 Aug 2020 10:23:57 -0000 1.79
+++ distinfo 28 Oct 2022 21:05:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.9.2.tar.gz) = o3WJxhkUBz9TxdoOaL0jO0GAJQnXWKAiAA4a4gdtpzM=
-SIZE (lftp-4.9.2.tar.gz) = 2950063
+SHA256 (lftp-4.9.2.12-cb80-dirty.tar.gz) = 0mshYcTHkcYhvkcoo3RWn9ofMRUkc/mXlTeViAtCoMM=
+SIZE (lftp-4.9.2.12-cb80-dirty.tar.gz) = 3035774
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.25
diff -u -p -r1.25 patch-configure
--- patches/patch-configure 11 Mar 2022 19:46:13 -0000 1.25
+++ patches/patch-configure 28 Oct 2022 21:05:54 -0000
@@ -3,7 +3,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -55428,7 +55428,7 @@ fi
+@@ -62254,7 +62254,7 @@ fi
fi
readline_ld_flags="-L$readline_prefix/lib"
if test -z "$readline_lib_flags"; then
Index: patches/patch-lib_vasnprintf_c
===================================================================
RCS file: patches/patch-lib_vasnprintf_c
diff -N patches/patch-lib_vasnprintf_c
--- patches/patch-lib_vasnprintf_c 11 Mar 2022 19:46:13 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-Initialize variable e
-
-Don't use printf %n.
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c6101860c7b462d1b286641d1307afd6c
-
-Index: lib/vasnprintf.c
---- lib/vasnprintf.c.orig
-+++ lib/vasnprintf.c
-@@ -1375,7 +1375,7 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *m
- static char *
- scale10_round_decimal_long_double (long double x, int n)
- {
-- int e IF_LINT(= 0);
-+ int e = 0;
- mpn_t m;
- void *memory = decode_long_double (x, &e, &m);
- return scale10_round_decimal_decoded (e, m, memory, n);
-@@ -1393,7 +1393,7 @@ scale10_round_decimal_long_double (long double x, int
- static char *
- scale10_round_decimal_double (double x, int n)
- {
-- int e IF_LINT(= 0);
-+ int e = 0;
- mpn_t m;
- void *memory = decode_double (x, &e, &m);
- return scale10_round_decimal_decoded (e, m, memory, n);
-@@ -5117,11 +5117,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
-
No comments:
Post a Comment