Leo Famulari writes:
> I notice that the commit message says "Drop patch", but that this change
> actually removes two patches from the oath-toolkit.
>
> It removes the application of both "oath-toolkit-glibc-compat.patch" and
> also the "oath-toolkit-update-gnulib.patch". Is that intended?
>
> If so, we should also delete the former's patch file and remove it from
> 'gnu/local.mk'.
Thanks for the review! How about this updated patch?
/Simon
From 7c57d7b93f1315ff02e55d11d41b8c9442bb7633 Mon Sep 17 00:00:00 2001
From: Simon Josefsson
Date: Tue, 10 Nov 2020 16:10:17 +0100
Subject: [PATCH] gnu: oath-toolkit: Update to 2.6.3.
* gnu/packages/authentication.scm (oath-toolkit): Update to 2.6.3. Drop patch.
* gnu/local.mk (dist_patch_DATA): Drop oath-toolkit-glibc-compat.patch
* gnu/packages/patches/oath-toolkit-glibc-compat.patch: Remove file.
---
gnu/local.mk | 1 -
gnu/packages/authentication.scm | 16 +---
.../patches/oath-toolkit-glibc-compat.patch | 90 ---
3 files changed, 2 insertions(+), 105 deletions(-)
delete mode 100644 gnu/packages/patches/oath-toolkit-glibc-compat.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 996b6c7afa..a9c3124016 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1387,7 +1387,6 @@ dist_patch_DATA = \
%D%/packages/patches/nvi-dbpagesize-binpower.patch \
%D%/packages/patches/nvi-db4.patch\
%D%/packages/patches/nyacc-binary-literals.patch \
- %D%/packages/patches/oath-toolkit-glibc-compat.patch \
%D%/packages/patches/ocaml-bitstring-fix-configure.patch \
%D%/packages/patches/ocaml-CVE-2015-8869.patch \
%D%/packages/patches/ocaml-Add-a-.file-directive.patch \
diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm
index b3ff912c8f..52ab445775 100644
--- a/gnu/packages/authentication.scm
+++ b/gnu/packages/authentication.scm
@@ -33,26 +33,14 @@
(define-public oath-toolkit
(package
(name "oath-toolkit")
-(version "2.6.2")
+(version "2.6.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/;
name "/" name "-" version ".tar.gz"))
- (patches
-(append (search-patches "oath-toolkit-glibc-compat.patch")
-(list (origin
-;; This huge commit updates gnulib for GCC 7 compatibility.
-(method url-fetch)
-(uri (string-append
- "https://gitlab.com/oath-toolkit/oath-toolkit/commit/;
- "2fffce2a471f74a585939c84cce16ef3015e5d3d.diff"))
-(file-name "oath-toolkit-update-gnulib.patch")
-(sha256
- (base32
- "088c9s4ay1b54bjqc4mwfs5l3f6357zj5vpw771zlq5g4addd4s0"))
(sha256
-(base32 "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h"
+(base32 "1cjial8njck2sd7452jcxspbi5h5fnp3n8v3wbmlw8fzqmgzvxx1"
(build-system gnu-build-system)
(arguments
;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures.
diff --git a/gnu/packages/patches/oath-toolkit-glibc-compat.patch b/gnu/packages/patches/oath-toolkit-glibc-compat.patch
deleted file mode 100644
index 22814599e5..00
--- a/gnu/packages/patches/oath-toolkit-glibc-compat.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Adjust the bundled Gnulib to cope with removal of libio interface in Glibc 2.28.
-
-Based on this upstream gnulib patch:
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
-
a/liboath/gl/fflush.c
-+++ b/liboath/gl/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
-
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
- static void
-@@ -72,7 +72,7 @@
-
- #endif
-
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
-@@ -148,7 +148,7 @@
- if (stream == NULL || ! freading (stream))
- return fflush (stream);
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-
- clear_ungetc_buffer_preserving_position (stream);
-
a/liboath/gl/fpurge.c
-+++ b/liboath/gl/fpurge.c
-@@ -62,7 +62,7 @@
- /* Most systems provide FILE as a struct and the necessary bitmask in
- , because
