diff options
| author | tnn <tnn@pkgsrc.org> | 2020-07-30 13:32:33 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-07-30 13:32:33 +0000 |
| commit | 421221768320d7484339c91a79a3d47fb667a7a4 (patch) | |
| tree | 3a14f6ce56150e3670b3a9c4cc0a0def853c8ab0 /security | |
| parent | d6cec720443dd1360de3b32fe41771bc0abb03dd (diff) | |
| download | pkgsrc-421221768320d7484339c91a79a3d47fb667a7a4.tar.gz | |
putty: fix build on Linux
Diffstat (limited to 'security')
| -rw-r--r-- | security/putty/Makefile | 8 | ||||
| -rw-r--r-- | security/putty/distinfo | 4 | ||||
| -rw-r--r-- | security/putty/patches/patch-unix_uxpgnt.c | 12 |
3 files changed, 8 insertions, 16 deletions
diff --git a/security/putty/Makefile b/security/putty/Makefile index a85b6ba1e5e..785ea77d44d 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2020/06/29 11:49:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.63 2020/07/30 13:32:33 tnn Exp $ # DISTNAME= putty-0.74 @@ -20,10 +20,6 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "options.mk" -.if empty(OPSYS:MLinux) -CFLAGS+= -DHAVE_NO_SETRESUID -.endif - .if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin" CFLAGS+= -DOMIT_UTMP .endif @@ -37,6 +33,8 @@ CFLAGS+= -DBSD_PTYS LDFLAGS.SunOS+= -lsocket -lnsl CFLAGS.SunOS+= -DBSD_COMP CFLAGS.NetBSD+= -DHAVE_FUTIMES +CFLAGS.Linux+= -DHAVE_FUTIMES -DHAVE_NO_SETRESUID +LDFLAGS.Linux+= -ldl .include "../../x11/gtk3/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" diff --git a/security/putty/distinfo b/security/putty/distinfo index aa9f21027a0..9847f587ce4 100644 --- a/security/putty/distinfo +++ b/security/putty/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2020/06/29 11:49:50 ryoon Exp $ +$NetBSD: distinfo,v 1.30 2020/07/30 13:32:33 tnn Exp $ SHA1 (putty-0.74.tar.gz) = 17b160e9720f67f9af9399d7d185b913b81f18fe RMD160 (putty-0.74.tar.gz) = 0bcc5b606f19379168d19de6f5b764a7c2753bf5 @@ -10,4 +10,4 @@ SHA1 (patch-terminal.c) = 30d6196e371b5369f9ea69e193662a47dbefaa10 SHA1 (patch-timing.c) = a6a492fc8b22c58e2973c854bffa4c8bf71eb6a7 SHA1 (patch-unix_Makefile.gtk) = 7fe7859ad91afb57ef3ba31194ffd2ef784f638d SHA1 (patch-unix_uxnet.c) = 2d1c2939721993fe5616c2fe3f1935c03a31bb35 -SHA1 (patch-unix_uxpgnt.c) = b5625b33b940ea2870d3e91d38e2303a80d6887b +SHA1 (patch-unix_uxpgnt.c) = 64da7ac0b5f02de7d5e03858b0ea69c8662cc07a diff --git a/security/putty/patches/patch-unix_uxpgnt.c b/security/putty/patches/patch-unix_uxpgnt.c index cbf11ab10ed..edaa64e8b18 100644 --- a/security/putty/patches/patch-unix_uxpgnt.c +++ b/security/putty/patches/patch-unix_uxpgnt.c @@ -1,22 +1,16 @@ -$NetBSD: patch-unix_uxpgnt.c,v 1.2 2017/03/17 11:55:53 maya Exp $ +$NetBSD: patch-unix_uxpgnt.c,v 1.3 2020/07/30 13:32:33 tnn Exp $ BSD setpgrp has parameters. POSIX says it is undefined whether setpgrp(0,0) == setpgrp() and it should use setpgid. -Use setpgid without parameters on non-BSD - ---- unix/uxpgnt.c.orig 2017-02-18 17:10:15.000000000 +0000 +--- unix/uxpgnt.c.orig 2020-06-21 17:30:49.000000000 +0000 +++ unix/uxpgnt.c -@@ -270,7 +270,11 @@ void pageant_fork_and_print_env(int reta +@@ -240,7 +240,7 @@ void pageant_fork_and_print_env(bool ret /* 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(); -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) + setpgid(0, 0); -+#else -+ setpgid(); -+#endif } else { /* Do that, but also leave our entire session and detach from * the controlling tty (if any). */ |