[arch-commits] Commit in samba/trunk (PKGBUILD no-clients.patch)

[Tobias Powalowski]

    Date: Sunday, September 28, 2008 @ 11:08:08
  Author: tpowa
Revision: 13779

upgpkg: samba 3.2.4-1

Modified:
  samba/trunk/PKGBUILD
  samba/trunk/no-clients.patch

------------------+
 PKGBUILD         |   32 ++++++++++----------------------
 no-clients.patch |    4 ++--
 2 files changed, 12 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-28 14:51:15 UTC (rev 13778)
+++ PKGBUILD	2008-09-28 15:08:08 UTC (rev 13779)
@@ -1,25 +1,22 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=samba
-pkgver=3.0.31
+pkgver=3.2.4
 # 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.0.31
+_realver=3.2.4
 pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 arch=(i686 x86_64)
 url="http://www.samba.org"
-license=('GPL')
+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.0.30-2' 'libcap' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1')
+depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'smbclient>=3.2.4' 'libcap' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1')
 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)
 
-# 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(?)
-
 build() {
   cd ${startdir}/src/${pkgname}-${_realver}/source
   patch -Np2 -i ${startdir}/src/no-clients.patch || return 1
@@ -28,8 +25,8 @@
               --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
+              --without-cifsmount --without-libsmbclient \
+              --localstatedir=/var --disable-dnssd
   make || return 1
   mkdir -p $startdir/pkg/var/log/samba
   mkdir -p $startdir/pkg/etc/samba/private
@@ -56,9 +53,9 @@
   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
-
-  for man in libsmbclient smbmnt smbmount smbspool \
-      smbumount umount.cifs mount.cifs net; do
+  # remove conflict files of smbclient
+  for man in libsmbclient smbspool \
+      umount.cifs mount.cifs net; do
     rm -f ${startdir}/pkg/usr/share/man/man8/${man}.8
   done
   for man in rpcclient smbcacls smbclient smbcquotas \
@@ -68,14 +65,5 @@
   rm -f ${startdir}/pkg/usr/share/man/man7/libsmbclient.7
 
   rm -f ${startdir}/pkg/usr/include/libsmbclient.h
-  # remove mount and umount.cifs
-  rm $startdir/pkg/usr/sbin/mount.cifs
-  rm $startdir/pkg/usr/sbin/umount.cifs
+  rm -f ${startdir}/pkg/usr/lib/{libnetapi.so,libnetapi.so.0,libtalloc.so,libtalloc.so.1,libtdb.so,libtdb.so.1,libwbclient.so,libwbclient.so.0}
 }
-md5sums=('165abaf4522c70031d9a76fbb638ca06'
-         '9fc80d2b5210a94b386ea0904337f5bd'
-         'e93533fa2296c07c1f645dfdd373657f'
-         '5697da77590ec092cc8a883bae06093c'
-         'a4bbfa39fee95bba2e7ad6b535fae7e6'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'f2f2e348acd1ccb566e95fa8a561b828')

Modified: no-clients.patch
===================================================================
--- no-clients.patch	2008-09-28 14:51:15 UTC (rev 13778)
+++ no-clients.patch	2008-09-28 15:08:08 UTC (rev 13779)
@@ -17,9 +17,9 @@
 +BIN_PROGS2 = bin/smbcontrol at EXEEXT@ bin/tdbbackup at EXEEXT@ bin/pdbedit at EXEEXT@
 +BIN_PROGS3 = bin/smbpasswd at EXEEXT@ bin/profiles at EXEEXT@ bin/ntlm_auth at EXEEXT@ \
 +	bin/eventlogadm at EXEEXT@
+ BIN_PROGS4 = bin/ldbedit at EXEEXT@ bin/ldbsearch at EXEEXT@ bin/ldbadd at EXEEXT@ \
+ 	bin/ldbdel at EXEEXT@ bin/ldbmodify at EXEEXT@
  
- TORTURE_PROGS = bin/smbtorture at EXEEXT@ bin/msgtest at EXEEXT@ \
- 	bin/masktest at EXEEXT@ bin/locktest at EXEEXT@ \
 @@ -160,7 +156,7 @@
  
  PAM_MODULES = @PAM_MODULES@