From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 EB23D139085 for ; Thu, 19 Jan 2017 10:40:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5ACD4234012; Thu, 19 Jan 2017 10:40:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27257234012 for ; Thu, 19 Jan 2017 10:40:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08F8F341117 for ; Thu, 19 Jan 2017 10:40:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3070B28F5 for ; Thu, 19 Jan 2017 10:40:11 +0000 (UTC) From: "Aaron Bauman" 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" Message-ID: <1484822395.5734ce51ae989c6d907f680ede2a6e9dca75f585.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/htmldoc/Manifest app-text/htmldoc/htmldoc-1.8.27-r3.ebuild X-VCS-Directories: app-text/htmldoc/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 5734ce51ae989c6d907f680ede2a6e9dca75f585 X-VCS-Branch: master Date: Thu, 19 Jan 2017 10:40:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 385bfd78-a904-4766-be5e-f604d755b9e5 X-Archives-Hash: 8c8a925ae29a8731f05b7254f067ae49 commit: 5734ce51ae989c6d907f680ede2a6e9dca75f585 Author: Aaron Bauman gentoo org> AuthorDate: Thu Jan 19 10:39:32 2017 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Thu Jan 19 10:39:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5734ce51 app-text/htmldoc: security cleanup wrt bug #554262 Package-Manager: portage-2.3.0 app-text/htmldoc/Manifest | 1 - app-text/htmldoc/htmldoc-1.8.27-r3.ebuild | 60 ------------------------------- 2 files changed, 61 deletions(-) diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest index 356f17d..db40799 100644 --- a/app-text/htmldoc/Manifest +++ b/app-text/htmldoc/Manifest @@ -1,2 +1 @@ -DIST htmldoc-1.8.27-source.tar.bz2 3960271 SHA256 89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613 SHA512 f0b2b6fec4925e549e74d6721f15b5de00c8c4889b0c67689945c408ed88074acb1330cae155655a1986adc0ca549cea32e242aa1ecac8e6338a1739f7c85438 WHIRLPOOL 0716ef8e70d11208668685b3b2cc742111940c91264a97531e705351721f3f14260c05479f35f73c2961238e163e0f5407c5bb2769984ccbcb5063736ebd4b39 DIST htmldoc-1.8.29-source.tar.bz2 4089227 SHA256 e8c96ad740d19169eab8305c8e2ee1c795c4afa59ba99d18786ad191a2853f31 SHA512 06c4367b84005624564dfb33d2cc632cbfc711268ffce9efe00c17760da17637949fc7415fd29fcd63edc26ba96ff18cf57d1e9d36e7205b92ac2095cf4acfc8 WHIRLPOOL 3efe016ce4e071d164e3ca44fe3c8cba9ba830eb0847215116fbccab45b7ae913bfe94c723d4c8ba952c48ce31c68e5c4a71bd7048030a03c8fb3dffe42ea6d3 diff --git a/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild b/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild deleted file mode 100644 index b863c8b..00000000 --- a/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -inherit eutils - -DESCRIPTION="Convert HTML pages into a PDF document" -SRC_URI="http://www.msweet.org/files/project1/${P}-source.tar.bz2" -HOMEPAGE="http://www.msweet.org/projects.php?Z1" - -IUSE="fltk ssl" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86" - -DEPEND=">=media-libs/libpng-1.4 - virtual/jpeg - fltk? ( x11-libs/fltk:1 ) - ssl? ( >=dev-libs/openssl-0.9.6e )" -RDEPEND="${DEPEND}" - -# this needs to be figured out, since htmldoc looks for all three libs -# right now there's no virtual/ssl -# -# --enable-openssl use OpenSSL for SSL/TLS support, default=yes -# --enable-gnutls use GNU TLS for SSL/TLS support, default=yes -# --enable-cdsassl use CDSA for SSL/TLS support, default=yes - -src_prepare() { - # make sure not to use the libs htmldoc ships with - mkdir foo ; mv jpeg foo/ ; mv png foo/ ; mv zlib foo/ - - epatch \ - "${FILESDIR}"/${PN}-sscanf-overflows.patch \ - "${FILESDIR}"/${PN}-fortify-fail.patch \ - "${FILESDIR}"/${PN}-libpng15.patch \ - "${FILESDIR}"/${P}-crash.patch - - sed -i "s:^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\":#define DOCUMENTATION \"\$prefix/share/doc/${PF}/html\":" \ - configure || die -} - -src_configure() { - local myconf="$(use_enable ssl openssl) $(use_with fltk gui)" - econf ${myconf} - # Add missing -lfltk_images to LIBS - if use fltk; then - sed -i 's:-lfltk :-lfltk -lfltk_images :g' Makedefs || die - fi -} - -src_install() { - einstall bindir="${D}/usr/bin" - - # Minor cleanups - mv "${D}/usr/share/doc/htmldoc" "${D}/usr/share/doc/${PF}" - dodir /usr/share/doc/${PF}/html - mv "${D}"/usr/share/doc/${PF}/*.html "${D}/usr/share/doc/${PF}/html" -}