Fix for format-security, bug #521090

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

4 files changed, 88 insertions, 4 deletions

diff --git a/app-misc/gnuit/ChangeLog b/app-misc/gnuit/ChangeLog
index 651b32b6069f..85a0c88687fd 100644
--- a/app-misc/gnuit/ChangeLog
+++ b/app-misc/gnuit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/gnuit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/ChangeLog,v 1.7 2011/01/05 15:15:34 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/ChangeLog,v 1.8 2015/06/24 10:03:51 jlec Exp $
+
+*gnuit-4.9.5-r2 (24 Jun 2015)
+
+  24 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  +files/gnuit-4.9.5-format-security.patch, +gnuit-4.9.5-r2.ebuild:
+  Fix for format-security, bug #521090
 
   05 Jan 2011; Justin Lecher <jlec@gentoo.org> gnuit-4.9.5-r1.ebuild:
   Some Clean up
@@ -30,4 +36,3 @@
   +metadata.xml:
   Initial ebuild of app-misc/gnuit which is an upstream rename of
   app-misc/git, ebuild by James Rowe. bug 281853
-
diff --git a/app-misc/gnuit/Manifest b/app-misc/gnuit/Manifest
index c77ea7d5564e..962ce8079ba2 100644
--- a/app-misc/gnuit/Manifest
+++ b/app-misc/gnuit/Manifest
@@ -1,4 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX gnuit-4.9.5-format-security.patch 427 SHA256 2db22addd5830263bc76f2b3c5ad0ccf4652852c82361d4e787cc4303bb3a5e8 SHA512 de604126f686af2eec160d4bd735f3888ee87a0b7bab38bb3d00d4dd26694c66810641687bb413933acb7991893a8772490fdc36fd001325d2a2b5f82bb3afc2 WHIRLPOOL fc6379d879f72fb3043a2b7255630df2f8843bffab0360b3d8a9e8b93800da55e51a3d1d0b47584e946f997919971d29e1baeb394f4b2178a1946c0a5120b94c
 DIST gnuit-4.9.5.tar.gz 894362 SHA256 6b6e96db13bafa5ad35c735b2277699d4244088c709a3e134fb1a3e8c8a8557c SHA512 91f1a86f45d5a2fab91941587aed3c1e57ae68271584bef38560c9a31fabbdfeba801d87cdf5640ba9f2041e43305e49c64953b8d5370f3f6a463b2fa2a7c5da WHIRLPOOL 45c9539fb1bcc8bb985b0d63ae24c7be50773cbddb81b986d48a3b9f290fcf3ca4649eda3d830beafe0c2b854a82e7b90d3082231a8e401643cc3fa6d59af18b
 EBUILD gnuit-4.9.5-r1.ebuild 1216 SHA256 2b975016683f49859255d889ad26af0f8ff9693b0fdde49e02a45d42b25cc0a9 SHA512 218e81c4903274fb567487e771c53f800e6c9fdf0f5485b0e6a52f78107471b17264aa2f1aa6bf04389ec2057bd2a8f4a5bc628a9fcc1dd6c0f33088d62e1ec1 WHIRLPOOL 8589ece5ded6df971e2a1a523f723aa8414424a84c20a87975b8bac6991b51d913657350dda5c33c1d5f1dac9972dd424718ac68e03c08aa33e4073317800eb6
-MISC ChangeLog 1177 SHA256 d20c7ae71eca7e6b8603c5f2bd0091f6f2f28b80dec4efdc65fc0d4519f5fe41 SHA512 921a477ef2b1735aa6accc1b7ea7e7f1258ec456022b7fbcf95eb1ba82b215b07f0dd48f4b39a3275e9e60d09ddd5d6f45c8300ddd3dc18f666312f1ffebb1c9 WHIRLPOOL c03a08f16564c55d5ac4040188230136fb7187332c6f8be5ad67b69c1f5053afc8cdb32c527e86749924ca34a4c62d9e87d39047b1e13c52dbd529a1938eedee
+EBUILD gnuit-4.9.5-r2.ebuild 1235 SHA256 b5ae2ccbeaa7dcc8ac13023a5fcc9685e1e22f84fd97335d59162bdcb8367e93 SHA512 20f30bd845e08e8168ead82946617e0df78e727fef1214a2f09137535a83ab3efae813f79488c29102f2d0e8638b3bdbdcdf5e1f1804b1810eb613ed7e6f3c89 WHIRLPOOL 69f2c38ca74cf9ec6b763dd1cdb4899bda38eaadecd0cfbb8f47b656b78d53a6e7fcf3c5196b77ad556585f965c0a254313a6328803d3c515d5559142f925240
+MISC ChangeLog 1362 SHA256 7d3530c563dfa90db79baf1a260379a88702df49405aac8d84bf6891a62fd2d8 SHA512 4fb1f32ee46798e8df61f8e6541babd7d51f5a48eaa2fd68b86202254270cfccf764f2f8b7aa264fc8a597410dee42648d38c3906eb96d239f5d9628edc7cffa WHIRLPOOL 243e8f1b814e22dc9772b60407d9696eddf2a45c0fecf080d405e3f4595d29e14c932675914754b720d39f930cee49078c43931798cab01e3c0e68de07c38cc8
 MISC metadata.xml 165 SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd SHA512 d99326d50355f1fa041618844027c043a114e7e63dec3c2d6c0c6023a5863bde8e62706bed974a394e21ce2e64ddf5539750c30e5913dacb39ed37cfd62e6eb3 WHIRLPOOL bb8b8cc1c4d9312dfe9015934c3c315a1ea6b9b6da2db22b231b434fd144ee7690ec2e242a1fba9c8e601610dc5cc9061c1995dd33c5b59c78a19a71f71d7a76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQJ8BAEBCgBmBQJVioCIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIXwP/3Jz/TUpAhm1EhAVfEmM2+Hp
+M+FF8xQkUEN0nbDXHxnv2o5QzQ3JBuR1URKKVHHhGjQNu8xAszSRz7xQvZyvUooY
+9NYIkPCJFDiZdioTp/LqTK6G6qrf2iMhqvbhMPMsPOR4HnJSwY1eduHZ6AoDJG/x
+KIGgbWdCaXX0LgNpF1UrhBuI+FpRSqTuIaJTUvHF5dZZ4sgkm7Z/yT9B9ARtliZI
+kNg96FuInda8SW34j6I0GFINSE8W8JBsfxobiFMzPP6YX1MYRs4cbsvmwlwwt8hy
+7B3r1/dw5aGdUpGVHVRRWYotLD28Xyu1+yz4cgDTTREE6i6QhTcSH/C4NYaT9Q52
+DBNbffINRiYYYRBGMeQSlCKX96MuTiqg5dpaBqu/zrEVLYUGs29SZ8Z0/TqOX69Q
+ltXsFd+D/ddFoDobZhfHw3q6TTIvam3s/SxjF44nqMeRpp2KInVyabcye8veVu5n
+JeoksgAveNCJ8VA6pkp84i60/v+MVE4YCP0zcfl/YCFwltf2PAqKKnUhSUtBkpvJ
++8XOGba/MgT1EU7yeMFaXSkgNiOK49Tc0pQApp9FNublHSGhoV+/XEN0YlFpvxzo
+54/IClofSc/EB1XFkOaJuTp5LXvf5onMxOeqEa5dlXoR48CX4jvnQeTpJW1q0tJb
+c9DLTig7yUlgFUc6pMPa
+=O0on
+-----END PGP SIGNATURE-----
diff --git a/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
new file mode 100644
index 000000000000..ec2a1c51fdb8
--- /dev/null
+++ b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
@@ -0,0 +1,16 @@
+ src/git.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/git.c b/src/git.c
+index c6040b2..595912d 100644
+--- a/src/git.c
++++ b/src/git.c
+@@ -1917,7 +1917,7 @@ main(argc, argv)
+     printf("%s %s (%s)\n", PRODUCT, VERSION, HOST);
+ #endif /* !HAVE_GCC */
+ 
+-    printf(copyright);
++    printf("%s", copyright);
+ 
+ #ifdef DEBIAN
+     add_to_environment("GIT_EDITOR",    "EDITOR",     "sensible-editor");
diff --git a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
new file mode 100644
index 000000000000..e87cefda87ed
--- /dev/null
+++ b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/gnuit-4.9.5-r2.ebuild,v 1.1 2015/06/24 10:03:51 jlec Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="GNU Interactive Tools - increase speed and efficiency of most daily tasks"
+HOMEPAGE="http://www.gnu.org/software/gnuit/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format-security.patch
+}
+
+src_configure() {
+	# The transition option controls whether a "git" wrapper is installed, it is
+	# disabled explicitly so we don't need to block on dev-vcs/git.
+	econf --disable-transition
+}
+
+src_install() {
+	default
+	#emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install
+	mv "${D}/usr/bin/gitview" "${D}/usr/bin/gnuitview" || die
+}
+
+pkg_postinst() {
+	elog "The 'git' tool this package previously installed is now called 'gitfm'"
+	elog "The 'gitview' tool this package previously installed is now called 'gnuitview'"
+	elog "If you want the 'gitaction' tool to use your preferred desktop"
+	elog "application settings install the 'x11-misc/xdg-utils' package."
+}