diff options
| -rw-r--r-- | net/filezilla/Makefile | 6 | ||||
| -rw-r--r-- | net/filezilla/PLIST | 3 | ||||
| -rw-r--r-- | net/filezilla/distinfo | 11 | ||||
| -rw-r--r-- | net/filezilla/patches/patch-src_engine_ControlSocket.cpp | 15 | ||||
| -rw-r--r-- | net/filezilla/patches/patch-src_engine_socket.cpp | 21 | ||||
| -rw-r--r-- | net/filezilla/patches/patch-src_putty_unix_uxshare.c | 35 |
6 files changed, 82 insertions, 9 deletions
diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile index 56b62ca4e9e..b646c6669be 100644 --- a/net/filezilla/Makefile +++ b/net/filezilla/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.62 2015/05/06 17:01:52 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2015/07/08 16:46:43 richard Exp $ -VERSION= 3.10.3 +VERSION= 3.12.0 DISTNAME= FileZilla_${VERSION}_src PKGNAME= filezilla-${VERSION} CATEGORIES= net x11 @@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes USE_LANGUAGES= c c++ -USE_TOOLS+= gmake pkg-config msgfmt msgmerge +USE_TOOLS+= gmake pkg-config msgfmt msgmerge xgettext WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} CONFIGURE_ARGS+= --disable-autoupdatecheck diff --git a/net/filezilla/PLIST b/net/filezilla/PLIST index 9cceb545ed6..3b7c7c0a7a1 100644 --- a/net/filezilla/PLIST +++ b/net/filezilla/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2015/01/18 17:19:32 wiz Exp $ +@comment $NetBSD: PLIST,v 1.14 2015/07/08 16:46:43 richard Exp $ bin/filezilla bin/fzputtygen bin/fzsftp @@ -669,7 +669,6 @@ share/locale/el/LC_MESSAGES/filezilla.mo share/locale/es/LC_MESSAGES/filezilla.mo share/locale/et/LC_MESSAGES/filezilla.mo share/locale/eu/LC_MESSAGES/filezilla.mo -share/locale/eu_ES/LC_MESSAGES/filezilla.mo share/locale/fa_IR/LC_MESSAGES/filezilla.mo share/locale/fi_FI/LC_MESSAGES/filezilla.mo share/locale/fr/LC_MESSAGES/filezilla.mo diff --git a/net/filezilla/distinfo b/net/filezilla/distinfo index 7a650dd1ad8..c33d781bc37 100644 --- a/net/filezilla/distinfo +++ b/net/filezilla/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.24 2015/05/06 17:01:52 wiz Exp $ +$NetBSD: distinfo,v 1.25 2015/07/08 16:46:43 richard Exp $ -SHA1 (FileZilla_3.10.3_src.tar.bz2) = 81d9994797a841711e4365fb437771abc0df82a8 -RMD160 (FileZilla_3.10.3_src.tar.bz2) = cdb1a073b66bedcb7930d804a588bc437a1e1e6b -Size (FileZilla_3.10.3_src.tar.bz2) = 4430113 bytes +SHA1 (FileZilla_3.12.0_src.tar.bz2) = a0d3be9c19e15a14473f3103063dbf7eb1b8ed77 +RMD160 (FileZilla_3.12.0_src.tar.bz2) = dd6f80326b1d2d77d9e25e5bb64647576d3ba9a6 +Size (FileZilla_3.12.0_src.tar.bz2) = 4438133 bytes +SHA1 (patch-src_engine_ControlSocket.cpp) = efb71dde8ad35c8a7424ac6f0383c79950f6e495 +SHA1 (patch-src_engine_socket.cpp) = 5abbd66d0cb93fc2cf3293bcd91e413934bffe74 +SHA1 (patch-src_putty_unix_uxshare.c) = 0c3102c10b742c461fe032f081d1a642c6fd6a59 diff --git a/net/filezilla/patches/patch-src_engine_ControlSocket.cpp b/net/filezilla/patches/patch-src_engine_ControlSocket.cpp new file mode 100644 index 00000000000..517802394db --- /dev/null +++ b/net/filezilla/patches/patch-src_engine_ControlSocket.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-src_engine_ControlSocket.cpp,v 1.1 2015/07/08 16:46:43 richard Exp $ +upstream workaround for clash with 'struct mutex' on SunOS + +--- src/engine/ControlSocket.cpp.orig 2015-03-28 04:30:03.000000000 +0000 ++++ src/engine/ControlSocket.cpp +@@ -14,7 +14,9 @@ + #include <wx/filename.h> + + #ifndef __WXMSW__ ++ #define mutex mutex_override // Sadly on some platforms system headers include conflicting names + #include <netdb.h> ++ #undef mutex + #ifndef AI_IDN + #include <idna.h> + extern "C" { diff --git a/net/filezilla/patches/patch-src_engine_socket.cpp b/net/filezilla/patches/patch-src_engine_socket.cpp new file mode 100644 index 00000000000..c34e227b4e5 --- /dev/null +++ b/net/filezilla/patches/patch-src_engine_socket.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-src_engine_socket.cpp,v 1.1 2015/07/08 16:46:43 richard Exp $ +upstream workaround for clash with 'struct mutex' on SunOS + +--- src/engine/socket.cpp.orig 2015-03-20 04:30:04.000000000 +0000 ++++ src/engine/socket.cpp +@@ -19,6 +19,7 @@ + #include "mutex.h" + #include "socket.h" + #ifndef __WXMSW__ ++ #define mutex mutex_override // Sadly on some platforms system headers include conflicting names + #include <sys/types.h> + #include <sys/socket.h> + #include <netdb.h> +@@ -29,6 +30,7 @@ + #if !defined(MSG_NOSIGNAL) && !defined(SO_NOSIGPIPE) + #include <signal.h> + #endif ++ #undef mutex + #endif + + // Fixups needed on FreeBSD diff --git a/net/filezilla/patches/patch-src_putty_unix_uxshare.c b/net/filezilla/patches/patch-src_putty_unix_uxshare.c new file mode 100644 index 00000000000..71bfcb65eab --- /dev/null +++ b/net/filezilla/patches/patch-src_putty_unix_uxshare.c @@ -0,0 +1,35 @@ +$NetBSD: patch-src_putty_unix_uxshare.c,v 1.1 2015/07/08 16:46:43 richard Exp $ +Use POSIX fcntl instead of flock for setting file locking options on SunOS + +--- src/putty/unix/uxshare.c.orig 2014-12-18 15:15:44.000000000 +0000 ++++ src/putty/unix/uxshare.c +@@ -295,6 +295,13 @@ int platform_ssh_share(const char *pi_na + int lockfd; + Socket retsock; + ++ struct flock lock; ++ ++ lock.l_type = F_WRLCK; ++ lock.l_whence = SEEK_SET; ++ lock.l_start = 0; ++ lock.l_len = 0; ++ + /* + * Sort out what we're going to call the directory in which we + * keep the socket. This has the side effect of potentially +@@ -326,9 +333,15 @@ int platform_ssh_share(const char *pi_na + sfree(lockname); + return SHARE_NONE; + } ++#ifdef __sun ++ if (fcntl(lockfd, F_SETLK, &lock) == -1) { ++ *logtext = dupprintf("%s: fcntl(F_SETLK): %s", ++ lockname, strerror(errno)); ++#else + if (flock(lockfd, LOCK_EX) < 0) { + *logtext = dupprintf("%s: flock(LOCK_EX): %s", + lockname, strerror(errno)); ++#endif + sfree(dirname); + sfree(lockname); + close(lockfd); |