pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/39809: Update net/lftp to 3.7.3



>Number:         39809
>Category:       pkg
>Synopsis:       net/lftp is not the latest stable version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Oct 26 11:20:00 +0000 2008
>Originator:     Leonardo Taccari
>Release:        NetBSD 4.0.1
>Organization:
NetBSD Italia
>Environment:
        
        
System: NetBSD bianconiglio 4.0.1 NetBSD 4.0.1 (BIANCONIGLIO) #0: Sat Oct 18 
15:44:19 CEST 2008 
leot@bianconiglio:/home/leot/builds/usr/src/sys/arch/i386/compile/BIANCONIGLIO 
i386
Architecture: i386
Machine: i386
>Description:
        Our net/lftp package in pkgsrc is not the latest stable version. In 
pkgsrc
        there is version 3.5.11 while the latest stable one is 3.7.3.

        There is also another small problem:
        ftp://ftp.iasi.roedu.net/pub/os/Linux/network/ftp/lftp/ MASTER_SITES 
does
        not contain lftp-3.5.11 nor lftp-3.7.3 distfiles.

>How-To-Repeat:
        For the former:

           $ cd ${PKGSRCDIR}/net/lftp && make show-var VARNAME=DISTNAME

        and/or

           $ cd ${PKGSRCDIR}/net/lftp && make install && lftp --version

        For the latter:

           $ ftp 
ftp://ftp.iasi.roedu.net/pub/os/Linux/network/ftp/lftp/lftp-3.5.11.tar.bz2
           $ ftp 
ftp://ftp.iasi.roedu.net/pub/os/Linux/network/ftp/lftp/lftp-3.7.3.tar.bz2

>Fix:
        Please apply the attached patches. While here I added various mirrors to
        MASTER_SITES (you can find a list here: http://lftp.yar.ru/get.html ), 
and
        I added comments to the patches (a big "thank you" to joerg@ who helped
        me to understand patches/patch-ab and patches/patch-ae) in order to fix
        pkglint(1) warnings and, especially, to make easier next lftp updates.

        Thank you a lot!


Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/lftp/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo    25 Apr 2007 18:37:38 -0000      1.42
+++ distinfo    26 Oct 2008 10:40:42 -0000
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.42 2007/04/25 18:37:38 tnn Exp $
 
-SHA1 (lftp-3.5.11.tar.bz2) = d9a3add50667cbdf98ee765d521b77f628612c0d
-RMD160 (lftp-3.5.11.tar.bz2) = a8c905073fcf13d50af11357662271985abcd220
-Size (lftp-3.5.11.tar.bz2) = 1330090 bytes
-SHA1 (patch-aa) = 6e3e8410994c7de84c5e42ad658cb72dec0f3426
-SHA1 (patch-ab) = d230522c60786a2bcbce346419d8dfce412578d3
-SHA1 (patch-ac) = 8000bf8b44b39b7f87e9d7c89bcb513aa5150753
-SHA1 (patch-ad) = 23f8250be519e7c2721adf27f094282d261061f5
-SHA1 (patch-ae) = 97f539b1e0d6dfb083aac5b17c29e9a0a60444e4
+SHA1 (lftp-3.7.3.tar.gz) = cb174d2f1e83b33226e9c2017e4b7bcedbc01c06
+RMD160 (lftp-3.7.3.tar.gz) = 3d30dcf7f381e40118101b2f6eeb3dc480b177a3
+Size (lftp-3.7.3.tar.gz) = 1844300 bytes
+SHA1 (patch-aa) = 056b8c814007410c2ef504a7a635aaf15208bd19
+SHA1 (patch-ab) = a402434e3fb0754f2d60ca41811b7e75b7a5e397
+SHA1 (patch-ac) = 93c3954db7dcd05a28c5a99f66dc96b7d0ddec76
+SHA1 (patch-ad) = a8a335baf0c9a2a89c58c7395c879d2e8b0c4407
+SHA1 (patch-ae) = 70969c91711ec5cc3323714eeabb1a056da6bf61


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/lftp/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile    18 Sep 2008 05:22:19 -0000      1.82
+++ Makefile    26 Oct 2008 10:38:49 -0000
@@ -1,17 +1,19 @@
 # $NetBSD: Makefile,v 1.82 2008/09/18 05:22:19 yyamano Exp $
 
-DISTNAME=              lftp-3.5.11
-PKGREVISION=           1
+DISTNAME=              lftp-3.7.3
 CATEGORIES=            net
 MASTER_SITES=          http://ftp.yars.free.net/pub/source/lftp/ \
-                       ftp://ftp.iasi.roedu.net/pub/os/Linux/network/ftp/lftp/ 
\
-                       http://ftp.yars.free.net/pub/source/lftp/old/
-EXTRACT_SUFX=          .tar.bz2
+       ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \
+       ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
+       ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ \
+       http://lftp.cybermirror.org/
 
 MAINTAINER=            salo%NetBSD.org@localhost
 HOMEPAGE=              http://lftp.yar.ru/
 COMMENT=               Powerful command line file transfer client
 
+#LICENSE=              gnu-gpl-v2
+
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir
 


Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/lftp/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- PLIST       11 Aug 2006 15:19:35 -0000      1.12
+++ PLIST       26 Oct 2008 10:39:14 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/08/11 15:19:35 salo Exp $
+@comment $NetBSD$
 bin/lftp
 bin/lftpget
 lib/lftp/${PKGVERSION}/cmd-mirror.so
@@ -28,6 +28,7 @@ share/locale/pl/LC_MESSAGES/lftp.mo
 share/locale/pt_BR/LC_MESSAGES/lftp.mo
 share/locale/ru/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
 @dirrm share/lftp
 @dirrm share/examples/lftp


Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/lftp/patches/patch-aa,v
retrieving revision 1.11
diff -u -p -r1.11 patch-aa
--- patches/patch-aa    11 Aug 2006 15:19:35 -0000      1.11
+++ patches/patch-aa    26 Oct 2008 10:41:12 -0000
@@ -1,9 +1,12 @@
 $NetBSD: patch-aa,v 1.11 2006/08/11 15:19:35 salo Exp $
 
---- src/Makefile.in.orig       2006-07-28 16:12:23.000000000 +0200
-+++ src/Makefile.in    2006-08-02 23:21:16.000000000 +0200
-@@ -356,7 +356,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+Do not install by default Perl scripts; they are installed via
+${INSTALL_SCRIPT} if the user set the "perl" option.
+
+--- src/Makefile.in.orig       2008-05-23 15:54:07.000000000 +0200
++++ src/Makefile.in
+@@ -633,7 +633,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  pkgverlibdir = $(pkglibdir)/$(VERSION)
  bin_SCRIPTS = lftpget
 -pkgdata_SCRIPTS = import-ncftp import-netscape verify-file 
convert-netscape-cookies
@@ -11,12 +14,12 @@ $NetBSD: patch-aa,v 1.11 2006/08/11 15:1
  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
-@@ -907,7 +907,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
+@@ -1166,7 +1166,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
  install-binPROGRAMS: install-libLTLIBRARIES
  
  installdirs:
 -      for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgverlibdir)" 
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
 +      for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" 
"$(DESTDIR)$(pkgdatadir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
  install: install-am


Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/net/lftp/patches/patch-ab,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ab
--- patches/patch-ab    14 Jun 2004 08:42:17 -0000      1.2
+++ patches/patch-ab    26 Oct 2008 10:41:27 -0000
@@ -1,11 +1,11 @@
 $NetBSD: patch-ab,v 1.2 2004/06/14 08:42:17 salo Exp $
 
---- lib/fnmatch_loop.c.orig    2004-06-09 16:00:18.000000000 +0200
-+++ lib/fnmatch_loop.c 2004-06-13 21:40:37.000000000 +0200
-@@ -250,7 +250,7 @@
+--- lib/fnmatch_loop.c.orig    2008-05-22 08:27:47.000000000 +0200
++++ lib/fnmatch_loop.c
+@@ -242,7 +242,7 @@ FCT (const CHAR *pattern, const CHAR *st
                    CHAR str[CHAR_CLASS_MAX_LENGTH + 1];
                    size_t c1 = 0;
- #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && 
defined HAVE_BTOWC)
+ #if defined _LIBC || WIDE_CHAR_SUPPORT
 -                  wctype_t wt;
 +                  wint_t wt;
  #endif


Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/net/lftp/patches/patch-ac,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ac
--- patches/patch-ac    2 Jun 2004 12:20:13 -0000       1.2
+++ patches/patch-ac    26 Oct 2008 10:41:43 -0000
@@ -1,13 +1,15 @@
 $NetBSD: patch-ac,v 1.2 2004/06/02 12:20:13 adam Exp $
 
---- Makefile.in.orig   2004-05-31 12:58:54.000000000 +0000
+The configuration files are handled by CONF_FILES.
+
+--- Makefile.in.orig   2008-05-23 15:54:08.000000000 +0200
 +++ Makefile.in
-@@ -576,7 +576,7 @@ info: info-recursive
+@@ -865,7 +865,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-data-local
 +install-data-am:
  
- install-exec-am:
+ install-dvi: install-dvi-recursive
  


Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/net/lftp/patches/patch-ad,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ad
--- patches/patch-ad    11 Aug 2006 15:19:35 -0000      1.3
+++ patches/patch-ad    26 Oct 2008 10:42:51 -0000
@@ -1,5 +1,7 @@
 $NetBSD: patch-ad,v 1.3 2006/08/11 15:19:35 salo Exp $
 
+strmode(3) is defined in <unistd.h>.
+
 --- src/ChmodJob.cc.orig       2006-07-24 08:50:18.000000000 +0000
 +++ src/ChmodJob.cc    2006-08-11 14:08:34.000000000 +0000
 @@ -22,6 +22,7 @@


Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/net/lftp/patches/patch-ae,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ae
--- patches/patch-ae    25 Apr 2007 18:37:38 -0000      1.3
+++ patches/patch-ae    26 Oct 2008 10:43:04 -0000
@@ -1,8 +1,10 @@
 $NetBSD: patch-ae,v 1.3 2007/04/25 18:37:38 tnn Exp $
 
---- po/Makefile.in.in.orig     2007-03-26 12:25:16.000000000 +0200
+Do not use $(SHELL), call directly @install_sh@.
+
+--- po/Makefile.in.in.orig     2007-12-29 20:43:19.000000000 +0100
 +++ 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.

>Unformatted:
        
        


Home | Main Index | Thread Index | Old Index