Sun Aug 28 23:14:35 UTC 2011

1 files changed, 27 insertions, 7 deletions

diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 26af8f5e3..8e51af587 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136328 2011-08-26 12:41:22Z tpowa $
+# $Id: PKGBUILD 136362 2011-08-27 15:46:49Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,7 +8,7 @@ pkgver=3.6.0
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.0
-pkgrel=4
+pkgrel=6
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -41,6 +41,7 @@ build() {
               --with-piddir=/var/run/samba \
               --with-logfilebase=/var/log/samba \
               --sysconfdir=/etc \
+              --with-dnsupdate \
               --with-pam \
               --with-pam_smbpass \
               --with-pammodulesdir=/lib/security \
@@ -71,8 +72,8 @@ depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprog
     ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
   done
   mkdir ${pkgdir}/usr/lib/libsmb
-  ln -sf /usr/lib/libsmb/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
-  ln -sf /usr/lib/libsmb/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so
+  ln -sf /usr/lib/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
+  ln -sf /usr/lib/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so
   for i in libndr-krb5pac libndr-standard libndr; do
     install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
     ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
@@ -104,14 +105,21 @@ backup=(etc/logrotate.d/samba
 depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
 optdepends=('python2: for python bindings')
   cd ${srcdir}/samba-${_realver}/source3
-  mkdir -p ${pkgdir}/etc/samba/private
-  chmod 700 ${pkgdir}/etc/samba/private
   ../buildtools/bin/waf install --destdir=${pkgdir}
+  # fix permission on include files
   chmod 644 ${pkgdir}/usr/include/*.h
+  # remove wrong var directory
   rm -rf ${pkgdir}/usr/var
+  # create missing directories
+  mkdir -p ${pkgdir}/etc/samba/private
+  chmod 700 ${pkgdir}/etc/samba/private
+  mkdir -p ${pkgdir}/var/{lib,cache}/samba
+  mkdir -p ${pkgdir}/var/nmbd
+  mkdir -p ${pkgdir}/lib/security
+  mkdir -p ${pkgdir}/etc/samba
+  # install config files
   install -D -m755 ${startdir}/samba ${pkgdir}/etc/rc.d/samba
   install -D -m644 ${startdir}/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' >${pkgdir}/etc/samba/smb.conf.default
   install -D -m644 ${startdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba
@@ -122,6 +130,13 @@ optdepends=('python2: for python bindings')
   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' ${pkgdir}/etc/samba/smb.conf.default
+  # run various install scripts
+  script/./installman.sh ${pkgdir}/usr/share/man . C
+  script/./installmo.sh ${pkgdir}/usr/share locale .
+  script/./installdat.sh ${pkgdir}/usr/lib samba .
+  chmod 755 script/./installmsg.sh
+  script/./installmsg.sh ${pkgdir}/usr/lib samba .
+  script/./installswat.sh ${pkgdir}/usr/share/samba swat .
   # remove conflict files of smbclient
   for man in libsmbclient smbspool \
       mount.cifs net cifs.upcall; do
@@ -130,6 +145,11 @@ optdepends=('python2: for python bindings')
   for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so libtevent.so.0.9.11 libtevent.so.0 libwinbind-client.so; do
       rm -f ${pkgdir}/usr/lib/samba/$i
   done
+  # move libs to correct place
+  mv ${pkgdir}/usr/lib/pam*.so ${pkgdir}/lib/security
+  mv ${pkgdir}/usr/lib/libnss* ${pkgdir}/lib/
+  ln -sf /lib/libnss_wins.so.2 ${pkgdir}/lib/libnss_wins.so
+  ln -sf /lib/libnss_winbind.so.2 ${pkgdir}/lib/libnss_winbind.so
   mv ${pkgdir}/usr/lib/samba/*.so ${pkgdir}/usr/lib
   for i in libndr-krb5pac.* libsmbconf.*  libndr-standard.* libndr.* libnetapi.* libwbclient.* libsmbclient.*; do
       rm -f ${pkgdir}/usr/lib/$i