Hi,

Here's an update to gnupg-2.2.1.

Also a patch to fix hangs under vmm. Reported and fixed upstream.

OK?

Index: Makefile
===================================================================
RCS file: /home/edd/source/OpenBSD-CVS/ports/security/gnupg2/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile    22 Aug 2017 21:07:45 -0000      1.53
+++ Makefile    7 Nov 2017 09:05:50 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      GNU privacy guard - a free PGP replacement
 
-DISTNAME =     gnupg-2.1.23
+DISTNAME =     gnupg-2.2.1
 CATEGORIES =   security
 
 MASTER_SITES = ${MASTER_SITE_GNUPG:=gnupg/}
Index: distinfo
===================================================================
RCS file: /home/edd/source/OpenBSD-CVS/ports/security/gnupg2/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo    10 Aug 2017 14:55:49 -0000      1.23
+++ distinfo    7 Nov 2017 09:05:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.1.23.tar.bz2) = qUR2ORWV6TUfIZGIdnqdbqEo6Dvl7TImp4kPSaotDXc=
-SIZE (gnupg-2.1.23.tar.bz2) = 6526734
+SHA256 (gnupg-2.2.1.tar.bz2) = NNcM1luclfPy+QqfXB4Lag/gOajWheLWbWnDPRy/Yvs=
+SIZE (gnupg-2.2.1.tar.bz2) = 6537959
Index: patches/patch-agent_protect_c
===================================================================
RCS file: patches/patch-agent_protect_c
diff -N patches/patch-agent_protect_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-agent_protect_c       7 Nov 2017 09:05:50 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Fix gpg-agent hanging on virtual machines.
+
+From upstram:
+https://dev.gnupg.org/T3472
+https://dev.gnupg.org/D450
+
+
+Index: agent/protect.c
+--- agent/protect.c.orig
++++ agent/protect.c
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include <ctype.h>
+ #include <assert.h>
+ #include <unistd.h>
+@@ -104,6 +105,12 @@ calibrate_get_time (struct calibrate_time_s *data)
+                    &data->creation_time, &data->exit_time,
+                    &data->kernel_time, &data->user_time);
+ # endif
++#elif defined (CLOCK_THREAD_CPUTIME_ID)
++  struct timespec tmp;
++
++  clock_gettime (CLOCK_THREAD_CPUTIME_ID, &tmp);
++  data->ticks = (clock_t)(((unsigned long long)tmp.tv_sec * 1000000000 +
++                           tmp.tv_nsec) * CLOCKS_PER_SEC / 1000000000);
+ #else
+   struct tms tmp;
+ 

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply via email to