commit: 46cf32a0054cb2871467a06897d3847e57929bc0 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Dec 6 19:43:58 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Dec 6 19:43:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46cf32a0
app-text/info2html: Remove last-rited pkg Closes: https://bugs.gentoo.org/697372 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-text/info2html/Manifest | 1 - app-text/info2html/files/info2html-2.0-xss.patch | 61 -------------------- app-text/info2html/info2html-2.0-r1.ebuild | 72 ----------------------- app-text/info2html/info2html-2.0.ebuild | 73 ------------------------ app-text/info2html/metadata.xml | 11 ---- profiles/package.mask | 5 -- 6 files changed, 223 deletions(-) diff --git a/app-text/info2html/Manifest b/app-text/info2html/Manifest deleted file mode 100644 index 38befd45ab5..00000000000 --- a/app-text/info2html/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST info2html-2.0.tar 51200 BLAKE2B 0209e7792689f68c8f596dcb0771395014963240f2071aa970f50611f752e9b9cf524ba2083a72a9b0f4346f8e14e23aedfde4497b05c02dae90b223ebcf6311 SHA512 1b9ebc8bdd4101d24116fe22df9e5d3124300b2ac11585d8c7fff9652f7984983480442af9d9f86300f9684335d85b96f276a775c56c95e7fac85ebc46235e06 diff --git a/app-text/info2html/files/info2html-2.0-xss.patch b/app-text/info2html/files/info2html-2.0-xss.patch deleted file mode 100644 index a2254bdbbe2..00000000000 --- a/app-text/info2html/files/info2html-2.0-xss.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -u info2html-2.0-orig/info2html info2html-2.0/info2html ---- info2html-2.0-orig/info2html 2006-09-01 14:55:13.000000000 +0200 -+++ info2html-2.0/info2html 2006-09-01 15:05:41.000000000 +0200 -@@ -42,7 +42,7 @@ - - use CGI; - $ENV{'REQUEST_METHOD'} or -- print "Note: I'm really supposed to be run as a CGI!\n"; -+ print "Note: I'm really supposed to be run as a CGI\!\n"; - - #-- patterns - $NODEBORDER = '\037\014?'; #-- delimiter of an info node -@@ -62,7 +62,7 @@ - #--------------------------------------------------------- - # Don't reveal where we're looking... --jonh 5/20/97 (and reapplied 5/4/1998) - sub DieFileNotFound{ -- local($FileName) = @_; -+ local($FileName) = &XssEscape(@_); - #-- TEXT : error message if a file could not be opened - print <<"EOF"; - <html><head><title>Info Files - Error Message</title> -@@ -104,6 +104,28 @@ - } - - #---------------------------------------------------------- -+# XssEscape -+#---------------------------------------------------------- -+sub XssEscape { -+ local($Tag) = @_; -+ #-- output escaping is required to protect browser -+ # against `cross site' and `cross frame scripting' -+ -+ $Tag =~ s/&/&/gs; # ampersand -+ $Tag =~ s/#/#/gs; -+ $Tag =~ s/;/;/gs; -+ $Tag =~ s/[\000-\037\177-\237]/¿/gs; # "ctrl" codes 0-31 and 127-159 -+ $Tag =~ s/</</gs; # less-than symbol -+ $Tag =~ s/>/>/gs; # greater-than symbol -+ $Tag =~ s/"/"/gs; # double quote -+ $Tag =~ s/\240/ /gs; # non-breaking space -+ $Tag =~ s/\255/­/gs; # soft hyphen -+ # the rest is interpreted -+ # as ISO 8859-1 -+ $Tag; -+} -+ -+#---------------------------------------------------------- - # ParsHeaderToken - #---------------------------------------------------------- - # Parses the heaer line of an info node for a specific -@@ -493,6 +515,8 @@ - #---------------------------------------------------------- - sub ReplyNotFoundMessage{ - local($FileName,$Tag) = @_; -+ $FileName = &XssEscape($FileName); -+ $Tag = &XssEscape($Tag); - print <<"EOF"; - <html><head><title>Info Files - Error Message</title> - $BOTS_STAY_AWAY -Only in info2html-2.0: info2html.orig -Only in info2html-2.0: info2html.rej diff --git a/app-text/info2html/info2html-2.0-r1.ebuild b/app-text/info2html/info2html-2.0-r1.ebuild deleted file mode 100644 index 3bacec7b49a..00000000000 --- a/app-text/info2html/info2html-2.0-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils webapp - -DESCRIPTION="Converts GNU .info files to HTML" -HOMEPAGE="http://info2html.sourceforge.net/"; -SRC_URI="mirror://sourceforge/info2html/${P}.tar" - -LICENSE="freedist" -# webapp.eclass deals with SLOTting -#SLOT="0" -IUSE="" -KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86" - -RDEPEND="dev-lang/perl" -PATCHES=( - # filter user-provided data to prevent cross-frame/site scripting attacks - # bug #91354 (fix from Werner Fink) - "${FILESDIR}"/info2html-2.0-xss.patch -) - -src_prepare() { - default - - # Fixup INFODIR for paths in /etc/profile.env INFOPATH - infos=$(grep "^export INFOPATH=" /etc/profile.env | tail -n 1 |\ - sed -e "s:^export INFOPATH=:INFOPATH=:;s:'::g") - # Default path to /usr/share/info and /usr/local/share/info - [[ -z ${infos} ]] && export infos="/usr/share/info" - infos=( ${INFOPATH//:/ } ) - mv "${S}"/info2html.conf "${S}"/info2html.conf.orig - touch "${S}"/info2html.conf - state="copy" - inserted="no" - while read line; do - [[ ${line} == "@INFODIR = (" ]] && state="insert" - [[ ${line} == ");" ]] && state="copy" - case ${state} in - "copy") - echo ${line} >> ${S}/info2html.conf - ;; - "insert") - echo ${line} >> ${S}/info2html.conf - for info in "${infos[@]}"; do - echo " '${info}'," >> ${S}/info2html.conf - done - echo " '/usr/local/share/info'" >> ${S}/info2html.conf - state="skip" - inserted="yes" - ;; - "skip") - ;; - esac - done < "${S}"/info2html.conf.orig - [[ ${state} == "copy" && ${inserted} == "yes" ]] || - die "Setting up info2html.conf failed" -} - -src_install() { - webapp_src_preinst - - exeinto ${MY_CGIBINDIR} - cp info2html infocat info2html.css info2html.conf "${D}"/${MY_CGIBINDIR} - # README zapped by info2html-gentoo.patch; it only listed - # the homepage so it doesn't add anything useful. - # dodoc README - - webapp_src_install -} diff --git a/app-text/info2html/info2html-2.0.ebuild b/app-text/info2html/info2html-2.0.ebuild deleted file mode 100644 index dde16343190..00000000000 --- a/app-text/info2html/info2html-2.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils webapp - -DESCRIPTION="Converts GNU .info files to HTML" -HOMEPAGE="http://info2html.sourceforge.net/"; -SRC_URI="mirror://sourceforge/info2html/${P}.tar" - -LICENSE="freedist" -# webapp.eclass deals with SLOTting -#SLOT="0" -IUSE="" -KEYWORDS="alpha amd64 hppa sparc x86" - -RDEPEND="dev-lang/perl" - -src_unpack() { - local infos state line i - unpack ${A} - cd ${S} - - # filter user-provided data to prevent cross-frame/site scripting attacks - # bug #91354 (fix from Werner Fink) - epatch "${FILESDIR}"/info2html-2.0-xss.patch - - # Fixup INFODIR for paths in /etc/profile.env INFOPATH - infos=$(grep "^export INFOPATH=" /etc/profile.env | tail -n 1 |\ - sed -e "s:^export INFOPATH=:INFOPATH=:;s:'::g") - # Default path to /usr/share/info and /usr/local/share/info - [[ -z ${infos} ]] && export infos="/usr/share/info" - infos=( ${INFOPATH//:/ } ) - mv ${S}/info2html.conf ${S}/info2html.conf.orig - touch ${S}/info2html.conf - state="copy" - inserted="no" - while read line; do - [[ ${line} == "@INFODIR = (" ]] && state="insert" - [[ ${line} == ");" ]] && state="copy" - case ${state} in - "copy") - echo ${line} >> ${S}/info2html.conf - ;; - "insert") - echo ${line} >> ${S}/info2html.conf - for info in "${infos[@]}"; do - echo " '${info}'," >> ${S}/info2html.conf - done - echo " '/usr/local/share/info'" >> ${S}/info2html.conf - state="skip" - inserted="yes" - ;; - "skip") - ;; - esac - done < ${S}/info2html.conf.orig - [[ ${state} == "copy" && ${inserted} == "yes" ]] || - die "Setting up info2html.conf failed" -} - -src_install() { - webapp_src_preinst - - exeinto ${MY_CGIBINDIR} - cp info2html infocat info2html.css info2html.conf ${D}/${MY_CGIBINDIR} - # README zapped by info2html-gentoo.patch; it only listed - # the homepage so it doesn't add anything useful. - # dodoc README - - webapp_src_install -} diff --git a/app-text/info2html/metadata.xml b/app-text/info2html/metadata.xml deleted file mode 100644 index 5020ed8cb0f..00000000000 --- a/app-text/info2html/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>web-a...@gentoo.org</email> - <name>Gentoo Webapps</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">info2html</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 722d3e9fb48..9e74cfaff4a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -526,11 +526,6 @@ dev-haskell/hsql-postgresql # Removal in 30 days. Bug #697218. net-misc/openssh-blacklist -# Michał Górny <mgo...@gentoo.org> (2019-11-06) -# EAPI 0. Last upstream release in 2006. -# Removal in 30 days. Bug #697372. -app-text/info2html - # Michał Górny <mgo...@gentoo.org> (2019-10-20) # Testing version that breaks multiple plugins. Let's keep it masked # until upstream releases fixed versions.
