Wed May 22 00:46:35 PDT 2013

9 files changed, 19 insertions, 73 deletions

diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 29534340d..733c62366 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -15,7 +15,7 @@ pkgver=4.0.5
 # 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 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a
  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 @@ install=samba.install
 
     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 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
   # 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')
diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service
index 4f86c4db9..34c66d5d6 100644
--- a/extra/samba/nmbd.service
+++ b/extra/samba/nmbd.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/var/run/nmbd.pid
-ExecStart=/usr/sbin/nmbd -D 
+ExecStart=/usr/bin/nmbd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/samba/samba b/extra/samba/samba
deleted file mode 100755
index 6098ee0cb..000000000
--- a/extra/samba/samba
+++ /dev/null
@@ -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
diff --git a/extra/samba/samba.service b/extra/samba/samba.service
index e423a7d2d..562d42562 100644
--- a/extra/samba/samba.service
+++ b/extra/samba/samba.service
@@ -7,7 +7,7 @@ Type=forking
 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]
diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service
index 12c08474a..de34c2a5f 100644
--- a/extra/samba/smbd.service
+++ b/extra/samba/smbd.service
@@ -5,7 +5,7 @@ After=network.target nmbd.service winbindd.service
 [Service]
 Type=forking
 PIDFile=/var/run/smbd.pid
-ExecStart=/usr/sbin/smbd -D 
+ExecStart=/usr/bin/smbd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service
index e1f71be3f..071eb5788 100644
--- a/extra/samba/smbd@.service
+++ b/extra/samba/smbd@.service
@@ -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
diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd
index 2e62a82b2..b083ad860 100644
--- a/extra/samba/swat.xinetd
+++ b/extra/samba/swat.xinetd
@@ -3,7 +3,7 @@ service swat
         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
diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service
index a036b2c03..ebbc31c47 100644
--- a/extra/samba/swat@.service
+++ b/extra/samba/swat@.service
@@ -3,5 +3,5 @@ Description=SWAT Samba Web Admin Tool
 After=local-fs.target
 
 [Service]
-ExecStart=/usr/sbin/swat
+ExecStart=/usr/bin/swat
 StandardInput=socket
diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service
index 02e3014b1..20bac9a83 100644
--- a/extra/samba/winbindd.service
+++ b/extra/samba/winbindd.service
@@ -5,7 +5,7 @@ After=network.target nmbd.service
 [Service]
 Type=forking
 PIDFile=/var/run/winbindd.pid
-ExecStart=/usr/sbin/winbindd -D 
+ExecStart=/usr/bin/winbindd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]