1) Fix incorect patch

2) Fix incorrect socket permission

5 files changed, 45 insertions, 25 deletions

diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index fec28f537b4..1b9242bc19b 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2007/11/07 12:43:21 shannonjr Exp $
+# $NetBSD: Makefile,v 1.31 2007/11/07 19:38:12 shannonjr Exp $
 #
 
 DISTNAME=		dirmngr-1.0.1
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/dirmngr/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
@@ -40,6 +41,7 @@ INFO_FILES=		YES
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/libdata
 CONFIGURE_ENV+=		BUILDLINK_PREFIX_openldap-client=${BUILDLINK_PREFIX.openldap-client}
 CONFIGURE_ARGS+=	--with-pth-prefix=${WRKDIR}/pth
 CONFIGURE_ARGS+=	--with-libassuan-prefix=${WRKDIR}/libassuan
@@ -56,7 +58,6 @@ OWN_DIRS+=		${PKG_SYSCONFDIR}/dirmngr/trusted-certs
 OWN_DIRS+=		${VARBASE}/cache/dirmngr
 
 DIRMNGR_PERMS=		${DIRMNGR_USER} ${DIRMNGR_GROUP} 0755
-#OWN_DIRS_PERMS+=	${VARBASE}/dirmngr ${DIRMNGR_PERMS}
 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}
diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo
index 523e753d425..7c7418a785f 100644
--- a/security/dirmngr/distinfo
+++ b/security/dirmngr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2007/11/07 12:43:22 shannonjr Exp $
+$NetBSD: distinfo,v 1.14 2007/11/07 19:38:12 shannonjr Exp $
 
 SHA1 (dirmngr-1.0.1.tar.bz2) = 39eb62907e5c4ddc29da00b1291c24e5267f113e
 RMD160 (dirmngr-1.0.1.tar.bz2) = eca2e5622ffe7af7ddece1b76977e5f696465385
@@ -9,9 +9,9 @@ Size (libassuan-1.0.3.tar.bz2) = 292168 bytes
 SHA1 (pth-2.0.7.tar.gz) = 9a71915c89ff2414de69fe104ae1016d513afeee
 RMD160 (pth-2.0.7.tar.gz) = 80bc66777ba20d9648b7aaf3f58d593be6416910
 Size (pth-2.0.7.tar.gz) = 652640 bytes
-SHA1 (patch-aa) = 5f3cb038a5d799a91394406aecf855e77c931412
+SHA1 (patch-aa) = 7a82dce7d558914e2a95b1f464c9d5760a9357b6
 SHA1 (patch-ab) = 97fbb195fa8ab33c4fddfee9b23ae2024f99c615
-SHA1 (patch-ac) = c148a6f0c3066decdbd91abb8725d6f2bd3b0d38
+SHA1 (patch-ac) = 6726d6dcd897cddaf068e400ceddfdaed0094cba
 SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4
 SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26
 SHA1 (patch-af) = b6ae3b526e344ca63af1babb9eb6707b90edc837
diff --git a/security/dirmngr/files/dirmngr.sh b/security/dirmngr/files/dirmngr.sh
index 94ed7f75d1a..052e0e6aa02 100644
--- a/security/dirmngr/files/dirmngr.sh
+++ b/security/dirmngr/files/dirmngr.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dirmngr.sh,v 1.2 2007/11/07 12:43:22 shannonjr Exp $
+# $NetBSD: dirmngr.sh,v 1.3 2007/11/07 19:38:12 shannonjr Exp $
 #
 # PROVIDE: dirmngr
 # REQUIRE: DAEMON
@@ -26,8 +26,10 @@ 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 775 @VARBASE@/run/dirmngr
+	chmod 1755 @VARBASE@/run/dirmngr
 	mkdir -p /tmp/dirmngr
 	chgrp @DIRMNGR_GROUP@ /tmp/dirmngr
 	chmod 755 /tmp/dirmngr
@@ -65,6 +67,7 @@ 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
 }
 
diff --git a/security/dirmngr/patches/patch-aa b/security/dirmngr/patches/patch-aa
index 3142acc3692..cc4e9e9d3ba 100644
--- a/security/dirmngr/patches/patch-aa
+++ b/security/dirmngr/patches/patch-aa
@@ -1,17 +1,22 @@
-$NetBSD: patch-aa,v 1.4 2006/12/12 13:09:21 shannonjr Exp $
+$NetBSD: patch-aa,v 1.5 2007/11/07 19:38:12 shannonjr Exp $
 
---- src/Makefile.in.orig	2006-12-11 07:34:48.000000000 -0700
-+++ src/Makefile.in
-@@ -246,9 +246,9 @@ target_alias = @target_alias@
+--- src/Makefile.am.orig	2007-08-13 02:54:50.000000000 -0600
++++ src/Makefile.am
+@@ -20,7 +20,7 @@
+ 
+ ## Process this file with automake to produce Makefile.in
+ 
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ 
  EXTRA_DIST = Manifest
- AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \
- 	-DDIRMNGR_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
--	-DDIRMNGR_LIBEXECDIR="\"$(libexecdir)\"" \
--	-DDIRMNGR_DATADIR="\"$(localstatedir)/lib/@PACKAGE@\"" \
--	-DDIRMNGR_CACHEDIR="\"$(localstatedir)/cache/@PACKAGE@\""
-+	-DDIRMNGR_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\"" \
-+	-DDIRMNGR_DATADIR="\"$(prefix)/libdata/@PACKAGE@\"" \
-+	-DDIRMNGR_CACHEDIR="\"$(localstatedir)/@PACKAGE@/cache\""
- AM_CFLAGS = -I$(top_srcdir)/jnlib $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) \
-               $(KSBA_CFLAGS) $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)
  
+@@ -31,7 +31,7 @@ libexec_PROGRAMS = dirmngr_ldap
+ 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)/@PACKAGE@\""
+ AM_CPPFLAGS += -DDIRMNGR_CACHEDIR="\"$(localstatedir)/cache/@PACKAGE@\""
+ 
+ AM_CFLAGS = -I$(top_srcdir)/jnlib $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) \
diff --git a/security/dirmngr/patches/patch-ac b/security/dirmngr/patches/patch-ac
index 854b25f0e52..a8c73dac825 100644
--- a/security/dirmngr/patches/patch-ac
+++ b/security/dirmngr/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/12/12 13:09:21 shannonjr Exp $
+$NetBSD: patch-ac,v 1.4 2007/11/07 19:38:12 shannonjr Exp $
 
---- ./src/dirmngr.c.orig	2006-11-29 06:06:11.000000000 -0700
-+++ ./src/dirmngr.c
-@@ -36,6 +36,7 @@
+--- src/dirmngr.c.orig	2007-08-16 07:11:53.000000000 -0600
++++ src/dirmngr.c
+@@ -39,6 +39,7 @@
  #include <unistd.h>
  #include <signal.h>
  #include <pth.h>
@@ -10,3 +10,14 @@ $NetBSD: patch-ac,v 1.3 2006/12/12 13:09:21 shannonjr Exp $
  
  #include <gcrypt.h>
  #include <ksba.h>
+@@ -945,7 +946,10 @@ main (int argc, char **argv)
+ 	  rc = _w32_sock_bind (fd, (struct sockaddr*) &serv_addr, len);
+ 	}
+ #else
++      /* FreeBSD honors users umask */
++      mode_t oldumask = umask(0);
+       rc = bind (fd, (struct sockaddr*)&serv_addr, len);
++      umask(oldumask);
+       if (rc == -1 && errno == EADDRINUSE)
+         {
+           remove (socket_name);