[lucidlife] Fix FTBFS bugs (#992152, #1037183). Remove versioned DOCDIR patch. Add ARM build support (#926097).

Peter Gordon pgordon at fedoraproject.org
Sun May 25 01:59:49 UTC 2014


commit 68a36484fcfabc0048249dec635347f01de13023
Author: Peter Gordon <peter at thecodergeek.com>
Date:   Sat May 24 18:59:45 2014 -0700

    Fix FTBFS bugs (#992152, #1037183). Remove versioned DOCDIR patch. Add ARM build support (#926097).

 lucidlife-make-docs-use-proper-dir.patch |   40 ------------------------------
 lucidlife-printf-format-security.patch   |   33 ++++++++++++++++++++++++
 lucidlife.spec                           |   20 ++++++++++++---
 3 files changed, 49 insertions(+), 44 deletions(-)
---
diff --git a/lucidlife-printf-format-security.patch b/lucidlife-printf-format-security.patch
new file mode 100644
index 0000000..ea8d38a
--- /dev/null
+++ b/lucidlife-printf-format-security.patch
@@ -0,0 +1,33 @@
+diff -up ./src/loadsave.c.orig ./src/loadsave.c
+--- ./src/loadsave.c.orig	2014-05-24 15:33:20.292783219 -0700
++++ ./src/loadsave.c	2014-05-24 15:34:20.898980932 -0700
+@@ -714,7 +714,7 @@ static void rle_output(FILE* f, char obj
+ 
+     nchars = ((count < 3) ? count : num_digits(count) + 1);
+     if (line_len > RLE_MAX_COLS - nchars) {
+-        fprintf(f, newline);
++        fprintf(f, "%s", newline);
+         line_len = 0;
+     }
+ 
+@@ -726,7 +726,7 @@ static void rle_output(FILE* f, char obj
+         fprintf(f, "%u%c", count, obj);
+ 
+     if (obj == '!') {
+-        fprintf(f, newline);
++        fprintf(f, "%s", newline);
+         line_len = 0;
+     } else
+         line_len += nchars;
+diff -up ./src/lucidlife.c.orig ./src/lucidlife.c
+--- ./src/lucidlife.c.orig	2014-05-24 17:39:30.623555037 -0700
++++ ./src/lucidlife.c	2014-05-24 17:41:13.381751619 -0700
+@@ -3247,7 +3247,7 @@ void error_dialog(const char* format, ..
+ 		GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ 		GTK_MESSAGE_ERROR,
+ 		GTK_BUTTONS_CLOSE,
+-		str);
++		"%s", str);
+ 
+ 	gtk_widget_show_all (dialog);
+ 	gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/lucidlife.spec b/lucidlife.spec
index 1827a2c..41d7102 100644
--- a/lucidlife.spec
+++ b/lucidlife.spec
@@ -1,14 +1,14 @@
 Name:           lucidlife
 Version:        0.9.2
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/Simulation/LucidLife-26633.shtml
 Source0:        http://mirror.thecodergeek.com/src/lucidlife-0.9.2.tar.gz
-Patch0:		%{name}-make-docs-use-proper-dir.patch
 Patch1: 	%{name}-fix-FSF-address.patch
+Patch2: 	%{name}-printf-format-security.patch
 
 BuildRequires:  gtk2-devel >= 2.6.0
 BuildRequires:	gnome-vfs2-devel
@@ -29,11 +29,12 @@ more modern user interface and other enhancements.
 
 %prep
 %setup -q
-%patch0 -p0 -b .make-docs-use-proper-dir
 %patch1 -p0 -b .fix-FSF-address
+%patch2 -p0 -b .printf-format-security
 
 
 %build
+%{__autoconf}
 %configure LDFLAGS='-lX11'
 make %{?_smp_mflags}
 
@@ -49,7 +50,7 @@ desktop-file-install \
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
  
 
-%files -f %{name}.lang 
+%files -f %{name}.lang
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %doc doc/*.png doc/*.html doc/*.gif doc/*.css
 %{_bindir}/%{name}
@@ -59,6 +60,17 @@ desktop-file-install \
 
 
 %changelog
+* Sat May 24 2014 Peter Gordon <peter at thecodergeek.com> - 0.9.2-14
+- Apply fix for print format security:
+  + printf-format-security.patch
+- Drop versioned DOCDIR patch, in accordance with UnversionedDocdirs feature:
+  - make-docs-use-proper-docdir.patch
+- Fixes bugs #1037183 (lucidlife FTBFS if "-Werror=format-security" flag is
+  used) and #992152 (lucidlife: FTBFS in rawhide)
+- Rerun autoconf in %%build to update for ARM64 arch support.
+- Fixes bug #926097 (lucidlife: Does not support aarch64 in f19 and rawhide)
+
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list