diff options
| author | tron <tron@pkgsrc.org> | 2012-01-30 23:07:06 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2012-01-30 23:07:06 +0000 |
| commit | a5b7bd8e2e46f6e52cd74ae90ee15348761f236a (patch) | |
| tree | 97ff10c7c386565cd75ecca8950e2c76261b54a0 /net/samba | |
| parent | 3e5bdf51b4f0784c9dce1510d733728762dd0aaf (diff) | |
| download | pkgsrc-a5b7bd8e2e46f6e52cd74ae90ee15348761f236a.tar.gz | |
Third time's the charm:
Replace patch for SMBecho compatibility problem with patch provided by
the Samba maintainers. Successfully tested with an Apple Time Capsule.
Diffstat (limited to 'net/samba')
| -rw-r--r-- | net/samba/Makefile | 4 | ||||
| -rw-r--r-- | net/samba/distinfo | 4 | ||||
| -rw-r--r-- | net/samba/patches/patch-client_client.c | 21 |
3 files changed, 19 insertions, 10 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 63bff750f82..7279d711c17 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.212 2012/01/30 15:48:11 tron Exp $ +# $NetBSD: Makefile,v 1.213 2012/01/30 23:07:06 tron Exp $ .include "../../net/samba/Makefile.mirrors" DISTNAME= samba-${VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=stable/} diff --git a/net/samba/distinfo b/net/samba/distinfo index 67f1d820900..4317a2ba52f 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.82 2012/01/30 15:48:11 tron Exp $ +$NetBSD: distinfo,v 1.83 2012/01/30 23:07:06 tron Exp $ SHA1 (samba-3.6.3.tar.gz) = 430a1e13fe20c17e2808035c863eb5e77685c89b RMD160 (samba-3.6.3.tar.gz) = fd04fd5897f0f34f257c504de911e1ab34ff3e25 @@ -30,4 +30,4 @@ SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47 SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973 -SHA1 (patch-client_client.c) = c25841ce89721c0d47e2e4f880949b8a158030c6 +SHA1 (patch-client_client.c) = 5e9f25680273fc01c9a2276a09d560b0c9ee9d0d diff --git a/net/samba/patches/patch-client_client.c b/net/samba/patches/patch-client_client.c index 2192b392ad2..93daca88433 100644 --- a/net/samba/patches/patch-client_client.c +++ b/net/samba/patches/patch-client_client.c @@ -1,18 +1,27 @@ -$NetBSD: patch-client_client.c,v 1.2 2012/01/30 15:48:11 tron Exp $ +$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: +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 13:05:27.000000000 +0000 -@@ -4844,7 +4844,8 @@ ++++ 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_IS_OK(status) -+ && NT_STATUS_V(status) != 0xffff0002) { ++ 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). */ + } + } + |