[pkgsrc/trunk]: pkgsrc/security/dirmngr Remove undocumented patches that do n...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ccbf636a19c
branches:  trunk
changeset: 367311:4ccbf636a19c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Aug 29 11:54:00 2017 +0000

description:
Remove undocumented patches that do not seem useful.
Please readd with comments and upstream them if they are.

Bump PKGREVISION.

Fix RELRO build.

diffstat:

 security/dirmngr/Makefile         |   6 +++---
 security/dirmngr/distinfo         |   8 +-------
 security/dirmngr/patches/patch-ab |  13 -------------
 security/dirmngr/patches/patch-ac |  39 ---------------------------------------
 security/dirmngr/patches/patch-ad |  12 ------------
 security/dirmngr/patches/patch-ae |  12 ------------
 security/dirmngr/patches/patch-af |  17 -----------------
 security/dirmngr/patches/patch-ag |  12 ------------
 8 files changed, 4 insertions(+), 115 deletions(-)

diffs (171 lines):

diff -r 7592bfd3bda5 -r 4ccbf636a19c security/dirmngr/Makefile
--- a/security/dirmngr/Makefile Tue Aug 29 11:40:25 2017 +0000
+++ b/security/dirmngr/Makefile Tue Aug 29 11:54:00 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.57 2017/08/29 11:54:00 wiz Exp $
 
 DISTNAME=      dirmngr-1.1.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/dirmngr/
 EXTRACT_SUFX=  .tar.bz2
@@ -56,7 +56,7 @@
 INSTALLATION_DIRS=     sbin
 
 post-build:
-       ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -DDIRMNGR_USER='"${DIRMNGR_USER}"' -DDIRMNGR_PATH='"${PREFIX}/bin/dirmngr"' -o ${WRKDIR}/runDirmngr ${FILESDIR}/runDirmngr.c
+       ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} ${LDFLAGS} -DDIRMNGR_USER='"${DIRMNGR_USER}"' -DDIRMNGR_PATH='"${PREFIX}/bin/dirmngr"' -o ${WRKDIR}/runDirmngr ${FILESDIR}/runDirmngr.c
 
 post-install:
        ${INSTALL_PROGRAM} ${WRKDIR}/runDirmngr ${DESTDIR}${PREFIX}/sbin
diff -r 7592bfd3bda5 -r 4ccbf636a19c security/dirmngr/distinfo
--- a/security/dirmngr/distinfo Tue Aug 29 11:40:25 2017 +0000
+++ b/security/dirmngr/distinfo Tue Aug 29 11:54:00 2017 +0000
@@ -1,15 +1,9 @@
-$NetBSD: distinfo,v 1.23 2015/12/29 23:18:50 bsiegert Exp $
+$NetBSD: distinfo,v 1.24 2017/08/29 11:54:00 wiz Exp $
 
 SHA1 (dirmngr-1.1.1.tar.bz2) = e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
 RMD160 (dirmngr-1.1.1.tar.bz2) = f376b6cc874e275a11093dac0db6f9dc1c78d548
 SHA512 (dirmngr-1.1.1.tar.bz2) = 922512f22853c49cf291207c81862c68ba51c89646036288592d6b2f57709d35ac53f9f550569986c04daec20403ab8ec85b08893443af417950916b869c8419
 Size (dirmngr-1.1.1.tar.bz2) = 566929 bytes
 SHA1 (patch-aa) = c25289d53509761c2ca86951c33ff6f70c5696b1
-SHA1 (patch-ab) = d28f1d4a2062e2207d02d9989e7e708f7a44acc0
-SHA1 (patch-ac) = 625ba1050021e6cb17af76a4301cdcf6f5aaa92d
-SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4
-SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26
-SHA1 (patch-af) = b6ae3b526e344ca63af1babb9eb6707b90edc837
-SHA1 (patch-ag) = a08f7c82ed32e72f52a69baa64e97a86cbe8fa70
 SHA1 (patch-doc_Makefile.in) = 61f166b39ca7365e02b9d6510487c5c2d9e61f08
 SHA1 (patch-src_crlfetch.c) = d93c7120b6766fd3541a9911d490173a1340b33f
diff -r 7592bfd3bda5 -r 4ccbf636a19c security/dirmngr/patches/patch-ab
--- a/security/dirmngr/patches/patch-ab Tue Aug 29 11:40:25 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2011/01/05 07:28:20 adam Exp $
-
---- configure.orig     2011-01-05 07:14:41.000000000 +0000
-+++ configure
-@@ -8608,7 +8608,7 @@ fi
- # guess-the-dependency by using something like ./configure
- # LDAPLIBS="-Lfoo -lbar"
- #
--for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv" "-lwldap32"; do
-+for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap -llber" "-lldap" "-lldap -llber -lresolv" "-lwldap32"; do
-     _ldap_save_libs=$LIBS
-     LIBS="$MY_LDAPLIBS $NETLIBS $LIBS"
- 
diff -r 7592bfd3bda5 -r 4ccbf636a19c security/dirmngr/patches/patch-ac
--- a/security/dirmngr/patches/patch-ac Tue Aug 29 11:40:25 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2015/01/09 16:30:57 rumko Exp $
-
-With libgcrypt >= 1.6.0, one needs to init pth before init-ing libgcrypt.
-Taken from https://bugs.g10code.com/gnupg/issue1590
-
---- src/dirmngr.c.orig 2010-03-13 07:33:58.000000000 +0000
-+++ src/dirmngr.c
-@@ -39,6 +39,7 @@
- #include <unistd.h>
- #include <signal.h>
- #include <pth.h>
-+#include <locale.h>
- 
- #include <gcrypt.h>
- #include <ksba.h>
-@@ -656,8 +657,11 @@ main (int argc, char **argv)
-      the option parsing may need services of the libraries. */
- 
-   /* Libgcrypt requires us to register the threading model first.
--     Note that this will also do the pth_init. */
-+     Note that this will also do the pth_init for libgcrypt < 1.6. */
- 
-+#if GCRYPT_VERSION_NUMBER >= 0x010600
-+  pth_init();
-+#endif
-   /* Init Libgcrypt. */
-   rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
-   if (rc)
-@@ -1014,7 +1018,10 @@ main (int argc, char **argv)
-       len = (offsetof (struct sockaddr_un, sun_path)
-              + strlen (serv_addr.sun_path) + 1);
- 
-+      /* FreeBSD honors users umask */
-+      mode_t oldumask = umask(0);
-       rc = assuan_sock_bind (fd, (struct sockaddr*) &serv_addr, len);
-+      umask(oldumask);
-       if (rc == -1 && errno == EADDRINUSE)
-       {
-         remove (socket_name);
diff -r 7592bfd3bda5 -r 4ccbf636a19c security/dirmngr/patches/patch-ad
--- a/security/dirmngr/patches/patch-ad Tue Aug 29 11:40:25 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/12/12 13:09:21 shannonjr Exp $
-
---- ./src/dirmngr-client.c.orig        2006-11-29 06:04:00.000000000 -0700
-+++ ./src/dirmngr-client.c
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <errno.h>
- #include <assert.h>
-+#include <locale.h>
- 
- #include <gpg-error.h>
- #include <assuan.h> 
diff -r 7592bfd3bda5 -r 4ccbf636a19c security/dirmngr/patches/patch-ae
--- a/security/dirmngr/patches/patch-ae Tue Aug 29 11:40:25 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2007/11/07 12:43:22 shannonjr Exp $
-
---- ./src/dirmngr_ldap.c.orig  2007-08-16 07:19:40.000000000 -0600
-+++ ./src/dirmngr_ldap.c
-@@ -30,6 +30,7 @@
- #include <assert.h>
- #include <sys/time.h>
- #include <unistd.h>
-+#include <locale.h>
- 
- #ifdef HAVE_W32_SYSTEM
- #include <winsock2.h>
diff -r 7592bfd3bda5 -r 4ccbf636a19c security/dirmngr/patches/patch-af
--- a/security/dirmngr/patches/patch-af Tue Aug 29 11:40:25 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/12/12 13:09:21 shannonjr Exp $
-
---- autogen.sh.orig    2006-11-16 03:14:50.000000000 -0700
-+++ autogen.sh
-@@ -125,9 +125,9 @@ fi
- if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
-   check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
- fi
--if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
--  check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
--fi
-+#if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
-+#  check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
-+#fi
- 
- if test "$DIE" = "yes"; then
-     cat <<EOF
diff -r 7592bfd3bda5 -r 4ccbf636a19c security/dirmngr/patches/patch-ag
--- a/security/dirmngr/patches/patch-ag Tue Aug 29 11:40:25 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/12/18 07:15:05 smb Exp $
---- po/Makefile.in.in.orig     2006-12-17 21:37:20.000000000 -0500
-+++ po/Makefile.in.in  2006-12-17 21:46:18.000000000 -0500
-@@ -30,7 +30,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--mkinstalldirs = $(SHELL) @install_sh@ -d
-+mkinstalldirs = @install_sh@ -d
- mkdir_p = @mkdir_p@
- 
- GMSGFMT_ = @GMSGFMT@