fix two segfaults, see upstream bugs 7205, 7250. Patches have been backported, can be dropped when 3.5.3 is out

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 61 insertions, 15 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8f723a683e5a..ae4c33fc4003 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.409 2010/05/04 14:26:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.410 2010/05/10 11:26:09 lxnay Exp $
+
+*samba-3.5.2-r1 (10 May 2010)
+
+  10 May 2010; Fabio Erculiani <lxnay@gentoo.org>
+  +files/3.5.2-backport-fix-ipv6-cifs-mount.patch, -samba-3.5.2.ebuild,
+  +files/3.5.2-backport-fix-smbclient-segfault.patch,
+  +samba-3.5.2-r1.ebuild:
+  fix two segfaults, see upstream bugs 7205, 7250. Patches have been
+  backported, can be dropped when 3.5.3 is out
 
   03 May 2010; Olivier Crête <tester@gentoo.org> ChangeLog:
   amd64 stable, bug #300158
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7b764836effb..b3e535654951 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.0.26a-invalid-free-fix.patch 541 RMD160 13e1b0420ae9c06a2e6d4f9a8a0a3af8c32318b9 SHA1 0457c901f55b86b9b3751dc67b86a26cb19ec4e7 SHA256 4a727b9a02cbc7e2efc00190d5068c82e12a0b9fdad2a50869a2f10bc39a06f2
 AUX 3.0.26a-lazyldflags.patch 1466 RMD160 12a3d97c8b84af5dea7c70173e4613bc663d4e8d SHA1 35742557c810ae4bfbbfecc3a6c3549c392fd313 SHA256 07eb35a567540bc88657f75881c8daf10de3697b64ec9bd7167f1df80cfb0d55
 AUX 3.0.28-autoconf-2.62-fix.patch 524 RMD160 843a8adb134376259485fba22deceeebf453abea SHA1 2adfe8d3a5ea32971c67305fc047f39e5c03ba76 SHA256 0b9b80b52899154f6526d4864218742c2ec836d44a8a4045e091b3bb40449171
@@ -19,6 +16,8 @@ AUX 3.4/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SH
 AUX 3.4/smbusers 218 RMD160 6a8acc59ff824419c9f10db432ae8ed9d0ec5651 SHA1 5bad77d5e82f914b716722b4d5fa5126236b73ef SHA256 97562315c02ed571aca99ba857a1fab7550fa8dbbf3eebcb41157b2d5deb57b3
 AUX 3.4/swat.xinetd 527 RMD160 a4b3d8c6fef6417007fe17bba7737bf6c6821696 SHA1 706cfa524e14f16237f6f6a8039236b59e1beddc SHA256 f59fe771e6804296ac3a0a7c3ad88dd3ae2cd59b89c64af8924f6e0f2ad30cd0
 AUX 3.4/system-auth-winbind.pam 705 RMD160 f6275a470e06dc168cf39ef144ccc190901978ee SHA1 a8e4946fc4dd24b00b9ce7d8574795e987350462 SHA256 046ba3a997328eeeaffa65d662b90dc415a27c8a77f9e4402d2a979aace97dd7
+AUX 3.5.2-backport-fix-ipv6-cifs-mount.patch 435 RMD160 98e1dbe42921c9dc7e3821995ad9a696313d97e9 SHA1 9c994a3045f283678d88646cef34f0a9dacb0728 SHA256 fa1ffc9e7b02744eb31d6345ae06fd7167f82bf2b0ffbf56e6ab8dc13329dbc5
+AUX 3.5.2-backport-fix-smbclient-segfault.patch 1164 RMD160 568933f0f200f107ae243435a3f1ee780e5b6208 SHA1 255dc08133f72436490626d37bbc210466f187e9 SHA256 73f00f28378268ddb8b96cbd08be79a9685372590d9e9dc7d1380bfa163eb8df
 AUX 3.5/lmhosts 126 RMD160 485c480c5d3203e5f6c3d769ea36d04682a4ce39 SHA1 149e536986bddaf961d77e73f3bf04f39212333d SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e
 AUX 3.5/nsswitch.conf-winbind 406 RMD160 43175297fb2ca9e364a7e07e6b1f7cec367f36f5 SHA1 16c57e5ba8d07ecc50d0e1a93df5bc82c4063764 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893
 AUX 3.5/nsswitch.conf-wins 392 RMD160 58b135036c4a7ecab97bf532b35da3d50693c4bf SHA1 7945e42a4d72e4604678add14ecdbb9bde8e9894 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8
@@ -64,14 +63,7 @@ EBUILD samba-3.0.37.ebuild 9995 RMD160 84b79edc774ea3053755016756724cf14e757691
 EBUILD samba-3.2.15.ebuild 8586 RMD160 1b4e8d899150a548892ac7c91f0e6165f8ca0171 SHA1 660bdcb314a0d5fc0988fecf806952f0356e4065 SHA256 d5d9c1a5f56bb7c936c4aeae7c72cb16e1c1a92313670cd5131e56c20873a8b1
 EBUILD samba-3.4.6.ebuild 10341 RMD160 d78afcfaab13d86494b0f856f620d6932c86d617 SHA1 09266b2a48f6d2e1f0cec5e381df53e9ce7a00e7 SHA256 6f4909d163c9d48bc73295c44af162109ebf071c0627d83975f8b81b6d593c93
 EBUILD samba-3.5.0.ebuild 10377 RMD160 8bb7f9bcfcd13002cd72733c0e52fa0480ebeb3a SHA1 1c0dc8330d747943135bb7d37e8eee3b3ec295fa SHA256 52a728a009223e74bcc6ab7e31dce0b8cbe1bf68463ceddfe49298d5fbd5b5a3
-EBUILD samba-3.5.2.ebuild 10376 RMD160 6dd507ea4fa760d3c4e2049f31d471769ecdece8 SHA1 b8b047975a74a2948266f76422c18e082caa663a SHA256 09c7f8f80e6255c9f2dfd6016d232bf53e99f64c7969cfc8cab58198db7c8825
+EBUILD samba-3.5.2-r1.ebuild 10445 RMD160 bb1b2f5250de4b9f236a569789c622fe8a24c4fd SHA1 eb17a5f33d25f0317203a72eb35ec60b27916314 SHA256 4f1e292fa10e151334f83dbce750a8edccbe62bb05a2774b24edf30194ab7624
 EBUILD samba-4.0.0_alpha11.ebuild 4156 RMD160 d63bbf124c3fde8d264da490122a0826dda1aa13 SHA1 4bd67529b6094b91349e138614ba36075e5912c5 SHA256 619c7c38aa499083e3ee7ba06f681851b76a4456c1b8e8f3d4f3c998eaccda58
-MISC ChangeLog 68151 RMD160 65263320de3061a2d2c8c3a0924bf7af5b731647 SHA1 1f261b0e577e4e841c1a7e348a19e1dd03fba31a SHA256 0358d4f3524483e54e20e7abe9033c402ee053ef44232055c1888288e3f80aeb
+MISC ChangeLog 68500 RMD160 8deaad715635e7d21bb6c095fef98cdf38fcdc58 SHA1 750f3aa6493b243e9dcedf7fdc06f36353aadab0 SHA256 2e22174071232e226723416a1a553a9d4c26659febd7f7dd1989c38c29e58414
 MISC metadata.xml 1678 RMD160 fc5f6a9674053523edb993fda99f75789e995231 SHA1 7a3f710083ab340eb139281a0d9d94af1aaa4927 SHA256 afeddf0c54227bcdd40ccc67c65b5ee8809cbba447d0500773270d89de7d044e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvgLpkACgkQmOfEJZHYOKe1JgCg0hLZuvPC9so9Y6MSxHdHS5Af
-StMAoKQ5KEUrl1i/uuDrJvY1CEDiKR93
-=BX44
------END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/3.5.2-backport-fix-ipv6-cifs-mount.patch b/net-fs/samba/files/3.5.2-backport-fix-ipv6-cifs-mount.patch
new file mode 100644
index 000000000000..89bef6533765
--- /dev/null
+++ b/net-fs/samba/files/3.5.2-backport-fix-ipv6-cifs-mount.patch
@@ -0,0 +1,11 @@
+--- client/mount.cifs.c.orig	2010-03-03 13:42:02.143936727 +1000
++++ client/mount.cifs.c	2010-03-04 01:53:22.752879004 +1000
+@@ -1563,7 +1563,7 @@
+ 		}
+ 	}
+
+-	if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
++	if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
+ 		strlcat(options, "%", options_size);
+ 		current_len = strnlen(options, options_size);
+ 		optionstail = options + current_len; 
diff --git a/net-fs/samba/files/3.5.2-backport-fix-smbclient-segfault.patch b/net-fs/samba/files/3.5.2-backport-fix-smbclient-segfault.patch
new file mode 100644
index 000000000000..dbce01d3ddb0
--- /dev/null
+++ b/net-fs/samba/files/3.5.2-backport-fix-smbclient-segfault.patch
@@ -0,0 +1,32 @@
+From: Tim Prouty <tprouty@samba.org>
+Date: Mon, 4 Jan 2010 20:57:34 +0000 (-0800)
+Subject: s3 torture: Prevent smbcli segfault when running smbtorture3 against an smbd with ...
+X-Git-Tag: release-4-0-0alpha11~150
+X-Git-Url: http://gitweb.samba.org/?p=samba.git;a=commitdiff_plain;h=34f0cff0664f1c160ee7442461e9f875e8d8f4dc;hp=dc689827114c46b3ca2a75082421dc2d98001ce7
+
+s3 torture: Prevent smbcli segfault when running smbtorture3 against an smbd with security=share
+---
+
+diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
+index 31216b8..fa79ebc 100644
+--- a/source3/libsmb/cliconnect.c
++++ b/source3/libsmb/cliconnect.c
+@@ -1573,6 +1573,8 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx,
+ 	char *tmp = NULL;
+ 	uint8_t *bytes;
+ 
++	*psmbreq = NULL;
++
+ 	req = tevent_req_create(mem_ctx, &state, struct cli_tcon_andx_state);
+ 	if (req == NULL) {
+ 		return NULL;
+@@ -1708,6 +1710,9 @@ struct tevent_req *cli_tcon_andx_send(TALLOC_CTX *mem_ctx,
+ 	if (req == NULL) {
+ 		return NULL;
+ 	}
++	if (subreq == NULL) {
++		return req;
++	}
+ 	status = cli_smb_req_send(subreq);
+ 	if (!NT_STATUS_IS_OK(status)) {
+ 		tevent_req_nterror(req, status);
diff --git a/net-fs/samba/samba-3.5.2.ebuild b/net-fs/samba/samba-3.5.2-r1.ebuild
index 3eb10af41441..060813bfe776 100644
--- a/net-fs/samba/samba-3.5.2.ebuild
+++ b/net-fs/samba/samba-3.5.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.2.ebuild,v 1.2 2010/04/08 10:05:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.2-r1.ebuild,v 1.1 2010/05/10 11:26:10 lxnay Exp $
 
 EAPI="2"
 
-inherit pam confutils versionator multilib
+inherit pam confutils versionator multilib eutils
 
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
@@ -93,6 +93,8 @@ src_prepare() {
 	sed -i \
 		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
 		configure || die "sed failed"
+
+	cd "${S}/../" && epatch "${FILESDIR}"/${PV}-backport-fix-*
 }
 
 src_configure() {