diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-30 12:20:50 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-30 12:20:50 -0300 |
| commit | f945a6a14843dcca046e22f28d0cb0ca75fe27de (patch) | |
| tree | 128fd26fe2a604e6f5d3d6105da06610332d524a /extra/samba | |
| parent | 14995c4581e56e6540a9c89074623e73b9f1fc49 (diff) | |
| parent | dba5b0127d9f00a13c489f0f5893481cbe7d429b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avifile/PKGBUILD
community/drbd/PKGBUILD
extra/feh/PKGBUILD
extra/samba/PKGBUILD
libre/syslinux/PKGBUILD
social/batctl/PKGBUILD
Diffstat (limited to 'extra/samba')
| -rw-r--r-- | extra/samba/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/samba/nmbd.service | 1 | ||||
| -rw-r--r-- | extra/samba/smbd.service | 1 | ||||
| -rw-r--r-- | extra/samba/winbindd.service | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 2da1b26db..8c6b7c37b 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164956 2012-08-07 10:42:12Z tpowa $ +# $Id: PKGBUILD 165667 2012-08-28 12:51:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,7 +8,7 @@ pkgver=3.6.7 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.7 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -163,7 +163,7 @@ md5sums=('b23be56c15dd52f64eb7ba54c0ea1ed5' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' 'f2f2e348acd1ccb566e95fa8a561b828' - '389cc4fa3b459360feaa1b3d93274693' - 'ea6a1251be979cb30c6098a28b270d2d' - '455f106ce7a4f983975b3a686eaa85e5' + '4b9c54d6fed4d0a225a84963516fc46f' + '67ce9229c4e343a91d70edba6de29437' + '617079917cdc84b450d109557b1fe2e1' '8e7ed39b54968e427f9506e9107bfb45') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 6e22ef2fb..55c22f563 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -1,5 +1,6 @@ [Unit] Description=Samba NetBIOS name server +After=network.target [Service] ExecStart=/usr/sbin/nmbd -F diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index beb9bfad7..68d1947da 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -1,5 +1,6 @@ [Unit] Description=Samba SMB/CIFS server +After=network.target [Service] ExecStart=/usr/sbin/smbd -F diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 509c89628..dc9fe199b 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -1,5 +1,6 @@ [Unit] Description=Samba Winbind daemon +After=network.target [Service] ExecStart=/usr/sbin/winbindd -F |