Hi all, please find below an update diff for lftp 4.8.1. I add a simple patch to avoid running into an assert at the program end.
Changelog between 4.7.1 and 4.8.1 Version 4.8.1 - 2017-09-12 - improved rate limiting to allow per-host limits. - ftp: make prefer-epsv default "no". - ftp: fixed quote command and ftp:use-stat-for-list setting. - switched to libidn2. - fixed build with LibreSSL. - fixed configure --disable-rpath. - fixed coredump when a parent directory was deleted. Version 4.8.0 - 2017-07-10 - mirror: improved performance of --scan-all-first for big trees. - mirror: new --flat option to flatten the target directory structure. - mmv: new command for file moving; redirect mv to mmv in certain cases. - fixed compilation with newer openssl (1.1.0 and later). - du: allow multiple --exclude options to be combined. - new setting cmd:nullglob for `glob' command prefix. - http: use proppatch to set last-modified property. - new settings net:connection-limit-timer and ftp:too-many-re. - ftp: dynamically ajust connection limit. - ftp: fixed core dump on LINK/SYMLINK when the command is not supported. - get1: fixed -o option. - sftp,fish: connect-program setting is now passed to the shell for execution. - get/mget/put/mput: add -P option for parallel transfers and long options. - appimage: new make target for making an AppImage file. - fixed "local glob". Ok? Comments? Best regards, Rafael Sadowski Inder: Makefile =================================================================== RCS file: /cvs/ports/net/lftp/Makefile,v retrieving revision 1.120 diff -u -p -u -p -r1.120 Makefile --- Makefile 22 Aug 2017 15:48:45 -0000 1.120 +++ Makefile 23 Sep 2017 18:03:57 -0000 @@ -2,23 +2,26 @@ COMMENT= shell-like command line ftp and sftp client -DISTNAME= lftp-4.7.8 +DISTNAME= lftp-4.8.1 CATEGORIES= net HOMEPAGE= https://lftp.tech/ -MAINTAINER= Rafael Sadowski <raf...@sizeofvoid.org> +MAINTAINER= Rafael Sadowski <rsadow...@openbsd.org> # GPLv3+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c crypto curses ereadline expat iconv idn intl m ssl -WANTLIB += ${COMPILER_LIBCXX} util z +WANTLIB += ${COMPILER_LIBCXX} c crypto curses ereadline expat +WANTLIB += iconv idn2 intl m ssl unistring util z # lftp needs add_history_time() -LIB_DEPENDS= devel/libidn \ +LIB_DEPENDS= devel/libidn2 \ devel/gettext \ devel/readline>=6.1p2 + +RUN_DEPENDS += devel/desktop-file-utils \ + x11/gtk+3,-guic MASTER_SITES= http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \ http://lftp.yar.ru/ftp/ \ Index: distinfo =================================================================== RCS file: /cvs/ports/net/lftp/distinfo,v retrieving revision 1.74 diff -u -p -u -p -r1.74 distinfo --- distinfo 22 Aug 2017 15:48:45 -0000 1.74 +++ distinfo 23 Sep 2017 18:03:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (lftp-4.7.8.tar.gz) = uiPyjeWRNqA9GVKccUL8kip5FsQPyB1qxjm74ZnkSGM= -SIZE (lftp-4.7.8.tar.gz) = 2777576 +SHA256 (lftp-4.8.1.tar.gz) = YReGYhXNiJ2rMP9zKSzR01/g4Sqa9c120JNQDQerZaM= +SIZE (lftp-4.8.1.tar.gz) = 2825304 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/net/lftp/patches/patch-configure,v retrieving revision 1.19 diff -u -p -u -p -r1.19 patch-configure --- patches/patch-configure 22 Aug 2017 15:48:45 -0000 1.19 +++ patches/patch-configure 23 Sep 2017 18:03:57 -0000 @@ -5,7 +5,7 @@ Use GNU readline as our base readline la Index: configure --- configure.orig +++ configure -@@ -49827,7 +49827,7 @@ fi +@@ -50069,7 +50069,7 @@ fi readline_include_dir="$readline_include_dir/readline" fi readline_ld_flags="-L$readline_prefix/lib" Index: patches/patch-doc_lftp_1 =================================================================== RCS file: /cvs/ports/net/lftp/patches/patch-doc_lftp_1,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-doc_lftp_1 --- patches/patch-doc_lftp_1 29 Jun 2017 08:49:33 -0000 1.1 +++ patches/patch-doc_lftp_1 23 Sep 2017 18:03:57 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-doc_lftp_1,v 1.1 2017/06 Index: doc/lftp.1 --- doc/lftp.1.orig +++ doc/lftp.1 -@@ -767,7 +767,8 @@ FXP is automatically used for transfers between FTP se +@@ -783,7 +783,8 @@ FXP is automatically used for transfers between FTP se Some FTP servers hide dot-files by default (e.g. \fI.htaccess\fP), and show them only when LIST command is used with \-a option. In such case try to use `set ftp:list-options \-a'. Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/net/lftp/patches/patch-src_Makefile_in,v retrieving revision 1.15 diff -u -p -u -p -r1.15 patch-src_Makefile_in --- patches/patch-src_Makefile_in 22 Aug 2017 15:48:45 -0000 1.15 +++ patches/patch-src_Makefile_in 23 Sep 2017 18:03:57 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.15 2 Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in -@@ -240,7 +240,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p +@@ -243,7 +243,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(pkgdatadir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(pkgverlib_LTLIBRARIES) Index: patches/patch-src_xheap_h =================================================================== RCS file: patches/patch-src_xheap_h diff -N patches/patch-src_xheap_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_xheap_h 23 Sep 2017 18:03:57 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +fix, otherwise we run into assert at the program end. + +Index: src/xheap.h +--- src/xheap.h.orig ++++ src/xheap.h +@@ -122,7 +122,7 @@ class xheap (public) + return m; + } + void remove(node& x) { +- if(!x.heap_index) ++ if(!x.heap_index || ptr(x.heap_index)!=&x) + return; + assert(ptr(x.heap_index)==&x); + remove(x.heap_index); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/lftp/pkg/PLIST,v retrieving revision 1.28 diff -u -p -u -p -r1.28 PLIST --- pkg/PLIST 18 Mar 2015 14:51:33 -0000 1.28 +++ pkg/PLIST 23 Sep 2017 18:03:57 -0000 @@ -5,9 +5,16 @@ bin/lftpget @man man/man1/lftp.1 @man man/man1/lftpget.1 @man man/man5/lftp.conf.5 +share/applications/ +share/applications/lftp.desktop share/examples/lftp/ share/examples/lftp/lftp.conf @sample ${SYSCONFDIR}/lftp.conf +share/icons/ +share/icons/hicolor/ +share/icons/hicolor/48x48/ +share/icons/hicolor/48x48/apps/ +share/icons/hicolor/48x48/apps/lftp-icon.png share/lftp/ share/lftp/convert-mozilla-cookies share/lftp/import-ncftp @@ -28,3 +35,7 @@ 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 +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
