oath-toolkit: update to 2.6.4.
This commit is contained in:
parent
81b5fec301
commit
5d8be79b60
3 changed files with 4 additions and 258 deletions
|
@ -1,35 +0,0 @@
|
||||||
From fc0ef4aca2188c2653344924a35d19a86392d50f Mon Sep 17 00:00:00 2001
|
|
||||||
From: maxice8 <thinkabit.ukim@gmail.com>
|
|
||||||
Date: Sun, 23 Sep 2018 13:08:17 -0300
|
|
||||||
Subject: [PATCH] gl/fseeko.c: fix compilation with glibc >= 2.28
|
|
||||||
|
|
||||||
---
|
|
||||||
liboath/gl/fseeko.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/liboath/gl/fseeko.c b/liboath/gl/fseeko.c
|
|
||||||
index 67bb9ec..6adb80e 100644
|
|
||||||
--- liboath/gl/fseeko.c
|
|
||||||
+++ 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__
|
|
||||||
--
|
|
||||||
2.19.0
|
|
||||||
|
|
||||||
|
|
|
@ -1,219 +0,0 @@
|
||||||
--- ./oathtool/gl/intprops.h
|
|
||||||
+++ ./oathtool/gl/intprops.h
|
|
||||||
@@ -222,20 +222,23 @@
|
|
||||||
? (a) < (min) >> (b) \
|
|
||||||
: (max) >> (b) < (a))
|
|
||||||
|
|
||||||
-/* True if __builtin_add_overflow (A, B, P) works when P is null. */
|
|
||||||
-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
|
|
||||||
+/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */
|
|
||||||
+#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__)
|
|
||||||
+
|
|
||||||
+/* True if __builtin_add_overflow_p (A, B, C) works. */
|
|
||||||
+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
|
|
||||||
|
|
||||||
/* The _GL*_OVERFLOW macros have the same restrictions as the
|
|
||||||
*_RANGE_OVERFLOW macros, except that they do not assume that operands
|
|
||||||
(e.g., A and B) have the same type as MIN and MAX. Instead, they assume
|
|
||||||
that the result (e.g., A + B) has that type. */
|
|
||||||
-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
|
|
||||||
-# define _GL_ADD_OVERFLOW(a, b, min, max)
|
|
||||||
- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
|
|
||||||
-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
|
|
||||||
- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
|
|
||||||
-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
|
|
||||||
- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
|
|
||||||
+#if _GL_HAS_BUILTIN_OVERFLOW_P
|
|
||||||
+# define _GL_ADD_OVERFLOW(a, b, min, max) \
|
|
||||||
+ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
|
|
||||||
+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
|
|
||||||
+ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
|
|
||||||
+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
|
|
||||||
+ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
|
|
||||||
#else
|
|
||||||
# define _GL_ADD_OVERFLOW(a, b, min, max) \
|
|
||||||
((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \
|
|
||||||
@@ -315,7 +318,7 @@
|
|
||||||
_GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
|
|
||||||
#define INT_SUBTRACT_OVERFLOW(a, b) \
|
|
||||||
_GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
|
|
||||||
-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
|
|
||||||
+#if _GL_HAS_BUILTIN_OVERFLOW_WITH_P
|
|
||||||
# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
|
|
||||||
#else
|
|
||||||
# define INT_NEGATE_OVERFLOW(a) \
|
|
||||||
@@ -349,10 +352,6 @@
|
|
||||||
#define INT_MULTIPLY_WRAPV(a, b, r) \
|
|
||||||
_GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
|
|
||||||
|
|
||||||
-#ifndef __has_builtin
|
|
||||||
-# define __has_builtin(x) 0
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See:
|
|
||||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
|
|
||||||
https://llvm.org/bugs/show_bug.cgi?id=25390
|
|
||||||
@@ -369,7 +368,7 @@
|
|
||||||
the operation. BUILTIN is the builtin operation, and OVERFLOW the
|
|
||||||
overflow predicate. Return 1 if the result overflows. See above
|
|
||||||
for restrictions. */
|
|
||||||
-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
|
|
||||||
+#if _GL_HAS_BUILTIN_OVERFLOW
|
|
||||||
# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
|
|
||||||
#elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
|
|
||||||
# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
|
|
||||||
@@ -412,7 +411,7 @@
|
|
||||||
# else
|
|
||||||
# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
|
|
||||||
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
|
||||||
- long int, LONG_MIN, LONG_MAX))
|
|
||||||
+ long int, LONG_MIN, LONG_MAX)
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--- ./pskctool/gl/intprops.h
|
|
||||||
+++ ./pskctool/gl/intprops.h
|
|
||||||
@@ -222,20 +222,23 @@
|
|
||||||
? (a) < (min) >> (b) \
|
|
||||||
: (max) >> (b) < (a))
|
|
||||||
|
|
||||||
-/* True if __builtin_add_overflow (A, B, P) works when P is null. */
|
|
||||||
-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
|
|
||||||
+/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */
|
|
||||||
+#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__)
|
|
||||||
+
|
|
||||||
+/* True if __builtin_add_overflow_p (A, B, C) works. */
|
|
||||||
+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
|
|
||||||
|
|
||||||
/* The _GL*_OVERFLOW macros have the same restrictions as the
|
|
||||||
*_RANGE_OVERFLOW macros, except that they do not assume that operands
|
|
||||||
(e.g., A and B) have the same type as MIN and MAX. Instead, they assume
|
|
||||||
that the result (e.g., A + B) has that type. */
|
|
||||||
-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
|
|
||||||
-# define _GL_ADD_OVERFLOW(a, b, min, max)
|
|
||||||
- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
|
|
||||||
-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
|
|
||||||
- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
|
|
||||||
-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
|
|
||||||
- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
|
|
||||||
+#if _GL_HAS_BUILTIN_OVERFLOW_P
|
|
||||||
+# define _GL_ADD_OVERFLOW(a, b, min, max) \
|
|
||||||
+ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
|
|
||||||
+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
|
|
||||||
+ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
|
|
||||||
+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
|
|
||||||
+ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
|
|
||||||
#else
|
|
||||||
# define _GL_ADD_OVERFLOW(a, b, min, max) \
|
|
||||||
((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \
|
|
||||||
@@ -315,7 +318,7 @@
|
|
||||||
_GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
|
|
||||||
#define INT_SUBTRACT_OVERFLOW(a, b) \
|
|
||||||
_GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
|
|
||||||
-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
|
|
||||||
+#if _GL_HAS_BUILTIN_OVERFLOW_WITH_P
|
|
||||||
# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
|
|
||||||
#else
|
|
||||||
# define INT_NEGATE_OVERFLOW(a) \
|
|
||||||
@@ -349,10 +352,6 @@
|
|
||||||
#define INT_MULTIPLY_WRAPV(a, b, r) \
|
|
||||||
_GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
|
|
||||||
|
|
||||||
-#ifndef __has_builtin
|
|
||||||
-# define __has_builtin(x) 0
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See:
|
|
||||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
|
|
||||||
https://llvm.org/bugs/show_bug.cgi?id=25390
|
|
||||||
@@ -369,7 +368,7 @@
|
|
||||||
the operation. BUILTIN is the builtin operation, and OVERFLOW the
|
|
||||||
overflow predicate. Return 1 if the result overflows. See above
|
|
||||||
for restrictions. */
|
|
||||||
-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
|
|
||||||
+#if _GL_HAS_BUILTIN_OVERFLOW
|
|
||||||
# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
|
|
||||||
#elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
|
|
||||||
# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
|
|
||||||
@@ -412,7 +411,7 @@
|
|
||||||
# else
|
|
||||||
# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
|
|
||||||
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
|
||||||
- long int, LONG_MIN, LONG_MAX))
|
|
||||||
+ long int, LONG_MIN, LONG_MAX)
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--- ./libpskc/gl/intprops.h
|
|
||||||
+++ ./libpskc/gl/intprops.h
|
|
||||||
@@ -222,20 +222,23 @@
|
|
||||||
? (a) < (min) >> (b) \
|
|
||||||
: (max) >> (b) < (a))
|
|
||||||
|
|
||||||
-/* True if __builtin_add_overflow (A, B, P) works when P is null. */
|
|
||||||
-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
|
|
||||||
+/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */
|
|
||||||
+#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__)
|
|
||||||
+
|
|
||||||
+/* True if __builtin_add_overflow_p (A, B, C) works. */
|
|
||||||
+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
|
|
||||||
|
|
||||||
/* The _GL*_OVERFLOW macros have the same restrictions as the
|
|
||||||
*_RANGE_OVERFLOW macros, except that they do not assume that operands
|
|
||||||
(e.g., A and B) have the same type as MIN and MAX. Instead, they assume
|
|
||||||
that the result (e.g., A + B) has that type. */
|
|
||||||
-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
|
|
||||||
-# define _GL_ADD_OVERFLOW(a, b, min, max)
|
|
||||||
- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
|
|
||||||
-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
|
|
||||||
- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
|
|
||||||
-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
|
|
||||||
- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
|
|
||||||
+#if _GL_HAS_BUILTIN_OVERFLOW_P
|
|
||||||
+# define _GL_ADD_OVERFLOW(a, b, min, max) \
|
|
||||||
+ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
|
|
||||||
+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
|
|
||||||
+ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
|
|
||||||
+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
|
|
||||||
+ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
|
|
||||||
#else
|
|
||||||
# define _GL_ADD_OVERFLOW(a, b, min, max) \
|
|
||||||
((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \
|
|
||||||
@@ -315,7 +318,7 @@
|
|
||||||
_GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
|
|
||||||
#define INT_SUBTRACT_OVERFLOW(a, b) \
|
|
||||||
_GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
|
|
||||||
-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
|
|
||||||
+#if _GL_HAS_BUILTIN_OVERFLOW_WITH_P
|
|
||||||
# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
|
|
||||||
#else
|
|
||||||
# define INT_NEGATE_OVERFLOW(a) \
|
|
||||||
@@ -349,10 +352,6 @@
|
|
||||||
#define INT_MULTIPLY_WRAPV(a, b, r) \
|
|
||||||
_GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
|
|
||||||
|
|
||||||
-#ifndef __has_builtin
|
|
||||||
-# define __has_builtin(x) 0
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See:
|
|
||||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
|
|
||||||
https://llvm.org/bugs/show_bug.cgi?id=25390
|
|
||||||
@@ -369,7 +368,7 @@
|
|
||||||
the operation. BUILTIN is the builtin operation, and OVERFLOW the
|
|
||||||
overflow predicate. Return 1 if the result overflows. See above
|
|
||||||
for restrictions. */
|
|
||||||
-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
|
|
||||||
+#if _GL_HAS_BUILTIN_OVERFLOW
|
|
||||||
# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
|
|
||||||
#elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
|
|
||||||
# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
|
|
||||||
@@ -412,7 +411,7 @@
|
|
||||||
# else
|
|
||||||
# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
|
|
||||||
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
|
||||||
- long int, LONG_MIN, LONG_MAX))
|
|
||||||
+ long int, LONG_MIN, LONG_MAX)
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
# Template file for 'oath-toolkit'
|
# Template file for 'oath-toolkit'
|
||||||
pkgname=oath-toolkit
|
pkgname=oath-toolkit
|
||||||
version=2.6.2
|
version=2.6.4
|
||||||
revision=3
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
makedepends="pam-devel"
|
makedepends="pam-devel"
|
||||||
short_desc="OATH one-time password toolkit"
|
short_desc="OATH one-time password toolkit"
|
||||||
maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
|
maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
|
||||||
license="GPL-3"
|
license="GPL-3.0-or-later"
|
||||||
homepage="http://www.nongnu.org/oath-toolkit/"
|
homepage="http://www.nongnu.org/oath-toolkit/"
|
||||||
distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
|
distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
|
||||||
checksum=b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0
|
checksum=bfc6255ead837e6966f092757a697c3191c93fa58323ce07859a5f666d52d684
|
||||||
|
|
||||||
oath-toolkit-devel_package() {
|
oath-toolkit-devel_package() {
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
|
|
Loading…
Reference in a new issue