From: Tupone Alfredo <tupone@gentoo.org>
Date: Wed, 23 Dec 2015 20:11:37 +0000 (+0100)
Subject: games-sports/torcs: compile with format-security. Bug #539232
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e417a0e5984a8f6d67adb4684590651052302ace;p=gentoo.git

games-sports/torcs: compile with format-security. Bug #539232

Package-Manager: portage-2.2.24
---

diff --git a/games-sports/torcs/files/torcs-1.3.6-format.patch b/games-sports/torcs/files/torcs-1.3.6-format.patch
new file mode 100644
index 000000000000..52e7db6db968
--- /dev/null
+++ b/games-sports/torcs/files/torcs-1.3.6-format.patch
@@ -0,0 +1,34 @@
+--- src/tools/texmapper/maintexmapper.cpp.old	2015-12-23 20:55:24.874102363 +0100
++++ src/tools/texmapper/maintexmapper.cpp	2015-12-23 20:55:55.071553325 +0100
+@@ -103,7 +103,7 @@
+ {
+     int		i, j;
+ 
+-    printf(title);
++    printf("%s", title);
+     for (j = 0; j < 4; j ++){
+ 	for (i = 0; i < 4; i ++) {
+ 	    printf("%.6f  ", m[i][j]);
+--- src/tools/trackgen/objects.cpp.old	2015-12-23 20:59:49.671287196 +0100
++++ src/tools/trackgen/objects.cpp	2015-12-23 21:02:21.639523189 +0100
+@@ -234,9 +234,9 @@
+ 
+ 	ssgLeaf *vt = (ssgLeaf *)ent;
+ 	if (vt->getCullFace() == TRUE) {
+-		surf = "SURF 0x10\n";
++		surf = "0x10";
+ 	} else {
+-		surf = "SURF 0x30\n";
++		surf = "0x30";
+ 	}
+ 
+ 	int num_verts = vt->getNumVertices();
+@@ -304,7 +304,7 @@
+ 	fprintf (save_fd, "numsurf %d\n", num_tris);
+ 
+ 	for (i = 0; i < num_tris; i++) {
+-		fprintf (save_fd, surf);
++		fprintf (save_fd, "SURF %s\n", surf);
+ 		fprintf (save_fd, "mat 0\n");
+ 		fprintf (save_fd, "refs 3\n");
+ 		fprintf (save_fd, "%d %g %g\n",
diff --git a/games-sports/torcs/torcs-1.3.6.ebuild b/games-sports/torcs/torcs-1.3.6.ebuild
index 4c01238e2991..fdd634c3ab45 100644
--- a/games-sports/torcs/torcs-1.3.6.ebuild
+++ b/games-sports/torcs/torcs-1.3.6.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-no-automake.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
 		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-format.patch \
 		"${FILESDIR}"/${P}-noXmuXt.patch
 	eautoreconf
 	ecvs_clean