Dont die on kernel misconfiguration; correct CVE number, the patch fixes CVE-2011-3170

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

6 files changed, 38 insertions, 14 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index d0a39b73103c..672d1ed035fe 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.428 2011/08/25 01:02:49 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.429 2011/08/27 10:46:02 dilfridge Exp $
+
+  27 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
+  cups-1.4.8-r21.ebuild, -files/cups-1.4.8-CVE-2011-2896.patch,
+  +files/cups-1.4.8-CVE-2011-3170.patch, cups-1.5.0-r1.ebuild:
+  Dont die on kernel misconfiguration; correct CVE number, the patch fixes
+  CVE-2011-3170
 
 *cups-1.5.0-r1 (25 Aug 2011)
 *cups-1.4.8-r21 (25 Aug 2011)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 8bf344cb3fb9..4fbf107387d8 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736
 AUX cups-1.3.10-str3178.patch 888 RMD160 ff061fc3500960f441c59896cdfe421d5f47f386 SHA1 fac5361b1172aba167d48988f874faa6faf1554a SHA256 e6550fad17017ac6897e6e9c70a4aafaaec5473c05a19e9e50277293cdc6aac6
 AUX cups-1.3.11-pdf-m4.patch 1476 RMD160 be4d4ed2b699625282c9725faee08e01edca9b7a SHA1 a8b092b9c155c161c781319a94cb1bb7de734c3f SHA256 191b0c41c142ed31718fc01f55fcefc6c26735fa56165c23450fd7a454818b01
@@ -15,7 +18,7 @@ AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78
 AUX cups-1.4.6-force-gnutls.patch 3319 RMD160 c6cc024a702305eb81661d5cdadd9857e9a6778e SHA1 5ac62ed3ca20bc7a4541c990c676c433299b2177 SHA256 beb4014eac5218d9f424b81946ac1e209625026bf20a7f4820758e5ee1fe5b66
 AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666a958dd5b0e SHA1 aae046121d0139fbba1cb9147c8742f73b2f1fa0 SHA256 6bc9e16fc6865b2f3e0ee2d1947bdde691e41f90fce32b9839b3661dcea4a827
 AUX cups-1.4.6-web-hang.patch 1749 RMD160 ff8d4cfa10a5de5a911c8672313904f50b13fd0f SHA1 f37a3fb7d71a6d56bbb3e5e7a8cf74ca8cb19276 SHA256 f49cef2ce1f2eecdd8ee07d85f306a19375f6d48510763aa51e96a0c54ad27c5
-AUX cups-1.4.8-CVE-2011-2896.patch 1045 RMD160 9a27eb1ec34ced57da5bbe7c55261d8aa35b01c0 SHA1 6155d7c4b34ff6447a93aa56fa4b5958eb943202 SHA256 c94d49c3ff980b830874dae4158768554f87f429ae400838a605505aae350af6
+AUX cups-1.4.8-CVE-2011-3170.patch 1045 RMD160 9a27eb1ec34ced57da5bbe7c55261d8aa35b01c0 SHA1 6155d7c4b34ff6447a93aa56fa4b5958eb943202 SHA256 c94d49c3ff980b830874dae4158768554f87f429ae400838a605505aae350af6
 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
@@ -24,8 +27,25 @@ DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b926
 DIST cups-1.5.0-source.tar.bz2 4090210 RMD160 e7be9b6b44428561609c59abaea8fa31a11aefff SHA1 628f549867751e373fc20c7558fec422f9eb942b SHA256 c6f99b68a558f4d626e9a5076d664f38e9925715dc541b07f0328c9aeb02ec33
 EBUILD cups-1.3.11-r4.ebuild 8157 RMD160 8a87f90b96c08a694643df5324e7daab651daed2 SHA1 f1f3d811c3bc989046cca5981a98d3a7e47e22fc SHA256 40fd91ccb98b69279919e10c46a286ae04b839ac77c0b074a8973f0313616d7b
 EBUILD cups-1.4.6-r2.ebuild 7232 RMD160 360accbab201dc540131622d6fc1dcf1df88d1e1 SHA1 ef0640f2bb2a846fc1435de4bb77eebfa82436f5 SHA256 c36d259463de77c8a6395eeb10571853702db0efc90ac4bfddd8144240462974
-EBUILD cups-1.4.8-r1.ebuild 7201 RMD160 eee066e25d6fe3418d49221bca070e78e402356f SHA1 a712d705ceaaf7479a58706c3efcdec59ca456b3 SHA256 d04103eabce41949c868b86fc2291ea5b1042bbd25509345c14c96e8b3a15767
-EBUILD cups-1.4.8-r21.ebuild 8476 RMD160 36d46c555d5f7f1f3991702b9281eb2f63cc8c6b SHA1 8c8ef9e22606cb98fa93db75dd0901a93c820dfe SHA256 30bd5ab4957184fcea385cea685c775608f01af5c17157db3fd082070cff4f37
-EBUILD cups-1.5.0-r1.ebuild 8332 RMD160 9bef915f7446cb208ad84dc54ff6690f165fbee9 SHA1 01c507453afa2d0ef382a2c3b7aa28ef03257d17 SHA256 4626779073eb5255411b63c5779d04e9d2c179d395b528efad7e84720fc9a45d
-MISC ChangeLog 64283 RMD160 e1196b13405e0e79a4b27a4ffb492623d5724933 SHA1 cb4569ff11046af32bb84822ed379b0c9f9bcaf7 SHA256 2dc82bcef48f8a00c13eadce4607e289e81fe8fd6c98032ec0fcf9a4a9f4c1c6
+EBUILD cups-1.4.8-r1.ebuild 7205 RMD160 9d53effeba5c484c3c70261242a42d29c835eeb3 SHA1 ba0178e4732c1511dfea81715da3eb5acddd6f9f SHA256 5a769bfc36c28b8f5e595db1478014f508a73d449652dd9baea69c806130177c
+EBUILD cups-1.4.8-r21.ebuild 8443 RMD160 679ccbc84e633feff758cf3475d09c9d05472457 SHA1 f26fc96e87bd0fb849a948f3ca57fb50056c8e43 SHA256 e0abc4a87def1cbe0cd5ab086984cfd46356bfc5d9427312cac4323a6c5a7635
+EBUILD cups-1.5.0-r1.ebuild 8299 RMD160 cd482176e3cf5f29b09d8b35fa47450beae289c6 SHA1 c9bd7e12e6feb3dcf215c5b5c6c085c0f0825c8d SHA256 f2ed0e6c468f22b36f9fb0774fb0b4c6ed377246356ebc4385afa6b791170bd7
+MISC ChangeLog 64585 RMD160 98e9e6b13fb4aae20b60a9392008acbdcb3507fd SHA1 3e2813fca6e238065f6731a1a05ea0b3a22de3f3 SHA256 cde65cc7cfe74adeb0f40fa50aab054198253c80b81cd9f367f5a628b3d3b267
 MISC metadata.xml 586 RMD160 73a1f1c0096d5035dfa53207b00c125894f6822a SHA1 123501263490cab57af2b99f2336fb70c094d9b0 SHA256 3b729c497ee38452b1ca051b759f43b5f9e117f9c36c0f3b660e4bd8ab7c295b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOWMsWAAoJEEb+UGWnxTyHnwQQAIHPBF6wGKWh9w2LegL6fYyd
+4BgsX2EIuHU9XlCEiTcuVJIJXD6sZY2FNuOy+IctQnb46rJNzWiZfmJw5wJsDEvI
+pFo5B6UcD3TFUuSTtFk5gVPcJlW+9C7/7mHMNaju3rqmOW3p4RhKX0KbKYNqrTE9
+tchzvESYzKl4ti7Wrl/gqfJ5vA9akq+5a0LcYYslRkFMHkkBx1eelgrH48xGRKEq
+pjtF5rEL7APLvErdMfPzNX+1bzUe+WebjCcRCyGuqj8WFQ5FMf2Ch+BXycVRES5v
+EHhu+b5xMhk36sP/lp/mSufAbnIxyEj70ZqRMQdWT4YrLzutTSMvo1MwCoDo1+PQ
++9Tk3nfd6bom43plHNp/UH1K0Q4Lu5/wQVVGTQ9PL4enDmOGkieSlDba9fRmkuuL
+yDcPgJugJ9DtLqfNmnB3FwezJ2bDrHmfqy5UuNM5wZsfcZ00djkpv1EOi6Mp+EEr
+HrnHfCc58LmlU8t2rFfrNqMHT5oE8dma2gBEslxGmWEOpRfLUDlWvrjEiES7y/TI
+tN/VqC8SnWR/moDFHo7N8dZczpYeKTz8rxyGo4ge3kPSZ15CMfYxttrwVcmL0EM5
+MtusXwWluiKV0kXVqIA1IzvGB5NN+DVrDLx6s8/W6lBFnhZxPNLCz0r5nTvBUT0O
+bpb5wzaqPn7yNJK0jGBg
+=rcc3
+-----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
index 8a6f59700875..866b570278bf 100644
--- a/net-print/cups/cups-1.4.8-r1.ebuild
+++ b/net-print/cups/cups-1.4.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.1 2011/08/25 01:02:49 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.2 2011/08/27 10:46:02 dilfridge Exp $
 
 EAPI=3
 
@@ -111,7 +111,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.4.6-force-gnutls.patch"
 	epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch"
 	# security fixes
-	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-2896.patch"
+	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
 
 	AT_M4DIR=config-scripts eaclocal
 	eautoconf
diff --git a/net-print/cups/cups-1.4.8-r21.ebuild b/net-print/cups/cups-1.4.8-r21.ebuild
index a0c72859940b..2450a6f07ba5 100644
--- a/net-print/cups/cups-1.4.8-r21.ebuild
+++ b/net-print/cups/cups-1.4.8-r21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r21.ebuild,v 1.1 2011/08/25 01:02:49 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r21.ebuild,v 1.2 2011/08/27 10:46:02 dilfridge Exp $
 
 EAPI=3
 
@@ -109,7 +109,6 @@ pkg_setup() {
 				eerror "        USB support  --->"
 				eerror "            [ ] USB Printer support"
 				eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				die "USB_PRINTER module enabled"
 			fi
 		else
 			#here we should warn user that he should enable it so he can print
@@ -140,7 +139,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.4.6-force-gnutls.patch"
 	epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch"
 	# security fixes
-	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-2896.patch"
+	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
 
 	AT_M4DIR=config-scripts eaclocal
 	eautoconf
diff --git a/net-print/cups/cups-1.5.0-r1.ebuild b/net-print/cups/cups-1.5.0-r1.ebuild
index 8f33d42a6464..bb4cda2804e3 100644
--- a/net-print/cups/cups-1.5.0-r1.ebuild
+++ b/net-print/cups/cups-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r1.ebuild,v 1.1 2011/08/25 01:02:49 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r1.ebuild,v 1.2 2011/08/27 10:46:02 dilfridge Exp $
 
 #
 # See http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=blob;f=net-print/cups/notes.txt;hb=HEAD
@@ -115,7 +115,6 @@ pkg_setup() {
 				eerror "        USB support  --->"
 				eerror "            [ ] USB Printer support"
 				eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				die "USB_PRINTER module enabled"
 			fi
 		else
 			#here we should warn user that he should enable it so he can print
@@ -142,7 +141,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
 	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
 	# security fixes
-	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-2896.patch"
+	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
 
 	AT_M4DIR=config-scripts eaclocal
 	eautoconf
diff --git a/net-print/cups/files/cups-1.4.8-CVE-2011-2896.patch b/net-print/cups/files/cups-1.4.8-CVE-2011-3170.patch
index 843456f2eebd..843456f2eebd 100644
--- a/net-print/cups/files/cups-1.4.8-CVE-2011-2896.patch
+++ b/net-print/cups/files/cups-1.4.8-CVE-2011-3170.patch