From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uHvzBXCvql+mJgAA0tVLHw (envelope-from ) for ; Tue, 10 Nov 2020 15:19:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0D7WAXCvql/+OAAAbx9fmQ (envelope-from ) for ; Tue, 10 Nov 2020 15:19:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AA20E9403E6 for ; Tue, 10 Nov 2020 15:19:11 +0000 (UTC) Received: from localhost ([::1]:39888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcVQM-0004yY-DR for larch@yhetil.org; Tue, 10 Nov 2020 10:19:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcVJa-0005kU-IF for guix-devel@gnu.org; Tue, 10 Nov 2020 10:12:10 -0500 Received: from uggla.sjd.se ([2001:9b1:8633::107]:49892) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcVJU-0002dY-8Y for guix-devel@gnu.org; Tue, 10 Nov 2020 10:12:09 -0500 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed20b09; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=KWmDbYk5OgLcETX5gky5d1fV5iqQ3yMnJQqXYGtupSI=; b=RDRJZBVED7SGhxryGkMBIqIy4 4PrBAgXnX+gNL6YzEI9jwHpBpTXh+8HPgoeqJ3h4yIX5hEVoHQmLl95zA2JAQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa20b09; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=KWmDbYk5OgLcETX5gky5d1fV5iqQ3yMnJQqXYGtupSI=; b=ZKe2+BuNFXoPe6SyIGL59v7tr mMZtWO8PXG/lJTV4WduwdMRCjsf8QFvRjEpBS/Jeh6uM6i7grRLmt9F02jc4sNc0zuoyH6HT0BRa7 wBAeuShTB1LiEAbNYDIfJcveS/kRuua8ahrqumluX8vnLimRKIzA8wCj1lgNHGepfZOwhPh11lwUD kGoMZCpqJUa64WOKROWutPBhiwchnOOqMlcce5hWUFpTfMpqfJcVczjgwxCoL8VWoaAFDaI9eqlcA D6yvOOv+dBNWqU4NawYDPZIfhYT/ZxeZ+fXXoOzd2ivPOQ383lqU66hGT86TEqhdceqgauyzzY+RG iwi5cPx6ffj9cmPV/W4tL3nQlCgJAnbFgLVTO7VYM/7GhYdHMTRC3a6psYcMAN1ooqYE4v3LrdMT+ LQS/GgEO7YZoIakUIpQ9sLu12h98dUnMMS6LhaJQtEcbJU; Received: from 31-208-42-58.cust.bredband2.com ([31.208.42.58]:58514 helo=latte) by uggla.sjd.se with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kcVJM-0000Zs-GV; Tue, 10 Nov 2020 15:11:57 +0000 To: Leo Famulari Cc: guix-devel@gnu.org Subject: Re: [PATCH] gnu: oath-toolkit: Update to 2.6.3. References: <874klyu0rm.fsf@latte.josefsson.org> <20201109185528.GA9563@jasmine.lan> OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:22:201110:leo@famulari.name::ft+WmkTgVP0oF+Ww:Jf27 X-Hashcash: 1:22:201110:guix-devel@gnu.org::3SVtuuj9peP1Sgwz:ScyC Date: Tue, 10 Nov 2020 16:11:55 +0100 In-Reply-To: <20201109185528.GA9563@jasmine.lan> (Leo Famulari's message of "Mon, 9 Nov 2020 13:55:28 -0500") Message-ID: <87sg9hutz8.fsf@latte.josefsson.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-uggla-rspamd: ----- Score: -5.2 Action: no action Symbol: ARC_NA(0.00) Symbol: RCVD_VIA_SMTP_AUTH(0.00) Symbol: FROM_HAS_DN(0.00) Symbol: TO_DN_SOME(0.00) Symbol: TO_MATCH_ENVRCPT_ALL(0.00) Symbol: MIME_GOOD(-0.20) Symbol: RCPT_COUNT_TWO(0.00) Symbol: NEURAL_HAM(-0.00) Symbol: RCVD_COUNT_ONE(0.00) Symbol: SIGNED_PGP(-2.00) Symbol: FROM_EQ_ENVFROM(0.00) Symbol: MIME_TRACE(0.00) Symbol: ASN(0.00) Symbol: RCVD_TLS_ALL(0.00) Symbol: BAYES_HAM(-3.00) Message-ID: 87sg9hutz8.fsf@latte.josefsson.org Received-SPF: pass client-ip=2001:9b1:8633::107; envelope-from=simon@josefsson.org; helo=uggla.sjd.se X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" Reply-to: Simon Josefsson From: Simon Josefsson via "Development of GNU Guix and the GNU System distribution." X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers eddsa verify failed) header.d=josefsson.org header.s=ed20b09 header.b=RDRJZBVE; dkim=fail (headers rsa verify failed) header.d=josefsson.org header.s=rsa20b09 header.b=ZKe2+BuN; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -3.61 X-TUID: kCcAAuhK3KC6 --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-oath-toolkit-Update-to-2.6.3.patch Content-Transfer-Encoding: quoted-printable From=207c57d7b93f1315ff02e55d11d41b8c9442bb7633 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 pa= tch. * gnu/local.mk (dist_patch_DATA): Drop oath-toolkit-glibc-compat.patch * gnu/packages/patches/oath-toolkit-glibc-compat.patch: Remove file. =2D-- 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 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1387,7 +1387,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \ %D%/packages/patches/nvi-db4.patch \ %D%/packages/patches/nyacc-binary-literals.patch \ =2D %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 =2D-- a/gnu/packages/authentication.scm +++ b/gnu/packages/authentication.scm @@ -33,26 +33,14 @@ (define-public oath-toolkit (package (name "oath-toolkit") =2D (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")) =2D (patches =2D (append (search-patches "oath-toolkit-glibc-compat.patch") =2D (list (origin =2D ;; This huge commit updates gnulib for GCC 7 com= patibility. =2D (method url-fetch) =2D (uri (string-append =2D "https://gitlab.com/oath-toolkit/oath-tool= kit/commit/" =2D "2fffce2a471f74a585939c84cce16ef3015e5d3d.= diff")) =2D (file-name "oath-toolkit-update-gnulib.patch") =2D (sha256 =2D (base32 =2D "088c9s4ay1b54bjqc4mwfs5l3f6357zj5vpw771zlq5g4= addd4s0")))))) (sha256 =2D (base32 "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h"))= )) + (base32 "1cjial8njck2sd7452jcxspbi5h5fnp3n8v3wbmlw8fzqmgzvxx1")))) (build-system gnu-build-system) (arguments ;; TODO =E2=80=98--enable-pskc=E2=80=99 causes xmlsec-related test su= ite failures. diff --git a/gnu/packages/patches/oath-toolkit-glibc-compat.patch b/gnu/pac= kages/patches/oath-toolkit-glibc-compat.patch deleted file mode 100644 index 22814599e5..0000000000 =2D-- a/gnu/packages/patches/oath-toolkit-glibc-compat.patch +++ /dev/null @@ -1,90 +0,0 @@ =2DAdjust the bundled Gnulib to cope with removal of libio interface in Gli= bc 2.28. =2D =2DBased on this upstream gnulib patch: =2Dhttps://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=3D4af4a4a71827c0= bc5e0ec67af23edef4f15cee8e =2D =2D--- a/liboath/gl/fflush.c =2D+++ b/liboath/gl/fflush.c =2D@@ -33,7 +33,7 @@ =2D #undef fflush =2D=20 =2D=20 =2D-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, B= eOS, Haiku, Linux libc5 */ =2D+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeOS,= Haiku, Linux libc5 */ =2D=20 =2D /* Clear the stream's ungetc buffer, preserving the value of ftello (fp= ). */ =2D static void =2D@@ -72,7 +72,7 @@ =2D=20 =2D #endif =2D=20 =2D-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc= , BeOS, Haiku, Linux libc5 */) =2D+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, B= eOS, Haiku, Linux libc5 */) =2D=20 =2D # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__= ) && defined __SNPT =2D /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ =2D@@ -148,7 +148,7 @@ =2D if (stream =3D=3D NULL || ! freading (stream)) =2D return fflush (stream); =2D=20 =2D-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, B= eOS, Haiku, Linux libc5 */ =2D+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeOS,= Haiku, Linux libc5 */ =2D=20 =2D clear_ungetc_buffer_preserving_position (stream); =2D=20 =2D--- a/liboath/gl/fpurge.c =2D+++ b/liboath/gl/fpurge.c =2D@@ -62,7 +62,7 @@ =2D /* Most systems provide FILE as a struct and the necessary bitmask in =2D , because they need it for implementing getc() and putc()= as =2D fast macros. */ =2D-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, = BeOS, Haiku, Linux libc5 */ =2D+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeOS,= Haiku, Linux libc5 */ =2D fp->_IO_read_end =3D fp->_IO_read_ptr; =2D fp->_IO_write_ptr =3D fp->_IO_write_base; =2D /* Avoid memory leak when there is an active ungetc buffer. */ =2D--- a/libaoth/gl/freading.c =2D+++ b/liboath/gl/freading.c =2D@@ -31,7 +31,7 @@ =2D /* Most systems provide FILE as a struct and the necessary bitmask in =2D , because they need it for implementing getc() and putc()= as =2D fast macros. */ =2D-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, = BeOS, Haiku, Linux libc5 */ =2D+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeOS,= Haiku, Linux libc5 */ =2D return ((fp->_flags & _IO_NO_WRITES) !=3D 0 =2D || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) =3D= =3D 0 =2D && fp->_IO_read_base !=3D NULL)); =2D--- a/liboath/gl/fseeko.c =2D+++ b/liboath/gl/fseeko.c =2D@@ -47,7 +47,7 @@ =2D #endif =2D=20 =2D /* These tests are based on fpurge.c. */ =2D-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, B= eOS, Haiku, Linux libc5 */ =2D+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeOS= , Haiku, Linux libc5 */ =2D if (fp->_IO_read_end =3D=3D fp->_IO_read_ptr =2D && fp->_IO_write_ptr =3D=3D fp->_IO_write_base =2D && fp->_IO_save_base =3D=3D NULL) =2D@@ -123,7 +123,7 @@ =2D return -1; =2D } =2D=20 =2D-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, B= eOS, Haiku, Linux libc5 */ =2D+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeOS= , Haiku, Linux libc5 */ =2D fp->_flags &=3D ~_IO_EOF_SEEN; =2D fp->_offset =3D pos; =2D #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ =2D--- a/liboath/gl/stdio-impl.h =2D+++ b/liboath/gl/stdio-impl.h =2D@@ -18,6 +18,11 @@ =2D the same implementation of stdio extension API, except that some fie= lds =2D have different naming conventions, or their access requires some cas= ts. */ =2D=20 =2D+/* Glibc 2.28 made _IO_IN_BACKUP private, so define it here for now. */ =2D+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN =2D+# define _IO_IN_BACKUP 0x100 =2D+#endif =2D+ =2D /* BSD stdio derived implementations. */ =2D=20 =2D #if defined __NetBSD__ /* NetBSD */ =2D-=20 2.20.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSjzJyHC50xCrrUzy9RcisI/kdFogUCX6qtuwAKCRBRcisI/kdF ovcMAQDkvzJ2RZoeeNqGYcd5dCed315e/xYCFoGrch45NljjewEAjW7A9UmlmM4i KZC/GSOsgHBJbyIPEVFLYyeGI4H4TQE= =DYuc -----END PGP SIGNATURE----- --==-=-=--