diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-30 09:58:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-30 13:08:32 +0000 |
| commit | e070993537abb807231afdbf1ffa76e712bccc2a (patch) | |
| tree | c8209d509001c3d0959b466fd5da257c1b52f09d /main/tcl | |
| parent | 1f459266d3e9480ba3192e8ae2a3a9c1f5ca122d (diff) | |
| download | aports-e070993537abb807231afdbf1ffa76e712bccc2a.tar.bz2 aports-e070993537abb807231afdbf1ffa76e712bccc2a.tar.xz | |
main/tcl: upgrade to 8.6.5
Diffstat (limited to 'main/tcl')
| -rw-r--r-- | main/tcl/APKBUILD | 22 | ||||
| -rw-r--r-- | main/tcl/tcl-fix-segv.patch | 26 |
2 files changed, 39 insertions, 9 deletions
diff --git a/main/tcl/APKBUILD b/main/tcl/APKBUILD index 31e63299fa..aa94d55710 100644 --- a/main/tcl/APKBUILD +++ b/main/tcl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=tcl -pkgver=8.6.4 -pkgrel=3 +pkgver=8.6.5 +pkgrel=0 pkgdesc="The Tcl scripting language" url="http://tcl.sourceforge.net/" arch="all" @@ -13,6 +13,7 @@ makedepends="zlib-dev sqlite-dev" subpackages="$pkgname-doc $pkgname-dev" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname$pkgver-src.tar.gz tcl-stat64.patch + tcl-fix-segv.patch " _major=${pkgver%.*} @@ -25,6 +26,7 @@ prepare() { *.patch) msg "$i"; patch -p1 -i "$srcdir"/$i || return 1;; esac done + rm -r pkgs/sqlite3* } build() { @@ -32,7 +34,6 @@ build() { case "$CARCH" in x86_64) _64bit="--enable-64bit";; esac - cd "$_builddir" ./configure \ --build=$CBUILD \ @@ -68,9 +69,12 @@ dev() { done } -md5sums="d7cbb91f1ded1919370a30edd1534304 tcl8.6.4-src.tar.gz -5828445dcdebfbc761caecadf624bf1a tcl-stat64.patch" -sha256sums="9e6ed94c981c1d0c5f5fefb8112d06c6bf4d050a7327e95e71d417c416519c8d tcl8.6.4-src.tar.gz -ce1b6f1eab4445337c82d4c56f8d4483e312d7f65769b5e8cd7a72fdc2ac5ff5 tcl-stat64.patch" -sha512sums="f348224f6c63aa899345a5c9b84d6ad1c0bfce5e22a86e4319900b561787855473888bd284f7ee55edf552ce32792b78649526af3641b0dff46590cad53b2489 tcl8.6.4-src.tar.gz -cd52cbe80fd2be227c9018dbe38fa0888302293402e7a57f2e231c195b7c1902f1b58bc87d19c9d123915ca757e871abf084c0ef23b1a7f187bc03ba93904cc2 tcl-stat64.patch" +md5sums="0e6426a4ca9401825fbc6ecf3d89a326 tcl8.6.5-src.tar.gz +5828445dcdebfbc761caecadf624bf1a tcl-stat64.patch +59cb5b934d38d9f63b4331db5c152941 tcl-fix-segv.patch" +sha256sums="ce26d5b9c7504fc25d2f10ef0b82b14cf117315445b5afa9e673ed331830fb53 tcl8.6.5-src.tar.gz +ce1b6f1eab4445337c82d4c56f8d4483e312d7f65769b5e8cd7a72fdc2ac5ff5 tcl-stat64.patch +84bf2bda9e21d41bd5c1c8aff428c08504a668f1626b263ea361187f495c627a tcl-fix-segv.patch" +sha512sums="e58177728eea14df0492f9e3ec20ce5ad53150954ea901f0f337ac07d5b2d2196709f1364d94104043b0f2939eeb7296888a3b6d4f92df209b5c6174638f039f tcl8.6.5-src.tar.gz +cd52cbe80fd2be227c9018dbe38fa0888302293402e7a57f2e231c195b7c1902f1b58bc87d19c9d123915ca757e871abf084c0ef23b1a7f187bc03ba93904cc2 tcl-stat64.patch +e891b7a84aa3331f4a38df87a92b8d4dce6c7df3197d0338b70d90d718573e1b5473381d47ff8ef80ba6df0c88f5f663e9f3206d3ccbba61389bba418f5e003b tcl-fix-segv.patch" diff --git a/main/tcl/tcl-fix-segv.patch b/main/tcl/tcl-fix-segv.patch new file mode 100644 index 0000000000..1eaa11d224 --- /dev/null +++ b/main/tcl/tcl-fix-segv.patch @@ -0,0 +1,26 @@ +From 55234833327f1ee7469552fa103c316e5405f8b0 Mon Sep 17 00:00:00 2001 +From: "nijtmans@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(¬ifierMutex); + while(triggerPipe != -1) { + pthread_cond_wait(¬ifierCV, ¬ifierMutex); + } ++ pthread_mutex_unlock(¬ifierMutex); + if (notifierThreadRunning) { + int result = pthread_join((pthread_t) notifierThread, NULL); + |