[pkgsrc/trunk]: pkgsrc/net/lftp Version 4.0.1 - 2009-09-17

[hasso <hasso%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28116f9ba143
branches:  trunk
changeset: 399359:28116f9ba143
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Fri Sep 18 16:22:18 2009 +0000

description:
Version 4.0.1 - 2009-09-17

* ignore `Status of' line in STAT output (ftp).
* fixed handling of files starting with a tilde in ftp.
* fixed an infinite bind-loop in ftp.
* fixed iconv translit usage for NetBSD.

diffstat:

 net/lftp/Makefile         |   4 +-
 net/lftp/distinfo         |  11 ++-----
 net/lftp/patches/patch-ad |  14 ----------
 net/lftp/patches/patch-ah |  12 --------
 net/lftp/patches/patch-ai |  65 -----------------------------------------------
 5 files changed, 6 insertions(+), 100 deletions(-)

diffs (137 lines):

diff -r 0cb6c1db3afd -r 28116f9ba143 net/lftp/Makefile
--- a/net/lftp/Makefile Fri Sep 18 14:51:56 2009 +0000
+++ b/net/lftp/Makefile Fri Sep 18 16:22:18 2009 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.88 2009/09/16 07:13:20 hasso Exp $
+# $NetBSD: Makefile,v 1.89 2009/09/18 16:22:18 hasso Exp $
 
-DISTNAME=              lftp-4.0.0
+DISTNAME=              lftp-4.0.1
 CATEGORIES=            net
 MASTER_SITES=          http://ftp.yars.free.net/pub/source/lftp/ \
                        ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
diff -r 0cb6c1db3afd -r 28116f9ba143 net/lftp/distinfo
--- a/net/lftp/distinfo Fri Sep 18 14:51:56 2009 +0000
+++ b/net/lftp/distinfo Fri Sep 18 16:22:18 2009 +0000
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.48 2009/09/16 11:34:23 hasso Exp $
+$NetBSD: distinfo,v 1.49 2009/09/18 16:22:18 hasso Exp $
 
-SHA1 (lftp-4.0.0.tar.bz2) = 908397b581a68e6206ade4f798a68d8390aebf42
-RMD160 (lftp-4.0.0.tar.bz2) = 7ca6ee013733180bc3b45db13dda1b1eb2cd9acc
-Size (lftp-4.0.0.tar.bz2) = 1580362 bytes
+SHA1 (lftp-4.0.1.tar.bz2) = 01bcf6c053efab68c2e5ccf3ceb6c944db16aac3
+RMD160 (lftp-4.0.1.tar.bz2) = 7ca64c5544fc2dbcc0e7b9804f3eccb64316bb86
+Size (lftp-4.0.1.tar.bz2) = 1580251 bytes
 SHA1 (patch-aa) = 62af66bc66593164eb13fb25e63ff1b0e68f870b
 SHA1 (patch-ab) = 65c92b264873b45c69a0dfde2d2715dca0b6dc36
 SHA1 (patch-ac) = 32e1fba23d4d6bd0b06bacbe503cb9b39d2bf825
-SHA1 (patch-ad) = a8a335baf0c9a2a89c58c7395c879d2e8b0c4407
 SHA1 (patch-ae) = 3ee418b94cc1afb7b2db5bc550fd966d346368a4
 SHA1 (patch-af) = 69c414ab28cbdfb86e4981fb7eaa7985b8384838
 SHA1 (patch-ag) = 9eda126e106cee0cae6be691ad8bece921c9c0a9
-SHA1 (patch-ah) = 0fe8a0d179cca0d747d5b43e0db1617d22e0cc3a
-SHA1 (patch-ai) = cd6720e86c8809fe1606c534519ce2797afc84c9
diff -r 0cb6c1db3afd -r 28116f9ba143 net/lftp/patches/patch-ad
--- a/net/lftp/patches/patch-ad Fri Sep 18 14:51:56 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2009/06/08 10:16:22 hasso 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 @@
- 
- #include <config.h>
- #include <assert.h>
-+#include <unistd.h>
- #include "ChmodJob.h"
- #include "url.h"
- 
diff -r 0cb6c1db3afd -r 28116f9ba143 net/lftp/patches/patch-ah
--- a/net/lftp/patches/patch-ah Fri Sep 18 14:51:56 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/09/16 07:13:20 hasso Exp $
-
---- src/Torrent.cc.orig        2009-09-16 08:23:06 +0300
-+++ src/Torrent.cc     2009-09-16 08:24:21 +0300
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <sys/socket.h>
-+#include <sys/stat.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <unistd.h>
diff -r 0cb6c1db3afd -r 28116f9ba143 net/lftp/patches/patch-ai
--- a/net/lftp/patches/patch-ai Fri Sep 18 14:51:56 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2009/09/16 11:34:23 hasso Exp $
-
---- src/buffer.cc.orig
-+++ src/buffer.cc
-@@ -247,11 +247,6 @@ void DataTranslator::AppendTranslated(Bu
- #ifdef HAVE_ICONV
- void DataRecoder::PutTranslated(Buffer *target,const char *put_buf,int size)
- {
--   if(!backend_translate)
--   {
--      target->Put(put_buf,size);
--      return;
--   }
-    bool from_untranslated=false;
-    if(Size()>0)
-    {
-@@ -261,6 +256,13 @@ void DataRecoder::PutTranslated(Buffer *
-    }
-    if(size<=0)
-       return;
-+   if(!backend_translate)
-+   {
-+      target->Put(put_buf,size);
-+      if(from_untranslated)
-+       Skip(size);
-+      return;
-+   }
-    size_t put_size=size;
- 
-    int size_coeff=6;
-@@ -313,20 +315,23 @@ DataRecoder::~DataRecoder()
- }
- DataRecoder::DataRecoder(const char *from_code,const char *to_code,bool translit)
- {
--   if(translit)
--   {
--      const char *add="//TRANSLIT";
--      char *tmp_enc=alloca_strdup2(to_code,strlen(add));
--      strcat(tmp_enc,add);
--      to_code=tmp_enc;
-+   backend_translate=0;
-+
-+   if(translit) {
-+      const char *to_code_translit=xstring::cat(to_code,"//TRANSLIT",NULL);
-+      backend_translate=iconv_open(to_code_translit,from_code);
-+      if(backend_translate!=(iconv_t)-1)
-+       return;
-+      backend_translate=0;
-    }
-+
-    backend_translate=iconv_open(to_code,from_code);
--   if(backend_translate==(iconv_t)-1)
--   {
--      Log::global->Format(0,"iconv_open(%s,%s) failed: %s\n",
-+   if(backend_translate!=(iconv_t)-1)
-+      return;
-+
-+   Log::global->Format(0,"iconv_open(%s,%s) failed: %s\n",
-                             to_code,from_code,strerror(errno));
--      backend_translate=0;
--   }
-+   backend_translate=0;
- }
- 
- void DirectedBuffer::SetTranslation(const char *enc,bool translit)