diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2017-09-10 11:47:42 +0200 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2017-09-10 12:13:21 +0200 |
commit | 004ec7a497d0afbb3cb2528c1c555d95dc65539f (patch) | |
tree | 62e591428fb10e9f91bb0f5790d6a7cdd8fcbf3b /x11-libs | |
parent | sys-libs/libosinfo: drop old revisions (diff) | |
download | gentoo-004ec7a497d0afbb3cb2528c1c555d95dc65539f.tar.gz gentoo-004ec7a497d0afbb3cb2528c1c555d95dc65539f.tar.bz2 gentoo-004ec7a497d0afbb3cb2528c1c555d95dc65539f.zip |
x11-libs/gdk-pixbuf: cleanup security vulnerable revision, bug #611390
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=629956
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gdk-pixbuf/Manifest | 2 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.6.ebuild | 128 |
2 files changed, 0 insertions, 130 deletions
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index e65db28c868b..70ef424e8f5a 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,3 +1 @@ -DIST gdk-pixbuf-2.36.6-bug143608-comment.jpg 191869 SHA256 d6ca7c9d3b70fd312666363591bac2b3d25253e352562255e6d2d50bd69f4a57 SHA512 28ed4e203b98b6009a27477009a79f8f5bd611b4b302736e014b1ebde820daaee73f9c3c4497d184a1e1872ec0debd40f571865294473a56e1c2bdac574a14fc WHIRLPOOL e03dc6b19514a73f22cc99cd3b7716a78eb7f492b04c3f3b924de75abfa7f4cb961b4b885c35893caab40c81c91d1c55efdcb2699e720e97c3e6fa10998f86f1 -DIST gdk-pixbuf-2.36.6.tar.xz 5166980 SHA256 455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c SHA512 b963f01161b58463c83499079545aa946fd824ec5e7167e0898698ac46e0cc3fb3dcb0cac5afabd6b7d957391b9c9bba55f340294076433155fc91052d5403ec WHIRLPOOL b790cb631a09f7b8b72fd3ef04fa7195d759c5ab03a2c31f7f76a4eb4615cfa59d688ee0914887700d013b4f399b0454f7bf7e600e1dd8af08361ad85955d8c7 DIST gdk-pixbuf-2.36.9.tar.xz 5769124 SHA256 8013b271ff1a691514b5bbc9b99f6ed456422d4da4a721a9db0b783abe8e740a SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261 WHIRLPOOL 13422ecffde49445e4c81e4d7e244a2511811fa85d55261420f8ac4e2a373eab08e7adab64c6ea5b2997ed4e6a888630e03a378d04a0c6b2a652fc34d2996a87 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.6.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.6.ebuild deleted file mode 100644 index 27bc26a38db5..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.6.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X debug +introspection jpeg jpeg2k tiff test" - -# Remove SRC_URI when gnome bug #780667 is fixed -SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_PVP}/${GNOME_ORG_MODULE}-${PV}.tar.xz -test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug143608-comment.jpg?h=2.36.6 -> ${PN}-2.36.6-bug143608-comment.jpg )" - -COMMON_DEPEND=" - >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}] - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) -" -DEPEND="${COMMON_DEPEND} - >=dev-util/gtk-doc-am-1.20 - >=sys-devel/gettext-0.19 - virtual/pkgconfig -" -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise -RDEPEND="${COMMON_DEPEND} - !<gnome-base/gail-1000 - !<gnome-base/librsvg-2.31.0 - !<x11-libs/gtk+-2.21.3:2 - !<x11-libs/gtk+-2.90.4:3 -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) -) - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=780667 - if use test ; then - cp -v "${DISTDIR}"/${P}-bug143608-comment.jpg "${S}"/tests/bug143608-comment.jpg || die - fi - - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 - eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch - - # This will avoid polluting the pkg-config file with versioned libpng, - # which is causing problems with libpng14 -> libpng15 upgrade - # See upstream bug #667068 - # First check that the pattern is present, to catch upstream changes on bumps, - # because sed doesn't return failure code if it doesn't do any replacements - grep -q 'l in libpng16' configure || die "libpng check order has changed upstream" - sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die - [[ ${CHOST} == *-solaris* ]] && append-libs intl - - gnome2_src_prepare -} - -multilib_src_configure() { - # png always on to display icons - ECONF_SOURCE="${S}" \ - gnome2_src_configure \ - $(usex debug --enable-debug=yes "") \ - $(use_with jpeg libjpeg) \ - $(use_with jpeg2k libjasper) \ - $(use_with tiff libtiff) \ - $(multilib_native_use_enable introspection) \ - $(use_with X x11) \ - --with-libpng - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die - fi -} - -multilib_src_install() { - # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # Make sure loaders.cache belongs to gdk-pixbuf alone - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - } - - multilib_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - multilib_foreach_abi gnome2_pkg_postinst - - # Migration snippet for when this was handled by gtk+ - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache - fi -} |