Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-gfx/gimp
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/gimp')
-rw-r--r--media-gfx/gimp/ChangeLog7
-rw-r--r--media-gfx/gimp/Manifest10
-rw-r--r--media-gfx/gimp/gimp-2.6.12-r2.ebuild158
-rw-r--r--media-gfx/gimp/gimp-2.6.12-r4.ebuild164
4 files changed, 10 insertions, 329 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 4c9447f5bed3..3224f6482bfd 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/gimp
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.397 2012/09/29 20:10:26 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.398 2012/09/29 20:14:22 sping Exp $
+
+ 29 Sep 2012; Sebastian Pipping <sping@gentoo.org> -gimp-2.6.12-r2.ebuild,
+ -gimp-2.6.12-r4.ebuild:
+ Remove vulnerable 2.6.12-r{2,4} ebuilds with a newer 2.6.12-r5 version stable
+ on all arches
29 Sep 2012; Sebastian Pipping <sping@gentoo.org> gimp-2.6.12-r2.ebuild,
gimp-2.6.12-r4.ebuild, gimp-2.6.12-r5.ebuild, gimp-2.8.2.ebuild:
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 64422f4212ca..1cb474834e6f 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -21,17 +21,15 @@ AUX gimp-libpng15.diff 17119 RMD160 c04595754b3b3bf2631ab834261d14d7debb08ca SHA
DIST gimp-2.6.11-underlinking.patch.xz 5544 RMD160 289359e3b2367cf85dd2f838350ae340ff21256c SHA1 7b7daa0144da506519070835a101455f87e6bfba SHA256 5e7f2f16b8fe9b186b94cbe4cea1cda6242b066c07d36ca4907e276e32976d56
DIST gimp-2.6.12.tar.bz2 16745411 RMD160 3c7ae863474dea670eaeb914e333ba6bf50c7fcc SHA1 82964e3d4eb003239f3443a1bccac53f5d780e15 SHA256 d553c9f1c07f59fa7b7ce9cc5f84ce59bf4e9dfb5b6ee4bd8718b74b947aec62
DIST gimp-2.8.2.tar.bz2 20161424 RMD160 353cf862302417c35df902618a3ba05ac0b3af41 SHA1 64ad90cedc5e8e348310b6eb6b7821ec110c0886 SHA256 0cd1a7e67e132ead810e16e31ff929394c83fcf841e4a295c45d6f3829601ad9
-EBUILD gimp-2.6.12-r2.ebuild 4237 RMD160 670ed33936e3f23d1aaf2e9490e69c8665596cda SHA1 5c8417195be04b0613a71acc0437c5650c17dbf8 SHA256 c9ea11d9b0714adc615b180657ccb4ba6da8764efeb3fb9a0c998e746d095568
-EBUILD gimp-2.6.12-r4.ebuild 4547 RMD160 59f6de5cf6173f13d05c1f5854ecc6b31fc03115 SHA1 72be8ba81c47da5bbbe63e773c6406e5ffa2490e SHA256 84e2a2c3fd7f95b472a1b0fd8a5d9f67cb07b5287f3728ceb31f0b1159b4b2c0
EBUILD gimp-2.6.12-r5.ebuild 4728 RMD160 f867df04357cf151d103892323ff7ddf0625c3e6 SHA1 3f1b9a646923d5df31f365dea08e54e8abc9ae24 SHA256 8b54be2c26f65f310289a59ca001a50f63e98c3e2b8bb429766d88ada47a48af
EBUILD gimp-2.8.2.ebuild 4683 RMD160 51882185b8fec7b202e9947b3a5274455d28a429 SHA1 0c03cf5715431c07f31986c23be4c128cdc6e421 SHA256 4110d54f32b846c6c1ba5da6037708e570cf86d06b2f4737bc8009281ca37011
EBUILD gimp-9999.ebuild 3845 RMD160 79c8a722d960037fda7f7830fd7167db23e42b64 SHA1 ba35425a897cba1c272a5012911b62c9e52fb5d3 SHA256 f4cf8c8d37cebd612041ac1144d32dbf8e0f4813f94a21317c5a20f4f38696ab
-MISC ChangeLog 56703 RMD160 bbb47b778ce4db0a3f013503a1fae7f0c39f1795 SHA1 68524d053c6bce8db10e55f5cb185b02e7759ae4 SHA256 a91e0a5e90c9dc07a26f600f5af1222482a50cafc805bdf32c4be2433719d119
+MISC ChangeLog 56902 RMD160 c6d24034df0bc91e9106ae5f60db28221f90aefa SHA1 173f11382a76857844c9579989f00047b424d1d6 SHA256 f070274662ad75ada1491bab7fda8363cc4479a90034d35f4a6a98e6466ff5b2
MISC metadata.xml 285 RMD160 8b04ced6e549af721b913ad96fa7f53f59dbbfde SHA1 77344d02f429d6e3daa2eadf2411dceadb80a7c5 SHA256 77c9767711868abab1e559504dd88eb8aef8cf395629d8ec8c7a5fdb3d29397e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAlBnVbUACgkQsAvGakAaFgAnFgCfbQBtvitzJz/sNgfZq2NYzn61
-YKsAn2GUCr9r0NEin11Y+eArsIv6ONGE
-=b9+H
+iEYEARECAAYFAlBnVqAACgkQsAvGakAaFgCBxgCgtuY107P8hGsJM49le5cHxwO3
+mGMAoJlcu/n8i5PatyQQIbzTyq3Y+vI3
+=LZXm
-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-2.6.12-r2.ebuild b/media-gfx/gimp/gimp-2.6.12-r2.ebuild
deleted file mode 100644
index 8365f8662d29..000000000000
--- a/media-gfx/gimp/gimp-2.6.12-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12-r2.ebuild,v 1.8 2012/09/29 20:10:26 sping Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="
- http://dev.gentoo.org/~jlec/distfiles/${PN}-2.6.11-underlinking.patch.xz
- mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-LANGS="am ar ast az be bg ca ca@valencia cs 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 mr ms my nb nds ne nl nn oc or pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-for lang in ${LANGS}; do
- IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="
- >=dev-libs/glib-2.18.1:2
- dev-libs/libxml2
- dev-libs/libxslt
- >=media-libs/fontconfig-2.2.0
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
- >=x11-libs/gtk+-2.12.5:2
- x11-libs/libXpm
- >=x11-libs/pango-1.18.0
- sys-libs/zlib
- x11-themes/hicolor-icon-theme
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- curl? ( net-misc/curl )
- dbus? ( dev-libs/dbus-glib )
- exif? ( >=media-libs/libexif-0.6.15 )
- gnome? ( gnome-base/gvfs )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( =media-libs/lcms-1* )
- mng? ( media-libs/libmng )
- pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
- png? ( >=media-libs/libpng-1.2.2:0 )
- python? ( >=dev-python/pygtk-2.10.4:2 )
- svg? ( >=gnome-base/librsvg-2.8.0:2 )
- tiff? ( >=media-libs/tiff-3.5.7:0 )
- webkit? ( net-libs/webkit-gtk:2 )
- wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- >=sys-devel/gettext-0.17
- doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
- G2CONF="--enable-default-binary \
- --with-x \
- $(use_with aalib aa) \
- $(use_with alsa) \
- $(use_enable altivec) \
- $(use_with curl libcurl) \
- $(use_with dbus) \
- --without-hal \
- $(use_with gnome gvfs) \
- --without-gnomevfs \
- $(use_with webkit) \
- $(use_with jpeg libjpeg) \
- $(use_with exif libexif) \
- $(use_with lcms) \
- $(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 wmf)"
-
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- # don't use empty, removed header
- # https://bugs.gentoo.org/show_bug.cgi?id=377075
- epatch "${FILESDIR}"/gimp-curl-headers.diff
-
- # apply file-uri patch by upstream
- # https://bugs.gentoo.org/show_bug.cgi?id=372941
- # https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6
- epatch "${FILESDIR}"/${PN}-2.6.11-file-uri.patch
-
- # fix test suite
- # https://bugs.gentoo.org/show_bug.cgi?id=406625
- epatch "${FILESDIR}"/${P}-potfiles-skip.patch
-
- # buffer overflow patch backport
- # https://bugs.gentoo.org/show_bug.cgi?id=418425
- epatch "${FILESDIR}"/${P}-CVE-2012-2763.patch
-
- echo '#!/bin/sh' > py-compile
- gnome2_src_prepare
-}
-
-_clean_up_locales() {
- einfo "Cleaning up locales..."
- for lang in ${LANGS}; do
- use "linguas_${lang}" && {
- einfo "- keeping ${lang}"
- continue
- }
- rm -Rf "${D}"/usr/share/locale/"${lang}" || die
- done
-}
-
-src_install() {
- gnome2_src_install
-
- if use python; then
- python_convert_shebangs -r $(python_get_version) "${ED}"
- python_need_rebuild
- fi
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- find "${D}" -name '*.la' -delete || die
-
- _clean_up_locales
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
- /usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
- /usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.6.12-r4.ebuild b/media-gfx/gimp/gimp-2.6.12-r4.ebuild
deleted file mode 100644
index c3056a0561c7..000000000000
--- a/media-gfx/gimp/gimp-2.6.12-r4.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12-r4.ebuild,v 1.2 2012/09/29 20:10:26 sping Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="
- http://dev.gentoo.org/~jlec/distfiles/${PN}-2.6.11-underlinking.patch.xz
- mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-LANGS="am ar ast az be bg ca ca@valencia cs 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 mr ms my nb nds ne nl nn oc or pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-for lang in ${LANGS}; do
- IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="
- >=dev-libs/glib-2.18.1:2
- dev-libs/libxml2
- dev-libs/libxslt
- >=media-libs/fontconfig-2.2.0
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
- >=x11-libs/gtk+-2.12.5:2
- x11-libs/libXpm
- >=x11-libs/pango-1.18.0
- sys-libs/zlib
- x11-themes/hicolor-icon-theme
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- curl? ( net-misc/curl )
- dbus? ( dev-libs/dbus-glib )
- exif? ( >=media-libs/libexif-0.6.15 )
- gnome? ( gnome-base/gvfs )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( =media-libs/lcms-1* )
- mng? ( media-libs/libmng )
- pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
- png? ( >=media-libs/libpng-1.2.2:0 )
- python? ( >=dev-python/pygtk-2.10.4:2 )
- svg? ( >=gnome-base/librsvg-2.8.0:2 )
- tiff? ( >=media-libs/tiff-3.5.7:0 )
- webkit? ( net-libs/webkit-gtk:2 )
- wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- >=sys-devel/gettext-0.17
- doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
- G2CONF="--enable-default-binary \
- --with-x \
- $(use_with aalib aa) \
- $(use_with alsa) \
- $(use_enable altivec) \
- $(use_with curl libcurl) \
- $(use_with dbus) \
- --without-hal \
- $(use_with gnome gvfs) \
- --without-gnomevfs \
- $(use_with webkit) \
- $(use_with jpeg libjpeg) \
- $(use_with exif libexif) \
- $(use_with lcms) \
- $(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 wmf)"
-
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- # don't use empty, removed header
- # https://bugs.gentoo.org/show_bug.cgi?id=377075
- epatch "${FILESDIR}"/gimp-curl-headers.diff
-
- # apply file-uri patch by upstream
- # https://bugs.gentoo.org/show_bug.cgi?id=372941
- # https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6
- epatch "${FILESDIR}"/${PN}-2.6.11-file-uri.patch
-
- # fix test suite
- # https://bugs.gentoo.org/show_bug.cgi?id=406625
- epatch "${FILESDIR}"/${P}-potfiles-skip.patch
-
- # buffer overflow patch backport
- # https://bugs.gentoo.org/show_bug.cgi?id=418425
- epatch "${FILESDIR}"/${P}-CVE-2012-2763.patch
-
- # CEL and GIF plug-ins: Heap-based buffer overflows (CVE-2012-{3403,3481})
- # https://bugs.gentoo.org/show_bug.cgi?id=434580
- # Patches from Fedora <http://pkgs.fedoraproject.org/cgit/gimp.git/tree/?h=f16>
- epatch "${FILESDIR}"/${P}-CVE-2012-3403.patch
- epatch "${FILESDIR}"/${P}-CVE-2012-3481.patch
-
- echo '#!/bin/sh' > py-compile
- gnome2_src_prepare
-}
-
-_clean_up_locales() {
- einfo "Cleaning up locales..."
- for lang in ${LANGS}; do
- use "linguas_${lang}" && {
- einfo "- keeping ${lang}"
- continue
- }
- rm -Rf "${D}"/usr/share/locale/"${lang}" || die
- done
-}
-
-src_install() {
- gnome2_src_install
-
- if use python; then
- python_convert_shebangs -r $(python_get_version) "${ED}"
- python_need_rebuild
- fi
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- find "${D}" -name '*.la' -delete || die
-
- _clean_up_locales
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
- /usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
- /usr/$(get_libdir)/gimp/2.0/plug-ins
-}