From a85da3b14e58cca7a83851dc54b7c1084e7abb27 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sun, 31 Mar 2019 10:55:48 +0000
Subject: [PATCH] add putty patches: pageant fix from freebsd, arm/aarch64 fix
 from upstream

---
 net/putty/Makefile                    | 12 +++++++++++-
 net/putty/patches/patch-Makefile_in   | 13 -------------
 net/putty/patches/patch-Recipe        | 22 ++++++++++++++++++++++
 net/putty/patches/patch-unix_uxpgnt_c | 16 ++++++++++++++++
 net/putty/pkg/PLIST-main              |  3 ++-
 5 files changed, 51 insertions(+), 15 deletions(-)
 delete mode 100644 net/putty/patches/patch-Makefile_in
 create mode 100644 net/putty/patches/patch-Recipe
 create mode 100644 net/putty/patches/patch-unix_uxpgnt_c

diff --git a/net/putty/Makefile b/net/putty/Makefile
index 34681ca9c9e..c51005f0968 100644
--- a/net/putty/Makefile
+++ b/net/putty/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2019/03/16 22:09:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2019/03/31 10:55:48 sthen Exp $
 
 COMMENT-main=	SSH and telnet client
 COMMENT-gui=	PuTTY GUI clients
 
 V=		0.71
+REVISION=	0
 DISTNAME=	putty-$V
 PKGNAME-main=	${DISTNAME}
 PKGNAME-gui=	${DISTNAME:S/putty/putty-gui/}
@@ -35,4 +36,13 @@ LIB_DEPENDS-gui=	devel/gettext \
 
 NO_TEST=		Yes
 
+AUTOCONF_VERSION=	2.69
+AUTOMAKE_VERSION=	1.16
+BUILD_DEPENDS=		${MODGNU_AUTOCONF_DEPENDS} \
+			${MODGNU_AUTOMAKE_DEPENDS}
+
+do-gen:
+	cd ${WRKDIST}; ${AUTOCONF_ENV} perl mkfiles.pl && \
+	    ${AUTOCONF_ENV} sh mkauto.sh
+
 .include <bsd.port.mk>
diff --git a/net/putty/patches/patch-Makefile_in b/net/putty/patches/patch-Makefile_in
deleted file mode 100644
index a803785d3ee..00000000000
--- a/net/putty/patches/patch-Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2019/03/16 22:09:30 sthen Exp $
-Index: Makefile.in
---- Makefile.in.orig
-+++ Makefile.in
-@@ -97,7 +97,7 @@ POST_UNINSTALL = :
- @HAVE_GTK_FALSE@	psftp$(EXEEXT) puttygen$(EXEEXT)
- @HAVE_GTK_TRUE@bin_PROGRAMS = plink$(EXEEXT) pscp$(EXEEXT) \
- @HAVE_GTK_TRUE@	psftp$(EXEEXT) puttygen$(EXEEXT) \
--@HAVE_GTK_TRUE@	pageant$(EXEEXT) pterm$(EXEEXT) putty$(EXEEXT) \
-+@HAVE_GTK_TRUE@	pterm$(EXEEXT) putty$(EXEEXT) \
- @HAVE_GTK_TRUE@	puttytel$(EXEEXT)
- @HAVE_GTK_FALSE@noinst_PROGRAMS = cgtest$(EXEEXT) fuzzterm$(EXEEXT) \
- @HAVE_GTK_FALSE@	osxlaunch$(EXEEXT) testcrypt$(EXEEXT) \
diff --git a/net/putty/patches/patch-Recipe b/net/putty/patches/patch-Recipe
new file mode 100644
index 00000000000..cb910c1d2c4
--- /dev/null
+++ b/net/putty/patches/patch-Recipe
@@ -0,0 +1,22 @@
+$OpenBSD: patch-Recipe,v 1.1 2019/03/31 10:55:48 sthen Exp $
+
+From f5c1753244d0399764fd68d6ac42ea2f2db47fc9 Mon Sep 17 00:00:00 2001
+From: Simon Tatham <anakin@pobox.com>
+Date: Tue, 26 Mar 2019 19:12:27 +0000
+Subject: [PATCH] Link uxutils.o into Unix PuTTYgen.
+
+On Arm Linux, this is necessary for the functions that check
+availability of hardware crypto acceleration.
+
+Index: Recipe
+--- Recipe.orig
++++ Recipe
+@@ -365,7 +365,7 @@ PUTTYGEN_UNIX = sshrsag sshdssg sshprime sshdes ARITH 
+          + sshrand uxnoise sshsha MISC sshrsa sshdss uxcons uxstore uxmisc
+          + sshpubk sshaes sshsh256 sshsh512 IMPORT puttygen.res time tree234
+          + uxgen notiming CONF sshecc sshecdsag uxnogtk sshauxcrypt sshhmac
+-         + uxpoll
++         + uxpoll uxutils
+ puttygen : [U] cmdgen PUTTYGEN_UNIX
+ cgtest   : [UT] cgtest PUTTYGEN_UNIX
+ 
diff --git a/net/putty/patches/patch-unix_uxpgnt_c b/net/putty/patches/patch-unix_uxpgnt_c
new file mode 100644
index 00000000000..d5b0e279896
--- /dev/null
+++ b/net/putty/patches/patch-unix_uxpgnt_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-unix_uxpgnt_c,v 1.1 2019/03/31 10:55:48 sthen Exp $
+
+https://svnweb.freebsd.org/ports/head/security/putty/files/patch-unix_uxpgnt.c?revision=496064&view=co
+
+Index: unix/uxpgnt.c
+--- unix/uxpgnt.c.orig
++++ unix/uxpgnt.c
+@@ -241,7 +241,7 @@ void pageant_fork_and_print_env(bool retain_tty)
+         /* Get out of our previous process group, to avoid being
+          * blasted by passing signals. But keep our controlling tty,
+          * so we can keep checking to see if we still have one. */
+-        setpgrp();
++        setpgrp(0, 0);
+     } else {
+         /* Do that, but also leave our entire session and detach from
+          * the controlling tty (if any). */
diff --git a/net/putty/pkg/PLIST-main b/net/putty/pkg/PLIST-main
index 2a69b16dc77..37a8ded0ccf 100644
--- a/net/putty/pkg/PLIST-main
+++ b/net/putty/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2017/04/30 22:29:53 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2019/03/31 10:55:48 sthen Exp $
+@bin bin/pageant
 @bin bin/plink
 @bin bin/pscp
 @bin bin/psftp