samba3, maj 3.6.0-1

5 files changed, 31 insertions, 41 deletions

diff --git a/extra/samba3/.footprint.i686 b/extra/samba3/.footprint.i686
index 8f5307df1..6af193cce 100755
--- a/extra/samba3/.footprint.i686
+++ b/extra/samba3/.footprint.i686
@@ -10,12 +10,6 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/eventlogadm
 -rwxr-xr-x	root/root	usr/bin/findsmb
--rwxr-xr-x	root/root	usr/bin/ldbadd
--rwxr-xr-x	root/root	usr/bin/ldbdel
--rwxr-xr-x	root/root	usr/bin/ldbedit
--rwxr-xr-x	root/root	usr/bin/ldbmodify
--rwxr-xr-x	root/root	usr/bin/ldbrename
--rwxr-xr-x	root/root	usr/bin/ldbsearch
 -rwxr-xr-x	root/root	usr/bin/net
 -rwxr-xr-x	root/root	usr/bin/nmblookup
 -rwxr-xr-x	root/root	usr/bin/ntlm_auth
@@ -31,10 +25,12 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/smbpasswd
 -rwxr-xr-x	root/root	usr/bin/smbspool
 -rwxr-xr-x	root/root	usr/bin/smbstatus
+-rwxr-xr-x	root/root	usr/bin/smbta-util
 -rwxr-xr-x	root/root	usr/bin/smbtar
 -rwxr-xr-x	root/root	usr/bin/smbtree
 -rwxr-xr-x	root/root	usr/bin/tdbbackup
 -rwxr-xr-x	root/root	usr/bin/tdbdump
+-rwxr-xr-x	root/root	usr/bin/tdbrestore
 -rwxr-xr-x	root/root	usr/bin/tdbtool
 -rwxr-xr-x	root/root	usr/bin/testparm
 -rwxr-xr-x	root/root	usr/bin/wbinfo
@@ -43,7 +39,6 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/netapi.h
 -rw-r--r--	root/root	usr/include/smb_share_modes.h
 -rw-r--r--	root/root	usr/include/tdb.h
--rw-r--r--	root/root	usr/include/wbc_async.h
 -rw-r--r--	root/root	usr/include/wbclient.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cups/
@@ -56,7 +51,8 @@ lrwxrwxrwx	root/root	usr/lib/libsmbclient.so -> libsmbclient.so.0
 lrwxrwxrwx	root/root	usr/lib/libsmbsharemodes.so -> libsmbsharemodes.so.0
 -rwxr-xr-x	root/root	usr/lib/libsmbsharemodes.so.0
 lrwxrwxrwx	root/root	usr/lib/libtdb.so -> libtdb.so.1
--rwxr-xr-x	root/root	usr/lib/libtdb.so.1
+lrwxrwxrwx	root/root	usr/lib/libtdb.so.1 -> libtdb.so.1.2.9
+-rwxr-xr-x	root/root	usr/lib/libtdb.so.1.2.9
 lrwxrwxrwx	root/root	usr/lib/libwbclient.so -> libwbclient.so.0
 -rwxr-xr-x	root/root	usr/lib/libwbclient.so.0
 drwxr-xr-x	root/root	usr/lib/samba/
@@ -71,6 +67,7 @@ drwxr-xr-x	root/root	usr/lib/samba/charset/
 -rw-r--r--	root/root	usr/lib/samba/fr.msg
 drwxr-xr-x	root/root	usr/lib/samba/gpext/
 drwxr-xr-x	root/root	usr/lib/samba/idmap/
+-rwxr-xr-x	root/root	usr/lib/samba/idmap/autorid.so
 -rw-r--r--	root/root	usr/lib/samba/it.msg
 -rw-r--r--	root/root	usr/lib/samba/ja.msg
 -rw-r--r--	root/root	usr/lib/samba/lowcase.dat
@@ -79,7 +76,6 @@ drwxr-xr-x	root/root	usr/lib/samba/nss_info/
 drwxr-xr-x	root/root	usr/lib/samba/pdb/
 drwxr-xr-x	root/root	usr/lib/samba/perfcount/
 -rw-r--r--	root/root	usr/lib/samba/pl.msg
-drwxr-xr-x	root/root	usr/lib/samba/rpc/
 -rw-r--r--	root/root	usr/lib/samba/ru.msg
 -rw-r--r--	root/root	usr/lib/samba/tr.msg
 -rw-r--r--	root/root	usr/lib/samba/upcase.dat
@@ -90,6 +86,7 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/audit.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/cap.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/catia.so
+-rwxr-xr-x	root/root	usr/lib/samba/vfs/crossrename.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/default_quota.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/dirsort.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/expand_msdfs.so
@@ -97,6 +94,7 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/fake_perms.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/fileid.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/full_audit.so
+-rwxr-xr-x	root/root	usr/lib/samba/vfs/linux_xfs_sgid.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/netatalk.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/notify_fam.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/preopen.so
@@ -110,10 +108,9 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/streams_depot.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/streams_xattr.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/syncops.so
+-rwxr-xr-x	root/root	usr/lib/samba/vfs/time_audit.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/xattr_tdb.so
 drwxr-xr-x	root/root	usr/sbin/
--rwsr-xr-x	root/root	usr/sbin/mount.cifs
--rwsr-xr-x	root/root	usr/sbin/umount.cifs
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
@@ -155,6 +152,3 @@ drwxr-xr-x	root/root	usr/share/man/man7/
 -rw-r--r--	root/root	usr/share/man/man7/libsmbclient.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/samba.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/winbind_krb5_locator.7.gz
-drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/mount.cifs.8.gz
--rw-r--r--	root/root	usr/share/man/man8/umount.cifs.8.gz
diff --git a/extra/samba3/.footprint.x86_64 b/extra/samba3/.footprint.x86_64
index 8f5307df1..6af193cce 100755
--- a/extra/samba3/.footprint.x86_64
+++ b/extra/samba3/.footprint.x86_64
@@ -10,12 +10,6 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/eventlogadm
 -rwxr-xr-x	root/root	usr/bin/findsmb
--rwxr-xr-x	root/root	usr/bin/ldbadd
--rwxr-xr-x	root/root	usr/bin/ldbdel
--rwxr-xr-x	root/root	usr/bin/ldbedit
--rwxr-xr-x	root/root	usr/bin/ldbmodify
--rwxr-xr-x	root/root	usr/bin/ldbrename
--rwxr-xr-x	root/root	usr/bin/ldbsearch
 -rwxr-xr-x	root/root	usr/bin/net
 -rwxr-xr-x	root/root	usr/bin/nmblookup
 -rwxr-xr-x	root/root	usr/bin/ntlm_auth
@@ -31,10 +25,12 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/smbpasswd
 -rwxr-xr-x	root/root	usr/bin/smbspool
 -rwxr-xr-x	root/root	usr/bin/smbstatus
+-rwxr-xr-x	root/root	usr/bin/smbta-util
 -rwxr-xr-x	root/root	usr/bin/smbtar
 -rwxr-xr-x	root/root	usr/bin/smbtree
 -rwxr-xr-x	root/root	usr/bin/tdbbackup
 -rwxr-xr-x	root/root	usr/bin/tdbdump
+-rwxr-xr-x	root/root	usr/bin/tdbrestore
 -rwxr-xr-x	root/root	usr/bin/tdbtool
 -rwxr-xr-x	root/root	usr/bin/testparm
 -rwxr-xr-x	root/root	usr/bin/wbinfo
@@ -43,7 +39,6 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/netapi.h
 -rw-r--r--	root/root	usr/include/smb_share_modes.h
 -rw-r--r--	root/root	usr/include/tdb.h
--rw-r--r--	root/root	usr/include/wbc_async.h
 -rw-r--r--	root/root	usr/include/wbclient.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cups/
@@ -56,7 +51,8 @@ lrwxrwxrwx	root/root	usr/lib/libsmbclient.so -> libsmbclient.so.0
 lrwxrwxrwx	root/root	usr/lib/libsmbsharemodes.so -> libsmbsharemodes.so.0
 -rwxr-xr-x	root/root	usr/lib/libsmbsharemodes.so.0
 lrwxrwxrwx	root/root	usr/lib/libtdb.so -> libtdb.so.1
--rwxr-xr-x	root/root	usr/lib/libtdb.so.1
+lrwxrwxrwx	root/root	usr/lib/libtdb.so.1 -> libtdb.so.1.2.9
+-rwxr-xr-x	root/root	usr/lib/libtdb.so.1.2.9
 lrwxrwxrwx	root/root	usr/lib/libwbclient.so -> libwbclient.so.0
 -rwxr-xr-x	root/root	usr/lib/libwbclient.so.0
 drwxr-xr-x	root/root	usr/lib/samba/
@@ -71,6 +67,7 @@ drwxr-xr-x	root/root	usr/lib/samba/charset/
 -rw-r--r--	root/root	usr/lib/samba/fr.msg
 drwxr-xr-x	root/root	usr/lib/samba/gpext/
 drwxr-xr-x	root/root	usr/lib/samba/idmap/
+-rwxr-xr-x	root/root	usr/lib/samba/idmap/autorid.so
 -rw-r--r--	root/root	usr/lib/samba/it.msg
 -rw-r--r--	root/root	usr/lib/samba/ja.msg
 -rw-r--r--	root/root	usr/lib/samba/lowcase.dat
@@ -79,7 +76,6 @@ drwxr-xr-x	root/root	usr/lib/samba/nss_info/
 drwxr-xr-x	root/root	usr/lib/samba/pdb/
 drwxr-xr-x	root/root	usr/lib/samba/perfcount/
 -rw-r--r--	root/root	usr/lib/samba/pl.msg
-drwxr-xr-x	root/root	usr/lib/samba/rpc/
 -rw-r--r--	root/root	usr/lib/samba/ru.msg
 -rw-r--r--	root/root	usr/lib/samba/tr.msg
 -rw-r--r--	root/root	usr/lib/samba/upcase.dat
@@ -90,6 +86,7 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/audit.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/cap.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/catia.so
+-rwxr-xr-x	root/root	usr/lib/samba/vfs/crossrename.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/default_quota.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/dirsort.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/expand_msdfs.so
@@ -97,6 +94,7 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/fake_perms.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/fileid.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/full_audit.so
+-rwxr-xr-x	root/root	usr/lib/samba/vfs/linux_xfs_sgid.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/netatalk.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/notify_fam.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/preopen.so
@@ -110,10 +108,9 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/streams_depot.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/streams_xattr.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/syncops.so
+-rwxr-xr-x	root/root	usr/lib/samba/vfs/time_audit.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/xattr_tdb.so
 drwxr-xr-x	root/root	usr/sbin/
--rwsr-xr-x	root/root	usr/sbin/mount.cifs
--rwsr-xr-x	root/root	usr/sbin/umount.cifs
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
@@ -155,6 +152,3 @@ drwxr-xr-x	root/root	usr/share/man/man7/
 -rw-r--r--	root/root	usr/share/man/man7/libsmbclient.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/samba.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/winbind_krb5_locator.7.gz
-drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/mount.cifs.8.gz
--rw-r--r--	root/root	usr/share/man/man8/umount.cifs.8.gz
diff --git a/extra/samba3/.md5sum.i686 b/extra/samba3/.md5sum.i686
index 875d93d25..6a803b095 100755
--- a/extra/samba3/.md5sum.i686
+++ b/extra/samba3/.md5sum.i686
@@ -1 +1 @@
-fc3fe1103cf9d71abe12a8c604f31c76  samba-3.5.9.tar.gz
+e297e0ea7923c7de8d7c1d8fd0ec0a05  samba-3.6.0.tar.gz
diff --git a/extra/samba3/.md5sum.x86_64 b/extra/samba3/.md5sum.x86_64
index 875d93d25..6a803b095 100755
--- a/extra/samba3/.md5sum.x86_64
+++ b/extra/samba3/.md5sum.x86_64
@@ -1 +1 @@
-fc3fe1103cf9d71abe12a8c604f31c76  samba-3.5.9.tar.gz
+e297e0ea7923c7de8d7c1d8fd0ec0a05  samba-3.6.0.tar.gz
diff --git a/extra/samba3/Pkgfile b/extra/samba3/Pkgfile
index 478c784ab..b9334360c 100755
--- a/extra/samba3/Pkgfile
+++ b/extra/samba3/Pkgfile
@@ -6,10 +6,10 @@
 # Run on: talloc,libcups,gamin,kerberos,libcap
 
 name=samba3
-version=3.5.9
+version=3.6.0
 release=1
 localname=samba
-source=( http://us6.samba.org/samba/ftp/stable/$localname-$version.tar.gz)
+source=( http://ftp.samba.org/pub/samba/stable/$localname-$version.tar.gz)
 
 
 build() {
@@ -19,8 +19,7 @@ build() {
 		--sysconfdir=/etc \
                 --with-piddir=/var/run \
                 --with-pammodulesdir=/lib/security \
-		--with-fhs --with-syslog \
-                --with-cifsumount --with-cifsmount
+		--with-fhs --with-syslog
 	make
 	make DESTDIR=$PKG install
         
@@ -33,17 +32,20 @@ build() {
         ln -v -sf libnss_wins.so $PKG/lib/libnss_wins.so.2
         
 	install -v -m644 ../examples/smb.conf.default $PKG/etc/samba/smb.conf.default
-        chmod -v 4755  $PKG/usr/sbin/{,u}mount.cifs
+        # chmod -v 4755  $PKG/usr/sbin/{,u}mount.cifs
 	#  cups 
         cd $PKG/usr/lib/
         install -d cups/backend
         ln -v -sf /usr/bin/smbspool $PKG/usr/lib/cups/backend/smb
 	rm -r $PKG/{var,etc,usr/share/samba}
 	rm -r $PKG/usr/sbin/{nmbd,smbd,swat,winbindd}
-	# Ne garder que les mans de mount.cifs 
-	mv $PKG/usr/share/man/man8/{u,}mount.cifs.8 .
-	rm -r $PKG/usr/share/man/man8
-	mkdir -p $PKG/usr/share/man/man8
-	mv {u,}mount.cifs.8 $PKG/usr/share/man/man8/
+	# Ne garder que les mans de mount.cifs si ils existent
+	if [ -f $PKG/usr/share/man/man8/umount.cifs.8 ]; then 
+		mv $PKG/usr/share/man/man8/{u,}mount.cifs.8 .
+		rm -r $PKG/usr/share/man/man8
+		mkdir -p $PKG/usr/share/man/man8
+		mv {u,}mount.cifs.8 $PKG/usr/share/man/man8/
+	else
+		rm -r $PKG/usr/share/man/man8
+	fi
 }
-