--- a/components/pwgen/Makefile	Sat Apr 23 02:37:28 2016 -0700
+++ b/components/pwgen/Makefile	Fri Apr 22 05:13:17 2016 -0700
@@ -26,13 +26,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pwgen
-COMPONENT_VERSION=	2.06
+COMPONENT_VERSION=	2.07
 COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/pwgen/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
-COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/pwgen/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)	
+    sha256:eb74593f58296c21c71cd07933e070492e9222b79cedf81d1a02ce09c0e11556
+COMPONENT_ARCHIVE_URL=	http://netcologne.dl.sourceforge.net/project/pwgen/pwgen/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
-TPNO=			9020
+TPNO=			27185
 
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
@@ -42,12 +42,12 @@
 
 # IPS Package versions contain sequences of non-negative (for now) integers,
 # separated by dots.  Leading zeroes are not allowed, due to ordering
-# ambiguity, so IPS team has to massage "06" into "6" and thus IPS version
-# of pwgen is actually 2.6 and not 2.06.  IPS_COMPONENT_VERSION is by default
+# ambiguity. For example, IPS team has to massage "06" into "6" and thus IPS 
+# version of pwgen 2.06 becomes 2.6.  IPS_COMPONENT_VERSION is by default
 # set to $(COMPONENT_VERSION) but in this case it has to be set specifically
-# to "2.6" to comply with the convention described above.
+# to comply with the convention described above.
 #
-IPS_COMPONENT_VERSION=	2.6
+IPS_COMPONENT_VERSION=	2.7
 HUMAN_VERSION=		$(COMPONENT_VERSION)
 
 # configure in pwgen is generated by autoconf 2.13, which does not accept the

--- a/components/pwgen/patches/01-sha1num.c.patch	Sat Apr 23 02:37:28 2016 -0700
+++ b/components/pwgen/patches/01-sha1num.c.patch	Fri Apr 22 05:13:17 2016 -0700
@@ -1,14 +1,33 @@
-Developed in-house, not fed back - can't submit new issue
- - community seems dead.
-Fixes Parfait problem file leak
+Developed in-house, as the community seems to be back it can be
+provided back upstream.
+
+Fixes a Parfait reported issue and makes pwgen to use Solaris'
+implementation of SHA1.
 
---- pwgen-2.06/sha1num.c	2007-07-04 16:42:19.000000000 -0700
-+++ pwgen-2.06-fixed/sha1num.c	2013-09-05 07:33:17.194749959 -0700
-@@ -54,6 +54,8 @@
+--- pwgen-2.07/sha1num.c.orig	Fri Apr 22 04:32:20 2016
++++ pwgen-2.07/sha1num.c	Fri Apr 22 04:45:55 2016
+@@ -11,7 +11,15 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "pwgen.h"
+-#include "sha1.h"
++#ifdef SHA_INTERNAL
++  #include "sha1.h"
++#elif SHA_SOLARIS
++  #include <sha1.h>
++  #define sha1_context SHA1_CTX
++  #define sha1_starts SHA1Init
++  #define sha1_update SHA1Update
++  #define sha1_finish(a,b) SHA1Final(b,a)
++#endif
+ 
+ sha1_context sha1_ctx;
+ char *sha1_seed;
+@@ -54,6 +62,8 @@
  		sha1_update( &sha1_ctx, buf, i );
  	}
  
-+	fclose(f);
++  fclose(f);
 +
  	return;
  }

--- a/components/pwgen/patches/02-use_libmd_sha1.patch	Sat Apr 23 02:37:28 2016 -0700
+++ b/components/pwgen/patches/02-use_libmd_sha1.patch	Fri Apr 22 05:13:17 2016 -0700
@@ -1,31 +1,13 @@
-Developed in-house, not fed back - can't submit new issue
- - community seems dead.
-Solaris specific: uses internal implementation of SHA1
+Developed in-house, as the community seems to be back it can be
+provided back upstream.
 
---- pwgen-2.06/sha1num.c	2013-11-25 12:09:31.359377740 -0800
-+++ pwgen-2.06/sha1num.c	2013-11-25 12:09:26.489379943 -0800
-@@ -11,7 +11,16 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include "pwgen.h"
-+#ifdef SHA_INTERNAL
- #include "sha1.h"
-+#endif
-+#ifdef SHA_SOLARIS
-+#include <sha1.h>
-+#define sha1_context SHA1_CTX
-+#define sha1_starts SHA1Init
-+#define sha1_update SHA1Update
-+#define sha1_finish(a,b) SHA1Final(b,a)
-+#endif
- 
- sha1_context sha1_ctx;
- char *sha1_seed;
---- pwgen-2.06/configure.in	2013-12-02 02:57:12.022589524 -0800
-+++ pwgen-2.06/configure.in	2013-12-02 02:56:10.404769485 -0800
+Makes pwgen to use Solaris' implementation of SHA1.
+
+--- pwgen-2.07/configure.in.orig	Fri Apr 22 04:49:40 2016
++++ pwgen-2.07/configure.in	Fri Apr 22 04:52:17 2016
 @@ -8,4 +8,23 @@
  AC_PATH_PROG(PERL, perl, perl)
- AC_CHECK_FUNCS(drand48 getopt_long)
+ AC_CHECK_FUNCS(getopt_long)
  AC_CHECK_HEADERS(getopt.h)
 +pwgen_sha="internal"
 +SHA_OBJ=""
@@ -34,22 +16,22 @@
 +SHA_HEAD=""
 +AC_CHECK_LIB(md, SHA1Init, [pwgen_sha="solaris"])
 +if test x"$pwgen_sha" = x"internal" ; then
-+	CFLAGS="${CFLAGS} -DSHA_INTERNAL"
-+	SHA_OBJ="sha1.o"
-+	SHA_SRC="sha1.c"
-+	SHA_HEAD="sha1.h"
++    CFLAGS="${CFLAGS} -DSHA_INTERNAL"
++    SHA_OBJ="sha1.o"
++    SHA_SRC="sha1.c"
++    SHA_HEAD="sha1.h"
 +elif test x"$pwgen_sha" = x"solaris" ; then
-+	SHA_LIB="-lmd"
-+	CFLAGS="${CFLAGS} -DSHA_SOLARIS"
++    SHA_LIB="-lmd"
++    CFLAGS="${CFLAGS} -DSHA_SOLARIS"
 +fi
 +AC_SUBST(SHA_OBJ)
 +AC_SUBST(SHA_SRC)
 +AC_SUBST(SHA_LIB)
 +AC_SUBST(SHA_HEAD)
  AC_OUTPUT(Makefile)
---- pwgen-2.06/Makefile.in	2013-12-02 03:52:49.960581781 -0800
-+++ pwgen-2.06/Makefile.in	2013-12-02 03:52:25.323489891 -0800
-@@ -19,7 +19,7 @@
+--- pwgen-2.07/Makefile.in.orig	Fri Apr 22 04:52:43 2016
++++ pwgen-2.07/Makefile.in	Fri Apr 22 04:56:18 2016
+@@ -20,7 +20,7 @@
  CFLAGS = @CFLAGS@ $(WALL_OPTS)
  CPPFLAGS = @CPPFLAGS@
  ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) 
@@ -58,7 +40,7 @@
  RM = @RM@
  MV = @MV@
  SED = @SED@
-@@ -31,9 +31,9 @@
+@@ -32,9 +32,9 @@
  .c.o:
  	$(CC) -c $(ALL_CFLAGS) $< -o $@
  
@@ -70,7 +52,7 @@
  
  
  pwgen: $(OBJS)
-@@ -127,4 +127,4 @@
+@@ -128,4 +128,4 @@
  pw_rand.o: pw_rand.c pwgen.h
  randnum.o: randnum.c pwgen.h
  sha1.o: sha1.c sha1.h 

--- a/components/pwgen/patches/03-fix_CVEs-2013-4440-4443.patch	Sat Apr 23 02:37:28 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-Developed by community.
-http://marc.info/?l=oss-security&m=137049241132104&w=4
-Fix following CVEs:
-CVE-2013-4440, CVE-2013-4441, CVE-2013-4442, CVE-2013-4443
-with an exception of number bias in short passwords (won't be fixed,
-it's a feature)
-
---- pwgen-2.06/configure.in	2007-07-05 09:42:19.000000000 +1000
-+++ pwgen-2.06-mik/configure.in	2013-05-27 16:48:46.399195554 +1000
-@@ -6,7 +6,7 @@
- AC_PATH_PROG(RM, rm, rm)
- AC_PATH_PROG(SED, sed, sed)
- AC_PATH_PROG(PERL, perl, perl)
--AC_CHECK_FUNCS(drand48 getopt_long)
-+AC_CHECK_FUNCS(getopt_long)
- AC_CHECK_HEADERS(getopt.h)
- pwgen_sha="internal"
- SHA_OBJ=""
---- pwgen-2.06/debian/control	2013-06-06 09:57:01.000000000 +1000
-+++ pwgen-2.06-mik/debian/control	2013-06-06 10:05:44.315608968 +1000
-@@ -8,6 +8,7 @@
- Package: pwgen
- Architecture: any
- Depends: ${shlibs:Depends}
-+Suggests: passwdqc
- Description: Automatic Password generation
-  pwgen generates random, meaningless but pronounceable passwords.
-  These passwords contain either only lowercase letters, or upper
---- pwgen-2.06/pwgen.c	2013-06-06 09:57:01.000000000 +1000
-+++ pwgen-2.06-mik/pwgen.c	2013-06-06 13:50:19.541188659 +1000
-@@ -25,7 +25,7 @@
- 
- int	pw_length = 8;
- int	num_pw = -1;
--int	pwgen_flags = 0;
-+int	pwgen_flags = PW_LOWERS | PW_UPPERS | PW_DIGITS;
- int	do_columns = 0;
- 
- #ifdef HAVE_GETOPT_LONG
-@@ -42,11 +42,12 @@
- 	{ "sha1", required_argument, 0, 'H' },
- 	{ "ambiguous", no_argument, 0, 'B' },
- 	{ "no-vowels", no_argument, 0, 'v' },
-+	{ "insecure-phonemes", no_argument, 0, 'P' },
- 	{ 0, 0, 0, 0}
- };
- #endif
- 
--const char *pw_options = "01AaBCcnN:shH:vy";
-+const char *pw_options = "01AaBCcnN:shH:vyP";
- 
- static void usage(void)
- {
-@@ -82,6 +83,8 @@
- 	fputs("  -v or --no-vowels\n", stderr);
- 	fputs("\tDo not use any vowels so as to avoid accidental nasty words\n",
- 	      stderr);
-+	fputs("  -P or --insecure-phonemes\n", stderr);
-+	fputs("\tGenerate insecure phonemes, as was previously the default\n", stderr);
- 	exit(1);
- }
- 
-@@ -94,11 +97,10 @@
- 	char	*buf, *tmp;
- 	void	(*pwgen)(char *inbuf, int size, int pw_flags);
- 
--	pwgen = pw_phonemes;
-+	pwgen = pw_rand;
- 	pw_number = pw_random_number;
- 	if (isatty(1)) {
- 		do_columns = 1;
--		pwgen_flags |= PW_DIGITS | PW_UPPERS;
- 	}
- 
- 	while (1) {
-@@ -140,6 +144,9 @@
- 			pwgen = pw_rand;
- 			pwgen_flags = PW_DIGITS | PW_UPPERS;
- 			break;
-+		case 'P':
-+			pwgen = pw_phonemes;
-+			break;
- 		case 'C':
- 			do_columns = 1;
- 			break;
---- pwgen-2.06/pwgen.h	2007-07-05 09:42:19.000000000 +1000
-+++ pwgen-2.06-mik/pwgen.h	2013-06-06 10:08:42.186709620 +1000
-@@ -28,6 +28,7 @@
- #define PW_SYMBOLS	0x0004
- #define PW_AMBIGUOUS	0x0008
- #define PW_NO_VOWELS	0x0010
-+#define PW_LOWERS	0x0020  /* At least one lowercase! */
- 
- /* pointer to choose between random or sha1 pseudo random number generator */
- extern int (*pw_number)(int max_num);
---- pwgen-2.06/pw_rand.c	2007-07-05 09:42:19.000000000 +1000
-+++ pwgen-2.06-mik/pw_rand.c	2013-06-06 13:51:38.948600125 +1000
-@@ -72,10 +72,12 @@
- 			feature_flags &= ~PW_UPPERS;
- 		if (strchr(pw_symbols, ch))
- 			feature_flags &= ~PW_SYMBOLS;
-+		if (strchr(pw_lowers, ch))
-+			feature_flags &= ~PW_LOWERS;
- 	}
--	if (feature_flags & (PW_UPPERS | PW_DIGITS | PW_SYMBOLS))
-+	if (feature_flags & (PW_UPPERS | PW_DIGITS | PW_SYMBOLS | PW_LOWERS))
- 		goto try_again;
- 	buf[size] = 0;
- 	free(chars);
- 	return;
--}	
-+}
---- pwgen-2.06/randnum.c	2007-07-05 09:42:19.000000000 +1000
-+++ pwgen-2.06-mik/randnum.c	2013-06-06 10:00:23.149212710 +1000
-@@ -7,53 +7,45 @@
-  * License.
-  */
- 
-+#include <stdio.h>
-+#include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/types.h>
--#include <sys/time.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
- 
- #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;
--	int		i;
-+	static int fd = -2;
- 
--	if (fd == -2) {
--		gettimeofday(&tv, 0);
-+	if(fd == -2) {
- 		fd = open("/dev/urandom", O_RDONLY);
--		if (fd == -1)
--			fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
--#ifdef HAVE_DRAND48
--		srand48((tv.tv_sec<<9) ^ (getpgrp()<<15) ^
--			(getpid()) ^ (tv.tv_usec>>11));
--#else
--		srandom((getpid() << 16) ^ (getpgrp() << 8) ^ getuid() 
--		      ^ tv.tv_sec ^ tv.tv_usec);
--#endif
-+		if (fd == -1) {
-+			fprintf(stderr, "Unable to open /dev/urandom: %s\n", strerror(errno));
-+			abort();
-+		}
- 	}
--	/* Crank the random number generator a few times */
--	gettimeofday(&tv, 0);
--	for (i = (tv.tv_sec ^ tv.tv_usec) & 0x1F; i > 0; i--)
--#ifdef HAVE_DRAND48
--		drand48();
--#else
--		random();
--#endif
- 	return fd;
- }
- 
-+static unsigned int get_mask(int max_num)
-+{
-+	unsigned int numBits = 0;
-+	while(max_num > 0)
-+	{
-+		numBits++;
-+		max_num >>= 1;
-+	}
-+	return (1<<numBits) - 1;
-+}
-+
- /*
-  * Generate a random number n, where 0 <= n < max_num, using
-  * /dev/urandom if possible.
-@@ -62,34 +54,20 @@
- 	int max_num;
- {
- 	int i, fd = get_random_fd();
--	int lose_counter = 0, nbytes=4;
- 	unsigned int rand_num;
--	char *cp = (char *) &rand_num;
- 
--	if (fd >= 0) {
--		while (nbytes > 0) {
--			i = read(fd, cp, nbytes);
--			if ((i < 0) &&
--			    ((errno == EINTR) || (errno == EAGAIN)))
--				continue;
--			if (i <= 0) {
--				if (lose_counter++ == 8)
--					break;
--				continue;
--			}
--			nbytes -= i;
--			cp += i;
--			lose_counter = 0;
--		}
-+	i = read(fd, (void *)&rand_num, sizeof(rand_num));
-+	if(i < 0) {
-+		fprintf(stderr, "Error reading from /dev/urandom: %s\n", strerror(errno));
-+		abort();
- 	}
--	if (nbytes == 0)
--		return (rand_num % max_num);
- 
--	/* OK, we weren't able to use /dev/random, fall back to rand/rand48 */
-+        rand_num &= get_mask(max_num);
- 
--#ifdef HAVE_DRAND48
--	return ((int) ((drand48() * max_num)));
--#else
--	return ((int) (random() / ((float) RAND_MAX) * max_num));
--#endif
-+	if(rand_num < max_num) {
-+		return rand_num;
-+	}
-+
-+	return pw_random_number(max_num); /* tail-recurse */
- }
-+