pkg/44833: net/netatalk rc.d "netbsd" scripts pidfile failure on DragonFly

[matthias.rampke%googlemail.com@localhost]

>Number:         44833
>Category:       pkg
>Synopsis:       net/netatalk rc.d "netbsd" scripts pidfile failure on DragonFly
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 06 02:10:01 +0000 2011
>Originator:     Matthias Rampke
>Release:        DragonFlyBSD 2.8.2
>Organization:
>Environment:
DragonFly zz.2pktfkt.net 2.8-RELEASE DragonFly v2.8.2.68.g41750d-RELEASE #6: 
Tue Mar  8 00:05:12 CET 2011     
matthias%zz.2pktfkt.net@localhost:/usr/obj/usr/src/sys/X86_64_GENERIC_SMP  
x86_64
>Description:
Some of the netatalk rc.d scripts have a "pidfile=" line that somehow breaks 
stopping and restarting on DragonFly; the script can (counterintuitively) *not* 
determine the current instance's pid.

Simply removing the line (as in the attached patch) and letting the rc scripts 
figure this out themselves fixes this for me; I have currently no way to test 
this on NetBSD, sorry.

The patch also removes this line from the other rc.d scripts it appears in; I 
have not tested these either.
>How-To-Repeat:
/etc/rc.d/mpd stop
>Fix:
commit 948483dbfaf87cffd956ee939939df93387e8f01
Author: Matthias Rampke <matthias%rampke.de@localhost>
Date:   Mon Mar 14 13:00:19 2011 +0100

    net/netatalk: fix rc.d scripts

diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 1d1104f..e76ce27 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -23,3 +23,4 @@ SHA1 (patch-au) = cff38d7d61af4ee260cead2c741f6aae07be3ddd
 SHA1 (patch-bj) = e1e0fc2be101554a2e0d53c24d113b593556eb41
 SHA1 (patch-bk) = d4fd2489297897a20c63c26f75d449f287bf229e
 SHA1 (patch-bl) = d7ac4472636b35b43642cb673f2595c88c30910a
+SHA1 (patch-bm) = a11b3791c7b2e714e1004b38cccbd93efbe97a62
diff --git a/net/netatalk/patches/patch-bm b/net/netatalk/patches/patch-bm
new file mode 100644
index 0000000..7cc8953
--- /dev/null
+++ b/net/netatalk/patches/patch-bm
@@ -0,0 +1,40 @@
+--- distrib/initscripts/rc.afpd.netbsd.tmpl.orig
++++ distrib/initscripts/rc.afpd.netbsd.tmpl
+@@ -16,7 +16,6 @@ name="afpd"
+ rcvar=$name
+ command=":SBINDIR:/afpd"
+ etcdir=":ETCDIR:"
+-pidfile="/var/run/${name}.pid"
+ required_files="$etcdir/afpd.conf $etcdir/AppleVolumes.default 
$etcdir/AppleVolumes.system"
+ 
+ load_rc_config $name
+--- distrib/initscripts/rc.atalkd.netbsd.tmpl.orig
++++ distrib/initscripts/rc.atalkd.netbsd.tmpl
+@@ -14,7 +14,6 @@
+ name="atalkd"
+ rcvar=$name
+ command=":SBINDIR:/atalkd"
+-pidfile="/var/run/${name}.pid"
+ register=":BINDIR:/nbprgstr"
+ myhostname=`hostname|sed 's/\..*$//'`
+ required_files=":ETCDIR:/atalkd.conf $register"
+--- distrib/initscripts/rc.papd.netbsd.tmpl.orig
++++ distrib/initscripts/rc.papd.netbsd.tmpl
+@@ -14,7 +14,6 @@
+ name="papd"
+ rcvar=$name
+ command=":SBINDIR:/papd"
+-pidfile="/var/run/${name}.pid"
+ required_files=":ETCDIR:/papd.conf"
+ 
+ load_rc_config $name
+--- distrib/initscripts/rc.timelord.netbsd.tmpl.orig
++++ distrib/initscripts/rc.timelord.netbsd.tmpl
+@@ -14,7 +14,6 @@
+ name="timelord"
+ rcvar=$name
+ command=":SBINDIR:/timelord"
+-pidfile="/var/run/${name}.pid"
+ 
+ load_rc_config $name
+ run_rc_command "$1"