update to samba 3.6.1; lots of bugfixes.

similar diff / ok Ian McWilliam (maintainer). also tested by dhill, thanks!
avsm · Oct 21, 2011 · 99f5dc5 · 99f5dc5
1 parent 6f13d5b
commit 99f5dc5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 34 deletions.
diff --git a/net/samba/Makefile b/net/samba/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.151 2011/09/26 09:32:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.152 2011/10/21 20:10:51 sthen Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT-main=		SMB and CIFS client and server for UNIX
 COMMENT-docs=		additional documentation and examples for Samba
 
-DISTNAME=		samba-3.6.0
+DISTNAME=		samba-3.6.1
 PKGNAME-main=		${DISTNAME}
 FULLPKGNAME-docs=	${DISTNAME:S/-/-docs-/}
 FULLPKGPATH-docs=	net/samba,-docs
@@ -41,12 +41,12 @@ LIB_DEPENDS=	databases/tdb>=1.2.7 \
 		devel/libexecinfo \
 		devel/libtalloc
 
-MAKE_FLAGS+=	PASSWD_PROGRAM="/usr/bin/passwd"  \
-		LIBSMBCLIENT_SOVER="${LIBsmbclient_VERSION}" \
-		LIBSMBSHAREMODES_SOVER="${LIBsmbsharemodes_VERSION}" \
-		LIBNETAPI_SOVER="${LIBnetapi_VERSION}" \
-		LIBADDNS_SOVER="${LIBaddns_VERSION}" \
-		LIBWBCLIENT_SOVER="${LIBwbclient_VERSION}"
+MAKE_FLAGS+=	PASSWD_PROGRAM="/usr/bin/passwd" \
+		LIBSMBCLIENT_SHARED_TARGET_SONAME="bin/libsmbclient.so.${LIBsmbclient_VERSION}" \
+		LIBSMBSHAREMODES_SHARED_TARGET_SONAME="bin/libsmbsharemodes.so.${LIBsmbsharemodes_VERSION}" \
+		LIBNETAPI_SHARED_TARGET_SONAME="bin/libnetapi.so.${LIBnetapi_VERSION}" \
+		LIBADDNS_SHARED_TARGET_SONAME="bin/libaddns.so.${LIBaddns_VERSION}" \
+		LIBWBCLIENT_SHARED_TARGET_SONAME="bin/libwbclient.so.${LIBwbclient_VERSION}"
 
 CONFDIR=		${SYSCONFDIR}/samba
 SAMBA_LOGDIR=		/var/log/samba

diff --git a/net/samba/distinfo b/net/samba/distinfo
@@ -1,5 +1,5 @@
-MD5 (samba-3.6.0.tar.gz) = 4pfg6nkjx96NfB2P0OwKBQ==
-RMD160 (samba-3.6.0.tar.gz) = jheABGZEO9ZSnCMS7uyKz6sdf2M=
-SHA1 (samba-3.6.0.tar.gz) = yH4kgddV86fyK65E7y8iymS50XM=
-SHA256 (samba-3.6.0.tar.gz) = 4cFFaeR4V1iDjneFK8HpWMFUBRRs+s5WjCXFcmgC9T8=
-SIZE (samba-3.6.0.tar.gz) = 28990069
+MD5 (samba-3.6.1.tar.gz) = UpFxe+BzTgfcB7YRDhYuhw==
+RMD160 (samba-3.6.1.tar.gz) = btROZrIs7wAWiDH6ftE1cf1eRe0=
+SHA1 (samba-3.6.1.tar.gz) = /tgv2SlY8yCe2zxxMh1LSKvunEs=
+SHA256 (samba-3.6.1.tar.gz) = xbDyqwL+LGQbHOUqFBwo8bP7wJOtqKYu7KcMJeFb1WQ=
+SIZE (samba-3.6.1.tar.gz) = 28984820
diff --git a/net/samba/patches/patch-configure_in b/net/samba/patches/patch-configure_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.21 2011/09/26 09:32:12 sthen Exp $
---- configure.in.orig	Tue Aug  9 13:17:47 2011
-+++ configure.in	Mon Sep 12 17:40:48 2011
-@@ -1638,8 +1638,7 @@ DSO_EXPORTS=""
+$OpenBSD: patch-configure_in,v 1.22 2011/10/21 20:10:51 sthen Exp $
+--- configure.in.orig	Tue Oct 18 19:48:48 2011
++++ configure.in	Fri Oct 21 13:04:40 2011
+@@ -1640,8 +1640,7 @@ DSO_EXPORTS=""
  			;;
  		*openbsd*)  BLDSHARED="true"
  			LDSHFLAGS="-shared"

diff --git a/net/samba/pkg/PLIST-docs b/net/samba/pkg/PLIST-docs
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-docs,v 1.16 2011/09/26 09:32:12 sthen Exp $
+@comment $OpenBSD: PLIST-docs,v 1.17 2011/10/21 20:10:51 sthen Exp $
 @conflict samba-<3.6.0
 @pkgpath net/samba,-docs,ads
 @pkgpath net/samba,-docs,cups
@@ -413,13 +413,6 @@ share/swat/help/manpages/idmap_rid.8.html
 share/swat/help/manpages/idmap_tdb.8.html
 share/swat/help/manpages/idmap_tdb2.8.html
 share/swat/help/manpages/index.html
-share/swat/help/manpages/ldb.3.html
-share/swat/help/manpages/ldbadd.1.html
-share/swat/help/manpages/ldbdel.1.html
-share/swat/help/manpages/ldbedit.1.html
-share/swat/help/manpages/ldbmodify.1.html
-share/swat/help/manpages/ldbrename.1.html
-share/swat/help/manpages/ldbsearch.1.html
 share/swat/help/manpages/libsmbclient.7.html
 share/swat/help/manpages/lmhosts.5.html
 share/swat/help/manpages/log2pcap.1.html
@@ -456,6 +449,7 @@ share/swat/help/manpages/tdbtool.8.html
 share/swat/help/manpages/testparm.1.html
 share/swat/help/manpages/vfs_acl_tdb.8.html
 share/swat/help/manpages/vfs_acl_xattr.8.html
+share/swat/help/manpages/vfs_aio_fork.8.html
 share/swat/help/manpages/vfs_audit.8.html
 share/swat/help/manpages/vfs_cacheprime.8.html
 share/swat/help/manpages/vfs_cap.8.html

diff --git a/net/samba/pkg/PLIST-main b/net/samba/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.18 2011/09/26 09:32:12 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.19 2011/10/21 20:10:51 sthen Exp $
 @conflict samba-docs-<3.6.0
 @pkgpath ${BASE_PKGPATH}
 @bin bin/eventlogadm
@@ -96,12 +96,6 @@ lib/samba/vfs/xattr_tdb.so
 @bin libexec/swat
 @bin libexec/winbindd
 @man man/man1/findsmb.1
-@man man/man1/ldbadd.1
-@man man/man1/ldbdel.1
-@man man/man1/ldbedit.1
-@man man/man1/ldbmodify.1
-@man man/man1/ldbrename.1
-@man man/man1/ldbsearch.1
 @man man/man1/log2pcap.1
 @man man/man1/nmblookup.1
 @man man/man1/ntlm_auth.1
@@ -137,7 +131,6 @@ lib/samba/vfs/xattr_tdb.so
 @man man/man8/idmap_rid.8
 @man man/man8/idmap_tdb.8
 @man man/man8/idmap_tdb2.8
-@comment @man man/man8/mount.cifs.8
 @man man/man8/net.8
 @man man/man8/nmbd.8
 @comment @man man/man8/pam_winbind.8
@@ -150,9 +143,9 @@ lib/samba/vfs/xattr_tdb.so
 @man man/man8/tdbbackup.8
 @man man/man8/tdbdump.8
 @man man/man8/tdbtool.8
-@comment @man man/man8/umount.cifs.8
 @man man/man8/vfs_acl_tdb.8
 @man man/man8/vfs_acl_xattr.8
+@man man/man8/vfs_aio_fork.8
 @man man/man8/vfs_audit.8
 @man man/man8/vfs_cacheprime.8
 @man man/man8/vfs_cap.8