ports/opt (2.7): [notify] samba: update to 3.6.0

crux at crux.nu crux at crux.nu
Fri Sep 2 10:01:14 UTC 2011


commit 25e4c8019eb294cf05f1237aa53d0759a03f21d8
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Sep 2 11:49:12 2011 +0200

    [notify] samba: update to 3.6.0
    
    Note: mount.cifs is no longer part of the samba sources, install
          the new port opt/cifs-utils additionally.

diff --git a/samba/.footprint b/samba/.footprint
index 956f1b5..e661b04 100644
--- a/samba/.footprint
+++ b/samba/.footprint
@@ -9,19 +9,10 @@ drwxr-xr-x	root/root	lib/
 lrwxrwxrwx	root/root	lib/libnss_winbind.so.2 -> libnss_winbind.so
 -rwxr-xr-x	root/root	lib/libnss_wins.so
 lrwxrwxrwx	root/root	lib/libnss_wins.so.2 -> libnss_wins.so
-drwxr-xr-x	root/root	sbin/
--rwxr-xr-x	root/root	sbin/mount.cifs
--rwxr-xr-x	root/root	sbin/umount.cifs
 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
@@ -37,6 +28,7 @@ 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/testparm
@@ -45,7 +37,6 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/libsmbclient.h
 -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/wbc_async.h
 -rw-r--r--	root/root	usr/include/wbclient.h
 drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libnetapi.so -> libnetapi.so.0
@@ -64,11 +55,11 @@ drwxr-xr-x	root/root	usr/lib/samba/charset/
 -rwxr-xr-x	root/root	usr/lib/samba/charset/CP850.so
 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/lowcase.dat
 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/
-drwxr-xr-x	root/root	usr/lib/samba/rpc/
 -rw-r--r--	root/root	usr/lib/samba/upcase.dat
 -rw-r--r--	root/root	usr/lib/samba/valid.dat
 drwxr-xr-x	root/root	usr/lib/samba/vfs/
@@ -77,6 +68,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
@@ -84,6 +76,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/preopen.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/readahead.so
@@ -96,6 +89,7 @@ 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/man/
 drwxr-xr-x	root/root	usr/man/man1/
@@ -137,13 +131,13 @@ drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/eventlogadm.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_ad.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_adex.8.gz
+-rw-r--r--	root/root	usr/man/man8/idmap_autorid.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_hash.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_ldap.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_nss.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_rid.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_tdb.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_tdb2.8.gz
--rw-r--r--	root/root	usr/man/man8/mount.cifs.8.gz
 -rw-r--r--	root/root	usr/man/man8/net.8.gz
 -rw-r--r--	root/root	usr/man/man8/nmbd.8.gz
 -rw-r--r--	root/root	usr/man/man8/pam_winbind.8.gz
@@ -151,7 +145,7 @@ drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/smbd.8.gz
 -rw-r--r--	root/root	usr/man/man8/smbpasswd.8.gz
 -rw-r--r--	root/root	usr/man/man8/smbspool.8.gz
--rw-r--r--	root/root	usr/man/man8/umount.cifs.8.gz
+-rw-r--r--	root/root	usr/man/man8/smbta-util.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_acl_tdb.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_acl_xattr.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_audit.8.gz
@@ -159,6 +153,7 @@ drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/vfs_cap.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_catia.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_commit.8.gz
+-rw-r--r--	root/root	usr/man/man8/vfs_crossrename.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_default_quota.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_dirsort.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_extd_audit.8.gz
@@ -179,6 +174,7 @@ drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/vfs_smb_traffic_analyzer.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_streams_depot.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_streams_xattr.8.gz
+-rw-r--r--	root/root	usr/man/man8/vfs_time_audit.8.gz
 -rw-r--r--	root/root	usr/man/man8/vfs_xattr_tdb.8.gz
 -rw-r--r--	root/root	usr/man/man8/winbindd.8.gz
 drwxr-xr-x	root/root	usr/sbin/
diff --git a/samba/.md5sum b/samba/.md5sum
index 7e034d0..a5cfd51 100644
--- a/samba/.md5sum
+++ b/samba/.md5sum
@@ -1,3 +1,3 @@
 448caca4745aef1a842f4fdb1aa62e1e  samba
-81bbd16048c6ca40baea8c59126ee385  samba-3.5.11.tar.gz
+e297e0ea7923c7de8d7c1d8fd0ec0a05  samba-3.6.0.tar.gz
 fbaccda19afc8f75f6f0123cab82c87e  samba-config.patch
diff --git a/samba/Pkgfile b/samba/Pkgfile
index 68b1f4f..4d8cde9 100644
--- a/samba/Pkgfile
+++ b/samba/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  ncurses openssl readline zlib tdb talloc libcap acl
 
 name=samba
-version=3.5.11
+version=3.6.0
 release=1
 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
         samba-config.patch samba)
@@ -12,7 +12,7 @@ source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
 build () {
     cd $name-$version/source3
 
-    patch -d .. -p1 -i $SRC/samba-config.patch
+    #patch -d .. -p1 -i $SRC/samba-config.patch
 
     ./configure --prefix=/usr \
                 --localstatedir=/var \
@@ -21,19 +21,16 @@ build () {
                 --with-modulesdir=/usr/lib/samba \
                 --with-lockdir=/var/run/samba \
                 --with-piddir=/var/run/samba \
+                --with-nmbdsocketdir=/var/run/samba \
                 --with-mandir=/usr/man \
                 --with-logfilebase=/var/log/samba \
                 --disable-swat \
                 --with-included-popt \
-                --with-cifs{mount,umount} \
                 --enable-external-{libtdb,libtalloc}
 
     make
     make DESTDIR=$PKG install
 
-    install -d $PKG/sbin
-    mv $PKG/usr/sbin/*.cifs $PKG/sbin
-
     # nsswitch extensions
     install -d $PKG/lib
     install ../nsswitch/libnss_win{s,bind}.so $PKG/lib



More information about the CRUX mailing list