Date: Fri, 5 Dec 2014 16:55:19 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374057 - in head: . ftp ftp/gftp ftp/gftp/files Message-ID: <201412051655.sB5GtJA1020756@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Dec 5 16:55:18 2014 New Revision: 374057 URL: https://svnweb.freebsd.org/changeset/ports/374057 QAT: https://qat.redports.org/buildarchive/r374057/ Log: - Resurrect, unbreak, stagify, modernize Makefile - Switch to the tar.bz2 distfile (it is 37% smaller) - Fix a segmentation fault (patch obtained from Gentoo) - Define LICENSE (GPLv2) and make GUI compulsory for now (when configured for non-GUI, it doesn't install universally required `gftprc' file, and generally requires more work to correctly decouple frontend programs) - Rename one ::-containing patch file, remove unneeded ones - Cleanup MASTER_SITES, update pkg-plist and pkg-descr Added: head/ftp/gftp/ - copied from r337184, head/ftp/gftp/ head/ftp/gftp/files/patch-lib-misc.c (contents, props changed) head/ftp/gftp/files/patch-lib-pty.c - copied unchanged from r337184, head/ftp/gftp/files/patch-lib::pty.c Deleted: head/ftp/gftp/files/patch-ab head/ftp/gftp/files/patch-configure head/ftp/gftp/files/patch-lib-protocols.c head/ftp/gftp/files/patch-lib::pty.c Modified: head/MOVED head/ftp/Makefile head/ftp/gftp/Makefile head/ftp/gftp/distinfo head/ftp/gftp/pkg-descr head/ftp/gftp/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Fri Dec 5 16:54:23 2014 (r374056) +++ head/MOVED Fri Dec 5 16:55:18 2014 (r374057) @@ -5304,7 +5304,6 @@ lang/slib-gauche||2013-12-22|Has expired graphics/f-spot||2013-12-22|Has expired: Broken for more than 6 month sysutils/linux-megamgr||2013-12-22|Has expired: Broken for more than 6 month games/linux-savage-samuraiwars||2013-12-22|Has expired: Broken for more than 6 month -ftp/gftp||2013-12-22|Has expired: Broken for more than 6 month devel/hs-DeepArrow||2013-12-22|Has expired: Broken for more than 6 month converters/py-svglib||2013-12-22|Has expired: Broken for more than 6 month converters/p5-Unicode-Lite||2013-12-22|Has expired: Broken for more than 6 month Modified: head/ftp/Makefile ============================================================================== --- head/ftp/Makefile Fri Dec 5 16:54:23 2014 (r374056) +++ head/ftp/Makefile Fri Dec 5 16:55:18 2014 (r374057) @@ -29,6 +29,7 @@ SUBDIR += ftpproxy SUBDIR += ftpsesame SUBDIR += ftpsync + SUBDIR += gftp SUBDIR += gnusget SUBDIR += gnustep-ftp SUBDIR += gstreamer1-plugins-curl Modified: head/ftp/gftp/Makefile ============================================================================== --- head/ftp/gftp/Makefile Sun Dec 22 11:42:11 2013 (r337184) +++ head/ftp/gftp/Makefile Fri Dec 5 16:55:18 2014 (r374057) @@ -5,61 +5,26 @@ PORTNAME= gftp PORTVERSION= 2.0.19 PORTREVISION= 5 CATEGORIES= ftp -MASTER_SITES= http://gftp.seul.org/ \ - ftp://gftp.seul.org/pub/gftp/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} +MASTER_SITES= http://gftp.seul.org/ MAINTAINER= oliver@FreeBSD.org -COMMENT= A free multithreaded GTK-based GUI ftp and sftp client +COMMENT= Free multithreaded GTK-based FTP and SFTP client -GNU_CONFIGURE= yes - -CONFIGURE_ARGS= --without-included-gettext -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CPPFLAGS+= -I${LOCALBASE}/include - -WANT_GNOME= yes +LICENSE= GPLv2 -DEPRECATED= Broken for more than 6 month -EXPIRATION_DATE= 2013-12-22 +USES= pathfix pkgconfig tar:bzip2 +GNU_CONFIGURE= yes +USE_GNOME= glib20 gtk20 +USE_OPENSSL= yes -BROKEN= Dumps core when connecting to a host with pthread_mutex_lock: Operation not permitted +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes -OPTIONS_DEFINE= X11 NLS -OPTIONS_DEFAULT= X11 +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 -.endif - -USES= pathfix - -.if ${PORT_OPTIONS:MX11} -PLIST_SUB+= NOX11:="" -WANT_GNOME= yes -USE_GNOME+= gtk20 -CONFIGURE_ENV+= _GTHREAD_LIBS="-lgthread-2.0" -.else -CONFIGURE_ARGS+=--disable-gtkport -USE_GNOME+= glib20 -PLIST_SUB+= NOX11:="@comment " -.endif - -MAN1= gftp.1 - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ @@ -67,9 +32,5 @@ post-patch: @${REINPLACE_CMD} -e 's|size_t dest_len|size_t *dest_len|g ; \ s|\(gftp_filename_from_utf8 (gftp_request \* request,\) int force_local,|\1|' \ ${WRKSRC}/lib/charset-conv.c -.if ! ${PORT_OPTIONS:MX11} - @${REINPLACE_CMD} -e 's|: install-pkgdataDATA|: |' \ - ${WRKSRC}/docs/sample.gftp/Makefile.in -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/ftp/gftp/distinfo ============================================================================== --- head/ftp/gftp/distinfo Sun Dec 22 11:42:11 2013 (r337184) +++ head/ftp/gftp/distinfo Fri Dec 5 16:55:18 2014 (r374057) @@ -1,2 +1,2 @@ -SHA256 (gftp-2.0.19.tar.gz) = eefc47ae51b011a2412874f0df068397ad85d9600c1acc02e22d5df3d9a60074 -SIZE (gftp-2.0.19.tar.gz) = 2691419 +SHA256 (gftp-2.0.19.tar.bz2) = 5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd +SIZE (gftp-2.0.19.tar.bz2) = 1687167 Added: head/ftp/gftp/files/patch-lib-misc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/gftp/files/patch-lib-misc.c Fri Dec 5 16:55:18 2014 (r374057) @@ -0,0 +1,21 @@ +Fix segmentation fault, when gftpui_run_chdir is called with directory=0x0, +and then calls gftp_expand_path (src=0x0), +the NULL string was cloned using g_strdup, which returns NULL if +its only argument is NULL, then this returned string was unreferenced. + + lib/misc.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/lib/misc.c b/lib/misc.c +index 16c019b..2791466 100644 +--- lib/misc.c.orig ++++ lib/misc.c +@@ -143,6 +143,8 @@ gftp_expand_path (gftp_request * request, const char *src) + tempchar; + struct passwd *pw; + ++ g_return_val_if_fail(src != NULL, NULL); ++ + pw = NULL; + str = g_strdup (src); + Copied: head/ftp/gftp/files/patch-lib-pty.c (from r337184, head/ftp/gftp/files/patch-lib::pty.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/gftp/files/patch-lib-pty.c Fri Dec 5 16:55:18 2014 (r374057, copy of r337184, head/ftp/gftp/files/patch-lib::pty.c) @@ -0,0 +1,103 @@ +--- lib/pty.c.orig 2007-03-13 02:56:43.000000000 +0100 ++++ lib/pty.c 2010-01-17 17:34:25.000000000 +0100 +@@ -59,6 +59,50 @@ + return (new_fds); + } + ++#elif HAVE_OPENPTY ++ ++#ifdef HAVE_PTY_H ++#include <pty.h> ++#include <utmp.h> /* for login_tty */ ++#elif HAVE_LIBUTIL_H ++#include <libutil.h> ++#else ++extern int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp); ++extern int login_tty(int fd); ++#endif ++ ++char * ++gftp_get_pty_impl (void) ++{ ++ return ("openpty"); ++} ++ ++ ++static int ++_gftp_ptym_open (char *pts_name, size_t len, int *fds) ++{ ++ int fdm; ++ ++ if (openpty (&fdm, fds, pts_name, NULL, NULL) < 0) ++ return (GFTP_ERETRYABLE); ++ ++ ioctl (*fds, TIOCSCTTY, NULL); ++ ++ return (fdm); ++} ++ ++ ++static int ++_gftp_ptys_open (int fdm, int fds, char *pts_name) ++{ ++ if (login_tty (fds) < 0) { ++ close(fds); ++ return (GFTP_EFATAL); ++ } ++ ++ return (fds); ++} ++ + #elif HAVE_GRANTPT + + #if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)) +@@ -131,49 +192,6 @@ + return (new_fds); + } + +-#elif HAVE_OPENPTY +- +-#ifdef HAVE_PTY_H +-#include <pty.h> +-#include <utmp.h> /* for login_tty */ +-#elif HAVE_LIBUTIL_H +-#include <libutil.h> +-#include <utmp.h> /* for login_tty */ +-#else +-extern int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp); +-extern int login_tty(int fd); +-#endif +- +-char * +-gftp_get_pty_impl (void) +-{ +- return ("openpty"); +-} +- +- +-static int +-_gftp_ptym_open (char *pts_name, size_t len, int *fds) +-{ +- int fdm; +- +- if (openpty (&fdm, fds, pts_name, NULL, NULL) < 0) +- return (GFTP_ERETRYABLE); +- +- ioctl (*fds, TIOCSCTTY, NULL); +- +- return (fdm); +-} +- +- +-static int +-_gftp_ptys_open (int fdm, int fds, char *pts_name) +-{ +- if (login_tty (fds) < 0) +- return (GFTP_EFATAL); +- +- return (fds); +-} +- + #else + + /* Fall back to *BSD... */ Modified: head/ftp/gftp/pkg-descr ============================================================================== --- head/ftp/gftp/pkg-descr Sun Dec 22 11:42:11 2013 (r337184) +++ head/ftp/gftp/pkg-descr Fri Dec 5 16:55:18 2014 (r374057) @@ -1,21 +1,23 @@ -gFTP is a free multithreaded ftp and sftp client for *NIX based machines. -It has the following features: - Distributed under the terms of the GNU Public License Agreement - Written in C and Can use GTK+ 1.2.x+ or GTK 2.x for the GUI (or text mode) - Multithreaded to allow for simultaneous downloads - File transfer queues to allow for downloading multiple files - Supports downloading entire directories and subdirectories - Extensive connection manager - Supports resuming interrupted file transfers - Supports caching of remote directory listings - Drag-N-Drop support - FTP proxy server support - Supports connecting to a FTP server via command line parameters. - Supports associating icons with particular file extensions in the list boxes - Sorting capabilities in the file list boxes - Can restrict files in the list boxes to a particular file specification - Supports viewing and editing of local and remote files - Allows for passive and non-passive file transfers - Eliminates buffer overruns from malicious ftp sites +gFTP is a free multithreaded FTP and SFTP client for Unix-like systems. +It has the following features: + + Distributed under the terms of the GNU Public License + Written in C, has a text interface and a GTK+ 2.x interface + Supports the FTP, FTPS (control connection only), HTTP, HTTPS, SSH, and FSP + Multithreaded to allow for simultaneous downloads + File transfer queues to allow for downloading multiple files + Bookmarks menu to allow you to quickly connect to remote sites + Supports downloading entire directories and subdirectories + Extensive connection manager with FTP and HTTP proxy server support + Supports resuming interrupted file transfers + Supports caching of remote directory listings + Supports connecting to a FTP server via command line parameters + Supports associating icons with particular file extensions in the list boxes + Sorting capabilities in the file list boxes + Can restrict files in the list boxes to a particular file specification + Supports viewing and editing of local and remote files + Allows for passive and non-passive file transfers + Supports FXP file transfers (file transfer between 2 remote servers via FTP) + Eliminates buffer overruns from malicious FTP sites WWW: http://gftp.seul.org/ Modified: head/ftp/gftp/pkg-plist ============================================================================== --- head/ftp/gftp/pkg-plist Sun Dec 22 11:42:11 2013 (r337184) +++ head/ftp/gftp/pkg-plist Fri Dec 5 16:55:18 2014 (r374057) @@ -1,39 +1,42 @@ bin/gftp -%%NOX11:%%bin/gftp-gtk +bin/gftp-gtk bin/gftp-text -%%NOX11:%%%%DATADIR%%/COPYING -%%NOX11:%%%%DATADIR%%/bookmarks -%%NOX11:%%%%DATADIR%%/connect.xpm -%%NOX11:%%%%DATADIR%%/deb.xpm -%%NOX11:%%%%DATADIR%%/diff.xpm -%%NOX11:%%%%DATADIR%%/dir.xpm -%%NOX11:%%%%DATADIR%%/doc.xpm -%%NOX11:%%%%DATADIR%%/dotdot.xpm -%%NOX11:%%%%DATADIR%%/down.xpm -%%NOX11:%%%%DATADIR%%/exe.xpm -%%NOX11:%%%%DATADIR%%/gftp-16x16.png -%%NOX11:%%%%DATADIR%%/gftp-22x22.png -%%NOX11:%%%%DATADIR%%/gftp-24x24.png -%%NOX11:%%%%DATADIR%%/gftp-32x32.png -%%NOX11:%%%%DATADIR%%/gftp-48x48.png -%%NOX11:%%%%DATADIR%%/gftp-logo.xpm -%%NOX11:%%%%DATADIR%%/gftp-scalable.svg -%%NOX11:%%%%DATADIR%%/gftp.xpm -%%NOX11:%%%%DATADIR%%/gftprc -%%NOX11:%%%%DATADIR%%/img.xpm -%%NOX11:%%%%DATADIR%%/left.xpm -%%NOX11:%%%%DATADIR%%/linkdir.xpm -%%NOX11:%%%%DATADIR%%/linkfile.xpm -%%NOX11:%%%%DATADIR%%/man.xpm -%%NOX11:%%%%DATADIR%%/open_dir.xpm -%%NOX11:%%%%DATADIR%%/right.xpm -%%NOX11:%%%%DATADIR%%/rpm.xpm -%%NOX11:%%%%DATADIR%%/sound.xpm -%%NOX11:%%%%DATADIR%%/stop.xpm -%%NOX11:%%%%DATADIR%%/tar.xpm -%%NOX11:%%%%DATADIR%%/txt.xpm -%%NOX11:%%%%DATADIR%%/up.xpm -%%NOX11:%%%%DATADIR%%/world.xpm +man/man1/gftp.1.gz +share/applications/gftp.desktop +share/pixmaps/gftp.png +%%DATADIR%%/COPYING +%%DATADIR%%/bookmarks +%%DATADIR%%/connect.xpm +%%DATADIR%%/deb.xpm +%%DATADIR%%/diff.xpm +%%DATADIR%%/dir.xpm +%%DATADIR%%/doc.xpm +%%DATADIR%%/dotdot.xpm +%%DATADIR%%/down.xpm +%%DATADIR%%/exe.xpm +%%DATADIR%%/gftp-16x16.png +%%DATADIR%%/gftp-22x22.png +%%DATADIR%%/gftp-24x24.png +%%DATADIR%%/gftp-32x32.png +%%DATADIR%%/gftp-48x48.png +%%DATADIR%%/gftp-logo.xpm +%%DATADIR%%/gftp-scalable.svg +%%DATADIR%%/gftp.xpm +%%DATADIR%%/gftprc +%%DATADIR%%/img.xpm +%%DATADIR%%/left.xpm +%%DATADIR%%/linkdir.xpm +%%DATADIR%%/linkfile.xpm +%%DATADIR%%/man.xpm +%%DATADIR%%/open_dir.xpm +%%DATADIR%%/right.xpm +%%DATADIR%%/rpm.xpm +%%DATADIR%%/sound.xpm +%%DATADIR%%/stop.xpm +%%DATADIR%%/tar.xpm +%%DATADIR%%/txt.xpm +%%DATADIR%%/up.xpm +%%DATADIR%%/world.xpm %%NLS%%share/locale/am/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ar/LC_MESSAGES/gftp.mo %%NLS%%share/locale/az/LC_MESSAGES/gftp.mo @@ -88,10 +91,3 @@ bin/gftp-text %%NLS%%share/locale/zh_CN/LC_MESSAGES/gftp.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/gftp.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gftp.mo -%%NOX11:%%@dirrm %%DATADIR%% -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412051655.sB5GtJA1020756>