Mon Jan 30 13:44:06 2012 UTC ()
Restore compatibility of "smbclient" with CIFS server on the
Apple Time Capsule.


(tron)
diff -r1.209 -r1.210 pkgsrc/net/samba/Makefile
diff -r1.80 -r1.81 pkgsrc/net/samba/distinfo
diff -r0 -r1.1 pkgsrc/net/samba/patches/patch-client_client.c
cvs diff -r1.209 -r1.210 pkgsrc/net/samba/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba/Makefile 2012/01/29 22:01:19 1.209
+++ pkgsrc/net/samba/Makefile 2012/01/30 13:44:06 1.210
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.209 2012/01/29 22:01:19 taca Exp $ 1# $NetBSD: Makefile,v 1.210 2012/01/30 13:44:06 tron Exp $
2 2
3.include "../../net/samba/Makefile.mirrors" 3.include "../../net/samba/Makefile.mirrors"
4 4
5DISTNAME= samba-${VERSION} 5DISTNAME= samba-${VERSION}
 6PKGREVISION= 1
6CATEGORIES= net 7CATEGORIES= net
7MASTER_SITES= ${SAMBA_MIRRORS:=stable/} 8MASTER_SITES= ${SAMBA_MIRRORS:=stable/}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.samba.org/ 11HOMEPAGE= http://www.samba.org/
11COMMENT= SMB/CIFS protocol server suite 12COMMENT= SMB/CIFS protocol server suite
12LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
13 14
14VERSION= 3.6.3 15VERSION= 3.6.3
15CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* 16CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
16 17
17PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
18 19
cvs diff -r1.80 -r1.81 pkgsrc/net/samba/distinfo (expand / switch to unified diff)

--- pkgsrc/net/samba/distinfo 2012/01/30 07:24:42 1.80
+++ pkgsrc/net/samba/distinfo 2012/01/30 13:44:06 1.81
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.80 2012/01/30 07:24:42 sbd Exp $ 1$NetBSD: distinfo,v 1.81 2012/01/30 13:44:06 tron Exp $
2 2
3SHA1 (samba-3.6.3.tar.gz) = 430a1e13fe20c17e2808035c863eb5e77685c89b 3SHA1 (samba-3.6.3.tar.gz) = 430a1e13fe20c17e2808035c863eb5e77685c89b
4RMD160 (samba-3.6.3.tar.gz) = fd04fd5897f0f34f257c504de911e1ab34ff3e25 4RMD160 (samba-3.6.3.tar.gz) = fd04fd5897f0f34f257c504de911e1ab34ff3e25
5Size (samba-3.6.3.tar.gz) = 28993737 bytes 5Size (samba-3.6.3.tar.gz) = 28993737 bytes
6SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e 6SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
7SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 7SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
8SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032 8SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
9SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 9SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
10SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 10SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
11SHA1 (patch-af) = 0c40e9ead1c3aba58448dd0a35669de598e543b7 11SHA1 (patch-af) = 0c40e9ead1c3aba58448dd0a35669de598e543b7
12SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c 12SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c
13SHA1 (patch-ah) = a75ab50dbdb2de48915e55e43d06e713275b23e2 13SHA1 (patch-ah) = a75ab50dbdb2de48915e55e43d06e713275b23e2
14SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386 14SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386
@@ -20,13 +20,14 @@ SHA1 (patch-ao) = bc31d3003bdaad141652da @@ -20,13 +20,14 @@ SHA1 (patch-ao) = bc31d3003bdaad141652da
20SHA1 (patch-aq) = c3d1a3045364bebaa6c90967837907bd1de0964b 20SHA1 (patch-aq) = c3d1a3045364bebaa6c90967837907bd1de0964b
21SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a 21SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a
22SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61 22SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61
23SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b 23SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b
24SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84 24SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84
25SHA1 (patch-av) = fccde3e48f2b3de3b1adfaa488a67c57696d1a83 25SHA1 (patch-av) = fccde3e48f2b3de3b1adfaa488a67c57696d1a83
26SHA1 (patch-aw) = 36cb31313cdbd1e4670f33924371df5ed3390420 26SHA1 (patch-aw) = 36cb31313cdbd1e4670f33924371df5ed3390420
27SHA1 (patch-ba) = 87799a62831b45e6cde8c36fbafbc08596411f98 27SHA1 (patch-ba) = 87799a62831b45e6cde8c36fbafbc08596411f98
28SHA1 (patch-bb) = 6283ffa8781d0c069f81e80704a018028e6b2b50 28SHA1 (patch-bb) = 6283ffa8781d0c069f81e80704a018028e6b2b50
29SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea 29SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea
30SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47 30SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47
31SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa 31SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa
32SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973 32SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973
 33SHA1 (patch-client_client.c) = e65d4c17d77f61aa1f3f30b19d500756f6287fd8
File Added: pkgsrc/net/samba/patches/Attic/patch-client_client.c
$NetBSD: patch-client_client.c,v 1.1 2012/01/30 13:44:06 tron Exp $

Restore compatibility with CIFS server on Apple Time Capsule:

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 13:05:27.000000000 +0000
@@ -4844,7 +4844,8 @@
 		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_IS_OK(status)
+		    && NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
 			DEBUG(0, ("SMBecho failed. Maybe server has closed "
 				"the connection\n"));
 			finished = true;