From 41bc1630b8a21bfe9bf3a0e3e57b77ee164e07fc Mon Sep 17 00:00:00 2001 From: kevlo Date: Mon, 24 May 2004 07:04:44 +0000 Subject: [PATCH] upgrade to lftp 3.0.3 Submitted by : Victor Sahlstedt --- net/lftp/Makefile | 6 +++--- net/lftp/distinfo | 6 +++--- net/lftp/patches/patch-src_Filter_cc | 8 ++++---- net/lftp/patches/patch-src_PtyShell_cc | 10 +++++----- net/lftp/patches/patch-src_Resolver_cc | 10 +++++----- net/lftp/patches/patch-src_misc_cc | 8 ++++---- net/lftp/pkg/DESCR | 2 +- net/lftp/pkg/PLIST | 6 +++--- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/net/lftp/Makefile b/net/lftp/Makefile index 1898cdf51c3..6b06efde9bf 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.43 2004/02/16 06:23:23 kevlo Exp $ +# $OpenBSD: Makefile,v 1.44 2004/05/24 07:04:44 kevlo Exp $ -COMMENT= "shell-like command line ftp client" +COMMENT= "shell-like command line ftp and sftp client" -DISTNAME= lftp-2.6.12 +DISTNAME= lftp-3.0.3 CATEGORIES= net MASTER_SITES= http://the.wiretapped.net/mirrors/lftp/ \ http://the.wiretapped.net/mirrors/lftp/old/ \ diff --git a/net/lftp/distinfo b/net/lftp/distinfo index a21251d03d9..4aa2124a55c 100644 --- a/net/lftp/distinfo +++ b/net/lftp/distinfo @@ -1,3 +1,3 @@ -MD5 (lftp-2.6.12.tar.bz2) = bc5ed223daa568fda9a01f89b5000612 -RMD160 (lftp-2.6.12.tar.bz2) = dbb989cd02f5a3be54e1e89dbc8ad68bc15246b4 -SHA1 (lftp-2.6.12.tar.bz2) = 96b399211a4008ae96f7c1ce44756632250d154e +MD5 (lftp-3.0.3.tar.bz2) = ee346d91ecd280a8e7f6ea406ceed144 +RMD160 (lftp-3.0.3.tar.bz2) = 3eea740880108309c03ab4a244a3d07d089fd6f0 +SHA1 (lftp-3.0.3.tar.bz2) = 3e42c286f7a4525afbfb57899fd9f1f3be9e63ba diff --git a/net/lftp/patches/patch-src_Filter_cc b/net/lftp/patches/patch-src_Filter_cc index 1ba857f6946..bb2546d69d6 100644 --- a/net/lftp/patches/patch-src_Filter_cc +++ b/net/lftp/patches/patch-src_Filter_cc @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_Filter_cc,v 1.1 2002/12/29 00:10:48 pvalchev Exp $ ---- src/Filter.cc.orig Sat Dec 28 15:24:26 2002 -+++ src/Filter.cc Sat Dec 28 15:25:12 2002 +$OpenBSD: patch-src_Filter_cc,v 1.2 2004/05/24 07:04:46 kevlo Exp $ +--- src/Filter.cc.orig Sat May 8 22:52:07 2004 ++++ src/Filter.cc Sat May 8 22:52:37 2004 @@ -178,7 +178,7 @@ int OutputFilter::getfd() } if(a) - execvp(a->a0(),a->GetV()); + execvp(a->a0(),a->GetVNonConst()); - execl("/bin/sh","sh","-c",name,NULL); + execl("/bin/sh","sh","-c",name,(void *)NULL); fprintf(stderr,_("execl(/bin/sh) failed: %s\n"),strerror(errno)); diff --git a/net/lftp/patches/patch-src_PtyShell_cc b/net/lftp/patches/patch-src_PtyShell_cc index c5af017382f..7bf52d12b12 100644 --- a/net/lftp/patches/patch-src_PtyShell_cc +++ b/net/lftp/patches/patch-src_PtyShell_cc @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_PtyShell_cc,v 1.3 2002/12/29 00:10:48 pvalchev Exp $ ---- src/PtyShell.cc.orig Sat Dec 28 15:24:54 2002 -+++ src/PtyShell.cc Sat Dec 28 15:25:28 2002 -@@ -114,7 +114,7 @@ int PtyShell::getfd() +$OpenBSD: patch-src_PtyShell_cc,v 1.4 2004/05/24 07:04:46 kevlo Exp $ +--- src/PtyShell.cc.orig Sat May 8 22:53:10 2004 ++++ src/PtyShell.cc Sat May 8 22:53:39 2004 +@@ -150,7 +150,7 @@ int PtyShell::getfd() putenv((char*)"LANGUAGE=C"); if(a) - execvp(a->a0(),a->GetV()); + execvp(a->a0(),a->GetVNonConst()); - execl("/bin/sh","sh","-c",name,NULL); + execl("/bin/sh","sh","-c",name,(void *)NULL); fprintf(stderr,_("execl(/bin/sh) failed: %s\n"),strerror(errno)); diff --git a/net/lftp/patches/patch-src_Resolver_cc b/net/lftp/patches/patch-src_Resolver_cc index 193a296ab3c..b1660ec72c5 100644 --- a/net/lftp/patches/patch-src_Resolver_cc +++ b/net/lftp/patches/patch-src_Resolver_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-src_Resolver_cc,v 1.1 2002/10/01 12:13:02 naddy Exp $ ---- src/Resolver.cc.orig Mon Sep 30 09:31:34 2002 -+++ src/Resolver.cc Mon Sep 30 09:31:49 2002 -@@ -748,8 +748,6 @@ void Resolver::LookupOne(const char *nam - # endif +$OpenBSD: patch-src_Resolver_cc,v 1.2 2004/05/24 07:04:46 kevlo Exp $ +--- src/Resolver.cc.orig Sat May 8 22:53:56 2004 ++++ src/Resolver.cc Sat May 8 22:54:41 2004 +@@ -752,8 +752,6 @@ void Resolver::LookupOne(const char *nam + # undef h_errno // it could be a macro, but we want it to be local variable. int h_errno=0; ha=getipnodebyname(name,af,0,&h_errno); -# elif defined(HAVE_GETHOSTBYNAME2) diff --git a/net/lftp/patches/patch-src_misc_cc b/net/lftp/patches/patch-src_misc_cc index 8cc9f1211c7..d60b02d9354 100644 --- a/net/lftp/patches/patch-src_misc_cc +++ b/net/lftp/patches/patch-src_misc_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_misc_cc,v 1.1 2002/12/29 00:10:48 pvalchev Exp $ ---- src/misc.cc.orig Sat Dec 28 15:24:50 2002 -+++ src/misc.cc Sat Dec 28 15:25:18 2002 -@@ -258,7 +258,7 @@ void truncate_file_tree(const char *dir +$OpenBSD: patch-src_misc_cc,v 1.2 2004/05/24 07:04:46 kevlo Exp $ +--- src/misc.cc.orig Sat May 8 22:55:29 2004 ++++ src/misc.cc Sat May 8 22:55:55 2004 +@@ -263,7 +263,7 @@ void truncate_file_tree(const char *dir SignalHook::Ignore(SIGTSTP); SignalHook::Ignore(SIGQUIT); SignalHook::Ignore(SIGHUP); diff --git a/net/lftp/pkg/DESCR b/net/lftp/pkg/DESCR index aca0283d8cd..380c1079720 100644 --- a/net/lftp/pkg/DESCR +++ b/net/lftp/pkg/DESCR @@ -1,4 +1,4 @@ -LFTP is a shell-like command line ftp client. +LFTP is a shell-like command line ftp and sftp client. It is reliable: can retry operations and does reget automatically. It can do several transfers simultaneously in background. You can start a transfer in background and continue browsing diff --git a/net/lftp/pkg/PLIST b/net/lftp/pkg/PLIST index 1fb8bbdba3b..0d5ee3d5bdd 100644 --- a/net/lftp/pkg/PLIST +++ b/net/lftp/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.11 2004/04/14 18:59:08 xsa Exp $ +@comment $OpenBSD: PLIST,v 1.12 2004/05/24 07:04:47 kevlo Exp $ bin/lftp bin/lftpget man/man1/lftp.1 @@ -22,5 +22,5 @@ share/locale/zh_TW/LC_MESSAGES/lftp.mo @dirrm share/locale/zh_CN @dirrm share/lftp @dirrm share/examples/lftp -@cwd ${SYSCONFDIR} -@extra lftp.conf +@exec mkdir -p %D/lib/lftp +@dirrm lib/lftp