Date: Wed, 28 May 2008 16:02:00 GMT From: Ganael Laplanche <ganael.laplanche@martymac.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/124069: Port update: ftp/lftp - Update to v3.7.3 Message-ID: <200805281602.m4SG206Y009620@www.freebsd.org> Resent-Message-ID: <200805281610.m4SGA2LC075780@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124069 >Category: ports >Synopsis: Port update: ftp/lftp - Update to v3.7.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed May 28 16:10:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Ganael Laplanche >Release: 8.0-CURRENT >Organization: http://contribs.martymac.com >Environment: FreeBSD home.martymac.com 8.0-CURRENT FreeBSD 8.0-CURRENT #17: Sun May 18 23:44:45 CEST 2008 root@:/usr/obj/usr/src/sys/MYKERNEL amd64 >Description: This patch updates ftp/lftp to v3.7.3 : Port changes : - Added counterparts for each with/enable configure arg, to avoid possible auto-enabling during configure step as advised in the handbook - Added new patch files/patch-lib-Makefile.in to avoid creating config.charset file - Renamed patches to stick to their actual path in the source tree I'll also take maintainership if possible. Lftp changes from 3.7.1 : (3.7.3) * added support for 2-argument SITE UTIME and MFMT commands. * added a workaround for paramiko sftp server. * included newer gnulib sources using gnulib-tool. * Polish translation updated (Jakub Bogusz). * fixed German translation encoding. (3.7.2) * fixed core dump when sending http cookies. * fixed assertion failure for ftp over http proxy (CONNECT mode). * fixed cwd tracking for ftps. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -aurN lftp.orig/Makefile lftp/Makefile --- lftp.orig/Makefile 2008-05-28 15:23:36.008451789 +0200 +++ lftp/Makefile 2008-05-28 17:02:10.054732252 +0200 @@ -6,7 +6,7 @@ # PORTNAME= lftp -PORTVERSION= 3.7.1 +PORTVERSION= 3.7.3 CATEGORIES= ftp ipv6 MASTER_SITES= ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \ ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/ \ @@ -20,7 +20,7 @@ http://lftp.cybermirror.org/ \ http://lftp.cybermirror.org/old/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ganael.laplanche@martymac.com COMMENT= Shell-like command line ftp client LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 @@ -48,20 +48,25 @@ .endif .if defined(WITH_GNUTLS) -CONFIGURE_ARGS+= --with-gnutls LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls +CONFIGURE_ARGS+= --with-gnutls +.else +CONFIGURE_ARGS+= --without-gnutls .endif .if !defined(WITHOUT_OPENSSL) .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --with-openssl +.else +CONFIGURE_ARGS+= --without-openssl .endif .if !defined(WITHOUT_NLS) USE_GETTEXT= yes +CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" .else -CONFIGURE_ARGS+=--disable-nls +CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif diff -aurN lftp.orig/distinfo lftp/distinfo --- lftp.orig/distinfo 2008-05-28 15:23:36.008451789 +0200 +++ lftp/distinfo 2008-05-28 15:24:16.689847609 +0200 @@ -1,3 +1,3 @@ -MD5 (lftp-3.7.1.tar.bz2) = 60bb61fc1a5e96392bbd2dc88b938109 -SHA256 (lftp-3.7.1.tar.bz2) = a91b411acd3e1df394a8340a8ce0352795486cbc032e49d7093dc6a9cfb42864 -SIZE (lftp-3.7.1.tar.bz2) = 1165288 +MD5 (lftp-3.7.3.tar.bz2) = fc98506620b059d712341d624eb720d6 +SHA256 (lftp-3.7.3.tar.bz2) = f81d70b148d1f460658dad8a48b21b8ed918f60211770299151b64c8e49edfcf +SIZE (lftp-3.7.3.tar.bz2) = 1315201 diff -aurN lftp.orig/files/patch-build-aux-ltmain.sh lftp/files/patch-build-aux-ltmain.sh --- lftp.orig/files/patch-build-aux-ltmain.sh 1970-01-01 01:00:00.000000000 +0100 +++ lftp/files/patch-build-aux-ltmain.sh 2008-05-28 16:42:23.468018019 +0200 @@ -0,0 +1,15 @@ +--- build-aux/ltmain.sh.orig 2007-12-29 12:41:13.000000000 +0100 ++++ build-aux/ltmain.sh 2008-05-28 16:41:23.818197162 +0200 +@@ -6058,10 +6058,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff -aurN lftp.orig/files/patch-lib-Makefile.in lftp/files/patch-lib-Makefile.in --- lftp.orig/files/patch-lib-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ lftp/files/patch-lib-Makefile.in 2008-05-28 17:41:26.766498133 +0200 @@ -0,0 +1,41 @@ +--- lib/Makefile.in.orig 2008-05-23 15:54:06.000000000 +0200 ++++ lib/Makefile.in 2008-05-28 17:40:42.280514020 +0200 +@@ -576,8 +576,6 @@ + libgnu_la_LDFLAGS = $(AM_LDFLAGS) + GPERF = gperf + LINK_WARNING_H = $(top_srcdir)/build-aux/link-warning.h +-charset_alias = $(DESTDIR)$(libdir)/charset.alias +-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp + all: $(BUILT_SOURCES) config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +@@ -1107,29 +1105,8 @@ + all-local: charset.alias ref-add.sed ref-del.sed + install-exec-local: all-local + test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) +- if test -f $(charset_alias); then \ +- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ +- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ +- rm -f $(charset_tmp) ; \ +- else \ +- if test $(GLIBC21) = no; then \ +- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ +- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ +- rm -f $(charset_tmp) ; \ +- fi ; \ +- fi + + uninstall-local: all-local +- if test -f $(charset_alias); then \ +- sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ +- if grep '^# Packages using this file: $$' $(charset_tmp) \ +- > /dev/null; then \ +- rm -f $(charset_alias); \ +- else \ +- $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \ +- fi; \ +- rm -f $(charset_tmp); \ +- fi + + charset.alias: config.charset + rm -f t-$@ $@ diff -aurN lftp.orig/files/patch-ltmain.sh lftp/files/patch-ltmain.sh --- lftp.orig/files/patch-ltmain.sh 2008-05-28 15:23:36.007452221 +0200 +++ lftp/files/patch-ltmain.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ ---- ltmain.sh.orig Fri May 23 15:22:56 2003 -+++ ltmain.sh Thu May 27 12:50:36 2004 -@@ -5425,10 +5425,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff -aurN lftp.orig/files/patch-src-Makefile.in lftp/files/patch-src-Makefile.in --- lftp.orig/files/patch-src-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ lftp/files/patch-src-Makefile.in 2008-05-28 16:42:59.533999310 +0200 @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2008-05-23 15:54:07.000000000 +0200 ++++ src/Makefile.in 2008-05-28 16:41:23.857301294 +0200 +@@ -1217,7 +1217,7 @@ + + info-am: + +-install-data-am: install-pkgdataSCRIPTS install-pkgverlibLTLIBRARIES ++install-data-am: install-pkgdataSCRIPTS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + diff -aurN lftp.orig/files/patch-src_Makefile.in lftp/files/patch-src_Makefile.in --- lftp.orig/files/patch-src_Makefile.in 2008-05-28 15:23:36.007452221 +0200 +++ lftp/files/patch-src_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Thu Dec 23 15:03:41 2004 -+++ src/Makefile.in Thu Dec 23 15:06:20 2004 -@@ -834,7 +834,7 @@ - - info-am: - --install-data-am: install-pkgdataSCRIPTS install-pkgverlibLTLIBRARIES -+install-data-am: install-pkgdataSCRIPTS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - diff -aurN lftp.orig/pkg-plist lftp/pkg-plist --- lftp.orig/pkg-plist 2008-05-28 15:23:36.007452221 +0200 +++ lftp/pkg-plist 2008-05-28 17:00:29.154625674 +0200 @@ -9,6 +9,7 @@ %%DATADIR%%/import-ncftp %%DATADIR%%/import-netscape %%DATADIR%%/verify-file +@dirrm %%DATADIR%% %%NLS%%share/locale/de/LC_MESSAGES/lftp.mo %%NLS%%share/locale/es/LC_MESSAGES/lftp.mo %%NLS%%share/locale/fr/LC_MESSAGES/lftp.mo @@ -21,4 +22,5 @@ %%NLS%%share/locale/zh_CN/LC_MESSAGES/lftp.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/lftp.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/lftp.mo -@dirrm %%DATADIR%% +%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_HK >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805281602.m4SG206Y009620>