CVS commit: pkgsrc/sysutils/pwgen

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Aug  1 08:13:09 UTC 2025

Modified Files:
        pkgsrc/sysutils/pwgen: Makefile distinfo
Added Files:
        pkgsrc/sysutils/pwgen/patches: patch-pw__phonemes.c patch-pwgen.1
            patch-randnum.c

Log Message:
pwgen: Backport various fixes from the GH version.

If they ever tag a new release we should switch to it away from the SF
version.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/pwgen/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/pwgen/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/pwgen/patches/patch-pw__phonemes.c \
    pkgsrc/sysutils/pwgen/patches/patch-pwgen.1 \
    pkgsrc/sysutils/pwgen/patches/patch-randnum.c

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

Modified files:

Index: pkgsrc/sysutils/pwgen/Makefile
diff -u pkgsrc/sysutils/pwgen/Makefile:1.12 pkgsrc/sysutils/pwgen/Makefile:1.13
--- pkgsrc/sysutils/pwgen/Makefile:1.12 Tue May 29 02:57:56 2018
+++ pkgsrc/sysutils/pwgen/Makefile      Fri Aug  1 08:13:08 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2018/05/29 02:57:56 ginsbach Exp $
+# $NetBSD: Makefile,v 1.13 2025/08/01 08:13:08 jperkin Exp $
 
 DISTNAME=      pwgen-2.08
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pwgen/}
 

Index: pkgsrc/sysutils/pwgen/distinfo
diff -u pkgsrc/sysutils/pwgen/distinfo:1.11 pkgsrc/sysutils/pwgen/distinfo:1.12
--- pkgsrc/sysutils/pwgen/distinfo:1.11 Tue Oct 26 11:20:02 2021
+++ pkgsrc/sysutils/pwgen/distinfo      Fri Aug  1 08:13:08 2025
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:20:02 nia Exp $
+$NetBSD: distinfo,v 1.12 2025/08/01 08:13:08 jperkin Exp $
 
 BLAKE2s (pwgen-2.08.tar.gz) = 0e4220d3484ea27510136533f9117b5b13bcb2bf748991143f52cd06ac6b0e80
 SHA512 (pwgen-2.08.tar.gz) = 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
 Size (pwgen-2.08.tar.gz) = 54884 bytes
+SHA1 (patch-pw__phonemes.c) = c8e3fc20c93c31dfff67e33373930939f9124e69
+SHA1 (patch-pwgen.1) = 6d01a9a2428c0fd3e69648be53adaa2c64b76438
+SHA1 (patch-randnum.c) = a041bd7a61f19dc0e970fcb66f7daec37777a0c7

Added files:

Index: pkgsrc/sysutils/pwgen/patches/patch-pw__phonemes.c
diff -u /dev/null pkgsrc/sysutils/pwgen/patches/patch-pw__phonemes.c:1.1
--- /dev/null   Fri Aug  1 08:13:09 2025
+++ pkgsrc/sysutils/pwgen/patches/patch-pw__phonemes.c  Fri Aug  1 08:13:08 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-pw__phonemes.c,v 1.1 2025/08/01 08:13:08 jperkin Exp $
+
+https://github.com/tytso/pwgen/commit/54d6c1c0e8c380583c7b3f87c0ff19146232a771
+
+--- pw_phonemes.c.orig 2025-08-01 08:07:04.309469933 +0000
++++ pw_phonemes.c
+@@ -111,7 +111,7 @@ try_again:
+                       buf[c+len] = '\0'; /* To make strpbrk() happy */
+                       cp = strpbrk(buf, pw_ambiguous);
+                       if (cp)
+-                              continue;
++                              goto try_again;
+               }
+               
+               c += len;
Index: pkgsrc/sysutils/pwgen/patches/patch-pwgen.1
diff -u /dev/null pkgsrc/sysutils/pwgen/patches/patch-pwgen.1:1.1
--- /dev/null   Fri Aug  1 08:13:09 2025
+++ pkgsrc/sysutils/pwgen/patches/patch-pwgen.1 Fri Aug  1 08:13:09 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-pwgen.1,v 1.1 2025/08/01 08:13:09 jperkin Exp $
+
+https://github.com/tytso/pwgen/commit/8fffbc7cbf3f80add7150bca7c05f41f25b72fbe
+
+--- pwgen.1.orig       2025-08-01 08:07:33.197719497 +0000
++++ pwgen.1
+@@ -17,7 +17,7 @@ The
+ .B pwgen
+ program generates passwords which are designed to be easily memorized by
+ humans, while being as secure as possible.  Human-memorable passwords
+-are never going to be as secure as completely completely random
++are never going to be as secure as completely random
+ passwords.  In particular, passwords generated by
+ .B pwgen
+ without the 
Index: pkgsrc/sysutils/pwgen/patches/patch-randnum.c
diff -u /dev/null pkgsrc/sysutils/pwgen/patches/patch-randnum.c:1.1
--- /dev/null   Fri Aug  1 08:13:09 2025
+++ pkgsrc/sysutils/pwgen/patches/patch-randnum.c       Fri Aug  1 08:13:09 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-randnum.c,v 1.1 2025/08/01 08:13:09 jperkin Exp $
+
+https://github.com/tytso/pwgen/commit/1459a31e07fa208cddb2c4f3f72071503c37b8bc
+
+--- randnum.c.orig     2025-08-01 08:07:42.948068937 +0000
++++ randnum.c
+@@ -18,20 +18,13 @@
+ 
+ #include "pwgen.h"
+ 
+-#ifdef HAVE_DRAND48
+-extern double drand48(void);
+-#endif
+-
+ static int get_random_fd(void);
+ 
+-/* Borrowed/adapted from e2fsprogs's UUID generation code */
+ static int get_random_fd()
+ {
+-      struct timeval  tv;
+       static int      fd = -2;
+ 
+       if (fd == -2) {
+-              gettimeofday(&tv, 0);
+               fd = open("/dev/urandom", O_RDONLY);
+               if (fd == -1)
+                       fd = open("/dev/random", O_RDONLY | O_NONBLOCK);