public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.4.8-r21.ebuild cups-1.4.8-r1.ebuild ChangeLog cups-1.5.0-r1.ebuild
@ 2011-08-27 10:46 Andreas HAttel (dilfridge)
  0 siblings, 0 replies; only message in thread
From: Andreas HAttel (dilfridge) @ 2011-08-27 10:46 UTC (permalink / raw
  To: gentoo-commits

dilfridge    11/08/27 10:46:02

  Modified:             cups-1.4.8-r21.ebuild cups-1.4.8-r1.ebuild
                        ChangeLog cups-1.5.0-r1.ebuild
  Log:
  Dont die on kernel misconfiguration; correct CVE number, the patch fixes CVE-2011-3170
  
  (Portage version: 2.1.10.11/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-print/cups/cups-1.4.8-r21.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r21.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r21.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r21.ebuild?r1=1.1&r2=1.2

Index: cups-1.4.8-r21.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r21.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.4.8-r21.ebuild	25 Aug 2011 01:02:49 -0000	1.1
+++ cups-1.4.8-r21.ebuild	27 Aug 2011 10:46:02 -0000	1.2
@@ -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 @@
 				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 @@
 	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



1.2                  net-print/cups/cups-1.4.8-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild?r1=1.1&r2=1.2

Index: cups-1.4.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.4.8-r1.ebuild	25 Aug 2011 01:02:49 -0000	1.1
+++ cups-1.4.8-r1.ebuild	27 Aug 2011 10:46:02 -0000	1.2
@@ -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 @@
 	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



1.429                net-print/cups/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.429&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.429&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.428&r2=1.429

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- ChangeLog	25 Aug 2011 01:02:49 -0000	1.428
+++ ChangeLog	27 Aug 2011 10:46:02 -0000	1.429
@@ -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)



1.2                  net-print/cups/cups-1.5.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r1.ebuild?r1=1.1&r2=1.2

Index: cups-1.5.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.5.0-r1.ebuild	25 Aug 2011 01:02:49 -0000	1.1
+++ cups-1.5.0-r1.ebuild	27 Aug 2011 10:46:02 -0000	1.2
@@ -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 @@
 				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 @@
 	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






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-08-27 10:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-27 10:46 [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.4.8-r21.ebuild cups-1.4.8-r1.ebuild ChangeLog cups-1.5.0-r1.ebuild Andreas HAttel (dilfridge)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox