Update netatalk to version 2.0.3.

Also fix build on NetBSD1.6

Changes in 2.0.3
================

* NEW: afpd: add a cachecnid option that controls if afpd should
       use the IDs stored in the AD2 files as cache. Defaults
       to off.
* UPD: afpd: deal with more than 32 groups.
* FIX: afpd: several catsearch fixes, based on patch from
       TSUBAKIMOTO Hiroya.
* FIX: afpd: fix a race when a client very quickly reconnects and
       tries to kill its old session.
* FIX: afpd: OSX style symlink caused problems with Panther clients.
* FIX: afpd: old files with default type didn't show the right icon
       in finder, from Shlomi Yaakobovich, slightly modified.
* FIX: cnid_check: disable cnid_check if CNID db was configured with
       transactions and really bail out after the first error.
* FIX: admin-group configure option was broken.
* FIX: several problems with IDs cached in AD2 files.
* FIX: Ignore BIDI in UTF8 hints from OSX.
* FIX: Lots of gcc warning fixes.
* FIX: small configure script changes.

6 files changed, 51 insertions, 17 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a291942d384..d8223d33397 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:25 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/26 05:47:40 markd Exp $
 
-DISTNAME=	netatalk-2.0.2
-PKGREVISION=	1
+DISTNAME=	netatalk-2.0.3
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
@@ -43,9 +42,13 @@ CONFIGURE_ARGS+=	--enable-netbsd \
 			--libexecdir=${PREFIX}/libexec/netatalk \
 			--sbindir=${PREFIX}/libexec/netatalk \
 			--with-pkgconfdir=${PKG_SYSCONFDIR} \
+			--with-message-dir=${PKG_SYSCONFDIR}/msg \
 			--localstatedir=${VARBASE}/netatalk \
 			--with-uams-path=${PREFIX}/libexec/netatalk/uams \
-			--with-bdb=${BUILDLINK_PREFIX.db4}
+			--with-bdb=${BUILDLINK_PREFIX.db4} \
+			--with-ssl-dir=${BUILDLINK_PREFIX.openssl}
+
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/msg
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST
index 80374df830b..c9e83072a27 100644
--- a/net/netatalk/PLIST
+++ b/net/netatalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/05/03 15:41:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/05/26 05:47:40 markd Exp $
 bin/achfile
 bin/acleandir.rc
 bin/adv1tov2
@@ -60,16 +60,10 @@ include/atalk/uam.h
 include/atalk/unicode.h
 include/atalk/util.h
 include/atalk/zip.h
-include/netatalk/aarp.c
 include/netatalk/aarp.h
 include/netatalk/at.h
-include/netatalk/at_control.c
-include/netatalk/at_proto.c
 include/netatalk/at_var.h
 include/netatalk/ddp.h
-include/netatalk/ddp_input.c
-include/netatalk/ddp_output.c
-include/netatalk/ddp_usrreq.c
 include/netatalk/ddp_var.h
 include/netatalk/endian.h
 include/netatalk/phase2.h
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index f449d00ed8c..58fa8122ff6 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2005/02/24 12:13:54 agc Exp $
+$NetBSD: distinfo,v 1.18 2005/05/26 05:47:40 markd Exp $
 
-SHA1 (netatalk-2.0.2.tar.bz2) = 32ed755af1131982395a67faa48634b8efa02cb6
-RMD160 (netatalk-2.0.2.tar.bz2) = 08e15e3edd8f249e433bdc2265cd6cd4bb08cda7
-Size (netatalk-2.0.2.tar.bz2) = 1470047 bytes
-SHA1 (patch-aa) = 038971eea8da4fbab0596b87aa0c2f8d01493a15
+SHA1 (netatalk-2.0.3.tar.bz2) = ce2d5dd123467ccae72fc62ca4ee3738019455f2
+RMD160 (netatalk-2.0.3.tar.bz2) = 29b763400a45797ac4a8e499d5328aa91a091c91
+Size (netatalk-2.0.3.tar.bz2) = 1471804 bytes
+SHA1 (patch-aa) = 8e4abb33f4ffef681a59c23c2c3706a793020d51
 SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
 SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
@@ -12,3 +12,5 @@ SHA1 (patch-ah) = 318626f5c6d21f025ae5e08c9da76bd4c493f7e6
 SHA1 (patch-ai) = e8f453569db891100221f27bf579c66a18a650b7
 SHA1 (patch-ak) = ee205781dffb02b558353e95a07f7f66e143614a
 SHA1 (patch-al) = df56d837eeb5698b0247fc0233448d254392fe43
+SHA1 (patch-am) = a01ab55a793c5249cc6fa0a4d98d61e43f173021
+SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index b247a3e94f5..215b83befcc 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.12 2004/11/07 12:21:27 markd Exp $
+$NetBSD: patch-aa,v 1.13 2005/05/26 05:47:40 markd Exp $
 
 --- configure.orig	Thu Oct 28 03:42:21 2004
 +++ configure
+@@ -18190,7 +18190,7 @@
+ #define NETBSD 1
+ _ACEOF
+ 
+-	CFLAGS="-I\$(top_srcdir)/sys/netbsd -I/usr/include/kerberosIV $CFLAGS"
++	CFLAGS="-I\$(top_srcdir)/sys/netbsd $CFLAGS"
+ 	need_dash_r=yes
+ 
+ 
 @@ -18960,7 +18960,7 @@ if test "${enable_krbV_uam+set}" = set; 
  		if test x"$enableval" = x"yes"; then
  
diff --git a/net/netatalk/patches/patch-am b/net/netatalk/patches/patch-am
new file mode 100644
index 00000000000..8668ac79d60
--- /dev/null
+++ b/net/netatalk/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.4 2005/05/26 05:47:40 markd Exp $
+
+--- bin/afppasswd/afppasswd.c.orig	2005-02-10 14:23:07.000000000 +1300
++++ bin/afppasswd/afppasswd.c
+@@ -42,7 +42,7 @@
+ 
+ #include <netatalk/endian.h>
+ 
+-#include <des.h>
++#include <openssl/des.h>
+ 
+ #ifdef USE_CRACKLIB
+ #include <crack.h>
diff --git a/net/netatalk/patches/patch-an b/net/netatalk/patches/patch-an
new file mode 100644
index 00000000000..11ae8f205cb
--- /dev/null
+++ b/net/netatalk/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.4 2005/05/26 05:47:40 markd Exp $
+
+--- etc/uams/uams_randnum.c.orig	2005-05-26 17:24:26.000000000 +1200
++++ etc/uams/uams_randnum.c
+@@ -47,7 +47,7 @@ char *strchr (), *strrchr ();
+ #include <atalk/uam.h>
+ 
+ 
+-#include <des.h>
++#include <openssl/des.h>
+ 
+ #ifdef USE_CRACKLIB
+ #include <crack.h>