Merge lp:~debfx/aisleriot/format-security into lp:~ubuntu-desktop/aisleriot/ubuntu

Proposed by Felix Geyer on 2011-11-13
Status: Merged
Merged at revision: 6
Proposed branch: lp:~debfx/aisleriot/format-security
Merge into: lp:~ubuntu-desktop/aisleriot/ubuntu
Diff against target: 41 lines (+22/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/03_format-security.patch (+14/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~debfx/aisleriot/format-security
Reviewer Review Type Date Requested Status
Jeremy Bicha 2011-11-13 Approve on 2011-11-16
Review via email: mp+82081@code.launchpad.net

Description of the change

Fix FTBFS with -Werror=format-security.

To post a comment you must log in.
lp:~debfx/aisleriot/format-security updated on 2011-11-15
7. By Felix Geyer on 2011-11-15

Add upstream bug url.

8. By Felix Geyer on 2011-11-15

Close launchpad bug.

Jeremy Bicha (jbicha) wrote :

Thanks for finding this and fixing it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-10-17 19:00:37 +0000
3+++ debian/changelog 2011-11-15 22:27:23 +0000
4@@ -1,3 +1,10 @@
5+aisleriot (1:3.2.1-0ubuntu2) precise; urgency=low
6+
7+ * Fix FTBFS with -Werror=format-security. (LP: #890889)
8+ - Add 03_format-security.patch.
9+
10+ -- Felix Geyer <debfx-pkg@fobos.de> Sun, 13 Nov 2011 16:44:35 +0100
11+
12 aisleriot (1:3.2.1-0ubuntu1) oneiric-proposed; urgency=low
13
14 * New upstream bugfix & translations release.
15
16=== added file 'debian/patches/03_format-security.patch'
17--- debian/patches/03_format-security.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/03_format-security.patch 2011-11-15 22:27:23 +0000
19@@ -0,0 +1,14 @@
20+Description: Fix FTBFS with -Werror=format-security.
21+Author: Felix Geyer <debfx-pkg@fobos.de>
22+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=664151
23+
24+--- aisleriot-3.2.1.orig/src/game.c
25++++ aisleriot-3.2.1/src/game.c
26+@@ -408,6 +408,7 @@ game_scm_pre_unwind_handler (void *user_
27+ g_set_error (error,
28+ AISLERIOT_GAME_ERROR,
29+ GAME_ERROR_EXCEPTION,
30++ "%s",
31+ message ? message
32+ : "A scheme exception occurred, but there was no exception info");
33+ return SCM_UNDEFINED;
34
35=== modified file 'debian/patches/series'
36--- debian/patches/series 2011-09-26 16:54:18 +0000
37+++ debian/patches/series 2011-11-15 22:27:23 +0000
38@@ -1,2 +1,3 @@
39 01_lpi.patch
40 02_desktop-path.patch
41+03_format-security.patch

Subscribers

People subscribed via source and target branches

to all changes: