[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#991303: marked as done (unblock: scottfree/1.14-10.1)

Your message dated Tue, 20 Jul 2021 21:38:21 +0000
with message-id <E1m5xRV-0008Qw-FU@respighi.debian.org>
and subject line unblock scottfree
has caused the Debian Bug report #991303,
regarding unblock: scottfree/1.14-10.1
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 owner@bugs.debian.org
immediately.)


-- 
991303: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991303
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package scottfree

  * Add patch from Bernhard Übelacker to fix crash when restoring
    from save-file. (Closes: #968375)

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@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@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

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: