diff options
| author | Eivind Uggedal <eivind@uggedal.com> | 2014-06-05 07:44:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-08 08:13:03 +0000 |
| commit | 607ade52f929fd8f52b62ac32a4b6920568f6325 (patch) | |
| tree | 67c058b00e01fd4335a3e82709ad8a90bea5cc61 | |
| parent | 5860e0969752efdd95025098dba9a5802a4c4108 (diff) | |
| download | aports-607ade52f929fd8f52b62ac32a4b6920568f6325.tar.bz2 aports-607ade52f929fd8f52b62ac32a4b6920568f6325.tar.xz | |
main/python: upgrade to 2.7.7
(cherry picked from commit 156bf140225c0ab6d004a3ad739cec193c6ab766)
| -rw-r--r-- | main/python/APKBUILD | 26 | ||||
| -rw-r--r-- | main/python/find_library.patch | 6 | ||||
| -rw-r--r-- | main/python/fix-posix-close-clash.patch | 20 | ||||
| -rw-r--r-- | main/python/unchecked-ioctl.patch | 4 |
4 files changed, 16 insertions, 40 deletions
diff --git a/main/python/APKBUILD b/main/python/APKBUILD index bb2ca1ebd..4e7e854ec 100644 --- a/main/python/APKBUILD +++ b/main/python/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=python -pkgver=2.7.6 +pkgver=2.7.7 _verbase=${pkgver%.*} -pkgrel=4 +pkgrel=0 pkgdesc="A high-level scripting language" url="http://www.python.org" arch="all" @@ -15,7 +15,6 @@ depends="" makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev gdbm-dev sqlite-dev libffi-dev readline-dev paxctl" source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.xz - fix-posix-close-clash.patch find_library.patch unchecked-ioctl.patch " @@ -96,15 +95,12 @@ gdbm() { _mv_files $(find usr/lib -name '*gdbm*') } -md5sums="bcf93efa8eaf383c98ed3ce40b763497 Python-2.7.6.tar.xz -10103fd4c0f5476aac7330c09e31b32e fix-posix-close-clash.patch -22e32fddd3a973172f2fd570f8c5c416 find_library.patch -44ab30c0715f975d78e626729aaca265 unchecked-ioctl.patch" -sha256sums="1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 Python-2.7.6.tar.xz -08daec45cdd42d5bef137de5e569661ec0375ace1d0429fddd7a97d4d746aed2 fix-posix-close-clash.patch -452f9dc842316bcacfd7d6547ac5c1faaa286568cc782db1c0099464bc913946 find_library.patch -57cc9ba55e2e72be4042a466e21d956886635cda69e857de22fb24b8a0779d97 unchecked-ioctl.patch" -sha512sums="e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238 Python-2.7.6.tar.xz -95cff3d1e9f6e7f7d766f4e87cd199cae4f983f7274285dffa59a72bd684601d03da942f0c2f9b18e6f1955e2a975b75cb6950cbe7f4eda6e7b7d8c55efcc05e fix-posix-close-clash.patch -a1ea61266bb56358158de4036f5be0ad579b44ae616fe0f8d5cef59610886daed73979308c26e56f944435167a6bb8cc6278e6f97f9a72b5f5786d3c31668fc2 find_library.patch -bd015fcc8abe96f999fed1f973364a724c33b6dc0e829d9a530a16718eefc403c3585f30410d22ca30793ca3109c8fe40b64a9a40f4987b8197431c336d4a3d1 unchecked-ioctl.patch" +md5sums="41f7348b348e3f72fcfb4f4d76701352 Python-2.7.7.tar.xz +5d8ca92fa6f187573104593470a9d3d5 find_library.patch +dada786a50fa332686a9b9260d84c110 unchecked-ioctl.patch" +sha256sums="2983e3cd089b30c50e2b2234f07c2ac4fb8a5df230ab8f2e1133a1d8b208da78 Python-2.7.7.tar.xz +63b2b1489c2b97b450bb2d19b64f2ae6cca5c43d549c131c7807fbe52b7bbf21 find_library.patch +f9d37609bab83d9ffff96ec9a33e16568cfb14980d389f7fe34a1c837397e359 unchecked-ioctl.patch" +sha512sums="ea2101feeb41da953b078b93977bd320a937f4047d074fbed568c7c73b1dfe433a66f7f14009ad7160862694a1b378e61f688831b655dcab8a8825e0d1a9acff Python-2.7.7.tar.xz +cbb18c23b1b55025ba8a08debd545b68317eef2732f9f631d2629ed71b603b9a90843bca5df9db7072e83e29c928b0e9c557d0710955692052607db36a241c08 find_library.patch +5a8e013a4132d71c4360771f130d27b37275ae59330cf9a75378dc8a11236017f540eb224f2a148984e82ca3fb6b29129375b1080ba05b81044faa717520ab82 unchecked-ioctl.patch" diff --git a/main/python/find_library.patch b/main/python/find_library.patch index b2a7d4fbd..c4975250b 100644 --- a/main/python/find_library.patch +++ b/main/python/find_library.patch @@ -1,6 +1,6 @@ ---- ./Lib/ctypes/util.py.orig 2013-05-27 14:59:31.253297476 +0000 -+++ ./Lib/ctypes/util.py 2013-05-27 14:59:55.730215183 +0000 -@@ -198,7 +198,7 @@ +--- ./Lib/ctypes/util.py.orig ++++ ./Lib/ctypes/util.py +@@ -227,7 +227,7 @@ abi_type = mach_map.get(machine, 'libc6') # XXX assuming GLIBC's ldconfig (with option -p) diff --git a/main/python/fix-posix-close-clash.patch b/main/python/fix-posix-close-clash.patch deleted file mode 100644 index 6b77acacb..000000000 --- a/main/python/fix-posix-close-clash.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Python-2.7.6/Modules/posixmodule.c.orig -+++ Python-2.7.6/Modules/posixmodule.c -@@ -6582,7 +6582,7 @@ - Close a file descriptor (for low level IO)."); - - static PyObject * --posix_close(PyObject *self, PyObject *args) -+posix_closex(PyObject *self, PyObject *args) - { - int fd, res; - if (!PyArg_ParseTuple(args, "i:close", &fd)) -@@ -8960,7 +8960,7 @@ - {"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__}, - #endif /* HAVE_TCSETPGRP */ - {"open", posix_open, METH_VARARGS, posix_open__doc__}, -- {"close", posix_close, METH_VARARGS, posix_close__doc__}, -+ {"close", posix_closex, METH_VARARGS, posix_close__doc__}, - {"closerange", posix_closerange, METH_VARARGS, posix_closerange__doc__}, - {"dup", posix_dup, METH_VARARGS, posix_dup__doc__}, - {"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__}, diff --git a/main/python/unchecked-ioctl.patch b/main/python/unchecked-ioctl.patch index 77bed8a55..4d5564c2c 100644 --- a/main/python/unchecked-ioctl.patch +++ b/main/python/unchecked-ioctl.patch @@ -1,5 +1,5 @@ ---- Python-2.7.6.orig/Modules/fcntlmodule.c -+++ Python-2.7.6/Modules/fcntlmodule.c +--- ./Modules/fcntlmodule.c.orig ++++ ./Modules/fcntlmodule.c @@ -118,7 +118,7 @@ int mutate_arg = 1; char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */ |