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).

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 32 insertions, 11 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/Manifest b/net-fs/samba-server/Manifest
index 04e69d684c14..5fe65f63731b 100644
--- a/net-fs/samba-server/Manifest
+++ b/net-fs/samba-server/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.3/lmhosts 133 RMD160 5fe8da95213b99a41e60cee6256bcae472168135 SHA1 239819ab0b8b90cb75794394808766d20a9b3f8b SHA256 2d5cdf87577da802caa0a1799fcfa2c0582cfc99e21436c063c73d48184ae333
-AUX 3.3/samba.confd 1279 RMD160 923f174d8bd29b16671a01453e697408f0b55dec SHA1 822942d05a2442be3e9d54c7f583d67e69102ddd SHA256 e37eee4ddf736ead93e6307b58b18dfac1e52b062baf556181cedeed708efb9a
+AUX 3.3/samba.confd 1231 RMD160 24fea6554df046f66ad09352346895a09304f018 SHA1 2e0395934aa9dd06cfc3f15d227efd7d24b2f78c SHA256 dd426750b77787e7c34b16dcd0ba4621d7e4a6f5918e9f6188afdb2866e82aa6
 AUX 3.3/samba.initd 1143 RMD160 14d18d740f21b0fedcb4ed188be8d3adb63c7d96 SHA1 ad476b2338622e8a4681870b955d2288eb2eadac SHA256 ccc546df8a93ccc78eb40f107990897077c79696cee9f8a1e776ed9cfec26bf8
 AUX 3.3/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
 AUX 3.3/smbusers 226 RMD160 67f58a146d2dc88974d94fd483171b2bceaf5569 SHA1 176f22416b004b42076ba97b4748b8e49808f8f7 SHA256 140bdd07d40fe346133030973e61075e735b784334d360ce00d310b9b8088212
 AUX 3.3/swat.xinetd 534 RMD160 aa895bfd09bdc8f25bb0f659320c760873d2d176 SHA1 b7620ef3146580d16f467481b423f5937330c2de SHA256 cc04c5305af8760d4179614c41a880e0dd442cc890517e208d22c8aea5741140
 DIST samba-3.3.7.tar.gz 26096144 RMD160 ec82cc23a2799b06c1bd2cd59aca9e78fb814fc4 SHA1 b69c3591ba6d2145fc0a03d7edc4dda62c28f6b0 SHA256 5a0d311143e369ef976ce02a536035da2db7bad008cd11e5e3323e85fa282635
-EBUILD samba-server-3.3.7.ebuild 6333 RMD160 2e8d0ac37c89640e3bca259d57d236bbc0c16a18 SHA1 541bed773cb04d47951b0d1fb81b02203b0a6b3e SHA256 25a1fe4b60f51e1d9b9c4c024135cf8fea546d3424daa16582792031309e3bbb
-MISC ChangeLog 1186 RMD160 3a846d2e7e95bbcfa2a728390a50860998d88daf SHA1 cd929aaf6a290c4d320a11d48512b94500474f48 SHA256 44f4685b03fdb9e4124bea0587406dbcdcc76fc5485e523684300006fac5515b
+EBUILD samba-server-3.3.7-r1.ebuild 6337 RMD160 b1562d269279111c9d7053e8cc1ce47f2297000a SHA1 cb4e37a14894ab5b07c946e61c73d24e39330222 SHA256 43ba94b78f9be7467d009b572bad6afd36c9899c1fc4491a6280076f2b0c396b
+MISC ChangeLog 1726 RMD160 f54ddda40060544f662babf7a3c7b7a8173a01a4 SHA1 b668964adfec31b005e665bd7f01f8fda5f31a1c SHA256 28d493717b14baa012754d945086c5c5e7c87b2eaae80eb7664549bef43e930d
 MISC metadata.xml 875 RMD160 2504c0f4d9bea13145c10753f4783a5153c4d138 SHA1 214b31d1d4128260a6d68e80d5d9bc0a3f9227be SHA256 79bde46c107701e935f0f4cbae836521b4402dd52edf8b9d7c9965049134e0a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq2XFMACgkQAiZjviIA2XitngCfaxOgCQLit5ouNVqTYx0Fo77q
+DKkAoMmpGJmT7MHnuFYkU3kfB2SG3lvi
+=DwbQ
+-----END PGP SIGNATURE-----
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"