Fixing init script for #301263

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

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index ae69196cf5aa20aa1442006525a66089a05a7205..6663d8eb47a6253deae9bd9aba386db50f7b7bec 100644 (file)
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
 # 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.412 2010/05/11 11:27:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.413 2010/05/11 11:53:24 patrick Exp $
+
+  11 May 2010; Patrick Lauer <patrick@gentoo.org> files/samba-init:
+  Fixing init script for #301263
 
   11 May 2010; Patrick Lauer <patrick@gentoo.org> samba-3.4.6.ebuild,
   samba-3.4.8.ebuild, samba-3.5.2-r1.ebuild:

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 6b8c96970a6bd68bc2775052ca420f33f0a0b939..2afa7b2d553f54d16f9e44d2d60ea669fcf646bf 100644 (file)
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -49,7 +49,7 @@ AUX config/swat.xinetd 531 RMD160 76c6d999a77c356d1013ab2586762e034550aac3 SHA1
 AUX config/system-auth-winbind 705 RMD160 fc6cc98cd1749d4e44f7edfbfd904fe77aaf046f SHA1 1b55c7b4211133b8fe27d07dd0a4a14539fbf859 SHA256 73791c615c207f2ff5589866eda7def275ed0b1085ac3f465ba9442258858e14
 AUX samba-3.4.2-lib.tevent.python.mk 177 RMD160 3ed0264790f5ce15106528cd485c83611f6ebeb5 SHA1 ab048fb7ba236621d82cc305ce85d129d38d32a8 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153
 AUX samba-conf 1291 RMD160 326fb4beee8105d839d23e37f4989d7e332c996b SHA1 af7cd695f212d7ec022df05ba2f821a8f9878ab2 SHA256 dfaf474c3cbfa3d3b26d1531c6f5913739d5815c4b8083063934ee4fd6b38861
-AUX samba-init 1133 RMD160 77a084e8f78665af0233f19dc9c4a49693360da1 SHA1 09d7f1d676856289b61e890396a9976e2ccc794a SHA256 3b41d16daf02f9a1ab12e62c4c915f58e7801c07be48e2a94086eb288bb86aad
+AUX samba-init 1254 RMD160 598e286b65d1c0bada985ce645c685cbe04292e3 SHA1 6c86b2f8ce3d508d4fd5035d70f3f5d6b4b113d2 SHA256 a7c54c38df2025eb4a7957bc8f86d8e8ce9a0b31598b8732606d6fd423193524
 AUX samba-xinetd 286 RMD160 c90bd8518082eb4c182d5f7bd223a76f8e3c7fab SHA1 b250c5ca539187d8b481bcfb6ea3a915d7e8b26b SHA256 964d06dc33beff38978a8f03cd12b05c33d8258ed73aa9ffbf137fe226de25b8
 AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0bcdb1783f1fb2ed256442f051b98ad70d64 SHA256 df553df5cfb8d8305566accd62bff23dac4772ad4a2eb7d3b1328a5651113cad
 DIST samba-3.0.37.tar.gz 23416703 RMD160 06b76ae22729e10c83d6af42d03b03ad69e49103 SHA1 5ec6bc6558b3c799f747eb49fbba019d5edf0cbd SHA256 bb67c0e13d4ccbd84b9200c8739393fdd9b3145b5aad216934dc670f0fcea266
@@ -67,5 +67,5 @@ EBUILD samba-3.4.8.ebuild 10289 RMD160 533c2c7f769247cc6bdf9870e5d9f8a928624c7b
 EBUILD samba-3.5.0.ebuild 10377 RMD160 8bb7f9bcfcd13002cd72733c0e52fa0480ebeb3a SHA1 1c0dc8330d747943135bb7d37e8eee3b3ec295fa SHA256 52a728a009223e74bcc6ab7e31dce0b8cbe1bf68463ceddfe49298d5fbd5b5a3
 EBUILD samba-3.5.2-r1.ebuild 10393 RMD160 35eb4360ca10b078b9de5731933c7797273f9ad9 SHA1 32804be149c29eae19e47118d60a7b64f1f781f5 SHA256 70260d9be2fa21e9506196cdfbc9ac97e261400b96ffafe0234bcb7e4fe0a755
 EBUILD samba-4.0.0_alpha11.ebuild 4156 RMD160 d63bbf124c3fde8d264da490122a0826dda1aa13 SHA1 4bd67529b6094b91349e138614ba36075e5912c5 SHA256 619c7c38aa499083e3ee7ba06f681851b76a4456c1b8e8f3d4f3c998eaccda58
-MISC ChangeLog 68776 RMD160 7228c9fd2a26ff6cdf7a992353ea7b6eb4d09b71 SHA1 59d0d509ebd91c88323fbc02d58e6d14e091f5bb SHA256 d3e9ed214cf558d036e4be06292544594e88260137d9c38cff85c1c9b263e255
+MISC ChangeLog 68878 RMD160 76acd661ee5f9e1db0485517220119387f5dacaa SHA1 eec691bab8ba7ee21a1fe889a6283cb01e8d77d3 SHA256 aceb59fd8c2332cbbf886ae5ad61583b4ceeda76e01253fdbec9c7370efbf449
 MISC metadata.xml 1678 RMD160 fc5f6a9674053523edb993fda99f75789e995231 SHA1 7a3f710083ab340eb139281a0d9d94af1aaa4927 SHA256 afeddf0c54227bcdd40ccc67c65b5ee8809cbba447d0500773270d89de7d044e

diff --git a/net-fs/samba/files/samba-init b/net-fs/samba/files/samba-init
index bdefea63ecc6646cc0e3cbcd08044127be179966..9347b8159087c6e84969415af65a6f9e66779508 100644 (file)
--- a/net-fs/samba/files/samba-init
+++ b/net-fs/samba/files/samba-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.17 2007/09/11 22:55:08 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.18 2010/05/11 11:53:24 patrick Exp $
 
 opts="reload"
 
@@ -33,6 +33,8 @@ signal_do() {
        return ${result}
 }
 start() {
+       # we can't assume that /var/run/ is persistent, so create dir if needed
+       [ ! -e /var/run/samba ] && mkdir /var/run/samba
        ${my_service_PRE}
        signal_do start && return 0