diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-31 10:59:13 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-31 10:59:13 +0100 |
| commit | 3891a8a21b1ef695b99685a1720bc750b41361c3 (patch) | |
| tree | 5b532eed541dca9573aecfd64ae407aa8ba97730 /extra/samba | |
| parent | e175fdd8593579f4a606206ad703f8433f7316c5 (diff) | |
| parent | a949895a0243a490d30fe355655c839fe217c580 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libpar2/PKGBUILD
extra/audacity/PKGBUILD
extra/samba/PKGBUILD
extra/xorg-xev/PKGBUILD
Diffstat (limited to 'extra/samba')
| -rw-r--r-- | extra/samba/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/samba/nmbd.service | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 695a847bd..65bb54463 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176254 2013-01-28 08:10:20Z tpowa $ +# $Id: PKGBUILD 176328 2013-01-30 11:29:10Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,7 +8,7 @@ pkgver=3.6.11 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.11 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -170,7 +170,7 @@ md5sums=('9039e0ab3e4fc632ff0a1a8f2433edb4' '4d86a4e3b2ac4b35e12ac667d1d261a7' 'a78b9aa93eb14b0ac445897395693225' '4f2a5266f88d016a78014bb02e118c7f' - '6c8e6f346592702d09a279ce5abad42e' + '46bac3375dcf25baea4699226410987a' '6db11f3dd2112a4b7a73007b189bef3f' 'b0de262f9c62acd162e873658f33d063' '5637e10184db5a7a942855598fc3e075' diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 06c245b4d..44b4ffba1 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/var/run/samba/nmbd.pid -ExecStart=/usr/sbin/nmbd +ExecStart=/usr/sbin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] |