CVS commit: pkgsrc/security/putty

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Mar 17 11:55:53 UTC 2017

Modified Files:
        pkgsrc/security/putty: distinfo
        pkgsrc/security/putty/patches: patch-unix_uxpgnt.c

Log Message:
putty: amend patch to use the BSD syntax on BSDs, and the alternate
syntax otherwise -- it has a better chance of working.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/putty/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/putty/patches/patch-unix_uxpgnt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/putty/distinfo
diff -u pkgsrc/security/putty/distinfo:1.21 pkgsrc/security/putty/distinfo:1.22
--- pkgsrc/security/putty/distinfo:1.21 Fri Mar 17 00:11:48 2017
+++ pkgsrc/security/putty/distinfo      Fri Mar 17 11:55:53 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2017/03/17 00:11:48 maya Exp $
+$NetBSD: distinfo,v 1.22 2017/03/17 11:55:53 maya Exp $
 
 SHA1 (putty-0.68.tar.gz) = e6acf0285e0718516cfa1fe775b1a92765387d70
 RMD160 (putty-0.68.tar.gz) = c5a07a3250f857cdcce619ef35953ed46c260788
@@ -10,6 +10,6 @@ SHA1 (patch-timing.c) = 9dd79fde39087896
 SHA1 (patch-unix_Makefile.gtk) = 399636a9b6d445fa0cdd55c7a887efa8f03bdc94
 SHA1 (patch-unix_gtkwin.c) = 110079a07a802f93705c6526a14069491f1c313e
 SHA1 (patch-unix_uxnet.c) = 2d1c2939721993fe5616c2fe3f1935c03a31bb35
-SHA1 (patch-unix_uxpgnt.c) = 2aa46f5ba17f436007d926abc529ee0cfb82ff52
+SHA1 (patch-unix_uxpgnt.c) = b5625b33b940ea2870d3e91d38e2303a80d6887b
 SHA1 (patch-unix_uxucs.c) = a2a5021b515c3bade1126ed062bdc1eece1ca0f9
 SHA1 (patch-windows_window.c) = e851bad963967429131286c18e39d1ac4add4ae7

Index: pkgsrc/security/putty/patches/patch-unix_uxpgnt.c
diff -u pkgsrc/security/putty/patches/patch-unix_uxpgnt.c:1.1 pkgsrc/security/putty/patches/patch-unix_uxpgnt.c:1.2
--- pkgsrc/security/putty/patches/patch-unix_uxpgnt.c:1.1       Fri Mar 17 00:11:48 2017
+++ pkgsrc/security/putty/patches/patch-unix_uxpgnt.c   Fri Mar 17 11:55:53 2017
@@ -1,19 +1,22 @@
-$NetBSD: patch-unix_uxpgnt.c,v 1.1 2017/03/17 00:11:48 maya Exp $
+$NetBSD: patch-unix_uxpgnt.c,v 1.2 2017/03/17 11:55:53 maya Exp $
 
 BSD setpgrp has parameters. POSIX says it is undefined whether
 setpgrp(0,0) == setpgrp() and it should use setpgid.
 
-If this is a problem on glibc, it should support both based
-on defines.
+Use setpgid without parameters on non-BSD
 
 --- unix/uxpgnt.c.orig 2017-02-18 17:10:15.000000000 +0000
 +++ unix/uxpgnt.c
-@@ -270,7 +270,7 @@ void pageant_fork_and_print_env(int reta
+@@ -270,7 +270,11 @@ void pageant_fork_and_print_env(int reta
          /* 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). */