Your message dated Fri, 30 Nov 2012 22:00:20 +0100
with message-id <[email protected]>
and subject line Re: Bug#681788: unblock: ace-of-penguins/1.3-10
has caused the Debian Bug report #681788,
regarding unblock: ace-of-penguins/1.3-10
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
681788: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681788
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package ace-of-penguins
Target bug to fix:
A crash happens for all games when F1 is pressed
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679875
The cause
Happens only on systems where 100dpi font package is not
installed
The Fix
Add required font package to debian/control::Recommends
Also includes compared to 1.3-8
Patch 50: Full hardenining (CPPFLAGS support)
Comment
Changes according to past unblock discussion
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680951
unblock ace-of-penguins/1.3-10
$ cat ace-of-penguins-1.3-8--1.3-10.dsc.deb.diff
diff -Nru ace-of-penguins-1.3/debian/changelog
ace-of-penguins-1.3/debian/changelog
--- ace-of-penguins-1.3/debian/changelog 2012-03-23 08:04:24.000000000
+0200
+++ ace-of-penguins-1.3/debian/changelog 2012-07-12 13:35:45.000000000
+0300
@@ -1,3 +1,25 @@
+ace-of-penguins (1.3-10) unstable; urgency=low
+
+ * debian/series
+ - (45): Add libpng 1.5 transition patch. For some reason the line
+ was mistankely deleted in 1.3-9.
+ - (50): New. Included in 1.3-9 but not listed in changelog.
+ Enable CPPFLAGS, thus making full use of hardened build flags
+ (hardening=+all) added in 1.3-8. Patch thanks to Simon Ruderich
+ <[email protected]>
+
+ -- Jari Aalto <[email protected]> Thu, 12 Jul 2012 13:35:26 +0300
+
+ace-of-penguins (1.3-9) unstable; urgency=low
+
+ * debian/control
+ - (Recommends): Add xfonts-100dpi. This fixes F1 keypress
+ segmentation fault crash on systems which do not already have the font
+ installed (Closes: #679875). Thanks to Lukas Hofmann <[email protected]>
+ for the patch.
+
+ -- Jari Aalto <[email protected]> Tue, 10 Jul 2012 12:47:52 +0300
+
ace-of-penguins (1.3-8) unstable; urgency=low
* debian/control
diff -Nru ace-of-penguins-1.3/debian/control ace-of-penguins-1.3/debian/control
--- ace-of-penguins-1.3/debian/control 2012-03-23 08:04:24.000000000 +0200
+++ ace-of-penguins-1.3/debian/control 2012-07-12 13:35:45.000000000 +0300
@@ -12,6 +12,7 @@
Architecture: any
Pre-Depends: multiarch-support
Depends: ${misc:PreDepends}, ${misc:Depends}, ${shlibs:Depends}
+Recommends: xfonts-100dpi
Description: penguin-themed solitaire games
The Ace of Penguins is a set of solitaire games inspired by the ones
available for MS Windows, but with a number of enhancements.
@@ -19,3 +20,6 @@
The package consists of the games Canfield, Freecell, Golf,
Mastermind, Merlin, Minesweeper, Pegged, Solitaire, Spider, Taipei
(with a level editor), and Thornq.
+ .
+ NOTE: If you experience problems with the F1 help key, please
+ make sure you have package xfonts-100dpi installed.
diff -Nru ace-of-penguins-1.3/debian/patches/45-libpng15
ace-of-penguins-1.3/debian/patches/45-libpng15
--- ace-of-penguins-1.3/debian/patches/45-libpng15 2012-03-23
08:04:24.000000000 +0200
+++ ace-of-penguins-1.3/debian/patches/45-libpng15 2012-07-12
13:35:45.000000000 +0300
@@ -1,5 +1,5 @@
-From: Jari Aalto <[email protected]>
-Subject: libpng 1.5 transition
+From: Nobuhiro Iwamatsu <[email protected]>
+Subject: libpng 1.5 transition Bug#635741
--- a/lib/make-imglib.c
+++ b/lib/make-imglib.c
diff -Nru ace-of-penguins-1.3/debian/patches/50-buildflags.patch
ace-of-penguins-1.3/debian/patches/50-buildflags.patch
--- ace-of-penguins-1.3/debian/patches/50-buildflags.patch 1970-01-01
02:00:00.000000000 +0200
+++ ace-of-penguins-1.3/debian/patches/50-buildflags.patch 2012-07-12
13:35:45.000000000 +0300
@@ -0,0 +1,31 @@
+From: Simon Ruderich <[email protected]>
+Subject: Add dupport for CPPFLAGS
+Last-Update: 2012-03-24
+
+--- ace-of-penguins-1.3.orig/lib/Makefile.in
++++ ace-of-penguins-1.3/lib/Makefile.in
+@@ -565,10 +565,10 @@ images.c : make-imglib Makefile images.i
+ ./make-imglib -n cards -i $(srcdir)/png -d images.d $(srcdir)/images.in
images.c
+
+ make-imglib : make-imglib.c
+- $(BUILD_CC) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz
++ $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/make-imglib.c -o
make-imglib -lpng -lz
+
+ text2c : text2c.c
+- $(BUILD_CC) $(srcdir)/text2c.c -o text2c -lpng -lz
++ $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/text2c.c -o
text2c -lpng -lz
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- ace-of-penguins-1.3.orig/lib/Makefile.am
++++ ace-of-penguins-1.3/lib/Makefile.am
+@@ -24,7 +24,7 @@ images.c : make-imglib Makefile images.i
+ ./make-imglib -n cards -i $(srcdir)/png -d images.d $(srcdir)/images.in
images.c
+
+ make-imglib : make-imglib.c
+- $(BUILD_CC) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz
++ $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/make-imglib.c -o
make-imglib -lpng -lz
+
+ text2c : text2c.c
+- $(BUILD_CC) $(srcdir)/text2c.c -o text2c -lpng -lz
++ $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/text2c.c -o
text2c -lpng -lz
diff -Nru ace-of-penguins-1.3/debian/patches/series
ace-of-penguins-1.3/debian/patches/series
--- ace-of-penguins-1.3/debian/patches/series 2012-03-23 08:04:24.000000000
+0200
+++ ace-of-penguins-1.3/debian/patches/series 2012-07-12 13:35:45.000000000
+0300
@@ -3,3 +3,4 @@
30-spider.c-implicit-pointer-conversion.patch
40-include.patch
45-libpng15
+50-buildflags.patch
--- End Message ---
--- Begin Message ---
On Mon, Jul 23, 2012 at 08:25:47 +0300, jaalto wrote:
> On 2012-07-21 19:29, Julien Cristau wrote:
> | On Sat, Jul 21, 2012 at 20:00:38 +0300, jaalto wrote:
> |
> | > On 2012-07-21 12:39, Julien Cristau wrote:
> | > | On Mon, Jul 16, 2012 at 18:47:14 +0300, Jari Aalto wrote:
> | > |
> | > | > Add required font package to debian/control::Recommends
> | > | >
> | > | Making the software deal sanely with a missing font (where "SIGSEGV"
> | > | doesn't count as "sane") is not an option?
> | >
> | > The policy says that font packages are not allowed to be listed in
> | > debian/control::Depends. If this is permissable to be overridden, I
> | > can move it from Recommends to Depends.
> | >
> | That's not what I meant.
>
> Given the release time frame, upstream probably is unable to provide
> updates on this at code level.
>
You could...
> To improve it for release, I'm wondering if it would be more sensible
> to play it safe and use:
>
> debian/controll::Depends
That's both not safe and against policy. (There's a reason it's against
policy; X apps using server-side fonts don't have any say over which
fonts are available to the X server.)
> Currenly the measures in 1.3-10 are the ones that are allowed by
> policy.
>
If this isn't getting fixed properly then let's stay with the current
version.
Cheers,
Julien
signature.asc
Description: Digital signature
--- End Message ---
