diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-04-28 14:10:31 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-04-28 14:10:31 +0000 |
| commit | 6ed74a5a0ccbe2bfd7fee9c71098cb880037ffa1 (patch) | |
| tree | cd6cbce157e5bf30f8a456dba179448abc975e21 /kde-base/kdelibs | |
| parent | Same for ~arch. (diff) | |
| download | gentoo-2-6ed74a5a0ccbe2bfd7fee9c71098cb880037ffa1.tar.gz gentoo-2-6ed74a5a0ccbe2bfd7fee9c71098cb880037ffa1.tar.bz2 gentoo-2-6ed74a5a0ccbe2bfd7fee9c71098cb880037ffa1.zip | |
Fix security bug 218848, CVS-2008-1670.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'kde-base/kdelibs')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.0.3-CVS-2008-1670.patch | 19 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.0.3-r1.ebuild (renamed from kde-base/kdelibs/kdelibs-4.0.3.ebuild) | 5 |
3 files changed, 30 insertions, 3 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 858edb7b93d2..a29a7118ad59 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.524 2008/04/28 13:56:22 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.525 2008/04/28 14:10:31 ingmar Exp $ + +*kdelibs-4.0.3-r1 (28 Apr 2008) + + 28 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> + +files/kdelibs-4.0.3-CVS-2008-1670.patch, -kdelibs-4.0.3.ebuild, + +kdelibs-4.0.3-r1.ebuild: + Fix security bug 218848, CVS-2008-1670. *kdelibs-3.5.9-r3 (28 Apr 2008) diff --git a/kde-base/kdelibs/files/kdelibs-4.0.3-CVS-2008-1670.patch b/kde-base/kdelibs/files/kdelibs-4.0.3-CVS-2008-1670.patch new file mode 100644 index 000000000000..4b085e63e3cf --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.0.3-CVS-2008-1670.patch @@ -0,0 +1,19 @@ +--- khtml/imload/decoders/pngloader.cpp ++++ khtml/imload/decoders/pngloader.cpp +@@ -109,6 +109,8 @@ private: + + if (colorType == PNG_COLOR_TYPE_RGB) + colorType = PNG_COLOR_TYPE_RGB_ALPHA; //Paranoia.. ++ else if (colorType == PNG_COLOR_TYPE_GRAY) ++ colorType = PNG_COLOR_TYPE_GRAY_ALPHA; + } + + ImageFormat imFrm; +@@ -192,6 +194,7 @@ private: + { + if (interlaced) + { ++ Q_ASSERT(pngReadStruct->row_info.pixel_depth <= depth * 8); + requestScanline(rowNum, scanlineBuf); + png_progressive_combine_row(pngReadStruct, scanlineBuf, data); + notifyScanline(pass + 1, scanlineBuf); diff --git a/kde-base/kdelibs/kdelibs-4.0.3.ebuild b/kde-base/kdelibs/kdelibs-4.0.3-r1.ebuild index 4edd226ffbf6..790d41a61ad6 100644 --- a/kde-base/kdelibs/kdelibs-4.0.3.ebuild +++ b/kde-base/kdelibs/kdelibs-4.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.0.3.ebuild,v 1.1 2008/04/03 20:57:13 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.0.3-r1.ebuild,v 1.1 2008/04/28 14:10:31 ingmar Exp $ EAPI="1" @@ -74,7 +74,8 @@ RDEPEND="${COMMONDEPEND} # or executes an external program that tries to write files. PATCHES="${FILESDIR}/e-tempdir.patch ${FILESDIR}/${PN}-4.0.2-X11-optional.patch -${FILESDIR}/${PN}-4.0.2-alsa-optional.patch" +${FILESDIR}/${PN}-4.0.2-alsa-optional.patch +${FILESDIR}/${P}-CVS-2008-1670.patch" # Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional. pkg_setup() { |