Fix tcl/tk slotting; bump EAPI=5; fix for format-security

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 165 insertions, 21 deletions

diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index 453e4f1e95cd..30838a00660b 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-dicts/wordnet
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.26 2014/03/22 18:30:47 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.27 2015/03/19 14:32:00 jlec Exp $
+
+*wordnet-3.0-r4 (19 Mar 2015)
+
+  19 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/wordnet-3.0-format-security.patch, +files/wordnet-3.0-stubs_c.patch,
+  +wordnet-3.0-r4.ebuild, metadata.xml:
+  Fix tcl/tk slotting; bump EAPI=5; fix for format-security
 
   22 Mar 2014; Michael Palimaka <kensington@gentoo.org> -wordnet-3.0-r2.ebuild:
   Remove old.
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index 6800fdd00f00..31304b2de6ed 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -1,30 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wordnet-3.0-dict-location.patch 1542 SHA256 8eaae12a77610e10003d26ac6e10b394bbaab2aefc56ceb843e4f65d65b125c2 SHA512 4ebcf63d0492744aa7b0e061362a5fa386e7c3b36a9451b1235e813c56259f7ef52b1e7028ebd95ba4414c67cc8c26aae11e62109e2ffa682c09c37b28596f1c WHIRLPOOL 78607a0861b9281a14c4d65eb176da47a1a2e43bb8f39ce2a8b6038fbe37ff16604b9aa0f01ae3fe3626b8f50d011c1290c8f345ed66a2e54264ccceca576ecf
 AUX wordnet-3.0-docs-path.patch 2832 SHA256 26130edeadc7c6993faa8a1471c5cac87c533d3e1c927eb5d59716f5b47a808d SHA512 10dec6da3f6853bdf0b6cbbcf47540ae2d682007d145eaab81fd5e532f8ff96067957b5225f82302114adb806f0a2d8a7bf0a8ae95a091473059c96028d7d1a1 WHIRLPOOL 6e6c3d8268a7dc3e08b3d9ee20681f9ab947cd3341868c150a2a2cc53e1d7b94b20667c0fdb1f181e8e6a6a6928b63ae749f22d788fe17ab9e44dd59fc855c5d
+AUX wordnet-3.0-format-security.patch 1443 SHA256 d5b8f4f338487e0a15a99ba6c193b3cbfa12d428c825b3c47cb30a23df5b5ad8 SHA512 5567b1d5e041ed39a38e40e253dc94e22a3a7c6b690bc452716b26c2932b94eeb065e00354e2c8f1dc77d53713fd2e69e44a498a8664e867de2df07f2f36c170 WHIRLPOOL 638e8b6b82673d01c7a01a6ab922d998f8d0f23bc7bf4a920c41a75fbf85efb1508b52ae15863128341c6766b99d052c114a7c68f723641c94b3fee4a6e2a2fd
 AUX wordnet-3.0-shared-lib.patch 921 SHA256 bcca076ec3581a88f7a221dd419e0e69e88d896018776cde5d56019a020d9cc1 SHA512 a06ca1a855a5cfd74f2dad2c90c09eb463bbc20992f17626aefacc0e7d6b435a93c56002735267c57911cae6af50bdfbacc3966c96ee129099d65dcb53782359 WHIRLPOOL 8a5c66e6c2ddb5f3c4ccef76748cb5c6753a269dce2feabef9097dd4305f248b08746cd64d344e962dfcb19d6a8ee6414d85d837542df32799852d012e2b01e1
+AUX wordnet-3.0-stubs_c.patch 478 SHA256 1be6ae89d414195a0ead7490dc261dab97ebe166790c78d1e1c4ea5b500cdf60 SHA512 4742b59a156921d085151f0cb5d5d2c624a6a080cdcaab183e8fd405ab7a41c67b2c1096be9948bf8473371a9c64eebe67c009bef0aa6dddf9f190d71cf2ba15 WHIRLPOOL 87a3fc12cf556ebc1eebca8a642a0db3452a70546c25475a17291a71742b318f2d172dafe92af6c2c19b0c760ab288b440d13ece7ba7e6f49e94825cf7f4f55c
 AUX wordnet-3.0-tcl8.6.patch 4974 SHA256 97d551b2a7766de8c9f113f94e768a52d450e07c974dbac20bf7ea8df04b35d3 SHA512 2dafc6a6cd332d387fa15b63a7c5cad222e611906582232f7bd6f2522773336e7b632775e73fcd1a8587bd95eabaf70ec1c9ea4b8a81a7c147360a836be0a90c WHIRLPOOL 5416b325ec5abac95d5b0802b8994e6e5d2db8b2b28241155402fca21e88f373785d94cd57506485fa6c890d0a0ee99d9cf2ca9f887720be0a7ae1e80e2d6a8b
 DIST WordNet-3.0.tar.gz 11537227 SHA256 b4d8b1feeb22defe686cf1c5062d723bd854997614da9547fa135e5137843531 SHA512 d39c008cec41de8f1b2aeacb4ad818f9997a13b30a992fda100b6dcc9c11c253530b00a1909b55ff7b564bafc33f7763c1ce9b0a6ae3e591695db2083e9ead7a WHIRLPOOL cfba84209b4366b1ab381957f82cc2a32039d073baf8fbd44252c829c9291be76f05b214e014157f3ec03a354aaec68a14e20103dde37d11f13b846056aa90f4
 DIST wordnet-3.0-patchset-1.tar.bz2 8076 SHA256 d8333b107f53e188981e9ec0e1e53890c8bd7155924ae140c777c3f443d8aba7 SHA512 17668d736dd6dfe83e4d5d328729cbcdfb4dbca9a9707651534169bd2ce6fc2238d5c820d63330c51c20ab9b2964b56a609f58242b05dabbcfdfc0da61c048cb WHIRLPOOL 30e3820c2679148206bc14d5acf8eb7a2bde422f13ce2e9b0a90145e510667d70b1c1ef5d3486c85eddf6492c72b2243672683164f917f8ff5910370e30bd0f8
 EBUILD wordnet-3.0-r3.ebuild 2268 SHA256 c88f52c246d3654b55c5ca658d60b285ea691aa28832bd8ade943f92bedefea9 SHA512 f2b2ddbfff2a8dd48c4413989170fd2b645e1c29d428e3f8a7f84c1823b99fbaa8da54583f00573c97b1b0b94d448990d288c49c4a766c9d712029933982da56 WHIRLPOOL 92e5f7dcc64bdc3bf7170fcb70e250467ea27d76001689be83f5f29d1ee5f4a8ada8d350d9a0b5cd7085bccb0d515b1e216d698cf89e3f6ecf345e6dc4c68f29
-MISC ChangeLog 4553 SHA256 93b721f78ece8ad76b3b2fb1b7ea8633301ad3afc71a0de3174a8675e1616d33 SHA512 72baf899ba6f132b2a88452c130cdf9bfea961b65f57aa86c44518d61e82076ed88aa9e63cbba18a8fd882354878ca26e596ffc5fbcb1bed2a998bab3eb5e87d WHIRLPOOL 7c0f20dc017fba0ea043675b5b37df61e1266f6ef5e7d8e93b1c51124e806343c15123441c7368246f3f1e3dcd832c2f6774cd026b1d7582526b8c34129f0997
-MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
+EBUILD wordnet-3.0-r4.ebuild 2222 SHA256 a7dcc64c7dadb911488aad3275df496e08e2a849bd2949e9ceb303117ed976c3 SHA512 0370c1bc5f8508100461264c1efa8c17dc7a640780fe1873f7fe1467deac02bd1d4e2d879368adb85cf4c11a91fa8ab959d8ab8428dc0263bf1472ccc7a28d8f WHIRLPOOL 582d9f4b885c5efabdf49512bd2865d30a72c95af25feb7d583e6d2b0edf69c1cf5f6d59d9c033d30f476cabaa428875c0d014278afab9248406bc43d4d16c39
+MISC ChangeLog 4804 SHA256 47861edaffb9b2a9a54a89f7eccb0850769de7be9a2a52156131f9ba98c87007 SHA512 a6e33e3988050f4a6592a7583692a4c9c576fc930a0cbb1f53f062ee907c9e3550a195aff2cc9005d4c71d098a315ede230034c9c134a4707a8315fa862dcb72 WHIRLPOOL ac76ad6222ae43e3d5c2dcb2286e2dec00c7de51d30d557ab5d923d60d9533498d59f7ea84e29049aa086b782a2661795462f6348536dd17d83c7dd2eef12557
+MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJTLdbXRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7ASrD/4zj+o32eYSRzucf9/5qJdmgIJsP1p0w7wrJa2mj75Qzy+XHnOeicI+ILl3
-uqCkvWtLJiFebRjm0kBZEwZ7r+8q3JniM3nLJR23FDEqv3DUR+2JgKuiE5AY/UE0
-cGloZKska3A0K4Iy/HY1VH+fwYO6fEBkwaOyObzBXw7fYEuWps8RKXID3rfz47mS
-l3LvrtF1rcKQivk0kJKT2fYJ7sowVAI6krRXeGDt7DFJ2FJJX8MEkvXhe9A1Be8W
-5J+2J/YoMsohci/dyQ+lnXGLPdyN/Yny7T/75tm4y+TKShsByQFrFsdmlJ0GlLaC
-ScDuklkbBd6UinXTN9a7Q/HksXGZKtdD51w2Ed+eGTrAYdw4mQjVJB33fJCDvDV5
-elcidNJpPT8T7CuI3To/ROVrJWJv29SsAowxPSnpIte8FwxHWG/G5nIpy80KKk06
-fcu5V9N50Ur4sqJDdtW9Zc+5Q6ttYqIo+ihf/7aTn4u53TXUBqT9tQ7PyzZ1837G
-Qq+kHyYcc3txQS4N/94c9uRJLdhFxP1hjmJWgOdmCGuUOCNjyzNc7dNYuwGCagm0
-ZKugULcXxCm7AiLzXYNVYO8T7M71ZSqvYU5NlDX6uejrvs1ucIQBnlxwL0nZgRKB
-3psYBBLmHDSLZ3pPwmMH6zVm6DybDGfYQOL/v+MBN0ueUP4GnA==
-=8DSm
+iQJ8BAEBCgBmBQJVCt3hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir1oIP/3z+U5I4eeU+0X5qAOultNda
+4CA2EiKh+ch2aIkjOftLbb3z1w2XHFBJ7SuhAb7KKLQCwjuTkO8dnHb5yYP40XwX
+xElWKDgM4CQJYLIpS+rP8YxsEBepg9kfA2NRe+K4kGbAUEo96j8pCYEX4S0cZDC0
+I72f40P7vXe/dR4KKBt6Sm7dris3MzORLB9Qiie0dqEMTGPSSPYpw1+TwfpO6PAn
+mCaTqy2rO3g8KWS3a12ENkUyZFMXlJF8gsJVE6HycxvXfh5FgFreYyErgPCH8ixm
+80NLxXpKSe3ab/YjNIikCm/3sqgaKzbu34xS76g/pyQp55xMF/dB0Q2HYF/Yo07c
+TCctF07AU4/ElsrkLyJu/XW3iDKKXcG6RXUUldjIljA5dWSMOqEf8vIJ5O1OzAK+
+KBqG/BcgflSy+MOX74IOWnjXcvfQFKLAxiJdKkqbS0sMQRmXx+v+wAaGZra7rH4t
+2m2BCXMBelsW+BLslJhIDoGRbJ1R1awekbZgjVmG1hxDpmwZTzdqBzXqVAwIbypL
+CioW/YD1+mNWFL9Y0d8yc5l9F8Wx2u1ZetIjuy/+QM3ShOV0F1daRkEe8lstRy+p
+8On+BIbTxOfUjWcIrmax9SGORr1hffXCYugbDLnCi9O6jCtSdqiOmMNSj9HaMJmm
+W49BZm1JxXAVmQyNCQTz
+=ZNV8
 -----END PGP SIGNATURE-----
diff --git a/app-dicts/wordnet/files/wordnet-3.0-format-security.patch b/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
new file mode 100644
index 000000000000..b5d86dbbdd89
--- /dev/null
+++ b/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
@@ -0,0 +1,48 @@
+ lib/binsrch.c | 4 ++--
+ src/wn.c      | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/binsrch.c b/lib/binsrch.c
+index 8b71216..9ac51a7 100644
+--- a/lib/binsrch.c
++++ b/lib/binsrch.c
+@@ -193,7 +193,7 @@ char *replace_line(char *new_line, char *searchkey, FILE *fp)
+     copyfile(fp, tfp);
+     if (fseek(fp, offset, 0) == -1)
+ 	return(NULL);		/* could not seek to offset */
+-    fprintf(fp, new_line);	/* write line */
++    fprintf(fp, "%s", new_line);	/* write line */
+     rewind(tfp);
+     copyfile(tfp, fp);
+ 
+@@ -220,7 +220,7 @@ char *insert_line(char *new_line, char *searchkey, FILE *fp)
+     copyfile(fp, tfp);
+     if (fseek(fp, offset, 0) == -1)
+ 	return(NULL);		/* could not seek to offset */
+-    fprintf(fp, new_line);	/* write line */
++    fprintf(fp, "%s", new_line);	/* write line */
+     rewind(tfp);
+     copyfile(tfp, fp);
+ 
+diff --git a/src/wn.c b/src/wn.c
+index 004e1e6..398632f 100644
+--- a/src/wn.c
++++ b/src/wn.c
+@@ -284,7 +284,7 @@ static void printsearches(char *word, int dbase, unsigned long search)
+ 	    printf("\t");
+ 	    printf(searchstr[j].template,
+ 		   partchars[dbase], partchars[dbase]);
+-	    printf(searchstr[j].helpstr);
++	    printf("%s", searchstr[j].helpstr);
+ 	    printf("\n");
+ 	}
+ }
+@@ -345,7 +345,7 @@ static int getoptidx(char *searchtype)
+ 
+ static int error_message(char *msg)
+ {
+-    fprintf(stderr, msg);
++    fprintf(stderr, "%s", msg);
+     return(0);
+ }
+ 
diff --git a/app-dicts/wordnet/files/wordnet-3.0-stubs_c.patch b/app-dicts/wordnet/files/wordnet-3.0-stubs_c.patch
new file mode 100644
index 000000000000..e2d11561dca5
--- /dev/null
+++ b/app-dicts/wordnet/files/wordnet-3.0-stubs_c.patch
@@ -0,0 +1,12 @@
+diff -urNad wordnet-3.0/src/stubs.c.orig wordnet-3.0/src/stubs.c
+--- wordnet-3.0/src/stubs.c.orig	2007-01-04 18:47:55.000000000 +0100
++++ wordnet-3.0/src/stubs.c	2007-01-20 19:01:19.000000000 +0100
+@@ -14,7 +14,7 @@
+ #include <tk.h>
+ #include <wn.h>
+ 
+-static char *Id = "$Id: wordnet-3.0-stubs_c.patch,v 1.1 2015/03/19 14:32:00 jlec Exp $";
++static const char Id[] = "$Id: wordnet-3.0-stubs_c.patch,v 1.1 2015/03/19 14:32:00 jlec Exp $";
+ 
+ static char resultbuf[SEARCHBUF];
+ 
diff --git a/app-dicts/wordnet/metadata.xml b/app-dicts/wordnet/metadata.xml
index 4538a68724a6..1470e032181b 100644
--- a/app-dicts/wordnet/metadata.xml
+++ b/app-dicts/wordnet/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-dicts/wordnet/wordnet-3.0-r4.ebuild b/app-dicts/wordnet/wordnet-3.0-r4.ebuild
new file mode 100644
index 000000000000..b2ca67bda496
--- /dev/null
+++ b/app-dicts/wordnet/wordnet-3.0-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r4.ebuild,v 1.1 2015/03/19 14:32:00 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="A lexical database for the English language"
+HOMEPAGE="http://wordnet.princeton.edu/"
+SRC_URI="
+	ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz
+	mirror://gentoo/${P}-patchset-1.tar.bz2"
+LICENSE="Princeton"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+# In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
+# cf. bug 163478 for details. (Yes, it's about 2.1 but it's still the same here.)
+DEPEND="
+	dev-lang/tcl:0=
+	dev-lang/tk:0="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/WordNet-${PV}"
+
+PATCHES=(
+	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
+	"${WORKDIR}/${P}-dict-location.patch"
+	# Fixes bug 130024, make an additional shared lib
+	"${WORKDIR}/${P}-shared-lib.patch"
+	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
+	"${WORKDIR}/${P}-docs-path.patch"
+	"${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
+	"${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
+
+	"${FILESDIR}"/${P}-tcl8.6.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-stubs_c.patch
+)
+src_prepare() {
+	epatch ${PATCHES[@]}
+	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
+	if ! use doc; then
+		sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
+	fi
+
+	# Drop installation of OLD tk.h headers #255590
+	sed '/^SUBDIRS/d' -i include/Makefile.am || die
+	sed 's: include/tk/Makefile::' -i configure.ac || die
+	rm -rf include/tk/ || die
+
+	rm -f configure || die
+	eautoreconf
+	MAKEOPTS+=" -e"
+}
+
+src_configure() {
+	append-cppflags -DUNIX -I"${T}"/usr/include
+
+	PLATFORM=linux WN_ROOT="${T}/usr" \
+	WN_DICTDIR="${T}/usr/share/wordnet/dict" \
+	WN_MANDIR="${T}/usr/share/man" \
+	WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
+	WNHOME="${EPREFIX}/usr/share/wordnet" \
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir)
+}