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

Bug#768564: marked as done (unblock: flightgear/3.0.0-4)

Your message dated Sat, 08 Nov 2014 14:52:54 +0100
with message-id <545E2036.4080807@thykier.net>
and subject line Re: Bug#768564: unblock: flightgear/3.0.0-4
has caused the Debian Bug report #768564,
regarding unblock: flightgear/3.0.0-4
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.)


-- 
768564: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768564
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
X-Debbugs-CC: pkg-fgfs-crew@lists.alioth.debian.org

Please unblock package flightgear

The recent upload to unstable fixes bug #750939 (severity: important -
Occasional deadlock when processing key input).

flightgear (3.0.0-4) unstable; urgency=medium

  * Add patch 750939.patch. Closes: #750939.

 -- Markus Wanner <markus@bluegap.ch>  Fri, 07 Nov 2014 17:27:44 +0100

unblock flightgear/3.0.0-4

Thanks

Markus Wanner

diff -Nru flightgear-3.0.0/debian/changelog flightgear-3.0.0/debian/changelog
--- flightgear-3.0.0/debian/changelog	2014-10-08 10:56:43.000000000 +0200
+++ flightgear-3.0.0/debian/changelog	2014-11-07 17:27:50.000000000 +0100
@@ -1,3 +1,9 @@
+flightgear (3.0.0-4) unstable; urgency=medium
+
+  * Add patch 750939.patch. Closes: #750939.
+
+ -- Markus Wanner <markus@bluegap.ch>  Fri, 07 Nov 2014 17:27:44 +0100
+
 flightgear (3.0.0-3) unstable; urgency=medium
 
   * Change B-D to libjpeg-dev to finish the transition to
diff -Nru flightgear-3.0.0/debian/patches/750939.patch flightgear-3.0.0/debian/patches/750939.patch
--- flightgear-3.0.0/debian/patches/750939.patch	1970-01-01 01:00:00.000000000 +0100
+++ flightgear-3.0.0/debian/patches/750939.patch	2014-10-27 11:33:20.000000000 +0100
@@ -0,0 +1,28 @@
+Description: Fix hang in nested Nasal calls
+
+naCall() increments Nasal's "active threads" count; as Nasal's garbage
+collector first asks all other threads to stop and waits for them to
+say they have, this can cause a hang when used in a function that was
+itself called from Nasal (inner function's GC waiting for outer function
+to say it has stopped, outer function waiting for inner function to return).
+
+naCallMethodCtx() doesn't, to avoid exactly this problem.
+(simgear simgear/nasal/nasal.h:108)
+
+(Deliberately not changing NasalXMLVisitor: that already uses naSubContext,
+another mechanism to do the same thing.)
+
+Author: Rebecca Palmer
+Bug-Debian: https://bugs.debian.org/750939
+
+--- flightgear-3.0.0.orig/src/Scripting/NasalSys.cxx
++++ flightgear-3.0.0/src/Scripting/NasalSys.cxx
+@@ -872,7 +872,7 @@ naRef FGNasalSys::wrappedPropsNode(SGPro
+     naRef args[1];
+     args[0] = propNodeGhost(aProps);
+     naContext ctx = naNewContext();
+-    naRef wrapped = naCall(ctx, _wrappedNodeFunc, 1, args, naNil(), naNil());
++    naRef wrapped = naCallMethodCtx(ctx, _wrappedNodeFunc, naNil(), 1, args, naNil());
+     naFreeContext(ctx);
+     return wrapped;
+ }
diff -Nru flightgear-3.0.0/debian/patches/series flightgear-3.0.0/debian/patches/series
--- flightgear-3.0.0/debian/patches/series	2014-10-07 11:36:09.000000000 +0200
+++ flightgear-3.0.0/debian/patches/series	2014-10-27 11:33:44.000000000 +0100
@@ -1,3 +1,4 @@
 systemLibraries.patch
 nasal-fix.patch
 fix-mobile-tacan.patch
+750939.patch

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
--- Begin Message --- 
On 2014-11-08 13:38, Markus Wanner wrote:
> On 11/08/2014 01:32 PM, Niels Thykier wrote:
>> Btw, please improve the changelog message to say what is being fixed
>> (like "Added patch to fix a deadlock in the garbage collector" etc.).
> 
> Sorry, I already uploaded this one prior to sending the unblock request.
> The acceptance message just arrived, now. I'll write more detailed
> changelog entries in the future.
> 
> Regards
> 
> Markus Wanner
> 
> 

Unblocked, thanks.

~Niels

--- End Message ---
Reply to: