update netatalk to 2.0.5

NEW: afpd: Time Machine support with new volume option "tm".
FIX: papd: Remove variable expansion for BSD printers. Fixes
     CVE-2008-5718.
FIX: afpd: .AppleDxxx folders were user accessible if option 'usedots'
     was set
FIX: afpd: vetoed files/dirs where still accessible
FIX: afpd: cnid_resolve: don't return '..' as a valid name.
FIX: uniconv: -d option wasn't working

6 files changed, 31 insertions, 50 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a03bfc6cc3f..bab052b2348 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2009/08/26 19:58:45 sno Exp $
+# $NetBSD: Makefile,v 1.66 2010/01/17 11:48:03 markd Exp $
 
-DISTNAME=	netatalk-2.0.4
-PKGREVISION=	1
+DISTNAME=	netatalk-2.0.5
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
@@ -32,13 +31,6 @@ CONF_FILES=	${EG_DIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.defaul
 
 CONFLICTS=	netatalk-asun-[0-9]* netatalk-umich-[0-9]*
 
-RCD_SCRIPTS=	atalkd afpd cnid_metad papd timelord
-RCD_SCRIPT_SRC.atalkd=		# empty
-RCD_SCRIPT_SRC.afpd=		# empty
-RCD_SCRIPT_SRC.cnid_metad=	# empty
-RCD_SCRIPT_SRC.papd=		# empty
-RCD_SCRIPT_SRC.timelord=	# empty
-
 .include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS+=		VARBASE
@@ -82,6 +74,7 @@ post-install:
 .endif
 
 .include "../../databases/db4/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST
index b6b8f8016b1..c2a5608e4a2 100644
--- a/net/netatalk/PLIST
+++ b/net/netatalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 21:00:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2010/01/17 11:48:03 markd Exp $
 bin/achfile
 bin/acleandir.rc
 bin/adv1tov2
@@ -100,6 +100,9 @@ libexec/netatalk/tfwpaprev
 libexec/netatalk/timelord
 libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
+libexec/netatalk/uams/uams_dhx2.so
+${PLIST.pam}libexec/netatalk/uams/uams_dhx2_pam.la
+libexec/netatalk/uams/uams_dhx2_passwd.la
 ${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la
 libexec/netatalk/uams/uams_dhx_passwd.la
 ${PLIST.gssapi}libexec/netatalk/uams/uams_gss.la
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 2112d4c8186..390a4c29f0d 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.30 2009/06/09 13:57:56 taca Exp $
+$NetBSD: distinfo,v 1.31 2010/01/17 11:48:03 markd Exp $
 
-SHA1 (netatalk-2.0.4.tar.bz2) = e4ee42849844137ed0ce1e01a77419c8dc6ae0b7
-RMD160 (netatalk-2.0.4.tar.bz2) = 4f9b009857319116b7a4dfa6ab4910533afc35e5
-Size (netatalk-2.0.4.tar.bz2) = 964106 bytes
-SHA1 (patch-aa) = 5bd27e8782527d79635df82d4e5c85633a285adb
+SHA1 (netatalk-2.0.5.tar.bz2) = a38f98abc123b02d26628543e393a4de04481e4f
+RMD160 (netatalk-2.0.5.tar.bz2) = 47247d376bf421652d9f9897c75853424215ae0a
+Size (netatalk-2.0.5.tar.bz2) = 993882 bytes
+SHA1 (patch-aa) = 4aeb5ca2cb82f8bfa92c26db6ba63b291510badb
 SHA1 (patch-ab) = 59373428e7485b88d6e9e7474bbeef9687ed1084
 SHA1 (patch-ac) = 5511ff25a2ae7e4148fb865b31f0492b0a4b79af
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
 SHA1 (patch-ae) = 8d26d0c91009c3147363e4efe05d89e13fcef987
 SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2
 SHA1 (patch-ag) = 517689746d79f3f1b7c55aa6c25bf57fb184c4d9
-SHA1 (patch-ah) = 28d68c4755b1d3363fbd070eb679c6e353efc10a
+SHA1 (patch-ah) = 8fbd57102e001967c29537102ca792eaa837b911
 SHA1 (patch-ai) = e8f453569db891100221f27bf579c66a18a650b7
 SHA1 (patch-am) = a01ab55a793c5249cc6fa0a4d98d61e43f173021
 SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
 SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9
 SHA1 (patch-bi) = b592d058a1d61322c03d1c3d44e39b48f2ddf7c3
-SHA1 (patch-bj) = 28f71df2619b6188806e187b588fc6ca9d1e14cb
+SHA1 (patch-bj) = 28f50f333d73b4a219d69412a1563ec11c4b63a2
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index 7c8e229db22..a16441f6f7b 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.18 2009/06/09 13:57:56 taca Exp $
+$NetBSD: patch-aa,v 1.19 2010/01/17 11:48:03 markd Exp $
 
 --- configure.orig	2009-03-29 16:24:33.000000000 +0900
 +++ configure
@@ -38,15 +38,6 @@ $NetBSD: patch-aa,v 1.18 2009/06/09 13:57:56 taca Exp $
  	need_dash_r=yes
  
  
-@@ -29839,7 +29839,7 @@ IFS=$as_save_IFS
-   ;;
- esac
- fi
--LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
-+LIBGCRYPT_CONFIG=no
- if test -n "$LIBGCRYPT_CONFIG"; then
-   { echo "$as_me:$LINENO: result: $LIBGCRYPT_CONFIG" >&5
- echo "${ECHO_T}$LIBGCRYPT_CONFIG" >&6; }
 @@ -30286,7 +30286,7 @@ echo "${ECHO_T}yes" >&6; }
      atalk_cv_bdb_version=no
      maj=$atalk_cv_bdb_MAJOR
diff --git a/net/netatalk/patches/patch-ah b/net/netatalk/patches/patch-ah
index ab4c007fa54..baeba10d2ea 100644
--- a/net/netatalk/patches/patch-ah
+++ b/net/netatalk/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.5 2009/06/09 13:57:56 taca Exp $
+$NetBSD: patch-ah,v 1.6 2010/01/17 11:48:03 markd Exp $
 
 --- config/Makefile.in.orig	2009-04-25 01:46:56.000000000 +0900
 +++ config/Makefile.in
@@ -20,18 +20,3 @@ $NetBSD: patch-ah,v 1.5 2009/06/09 13:57:56 taca Exp $
  		else \
  			echo "not overwriting $$f"; \
  		fi; \
-@@ -445,10 +446,10 @@ install-config-files: $(CONFFILES) $(GEN
- @USE_PAM_FALSE@install-data-local: install-config-files
- 
- @USE_PAM_FALSE@uninstall-local:
--@USE_PAM_FALSE@    for f in $(CONFFILES) $(GENFILES); do \
--@USE_PAM_FALSE@        echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
--@USE_PAM_FALSE@        rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
--@USE_PAM_FALSE@    done
-+@USE_PAM_FALSE@	for f in $(CONFFILES) $(GENFILES); do \
-+@USE_PAM_FALSE@		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
-+@USE_PAM_FALSE@		rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
-+@USE_PAM_FALSE@	done
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/netatalk/patches/patch-bj b/net/netatalk/patches/patch-bj
index 3df089375f3..4dfcbda17ea 100644
--- a/net/netatalk/patches/patch-bj
+++ b/net/netatalk/patches/patch-bj
@@ -1,8 +1,8 @@
-$NetBSD: patch-bj,v 1.2 2009/06/09 13:57:56 taca Exp $
+$NetBSD: patch-bj,v 1.3 2010/01/17 11:48:03 markd Exp $
 
---- distrib/initscripts/Makefile.in.orig	2009-04-23 17:03:29.000000000 +0900
+--- distrib/initscripts/Makefile.in.orig	2009-11-10 13:11:12.000000000 +0000
 +++ distrib/initscripts/Makefile.in
-@@ -248,7 +248,7 @@ TEMPLATES = \
+@@ -251,7 +251,7 @@ TEMPLATES = \
  	rc.atalk.gentoo.tmpl		\
  	rc.atalk.debian.tmpl
  
@@ -11,7 +11,7 @@ $NetBSD: patch-bj,v 1.2 2009/06/09 13:57:56 taca Exp $
  EXTRA_DIST = $(TEMPLATES) rc.atalk.cobalt
  
  #
-@@ -293,7 +293,7 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
+@@ -296,7 +296,7 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
  @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
  @USE_DEBIAN_TRUE@sysv_SCRIPTS = atalk
  @USE_GENTOO_TRUE@sysv_SCRIPTS = atalk
@@ -20,7 +20,16 @@ $NetBSD: patch-bj,v 1.2 2009/06/09 13:57:56 taca Exp $
  @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
  @USE_SOLARIS_TRUE@sysv_SCRIPTS = atalk
  @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
-@@ -556,6 +556,7 @@ uninstall: uninstall-startup
+@@ -443,7 +443,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-sysvSCRIPTS
++install-data-am: 
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+@@ -559,6 +559,7 @@ uninstall: uninstall-startup
  
  @USE_NETBSD_TRUE@afpd: rc.afpd.netbsd
  @USE_NETBSD_TRUE@	cp -f $< $@
@@ -28,7 +37,7 @@ $NetBSD: patch-bj,v 1.2 2009/06/09 13:57:56 taca Exp $
  
  @USE_NETBSD_TRUE@atalkd: rc.atalkd.netbsd
  @USE_NETBSD_TRUE@	cp -f $< $@
-@@ -569,6 +570,10 @@ uninstall: uninstall-startup
+@@ -572,6 +573,10 @@ uninstall: uninstall-startup
  @USE_NETBSD_TRUE@	cp -f $< $@
  @USE_NETBSD_TRUE@	chmod a+x $@