Update to netatalk 2.0.2.

Changes in 2.0.2
NEW: cnid: Add an indexes check and rebuild, optional for dbd (parameter
  check default no), standalone program cnid_index for cdb.
UPD: Enhanced afpd's -v command line switch and added -V for more verbose
  information
UPD: uams_gss: build the principal used by uams_gss.so from afpd's
  configuration, don't use GSS_C_NT_HOSTBASED_SERVICE
UPD: cnid_dbd: add process id in syslog and small clean up
REM: remove netatalkshorternamelinks.pl
FIX: afpd: check for DenyRead on FPCopyFile
FIX: afpd: add missing flush for AD2 Metadata on FPCopyFile
FIX: afpd: Deal with AFP3 connection and type 2 (non-UTF8) names.
  reported by Gair Heaton, HI RESOLUTION SYSTEMS
FIX: afpd: Broken 'crlf' option
FIX: afpd: fix afpd/dhx memory bug, by Ralf Schuchardt
FIX: afpd: Return an error if we cannot get the db stamp in afp_openvol.
FIX: afpd: Fix slp registration with Solaris9 slpd, from hat at
  fa2.so-net.ne.jp

7 files changed, 46 insertions, 33 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 0dc9ffb64f8..3a6f6a98c69 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2004/12/28 02:47:47 reed Exp $
+# $NetBSD: Makefile,v 1.34 2005/01/04 12:57:03 markd Exp $
 
-DISTNAME=	netatalk-2.0.1
-PKGREVISION=	1
+DISTNAME=	netatalk-2.0.2
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST
index 2cb76adaa7b..385b5041504 100644
--- a/net/netatalk/PLIST
+++ b/net/netatalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/11/02 11:26:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/01/04 12:57:03 markd Exp $
 bin/achfile
 bin/acleandir.rc
 bin/adv1tov2
@@ -13,6 +13,7 @@ bin/asip-status.pl
 bin/binheader
 bin/cleanappledouble.pl
 bin/cnid2_create
+bin/cnid_index
 bin/cnid_maint
 bin/getzones
 bin/hqx2bin
@@ -25,7 +26,6 @@ bin/nbplkup
 bin/nbprgstr
 bin/nbpunrgstr
 bin/netatalk-config
-bin/netatalkshorternamelinks.pl
 bin/nu
 bin/pap
 bin/papstatus
@@ -57,6 +57,7 @@ include/atalk/rtmp.h
 include/atalk/server_child.h
 include/atalk/tdb.h
 include/atalk/uam.h
+include/atalk/unicode.h
 include/atalk/util.h
 include/atalk/zip.h
 include/netatalk/aarp.c
@@ -118,6 +119,7 @@ man/man1/apple_cp.1
 man/man1/apple_mv.1
 man/man1/apple_rm.1
 man/man1/asip-status.pl.1
+man/man1/cnid_index.1
 man/man1/getzones.1
 man/man1/hqx2bin.1
 man/man1/macbinary.1
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 4a2653b0bc9..cb575663e8a 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.14 2004/11/07 12:21:27 markd Exp $
+$NetBSD: distinfo,v 1.15 2005/01/04 12:57:03 markd Exp $
 
-SHA1 (netatalk-2.0.1.tar.bz2) = b61fd7595b8d03971fbd6c0dce0ed307e8916628
-Size (netatalk-2.0.1.tar.bz2) = 1465827 bytes
+SHA1 (netatalk-2.0.2.tar.bz2) = 32ed755af1131982395a67faa48634b8efa02cb6
+Size (netatalk-2.0.2.tar.bz2) = 1470047 bytes
 SHA1 (patch-aa) = 038971eea8da4fbab0596b87aa0c2f8d01493a15
-SHA1 (patch-ab) = 057a8a4ef188068237550199e2c87db0c0cc5dfd
+SHA1 (patch-ab) = fd514b914b74b8109e941ab8699bce80d82a45fb
 SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
 SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
 SHA1 (patch-ag) = c99fdca284c08577194f0c8820f724793841208f
 SHA1 (patch-ah) = 318626f5c6d21f025ae5e08c9da76bd4c493f7e6
 SHA1 (patch-ai) = e8f453569db891100221f27bf579c66a18a650b7
-SHA1 (patch-aj) = f28c7ff090794e975ad6d0a0b5f31e03e953d409
+SHA1 (patch-ak) = ee205781dffb02b558353e95a07f7f66e143614a
+SHA1 (patch-al) = df56d837eeb5698b0247fc0233448d254392fe43
diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab
index f75d59eb9a1..03d13bd518c 100644
--- a/net/netatalk/patches/patch-ab
+++ b/net/netatalk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2004/11/02 11:26:28 markd Exp $
+$NetBSD: patch-ab,v 1.9 2005/01/04 12:57:03 markd Exp $
 
 --- distrib/initscripts/Makefile.in.orig	2004-08-27 23:24:05.000000000 +1200
 +++ distrib/initscripts/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.8 2004/11/02 11:26:28 markd Exp $
  # checking for NetBSD init scripts
  #
 -@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
-+@USE_NETBSD_TRUE@sysvdir = ${prefix}/etc/rc.d# pkgsrc *only*!
++@USE_NETBSD_TRUE@sysvdir = ${prefix}/share/examples/rc.d# pkgsrc *only*!
  
  
  #
diff --git a/net/netatalk/patches/patch-aj b/net/netatalk/patches/patch-aj
deleted file mode 100644
index a2831f46c5f..00000000000
--- a/net/netatalk/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2004/11/07 12:21:27 markd Exp $
-
---- etc/uams/uams_gss.c.orig	Mon Nov  8 12:22:44 2004
-+++ etc/uams/uams_gss.c
-@@ -135,6 +135,7 @@ static int do_gss_auth( char *service, c
-      * we should be able to detect it.
-      */
-     gss_buffer_desc s_princ_buffer;
-+    u_int16_t auth_len;
- 
-     s_princ_buffer.value = service;
-     s_princ_buffer.length = strlen( service ) + 1;
-@@ -209,7 +210,7 @@ static int do_gss_auth( char *service, c
- 	    if (wrap_buff.value)
- 	        gss_release_buffer( &minor_status, &wrap_buff );
- 
--	    u_int16_t auth_len = htons( authenticator_buff.length );
-+	    auth_len = htons( authenticator_buff.length );
- 	    /* save the username... note that doing it this way is
- 	     * not the best idea: if a principal is truncated, a user could be
- 	     * impersonated
diff --git a/net/netatalk/patches/patch-ak b/net/netatalk/patches/patch-ak
new file mode 100644
index 00000000000..d737025d78f
--- /dev/null
+++ b/net/netatalk/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.4 2005/01/04 12:57:03 markd Exp $
+
+--- bin/cnid/cnid_index.c.orig	2005-01-04 02:49:55.000000000 +1300
++++ bin/cnid/cnid_index.c
+@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i
+     DB_BTREE_STAT *sp;
+     DB *db = db_table[dbi].db;
+ 
++#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
++    ret = db->stat(db, NULL, &sp, 0);
++#else
+     ret = db->stat(db, &sp, 0);
++#endif
+ 
+     if (ret) {
+         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
diff --git a/net/netatalk/patches/patch-al b/net/netatalk/patches/patch-al
new file mode 100644
index 00000000000..c3eaa5bded9
--- /dev/null
+++ b/net/netatalk/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.4 2005/01/04 12:57:03 markd Exp $
+
+--- etc/cnid_dbd/dbif.c.orig	2004-12-22 02:36:12.000000000 +1300
++++ etc/cnid_dbd/dbif.c
+@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t 
+     DB_BTREE_STAT *sp;
+     DB *db = db_table[dbi].db;
+ 
++#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
++    ret = db->stat(db, NULL, &sp, 0);
++#else
+     ret = db->stat(db, &sp, 0);
++#endif
+ 
+     if (ret) {
+         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));