[csw-devel] SF.net SVN: gar:[16098] csw/mgar/pkg/lftp/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sun Nov 6 15:17:33 CET 2011
Revision: 16098
http://gar.svn.sourceforge.net/gar/?rev=16098&view=rev
Author: chninkel
Date: 2011-11-06 14:17:33 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
lftp: new upstream release
Modified Paths:
--------------
csw/mgar/pkg/lftp/trunk/Makefile
csw/mgar/pkg/lftp/trunk/checksums
csw/mgar/pkg/lftp/trunk/files/changelog.CSW
Removed Paths:
-------------
csw/mgar/pkg/lftp/trunk/files/do_not_use_sun_as_a_variable.patch
csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch
csw/mgar/pkg/lftp/trunk/files/sun_len_definition.patch
Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile 2011-11-06 13:14:28 UTC (rev 16097)
+++ csw/mgar/pkg/lftp/trunk/Makefile 2011-11-06 14:17:33 UTC (rev 16098)
@@ -13,7 +13,7 @@
###### Package information #######
NAME = lftp
-VERSION = 4.3.1
+VERSION = 4.3.3
CATEGORIES = net
DESCRIPTION = A sophisticated command-line ftp/http client
@@ -42,13 +42,6 @@
# (patch only mandatory to compile with gnutls)
#PATCHFILES = munmap.patch
-# Sun Studio 12 cc supports the __restrict__ keyword
-# but CC doesn't, that disturbs autoconf.
-# so we have to apply the following modification to
-# lftp-provided autoconf m4 macros
-# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=aa30765d64d4a50ad7ce83e78b5699223571ef36
-PATCHFILES += sun_cc_no_restrict.patch
-
PATCHFILES += dont_use_csw_getopt_h.patch
# Disable the use of IPV6_V6ONLY function
@@ -57,12 +50,6 @@
# catch the ipv4 connection even if IPV6_V6ONLY can't be set
PATCHFILES += 0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch
-# sun should not be used as a variable as sun is a macro under Solaris
-PATCHFILES += do_not_use_sun_as_a_variable.patch
-
-# SUN_LEN macro is not defined under Solaris
-PATCHFILES += sun_len_definition.patch
-
# Update the system-wide lftp.conf path in the man page
PATCHFILES += 0007-update-configuration-files-paths-in-documentation.patch
@@ -89,7 +76,6 @@
TEST_SCRIPTS =
-
include gar/category.mk
# we re-run autoconf because we patched a m4 file
Modified: csw/mgar/pkg/lftp/trunk/checksums
===================================================================
--- csw/mgar/pkg/lftp/trunk/checksums 2011-11-06 13:14:28 UTC (rev 16097)
+++ csw/mgar/pkg/lftp/trunk/checksums 2011-11-06 14:17:33 UTC (rev 16098)
@@ -1 +1 @@
-3acc58840013d16890ec6e1d01fb4103 lftp-4.3.1.tar.gz
+14bd2e4a583d07593d76da3690aef02a lftp-4.3.3.tar.gz
Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2011-11-06 13:14:28 UTC (rev 16097)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2011-11-06 14:17:33 UTC (rev 16098)
@@ -1,3 +1,13 @@
+lftp (4.3.3,REV=2011.11.06) unstable
+
+ * New upstream release.
+ * Removed patches once necessary to compile under Solaris:
+ sun_cc_no_restrict.patch
+ do_not_use_sun_as_a_variable.patch
+ sun_len_definition.patch
+
+ -- Yann Rouillard <yann at opencsw.org> Sun, 06 Nov 2011 15:16:16 +0100
+
lftp (4.3.1,REV=2011.07.19) unstable
* New upstream release.
Deleted: csw/mgar/pkg/lftp/trunk/files/do_not_use_sun_as_a_variable.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/do_not_use_sun_as_a_variable.patch 2011-11-06 13:14:28 UTC (rev 16097)
+++ csw/mgar/pkg/lftp/trunk/files/do_not_use_sun_as_a_variable.patch 2011-11-06 14:17:33 UTC (rev 16098)
@@ -1,50 +0,0 @@
---- a/src/attach.h
-+++ b/src/attach.h
-@@ -88,9 +91,9 @@ public:
- 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 s_un;
-+ socklen_t sa_len=sizeof(s_un);
-+ a_sock=accept(sock,(sockaddr*)&s_un,&sa_len);
- if(a_sock==-1 && E_RETRY(errno)) {
- Block(sock,POLLIN);
- return m;
-@@ -161,11 +164,11 @@ public:
- 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 s_un;
-+ memset(&s_un,0,sizeof(s_un));
-+ s_un.sun_family=AF_UNIX;
-+ strncpy(s_un.sun_path,path,sizeof(s_un.sun_path));
-+ if(bind(sock,(sockaddr*)&s_un,SUN_LEN(&s_un))==-1) {
- perror("bind");
- close(sock);
- sock=-1;
-@@ -219,12 +222,12 @@ public:
- m=MOVED;
- }
- if(!connected) {
-- struct sockaddr_un sun;
-- memset(&sun,0,sizeof(sun));
-- sun.sun_family=AF_UNIX;
-+ struct sockaddr_un s_un;
-+ memset(&s_un,0,sizeof(s_un));
-+ s_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(s_un.sun_path,path,sizeof(s_un.sun_path));
-+ int res=connect(sock,(sockaddr*)&s_un,SUN_LEN(&s_un));
- if(res==-1 && !NonFatalError(errno)) {
- error=Error::Fatal(xstring::format("connect(%s): %s",path,strerror(errno)));
- return MOVED;
Deleted: csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch 2011-11-06 13:14:28 UTC (rev 16097)
+++ csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch 2011-11-06 14:17:33 UTC (rev 16098)
@@ -1,22 +0,0 @@
---- lftp-4.0.6/m4/gnulib-common.m4.orig 2010-03-27 00:36:17.789995812 +0100
-+++ lftp-4.0.6/m4/gnulib-common.m4 2010-03-27 00:37:09.978083148 +0100
-@@ -104,13 +104,14 @@
- nothing if this is not supported. Do not define if restrict is
- supported directly. */
- #undef restrict
--/* Work around a bug in Sun C++: it does not support _Restrict, even
-- though the corresponding Sun C compiler does, which causes
-- "#define restrict _Restrict" in the previous line. Perhaps some future
-- version of Sun C++ will work with _Restrict; if so, it'll probably
-- define __RESTRICT, just as Sun C does. */
-+/* Work around a bug in Sun C++: it does not support _Restrict or
-+ __restrict__, even though the corresponding Sun C compiler ends up with
-+ "#define restrict _Restrict" or "#define restrict __restrict__" in the
-+ previous line. Perhaps some future version of Sun C++ will work with
-+ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
- #if defined __SUNPRO_CC && !defined __RESTRICT
- # define _Restrict
-+# define __restrict__
- #endif])
- case $ac_cv_c_restrict in
- restrict) ;;
Deleted: csw/mgar/pkg/lftp/trunk/files/sun_len_definition.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/sun_len_definition.patch 2011-11-06 13:14:28 UTC (rev 16097)
+++ csw/mgar/pkg/lftp/trunk/files/sun_len_definition.patch 2011-11-06 14:17:33 UTC (rev 16098)
@@ -1,12 +0,0 @@
---- a/src/attach.h
-+++ b/src/attach.h
-@@ -39,6 +39,9 @@
- #elif HAVE_WS2TCPIP_H
- # include <ws2tcpip.h>
- #endif
-+#ifndef SUN_LEN
-+# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen ((ptr)->sun_path))
-+#endif
-
- #include "SMTask.h"
- #include "Error.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list