diff options
Diffstat (limited to 'net-fs/samba')
| -rw-r--r-- | net-fs/samba/Manifest | 4 | ||||
| -rw-r--r-- | net-fs/samba/files/4.4/samba4.confd | 23 | ||||
| -rw-r--r-- | net-fs/samba/files/4.4/samba4.initd-r1 | 4 |
3 files changed, 19 insertions, 12 deletions
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 398614aff602..701f880a2370 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,7 +1,7 @@ AUX 4.2/samba4.confd 1783 BLAKE2B 773d5da817e3c4a93ce31a3bd81715632f879711a3ecfa6821f91523c65eb49c90498f86e7c2108df8b5c89d811105d2e685efadb1317a10af07e501339fb8c8 SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d AUX 4.2/samba4.initd-r1 1103 BLAKE2B cf8a53aff9ec49a745168593e737c35d61ccc138ed304d27977a420f71440b4a7a0e241110180278684d26c5f848810c9b1bfc32af54a22f039119513765bccc SHA512 8627b32446afed2cf1238eafc0f154ddb6c16857ee96f959e47f8d485b7317354afe59a08fcb3adbd17da087069cf2b94020a44b9190d597b40afd0b8aedf9a5 -AUX 4.4/samba4.confd 1783 BLAKE2B 773d5da817e3c4a93ce31a3bd81715632f879711a3ecfa6821f91523c65eb49c90498f86e7c2108df8b5c89d811105d2e685efadb1317a10af07e501339fb8c8 SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d -AUX 4.4/samba4.initd-r1 1103 BLAKE2B cf8a53aff9ec49a745168593e737c35d61ccc138ed304d27977a420f71440b4a7a0e241110180278684d26c5f848810c9b1bfc32af54a22f039119513765bccc SHA512 8627b32446afed2cf1238eafc0f154ddb6c16857ee96f959e47f8d485b7317354afe59a08fcb3adbd17da087069cf2b94020a44b9190d597b40afd0b8aedf9a5 +AUX 4.4/samba4.confd 2036 BLAKE2B afc872734ee4b5d4332e1550e29dca6fdfe5e70a77018621df731aed5c69471294c5c9766050b1109bf978c785690930d8e6aa0429d60ae4d0b37487b4c2c8bf SHA512 122fa1eb8bcf43b0cab64be604c4cae82553f4fbff58ba831afdd2dd5e032618a875154bd50578aeba880a28c45027aa1fba66a76d1c3c28d5850fc098d9812c +AUX 4.4/samba4.initd-r1 1125 BLAKE2B 204a639069495cfd711bd1c9dcd78a480e07bca7b760efdec49061f093d7e41dc6ce16b9264cc4762094bb7a796dc96d71003668416d40948036bd6fcc944a2e SHA512 982771fd7e1d260d8d4305eb18a3c15871f535b700d2b9554af24df62286e59ce6c5c76ef4ffee7a751fc01040eefaaabad71b2f67e3749ba1ee97a368b14d5a AUX nmbd.service 224 BLAKE2B 499598b7e80f3dddbcc0b2d3ba217774cfcd7d87cc5287bdc75b8b616e039e235f2202e4c5275421ec018911e92680da923d9403f7bfc65e1995216f4c157fef SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d AUX samba-4.2.3-heimdal_compilefix.patch 819 BLAKE2B f19e9e1af0d5616fc04473ddcdd898f2a942afb284e72a3a50454ffa63c201a3ad1b061d966107c749450cefe260e40090327f0144e1086e9bba4607c3811500 SHA512 0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536 AUX samba-4.2.7-pam.patch 1273 BLAKE2B 41a17b701a592500f3b85be29fd134048ebd9403c510c339d1094f915c5eeae729972c7231169fa890dfde802797276a9c419eb17ed7a23e5ad1aaa46cdfd8ec SHA512 5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc diff --git a/net-fs/samba/files/4.4/samba4.confd b/net-fs/samba/files/4.4/samba4.confd index 58b2c7827bdf..2604981f2141 100644 --- a/net-fs/samba/files/4.4/samba4.confd +++ b/net-fs/samba/files/4.4/samba4.confd @@ -6,6 +6,8 @@ # accordingly. daemon_list="smbd nmbd" +piddir="/run/samba" + #---------------------------------------------------------------------------- # Daemons calls: <daemon_name>_<command_option> #---------------------------------------------------------------------------- @@ -17,22 +19,27 @@ my_service_POST="" # Daemons calls: <daemon_name>_<command_option> #---------------------------------------------------------------------------- smbd_start_options="-D" -smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}" -smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd" +smbd_command="/usr/sbin/smbd" +smbd_start="start-stop-daemon --start --exec ${smbd_command} -- ${smbd_start_options}" +smbd_stop="start-stop-daemon --stop --exec ${smbd_command}" smbd_reload="killall -HUP smbd" nmbd_start_options="-D" -nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}" -nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd" +nmbd_command="/usr/sbin/nmbd" +nmbd_start="start-stop-daemon --start --exec ${nmbd_command} -- ${nmbd_start_options}" +nmbd_stop="start-stop-daemon --stop --exec ${nmbd_command}" nmbd_reload="killall -HUP nmbd" samba4_start_options="" -samba4_start="start-stop-daemon --start --exec /usr/sbin/samba -- ${samba4_start_options}" -samba4_stop="start-stop-daemon --stop --exec /usr/sbin/samba" +samba4_command="/usr/sbin/samba" +samba4_pidfile="${piddir}/samba4.pid" +samba4_start="start-stop-daemon --start --exec ${samba4_command} --pidfile ${samba4_pidfile} -- ${samba4_start_options}" +samba4_stop="start-stop-daemon --stop --exec ${samba4_command} --pidfile ${samba4_pidfile}" samba4_reload="killall -HUP samba" winbind_start_options="" -winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}" -winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd" +winbind_command="/usr/sbin/winbindd" +winbind_start="start-stop-daemon --start --exec ${winbind_command} -- ${winbind_start_options}" +winbind_stop="start-stop-daemon --stop --exec ${winbind_command}" winbind_reload="killall -HUP winbindd" diff --git a/net-fs/samba/files/4.4/samba4.initd-r1 b/net-fs/samba/files/4.4/samba4.initd-r1 index 52a9b68bba80..05bd1fcfd695 100644 --- a/net-fs/samba/files/4.4/samba4.initd-r1 +++ b/net-fs/samba/files/4.4/samba4.initd-r1 @@ -1,9 +1,9 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later extra_started_commands="reload" -piddir="/run/samba" +[ -z "${piddir}" ] && piddir="/run/samba" depend() { after slapd |