From c3c327822e2ae451edf70d9a2d2fbc3900244147 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 19 Jul 2012 12:01:38 -0300 Subject: Remove python2-libre since it's free now (starting from 2.7.3) --- ...13156-revert-tls-changeset-subinterpreter.patch | 61 ------------ libre/python2-libre/PKGBUILD | 109 --------------------- libre/python2-libre/SRCBUILD | 36 ------- libre/python2-libre/WDAS.patch | 109 --------------------- libre/python2-libre/doc_license_change.patch | 44 --------- libre/python2-libre/gdbm-magic-values.patch | 12 --- libre/python2-libre/linux2.patch | 23 ----- 7 files changed, 394 deletions(-) delete mode 100644 libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch delete mode 100644 libre/python2-libre/PKGBUILD delete mode 100644 libre/python2-libre/SRCBUILD delete mode 100644 libre/python2-libre/WDAS.patch delete mode 100644 libre/python2-libre/doc_license_change.patch delete mode 100644 libre/python2-libre/gdbm-magic-values.patch delete mode 100644 libre/python2-libre/linux2.patch diff --git a/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch b/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch deleted file mode 100644 index ed8154df5..000000000 --- a/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch +++ /dev/null @@ -1,61 +0,0 @@ - -# HG changeset patch -# User Charles-François Natali -# Date 1318446474 -7200 -# Node ID ee4fe16d9b4822457ad855ea6c44e65030166304 -# Parent f6feed6ec3f9b024cecd0fd587595c403f55624f -Issue #13156: revert changeset f6feed6ec3f9, which was only relevant for native -TLS implementations, and fails with the ad-hoc TLS implementation when a thread -doesn't have an auto thread state (e.g. a thread created outside of Python -calling into a subinterpreter). - -diff --git a/Include/pystate.h b/Include/pystate.h ---- a/Include/pystate.h -+++ b/Include/pystate.h -@@ -111,7 +111,6 @@ PyAPI_FUNC(void) PyThreadState_Clear(PyT - PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); - #ifdef WITH_THREAD - PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); --PyAPI_FUNC(void) _PyGILState_Reinit(void); - #endif - - PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); -diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c ---- a/Modules/signalmodule.c -+++ b/Modules/signalmodule.c -@@ -976,7 +976,6 @@ void - PyOS_AfterFork(void) - { - #ifdef WITH_THREAD -- _PyGILState_Reinit(); - PyEval_ReInitThreads(); - main_thread = PyThread_get_thread_ident(); - main_pid = getpid(); -diff --git a/Python/pystate.c b/Python/pystate.c ---- a/Python/pystate.c -+++ b/Python/pystate.c -@@ -537,23 +537,6 @@ void - autoInterpreterState = NULL; - } - --/* Reset the TLS key - called by PyOS_AfterFork. -- * This should not be necessary, but some - buggy - pthread implementations -- * don't flush TLS on fork, see issue #10517. -- */ --void --_PyGILState_Reinit(void) --{ -- PyThreadState *tstate = PyGILState_GetThisThreadState(); -- PyThread_delete_key(autoTLSkey); -- if ((autoTLSkey = PyThread_create_key()) == -1) -- Py_FatalError("Could not allocate TLS entry"); -- -- /* re-associate the current thread state with the new key */ -- if (PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0) -- Py_FatalError("Couldn't create autoTLSkey mapping"); --} -- - /* When a thread state is created for a thread by some mechanism other than - PyGILState_Ensure, it's important that the GILState machinery knows about - it so it doesn't try to create another thread state for the thread (this is - diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD deleted file mode 100644 index e743151b0..000000000 --- a/libre/python2-libre/PKGBUILD +++ /dev/null @@ -1,109 +0,0 @@ -# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $ -# Maintainer: Stéphane Gaudreault -# Contributer: Allan McRae -# Contributer: Jason Chu - -_pkgname=python2 -pkgname=python2-libre -pkgver=2.7.2 -pkgrel=6 -_pybasever=2.7 -pkgdesc="A high-level scripting language" -arch=('i686' 'x86_64') -license=('PSF') -url="http://www.python.org/" -depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') -makedepends=('tk') -optdepends=('tk: for IDLE') -conflicts=('python<3') -options=('!makeflags') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-4-any.src.tar.xz - doc_license_change.patch - WDAS.patch - linux2.patch - gdbm-magic-values.patch - 13156-revert-tls-changeset-subinterpreter.patch) -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") -replaces=("$_pkgname") - -build() { - cd "${srcdir}/Python-${pkgver}" - - # Temporary workaround for FS#22322 - # See http://bugs.python.org/issue10835 for upstream report - sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c - - # Enable built-in SQLite module to load extensions (fix FS#22122) - sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py - - # FS#23997 - sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py - - # Make sure sys.platform is set to linux2, even on kernel 3.X - # cf http://bugs.python.org/issue12326 - patch -Np1 -i ../linux2.patch - - # gdbm has new magic that whichdb does not recognize - # http://bugs.python.org/issue13007 - patch -Np1 -i ../gdbm-magic-values.patch - - # http://bugs.python.org/issue13156 - patch -Np1 -i ../13156-revert-tls-changeset-subinterpreter.patch - - # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), - # rather than copies shipped in the tarball - rm -r Modules/expat - rm -r Modules/zlib - rm -r Modules/_ctypes/{darwin,libffi}* - - export OPT="${CFLAGS}" - ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ - --enable-unicode=ucs4 --with-system-expat --with-system-ffi \ - --with-dbmliborder=gdbm:ndbm - - make MACHDEP=linux2 -} - -package() { - cd "${srcdir}/Python-${pkgver}" - make DESTDIR="${pkgdir}" altinstall maninstall - - ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" - ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" - ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" - - ln -sf ../../libpython${_pybasever}.so \ - "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" - - mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" - - # some useful "stuff" - install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} - install -m755 Tools/i18n/{msgfmt,pygettext}.py \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" - install -m755 Tools/scripts/{README,*py} \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" - - # fix conflicts with python - mv "${pkgdir}"/usr/bin/idle{,2} - mv "${pkgdir}"/usr/bin/pydoc{,2} - mv "${pkgdir}"/usr/bin/2to3{,-2.7} - - # clean up #!s - find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ - xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" - - # clean-up reference to build directory - sed -i "s#${srcdir}/Python-${pkgver}:##" \ - "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" - - # license - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('456d053a5d418adc913a4971e95fe918' - '1e6595f85a1da7f42b69456119924d50' - '3f8c0e310a0be0bd8b319d6c46bbd427' - '6099a7c1aed80cf04943ee4affa84b5c' - '6de394351179c2ada82e95458ceb13e5' - 'daa5110f092f1406c17de23171529e62') diff --git a/libre/python2-libre/SRCBUILD b/libre/python2-libre/SRCBUILD deleted file mode 100644 index f021d6624..000000000 --- a/libre/python2-libre/SRCBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $ -# Maintainer: AndyRTR -# Maintainer (Parabola): xihh - -pkgname=python2-libre -pkgver=2.7.2 -pkgrel=4 -pkgdesc="A high-level scripting language" -arch=('any') -license=('PSF') -url="http://www.python.org/" -source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz - doc_license_change.patch - WDAS.patch) -md5sums=('75c87a80c6ddb0b785a57ea3583e04fa' - '1e6595f85a1da7f42b69456119924d50' - '3f8c0e310a0be0bd8b319d6c46bbd427') -options=(!strip docs libtool emptydirs !zipman !purge) - -build() { - cd "${srcdir}/Python-${pkgver}" - - export PKGEXT=.src.tar.xz - - patch -Np1 -i ../WDAS.patch - patch -Np0 -i ../doc_license_change.patch - -} - -package() { - export PKGEXT=.src.tar.xz - export PKGDEST=${startdir} - - mv "${srcdir}/Python-${pkgver}" ${pkgdir} - -} diff --git a/libre/python2-libre/WDAS.patch b/libre/python2-libre/WDAS.patch deleted file mode 100644 index 86bc75e8c..000000000 --- a/libre/python2-libre/WDAS.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -r ac562d86ab71 Lib/profile.py ---- a/Lib/profile.py Fri Jun 03 17:50:59 2011 -0500 -+++ b/Lib/profile.py Mon Jun 27 00:02:20 2011 -0700 -@@ -2,35 +2,26 @@ - # - # Class for profiling python code. rev 1.0 6/2/94 - # -+# Written by James Roskind - # Based on prior profile module by Sjoerd Mullender... - # which was hacked somewhat by: Guido van Rossum - - """Class for profiling Python code.""" - --# Copyright 1994, by InfoSeek Corporation, all rights reserved. --# Written by James Roskind --# --# Permission to use, copy, modify, and distribute this Python software --# and its associated documentation for any purpose (subject to the --# restriction in the following sentence) without fee is hereby granted, --# provided that the above copyright notice appears in all copies, and --# that both that copyright notice and this permission notice appear in --# supporting documentation, and that the name of InfoSeek not be used in --# advertising or publicity pertaining to distribution of the software --# without specific, written prior permission. This permission is --# explicitly restricted to the copying and modification of the software --# to remain in Python, compiled Python, or other languages (such as C) --# wherein the modified or derived code is exclusively imported into a --# Python module. --# --# INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS --# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND --# FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY --# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER --# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF --# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN --# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- -+# Copyright Disney Enterprises, Inc. All Rights Reserved. -+# Licensed to PSF under a Contributor Agreement -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -+# either express or implied. See the License for the specific language -+# governing permissions and limitations under the License. - - - import sys -diff -r ac562d86ab71 Lib/pstats.py ---- a/Lib/pstats.py Fri Jun 03 17:50:59 2011 -0500 -+++ b/Lib/pstats.py Mon Jun 27 00:02:20 2011 -0700 -@@ -2,34 +2,26 @@ - - # Class for printing reports on profiled python code. rev 1.0 4/1/94 - # -+# Written by James Roskind - # Based on prior profile module by Sjoerd Mullender... - # which was hacked somewhat by: Guido van Rossum --# --# see profile.py for more info. - --# Copyright 1994, by InfoSeek Corporation, all rights reserved. --# Written by James Roskind --# --# Permission to use, copy, modify, and distribute this Python software --# and its associated documentation for any purpose (subject to the --# restriction in the following sentence) without fee is hereby granted, --# provided that the above copyright notice appears in all copies, and --# that both that copyright notice and this permission notice appear in --# supporting documentation, and that the name of InfoSeek not be used in --# advertising or publicity pertaining to distribution of the software --# without specific, written prior permission. This permission is --# explicitly restricted to the copying and modification of the software --# to remain in Python, compiled Python, or other languages (such as C) --# wherein the modified or derived code is exclusively imported into a --# Python module. --# --# INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS --# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND --# FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY --# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER --# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF --# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN --# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+"""Class for profiling Python code.""" -+ -+# Copyright Disney Enterprises, Inc. All Rights Reserved. -+# Licensed to PSF under a Contributor Agreement -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -+# either express or implied. See the License for the specific language -+# governing permissions and limitations under the License. - - - import sys diff --git a/libre/python2-libre/doc_license_change.patch b/libre/python2-libre/doc_license_change.patch deleted file mode 100644 index 18f9447d7..000000000 --- a/libre/python2-libre/doc_license_change.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- Doc/library/profile.rst 2011-06-11 12:46:23.000000000 -0300 -+++ Doc/library/profile.rst.orig 2011-08-12 11:35:25.000000000 -0300 -@@ -12,27 +12,23 @@ - - .. index:: single: InfoSeek Corporation - --Copyright © 1994, by InfoSeek Corporation, all rights reserved. -+Copyright Disney Enterprises, Inc. All Rights Reserved. - - Written by James Roskind. [#]_ - --Permission to use, copy, modify, and distribute this Python software and its --associated documentation for any purpose (subject to the restriction in the --following sentence) without fee is hereby granted, provided that the above --copyright notice appears in all copies, and that both that copyright notice and --this permission notice appear in supporting documentation, and that the name of --InfoSeek not be used in advertising or publicity pertaining to distribution of --the software without specific, written prior permission. This permission is --explicitly restricted to the copying and modification of the software to remain --in Python, compiled Python, or other languages (such as C) wherein the modified --or derived code is exclusively imported into a Python module. -- --INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, --INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT --SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL --DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, --WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING --OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+Licensed to PSF under a Contributor Agreement -+ -+Licensed under the Apache License, Version 2.0 (the "License"); -+you may not use this file except in compliance with the License. -+You may obtain a copy of the License at -+ -+http://www.apache.org/licenses/LICENSE-2.0 -+ -+Unless required by applicable law or agreed to in writing, software -+distributed under the License is distributed on an "AS IS" BASIS, -+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -+either express or implied. See the License for the specific language -+governing permissions and limitations under the License. - - .. _profiler-introduction: - diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch deleted file mode 100644 index 471faf2c7..000000000 --- a/libre/python2-libre/gdbm-magic-values.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py ---- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic 2011-06-11 11:46:26.000000000 -0400 -+++ Python-2.7.2/Lib/whichdb.py 2011-09-30 15:45:21.778872290 -0400 -@@ -91,7 +91,7 @@ def whichdb(filename): - return "" - - # Check for GNU dbm -- if magic == 0x13579ace: -+ if magic in (0x13579ace, 0x13579acd, 0x13579acf): - return "gdbm" - - # Check for old Berkeley db hash file format v2 diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch deleted file mode 100644 index 670510fde..000000000 --- a/libre/python2-libre/linux2.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://hg.python.org/cpython/rev/c816479f6aaf/ -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -2995,6 +2995,7 @@ then - MACHDEP="$ac_md_system$ac_md_release" - - case $MACHDEP in -+ linux*) MACHDEP="linux2";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; - atheos*) MACHDEP="atheos";; -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -293,6 +293,7 @@ then - MACHDEP="$ac_md_system$ac_md_release" - - case $MACHDEP in -+ linux*) MACHDEP="linux2";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; - atheos*) MACHDEP="atheos";; -- cgit v1.2.3