tags 483073 + patch
thanks

Hi,

Attached is the diff for my nant 0.85.dfsg1-4.1 NMU.

This is based on upstream's suggestion, I don't have an SMP box, it would be
great if someone could test this (and do an NMU also if possible).

Giridhar

--
Y Giridhar Appaji Nag | http://appaji.net/
diff -u nant-0.85.dfsg1/debian/changelog nant-0.85.dfsg1/debian/changelog
--- nant-0.85.dfsg1/debian/changelog
+++ nant-0.85.dfsg1/debian/changelog
@@ -1,3 +1,12 @@
+nant (0.85.dfsg1-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New patch 005-nant-ExternalProgramBase-race.dpatch to prevent Mono
+    detection failure due to a race on SMP machines.  Based on upstream
+    fix for bug 1733671 (Closes: #483073)
+
+ -- Y Giridhar Appaji Nag <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 22:19:56 +0530
+
 nant (0.85.dfsg1-4) unstable; urgency=low
 
   * Use right NDoc directory. (Closes: #492300)
diff -u nant-0.85.dfsg1/debian/patches/00list nant-0.85.dfsg1/debian/patches/00list
--- nant-0.85.dfsg1/debian/patches/00list
+++ nant-0.85.dfsg1/debian/patches/00list
@@ -4,0 +5 @@
+005-nant-ExternalProgramBase-race.dpatch
only in patch2:
unchanged:
--- nant-0.85.dfsg1.orig/debian/patches/005-nant-ExternalProgramBase-race.dpatch
+++ nant-0.85.dfsg1/debian/patches/005-nant-ExternalProgramBase-race.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 005-nant-ExternalProgramBase-race.dpatch by Y Giridhar Appaji Nag <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes threading issue in ExternalProgramBase causing a race in SMP env
+## DP: ExternalProgramBase.cs CVS r1.71, upstream #1733671, Debian #483073
+
[EMAIL PROTECTED]@
+diff -urNad nant-0.85.dfsg1~/src/NAnt.Core/Tasks/ExternalProgramBase.cs nant-0.85.dfsg1/src/NAnt.Core/Tasks/ExternalProgramBase.cs
+--- nant-0.85.dfsg1~/src/NAnt.Core/Tasks/ExternalProgramBase.cs	2008-10-15 22:13:06.000000000 +0530
++++ nant-0.85.dfsg1/src/NAnt.Core/Tasks/ExternalProgramBase.cs	2008-10-15 22:15:35.000000000 +0530
+@@ -452,7 +452,9 @@
+                     }
+                 }
+             }
+-            OutputWriter.Flush();
++            lock (_lockObject) {
++                OutputWriter.Flush();
++            }
+         }
+ 
        /// <summary>
        /// Reads from the stream until the external program is ended.
        /// </summary>
+         private void StreamReaderThread_Error() {
+@@ -476,7 +478,9 @@
+                     }
+                 }
+             }
+-            ErrorWriter.Flush();
++            lock (_lockObject) {
++                ErrorWriter.Flush();
++            }
+         }
+ 
+         /// <summary>

Attachment: signature.asc
Description: Digital signature

Reply via email to