[gentoo-commits] repo/gentoo:master commit in: sys-auth/oath-toolkit/, sys-auth/oath-toolkit/files/
commit: fbc1f31bc03c190eb69994887903d4c8d313a8f4
Author: Matt Turner gentoo org>
AuthorDate: Tue Feb 13 20:37:16 2024 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Feb 13 20:37:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc1f31b
sys-auth/oath-toolkit: Add patch to avoid implicit definitions
Closes: https://bugs.gentoo.org/924395
Signed-off-by: Matt Turner gentoo.org>
...build-failure-noticed-on-ArchLinux-xmlsec.patch | 40 ++
sys-auth/oath-toolkit/oath-toolkit-2.6.9.ebuild| 4 +++
2 files changed, 44 insertions(+)
diff --git
a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.9-Fix-build-failure-noticed-on-ArchLinux-xmlsec.patch
b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.9-Fix-build-failure-noticed-on-ArchLinux-xmlsec.patch
new file mode 100644
index ..8b0cbacc51f7
--- /dev/null
+++
b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.9-Fix-build-failure-noticed-on-ArchLinux-xmlsec.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/924395
+
+From 9f2bc8d4278421e2a05598c89f22cdf34929ec66 Mon Sep 17 00:00:00 2001
+From: Simon Josefsson
+Date: Sun, 31 Dec 2023 15:42:00 +0100
+Subject: [PATCH] Fix build failure noticed on ArchLinux-xmlsec.
+
+---
+ NEWS| 2 ++
+ libpskc/container.c | 1 +
+ libpskc/parser.c| 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/libpskc/container.c b/libpskc/container.c
+index 639babc..bda2266 100644
+--- a/libpskc/container.c
b/libpskc/container.c
+@@ -24,6 +24,7 @@
+ #include
+
+ #include/* memset */
++#include/* realloc */
+
+ #define INTERNAL_NEED_PSKC_STRUCT
+ #define INTERNAL_NEED_PSKC_KEY_STRUCT
+diff --git a/libpskc/parser.c b/libpskc/parser.c
+index b1f3245..9a1e925 100644
+--- a/libpskc/parser.c
b/libpskc/parser.c
+@@ -28,6 +28,7 @@
+ #include "internal.h"
+
+ #include
++#include/* malloc, strtoul */
+ #include "base64.h"
+
+ static void
+--
+2.43.0
+
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.9.ebuild
b/sys-auth/oath-toolkit/oath-toolkit-2.6.9.ebuild
index 9ddeb896163e..d7c6b3404ba0 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.9.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.9.ebuild
@@ -31,6 +31,10 @@ QA_CONFIG_IMPL_DECL_SKIP=(
MIN # glibc fp
)
+PATCHES=(
+ "${FILESDIR}"/${P}-Fix-build-failure-noticed-on-ArchLinux-xmlsec.patch
+)
+
src_configure() {
local myeconfargs=(
--cache-file="${S}"/config.cache
[gentoo-commits] repo/gentoo:master commit in: sys-auth/oath-toolkit/, sys-auth/oath-toolkit/files/
commit: 0803d218823ef92b6b0ac09ce44f1172ca36fa9b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 29 08:56:54 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 29 21:51:27 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0803d218 sys-auth/oath-toolkit: drop 2.6.2-r3, EAPI-6-- Closes: https://bugs.gentoo.org/827887 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-auth/oath-toolkit/Manifest | 1 - .../files/oath-toolkit-2.6.2-gcc7.patch| 80 - .../files/oath-toolkit-2.6.2-glibc228.patch| 100 - sys-auth/oath-toolkit/metadata.xml | 1 - sys-auth/oath-toolkit/oath-toolkit-2.6.2-r3.ebuild | 77 5 files changed, 259 deletions(-) diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest index e8a60334a808..f462178014ea 100644 --- a/sys-auth/oath-toolkit/Manifest +++ b/sys-auth/oath-toolkit/Manifest @@ -1,2 +1 @@ -DIST oath-toolkit-2.6.2.tar.gz 4295786 BLAKE2B 2b97ab73339647b560b46373922095f18655a167b613b15d4ee2fd507d430025628d20eb111ff1d8025e78646b1d61d9680a7082caba1c75d247bb1d8b9b99dd SHA512 201a702a05a2e9fb3a66d04750e1a34e293342126caf02c344954a0d9fd0daafe73ca7f1fe273be129ae555a29b82b72fa2b4770ea2ad10711924e1926ec2cfb DIST oath-toolkit-2.6.7.tar.gz 5625279 BLAKE2B 23f377c51eb633bf01d6085d33c7362cd91b6bed1cf4c2bbf32dc9433849e20c53f6896b16e5056b13f420f6a65a3c593fa1dafd7e184ed9e52666d94a7f75d1 SHA512 50edff75c8366887d69cf4740c4cc3bdfc3e43cbd4910ff40f735bca489f0953d7e5a21130f12782ac7a1f2fb00f0db313aff139085f23daba78a69bc7b2eb12 diff --git a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-gcc7.patch b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-gcc7.patch deleted file mode 100644 index 18a0a2779408.. --- a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-gcc7.patch +++ /dev/null @@ -1,80 +0,0 @@ -Bug: https://bugs.gentoo.org/618100 -Cherry-picked from upstream commits: https://github.com/coreutils/gnulib/commit/175b4e22f99e00996b72f822f5ae54dca8243d19 - https://github.com/coreutils/gnulib/commit/abae112b34572cd3869ce4fc81dddb5c2a7394c4 - a/oathtool/gl/intprops.h -+++ b/oathtool/gl/intprops.h -@@ -23,6 +23,10 @@ - #include - #include - -+#ifndef __has_builtin -+# define __has_builtin(x) 0 -+#endif -+ - /* Return a value with the common real type of E and V and the value of V. */ - #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) - -@@ -222,20 +226,24 @@ -? (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__ || __has_builtin (__builtin_add_overflow)) -+ -+#define _GL_HAS_BUILTIN_OVERFLOW_P \ -+ (7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)) - - /* 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, (a) + (b)) -+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ -+ __builtin_sub_overflow_p (a, b, (a) - (b)) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ -+ __builtin_mul_overflow_p (a, b, (a) * (b)) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max)\ -((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ -@@ -315,7 +323,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 || _GL_HAS_BUILTIN_OVERFLOW_P - # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) - #else - # define INT_NEGATE_OVERFLOW(a) \ -@@ -349,10 +357,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.
[gentoo-commits] repo/gentoo:master commit in: sys-auth/oath-toolkit/, sys-auth/oath-toolkit/files/
commit: c5757e21c174721dad7cedcf5a7a6642da4e1446
Author: Peter Levine gmail com>
AuthorDate: Mon Mar 26 02:52:17 2018 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Mar 26 19:14:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5757e21
sys-auth/oath-toolkit: Fix building with GCC-7
Bug: https://bugs.gentoo.org/618100
Closes: https://github.com/gentoo/gentoo/pull/7618
Package-Manager: Portage-2.3.16, Repoman-2.3.6
(cherry picked from commit 99a631bb82f619d2553354ca5a0cdf535d4d018b)
Signed-off-by: Robin H. Johnson gentoo.org>
.../files/oath-toolkit-2.6.2-gcc7.patch| 80 ++
sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild| 5 +-
2 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-gcc7.patch
b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-gcc7.patch
new file mode 100644
index 000..18a0a277940
--- /dev/null
+++ b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-gcc7.patch
@@ -0,0 +1,80 @@
+Bug: https://bugs.gentoo.org/618100
+Cherry-picked from upstream commits:
https://github.com/coreutils/gnulib/commit/175b4e22f99e00996b72f822f5ae54dca8243d19
+
https://github.com/coreutils/gnulib/commit/abae112b34572cd3869ce4fc81dddb5c2a7394c4
+
+--- a/oathtool/gl/intprops.h
b/oathtool/gl/intprops.h
+@@ -23,6 +23,10 @@
+ #include
+ #include
+
++#ifndef __has_builtin
++# define __has_builtin(x) 0
++#endif
++
+ /* Return a value with the common real type of E and V and the value of V. */
+ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
+
+@@ -222,20 +226,24 @@
+? (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__ || __has_builtin (__builtin_add_overflow))
++
++#define _GL_HAS_BUILTIN_OVERFLOW_P \
++ (7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p))
+
+ /* 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, (a) + (b))
++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
++ __builtin_sub_overflow_p (a, b, (a) - (b))
++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
++ __builtin_mul_overflow_p (a, b, (a) * (b))
+ #else
+ # define _GL_ADD_OVERFLOW(a, b, min, max)\
+((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \
+@@ -315,7 +323,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 || _GL_HAS_BUILTIN_OVERFLOW_P
+ # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
+ #else
+ # define INT_NEGATE_OVERFLOW(a) \
+@@ -349,10 +357,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 +373,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) \
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
index 394a6ea3c5f..f3d38999c1e 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
@@ -20,7 +20,11 @@ DEPEND="${RDEPEND}
test? ( dev-libs/libxml2 )
dev-util/
