Revbump adding the patches to fix CVE-2007-4045, see bug #199195. Also remove an older vulnerable version.

Package-Manager: portage-2.1.3.19

8 files changed, 153 insertions, 22 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 049d516d98d6..8aaa3659c314 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.269 2007/11/12 23:36:45 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.270 2007/11/16 20:13:07 tgurr Exp $
+
+*cups-1.3.4-r3 (16 Nov 2007)
+*cups-1.2.12-r3 (16 Nov 2007)
+
+  16 Nov 2007; Timo Gurr <tgurr@gentoo.org>
+  +files/cups-1.2.4-CVE-2007-4045.patch,
+  +files/cups-1.3.4-CVE-2007-4045.patch, -cups-1.2.12-r1.ebuild,
+  +cups-1.2.12-r3.ebuild, -cups-1.3.4-r2.ebuild, +cups-1.3.4-r3.ebuild:
+  Revbump adding the patches to fix CVE-2007-4045, see bug #199195. Also
+  remove an older vulnerable version.
 
 *cups-1.3.4-r2 (12 Nov 2007)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 420fb3c4b794..957ecfa4f22b 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -6,6 +6,10 @@ AUX cups-1.2.0-bindnow.patch 2178 RMD160 cdf51a6734c7a38fab33f270c7c374445a93432
 MD5 17610ba395fa28cc46fe4be7d45c0a44 files/cups-1.2.0-bindnow.patch 2178
 RMD160 cdf51a6734c7a38fab33f270c7c374445a934321 files/cups-1.2.0-bindnow.patch 2178
 SHA256 0fffd86557fdfbf85e32781d1b77f9696e5f0ed7eb30a78fb57ca82cfafdc190 files/cups-1.2.0-bindnow.patch 2178
+AUX cups-1.2.4-CVE-2007-4045.patch 1737 RMD160 6c239b26443af6cf841a457cc5611a2f78d809c3 SHA1 02c2bd1bf58204fd9e1b380f8899dae2f98c2fed SHA256 0e4898b7e42f74f894b416a1398d75bcf6062497a87e061984f09e904f68489e
+MD5 9aee4dabde90a5edd9e484289209ad5f files/cups-1.2.4-CVE-2007-4045.patch 1737
+RMD160 6c239b26443af6cf841a457cc5611a2f78d809c3 files/cups-1.2.4-CVE-2007-4045.patch 1737
+SHA256 0e4898b7e42f74f894b416a1398d75bcf6062497a87e061984f09e904f68489e files/cups-1.2.4-CVE-2007-4045.patch 1737
 AUX cups-1.3.0-bindnow.patch 1919 RMD160 8ee1c27c0236b64df1cfc2a71f59370137768cc1 SHA1 16151a09d7b4a1fc431987191bdb09b92dd9631b SHA256 871d92fb8c6f658d1035a3ff058b5186131dfe295f54ecdcd4bc630b517eee4b
 MD5 f0dfe7ed0d04d09c47a223a8b838629f files/cups-1.3.0-bindnow.patch 1919
 RMD160 8ee1c27c0236b64df1cfc2a71f59370137768cc1 files/cups-1.3.0-bindnow.patch 1919
@@ -14,6 +18,10 @@ AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d
 MD5 b27d2eb4d81529a5fe9bdda12b3fabfa files/cups-1.3.0-configure.patch 651
 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a files/cups-1.3.0-configure.patch 651
 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736 files/cups-1.3.0-configure.patch 651
+AUX cups-1.3.4-CVE-2007-4045.patch 1276 RMD160 4aa328e6c0b30e58cfbf7b645380c147dc20dfd4 SHA1 4595ade2f84a2f868a4735a3ce2e1761e26b0ff4 SHA256 10023e221c1a59263b44d13649a26afbeb7d3e84a52b1c7ab25116eaae92811d
+MD5 4ed35a76be70a4d33d43d9059f603dc5 files/cups-1.3.4-CVE-2007-4045.patch 1276
+RMD160 4aa328e6c0b30e58cfbf7b645380c147dc20dfd4 files/cups-1.3.4-CVE-2007-4045.patch 1276
+SHA256 10023e221c1a59263b44d13649a26afbeb7d3e84a52b1c7ab25116eaae92811d files/cups-1.3.4-CVE-2007-4045.patch 1276
 AUX cupsd.init 288 RMD160 9bd676af5b43a97ba08ca51f70cefb445faeb8b8 SHA1 922868e1a6acb81b83e87a3c6905149789f16503 SHA256 008eeadc4979ad0e1f05e8ce5d22449eb798375e75ffc3176cbef138a53de4f9
 MD5 633b9b98f192f72067ede1ac8c272259 files/cupsd.init 288
 RMD160 9bd676af5b43a97ba08ca51f70cefb445faeb8b8 files/cupsd.init 288
@@ -37,22 +45,22 @@ EBUILD cups-1.2.10-r1.ebuild 6316 RMD160 396839aec0fe91130450f8c4bdc5df0598a5ae2
 MD5 683374c073f1791ca3bfe1a3447b71f8 cups-1.2.10-r1.ebuild 6316
 RMD160 396839aec0fe91130450f8c4bdc5df0598a5ae29 cups-1.2.10-r1.ebuild 6316
 SHA256 b7dc3e71cd9fa05d9f51274e6c9158ccaf4ad5558de57dbf2b34f1c5cc0de95b cups-1.2.10-r1.ebuild 6316
-EBUILD cups-1.2.12-r1.ebuild 6893 RMD160 588b90b337c6861c67dbbdb9582749c9f489e331 SHA1 60b5aa4140d231b5c6f95df20a7a9dc883651dc0 SHA256 a485e5b91d16a68698e70ab1918c16ed47b3cbad579d1ac4d3727959797ca9b3
-MD5 a8d15bc56f0cb020776d61ae06877c93 cups-1.2.12-r1.ebuild 6893
-RMD160 588b90b337c6861c67dbbdb9582749c9f489e331 cups-1.2.12-r1.ebuild 6893
-SHA256 a485e5b91d16a68698e70ab1918c16ed47b3cbad579d1ac4d3727959797ca9b3 cups-1.2.12-r1.ebuild 6893
 EBUILD cups-1.2.12-r2.ebuild 6986 RMD160 98a4b0bab1fdb4bb72ea2d6f4b0e16b0ac5c60c5 SHA1 ed1b978975b632c946a77f31077add4400e4e6df SHA256 986b713b2ca2c023433ba7816c669aa18e898a55f585281c77d91b5c76141a98
 MD5 da5536fe1d61065851bbf3a9d67c6173 cups-1.2.12-r2.ebuild 6986
 RMD160 98a4b0bab1fdb4bb72ea2d6f4b0e16b0ac5c60c5 cups-1.2.12-r2.ebuild 6986
 SHA256 986b713b2ca2c023433ba7816c669aa18e898a55f585281c77d91b5c76141a98 cups-1.2.12-r2.ebuild 6986
-EBUILD cups-1.3.4-r2.ebuild 7941 RMD160 04930285f02a719d5eecf63a944df6c382cee122 SHA1 d1161e50cbc4315378f555679a8cf81809a4cecf SHA256 124d0e8f00ee44322c6b05963fd7edf7acc3a93b8f7a0d90e10955e1c7bf3796
-MD5 82bdb9072fa4a254d6e42500608a01ad cups-1.3.4-r2.ebuild 7941
-RMD160 04930285f02a719d5eecf63a944df6c382cee122 cups-1.3.4-r2.ebuild 7941
-SHA256 124d0e8f00ee44322c6b05963fd7edf7acc3a93b8f7a0d90e10955e1c7bf3796 cups-1.3.4-r2.ebuild 7941
-MISC ChangeLog 38147 RMD160 866d89caba78d0319d35548876481affeb3b3828 SHA1 a836042763b250c4cda59b4be4d81087c550a22e SHA256 a84791857926c90f84642b69fad158be2acb31410a8cd4d25ef4d13ed30dda62
-MD5 1c24c5f0afef460ff5e519587d5119da ChangeLog 38147
-RMD160 866d89caba78d0319d35548876481affeb3b3828 ChangeLog 38147
-SHA256 a84791857926c90f84642b69fad158be2acb31410a8cd4d25ef4d13ed30dda62 ChangeLog 38147
+EBUILD cups-1.2.12-r3.ebuild 7091 RMD160 e4d238125a49c1fe56de56cf915923d9323c452a SHA1 75c1f2fff32355df4750d2ab1846797d4c8b50c3 SHA256 149eb967ae91382f669eb8465a66becba2da1f3135e0b9909e3587dbd567d4ec
+MD5 387ba1942d8477b9bd47421c5f203fdb cups-1.2.12-r3.ebuild 7091
+RMD160 e4d238125a49c1fe56de56cf915923d9323c452a cups-1.2.12-r3.ebuild 7091
+SHA256 149eb967ae91382f669eb8465a66becba2da1f3135e0b9909e3587dbd567d4ec cups-1.2.12-r3.ebuild 7091
+EBUILD cups-1.3.4-r3.ebuild 8034 RMD160 beb20452ff25029bac84c2395687110c0e2eefb7 SHA1 8e8eced71d808af79a0ab6721ad8370e5bc9b125 SHA256 76c2b7f3fe56e4d5ad3cf1fe1a7af5d5025fa44a7efb512b28bdd7a8369a210d
+MD5 b1bdc1da18141ef378d8853bdf504cc3 cups-1.3.4-r3.ebuild 8034
+RMD160 beb20452ff25029bac84c2395687110c0e2eefb7 cups-1.3.4-r3.ebuild 8034
+SHA256 76c2b7f3fe56e4d5ad3cf1fe1a7af5d5025fa44a7efb512b28bdd7a8369a210d cups-1.3.4-r3.ebuild 8034
+MISC ChangeLog 38541 RMD160 e011ecaa5bdbf5e304c672386909e06d614dd993 SHA1 ef28d9f6a318d9c375d4626caaf75ff3de5ef7f0 SHA256 7d750de555a4be7e7b4bcc4aa8f24613d5aa495a93ead8cd99e1d98bc671510e
+MD5 de402c022294bf639d7431d1956d078b ChangeLog 38541
+RMD160 e011ecaa5bdbf5e304c672386909e06d614dd993 ChangeLog 38541
+SHA256 7d750de555a4be7e7b4bcc4aa8f24613d5aa495a93ead8cd99e1d98bc671510e ChangeLog 38541
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -63,12 +71,12 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 126e6284164bd1c1cc5fc98f1b3f1089 files/digest-cups-1.2.10-r1 262
 RMD160 73673bf65cd75f7e5b15918308b45477ce244a5e files/digest-cups-1.2.10-r1 262
 SHA256 66f16eee78c2442511803e6de89563a1f32ff0150e604904a123b2b222f0e3b3 files/digest-cups-1.2.10-r1 262
-MD5 422be1a8808e7fb306fcc6872c874a9b files/digest-cups-1.2.12-r1 262
-RMD160 af6b2363980a1e6323b89c87f8a25598b7730897 files/digest-cups-1.2.12-r1 262
-SHA256 1ed8553b6b83c34074f536128d9794fdbd11070a6091353722bb0cc5d4e625df files/digest-cups-1.2.12-r1 262
 MD5 422be1a8808e7fb306fcc6872c874a9b files/digest-cups-1.2.12-r2 262
 RMD160 af6b2363980a1e6323b89c87f8a25598b7730897 files/digest-cups-1.2.12-r2 262
 SHA256 1ed8553b6b83c34074f536128d9794fdbd11070a6091353722bb0cc5d4e625df files/digest-cups-1.2.12-r2 262
-MD5 77aecc8383995af24a8b9f15a4402f54 files/digest-cups-1.3.4-r2 259
-RMD160 b001cfa2371621a0f315bab77bb8c78976f0c150 files/digest-cups-1.3.4-r2 259
-SHA256 a330b10cc5bfd0ba11fab682de999eccf42232d850e0b8d996cb2abecbc0f8e0 files/digest-cups-1.3.4-r2 259
+MD5 422be1a8808e7fb306fcc6872c874a9b files/digest-cups-1.2.12-r3 262
+RMD160 af6b2363980a1e6323b89c87f8a25598b7730897 files/digest-cups-1.2.12-r3 262
+SHA256 1ed8553b6b83c34074f536128d9794fdbd11070a6091353722bb0cc5d4e625df files/digest-cups-1.2.12-r3 262
+MD5 77aecc8383995af24a8b9f15a4402f54 files/digest-cups-1.3.4-r3 259
+RMD160 b001cfa2371621a0f315bab77bb8c78976f0c150 files/digest-cups-1.3.4-r3 259
+SHA256 a330b10cc5bfd0ba11fab682de999eccf42232d850e0b8d996cb2abecbc0f8e0 files/digest-cups-1.3.4-r3 259
diff --git a/net-print/cups/cups-1.2.12-r1.ebuild b/net-print/cups/cups-1.2.12-r3.ebuild
index 69d41afbac47..16890cfd73d3 100644
--- a/net-print/cups/cups-1.2.12-r1.ebuild
+++ b/net-print/cups/cups-1.2.12-r3.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-print/cups/cups-1.2.12-r1.ebuild,v 1.7 2007/10/28 13:36:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r3.ebuild,v 1.1 2007/11/16 20:13:07 tgurr Exp $
 
 WANT_AUTOMAKE=latest
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/cups/${MY_P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="ldap ssl slp pam php samba nls dbus tiff png ppds jpeg X"
 
 DEP="pam? ( virtual/pam )
@@ -86,6 +86,11 @@ src_unpack() {
 	# upstream does not acknowledge bindnow as a solution
 	epatch "${FILESDIR}"/cups-1.2.0-bindnow.patch
 
+	# CVE-2007-4351 security patch, bug #196736
+	epatch "${FILESDIR}"/${PN}-1.2-str2561-v2.patch
+	# CVE-2007-4045 security patch, bug #199195
+	epatch "${FILESDIR}"/${PN}-1.2.4-CVE-2007-4045.patch
+
 	# cups does not use autotools "the usual way" and ship a static config.h.in
 	eaclocal
 	eautoconf
diff --git a/net-print/cups/cups-1.3.4-r2.ebuild b/net-print/cups/cups-1.3.4-r3.ebuild
index 10b03f55417b..7920e70bfdad 100644
--- a/net-print/cups/cups-1.3.4-r2.ebuild
+++ b/net-print/cups/cups-1.3.4-r3.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-print/cups/cups-1.3.4-r2.ebuild,v 1.1 2007/11/12 23:36:45 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.4-r3.ebuild,v 1.1 2007/11/16 20:13:07 tgurr Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -100,6 +100,9 @@ src_unpack() {
 	# disable configure automagic for acl/attr
 	epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
 
+	# CVE-2007-4045 security patch, bug #199195
+	epatch "${FILESDIR}/${P}-CVE-2007-4045.patch"
+
 	# cups does not use autotools "the usual way" and ship a static config.h.in
 	eaclocal
 	eautoconf
diff --git a/net-print/cups/files/cups-1.2.4-CVE-2007-4045.patch b/net-print/cups/files/cups-1.2.4-CVE-2007-4045.patch
new file mode 100644
index 000000000000..e28a7bb4ff9d
--- /dev/null
+++ b/net-print/cups/files/cups-1.2.4-CVE-2007-4045.patch
@@ -0,0 +1,58 @@
+diff -up cups-1.2.4/scheduler/client.c.CVE-2007-4045 cups-1.2.4/scheduler/client.c
+--- cups-1.2.4/scheduler/client.c.CVE-2007-4045	2007-10-30 09:51:04.000000000 +0000
++++ cups-1.2.4/scheduler/client.c	2007-10-30 10:07:10.000000000 +0000
+@@ -105,6 +105,25 @@ static int		write_file(cupsd_client_t *c
+ 				   struct stat *filestats);
+ 
+ 
++void
++_cupsdFixClientsBIO(void)
++{
++#ifdef HAVE_LIBSSL
++  cupsd_client_t *c;
++  BIO *bio;
++  cupsArraySave (Clients);
++  for (c = (cupsd_client_t *)cupsArrayFirst(Clients);
++       c;
++       c = (cupsd_client_t *)cupsArrayNext(Clients))
++  {
++    bio = SSL_get_wbio(c->http.tls);
++    BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)HTTP(c));
++  }
++  cupsArrayRestore (Clients);
++#endif
++}
++
++
+ /*
+  * 'cupsdAcceptClient()' - Accept a new client.
+  */
+@@ -438,6 +457,7 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+   }
+ 
+   cupsArrayAdd(Clients, con);
++  _cupsdFixClientsBIO();
+ 
+   cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                   "cupsdAcceptClient: %d connected to server on %s:%d",
+@@ -729,6 +749,7 @@ cupsdCloseClient(cupsd_client_t *con)	/*
+     */
+ 
+     cupsArrayRemove(Clients, con);
++    _cupsdFixClientsBIO();
+ 
+     free(con);
+   }
+diff -up cups-1.2.4/scheduler/main.c.CVE-2007-4045 cups-1.2.4/scheduler/main.c
+--- cups-1.2.4/scheduler/main.c.CVE-2007-4045	2007-10-30 09:51:04.000000000 +0000
++++ cups-1.2.4/scheduler/main.c	2007-10-30 09:51:05.000000000 +0000
+@@ -948,7 +948,7 @@ main(int  argc,				/* I - Number of comm
+       * Write data as needed...
+       */
+ 
+-      if (con->pipe_pid && FD_ISSET(con->file, input))
++      if (con->pipe_pid && con->file >= 0 && FD_ISSET(con->file, input))
+       {
+        /*
+         * Keep track of pending input from the file/pipe separately
+
diff --git a/net-print/cups/files/cups-1.3.4-CVE-2007-4045.patch b/net-print/cups/files/cups-1.3.4-CVE-2007-4045.patch
new file mode 100644
index 000000000000..aab1b213d018
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.4-CVE-2007-4045.patch
@@ -0,0 +1,47 @@
+diff -up cups-1.3.4/scheduler/client.c.CVE-2007-4045 cups-1.3.4/scheduler/client.c
+--- cups-1.3.4/scheduler/client.c.CVE-2007-4045	2007-11-07 21:11:58.000000000 +0000
++++ cups-1.3.4/scheduler/client.c	2007-11-07 21:13:26.000000000 +0000
+@@ -114,6 +114,25 @@ static int		write_file(cupsd_client_t *c
+ static void		write_pipe(cupsd_client_t *con);
+ 
+ 
++void
++_cupsdFixClientsBIO(void)
++{
++#ifdef HAVE_LIBSSL
++  cupsd_client_t *c;
++  BIO *bio;
++  cupsArraySave (Clients);
++  for (c = (cupsd_client_t *)cupsArrayFirst(Clients);
++       c;
++       c = (cupsd_client_t *)cupsArrayNext(Clients))
++  {
++    bio = SSL_get_wbio(c->http.tls);
++    BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)HTTP(c));
++  }
++  cupsArrayRestore (Clients);
++#endif
++}
++
++
+ /*
+  * 'cupsdAcceptClient()' - Accept a new client.
+  */
+@@ -451,6 +470,7 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+   }
+ 
+   cupsArrayAdd(Clients, con);
++  _cupsdFixClientsBIO();
+ 
+   cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                   "cupsdAcceptClient: %d connected to server on %s:%d",
+@@ -735,6 +755,7 @@ cupsdCloseClient(cupsd_client_t *con)	/*
+     */
+ 
+     cupsArrayRemove(Clients, con);
++    _cupsdFixClientsBIO();
+ 
+     free(con);
+   }
+diff -up cups-1.3.4/scheduler/main.c.CVE-2007-4045 cups-1.3.4/scheduler/main.c
+
diff --git a/net-print/cups/files/digest-cups-1.2.12-r1 b/net-print/cups/files/digest-cups-1.2.12-r3
index 8073a9a92cbd..8073a9a92cbd 100644
--- a/net-print/cups/files/digest-cups-1.2.12-r1
+++ b/net-print/cups/files/digest-cups-1.2.12-r3
diff --git a/net-print/cups/files/digest-cups-1.3.4-r2 b/net-print/cups/files/digest-cups-1.3.4-r3
index 991c8b77ff2e..991c8b77ff2e 100644
--- a/net-print/cups/files/digest-cups-1.3.4-r2
+++ b/net-print/cups/files/digest-cups-1.3.4-r3