New version of net/samba36 port - 3.6.1.

5 files changed, 7 insertions, 40 deletions

diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index e61cb83c3ee6..f20d3aab341a 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=		${SAMBA_BASENAME}36
-PORTVERSION=		3.6.0
-PORTREVISION?=		1
+PORTVERSION=		3.6.1
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
@@ -365,11 +365,9 @@ post-patch:
 .if !defined(SAMBA_SUBPORT)
 # Samba server only
 MAN1=		findsmb.1 \
-		ldbadd.1 ldbdel.1 ldbedit.1 ldbmodify.1 ldbrename.1 ldbsearch.1 \
 		log2pcap.1 nmblookup.1 ntlm_auth.1 profiles.1 rpcclient.1 \
 		sharesec.1 smbcacls.1 smbclient.1 smbcontrol.1 smbcquotas.1 \
 		smbget.1 smbstatus.1 smbtar.1 smbtree.1 testparm.1 vfstest.1
-MAN3=		ldb.3
 MAN5=		lmhosts.5 smb.conf.5 smbgetrc.5 smbpasswd.5
 MAN7=		samba.7
 MAN8=		eventlogadm.8 net.8 nmbd.8 pdbedit.8 smbd.8 smbpasswd.8 \
diff --git a/net/samba36/distinfo b/net/samba36/distinfo
index 09dc22324322..68cb8014f43b 100644
--- a/net/samba36/distinfo
+++ b/net/samba36/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-3.6.0.tar.gz) = e1c14569e4785758838e77852bc1e958c15405146cface568c25c5726802f53f
-SIZE (samba-3.6.0.tar.gz) = 28990069
+SHA256 (samba-3.6.1.tar.gz) = c5b0f2ab02fe2c641b1ce52a141c28f1b3fbc093ada8a62eeca70c25e15bd564
+SIZE (samba-3.6.1.tar.gz) = 28984820
diff --git a/net/samba36/files/sernet.patch b/net/samba36/files/sernet.patch
index 435b78109ced..0337f860fb16 100644
--- a/net/samba36/files/sernet.patch
+++ b/net/samba36/files/sernet.patch
@@ -1,31 +1,5 @@
-0001-s3-vfs_prealloc-fix-build-on-SLES8.patch
 samba3-3.4-honor-all-loopback-ips.patch
 
-From a1cd413de5493b06d7505a441bc5965f27ae38d4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
-Date: Tue, 9 Aug 2011 17:02:29 +0200
-Subject: [PATCH] s3:vfs_prealloc: fix build on SLES8
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
----
- source3/modules/vfs_prealloc.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c
-index 4d1b2e1..fb2e46e 100644
---- a/source3/modules/vfs_prealloc.c
-+++ b/source3/modules/vfs_prealloc.c
-@@ -18,6 +18,7 @@
-  */
- 
- #include "includes.h"
-+#include "system/filesys.h"
- #include "smbd/smbd.h"
- 
- /* Extent preallocation module.
--- 
-1.7.6
-
 commit b6afe7ef236a454d8a6abf104b8846f817378f73
 Author: Björn Jacke <bj@sernet.de>
 Date:   Thu Oct 15 02:02:30 2009 +0200
diff --git a/net/samba36/pkg-plist b/net/samba36/pkg-plist
index 2468db7d7ce4..ce859c506ee3 100644
--- a/net/samba36/pkg-plist
+++ b/net/samba36/pkg-plist
@@ -26,8 +26,9 @@ bin/testparm
 sbin/smbd
 sbin/nmbd
 %%SWAT%%sbin/swat
-%%WINBIND%%lib/libwbclient.so.0
 %%WINBIND%%sbin/winbindd
+%%WINBIND%%lib/libwbclient.so
+%%WINBIND%%lib/libwbclient.so.0
 %%WINBIND%%lib/nss_winbind.so.1
 %%WINBIND%%lib/nss_wins.so.1
 %%WINBIND%%lib/pam_winbind.so
diff --git a/net/samba36/pkg-plist.swat b/net/samba36/pkg-plist.swat
index 8ac368118961..355118feb417 100644
--- a/net/samba36/pkg-plist.swat
+++ b/net/samba36/pkg-plist.swat
@@ -216,13 +216,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/lmhosts.5.html
 share/swat/help/manpages/log2pcap.1.html
 share/swat/help/manpages/net.8.html
@@ -258,6 +251,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