Switch Arch from opentty to ptmx

4 files changed, 33 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f475dfd1798..19dfbaf538a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
+# Generated by mksrcinfo v8
+# Fri Dec 18 14:04:05 UTC 2015
 pkgbase = zssh
 	pkgdesc = SSH and Telnet client with ZMODEM file transfer capability
 	pkgver = 1.5c
-	pkgrel = 8
+	pkgrel = 9
 	url = http://zssh.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = readline
 	source = http://vorboss.dl.sourceforge.net/project/zssh/zssh/1.5/zssh-1.5c.tgz
-	source = 04_GNU_openpty.patch
+	source = fix_use_ptmx_on_arch.patch
 	source = fix_CPPsymlink.patch
 	md5sums = 9f140ec2705a96d6a936b7dca0e8dd13
-	md5sums = 8132f38155298a89b72636e0e0e316d4
+	md5sums = 33eaf98542183445be57b466bf6da212
 	md5sums = 38d530c901a10117e56f145acc19b925
 
 pkgname = zssh
diff --git a/04_GNU_openpty.patch b/04_GNU_openpty.patch
deleted file mode 100644
index 707fcfac990b..000000000000
--- a/04_GNU_openpty.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nur zssh_1.5c.debian.1-3/configure.in zssh_1.5c.debian.1-3.new/configure.in

---- zssh_1.5c.debian.1-3/configure.in	2007-09-25 01:28:53.000000000 -0700

-+++ zssh_1.5c.debian.1-3.new/configure.in	2007-09-25 01:30:03.000000000 -0700

-@@ -57,7 +57,7 @@

- AC_HEADER_STDC

- AC_HEADER_SYS_WAIT

- AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h termios.h unistd.h \

--	err.h sys/cdefs.h sys/param.h util.h stropts.h)

-+	err.h sys/cdefs.h sys/param.h util.h stropts.h pty.h)

- 

- 

- 

-@@ -97,7 +97,14 @@

- 

- 

- dnl Check what is available for tty/pty allocation 

--AC_CHECK_FUNCS(_getpty getpseudotty openpty grantpt unlockpt)

-+AC_CHECK_FUNCS(_getpty getpseudotty grantpt unlockpt)

-+AC_CHECK_FUNCS(openpty,,

-+	[AC_CHECK_LIB(util,openpty,

-+		[AC_DEFINE(HAVE_OPENPTY)

-+		LIBS="$LIBS -lutil"]

-+	)])

-+

-+

- AC_MSG_CHECKING(for pseudo ttys)

- if test -c /dev/getpty && test $ac_cv_func_getpseudotty = yes

- then

-diff -Nur zssh_1.5c.debian.1-3/openpty.c zssh_1.5c.debian.1-3.new/openpty.c

---- zssh_1.5c.debian.1-3/openpty.c	2007-09-25 01:28:53.000000000 -0700

-+++ zssh_1.5c.debian.1-3.new/openpty.c	2007-09-25 01:30:03.000000000 -0700

-@@ -25,6 +25,10 @@

- #include <util.h>

- #endif

- 

-+#ifdef HAVE_PTY_H

-+#include <pty.h>

-+#endif

-+

- void	getmaster()

- {

- #ifdef DEBUG
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 5e9d02df3d04..ffef38293836 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,43 +2,43 @@
 # Recovery by Ivo(sh) Musil <ivoshm@gmail.com>
 pkgname=zssh
 pkgver=1.5c
-pkgrel=8
+pkgrel=9
 pkgdesc="SSH and Telnet client with ZMODEM file transfer capability"
 arch=("i686" "x86_64")
 license="GPL"
 url="http://zssh.sourceforge.net/"
 depends=("readline")
 source=(http://vorboss.dl.sourceforge.net/project/zssh/zssh/1.5/$pkgname-$pkgver.tgz \
-	04_GNU_openpty.patch \
-	fix_CPPsymlink.patch)
+    fix_use_ptmx_on_arch.patch \
+    fix_CPPsymlink.patch)
 
 md5sums=(\
-	 '9f140ec2705a96d6a936b7dca0e8dd13'\
-	 '8132f38155298a89b72636e0e0e316d4'\
-	 '38d530c901a10117e56f145acc19b925'\
-	)
+     '9f140ec2705a96d6a936b7dca0e8dd13'\
+     '33eaf98542183445be57b466bf6da212'\
+     '38d530c901a10117e56f145acc19b925'\
+    )
 
 prepare() {
         cd $srcdir/$pkgname-$pkgver
 
-	patch -p1 < $srcdir/04_GNU_openpty.patch
-	patch -p0 < $srcdir/fix_CPPsymlink.patch
+    patch -p0 < $srcdir/fix_use_ptmx_on_arch.patch
+    patch -p0 < $srcdir/fix_CPPsymlink.patch
 }
 
 build() {
-	cd $srcdir/$pkgname-$pkgver
+    cd $srcdir/$pkgname-$pkgver
         ./configure --prefix=$pkgdir/usr
         make
 }
 
 package() {
-	mkdir -p $pkgdir/usr/bin
-	mkdir -p $pkgdir/usr/man/man1
-	mkdir -p $pkgdir/usr/share/man/man1
-	cd $srcdir/$pkgname-$pkgver
+    mkdir -p $pkgdir/usr/bin
+    mkdir -p $pkgdir/usr/man/man1
+    mkdir -p $pkgdir/usr/share/man/man1
+    cd $srcdir/$pkgname-$pkgver
         make install
-	chmod a+r $pkgdir/usr/bin/*
-	mv $pkgdir/usr/man/man1/* $pkgdir/usr/share/man/man1/
-	rm -rf $pkgdir/usr/man
+    chmod a+r $pkgdir/usr/bin/*
+    mv $pkgdir/usr/man/man1/* $pkgdir/usr/share/man/man1/
+    rm -rf $pkgdir/usr/man
 }
 
diff --git a/fix_use_ptmx_on_arch.patch b/fix_use_ptmx_on_arch.patch
new file mode 100644
index 000000000000..dea5cac506a2
--- /dev/null
+++ b/fix_use_ptmx_on_arch.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2015-12-18 14:48:28.000000000 +0100
++++ configure	2015-12-18 15:01:39.619986497 +0100
+@@ -1893,7 +1893,7 @@
+ 
+   echo "$ac_t""getpseudotty" 1>&6
+ else
+-if test -c /dev/ptmx && test -c /dev/pts/0
++if test -c /dev/ptmx
+ then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_DEV_PTMX 1