summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Solano Gómez <gentoo@sattvik.com>2010-11-14 19:34:26 -0600
committerDaniel Solano Gómez <gentoo@sattvik.com>2010-11-14 19:34:26 -0600
commit68dfab400140eefa896b9ee70f95453a2f42680f (patch)
tree04a3e1cac51ddc1afdb72f2162f1bd49024780fe /net-print
parentSynced with portage (diff)
downloadsattvik-68dfab400140eefa896b9ee70f95453a2f42680f.tar.gz
sattvik-68dfab400140eefa896b9ee70f95453a2f42680f.tar.bz2
sattvik-68dfab400140eefa896b9ee70f95453a2f42680f.zip
Sync up with portage
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/Manifest4
-rw-r--r--net-print/cups/cups-1.3.11-r3.ebuild (renamed from net-print/cups/cups-1.3.11-r1.ebuild)8
3 files changed, 13 insertions, 5 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 5ba8852..2efd0f4 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*cups-1.3.11-r3 (15 Nov 2010)
+
+ 15 Nov 2010; Daniel Solano Gómez <gentoo@sattvik.com>
+ -cups-1.3.11-r1.ebuild, +cups-1.3.11-r3.ebuild:
+ Sync up with portage.
+
23 Oct 2010; Daniel Solano Gómez <gentoo@sattvik.com>
cups-1.3.11-r1.ebuild, cups-1.3.11-r2.ebuild:
Merged in changes form portage.
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 24d1a88..a7fe2d3 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -12,8 +12,8 @@ AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b
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
DIST cups-1.4.4-source.tar.bz2 4472741 RMD160 1f486acda02e83b6824f8ca33b74c02ff3f01994 SHA1 3e179c007fa6cd6874b60ff18a6f48070547a00a SHA256 d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3
-EBUILD cups-1.3.11-r1.ebuild 8286 RMD160 a75e6dd7cac4cfae6b188f172292b34b000c8f75 SHA1 179bee77024f9c5b9763db992ee4de6776e4e3bb SHA256 f6cd52ef403530261895f05f9a49ee540bdeb528dccea304675c2ae03e614c8a
EBUILD cups-1.3.11-r2.ebuild 8481 RMD160 d08b759e1acb34da7b3f2009aea06b5d080b3501 SHA1 d1f0249a4ccf75a805ea49ef55004d8d3372e4ac SHA256 a8f9b650b1100d3750f8e52d50ff43269bac4e33f9fba7e263c9b4371790e773
+EBUILD cups-1.3.11-r3.ebuild 8431 RMD160 f57db7c53959e8f2e9f334019552210d662982d8 SHA1 a046c3c5255a9ac4e1c1c2b19d511e0aaac8d102 SHA256 c10dc5a854f9b859c236c29c09c87d3467c191bbad455eaa5d22d672e3166e6e
EBUILD cups-1.4.4.ebuild 5400 RMD160 90b06cbfee318ca5cf9739de5d32ff9dfa1148e2 SHA1 4592083288218af2bbe7c5f22c76ba07d1479983 SHA256 f2692257285ffefab0da908a3dbcf918ed13f9c18fa49ca4e9e380f81ebeacd9
-MISC ChangeLog 1152 RMD160 5f504f3f97a6cac1bd30341f5a8a259f67c6ea1b SHA1 46103b2bd6e89a98fde4b03e6fab377415e48c86 SHA256 bc252693306bc65c4d523918c0825bbbd69908512d9b1bcc6fd1ad73af1d01da
+MISC ChangeLog 1315 RMD160 114884c6ae8c6126051a995503954cc8946d77af SHA1 9926e40517329328fd95f0649d3323d188a6d39f SHA256 9e89083f8b20a72e487566b95769ce59a24475ba11106f8525244699201eb77f
MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.3.11-r1.ebuild b/net-print/cups/cups-1.3.11-r3.ebuild
index ec94269..1195c5a 100644
--- a/net-print/cups/cups-1.3.11-r1.ebuild
+++ b/net-print/cups/cups-1.3.11-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.13 2010/08/10 20:54:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.13 2010/08/10 20:54:31 scarabeus Exp $
EAPI=2
inherit autotools eutils flag-o-matic multilib pam
@@ -104,12 +104,14 @@ src_prepare() {
# detect recent libgnutls versions, upstream bug STR #3178
epatch "${FILESDIR}/${PN}-1.3.10-str3178.patch"
- epatch "${FILESDIR}/${PN}-1.3.8-group_fix.patch"
- # security fix CUPS XSS and HTTP header/body attacks via attribute injection
+ # CVE-2009-2820: Several XSS flaws in forms processed by CUPS web interface
# upstream bug STR #3178 and STR #3401
epatch "${FILESDIR}/${PN}-1.3.11-str3367-security-1.3v2.patch"
epatch "${FILESDIR}/${PN}-1.3.11-str3401-security-1.3v2-regression.patch"
+ # CVE-2009-3553: Use-after-free (crash) due improper reference counting in abstract file descriptors handling interface
+ # upstream bug STR #3200
+ epatch "${FILESDIR}/${PN}-1.3.11-str3200.patch"
# cups does not use autotools "the usual way" and ship a static config.h.in
eaclocal