Attachment 177065 Details for Bug 214568 – fix initialisation order

[patch] fix initialisation order

security_gnupg.diff (text/plain), 3.53 KB, created by Christoph Moench-Tegeder on 2016-11-16 12:25:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2016-11-16 12:25:59 UTC

Size: 3.53 KB

patch

obsolete

>Index: security/gnupg/Makefile
>===================================================================
>--- security/gnupg/Makefile	(revision 426235)
>+++ security/gnupg/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	gnupg
> PORTVERSION=	2.1.15
>-#PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	GNUPG
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
>Index: security/gnupg/files/patch-agent_gpg-agent.c
>===================================================================
>--- security/gnupg/files/patch-agent_gpg-agent.c	(nonexistent)
>+++ security/gnupg/files/patch-agent_gpg-agent.c	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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;
>Index: security/gnupg/files/patch-dirmngr_dirmngr.c
>===================================================================
>--- security/gnupg/files/patch-dirmngr_dirmngr.c	(nonexistent)
>+++ security/gnupg/files/patch-dirmngr_dirmngr.c	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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);
>+ 
>Index: security/gnupg/files/patch-doc-Makefile.in
>===================================================================
>--- security/gnupg/files/patch-doc-Makefile.in	(revision 426235)
>+++ security/gnupg/files/patch-doc-Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- doc/Makefile.in.orig	2016-05-04 23:00:20.000000000 +0900
>-+++ doc/Makefile.in	2016-05-06 07:36:42.183921000 +0900
>-@@ -514,7 +514,7 @@
>+--- doc/Makefile.in.orig	2016-08-18 15:16:49 UTC
>++++ doc/Makefile.in
>+@@ -515,7 +515,7 @@ CLEANFILES = yat2m mkdefsinc defs.inc
>  DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
>                   gnupg-card-architecture.eps \
>                   gnupg-module-overview.eps \
>Index: security/gnupg/files/patch-g13_g13.c
>===================================================================
>--- security/gnupg/files/patch-g13_g13.c	(nonexistent)
>+++ security/gnupg/files/patch-g13_g13.c	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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);
>Index: security/gnupg/files/patch-scd_scdaemon.c
>===================================================================
>--- security/gnupg/files/patch-scd_scdaemon.c	(nonexistent)
>+++ security/gnupg/files/patch-scd_scdaemon.c	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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);
>+

Actions: View | Diff

Attachments on bug 214568: 177065 | 177181