enable the Debian fix for non-setuid login

3 files changed, 21 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04ae5d5b8c7a..fff873cee9c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,6 +3,7 @@ pkgbase = netkit-telnet-ssl
 	pkgver = 0.17.41+0.2
 	pkgrel = 1
 	url = http://www.hcs.harvard.edu/~dholland/computers/netkit.html
+	install = netkit-telnet-ssl.install
 	arch = i686
 	arch = x86_64
 	license = BSD
@@ -11,7 +12,7 @@ pkgbase = netkit-telnet-ssl
 	depends = ncurses
 	source = https://deb.debian.org/debian/pool/main/n/netkit-telnet-ssl/netkit-telnet-ssl_0.17.41+0.2.orig.tar.gz
 	source = https://deb.debian.org/debian/pool/main/n/netkit-telnet-ssl/netkit-telnet-ssl_0.17.41+0.2-3.debian.tar.xz
-	source = netkit-telnet-ssl.gcc7.patch
+	source = netkit-telnet-ssl.arch.patch
 	source = netkit-telnet-ssl.sysusers
 	source = netkit-telnetd.socket
 	source = netkit-telnetd-ssl.socket
@@ -20,12 +21,12 @@ pkgbase = netkit-telnet-ssl
 	source = telnet.xinetd
 	sha256sums = 9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00
 	sha256sums = 3f8b155bc5085e37a0d836867af330f2911953055010e30f30ca46698559a0aa
-	sha256sums = 2d3bf162cbb2e3df4ba6014206d95bbccf84ff4a277fdf9c0935a830f52443ee
-	sha256sums = 79fa821d14e29273da7a0405f7cbc0d8f13a961b168b6b257c71342d06878eb8
+	sha256sums = 339308000345e294f0188c232bdb6cf4a22225db2efe188064f14caabd915ed4
+	sha256sums = be6cc69383e1326a9aa49d36bfda856d049f16512655ea83b991910800d540ba
 	sha256sums = 25a9cd6c6fd3dd50a20038c05d755c519be1081e42bcb148f71e7a8f182e91a2
 	sha256sums = a9a14476c43d65a57d50eec7e7d773ff1031cf1c13c12e84a9de5eaa14279434
-	sha256sums = db921a9ad938ecdb208f6568466950360a892ca0c0754cf51ee082216cd3c8ff
-	sha256sums = 7a3b68541840a8a9ed5c40fbec815ba21f72b9b2726c42fab6b7aa3d1e0e0d9b
+	sha256sums = 6e45cfed7968af48b59f172523934db421964e58fdb624872a831160e2848284
+	sha256sums = b4220954373f5431b127509b4344dad32d5c692871c536106507fa8b052ef40a
 	sha256sums = 9f1506cbe02b48fe7ac53932f068f3ebc8a8441ad92bdec17e2cd40ca7bcbaa8
 
 pkgname = netkit-telnet-ssl
diff --git a/PKGBUILD b/PKGBUILD
index 5e0cabd0d23a..91ff2ffaf932 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,14 +14,14 @@ license=('BSD')
 url="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
 source=(https://deb.debian.org/debian/pool/main/n/${pkgname}/${pkgname}_${_debver}.orig.tar.gz
         https://deb.debian.org/debian/pool/main/n/${pkgname}/${pkgname}_${_debver}-${_debrel}.debian.tar.xz
-        netkit-telnet-ssl.gcc7.patch
+        netkit-telnet-ssl.arch.patch
         netkit-telnet-ssl.sysusers
         netkit-telnetd{,-ssl}.socket
         netkit-telnetd{,-ssl}@.service
         telnet.xinetd)
 sha256sums=('9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00'
             '3f8b155bc5085e37a0d836867af330f2911953055010e30f30ca46698559a0aa'
-            '2d3bf162cbb2e3df4ba6014206d95bbccf84ff4a277fdf9c0935a830f52443ee'
+            '339308000345e294f0188c232bdb6cf4a22225db2efe188064f14caabd915ed4'
             'be6cc69383e1326a9aa49d36bfda856d049f16512655ea83b991910800d540ba'
             '25a9cd6c6fd3dd50a20038c05d755c519be1081e42bcb148f71e7a8f182e91a2'
             'a9a14476c43d65a57d50eec7e7d773ff1031cf1c13c12e84a9de5eaa14279434'
@@ -39,7 +39,7 @@ prepare() {
   done
 
   msg2 "Applying additional patches"
-  patch -Np1 < ../netkit-telnet-ssl.gcc7.patch
+  patch -Np1 < ../netkit-telnet-ssl.arch.patch
 }
 
 build() {
diff --git a/netkit-telnet-ssl.gcc7.patch b/netkit-telnet-ssl.arch.patch
index cde6fd6e8def..e263481a5df2 100644
--- a/netkit-telnet-ssl.gcc7.patch
+++ b/netkit-telnet-ssl.arch.patch
@@ -29,3 +29,15 @@ diff -ru netkit-telnet-0.17.orig/telnetd/utility.c netkit-telnet-0.17/telnetd/ut
  
  	netfile = fopencookie(0, "w", funcs);
 Only in netkit-telnet-0.17/telnetd: utility.o
+diff -ru netkit-telnet-0.17.orig/telnetlogin/telnetlogin.c netkit-telnet-0.17/telnetlogin/telnetlogin.c
+--- netkit-telnet-0.17.orig/telnetlogin/telnetlogin.c	2017-09-05 09:13:42.675718525 +0300
++++ netkit-telnet-0.17/telnetlogin/telnetlogin.c	2017-09-05 09:13:47.395788056 +0300
+@@ -217,7 +217,7 @@
+     * but, should we insist that ruid==nobody?
+     */
+ 
+-#ifdef debian
++#if 1
+    /*
+     * Debian's /bin/login doesn't work properly unless we're really root.
+     */