From f0fb135dd5c985841dce28ee80d1627180af3439 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Sat, 14 Nov 2020 16:58:39 +0700 Subject: libraries/oath-toolkit: Updated for version 2.6.4. Signed-off-by: Willy Sudiarto Raharjo --- libraries/oath-toolkit/oath-toolkit-gcc.patch | 68 -------------------------- libraries/oath-toolkit/oath-toolkit.SlackBuild | 6 +-- libraries/oath-toolkit/oath-toolkit.info | 6 +-- 3 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 libraries/oath-toolkit/oath-toolkit-gcc.patch diff --git a/libraries/oath-toolkit/oath-toolkit-gcc.patch b/libraries/oath-toolkit/oath-toolkit-gcc.patch deleted file mode 100644 index 3c52d7cde5..0000000000 --- a/libraries/oath-toolkit/oath-toolkit-gcc.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- oath-toolkit-2.6.2/libpskc/gl/intprops.h.orig 2017-07-05 00:14:44.595175474 +0700 -+++ oath-toolkit-2.6.2/libpskc/gl/intprops.h 2017-07-05 00:16:26.580176632 +0700 -@@ -230,11 +230,11 @@ - (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) -+# 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) -+# 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) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ - __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max) \ ---- oath-toolkit-2.6.2/oathtool/gl/intprops.h.orig 2017-07-05 00:16:45.637176849 +0700 -+++ oath-toolkit-2.6.2/oathtool/gl/intprops.h 2017-07-05 00:21:02.898179771 +0700 -@@ -230,11 +230,11 @@ - (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) -+# 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) -+# 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) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ - __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max) \ ---- oath-toolkit-2.6.2/pskctool/gl/intprops.h.orig 2017-07-05 00:21:45.109180251 +0700 -+++ oath-toolkit-2.6.2/pskctool/gl/intprops.h 2017-07-05 00:22:06.895180498 +0700 -@@ -230,11 +230,11 @@ - (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) -+# 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) -+# 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) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ - __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max) \ ---- oath-toolkit-2.6.2/liboath/gl/tests/intprops.h.orig 2017-07-05 00:22:52.355181015 +0700 -+++ oath-toolkit-2.6.2/liboath/gl/tests/intprops.h 2017-07-05 00:23:18.133181307 +0700 -@@ -230,11 +230,11 @@ - (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) -+# 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) -+# 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) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ - __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max) \ diff --git a/libraries/oath-toolkit/oath-toolkit.SlackBuild b/libraries/oath-toolkit/oath-toolkit.SlackBuild index a7a678abaf..7b6e7da942 100644 --- a/libraries/oath-toolkit/oath-toolkit.SlackBuild +++ b/libraries/oath-toolkit/oath-toolkit.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for oath-toolkit -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2014-2020 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=oath-toolkit -VERSION=${VERSION:-2.6.2} +VERSION=${VERSION:-2.6.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,8 +69,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/oath-toolkit-gcc.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/oath-toolkit/oath-toolkit.info b/libraries/oath-toolkit/oath-toolkit.info index 4559352194..a23a83f78f 100644 --- a/libraries/oath-toolkit/oath-toolkit.info +++ b/libraries/oath-toolkit/oath-toolkit.info @@ -1,8 +1,8 @@ PRGNAM="oath-toolkit" -VERSION="2.6.2" +VERSION="2.6.4" HOMEPAGE="http://www.nongnu.org/oath-toolkit/" -DOWNLOAD="http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.2.tar.gz" -MD5SUM="4a05cd4768764843bd5493609a6bdb17" +DOWNLOAD="http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.4.tar.gz" +MD5SUM="7aeb11fd9fe064827181f0823ec94470" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="xmlsec" -- cgit v1.2.3