Add ghostscript-gpl-8.61.ebuild, fixes bug #200383. Remove a vulnerable 8.60 version.

Package-Manager: portage-2.1.4_rc4

5 files changed, 60 insertions, 45 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 5555b1c2302d..9cb112cdc5e8 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.31 2007/11/10 21:38:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.32 2007/11/30 22:37:50 tgurr Exp $
+
+*ghostscript-gpl-8.61 (30 Nov 2007)
+
+  30 Nov 2007; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-8.60.ebuild,
+  +ghostscript-gpl-8.61.ebuild:
+  Add ghostscript-gpl-8.61.ebuild, fixes bug #200383. Remove a vulnerable 8.60
+  version.
 
   10 Nov 2007; Markus Rothe <corsair@gentoo.org>
   ghostscript-gpl-8.60-r1.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index b8f7384ec74c..04ce4d1d09cf 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -93,8 +93,11 @@ DIST gdevhl12.c.gz 7613 RMD160 3adffbf7df824abd02242dadf847b09246f411bb SHA1 b5a
 DIST ghostscript-8.54-gpl.tar.bz2 12365361 RMD160 f61f6da568ffe440a466cd0d7b5871a3d87d1116 SHA1 5da69b04ddc8a4660a2c40b0e561a358c737c310 SHA256 64f43553223390a3e519efed2b3dfee8a4c79df5a373a0e96861483565957e1b
 DIST ghostscript-8.57.tar.bz2 11934408 RMD160 034331d9713cb551e1081c6bd53dbe4c983c2908 SHA1 17975b561a05b036fe06c96e8efdc512b9960062 SHA256 29c4cbf8bd95a14046d72eba7edbec60ffd25c37b3b3427f7c8ad5f81636ab15
 DIST ghostscript-8.60.tar.bz2 12942029 RMD160 208168fcd6bc5fd931d15b288ce9324f59ba07a3 SHA1 f0045b5055d7f83bf34b205976f73a7dafdac863 SHA256 f615f936e38d2e7a6da588de6655f2b23207c0a906df1960b1d7e83c3241982a
+DIST ghostscript-8.61.tar.bz2 13244754 RMD160 ec217b05f62f2f268a72c073f85aa95ee6f6c2aa SHA1 b05ac61885c0370e432531ffb79de349c6e8b896 SHA256 8c3f62da38688c02442f9b94ac42c6ecefb01141c8319393e8216d8422f7aa33
+DIST ghostscript-gpl-8.61-patchset-1.tar.bz2 9620 RMD160 b7464977dfabeab461439abb93ad38856a7bc27e SHA1 2e3f246d4da0956c712be4312319606cdd45593f SHA256 f2112bcf6e837f47c035646238d255f683e54b2ee6227afe7cef2d0a8ea2705c
 DIST gsdjvu-1.1.tar.gz 214364 RMD160 aa1ff4a80b02b16e43bf8e14719613f98bdf13c6 SHA1 cc33916f86a0f826159e5afed43d7fae722b3133 SHA256 39f32b9946a65cbe8d5b7c2882ef0e82d5858e78e04b568bb525d2c4e2d6ce78
 DIST gsdjvu-1.2.tar.gz 214539 RMD160 6cf27e95955b5ae0cc15dacc36ce514ff8347ab0 SHA1 e393193d8794c8a9c17e5642f90f2644c7ced155 SHA256 ab4a81eddb44241bb71b5ec813242036312effc9eb1b343b3c257fb563fa8a49
+DIST gsdjvu-1.3.tar.gz 204330 RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 SHA1 67fcbd72ae229ff68a5d0cc482d4179e3957df61 SHA256 7702fd287cd881a8b1e7911f780c10f98e332b3a6cd93dd35b245d5816b09ca2
 EBUILD ghostscript-gpl-8.54-r1.ebuild 5677 RMD160 a488cfd9f2def244d53331bd60c09a21540dce7b SHA1 7a35c9dbc632aea804a48ed5f6badb49dd4270d0 SHA256 9a2cd1d7ad1686fad148480d43ed69cf198b52c51fe4ee0a16c5c73f26fb8cf2
 MD5 26f578309fd1bf98c03e5535a2fd9b02 ghostscript-gpl-8.54-r1.ebuild 5677
 RMD160 a488cfd9f2def244d53331bd60c09a21540dce7b ghostscript-gpl-8.54-r1.ebuild 5677
@@ -111,14 +114,14 @@ EBUILD ghostscript-gpl-8.60-r1.ebuild 4751 RMD160 e991c17dda2a633d7a350ba8e36404
 MD5 be02516ac510f19a2de53d6054ddd96d ghostscript-gpl-8.60-r1.ebuild 4751
 RMD160 e991c17dda2a633d7a350ba8e364041e4f08cb0d ghostscript-gpl-8.60-r1.ebuild 4751
 SHA256 bd310a2e624ce98dee5c27dd9bbc407f32d9c09441fb60f5a4be5f4cbcb2f95c ghostscript-gpl-8.60-r1.ebuild 4751
-EBUILD ghostscript-gpl-8.60.ebuild 4492 RMD160 63ebdd2c705196c4e97e3c00f85043bc2e896105 SHA1 7b503a35f7d4dcaecda371053af941fd16430be8 SHA256 a55bf0e8ae64bd276d69e6744ef6732747ddd6a4c28e99390628b48741000ce4
-MD5 c8c049f4083c5b13876a60821242a494 ghostscript-gpl-8.60.ebuild 4492
-RMD160 63ebdd2c705196c4e97e3c00f85043bc2e896105 ghostscript-gpl-8.60.ebuild 4492
-SHA256 a55bf0e8ae64bd276d69e6744ef6732747ddd6a4c28e99390628b48741000ce4 ghostscript-gpl-8.60.ebuild 4492
-MISC ChangeLog 6923 RMD160 38727cf7e2eab2a3baf2555ac92cb6d7a33734e5 SHA1 8384efff0279315e9311bbc0c8b684f91ef8f524 SHA256 dffb6cc2bea553513085c61edf4a68c864d7c30cb8b472f01b440e9185815b85
-MD5 d4ef61cae7997eb10506dacd637b28be ChangeLog 6923
-RMD160 38727cf7e2eab2a3baf2555ac92cb6d7a33734e5 ChangeLog 6923
-SHA256 dffb6cc2bea553513085c61edf4a68c864d7c30cb8b472f01b440e9185815b85 ChangeLog 6923
+EBUILD ghostscript-gpl-8.61.ebuild 4599 RMD160 8d60aa26df9d48a8865ac45bedadbe7c3a3f2e5d SHA1 863506492f827414c00422440a378be68c2cfccb SHA256 b96a092caac4984a9df48b623708fb3fee1d77d188519ae01fa9b0596518bddf
+MD5 c1e0e217311d56d6ebfe02b7213a6379 ghostscript-gpl-8.61.ebuild 4599
+RMD160 8d60aa26df9d48a8865ac45bedadbe7c3a3f2e5d ghostscript-gpl-8.61.ebuild 4599
+SHA256 b96a092caac4984a9df48b623708fb3fee1d77d188519ae01fa9b0596518bddf ghostscript-gpl-8.61.ebuild 4599
+MISC ChangeLog 7155 RMD160 9976d9c5cc8a81710a790e37f9193c84e16b452a SHA1 3d1898820cdceddf49c037127c450a83b67e63d4 SHA256 f5898fd7de51bbe4cfc5eab2405d6a7e25b3b30c17b5ea3c3cb35dc14c52a9c5
+MD5 ef1afc60007833125130fcb5ba620391 ChangeLog 7155
+RMD160 9976d9c5cc8a81710a790e37f9193c84e16b452a ChangeLog 7155
+SHA256 f5898fd7de51bbe4cfc5eab2405d6a7e25b3b30c17b5ea3c3cb35dc14c52a9c5 ChangeLog 7155
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -132,9 +135,9 @@ SHA256 0c2f61b7b0575c76d83fbfd9ddddb87b151118444609d0f3ae55fba35587f7c4 files/di
 MD5 55331e222ea7c63743453ec4aee0658a files/digest-ghostscript-gpl-8.57-r1 1476
 RMD160 ac943d61c81167cab7007e993f56b663057059f4 files/digest-ghostscript-gpl-8.57-r1 1476
 SHA256 173e6238b3990e0e9b71b04d108159d2fb6457f866be92571aa810360a2c0b0a files/digest-ghostscript-gpl-8.57-r1 1476
-MD5 ad2c51586f706c781698d86b63308fe2 files/digest-ghostscript-gpl-8.60 1000
-RMD160 f314aa1cac8387a24be632548a20249212f16cc7 files/digest-ghostscript-gpl-8.60 1000
-SHA256 2b6a56bd1d93f9fce20899b6e023e9e3e25bcd96d7d30a414d73c9dde39e6a29 files/digest-ghostscript-gpl-8.60 1000
 MD5 ad2c51586f706c781698d86b63308fe2 files/digest-ghostscript-gpl-8.60-r1 1000
 RMD160 f314aa1cac8387a24be632548a20249212f16cc7 files/digest-ghostscript-gpl-8.60-r1 1000
 SHA256 2b6a56bd1d93f9fce20899b6e023e9e3e25bcd96d7d30a414d73c9dde39e6a29 files/digest-ghostscript-gpl-8.60-r1 1000
+MD5 3fe2b8b8aeab833d598853a5a9e59eef files/digest-ghostscript-gpl-8.61 1292
+RMD160 fe9f1b1806bc465894a8e7d61beb4f8d3c9c1c20 files/digest-ghostscript-gpl-8.61 1292
+SHA256 4dd36321aa88d39108e29c59c9320505e106de99f71d1925f553f3172811cf3e files/digest-ghostscript-gpl-8.61 1292
diff --git a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60
deleted file mode 100644
index a6cd5c99e4c8..000000000000
--- a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
-SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
-MD5 dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz 5001983
-RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 adobe-cmaps-200406.tar.gz 5001983
-SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689 adobe-cmaps-200406.tar.gz 5001983
-MD5 89fc0a90e67caf151a9d6855200c68ca ghostscript-8.60.tar.bz2 12942029
-RMD160 208168fcd6bc5fd931d15b288ce9324f59ba07a3 ghostscript-8.60.tar.bz2 12942029
-SHA256 f615f936e38d2e7a6da588de6655f2b23207c0a906df1960b1d7e83c3241982a ghostscript-8.60.tar.bz2 12942029
-MD5 cbb24f8c50b5a94ecf1635048d2f11d6 gsdjvu-1.2.tar.gz 214539
-RMD160 6cf27e95955b5ae0cc15dacc36ce514ff8347ab0 gsdjvu-1.2.tar.gz 214539
-SHA256 ab4a81eddb44241bb71b5ec813242036312effc9eb1b343b3c257fb563fa8a49 gsdjvu-1.2.tar.gz 214539
diff --git a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.61 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.61
new file mode 100644
index 000000000000..1dc21daeb2e6
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.61
@@ -0,0 +1,15 @@
+MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
+RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
+SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
+MD5 dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz 5001983
+RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 adobe-cmaps-200406.tar.gz 5001983
+SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689 adobe-cmaps-200406.tar.gz 5001983
+MD5 abff0506cd249cba3ad862d8fe4f6474 ghostscript-8.61.tar.bz2 13244754
+RMD160 ec217b05f62f2f268a72c073f85aa95ee6f6c2aa ghostscript-8.61.tar.bz2 13244754
+SHA256 8c3f62da38688c02442f9b94ac42c6ecefb01141c8319393e8216d8422f7aa33 ghostscript-8.61.tar.bz2 13244754
+MD5 8cf17ab26420b9b43c2fa64672c717e8 ghostscript-gpl-8.61-patchset-1.tar.bz2 9620
+RMD160 b7464977dfabeab461439abb93ad38856a7bc27e ghostscript-gpl-8.61-patchset-1.tar.bz2 9620
+SHA256 f2112bcf6e837f47c035646238d255f683e54b2ee6227afe7cef2d0a8ea2705c ghostscript-gpl-8.61-patchset-1.tar.bz2 9620
+MD5 c72d2327708683ffc70151d49fbd6175 gsdjvu-1.3.tar.gz 204330
+RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 gsdjvu-1.3.tar.gz 204330
+SHA256 7702fd287cd881a8b1e7911f780c10f98e332b3a6cd93dd35b245d5816b09ca2 gsdjvu-1.3.tar.gz 204330
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.61.ebuild
index 766346e77e3c..ecba1da550f0 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.61.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild,v 1.8 2007/11/02 23:45:42 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.61.ebuild,v 1.1 2007/11/30 22:37:50 tgurr Exp $
 
 inherit autotools elisp-common eutils versionator flag-o-matic
 
 DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed"
-HOMEPAGE="http://ghostscript.com"
+HOMEPAGE="http://ghostscript.com/"
 
 MY_P=${P/-gpl}
-GSDJVU_PV=1.2
+GSDJVU_PV=1.3
 PVM=$(get_version_component_range 1-2)
 SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
 		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz )
 	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2"
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-patchset-1.tar.bz2"
 
 LICENSE="GPL-2 CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bindist cjk cups djvu gtk jpeg2k X"
 
 COMMON_DEPEND="media-libs/fontconfig
@@ -47,8 +48,8 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
 	if use cjk ; then
-		cat "${FILESDIR}/ghostscript-esp-8.15.2-cidfmap.cjk" >> "${S}/lib/cidfmap"
-		cat "${FILESDIR}/ghostscript-esp-8.15.2-FAPIcidfmap.cjk" >> "${S}/lib/FAPIcidfmap"
+		cat "${WORKDIR}/patches/ghostscript-esp-8.15.2-cidfmap.cjk" >> "${S}/lib/cidfmap"
+		cat "${WORKDIR}/patches/ghostscript-esp-8.15.2-FAPIcidfmap.cjk" >> "${S}/lib/FAPIcidfmap"
 		cd "${S}/Resource"
 		unpack adobe-cmaps-200406.tar.gz
 		unpack acro5-cmaps-2001.tar.gz
@@ -59,15 +60,14 @@ src_unpack() {
 
 	# Fedora patches
 	# upstream bug http://bugs.ghostscript.com/show_bug.cgi?id=689393
-	epatch "${FILESDIR}/ghostscript-8.60-ijs-krgb.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-fPIC.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-multilib.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-noopt.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-scripts.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.61-ijs-krgb.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.60-fPIC.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.61-multilib.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.60-noopt.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.60-scripts.patch"
 
-	# additional Gentoo patches
-	epatch "${FILESDIR}/ghostscript-afpl-8.54-rinkj.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-include.patch"
+	# additional Gentoo patches, compilation fixes
+	epatch "${WORKDIR}/patches/${PN}-8.61-rinkj.patch"
 
 	if use bindist && use djvu ; then
 		ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
@@ -78,11 +78,15 @@ src_unpack() {
 		unpack gsdjvu-${GSDJVU_PV}.tar.gz
 		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
 		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/src"
-		epatch "${FILESDIR}/djvu-gs-gpl-8.60.patch"
+		epatch "${WORKDIR}/patches/${PN}-8.61-gsdjvu-1.3.patch"
 		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
 		cp "${S}/src/contrib.mak" "${S}/src/contrib.mak.gsdjvu"
 		grep -q djvusep "${S}/src/contrib.mak" || \
 			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/src/contrib.mak"
+
+		# install ps2utf8.ps, bug #197818
+		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/src/unixinst.mak" \
+		|| die "sed failed"
 	fi
 
 	if ! use gtk ; then
@@ -116,15 +120,13 @@ src_compile() {
 	|| die "econf failed"
 
 	if ! use bindist && use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g'		Makefile
-		sed -i -e 's:(/\(Resource/[a-zA-Z/]*\)):(\1) findlibfile {pop} {pop &}
-		ifelse:' lib/gs_res.ps
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
 	fi
 
 	emake -j1 so all || die "emake failed"
 
 	cd "${S}/ijs"
-	econf || die "ijs econf failed"
+	./autogen.sh || die "ijs autogen failed"
 	emake || die "ijs emake failed"
 }
 
@@ -135,7 +137,7 @@ src_install() {
 		dobin gsdjvu || die "dobin gsdjvu install failed"
 	fi
 
-	rm -fr "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
+	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
 	dodoc doc/README || die "dodoc install failed"
 
 	cd "${S}/ijs"