commit: 0803d218823ef92b6b0ac09ce44f1172ca36fa9b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 29 08:56:54 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 29 21:51:27 2023 +0000 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 <asturm <AT> 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..000000000000 --- 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 <limits.h> - #include <verify.h> - -+#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/files/oath-toolkit-2.6.2-glibc228.patch b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-glibc228.patch deleted file mode 100644 index c43f7aee0fe7..000000000000 --- a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-glibc228.patch +++ /dev/null @@ -1,100 +0,0 @@ -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.c 2016-08-27 13:15:06.000000000 +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 <http://www.gnu.org/licenses/>. */ -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, see <https://www.gnu.org/licenses/>. */ - - #include <config.h> - -@@ -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__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -+# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix - /* fp_->_offset is typed as an integer. */ - fp_->_offset = pos; - # else -@@ -150,8 +152,8 @@ - fp_->_flags &= ~__SEOF; - #elif defined __EMX__ /* emx+gcc */ - fp->_flags &= ~_IOEOF; --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -- fp->_flag &= ~_IOEOF; -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ -+ fp_->_flag &= ~_IOEOF; - #elif defined __MINT__ /* Atari FreeMiNT */ - fp->__offset = pos; - fp->__eof = 0; diff --git a/sys-auth/oath-toolkit/metadata.xml b/sys-auth/oath-toolkit/metadata.xml index 69b7c5ff26ec..96a71f111315 100644 --- a/sys-auth/oath-toolkit/metadata.xml +++ b/sys-auth/oath-toolkit/metadata.xml @@ -9,7 +9,6 @@ <name>Gentoo Sysadmin Project</name> </maintainer> <use> - <flag name="pskc">Build tools & library for the Portable Symmetric Key Container (PSKC) format per RFC6030</flag> <flag name="pam">Build PAM module for pluggable login authentication for OATH</flag> </use> <upstream> diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.2-r3.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.2-r3.ebuild deleted file mode 100644 index 742fc8913696..000000000000 --- a/sys-auth/oath-toolkit/oath-toolkit-2.6.2-r3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pam autotools -DESCRIPTION="Toolkit for using one-time password authentication with HOTP/TOTP algorithms" -HOMEPAGE="http://www.nongnu.org/oath-toolkit/"; -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"; - -LICENSE="GPL-3 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" -IUSE="pam pskc static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/icu:= - pam? ( sys-libs/pam ) - pskc? ( <dev-libs/xmlsec-1.3.0:= )" -DEPEND="${RDEPEND} - test? ( dev-libs/libxml2 ) - dev-util/gtk-doc-am" - -PATCHES=( - "${FILESDIR}"/${P}-gcc7.patch - "${FILESDIR}"/${P}-glibc228.patch -) - -src_prepare() { - default - - # Below files are verbatim copy. Effectively apply ${P}-gcc7.patch - # to all of them. - local s='oathtool/gl/intprops.h' d - for d in {liboath/gl/tests,libpskc/gl,pskctool/gl}/intprops.h; do - echo "Copy '${s}' to '${d}'" - cp "${s}" "${d}" || die - done - - # These tests need git/cvs and don't reflect anything in the final app - sed -i -r \ - -e '/TESTS/s,test-vc-list-files-(git|cvs).sh,,g' \ - gl/tests/Makefile.am - # disable portability warnings, caused by gtk-doc.make - sed -i \ - -e '/AM_INIT_AUTOMAKE/ s:-Wall:\0 -Wno-portability:' \ - {liboath,libpskc}/configure.ac - eautoreconf -} - -src_configure() { - econf \ - $(use_enable test xmltest ) \ - $(use_enable pam) \ - $(use_with pam pam-dir $(getpam_mod_dir)) \ - $(use_enable pskc) \ - $(use_enable static-libs static) -} - -src_test() { - # without keep-going, it will bail out after the first testsuite failure, - # skipping the other testsuites. as they are mostly independant, this sucks. - emake --keep-going check - [ $? -ne 0 ] && die "At least one testsuite failed" -} - -src_install() { - default - find "${ED}" -name '*.la' -type f -delete || die - if use pam; then - newdoc pam_oath/README README.pam - fi - if use pskc; then - doman pskctool/pskctool.1 - fi -}
