Add patch to fix CVE-2011-2895. #408887

Package-Manager: portage-2.2.0_alpha89/cvs/FreeBSD i386

4 files changed, 74 insertions, 10 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 3587d7eff7fd..e4eecb30c872 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.76 2012/03/30 15:49:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.77 2012/04/02 10:22:58 naota Exp $
+
+*freebsd-ubin-8.2-r1 (02 Apr 2012)
+
+  02 Apr 2012; Naohiro Aota <naota@gentoo.org>
+  +files/freebsd-ubin-8.2-compress.patch, +freebsd-ubin-8.2-r1.ebuild,
+  -freebsd-ubin-8.2.ebuild:
+  Add patch to fix CVE-2011-2895. #408887
 
   30 Mar 2012; Alexis Ballier <aballier@gentoo.org>
   -freebsd-ubin-9.0_rc1.ebuild, -freebsd-ubin-9.0_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 7865fd479374..5d189140509f 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -6,6 +6,7 @@ AUX freebsd-ubin-6.0-fixmakefiles.patch 1457 RMD160 9fed268f43c4b8949f734900cb18
 AUX freebsd-ubin-6.0-kdump-ioctl.patch 1111 RMD160 d0cc816e7835b236c94c79a4ee2c45938d5246ff SHA1 9c4d8dde1fafd247980bb1367104ef89cc0adb98 SHA256 71f41de71568dd819e39c871dd5e570141f243dbabb23d855505c38bec4e9de9
 AUX freebsd-ubin-8.0-bsdar.patch 556 RMD160 113f6bd5a8c0b230645bc57c2a6bb73b6fc91221 SHA1 388f149e08678292f94066f005aed1c92a124d42 SHA256 cb81663b4cbb91372b492f2d8c430c166fe4f425fc464a94bb08ea43e23f278d
 AUX freebsd-ubin-8.0-xinstall.patch 1014 RMD160 997939f063f1515ae9512fda6265a74832719bdb SHA1 7855f78891b397559ddea5e2cd1a5532254475f8 SHA256 124cd30b5f44425d0914c64fd8ae98242c9649e4eb0cb1f786839137532504d6
+AUX freebsd-ubin-8.2-compress.patch 1658 RMD160 5c6c893a1c8b4fb8896ae9b122e8b3ecce54dd8e SHA1 ff69117806c4c5660682195a0522d40fb19aba32 SHA256 19485003b70669399b363c4579cecac7fe0b59e3127a13a2c2bc103526fe226c
 AUX freebsd-ubin-9.0-fixmakefiles.patch 445 RMD160 c6408fdd15d5cefc8ddf65575150d7f5b1dd83e9 SHA1 e65c27c37f6bfc2916bb96fe96e8971997824125 SHA256 88c90ea1e20afb56ae1b62c4e7ca9de8da8aa9b3726059a96e85beea13935d1c
 AUX freebsd-ubin-lint-stdarg.patch 792 RMD160 673ce804ebd887121160da5d1993787334099903 SHA1 948ade4052f3ec1865ee782116495a508bf70183 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6
 AUX freebsd-ubin-setXid.patch 3723 RMD160 f08790ad10346a69c7e84df111ec1219862298da SHA1 cff080269398d3b5ef5c990ac51e294cd9dc1f8d SHA256 961ac8dcd9efa4f1aab18f56b26c6210d1d5bf441410aae392160e7c0242d16d
@@ -50,14 +51,14 @@ DIST freebsd-ubin-9.0.tar.bz2 1962957 RMD160 0e01edf7896057b95ee2630ab1472329009
 EBUILD freebsd-ubin-7.2.ebuild 4077 RMD160 25eb82e31f1729aa79c2b7239216d8fb95f9ff42 SHA1 59d7de0659bf7f2eb4b9712866c8679e775a0d21 SHA256 0b3b36c131dbb747ee296bcb5e18f6b83fee0d711e2e72df34ab725c11726a85
 EBUILD freebsd-ubin-8.0-r1.ebuild 4491 RMD160 95f736b2966af7d64415c65d213e07f3604259c5 SHA1 32f041d58f410d987d15c0fdbc2e3ce64920eded SHA256 57bca884c6620659e46fdcba0b4250cbf9bea71d048fa1bb77c8efbad7bf298a
 EBUILD freebsd-ubin-8.0.ebuild 4483 RMD160 12ea9a487b4f004964eebc6ded77b5d4a0411630 SHA1 402133c557deeb1f35f7d1aaef31479521b3327b SHA256 f3cfb44634cea441415d082747fb3fdd60518d20db0beb7ee5bd6884cb96bac8
-EBUILD freebsd-ubin-8.2.ebuild 4610 RMD160 0e2e3c07aabbe2480c5e6a6735f0c230cbc4fa40 SHA1 d28f790f7d00269e99480b393198b18a18bf909e SHA256 1cee2a7dfae22e5424ff270d38daa44341b12a62f501bcd5e8fe807f892c3e29
+EBUILD freebsd-ubin-8.2-r1.ebuild 4645 RMD160 66a56ca500df04a6999e2503a5bcc586a9a78fe1 SHA1 a169c0fde09b3a87ef851678b4571e67845f48bc SHA256 aab17d095a0dfde25111ecceb6486e74d4ee71c0288d68b17f4b38f2019ec257
 EBUILD freebsd-ubin-9.0.ebuild 4695 RMD160 acca07a1a1f2368e98895087b65643ae263d87d5 SHA1 3dd22c275abbac50a852466ab8109ac704e7c38e SHA256 fb89008a19b8d8993d987dc0afc0357dbfa76326b56fd7d8ba51aba7ffbbb8fc
-MISC ChangeLog 16153 RMD160 1dd4e49d85074730530f3045eb1040782640706a SHA1 432f560f28907596636ac5e9c852db1a1df3e372 SHA256 7880c898d2244a825b7f20a5bed704508cecaad5d7cd7d2cb662ea398aef0df1
+MISC ChangeLog 16375 RMD160 578f7d698617300b707e6464620c1838afae3269 SHA1 34f4ac2226b3a865656b526bb7bc38f75c9ea72a SHA256 1fa7f38c07878734644851191ebe946f57bbfc33536299bd3b6468ad7e41e16f
 MISC metadata.xml 692 RMD160 ecb15a5894b6f31b822951faf3f2ce8270620f7f SHA1 b54ed38724e56583dcd435d2776fd33e0141b963 SHA256 9d7a61c414fb50713568dc2782c2de6460bac1eff7ca6a9f8a2d25979b48e811
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (FreeBSD)
 
-iEYEARECAAYFAk911iYACgkQvFcC4BYPU0ov1QCgk5A1hl4TljIEb4cTZaIz3+P1
-MqMAoI6JYTbQRyTXhvS6VlBs1KFi+lP3
-=MeGa
+iEYEARECAAYFAk95fgkACgkQGpDnPLSHuMAuiQCdFEsCEby7iQ+l5HmGKEFtHE3v
+ZwcAnRZnGYiIYzs8f/OANr0xw1ALJqLa
+=GNMJ
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch
new file mode 100644
index 000000000000..5bd1d5524c31
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch
@@ -0,0 +1,55 @@
+Index: usr.bin/compress/zopen.c
+===================================================================
+--- usr.bin/compress/zopen.c	(revision 225020)
++++ usr.bin/compress/zopen.c	(working copy)
+@@ -486,7 +486,7 @@ zread(void *cookie, char *rbp, int num)
+ 	block_compress = maxbits & BLOCK_MASK;
+ 	maxbits &= BIT_MASK;
+ 	maxmaxcode = 1L << maxbits;
+-	if (maxbits > BITS) {
++	if (maxbits > BITS || maxbits < 12) {
+ 		errno = EFTYPE;
+ 		return (-1);
+ 	}
+@@ -513,17 +513,28 @@ zread(void *cookie, char *rbp, int num)
+ 			for (code = 255; code >= 0; code--)
+ 				tab_prefixof(code) = 0;
+ 			clear_flg = 1;
+-			free_ent = FIRST - 1;
+-			if ((code = getcode(zs)) == -1)	/* O, untimely death! */
+-				break;
++			free_ent = FIRST;
++			oldcode = -1;
++			continue;
+ 		}
+ 		incode = code;
+ 
+-		/* Special case for KwKwK string. */
++		/* Special case for kWkWk string. */
+ 		if (code >= free_ent) {
++			if (code > free_ent || oldcode == -1) {
++				/* Bad stream. */
++				errno = EINVAL;
++				return (-1);
++			}
+ 			*stackp++ = finchar;
+ 			code = oldcode;
+ 		}
++		/*
++		 * The above condition ensures that code < free_ent.
++		 * The construction of tab_prefixof in turn guarantees that
++		 * each iteration decreases code and therefore stack usage is
++		 * bound by 1 << BITS - 256.
++		 */
+ 
+ 		/* Generate output characters in reverse order. */
+ 		while (code >= 256) {
+@@ -540,7 +551,7 @@ middle:		do {
+ 		} while (stackp > de_stack);
+ 
+ 		/* Generate the new entry. */
+-		if ((code = free_ent) < maxmaxcode) {
++		if ((code = free_ent) < maxmaxcode && oldcode != -1) {
+ 			tab_prefixof(code) = (u_short) oldcode;
+ 			tab_suffixof(code) = finchar;
+ 			free_ent = code + 1;
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild
index 6da997cf5ce8..9a5874db1903 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2.ebuild,v 1.3 2011/08/13 03:05:39 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild,v 1.1 2012/04/02 10:22:58 naota Exp $
 
 EAPI=2
 
@@ -47,7 +47,8 @@ PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
 	"${FILESDIR}/${PN}-lint-stdarg.patch"
 	"${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
 	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-8.0-bsdar.patch" )
+	"${FILESDIR}/${PN}-8.0-bsdar.patch"
+	"${FILESDIR}/${P}-compress.patch" )
 
 # Here we remove some sources we don't need because they are already
 # provided by portage's packages or similar. In order: