Remove dirmngr, part of security/gnupg2 now.

12 files changed, 3 insertions, 447 deletions

diff --git a/doc/CHANGES-2017 b/doc/CHANGES-2017
index 60ec27068c5..8a15f5a0625 100644
--- a/doc/CHANGES-2017
+++ b/doc/CHANGES-2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.3480 2017/08/29 12:55:01 fhajny Exp $
+$NetBSD: CHANGES-2017,v 1.3481 2017/08/29 13:04:33 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -4892,3 +4892,4 @@ Changes to the packages collection and infrastructure in 2017:
 	Updated security/gnupg2 to 2.2.0 [wiz 2017-08-29]
 	Removed security/gnupg21 successor security/gnupg2 [wiz 2017-08-29]
 	Updated textproc/groonga to 7.0.5 [fhajny 2017-08-29]
+	Removed security/dirmngr successor security/gnupg2 [wiz 2017-08-29]
diff --git a/security/Makefile b/security/Makefile
index 8a43060cfd2..f65cd82a81a 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.624 2017/08/29 12:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.625 2017/08/29 13:04:33 wiz Exp $
 #
 
 COMMENT=	Security tools
@@ -66,7 +66,6 @@ SUBDIR+=	dehydrated
 SUBDIR+=	destroy
 SUBDIR+=	dhbitty
 SUBDIR+=	dirb
-SUBDIR+=	dirmngr
 SUBDIR+=	dnssec-tools
 SUBDIR+=	dropbear
 SUBDIR+=	dsniff
diff --git a/security/dirmngr/DESCR b/security/dirmngr/DESCR
deleted file mode 100644
index 6f7c365473a..00000000000
--- a/security/dirmngr/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-DirMngr is a server for managing and downloading certificate revocation
-lists (CRLs) for X.509 certificates and for downloading the certificates
-themselves.  DirMngr also handles OCSP requests as an alternative to CRLs.
-DirMngr is usually invoked by gpgsm and in general not used directly.
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
deleted file mode 100644
index 0ee6487b62f..00000000000
--- a/security/dirmngr/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile,v 1.58 2017/08/29 12:24:57 wiz Exp $
-
-DISTNAME=	dirmngr-1.1.1
-PKGREVISION=	3
-CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/dirmngr/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnupg.org/aegypten2/
-COMMENT=	X509 certificate and CRL downloader
-LICENSE=	gnu-gpl-v3
-
-DIRMNGR_USER?=		dirmngr
-DIRMNGR_GROUP?=		dirmngr
-PKG_GROUPS=		${DIRMNGR_GROUP}
-PKG_USERS=		${DIRMNGR_USER}:${DIRMNGR_GROUP}
-PKG_GROUPS_VARS+=	DIRMNGR_GROUP
-PKG_USERS_VARS+=	DIRMNGR_USER
-
-BUILD_DEFS+=		VARBASE
-
-PKG_HOME.${DIRMNGR_USER}=	${VARBASE}/dirmngr
-
-USE_TOOLS+=		autoconf automake gawk gettext
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-RCD_SCRIPTS=		dirmngr
-INFO_FILES=		yes
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/libdata
-CONFIGURE_ENV+=		BUILDLINK_PREFIX_openldap-client=${BUILDLINK_PREFIX.openldap-client}
-
-FILES_SUBST+=		VARBASE=${VARBASE}
-FILES_SUBST+=		PREFIX=${PREFIX}
-FILES_SUBST+=		SYSCONFDIR=${SYSCONFDIR}
-FILES_SUBST+=		DIRMNGR_USER=${DIRMNGR_USER}
-FILES_SUBST+=		DIRMNGR_GROUP=${DIRMNGR_GROUP}
-FILES_SUBST+=		DIRMNGR_PATH=${DIRMNGR_PATH:Q}
-
-OWN_DIRS+=		${PKG_SYSCONFDIR}/dirmngr
-OWN_DIRS+=		${PKG_SYSCONFDIR}/dirmngr/trusted-certs
-OWN_DIRS+=		${VARBASE}/cache/dirmngr
-
-DIRMNGR_PERMS=		${DIRMNGR_USER} ${DIRMNGR_GROUP} 0755
-OWN_DIRS_PERMS+=	${VARBASE}/cache/dirmngr ${DIRMNGR_PERMS}
-OWN_DIRS_PERMS+=	${PREFIX}/libdata/dirmngr ${DIRMNGR_PERMS}
-OWN_DIRS_PERMS+=	${PREFIX}/libdata/dirmngr/extra-certs ${DIRMNGR_PERMS}
-
-INSTALLATION_DIRS=	sbin
-
-post-build:
-	${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
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../security/libgpg-error/buildlink3.mk"
-.include "../../security/libksba/buildlink3.mk"
-# previous pth versions have a bug which breaks CRL fetch on NetBSD
-BUILDLINK_ABI_DEPENDS.pth+= pth>=2.0.7nb1
-.include "../../devel/pth/buildlink3.mk"
-.include "../../security/libassuan2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/security/dirmngr/PLIST b/security/dirmngr/PLIST
deleted file mode 100644
index 70171326df1..00000000000
--- a/security/dirmngr/PLIST
+++ /dev/null
@@ -1,62 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2014/03/11 14:05:13 jperkin Exp $
-bin/dirmngr
-bin/dirmngr-client
-info/dirmngr.info
-libexec/dirmngr_ldap
-man/man1/dirmngr-client.1
-man/man1/dirmngr.1
-sbin/runDirmngr
-share/doc/dirmngr/examples/README
-share/doc/dirmngr/examples/bnetza-10r-ocsp.signer
-share/doc/dirmngr/examples/dirmngr.conf
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-001.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-002.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-003.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-004.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-005.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-006.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-007.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-008.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-009.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-010.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-011.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-012.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-013.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-014.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-015.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-016.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-017.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-018.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-019.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-020.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-021.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-022.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-023.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-024.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-025.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-026.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-027.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-028.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-001.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-002.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-003.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-004.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-005.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-006.final.v3.509.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-1.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-10.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-11.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-12.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-2.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-3.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-4.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-5.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-6.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-7.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-8.crt
-share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-9.crt
-share/doc/dirmngr/examples/trusted-certs/README
-share/doc/dirmngr/examples/trusted-certs/S-TRUSTQualifiedRootCA2008-001.final.v3.509.crt
-share/doc/dirmngr/examples/trusted-certs/S-TRUSTQualifiedRootCA2008-002.final.v3.509.crt
-share/doc/dirmngr/examples/trusted-certs/bnetza-10r-ca.crt
-share/locale/de/LC_MESSAGES/dirmngr.mo
diff --git a/security/dirmngr/buildlink3.mk b/security/dirmngr/buildlink3.mk
deleted file mode 100644
index 6dafcfd98b1..00000000000
--- a/security/dirmngr/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:56 dholland Exp $
-
-BUILDLINK_TREE+=	dirmngr
-
-.if !defined(DIRMNGR_BUILDLINK3_MK)
-DIRMNGR_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.dirmngr+=	dirmngr>=0.9.3nb1
-BUILDLINK_ABI_DEPENDS.dirmngr+=	dirmngr>=0.9.3nb2
-BUILDLINK_PKGSRCDIR.dirmngr?=	../../security/dirmngr
-.endif # DIRMNGR_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-dirmngr
diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo
deleted file mode 100644
index 5bda8d5755e..00000000000
--- a/security/dirmngr/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.25 2017/08/29 11:56:04 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-doc_Makefile.in) = 61f166b39ca7365e02b9d6510487c5c2d9e61f08
-SHA1 (patch-src_crlfetch.c) = cbc8050d30c7e29d0e58ad31ee7db6c9ae55e2a9
diff --git a/security/dirmngr/files/dirmngr.sh b/security/dirmngr/files/dirmngr.sh
deleted file mode 100644
index 06076990701..00000000000
--- a/security/dirmngr/files/dirmngr.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dirmngr.sh,v 1.5 2014/10/16 04:51:08 dholland Exp $
-#
-# PROVIDE: dirmngr
-# REQUIRE: DAEMON
-#
-
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
-
-name="dirmngr"
-rcvar="${name}"
-dirmngr_user="@DIRMNGR_USER@"
-dirmngr_group="@DIRMNGR_GROUP@"
-dirmngr_flags="--daemon"
-dirmngr_command="@PREFIX@/sbin/runDirmngr"
-start_precmd="dirmngr_precmd"
-start_cmd="dirmngr_start"
-start_postcmd="dirmngr_postcmd"
-stop_cmd="dirmngr_stop"
-required_dirs="@PKG_SYSCONFDIR@/dirmngr"
-required_files="@PKG_SYSCONFDIR@/dirmngr/ldapservers.conf"
-
-dirmngr_precmd()
-{
-	mkdir -p @VARBASE@/run/dirmngr
-	rm -f @VARBASE@/run/dirmngr/socket
-	chown @DIRMNGR_USER@  @VARBASE@/run/dirmngr
-	chgrp @DIRMNGR_GROUP@ @VARBASE@/run/dirmngr
-	chmod 1755 @VARBASE@/run/dirmngr
-	mkdir -p /tmp/dirmngr
-	chgrp @DIRMNGR_GROUP@ /tmp/dirmngr
-	chmod 755 /tmp/dirmngr
-}
-
-dirmngr_start()
-{
-	eval `${dirmngr_command} ${rc_flags}`
-}
-
-dirmngr_postcmd()
-{
-	echo ${DIRMNGR_INFO} >/tmp/dirmngr/dirmngr.info
-	chmod 644 /tmp/dirmngr/dirmngr.info
-	dirmngr_pid=`cut -f 2 -d ':' /tmp/dirmngr/dirmngr.info`
-}
-
-dirmngr_stop()
-{
-	if [ -f /tmp/dirmngr/dirmngr.info ] ; then
-		kill `cut -f 2 -d ':' /tmp/dirmngr/dirmngr.info`
-		rm -f @VARBASE@/run/dirmngr/socket
-	fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/security/dirmngr/files/runDirmngr.c b/security/dirmngr/files/runDirmngr.c
deleted file mode 100644
index ddb4f1d5c08..00000000000
--- a/security/dirmngr/files/runDirmngr.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-   Spawns dirmngr with UID and GID with a specific UID and GID.
-   The path for dirmngr is specified by the compiled-in definition
-   DIRMNGR_USER, normally passed as a compiler argument:
-   
-     `-D DIRMNGR_USER=DEFINITION'
-     
-   The UID and GID are the uid and gid for user DIRMNGR_USER.
-   DIRMNGR_USER is normally defined through a compiler argument
-   also.
-*/
-
-
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <pwd.h>
-#include <syslog.h>
-
-#define MAX_ARGS 40
-#ifndef         TRUE
-#define         TRUE                            1
-#endif                          /* TRUE */
-
-#ifndef         FALSE
-#define         FALSE                           0
-#endif                          /* FALSE */
-
-
-void error_sys(char *str)
-
-{
-    /* Output error message to syslog */
-    char msg[1024];
-    snprintf(msg, sizeof(msg), "runDirmngr : %s : %s", str, strerror(errno));
-    syslog(LOG_ALERT, msg);
-
-}
-
-
-int obtainUIDandGID(const char *name, uid_t *pw_uid, gid_t *pw_gid)
-{
-    /* Obtain UID and GID from passwd entry identified by name */
-    struct passwd *pw_entry;
-    char msg[100];
-
-    if ((pw_entry = getpwnam(name)) == NULL)
-    {
-        snprintf(msg, sizeof(msg), "failed to get password entry for %s", name);
-        error_sys(msg);
-        return FALSE;
-    }
-    else
-    {
-        *pw_uid = pw_entry->pw_uid;
-        *pw_gid = pw_entry->pw_gid;
-        return TRUE;
-
-    }
-}
-
-
-
-
-int main (int argc, char **argv )
-
-{
-
-    pid_t pid;
-    uid_t UID;
-    gid_t GID;
-    pid_t pidwait;
-    int waitstat;
-
-    /* Sanity check */
-    if (argc > MAX_ARGS)
-    {
-        error_sys("arg buffer too small");
-        exit(-1);
-    }
-/*
-    if (getpid() != 0)
-    {
-        error_sys("must be called by root");
-        exit(-1);
-    }
-*/
-
-    /* fork child that will become dirmngr */
-    if ((pid = fork()) < 0)
-
-        error_sys("fork error");
-
-    else
-
-    {
-
-        if (pid == 0)
-
-        {
-
-            /* We're the child */
-            char *args[MAX_ARGS];
-            unsigned int i;
-
-            if (!obtainUIDandGID(DIRMNGR_USER, &UID, &GID))
-                exit(-1);
-
-            /* Drop privileges immediately */
-            if (setgid(GID) < 0)
-            {
-                /* It is VERY important to check return
-                   value and not continue if setgid fails
-                */
-                error_sys ("setgid failed");
-                exit (-1);
-            }
-
-            if (setuid(UID) < 0)
-            {
-                /* It is VERY important to check return
-                   value and not continue if setuid fails
-                */
-                error_sys ("setuid failed");
-                exit (-1);
-            }
-
-            /* Build calling argv */
-            args[0] = DIRMNGR_PATH;
-            for (i=1;i<argc;i++)
-            {
-                args[i] = argv[i];
-            }
-            args[i++] = NULL;
-
-            /* Finally transform self into dirmngr */
-            if (execvp(DIRMNGR_PATH, args) < 0)
-                error_sys("execve error");
-            else
-                ; /* avoid if-then ambiguity */
-        }
-
-        else
-
-        {
-            /* We're the parent
-               Wait for child to terminate 
-            */
-            pidwait = waitpid(pid, &waitstat, 0);
-            switch (pidwait) {
-            case 0: exit(0);
-            case -1:
-                perror(strerror(errno));
-                exit(-1);
-            default:
-                if (WIFEXITED(waitstat)) {
-                    exit(WEXITSTATUS(waitstat));
-                }
-                else
-                {
-                    exit(-1);
-                }
-            }
-
-        }
-
-    }
-
-}
diff --git a/security/dirmngr/patches/patch-aa b/security/dirmngr/patches/patch-aa
deleted file mode 100644
index dd52cddd5fc..00000000000
--- a/security/dirmngr/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2015/03/11 01:31:02 mef Exp $
-
---- src/Makefile.am.orig	2013-04-26 17:04:59.000000000 +0900
-+++ src/Makefile.am	2015-03-11 10:19:38.000000000 +0900
-@@ -20,7 +20,7 @@
- 
- ## Process this file with automake to produce Makefile.in
- 
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- 
- EXTRA_DIST = Manifest
- 
-@@ -31,7 +31,7 @@
- AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
- AM_CPPFLAGS += -DDIRMNGR_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\""
- AM_CPPFLAGS += -DDIRMNGR_LIBEXECDIR="\"$(libexecdir)\""
--AM_CPPFLAGS += -DDIRMNGR_DATADIR="\"$(localstatedir)/lib/@PACKAGE@\""
-+AM_CPPFLAGS += -DDIRMNGR_DATADIR="\"$(datadir)/lib/@PACKAGE@\""
- AM_CPPFLAGS += -DDIRMNGR_CACHEDIR="\"$(localstatedir)/cache/@PACKAGE@\""
- AM_CPPFLAGS += -DDIRMNGR_SOCKETDIR="\"$(localstatedir)/run/@PACKAGE@\""
- 
diff --git a/security/dirmngr/patches/patch-doc_Makefile.in b/security/dirmngr/patches/patch-doc_Makefile.in
deleted file mode 100644
index 7855d35fbf4..00000000000
--- a/security/dirmngr/patches/patch-doc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_Makefile.in,v 1.1 2011/03/11 07:20:45 adam Exp $
-
-Pass CFLAGS and fix building e.g. with -isysroot on Mac OS X.
-
---- doc/Makefile.in.orig	2011-03-11 07:15:50.000000000 +0000
-+++ doc/Makefile.in
-@@ -850,7 +850,7 @@ uninstall-man: uninstall-man1
- 
- 
- yat2m: yat2m.c
--	$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
-+	$(CC_FOR_BUILD) $(CFLAGS) -o $@ $(srcdir)/yat2m.c
- 
- yat2m-stamp: $(myman_sources)
- 	@rm -f yat2m-stamp.tmp
diff --git a/security/dirmngr/patches/patch-src_crlfetch.c b/security/dirmngr/patches/patch-src_crlfetch.c
deleted file mode 100644
index db6c4cd0204..00000000000
--- a/security/dirmngr/patches/patch-src_crlfetch.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_crlfetch.c,v 1.2 2017/08/29 11:56:04 wiz Exp $
-
-Function is now void, do not use it as argument to return.
-
---- src/crlfetch.c.orig	2009-08-07 14:09:47.000000000 +0000
-+++ src/crlfetch.c
-@@ -389,7 +389,7 @@ fetch_next_ksba_cert (cert_fetch_context
- void
- end_cert_fetch (cert_fetch_context_t context)
- {
--  return end_cert_fetch_ldap (context);
-+  end_cert_fetch_ldap (context);
- }
- 
-