diff options
| -rw-r--r-- | net-print/cups/ChangeLog | 8 | ||||
| -rw-r--r-- | net-print/cups/cups-1.4.8-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-print/cups/cups-1.4.8-r21.ebuild | 5 | ||||
| -rw-r--r-- | net-print/cups/cups-1.5.0-r1.ebuild | 5 | ||||
| -rw-r--r-- | net-print/cups/files/cups-1.4.8-CVE-2011-3170.patch (renamed from net-print/cups/files/cups-1.4.8-CVE-2011-2896.patch) | 0 |
5 files changed, 13 insertions, 9 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/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 |