[arch-commits] Commit in samba/trunk (9 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Sun May 19 13:49:10 UTC 2013
Date: Sunday, May 19, 2013 @ 15:49:10
Author: tpowa
Revision: 185827
upgpkg: samba 4.0.5-4
move /usr/sbin to /usr/bin
Modified:
samba/trunk/PKGBUILD
samba/trunk/nmbd.service
samba/trunk/samba.service
samba/trunk/smbd.service
samba/trunk/smbd at .service
samba/trunk/swat.xinetd
samba/trunk/swat at .service
samba/trunk/winbindd.service
Deleted:
samba/trunk/samba
------------------+
PKGBUILD | 24 +++++++++++------------
nmbd.service | 2 -
samba | 54 -----------------------------------------------------
samba.service | 2 -
smbd.service | 2 -
smbd at .service | 2 -
swat.xinetd | 2 -
swat at .service | 2 -
winbindd.service | 2 -
9 files changed, 19 insertions(+), 73 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-19 13:29:06 UTC (rev 185826)
+++ PKGBUILD 2013-05-19 13:49:10 UTC (rev 185827)
@@ -15,7 +15,7 @@
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
_realver=4.0.5
-pkgrel=3
+pkgrel=4
arch=(i686 x86_64)
url="http://www.samba.org"
license=('GPL3')
@@ -67,6 +67,7 @@
cd ${srcdir}/samba-${_realver}
./configure --enable-fhs \
--prefix=/usr \
+ --sbindir=/usr/bin \
--libdir=/usr/lib \
--localstatedir=/var \
--with-configdir=/etc/samba \
@@ -196,12 +197,12 @@
find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \
xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
- find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \
+ find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \
xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
# Make admin scripts look in the right place for the samba python module
- for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \
- sbin/samba_upgradedns bin/samba-tool
+ for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \
+ bin/samba_upgradedns bin/samba-tool
do
sed -i "/^sys\.path\.insert/ a\
sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
@@ -244,18 +245,17 @@
# copy ldap example
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
}
-
md5sums=('58ec2fec08872b72f8fd526f2da20a9e'
'5697da77590ec092cc8a883bae06093c'
- 'a4bbfa39fee95bba2e7ad6b535fae7e6'
+ 'ee8507839745cf17d2fb5401be7da6a8'
'96f82c38f3f540b53f3e5144900acf17'
- '5602ba59bc60502c99e6d5a5ae16aecf'
+ 'ee4763a656cf00d92bfda31b6bb2c5cb'
'6c447748a064d631435dbef0a3dcf32f'
- 'd0b18dd7f5fafc8d25cb3a7c37c6d920'
+ 'c0c561c47de24d33dd48aae79823810b'
'a78b9aa93eb14b0ac445897395693225'
- '90845b89f2321cb19c0b13f385f1782a'
- '70186fa43510bf99e3afd5951e814fbf'
+ 'e8ebc966b5684a557284dd435daaab7f'
+ '70afd2db60a2e8eff7615dbdecd887ac'
'6db11f3dd2112a4b7a73007b189bef3f'
- 'b0de262f9c62acd162e873658f33d063'
- '64a52bc798033aeabfae3410bd559aa4'
+ 'fd6be0cf1e5b3f0c3599fdb95455d19f'
+ '081c20b9d994d69ce5c37dcf96f10572'
'49abd7b719e3713a3f75a8a50958e381')
Modified: nmbd.service
===================================================================
--- nmbd.service 2013-05-19 13:29:06 UTC (rev 185826)
+++ nmbd.service 2013-05-19 13:49:10 UTC (rev 185827)
@@ -5,7 +5,7 @@
[Service]
Type=forking
PIDFile=/var/run/nmbd.pid
-ExecStart=/usr/sbin/nmbd -D
+ExecStart=/usr/bin/nmbd -D
ExecReload=/bin/kill -HUP $MAINPID
[Install]
Deleted: samba
===================================================================
--- samba 2013-05-19 13:29:06 UTC (rev 185826)
+++ samba 2013-05-19 13:49:10 UTC (rev 185827)
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
-
-[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
-
-case "$1" in
- start)
- rc=0
- stat_busy "Starting Samba Server"
- if [ ! -x /var/log/samba ] ; then
- install -m755 -d /var/log/samba
- fi
- for d in ${SAMBA_DAEMONS[@]}; do
- PID=`pidof -o %PPID /usr/sbin/$d`
- [ -z "$PID" ] && /usr/sbin/$d -D
- rc=$(($rc+$?))
- done
- if [ $rc -gt 0 ]; then
- stat_fail
- else
- add_daemon samba
- stat_done
- fi
- ;;
- stop)
- rc=0
- stat_busy "Stopping Samba Server"
- for d in ${SAMBA_DAEMONS[@]}; do
- PID=`pidof -o %PPID /usr/sbin/$d`
- [ -z "$PID" ] || kill $PID &> /dev/null
- rc=$(($rc+$?))
- done
- if [ $rc -gt 0 ]; then
- stat_fail
- else
- 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
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Modified: samba.service
===================================================================
--- samba.service 2013-05-19 13:29:06 UTC (rev 185826)
+++ samba.service 2013-05-19 13:49:10 UTC (rev 185827)
@@ -7,7 +7,7 @@
PIDFile=/var/run/samba.pid
LimitNOFILE=16384
EnvironmentFile=-/etc/conf.d/samba
-ExecStart=/usr/sbin/samba $SAMBAOPTIONS
+ExecStart=/usr/bin/samba $SAMBAOPTIONS
ExecReload=/usr/bin/kill -HUP $MAINPID
[Install]
Modified: smbd.service
===================================================================
--- smbd.service 2013-05-19 13:29:06 UTC (rev 185826)
+++ smbd.service 2013-05-19 13:49:10 UTC (rev 185827)
@@ -5,7 +5,7 @@
[Service]
Type=forking
PIDFile=/var/run/smbd.pid
-ExecStart=/usr/sbin/smbd -D
+ExecStart=/usr/bin/smbd -D
ExecReload=/bin/kill -HUP $MAINPID
[Install]
Modified: smbd at .service
===================================================================
--- smbd at .service 2013-05-19 13:29:06 UTC (rev 185826)
+++ smbd at .service 2013-05-19 13:49:10 UTC (rev 185827)
@@ -2,6 +2,6 @@
Description=Samba SMB/CIFS server instance
[Service]
-ExecStart=/usr/sbin/smbd -F
+ExecStart=/usr/bin/smbd -F
ExecReload=/bin/kill -HUP $MAINPID
StandardInput=socket
Modified: swat.xinetd
===================================================================
--- swat.xinetd 2013-05-19 13:29:06 UTC (rev 185826)
+++ swat.xinetd 2013-05-19 13:49:10 UTC (rev 185827)
@@ -3,7 +3,7 @@
socket_type = stream
wait = no
user = root
- server = /usr/sbin/swat
+ server = /usr/bin/swat
log_on_success += HOST DURATION
log_on_failure += HOST
disable = yes
Modified: swat at .service
===================================================================
--- swat at .service 2013-05-19 13:29:06 UTC (rev 185826)
+++ swat at .service 2013-05-19 13:49:10 UTC (rev 185827)
@@ -3,5 +3,5 @@
After=local-fs.target
[Service]
-ExecStart=/usr/sbin/swat
+ExecStart=/usr/bin/swat
StandardInput=socket
Modified: winbindd.service
===================================================================
--- winbindd.service 2013-05-19 13:29:06 UTC (rev 185826)
+++ winbindd.service 2013-05-19 13:49:10 UTC (rev 185827)
@@ -5,7 +5,7 @@
[Service]
Type=forking
PIDFile=/var/run/winbindd.pid
-ExecStart=/usr/sbin/winbindd -D
+ExecStart=/usr/bin/winbindd -D
ExecReload=/bin/kill -HUP $MAINPID
[Install]
More information about the arch-commits
mailing list