Update netatalk to 1.5.5

	Neither the Changelog nor CHANGES files list the changes from 1.5.3.1

8 files changed, 94 insertions, 132 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a97150bb75c..a21c27eda96 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2002/09/02 11:43:38 abs Exp $
+# $NetBSD: Makefile,v 1.19 2002/09/30 09:25:22 abs Exp $
 
-DISTNAME=	netatalk-1.5.3.1
-PKGREVISION=	2
+DISTNAME=	netatalk-1.5.5
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/} \
 		http://me.in-berlin.de/~jroger/netatalk/
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 2a44755aab5..81aa8246f06 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.5 2002/09/02 11:52:58 abs Exp $
+$NetBSD: distinfo,v 1.6 2002/09/30 09:25:22 abs Exp $
 
-SHA1 (netatalk-1.5.3.1.tar.gz) = 584fc2329559138d05ee5da985837e298b027cd9
-Size (netatalk-1.5.3.1.tar.gz) = 790547 bytes
-SHA1 (patch-aa) = 546ada3aaa44e396a049972573b6743b4f5dd6c7
-SHA1 (patch-ab) = b83b7dc303ae5958a726d124ca3539e02527607b
-SHA1 (patch-ac) = c7d8a724db0ad149d3816d0555328726f6701d81
-SHA1 (patch-ad) = 2eb551644d08da9e59d675d1a61296f21ad69d90
-SHA1 (patch-ae) = 9fa2f74e1e33f011724125d85b5e40c2300536b9
-SHA1 (patch-af) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
+SHA1 (netatalk-1.5.5.tar.gz) = 3d4def4231f1630fb596d7f8c8ca70c7dc661b9a
+Size (netatalk-1.5.5.tar.gz) = 835649 bytes
+SHA1 (patch-aa) = 0d533245bc01003ecfa4e6b5c6403a82387aa2c4
+SHA1 (patch-ab) = 0921842982de335732e8c0618b66caa27ee9f6fb
+SHA1 (patch-ac) = 2eb551644d08da9e59d675d1a61296f21ad69d90
+SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
+SHA1 (patch-ae) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index 5836f00df62..681f749070b 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2002/09/02 11:43:38 abs Exp $
+$NetBSD: patch-aa,v 1.6 2002/09/30 09:25:23 abs Exp $
 
---- configure.orig	Wed Mar 27 22:20:55 2002
+--- configure.orig	Sun Sep  1 17:50:59 2002
 +++ configure
-@@ -8267,7 +8267,7 @@ if test "${with_pkgconfdir+set}" = set; 
- fi
+@@ -12460,7 +12460,7 @@ if test "${with_pkgconfdir+set}" = set; 
  
+ fi;
  
 -	NLSDIR="${PKGCONFDIR}/nls"
 +	NLSDIR="${prefix}/share/netatalk/nls"
  
- 	# Check whether --with-nls-dir or --without-nls-dir was given.
- if test "${with_nls_dir+set}" = set; then
+ 
+ # Check whether --with-nls-dir or --without-nls-dir was given.
diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab
index 5dda5b324fa..6f71dc87a5b 100644
--- a/net/netatalk/patches/patch-ab
+++ b/net/netatalk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2002/09/02 11:43:38 abs Exp $
+$NetBSD: patch-ab,v 1.5 2002/09/30 09:25:23 abs Exp $
 
---- distrib/initscripts/Makefile.in.orig	Wed Mar 27 22:20:46 2002
+--- distrib/initscripts/Makefile.in.orig	Sun Sep  1 17:57:04 2002
 +++ distrib/initscripts/Makefile.in
-@@ -149,12 +149,12 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
+@@ -155,12 +155,12 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
  # checking for NetBSD init scripts
  #
  @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d
diff --git a/net/netatalk/patches/patch-ac b/net/netatalk/patches/patch-ac
index 6f7f1bc9ea9..3e80058dfc7 100644
--- a/net/netatalk/patches/patch-ac
+++ b/net/netatalk/patches/patch-ac
@@ -1,29 +1,19 @@
-$NetBSD: patch-ac,v 1.5 2002/09/02 11:52:59 abs Exp $
+$NetBSD: patch-ac,v 1.6 2002/09/30 09:25:24 abs Exp $
 
---- etc/afpd/ofork.c.orig	Thu Feb  7 23:57:27 2002
-+++ etc/afpd/ofork.c
-@@ -14,6 +14,7 @@
- #include <string.h>
- #include <sys/stat.h> /* works around a bug */
- #include <sys/param.h>
-+#include <sys/resource.h>
- #include <syslog.h>
- #include <errno.h>
- 
-@@ -146,7 +147,15 @@ struct adouble      *ad;
-     int			i;
- 
-     if (!oforks) {
--        nforks = (getdtablesize() - 10) / 2;
-+	struct rlimit rlp;
-+
-+	getrlimit(RLIMIT_NOFILE, &rlp);
-+	if (rlp.rlim_cur < 256)
-+	    rlp.rlim_cur = 256;
-+	setrlimit(RLIMIT_NOFILE, &rlp);
-+	getrlimit(RLIMIT_NOFILE, &rlp);
-+
-+        nforks = (rlp.rlim_cur - 10) / 2;
-         oforks = (struct ofork **) calloc(nforks, sizeof(struct ofork *));
-         if (!oforks)
-             return NULL;
+--- etc/atalkd/main.c.orig	Wed Mar 13 20:50:26 2002
++++ etc/atalkd/main.c
+@@ -274,12 +274,12 @@ void as_timer(void)
+ 		    syslog( LOG_INFO, "config for no router" );
+ 		      
+ 		    if ( iface->i_flags & IFACE_PHASE2 ) {
+-			iface->i_rt->rt_firstnet = 0;
++			iface->i_rt->rt_firstnet = htons(1);
+ 			iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
+ 			setaddr( iface, IFACE_PHASE2,
+ 				iface->i_addr.sat_addr.s_net,
+ 				iface->i_addr.sat_addr.s_node,
+-				0, htons( STARTUP_LASTNET ));
++				htons(1), htons( STARTUP_LASTNET ));
+ 		    }
+ 		    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
+ 			syslog( LOG_ERR,
diff --git a/net/netatalk/patches/patch-ad b/net/netatalk/patches/patch-ad
index 2a752498946..d75ba69f37b 100644
--- a/net/netatalk/patches/patch-ad
+++ b/net/netatalk/patches/patch-ad
@@ -1,19 +1,40 @@
-$NetBSD: patch-ad,v 1.4 2002/09/02 11:43:39 abs Exp $
+$NetBSD: patch-ad,v 1.5 2002/09/30 09:25:24 abs Exp $
 
---- etc/atalkd/main.c.orig	Wed Mar 13 20:50:26 2002
-+++ etc/atalkd/main.c
-@@ -274,12 +274,12 @@ void as_timer(void)
- 		    syslog( LOG_INFO, "config for no router" );
- 		      
- 		    if ( iface->i_flags & IFACE_PHASE2 ) {
--			iface->i_rt->rt_firstnet = 0;
-+			iface->i_rt->rt_firstnet = htons(1);
- 			iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
- 			setaddr( iface, IFACE_PHASE2,
- 				iface->i_addr.sat_addr.s_net,
- 				iface->i_addr.sat_addr.s_node,
--				0, htons( STARTUP_LASTNET ));
-+				htons(1), htons( STARTUP_LASTNET ));
- 		    }
- 		    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
- 			syslog( LOG_ERR,
+--- include/atalk/paths.h.orig	Wed Sep 25 18:36:24 2002
++++ include/atalk/paths.h
+@@ -16,7 +16,7 @@
+ 
+ /* lock file path. this should be re-organized a bit. */
+ #if ! defined (_PATH_LOCKDIR)
+-#  if defined (FHS_COMPATIBILITY)
++#  if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+ #    define _PATH_LOCKDIR	"/var/run/"
+ #  elif defined (BSD4_4)
+ #    ifdef MACOSX_SERVER
+@@ -51,7 +51,7 @@
+  */
+ #define _PATH_ATALKDEBUG	"/tmp/atalkd.debug"
+ #define _PATH_ATALKDTMP		"atalkd.tmp"
+-#ifdef FHS_COMPATIBILITY
++#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+ #  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
+ #else
+ #  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
+@@ -61,7 +61,7 @@
+  * psorder paths
+  */
+ #define _PATH_TMPPAGEORDER	"/tmp/psorderXXXXXX"
+-#ifdef FHS_COMPATIBILITY
++#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+ #  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
+ #else
+ #  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd")
+@@ -71,7 +71,7 @@
+  * afpd paths
+  */
+ #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
+-#ifdef FHS_COMPATIBILITY
++#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+ #  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
+ #else
+ #  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
diff --git a/net/netatalk/patches/patch-ae b/net/netatalk/patches/patch-ae
index a87f18acd64..89fe0b29c0e 100644
--- a/net/netatalk/patches/patch-ae
+++ b/net/netatalk/patches/patch-ae
@@ -1,47 +1,19 @@
-$NetBSD: patch-ae,v 1.4 2002/09/02 11:43:39 abs Exp $
+$NetBSD: patch-ae,v 1.5 2002/09/30 09:25:24 abs Exp $
 
---- include/atalk/paths.h.orig	Tue Jul 31 20:51:12 2001
-+++ include/atalk/paths.h
-@@ -19,11 +19,7 @@
- #  if defined (FHS_COMPATIBILITY)
- #    define _PATH_LOCKDIR	"/var/run/"
- #  elif defined (BSD4_4)
--#    ifdef MACOSX_SERVER
- #      define _PATH_LOCKDIR	"/var/run/"
--#    else
--#      define _PATH_LOCKDIR	"/var/spool/lock/"
--#    endif
- #  elif defined (linux)
- #    define _PATH_LOCKDIR	"/var/lock/"
- #  else
-@@ -51,30 +47,18 @@
-  */
- #define _PATH_ATALKDEBUG	"/tmp/atalkd.debug"
- #define _PATH_ATALKDTMP		"atalkd.tmp"
--#ifdef FHS_COMPATIBILITY
- #  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
--#else
--#  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
--#endif
- 
- /*
-  * psorder paths
-  */
- #define _PATH_TMPPAGEORDER	"/tmp/psorderXXXXXX"
--#ifdef FHS_COMPATIBILITY
- #  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
--#else
--#  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd")
--#endif
- 
- /*
-  * afpd paths
-  */
- #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
--#ifdef FHS_COMPATIBILITY
- #  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
--#else
--#  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
--#endif
- 
- #endif /* atalk/paths.h */
+--- man/man8/psf.8.tmpl.orig	Tue Sep 19 18:13:47 2000
++++ man/man8/psf.8.tmpl
+@@ -93,10 +93,10 @@ laser|lp|LaserWriter Plus on AppleTalk:\
+     :sd=/usr/spool/lpd/laser:\\
+     :lp=/usr/spool/lpd/laser/null:\\
+     :lf=/var/adm/lpd-errs:pw#80:hl:\\
+-    :of=:LIBDIR:/filters/ofpap:\\
+-    :if=:LIBDIR:/filters/ifpaprev:\\
+-    :tf=:LIBDIR:/filters/tfpaprev:\\
+-    :df=:LIBDIR:/filters/dfpaprev:
++    :of=:SBINDIR:/filters/ofpap:\\
++    :if=:SBINDIR:/filters/ifpaprev:\\
++    :tf=:SBINDIR:/filters/tfpaprev:\\
++    :df=:SBINDIR:/filters/dfpaprev:
+ .fi
+ .RE
+ .sp
diff --git a/net/netatalk/patches/patch-af b/net/netatalk/patches/patch-af
deleted file mode 100644
index feb070d811e..00000000000
--- a/net/netatalk/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.4 2002/09/02 11:43:39 abs Exp $
-
---- man/man8/psf.8.tmpl.orig	Tue Sep 19 18:13:47 2000
-+++ man/man8/psf.8.tmpl
-@@ -93,10 +93,10 @@ laser|lp|LaserWriter Plus on AppleTalk:\
-     :sd=/usr/spool/lpd/laser:\\
-     :lp=/usr/spool/lpd/laser/null:\\
-     :lf=/var/adm/lpd-errs:pw#80:hl:\\
--    :of=:LIBDIR:/filters/ofpap:\\
--    :if=:LIBDIR:/filters/ifpaprev:\\
--    :tf=:LIBDIR:/filters/tfpaprev:\\
--    :df=:LIBDIR:/filters/dfpaprev:
-+    :of=:SBINDIR:/filters/ofpap:\\
-+    :if=:SBINDIR:/filters/ifpaprev:\\
-+    :tf=:SBINDIR:/filters/tfpaprev:\\
-+    :df=:SBINDIR:/filters/dfpaprev:
- .fi
- .RE
- .sp