[gentoo-commits] repo/gentoo:master commit in: net-ftp/gftp/, net-ftp/gftp/files/

[gentoo-commits] repo/gentoo:master commit in: net-ftp/gftp/, net-ftp/gftp/files/

[Pacho Ramos]

commit:     92f21a15729321069c11c483e47bd32bfd1ac0c1
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 10:15:15 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 10:15:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f21a15

net-ftp/gftp: Support libressl (#565380 by Marek Behun), fix .desktop file (#530800 by Kévin Bernard-Allies).

Package-Manager: portage-2.3.0

 net-ftp/gftp/files/gftp-2.0.19-desktop.patch | 26 +++++++++++++++
 net-ftp/gftp/gftp-2.0.19-r3.ebuild           | 49 ++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/net-ftp/gftp/files/gftp-2.0.19-desktop.patch b/net-ftp/gftp/files/gftp-2.0.19-desktop.patch
new file mode 100644
index 00000000..878a77b
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.19-desktop.patch
@@ -0,0 +1,26 @@
+@@ -, +, @@ 
+ <kevin.bernard.allies@gmail.com>
+ * the Encoding key is now deprecated, and UTF-8 is the default value.
+ * As the value of Icon is not an absolute path, there should be no extension.
+ * The Application category is deprecated.
+ docs/gftp.desktop | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+--- a/docs/gftp.desktop	
++++ a/docs/gftp.desktop	
+@@ -1,5 +1,4 @@ 
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=gFTP
+ Comment=Download and upload files using multiple file transfer protocols
+ Comment[fr]=Télécharge des fichiers en utilisant le protocole FTP
+@@ -8,8 +7,8 @@ Exec=gftp %u
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Icon=gftp.png
+-Categories=Application;Network;
++Icon=gftp
++Categories=Network;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gftp
+ X-GNOME-Bugzilla-Component=general

diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
new file mode 100644
index 00000000..904c1c4
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Gnome based FTP Client"
+SRC_URI="http://www.gftp.org/${P}.tar.bz2"
+HOMEPAGE="http://www.gftp.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk libressl ssl"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:0
+	gtk? ( x11-libs/gtk+:2 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= ) )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix SIGSEGV for gftp_expand_path function
+	"${FILESDIR}/${P}-${PN}-expand-path-sigsegv.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=740785
+	"${FILESDIR}/${P}-desktop.patch"
+)
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable gtk gtkport) \
+		$(use_enable ssl)
+}
+
+src_install() {
+	gnome2_src_install
+	dodoc docs/USERS-GUIDE
+	rm -f "${ED}"usr/share/gftp/COPYING
+}

[gentoo-commits] repo/gentoo:master commit in: net-ftp/gftp/, net-ftp/gftp/files/

[Sergei Trofimovich]

commit:     0d6e4b3e3caf745256cfb81d8bf718658796af06
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 20:42:21 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 20:42:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6e4b3e

net-ftp/gftp: backport glibc-2.30 fix, bug #692230

Fix found by Stephan Hartmann!

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/692230
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch | 27 +++++++++++++++++++++++++
 net-ftp/gftp/gftp-2.0.19-r3.ebuild              |  5 ++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch b/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch
new file mode 100644
index 00000000000..ee1d596a03c
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/692230
+https://github.com/masneyb/gftp/commit/371c494a34c1820544d6563fb7ef5ca51a0ee199
+
+From 371c494a34c1820544d6563fb7ef5ca51a0ee199 Mon Sep 17 00:00:00 2001
+From: Brian Masney <masneyb@onstation.org>
+Date: Thu, 21 Jul 2016 05:05:18 -0400
+Subject: [PATCH] fixed compiling on some versions of Linux. Patch picked up
+ from the Fedora Project at
+ https://github.com/repoforge/rpms/blob/master/specs/gftp/gftp-stropts.patch
+
+---
+ lib/pty.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/pty.c b/lib/pty.c
+index f7cb1f9..f9d609b 100644
+--- a/lib/pty.c
++++ b/lib/pty.c
+@@ -61,7 +61,7 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name)
+ 
+ #elif HAVE_GRANTPT
+ 
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__))
+ #include <stropts.h>
+ #endif
+ 

diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index 57a51c790a9..a79b3a00b48 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,9 @@ PATCHES=(
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=740785
 	"${FILESDIR}/${P}-desktop.patch"
+
+	# https://bugs.gentoo.org/692230
+	"${FILESDIR}"/${P}-glibc-2.30.patch
 )
 
 src_configure() {