diff options
| author | root <root@rshg054.dnsready.net> | 2012-06-10 00:04:00 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-06-10 00:04:00 +0000 |
| commit | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (patch) | |
| tree | e92096f88e034d79e6f814971f98eb098c0abd80 /extra/samba | |
| parent | 0c7e29df5c6742895884a0bbcf86381f8e601782 (diff) | |
Sun Jun 10 00:04:00 UTC 2012
Diffstat (limited to 'extra/samba')
| -rw-r--r-- | extra/samba/PKGBUILD | 15 | ||||
| -rwxr-xr-x | extra/samba/samba | 9 | ||||
| -rw-r--r-- | extra/samba/samba.conf | 1 | ||||
| -rw-r--r-- | extra/samba/samba.install | 7 |
4 files changed, 20 insertions, 12 deletions
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 11db4fc3e..e3f7f1997 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158568 2012-05-04 23:57:16Z allan $ +# $Id: PKGBUILD 161297 2012-06-09 01:08:52Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,7 +8,7 @@ pkgver=3.6.5 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.5 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') @@ -21,7 +21,7 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz smbd.service nmbd.service winbindd.service - smbd.conf) + samba.conf) ### UNINSTALL dmapi package before building!!! build() { @@ -92,6 +92,7 @@ backup=(etc/logrotate.d/samba etc/xinetd.d/swat etc/conf.d/samba) depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') +install='samba.install' cd ${srcdir}/samba-${_realver}/source3 mkdir -p ${pkgdir}/etc/samba/private chmod 700 ${pkgdir}/etc/samba/private @@ -152,10 +153,12 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr for i in smbd nmbd winbindd; do install -D -m644 ${srcdir}/$i.service ${pkgdir}/usr/lib/systemd/system/$i.service done - install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf + # create ephemeral dirs via tmpfiles rather than shipping them in package + install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf + rm -rf ${pkgdir}/var/run } md5sums=('2f0c14547333c1b48fd4728b031e7040' - 'dfc6f9018c556b9783c7140de183727f' + 'a45a4283723be2b0ae32439dc4496a09' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' @@ -163,4 +166,4 @@ md5sums=('2f0c14547333c1b48fd4728b031e7040' '389cc4fa3b459360feaa1b3d93274693' 'ea6a1251be979cb30c6098a28b270d2d' '455f106ce7a4f983975b3a686eaa85e5' - '6956c4f9989bec8f313de7d9343b6ba1') + '8e7ed39b54968e427f9506e9107bfb45') diff --git a/extra/samba/samba b/extra/samba/samba index 2a04bfec4..6098ee0cb 100755 --- a/extra/samba/samba +++ b/extra/samba/samba @@ -10,9 +10,6 @@ case "$1" in start) rc=0 stat_busy "Starting Samba Server" - if [ ! -x /var/run/samba ] ; then - install -m755 -d /var/run/samba - fi if [ ! -x /var/log/samba ] ; then install -m755 -d /var/log/samba fi @@ -39,9 +36,9 @@ case "$1" in if [ $rc -gt 0 ]; then stat_fail else - rm /var/run/samba/smbd.pid &>/dev/null - rm /var/run/samba/nmbd.pid &>/dev/null - rm /var/run/samba/winbindd.pid &>/dev/null + rm /run/samba/smbd.pid &>/dev/null + rm /run/samba/nmbd.pid &>/dev/null + rm /run/samba/winbindd.pid &>/dev/null rm_daemon samba stat_done fi diff --git a/extra/samba/samba.conf b/extra/samba/samba.conf new file mode 100644 index 000000000..c12610dd8 --- /dev/null +++ b/extra/samba/samba.conf @@ -0,0 +1 @@ +D /run/samba 0755 - - - diff --git a/extra/samba/samba.install b/extra/samba/samba.install new file mode 100644 index 000000000..09439743a --- /dev/null +++ b/extra/samba/samba.install @@ -0,0 +1,7 @@ +#!/bin/sh + +post_install() { + systemd-tmpfiles --create /usr/lib/tmpfiles.d/smbd.conf +} + +# vim:set ts=2 sw=2 et: |