forked from dylanaraps/community
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
oath-toolkit: new package at 2.6.2 (#317)
- Loading branch information
Artem Kobets
committed
Feb 8, 2020
1 parent
59ce0e6
commit f38228e
Showing
6 changed files
with
234 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/bin/sh -e | ||
|
|
||
| patch -p1 < intprops.patch | ||
|
|
||
| ./configure \ | ||
| --prefix=/usr | ||
|
|
||
| make | ||
| make DESTDIR="$1" install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0 oath-toolkit-2.6.2.tar.gz | ||
| 51e0ad66c4fbae41bf39ffbd5d56fc2f75434a4115d9d88abc084ebf6f87f91c intprops.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| xmlsec1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,219 @@ | ||
| --- ./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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| https://download.savannah.nongnu.org/releases/oath-toolkit/oath-toolkit-2.6.2.tar.gz | ||
| patches/intprops.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 2.6.2 1 |