[arch-commits] Commit in samba/trunk (PKGBUILD fix-ipv6-mount.patch samba)

[Tobias Powalowski]

    Date: Friday, March 2, 2012 @ 03:42:42
  Author: tpowa
Revision: 151754

upgpkg: samba 3.6.3-2

remove wrong uid and gid in samba start script #28240, splitted libwbclient for cifs-utils

Modified:
  samba/trunk/PKGBUILD
  samba/trunk/samba
Deleted:
  samba/trunk/fix-ipv6-mount.patch

----------------------+
 PKGBUILD             |   26 +++++++++++++++++---------
 fix-ipv6-mount.patch |   11 -----------
 samba                |    4 ++--
 3 files changed, 19 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-02 08:42:11 UTC (rev 151753)
+++ PKGBUILD	2012-03-02 08:42:42 UTC (rev 151754)
@@ -2,13 +2,13 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Contributor: judd <jvinet at zeroflux.org>
 pkgbase=samba
-pkgname=('smbclient' 'samba')
+pkgname=('libwbclient' 'smbclient' 'samba')
 pkgver=3.6.3
 # 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.6.3
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -17,8 +17,7 @@
         samba samba.logrotate
         swat.xinetd
         samba.pam
-        samba.conf.d
-        fix-ipv6-mount.patch)
+        samba.conf.d)
 ### UNINSTALL dmapi package before building!!!
 
 build() {
@@ -48,13 +47,23 @@
   make
 }
 
+package_libwbclient () {
+pkgdesc="Samba winbind client library"
+depends=('glibc')
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  mkdir -p ${pkgdir}/usr/lib  
+  for i in libwbclient*; do
+      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
+  done
+}
+
 package_smbclient () {
 pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc')
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient')
   cd ${srcdir}/${pkgbase}-${_realver}/source3
   mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
   install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
-  for i in libnetapi* libwbclient* libsmbclient*;do
+  for i in libnetapi* libsmbclient*;do
       cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
   done
   install -m755 script/smbtar ${pkgdir}/usr/bin/
@@ -137,9 +146,8 @@
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
 md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1'
-         'a3da19515a234c703876cf850c44e996'
+         'dfc6f9018c556b9783c7140de183727f'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
          '96f82c38f3f540b53f3e5144900acf17'
-         'f2f2e348acd1ccb566e95fa8a561b828'
-         'c6a38a8c8fa24979e6217aed533358ea')
+         'f2f2e348acd1ccb566e95fa8a561b828')

Deleted: fix-ipv6-mount.patch
===================================================================
--- fix-ipv6-mount.patch	2012-03-02 08:42:11 UTC (rev 151753)
+++ fix-ipv6-mount.patch	2012-03-02 08:42:42 UTC (rev 151754)
@@ -1,11 +0,0 @@
---- client/mount.cifs.c.orig	2010-03-03 13:42:02.143936727 +1000
-+++ client/mount.cifs.c	2010-03-04 01:53:22.752879004 +1000
-@@ -1563,7 +1563,7 @@
- 		}
- 	}
-
--	if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
-+	if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
- 		strlcat(options, "%", options_size);
- 		current_len = strnlen(options, options_size);
- 		optionstail = options + current_len; 

Modified: samba
===================================================================
--- samba	2012-03-02 08:42:11 UTC (rev 151753)
+++ samba	2012-03-02 08:42:42 UTC (rev 151754)
@@ -11,10 +11,10 @@
 		rc=0
 		stat_busy "Starting Samba Server"
 		if [ ! -x /var/run/samba ] ; then
-			install -m755 -g 81 -o 81 -d /var/run/samba
+			install -m755 -d /var/run/samba
 		fi
                 if [ ! -x /var/log/samba ] ; then
-                        install -m755 -g 81 -o 81 -d /var/log/samba
+                        install -m755 -d /var/log/samba
                 fi
 		for d in ${SAMBA_DAEMONS[@]}; do
 			PID=`pidof -o %PPID /usr/sbin/$d`