[arch-commits] Commit in samba/repos (extra-i686 extra-i686/PKGBUILD)

Mon Dec 1 19:50:00 UTC 2008

Date: Monday, December 1, 2008 @ 14:50:00
  Author: tpowa
Revision: 20246

Merged revisions 20244 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/samba/trunk

........
  r20244 | tpowa | 2008-12-01 19:18:10 +0000 (Mo, 01 Dez 2008) | 1 line
  
  upgpkg: samba 3.2.5-1
........

Modified:
  samba/repos/extra-i686/	(properties)
  samba/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   76 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 34 deletions(-)


Property changes on: samba/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /samba/trunk:1-14139
   + /samba/trunk:1-20245

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2008-12-01 19:19:01 UTC (rev 20245)
+++ extra-i686/PKGBUILD	2008-12-01 19:50:00 UTC (rev 20246)
@@ -1,77 +1,85 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=samba
-pkgver=3.2.4
+pkgver=3.2.5
 # 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.2.4
-pkgrel=3
+_realver=3.2.5
+pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
 backup=(etc/logrotate.d/samba etc/pam.d/samba etc/samba/smb.conf etc/xinetd.d/swat etc/conf.d/samba)
-depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'smbclient=3.2.4' 'libcap' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'tdb=3.2.4')
+depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'smbclient=3.2.5' 'libcap' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'tdb=3.2.5')
 options=(!makeflags)
 source=(http://us1.samba.org/samba/ftp/stable/${pkgname}-${_realver}.tar.gz \
         no-clients.patch samba samba.logrotate swat.xinetd samba.pam samba.conf.d)
 
 build() {
-  cd ${startdir}/src/${pkgname}-${_realver}/source
-  patch -Np2 -i ${startdir}/src/no-clients.patch || return 1
+  cd ${srcdir}/${pkgname}-${_realver}/source
+  patch -Np2 -i ${srcdir}/no-clients.patch || return 1
 
   ./configure --prefix=/usr --with-configdir=/etc/samba \
               --with-lockdir=/var/cache/samba \
               --with-piddir=/var/run/samba \
               --with-fhs --with-pam --with-ads --with-acl-support \
               --without-cifsmount --without-libsmbclient \
+              --with-syslog --with-pam_smbpass \
               --localstatedir=/var --disable-dnssd --libdir=/usr/lib/samba
   make || return 1
-  mkdir -p $startdir/pkg/var/log/samba
-  mkdir -p $startdir/pkg/etc/samba/private
-  chmod 700 $startdir/pkg/etc/samba/private
+  mkdir -p ${pkgdir}/var/log/samba
+  mkdir -p ${pkgdir}/etc/samba/private
+  chmod 700 ${pkgdir}/etc/samba/private
   make DESTDIR=$startdir/pkg install
-  chmod 644 $startdir/pkg/usr/include/*.h
-  rm -rf $startdir/pkg/usr/var
+  chmod 644 ${pkgdir}/usr/include/*.h
+  rm -rf ${pkgdir}/usr/var
   (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
-  install -D -m755 ../../samba $startdir/pkg/etc/rc.d/samba
-  install -D -m644 ../../samba.conf.d $startdir/pkg/etc/conf.d/samba
-  mkdir -p $startdir/pkg/etc/samba
+  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' >$startdir/pkg/etc/samba/smb.conf.default
-  install -D -m644 ../../samba.logrotate $startdir/pkg/etc/logrotate.d/samba
-  install -D -m644 ../../swat.xinetd $startdir/pkg/etc/xinetd.d/swat
-  install -D -m644 ../../samba.pam $startdir/pkg/etc/pam.d/samba
+    sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
+  install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
+  install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
+  install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
   # symlink libs
-  for i in ${startdir}/pkg/usr/lib/samba/libsmbshare*; do
-	ln -sf samba/$(basename $i) ${startdir}/pkg/usr/lib/$(basename $i)
+  for i in ${pkgdir}/usr/lib/samba/libsmbshare*; do
+	ln -sf samba/$(basename $i) ${pkgdir}/usr/lib/$(basename $i)
   done
   # 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
+  install -d -m1777 ${pkgdir}/var/spool/samba
+  sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
   # fix logrotate
-  sed -i -e 's|log.%m|%m.log|g' $startdir/pkg/etc/samba/smb.conf.default
+  sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/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
-  install -D -m755 nsswitch/libnss_winbind.so $startdir/pkg/lib/libnss_winbind.so
-  install -D -m755 bin/pam_winbind.so $startdir/pkg/lib/security/pam_winbind.so
+  install -D -m755 nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
+  ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
+  install -D -m755 nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
+  install -D -m755 bin/pam_winbind.so ${pkgdir}/lib/security/pam_winbind.so
   # remove conflict files of smbclient and tdb
   for man in libsmbclient smbspool \
       umount.cifs mount.cifs net; do
-    rm -f ${startdir}/pkg/usr/share/man/man8/${man}.8
+    rm -f ${pkgdir}/usr/share/man/man8/${man}.8
   done
   for i in libnetapi* libtdb* libtalloc* libwbclient*; do
-	  rm -f ${startdir}/pkg/usr/lib/samba/$i
+	  rm -f ${pkgdir}/usr/lib/samba/$i
   done
-  rm -f ${startdir}/pkg/usr/bin/tdbbackup
-  rm -f ${startdir}/pkg/usr/include/{tdb.h,talloc.h,netapi.h}
+  rm -f ${pkgdir}/usr/bin/tdbbackup
+  rm -f ${pkgdir}/usr/include/{tdb.h,talloc.h,netapi.h}
   for man in rpcclient smbcacls smbclient smbcquotas \
       smbtree smbtar nmblookup smbget; do
-    rm -f ${startdir}/pkg/usr/share/man/man1/${man}.1
+    rm -f ${pkgdir}/usr/share/man/man1/${man}.1
   done
-  rm -f ${startdir}/pkg/usr/share/man/man7/libsmbclient.7
+  rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
 
-  rm -f ${startdir}/pkg/usr/include/libsmbclient.h
+  rm -f ${pkgdir}/usr/include/libsmbclient.h
 }
+md5sums=('0f7539e09803ae60a2912e70adf1c747'
+         'a676f0dde2c434aeb5125376b8797a64'
+         'e93533fa2296c07c1f645dfdd373657f'
+         '5697da77590ec092cc8a883bae06093c'
+         'a4bbfa39fee95bba2e7ad6b535fae7e6'
+         '96f82c38f3f540b53f3e5144900acf17'
+         'f2f2e348acd1ccb566e95fa8a561b828')


