init script creates /var/run/samba if needed , bug #346087

Package-Manager: portage-2.1.9.24/cvs/Linux i686

4 files changed, 24 insertions, 8 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8dced1684722..6af78801a52c 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.453 2010/11/05 15:28:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.454 2010/12/20 20:35:07 vostorga Exp $
+
+  20 Dec 2010; Víctor Ostorga <vostorga@gentoo.org> files/3.4/samba.initd,
+  files/3.5/samba.initd:
+  init script creates /var/run/samba if needed , bug #346087
 
   05 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> -samba-3.4.8.ebuild,
   -samba-3.5.5.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 175239954697..80aea3852109 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -2,7 +2,7 @@ AUX 3.4/lmhosts 126 RMD160 c4ff63cf01158809311c97c768463826aa02127b SHA1 2d5be4b
 AUX 3.4/nsswitch.conf-winbind 406 RMD160 7bbc3f7a4bdc4907bc45ad71fc0e17cc376d4e1e SHA1 0cd4966690d98802de94f0353ecf760c1a6d5245 SHA256 342657852ec465f78b1450a522211c2102ee07a65f8cb167a19ca5e277220867
 AUX 3.4/nsswitch.conf-wins 392 RMD160 bf1c0b6c3128be82a3f901eb3ef70d6d621df334 SHA1 2742757c188bfeae94d272eed66405e1a5417540 SHA256 508f76bc1abe15b49ef97b6033ae873f6d630bbcb99cd69b9babe55dc2554ea0
 AUX 3.4/samba.confd 1219 RMD160 88949f00ea94f14af751e53cf870b6481dc3770d SHA1 a92a63dbbf9f7079e9d7cf0e2e3d608594fe5d42 SHA256 a83004571c4bc37eeaeec8efa0fef4a20d9fc12ec30f2eb9dcc6098251205314
-AUX 3.4/samba.initd 1136 RMD160 a7e0c6f33108bdb992d1fca26d2cb5a5ee3c1073 SHA1 8738ef80ee0d0cfba10e2dd0d9a35bfce5c242d0 SHA256 c694ff997c9594a4766c3ccbd32103ccb8f3df68942f2cde9c85b6218e513acf
+AUX 3.4/samba.initd 1228 RMD160 9d6b0c510277f0430562175752b128e6b078b0c1 SHA1 2a7cd4852d73ce378e3f051c11fd1ae509c70b96 SHA256 a827bdeeff845f495bcf573bf51937c7988eb651fef69aeaa1752a808c08a97d
 AUX 3.4/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
 AUX 3.4/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
 AUX 3.4/smbusers 218 RMD160 6a8acc59ff824419c9f10db432ae8ed9d0ec5651 SHA1 5bad77d5e82f914b716722b4d5fa5126236b73ef SHA256 97562315c02ed571aca99ba857a1fab7550fa8dbbf3eebcb41157b2d5deb57b3
@@ -12,7 +12,7 @@ AUX 3.5/lmhosts 126 RMD160 485c480c5d3203e5f6c3d769ea36d04682a4ce39 SHA1 149e536
 AUX 3.5/nsswitch.conf-winbind 406 RMD160 43175297fb2ca9e364a7e07e6b1f7cec367f36f5 SHA1 16c57e5ba8d07ecc50d0e1a93df5bc82c4063764 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893
 AUX 3.5/nsswitch.conf-wins 392 RMD160 58b135036c4a7ecab97bf532b35da3d50693c4bf SHA1 7945e42a4d72e4604678add14ecdbb9bde8e9894 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8
 AUX 3.5/samba.confd 1219 RMD160 88949f00ea94f14af751e53cf870b6481dc3770d SHA1 a92a63dbbf9f7079e9d7cf0e2e3d608594fe5d42 SHA256 a83004571c4bc37eeaeec8efa0fef4a20d9fc12ec30f2eb9dcc6098251205314
-AUX 3.5/samba.initd 1136 RMD160 49d7be720d68d9477fcfbfb61372471dbdba580e SHA1 19a4ac095e6c9c0cfb5dfabbf75a7a3e92e06b47 SHA256 24e5fb58f8fb360ce0ef75bd639b1e1f5f43c0c5e4e17049ebccc011dfca9ab9
+AUX 3.5/samba.initd 1228 RMD160 a4c5502dc1234d18eb7810899e171987ad33262b SHA1 b1d6d1ff47e3d2c0f96dfb2743915404ae6d59c1 SHA256 691b7389b87a5b413487443e3569e95b99208bd8d9f7dfaf9d54b42a5fc2d41a
 AUX 3.5/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
 AUX 3.5/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
 AUX 3.5/smbusers 218 RMD160 a94e0928466c0ed7cfd3edd3ac88dd1c8725a987 SHA1 84518d8768048e497724c72f89c00e6223c6cdb6 SHA256 ed24f121813aff4b8e79c99317f4f9dfde9246d150d7718f0fa60babb8b9dca1
@@ -26,5 +26,5 @@ DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa9
 EBUILD samba-3.4.9.ebuild 11253 RMD160 8f5533661f954415eb4ff42ab01db3edf683ad28 SHA1 8395f1649e410eae5604be5feba944b01c750fd9 SHA256 4cf8299e93e3c20a60f810e69ed8ae67a330af093a0d5d6b499bc25733efecd2
 EBUILD samba-3.5.6.ebuild 12354 RMD160 edd543630461c4c57e5677deb96da9a2fbb8044f SHA1 245debb9583f791ca7aff95c3cca234072fec25d SHA256 b992abbc2ffcc9b4f450d209dfdd8aa3ae845eee1eac5bdfcd0543350e245fef
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660
-MISC ChangeLog 75713 RMD160 1904cb629772222973b8f9b156b68ca9195775d1 SHA1 b4e727b8025b7b6f3252efa907d7aba5b8fe1d6a SHA256 34b7093aca3344c84655518285acb219c7e5ba3c95330808e36b72ef7531b514
+MISC ChangeLog 75875 RMD160 04fb66a9da473fe1cdf3384a9d80edcf24bc9f59 SHA1 0128096afb3e731711a8f46bb5bbd243091b2281 SHA256 ef0a0ae1122b5d4f9d171ee4d2805824b463d85d69866a6892944865494aedd8
 MISC metadata.xml 1365 RMD160 2f64795a1d7d7c42fef60ebf208dd7b857786e47 SHA1 5c76d183a1f4f77832415fce1eb02e7ee4ecea2f SHA256 adffcfd42c6c2895909ba3eb6dda9a398d9d499fbced64c6c65d51ac71a0374b
diff --git a/net-fs/samba/files/3.4/samba.initd b/net-fs/samba/files/3.4/samba.initd
index 9987f1ed6f53..2815e4ecfbe6 100644
--- a/net-fs/samba/files/3.4/samba.initd
+++ b/net-fs/samba/files/3.4/samba.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.4/samba.initd,v 1.1 2010/02/26 20:11:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.4/samba.initd,v 1.2 2010/12/20 20:35:07 vostorga Exp $
 
 opts="reload"
 
@@ -32,8 +32,14 @@ signal_do() {
 	done
 	return ${result}
 }
+
+mkdir_sambadirs() {
+	[ -d /var/run/samba ] || mkdir -p /var/run/samba
+}
+
 start() {
 	${my_service_PRE}
+	mkdir_sambadirs
 	signal_do start && return 0
 	
 	eerror "Error: starting services (see system logs)"
diff --git a/net-fs/samba/files/3.5/samba.initd b/net-fs/samba/files/3.5/samba.initd
index 584b509aa0bc..a1a2fae1a973 100644
--- a/net-fs/samba/files/3.5/samba.initd
+++ b/net-fs/samba/files/3.5/samba.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/samba.initd,v 1.1 2010/03/01 16:19:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/samba.initd,v 1.2 2010/12/20 20:35:07 vostorga Exp $
 
 opts="reload"
 
@@ -32,8 +32,14 @@ signal_do() {
 	done
 	return ${result}
 }
+
+mkdir_sambadirs() {
+	[ -d /var/run/samba ] || mkdir -p /var/run/samba
+}
+
 start() {
 	${my_service_PRE}
+	mkdir_sambadirs
 	signal_do start && return 0
 	
 	eerror "Error: starting services (see system logs)"