Add patch for format-security; bump to EAPI=5

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 103 insertions, 16 deletions

diff --git a/app-misc/cw/ChangeLog b/app-misc/cw/ChangeLog
index d73be1c1adb6..129b2099c147 100644
--- a/app-misc/cw/ChangeLog
+++ b/app-misc/cw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/cw
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/ChangeLog,v 1.34 2015/06/09 11:38:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/ChangeLog,v 1.35 2015/06/21 14:09:44 jlec Exp $
+
+*cw-1.0.16-r3 (21 Jun 2015)
+
+  21 Jun 2015; Justin Lecher <jlec@gentoo.org> +cw-1.0.16-r3.ebuild,
+  +files/1.0.16-format-security.patch:
+  Add patch for format-security; bump to EAPI=5
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest
index 517b9548ab8b..607bd1e8e205 100644
--- a/app-misc/cw/Manifest
+++ b/app-misc/cw/Manifest
@@ -2,28 +2,30 @@
 Hash: SHA512
 
 AUX 1.0.16-collision.patch 1367 SHA256 27a60b8495990c8207e402649cb4cfd4f9b93d40c5762e7f310c00717d3ff6c6 SHA512 2f5e2dc0eb6af383207cd514a5e42bd1cd03f8748a8c1c66d0d83b7a5abd2fafc108a2207ff96bef5b74b9044c21fbe185e3b47a090d11387c7d1bb8f7684e76 WHIRLPOOL 27127aa75c7af200d1b3db147d73e7e48dc14ac0fa386474a30dfa308ac976827deb676223f174bafdbb7c07b0c7b09e902c743418071183baabe8bd905b3d98
+AUX 1.0.16-format-security.patch 412 SHA256 6057fe46108f3842bbfa2b403abd251574bae3d1a010cab09a94e5d5842fb815 SHA512 604a22a47e36933d4b2788c1acfe1930e2935dac14dbad5a717ce69b26463bdffcc54aa74bf5dfc22631b3a587ca56bda359d86cebf9fa1ad7c7a235fb71a5db WHIRLPOOL 1861eb8e82b14972e365092da4cc62b1ff16f0287d76809a9c73fe20d7a965ceba37caed919dba8e06c5884d0673b122a08ad9ab38e8ad074b2ec52116a5b155
 AUX 1.0.16-ldflags.patch 486 SHA256 b825a9da47e5a06434f23ac092ede9b1e89956f966f342dd50bd6e463230c1a5 SHA512 75883411ef18c739e6f86ba53a5b515e8081ac10d1b3e894de9bee4dd0040620f0fe09786085acd325669475d0d1e99b4d46554a68ebffcad18e50cb281cabfe WHIRLPOOL c60879612503e49c5f0801903dad41194189597b774b35918fc414d013466b5282317bd9ed9021ebd289f108d32262446a098ad820c9073a25a891c8f764c99a
 AUX 1.0.16-path.patch 550 SHA256 f423c7f4464be0bc248230bfdec7ca9a5a18a4c0fc03e7755372e1265e54f513 SHA512 2d8c1cf55e0d2d725aae4c3bd4f8300402b036e934218135ac840f9f891424458a79a9c2432bd4fa47255c30f096c3752a1a5897854f82da438398d5c671af23 WHIRLPOOL bf672bb810c6cee5c02fe88ae9cfb2e4a67c565cd9b337fcd8b2651b68b54f00b29e7e19fb32a89929c6b5e2446efef9810b5c1f604c3b97ad33edb547de6a0d
 DIST cw-1.0.16.tar.bz2 76035 SHA256 a12738f13f3ee90b0bd0c875b4d0bd345d51dced6efd5a14dd82a4705c78fbe4 SHA512 6a5da4e4dbb4d042d8b4e1e0727039f3103f9d7124a6f7c37ac094d7fee0ae10d9bacc6739fc133ca9fb682501bcafecd39a660abfe19fbf1fd9bf7ec06cfa32 WHIRLPOOL 1e5188ac6a9c5985c0169a6a932e1fd7dec242a1e9dcf2409c0bf54161733feb26fb500ec0308d062dbffe595946d7adffe74a19a849420733931f092143cd1c
 EBUILD cw-1.0.16-r2.ebuild 1696 SHA256 26d88e755fa912dbe31dc3347c19de00c90b23fb8e4c8316efaf2d669d0bdfd7 SHA512 5e249c0d827e04849af14cf1a77840ae294b9845eb807e6395649709fb27d42ff572db98ce15a9faa3eaf08a4d58b8bc6e29d244f4c33733345cfbb82a5a7bfb WHIRLPOOL 0a9cf2319aaf25724e5982b6518fbfdfd32fbc31cc8371c1350247c0bbbb4b6a77b6bf1f642af88c4a8e4433131a6e7034129d2a5b9274e775f122661e0c97bc
-MISC ChangeLog 4202 SHA256 88cafcc9a24926214db18fd20a3568b44aebe6acf0ef8eaed1dd86168f48052a SHA512 f7234fa96cb4e7816e855e84b98fca3dd3880905965aff9b3fbf063987c71f93adb1ae5d4d3e671d57e9942c70e66708d8d12956ad7b22319ccf819843272665 WHIRLPOOL 2fb4d708e022f39b27b4c3d91f315f9ea1c965f883b9151c25ea7aade76c7493495cd1b416ea5a59ee1f41968c2360d366f279509cec23c4e5833bb5850ef994
+EBUILD cw-1.0.16-r3.ebuild 1658 SHA256 93b852bc36ecbd0e9e06558c484d64fd272860163ab66b37a66b205f8f50c40d SHA512 b79b5c99471197b1457f805bf157f695cfcf714275afeef43b45edccfef3f05a226c13b920b2471c432350492f2f411fba8ef912a79e8971409b6e6c17a5dfc2 WHIRLPOOL a2546192bce740062431f1ede9a496c9faae0761be7d14f98d37508321be1f5a6f2ca54dd6af5c4634a0e1cf524c4ecfdb80cb782a0ac087da4e8de66686fe6b
+MISC ChangeLog 4388 SHA256 865be44a6e422586f1f4b9948b90007679720e82ef75fc0a22d82e46a24dea29 SHA512 d8cbdab474568b43e41be338e02f9d60f776842476df608824ce0080dfd393682a8f67fa4b8a462d99286d3947ecb6ef81f1266864b1bde3685d980e285e9e79 WHIRLPOOL b297d4771c3ea3d430eac7535a5852ec984480d124704d09286fdb38a11fe417df3eadecddbcda00bf37ec9d6ad08d0dee54938ed2c225b12b950691c933f26e
 MISC metadata.xml 243 SHA256 b5c647977bb3ddcbcb963875eeb50b79244aa4e1da6ccc23a5cb152dec0b6e7c SHA512 b1b6f102b779b2919801ec3a984df9cf4c9f02102f6a2c2fb6e02972761475fde9b4bdfdee4bb5b73ced768fbb0a5a67a0ceb0fa426fd3d607334bd5cf14b6b4 WHIRLPOOL 0256e7e6793cb6ddf71b616bc697c180db471a151644f3db3f28ceac3578e1627342cf6ace26c28c6ed08cb5bf7fbcd02da3e4f04f4ae9c9917fc537e5e883b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVdtAlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVhsWpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPPMQAMACbCYkdQor1/P37WSP6SU4
-JaGkMkfLJ5ATT9ezS3hK4gkzEfXH8r9eV8cSRir2/XZhFMMTEcq/r8yGz3t+whvE
-9ajJfFTDPWEOdO+NojeRtbtom/42rGId0EXxDpOILsTIsAl4O65hHFD+NtxWu3bm
-gS1FP3AHJj/a5Q3Cag+vQkJTGfjRVVV4Cue7cFKH1lkSkDfVf1UR+78+W7fqz/L6
-jLqTgX7tgQEUZQgeLTPEXsqVUtPIkf/1FiBUl7EBm17NoZck8DuEnShh6LzF0sdc
-Pl93AS/wnsK7bDy3+ITIqOhP2cFSLROalym0XXCTEhzV5ngroMx6VeMYKIJjJZru
-C21N/xrDVuPo6GTUfJTlAccC7+WwKFmhet5iE7ws33VejFzC1mupvmkgtBDPrUq3
-rdai1pBz6TkoLwa55tbLboniKoO/8s0/KtFVIxkSlDbAK9zwZ9atot9YUN3lLYSy
-NOu4GdVB5sS5uzedpZpRTiBn9DHbyf1iHoXTwzNNaKCIK7xOFwozN6UIZQ5TpmG1
-DOSJwT+QsK1pngudw76R2RL7RUY/Sj7H2+9uIPaAQ8igcM2IpiJT3UDm8vENJFBS
-0kJzCAWlnbTpwWC2AH9SBZL1nDuvPJ8UJ6ZfzVXMYZZnIxqmDWDGN+SLSpm7mJ8s
-4C6Y9OQKKIbnC9C8YxsF
-=fIkO
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/jcP/jbNb3tNHndJM9hj7Ue3QYNa
+uo5dwOjodsV5LWrmT3bBG9ewwrmRUIWklTDR4PkM5z+F6W9dDhqdo/19kixU6H3C
+TnhKhhtcXJzZOtceAxVI4ffgAuGPXKnnExXb2ojDkT1N6Dkr/N6AsUi9omYQPqeP
++eliKAcvTCi9snJD2uKeD8iqhnCaPKnQAHyP7osHpKX0S4nKJan1C11x82kKMVgX
+qgre4iV8pFW28y7Gbzb2+KVkEQJOvi/hDzd43Kdxiny9cVwdwG64iCMTWLADikRN
+u6q4SJMmHx7iwetOZEdB3OkRBkgtehKaOUa9ByZjUJO41SHueAd8N5FpLSSis+hR
+hDL7qJYmYwjOzIuSSKUV2sX6e4FcmvN6oae/J/EX2RLxr7SRMIRIQ6Kigu5CGlKm
+PxX4ZaCl12LHwQD1HjfoNJs5Yb0ObTToHTB2iD3mV7uDqWXK4GORfoTEhJorAsQZ
+8hrGWqcRCf6LsJOpF/y+HOPZNPy9cXMthSeSZ7gQvX5f+lWxzJlostsj2vFfv16+
+iCtL/UMthB3q1DTUqFGkGKmJbVLXPShR0JA1hwvAIeIvCK6K1bKiZF+2sSBJcFvQ
+DwIWuYGMxo5OD3p7Xe0UAdj2BmNk+BR0091YreKj4jRL+ap3V9Z205IVXRTsqbr/
+QZ7RS9poHhtPlGtm8qpF
+=8tC4
 -----END PGP SIGNATURE-----
diff --git a/app-misc/cw/cw-1.0.16-r3.ebuild b/app-misc/cw/cw-1.0.16-r3.ebuild
new file mode 100644
index 000000000000..b88a14e31d7c
--- /dev/null
+++ b/app-misc/cw/cw-1.0.16-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/cw-1.0.16-r3.ebuild,v 1.1 2015/06/21 14:09:44 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
+HOMEPAGE="http://cwrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-ldflags.patch \
+		"${FILESDIR}"/${PV}-path.patch \
+		"${FILESDIR}"/${PV}-collision.patch \
+		"${FILESDIR}"/${PV}-format-security.patch
+	tc-export CC
+}
+
+src_compile() {
+	emake local
+}
+
+src_install() {
+	insinto /usr/share/cw
+	doins etc/*
+
+	exeinto /usr/libexec/cw
+	doexe def/*
+
+	doman man/cwu*
+	newman man/cw.* color-wrapper
+	dodoc CHANGES CONTRIB INSTALL README PLATFORM doc/README*
+
+	dobin bin/{cwu,colorcfg}
+	# app-misc/color currently conflicts; hopefully 'colors' is safe
+	newbin bin/color colors
+	# media-radio/unixcw currently conflicts;
+	newbin bin/cw color-wrapper
+}
+
+pkg_postinst() {
+	ebegin "Updating definition files"
+	cwu /usr/libexec/cw /usr/bin/color-wrapper # >/dev/null
+	eend $?
+
+	elog "To enable color-wrapper, as your user, run:"
+	elog "  colorcfg [1|2|3]"
+	elog "to add relevant environment variables to your ~/.bash_profile"
+	elog "Run colorcfg without options to see what [1|2|3] means."
+	elog
+	elog "After sourcing your ~/.bash_profile, commands for which definitions"
+	elog "are provided should have colored output."
+	elog
+	elog "To enable/disable colored output, run: 'colors [on|off]'."
+}
diff --git a/app-misc/cw/files/1.0.16-format-security.patch b/app-misc/cw/files/1.0.16-format-security.patch
new file mode 100644
index 000000000000..20f0b1d06b1e
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-format-security.patch
@@ -0,0 +1,16 @@
+ src/cw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cw.c b/src/cw.c
+index d7b4875..3ec1ac1 100644
+--- a/src/cw.c
++++ b/src/cw.c
+@@ -643,7 +643,7 @@ void sighandler(signed int sig){
+  else if(sig==SIGUSR1)ext=1;
+  else if(sig==SIGALRM)ext=2;
+  else if(sig==SIGPIPE||sig==SIGINT){
+-  fprintf(stderr,pal2[16]);
++  fprintf(stderr,"%s", pal2[16]);
+   fflush(stderr);
+   cwexit(0,0);
+  }