[arch-commits] Commit in openssh/trunk (PKGBUILD tuntap.patch)

[Gaëtan Bisson]

    Date: Monday, June 18, 2018 @ 21:01:56
  Author: bisson
Revision: 327170

fix FS#58737

Added:
  openssh/trunk/tuntap.patch
Modified:
  openssh/trunk/PKGBUILD

--------------+
 PKGBUILD     |    6 +++++-
 tuntap.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-18 20:47:01 UTC (rev 327169)
+++ PKGBUILD	2018-06-18 21:01:56 UTC (rev 327170)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=7.7p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -17,6 +17,7 @@
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'openssl-1.1.0.patch'
+        'tuntap.patch'
         'sshdgenkeys.service'
         'sshd at .service'
         'sshd.service'
@@ -26,6 +27,7 @@
 sha256sums=('d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f'
             'SKIP'
             'fa91849cc3161916f563bda5413676342e0bcc2705857e9d01b73c70e4904adf'
+            'bd3698425ece4853d67a9f9e934d37ad22948754c9b82e0a872eb854e94220ce'
             '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
             '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
             'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
@@ -40,6 +42,8 @@
 
 	# OpenSSL 1.1.0 patch from http://vega.pgw.jp/~kabe/vsd/patch/openssh-7.4p1-openssl-1.1.0c.patch.html
 	patch -p1 -i ../openssl-1.1.0.patch
+
+	patch -p1 -i ../tuntap.patch
 }
 
 build() {

Added: tuntap.patch
===================================================================
--- tuntap.patch	                        (rev 0)
+++ tuntap.patch	2018-06-18 21:01:56 UTC (rev 327170)
@@ -0,0 +1,35 @@
+From cfb1d9bc76734681e3dea532a1504fcd466fbe91 Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm at mindrot.org>
+Date: Fri, 13 Apr 2018 13:38:06 +1000
+Subject: Fix tunnel forwarding broken in 7.7p1
+
+bz2855, ok dtucker@
+---
+ openbsd-compat/port-net.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/openbsd-compat/port-net.c b/openbsd-compat/port-net.c
+index 7050629..bb53562 100644
+--- a/openbsd-compat/port-net.c
++++ b/openbsd-compat/port-net.c
+@@ -185,7 +185,7 @@ sys_tun_open(int tun, int mode, char **ifname)
+ 	else
+ 		debug("%s: %s mode %d fd %d", __func__, ifr.ifr_name, mode, fd);
+ 
+-	if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)))
++	if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL)
+ 		goto failed;
+ 
+ 	return (fd);
+@@ -272,7 +272,7 @@ sys_tun_open(int tun, int mode, char **ifname)
+ 			goto failed;
+ 	}
+ 
+-	if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)))
++	if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL)
+ 		goto failed;
+ 
+ 	close(sock);
+-- 
+cgit v1.1
+