Samba: update to 3.3.4 to match the client

3 files changed, 15 insertions, 12 deletions

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 7bd6369..ef4203c 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
-pkgver=1.0
-pkgrel=430
+pkgver=2.0
+pkgrel=1
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted )
diff --git a/abs/core-testing/samba/PKGBUILD b/abs/core-testing/samba/PKGBUILD
index 2e56238..24b2dba 100644
--- a/abs/core-testing/samba/PKGBUILD
+++ b/abs/core-testing/samba/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 22200 2008-12-22 22:24:26Z tpowa $
+# $Id: PKGBUILD 37517 2009-05-02 16:35:12Z tpowa $
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=samba
-pkgver=3.2.6
+pkgver=3.3.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.2.6
-pkgrel=5
+_realver=3.3.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=('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.6' 'libcap' 'heimdal>=1.2-1' 'pam'  'gnutls>=2.4.1' 'tdb=3.2.6')
+depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'smbclient=3.3.4' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam'  'gnutls>=2.4.1' 'tdb=3.3.4')
 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)
@@ -27,7 +27,8 @@ build() {
               --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 --without-fam
+              --localstatedir=/var --disable-dnssd \
+	      --disable-avahi --libdir=/usr/lib/samba --without-fam
   make || return 1
   mkdir -p ${pkgdir}/var/log/samba
   mkdir -p ${pkgdir}/etc/samba/private
@@ -75,9 +76,11 @@ build() {
   rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
 
   rm -f ${pkgdir}/usr/include/libsmbclient.h
+  # copy ldap example
+  install -D -m644 ${srcdir}/${pkgname}-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('0cd27c7afbb8211616eea4010f32271c'
-         'a676f0dde2c434aeb5125376b8797a64'
+md5sums=('1443165edb7cb3f56f1e77aec1ee3266'
+         'ce3d88336ade7522e9a8f59bb306accd'
          'e93533fa2296c07c1f645dfdd373657f'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/abs/core-testing/samba/no-clients.patch b/abs/core-testing/samba/no-clients.patch
index 61e4e5c..e06da8d 100644
--- a/abs/core-testing/samba/no-clients.patch
+++ b/abs/core-testing/samba/no-clients.patch
@@ -11,14 +11,14 @@ diff -Naur samba-3.0.23-orig/source/Makefile.in samba-3.0.23/source/Makefile.in
 -	bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ bin/tdbdump@EXEEXT@ \
 -	bin/tdbtool@EXEEXT@
 -BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
--	bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \
+-	bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \
 -	bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@
 +BIN_PROGS1 = bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@
 +BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/tdbbackup@EXEEXT@ bin/pdbedit@EXEEXT@
 +BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \
 +	bin/eventlogadm@EXEEXT@
  BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \
- 	bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@
+ 	bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@ bin/ldbrename@EXEEXT@
  
 @@ -160,7 +156,7 @@