Merge branch 'develop'

diff --git a/NEWS b/NEWS
index e73877ea6231653ce9312cbcd69b1ef5dae710e7..0c2f55807908b665b69b4f14f01b9497c4face06 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Changes in 3.0.1
 * UPD: libevent configure args to pick up installed version. Removed
        configure arg --disable-libevent, added configure args
        --with-libevent-header|lib.
+* UPD: gentoo initscript: merge from portage netatalk.init,v 1.1
 * REM: Remove --with-smbsharemodes configure option, it was an
        empty stub not yet implemented
 

diff --git a/VERSION b/VERSION
index 13d683ccbfeed4ecf19a8f76e016a4e0296ea4cf..abbd04eea2d743779a00caff977f35dc0a1f900f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.1
\ No newline at end of file
+3.0.1dev
\ No newline at end of file

diff --git a/contrib/shell_utils/apple_dump.in b/contrib/shell_utils/apple_dump.in
index 41b20e2e8b87b1a195b49f7722cc270fa7794c7a..6054e0f8bb26bb5a71382a9f3736619e981ba0f1 100755 (executable)
--- a/contrib/shell_utils/apple_dump.in
+++ b/contrib/shell_utils/apple_dump.in
@@ -55,7 +55,7 @@ use bigint; # require perl >= 5.8
 
 if (     0 == system("which getfattr > /dev/null 2>&1")) {
     $eacommand = 1;
-} elsif (0 == system("which xattr > /dev/null 2>&1")) {
+} elsif (0 == system("which attr > /dev/null 2>&1")) {
     $eacommand = 2;
 } elsif (0 == system("which runat > /dev/null 2>&1")) {
     $eacommand = 3;
@@ -111,7 +111,7 @@ while ($arg = shift @ARGV)
     } elsif ($arg eq "-e") {
         if ($eacommand == 0) {
             printf (STDERR "%s: unsupported option -e\n", basename($0));
-            printf (STDERR "because neither getfattr, xattr, runat nor getextattr is found.\n");
+            printf (STDERR "because neither getfattr, attr, runat nor getextattr is found.\n");
             exit 1;
         }
         $eaoption = 1;

diff --git a/distrib/initscripts/rc.gentoo.tmpl b/distrib/initscripts/rc.gentoo.tmpl
index c66e1e95d4f3bb527aa299ab46c6edc9687c2e64..b8f64606e57121c9fd569d634e15576e2a47e5c9 100644 (file)
--- a/distrib/initscripts/rc.gentoo.tmpl
+++ b/distrib/initscripts/rc.gentoo.tmpl
@@ -1,24 +1,14 @@
 #!/sbin/runscript
-
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
 # Netatalk :NETATALK_VERSION: daemons.
 
-depend() {
-    need net
-    use logger dns
-}
-
-netatalk_startup () {
-    ebegin "Starting netatalk"
-    start-stop-daemon --start --quiet --exec :SBINDIR:/netatalk
-    eend $?
-}
-
-start () {
-    netatalk_startup
-}
+command=":SBINDIR:/${SVCNAME}"
 
-stop () {
-    ebegin "Stopping netatalk"
-    start-stop-daemon --stop --quiet --exec :SBINDIR:/netatalk
-    eend $?
+depend() {
+       need net
+       use avahi-daemon
+       use logger dns
+       after entropy
 }