>Number:         21930
>Category:       pkg
>Synopsis:       Update net/netatalk package
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Jun 19 11:52:01 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Toru TAKAMIZU
>Release:        NetBSD 1.6.1_STABLE
>Organization:
>Environment:
System: NetBSD localhost 1.6.1_STABLE NetBSD 1.6.1_STABLE (MIWA) #28: Tue Jun 3 23:21:30 JST 2003 toru@localhost:/usr/src/sys/arch/i386/compile/MIWA i386
Architecture: i386
Machine: i386
>Description:
The attached patch provides the update to the latest(1.6.3), which is
a bugfix release.

1.
I split patches/patch-aa and let "db3" part go into patch-ag.
Although patch-ag is introduced for this purpose, the related
function is not enabled for the same reason as the one I said when
I send-pr'ed some previous patches -- "cnid" is not well tested, not
severely wanted at least by pkg users, etc.

2.
I decided to disable the "logger" function. See the URL in Makefile.

3.
from "NEWS":

Changes in 1.6.3
================

* UPD: afpd: Infrastructural support for an upcoming Kerberos 5 UAM.
       [Sam Noble]
* UPD: uams_dhx_passwd: Better random seed in Tru64. [Burkhard Schmidt]
* FIX: afpd: Bug in AFP connection negotiation stage. [Sam]
* FIX: afpd: Catsearch, when Mac and unix name differ, search on attributes.
* FIX: afpd: Files could be opened for writing on read-only filesystems.
* FIX: afpd: Debugging using SIGUSR1 was broken. [Stefan Muenkner]
* FIX: afpd: Segfault after login. [Robby Griffin, Sean Bolton]
* FIX: psf: Correct path to etc2ps.sh.
* FIX: shell_utils: Don't distribute generated files.
* FIX: aecho: -A option didn't work. [Chris Shiels]
* FIX: configure: Berkeley DB path detection could be wrong. [Stefan]
* FIX: Automake build fixes.


>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/net/netatalk/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	2003/04/28 04:07:45	1.23
+++ Makefile	2003/06/19 08:55:08
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.23 2003/04/28 04:07:45 fredb Exp $
 
-DISTNAME=	netatalk-1.6.2
+DISTNAME=	netatalk-1.6.3
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/} \
 		http://me.in-berlin.de/~jroger/netatalk/
@@ -31,7 +31,12 @@
 			--localstatedir=/var/netatalk \
 			--with-nls-dir=${PREFIX}/share/netatalk/nls \
 			--with-uams-path=${PREFIX}/libexec/netatalk/uams
-
+#
+# The logger function is said to be buggy. See the following.
+#   http://sourceforge.net/mailarchive/forum.php?thread_id=2526309&forum_id=8099
+#
+CONFIGURE_ARGS+=	--without-logfile
+#
 #CONFIGURE_ARGS+=	--with-flock-locks	# broken
 #CONFIGURE_ARGS+=	--with-bdb=${PREFIX}	# still some known issues
 
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/net/netatalk/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo	2003/04/28 04:07:45	1.11
+++ distinfo	2003/06/19 08:55:09
@@ -1,10 +1,11 @@
 $NetBSD: distinfo,v 1.11 2003/04/28 04:07:45 fredb Exp $
 
-SHA1 (netatalk-1.6.2.tar.gz) = b3e451b2c40c70feda4f81d92162d08fa063fc48
-Size (netatalk-1.6.2.tar.gz) = 855933 bytes
-SHA1 (patch-aa) = 0e7dc8d0524376e162f7d8d243720e12f8cbb5fb
-SHA1 (patch-ab) = 609bc6f137bb13ece41408277634e9f09c746e61
+SHA1 (netatalk-1.6.3.tar.gz) = d2d832d81f2fa5a314c244c3b869a55d463b3ddb
+Size (netatalk-1.6.3.tar.gz) = 924785 bytes
+SHA1 (patch-aa) = 5f6e410b1e9623f25a05e0e3360ab4fdd4c31550
+SHA1 (patch-ab) = 1327b3cfbc1af58e1c548e9e13436542bf9591f4
 SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
 SHA1 (patch-ae) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
 SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
+SHA1 (patch-ag) = 76bb7cff92e71075f8bec132c93a8b6b8e5c4a8d
Index: patches/patch-aa
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/net/netatalk/patches/patch-aa,v
retrieving revision 1.10
diff -u -r1.10 patch-aa
--- patches/patch-aa	2003/02/23 19:18:51	1.10
+++ patches/patch-aa	2003/06/19 08:55:09
@@ -2,7 +2,7 @@
 
 --- configure.orig	Sun Feb 16 12:46:32 2003
 +++ configure	Sun Feb 23 16:55:12 2003
-@@ -8084,64 +8084,6 @@
+@@ -8344,64 +8344,6 @@
  fi
  
  
@@ -67,33 +67,7 @@
  echo "$as_me:$LINENO: checking for main in -ld" >&5
  echo $ECHO_N "checking for main in -ld... $ECHO_C" >&6
  if test "${ac_cv_lib_d_main+set}" = set; then
-@@ -13066,13 +13008,13 @@
- 			savedldflags="$LDFLAGS"
- 			CFLAGS="$CFLAGS -I$bdbdir"
- 			LDFLAGS="-L$bdblibdir $LDFLAGS"
--			echo "$as_me:$LINENO: checking for main in -ldb" >&5
--echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
-+			echo "$as_me:$LINENO: checking for main in -ldb3" >&5
-+echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13118,7 +13060,7 @@
- 
- 				bdbfound=yes
- 				BDB_CFLAGS="-I$bdbdir"
--				BDB_LIBS="-L$bdblibdir -ldb"
-+				BDB_LIBS="-L$bdblibdir -ldb3"
- 				BDB_BIN=$bdbbindir
- 				BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
- 
-@@ -14552,7 +14494,62 @@
+@@ -14819,7 +14761,62 @@
  	fi
  
  
Index: patches/patch-ab
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/net/netatalk/patches/patch-ab,v
retrieving revision 1.7
diff -u -r1.7 patch-ab
--- patches/patch-ab	2003/02/23 19:18:52	1.7
+++ patches/patch-ab	2003/06/19 08:55:09
@@ -1,19 +1,22 @@
 $NetBSD: patch-ab,v 1.7 2003/02/23 19:18:52 fredb Exp $
 
---- distrib/initscripts/Makefile.in.orig	Sun Feb 16 12:50:01 2003
-+++ distrib/initscripts/Makefile.in	Sun Feb 23 13:18:29 2003
-@@ -125,12 +125,12 @@
- @USE_SUSE_TRUE@sysvdir = /etc/init.d
- @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d
- @USE_TRU64_TRUE@sysvdir = /sbin/init.d
+--- distrib/initscripts/Makefile.in.orig	Thu Jun 19 17:08:56 2003
++++ distrib/initscripts/Makefile.in	Thu Jun 19 17:10:55 2003
+@@ -202,7 +202,7 @@
+ #
+ # checking for NetBSD init scripts
+ #
 -@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
 +@USE_NETBSD_TRUE@sysvdir = ${prefix}/etc/rc.d#	pkgsrc *only*!
- @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
- @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
- @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
- @USE_TRU64_TRUE@sysv_SCRIPTS = atalk
+ 
+ 
+ #
+@@ -228,7 +228,7 @@
+ # checking for "tru64" style sysv scripts:
+ #
+ @USE_TRU64_TRUE@sysvdir = /sbin/init.d
 -@USE_NETBSD_TRUE@sysv_SCRIPTS = afp atalk pap timelord
 +@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
+ @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
+ @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
+ @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
--- /dev/null	Thu Jun 19 17:51:43 2003
+++ patches/patch-ag	Thu Jun 19 17:38:16 2003
@@ -0,0 +1,33 @@
+$NetBSD$
+
+#
+# This patch is for reference.
+#
+--- configure.orig	Thu Jun 19 17:34:38 2003
++++ configure	Thu Jun 19 17:35:57 2003
+@@ -13269,13 +13269,13 @@
+ 			savedldflags="$LDFLAGS"
+ 			CFLAGS="$CFLAGS -I$bdbdir"
+ 			LDFLAGS="-L$bdblibdir $LDFLAGS"
+-			echo "$as_me:$LINENO: checking for main in -ldb" >&5
+-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
++			echo "$as_me:$LINENO: checking for main in -ldb3" >&5
++echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6
+ if test "${ac_cv_lib_db_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldb  $LIBS"
++LIBS="-ldb3  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -13326,7 +13326,7 @@
+ 				if test "$bdblibdir" != "/usr/lib"; then
+ 				    BDB_LIBS="-L$bdblibdir"
+ 				fi
+-				BDB_LIBS="$BDB_LIBS -ldb"
++				BDB_LIBS="$BDB_LIBS -ldb3"
+ 				BDB_BIN=$bdbbindir
+ 				BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
+ 				BDB_PATH="`echo $BDB_PATH | sed 's,include$,,'`"
>Release-Note:
>Audit-Trail:
>Unformatted: