bump to 2.0; configure for info dirs more intelligently

Package-Manager: portage-2.1.1_rc1-r1

5 files changed, 164 insertions, 8 deletions

diff --git a/app-text/info2html/ChangeLog b/app-text/info2html/ChangeLog
index b4a3b764914e..6ca17e656f66 100644
--- a/app-text/info2html/ChangeLog
+++ b/app-text/info2html/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/info2html
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/info2html/ChangeLog,v 1.15 2006/09/01 12:45:42 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/info2html/ChangeLog,v 1.16 2006/09/01 14:39:52 kevquinn Exp $
+
+*info2html-2.0 (01 Sep 2006)
+
+  01 Sep 2006; Kevin F. Quinn <kevquinn@gentoo.org>
+  +files/info2html-2.0-xss.patch, +info2html-2.0.ebuild:
+  Bump to new version; although it has gone up a major revision the changes are
+  actually quite small.  Ebuild now cunningly sets up the INFODIR configuration
+  item from the data in profile.env :)
 
   01 Sep 2006; Kevin F. Quinn <kevquinn@gentoo.org> info2html-1.4-r2.ebuild:
   Make perl RDEPEND not DEPEND; ditch dodoc README since it says nothing useful
diff --git a/app-text/info2html/Manifest b/app-text/info2html/Manifest
index 52336804cb78..9e2e04e3704f 100644
--- a/app-text/info2html/Manifest
+++ b/app-text/info2html/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX info2html-2.0-xss.patch 2206 RMD160 c92f63cd183547138f9352048ce16049f0d2f266 SHA1 0b0f1b07dddb08eb67d3550db2859820ad41979d SHA256 a243877e41fdd7b5174b89a58e1f8d7d0afb5a2bfef4e7a6cc591e02287cf98f
+MD5 fb9c2056d5429abb02bd71f934da3ac4 files/info2html-2.0-xss.patch 2206
+RMD160 c92f63cd183547138f9352048ce16049f0d2f266 files/info2html-2.0-xss.patch 2206
+SHA256 a243877e41fdd7b5174b89a58e1f8d7d0afb5a2bfef4e7a6cc591e02287cf98f files/info2html-2.0-xss.patch 2206
 AUX info2html-gentoo.patch 1767 RMD160 7749dc4b369529c75819a5f86b7078dbc98a7d12 SHA1 e92586c0be1669b41bf42c36be764abb888236b4 SHA256 1ba2a50da128deadc59d5d2604ab9b0a9c49b4f6970c5ba965e0fdd8c214e80d
 MD5 495fd408850958212ae70b35f3b8129b files/info2html-gentoo.patch 1767
 RMD160 7749dc4b369529c75819a5f86b7078dbc98a7d12 files/info2html-gentoo.patch 1767
@@ -10,6 +14,7 @@ MD5 cc6a82ee8361bbdc4e94d4f39feb5896 files/info2html-xss.patch 1730
 RMD160 69961064f85b8eab600f943bbb32f5da286090e8 files/info2html-xss.patch 1730
 SHA256 c0cbc74bd7fc25f587050aaa42fb04eb9ff3dfb6c39853b4c11f07484396213a files/info2html-xss.patch 1730
 DIST info2html-1.4.tgz 8473 RMD160 04ce32dc6c6de843463eabfafe9007606ad584ce SHA1 58e901863f344a757fbc7a0ab5445ed6404db47f SHA256 b93bc7d1e11aaa287cf01ae32ab089ea347aa26d1973fab52a146c977096d56f
+DIST info2html-2.0.tar 51200 RMD160 3fb27f2962c3036eeb740250a848dc87decb613c SHA1 415d7b9e779859f270cbe9be33fb58a093844fe1 SHA256 553f4d17e7edc13e5d27ae66e27b8702e1e83691adb3505a26e3af70276f84a5
 EBUILD info2html-1.4-r1.ebuild 989 RMD160 84c3efe1f2aaba25fc46bcb63148a888679268ae SHA1 04e2077d94b480a506ab0e54ca2c4a19aacd23e5 SHA256 3363f971585a43b208604450a459cc3484a502824089199fb76cb4c59d8a6ce6
 MD5 9293d5fd1d3733b63e98932b84ce3f8e info2html-1.4-r1.ebuild 989
 RMD160 84c3efe1f2aaba25fc46bcb63148a888679268ae info2html-1.4-r1.ebuild 989
@@ -22,10 +27,14 @@ EBUILD info2html-1.4.ebuild 947 RMD160 47f9d53be6073d330e007e0be3b605aaaacfa829
 MD5 98979dcc8f89c84051f9957afd8d481a info2html-1.4.ebuild 947
 RMD160 47f9d53be6073d330e007e0be3b605aaaacfa829 info2html-1.4.ebuild 947
 SHA256 76cccc16d9a94957e0cb275f8b95f192712645af73374cb06ad9af27ac9364f6 info2html-1.4.ebuild 947
-MISC ChangeLog 1975 RMD160 ee8004a063563d91fcfe8ef1f34b0e10a1d76481 SHA1 02c359b089f968d7b94afdd171811fcf36fdb808 SHA256 20898cccdd660b81efc64167dad65cafe8127a75d8f58d0d398b2a2a8735a496
-MD5 9e562ff9a022ab3a206d76b791058a9e ChangeLog 1975
-RMD160 ee8004a063563d91fcfe8ef1f34b0e10a1d76481 ChangeLog 1975
-SHA256 20898cccdd660b81efc64167dad65cafe8127a75d8f58d0d398b2a2a8735a496 ChangeLog 1975
+EBUILD info2html-2.0.ebuild 2047 RMD160 3b050eac2db5eb795cb5940ab20bb0eb7b16b971 SHA1 805e2e5331716451507ad6b2debef847d3a5c513 SHA256 8fee67a79ad6b7687322e0d4d91d006dcdd4ecfd802eebaeeacf13ee3e9a65fa
+MD5 628dcf3802bed7af740a9d669a9f84aa info2html-2.0.ebuild 2047
+RMD160 3b050eac2db5eb795cb5940ab20bb0eb7b16b971 info2html-2.0.ebuild 2047
+SHA256 8fee67a79ad6b7687322e0d4d91d006dcdd4ecfd802eebaeeacf13ee3e9a65fa info2html-2.0.ebuild 2047
+MISC ChangeLog 2314 RMD160 b27fea6244814539be8cb65718bf7b71fcbd31cc SHA1 e9be3f0badf7dbaf2419d2923c37953253e1c1d2 SHA256 d36da958db7e66336bd0ff5d67a1200e33ff543928ede318bd5e7c91952b13df
+MD5 aa7c7bc4e47673f02b88334f7a6d9d03 ChangeLog 2314
+RMD160 b27fea6244814539be8cb65718bf7b71fcbd31cc ChangeLog 2314
+SHA256 d36da958db7e66336bd0ff5d67a1200e33ff543928ede318bd5e7c91952b13df ChangeLog 2314
 MISC metadata.xml 255 RMD160 4a21934460d561dd09c2a89906bf2d5e6b115fcb SHA1 f6d4efe219bcf2b807183c63e4d441932df3f7a3 SHA256 6142e613e113e9f45f44a77e3a2501487ec9aaf672ae51bff3f47a0821733cdb
 MD5 9d3b5da8e5d2162275c8675b7263f8e4 metadata.xml 255
 RMD160 4a21934460d561dd09c2a89906bf2d5e6b115fcb metadata.xml 255
@@ -39,10 +48,13 @@ SHA256 fa40c2bf18435194c3c17f54580d9a47f832f8f26ca09654b9f2fb2164f49054 files/di
 MD5 34c4959aa165b3189fecc9bed1fa34d1 files/digest-info2html-1.4-r2 226
 RMD160 10637315384245efd620c9216264dc190d4099ab files/digest-info2html-1.4-r2 226
 SHA256 fa40c2bf18435194c3c17f54580d9a47f832f8f26ca09654b9f2fb2164f49054 files/digest-info2html-1.4-r2 226
+MD5 63720b1f75b829d057cf5ac7714af318 files/digest-info2html-2.0 229
+RMD160 950f44659595ffd40b957f439dfec573fa37ac01 files/digest-info2html-2.0 229
+SHA256 545cab0cd8b9eb92f6b20b297ad3fbbef80746e92b4ba4f68a653bb0b78ddf2a files/digest-info2html-2.0 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+CuMZfNLSOUrp0sRAjETAKCOKKxwsFmJE3gctBFrohAvqvLCawCffoSR
-M29KdzeTp2jh+p8LhlSngDM=
-=CUbx
+iD8DBQFE+EZNZfNLSOUrp0sRAoMtAKDEen480+x6MXk3dNAVHEzCPkNEOACgtqpX
+KoA5GPl949Uivrv6ZrwZIsE=
+=s5jM
 -----END PGP SIGNATURE-----
diff --git a/app-text/info2html/files/digest-info2html-2.0 b/app-text/info2html/files/digest-info2html-2.0
new file mode 100644
index 000000000000..f9ce3e68dea1
--- /dev/null
+++ b/app-text/info2html/files/digest-info2html-2.0
@@ -0,0 +1,3 @@
+MD5 fc265a8f5347805689b27c31e85ccc08 info2html-2.0.tar 51200
+RMD160 3fb27f2962c3036eeb740250a848dc87decb613c info2html-2.0.tar 51200
+SHA256 553f4d17e7edc13e5d27ae66e27b8702e1e83691adb3505a26e3af70276f84a5 info2html-2.0.tar 51200
diff --git a/app-text/info2html/files/info2html-2.0-xss.patch b/app-text/info2html/files/info2html-2.0-xss.patch
new file mode 100644
index 000000000000..a2254bdbbe2b
--- /dev/null
+++ b/app-text/info2html/files/info2html-2.0-xss.patch
@@ -0,0 +1,61 @@
+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/&/&amp;/gs;		# ampersand
++  $Tag =~ s/#/&#35;/gs;
++  $Tag =~ s/;/&#59;/gs;
++  $Tag =~ s/[\000-\037\177-\237]/&iquest;/gs; # "ctrl" codes 0-31 and 127-159
++  $Tag =~ s/</&lt;/gs;		# less-than symbol
++  $Tag =~ s/>/&gt;/gs;		# greater-than symbol
++  $Tag =~ s/"/&quot;/gs;	# double quote
++  $Tag =~ s/\240/&nbsp;/gs;	# non-breaking space
++  $Tag =~ s/\255/&shy;/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.ebuild b/app-text/info2html/info2html-2.0.ebuild
new file mode 100644
index 000000000000..328f1859788b
--- /dev/null
+++ b/app-text/info2html/info2html-2.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/info2html/info2html-2.0.ebuild,v 1.1 2006/09/01 14:39:52 kevquinn Exp $
+
+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
+}