Bug#693244: etw: doesn't save and load important configurations

[Markus Koschany]

Attached is a new debdiff. I've changed the relevant part of the code which
is responsible for opening the configuration file in $HOME. It should be
more secure now.


-------------- next part --------------
diff -u etw-3.6+svn140/debian/changelog etw-3.6+svn140/debian/changelog
--- etw-3.6+svn140/debian/changelog
+++ etw-3.6+svn140/debian/changelog
@@ -1,3 +1,16 @@
+etw (3.6+svn140-4) unstable; urgency=low
+
+  * New Maintainer. (Closes: #544922)
+  * Eat the Whistle will be maintained in a Git repository from now on.
+    Change the Vcs-fields in debian/control accordingly.
+  * debian/patches: 
+    Add 0005-change-configuration-path.patch.
+    Load configuration in $HOME/.etw/ instead of
+    /usr/share/games/etw and stop failing silently. (Closes: #693244)
+  * Update README.Debian.
+
+ -- Markus Koschany <apo at gambaru.de>  Sun, 16 Nov 2012 19:41:55 +0100
+
 etw (3.6+svn140-3) unstable; urgency=low
 
   * Team upload.
diff -u etw-3.6+svn140/debian/control etw-3.6+svn140/debian/control
--- etw-3.6+svn140/debian/control
+++ etw-3.6+svn140/debian/control
@@ -2,12 +2,12 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sam Hocevar <sho at debian.org>, Barry deFreese <bdefreese at debian.org>
+Uploaders: Markus Koschany <apo at gambaru.de>
 Build-Depends: debhelper (>= 5.0), quilt, libgtk2.0-dev, libsdl1.2-dev, sharutils
 Standards-Version: 3.9.1
 Homepage: http://www.ggsoft.org/etw/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/etw/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/etw/?op=log
+Vcs-Git: git://git.debian.org/pkg-games/etw.git
+Vcs-Browser: http://git.debian.org/?p=pkg-games/etw.git;a=summary
 
 Package: etw
 Architecture: any
diff -u etw-3.6+svn140/debian/README.Debian etw-3.6+svn140/debian/README.Debian
--- etw-3.6+svn140/debian/README.Debian
+++ etw-3.6+svn140/debian/README.Debian
@@ -1,8 +1,26 @@
 etw for Debian
 --------------
 
-   The packaging should be rather clean, but there are still many bugs in
-the game. Do not hesitate to report them directly to me.
+Since version 3.6+svn140-4 your configuration is saved permanently in
+$HOME/.etw/. Although Eat The Whistle has been developed since 1997 it is, like
+other software, not free of bugs. Most notably the game crashes if you try
+to view a replay which was recorded while playing in arcade mode or if you hit
+SPACE during a replay again. 
+
+As long as there is no better solution the replay function is disabled.
+
+There are other well known bugs. Please refer for more information to
+"bugs.txt" which is also located in /usr/share/doc/etw. Thus said the game
+itself is enjoyable and is made in the spirit of good old retro football
+gaming.
+
+Nevertheless if you discover new bugs or if you think that they are related
+specifically to Debian, don't hesitate to report them with the reportbug tool.
+
+The official README, EatTheWhistle.txt, contains more information about
+controlling the players and other game functions. Don't be confused by some
+remarks and always keep in mind that Eat The Whistle was originally developed
+for the AMIGA platform!
 
    Useful excerpt from the old manual:
 
@@ -33 +50,0 @@
- -- Sam Hocevar <sho at debian.org>, Wed, 15 Oct 2003 19:28:47 +0200
diff -u etw-3.6+svn140/debian/patches/series etw-3.6+svn140/debian/patches/series
--- etw-3.6+svn140/debian/patches/series
+++ etw-3.6+svn140/debian/patches/series
@@ -1,3 +1,4 @@
+0005-change-configuration-path.patch
 000_upstream_changelog.diff
 100_pthread_linking.diff
 200_datadir.diff
only in patch2:
unchanged:
--- etw-3.6+svn140.orig/debian/patches/0005-change-configuration-path.patch
+++ etw-3.6+svn140/debian/patches/0005-change-configuration-path.patch
@@ -0,0 +1,32 @@
+Description: load configuration from home directory
+ The default game directory of etw is /usr/share/games/etw. In the past you
+ couldn't load the settings again because etw was looking for them in the wrong
+ directory. This patch changes the behaviour.
+ From now on the settings are loaded from $HOME/.etw/.
+
+Author: Markus Koschany <apo at gambaru.de>
+Origin: Debian 
+Bug-Debian: http://bugs.debian.org/693244
+Last-Update: 2012-11-18 
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/etw/menu_config.c
++++ b/etw/menu_config.c
+@@ -392,9 +392,16 @@ void load_config(FILE *f)
+ void read_menu_config(void)
+ {
+     FILE *f;
++    char path[1024];
++    snprintf(path, 1024, "%setw.cfg", TEMP_DIR);
++
+     D(bug("Reading configuration...\n"/*-*/));
+ 
+-    f=fopen("etw.cfg"/*-*/,"r");
++    f=fopen(path/*-*/,"r");
++
++    if (f == NULL) {
++      f=fopen("etw.cfg"/*-*/,"r");
++    }
+ 
+     newpitches=CheckNewPitches();
+ 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-games-devel/attachments/20121118/998fdb0f/attachment.pgp>