17417022 pwgen needs some love
authorJiri Kukacka <jiri.kukacka@oracle.com>
Thu, 12 Sep 2013 07:07:27 -0700
changeset 1466 24d2be32f88c
parent 1465 26be70b523fc
child 1467 f14b6c5766ca
17417022 pwgen needs some love
components/pwgen/Makefile
components/pwgen/patches/01-sha1num.c.patch
--- a/components/pwgen/Makefile	Wed Sep 11 10:06:27 2013 -0700
+++ b/components/pwgen/Makefile	Thu Sep 12 07:07:27 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -35,6 +35,8 @@
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/pwgen/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)	
 COMPONENT_BUGDB=	utility/pwgen
 
+CONFIGURE_OPTIONS += LDFLAGS="$(CC_BITS)"
+
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
@@ -61,10 +63,12 @@
 #
 COMPONENT_BUILD_ARGS = WALL_OPTS=
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/pwgen/patches/01-sha1num.c.patch	Thu Sep 12 07:07:27 2013 -0700
@@ -0,0 +1,13 @@
+# fixes Parfait problem file leak
+
+--- 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 @@
+ 		sha1_update( &sha1_ctx, buf, i );
+ 	}
+ 
++	fclose(f);
++
+ 	return;
+ }
+