r15964 - in packages/trunk/slashem/debian: . patches

Markus Koschany apo at moszumanska.debian.org
Sun Apr 30 18:31:53 UTC 2017 

Author: apo
Date: 2017-04-30 18:31:53 +0000 (Sun, 30 Apr 2017)
New Revision: 15964

Added:
   packages/trunk/slashem/debian/patches/enable-debug-symbols.patch
   packages/trunk/slashem/debian/patches/pointer-truncation-bug-860393.patch
Modified:
   packages/trunk/slashem/debian/changelog
   packages/trunk/slashem/debian/control
   packages/trunk/slashem/debian/patches/series
Log:
Release slashem 0.0.7E7F3-9


Modified: packages/trunk/slashem/debian/changelog
===================================================================
--- packages/trunk/slashem/debian/changelog	2017-04-03 17:55:55 UTC (rev 15963)
+++ packages/trunk/slashem/debian/changelog	2017-04-30 18:31:53 UTC (rev 15964)
@@ -1,3 +1,14 @@
+slashem (0.0.7E7F3-9) unstable; urgency=medium
+
+  * Team upload.
+  * Add pointer-truncation-bug-860393.patch and try to prevent the user
+    interface from crashing. Thanks to Bernhard Übelacker. (Closes: #860393)
+  * slashem-common: Fix Lintian error init.d-script-needs-depends-on-lsb-base.
+  * Add enable-debug-symbols.patch and make the -dbgsym packages useful. Thanks
+    to Bernhard Übelacker for the patch.
+
+ -- Markus Koschany <apo at debian.org>  Sun, 30 Apr 2017 19:04:41 +0200
+
 slashem (0.0.7E7F3-8) unstable; urgency=medium
 
   * Add pt_BR debconf template translation. (Closes: #811517)

Modified: packages/trunk/slashem/debian/control
===================================================================
--- packages/trunk/slashem/debian/control	2017-04-03 17:55:55 UTC (rev 15963)
+++ packages/trunk/slashem/debian/control	2017-04-30 18:31:53 UTC (rev 15964)
@@ -53,7 +53,7 @@
 
 Package: slashem-common
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: lsb-base (>= 3.0-6), ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: debconf | debconf-2.0
 Recommends: slashem | slashem-x11 | slashem-sdl | slashem-gtk
 Replaces: slashem (<< 0.0.7E6F1-1)

Added: packages/trunk/slashem/debian/patches/enable-debug-symbols.patch
===================================================================
--- packages/trunk/slashem/debian/patches/enable-debug-symbols.patch	                        (rev 0)
+++ packages/trunk/slashem/debian/patches/enable-debug-symbols.patch	2017-04-30 18:31:53 UTC (rev 15964)
@@ -0,0 +1,44 @@
+From: Bernhard Übelacker <bernhardu at mailbox.org>
+Date: Sun, 30 Apr 2017 19:15:33 +0200
+Subject: enable debug symbols
+
+Make the -dbgsym packages useful.
+
+Bug-Debian: https://bugs.debian.org/860393
+---
+ sys/unix/Makefile.src | 4 ++--
+ sys/unix/Makefile.utl | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
+index 9d657a5..05528ba 100644
+--- a/sys/unix/Makefile.src
++++ b/sys/unix/Makefile.src
+@@ -129,9 +129,9 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o
+ #   compile normally
+ #   disable optimization on non-Linux archs due to FTBFS
+ ifeq ($(UNAME),Linux)
+-CFLAGS = -DDEBIAN_$(GUI) -O2 -fomit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
++CFLAGS = -DDEBIAN_$(GUI) -g -O2 -fomit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
+ else
+-CFLAGS = -DDEBIAN_$(GUI) -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
++CFLAGS = -DDEBIAN_$(GUI) -g -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
+ endif
+ LFLAGS = -L/usr/X11R6/lib -Wl,-z,relro
+ #   OR compile backwards compatible a.out format
+diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl
+index b253b5d..e34d711 100644
+--- a/sys/unix/Makefile.utl
++++ b/sys/unix/Makefile.utl
+@@ -77,9 +77,9 @@ UNAME := $(shell uname -s)
+ #   compile normally
+ #   disable optimization on non-Linux archs due to FTBFS
+ ifeq ($(UNAME),Linux)
+-CFLAGS = -DDEBIAN_$(GUI) -O2 -fomit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
++CFLAGS = -DDEBIAN_$(GUI) -g -O2 -fomit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
+ else
+-CFLAGS = -DDEBIAN_$(GUI) -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
++CFLAGS = -DDEBIAN_$(GUI) -g -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
+ endif
+ LFLAGS = -L/usr/X11R6/lib -Wl,-z,relro
+ #   OR compile backwards compatible a.out format

Added: packages/trunk/slashem/debian/patches/pointer-truncation-bug-860393.patch
===================================================================
--- packages/trunk/slashem/debian/patches/pointer-truncation-bug-860393.patch	                        (rev 0)
+++ packages/trunk/slashem/debian/patches/pointer-truncation-bug-860393.patch	2017-04-30 18:31:53 UTC (rev 15964)
@@ -0,0 +1,100 @@
+From: Bernhard Übelacker <bernhardu at mailbox.org>
+Date: Sun, 30 Apr 2017 19:02:33 +0200
+Subject: pointer truncation bug 860393
+
+Bug-Debian: https://bugs.debian.org/860393
+Forwarded: no
+---
+ include/extern.h     | 1 +
+ win/proxy/nhext.c    | 1 +
+ win/proxy/proxycb.c  | 1 +
+ win/proxy/proxysvc.c | 1 +
+ win/proxy/prxychar.c | 1 +
+ win/proxy/prxyconn.c | 1 +
+ win/proxy/prxytile.c | 1 +
+ 7 files changed, 7 insertions(+)
+
+diff --git a/include/extern.h b/include/extern.h
+index 625a9e6..6d4aebc 100644
+--- a/include/extern.h
++++ b/include/extern.h
+@@ -1485,6 +1485,7 @@ E const char *FDECL(mimic_obj_name, (struct monst *));
+ 
+ /* ### options.c ### */
+ 
++E genericptr_t FDECL(nh_option_get_boolopt, ());
+ E boolean FDECL(match_optname, (const char *,const char *,int,BOOLEAN_P));
+ E void NDECL(initoptions);
+ E void FDECL(parseoptions, (char *,BOOLEAN_P,BOOLEAN_P));
+diff --git a/win/proxy/nhext.c b/win/proxy/nhext.c
+index dead5fd..9a26ddd 100644
+--- a/win/proxy/nhext.c
++++ b/win/proxy/nhext.c
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <ctype.h>
++#include "config.h"
+ #include "nhxdr.h"
+ #include "proxycom.h"
+ 
+diff --git a/win/proxy/proxycb.c b/win/proxy/proxycb.c
+index ed150f0..36ffa21 100644
+--- a/win/proxy/proxycb.c
++++ b/win/proxy/proxycb.c
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "config.h"
+ #include "nhxdr.h"
+ #include "proxycom.h"
+ #include "proxycb.h"
+diff --git a/win/proxy/proxysvc.c b/win/proxy/proxysvc.c
+index d6cd302..2efab79 100644
+--- a/win/proxy/proxysvc.c
++++ b/win/proxy/proxysvc.c
+@@ -14,6 +14,7 @@
+ #include <windows.h>
+ #include <commctrl.h>
+ #endif
++#include "config.h"
+ #include "nhxdr.h"
+ #include "proxycom.h"
+ #include "proxycb.h"
+diff --git a/win/proxy/prxychar.c b/win/proxy/prxychar.c
+index 954aaca..cf3cf42 100644
+--- a/win/proxy/prxychar.c
++++ b/win/proxy/prxychar.c
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++#include "config.h"
+ #include "nhxdr.h"
+ #include "proxycom.h"
+ #include "prxyclnt.h"
+diff --git a/win/proxy/prxyconn.c b/win/proxy/prxyconn.c
+index f21d040..f59ff02 100644
+--- a/win/proxy/prxyconn.c
++++ b/win/proxy/prxyconn.c
+@@ -17,6 +17,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #endif
++#include "config.h"
+ #include "nhxdr.h"
+ #include "proxycom.h"
+ #include "prxyclnt.h"
+diff --git a/win/proxy/prxytile.c b/win/proxy/prxytile.c
+index 2057318..9bd66fd 100644
+--- a/win/proxy/prxytile.c
++++ b/win/proxy/prxytile.c
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "config.h"
+ #include "nhxdr.h"
+ #include "proxycom.h"
+ #include "prxyclnt.h"

Modified: packages/trunk/slashem/debian/patches/series
===================================================================
--- packages/trunk/slashem/debian/patches/series	2017-04-03 17:55:55 UTC (rev 15963)
+++ packages/trunk/slashem/debian/patches/series	2017-04-30 18:31:53 UTC (rev 15964)
@@ -3,3 +3,5 @@
 slashem-debian.patch
 clang_FTBFS_Wreturn-type.patch
 reproducible-build.patch
+pointer-truncation-bug-860393.patch
+enable-debug-symbols.patch

More information about the Pkg-games-commits mailing list