[arch-commits] Commit in samba/trunk (9 files)
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@.service
samba/trunk/swat.xinetd
samba/trunk/swat@.service
samba/trunk/winbindd.service
Deleted:
samba/trunk/samba
--+
PKGBUILD | 24 +++
nmbd.service |2 -
samba| 54 -
samba.service|2 -
smbd.service |2 -
smbd@.service|2 -
swat.xinetd |2 -
swat@.service|2 -
winbindd.service |2 -
9 files changed, 19 insertions(+), 73 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-19 13:29:06 UTC (rev 185826)
+++ PKGBUILD2013-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.service2013-05-19 13:29:06 UTC (rev 185826)
+++ nmbd.service2013-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
-
[arch-commits] Commit in samba/trunk (9 files)
Date: Sunday, January 27, 2013 @ 12:14:25
Author: tpowa
Revision: 176081
upgpkg: samba 3.6.11-1
fix #33268 #33257 #32462 #31957, bump to latest 3.6 series
Added:
samba/trunk/smbd.socket
samba/trunk/smbd@.service
samba/trunk/swat.socket
samba/trunk/swat@.service
Modified:
samba/trunk/PKGBUILD
samba/trunk/nmbd.service
samba/trunk/samba.conf
samba/trunk/smbd.service
samba/trunk/winbindd.service
--+
PKGBUILD | 35 ---
nmbd.service |3 +++
samba.conf |1 +
smbd.service |6 --
smbd.socket |9 +
smbd@.service|9 +
swat.socket |9 +
swat@.service|7 +++
winbindd.service |4 +++-
9 files changed, 65 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-01-27 10:59:18 UTC (rev 176080)
+++ PKGBUILD2013-01-27 11:14:25 UTC (rev 176081)
@@ -3,23 +3,26 @@
# Contributor: judd jvi...@zeroflux.org
pkgbase=samba
pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.10
+pkgver=3.6.11
# We use the 'A' to fake out pacman's version comparators. Samba chooses
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
-_realver=3.6.10
+_realver=3.6.11
pkgrel=1
arch=(i686 x86_64)
url=http://www.samba.org;
license=('GPL3')
makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
'gamin' 'gnutls=2.4.1' 'talloc' 'tdb')
source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-samba samba.logrotate
+samba.logrotate
swat.xinetd
samba.pam
-samba.conf.d
smbd.service
+smbd.socket
+smbd@.service
nmbd.service
+swat.socket
+swat@.service
winbindd.service
samba.conf)
### UNINSTALL dmapi package before building!!!
@@ -101,8 +104,6 @@
rm -rf ${pkgdir}/usr/var
rm -rf ${pkgdir}/var/run/samba
(cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' installbin.sh)
- install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
- install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
mkdir -p ${pkgdir}/etc/samba
cat ../examples/smb.conf.default | \
sed 's|log file = .*$|log file = /var/log/samba/log.%m|g'
${pkgdir}/etc/samba/smb.conf.default
@@ -150,20 +151,24 @@
# copy ldap example
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema
${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
# install systemd files
- for i in smbd nmbd winbindd; do
- install -D -m644 ${srcdir}/$i.service
${pkgdir}/usr/lib/systemd/system/$i.service
+ install -d -m755 ${pkgdir}/usr/lib/systemd/system
+ for i in smbd nmbd swat winbindd; do
+install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/
+install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/
done
# 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=('b5f0560c216122529b1c3b7f41c62567'
- 'a45a4283723be2b0ae32439dc4496a09'
+md5sums=('9039e0ab3e4fc632ff0a1a8f2433edb4'
'5697da77590ec092cc8a883bae06093c'
'a4bbfa39fee95bba2e7ad6b535fae7e6'
'96f82c38f3f540b53f3e5144900acf17'
- 'f2f2e348acd1ccb566e95fa8a561b828'
- '4b9c54d6fed4d0a225a84963516fc46f'
- '67ce9229c4e343a91d70edba6de29437'
- '617079917cdc84b450d109557b1fe2e1'
- '8e7ed39b54968e427f9506e9107bfb45')
+ '5b7496b1b6706cf5a6e91ef879d9be7b'
+ 'a78b9aa93eb14b0ac445897395693225'
+ '321afbca6665d8f647c2468906452176'
+ '9a49f3ee5afd278d21fcdd34776c5da1'
+ '6db11f3dd2112a4b7a73007b189bef3f'
+ 'b0de262f9c62acd162e873658f33d063'
+ 'de93ae37dd76a2cd2cdab6d342e5baf3'
+ '49abd7b719e3713a3f75a8a50958e381')
Modified: nmbd.service
===
--- nmbd.service2013-01-27 10:59:18 UTC (rev 176080)
+++ nmbd.service2013-01-27 11:14:25 UTC (rev 176081)
@@ -3,7 +3,10 @@
After=network.target
[Service]
+Type=forking
+PIDFile=/var/run/samba/nmbd.pid
ExecStart=/usr/sbin/nmbd -F
+ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
Modified: samba.conf
===
--- samba.conf 2013-01-27 10:59:18 UTC (rev 176080)
+++ samba.conf 2013-01-27 11:14:25 UTC (rev 176081)
@@ -1 +1,2 @@
D /run/samba 0755 - - -
+d /var/log/samba 0755 - - -
\ No newline at end of file
Modified: smbd.service
===
--- smbd.service2013-01-27 10:59:18 UTC (rev 176080)
+++ smbd.service2013-01-27 11:14:25 UTC (rev 176081)
@@ -1,9
