[arch-commits] Commit in oath-toolkit/trunk (PKGBUILD fseeko.patch)

[Christian Hesse]

    Date: Tuesday, August 7, 2018 @ 08:37:54
  Author: eworm
Revision: 370106

fix fseeko with glibc 2.18

Added:
  oath-toolkit/trunk/fseeko.patch
Modified:
  oath-toolkit/trunk/PKGBUILD

--------------+
 PKGBUILD     |    7 +++++--
 fseeko.patch |   22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-07 06:09:34 UTC (rev 370105)
+++ PKGBUILD	2018-08-07 08:37:54 UTC (rev 370106)
@@ -13,15 +13,18 @@
 depends=('glibc' 'pam' 'xmlsec')
 validpgpkeys=('9AA9BDB11BB1B99A21285A330664A76954265E8C') # Simon Josefsson
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        'oath-toolkit-update-gnulib.patch::https://gitlab.com/oath-toolkit/oath-toolkit/commit/2fffce2a471f74a585939c84cce16ef3015e5d3d.diff')
+        'oath-toolkit-update-gnulib.patch::https://gitlab.com/oath-toolkit/oath-toolkit/commit/2fffce2a471f74a585939c84cce16ef3015e5d3d.diff'
+        'fseeko.patch')
 sha256sums=('b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0'
             'SKIP'
-            '4093d69a22af60fac339fcee22ff29c3b8418b76bc1286e5226505af884e0c21')
+            '4093d69a22af60fac339fcee22ff29c3b8418b76bc1286e5226505af884e0c21'
+            'b93dc7bafe32a3477127e55b1c470063660b1f5c3f25622ea581b41502783020')
 
 prepare() {
   cd $pkgname-$pkgver
 
   patch -Np1 < "${srcdir}"/oath-toolkit-update-gnulib.patch
+  patch -Np1 < "${srcdir}"/fseeko.patch
   
   autoreconf -fi
 }

Added: fseeko.patch
===================================================================
--- fseeko.patch	                        (rev 0)
+++ fseeko.patch	2018-08-07 08:37:54 UTC (rev 370106)
@@ -0,0 +1,22 @@
+diff --git a/liboath/gl/fseeko.c b/liboath/gl/fseeko.c
+index 67bb9ec..6adb80e 100644
+--- a/liboath/gl/fseeko.c
++++ b/liboath/gl/fseeko.c
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__