aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2020-04-21 02:39:53 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-05-05 06:12:38 +0000
commita98ecebd5f6f68faeae98d58be056e329e9944ea (patch)
tree5326401734cf7059117c7c04ac7347cfd5b56790
parent40a4951871b0a2e718de6a07e0772730fc280d06 (diff)
downloadaports-a98ecebd5f6f68faeae98d58be056e329e9944ea.tar.gz
aports-a98ecebd5f6f68faeae98d58be056e329e9944ea.tar.bz2
aports-a98ecebd5f6f68faeae98d58be056e329e9944ea.tar.xz
community/python2-tkinter: security upgrade to 2.7.18
-rw-r--r--community/python2-tkinter/APKBUILD43
1 files changed, 20 insertions, 23 deletions
diff --git a/community/python2-tkinter/APKBUILD b/community/python2-tkinter/APKBUILD
index 1f66b4a8b0..4032528ee5 100644
--- a/community/python2-tkinter/APKBUILD
+++ b/community/python2-tkinter/APKBUILD
@@ -4,7 +4,7 @@
# a cyclic dependency: python -> tk -> libx11 -> libxcb -> xcb-proto -> python
pkgname=python2-tkinter
-pkgver=2.7.17
+pkgver=2.7.18
_verbase=${pkgver%.*}
pkgrel=0
pkgdesc="A graphical user interface for the Python"
@@ -12,7 +12,6 @@ url="https://wiki.python.org/moin/TkInter"
arch="all"
license="custom"
subpackages="$pkgname-tests python2-idle:_idle:noarch"
-depends=""
makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev
gdbm-dev sqlite-dev libffi-dev readline-dev linux-headers paxmark
tk tk-dev python2"
@@ -25,19 +24,21 @@ source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
builddir="$srcdir/Python-$pkgver"
# secfixes:
+# 2.7.18-r0:
+# - CVE-2019-18348
# 2.7.17-r0:
-# - CVE-2019-15903
-# - CVE-2019-16056
-# - CVE-2019-16935
-# - CVE-2019-9636
-# - CVE-2019-9948
+# - CVE-2019-15903
+# - CVE-2019-16056
+# - CVE-2019-16935
+# - CVE-2019-9636
+# - CVE-2019-9948
# 2.7.16-r0:
-# - CVE-2018-14647
+# - CVE-2018-14647
# 2.7.15-r3:
-# - CVE-2019-5010
+# - CVE-2019-5010
# 2.7.15-r0:
-# - CVE-2018-1060
-# - CVE-2018-1061
+# - CVE-2018-1060
+# - CVE-2018-1061
prepare() {
local _pyapkbuild="$startdir"/../main/python2/APKBUILD
@@ -49,14 +50,12 @@ prepare() {
fi
fi
default_prepare
- cd "$builddir"
# Make sure we use system libs
rm -rf Modules/expat Modules/_ctypes/libffi* Modules/zlib
}
build() {
- cd "$builddir"
export OPT="$CFLAGS"
./configure \
--build=$CBUILD \
@@ -73,24 +72,22 @@ build() {
}
package() {
- cd "$builddir"
# we only care about idle, and tkinter
- make DESTDIR="$builddir"/tmpinstall sharedinstall libinstall \
- || return 1
+ make DESTDIR="$builddir"/tmpinstall sharedinstall libinstall
- mkdir -p "$pkgdir"/usr/lib/python${_verbase}/lib-dynload \
+ mkdir -p "$pkgdir"/usr/lib/python$_verbase/lib-dynload \
"$pkgdir"/usr/bin
for lib in idlelib lib-tk; do
- mv "$builddir"/tmpinstall/usr/lib/python${_verbase}/$lib \
- "$pkgdir"/usr/lib/python${_verbase}/
+ mv "$builddir"/tmpinstall/usr/lib/python$_verbase/$lib \
+ "$pkgdir"/usr/lib/python$_verbase/
done
- mv "$builddir"/tmpinstall/usr/lib/python${_verbase}/lib-dynload/_tkinter.so \
- "$pkgdir"/usr/lib/python${_verbase}/lib-dynload/
+ mv "$builddir"/tmpinstall/usr/lib/python$_verbase/lib-dynload/_tkinter.so \
+ "$pkgdir"/usr/lib/python$_verbase/lib-dynload/
mv "$builddir"/tmpinstall/usr/bin/idle \
- "$pkgdir"/usr/bin/idle${_verbase}
+ "$pkgdir"/usr/bin/idle$_verbase
}
_mv_files() {
@@ -115,6 +112,6 @@ _idle() {
_mv_files usr/bin
}
-sha512sums="2dc19a0b0d818c71429dae94783e58b2aac0fa31f5faa1e840cac06245a59932ecc4658d913515736601bcf70a78c9ec60367aed75f4567d1e41ff3bb104da9a Python-2.7.17.tar.xz
+sha512sums="a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c Python-2.7.18.tar.xz
ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2 musl-find_library.patch
5a8e013a4132d71c4360771f130d27b37275ae59330cf9a75378dc8a11236017f540eb224f2a148984e82ca3fb6b29129375b1080ba05b81044faa717520ab82 unchecked-ioctl.patch"