Fix build with gcc -Werror=format-security, bug #512404

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 45 insertions, 21 deletions

diff --git a/x11-libs/libXaw/ChangeLog b/x11-libs/libXaw/ChangeLog
index a0d64872b4c2..c34e44646696 100644
--- a/x11-libs/libXaw/ChangeLog
+++ b/x11-libs/libXaw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libXaw
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/ChangeLog,v 1.130 2014/06/18 21:04:57 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/ChangeLog,v 1.131 2015/01/06 14:29:54 pacho Exp $
+
+  06 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/libXaw-1.0.12-format-security.patch, libXaw-1.0.12.ebuild:
+  Fix build with gcc -Werror=format-security, bug #512404
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> libXaw-1.0.11-r2.ebuild,
   libXaw-1.0.12.ebuild:
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index c3fd694db662..34869484a716 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,29 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libXaw-1.0.12-format-security.patch 818 SHA256 bde20c0fe5ee51debd2de15bcc4368b19104a18d79c76bc3d120a7c7401a7f51 SHA512 d08763618a02eeb2ec2abe339566d7a2d2465615306831e4ee02ee2b1699446e598d5aa8dd36356936a87c643900b36845e8419bfa1a1570431c4b5a608f955a WHIRLPOOL f10bfde72933bf0d7fc8c8f82dcccb966cfb5f9403792f0083b5ac90a5f14e8714e78feb10d3be75b7a0ba8b3355d13585d4c153d70c86dd450c66fa046c63c2
 DIST libXaw-1.0.11.tar.bz2 649633 SHA256 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492 SHA512 01a990717501cf7b9baa7d3b3a0cb1d21e52a736765b84ccb7b4051f5fe06f1e480d25b80f3600fed86bb147de90959658f0db0fb1f3b411d0e532a2f196ad00 WHIRLPOOL 83fb251ccdfccbe00c47cf1b1093f312e326034579600a64fee35c1a523a6c9432543678ec9278c295b027808c313c69800dab06b83566936768c281eceb6c63
 DIST libXaw-1.0.12.tar.bz2 677147 SHA256 96fc314874fce9979556321d1d6ee00b5baf32fb333b7278853b4983bc3cdbf6 SHA512 baf11625a20b89f08747e25dff6755ab796c8a5a91341d3cb21f85780733c4a3c25bbf134ac6259982207067d0a617f83f516c48aef6f57cbab14c8a9862944d WHIRLPOOL f23798a3c221d6f23de9b8d708f5c054d39d6681df23a53ab7a3c221215dfafc23463475e2d8290d609fd591443e35c1d0e9bc939a528eca3c6e757d7dd2d6e0
 EBUILD libXaw-1.0.11-r1.ebuild 883 SHA256 416ca7bd7956794d1cf5f5bdc90a06e8680fe583da2daf51778d4c0473dbf73a SHA512 86a16500a7c08aa02fe4d9c5943ad5651d6361d877c178e6f8e2a0844461a6161347424e3c63318d394c75def15da7fe62ee882bcd27190a6e13ccb03382423c WHIRLPOOL 0605b3d059571ee412ac5590105fa97f605e52edab33ed30285e841ee78e9698d0d30aa7312bcc0e837b14569a1d62af1dcb43c4388295f378b344bce96d8462
 EBUILD libXaw-1.0.11-r2.ebuild 1117 SHA256 10ebbec6e211e2d27c116d0a1f118b2f87148b40a922facef5ebc2b806e8528a SHA512 04b934ccd60e93ccb966cb95ee2af6256006eab8f9ce9eaa471597b0bccd4ba6aa411bc4525c992beb8d545f0eafa1d49640164ab78cfb2f1dcf9271364d2603 WHIRLPOOL c59ab86cbdd9a04096b0640bfc3ca6bb0311bf2be759cb7b07bbc59e1d10a1cb7f0435ee068845cda317b415c26239802998df4858103990805922d74fe65a7a
-EBUILD libXaw-1.0.12.ebuild 1113 SHA256 10d10758f4670517beb31bf5cb222a61db6eee95e12b4c323ec9c994130c1a99 SHA512 1baa5d21d6d12fd571d42a0f1bcb1bdedb4b301a73ec882b359664c1c9f9684675d33861a6a7fdc40ca3024472dbc39cbcc35718c0b515a98b435dd64e5d6f17 WHIRLPOOL 9714f59ff4f05c232ed9ad1a028e2bc4c7ddfe3a8b201f7e4dc561b63dfb16a23f8f31890dab07d2439e8fb015fc3e0815216bd97eb92bb1effda057a080f1c8
-MISC ChangeLog 15026 SHA256 a6f73d0c9081ecf9b6183d18348c62abe8ac0ee6928e05c4fe7671619df632d9 SHA512 71e7e8f98fa7283699aa6ab391b78fc0e6e10838b5f98442e3daf971b4a0606dd6e482f512b83ca05d74205b8cc94c4214333e569c1e8f92365b0299c9c4fc93 WHIRLPOOL 98dbd98178f12ee8e8f90c51a3bb6648684f5f06b5de9751475db072ce120b4c5105e07b93b457e0c617b9e6bcc4355e7546ffc8a17fa9379b6da827e320b6a9
+EBUILD libXaw-1.0.12.ebuild 1229 SHA256 07b18d83157980ce68f86a97a8fca25d01253d76b8220a189c1895eb57b12bf0 SHA512 b453d6525dd324eb5e251505f5e2f8ff0f2a7a09b61d34b4a78700016466449af12e426e1771cb45a3d22c9f274d1e64c637f03a5312058fe179be6d6cc9707a WHIRLPOOL c92b94316b3975f782a43e3127646abb215cf5f9bf5c1c87a68c8c557ee2d38b4d6447c057ef3ff5e4d08566c47ffdde0c0600863faac3c192b2a02be76fd09c
+MISC ChangeLog 15198 SHA256 db973bd82ed7ef6b28f6fc078986ca491b88d3147b7dce579a85222e1b7b40ad SHA512 e5b88a2deb759dc0490dff73a239966381804981b16f9ed7078630058d6b6ed3d7ee2d1f86a82c904d26fc33d7f4b4dc3e3daa4f36fda3a90664237a70ef1c7c WHIRLPOOL f8c00850235b4d8f09621f015f2a2b0bb0bae72f9505ca4360493b3ed20159630dba1d688d390beafa650e56170a1699101f4afd213e945962b65330ef70d7d6
 MISC metadata.xml 234 SHA256 b5929b0ed3b8b6011d0d04f255ce4f305d69c38cb221b28425021a9bf7ed1254 SHA512 2bf360ab4ac54b2eee2adbddc44745749a3fe898d8e23d9bbe5b59f9d43c862540ba7b7625eecafa5a55c61efe91b3ab374a0ad67b0339a437f40b78708a641d WHIRLPOOL 3a0d9ce52ec7b0fe5b04f98041bb27583afcc225c29022fa93efd62fa7daa80e3c837c0381cfcbb1f9250ed19de15209251fdffd1404277f906e3c7e564ef9a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTof79XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOEkgP/0fO3ReOWHtYlcGPcHCr486z
-AohTzjbtT8GLQfE2EcSD+o29e5zgAcNtJrnWwnrNOWbK/aLooZBYs6HPSR0kqFo/
-fhxieonioKONaoFWkhW6w3KiiExD+cBNz/WGhzJk0ZKNOThXKHvb+eAyrVviRneR
-o36YRiFCZ0aWfvNy7rNk2BNrd1pXP8kqHEGY7yayL+jTa0695fAtdz5Ma8x2KXzZ
-f4wXWO+DEu+1PWEiKVaZQ5ezuYOoiu1U0AhbwdUT11vz1mI91Gyeebx3vd+PTcUc
-ISu7NZvW8cLN55euM7pCKRG+j6cdB+SscMxC0wHfn2IQCO89zQHzxDVD2ozeu5fQ
-LFmVZ66I2WLgV+9G19dt0VcRDsTH3NTnE/un5HVJDk3MmXxC38l65AZDDabJwXRK
-PH53KDu+0dhH18KpOgwXM9EIzKJyYno7JCK+5hsanifUG+HeQzVoWkqWgEAm6e8W
-Ugjrwb4V67N6+6XOLz0asA9ky3Cmbll3NDHxtPwM5Wl2fMZwBpp7evd8wmA2yo0C
-bOHrneJHIlsfcfC2LijRoYBsa535UNAaIFi/G12Q3CYUOhze4qaOz2oz9pm6VIyc
-GagnWSEBlnvKahEkqRgME8dW32G/4+Vjc8OCwbaqOt49nc+UWxXMi6KatpJeCShU
-XJp/7l5kmYJOHHmHCqnO
-=3vUM
+iEYEAREIAAYFAlSr8WMACgkQCaWpQKGI+9QsqQCfXGfLHZkrwretdaONLrTW4xKD
+xTQAnjU+PoW22qM1AL1rhRxtNO62D7JI
+=3SaS
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch b/x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch
new file mode 100644
index 000000000000..dfc2e23672f9
--- /dev/null
+++ b/x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch
@@ -0,0 +1,26 @@
+From ec7d7c303385a6bdb0833a5aaae96be697cca7ab Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 21 Nov 2013 11:43:55 -0500
+Subject: Fix build with gcc -Werror=format-security
+
+DisplayList.c:290:4: error: format not a string literal and no format
+arguments [-Werror=format-security]
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/DisplayList.c b/src/DisplayList.c
+index 3e99df4..0581bf7 100644
+--- a/src/DisplayList.c
++++ b/src/DisplayList.c
+@@ -287,7 +287,7 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
+ 	}
+       if (fp)
+ 	{
+-	  snprintf(cname, fp - fname + 1, fname);
++	  snprintf(cname, fp - fname + 1, "%s", fname);
+ 	  memmove(fname, fp + 1, strlen(fp));
+ 	  lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc;
+ 	  if (!lc)
+-- 
+cgit v0.10.2
+
diff --git a/x11-libs/libXaw/libXaw-1.0.12.ebuild b/x11-libs/libXaw/libXaw-1.0.12.ebuild
index 1edbc4795f63..65848a80ffd4 100644
--- a/x11-libs/libXaw/libXaw-1.0.12.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.12.ebuild,v 1.11 2014/06/18 21:04:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.12.ebuild,v 1.12 2015/01/06 14:29:54 pacho Exp $
 
 EAPI=5
 
@@ -22,6 +22,11 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	# Fix build with gcc -Werror=format-security (from 'master')
+	"${FILESDIR}"/${P}-format-security.patch
+)
+
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable deprecated xaw6)