Revision bump to update the conf.d file installed. When an ebuild sets the pidfile directory as /var/run/samba and installs a conf.d file that references /var/run, something is definitely wrong with it. Also, drop the --quiet that made it impossible for the sysadmin to know _why_ samba failed to stop properly (and yet the stop action succeeded).

(Portage version: 2.2_rc41/cvs/Linux x86_64)

3 files changed, 19 insertions, 8 deletions

diff --git a/net-fs/samba-server/ChangeLog b/net-fs/samba-server/ChangeLog
index 02f201252e5c..e10a0bceec24 100644
--- a/net-fs/samba-server/ChangeLog
+++ b/net-fs/samba-server/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-fs/samba-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/ChangeLog,v 1.5 2009/09/15 15:41:21 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/ChangeLog,v 1.6 2009/09/20 16:46:04 flameeyes Exp $
+
+*samba-server-3.3.7-r1 (20 Sep 2009)
+
+  20 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/3.3/samba.confd, -samba-server-3.3.7.ebuild,
+  +samba-server-3.3.7-r1.ebuild:
+  Revision bump to update the conf.d file installed. When an ebuild sets the
+  pidfile directory as /var/run/samba and installs a conf.d file that
+  references /var/run, something is definitely wrong with it. Also, drop the
+  --quiet that made it impossible for the sysadmin to know _why_ samba
+  failed to stop properly (and yet the stop action succeeded).
 
   15 Sep 2009; Víctor Ostorga <vostorga@gentoo.org> files/3.3/smbusers:
   Fixing syntax of smbusers file, patch thanks to Kraml Liu
diff --git a/net-fs/samba-server/files/3.3/samba.confd b/net-fs/samba-server/files/3.3/samba.confd
index 546774e0940f..6f33bc3f06c7 100644
--- a/net-fs/samba-server/files/3.3/samba.confd
+++ b/net-fs/samba-server/files/3.3/samba.confd
@@ -12,17 +12,17 @@ my_service_POST=""
 # Daemons calls: <daemon_name>_<command_option>
 #----------------------------------------------------------------------------
 smbd_start_options="-D"
-smbd_start="start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- ${smbd_start_options}"
-smbd_stop="start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid"
+smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
+smbd_stop="start-stop-daemon --stop --pidfile /var/run/smbd.pid"
 smbd_reload="killall -HUP smbd"
 
 nmbd_start_options="-D"
-nmbd_start="start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
-nmbd_stop="start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid"
+nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
+nmbd_stop="start-stop-daemon --stop --pidfile /var/run/nmbd.pid"
 nmbd_reload="killall -HUP nmbd"
 
 winbind_start_options=""
-winbind_start="start-stop-daemon --start --quiet --exec /usr/sbin/winbindd -- ${winbind_start_options}"
-winbind_stop="start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/winbindd"
+winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
+winbind_stop="start-stop-daemon --stop --oknodo --exec /usr/sbin/winbindd"
 winbind_reload="killall -HUP winbindd"
 
diff --git a/net-fs/samba-server/samba-server-3.3.7.ebuild b/net-fs/samba-server/samba-server-3.3.7-r1.ebuild
index bb53c1058a56..3521b8aff491 100644
--- a/net-fs/samba-server/samba-server-3.3.7.ebuild
+++ b/net-fs/samba-server/samba-server-3.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.3.7.ebuild,v 1.2 2009/09/07 23:25:09 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.3.7-r1.ebuild,v 1.1 2009/09/20 16:46:04 flameeyes Exp $
 
 EAPI="2"