From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1081265-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 382ED138334 for <garchives@archives.gentoo.org>; Thu, 4 Apr 2019 19:22:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C760E08AB; Thu, 4 Apr 2019 19:22:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7253E08AB for <gentoo-commits@lists.gentoo.org>; Thu, 4 Apr 2019 19:22:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44FBB335D03 for <gentoo-commits@lists.gentoo.org>; Thu, 4 Apr 2019 19:22:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A10EC55B for <gentoo-commits@lists.gentoo.org>; Thu, 4 Apr 2019 19:22:02 +0000 (UTC) From: "Aaron Bauman" <bman@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" <bman@gentoo.org> Message-ID: <1554405675.e89aa3a6c1d3e66f3678c71bee446991d28c0c0e.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/ghostscript-gpl/Manifest app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild X-VCS-Directories: app-text/ghostscript-gpl/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: e89aa3a6c1d3e66f3678c71bee446991d28c0c0e X-VCS-Branch: master Date: Thu, 4 Apr 2019 19:22:02 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8585c978-0afd-445a-9d83-5510bff37d69 X-Archives-Hash: dba932bee10b61acb457b665e99748e9 commit: e89aa3a6c1d3e66f3678c71bee446991d28c0c0e Author: Aaron Bauman <bman <AT> gentoo <DOT> org> AuthorDate: Thu Apr 4 19:21:15 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Thu Apr 4 19:21:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89aa3a6 app-text/ghostscript-gpl: drop vulnerable wrt bug #668846 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> app-text/ghostscript-gpl/Manifest | 2 - .../ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild | 200 -------------------- .../ghostscript-gpl/ghostscript-gpl-9.25.ebuild | 206 --------------------- 3 files changed, 408 deletions(-) diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest index 985436cf4f5..0c90c42ed8e 100644 --- a/app-text/ghostscript-gpl/Manifest +++ b/app-text/ghostscript-gpl/Manifest @@ -1,4 +1,2 @@ -DIST ghostscript-9.25.tar.xz 33027708 BLAKE2B 7c6684898ef04bc5b6be8fec86adbf7b270107f4063b299175f5c08e5e7ace2468e1512a297464fda5695c830808916e6a0dd1202ca7e85b32cfd175d8cc2b18 SHA512 7a1c0b7546ed523f50c1452d4a1c13fcf043d6060fc9708bbc4b543f66ecb1b619b6e71998094ac702ef44a2fd159b6523271de19b1cae352981ef51fb637651 DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e -DIST ghostscript-gpl-9.25-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild deleted file mode 100644 index 29eea9194c5..00000000000 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Interpreter for the PostScript language and PDF" -HOMEPAGE="https://ghostscript.com/" - -MY_P=${P/-gpl} -PVM=$(ver_cut 1-2) -PVM_S=$(ver_rs 1-2 "") - -MY_PATCHSET=1 - -SRC_URI=" - https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz -" - -LICENSE="AGPL-3 CPL-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="cups dbus gtk l10n_de static-libs tiff unicode X" - -LANGS="ja ko zh-CN zh-TW" -for X in ${LANGS} ; do - IUSE="${IUSE} l10n_${X}" -done - -DEPEND=" - app-text/libpaper - media-libs/fontconfig - >=media-libs/freetype-2.4.9:2= - media-libs/jbig2dec - >=media-libs/lcms-2.6:2 - >=media-libs/libpng-1.6.2:0= - >=media-libs/openjpeg-2.1.0:2= - >=sys-libs/zlib-1.2.7 - virtual/jpeg:0 - cups? ( >=net-print/cups-1.3.8 ) - dbus? ( sys-apps/dbus ) - gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) - unicode? ( net-dns/libidn:= ) - tiff? ( >=media-libs/tiff-4.0.1:0= ) - X? ( x11-libs/libXt x11-libs/libXext ) -" -BDEPEND="virtual/pkgconfig" -RDEPEND="${DEPEND} - app-text/poppler-data - >=media-fonts/urw-fonts-2.4.9 - l10n_ja? ( media-fonts/kochi-substitute ) - l10n_ko? ( media-fonts/baekmuk-fonts ) - l10n_zh-CN? ( media-fonts/arphicfonts ) - l10n_zh-TW? ( media-fonts/arphicfonts ) -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-no-gtk3.patch" # bug 668160 -) - -src_prepare() { - # apply various patches, many borrowed from Fedora - # http://pkgs.fedoraproject.org/cgit/ghostscript.git - eapply "${WORKDIR}/patches/"*.patch - default - - # remove internal copies of various libraries - rm -r cups/libs || die - rm -r freetype || die - rm -r jbig2dec || die - rm -r jpeg || die - rm -r lcms2mt || die - rm -r libpng || die - rm -r tiff || die - rm -r zlib || die - rm -r openjpeg || die - # remove internal CMaps (CMaps from poppler-data are used instead) - rm -r Resource/CMap || die - - if ! use gtk ; then - sed -e "s:\$(GSSOX)::" \ - -e "s:.*\$(GSSOX_XENAME)$::" \ - -i base/unix-dll.mak || die "sed failed" - fi - - # Force the include dirs to a neutral location. - sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \ - -i configure.ac || die - # Some files depend on zlib.h directly. Redirect them. #573248 - # Also make sure to not define OPJ_STATIC to avoid linker errors due to - # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1) - sed -e '/^zlib_h/s:=.*:=:' \ - -e 's|-DOPJ_STATIC ||' \ - -i base/lib.mak || die - - # search path fix - # put LDFLAGS after BINDIR, bug #383447 - sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \ - -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \ - -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \ - -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \ - -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ - -i Makefile.in base/*.mak || die "sed failed" - - # remove incorrect symlink, bug 590384 - rm ijs/ltmain.sh || die - eautoreconf - - cd ijs || die - eautoreconf -} - -src_configure() { - local FONTPATH - for path in \ - "${EPREFIX}"/usr/share/fonts/urw-fonts \ - "${EPREFIX}"/usr/share/fonts/Type1 \ - "${EPREFIX}"/usr/share/fonts \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1 - do - FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path" - done - - PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \ - econf \ - --enable-dynamic \ - --enable-freetype \ - --enable-fontconfig \ - --enable-openjpeg \ - --disable-compile-inits \ - --with-drivers=ALL \ - --with-fontpath="$FONTPATH" \ - --with-ijs \ - --with-jbig2dec \ - --with-libpaper \ - --without-luratech \ - $(use_enable cups) \ - $(use_enable dbus) \ - $(use_enable gtk) \ - $(use_with cups pdftoraster) \ - $(use_with unicode libidn) \ - $(use_with tiff system-libtiff) \ - $(use_with X x) - - cd "${S}/ijs" || die - econf \ - --enable-shared \ - $(use_enable static-libs static) -} - -src_compile() { - emake so all - - cd ijs || die - emake -} - -src_install() { - emake DESTDIR="${D}" install-so install - - # move gsc to gs, bug #343447 - # gsc collides with gambit, bug #253064 - mv -f "${ED}"/usr/bin/{gsc,gs} || die - - cd "${S}/ijs" || die - emake DESTDIR="${D}" install - - # rename the original cidfmap to cidfmap.GS - mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die - - # install our own cidfmap to handle CJK fonts - insinto /usr/share/ghostscript/${PVM}/Resource/Init - doins \ - "${WORKDIR}/fontmaps/CIDFnmap" \ - "${WORKDIR}/fontmaps/cidfmap" - for X in ${LANGS} ; do - if use l10n_${X} ; then - doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}" - fi - done - - # install the CMaps from poppler-data properly, bug #409361 - dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap" - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - if ! use l10n_de; then - rm -r "${ED}"/usr/share/man/de || die - fi -} diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild deleted file mode 100644 index 5aabd4e86a3..00000000000 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools multilib versionator flag-o-matic toolchain-funcs - -DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF" -HOMEPAGE="https://ghostscript.com/" - -MY_P=${P/-gpl} -PVM=$(get_version_component_range 1-2) -PVM_S=$(replace_all_version_separators "" ${PVM}) - -MY_PATCHSET=1 - -SRC_URI=" - https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz -" - -LICENSE="AGPL-3 CPL-1.0" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="cups dbus gtk l10n_de static-libs tiff unicode X" - -COMMON_DEPEND=" - app-text/libpaper - media-libs/fontconfig - >=media-libs/freetype-2.4.9:2= - media-libs/jbig2dec - >=media-libs/lcms-2.6:2 - >=media-libs/libpng-1.6.2:0= - >=media-libs/openjpeg-2.1.0:2= - >=sys-libs/zlib-1.2.7:= - virtual/jpeg:0 - cups? ( >=net-print/cups-1.3.8 ) - dbus? ( sys-apps/dbus ) - gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) - unicode? ( net-dns/libidn:= ) - tiff? ( >=media-libs/tiff-4.0.1:0= ) - X? ( x11-libs/libXt x11-libs/libXext ) -" - -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - >=app-text/poppler-data-0.4.5-r1 - >=media-fonts/urw-fonts-2.4.9 - l10n_ja? ( media-fonts/kochi-substitute ) - l10n_ko? ( media-fonts/baekmuk-fonts ) - l10n_zh-CN? ( media-fonts/arphicfonts ) - l10n_zh-TW? ( media-fonts/arphicfonts ) - !!media-fonts/gnu-gs-fonts-std - !!media-fonts/gnu-gs-fonts-other - !<net-print/cups-filters-1.0.36-r2 -" - -S="${WORKDIR}/${MY_P}" - -LANGS="ja ko zh-CN zh-TW" -for X in ${LANGS} ; do - IUSE="${IUSE} l10n_${X}" -done - -src_prepare() { - default - - # remove internal copies of various libraries - rm -rf "${S}"/cups/libs || die - rm -rf "${S}"/expat || die - rm -rf "${S}"/freetype || die - rm -rf "${S}"/jbig2dec || die - rm -rf "${S}"/jpeg{,xr} || die - rm -rf "${S}"/lcms{,2} || die - rm -rf "${S}"/libpng || die - rm -rf "${S}"/tiff || die - rm -rf "${S}"/zlib || die - rm -rf "${S}"/openjpeg || die - # remove internal CMaps (CMaps from poppler-data are used instead) - rm -rf "${S}"/Resource/CMap || die - - # apply various patches, many borrowed from Fedora - # http://pkgs.fedoraproject.org/cgit/ghostscript.git - eapply "${WORKDIR}/patches/"*.patch - - if ! use gtk ; then - sed -i -e "s:\$(GSSOX)::" \ - -e "s:.*\$(GSSOX_XENAME)$::" \ - "${S}"/base/unix-dll.mak || die "sed failed" - fi - - # Force the include dirs to a neutral location. - sed -i \ - -e "/^ZLIBDIR=/s:=.*:=${T}:" \ - configure.ac || die - # Some files depend on zlib.h directly. Redirect them. #573248 - # Also make sure to not define OPJ_STATIC to avoid linker errors due to - # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1) - sed -i \ - -e '/^zlib_h/s:=.*:=:' \ - -e 's|-DOPJ_STATIC ||' \ - base/lib.mak || die - - # search path fix - # put LDFLAGS after BINDIR, bug #383447 - sed -i -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \ - -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \ - -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \ - -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \ - -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ - "${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed" - - cd "${S}" || die - # remove incorrect symlink, bug 590384 - rm -f ijs/ltmain.sh || die - eautoreconf - - cd "${S}/ijs" || die - eautoreconf -} - -src_configure() { - local FONTPATH - for path in \ - "${EPREFIX}"/usr/share/fonts/urw-fonts \ - "${EPREFIX}"/usr/share/fonts/Type1 \ - "${EPREFIX}"/usr/share/fonts \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1 - do - FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path" - done - - PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \ - econf \ - --enable-dynamic \ - --enable-freetype \ - --enable-fontconfig \ - --enable-openjpeg \ - --disable-compile-inits \ - --with-drivers=ALL \ - --with-fontpath="$FONTPATH" \ - --with-ijs \ - --with-jbig2dec \ - --with-libpaper \ - --without-luratech \ - $(use_enable cups) \ - $(use_enable dbus) \ - $(use_enable gtk) \ - $(use_with cups pdftoraster) \ - $(use_with unicode libidn) \ - $(use_with tiff system-libtiff) \ - $(use_with X x) - - cd "${S}/ijs" || die - econf \ - --enable-shared \ - $(use_enable static-libs static) -} - -src_compile() { - emake so all - - cd "${S}/ijs" || die - emake -} - -src_install() { - emake DESTDIR="${D}" install-so install - - # move gsc to gs, bug #343447 - # gsc collides with gambit, bug #253064 - mv -f "${ED}"/usr/bin/{gsc,gs} || die - - cd "${S}/ijs" || die - emake DESTDIR="${D}" install - - # rename the original cidfmap to cidfmap.GS - mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die - - # install our own cidfmap to handle CJK fonts - insinto /usr/share/ghostscript/${PVM}/Resource/Init - doins \ - "${WORKDIR}/fontmaps/CIDFnmap" \ - "${WORKDIR}/fontmaps/cidfmap" - for X in ${LANGS} ; do - if use l10n_${X} ; then - doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}" - fi - done - - # install the CMaps from poppler-data properly, bug #409361 - dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap" - - use static-libs || find "${ED}" -name '*.la' -delete - - if ! use l10n_de; then - rm -r "${ED}"/usr/share/man/de || die - fi -}