[gentoo-commits] repo/gentoo:master commit in: sys-auth/oath-toolkit/files/, sys-auth/oath-toolkit/

2023-03-05 Thread Sam James 
commit: 93b66e313c8f85be009ac2c6ee3a70938ee49058
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  5 12:35:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  5 12:37:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b66e31

sys-auth/oath-toolkit: add 2.6.7

Bug: https://bugs.gentoo.org/719314
Closes: https://bugs.gentoo.org/683864
Closes: https://bugs.gentoo.org/719310
Closes: https://bugs.gentoo.org/775278
Closes: https://bugs.gentoo.org/827887
Closes: https://bugs.gentoo.org/837791
Closes: https://bugs.gentoo.org/898740
Signed-off-by: Sam James  gentoo.org>

 sys-auth/oath-toolkit/Manifest |  1 +
 .../oath-toolkit-2.6.7-new-xmlsec-tests.patch  | 74 ++
 sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild| 74 ++
 3 files changed, 149 insertions(+)

diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest
index 5869f860e046..e8a60334a808 100644
--- a/sys-auth/oath-toolkit/Manifest
+++ b/sys-auth/oath-toolkit/Manifest
@@ -1 +1,2 @@
 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.7-new-xmlsec-tests.patch 
b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch
new file mode 100644
index ..a2ad292e19fc
--- /dev/null
+++ b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch
@@ -0,0 +1,74 @@
+https://gitlab.com/oath-toolkit/oath-toolkit/-/commit/0ae59b9c72f69ee21044e736e292b73051df3272
+
+From 0ae59b9c72f69ee21044e736e292b73051df3272 Mon Sep 17 00:00:00 2001
+From: Simon Josefsson 
+Date: Sat, 12 Nov 2022 21:42:17 +0100
+Subject: [PATCH] Handle new libxmlsec on ArchLinux.
+
+--- a/libpskc/examples/pskc-hotp-signed.xml
 b/libpskc/examples/pskc-hotp-signed.xml
+@@ -38,7 +38,8 @@ 
rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
+ rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
+ CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
+ TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
+-n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
++n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
++
+ 
+ 
+ 
+--- a/pskctool/tests/pskc-all-signed.xml
 b/pskctool/tests/pskc-all-signed.xml
+@@ -38,7 +38,8 @@ 
rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
+ rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
+ CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
+ TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
+-n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
++n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
++
+ 
+ 
+ 
+--- a/pskctool/tests/tst_libexamples.sh
 b/pskctool/tests/tst_libexamples.sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ # tst_libexamples.sh - keep pskctool output in GTK-DOC manual up to date
+-# Copyright (C) 2012-2021 Simon Josefsson
++# Copyright (C) 2012-2022 Simon Josefsson
+ 
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -45,7 +45,8 @@ fi
+ 
+ $PSKCTOOL --sign --sign-key $srcdir/pskc-ee-key.pem \
+ --sign-crt $srcdir/pskc-ee-crt.pem \
+-$srcdir/../../libpskc/examples/pskc-hotp.xml > foo
++$srcdir/../../libpskc/examples/pskc-hotp.xml \
++| sed 's,4 foo
+ if ! diff -ur $srcdir/../../libpskc/examples/pskc-hotp-signed.xml foo; then
+ echo "FAIL: pskctool --sign output change, commit updated file."
+ exit 1
+--- a/pskctool/tests/tst_sign.sh
 b/pskctool/tests/tst_sign.sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ # tst_sign.sh - test that pskctool can sign and verify
+-# Copyright (C) 2012-2021 Simon Josefsson
++# Copyright (C) 2012-2022 Simon Josefsson
+ 
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -32,7 +32,7 @@ $PSKCTOOL --info --strict --debug $pskc_all > 
tmp-pre-human.txt
+ $PSKCTOOL --sign \
+ --sign-key $pskc_ee_key \
+ --sign-crt $pskc_ee_crt \
+-$pskc_all > tmp-signed.xml
++$pskc_all | sed 's,4 tmp-signed.xml
+ 
+ diff -ur $pskc_all_signed tmp-signed.xml
+ 
+-- 
+GitLab

diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild 
b/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild
new file mode 100644
index ..f8cb28b09ce9
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: sys-auth/oath-toolkit/files/, sys-auth/oath-toolkit/

2018-10-27 Thread Andreas Hüttel 
commit: 05227fb8a49663681f233e0833f8ab0fd8f6e043
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Oct 27 20:17:11 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Oct 27 20:17:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05227fb8

sys-auth/oath-toolkit: Add build fix for glibc-2.28, bug 669336

Closes: https://bugs.gentoo.org/669336
Signed-off-by: Andreas K. Hüttel  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/oath-toolkit-2.6.2-glibc228.patch| 100 +
 sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild|   7 +-
 2 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-glibc228.patch 
b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-glibc228.patch
new file mode 100644
index 000..c43f7aee0fe
--- /dev/null
+++ b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-glibc228.patch
@@ -0,0 +1,100 @@
+diff -ruN oath-toolkit-2.6.2.orig/liboath/gl/fseeko.c 
oath-toolkit-2.6.2/liboath/gl/fseeko.c
+--- oath-toolkit-2.6.2.orig/liboath/gl/fseeko.c2016-08-27 
13:15:06.0 +0200
 oath-toolkit-2.6.2/liboath/gl/fseeko.c 2018-10-27 22:07:53.836832404 
+0200
+@@ -1,18 +1,18 @@
+ /* An fseeko() function that, together with fflush(), is POSIX compliant.
+-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+This program is free software; you can redistribute it and/or modify
+-   it under the terms of the GNU Lesser General Public License as published by
+-   the Free Software Foundation; either version 2.1, or (at your option)
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU Lesser General Public License for more details.
++   GNU General Public License for more details.
+ 
+-   You should have received a copy of the GNU Lesser General Public License 
along
+-   with this program; if not, see .  */
++   You should have received a copy of the GNU General Public License along
++   with this program; if not, see .  */
+ 
+ #include 
+ 
+@@ -33,9 +33,9 @@
+ #endif
+ #if _GL_WINDOWS_64_BIT_OFF_T
+ # undef fseeko
+-# if HAVE__FSEEKI64 /* msvc, mingw64 */
++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, 
mingw64 */
+ #  define fseeko _fseeki64
+-# else /* mingw */
++# else /* mingw before msvcrt8.0 */
+ #  define fseeko fseeko64
+ # endif
+ #endif
+@@ -47,12 +47,13 @@
+ #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 || defined _IO_ftrylockfile || __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)
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android 
*/
+ # if defined __SL64 && defined __SCLE /* Cygwin */
+   if ((fp->_flags & __SL64) == 0)
+ {
+@@ -80,7 +81,7 @@
+ #elif defined __minix   /* Minix */
+   if (fp_->_ptr == fp_->_buf
+   && (fp_->_ptr == NULL || fp_->_count == 0))
+-#elif defined _IOERR/* AIX, HP-UX, IRIX, OSF/1, Solaris, 
OpenServer, mingw, NonStop Kernel */
++#elif defined _IOERR/* AIX, HP-UX, IRIX, OSF/1, Solaris, 
OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+   if (fp_->_ptr == fp_->_base
+   && (fp_->_ptr == NULL || fp_->_cnt == 0))
+ #elif defined __UCLIBC__/* uClibc */
+@@ -117,18 +118,19 @@
+   if (pos == -1)
+ {
+ #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, 
Android */
+   fp_->_flags &= ~__SOFF;
+ #endif
+   return -1;
+ }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_flags &= ~_IO_EOF_SEEN;
+   fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+-# if defined __CYGWIN__