Re: UPDATE: gnupg-2.1.19

2017-03-31 Thread Edd Barrett 
On Tue, Mar 28, 2017 at 06:18:25PM +0100, Edd Barrett wrote:
> On Tue, Mar 28, 2017 at 11:36:47AM +0100, Edd Barrett wrote:
> > I did wonder about this myself. systemd. Leave it with me and I'll kill
> > these files and any links to them.
> 
> New diff killing the systemd examples.

Ah, forgot to mention, there is one test failure:
https://bugs.gnupg.org/gnupg/issue3030

I've addded a link to this in the Makefile. Will post a new diff after
unlock.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: UPDATE: gnupg-2.1.19

2017-03-28 Thread Edd Barrett 
On Tue, Mar 28, 2017 at 11:36:47AM +0100, Edd Barrett wrote:
> I did wonder about this myself. systemd. Leave it with me and I'll kill
> these files and any links to them.

New diff killing the systemd examples.

OK?

Index: Makefile
===
RCS file: /home/edd/cvsync/ports/security/gnupg2/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile18 Nov 2016 11:30:53 -  1.47
+++ Makefile27 Mar 2017 14:56:02 -
@@ -2,8 +2,7 @@
 
 COMMENT =  GNU privacy guard - a free PGP replacement
 
-DISTNAME = gnupg-2.1.15
-REVISION = 2
+DISTNAME = gnupg-2.1.19
 CATEGORIES =   security
 
 MASTER_SITES = ${MASTER_SITE_GNUPG:=gnupg/}
@@ -43,8 +42,6 @@ CONFIGURE_ARGS += --disable-ldap
 
 RUN_DEPENDS =  security/pinentry
 
-# gpg-agent must be installed to run the regress tests
-# Make sure you dont have gpg aliased (e.g. to gpg2) when running tests.
 TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
 PORTHOME=${WRKDIR}
 
Index: distinfo
===
RCS file: /home/edd/cvsync/ports/security/gnupg2/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo19 Sep 2016 17:09:37 -  1.19
+++ distinfo19 Mar 2017 15:59:24 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.1.15.tar.bz2) = wowaII8bitY722uI0lL2c0/00z3mtU44SUsR1J4A/90=
-SIZE (gnupg-2.1.15.tar.bz2) = 5723689
+SHA256 (gnupg-2.1.19.tar.bz2) = RsztH1ZBzinMKCUPUvrfbkF+ZJs7/exJpaDQsipjm/A=
+SIZE (gnupg-2.1.19.tar.bz2) = 6404836
Index: patches/patch-agent_gpg-agent_c
===
RCS file: patches/patch-agent_gpg-agent_c
diff -N patches/patch-agent_gpg-agent_c
--- patches/patch-agent_gpg-agent_c 18 Nov 2016 11:30:53 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,97 +0,0 @@
-$OpenBSD: patch-agent_gpg-agent_c,v 1.1 2016/11/18 11:30:53 ajacoutot Exp $
-
-From eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka 
-Date: Tue, 4 Oct 2016 09:01:13 +0900
-Subject: [PATCH] agent, dirmngr, scd: npth_init must be after fork.
-
-From fc0b392e766af8127094e8b529d25abb84ad1d65 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka 
-Date: Fri, 7 Oct 2016 10:45:22 +0900
-Subject: [PATCH] agent, dirmngr, scd: Fix init_common_subsystems.
-
 agent/gpg-agent.c.orig Fri Nov 18 12:26:38 2016
-+++ agent/gpg-agent.c  Fri Nov 18 12:26:33 2016
-@@ -715,7 +715,31 @@ finalize_rereadable_options (void)
- }
- 
- 
-+static void
-+thread_init_once (void)
-+{
-+  static int npth_initialized = 0;
- 
-+  if (!npth_initialized)
-+{
-+  npth_initialized++;
-+  npth_init ();
-+}
-+  gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
-+}
-+
-+static void
-+initialize_modules (void)
-+{
-+  thread_init_once ();
-+  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
-+  initialize_module_cache ();
-+  initialize_module_call_pinentry ();
-+  initialize_module_call_scd ();
-+  initialize_module_trustlist ();
-+}
-+
-+
- /* The main entry point.  */
- int
- main (int argc, char **argv )
-@@ -762,14 +786,11 @@ main (int argc, char **argv )
-   i18n_init ();
-   init_common_subsystems (, );
- 
--  npth_init ();
--
-   malloc_hooks.malloc = gcry_malloc;
-   malloc_hooks.realloc = gcry_realloc;
-   malloc_hooks.free = gcry_free;
-   assuan_set_malloc_hooks (_hooks);
-   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
--  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
-   assuan_sock_init ();
-   setup_libassuan_logging ();
- 
-@@ -1051,16 +1072,12 @@ main (int argc, char **argv )
-   exit (1);
- }
- 
--  initialize_module_cache ();
--  initialize_module_call_pinentry ();
--  initialize_module_call_scd ();
--  initialize_module_trustlist ();
--
-   /* Try to create missing directories. */
-   create_directories ();
- 
-   if (debug_wait && pipe_server)
- {
-+  thread_init_once ();
-   log_debug ("waiting for debugger - my pid is %u .\n",
-  (unsigned int)getpid());
-   gnupg_sleep (debug_wait);
-@@ -1167,6 +1184,8 @@ main (int argc, char **argv )
-   /* This is the simple pipe based server */
-   ctrl_t ctrl;
- 
-+  initialize_modules ();
-+
-   ctrl = xtrycalloc (1, sizeof *ctrl);
-   if (!ctrl)
- {
-@@ -1369,6 +1388,8 @@ main (int argc, char **argv )
-   /*
-  This is the child
-*/
-+
-+  initialize_modules ();
- 
-   /* Detach from tty and put process into a new session */
-   if (!nodetach )
Index: patches/patch-common_init_c
===
RCS file: patches/patch-common_init_c
diff -N patches/patch-common_init_c
--- patches/patch-common_init_c 18 Nov 2016 11:30:53 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-$OpenBSD: patch-common_init_c,v 1.1 2016/11/18 11:30:53 ajacoutot Exp

Re: UPDATE: gnupg-2.1.19

2017-03-28 Thread Edd Barrett 
On Tue, Mar 28, 2017 at 12:13:31PM +0200, Jeremie Courreges-Anglas wrote:
> Edd Barrett  writes:
>
> I didn't look at the details, but the additional files in PLIST seem
> largely irrelevant on OpenBSD.  Maybe they should be removed?

I did wonder about this myself. systemd. Leave it with me and I'll kill
these files and any links to them.

> > If it really is deprecated, we should consider trying to kill it in
> > favour of gnupg2.
> 
> I'd prefer to postpone such a decision to after 6.1.

Absolutely! Now is certainly not the time.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: UPDATE: gnupg-2.1.19

2017-03-28 Thread Jeremie Courreges-Anglas 
Edd Barrett  writes:

> Hi,
>
> (I've CC'd other developers I know to use gpg.)
>
> Here's an update to the latest gnupg2. The new patches fix some memory
> errors. I got these from the upstream git repo. I've been using this for
> a week with no issue.
>
> OK?

I didn't look at the details, but the additional files in PLIST seem
largely irrelevant on OpenBSD.  Maybe they should be removed?

> P.S.
>
> I notice that gpg version 1 is no longer listed on the download page
> upstream, suggesting that it may be (finally) deprecated. I've asked for
> clarification as part of this bug:
> https://bugs.gnupg.org/gnupg/issue3021
>
> If it really is deprecated, we should consider trying to kill it in
> favour of gnupg2.

I'd prefer to postpone such a decision to after 6.1.

> Thanks!
>
>
> Index: Makefile
> ===
> RCS file: /home/edd/cvsync/ports/security/gnupg2/Makefile,v
> retrieving revision 1.47
> diff -u -p -r1.47 Makefile
> --- Makefile  18 Nov 2016 11:30:53 -  1.47
> +++ Makefile  27 Mar 2017 14:56:02 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT =GNU privacy guard - a free PGP replacement
>  
> -DISTNAME =   gnupg-2.1.15
> -REVISION =   2
> +DISTNAME =   gnupg-2.1.19
>  CATEGORIES = security
>  
>  MASTER_SITES =   ${MASTER_SITE_GNUPG:=gnupg/}
> @@ -43,8 +42,6 @@ CONFIGURE_ARGS +=   --disable-ldap
>  
>  RUN_DEPENDS =security/pinentry
>  
> -# gpg-agent must be installed to run the regress tests
> -# Make sure you dont have gpg aliased (e.g. to gpg2) when running tests.
>  TEST_DEPENDS =   ${FULLPKGNAME}:${BUILD_PKGPATH}
>  PORTHOME=${WRKDIR}
>  
> Index: distinfo
> ===
> RCS file: /home/edd/cvsync/ports/security/gnupg2/distinfo,v
> retrieving revision 1.19
> diff -u -p -r1.19 distinfo
> --- distinfo  19 Sep 2016 17:09:37 -  1.19
> +++ distinfo  19 Mar 2017 15:59:24 -
> @@ -1,2 +1,2 @@
> -SHA256 (gnupg-2.1.15.tar.bz2) = wowaII8bitY722uI0lL2c0/00z3mtU44SUsR1J4A/90=
> -SIZE (gnupg-2.1.15.tar.bz2) = 5723689
> +SHA256 (gnupg-2.1.19.tar.bz2) = RsztH1ZBzinMKCUPUvrfbkF+ZJs7/exJpaDQsipjm/A=
> +SIZE (gnupg-2.1.19.tar.bz2) = 6404836
> Index: patches/patch-agent_gpg-agent_c
> ===
> RCS file: patches/patch-agent_gpg-agent_c
> diff -N patches/patch-agent_gpg-agent_c
> --- patches/patch-agent_gpg-agent_c   18 Nov 2016 11:30:53 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,97 +0,0 @@
> -$OpenBSD: patch-agent_gpg-agent_c,v 1.1 2016/11/18 11:30:53 ajacoutot Exp $
> -
> -From eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d Mon Sep 17 00:00:00 2001
> -From: NIIBE Yutaka 
> -Date: Tue, 4 Oct 2016 09:01:13 +0900
> -Subject: [PATCH] agent, dirmngr, scd: npth_init must be after fork.
> -
> -From fc0b392e766af8127094e8b529d25abb84ad1d65 Mon Sep 17 00:00:00 2001
> -From: NIIBE Yutaka 
> -Date: Fri, 7 Oct 2016 10:45:22 +0900
> -Subject: [PATCH] agent, dirmngr, scd: Fix init_common_subsystems.
> -
>  agent/gpg-agent.c.orig   Fri Nov 18 12:26:38 2016
> -+++ agent/gpg-agent.cFri Nov 18 12:26:33 2016
> -@@ -715,7 +715,31 @@ finalize_rereadable_options (void)
> - }
> - 
> - 
> -+static void
> -+thread_init_once (void)
> -+{
> -+  static int npth_initialized = 0;
> - 
> -+  if (!npth_initialized)
> -+{
> -+  npth_initialized++;
> -+  npth_init ();
> -+}
> -+  gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
> -+}
> -+
> -+static void
> -+initialize_modules (void)
> -+{
> -+  thread_init_once ();
> -+  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
> -+  initialize_module_cache ();
> -+  initialize_module_call_pinentry ();
> -+  initialize_module_call_scd ();
> -+  initialize_module_trustlist ();
> -+}
> -+
> -+
> - /* The main entry point.  */
> - int
> - main (int argc, char **argv )
> -@@ -762,14 +786,11 @@ main (int argc, char **argv )
> -   i18n_init ();
> -   init_common_subsystems (, );
> - 
> --  npth_init ();
> --
> -   malloc_hooks.malloc = gcry_malloc;
> -   malloc_hooks.realloc = gcry_realloc;
> -   malloc_hooks.free = gcry_free;
> -   assuan_set_malloc_hooks (_hooks);
> -   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
> --  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
> -   assuan_sock_init ();
> -   setup_libassuan_logging ();
> - 
> -@@ -1051,16 +1072,12 @@ main (int argc, char **argv )
> -   exit (1);
> - }
> - 
> --  initialize_module_cache ();
> --  initialize_module_call_pinentry ();
> --  initialize_module_call_scd ();
> --  initialize_module_trustlist ();
> --
> -   /* Try to create missing directories. */
> -   create_directories ();
> - 
> -   if (debug_wait && pipe_server)
> - {
> -+  thread_init_once ();
> -   log_debug ("waiting for debugger - my pid is %u .\n",
> -  (unsigned int)getpid());
> -   gnupg_sleep (debug_wait);
>