sping 14/09/06 21:13:46
Modified: gimp-2.8.10-r1.ebuild ChangeLog
Added: gimp-2.8.10-r2.ebuild
Log:
media-gfx/gimp: 2.8.10-r2 CVE-2013-{1913,1978} (bug #493372)
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
0x401A1600)
Revision Changes Path
1.15 media-gfx/gimp/gimp-2.8.10-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild?rev=1.15&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild?rev=1.15&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild?r1=1.14&r2=1.15
Index: gimp-2.8.10-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gimp-2.8.10-r1.ebuild 24 Jul 2014 18:05:29 -0000 1.14
+++ gimp-2.8.10-r1.ebuild 6 Sep 2014 21:13:46 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild,v 1.14
2014/07/24 18:05:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild,v 1.15
2014/09/06 21:13:46 sping Exp $
EAPI=5
PYTHON_COMPAT=( python2_{6,7} )
@@ -9,8 +9,7 @@
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="http://www.gimp.org/";
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2
-
https://git.gnome.org/browse/gimp/patch/?id=6c73f28b6d87a2afd11974552a075bffec52347f
-> ${P}-freetype251.patch"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="2"
KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-interix
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x64-solaris ~x86-solaris"
@@ -118,7 +117,7 @@
src_prepare() {
epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695,
comment 9 and 16
- epatch "${DISTDIR}"/${P}-freetype251.patch # bug #493466
+ epatch "${FILESDIR}"/${P}-freetype251.patch # bug #493466
epatch "${FILESDIR}"/${P}-clang.patch # bug 449370 compile with clang
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
eautoreconf # If you remove this: remove dev-util/gtk-doc-am from
DEPEND, too
1.438 media-gfx/gimp/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.438&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.438&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?r1=1.437&r2=1.438
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- ChangeLog 1 Sep 2014 18:40:59 -0000 1.437
+++ ChangeLog 6 Sep 2014 21:13:46 -0000 1.438
@@ -1,6 +1,14 @@
# ChangeLog for media-gfx/gimp
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.437 2014/09/01
18:40:59 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.438 2014/09/06
21:13:46 sping Exp $
+
+*gimp-2.8.10-r2 (06 Sep 2014)
+
+ 06 Sep 2014; Sebastian Pipping <[email protected]> gimp-2.8.10-r1.ebuild,
+ +gimp-2.8.10-r2.ebuild, +files/gimp-2.8.10-CVE-2013-1913.patch,
+ +files/gimp-2.8.10-CVE-2013-1978.patch, +files/gimp-2.8.10-freetype251.patch:
+ Add patches for CVE-2013-{1913,1978} to 2.8.10-r2 (bug #493372, 2.8.14 has
+ them already); inline gimp-2.8.10-freetype251.patch (checksum changed)
01 Sep 2014; Sebastian Pipping <[email protected]> -gimp-2.8.10.ebuild:
Remove old version
1.1 media-gfx/gimp/gimp-2.8.10-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r2.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r2.ebuild?rev=1.1&content-type=text/plain
Index: gimp-2.8.10-r2.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r2.ebuild,v 1.1
2014/09/06 21:13:46 sping Exp $
EAPI=5
PYTHON_COMPAT=( python2_{6,7} )
inherit versionator autotools eutils gnome2 fdo-mime multilib python-single-r1
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="http://www.gimp.org/";
SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~x64-solaris ~x86-solaris"
LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo
es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml
ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te
th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript
jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
for lang in ${LANGS}; do
IUSE+=" linguas_${lang}"
done
RDEPEND=">=dev-libs/glib-2.30.2:2
>=dev-libs/atk-2.2.0
>=x11-libs/gtk+-2.24.10:2
>=x11-libs/gdk-pixbuf-2.24.1:2
>=x11-libs/cairo-1.10.2
>=x11-libs/pango-1.29.4
xpm? ( x11-libs/libXpm )
>=media-libs/freetype-2.1.7
>=media-libs/fontconfig-2.2.0
sys-libs/zlib
dev-libs/libxml2
dev-libs/libxslt
x11-themes/hicolor-icon-theme
>=media-libs/babl-0.1.10
>=media-libs/gegl-0.2.0
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
aqua? ( x11-libs/gtk-mac-integration )
curl? ( net-misc/curl )
dbus? ( dev-libs/dbus-glib )
gnome? ( gnome-base/gvfs )
webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/jasper )
exif? ( >=media-libs/libexif-0.6.15 )
lcms? ( >=media-libs/lcms-2.2:2 )
mng? ( media-libs/libmng )
pdf? ( >=app-text/poppler-0.12.4[cairo] )
png? ( >=media-libs/libpng-1.2.37:0 )
python? (
${PYTHON_DEPS}
>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
)
tiff? ( >=media-libs/tiff-3.5.7:0 )
svg? ( >=gnome-base/librsvg-2.36.0:2 )
wmf? ( >=media-libs/libwmf-0.2.8 )
x11-libs/libXcursor
sys-libs/zlib
bzip2? ( app-arch/bzip2 )
postscript? ( app-text/ghostscript-gpl )
udev? ( virtual/libgudev:= )"
DEPEND="${RDEPEND}
sys-apps/findutils
virtual/pkgconfig
>=dev-util/intltool-0.40.1
>=sys-devel/gettext-0.17
doc? ( >=dev-util/gtk-doc-1 )
>=sys-devel/libtool-2.2
>=sys-devel/automake-1.11
dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug
#386453)
DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
S="${WORKDIR}"/${P}
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
pkg_setup() {
G2CONF="--enable-default-binary \
--disable-silent-rules \
$(use_with !aqua x) \
$(use_with aalib aa) \
$(use_with alsa) \
$(use_enable altivec) \
$(use_with bzip2) \
$(use_with curl libcurl) \
$(use_with dbus) \
$(use_with gnome gvfs) \
$(use_with webkit) \
$(use_with jpeg libjpeg) \
$(use_with jpeg2k libjasper) \
$(use_with exif libexif) \
$(use_with lcms lcms lcms2) \
$(use_with postscript gs) \
$(use_enable mmx) \
$(use_with mng libmng) \
$(use_with pdf poppler) \
$(use_with png libpng) \
$(use_enable python) \
$(use_enable smp mp) \
$(use_enable sse) \
$(use_with svg librsvg) \
$(use_with tiff libtiff) \
$(use_with udev gudev) \
$(use_with wmf) \
--with-xmc \
$(use_with xpm libxpm) \
--without-xvfb-run"
if use python; then
python-single-r1_pkg_setup
fi
}
src_prepare() {
epatch "${FILESDIR}"/${P}-CVE-2013-1913.patch # bug 493372
epatch "${FILESDIR}"/${P}-CVE-2013-1978.patch # bug 493372
epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695,
comment 9 and 16
epatch "${FILESDIR}"/${P}-freetype251.patch # bug #493466
epatch "${FILESDIR}"/${P}-clang.patch # bug 449370 compile with clang
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
eautoreconf # If you remove this: remove dev-util/gtk-doc-am from
DEPEND, too
gnome2_src_prepare
}
_clean_up_locales() {
einfo "Cleaning up locales..."
for lang in ${LANGS}; do
use "linguas_${lang}" && {
einfo "- keeping ${lang}"
continue
}
rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
done
}
src_install() {
gnome2_src_install
if use python; then
python_optimize
fi
# Workaround for bug #321111 to give GIMP the least
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
prune_libtool_files --all
# Prevent dead symlink gimp-console.1 from downstream man page
compression (bug #433527)
local gimp_app_version=$(get_version_component_range 1-2)
mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 ||
die
_clean_up_locales
}
pkg_postinst() {
gnome2_pkg_postinst
}
pkg_postrm() {
gnome2_pkg_postrm
}
