[packages/lincity-ng] - fix format string errors - rel 3

baggins baggins at pld-linux.org
Thu Jul 13 17:03:08 CEST 2017


commit a689e2d665e63bcc6555e711e820ba0546151390
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jul 14 00:02:46 2017 +0900

    - fix format string errors
    - rel 3

 format-security.patch | 22 ++++++++++++++++++++++
 lincity-ng.spec       |  6 +++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/lincity-ng.spec b/lincity-ng.spec
index 75d227e..2cfffef 100644
--- a/lincity-ng.spec
+++ b/lincity-ng.spec
@@ -2,12 +2,13 @@ Summary:	Lincity - a Next Generation city/country simulation
 Summary(pl.UTF-8):	Lincity - symulator miasta/kraju Następnej Generacji
 Name:		lincity-ng
 Version:	2.0
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://download.berlios.de/lincity-ng/%{name}-%{version}.tar.bz2
 # Source0-md5:	1bd0f58e0f2b131d70044f4230600ed1
 Patch0:		%{name}-desktop.patch
+Patch1:		format-security.patch
 URL:		http://lincity-ng.berlios.de/wiki/index.php/Main_Page
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-devel
@@ -56,6 +57,7 @@ znajduje się w rękach gracza.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{__sed} 's/ -O3 -g / /' -i Jamrules
 
 %build
@@ -67,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 
 jam -s DESTDIR=$RPM_BUILD_ROOT install
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..40685a0
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,22 @@
+--- lincity-ng-2.0/src/lincity/fileutil.cpp~	2009-01-26 05:20:41.000000000 +0900
++++ lincity-ng-2.0/src/lincity/fileutil.cpp	2017-07-13 23:48:55.355365373 +0900
+@@ -498,7 +498,7 @@
+ 
+ void malloc_failure(void)
+ {
+-    printf(_("Out of memory: malloc failure\n"));
++    puts(_("Out of memory: malloc failure\n"));
+     exit(1);
+ }
+ 
+--- lincity-ng-2.0/src/lincity-ng/Dialog.cpp~	2009-01-26 05:20:43.000000000 +0900
++++ lincity-ng-2.0/src/lincity-ng/Dialog.cpp	2017-07-13 23:49:41.569815446 +0900
+@@ -378,7 +378,7 @@
+         setParagraphN( "statistic_text", line++, outf );
+     }
+     if (sustain_flag){
+-	    snprintf (outf, maxlength, _("Economy is sustainable"));
++	    snprintf (outf, maxlength, "%s", _("Economy is sustainable"));
+         setParagraphN( "statistic_text", line++, outf );
+     }
+     snprintf (outf, maxlength, _("Population  %d  of which  %d  are not housed.")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lincity-ng.git/commitdiff/a689e2d665e63bcc6555e711e820ba0546151390



More information about the pld-cvs-commit mailing list