Add patch provided by Hauke Fath in PR/10736 to avoid afpd server via ASIP

problem. Update version to netatalk-asun-2.1.3nb2

6 files changed, 171 insertions, 153 deletions

diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index 971486a8bdd..700c9454aa7 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2000/07/31 18:33:46 abs Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/02 11:43:00 abs Exp $
 
 DISTNAME=	netatalk-1.4b2+asun2.1.3
-PKGNAME=	netatalk-asun-2.1.3nb1
+PKGNAME=	netatalk-asun-2.1.3nb2
 CATEGORIES=	net print
-MASTER_SITES=   ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
+MASTER_SITES=   ftp://ftp.cobaltnet.com/pub/users/asun/release/ \
+		ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
 
 MAINTAINER=	abs@netbsd.org
 HOMEPAGE=	http://www.umich.edu/~rsug/netatalk/
diff --git a/net/netatalk-asun/files/patch-sum b/net/netatalk-asun/files/patch-sum
index 5cfaec77d8a..e06a26aebf0 100644
--- a/net/netatalk-asun/files/patch-sum
+++ b/net/netatalk-asun/files/patch-sum
@@ -1,36 +1,37 @@
-$NetBSD: patch-sum,v 1.2 2000/07/31 18:33:47 abs Exp $
+$NetBSD: patch-sum,v 1.3 2000/08/02 11:43:03 abs Exp $
 
-MD5 (patch-aa) = 46ed82d6697d21ce0b04c2e3b8243c8b
-MD5 (patch-ab) = 137583031766e6d75eec89285f2d6500
-MD5 (patch-ac) = e888021ff0555b331123a87e1e7b5a86
-MD5 (patch-ad) = 4e90ff17cc5539bf875cba65457ca420
-MD5 (patch-ae) = 314bc3225e044a2bce2cc2b63f5041e8
-MD5 (patch-af) = aa07bf2ea12eb045b7c368e943047ece
-MD5 (patch-ag) = bfc3d7a4172df44279e8e2d4d7aa5942
-MD5 (patch-ah) = 3cfaed4385f92144cfc9d7ae5124e04d
-MD5 (patch-ai) = 1a7d022d59ee666aeef8cdca68dfbac3
-MD5 (patch-aj) = ef01b8f7d165e69ad5898c26ff6c9725
-MD5 (patch-ak) = 98e0db823a1f6f1980275c55c2fc939b
-MD5 (patch-al) = f4ee952e33ad06c050c71f5c594510ae
-MD5 (patch-am) = 3f9a0d638e6af71d97686814d7542885
-MD5 (patch-an) = 267df68174aaddd2c54998379b824741
-MD5 (patch-ao) = e835a46e077dc1487e480ab3d4f83b62
-MD5 (patch-ap) = d81dcbfac5814e74b0228009ba291d25
-MD5 (patch-aq) = cec22414061fe786bcbdb77bd7ea5e66
-MD5 (patch-ar) = 05c825b8f3add209094fc5b8c693de90
-MD5 (patch-as) = 3e6593c74501dc7bc07f0b9b3398e79e
-MD5 (patch-at) = d89b6250c7da67fe7b69f004cd8f70d2
-MD5 (patch-au) = 6515ded3fd66ba9d3a2c16e0778e023d
-MD5 (patch-av) = 259ce58b98b08eeb543cc0c8939e14db
-MD5 (patch-aw) = bbc6fcbff220a23a8c4bbae228078fdc
-MD5 (patch-ax) = 976b6c7fd8994a56b9b8c268f12ebf81
-MD5 (patch-ay) = 3f05e3acc1322bcab978b22c01641215
-MD5 (patch-az) = 82149a7c9938ba9358fb85ddf7f373db
-MD5 (patch-ba) = e7c9d9ade3ea85ebf27c76e0faeac707
-MD5 (patch-bb) = 7cc061c4498c09f876b20dc8e94b3d4c
-MD5 (patch-bc) = 162897bc0d8d4c09646160656e49c8f5
-MD5 (patch-bd) = 0af514d83ef275a2b21b46dec0e9d80d
-MD5 (patch-be) = 5d55c347f1a88b7c3ee3e4e2d3ad3b2c
-MD5 (patch-bf) = 63201f981ef49ba997c0063606a9ef47
-MD5 (patch-bg) = 465f2f963d62462362b12888937886a4
-MD5 (patch-bh) = 94ba6a45abdb7ffbb58429816dfa6034
+MD5 (patch-aa) = 90cc4809fb45fc7064513ee04fc81348
+MD5 (patch-ab) = e9c905231375e9628e1fd3bd8fd7902f
+MD5 (patch-ac) = 875dd27beb456231672b50624e0d8d42
+MD5 (patch-ad) = 5e2fc5f5825d962ba1a2fbf20fe77685
+MD5 (patch-ae) = e1a7e7a51d378d0973efe8741b34ea3d
+MD5 (patch-af) = 370f3bf160de25ffd80edead4d4685e0
+MD5 (patch-ag) = 6723397d676d7d94879d07aaeb9f3fee
+MD5 (patch-ah) = ac67d17442179caf4534556e7cfef15a
+MD5 (patch-ai) = 07d70dc65d29c671d693b9367cb28a7f
+MD5 (patch-aj) = d6795e5eca95162d7a077a757a20f3f8
+MD5 (patch-ak) = 312c56f04eb5b6bdb72d5afba3ff8736
+MD5 (patch-al) = ad9f7613042a36503095216245b89329
+MD5 (patch-am) = 8bc34812918a5a0659e173ce601fa1cc
+MD5 (patch-an) = 414bed33301156f349791a9a80f57a40
+MD5 (patch-ao) = 1897d874489b183143d43e6217fa29ea
+MD5 (patch-ap) = 0e171dfd55e5f8698d499caf8b0cf2bc
+MD5 (patch-aq) = 667101ecb8d304a22f097e644777fc32
+MD5 (patch-ar) = becc869b2f5adc530648ebcfd62dee78
+MD5 (patch-as) = 6c2a48b207d10477feead80eb7b0da96
+MD5 (patch-at) = dfd8a9b98ce5740f80886818350f08f4
+MD5 (patch-au) = 95b19416e7417e6382d550e29a7df5eb
+MD5 (patch-av) = 188b9a219f5b6481c35e9e6bbcdbbc7d
+MD5 (patch-aw) = eeac983b59b2cc23355e542e38057f06
+MD5 (patch-ax) = a616c3d311ae60e693264b1103238144
+MD5 (patch-ay) = 893b6e70475b3b819f0e4e3293a1be58
+MD5 (patch-az) = ae44c5f1886e0aa312b012c1ab48dc14
+MD5 (patch-ba) = 4355b2a6d675d2d3fb5063ebef945889
+MD5 (patch-bb) = 08f0d119f22680b7a6893fa65967a033
+MD5 (patch-bc) = d0acb46a6f5cd15138ff343b238edfd3
+MD5 (patch-bd) = 3512f183a84027e2164fdc2001c079cc
+MD5 (patch-be) = dbc2534a8266010f7775ddceb86c3ccf
+MD5 (patch-bf) = 156599cacc530189ce5007f7271dd71c
+MD5 (patch-bg) = af74797ca603e79bf664ccc934f79a8c
+MD5 (patch-bh) = 8681cb51926a945aa1d3128fa9ca2c27
+MD5 (patch-bi) = 6a75ac8b64a7bf655e41ce6eb6f4dbec
diff --git a/net/netatalk-asun/patches/patch-bf b/net/netatalk-asun/patches/patch-bf
index 4a6528b042c..034dc086bd7 100644
--- a/net/netatalk-asun/patches/patch-bf
+++ b/net/netatalk-asun/patches/patch-bf
@@ -1,13 +1,16 @@
-$NetBSD: patch-bf,v 1.1 2000/07/31 18:33:56 abs Exp $
+$NetBSD: patch-bf,v 1.2 2000/08/02 11:43:03 abs Exp $
 
---- config/AppleVolumes.system.orig	Thu Feb  4 07:49:04 1999
-+++ config/AppleVolumes.system	Mon Jul 31 18:55:46 2000
-@@ -26,7 +26,7 @@
- .html	TEXT	MOS!
- .rtf	TEXT	MSWD
- .doc	WDBN	MSWD
--.pdf	CARO	PDF
-+.pdf	PDF	CARO
- 
- # compressed archives
- .bin	BINA	MB2P
+--- libatalk/dsi/dsi_tcp.c.orig	Wed Aug  2 10:16:25 2000
++++ libatalk/dsi/dsi_tcp.c	Wed Aug  2 10:17:02 2000
+@@ -108,6 +108,11 @@
+       exit(1);
+     }
+     newact.sa_handler = timeout_handler;
++    sigemptyset(&newact.sa_mask);
++    newact.sa_flags = 0;
++    oldact.sa_handler = NULL;
++    sigemptyset(&oldact.sa_mask);
++    oldact.sa_flags = 0;
+     if (sigaction(SIGALRM, &newact, &oldact) < 0) {
+ 	syslog(LOG_ERR, "dsi_tcp_open: sigaction: %m");
+ 	exit(1);
diff --git a/net/netatalk-asun/patches/patch-bg b/net/netatalk-asun/patches/patch-bg
index 31dbf31e2b2..2c4ad036b67 100644
--- a/net/netatalk-asun/patches/patch-bg
+++ b/net/netatalk-asun/patches/patch-bg
@@ -1,66 +1,13 @@
-$NetBSD: patch-bg,v 1.1 2000/07/31 18:33:56 abs Exp $
+$NetBSD: patch-bg,v 1.2 2000/08/02 11:43:03 abs Exp $
 
---- Makefile.orig	Sun Feb  7 11:15:46 1999
-+++ Makefile	Mon Jul 31 18:46:20 2000
-@@ -1,22 +1,27 @@
- # Root of installation. Subdirectories will be ${DESTDIR}/etc,
- # ${DESTDIR}/bin, and ${DESTDIR}/lib.
--DESTDIR=/usr/local/atalk
-+DESTDIR=${PREFIX}
- 
- # for system-level binaries
--SBINDIR=$(DESTDIR)/etc
-+SBINDIR=$(DESTDIR)/sbin
-+LIBEXECDIR=$(DESTDIR)/libexec
- # for user-level binaries
- BINDIR=$(DESTDIR)/bin
- # for program libraries (*.a)
- LIBDIR=$(DESTDIR)/lib
- # for machine-independent resources (pagecount.ps, etc.)
--RESDIR=$(DESTDIR)/etc
-+RESDIR=$(DESTDIR)/share
- # for configuration files (AppleVolumes.system, etc.)
--ETCDIR=$(DESTDIR)/etc
-+ETCDIR=/etc/netatalk
-+# for startup script
-+RCDIR=$(DESTDIR)/etc/rc.d
- # for include files
- INCDIR=$(DESTDIR)/include
- # Root of man pages.  Subdirectories will be
- # ${MANDIR}/man1, ${MANDIR}/man4, and ${MANDIR}/man8.
- MANDIR=$(DESTDIR)/man
-+# for example config files
-+EXAMPLEDIR=$(DESTDIR)/share/examples/netatalk
- 
- #SBINDIR=/usr/sbin
- #BINDIR=/usr/bin
-@@ -32,7 +37,7 @@
- # Location of the DES library and include files. Comment this out if you
- # don't want Randnum Exchange and 2-Way Randnum Exchange as allowable UAMs 
- # for afpd. We expect libdes.a in $DESDIR/lib and des.h in $DESDIR/include.
--DESDIR=/usr/local
-+#DESDIR=/usr/local
- 
- # Location of the tcp wrapper library and include files. Comment this out
- # if you don't want tcp wrapper support. having tcp wrapper support is
-@@ -41,7 +46,7 @@
- 
- # Location of PAM support library and include files. Comment this out
- # if you don't want to enable PAM support
--PAMDIR=/usr
-+#PAMDIR=/usr
- 
-  
- # Location of the AFS and Kerberos libraries and include files.  Uncomment
-@@ -73,9 +78,10 @@
- 	esac; \
- 	echo "Making $@ for $$ARCH..."; \
- 	cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
-+	    RCDIR="${RCDIR}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
- 	    TCPWRAPDIR="${TCPWRAPDIR}" PAMDIR="${PAMDIR}" DB2DIR="${DB2DIR}" \
- 	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" DESDIR="${DESDIR}" $@
- 
+--- config/AppleVolumes.system.orig	Thu Feb  4 07:49:04 1999
++++ config/AppleVolumes.system	Wed Aug  2 10:15:45 2000
+@@ -26,7 +26,7 @@
+ .html	TEXT	MOS!
+ .rtf	TEXT	MSWD
+ .doc	WDBN	MSWD
+-.pdf	CARO	PDF
++.pdf	PDF	CARO
+ 
+ # compressed archives
+ .bin	BINA	MB2P
diff --git a/net/netatalk-asun/patches/patch-bh b/net/netatalk-asun/patches/patch-bh
index 6aeda3c2b63..765e416d168 100644
--- a/net/netatalk-asun/patches/patch-bh
+++ b/net/netatalk-asun/patches/patch-bh
@@ -1,44 +1,66 @@
-$NetBSD: patch-bh,v 1.1 2000/07/31 18:33:57 abs Exp $
+$NetBSD: patch-bh,v 1.2 2000/08/02 11:43:03 abs Exp $
 
---- rc.atalk.bsd.orig	Mon Aug 25 23:00:54 1997
-+++ rc.atalk.bsd	Mon Jul 31 18:46:20 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- # AppleTalk daemons. Make sure not to start atalkd in the background:
- # its data structures must have time to stablize before running the
-@@ -14,26 +15,22 @@
- ##fi
+--- Makefile.orig	Sun Feb  7 11:15:46 1999
++++ Makefile	Wed Aug  2 10:15:45 2000
+@@ -1,22 +1,27 @@
+ # Root of installation. Subdirectories will be ${DESTDIR}/etc,
+ # ${DESTDIR}/bin, and ${DESTDIR}/lib.
+-DESTDIR=/usr/local/atalk
++DESTDIR=${PREFIX}
  
- echo -n 'starting appletalk daemons:'
--if [ -x :SBINDIR:/atalkd ]; then
--	:SBINDIR:/atalkd;		echo -n ' atalkd'
-+if [ -x :LIBEXECDIR:/atalkd ]; then
-+	:LIBEXECDIR:/atalkd;		echo -n ' atalkd'
- fi
+ # for system-level binaries
+-SBINDIR=$(DESTDIR)/etc
++SBINDIR=$(DESTDIR)/sbin
++LIBEXECDIR=$(DESTDIR)/libexec
+ # for user-level binaries
+ BINDIR=$(DESTDIR)/bin
+ # for program libraries (*.a)
+ LIBDIR=$(DESTDIR)/lib
+ # for machine-independent resources (pagecount.ps, etc.)
+-RESDIR=$(DESTDIR)/etc
++RESDIR=$(DESTDIR)/share
+ # for configuration files (AppleVolumes.system, etc.)
+-ETCDIR=$(DESTDIR)/etc
++ETCDIR=/etc/netatalk
++# for startup script
++RCDIR=$(DESTDIR)/etc/rc.d
+ # for include files
+ INCDIR=$(DESTDIR)/include
+ # Root of man pages.  Subdirectories will be
+ # ${MANDIR}/man1, ${MANDIR}/man4, and ${MANDIR}/man8.
+ MANDIR=$(DESTDIR)/man
++# for example config files
++EXAMPLEDIR=$(DESTDIR)/share/examples/netatalk
  
- if [ -x :BINDIR:/nbprgstr ]; then
--	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:Workstation
--	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:netatalk
-+	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:Workstation
-+	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:netatalk
- 					echo -n ' nbprgstr'
- fi
+ #SBINDIR=/usr/sbin
+ #BINDIR=/usr/bin
+@@ -32,7 +37,7 @@
+ # Location of the DES library and include files. Comment this out if you
+ # don't want Randnum Exchange and 2-Way Randnum Exchange as allowable UAMs 
+ # for afpd. We expect libdes.a in $DESDIR/lib and des.h in $DESDIR/include.
+-DESDIR=/usr/local
++#DESDIR=/usr/local
  
--if [ -x :SBINDIR:/papd ]; then
--	:SBINDIR:/papd;		echo -n ' papd'
-+if [ -x :LIBEXECDIR:/papd -a :ETCDIR:/papd.conf ]; then
-+	:LIBEXECDIR:/papd;		echo -n ' papd'
- fi
+ # Location of the tcp wrapper library and include files. Comment this out
+ # if you don't want tcp wrapper support. having tcp wrapper support is
+@@ -41,7 +46,7 @@
  
--if [ -x :SBINDIR:/afpd ]; then
--	:SBINDIR:/afpd;		echo -n ' afpd'
--fi
--
--if [ -x :SBINDIR:/timelord ]; then
--	:SBINDIR:/timelord;		echo -n ' timelord'
-+if [ -x :LIBEXECDIR:/afpd -a :ETCDIR:/AppleVolumes.system ]; then
-+	:LIBEXECDIR:/afpd;		echo -n ' afpd'
- fi
+ # Location of PAM support library and include files. Comment this out
+ # if you don't want to enable PAM support
+-PAMDIR=/usr
++#PAMDIR=/usr
+ 
+  
+ # Location of the AFS and Kerberos libraries and include files.  Uncomment
+@@ -73,9 +78,10 @@
+ 	esac; \
+ 	echo "Making $@ for $$ARCH..."; \
+ 	cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+-	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
++	    RCDIR="${RCDIR}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
+ 	    TCPWRAPDIR="${TCPWRAPDIR}" PAMDIR="${PAMDIR}" DB2DIR="${DB2DIR}" \
+ 	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" DESDIR="${DESDIR}" $@
  
- 					echo '.'
diff --git a/net/netatalk-asun/patches/patch-bi b/net/netatalk-asun/patches/patch-bi
new file mode 100644
index 00000000000..030b96234a1
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-bi
@@ -0,0 +1,44 @@
+$NetBSD: patch-bi,v 1.1 2000/08/02 11:43:03 abs Exp $
+
+--- rc.atalk.bsd.orig	Mon Aug 25 23:00:54 1997
++++ rc.atalk.bsd	Wed Aug  2 10:15:45 2000
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ # AppleTalk daemons. Make sure not to start atalkd in the background:
+ # its data structures must have time to stablize before running the
+@@ -14,26 +15,22 @@
+ ##fi
+ 
+ echo -n 'starting appletalk daemons:'
+-if [ -x :SBINDIR:/atalkd ]; then
+-	:SBINDIR:/atalkd;		echo -n ' atalkd'
++if [ -x :LIBEXECDIR:/atalkd ]; then
++	:LIBEXECDIR:/atalkd;		echo -n ' atalkd'
+ fi
+ 
+ if [ -x :BINDIR:/nbprgstr ]; then
+-	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:Workstation
+-	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:netatalk
++	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:Workstation
++	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:netatalk
+ 					echo -n ' nbprgstr'
+ fi
+ 
+-if [ -x :SBINDIR:/papd ]; then
+-	:SBINDIR:/papd;		echo -n ' papd'
++if [ -x :LIBEXECDIR:/papd -a :ETCDIR:/papd.conf ]; then
++	:LIBEXECDIR:/papd;		echo -n ' papd'
+ fi
+ 
+-if [ -x :SBINDIR:/afpd ]; then
+-	:SBINDIR:/afpd;		echo -n ' afpd'
+-fi
+-
+-if [ -x :SBINDIR:/timelord ]; then
+-	:SBINDIR:/timelord;		echo -n ' timelord'
++if [ -x :LIBEXECDIR:/afpd -a :ETCDIR:/AppleVolumes.system ]; then
++	:LIBEXECDIR:/afpd;		echo -n ' afpd'
+ fi
+ 
+ 					echo '.'