[Pkg-tcltk-commits] r1816 - in tcl8.5/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2016-03-21 13:00:36 +0000 (Mon, 21 Mar 2016)
New Revision: 1816

Added:
   tcl8.5/trunk/debian/patches/finalize-notifier.diff
Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/control
   tcl8.5/trunk/debian/patches/series
   tcl8.5/trunk/debian/rules
Log:
[tcl8.5]
  * Applied a patch by Hirofumi Ogawa to fix a segfault on exit if run on
    hardware supporting HLE/RTM extensions.
  * Sort the object files inside the static library using the C locale to make
    the build reproducible (closes: #818751).
  * Bumped standards version to 3.9.7.


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2016-03-21 13:00:10 UTC (rev 1815)
+++ tcl8.5/trunk/debian/changelog	2016-03-21 13:00:36 UTC (rev 1816)
@@ -1,8 +1,12 @@
-tcl8.5 (8.5.19-2) UNRELEASED; urgency=medium
+tcl8.5 (8.5.19-2) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Applied a patch by Hirofumi Ogawa to fix a segfault on exit if run on
+    hardware supporting HLE/RTM extensions.
+  * Sort the object files inside the static library using the C locale to make
+    the build reproducible (closes: #818751).
+  * Bumped standards version to 3.9.7.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 03 Mar 2016 16:04:06 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 21 Mar 2016 15:40:41 +0300
 
 tcl8.5 (8.5.19-1) unstable; urgency=medium
 

Modified: tcl8.5/trunk/debian/control
===================================================================
--- tcl8.5/trunk/debian/control	2016-03-21 13:00:10 UTC (rev 1815)
+++ tcl8.5/trunk/debian/control	2016-03-21 13:00:36 UTC (rev 1816)
@@ -4,7 +4,7 @@
 Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: http://www.tcl.tk/
 
 Package: tcl8.5

Added: tcl8.5/trunk/debian/patches/finalize-notifier.diff
===================================================================
--- tcl8.5/trunk/debian/patches/finalize-notifier.diff	                        (rev 0)
+++ tcl8.5/trunk/debian/patches/finalize-notifier.diff	2016-03-21 13:00:36 UTC (rev 1816)
@@ -0,0 +1,20 @@
+Author: Hirofumi Ogawa <hirofumi at mail.parknet.co.jp>
+Description: Patch fixes segfault on exit for modern hardware.
+Last-Modified: Mon, 21 Mar 2016 15:31:38 +0300
+Bug: http://core.tcl.tk/tcl/tktview?name=d3071887db
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818697
+
+--- a/unix/tclUnixNotfy.c
++++ b/unix/tclUnixNotfy.c
+@@ -432,9 +432,11 @@
+ 			"unable to write q to triggerPipe");
+ 	    }
+ 	    close(triggerPipe);
++	    pthread_mutex_lock(&notifierMutex);
+ 	    while(triggerPipe != -1) {
+ 		pthread_cond_wait(&notifierCV, &notifierMutex);
+ 	    }
++	    pthread_mutex_unlock(&notifierMutex);
+ 	    if (notifierThreadRunning) {
+ 		int result = pthread_join((pthread_t) notifierThread, NULL);
+ 

Modified: tcl8.5/trunk/debian/patches/series
===================================================================
--- tcl8.5/trunk/debian/patches/series	2016-03-21 13:00:10 UTC (rev 1815)
+++ tcl8.5/trunk/debian/patches/series	2016-03-21 13:00:36 UTC (rev 1816)
@@ -4,3 +4,4 @@
 confsearch.diff
 non-linux.diff
 manpages.diff
+finalize-notifier.diff

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2016-03-21 13:00:10 UTC (rev 1815)
+++ tcl8.5/trunk/debian/rules	2016-03-21 13:00:36 UTC (rev 1816)
@@ -52,6 +52,7 @@
 	$(MAKE) -C unix
 	# Build the static library.
 	cd unix && \
+	  LC_ALL=C \
 	  ar cr libtcl$(v).a *.o && \
 	  ar d libtcl$(v).a tclAppInit.o && \
 	  ranlib libtcl$(v).a