diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-04-06 14:58:03 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-04-06 22:21:05 +0000 |
| commit | 5ad0ec7da1064361cc74d56edf7524960f49ef9b (patch) | |
| tree | ea9044baf36e722d16670efc10fa93af3a2a6e82 | |
| parent | 7d0c1c002d1faffabd55083cf03a54325e8df6e8 (diff) | |
main/python2: remove python symlink and stop providing python
| -rw-r--r-- | main/python2/APKBUILD | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/main/python2/APKBUILD b/main/python2/APKBUILD index 7e2aa94d9a7..b103e5302d0 100644 --- a/main/python2/APKBUILD +++ b/main/python2/APKBUILD @@ -4,17 +4,15 @@ pkgname=python2 # the python2-tkinter's pkgver needs to be synchronized with this. pkgver=2.7.17 _verbase=${pkgver%.*} -pkgrel=0 +pkgrel=1 pkgdesc="A high-level scripting language" url="https://www.python.org/" arch="all" license="custom" -provides="python=$pkgver-r$pkgrel" -replaces="python" subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-tests py-gdbm:gdbm $pkgname-wininst" makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev - gdbm-dev sqlite-dev libffi-dev readline-dev linux-headers paxmark" + gdbm-dev sqlite-dev libffi-dev readline-dev linux-headers" source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz musl-find_library.patch unchecked-ioctl.patch @@ -23,20 +21,20 @@ builddir="$srcdir/Python-$pkgver" # secfixes: # 2.7.17-r0: -# - CVE-2019-15903 +# - CVE-2019-15903 # 2.7.16-r3: -# - CVE-2019-16056 -# - CVE-2019-16935 +# - CVE-2019-16056 +# - CVE-2019-16935 # 2.7.16-r1: -# - CVE-2019-9636 -# - CVE-2019-9948 +# - 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() { default_prepare @@ -53,7 +51,6 @@ prepare() { } build() { - cd "$builddir" export OPT="$CFLAGS -DTHREAD_STACK_SIZE=0x100000" ./configure \ --build=$CBUILD \ @@ -71,8 +68,6 @@ build() { } check() { - cd "$builddir" - # test that we reach recursionlimit before we segfault cat > test-stacksize.py <<-EOF import threading @@ -91,13 +86,12 @@ EOF } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE rm "$pkgdir/usr/bin/2to3" - # we need to enable emutramp - needed for virt-manager - # disable mprotect - needed for cffi - paxmark -zm "$pkgdir"/usr/bin/python$_verbase + + # This symlink is now owned by python3 + rm -f "$pkgdir"/usr/bin/python } _mv_files() { |