Update to 201710 with a patch for glibc 2.26+ compatibility.

3 files changed, 55 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47615fe2eeb5..5ec137e44fb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Nov  9 15:08:21 UTC 2016
+# Sat Dec 30 07:38:40 UTC 2017
 pkgbase = openonload
 	pkgdesc = A high performance network stack from Solarflare.
-	pkgver = 201606.u1
+	pkgver = 201710
 	pkgrel = 1
 	url = http://www.openonload.org/
 	install = openonload.install
@@ -17,16 +17,18 @@ pkgbase = openonload
 	options = !makeflags
 	options = !buildflags
 	options = staticlibs
-	source = http://www.openonload.org/download/openonload-201606-u1.tgz
+	source = http://www.openonload.org/download/openonload-201710.tgz
 	source = openonload.install
 	source = openonload.service
 	source = openonload-201310-cpp11-space-literal-fix.patch
 	source = openonload-201606-archlinux.patch
-	sha512sums = 0bf6eeffbd9c1c3275c8bef6f53f8bcab7fc59677da65a26d40125048916da974c9bff7d37f6bdf6d106464e18ff0264a997ff850e91ee1163bd87a254ec72cd
+	source = openonload-201710-p74377-glibc.patch
+	sha512sums = 06148af3e21a9222111a71154ea9c2c9cb032b2d0a567c4892b6fea6890a1385772e3ab15cfd2985805a7f235e0e4c5b5f50ebeffc3b9ecd7afd4e1261a7df2d
 	sha512sums = ac464250f2fb96d13e8ae129bac80c03f8cca62e450fdd765f24ccd064e28e9942e4a16ebc693e75c71fc1eb86c3a1b08337b2e39c6c618e129d8ec87d872bdb
 	sha512sums = b7e4529e37c64f99c660ca9b58f388cdd8f0d2f250ba875eb210f4909bb1f1c985a065aae64c048ca6f824adc6e3176c6eae1f582c049631326db73e939edd7b
 	sha512sums = a1d23b60b699c04caee93eb18d855dbe2e65d2115f10eb3771d1a2f04eea8d3b8042550152a5f96140aca759db10c3fbebdde85dbebcf46505c15f2ba7934bdb
 	sha512sums = c368ce3ed7987d1b374f1e671eb21bc80af4b927e4db4a229712f334ee4843f5921fb64c7ac83df214a9cc37134f8a3360273e9ba9496ff56c329476d26d050a
+	sha512sums = 713bec2eb1792781fe01d1df5df579507ae252548f7b3b9f77987904876ac6f8116f96ef7b2a27037f153299807773738560ba046694d2f8592cb22361ec7feb
 
 pkgname = openonload
 
diff --git a/PKGBUILD b/PKGBUILD
index 5e6bab12a97e..cc847e262faa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@
 
 pkgname='openonload'
 pkgdesc="A high performance network stack from Solarflare."
-pkgver='201606.u1'
+pkgver='201710'
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.openonload.org/'
@@ -31,12 +31,14 @@ source=("http://www.openonload.org/download/openonload-${pkgver//\./-}.tgz"
         'openonload.service'
         'openonload-201310-cpp11-space-literal-fix.patch'
         'openonload-201606-archlinux.patch'
+        'openonload-201710-p74377-glibc.patch'
 )
-sha512sums=('0bf6eeffbd9c1c3275c8bef6f53f8bcab7fc59677da65a26d40125048916da974c9bff7d37f6bdf6d106464e18ff0264a997ff850e91ee1163bd87a254ec72cd'
+sha512sums=('06148af3e21a9222111a71154ea9c2c9cb032b2d0a567c4892b6fea6890a1385772e3ab15cfd2985805a7f235e0e4c5b5f50ebeffc3b9ecd7afd4e1261a7df2d'
             'ac464250f2fb96d13e8ae129bac80c03f8cca62e450fdd765f24ccd064e28e9942e4a16ebc693e75c71fc1eb86c3a1b08337b2e39c6c618e129d8ec87d872bdb'
             'b7e4529e37c64f99c660ca9b58f388cdd8f0d2f250ba875eb210f4909bb1f1c985a065aae64c048ca6f824adc6e3176c6eae1f582c049631326db73e939edd7b'
             'a1d23b60b699c04caee93eb18d855dbe2e65d2115f10eb3771d1a2f04eea8d3b8042550152a5f96140aca759db10c3fbebdde85dbebcf46505c15f2ba7934bdb'
-            'c368ce3ed7987d1b374f1e671eb21bc80af4b927e4db4a229712f334ee4843f5921fb64c7ac83df214a9cc37134f8a3360273e9ba9496ff56c329476d26d050a')
+            'c368ce3ed7987d1b374f1e671eb21bc80af4b927e4db4a229712f334ee4843f5921fb64c7ac83df214a9cc37134f8a3360273e9ba9496ff56c329476d26d050a'
+            '713bec2eb1792781fe01d1df5df579507ae252548f7b3b9f77987904876ac6f8116f96ef7b2a27037f153299807773738560ba046694d2f8592cb22361ec7feb')
 
 install="openonload.install"
 
@@ -51,6 +53,7 @@ prepare() {
 
   patch -p1 < "${srcdir}/openonload-201310-cpp11-space-literal-fix.patch"
   patch -p1 < "${srcdir}/openonload-201606-archlinux.patch"
+  patch -p1 -R < "${srcdir}/openonload-201710-p74377-glibc.patch"
 }
 
 build() {
diff --git a/openonload-201710-p74377-glibc.patch b/openonload-201710-p74377-glibc.patch
new file mode 100644
index 000000000000..46514992df1b
--- /dev/null
+++ b/openonload-201710-p74377-glibc.patch
@@ -0,0 +1,43 @@
+diff -ru openonload-201710/scripts/libc_compat.sh onload201710/openonload-201710/scripts/libc_compat.sh
+--- openonload-201710/scripts/libc_compat.sh	2017-11-06 10:13:41.950953787 +0000
++++ onload201710/openonload-201710/scripts/libc_compat.sh	2017-10-02 14:59:29.000000000 +0100
+@@ -60,11 +60,6 @@
+ echo -n "#define CI_HAVE_SPLICE_RETURNS_SSIZE_T "
+ check_prototype fcntl.h splice \
+     "ssize_t (*foo)(int, loff_t*, int, loff_t*, size_t, unsigned int)"
+-# libc 2.26 changes splice proto again
+-echo -n "#define CI_HAVE_SPLICE_RETURNS___SSIZE_T "
+-check_prototype fcntl.h splice \
+-    "__ssize_t (*foo)(int, __off_t*, int, __off_t*, size_t, unsigned int)"
+-
+ # Some Ubuntus (1504) have timespec parameter in recvmmsg without
+ # "const" keyword.  We assume normal definition of recvmmsg if it is not
+ # present in libc.
+Only in openonload-201710/scripts: setup.py
+diff -ru openonload-201710/src/include/onload/declare_syscalls.h.tmpl onload201710/openonload-201710/src/include/onload/declare_syscalls.h.tmpl
+--- openonload-201710/src/include/onload/declare_syscalls.h.tmpl	2017-11-06 10:13:41.950953787 +0000
++++ onload201710/openonload-201710/src/include/onload/declare_syscalls.h.tmpl	2017-10-02 14:59:30.000000000 +0100
+@@ -47,9 +47,7 @@
+ CI_MK_DECL(int           , setsockopt , (int, int, int, const void*, socklen_t));
+ 
+ #if CI_LIBC_HAS_splice
+-# if CI_HAVE_SPLICE_RETURNS___SSIZE_T
+-#  define ci_splice_return_type __ssize_t
+-# elif CI_HAVE_SPLICE_RETURNS_SSIZE_T
++# if CI_HAVE_SPLICE_RETURNS_SSIZE_T
+ #  define ci_splice_return_type ssize_t
+ # elif CI_HAVE_SPLICE_RETURNS_INT
+ #  define ci_splice_return_type int
+Only in openonload-201710/src/include/onload: declare_syscalls.h.tmpl.orig
+diff -ru openonload-201710/src/include/onload/version.h onload201710/openonload-201710/src/include/onload/version.h
+--- openonload-201710/src/include/onload/version.h	2017-11-06 10:25:25.160880272 +0000
++++ onload201710/openonload-201710/src/include/onload/version.h	2017-10-09 17:38:27.000000000 +0100
+@@ -29,7 +29,7 @@
+ 
+ 
+ #ifndef ONLOAD_VERSION
+-# define ONLOAD_VERSION "201710_bug74377"
++# define ONLOAD_VERSION "201710"
+ #endif
+ 
+ #define ONLOAD_PRODUCT "OpenOnload"