Bug#954639: gftp: FTBFS: pty.c:65:10: fatal error: stropts.h: No such file or directory

[Logan Rosen]

Package: gftp
Version: 2.0.19-5
Followup-For: Bug #954639
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/glibc-2.30.patch: Fix FTBFS against glibc >= 2.30 with cherrypicked
    patch from upstream Git.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-18-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

diff -Nru gftp-2.0.19/debian/patches/glibc-2.30.patch 
gftp-2.0.19/debian/patches/glibc-2.30.patch
--- gftp-2.0.19/debian/patches/glibc-2.30.patch 1969-12-31 19:00:00.000000000 
-0500
+++ gftp-2.0.19/debian/patches/glibc-2.30.patch 2020-03-22 20:49:10.000000000 
-0400
@@ -0,0 +1,24 @@
+From 371c494a34c1820544d6563fb7ef5ca51a0ee199 Mon Sep 17 00:00:00 2001
+From: Brian Masney <masn...@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 -Nru gftp-2.0.19/debian/patches/series gftp-2.0.19/debian/patches/series
--- gftp-2.0.19/debian/patches/series   2016-11-29 14:24:17.000000000 -0500
+++ gftp-2.0.19/debian/patches/series   2020-03-22 20:49:23.000000000 -0400
@@ -1,3 +1,4 @@
 01-hurd_do_not_use_PATH_MAX.patch
 desktop-file-binary
 fix-configure.in.patch
+glibc-2.30.patch