Updated netatalk to 1.5.3.1nb2:

	Use getrlimit() and setrlimit() to attempt to set the open
	filedescriptor to a sane value. Avoids afpd running out of
	fork slots when serving MacOS 10.2 clients. Patch sent back
	to maintainers.

8 files changed, 150 insertions, 120 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 8c2e74672aa..a97150bb75c 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2002/08/29 11:16:15 abs Exp $
+# $NetBSD: Makefile,v 1.18 2002/09/02 11:43:38 abs Exp $
 
 DISTNAME=	netatalk-1.5.3.1
-PKGREVISION=	1
+PKGREVISION=	2
 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 e7be4168642..29fb3673a35 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2002/05/25 12:55:24 markd Exp $
+$NetBSD: distinfo,v 1.4 2002/09/02 11:43:38 abs Exp $
 
 SHA1 (netatalk-1.5.3.1.tar.gz) = 584fc2329559138d05ee5da985837e298b027cd9
 Size (netatalk-1.5.3.1.tar.gz) = 790547 bytes
-SHA1 (patch-aa) = 921483a45991180d89dbe6f554b9181da4aeb3c2
-SHA1 (patch-ab) = cb9afbb0d8b63ce1f5eda233abb23a981c11f7d2
-SHA1 (patch-ac) = a040dc916d47bd9b88033de8f0073ae3f1f7fcb5
-SHA1 (patch-ad) = da627a0d0d8a875f56a278b47f12770b22c4ef7d
-SHA1 (patch-ae) = ef942c80f699aafd2c6aa1dcc9c1691a978b89d2
+SHA1 (patch-aa) = 546ada3aaa44e396a049972573b6743b4f5dd6c7
+SHA1 (patch-ab) = b83b7dc303ae5958a726d124ca3539e02527607b
+SHA1 (patch-ac) = 4d4a16f530d52d8537a114632c80ef69e8dc88f8
+SHA1 (patch-ad) = 2eb551644d08da9e59d675d1a61296f21ad69d90
+SHA1 (patch-ae) = 9fa2f74e1e33f011724125d85b5e40c2300536b9
+SHA1 (patch-af) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index df1b15e9642..5836f00df62 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,19 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2002/05/25 12:55:25 markd Exp $
+$NetBSD: patch-aa,v 1.5 2002/09/02 11:43:38 abs Exp $
 
---- distrib/initscripts/Makefile.in.orig	Sat Feb 16 06:52:26 2002
-+++ distrib/initscripts/Makefile.in	Sat Feb 16 06:57:46 2002
-@@ -149,12 +149,12 @@
- # checking for NetBSD init scripts
- #
- @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d
--@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
-+@USE_NETBSD_TRUE@sysvdir = ${prefix}/etc/rc.d
- @USE_REDHAT_TRUE@sysvdir = /etc/rc.d/init.d
- @USE_SUSE_TRUE@sysvdir = /etc/rc.d
- @USE_TRU64_TRUE@sysvdir = /sbin/init.d
- @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
--@USE_NETBSD_TRUE@sysv_SCRIPTS = afp atalk pap timelord
-+@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord
- @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
- @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
- @USE_TRU64_TRUE@sysv_SCRIPTS = atalk
+--- configure.orig	Wed Mar 27 22:20:55 2002
++++ configure
+@@ -8267,7 +8267,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
diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab
index 3c41fb2341f..5dda5b324fa 100644
--- a/net/netatalk/patches/patch-ab
+++ b/net/netatalk/patches/patch-ab
@@ -1,13 +1,19 @@
-$NetBSD: patch-ab,v 1.3 2002/05/25 12:55:25 markd Exp $
+$NetBSD: patch-ab,v 1.4 2002/09/02 11:43:38 abs Exp $
 
---- configure.orig	Thu Mar 28 10:20:55 2002
-+++ configure	Wed May 22 00:04:08 2002
-@@ -8267,7 +8267,7 @@
- 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
+--- distrib/initscripts/Makefile.in.orig	Wed Mar 27 22:20:46 2002
++++ distrib/initscripts/Makefile.in
+@@ -149,12 +149,12 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
+ # checking for NetBSD init scripts
+ #
+ @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d
+-@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
++@USE_NETBSD_TRUE@sysvdir = ${prefix}/etc/rc.d
+ @USE_REDHAT_TRUE@sysvdir = /etc/rc.d/init.d
+ @USE_SUSE_TRUE@sysvdir = /etc/rc.d
+ @USE_TRU64_TRUE@sysvdir = /sbin/init.d
+ @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
+-@USE_NETBSD_TRUE@sysv_SCRIPTS = afp atalk pap timelord
++@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord
+ @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
+ @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
+ @USE_TRU64_TRUE@sysv_SCRIPTS = atalk
diff --git a/net/netatalk/patches/patch-ac b/net/netatalk/patches/patch-ac
index 0226d09b17e..b93210cf760 100644
--- a/net/netatalk/patches/patch-ac
+++ b/net/netatalk/patches/patch-ac
@@ -1,19 +1,29 @@
-$NetBSD: patch-ac,v 1.3 2002/05/25 12:55:25 markd Exp $
+$NetBSD: patch-ac,v 1.4 2002/09/02 11:43:39 abs Exp $
 
---- etc/atalkd/main.c.orig	Mon Dec 31 15:05:20 2001
-+++ etc/atalkd/main.c	Mon Jan 14 21:59:05 2002
-@@ -276,12 +276,12 @@
- 		    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,
+--- 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 < 128)
++	    rlp.rlim_cur = 128;
++	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;
diff --git a/net/netatalk/patches/patch-ad b/net/netatalk/patches/patch-ad
index 8a11009d4e7..2a752498946 100644
--- a/net/netatalk/patches/patch-ad
+++ b/net/netatalk/patches/patch-ad
@@ -1,47 +1,19 @@
-$NetBSD: patch-ad,v 1.3 2002/05/25 12:55:25 markd Exp $
+$NetBSD: patch-ad,v 1.4 2002/09/02 11:43:39 abs Exp $
 
---- include/atalk/paths.h.orig	Thu Dec 20 06:43:20 2001
-+++ include/atalk/paths.h	Thu Dec 20 06:44:02 2001
-@@ -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 */
+--- 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-ae b/net/netatalk/patches/patch-ae
index 6939d129f1d..a87f18acd64 100644
--- a/net/netatalk/patches/patch-ae
+++ b/net/netatalk/patches/patch-ae
@@ -1,19 +1,47 @@
-$NetBSD: patch-ae,v 1.3 2002/05/25 12:55:25 markd Exp $
+$NetBSD: patch-ae,v 1.4 2002/09/02 11:43:39 abs Exp $
 
---- man/man8/psf.8.tmpl.orig	Wed Dec 19 15:19:21 2001
-+++ man/man8/psf.8.tmpl	Wed Dec 19 15:21:29 2001
-@@ -93,10 +93,10 @@
-     :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
+--- 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 */
diff --git a/net/netatalk/patches/patch-af b/net/netatalk/patches/patch-af
new file mode 100644
index 00000000000..feb070d811e
--- /dev/null
+++ b/net/netatalk/patches/patch-af
@@ -0,0 +1,19 @@
+$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