summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2013-05-06 21:21:27 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2013-05-06 21:21:27 +0000
commitcec9a3ffd078455ff392e2cb49c66d227f86b5f9 (patch)
treee2d7f05b9d1267ed309ed47a47bdc914a42de13a /app-text/enscript
parentRevert json-c dependecies (revert bug #467310 actions) (diff)
downloadhistorical-cec9a3ffd078455ff392e2cb49c66d227f86b5f9.tar.gz
historical-cec9a3ffd078455ff392e2cb49c66d227f86b5f9.tar.bz2
historical-cec9a3ffd078455ff392e2cb49c66d227f86b5f9.zip
Remove old
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64 Manifest-Sign-Key: 0x84AD142F
Diffstat (limited to 'app-text/enscript')
-rw-r--r--app-text/enscript/ChangeLog13
-rw-r--r--app-text/enscript/Manifest16
-rw-r--r--app-text/enscript/enscript-1.6.4-r4.ebuild55
-rw-r--r--app-text/enscript/enscript-1.6.5.1.ebuild51
-rw-r--r--app-text/enscript/enscript-1.6.5.2-r1.ebuild52
-rw-r--r--app-text/enscript/enscript-1.6.5.2.ebuild51
-rw-r--r--app-text/enscript/enscript-1.6.5.ebuild51
-rw-r--r--app-text/enscript/files/enscript-1.6.3-language.patch11
-rw-r--r--app-text/enscript/files/enscript-1.6.3-security.patch177
-rw-r--r--app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch91
-rw-r--r--app-text/enscript/files/enscript-1.6.4-config.patch95
-rw-r--r--app-text/enscript/files/enscript-catmur.patch26
12 files changed, 12 insertions, 677 deletions
diff --git a/app-text/enscript/ChangeLog b/app-text/enscript/ChangeLog
index 28ee5bdc11d1..064be83c041e 100644
--- a/app-text/enscript/ChangeLog
+++ b/app-text/enscript/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for app-text/enscript
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/ChangeLog,v 1.76 2012/12/30 14:35:21 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/ChangeLog,v 1.77 2013/05/06 21:21:06 dilfridge Exp $
+
+ 06 May 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ -files/enscript-1.6.3-language.patch, -files/enscript-1.6.3-security.patch,
+ -enscript-1.6.4-r4.ebuild,
+ -files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch,
+ -files/enscript-1.6.4-config.patch, -enscript-1.6.5.ebuild,
+ -enscript-1.6.5.1.ebuild, -enscript-1.6.5.2.ebuild,
+ -enscript-1.6.5.2-r1.ebuild, -files/enscript-catmur.patch:
+ Remove old
30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> enscript-1.6.6.ebuild:
Stable for alpha, wrt bug #441108
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 95b25b22e356..0139bbd214a4 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -1,23 +1,9 @@
AUX ebuild.st 6098 SHA256 aa82c0b841aeb7b02d1c178c91e31f36b3795007613d420e6223e39e9c6c8b32 SHA512 a5bb63f8c768101930215634994ef4f9615b9122b21713f297cf97653717ed18746ce082f91efe0c0b0112695f929d94f18e3c3f5606fe67d4b17520135db5c6 WHIRLPOOL e7d67e9fa89dda5a7edfdfced2fbbaab525fe83389f6d0aed82fc8aae7035e5d516d6214f90f590d505e910505571dfd0656b5bf7426838df11c25f45612f8b5
AUX enscript-1.6.2-ruby.patch 661 SHA256 53bf90fa47841bcab742155d28f314ff5864c122b7f7d7fbb12177d43b3b60a7 SHA512 6ca804c1f9e1bc19eb896c88c4e710b5212e570d5e0d84b5b40100d4645bdb483c55ad902ae5db9a617268387d6b1d6db54f69e9ba3479f0f669dc1b2314d65c WHIRLPOOL bbaa5216e0d052802d72897784537f5b0ebc16691b3e268197f183985f493aacc96e009cb146f638e037fce3b38ae396b7650ad31d454f3b0bab0b751a67094b
-AUX enscript-1.6.3-language.patch 456 SHA256 b4830bb18f98749724f1382ef8c47124ae134c707af5303103fead2343710642 SHA512 9bdb0395379ec58a32563599e20ae690609c62a8b462652b557566e7d32c04d968ce9b0956c21a632a8ea31cc5b90b080a068b1e862371f08df1e3f10d1c8cfe WHIRLPOOL 25f85096f04a15c03dfba4d0f61db4475e6de2a50fced1564d9701cefa22866ce4ecf82abeec28dce2446c74fdf3b81a841463965e506b237eec06de68a71eab
-AUX enscript-1.6.3-security.patch 5447 SHA256 bd9525903b9690f259f0bba8257a96b57681f03a65272d590796c796a8396052 SHA512 571406c0e585104cd4d30f8ee4544a9c14e52d12eafeee71fa7f2d369c85813db08e66242cdb4f8ea8163e0aa11ce95f5842b0591d33be55cd1ab18a37023592 WHIRLPOOL a11303a63a67f258a69c19faaebdd413ba67d496e568cd74c624194b4a7ed47b71c9e1082f782bd7b3818e55b8d4b92bf37928aaa321752b1125c03d22da6cee
-AUX enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch 2799 SHA256 6fcccba9d5447c5872fef3072d798cfcbdf7fc347e566126d0014d1b96f3f978 SHA512 c1705c8759eb1c5c524276606a7bd02b762233fb6421fdc5f6cf8470e29765112cb092562f5963b1f5dc661217351d545e0be7a91061991a125501f77a2f8b6f WHIRLPOOL d7787f7dbd9be0d622ff24aa602cf8cd52cbed21be7906ad2e69e73307926a0b3850b5264477b88db84930da061dcbaf2d788dfca8c2c3111b8356589181653f
-AUX enscript-1.6.4-config.patch 3901 SHA256 b49ea303616373ed2b72c329a7632bae589b62df18e0af149315a36977459188 SHA512 9e20cd90b4926910fbd2a7cc46e37a7f065a1f45b87d240971f0048b4b24a3fdafb6ad1adcb6e5cb0a36b9342941bd54c5aae122d20d1a3c5283afd799324466 WHIRLPOOL 2a82976914da6d809d3b89e42a1a6b3e283f0dcf0345b7808f411bdbb4ecf78115d3498d3fc5fef4582e59eef425f5e958abefb80ffa2778f63ba3a84d3c4dfa
AUX enscript-1.6.4-ebuild.st.patch 332 SHA256 fae2d59559a61a3d2f0fb25695c3dc5eab917e1eb22af61844e85584281728a6 SHA512 8e86a7b2966810852703a7f3636b0c92e940d3fba21a46be46086830799cfecd2870cd38679f009cb9d984bf3c475e843df67970619cf43ebf272c209b204fd9 WHIRLPOOL 92c4dd373180556d4c3b2f7df372835c20b912d705072e735f99f492155c6a9f2919a8292bda8fd5d5f3dada2f42d8b915ca2688f1c0969b7ba6bf42ed9c3ec3
AUX enscript-1.6.5.2-php.st.patch 410 SHA256 2439a1d1fb1bf2f0a55f097b2d507316a767875db1fd9ee17f57d8bc2c242be7 SHA512 71bf65c91d6d362bbb700ef26b72137e524a969da0971b7f0c30ac409a7f002103769cc25c02222d0ccb1bf69919a419481af9ea479828e3df18ec7a2e1d29b0 WHIRLPOOL 9a8df36fcc440d7a3f5983f52cba8e5e296bf873f5e6014ebcc86ce4cf7af0de8e2adb5b70caec95fc4334615fe074ab5342d7a88c1b5a84e4f864964eb8d37d
-AUX enscript-catmur.patch 604 SHA256 23b2359b2ef4e9cf0f6b915fb9f326a0a9ebd3f43f4dcca5f4beb2602201d02c SHA512 06b9ee66fb1ad926e1e286fd5f53a2984a69dc710d54cc34094d8622bc6d9d00026502dec22132a9827c62306b63ad3540495ef161d8ceea92cc8434599a8560 WHIRLPOOL 8e2506a1778c4f91a19d9875ac8750c6022dd7eea8596a2794caf60c61aaf2b84f022b6a7c4bc80a7483fcb884cfbf2d3d6fab339d913da44799adb0fd8ed063
AUX ruby.st 3904 SHA256 211d8a241d177c9c1c232eec514357b96b2d28554d63b72df3d72f79a41b25b0 SHA512 43af0998ebe95530129aec126b9f91878bbbf7dd52530cb162b25f5779f9eb5b870f41727665e66dd5cf42a6d5e790899bf03c38c1a914adf2b0eecac83154e2 WHIRLPOOL dc0fd98a3d80a9369cf95472b167cc81fb6adb7d2a020fac56e9bd99a81bbc46d8ac5d2d65c2c0b23ad9c3bab85abf9be6de34f8167b966307a2e9ead6207d0f
-DIST enscript-1.6.4.tar.gz 1036734 SHA256 45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b SHA512 bd1a2e74e7434ef19c24cab35ab6fb460c593317d4f78161e17632c19bfb800229742def3c9785017b6343621208fca308c1a24a26c03c306ef1698ed7c02d94 WHIRLPOOL ef5f3af78e89b9ab7cd69f72dc451fd8d22f1c3227bb0ddda8766952243846f71cce69fa4c7e14a36485fef3257c0ffb86db1bc12f0db0bedf5ea5b7a17c20d0
-DIST enscript-1.6.5.1.tar.gz 1314983 SHA256 57bf356c1c44bcb02865c6f7337a18d0b51042388d5f10e6bbbcdd15e368f58b SHA512 86163472abbd6ac9e84b4b6ca4048855ff2a91f41bfb1b59b9d962927d10799d2bf73db1f8f5e5ec53876191b56cb21ff18c076f4a9873f552cb507332c85db4 WHIRLPOOL fc734a9a9bfe579f6246aaa368e538bfe96a602b65447f0d08e7cac9492501467123c015722db42b2e573b89a4276a1e1c84d1b4a5274ec8633e64246deb9cb5
-DIST enscript-1.6.5.2.tar.gz 1318283 SHA256 db3e33bdb36f9e7252a386ea1faa9b5444cc9ba0ac2dd46fffc1f14887a4cb75 SHA512 8e0ecb95fb4fed79bc82094c86dfc449d429581511840cc68b8e3dd1c04a532adf9ccbd1fe6f325b3b5df8192311c69a294a6367c8891c60a70698cd037038e1 WHIRLPOOL c3364fcea489727cbb4bd37ab6df938c4723168cd5f53f6d25ec98624b183e1aad5261172c5d237ba0b724b132047aa969933b5e48729f9bb049b86cd35d8610
-DIST enscript-1.6.5.tar.gz 1308918 SHA256 224ee94eb1c3c527d550a5bd7ef7a229cb2be76bf6dbad98e91093f1cfb304eb SHA512 310c4d9a3e9791a290dde875798d6f0dd6ddadc87f95e249aa90ab8e0263a8396128e13b6a854925dd3369153817967bfedfe12df4407527f2d8c6c21ba138d5 WHIRLPOOL b7f9e5084ff242be8193febb85913d5bc1f30265e01250476bd592ff79fd4b8d1774a38cefc8da0ef1c7e9cf22647ddf885022b0708344e2c073fe903c3d4836
DIST enscript-1.6.6.tar.gz 1330493 SHA256 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc WHIRLPOOL 718d06a76add39cc916a4a30262049787de73aee5e569407bf5a40eba4f90cd47c89ed6cc151269175d4fe250c15f6a04aed138828315988697d5b9eda03d055
-EBUILD enscript-1.6.4-r4.ebuild 1558 SHA256 ebe64476a8d619f7d5c2a216e9d0a588f7b0e8f56872501df8e26cd3de9e7083 SHA512 4bb159f14d5b0030ded49b7f9929d68c3ee595e230fd26a2bd153985801326b4113e7264c0f7ee8c45369ca42d3e4598c15348be8814d670dd6a398598649c9a WHIRLPOOL eed8f4ea3faad521e21e56f9a490d5c87a974fd790a08c969d03a305643e4e78a3800273e457dc956f25da4d4c5a7b83817af7530aa96131e86a49867aaaa526
-EBUILD enscript-1.6.5.1.ebuild 1281 SHA256 5274033fa278a27564079807566675a17a934b654515d7c7276776d73b146ee5 SHA512 3886b9ee98416453f2fe048199163e05d63f6ffb10a108a16431f176dc6ed316ceb9a0b177608014b0229f8184ce5356181c0211570894b8247afc230fc0cb18 WHIRLPOOL 57e858b8a1cca9633fa2277285b06d5223d27514b4775aad56045373535b39fe808f27ade9c03a684c7b31772285c4d44aa117a881abcf294f95387df564dfee
-EBUILD enscript-1.6.5.2-r1.ebuild 1344 SHA256 55d28bb70ccbdcfe4bc09a9d8193e9259f672dd506493ac35e5f6a19104365c7 SHA512 478ccbac3ec039da9ac2a09cc77a135ccfe03bb368f677683dd898a6215df6f70365653b9f64d2564d810cc45121c8f979bf0ed26badeababaa7ddbdc7c4bd90 WHIRLPOOL f38e94b20dfcd0a6a3f6ed8264e591aedee3115fb9756e4eb47fc885f988a31d3bc7a7552875d7ceb89238d4e93f913bfeeb0d9ab097489c5a0ac019130bc36f
-EBUILD enscript-1.6.5.2.ebuild 1281 SHA256 3bfb90672e58138ec693b08abdadb9ef16a274b8021fa3659d080a39b77de2b7 SHA512 5f0b642ebd3766f3ee62475dbf26163d249c642d977f85ea9470e6d5b5889678f30022f2299c66e8038059379df52b6179d40ac30791df7f60126b25bedc67bf WHIRLPOOL 7ecd2346402fedca46e4da5245592c03a5d26b404186903c29c1cbdd05373f87d8ba25a9fdcd0192738bcf851bcfc9db01ba1b7e25ae9f8b7a7d35b712ceb392
-EBUILD enscript-1.6.5.ebuild 1279 SHA256 543d31f9bb57b3ec4b32b15a869a4e82f0ecfffeb3faea2f515026ef2ce277bd SHA512 6a0e2daf0463462937f8a44a815458ec64a31453932ddb80af4e6ac497fbf30851ba8cfe2c7f03bfc36816afec495226b99dedb12b8e102ec9bdbec451504a5a WHIRLPOOL a3af4f8009f062b45f7168b6dc09d73a135554e28c95f4b58e5f873d706bfc9db780f51bd6f17ab0adac5ff6eade14ef37f2faca0e668979733cb6a801157a61
EBUILD enscript-1.6.6.ebuild 1353 SHA256 90dee5ae2a9ed08e8132d33f26bdc04ba62d36831c7355a67ea1a799260d3d07 SHA512 dfab6258b577d598b6db586da7752068baeabe99e64680a7a230d6279c0d3eabbdf0506185eafe585d5a1d629e2030890188cf0aacbea6ac09873a9051f75e08 WHIRLPOOL ec5b1268c62990563d3767ae06c36daf44c76a0275034d513f0bd5561bc5950d985427d6756069e6a9ed834fd9cec4077266ede5f818a63509b0bd236ba05047
-MISC ChangeLog 9507 SHA256 752c362e0a121a1d1f249e22804a99d4f6f2f3e3adf10ecb1bbef1755d88814f SHA512 a69c1673acc63f930aa6b57b93e407776ca4b768f6e2fae34ade6c6a1d3bbef6402eec444c04b26427fb93e8c5505516163e7f2912370b83383c79ac35de9232 WHIRLPOOL 667cc4a1a3249e0584adfb8a7a0e64d01744f99bc78bc7f1b5e04c6a39b81a31d1b7bb4d53e1ccacd6ce4f4fd0fc083c07d690ab64ad754083970b6cf1a45462
+MISC ChangeLog 9927 SHA256 97f45b8ee691ee8a16ce4f70cf5b67d1a36ccac092d5af56a0252fbdaee46760 SHA512 561eec81ff2ab76269b3cff05608710f0b7c6b64ba6ac714ef63795d3b3df325d05d07e302039be836c52a7a872e9b9460178020b9470e99861af5fbe8459960 WHIRLPOOL 3d4fde78e35c93d1b6e6352fdd23e48cd8182eb881ed99e42289bb494302f1bf118ecc32255cb9a9899ef832b0d96d4206b6cd6cf762a2678fb53909f8bf9f49
MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
diff --git a/app-text/enscript/enscript-1.6.4-r4.ebuild b/app-text/enscript/enscript-1.6.4-r4.ebuild
deleted file mode 100644
index ebaa3234456e..000000000000
--- a/app-text/enscript/enscript-1.6.4-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.4-r4.ebuild,v 1.7 2008/11/15 18:44:05 dertobi123 Exp $
-
-inherit eutils
-
-DESCRIPTION="powerful text-to-postscript converter"
-SRC_URI="http://www.iki.fi/mtr/genscript/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
-
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="nls ruby"
-
-DEPEND="sys-devel/flex
- sys-devel/bison
- nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/enscript-1.6.3-security.patch
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch
- epatch "${FILESDIR}"/enscript-catmur.patch
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
- epatch "${FILESDIR}"/enscript-1.6.4-config.patch
- epatch "${FILESDIR}"/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
-}
-
-src_compile() {
- unset CC
- econf $(use_enable nls)
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
-
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed"
-
- if use ruby ; then
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed"
- fi
-}
-
-pkg_postinst() {
- elog "Now, customize /etc/enscript.cfg."
-}
diff --git a/app-text/enscript/enscript-1.6.5.1.ebuild b/app-text/enscript/enscript-1.6.5.1.ebuild
deleted file mode 100644
index 0271e817cad8..000000000000
--- a/app-text/enscript/enscript-1.6.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.1.ebuild,v 1.1 2010/03/09 18:09:11 jer Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="powerful text-to-postscript converter"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="nls ruby"
-
-DEPEND="
- sys-devel/flex
- sys-devel/bison
- nls? ( sys-devel/gettext )
-"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
-
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed"
-
- if use ruby ; then
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed"
- fi
-}
-
-pkg_postinst() {
- elog "Now, customize /etc/enscript.cfg."
-}
diff --git a/app-text/enscript/enscript-1.6.5.2-r1.ebuild b/app-text/enscript/enscript-1.6.5.2-r1.ebuild
deleted file mode 100644
index c17a71d6c5dd..000000000000
--- a/app-text/enscript/enscript-1.6.5.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.2-r1.ebuild,v 1.7 2012/09/30 17:35:03 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="powerful text-to-postscript converter"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
-
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="nls ruby"
-
-DEPEND="
- sys-devel/flex
- sys-devel/bison
- nls? ( sys-devel/gettext )
-"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
- epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
-
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed"
-
- if use ruby ; then
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed"
- fi
-}
-
-pkg_postinst() {
- elog "Now, customize /etc/enscript.cfg."
-}
diff --git a/app-text/enscript/enscript-1.6.5.2.ebuild b/app-text/enscript/enscript-1.6.5.2.ebuild
deleted file mode 100644
index f0e8468cebc4..000000000000
--- a/app-text/enscript/enscript-1.6.5.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.2.ebuild,v 1.1 2010/06/10 16:01:47 jer Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="powerful text-to-postscript converter"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="nls ruby"
-
-DEPEND="
- sys-devel/flex
- sys-devel/bison
- nls? ( sys-devel/gettext )
-"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
-
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed"
-
- if use ruby ; then
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed"
- fi
-}
-
-pkg_postinst() {
- elog "Now, customize /etc/enscript.cfg."
-}
diff --git a/app-text/enscript/enscript-1.6.5.ebuild b/app-text/enscript/enscript-1.6.5.ebuild
deleted file mode 100644
index f25637c1ae28..000000000000
--- a/app-text/enscript/enscript-1.6.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.ebuild,v 1.1 2010/01/26 05:08:23 jer Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="powerful text-to-postscript converter"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="nls ruby"
-
-DEPEND="
- sys-devel/flex
- sys-devel/bison
- nls? ( sys-devel/gettext )
-"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
-
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed"
-
- if use ruby ; then
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed"
- fi
-}
-
-pkg_postinst() {
- elog "Now, customize /etc/enscript.cfg."
-}
diff --git a/app-text/enscript/files/enscript-1.6.3-language.patch b/app-text/enscript/files/enscript-1.6.3-language.patch
deleted file mode 100644
index 66ac8cbc3c5a..000000000000
--- a/app-text/enscript/files/enscript-1.6.3-language.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.c.org 2005-06-01 01:23:29.000000000 +0200
-+++ src/main.c 2005-06-01 01:26:38.000000000 +0200
-@@ -2001,7 +2001,7 @@
- int i;
-
- c = getopt_long (argc, argv,
-- "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ",
-+ "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ",
- long_options, &option_index);
-
- if (c == -1)
diff --git a/app-text/enscript/files/enscript-1.6.3-security.patch b/app-text/enscript/files/enscript-1.6.3-security.patch
deleted file mode 100644
index de67593f5edf..000000000000
--- a/app-text/enscript/files/enscript-1.6.3-security.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -u -p -Nr --exclude CVS orig/enscript-1.6.3/src/gsint.h enscript-1.6.3.CAN-2004-1184/src/gsint.h
---- orig/enscript-1.6.3/src/gsint.h 2000-07-11 17:28:06.000000000 +0200
-+++ enscript-1.6.3.CAN-2004-1184/src/gsint.h 2005-01-04 20:45:24.000000000 +0100
-@@ -701,4 +701,9 @@ FILE *printer_open ___P ((char *cmd, cha
- */
- void printer_close ___P ((void *context));
-
-+/*
-+ * Escape filenames for shell usage
-+ */
-+char *shell_escape ___P ((const char *fn));
-+
- #endif /* not GSINT_H */
-diff -u -p -Nr --exclude CVS orig/enscript-1.6.3/src/main.c enscript-1.6.3.CAN-2004-1184/src/main.c
---- orig/enscript-1.6.3/src/main.c 2005-01-04 20:52:31.000000000 +0100
-+++ enscript-1.6.3.CAN-2004-1184/src/main.c 2005-01-05 10:57:44.000000000 +0100
-@@ -1555,9 +1555,13 @@ name width\theight\tllx\tlly
- buffer_append (&cmd, intbuf);
- buffer_append (&cmd, " ");
-
-- buffer_append (&cmd, "-Ddocument_title=\"");
-- buffer_append (&cmd, title);
-- buffer_append (&cmd, "\" ");
-+ buffer_append (&cmd, "-Ddocument_title=\'");
-+ if ((cp = shell_escape (title)) != NULL)
-+ {
-+ buffer_append (&cmd, cp);
-+ free (cp);
-+ }
-+ buffer_append (&cmd, "\' ");
-
- buffer_append (&cmd, "-Dtoc=");
- buffer_append (&cmd, toc ? "1" : "0");
-@@ -1574,8 +1578,14 @@ name width\theight\tllx\tlly
- /* Append input files. */
- for (i = optind; i < argc; i++)
- {
-- buffer_append (&cmd, " ");
-- buffer_append (&cmd, argv[i]);
-+ char *cp;
-+ if ((cp = shell_escape (argv[i])) != NULL)
-+ {
-+ buffer_append (&cmd, " \'");
-+ buffer_append (&cmd, cp);
-+ buffer_append (&cmd, "\'");
-+ free (cp);
-+ }
- }
-
- /* And do the job. */
-@@ -1636,7 +1645,7 @@ name width\theight\tllx\tlly
- buffer_ptr (opts), buffer_len (opts));
- }
-
-- buffer_append (&buffer, " \"%s\"");
-+ buffer_append (&buffer, " \'%s\'");
-
- input_filter = buffer_copy (&buffer);
- input_filter_stdin = "-";
-diff -u -p -Nr --exclude CVS orig/enscript-1.6.3/src/util.c enscript-1.6.3.CAN-2004-1184/src/util.c
---- orig/enscript-1.6.3/src/util.c 1999-09-17 17:26:51.000000000 +0200
-+++ enscript-1.6.3.CAN-2004-1184/src/util.c 2005-01-05 10:43:23.000000000 +0100
-@@ -1239,6 +1239,8 @@ escape_string (char *string)
-
- /* Create result. */
- cp = xmalloc (len + 1);
-+ if (cp == NULL)
-+ return NULL;
- for (i = 0, j = 0; string[i]; i++)
- switch (string[i])
- {
-@@ -1879,6 +1881,7 @@ is_open (InputStream *is, FILE *fp, char
- char *cmd = NULL;
- int cmdlen;
- int i, pos;
-+ char *cp;
-
- is->is_pipe = 1;
-
-@@ -1902,12 +1905,16 @@ is_open (InputStream *is, FILE *fp, char
- {
- case 's':
- /* Expand cmd-buffer. */
-- cmdlen += strlen (fname);
-- cmd = xrealloc (cmd, cmdlen);
-+ if ((cp = shell_escape (fname)) != NULL)
-+ {
-+ cmdlen += strlen (cp);
-+ cmd = xrealloc (cmd, cmdlen);
-
-- /* Paste filename. */
-- strcpy (cmd + pos, fname);
-- pos += strlen (fname);
-+ /* Paste filename. */
-+ strcpy (cmd + pos, cp);
-+ pos += strlen (cp);
-+ free (cp);
-+ }
-
- i++;
- break;
-@@ -2116,3 +2123,36 @@ buffer_len (Buffer *buffer)
- {
- return buffer->len;
- }
-+
-+/*
-+ * Escapes the name of a file so that the shell groks it in 'single'
-+ * quotation marks. The resulting pointer has to be free()ed when not
-+ * longer used.
-+*/
-+char *
-+shell_escape(const char *fn)
-+{
-+ size_t len = 0;
-+ const char *inp;
-+ char *retval, *outp;
-+
-+ for(inp = fn; *inp; ++inp)
-+ switch(*inp)
-+ {
-+ case '\'': len += 4; break;
-+ default: len += 1; break;
-+ }
-+
-+ outp = retval = malloc(len + 1);
-+ if(!outp)
-+ return NULL; /* perhaps one should do better error handling here */
-+ for(inp = fn; *inp; ++inp)
-+ switch(*inp)
-+ {
-+ case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break;
-+ default: *outp++ = *inp; break;
-+ }
-+ *outp = 0;
-+
-+ return retval;
-+}
-diff -u -p -Nr --exclude CVS enscript-1.6.3.CAN-2004-1184/src/psgen.c enscript-1.6.3.CAN-2004-1185/src/psgen.c
---- enscript-1.6.3.CAN-2004-1184/src/psgen.c 2005-01-04 20:59:56.000000000 +0100
-+++ enscript-1.6.3.CAN-2004-1185/src/psgen.c 2005-01-05 15:22:40.000000000 +0100
-@@ -2385,9 +2385,10 @@ recognize_eps_file (Token *token)
- MESSAGE (2, (stderr, "^@epsf=\"%s\"\n", token->u.epsf.filename));
-
- i = strlen (token->u.epsf.filename);
-+ /*
- if (i > 0 && token->u.epsf.filename[i - 1] == '|')
- {
-- /* Read EPS data from pipe. */
-+ / * Read EPS data from pipe. * /
- token->u.epsf.pipe = 1;
- token->u.epsf.filename[i - 1] = '\0';
- token->u.epsf.fp = popen (token->u.epsf.filename, "r");
-@@ -2400,6 +2401,7 @@ recognize_eps_file (Token *token)
- }
- }
- else
-+ */
- {
- char *filename;
-
-diff -u -p -Nr --exclude CVS enscript-1.6.3.CAN-2004-1185/src/psgen.c enscript-1.6.3.CAN-2004-1186/src/psgen.c
---- enscript-1.6.3.CAN-2004-1185/src/psgen.c 2005-01-05 15:22:40.000000000 +0100
-+++ enscript-1.6.3.CAN-2004-1186/src/psgen.c 2005-01-05 15:22:44.000000000 +0100
-@@ -2034,8 +2034,9 @@ dump_ps_page_header (char *fname, int em
- else
- {
- ftail++;
-- strncpy (buf, fname, ftail - fname);
-- buf[ftail - fname] = '\0';
-+ i = ftail - fname >= sizeof (buf)-1 ? sizeof (buf)-1 : ftail - fname;
-+ strncpy (buf, fname, i);
-+ buf[i] = '\0';
- }
-
- if (nup > 1)
-
diff --git a/app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch b/app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch
deleted file mode 100644
index 2ee926b107af..000000000000
--- a/app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- src/psgen.c
-+++ src/psgen.c 2008-10-29 10:43:08.512598143 +0100
-@@ -24,6 +24,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
-+#include <limits.h>
- #include "gsint.h"
-
- /*
-@@ -124,7 +125,7 @@ struct gs_token_st
- double xscale;
- double yscale;
- int llx, lly, urx, ury; /* Bounding box. */
-- char filename[512];
-+ char filename[PATH_MAX];
- char *skipbuf;
- unsigned int skipbuf_len;
- unsigned int skipbuf_pos;
-@@ -135,11 +136,11 @@ struct gs_token_st
- Color bgcolor;
- struct
- {
-- char name[512];
-+ char name[PATH_MAX];
- FontPoint size;
- InputEncoding encoding;
- } font;
-- char filename[512];
-+ char filename[PATH_MAX];
- } u;
- };
-
-@@ -248,7 +249,7 @@ static int do_print = 1;
- static int user_fontp = 0;
-
- /* The user ^@font{}-defined font. */
--static char user_font_name[256];
-+static char user_font_name[PATH_MAX];
- static FontPoint user_font_pt;
- static InputEncoding user_font_encoding;
-
-@@ -978,7 +979,8 @@ large for page\n"),
- FATAL ((stderr,
- _("user font encoding can be only the system's default or `ps'")));
-
-- strcpy (user_font_name, token.u.font.name);
-+ memset (user_font_name, 0, sizeof(user_font_name));
-+ strncpy (user_font_name, token.u.font.name, sizeof(user_font_name) - 1);
- user_font_pt.w = token.u.font.size.w;
- user_font_pt.h = token.u.font.size.h;
- user_font_encoding = token.u.font.encoding;
-@@ -1444,7 +1446,7 @@ read_special_escape (InputStream *is, To
- buf[i] = ch;
- if (i + 1 >= sizeof (buf))
- FATAL ((stderr, _("too long argument for %s escape:\n%.*s"),
-- escapes[i].name, i, buf));
-+ escapes[e].name, i, buf));
- }
- buf[i] = '\0';
-
-@@ -1452,7 +1454,8 @@ read_special_escape (InputStream *is, To
- switch (escapes[e].escape)
- {
- case ESC_FONT:
-- strcpy (token->u.font.name, buf);
-+ memset (token->u.font.name, 0, sizeof(token->u.font.name));
-+ strncpy (token->u.font.name, buf, sizeof(token->u.font.name) - 1);
-
- /* Check for the default font. */
- if (strcmp (token->u.font.name, "default") == 0)
-@@ -1465,7 +1468,8 @@ read_special_escape (InputStream *is, To
- FATAL ((stderr, _("malformed font spec for ^@font escape: %s"),
- token->u.font.name));
-
-- strcpy (token->u.font.name, cp);
-+ memset (token->u.font.name, 0, sizeof(token->u.font.name));
-+ strncpy (token->u.font.name, cp, sizeof(token->u.font.name) - 1);
- xfree (cp);
- }
- token->type = tFONT;
-@@ -1544,7 +1548,8 @@ read_special_escape (InputStream *is, To
- break;
-
- case ESC_SETFILENAME:
-- strcpy (token->u.filename, buf);
-+ memset (token->u.filename, 0, sizeof(token->u.font.name));
-+ strncpy (token->u.filename, buf, sizeof(token->u.filename) - 1);
- token->type = tSETFILENAME;
- break;
-
diff --git a/app-text/enscript/files/enscript-1.6.4-config.patch b/app-text/enscript/files/enscript-1.6.4-config.patch
deleted file mode 100644
index 5823a9db5e96..000000000000
--- a/app-text/enscript/files/enscript-1.6.4-config.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- enscript-1.6.4/afm/Makefile.am.config 2003-03-05 07:26:16.000000000 +0000
-+++ enscript-1.6.4/afm/Makefile.am 2005-12-23 09:56:52.000000000 +0000
-@@ -36,11 +36,11 @@
- EXTRA_DIST = font.map $(default_afm) $(public_fonts)
-
- install-data-local:
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm
- for f in $(EXTRA_DIST); do \
-- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \
- done
-
- uninstall-local:
-- rm -rf $(datadir)/enscript/afm
-+ rm -rf $(DESTDIR)/$(datadir)/enscript/afm
---- enscript-1.6.4/afm/Makefile.in.config 2003-03-05 07:40:06.000000000 +0000
-+++ enscript-1.6.4/afm/Makefile.in 2005-12-23 09:56:52.000000000 +0000
-@@ -319,14 +319,14 @@
-
-
- install-data-local:
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm
- for f in $(EXTRA_DIST); do \
-- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \
- done
-
- uninstall-local:
-- rm -rf $(datadir)/enscript/afm
-+ rm -rf $(DESTDIR)/$(datadir)/enscript/afm
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- enscript-1.6.4/lib/Makefile.in.config 2003-03-05 07:40:07.000000000 +0000
-+++ enscript-1.6.4/lib/Makefile.in 2005-12-23 09:56:52.000000000 +0000
-@@ -345,15 +345,16 @@
- all-local: enscript.cfg
-
- install-data-local: enscript.cfg
-- $(top_srcdir)/mkinstalldirs $(sysconfdir)
-- if test -r $(sysconfdir)/enscript.cfg; then \
-- cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-+ if test -r $(DESTDIR)$(sysconfdir)/enscript.cfg; then \
-+ cp $(DESTDIR)$(sysconfdir)/enscript.cfg \
-+ $(DESTDIR)$(sysconfdir)/enscript.cfg.old; \
- else :; \
- fi
-- $(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg
-+ $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg
-
- uninstall-local:
-- rm -f $(sysconfdir)/enscript.cfg
-+ rm -f $(DESTDIR)$(sysconfdir)/enscript.cfg
-
- enscript.cfg: $(srcdir)/enscript.cfg.in Makefile
- sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \
---- enscript-1.6.4/states/hl/Makefile.am.config 2005-12-23 09:59:55.000000000 +0000
-+++ enscript-1.6.4/states/hl/Makefile.am 2005-12-23 10:00:09.000000000 +0000
-@@ -45,10 +45,10 @@
- EXTRA_DIST = $(states)
-
- install-data-local:
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl
- for f in $(states); do \
-- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \
- done
-
- uninstall-local:
---- enscript-1.6.4/states/hl/Makefile.in.config 2005-12-23 10:00:13.000000000 +0000
-+++ enscript-1.6.4/states/hl/Makefile.in 2005-12-23 10:00:34.000000000 +0000
-@@ -330,10 +330,10 @@
-
-
- install-data-local:
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl
- for f in $(states); do \
-- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \
- done
-
- uninstall-local:
diff --git a/app-text/enscript/files/enscript-catmur.patch b/app-text/enscript/files/enscript-catmur.patch
deleted file mode 100644
index bd4b222f7f36..000000000000
--- a/app-text/enscript/files/enscript-catmur.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/main.c 2005/11/04 11:02:27 1.1
-+++ src/main.c 2005/11/04 11:16:28
-@@ -1695,7 +1695,7 @@ name width\theight\tllx\tlly
- }
-
- /* Table of Contents. */
-- if (toc)
-+ if (ofp != NULL && toc)
- {
- /* This is really cool... */
-
-@@ -1714,9 +1714,11 @@ name width\theight\tllx\tlly
- process_file (_("Table of Contents"), &is, 1);
- is_close (&is);
- }
--
-- /* Clean up toc file. */
-- fclose (toc_fp);
-+ else
-+ {
-+ /* Clean up toc file. */
-+ fclose (toc_fp);
-+ }
- }
-
- /* Give trailer a chance to dump itself. */