[arch-commits] Commit in python/trunk (PKGBUILD test_socket_aead_kernel49.patch)
Lukas Fleischer
lfleischer at archlinux.org
Tue Feb 28 18:35:19 UTC 2017
Date: Tuesday, February 28, 2017 @ 18:35:18
Author: lfleischer
Revision: 289730
upgpkg: python 3.6.0-3
* Fix build under Linux >=4.9.
* Fix parallel build in a chroot environment.
* Rebuild against OpenSSL 1.1.
Added:
python/trunk/test_socket_aead_kernel49.patch
Modified:
python/trunk/PKGBUILD
---------------------------------+
PKGBUILD | 20 ++++++++++--
test_socket_aead_kernel49.patch | 61 ++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-28 18:30:29 UTC (rev 289729)
+++ PKGBUILD 2017-02-28 18:35:18 UTC (rev 289730)
@@ -7,7 +7,7 @@
pkgname=python
pkgver=3.6.0
-pkgrel=2
+pkgrel=3
_pybasever=3.6
pkgdesc="Next generation of the python high-level scripting language"
arch=('i686' 'x86_64')
@@ -24,9 +24,11 @@
provides=('python3')
replaces=('python3')
source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
+ test_socket_aead_kernel49.patch
dont-make-libpython-readonly.patch)
sha1sums=('18ebf7d726782967d967dc00e3aa08b334fbdd5c'
'SKIP'
+ '54df54d984fae381e471494e9b7f028a9f792eaf'
'c22b24324b8e53326702de439c401d97927ee3f2')
validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D') # Ned Deily (Python release signing key) <nad at python.org>
@@ -33,6 +35,9 @@
prepare() {
cd Python-${pkgver}
+ # Test suite fix for Linux 4.9.
+ patch -p1 -i ../test_socket_aead_kernel49.patch
+
# FS#45809
patch -p1 -i ../dont-make-libpython-readonly.patch
@@ -65,7 +70,11 @@
--enable-loadable-sqlite-extensions \
--without-ensurepip
- LC_CTYPE=en_US.UTF-8 xvfb-run make EXTRA_CFLAGS="$CFLAGS"
+ # Obtain next free server number for xvfb-run; this even works in a chroot environment.
+ export servernum=99
+ while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
+
+ LC_CTYPE=en_US.UTF-8 xvfb-run -a -n "$servernum" make EXTRA_CFLAGS="$CFLAGS"
}
check() {
@@ -72,8 +81,13 @@
# test_gdb is expected to fail with LTO
cd Python-${pkgver}
+
+ # Obtain next free server number for xvfb-run; this even works in a chroot environment.
+ export servernum=99
+ while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
+
LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
- LC_CTYPE=en_US.UTF-8 xvfb-run \
+ LC_CTYPE=en_US.UTF-8 xvfb-run -a -n "$servernum" \
"${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_gdb
}
Added: test_socket_aead_kernel49.patch
===================================================================
--- test_socket_aead_kernel49.patch (rev 0)
+++ test_socket_aead_kernel49.patch 2017-02-28 18:35:18 UTC (rev 289730)
@@ -0,0 +1,61 @@
+Index: Python-3.6.0/Lib/test/test_socket.py
+===================================================================
+--- Python-3.6.0.orig/Lib/test/test_socket.py
++++ Python-3.6.0/Lib/test/test_socket.py
+@@ -5456,7 +5456,7 @@ class LinuxKernelCryptoAPI(unittest.Test
+ self.assertEqual(len(dec), msglen * multiplier)
+ self.assertEqual(dec, msg * multiplier)
+
+- @support.requires_linux_version(4, 3) # see test_aes_cbc
++ @support.requires_linux_version(4, 9) # see issue29324
+ def test_aead_aes_gcm(self):
+ key = bytes.fromhex('c939cc13397c1d37de6ae0e1cb7c423c')
+ iv = bytes.fromhex('b3d8cc017cbb89b39e0f67e2')
+@@ -5479,8 +5479,7 @@ class LinuxKernelCryptoAPI(unittest.Test
+ op.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, iv=iv,
+ assoclen=assoclen, flags=socket.MSG_MORE)
+ op.sendall(assoc, socket.MSG_MORE)
+- op.sendall(plain, socket.MSG_MORE)
+- op.sendall(b'\x00' * taglen)
++ op.sendall(plain)
+ res = op.recv(assoclen + len(plain) + taglen)
+ self.assertEqual(expected_ct, res[assoclen:-taglen])
+ self.assertEqual(expected_tag, res[-taglen:])
+@@ -5488,7 +5487,7 @@ class LinuxKernelCryptoAPI(unittest.Test
+ # now with msg
+ op, _ = algo.accept()
+ with op:
+- msg = assoc + plain + b'\x00' * taglen
++ msg = assoc + plain
+ op.sendmsg_afalg([msg], op=socket.ALG_OP_ENCRYPT, iv=iv,
+ assoclen=assoclen)
+ res = op.recv(assoclen + len(plain) + taglen)
+@@ -5499,7 +5498,7 @@ class LinuxKernelCryptoAPI(unittest.Test
+ pack_uint32 = struct.Struct('I').pack
+ op, _ = algo.accept()
+ with op:
+- msg = assoc + plain + b'\x00' * taglen
++ msg = assoc + plain
+ op.sendmsg(
+ [msg],
+ ([socket.SOL_ALG, socket.ALG_SET_OP, pack_uint32(socket.ALG_OP_ENCRYPT)],
+@@ -5507,7 +5506,7 @@ class LinuxKernelCryptoAPI(unittest.Test
+ [socket.SOL_ALG, socket.ALG_SET_AEAD_ASSOCLEN, pack_uint32(assoclen)],
+ )
+ )
+- res = op.recv(len(msg))
++ res = op.recv(len(msg) + taglen)
+ self.assertEqual(expected_ct, res[assoclen:-taglen])
+ self.assertEqual(expected_tag, res[-taglen:])
+
+@@ -5517,8 +5516,8 @@ class LinuxKernelCryptoAPI(unittest.Test
+ msg = assoc + expected_ct + expected_tag
+ op.sendmsg_afalg([msg], op=socket.ALG_OP_DECRYPT, iv=iv,
+ assoclen=assoclen)
+- res = op.recv(len(msg))
+- self.assertEqual(plain, res[assoclen:-taglen])
++ res = op.recv(len(msg) - taglen)
++ self.assertEqual(plain, res[assoclen:])
+
+ @support.requires_linux_version(4, 3) # see test_aes_cbc
+ def test_drbg_pr_sha256(self):
More information about the arch-commits
mailing list