[arch-commits] CVS update of extra/daemons/samba (PKGBUILD samba.logrotate)

[Tobias Powalowski]

    Date: Thursday, October 25, 2007 @ 05:51:50
  Author: tpowa
    Path: /home/cvs-extra/extra/daemons/samba

Modified: PKGBUILD (1.95 -> 1.96) samba.logrotate (1.2 -> 1.3)

'upgpkg: fixed #5828 #5980'


-----------------+
 PKGBUILD        |   27 +++++++++++++++------------
 samba.logrotate |    2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)


Index: extra/daemons/samba/PKGBUILD
diff -u extra/daemons/samba/PKGBUILD:1.95 extra/daemons/samba/PKGBUILD:1.96
--- extra/daemons/samba/PKGBUILD:1.95	Sat Sep 29 09:28:43 2007
+++ extra/daemons/samba/PKGBUILD	Thu Oct 25 05:51:50 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.95 2007/09/29 13:28:43 tpowa Exp $
+# $Id: PKGBUILD,v 1.96 2007/10/25 09:51:50 tpowa Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=samba
 pkgver=3.0.26a
@@ -6,22 +6,15 @@
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.0.26a
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL')
-backup=(etc/logrotate.d/samba etc/pam.d/samba)
+backup=(etc/logrotate.d/samba etc/pam.d/samba etc/samba/smb.conf etc/xinetd.d/swat etc/conf.d/samba)
 depends=('db>=4.6' 'popt' 'libcups' 'acl' 'libldap' 'smbclient>=3.0.26a' 'libcap' 'heimdal>=1.0.1' 'pam' 'fam')
 source=(http://us1.samba.org/samba/ftp/${pkgname}-${_realver}.tar.gz \
         no-clients.patch samba samba.logrotate swat.xinetd samba.pam samba.conf.d)
-md5sums=('16b47e6add332e5ac4523fc88c381d06'
-         '9fc80d2b5210a94b386ea0904337f5bd'
-         'e93533fa2296c07c1f645dfdd373657f'
-         '3d09190213d20a946c30658ccfcbd455'
-         'a4bbfa39fee95bba2e7ad6b535fae7e6'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'f2f2e348acd1ccb566e95fa8a561b828')
 
 # for x86_64 and probably i686 make sure to not have dmapi/xfsdump installed when 
 # compiling or it will link against it which is not wanted right now(?)
@@ -31,10 +24,11 @@
   patch -Np2 -i ${startdir}/src/no-clients.patch || return 1
 
   ./configure --prefix=/usr --with-configdir=/etc/samba \
-              --with-lockdir=/var/run/samba \
+              --with-lockdir=/var/cache/samba \
+              --with-piddir=/var/run/samba \
               --with-fhs --with-pam --with-ads --with-acl-support \
               --without-smbmount --without-libsmbclient \
-	      --localstatedir=/var
+              --localstatedir=/var
   make -j1 || return 1
   mkdir -p $startdir/pkg/var/log/samba
   mkdir -p $startdir/pkg/etc/samba/private
@@ -54,6 +48,8 @@
   # spool directory
   install -d -m1777 $startdir/pkg/var/spool/samba
   sed -i 's|/usr/spool/samba|/var/spool/samba|g' $startdir/pkg/etc/samba/smb.conf.default
+  # fix logrotate
+  sed -i -e 's|log.%m|%m.log|g' $startdir/pkg/etc/samba/smb.conf.default
   # nsswitch libraries
   install -D -m755 nsswitch/libnss_wins.so $startdir/pkg/lib/libnss_wins.so
   ln -s libnss_wins.so $startdir/pkg/lib/libnss_wins.so.2
@@ -76,3 +72,10 @@
   rm $startdir/pkg/usr/sbin/umount.cifs
 }
 
+md5sums=('16b47e6add332e5ac4523fc88c381d06'
+         '9fc80d2b5210a94b386ea0904337f5bd'
+         'e93533fa2296c07c1f645dfdd373657f'
+         'eab0a8cfa944cb6ba7b73cc004edf624'
+         'a4bbfa39fee95bba2e7ad6b535fae7e6'
+         '96f82c38f3f540b53f3e5144900acf17'
+         'f2f2e348acd1ccb566e95fa8a561b828')
Index: extra/daemons/samba/samba.logrotate
diff -u extra/daemons/samba/samba.logrotate:1.2 extra/daemons/samba/samba.logrotate:1.3
--- extra/daemons/samba/samba.logrotate:1.2	Tue Mar 28 13:03:21 2006
+++ extra/daemons/samba/samba.logrotate	Thu Oct 25 05:51:50 2007
@@ -1,4 +1,4 @@
-/var/log/samba/log.* {
+/var/log/samba/log.smbd /var/log/samba/log.nbmd /var/log/samba/*.log {
    notifempty
    missingok
    sharedscripts