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

[Tobias Powalowski]

    Date: Monday, August 29, 2011 @ 05:23:57
  Author: tpowa
Revision: 136435

upgpkg: samba 3.6.0-8

remove fam depend, add options from fedora, moved winbind_krb5 to krb5 plugins directory

Modified:
  samba/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-29 09:20:09 UTC (rev 136434)
+++ PKGBUILD	2011-08-29 09:23:57 UTC (rev 136435)
@@ -8,12 +8,11 @@
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.0
-pkgrel=7
+pkgrel=8
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
-options=(!makeflags)
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba samba.logrotate
         swat.xinetd
@@ -34,6 +33,9 @@
               --with-pam \
               --with-pam_smbpass \
               --with-pammodulesdir=/lib/security \
+              --with-dnsupdate \
+              --with-automount \
+              --with-quotas \
               --with-ads \
               --with-acl-support \
               --with-cifsmount \
@@ -42,7 +44,7 @@
               --enable-external-libtalloc \
               --disable-dnssd \
               --disable-avahi \
-              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
+              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
               --enable-external-libtdb
   make
 }
@@ -77,13 +79,14 @@
         etc/samba/smb.conf
         etc/xinetd.d/swat
         etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
   make DESTDIR=${pkgdir} install
   chmod 644 ${pkgdir}/usr/include/*.h
   rm -rf ${pkgdir}/usr/var
+  rm -rf ${pkgdir}/var/run/samba
   (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
   install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
   install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
@@ -102,12 +105,17 @@
   install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
   ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
   install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
+  ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2
+  # winbind krb5 locator
+  mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
+  install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5
+  install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so
   # remove conflict files of smbclient
   for man in libsmbclient smbspool \
       mount.cifs net cifs.upcall; do
       rm -f ${pkgdir}/usr/share/man/man8/${man}.8
   done
-  for i in libnetapi* libwbclient* libsmbclient*;do
+  for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do
       rm -f ${pkgdir}/usr/lib/$i
   done
   for bin in net \