[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@×××××××××.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() {