aboutsummaryrefslogtreecommitdiffstats
path: root/main/python
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2014-05-09 06:59:37 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2014-05-09 06:59:37 +0000
commitcefd4657a7b185db8758159b1d9a08781ebd03a1 (patch)
tree72aef9df898bef94b79829a5856e061e11b7c5d7 /main/python
parente6efea9f1e7cab6e51396e35faaccac9c7fbb56f (diff)
downloadaports-cefd4657a7b185db8758159b1d9a08781ebd03a1.tar.bz2
aports-cefd4657a7b185db8758159b1d9a08781ebd03a1.tar.xz
main/python: allow 64-bit arguments to ioctl()
Diffstat (limited to 'main/python')
-rw-r--r--main/python/APKBUILD12
-rw-r--r--main/python/unchecked-ioctl.patch11
2 files changed, 19 insertions, 4 deletions
diff --git a/main/python/APKBUILD b/main/python/APKBUILD
index 61de1eef45..744149548c 100644
--- a/main/python/APKBUILD
+++ b/main/python/APKBUILD
@@ -2,7 +2,7 @@
pkgname=python
pkgver=2.7.6
_verbase=${pkgver%.*}
-pkgrel=2
+pkgrel=3
pkgdesc="A high-level scripting language"
url="http://www.python.org"
arch="all"
@@ -17,6 +17,7 @@ makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev
source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.xz
fix-posix-close-clash.patch
find_library.patch
+ unchecked-ioctl.patch
"
prepare() {
@@ -97,10 +98,13 @@ gdbm() {
md5sums="bcf93efa8eaf383c98ed3ce40b763497 Python-2.7.6.tar.xz
10103fd4c0f5476aac7330c09e31b32e fix-posix-close-clash.patch
-22e32fddd3a973172f2fd570f8c5c416 find_library.patch"
+22e32fddd3a973172f2fd570f8c5c416 find_library.patch
+d8a04d003acd406359119e5f13ea004e unchecked-ioctl.patch"
sha256sums="1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 Python-2.7.6.tar.xz
08daec45cdd42d5bef137de5e569661ec0375ace1d0429fddd7a97d4d746aed2 fix-posix-close-clash.patch
-452f9dc842316bcacfd7d6547ac5c1faaa286568cc782db1c0099464bc913946 find_library.patch"
+452f9dc842316bcacfd7d6547ac5c1faaa286568cc782db1c0099464bc913946 find_library.patch
+6dc53eec707e3efba3606e0b0e4522aef26668b47401fe232cf09874e8873348 unchecked-ioctl.patch"
sha512sums="e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238 Python-2.7.6.tar.xz
95cff3d1e9f6e7f7d766f4e87cd199cae4f983f7274285dffa59a72bd684601d03da942f0c2f9b18e6f1955e2a975b75cb6950cbe7f4eda6e7b7d8c55efcc05e fix-posix-close-clash.patch
-a1ea61266bb56358158de4036f5be0ad579b44ae616fe0f8d5cef59610886daed73979308c26e56f944435167a6bb8cc6278e6f97f9a72b5f5786d3c31668fc2 find_library.patch"
+a1ea61266bb56358158de4036f5be0ad579b44ae616fe0f8d5cef59610886daed73979308c26e56f944435167a6bb8cc6278e6f97f9a72b5f5786d3c31668fc2 find_library.patch
+1e0251d464af01dac336b9f2e9abdb57e7d67594d0b3036057974f9f06c29e07c1570cb8129e2c0b8300e6511ffad9cb1889d8f857715f3670abde567ec1081c unchecked-ioctl.patch"
diff --git a/main/python/unchecked-ioctl.patch b/main/python/unchecked-ioctl.patch
new file mode 100644
index 0000000000..e80a8ed6f1
--- /dev/null
+++ b/main/python/unchecked-ioctl.patch
@@ -0,0 +1,11 @@
+--- Python-2.7.6.orig/Modules/fcntlmodule.c
++++ Python-2.7.6/Modules/fcntlmodule.c
+@@ -118,7 +118,7 @@
+ int mutate_arg = 1;
+ char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */
+
+- if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
++ if (PyArg_ParseTuple(args, "O&Iw#|I:ioctl",
+ conv_descriptor, &fd, &code,
+ &str, &len, &mutate_arg)) {
+ char *arg;