[7kaa] 01/01: Remove the fix_format_security patch, included upstream.

[Bertrand Marc]

This is an automated email from the git hooks/post-receive script.

bmarc pushed a commit to branch master
in repository 7kaa.

commit 48b2f1d78bd44ad48031495a014c0edf7fedc038
Author: Bertrand Marc <bmarc at debian.org>
Date:   Tue Sep 13 19:22:40 2016 +0200

    Remove the fix_format_security patch, included upstream.
---
 debian/patches/fix_format_security.diff | 77 ---------------------------------
 debian/patches/series                   |  1 -
 2 files changed, 78 deletions(-)

diff --git a/debian/patches/fix_format_security.diff b/debian/patches/fix_format_security.diff
deleted file mode 100644
index 564c923..0000000
--- a/debian/patches/fix_format_security.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: Fix failure with -Werror=format-security.
-Origin: https://github.com/the3dfxdude/7kaa/commit/a8eaf0d02a37202e6e41d77c5c57c936524d827f
-Author: Ding-Yi Chen
---- a/src/client/ORACERES.cpp
-+++ b/src/client/ORACERES.cpp
-@@ -27,7 +27,7 @@
- #include <OUNITRES.h>
- #include <ORACERES.h>
- #include <locale.h>
--#include "gettext.h"
-+#include <gettext.h>
- 
- //---------- #define constant ------------//
- 
-@@ -540,52 +540,52 @@
- 	if( strncmp(adjective, "Norman", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Norman Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Norman") );
-+		strncpy( adjective, pgettext("Race Adjective", "Norman"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Mayan", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Mayan Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Mayan") );
-+		strncpy( adjective, pgettext("Race Adjective", "Mayan"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Greek", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Greek Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Greek") );
-+		strncpy( adjective, pgettext("Race Adjective", "Greek"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Viking", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Viking Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Viking") );
-+		strncpy( adjective, pgettext("Race Adjective", "Viking"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Persian", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Persian Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Persian") );
-+		strncpy( adjective, pgettext("Race Adjective", "Persian"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Chinese", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Chinese Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Chinese") );
-+		strncpy( adjective, pgettext("Race Adjective", "Chinese"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Japanese", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Japanese Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Japanese") );
-+		strncpy( adjective, pgettext("Race Adjective", "Japanese"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Egyptian", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Egyptian Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Egyptian") );
-+		strncpy( adjective, pgettext("Race Adjective", "Egyptian"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Mughul", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Mughul Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Mughul") );
-+		strncpy( adjective, pgettext("Race Adjective", "Mughul"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Zulu", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Zulu Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Zulu") );
-+		strncpy( adjective, pgettext("Race Adjective", "Zulu"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- }
- //---------- End of function translate_race_adjective -----------//
diff --git a/debian/patches/series b/debian/patches/series
index e38906b..caca40b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 abs_dir.patch
-fix_format_security.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/7kaa.git