From c1b46eb6ae3fd0c15433cd4bbba36e5b39a5dedc Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 9 May 2014 07:04:02 +0000
Subject: [PATCH] main/python: try 2
---
main/python/APKBUILD | 8 ++++----
main/python/unchecked-ioctl.patch | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/main/python/APKBUILD b/main/python/APKBUILD
index 744149548c35..bb2ca1ebd9a8 100644
--- a/main/python/APKBUILD
+++ b/main/python/APKBUILD
@@ -2,7 +2,7 @@
pkgname=python
pkgver=2.7.6
_verbase=${pkgver%.*}
-pkgrel=3
+pkgrel=4
pkgdesc="A high-level scripting language"
url="http://www.python.org"
arch="all"
@@ -99,12 +99,12 @@ gdbm() {
md5sums="bcf93efa8eaf383c98ed3ce40b763497 Python-2.7.6.tar.xz
10103fd4c0f5476aac7330c09e31b32e fix-posix-close-clash.patch
22e32fddd3a973172f2fd570f8c5c416 find_library.patch
-d8a04d003acd406359119e5f13ea004e unchecked-ioctl.patch"
+44ab30c0715f975d78e626729aaca265 unchecked-ioctl.patch"
sha256sums="1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 Python-2.7.6.tar.xz
08daec45cdd42d5bef137de5e569661ec0375ace1d0429fddd7a97d4d746aed2 fix-posix-close-clash.patch
452f9dc842316bcacfd7d6547ac5c1faaa286568cc782db1c0099464bc913946 find_library.patch
-6dc53eec707e3efba3606e0b0e4522aef26668b47401fe232cf09874e8873348 unchecked-ioctl.patch"
+57cc9ba55e2e72be4042a466e21d956886635cda69e857de22fb24b8a0779d97 unchecked-ioctl.patch"
sha512sums="e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238 Python-2.7.6.tar.xz
95cff3d1e9f6e7f7d766f4e87cd199cae4f983f7274285dffa59a72bd684601d03da942f0c2f9b18e6f1955e2a975b75cb6950cbe7f4eda6e7b7d8c55efcc05e fix-posix-close-clash.patch
a1ea61266bb56358158de4036f5be0ad579b44ae616fe0f8d5cef59610886daed73979308c26e56f944435167a6bb8cc6278e6f97f9a72b5f5786d3c31668fc2 find_library.patch
-1e0251d464af01dac336b9f2e9abdb57e7d67594d0b3036057974f9f06c29e07c1570cb8129e2c0b8300e6511ffad9cb1889d8f857715f3670abde567ec1081c unchecked-ioctl.patch"
+bd015fcc8abe96f999fed1f973364a724c33b6dc0e829d9a530a16718eefc403c3585f30410d22ca30793ca3109c8fe40b64a9a40f4987b8197431c336d4a3d1 unchecked-ioctl.patch"
diff --git a/main/python/unchecked-ioctl.patch b/main/python/unchecked-ioctl.patch
index e80a8ed6f18d..77bed8a55040 100644
--- a/main/python/unchecked-ioctl.patch
+++ b/main/python/unchecked-ioctl.patch
@@ -5,7 +5,7 @@
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",
++ if (PyArg_ParseTuple(args, "O&Iw#|n:ioctl",
conv_descriptor, &fd, &code,
&str, &len, &mutate_arg)) {
char *arg;
--
GitLab