CVS commit: pkgsrc/net/lftp

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/lftp
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 13 Feb 2025 09:10:43 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Feb 13 09:10:43 UTC 2025

Modified Files:
        pkgsrc/net/lftp: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/lftp/patches: patch-Makefile.in patch-lib_md5-stream.c
            patch-lib_sha1-stream.c patch-po_Makefile.in.in
            patch-src_Makefile.in
Removed Files:
        pkgsrc/net/lftp/patches: patch-aa patch-ac patch-ae

Log Message:
lftp: updated to 4.9.3

Version 4.9.3 - 2024-11-08

* fixed sftp out-of-order problem.
* fixed udp tracker looping.
* fixed a few coredumps.
* fixed compilation in some cases.
* translations updated.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/net/lftp/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/lftp/PLIST
cvs rdiff -u -r1.76 -r1.77 pkgsrc/net/lftp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/lftp/patches/patch-Makefile.in \
    pkgsrc/net/lftp/patches/patch-lib_md5-stream.c \
    pkgsrc/net/lftp/patches/patch-lib_sha1-stream.c \
    pkgsrc/net/lftp/patches/patch-po_Makefile.in.in \
    pkgsrc/net/lftp/patches/patch-src_Makefile.in
cvs rdiff -u -r1.18 -r0 pkgsrc/net/lftp/patches/patch-aa
cvs rdiff -u -r1.5 -r0 pkgsrc/net/lftp/patches/patch-ac \
    pkgsrc/net/lftp/patches/patch-ae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/lftp/Makefile
diff -u pkgsrc/net/lftp/Makefile:1.151 pkgsrc/net/lftp/Makefile:1.152
--- pkgsrc/net/lftp/Makefile:1.151      Thu Nov 14 22:21:10 2024
+++ pkgsrc/net/lftp/Makefile    Thu Feb 13 09:10:43 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.151 2024/11/14 22:21:10 wiz Exp $
+# $NetBSD: Makefile,v 1.152 2025/02/13 09:10:43 adam Exp $
 
-DISTNAME=      lftp-4.9.2
-PKGREVISION=   15
+DISTNAME=      lftp-4.9.3
 CATEGORIES=    net
 MASTER_SITES=  http://lftp.yar.ru/ftp/
 MASTER_SITES+= ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
@@ -20,6 +19,8 @@ USE_TOOLS+=           autoconf bison
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-modules
+# wcwidth from gnulib fails with duplicate symbol '_rpl_wcwidth'
+CONFIGURE_ENV+=                gl_cv_func_wcwidth_works=yes
 CONFIGURE_ENV+=                readline_prefix=${BUILDLINK_DIR}
 
 SUBST_CLASSES+=                        readline
@@ -44,6 +45,7 @@ post-install: post-install-perl
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libidn2/buildlink3.mk"
 # uses _rl_mark_modified_lines and GNU history(3) functions
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/net/lftp/PLIST
diff -u pkgsrc/net/lftp/PLIST:1.20 pkgsrc/net/lftp/PLIST:1.21
--- pkgsrc/net/lftp/PLIST:1.20  Wed Jul 12 08:58:18 2017
+++ pkgsrc/net/lftp/PLIST       Thu Feb 13 09:10:43 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2017/07/12 08:58:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2025/02/13 09:10:43 adam Exp $
 bin/lftp
 bin/lftpget
 lib/lftp/${PKGVERSION}/cmd-mirror.la
@@ -34,7 +34,9 @@ share/locale/ko/LC_MESSAGES/lftp.mo
 share/locale/pl/LC_MESSAGES/lftp.mo
 share/locale/pt_BR/LC_MESSAGES/lftp.mo
 share/locale/ru/LC_MESSAGES/lftp.mo
+share/locale/sr/LC_MESSAGES/lftp.mo
 share/locale/uk/LC_MESSAGES/lftp.mo
 share/locale/zh_CN/LC_MESSAGES/lftp.mo
 share/locale/zh_HK/LC_MESSAGES/lftp.mo
 share/locale/zh_TW/LC_MESSAGES/lftp.mo
+share/zsh/site-functions/_lftp

Index: pkgsrc/net/lftp/distinfo
diff -u pkgsrc/net/lftp/distinfo:1.76 pkgsrc/net/lftp/distinfo:1.77
--- pkgsrc/net/lftp/distinfo:1.76       Tue Oct 26 11:05:53 2021
+++ pkgsrc/net/lftp/distinfo    Thu Feb 13 09:10:43 2025
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.76 2021/10/26 11:05:53 nia Exp $
+$NetBSD: distinfo,v 1.77 2025/02/13 09:10:43 adam Exp $
 
-BLAKE2s (lftp-4.9.2.tar.xz) = 03aa37d43f7ba4f15db9c19c9de7e4aa313e1d742cda65e9c2caab248007c0a3
-SHA512 (lftp-4.9.2.tar.xz) = cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-Size (lftp-4.9.2.tar.xz) = 1654960 bytes
-SHA1 (patch-aa) = 988f4f2f5b9469d3c645ffa984d5449a219229bb
-SHA1 (patch-ac) = 8aa2ddc582bbc87cd0a5e8662f328dd2ac8dea90
-SHA1 (patch-ae) = 4e2506bbadbda97feeabb208cd43c0dff70ed7d3
+BLAKE2s (lftp-4.9.3.tar.xz) = 19691587cb46656e1b58665ff57503b9b59accfe708888c91b9a1e8db01bd0a8
+SHA512 (lftp-4.9.3.tar.xz) = 81dc39ff8638ae720f4b65a9a74dad8100f9a764b4ff6d1538cbf898f666d795137619b490d6b0586d1001f9d3b11a35bed52821ef1d5fc3b0529e5dcb5a836a
+Size (lftp-4.9.3.tar.xz) = 1872104 bytes
+SHA1 (patch-Makefile.in) = 8aa2ddc582bbc87cd0a5e8662f328dd2ac8dea90
 SHA1 (patch-lib_inttypes.in.h) = 1ed605531efa6fb92ebed762290f7b1060f4beb1
+SHA1 (patch-lib_md5-stream.c) = decf6542fb0a7ee75e5b7d158bd26b7c2127c8d0
+SHA1 (patch-lib_sha1-stream.c) = 10cce429e0636dc3c3b1d2873291d24cebee60bd
+SHA1 (patch-po_Makefile.in.in) = 4e2506bbadbda97feeabb208cd43c0dff70ed7d3
+SHA1 (patch-src_Makefile.in) = 84dbaf0e8be52d3efe40d549c660aba82f80e8f8
 SHA1 (patch-src_module.cc) = 236fe2ce4ff215ddfe44fc86ed43ed00849280b8

Added files:

Index: pkgsrc/net/lftp/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/net/lftp/patches/patch-Makefile.in:1.1
--- /dev/null   Thu Feb 13 09:10:43 2025
+++ pkgsrc/net/lftp/patches/patch-Makefile.in   Thu Feb 13 09:10:43 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2025/02/13 09:10:43 adam Exp $
+
+The configuration files are handled by CONF_FILES.
+
+--- Makefile.in.orig   2009-05-15 09:25:53 +0300
++++ Makefile.in        2009-06-08 12:23:32 +0300
+@@ -1871,7 +1871,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+ install-dvi: install-dvi-recursive
+ 
Index: pkgsrc/net/lftp/patches/patch-lib_md5-stream.c
diff -u /dev/null pkgsrc/net/lftp/patches/patch-lib_md5-stream.c:1.1
--- /dev/null   Thu Feb 13 09:10:43 2025
+++ pkgsrc/net/lftp/patches/patch-lib_md5-stream.c      Thu Feb 13 09:10:43 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_md5-stream.c,v 1.1 2025/02/13 09:10:43 adam Exp $
+
+Avoid duplicate symbols.
+https://github.com/lavv17/lftp/issues/743
+
+--- lib/md5-stream.c.orig      2025-02-13 07:48:10.019120268 +0000
++++ lib/md5-stream.c
+@@ -22,9 +22,6 @@
+ #include <config.h>
+ 
+ /* Specification.  */
+-#if HAVE_OPENSSL_MD5
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "md5.h"
+ 
+ #include <stdlib.h>
Index: pkgsrc/net/lftp/patches/patch-lib_sha1-stream.c
diff -u /dev/null pkgsrc/net/lftp/patches/patch-lib_sha1-stream.c:1.1
--- /dev/null   Thu Feb 13 09:10:43 2025
+++ pkgsrc/net/lftp/patches/patch-lib_sha1-stream.c     Thu Feb 13 09:10:43 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_sha1-stream.c,v 1.1 2025/02/13 09:10:43 adam Exp $
+
+Avoid duplicate symbols.
+https://github.com/lavv17/lftp/issues/743
+
+--- lib/sha1-stream.c.orig     2025-02-13 07:48:47.519257029 +0000
++++ lib/sha1-stream.c
+@@ -24,9 +24,6 @@
+ #include <config.h>
+ 
+ /* Specification.  */
+-#if HAVE_OPENSSL_SHA1
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "sha1.h"
+ 
+ #include <stdlib.h>
Index: pkgsrc/net/lftp/patches/patch-po_Makefile.in.in
diff -u /dev/null pkgsrc/net/lftp/patches/patch-po_Makefile.in.in:1.1
--- /dev/null   Thu Feb 13 09:10:43 2025
+++ pkgsrc/net/lftp/patches/patch-po_Makefile.in.in     Thu Feb 13 09:10:43 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-po_Makefile.in.in,v 1.1 2025/02/13 09:10:43 adam Exp $
+
+Do not use $(SHELL), call directly @install_sh@.
+
+--- po/Makefile.in.in.orig     2007-03-26 12:25:16.000000000 +0200
++++ po/Makefile.in.in
+@@ -39,8 +39,8 @@ INSTALL_DATA = @INSTALL_DATA@
+ # In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+ # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+ # versions, $(mkinstalldirs) and $(install_sh) are unused.
+-mkinstalldirs = $(SHELL) @install_sh@ -d
+-install_sh = $(SHELL) @install_sh@
++mkinstalldirs = @install_sh@ -d
++install_sh = @install_sh@
+ MKDIR_P = @MKDIR_P@
+ mkdir_p = @mkdir_p@
+ 
Index: pkgsrc/net/lftp/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/net/lftp/patches/patch-src_Makefile.in:1.1
--- /dev/null   Thu Feb 13 09:10:43 2025
+++ pkgsrc/net/lftp/patches/patch-src_Makefile.in       Thu Feb 13 09:10:43 2025
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2025/02/13 09:10:43 adam Exp $
+
+Do not install by default Perl scripts; they are installed via
+${INSTALL_SCRIPT} if the user set the "perl" option.
+
+Do not remove the *.la files.
+
+--- src/Makefile.in.orig       2024-11-08 10:32:23.000000000 +0000
++++ src/Makefile.in
+@@ -2543,7 +2543,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ pkgverlibdir = $(pkglibdir)/$(VERSION)
+ bin_SCRIPTS = lftpget
+-pkgdata_SCRIPTS = import-ncftp import-netscape verify-file convert-mozilla-cookies xdg-move
++pkgdata_SCRIPTS = import-ncftp import-netscape xdg-move
+ noinst_SCRIPTS = ftpget
+ EXTRA_DIST = $(pkgdata_SCRIPTS) $(bin_SCRIPTS) $(noinst_SCRIPTS)
+ lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.c lftp_rl.h attach.cc attach.h
+@@ -3297,7 +3297,7 @@ install-binPROGRAMS: install-libLTLIBRAR
+ install-pkgverlibLTLIBRARIES: install-libLTLIBRARIES
+ 
+ installdirs:
+-      for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgverlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
++      for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+@@ -3650,6 +3650,9 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 
+ # libtool does not strip modules, do it here.
+ install-data-hook:
++      :
++
++install-data-hook-disabled:
+ @WITH_MODULES_TRUE@   rm -f $(DESTDIR)$(pkgverlibdir)/*.la; \
+ @WITH_MODULES_TRUE@   case " $(LDFLAGS) " in *" -s "*) \
+ @WITH_MODULES_TRUE@           $(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so;; \

Prev by Date: CVS commit: pkgsrc/graphics/digikam/patches
Next by Date: CVS commit: pkgsrc/net/py-zeroconf
Previous by Thread: CVS commit: pkgsrc/graphics/digikam/patches
Next by Thread: CVS commit: pkgsrc/net/py-zeroconf
Indexes:

Home | Main Index | Thread Index | Old Index