summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/samba/Makefile4
-rw-r--r--net/samba/PLIST126
-rw-r--r--net/samba/distinfo9
-rw-r--r--net/samba/patches/patch-client_client.c27
4 files changed, 131 insertions, 35 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 9c13d2bf4b5..a8f2a970b4d 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.219 2012/05/02 14:48:00 taca Exp $
+# $NetBSD: Makefile,v 1.220 2012/07/06 23:32:59 asau Exp $
.include "../../net/samba/Makefile.mirrors"
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite
LICENSE= gnu-gpl-v3
-VERSION= 3.6.5
+VERSION= 3.6.6
CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 356d04f034b..872866797b7 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2012/02/01 08:30:39 sbd Exp $
+@comment $NetBSD: PLIST,v 1.50 2012/07/06 23:32:59 asau Exp $
bin/eventlogadm
bin/findsmb
bin/net
@@ -145,6 +145,7 @@ man/man8/tdbtool.8
man/man8/vfs_acl_tdb.8
man/man8/vfs_acl_xattr.8
man/man8/vfs_aio_fork.8
+man/man8/vfs_aio_pthread.8
man/man8/vfs_audit.8
man/man8/vfs_cacheprime.8
man/man8/vfs_cap.8
@@ -239,6 +240,60 @@ share/samba/swat/help/Samba3-ByExample/appendix.html
share/samba/swat/help/Samba3-ByExample/ch14.html
share/samba/swat/help/Samba3-ByExample/go01.html
share/samba/swat/help/Samba3-ByExample/happy.html
+share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
+share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
+share/samba/swat/help/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
+share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
+share/samba/swat/help/Samba3-ByExample/images/LocalMasterAnnouncement.png
+share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
+share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
+share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
+share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
+share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
+share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
+share/samba/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
+share/samba/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
+share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
+share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
+share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
+share/samba/swat/help/Samba3-ByExample/images/acct2net.png
+share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
+share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
+share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
+share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
+share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
+share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
+share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
+share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net-A.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net2-B.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net2.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net2r.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-netr.png
+share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
+share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
+share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
+share/samba/swat/help/Samba3-ByExample/images/lam-config.png
+share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
+share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
+share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
+share/samba/swat/help/Samba3-ByExample/images/lam-login.png
+share/samba/swat/help/Samba3-ByExample/images/lam-users.png
+share/samba/swat/help/Samba3-ByExample/images/openmag.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp010.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp011.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp012.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp013.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp015.png
share/samba/swat/help/Samba3-ByExample/index.html
share/samba/swat/help/Samba3-ByExample/ix01.html
share/samba/swat/help/Samba3-ByExample/kerberos.html
@@ -314,6 +369,74 @@ share/samba/swat/help/Samba3-HOWTO/domain-member.html
share/samba/swat/help/Samba3-HOWTO/go01.html
share/samba/swat/help/Samba3-HOWTO/groupmapping.html
share/samba/swat/help/Samba3-HOWTO/idmapper.html
+share/samba/swat/help/Samba3-HOWTO/images/10small.png
+share/samba/swat/help/Samba3-HOWTO/images/11small.png
+share/samba/swat/help/Samba3-HOWTO/images/12small.png
+share/samba/swat/help/Samba3-HOWTO/images/13small.png
+share/samba/swat/help/Samba3-HOWTO/images/14small.png
+share/samba/swat/help/Samba3-HOWTO/images/1small.png
+share/samba/swat/help/Samba3-HOWTO/images/2small.png
+share/samba/swat/help/Samba3-HOWTO/images/3small.png
+share/samba/swat/help/Samba3-HOWTO/images/4small.png
+share/samba/swat/help/Samba3-HOWTO/images/5small.png
+share/samba/swat/help/Samba3-HOWTO/images/6small.png
+share/samba/swat/help/Samba3-HOWTO/images/7small.png
+share/samba/swat/help/Samba3-HOWTO/images/8small.png
+share/samba/swat/help/Samba3-HOWTO/images/9small.png
+share/samba/swat/help/Samba3-HOWTO/images/WME001.png
+share/samba/swat/help/Samba3-HOWTO/images/WME002.png
+share/samba/swat/help/Samba3-HOWTO/images/WME003.png
+share/samba/swat/help/Samba3-HOWTO/images/WME004.png
+share/samba/swat/help/Samba3-HOWTO/images/WME005.png
+share/samba/swat/help/Samba3-HOWTO/images/WME006.png
+share/samba/swat/help/Samba3-HOWTO/images/WME007.png
+share/samba/swat/help/Samba3-HOWTO/images/WME008.png
+share/samba/swat/help/Samba3-HOWTO/images/WME009.png
+share/samba/swat/help/Samba3-HOWTO/images/WME010.png
+share/samba/swat/help/Samba3-HOWTO/images/WME011.png
+share/samba/swat/help/Samba3-HOWTO/images/WME012.png
+share/samba/swat/help/Samba3-HOWTO/images/WME013.png
+share/samba/swat/help/Samba3-HOWTO/images/WME014.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
+share/samba/swat/help/Samba3-HOWTO/images/a_small.png
+share/samba/swat/help/Samba3-HOWTO/images/access1.png
+share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
+share/samba/swat/help/Samba3-HOWTO/images/cups1.png
+share/samba/swat/help/Samba3-HOWTO/images/cups2.png
+share/samba/swat/help/Samba3-HOWTO/images/domain.png
+share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
+share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-groups.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
+share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
+share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
+share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp006.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp010.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp011.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp012.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp013.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp015.png
share/samba/swat/help/Samba3-HOWTO/index.html
share/samba/swat/help/Samba3-HOWTO/install.html
share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html
@@ -390,6 +513,7 @@ share/samba/swat/help/manpages/testparm.1.html
share/samba/swat/help/manpages/vfs_acl_tdb.8.html
share/samba/swat/help/manpages/vfs_acl_xattr.8.html
share/samba/swat/help/manpages/vfs_aio_fork.8.html
+share/samba/swat/help/manpages/vfs_aio_pthread.8.html
share/samba/swat/help/manpages/vfs_audit.8.html
share/samba/swat/help/manpages/vfs_cacheprime.8.html
share/samba/swat/help/manpages/vfs_cap.8.html
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 63de312cca1..4edae6dfda4 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.85 2012/05/02 14:48:00 taca Exp $
+$NetBSD: distinfo,v 1.86 2012/07/06 23:32:59 asau Exp $
-SHA1 (samba-3.6.5.tar.gz) = e41611c95b2bb91c7735928742b8aff4fc0da76e
-RMD160 (samba-3.6.5.tar.gz) = 0180e8d4eda9634048d41de166fe7b6a07c38b45
-Size (samba-3.6.5.tar.gz) = 29009444 bytes
+SHA1 (samba-3.6.6.tar.gz) = f1516ce332fe11c68a052855edd745368ac4d8e9
+RMD160 (samba-3.6.6.tar.gz) = 70a520012a1c02085f0d6209c2acac84512d9f8b
+Size (samba-3.6.6.tar.gz) = 34061741 bytes
SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
@@ -30,4 +30,3 @@ SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea
SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47
SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa
SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973
-SHA1 (patch-client_client.c) = 5e9f25680273fc01c9a2276a09d560b0c9ee9d0d
diff --git a/net/samba/patches/patch-client_client.c b/net/samba/patches/patch-client_client.c
deleted file mode 100644
index 93daca88433..00000000000
--- a/net/samba/patches/patch-client_client.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-client_client.c,v 1.3 2012/01/30 23:07:06 tron Exp $
-
-Restore compatibility with CIFS server on Apple Time Capsule. Patch
-take from here:
-
-https://bugzilla.samba.org/show_bug.cgi?id=8139
-
---- client/client.c.orig 2012-01-29 19:40:43.000000000 +0000
-+++ client/client.c 2012-01-30 22:39:12.000000000 +0000
-@@ -4844,12 +4844,16 @@
- memset(garbage, 0xf0, sizeof(garbage));
- status = cli_echo(cli, 1, data_blob_const(garbage, sizeof(garbage)));
-
-- if (!NT_STATUS_IS_OK(status)) {
-+ if (NT_STATUS_EQUAL(status, NT_STATUS_PIPE_BROKEN) ||
-+ NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
-+ NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
- DEBUG(0, ("SMBecho failed. Maybe server has closed "
- "the connection\n"));
- finished = true;
- smb_readline_done();
- }
-+ /* Ignore all other errors - sometimes servers simply
-+ don't implement SMBecho (Apple for example). */
- }
- }
-
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 22:56:49 +0000