Added security fix for CVE-2007-4138 (bug #192163)

Package-Manager: portage-2.1.3.8

5 files changed, 38 insertions, 13 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f9abbdc883c9..48125aeef476 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.301 2007/09/10 08:21:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.302 2007/09/11 19:50:49 dev-zero Exp $
+
+*samba-3.0.25c-r2 (11 Sep 2007)
+
+  11 Sep 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/3.0.25c-CVE-2007-4138.patch, -samba-3.0.25c-r1.ebuild,
+  +samba-3.0.25c-r2.ebuild:
+  Added security fix for CVE-2007-4138 (bug #192163)
 
   10 Sep 2007; Tiziano Müller <dev-zero@gentoo.org>
   samba-3.0.25c-r1.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7cf5ae2301b5..19e7edd361a8 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -10,6 +10,10 @@ AUX 3.0.24-sid2name_elevation_v2.patch 4776 RMD160 8a0e4c444fbe12a4487d02953026c
 MD5 af06739a1ad5efad42cc240d2d754156 files/3.0.24-sid2name_elevation_v2.patch 4776
 RMD160 8a0e4c444fbe12a4487d02953026c8182cd4da8b files/3.0.24-sid2name_elevation_v2.patch 4776
 SHA256 069954e3dbcc2904a673a19269b65f1f8b6b64d08de7d8d44d3462f349aa3c85 files/3.0.24-sid2name_elevation_v2.patch 4776
+AUX 3.0.25c-CVE-2007-4138.patch 477 RMD160 8c7fcd22b775f4c7b4b3b46ef60d0eba99dd929e SHA1 1ffcb6a777d386356ad08c9e291bbc44e9444627 SHA256 8dedb8429218c4a3fce5eb379fabb283322aa615cfd298145f0a40473bdc43bc
+MD5 7cc4821b92057b3fd99e75a0d6118415 files/3.0.25c-CVE-2007-4138.patch 477
+RMD160 8c7fcd22b775f4c7b4b3b46ef60d0eba99dd929e files/3.0.25c-CVE-2007-4138.patch 477
+SHA256 8dedb8429218c4a3fce5eb379fabb283322aa615cfd298145f0a40473bdc43bc files/3.0.25c-CVE-2007-4138.patch 477
 AUX 3.0.25c-lazyldflags.patch 1466 RMD160 12a3d97c8b84af5dea7c70173e4613bc663d4e8d SHA1 35742557c810ae4bfbbfecc3a6c3549c392fd313 SHA256 07eb35a567540bc88657f75881c8daf10de3697b64ec9bd7167f1df80cfb0d55
 MD5 25d3ba54dede5a4cde1c5d67c3e8090b files/3.0.25c-lazyldflags.patch 1466
 RMD160 12a3d97c8b84af5dea7c70173e4613bc663d4e8d files/3.0.25c-lazyldflags.patch 1466
@@ -82,14 +86,14 @@ EBUILD samba-3.0.24-r3.ebuild 8558 RMD160 8639eaba80f753d5da2bbfa7c2b451c954b563
 MD5 0c0cbf31c82035fa8a41f96dabe0ca4f samba-3.0.24-r3.ebuild 8558
 RMD160 8639eaba80f753d5da2bbfa7c2b451c954b563f3 samba-3.0.24-r3.ebuild 8558
 SHA256 b7179360d8560f2d28d1404bf64cb45d01af910668f4b017f2c0e127202ead4f samba-3.0.24-r3.ebuild 8558
-EBUILD samba-3.0.25c-r1.ebuild 8964 RMD160 7ce16acd64b2d09684b26520b895b3143ab4142d SHA1 01d208e844919b083b9cae17c1d8258c88a4272d SHA256 aaf577bd98d89d7a7d23949242550f4b0aebf5cb5a853f01723f5a2bce8bf464
-MD5 05c2f1220be6cc25e48ae30a2fabf70d samba-3.0.25c-r1.ebuild 8964
-RMD160 7ce16acd64b2d09684b26520b895b3143ab4142d samba-3.0.25c-r1.ebuild 8964
-SHA256 aaf577bd98d89d7a7d23949242550f4b0aebf5cb5a853f01723f5a2bce8bf464 samba-3.0.25c-r1.ebuild 8964
-MISC ChangeLog 51452 RMD160 8d34da5b3e4934445407799451d31f93f76c044c SHA1 3de0d1eb357ab05c055b1e0cdb6d027031187e05 SHA256 a800757bb4928ee672103b8d906b40fea495ad527433809323a19010547243ff
-MD5 c48634c0b7d8e99ee19c3a9541744d46 ChangeLog 51452
-RMD160 8d34da5b3e4934445407799451d31f93f76c044c ChangeLog 51452
-SHA256 a800757bb4928ee672103b8d906b40fea495ad527433809323a19010547243ff ChangeLog 51452
+EBUILD samba-3.0.25c-r2.ebuild 9012 RMD160 49f29d1b6dfd3bcfa710d0cdb404835e271b8f55 SHA1 c8c98b2a39f642e18793e249bf3df837c69497c8 SHA256 369c4fe0860ecb36546767b3f2c4a9300d827e28bd1c5370880c3f43555db28f
+MD5 fb8af40c50ee259a0f2d23dc16fa168e samba-3.0.25c-r2.ebuild 9012
+RMD160 49f29d1b6dfd3bcfa710d0cdb404835e271b8f55 samba-3.0.25c-r2.ebuild 9012
+SHA256 369c4fe0860ecb36546767b3f2c4a9300d827e28bd1c5370880c3f43555db28f samba-3.0.25c-r2.ebuild 9012
+MISC ChangeLog 51684 RMD160 d1b7d08725c85febdfd7c49792970079fa73692e SHA1 4541cecdbc122290d01fcd9c064f6017c70b4923 SHA256 8984acc323446c2039a49844b3e1c03f93290e452ceb6d0ab0d76af0d5dbe444
+MD5 7241e8757185b8d9a0ad69eb17935836 ChangeLog 51684
+RMD160 d1b7d08725c85febdfd7c49792970079fa73692e ChangeLog 51684
+SHA256 8984acc323446c2039a49844b3e1c03f93290e452ceb6d0ab0d76af0d5dbe444 ChangeLog 51684
 MISC metadata.xml 489 RMD160 36eed0edca609c521314ae415efd57ca9acfecb4 SHA1 317e61704a10a3bd888d32c6834721f5d40d00ff SHA256 6f35f13dd39bb51d304fd59b5352c92bc35a957c9c9412c5c1f3f58e98519792
 MD5 324855d88a5c326d1b45b5c7719d5536 metadata.xml 489
 RMD160 36eed0edca609c521314ae415efd57ca9acfecb4 metadata.xml 489
@@ -97,6 +101,6 @@ SHA256 6f35f13dd39bb51d304fd59b5352c92bc35a957c9c9412c5c1f3f58e98519792 metadata
 MD5 e899de085c153ac07e914eeb6e0d0ecb files/digest-samba-3.0.24-r3 768
 RMD160 f62fe0036cb69a6e84304089ec8a83dc8a068199 files/digest-samba-3.0.24-r3 768
 SHA256 4b66f0f4c47fbd739eb37e0a4dceb8ffd525131b9034dea75e3802ecdf06a824 files/digest-samba-3.0.24-r3 768
-MD5 ae776e7a2a73825b1040d5d39e78795c files/digest-samba-3.0.25c-r1 247
-RMD160 c08939296c0097674a68bd340d1fa23f8d8ecbd4 files/digest-samba-3.0.25c-r1 247
-SHA256 6772b5cc291b0f6dbd584253eabd0e7ad75966af1ff8f17c48762a65e4111a9c files/digest-samba-3.0.25c-r1 247
+MD5 ae776e7a2a73825b1040d5d39e78795c files/digest-samba-3.0.25c-r2 247
+RMD160 c08939296c0097674a68bd340d1fa23f8d8ecbd4 files/digest-samba-3.0.25c-r2 247
+SHA256 6772b5cc291b0f6dbd584253eabd0e7ad75966af1ff8f17c48762a65e4111a9c files/digest-samba-3.0.25c-r2 247
diff --git a/net-fs/samba/files/3.0.25c-CVE-2007-4138.patch b/net-fs/samba/files/3.0.25c-CVE-2007-4138.patch
new file mode 100644
index 000000000000..2a6012a840f8
--- /dev/null
+++ b/net-fs/samba/files/3.0.25c-CVE-2007-4138.patch
@@ -0,0 +1,13 @@
+Index: samba-3.0.25c/source/nsswitch/idmap_ad.c
+===================================================================
+--- samba-3.0.25c.orig/source/nsswitch/idmap_ad.c	2007-09-04 13:50:33.000000000 -0500
++++ samba-3.0.25c/source/nsswitch/idmap_ad.c	2007-09-04 13:51:36.000000000 -0500
+@@ -753,7 +753,7 @@
+        
+ 	if ( gid ) {		
+ 		if ( !ads_pull_uint32(ads, msg, ad_schema->posix_gidnumber_attr, gid ) )
+-			*gid = 0;		
++			*gid = (uint32)-1;		
+ 	}
+ 		
+ 	return NT_STATUS_OK;
diff --git a/net-fs/samba/files/digest-samba-3.0.25c-r1 b/net-fs/samba/files/digest-samba-3.0.25c-r2
index f7be3ff4f8de..f7be3ff4f8de 100644
--- a/net-fs/samba/files/digest-samba-3.0.25c-r1
+++ b/net-fs/samba/files/digest-samba-3.0.25c-r2
diff --git a/net-fs/samba/samba-3.0.25c-r1.ebuild b/net-fs/samba/samba-3.0.25c-r2.ebuild
index b755f58ae4fc..ae00462960b7 100644
--- a/net-fs/samba/samba-3.0.25c-r1.ebuild
+++ b/net-fs/samba/samba-3.0.25c-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.25c-r1.ebuild,v 1.3 2007/09/10 08:21:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.25c-r2.ebuild,v 1.1 2007/09/11 19:50:49 dev-zero Exp $
 
 inherit eutils pam python multilib versionator confutils
 
@@ -50,6 +50,7 @@ src_unpack() {
 	# Please read ... for further informations
 	epatch "${FILESDIR}/${PV}-lazyldflags.patch"
 	epatch "${FILESDIR}/${PV}-py_smp.patch"
+	epatch "${FILESDIR}/${PV}-CVE-2007-4138.patch"
 
 	# Ok, agreed, this is ugly. But it avoids a patch we
 	# need for every samba version and we don't need autotools