[arch-commits] Commit in tcl/repos (6 files)

Antonio Rojas arojas at archlinux.org
Sun May 29 14:27:17 UTC 2016 

    Date: Sunday, May 29, 2016 @ 16:27:16
  Author: arojas
Revision: 268733

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  tcl/repos/extra-i686/PKGBUILD
    (from rev 268732, tcl/trunk/PKGBUILD)
  tcl/repos/extra-i686/tcl-fix-segv.patch
    (from rev 268732, tcl/trunk/tcl-fix-segv.patch)
  tcl/repos/extra-x86_64/PKGBUILD
    (from rev 268732, tcl/trunk/PKGBUILD)
  tcl/repos/extra-x86_64/tcl-fix-segv.patch
    (from rev 268732, tcl/trunk/tcl-fix-segv.patch)
Deleted:
  tcl/repos/extra-i686/PKGBUILD
  tcl/repos/extra-x86_64/PKGBUILD

---------------------------------+
 /PKGBUILD                       |  122 ++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD             |   58 ------------------
 extra-i686/tcl-fix-segv.patch   |   26 ++++++++
 extra-x86_64/PKGBUILD           |   58 ------------------
 extra-x86_64/tcl-fix-segv.patch |   26 ++++++++
 5 files changed, 174 insertions(+), 116 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-05-29 14:26:46 UTC (rev 268732)
+++ extra-i686/PKGBUILD	2016-05-29 14:27:16 UTC (rev 268733)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=tcl
-pkgver=8.6.5
-pkgrel=1
-pkgdesc="The Tcl scripting language"
-arch=('i686' 'x86_64')
-url="http://tcl.sourceforge.net/"
-license=('custom')
-depends=('zlib')
-options=('staticlibs')
-source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-sha1sums=('c3a50ea58dac00a3c7e83cb4a4651c40d0f55160')
-
-prepare() {
-  cd tcl${pkgver}
-  # we build the tcl sqlite interface in sqlite-tcl package
-  rm -rf pkgs/sqlite3*
-}
-
-build() {
-  cd tcl${pkgver}/unix
-  [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT
-  make
-}
-
-check() {
-  cd tcl${pkgver}/unix
-  make test
-}
-
-package() {
-  cd tcl${pkgver}/unix
-  make INSTALL_ROOT="${pkgdir}" install install-private-headers
-  ln -sf tclsh${pkgver%.*} "${pkgdir}/usr/bin/tclsh"
-  ln -sf libtcl${pkgver%.*}.so "${pkgdir}/usr/lib/libtcl.so"
-  install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  # remove buildroot traces
-  sed -e "s#${srcdir}/tcl${pkgver}/unix#/usr/lib#" \
-      -e "s#${srcdir}/tcl${pkgver}#/usr/include#" \
-      -i "${pkgdir}/usr/lib/tclConfig.sh"
-
-  tdbcver=tdbc1.0.4
-  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$tdbcver#/usr/lib/$tdbcver#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/generic#/usr/include#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/library#/usr/lib/tcl${pkgver%.*}#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver#/usr/include#" \
-      -i "${pkgdir}/usr/lib/$tdbcver/tdbcConfig.sh"
-
-  itclver=itcl4.0.4
-  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$itclver#/usr/lib/$itclver#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver/generic#/usr/include#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver#/usr/include#" \
-      -i "${pkgdir}/usr/lib/$itclver/itclConfig.sh"
-}

Copied: tcl/repos/extra-i686/PKGBUILD (from rev 268732, tcl/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-05-29 14:27:16 UTC (rev 268733)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=tcl
+pkgver=8.6.5
+pkgrel=2
+pkgdesc="The Tcl scripting language"
+arch=('i686' 'x86_64')
+url="http://tcl.sourceforge.net/"
+license=('custom')
+depends=('zlib')
+options=('staticlibs')
+source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz tcl-fix-segv.patch)
+sha1sums=('c3a50ea58dac00a3c7e83cb4a4651c40d0f55160'
+          '1ec4fd9d159b920c15655936b1418034387114f0')
+
+prepare() {
+  cd tcl${pkgver}
+  # we build the tcl sqlite interface in sqlite-tcl package
+  rm -rf pkgs/sqlite3*
+  # fix SEGV if cpu supports HLE/RTM http://core.tcl.tk/tcl/info/d3071887dbc7aeac
+  patch -p1 -i ../tcl-fix-segv.patch
+}
+
+build() {
+  cd tcl${pkgver}/unix
+  [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT
+  make
+}
+
+check() {
+  cd tcl${pkgver}/unix
+  make test
+}
+
+package() {
+  cd tcl${pkgver}/unix
+  make INSTALL_ROOT="${pkgdir}" install install-private-headers
+  ln -sf tclsh${pkgver%.*} "${pkgdir}/usr/bin/tclsh"
+  ln -sf libtcl${pkgver%.*}.so "${pkgdir}/usr/lib/libtcl.so"
+  install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  # remove buildroot traces
+  sed -e "s#${srcdir}/tcl${pkgver}/unix#/usr/lib#" \
+      -e "s#${srcdir}/tcl${pkgver}#/usr/include#" \
+      -i "${pkgdir}/usr/lib/tclConfig.sh"
+
+  tdbcver=tdbc1.0.4
+  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$tdbcver#/usr/lib/$tdbcver#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/generic#/usr/include#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/library#/usr/lib/tcl${pkgver%.*}#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver#/usr/include#" \
+      -i "${pkgdir}/usr/lib/$tdbcver/tdbcConfig.sh"
+
+  itclver=itcl4.0.4
+  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$itclver#/usr/lib/$itclver#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver/generic#/usr/include#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver#/usr/include#" \
+      -i "${pkgdir}/usr/lib/$itclver/itclConfig.sh"
+}

Copied: tcl/repos/extra-i686/tcl-fix-segv.patch (from rev 268732, tcl/trunk/tcl-fix-segv.patch)
===================================================================
--- extra-i686/tcl-fix-segv.patch	                        (rev 0)
+++ extra-i686/tcl-fix-segv.patch	2016-05-29 14:27:16 UTC (rev 268733)
@@ -0,0 +1,26 @@
+From 55234833327f1ee7469552fa103c316e5405f8b0 Mon Sep 17 00:00:00 2001
+From: "nijtmans at users.sourceforge.net" <jan.nijtmans>
+Date: Mon, 21 Mar 2016 09:05:34 +0000
+Subject: [PATCH] Proposed fix for [d3071887dbc7aeac]: Fix SEGV in
+ Tcl_FinalizeNotifier()
+
+---
+ unix/tclUnixNotfy.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
+index 48ba0cc..3946c7d 100644
+--- a/unix/tclUnixNotfy.c
++++ b/unix/tclUnixNotfy.c
+@@ -433,9 +433,11 @@ Tcl_FinalizeNotifier(
+ 			    "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);
+ 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-05-29 14:26:46 UTC (rev 268732)
+++ extra-x86_64/PKGBUILD	2016-05-29 14:27:16 UTC (rev 268733)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=tcl
-pkgver=8.6.5
-pkgrel=1
-pkgdesc="The Tcl scripting language"
-arch=('i686' 'x86_64')
-url="http://tcl.sourceforge.net/"
-license=('custom')
-depends=('zlib')
-options=('staticlibs')
-source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-sha1sums=('c3a50ea58dac00a3c7e83cb4a4651c40d0f55160')
-
-prepare() {
-  cd tcl${pkgver}
-  # we build the tcl sqlite interface in sqlite-tcl package
-  rm -rf pkgs/sqlite3*
-}
-
-build() {
-  cd tcl${pkgver}/unix
-  [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT
-  make
-}
-
-check() {
-  cd tcl${pkgver}/unix
-  make test
-}
-
-package() {
-  cd tcl${pkgver}/unix
-  make INSTALL_ROOT="${pkgdir}" install install-private-headers
-  ln -sf tclsh${pkgver%.*} "${pkgdir}/usr/bin/tclsh"
-  ln -sf libtcl${pkgver%.*}.so "${pkgdir}/usr/lib/libtcl.so"
-  install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  # remove buildroot traces
-  sed -e "s#${srcdir}/tcl${pkgver}/unix#/usr/lib#" \
-      -e "s#${srcdir}/tcl${pkgver}#/usr/include#" \
-      -i "${pkgdir}/usr/lib/tclConfig.sh"
-
-  tdbcver=tdbc1.0.4
-  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$tdbcver#/usr/lib/$tdbcver#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/generic#/usr/include#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/library#/usr/lib/tcl${pkgver%.*}#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver#/usr/include#" \
-      -i "${pkgdir}/usr/lib/$tdbcver/tdbcConfig.sh"
-
-  itclver=itcl4.0.4
-  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$itclver#/usr/lib/$itclver#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver/generic#/usr/include#" \
-      -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver#/usr/include#" \
-      -i "${pkgdir}/usr/lib/$itclver/itclConfig.sh"
-}

Copied: tcl/repos/extra-x86_64/PKGBUILD (from rev 268732, tcl/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-05-29 14:27:16 UTC (rev 268733)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=tcl
+pkgver=8.6.5
+pkgrel=2
+pkgdesc="The Tcl scripting language"
+arch=('i686' 'x86_64')
+url="http://tcl.sourceforge.net/"
+license=('custom')
+depends=('zlib')
+options=('staticlibs')
+source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz tcl-fix-segv.patch)
+sha1sums=('c3a50ea58dac00a3c7e83cb4a4651c40d0f55160'
+          '1ec4fd9d159b920c15655936b1418034387114f0')
+
+prepare() {
+  cd tcl${pkgver}
+  # we build the tcl sqlite interface in sqlite-tcl package
+  rm -rf pkgs/sqlite3*
+  # fix SEGV if cpu supports HLE/RTM http://core.tcl.tk/tcl/info/d3071887dbc7aeac
+  patch -p1 -i ../tcl-fix-segv.patch
+}
+
+build() {
+  cd tcl${pkgver}/unix
+  [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT
+  make
+}
+
+check() {
+  cd tcl${pkgver}/unix
+  make test
+}
+
+package() {
+  cd tcl${pkgver}/unix
+  make INSTALL_ROOT="${pkgdir}" install install-private-headers
+  ln -sf tclsh${pkgver%.*} "${pkgdir}/usr/bin/tclsh"
+  ln -sf libtcl${pkgver%.*}.so "${pkgdir}/usr/lib/libtcl.so"
+  install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  # remove buildroot traces
+  sed -e "s#${srcdir}/tcl${pkgver}/unix#/usr/lib#" \
+      -e "s#${srcdir}/tcl${pkgver}#/usr/include#" \
+      -i "${pkgdir}/usr/lib/tclConfig.sh"
+
+  tdbcver=tdbc1.0.4
+  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$tdbcver#/usr/lib/$tdbcver#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/generic#/usr/include#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/library#/usr/lib/tcl${pkgver%.*}#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver#/usr/include#" \
+      -i "${pkgdir}/usr/lib/$tdbcver/tdbcConfig.sh"
+
+  itclver=itcl4.0.4
+  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$itclver#/usr/lib/$itclver#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver/generic#/usr/include#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver#/usr/include#" \
+      -i "${pkgdir}/usr/lib/$itclver/itclConfig.sh"
+}

Copied: tcl/repos/extra-x86_64/tcl-fix-segv.patch (from rev 268732, tcl/trunk/tcl-fix-segv.patch)
===================================================================
--- extra-x86_64/tcl-fix-segv.patch	                        (rev 0)
+++ extra-x86_64/tcl-fix-segv.patch	2016-05-29 14:27:16 UTC (rev 268733)
@@ -0,0 +1,26 @@
+From 55234833327f1ee7469552fa103c316e5405f8b0 Mon Sep 17 00:00:00 2001
+From: "nijtmans at users.sourceforge.net" <jan.nijtmans>
+Date: Mon, 21 Mar 2016 09:05:34 +0000
+Subject: [PATCH] Proposed fix for [d3071887dbc7aeac]: Fix SEGV in
+ Tcl_FinalizeNotifier()
+
+---
+ unix/tclUnixNotfy.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
+index 48ba0cc..3946c7d 100644
+--- a/unix/tclUnixNotfy.c
++++ b/unix/tclUnixNotfy.c
+@@ -433,9 +433,11 @@ Tcl_FinalizeNotifier(
+ 			    "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);
+

More information about the arch-commits mailing list