Bug#991303: unblock: scottfree/1.14-10.1

[Adrian Bunk]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package scottfree

  * Add patch from Bernhard Übelacker to fix crash when restoring
    from save-file. (Closes: #968375)
-------------- next part --------------
diff -Nru scottfree-1.14/debian/changelog scottfree-1.14/debian/changelog
--- scottfree-1.14/debian/changelog	2017-01-20 13:52:21.000000000 +0200
+++ scottfree-1.14/debian/changelog	2021-07-17 22:54:45.000000000 +0300
@@ -1,3 +1,11 @@
+scottfree (1.14-10.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch from Bernhard Übelacker to fix crash when restoring
+    from save-file. (Closes: #968375)
+
+ -- Adrian Bunk <bunk at debian.org>  Sat, 17 Jul 2021 22:54:45 +0300
+
 scottfree (1.14-10) unstable; urgency=low
 
   * Team upload.
diff -Nru scottfree-1.14/debian/patches/04_968375.patch scottfree-1.14/debian/patches/04_968375.patch
--- scottfree-1.14/debian/patches/04_968375.patch	1970-01-01 02:00:00.000000000 +0200
+++ scottfree-1.14/debian/patches/04_968375.patch	2021-07-17 22:53:59.000000000 +0300
@@ -0,0 +1,37 @@
+Description: Include time.h, fix two warnings in fscanf calls.
+
+Author: Bernhard Übelacker <bernhardu at mailbox.org>
+Bug-Debian: https://bugs.debian.org/968375
+Forwarded: no
+Last-Update: 2020-08-14
+
+Index: scottfree-1.14/ScottCurses.c
+===================================================================
+--- scottfree-1.14.orig/ScottCurses.c
++++ scottfree-1.14/ScottCurses.c
+@@ -22,6 +22,7 @@
+ #include <signal.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <time.h>
+ 
+ #include "Scott.h"
+ 
+@@ -239,7 +240,7 @@ void LoadDatabase(FILE *f, int loud)
+ /* Load the header */
+ 	
+ 	if(fscanf(f,"%*d %d %d %d %d %d %d %d %d %d %d %d",
+-		&ni,&na,&nw,&nr,&mc,&pr,&tr,&wl,&lt,&mn,&trm,&ct)<10)
++		&ni,&na,&nw,&nr,&mc,&pr,&tr,&wl,&lt,&mn,&trm)<10)
+ 		Fatal("Invalid database(bad header)");
+ 	GameHeader.NumItems=ni;
+ 	Items=(Item *)MemAlloc(sizeof(Item)*(ni+1));
+@@ -693,7 +694,7 @@ void LoadGame(char *name)
+ 	{
+ 		fscanf(f,"%d %d\n",&Counters[ct],&RoomSaved[ct]);
+ 	}
+-	fscanf(f,"%ld %d %hd %d %d %hd\n",
++	fscanf(f,"%ld %hd %hd %d %d %hd\n",
+ 		&BitFlags,&DarkFlag,&MyLoc,&CurrentCounter,&SavedRoom,
+ 		&GameHeader.LightTime);
+ 	/* Backward compatibility */
diff -Nru scottfree-1.14/debian/patches/series scottfree-1.14/debian/patches/series
--- scottfree-1.14/debian/patches/series	2017-01-20 13:48:06.000000000 +0200
+++ scottfree-1.14/debian/patches/series	2021-07-17 22:54:42.000000000 +0300
@@ -1,3 +1,4 @@
 01_makefile.diff
 02_scottcurses_includes.diff
 03_clang.diff
+04_968375.patch