Attachment 243833 Details for Bug 272931 – Update to 2.9.1b

[patch] Update to 2.9.1b

gftp.patch (text/plain), 5.18 KB, created by Kevin Bowling on 2023-08-04 07:05:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Bowling

Created: 2023-08-04 07:05:22 UTC

Size: 5.18 KB

patch

obsolete

>diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
>index 41e45a1a1543..33313e91660b 100644
>--- a/ftp/gftp/Makefile
>+++ b/ftp/gftp/Makefile
>@@ -1,31 +1,36 @@
> PORTNAME=	gftp
>-PORTVERSION=	2.7.0b
>-PORTREVISION=	1
>+PORTVERSION=	2.9.1b
> CATEGORIES=	ftp
> 
> MAINTAINER=	oliver@FreeBSD.org
> COMMENT=	Free multithreaded GTK-based FTP and SFTP client
> WWW=		http://gftp.seul.org/
> 
> LICENSE=	GPLv2
> 
>-USES=		autoreconf gnome gmake libtool pathfix pkgconfig ssl tar:bzip2
>+LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
>+		libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2
>+
>+USES=		autoreconf desktop-file-utils gnome gmake libtool pathfix \
>+		pkgconfig ssl tar:bzip2
> USE_GITHUB=	yes
> GH_ACCOUNT=	masneyb
>-USE_GNOME=	glib20 gtk20
>+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20
> 
> GNU_CONFIGURE=	yes
> 
> CFLAGS+=	-D_WANT_SEMUN
> 
> OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
> 
> NLS_USES=		gettext
> NLS_USE=		GNOME=intltool
> NLS_CONFIGURE_OFF=	--disable-nls
> 
> post-patch:
>-	@${TOUCH} ${WRKSRC}/config.rpath
>+	@${MKDIR} ${WRKSRC}/autoconf
>+	@${TOUCH} ${WRKSRC}/autoconf/config.rpath
> 
> .include <bsd.port.mk>
>diff --git a/ftp/gftp/distinfo b/ftp/gftp/distinfo
>index 48716137aad0..e3685ead7eee 100644
>--- a/ftp/gftp/distinfo
>+++ b/ftp/gftp/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1631708866
>-SHA256 (masneyb-gftp-2.7.0b_GH0.tar.gz) = 164651e19c840e5df148e905fbfcf4d24c65204a2df078dc98ad6c95a421e7f4
>-SIZE (masneyb-gftp-2.7.0b_GH0.tar.gz) = 1618157
>+TIMESTAMP = 1691130830
>+SHA256 (masneyb-gftp-2.9.1b_GH0.tar.gz) = fb134d5479a6b81251b9d37be7264fb8be6edb07bce98569e0e0ba9570587fd6
>+SIZE (masneyb-gftp-2.9.1b_GH0.tar.gz) = 1556915
>diff --git a/ftp/gftp/files/patch-lib-misc.c b/ftp/gftp/files/patch-lib-misc.c
>index 9daf864e58ab..e8d2d5347378 100644
>--- a/ftp/gftp/files/patch-lib-misc.c
>+++ b/ftp/gftp/files/patch-lib-misc.c
>@@ -1,21 +1,19 @@
> 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.orig	2022-02-15 06:31:19 UTC
> +++ lib/misc.c
>-@@ -143,6 +143,8 @@ gftp_expand_path (gftp_request * request, const char *src)
>+@@ -145,6 +145,8 @@ char * gftp_expand_path (gftp_request * request, const
>         tempchar;
>    struct passwd *pw;
>  
> +  g_return_val_if_fail(src != NULL, NULL);
> +
>    pw = NULL;
>    str = g_strdup (src);
>  
>diff --git a/ftp/gftp/files/patch-lib-pty.c b/ftp/gftp/files/patch-lib-pty.c
>index 25f7c385ed39..7f119778f33e 100644
>--- a/ftp/gftp/files/patch-lib-pty.c
>+++ b/ftp/gftp/files/patch-lib-pty.c
>@@ -1,103 +1,25 @@
>---- 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>
>+--- lib/pty.c.orig	2022-02-15 06:31:19 UTC
>++++ lib/pty.c
>+@@ -91,7 +91,9 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name)
>+ #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)
>-+{
>+ #endif
>+
>+ char *
>+@@ -118,8 +120,10 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name)
>+ static int
>+ _gftp_ptys_open (int fdm, int fds, char *pts_name)
>+ {
>+-  if (login_tty (fds) < 0)
> +  if (login_tty (fds) < 0) {
> +    close(fds);
>-+    return (GFTP_EFATAL);
>+     return (GFTP_EFATAL);
> +  }
>-+
>-+  return (fds);
>-+}
>-+
>- #elif HAVE_GRANTPT
>  
>- #if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
>-@@ -131,49 +192,6 @@
>-   return (new_fds);
>+   return (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... */

Actions: View | Diff

Attachments on bug 272931: 243833 | 243842