7018539 Problem with utility/lftp
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 15 Jul 2011 09:36:41 -0700
changeset 406 f556f16e55d2
parent 405 c234ebd235a4
child 407 371955ee7fe6
7018539 Problem with utility/lftp
components/lftp/Makefile
components/lftp/lftp.license
components/lftp/lftp.p5m
components/lftp/patches/lftp.1.patch
components/lftp/patches/sun_collision.patch
--- a/components/lftp/Makefile	Fri Jul 15 07:36:10 2011 -0700
+++ b/components/lftp/Makefile	Fri Jul 15 09:36:41 2011 -0700
@@ -26,12 +26,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		lftp
-COMPONENT_VERSION=	4.0.10
+COMPONENT_VERSION=	4.3.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://lftp.yar.ru/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
-COMPONENT_ARCHIVE_HASH=	sha1:b7f56d8b2c81e86e4a281f3c8835c6fe0553ab76
-COMPONENT_ARCHIVE_URL=	http://ftp.yars.free.net/pub/source/lftp/old/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH=	sha1:702023cababe34a0fe5854d792d6437c04e9f059
+COMPONENT_ARCHIVE_URL=	http://ftp.yars.free.net/pub/source/lftp/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/lftp/lftp.license	Fri Jul 15 07:36:10 2011 -0700
+++ b/components/lftp/lftp.license	Fri Jul 15 09:36:41 2011 -0700
@@ -5,7 +5,7 @@
 the language indicating that GPLv3 or any later version may be used.
 =============================================================================
 
-Copyright (c) 1996-2010 Alexander V. Lukyanov
+Copyright (c) 1996-2011 Alexander V. Lukyanov
 
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
--- a/components/lftp/lftp.p5m	Fri Jul 15 07:36:10 2011 -0700
+++ b/components/lftp/lftp.p5m	Fri Jul 15 09:36:41 2011 -0700
@@ -73,10 +73,10 @@
     original_name=SUNWlftp:etc/lftp.conf
 file path=usr/bin/lftp
 file path=usr/bin/lftpget
-file path=usr/share/lftp/convert-mozilla-cookies
-file path=usr/share/lftp/import-ncftp
-file path=usr/share/lftp/import-netscape
-file path=usr/share/lftp/verify-file
+file path=usr/share/lftp/convert-mozilla-cookies mode=0555
+file path=usr/share/lftp/import-ncftp mode=0555
+file path=usr/share/lftp/import-netscape mode=0555
+file path=usr/share/lftp/verify-file mode=0555
 file path=usr/share/locale/cs/LC_MESSAGES/lftp.mo
 file path=usr/share/locale/de/LC_MESSAGES/lftp.mo
 file path=usr/share/locale/es/LC_MESSAGES/lftp.mo
--- a/components/lftp/patches/lftp.1.patch	Fri Jul 15 07:36:10 2011 -0700
+++ b/components/lftp/patches/lftp.1.patch	Fri Jul 15 09:36:41 2011 -0700
@@ -1,5 +1,9 @@
---- doc/lftp.1.orig	Wed May 11 12:32:03 2011
-+++ doc/lftp.1	Wed May 11 12:37:14 2011
+- Solaris specific documentation change.
+- Solaris tbl(1) won't handle 'x' suffix.
+- Man page category change.
+
+--- doc/lftp.1	Tue Jun 28 02:36:24 2011
++++ doc/lftp.1	Thu Jul 14 06:55:30 2011
 @@ -68,8 +68,7 @@
  the open command.
  .PP
@@ -10,7 +14,151 @@
  URL' command, e.g. `open http://www.us.kernel.org/pub/linux'. hftp is
  ftp-over-http-proxy protocol. It can be used automatically instead of ftp
  if ftp:proxy is set to `http://proxy[:port]'. Fish is a protocol working
[email protected]@ -1743,7 +1742,7 @@
[email protected]@ -164,7 +163,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ add <name> [<loc>]	T{
+ add current place or given location to bookmarks and bind to given name
+ T}
[email protected]@ -182,7 +181,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ stat	print cache status (default)
+ on|off	turn on/off caching
+ flush	flush cache
[email protected]@ -292,7 +291,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-c	continue, reget
+ \-E	delete source files after successful transfer
+ \-a	use ascii mode (binary is the default)
[email protected]@ -318,7 +317,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-o <lfile>	T{
+ destination file name (default - basename of rfile)
+ T}
[email protected]@ -343,7 +342,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-f	plain files (default)
+ \-d	directories
+ \-a	all types
[email protected]@ -413,7 +412,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-c	continue, reget.
+ \-d	T{
+ create directories the same as file names and get the files into them instead of current directory.
[email protected]@ -436,7 +435,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l1	l	lx	.
++l1	l	l	.
+ \-c,	\-\-continue	T{
+ continue a mirror job if possible
+ T}
[email protected]@ -620,7 +619,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-c	continue, reput
+ \-d	T{
+ create directories the same as in file names and put the files into them instead of current directory
[email protected]@ -668,7 +667,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-c	T{
+ continue transfer. Requires \fIlfile.lftp-pget-status\fP file.
+ T}
[email protected]@ -690,7 +689,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-o <rfile>	T{
+ specifies remote file name (default - basename of lfile)
+ T}
[email protected]@ -745,7 +744,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-q	Be quiet.
+ \-v	Be verbose.
+ \-Q	T{
[email protected]@ -766,7 +765,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ queue \-d 3	Delete the third item in the queue.
+ queue \-m 6 4	T{
+ Move the sixth item in the queue before the fourth.
[email protected]@ -829,7 +828,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-c <count>	maximum number of iterations
+ \-d <delay>	delay between iterations
+ \-\-while\-ok	stop when command exits with non-zero code
[email protected]@ -876,7 +875,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-a	list all settings, including default values
+ \-d	list only default values, not necessary current ones
+ .TE
[email protected]@ -934,7 +933,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \-O <directory>	T{
+ specifies base directory where files should be placed
+ T}
[email protected]@ -1130,7 +1129,7 @@
+ .Sp
+ .in +0.5i
+ .TS
+-l	lx	.
++l	l	.
+ \\a	bell
+ \\e	escape
+ \\n	new line
[email protected]@ -1996,7 +1995,7 @@
  password is used.
  
  .SH SEE ALSO
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lftp/patches/sun_collision.patch	Fri Jul 15 09:36:41 2011 -0700
@@ -0,0 +1,50 @@
+--- src/attach.h.orig	Fri Jun 17 05:58:31 2011
++++ src/attach.h	Wed Jul 13 01:57:06 2011
[email protected]@ -88,9 +88,9 @@
+ 	    TimeoutS(1);
+ 	    return m;
+ 	 }
+-	 struct sockaddr_un sun;
+-	 socklen_t sa_len=sizeof(sun);
+-	 a_sock=accept(sock,(sockaddr*)&sun,&sa_len);
++	 struct sockaddr_un un;
++	 socklen_t sa_len=sizeof(un);
++	 a_sock=accept(sock,(sockaddr*)&un,&sa_len);
+ 	 if(a_sock==-1 && E_RETRY(errno)) {
+ 	    Block(sock,POLLIN);
+ 	    return m;
[email protected]@ -161,11 +161,11 @@
+ 	 int fl=fcntl(sock,F_GETFL);
+ 	 fcntl(sock,F_SETFL,fl|O_NONBLOCK);
+ 	 fcntl(sock,F_SETFD,FD_CLOEXEC);
+-	 struct sockaddr_un sun;
+-	 memset(&sun,0,sizeof(sun));
+-	 sun.sun_family=AF_UNIX;
+-	 strncpy(sun.sun_path,path,sizeof(sun.sun_path));
+-	 if(bind(sock,(sockaddr*)&sun,SUN_LEN(&sun))==-1) {
++	 struct sockaddr_un un;
++	 memset(&un,0,sizeof(un));
++	 un.sun_family=AF_UNIX;
++	 strncpy(un.sun_path,path,sizeof(un.sun_path));
++	 if(bind(sock,(sockaddr*)&un,SUN_LEN(&un))==-1) {
+ 	    perror("bind");
+ 	    close(sock);
+ 	    sock=-1;
[email protected]@ -219,12 +219,12 @@
+ 	 m=MOVED;
+       }
+       if(!connected) {
+-	 struct sockaddr_un sun;
+-	 memset(&sun,0,sizeof(sun));
+-	 sun.sun_family=AF_UNIX;
++	 struct sockaddr_un un;
++	 memset(&un,0,sizeof(un));
++	 un.sun_family=AF_UNIX;
+ 	 const char *path=AcceptTermFD::get_sock_path(pid);
+-	 strncpy(sun.sun_path,path,sizeof(sun.sun_path));
+-	 int res=connect(sock,(sockaddr*)&sun,SUN_LEN(&sun));
++	 strncpy(un.sun_path,path,sizeof(un.sun_path));
++	 int res=connect(sock,(sockaddr*)&un,SUN_LEN(&un));
+ 	 if(res==-1 && !NonFatalError(errno)) {
+ 	    error=Error::Fatal(xstring::format("connect(%s): %s",path,strerror(errno)));
+ 	    return MOVED;