Date: Saturday, September 19, 2015 @ 11:43:37 Author: fyan Revision: 246582
archrelease: copy trunk to staging-i686, staging-x86_64 Added: python/repos/staging-i686/ python/repos/staging-i686/PKGBUILD (from rev 246581, python/trunk/PKGBUILD) python/repos/staging-i686/PKGBUILD.3.5 (from rev 246581, python/trunk/PKGBUILD.3.5) python/repos/staging-i686/dont-make-libpython-readonly.patch (from rev 246581, python/trunk/dont-make-libpython-readonly.patch) python/repos/staging-i686/test_gdb-version-fix.patch (from rev 246581, python/trunk/test_gdb-version-fix.patch) python/repos/staging-x86_64/ python/repos/staging-x86_64/PKGBUILD (from rev 246581, python/trunk/PKGBUILD) python/repos/staging-x86_64/PKGBUILD.3.5 (from rev 246581, python/trunk/PKGBUILD.3.5) python/repos/staging-x86_64/dont-make-libpython-readonly.patch (from rev 246581, python/trunk/dont-make-libpython-readonly.patch) python/repos/staging-x86_64/test_gdb-version-fix.patch (from rev 246581, python/trunk/test_gdb-version-fix.patch) ---------------------------------------------------+ staging-i686/PKGBUILD | 113 ++++++++++++++++++++ staging-i686/PKGBUILD.3.5 | 93 ++++++++++++++++ staging-i686/dont-make-libpython-readonly.patch | 13 ++ staging-i686/test_gdb-version-fix.patch | 11 + staging-x86_64/PKGBUILD | 113 ++++++++++++++++++++ staging-x86_64/PKGBUILD.3.5 | 93 ++++++++++++++++ staging-x86_64/dont-make-libpython-readonly.patch | 13 ++ staging-x86_64/test_gdb-version-fix.patch | 11 + 8 files changed, 460 insertions(+) Copied: python/repos/staging-i686/PKGBUILD (from rev 246581, python/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-09-19 09:43:37 UTC (rev 246582) @@ -0,0 +1,113 @@ +# $Id$ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Jason Chu <ja...@archlinux.org> + +pkgname=python +pkgver=3.5.0 +pkgrel=1 +_pybasever=3.5 +pkgdesc="Next generation of the python high-level scripting language" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.python.org/" +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') +makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal') +checkdepends=('gdb' 'xorg-server-xvfb') +optdepends=('python-setuptools' + 'python-pip' + 'sqlite' + 'mpdecimal: for decimal' + 'xz: for lzma' + 'tk: for tkinter') +options=('!makeflags') +provides=('python3') +replaces=('python3') +source=("http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz" + test_gdb-version-fix.patch + dont-make-libpython-readonly.patch) +sha1sums=('871a06df9ab70984b7398ac53047fe125c757a70' + 'ab86515aff465385675e2e6e593f09596e0a8db0' + 'c22b24324b8e53326702de439c401d97927ee3f2') + +prepare() { + cd Python-${pkgver} + + # https://bugs.python.org/issue25096 + patch -p1 -i ../test_gdb-version-fix.patch + + # FS#45809 + patch -p1 -i ../dont-make-libpython-readonly.patch + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + rm -r Modules/_decimal/libmpdec +} + +build() { + cd Python-${pkgver} + + # Disable bundled pip & setuptools + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --with-system-ffi \ + --with-system-libmpdec \ + --enable-loadable-sqlite-extensions \ + --without-ensurepip + + make EXTRA_CFLAGS="$CFLAGS" +} + +check() { + # Failures: + # test_pathlib & test_posixpath: https://bugs.python.org/issue24950 + + # Hacks: + # test_tk: xvfb-run + # test_unicode_file: LC_CTYPE=en_US.utf-8 + + cd Python-${pkgver} + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + LC_CTYPE=en_US.utf-8 xvfb-run \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -uall || warning "Expected failure" +} + +package() { + cd Python-${pkgver} + make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" install maninstall + + # Why are these not done by default... + ln -s python3 "${pkgdir}"/usr/bin/python + ln -s python3-config "${pkgdir}"/usr/bin/python-config + ln -s idle3 "${pkgdir}"/usr/bin/idle + ln -s pydoc3 "${pkgdir}"/usr/bin/pydoc + ln -s python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1 + + # Fix FS#22552 + ln -sf ../../libpython${_pybasever}m.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so" + + # some useful "stuff" FS#46146 + 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/ + + # Clean-up reference to build directory + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile" + + # License + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: python/repos/staging-i686/PKGBUILD.3.5 (from rev 246581, python/trunk/PKGBUILD.3.5) =================================================================== --- staging-i686/PKGBUILD.3.5 (rev 0) +++ staging-i686/PKGBUILD.3.5 2015-09-19 09:43:37 UTC (rev 246582) @@ -0,0 +1,93 @@ +# $Id: PKGBUILD 234956 2015-03-26 07:56:56Z fyan $ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Jason Chu <ja...@archlinux.org> + +pkgname=python +pkgver=3.5.0rc3 +pkgrel=1 +_pybasever=3.4 +pkgdesc="Next generation of the python high-level scripting language" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.python.org/" +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') +makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal' 'hardening-wrapper') +checkdepends=('gdb' 'xorg-server-xvfb') +optdepends=('python-setuptools' + 'python-pip' + 'sqlite' + 'mpdecimal: for decimal' + 'xz: for lzma' + 'tk: for tkinter') +options=('!makeflags') +provides=('python3') +replaces=('python3') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('d4f5a75142bd9290cd7603db5f26fa62a25ef273') + +prepare() { + cd Python-${pkgver} + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + rm -r Modules/_decimal/libmpdec +} + +build() { + cd Python-${pkgver} + + # Disable bundled pip & setuptools + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --with-system-ffi \ + --with-system-libmpdec \ + --enable-loadable-sqlite-extensions \ + --without-ensurepip + + make +} + +check() { + # test_pathlib/test_posixpath: http://bugs.python.org/issue24950 + + cd Python-${pkgver} + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + TERM=screen HOME="$srcdir" xvfb-run \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -uall +} + +package() { + cd Python-${pkgver} + make DESTDIR="${pkgdir}" install maninstall + + # Why are these not done by default... + ln -s python3 "${pkgdir}"/usr/bin/python + ln -s python3-config "${pkgdir}"/usr/bin/python-config + ln -s idle3 "${pkgdir}"/usr/bin/idle + ln -s pydoc3 "${pkgdir}"/usr/bin/pydoc + ln -s python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1 + + # Fix FS#22552 + ln -sf ../../libpython${_pybasever}m.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so" + + # Clean-up reference to build directory + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile" + + # License + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: python/repos/staging-i686/dont-make-libpython-readonly.patch (from rev 246581, python/trunk/dont-make-libpython-readonly.patch) =================================================================== --- staging-i686/dont-make-libpython-readonly.patch (rev 0) +++ staging-i686/dont-make-libpython-readonly.patch 2015-09-19 09:43:37 UTC (rev 246582) @@ -0,0 +1,13 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +index ce2c0aa..7d6dcf7 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -60,7 +60,7 @@ INSTALL_DATA= @INSTALL_DATA@ + # Shared libraries must be installed with executable mode on some systems; + # rather than figuring out exactly which, we always give them executable mode. + # Also, making them read-only seems to be a good idea... +-INSTALL_SHARED= ${INSTALL} -m 555 ++INSTALL_SHARED= ${INSTALL} -m 755 + + MKDIR_P= @MKDIR_P@ + Copied: python/repos/staging-i686/test_gdb-version-fix.patch (from rev 246581, python/trunk/test_gdb-version-fix.patch) =================================================================== --- staging-i686/test_gdb-version-fix.patch (rev 0) +++ staging-i686/test_gdb-version-fix.patch 2015-09-19 09:43:37 UTC (rev 246582) @@ -0,0 +1,11 @@ +--- a/Lib/test/test_gdb.py 2015-09-14 11:58:09.218811556 +0800 ++++ b/Lib/test/test_gdb.py 2015-09-14 11:58:24.845647558 +0800 +@@ -28,7 +28,7 @@ + # This is what "no gdb" looks like. There may, however, be other + # errors that manifest this way too. + raise unittest.SkipTest("Couldn't find gdb on the path") +-gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.(\d)", gdb_version) ++gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.(\d+)", gdb_version) + gdb_major_version = int(gdb_version_number.group(1)) + gdb_minor_version = int(gdb_version_number.group(2)) + if gdb_major_version < 7: Copied: python/repos/staging-x86_64/PKGBUILD (from rev 246581, python/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2015-09-19 09:43:37 UTC (rev 246582) @@ -0,0 +1,113 @@ +# $Id$ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Jason Chu <ja...@archlinux.org> + +pkgname=python +pkgver=3.5.0 +pkgrel=1 +_pybasever=3.5 +pkgdesc="Next generation of the python high-level scripting language" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.python.org/" +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') +makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal') +checkdepends=('gdb' 'xorg-server-xvfb') +optdepends=('python-setuptools' + 'python-pip' + 'sqlite' + 'mpdecimal: for decimal' + 'xz: for lzma' + 'tk: for tkinter') +options=('!makeflags') +provides=('python3') +replaces=('python3') +source=("http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz" + test_gdb-version-fix.patch + dont-make-libpython-readonly.patch) +sha1sums=('871a06df9ab70984b7398ac53047fe125c757a70' + 'ab86515aff465385675e2e6e593f09596e0a8db0' + 'c22b24324b8e53326702de439c401d97927ee3f2') + +prepare() { + cd Python-${pkgver} + + # https://bugs.python.org/issue25096 + patch -p1 -i ../test_gdb-version-fix.patch + + # FS#45809 + patch -p1 -i ../dont-make-libpython-readonly.patch + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + rm -r Modules/_decimal/libmpdec +} + +build() { + cd Python-${pkgver} + + # Disable bundled pip & setuptools + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --with-system-ffi \ + --with-system-libmpdec \ + --enable-loadable-sqlite-extensions \ + --without-ensurepip + + make EXTRA_CFLAGS="$CFLAGS" +} + +check() { + # Failures: + # test_pathlib & test_posixpath: https://bugs.python.org/issue24950 + + # Hacks: + # test_tk: xvfb-run + # test_unicode_file: LC_CTYPE=en_US.utf-8 + + cd Python-${pkgver} + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + LC_CTYPE=en_US.utf-8 xvfb-run \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -uall || warning "Expected failure" +} + +package() { + cd Python-${pkgver} + make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" install maninstall + + # Why are these not done by default... + ln -s python3 "${pkgdir}"/usr/bin/python + ln -s python3-config "${pkgdir}"/usr/bin/python-config + ln -s idle3 "${pkgdir}"/usr/bin/idle + ln -s pydoc3 "${pkgdir}"/usr/bin/pydoc + ln -s python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1 + + # Fix FS#22552 + ln -sf ../../libpython${_pybasever}m.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so" + + # some useful "stuff" FS#46146 + 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/ + + # Clean-up reference to build directory + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile" + + # License + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: python/repos/staging-x86_64/PKGBUILD.3.5 (from rev 246581, python/trunk/PKGBUILD.3.5) =================================================================== --- staging-x86_64/PKGBUILD.3.5 (rev 0) +++ staging-x86_64/PKGBUILD.3.5 2015-09-19 09:43:37 UTC (rev 246582) @@ -0,0 +1,93 @@ +# $Id: PKGBUILD 234956 2015-03-26 07:56:56Z fyan $ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Jason Chu <ja...@archlinux.org> + +pkgname=python +pkgver=3.5.0rc3 +pkgrel=1 +_pybasever=3.4 +pkgdesc="Next generation of the python high-level scripting language" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.python.org/" +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') +makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal' 'hardening-wrapper') +checkdepends=('gdb' 'xorg-server-xvfb') +optdepends=('python-setuptools' + 'python-pip' + 'sqlite' + 'mpdecimal: for decimal' + 'xz: for lzma' + 'tk: for tkinter') +options=('!makeflags') +provides=('python3') +replaces=('python3') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('d4f5a75142bd9290cd7603db5f26fa62a25ef273') + +prepare() { + cd Python-${pkgver} + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + rm -r Modules/_decimal/libmpdec +} + +build() { + cd Python-${pkgver} + + # Disable bundled pip & setuptools + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --with-system-ffi \ + --with-system-libmpdec \ + --enable-loadable-sqlite-extensions \ + --without-ensurepip + + make +} + +check() { + # test_pathlib/test_posixpath: http://bugs.python.org/issue24950 + + cd Python-${pkgver} + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + TERM=screen HOME="$srcdir" xvfb-run \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -uall +} + +package() { + cd Python-${pkgver} + make DESTDIR="${pkgdir}" install maninstall + + # Why are these not done by default... + ln -s python3 "${pkgdir}"/usr/bin/python + ln -s python3-config "${pkgdir}"/usr/bin/python-config + ln -s idle3 "${pkgdir}"/usr/bin/idle + ln -s pydoc3 "${pkgdir}"/usr/bin/pydoc + ln -s python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1 + + # Fix FS#22552 + ln -sf ../../libpython${_pybasever}m.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so" + + # Clean-up reference to build directory + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile" + + # License + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: python/repos/staging-x86_64/dont-make-libpython-readonly.patch (from rev 246581, python/trunk/dont-make-libpython-readonly.patch) =================================================================== --- staging-x86_64/dont-make-libpython-readonly.patch (rev 0) +++ staging-x86_64/dont-make-libpython-readonly.patch 2015-09-19 09:43:37 UTC (rev 246582) @@ -0,0 +1,13 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +index ce2c0aa..7d6dcf7 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -60,7 +60,7 @@ INSTALL_DATA= @INSTALL_DATA@ + # Shared libraries must be installed with executable mode on some systems; + # rather than figuring out exactly which, we always give them executable mode. + # Also, making them read-only seems to be a good idea... +-INSTALL_SHARED= ${INSTALL} -m 555 ++INSTALL_SHARED= ${INSTALL} -m 755 + + MKDIR_P= @MKDIR_P@ + Copied: python/repos/staging-x86_64/test_gdb-version-fix.patch (from rev 246581, python/trunk/test_gdb-version-fix.patch) =================================================================== --- staging-x86_64/test_gdb-version-fix.patch (rev 0) +++ staging-x86_64/test_gdb-version-fix.patch 2015-09-19 09:43:37 UTC (rev 246582) @@ -0,0 +1,11 @@ +--- a/Lib/test/test_gdb.py 2015-09-14 11:58:09.218811556 +0800 ++++ b/Lib/test/test_gdb.py 2015-09-14 11:58:24.845647558 +0800 +@@ -28,7 +28,7 @@ + # This is what "no gdb" looks like. There may, however, be other + # errors that manifest this way too. + raise unittest.SkipTest("Couldn't find gdb on the path") +-gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.(\d)", gdb_version) ++gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.(\d+)", gdb_version) + gdb_major_version = int(gdb_version_number.group(1)) + gdb_minor_version = int(gdb_version_number.group(2)) + if gdb_major_version < 7: