The following diff brings security/pwgen to 2.08, which fixes some bugs.
Response maintainer 'fine for me'.
--
Björn Ketelaars
GPG key: 0x4F0E5F21
diff --git security/pwgen/Makefile security/pwgen/Makefile
index 866aea4c7b0..3f8961119b2 100644
--- security/pwgen/Makefile
+++ security/pwgen/Makefile
@@ -2,8 +2,7 @@
COMMENT= simple password generator
-DISTNAME= pwgen-2.07
-REVISION= 2
+DISTNAME= pwgen-2.08
CATEGORIES= security
MAINTAINER= Robert Nagy <rob...@openbsd.org>
diff --git security/pwgen/distinfo security/pwgen/distinfo
index ce21281216e..5fae692561c 100644
--- security/pwgen/distinfo
+++ security/pwgen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pwgen-2.07.tar.gz) = 63RZP1gpbCHHHNB5M+BwSS6SIrec7fgdGgLOCcDhFVY=
-SIZE (pwgen-2.07.tar.gz) = 53513
+SHA256 (pwgen-2.08.tar.gz) = 2rA90wrVpY5XjFWBJBpuh+GEoY6yw7Lg//qKnPEFyXs=
+SIZE (pwgen-2.08.tar.gz) = 54884
diff --git security/pwgen/patches/patch-configure_ac
security/pwgen/patches/patch-configure_ac
new file mode 100644
index 00000000000..56b5749f3e0
--- /dev/null
+++ security/pwgen/patches/patch-configure_ac
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -1,11 +1,12 @@
+ AC_INIT(pwgen.c)
+ AC_PREREQ(2.50)
++AC_CONFIG_HEADERS(config.h)
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PATH_PROG(MV, mv, mv)
+ AC_PATH_PROG(RM, rm, rm)
+ AC_PATH_PROG(SED, sed, sed)
+ AC_PATH_PROG(PERL, perl, perl)
+-AC_CHECK_FUNCS(getopt_long)
++AC_CHECK_FUNCS(arc4random arc4random_uniform getopt_long pledge)
+ AC_CHECK_HEADERS(getopt.h)
+ AC_OUTPUT(Makefile)
diff --git security/pwgen/patches/patch-configure_in
security/pwgen/patches/patch-configure_in
deleted file mode 100644
index 26c9a16e2ef..00000000000
--- security/pwgen/patches/patch-configure_in
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.6 2016/01/31 13:35:28 jasper Exp $
---- configure.in.orig Tue Oct 28 04:39:37 2014
-+++ configure.in Mon Jan 18 14:30:48 2016
-@@ -1,11 +1,12 @@
- AC_INIT(pwgen.c)
- AC_PREREQ(2.50)
-+AC_CONFIG_HEADERS(config.h)
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PATH_PROG(MV, mv, mv)
- AC_PATH_PROG(RM, rm, rm)
- AC_PATH_PROG(SED, sed, sed)
- AC_PATH_PROG(PERL, perl, perl)
--AC_CHECK_FUNCS(getopt_long)
-+AC_CHECK_FUNCS(arc4random arc4random_uniform getopt_long pledge)
- AC_CHECK_HEADERS(getopt.h)
- AC_OUTPUT(Makefile)
diff --git security/pwgen/patches/patch-pwgen_c
security/pwgen/patches/patch-pwgen_c
index f58d7e3129f..9de7d8bc7ee 100644
--- security/pwgen/patches/patch-pwgen_c
+++ security/pwgen/patches/patch-pwgen_c
@@ -1,6 +1,7 @@
$OpenBSD: patch-pwgen_c,v 1.2 2016/01/31 13:35:28 jasper Exp $
---- pwgen.c.orig Tue Oct 28 02:00:39 2014
-+++ pwgen.c Mon Jan 18 14:38:37 2016
+Index: pwgen.c
+--- pwgen.c.orig
++++ pwgen.c
@@ -7,6 +7,8 @@
* License.
*/
@@ -10,9 +11,9 @@ $OpenBSD: patch-pwgen_c,v 1.2 2016/01/31 13:35:28 jasper Exp $
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
-@@ -94,6 +96,12 @@ int main(int argc, char **argv)
- char *buf, *tmp;
- void (*pwgen)(char *inbuf, int size, int pw_flags);
+@@ -99,6 +101,12 @@ int main(int argc, char **argv)
+ char *remove=NULL;
+ void (*pwgen)(char *inbuf, int size, int pw_flags, char *remove);
+#ifdef HAVE_PLEDGE
+ if (pledge("stdio rpath", NULL) == -1) {
@@ -23,7 +24,7 @@ $OpenBSD: patch-pwgen_c,v 1.2 2016/01/31 13:35:28 jasper Exp $
pwgen = pw_phonemes;
pw_number = pw_random_number;
if (isatty(1))
-@@ -162,6 +170,13 @@ int main(int argc, char **argv)
+@@ -170,6 +178,13 @@ int main(int argc, char **argv)
break;
}
}
diff --git security/pwgen/patches/patch-randnum_c
security/pwgen/patches/patch-randnum_c
index ae910943fb4..491577d21a8 100644
--- security/pwgen/patches/patch-randnum_c
+++ security/pwgen/patches/patch-randnum_c
@@ -1,6 +1,7 @@
$OpenBSD: patch-randnum_c,v 1.4 2015/02/09 18:56:11 jasper Exp $
---- randnum.c.orig Tue Oct 28 02:55:43 2014
-+++ randnum.c Mon Feb 9 19:24:58 2015
+Index: randnum.c
+--- randnum.c.orig
++++ randnum.c
@@ -16,8 +16,18 @@
#include <fcntl.h>
#include <errno.h>
@@ -20,7 +21,7 @@ $OpenBSD: patch-randnum_c,v 1.4 2015/02/09 18:56:11 jasper
Exp $
#ifdef HAVE_DRAND48
extern double drand48(void);
#endif
-@@ -76,3 +86,4 @@ int pw_random_number(max_num)
+@@ -75,3 +85,4 @@ int pw_random_number(max_num)
fprintf(stderr, "No entropy available!\n");
exit(1);
}
