Fix compile with format-security. Bug #520568

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 60 insertions, 26 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index af5faaeb0a40..ac0fdbc58bc5 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/lgeneral
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.44 2014/05/15 17:05:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.45 2014/10/20 07:00:23 tupone Exp $
+
+  20 Oct 2014; Alfredo Tupone <tupone@gentoo.org> lgeneral-1.2.3.ebuild,
+  +files/lgeneral-1.2.3-format.patch:
+  Fix compile with format-security. Bug #520568 by Agostino Sarubbo
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> lgeneral-1.2.3.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 85992c4b7038..373a07d67e5a 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,22 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX lgeneral-1.2.3-format.patch 1956 SHA256 f42070cbf2db7583e56726136f77cec871882acf840f014227a37a1f8288bb01 SHA512 ce66984f01b78ae3b1abced5f68a1b37f26cf06c1383f04536dad8302fa424b3d3680539e3e61ed5c8d3264f8eda3955239477b2e2df6456c53521df994a81b6 WHIRLPOOL facb25d6d14d2632c3b1cb302e1b8834f8099bf2a1b50bc8e78546e4377106300493bcd1d902dee4bade0c1eb7a71edfb4f69964f5eed6f2d4969c02cbcb7262
 DIST lgeneral-1.2.3.tar.gz 1630400 SHA256 55d17bb173c956c705b94bc8a6399d5311b3ec82c9f1821a97fe9ec45da0d9a1 SHA512 f6481d39e29e112b40bf4fce0edae4ad0228a31eea14aec3f8504ebb1878212e4c82b13a77ff09939f0f41903cb8f915ebfd005ab9e3f7b821d4ca3ddef5ec15 WHIRLPOOL f58182f1327667f2254c65000f79f97e247e42d431078bd4aa0ca76c24699ef5486ba3033faf84eb0a043daafcbf882fd3ceb56427847e5ac1f7567b679cda59
 DIST pg-data.tar.gz 410454 SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516 WHIRLPOOL 69f22f28cf4639dab0e6cf90036c26178129d7f67decf8b95ca175bb224bb3b985cf80382e06e45db06ef21d9ab9819fc1821b3d633a67bbb06ba56a8b450022
-EBUILD lgeneral-1.2.3.ebuild 2249 SHA256 c17e8e2479bf0dccd606317bda1f6adf48815c48a9a9caf4d3dde5f8773c9945 SHA512 72fc3e0891a5d95d2d5985a014e727ec85a4bb87e684845c541e7c453e30f93e467385216722a8745f6321ab53f6a2ec14dc6324bf159ec8337342215258a9ea WHIRLPOOL c7fc686a61fa70105f42bfc18c409115675497a11764ef20c26501d57561f3bccad3d3629c86b35f77a9687d82ee5e5968b858f51ffd93e5e0266062666c6f42
-MISC ChangeLog 8273 SHA256 1294033e6757db2b2325ca765ae387df261c2f655237bac64c5903c08da0bf82 SHA512 7ea09f6e23723aa0e526f4db20f3e19b2ec378d84a6b305c8d7be1dd26892fa4fdd97573535f08bb4b012a337a7a660fff5fa74d91dcf1471dc5349f9d016253 WHIRLPOOL f5ee1c057c062e5a5dc5a4efe3e41bd7028e0dbefabaff2b66e4d87fbbcb22293523b9a333fa0e4b85042aeea31b3f93c11140c3dc8a089f5619d221fd99e9c5
+EBUILD lgeneral-1.2.3.ebuild 2041 SHA256 3b28cfcb8424f45705203250086e75ce388cf09bb7173dbb1311f2d4d6f6daaf SHA512 428af9f7e6cf1bdd439aa727257c03bd1f292f8e9a6ef866c79d73033a63cb3016a4e752dd170faadd3ff25c05c3406cd79e046061cf3d31684edbe10c93c9cd WHIRLPOOL f1fce1b08d3c270a3d50b0b3fa6cfb6d8a8fc5cf9a434a3502ca4c36c83b1b72b82b55583de990190c2dadc56a67537748715c396dd97d2469dda0796f0fada1
+MISC ChangeLog 8456 SHA256 a14d9ea1324f76d2b78ef0ebeba81f35e564967e75a9861d83e98faeabfd11a2 SHA512 850d3b3f75260ed34adb1a21509c3c0c55ae30b076b3c532385acfcc7d954fc3bde2a87eb2e8304ed2bf1af87ec08b37db96a968a4498405d7f1f99ca4a581d9 WHIRLPOOL 334cce8fd30ebfaac3e58a3e52dfb1338e38fbed2945828faffd3fbb815a5c72a7ec2e7ea971f789043690b8195bef5ef4e3073053f0e8879f1950eee5df8062
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTdPPPAAoJEJQzkH1pP7W4im0MAJhVGlDgNTN3ftOUxjf5SP/y
-O7srNSUsdRcfaLBLv0Z3U5wcvwzeZAsBHD26w1KrrEe/C9Syshm0j30phtGwpq2C
-AzN0dnkmCLB1nZFCLCjzzIIuOdEcltL7Apysb3V8eZc2Ji7ry74vz4rAFvtjWNXq
-5Xhje0E6kUXOBjtrJIEuKHg2ET2CIrzc319SChqRPIDy+Z5zE56DLXWXDaBTC50W
-+OBrtD2+0uyFlsXMmAkuUqsWlb2CWKeuR27cl4x0b+1WGiZLoyH/YhIHHsxf5Tix
-aJMZ+TG5XMLWTw9cEscHXgAbTQpSxdaHWc3LiE64WFbmFJwuKOBJuu8nhox2tndz
-b8F7UHZiVT3uYQv+9ZqZ1DcOT18Xbd6tYqSyYxlxTaEgFUwGTRasY6iV4ZXDkO0U
-p6/bHm4VRU39RU+TikUqsU+7H3g+x5/HEpECpdxF3OAzMxfnkRRBl1Yp591KV5D6
-4f+XVFSfwqTILDjGZ7+8N1FJ675tUNOomDUNxasbtg==
-=zBdi
+iEYEAREIAAYFAlREswwACgkQIY77eQFFFC3+mQCaAteMnJNghRz7DozZlssE4rXk
+GioAoK5TJacnboU9+47MvNgGkTRsqY1j
+=//Me
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch b/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch
new file mode 100644
index 000000000000..364b65a7ee3c
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch
@@ -0,0 +1,40 @@
+--- lgc-pg/units.c.old	2014-10-20 08:42:12.389153753 +0200
++++ lgc-pg/units.c	2014-10-20 08:42:41.412883009 +0200
+@@ -552,7 +552,7 @@
+             }
+         }
+         /* get flags */
+-        sprintf( flags, unit_classes[entry.class * 3 + 2] );
++        sprintf( flags, "%s", unit_classes[entry.class * 3 + 2] );
+         if ( apply_unit_mods ) {
+             i = 0;
+             while ( add_flags[i*2][0] != 'X' ) {
+--- src/engine.c.old	2014-10-20 08:44:21.867947804 +0200
++++ src/engine.c	2014-10-20 08:45:19.299413602 +0200
+@@ -2311,7 +2311,7 @@
+                 if ( gui->module_dlg->subdir[0] != 0 )
+                     sprintf( path, "%s/%s", gui->module_dlg->subdir, (char*)gui->module_dlg->lbox->cur_item );
+                 else
+-                    sprintf( path, (char*)gui->module_dlg->lbox->cur_item );
++                    sprintf( path, "%s", (char*)gui->module_dlg->lbox->cur_item );
+                 free( setup.modules[gui->setup->sel_id] );
+                 setup.modules[gui->setup->sel_id] = strdup( path );
+                 gui_handle_player_select( gui->setup->list->cur_item );
+@@ -2756,7 +2756,7 @@
+                      result = gui_get_message_pane_selection(camp_pane);
+                      if (result && strcmp(result, "nextscen") == 0) {
+                          /* start scenario */
+-                         sprintf( setup.fname, camp_cur_scen->scen );
++                         sprintf( setup.fname, "%s", camp_cur_scen->scen );
+                          setup.type = SETUP_DEFAULT_SCEN;
+                          end_scen = 1;
+                          *reinit = 1;
+@@ -4243,7 +4243,7 @@
+                 }
+                 else {
+                     /* next scenario */
+-                    sprintf( setup.fname, camp_cur_scen->scen );
++                    sprintf( setup.fname, "%s", camp_cur_scen->scen );
+                     setup.type = SETUP_CAMP_BRIEFING;
+                     reinit = 1;
+                 }
diff --git a/games-strategy/lgeneral/lgeneral-1.2.3.ebuild b/games-strategy/lgeneral/lgeneral-1.2.3.ebuild
index c1f48a187a3e..00bfc1c366b3 100644
--- a/games-strategy/lgeneral/lgeneral-1.2.3.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild,v 1.5 2014/05/15 17:05:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild,v 1.6 2014/10/20 07:00:23 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils autotools games
 
 MY_P="${P/_/}"
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-format.patch
 	sed -i \
 		-e '/desktop_DATA/d' \
 		-e '/icon_DATA/d' \
@@ -53,29 +54,25 @@ src_prepare() {
 
 src_configure() {
 	egamesconf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		|| die
+		$(use_enable nls)
 
 	# Build the temporary lgc-pg:
 	cd "${WORKDIR}"/tmp-build
 	egamesconf \
-		--disable-dependency-tracking \
 		--disable-nls \
-		--datadir="${D}/${GAMES_DATADIR}" \
-		|| die
+		--datadir="${D}/${GAMES_DATADIR}"
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	# Build the temporary lgc-pg:
 	cd "${WORKDIR}"/tmp-build
-	emake || die "emake failed (tmp)"
+	emake
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain}
 
 	# Generate scenario data:
@@ -85,7 +82,6 @@ src_install() {
 		-d "${D}/${GAMES_DATADIR}"/${PN} \
 		|| die "Failed to generate scenario data"
 
-	dodoc AUTHORS ChangeLog README.lgeneral README.lgc-pg TODO
 	newicon lgeneral48.png ${PN}.png
 	make_desktop_entry ${PN} LGeneral
 	prepgamesdirs