Attachment #177065 for bug #214568

Lines 2-8 Link Here

(-)security/gnupg/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= gnupg	3	PORTNAME= gnupg
4	PORTVERSION= 2.1.15	4	PORTVERSION= 2.1.15
5	#PORTREVISION= 0	5	PORTREVISION= 1
6	CATEGORIES= security	6	CATEGORIES= security
7	MASTER_SITES= GNUPG	7	MASTER_SITES= GNUPG
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig	8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig




--- agent/gpg-agent.c.orig	2016-11-16 11:52:50 UTC
+++ agent/gpg-agent.c
@@ -760,9 +760,8 @@ main (int argc, char **argv )
 
   /* Make sure that our subsystems are ready.  */
   i18n_init ();
-  init_common_subsystems (&argc, &argv);
-
   npth_init ();
+  init_common_subsystems (&argc, &argv);
 
   malloc_hooks.malloc = gcry_malloc;
   malloc_hooks.realloc = gcry_realloc;




--- dirmngr/dirmngr.c.orig	2016-11-16 11:53:05 UTC
+++ dirmngr/dirmngr.c
@@ -667,9 +667,8 @@ main (int argc, char **argv)
 
   /* Make sure that our subsystems are ready.  */
   i18n_init ();
-  init_common_subsystems (&argc, &argv);
-
   npth_init ();
+  init_common_subsystems (&argc, &argv);
 
   gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
 

Lines 1-6 Link Here

(-)security/gnupg/files/patch-doc-Makefile.in (-3 / +3 lines)
1	--- doc/Makefile.in.orig 2016-05-04 23:00:20.000000000 +0900	1	--- doc/Makefile.in.orig 2016-08-18 15:16:49 UTC
2	+++ doc/Makefile.in 2016-05-06 07:36:42.183921000 +0900	2	+++ doc/Makefile.in
3	@@ -514,7 +514,7 @@	3	@@ -515,7 +515,7 @@ CLEANFILES = yat2m mkdefsinc defs.inc
4	DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \	4	DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
5	gnupg-card-architecture.eps \	5	gnupg-card-architecture.eps \
6	gnupg-module-overview.eps \	6	gnupg-module-overview.eps \




--- g13/g13.c.orig	2016-11-16 11:53:27 UTC
+++ g13/g13.c
@@ -370,9 +370,8 @@ main ( int argc, char **argv)
 
   /* Make sure that our subsystems are ready.  */
   i18n_init ();
-  init_common_subsystems (&argc, &argv);
-
   npth_init ();
+  init_common_subsystems (&argc, &argv);
 
   /* Take extra care of the random pool.  */
   gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);




--- scd/scdaemon.c.orig	2016-11-16 11:52:59 UTC
+++ scd/scdaemon.c
@@ -420,9 +420,8 @@ main (int argc, char **argv )
 
   /* Make sure that our subsystems are ready.  */
   i18n_init ();
-  init_common_subsystems (&argc, &argv);
-
   npth_init ();
+  init_common_subsystems (&argc, &argv);
 
   ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free);
 

Return to bug 214568

Line 0 Link Here

(-)security/gnupg/files/patch-agent_gpg-agent.c (+13 lines)
	1	--- agent/gpg-agent.c.orig 2016-11-16 11:52:50 UTC
	2	+++ agent/gpg-agent.c
	3	@@ -760,9 +760,8 @@ main (int argc, char **argv )
	4
	5	/* Make sure that our subsystems are ready. */
	6	i18n_init ();
	7	- init_common_subsystems (&argc, &argv);
	8	-
	9	npth_init ();
	10	+ init_common_subsystems (&argc, &argv);
	11
	12	malloc_hooks.malloc = gcry_malloc;
	13	malloc_hooks.realloc = gcry_realloc;

Line 0 Link Here

(-)security/gnupg/files/patch-dirmngr_dirmngr.c (+13 lines)
	1	--- dirmngr/dirmngr.c.orig 2016-11-16 11:53:05 UTC
	2	+++ dirmngr/dirmngr.c
	3	@@ -667,9 +667,8 @@ main (int argc, char **argv)
	4
	5	/* Make sure that our subsystems are ready. */
	6	i18n_init ();
	7	- init_common_subsystems (&argc, &argv);
	8	-
	9	npth_init ();
	10	+ init_common_subsystems (&argc, &argv);
	11
	12	gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
	13

Line 0 Link Here

(-)security/gnupg/files/patch-g13_g13.c (+13 lines)
	1	--- g13/g13.c.orig 2016-11-16 11:53:27 UTC
	2	+++ g13/g13.c
	3	@@ -370,9 +370,8 @@ main ( int argc, char **argv)
	4
	5	/* Make sure that our subsystems are ready. */
	6	i18n_init ();
	7	- init_common_subsystems (&argc, &argv);
	8	-
	9	npth_init ();
	10	+ init_common_subsystems (&argc, &argv);
	11
	12	/* Take extra care of the random pool. */
	13	gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);

Line 0 Link Here

(-)security/gnupg/files/patch-scd_scdaemon.c (+13 lines)
	1	--- scd/scdaemon.c.orig 2016-11-16 11:52:59 UTC
	2	+++ scd/scdaemon.c
	3	@@ -420,9 +420,8 @@ main (int argc, char **argv )
	4
	5	/* Make sure that our subsystems are ready. */
	6	i18n_init ();
	7	- init_common_subsystems (&argc, &argv);
	8	-
	9	npth_init ();
	10	+ init_common_subsystems (&argc, &argv);
	11
	12	ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free);
	13