[arch-commits] Commit in samba/trunk (5 files)

[Tom Gundersen]

    Date: Friday, June 8, 2012 @ 21:07:38
  Author: tomegun
Revision: 161296

upgpkg: samba 3.6.5-2

remove /var/run

Added:
  samba/trunk/samba.conf
    (from rev 161293, samba/trunk/smbd.conf)
  samba/trunk/samba.install
Modified:
  samba/trunk/PKGBUILD
  samba/trunk/samba
Deleted:
  samba/trunk/smbd.conf

---------------+
 PKGBUILD      |   13 ++++++++-----
 samba         |    9 +++------
 samba.conf    |    1 +
 samba.install |    7 +++++++
 smbd.conf     |    1 -
 5 files changed, 19 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-08 23:50:11 UTC (rev 161295)
+++ PKGBUILD	2012-06-09 01:07:38 UTC (rev 161296)
@@ -8,7 +8,7 @@
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.5
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -21,7 +21,7 @@
         smbd.service
         nmbd.service
         winbindd.service
-        smbd.conf)
+        samba.conf)
 ### UNINSTALL dmapi package before building!!!
 
 build() {
@@ -92,6 +92,7 @@
         etc/xinetd.d/swat
         etc/conf.d/samba)
 depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+install='samba.install'
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
@@ -152,10 +153,12 @@
   for i in smbd nmbd winbindd; do
   install -D -m644 ${srcdir}/$i.service ${pkgdir}/usr/lib/systemd/system/$i.service
   done
-  install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf 
+  # 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=('2f0c14547333c1b48fd4728b031e7040'
-         'dfc6f9018c556b9783c7140de183727f'
+         'a45a4283723be2b0ae32439dc4496a09'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
          '96f82c38f3f540b53f3e5144900acf17'
@@ -163,4 +166,4 @@
          '389cc4fa3b459360feaa1b3d93274693'
          'ea6a1251be979cb30c6098a28b270d2d'
          '455f106ce7a4f983975b3a686eaa85e5'
-         '6956c4f9989bec8f313de7d9343b6ba1')
+         '8e7ed39b54968e427f9506e9107bfb45')

Modified: samba
===================================================================
--- samba	2012-06-08 23:50:11 UTC (rev 161295)
+++ samba	2012-06-09 01:07:38 UTC (rev 161296)
@@ -10,9 +10,6 @@
 	start)
 		rc=0
 		stat_busy "Starting Samba Server"
-		if [ ! -x /var/run/samba ] ; then
-			install -m755 -d /var/run/samba
-		fi
                 if [ ! -x /var/log/samba ] ; then
                         install -m755 -d /var/log/samba
                 fi
@@ -39,9 +36,9 @@
 		if [ $rc -gt 0 ]; then
 			stat_fail
 		else
-			rm /var/run/samba/smbd.pid &>/dev/null
-			rm /var/run/samba/nmbd.pid &>/dev/null
-			rm /var/run/samba/winbindd.pid &>/dev/null
+			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

Copied: samba/trunk/samba.conf (from rev 161293, samba/trunk/smbd.conf)
===================================================================
--- samba.conf	                        (rev 0)
+++ samba.conf	2012-06-09 01:07:38 UTC (rev 161296)
@@ -0,0 +1 @@
+D /run/samba 0755 - - -

Added: samba.install
===================================================================
--- samba.install	                        (rev 0)
+++ samba.install	2012-06-09 01:07:38 UTC (rev 161296)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+post_install() {
+  systemd-tmpfiles --create /usr/lib/tmpfiles.d/smbd.conf
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: smbd.conf
===================================================================
--- smbd.conf	2012-06-08 23:50:11 UTC (rev 161295)
+++ smbd.conf	2012-06-09 01:07:38 UTC (rev 161296)
@@ -1 +0,0 @@
-D /var/run/samba 0755 root root -