From 2cb47e275c9ea941b64a167bd0720015494f65d6 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Mon, 15 Aug 2011 12:12:43 -0300 Subject: libre/python2-libre-2.7.2-2 Applied license change for pstats and profiler --- libre/python2-libre/PKGBUILD | 105 ++++++++++++++++++++++++++ libre/python2-libre/WDAS.patch | 109 +++++++++++++++++++++++++++ libre/python2-libre/doc_license_change.patch | 44 +++++++++++ 3 files changed, 258 insertions(+) create mode 100644 libre/python2-libre/PKGBUILD create mode 100644 libre/python2-libre/WDAS.patch create mode 100644 libre/python2-libre/doc_license_change.patch (limited to 'libre') diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD new file mode 100644 index 000000000..78550b63f --- /dev/null +++ b/libre/python2-libre/PKGBUILD @@ -0,0 +1,105 @@ +# $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=2 +_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' 'sqlite3' 'libffi') +makedepends=('tk') +optdepends=('tk: for IDLE') +conflicts=('python<3') +options=('!makeflags') +source=(http://repo.parabolagnulinux.org/other/Python-${pkgver}.tar.xz + doc_license_change.patch + WDAS.patch) +md5sums=('5f8a18361784411b16dbb1cdcd6f6664' + '1e6595f85a1da7f42b69456119924d50' + '3f8c0e310a0be0bd8b319d6c46bbd427') +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +replaces=("$_pkgname") + +mksource() { + [ ! -d "Python-${pkgver}" ] && \ + wget -O - http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz |\ + tar -xJf - + + cd "Python-${pkgver}" +# http://bugs.python.org/issue12417 + patch -Np1 -i ../WDAS.patch || return 1 + patch -Np0 -i ../doc_license_change.patch || return 1 + + cd .. + tar -cJf Python-${pkgver}.tar.xz "Python-${pkgver}" +} + +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 SQLite3 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 + + # 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 + + make +} + +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" +} diff --git a/libre/python2-libre/WDAS.patch b/libre/python2-libre/WDAS.patch new file mode 100644 index 000000000..86bc75e8c --- /dev/null +++ b/libre/python2-libre/WDAS.patch @@ -0,0 +1,109 @@ +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 new file mode 100644 index 000000000..18f9447d7 --- /dev/null +++ b/libre/python2-libre/doc_license_change.patch @@ -0,0 +1,44 @@ +--- 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: + -- cgit v1.2.3-54-g00ecf