diff options
author | adam <adam> | 2013-05-18 20:23:03 +0000 |
---|---|---|
committer | adam <adam> | 2013-05-18 20:23:03 +0000 |
commit | f7e76bc03a951564a0984873a1d6e44fded1c49a (patch) | |
tree | 4d9518d07a7098278ac50dbbc999871e102f341a /net/lftp | |
parent | ea9e6729b7a0d010e5d03c4b5ac2f375a82a0450 (diff) | |
download | pkgsrc-f7e76bc03a951564a0984873a1d6e44fded1c49a.tar.gz |
Changes 4.4.6:
* improved sftp backend with symlink info retrieving (readlink).
* new cls option -a to show dot files.
* new setting cmd:cls-exact-time.
* fixed NULL dereference when torrent:use-dht is off.
* fixed torrent for info_hash with NUL character (broken in 4.4.4).
Diffstat (limited to 'net/lftp')
-rw-r--r-- | net/lftp/Makefile | 57 | ||||
-rw-r--r-- | net/lftp/PLIST | 5 | ||||
-rw-r--r-- | net/lftp/PLIST.perl | 3 | ||||
-rw-r--r-- | net/lftp/distinfo | 20 | ||||
-rw-r--r-- | net/lftp/options.mk | 19 | ||||
-rw-r--r-- | net/lftp/patches/patch-aa | 16 | ||||
-rw-r--r-- | net/lftp/patches/patch-ac | 4 | ||||
-rw-r--r-- | net/lftp/patches/patch-ad | 4 | ||||
-rw-r--r-- | net/lftp/patches/patch-ae | 4 | ||||
-rw-r--r-- | net/lftp/patches/patch-configure.ac | 18 | ||||
-rw-r--r-- | net/lftp/patches/patch-lib_inttypes.in.h | 16 | ||||
-rw-r--r-- | net/lftp/patches/patch-lib_stdio.in.h | 14 | ||||
-rw-r--r-- | net/lftp/patches/patch-src_module.cc | 18 |
13 files changed, 115 insertions, 83 deletions
diff --git a/net/lftp/Makefile b/net/lftp/Makefile index 83cbffc1f35..4a992dd8aea 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -1,40 +1,36 @@ -# $NetBSD: Makefile,v 1.102 2013/02/06 23:23:17 jperkin Exp $ - -DISTNAME= lftp-4.3.3 -PKGREVISION= 2 -CATEGORIES= net -MASTER_SITES= http://ftp.yars.free.net/pub/source/lftp/ \ - ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \ - http://lftp.cybermirror.org/ - -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pettai@NetBSD.org -HOMEPAGE= http://lftp.yar.ru/ -COMMENT= Powerful command line file transfer client -LICENSE= gnu-gpl-v3 +# $NetBSD: Makefile,v 1.103 2013/05/18 20:23:03 adam Exp $ + +DISTNAME= lftp-4.4.6 +CATEGORIES= net +MASTER_SITES= http://ftp.yar.ru/pub/source/lftp/ \ + ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \ + ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ \ + ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \ + http://lftp.cybermirror.org/ +EXTRACT_SUFX= .tar.xz + +MAINTAINER= pettai@NetBSD.org +HOMEPAGE= http://lftp.yar.ru/ +COMMENT= Powerful command line file transfer client +LICENSE= gnu-gpl-v3 PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_TOOLS+= bison -MAKE_JOBS_SAFE= no -USE_PKGLOCALEDIR= YES +USE_GNU_READLINE= yes # uses _rl_mark_modified_lines USE_LANGUAGES= c c++ -USE_LIBTOOL= YES -GNU_CONFIGURE= YES -USE_GNU_READLINE= YES # uses GNU readline internal _rl_mark_modified_lines +USE_LIBTOOL= yes +USE_PKGLOCALEDIR= yes +USE_TOOLS+= autoconf bison +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-modules +REPLACE_SH= src/xdg-move SHLIBTOOL_OVERRIDE= # empty .include "options.mk" -PLIST_SRC+= ${PKGDIR}/PLIST - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --with-modules - LDFLAGS.Darwin+= -flat_namespace - .if ${OPSYS} == "Darwin" INSTALL_UNSTRIPPED= yes .endif @@ -42,7 +38,11 @@ INSTALL_UNSTRIPPED= yes EGDIR= ${PREFIX}/share/examples/lftp CONF_FILES= ${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf -INSTALLATION_DIRS= bin lib/lftp ${PKGMANDIR}/man1 share/examples/lftp share/lftp +INSTALLATION_DIRS= bin lib/lftp ${PKGMANDIR}/man1 +INSTALLATION_DIRS+= share/examples/lftp share/lftp + +pre-configure: + cd ${WRKSRC} && autoconf post-install: post-install-perl ${INSTALL_DATA} ${WRKSRC}/lftp.conf ${DESTDIR}${EGDIR}/lftp.conf.default @@ -51,5 +51,4 @@ post-install: post-install-perl .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/net/lftp/PLIST b/net/lftp/PLIST index 9468aedaf96..4311d6327ab 100644 --- a/net/lftp/PLIST +++ b/net/lftp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2010/07/25 21:38:34 pettai Exp $ +@comment $NetBSD: PLIST,v 1.18 2013/05/18 20:23:03 adam Exp $ bin/lftp bin/lftpget @comment belongs to libiconv: lib/charset.alias @@ -18,8 +18,11 @@ man/man1/lftp.1 man/man1/lftpget.1 man/man5/lftp.conf.5 share/examples/lftp/lftp.conf.default +${PLIST.perl}share/lftp/convert-mozilla-cookies share/lftp/import-ncftp share/lftp/import-netscape +${PLIST.perl}share/lftp/verify-file +share/lftp/xdg-move share/locale/cs/LC_MESSAGES/lftp.mo share/locale/de/LC_MESSAGES/lftp.mo share/locale/es/LC_MESSAGES/lftp.mo diff --git a/net/lftp/PLIST.perl b/net/lftp/PLIST.perl deleted file mode 100644 index 7387e75fff4..00000000000 --- a/net/lftp/PLIST.perl +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.perl,v 1.2 2011/03/10 23:38:42 pettai Exp $ -share/lftp/convert-mozilla-cookies -share/lftp/verify-file diff --git a/net/lftp/distinfo b/net/lftp/distinfo index 5d7237b54a9..783b4a3c6b5 100644 --- a/net/lftp/distinfo +++ b/net/lftp/distinfo @@ -1,11 +1,13 @@ -$NetBSD: distinfo,v 1.60 2013/02/26 14:47:16 jperkin Exp $ +$NetBSD: distinfo,v 1.61 2013/05/18 20:23:03 adam Exp $ -SHA1 (lftp-4.3.3.tar.bz2) = dc4c47366b28cccf94a599d11acb18f9b3f833be -RMD160 (lftp-4.3.3.tar.bz2) = 3a8e212323bf58c14f5f0dca05d8b9fddb461747 -Size (lftp-4.3.3.tar.bz2) = 1795860 bytes -SHA1 (patch-aa) = fee203675df2863830d8b0aaddac44169926709d +SHA1 (lftp-4.4.6.tar.xz) = 76a61015adec55c0d6d5eb013d4cf3f108fd96a0 +RMD160 (lftp-4.4.6.tar.xz) = 14ed0f6f5076750cb0661364a6e0a751d4512697 +Size (lftp-4.4.6.tar.xz) = 1429480 bytes +SHA1 (patch-aa) = 988f4f2f5b9469d3c645ffa984d5449a219229bb SHA1 (patch-ab) = cbf428fb51c64431eb32d25160303333ce695b5a -SHA1 (patch-ac) = 32e1fba23d4d6bd0b06bacbe503cb9b39d2bf825 -SHA1 (patch-ad) = 365c205cf83f65b7253b71e67e530ac2fcf58154 -SHA1 (patch-ae) = 3ee418b94cc1afb7b2db5bc550fd966d346368a4 -SHA1 (patch-lib_stdio.in.h) = 9e892220d466cb40b58c01159af816a7364bfac6 +SHA1 (patch-ac) = 8aa2ddc582bbc87cd0a5e8662f328dd2ac8dea90 +SHA1 (patch-ad) = daf9867bf3d42d82c6abe9200f3e8db8f91319e9 +SHA1 (patch-ae) = 4e2506bbadbda97feeabb208cd43c0dff70ed7d3 +SHA1 (patch-configure.ac) = 3264108e79adf637fa631dfe3787aa64c6f84743 +SHA1 (patch-lib_inttypes.in.h) = 36d4cabc7fd9beef8f93973370ef5125c38ca121 +SHA1 (patch-src_module.cc) = 236fe2ce4ff215ddfe44fc86ed43ed00849280b8 diff --git a/net/lftp/options.mk b/net/lftp/options.mk index 884830761b4..2d91e9988ac 100644 --- a/net/lftp/options.mk +++ b/net/lftp/options.mk @@ -1,22 +1,19 @@ -# $NetBSD: options.mk,v 1.12 2012/01/09 14:53:31 drochner Exp $ -# +# $NetBSD: options.mk,v 1.13 2013/05/18 20:23:03 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lftp - PKG_OPTIONS_OPTIONAL_GROUPS= ssl PKG_OPTIONS_GROUP.ssl= gnutls ssl - PKG_SUPPORTED_OPTIONS= perl dnssec PKG_SUGGESTED_OPTIONS= ssl .include "../../mk/bsd.options.mk" -### -### SSL support -### +PLIST_VARS+= perl + +# SSL support .if !empty(PKG_OPTIONS:Mgnutls) +USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --without-openssl -USE_TOOLS+= pkg-config . include "../../security/gnutls/buildlink3.mk" .elif !empty(PKG_OPTIONS:Mssl) CONFIGURE_ARGS+= --without-gnutls @@ -34,7 +31,7 @@ USE_TOOLS+= perl:run DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5 DEPENDS+= p5-String-CRC32-[0-9]*:../../textproc/p5-String-CRC32 REPLACE_PERL+= src/convert-mozilla-cookies src/verify-file -PLIST_SRC+= ${PKGDIR}/PLIST.perl +PLIST.perl= yes post-install-perl: ${INSTALL_SCRIPT} ${WRKSRC}/src/convert-mozilla-cookies \ @@ -43,9 +40,7 @@ post-install-perl: post-install-perl: .endif -### -### DNSSEC support -### +# DNSSEC support .if !empty(PKG_OPTIONS:Mdnssec) . include "../../security/dnssec-tools/buildlink3.mk" CONFIGURE_ARGS+= --with-dnssec-local-validation diff --git a/net/lftp/patches/patch-aa b/net/lftp/patches/patch-aa index b674a76ce36..794c013d3d7 100644 --- a/net/lftp/patches/patch-aa +++ b/net/lftp/patches/patch-aa @@ -1,24 +1,22 @@ -$NetBSD: patch-aa,v 1.17 2011/07/27 04:57:47 pettai Exp $ +$NetBSD: patch-aa,v 1.18 2013/05/18 20:23:03 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. -$NetBSD: patch-aa,v 1.17 2011/07/27 04:57:47 pettai Exp $ - ---- src/Makefile.in.orig 2011-06-28 09:31:02.000000000 +0000 +--- src/Makefile.in.orig 2013-05-17 10:02:35.000000000 +0000 +++ src/Makefile.in -@@ -1265,7 +1265,7 @@ top_builddir = @top_builddir@ +@@ -1567,7 +1567,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 -+pkgdata_SCRIPTS = import-ncftp import-netscape +-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 -@@ -1865,7 +1865,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA +@@ -2201,7 +2201,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA install-binPROGRAMS: install-libLTLIBRARIES installdirs: @@ -27,7 +25,7 @@ $NetBSD: patch-aa,v 1.17 2011/07/27 04:57:47 pettai Exp $ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1995,6 +1995,9 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -2337,6 +2337,9 @@ uninstall-am: uninstall-binPROGRAMS unin # libtool does not strip modules, do it here. install-data-hook: diff --git a/net/lftp/patches/patch-ac b/net/lftp/patches/patch-ac index 4b755835337..ad564b17d2c 100644 --- a/net/lftp/patches/patch-ac +++ b/net/lftp/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.4 2009/06/08 10:16:22 hasso Exp $ +$NetBSD: patch-ac,v 1.5 2013/05/18 20:23:03 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 -@@ -1138,7 +1138,7 @@ info: info-recursive +@@ -1871,7 +1871,7 @@ info: info-recursive info-am: diff --git a/net/lftp/patches/patch-ad b/net/lftp/patches/patch-ad index c8e86e0f852..a3399ece083 100644 --- a/net/lftp/patches/patch-ad +++ b/net/lftp/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.6 2010/02/07 14:36:40 tnn Exp $ +$NetBSD: patch-ad,v 1.7 2013/05/18 20:23:03 adam Exp $ --- src/lftp_tinfo.cc.orig 2008-11-27 05:56:39.000000000 +0000 +++ src/lftp_tinfo.cc -@@ -37,7 +37,8 @@ extern "C" { +@@ -34,7 +34,8 @@ extern "C" { # elif defined(HAVE_TERM_H) # include <term.h> # endif diff --git a/net/lftp/patches/patch-ae b/net/lftp/patches/patch-ae index 46e9c413503..d0b832b8c1e 100644 --- a/net/lftp/patches/patch-ae +++ b/net/lftp/patches/patch-ae @@ -1,10 +1,10 @@ -$NetBSD: patch-ae,v 1.4 2009/06/08 10:16:22 hasso Exp $ +$NetBSD: patch-ae,v 1.5 2013/05/18 20:23:03 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 -@@ -38,8 +38,8 @@ INSTALL_DATA = @INSTALL_DATA@ +@@ -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. diff --git a/net/lftp/patches/patch-configure.ac b/net/lftp/patches/patch-configure.ac new file mode 100644 index 00000000000..3ff18cba5ff --- /dev/null +++ b/net/lftp/patches/patch-configure.ac @@ -0,0 +1,18 @@ +$NetBSD: patch-configure.ac,v 1.1 2013/05/18 20:23:03 adam Exp $ + +GNU lib tests must be run with C compiler. + +--- configure.ac.orig 2013-05-18 20:01:23.000000000 +0000 ++++ configure.ac +@@ -237,9 +237,9 @@ fi + AM_PROG_LIBTOOL + LIBTOOL="$LIBTOOL --silent" + +-AC_LANG_PUSH(C++) ++AC_LANG_PUSH(C) + gl_INIT +-AC_LANG_POP(C++) ++AC_LANG_POP(C) + + if test x$ac_cv_func_wcwidth != xyes || test x$REPLACE_WCWIDTH = x1; then + gl_LIBOBJ([wcwidth]) diff --git a/net/lftp/patches/patch-lib_inttypes.in.h b/net/lftp/patches/patch-lib_inttypes.in.h new file mode 100644 index 00000000000..6c16c07e465 --- /dev/null +++ b/net/lftp/patches/patch-lib_inttypes.in.h @@ -0,0 +1,16 @@ +$NetBSD: patch-lib_inttypes.in.h,v 1.1 2013/05/18 20:23:03 adam Exp $ + +Poratbility obstacle. + +--- lib/inttypes.in.h.orig 2013-05-18 20:12:09.000000000 +0000 ++++ lib/inttypes.in.h +@@ -52,9 +52,6 @@ + /* Get CHAR_BIT. */ + #include <limits.h> + +-#if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX) +-# error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to <bug-gnulib@gnu.org>." +-#endif + + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + diff --git a/net/lftp/patches/patch-lib_stdio.in.h b/net/lftp/patches/patch-lib_stdio.in.h deleted file mode 100644 index b37374a40fb..00000000000 --- a/net/lftp/patches/patch-lib_stdio.in.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-lib_stdio.in.h,v 1.1 2013/02/26 14:47:16 jperkin Exp $ - -Remove broken gets() warning, conflicts with std::gets. - ---- lib/stdio.in.h.orig 2011-09-29 09:54:41.000000000 +0000 -+++ lib/stdio.in.h -@@ -715,7 +715,6 @@ _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - - diff --git a/net/lftp/patches/patch-src_module.cc b/net/lftp/patches/patch-src_module.cc new file mode 100644 index 00000000000..1d53b7ba321 --- /dev/null +++ b/net/lftp/patches/patch-src_module.cc @@ -0,0 +1,18 @@ +$NetBSD: patch-src_module.cc,v 1.1 2013/05/18 20:23:03 adam Exp $ + +Darwin actually expects .so extension. + +--- src/module.cc.orig 2013-05-18 18:29:32.000000000 +0000 ++++ src/module.cc +@@ -117,11 +117,7 @@ static ResDecl res_mod_path("module:path + /* dlopen can take a file without extension and automatically do the + * right thing, however that doesn't fit with this code that tries to + * stat before the dlopen call, hence need some help here */ +-#if defined(__MACH__) && defined(__APPLE__) +-static const char ext[] = ".bundle"; +-#else + static const char ext[] = ".so"; +-#endif + + static int access_so(xstring &fullpath) + { |