diff options
| -rw-r--r-- | net/samba/Makefile | 3 | ||||
| -rw-r--r-- | net/samba/distinfo | 3 | ||||
| -rw-r--r-- | net/samba/patches/patch-client_client.c | 18 |
3 files changed, 22 insertions, 2 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 739f04dbba0..64bcb9e2273 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.209 2012/01/29 22:01:19 taca Exp $ +# $NetBSD: Makefile,v 1.210 2012/01/30 13:44:06 tron Exp $ .include "../../net/samba/Makefile.mirrors" DISTNAME= samba-${VERSION} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=stable/} diff --git a/net/samba/distinfo b/net/samba/distinfo index 6f1d895d7f0..671c023a16c 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.80 2012/01/30 07:24:42 sbd Exp $ +$NetBSD: distinfo,v 1.81 2012/01/30 13:44:06 tron Exp $ SHA1 (samba-3.6.3.tar.gz) = 430a1e13fe20c17e2808035c863eb5e77685c89b RMD160 (samba-3.6.3.tar.gz) = fd04fd5897f0f34f257c504de911e1ab34ff3e25 @@ -30,3 +30,4 @@ SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47 SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973 +SHA1 (patch-client_client.c) = e65d4c17d77f61aa1f3f30b19d500756f6287fd8 diff --git a/net/samba/patches/patch-client_client.c b/net/samba/patches/patch-client_client.c new file mode 100644 index 00000000000..d86dd932a19 --- /dev/null +++ b/net/samba/patches/patch-client_client.c @@ -0,0 +1,18 @@ +$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; |