On Tue, Aug 22, 2017 at 02:28:59PM +0100, Edd Barrett wrote:
> Hi,
>
> The last update to gnupg2 broke `gpg2 --refresh`.
>
> ---8<---
> $ gpg2 --refresh
> gpg: connecting dirmngr at '/home/edd/.gnupg/S.dirmngr' failed: IPC connect
> call failed
> gpg: keyserver refresh failed: No dirmngr
> --->8---
>
> The reason: dirmngr is dumping core:
>
> ---8<---
> $ dirmngr
> assertion "res == 0" failed: file "npth.c", line 123, function "enter_npth"
> zsh: abort (core dumped) dirmngr
> --->8---
>
> Since the crash is to do with npth, I tried updating this port, and it
> appears to be fixed. dirmngr now works:
>
> ---8<---
> $ dirmngr
> ...
> OK Dirmngr 2.1.23 at your service
> --->8---
>
> Can people try this diff and see if it works for them? OK?
>
Yes, go for it.
ok pea@
>
> Index: devel/npth/Makefile
> ===================================================================
> RCS file: /home/edd/cvsync/ports/devel/npth/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- devel/npth/Makefile 1 Oct 2016 13:56:26 -0000 1.6
> +++ devel/npth/Makefile 22 Aug 2017 13:15:34 -0000
> @@ -2,9 +2,9 @@
>
> COMMENT= new GNU Portable Threads Library
>
> -DISTNAME= npth-1.2
> +DISTNAME= npth-1.5
>
> -SHARED_LIBS= npth 0.0 # 0.5
> +SHARED_LIBS= npth 1.0 # 1.1
>
> CATEGORIES= devel
>
> Index: devel/npth/distinfo
> ===================================================================
> RCS file: /home/edd/cvsync/ports/devel/npth/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- devel/npth/distinfo 18 Sep 2015 10:41:05 -0000 1.2
> +++ devel/npth/distinfo 22 Aug 2017 13:15:34 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (npth-1.2.tar.bz2) = bdvd2yz0mkcj+dGtZWPEgNZ2Dctjy3cmuPw7wuG2wIo=
> -SIZE (npth-1.2.tar.bz2) = 298735
> +SHA256 (npth-1.5.tar.bz2) = KUppDB9Te5Ltgp2Ge+5Tfka+k/vWCxbARjD7v82ds8I=
> +SIZE (npth-1.5.tar.bz2) = 299308
> Index: devel/npth/patches/patch-configure
> ===================================================================
> RCS file: /home/edd/cvsync/ports/devel/npth/patches/patch-configure,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-configure
> --- devel/npth/patches/patch-configure 18 Sep 2015 10:41:05 -0000
> 1.2
> +++ devel/npth/patches/patch-configure 22 Aug 2017 13:15:34 -0000
> @@ -1,12 +1,13 @@
> $OpenBSD: patch-configure,v 1.2 2015/09/18 10:41:05 pea Exp $
> ---- configure.orig Sat Apr 11 14:02:28 2015
> -+++ configure Fri Sep 11 14:50:04 2015
> -@@ -2306,8 +2306,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
> +Index: configure
> +--- configure.orig
> ++++ configure
> +@@ -2311,8 +2311,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
> # (Interfaces removed/changed: AGE=0)
> #
> - LIBNPTH_LT_CURRENT=0
> --LIBNPTH_LT_AGE=0
> --LIBNPTH_LT_REVISION=5
> + LIBNPTH_LT_CURRENT=1
> +-LIBNPTH_LT_AGE=1
> +-LIBNPTH_LT_REVISION=1
> +LIBNPTH_LT_AGE=${LIBnpth_MAJOR}
> +LIBNPTH_LT_REVISION=${LIBnpth_MINOR}
>
> Index: security/gnupg2/Makefile
> ===================================================================
> RCS file: /home/edd/cvsync/ports/security/gnupg2/Makefile,v
> retrieving revision 1.52
> diff -u -p -r1.52 Makefile
> --- security/gnupg2/Makefile 10 Aug 2017 14:55:48 -0000 1.52
> +++ security/gnupg2/Makefile 22 Aug 2017 13:15:51 -0000
> @@ -4,6 +4,7 @@ COMMENT = GNU privacy guard - a free PGP
>
> DISTNAME = gnupg-2.1.23
> CATEGORIES = security
> +REVISION = 0
>
> MASTER_SITES = ${MASTER_SITE_GNUPG:=gnupg/}
>
> @@ -26,7 +27,7 @@ LIB_DEPENDS = archivers/bzip2 \
> databases/sqlite3 \
> devel/gettext \
> devel/libusb1 \
> - devel/npth \
> + devel/npth>=1.5 \
> security/gnutls \
> security/libassuan>=2.4.3 \
> security/libgcrypt \
>
> --
> Best Regards
> Edd Barrett
>
> http://www.theunixzoo.co.uk
