From unknown Sun Jun 22 00:21:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#41464] [PATCH] gnu: git-annex: Update to 8.20200522. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 May 2020 18:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41464 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41464@debbugs.gnu.org Cc: Kyle Meyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159017121211442 (code B ref -1); Fri, 22 May 2020 18:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 May 2020 18:13:32 +0000 Received: from localhost ([127.0.0.1]:60345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcCAh-0002yQ-DN for submit@debbugs.gnu.org; Fri, 22 May 2020 14:13:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:36082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcCAc-0002yC-5f for submit@debbugs.gnu.org; Fri, 22 May 2020 14:13:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcCAb-0005J5-T0 for guix-patches@gnu.org; Fri, 22 May 2020 14:13:22 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:51396) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcCAX-0003RR-D7 for guix-patches@gnu.org; Fri, 22 May 2020 14:13:21 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 2BC1DC04F2; Fri, 22 May 2020 14:13:14 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=sasl; bh=6qAz+DgQkxLO3aJHBQ/wWieYvd0=; b=cMowZu7Y0rf9P+910LrJ Wko1B5/bUGen5oI3sfe9ZpNY5AWq86ORONHXLGn6R5Fj+JmSZBZkUuW2oWbMl+lk YSZpvDFmrXyxtJt8RHR5X4oMSgNTE/qb3xQJP0ii6uk9wo7Wu3bsPwOfmiBEkrS6 96wew6sG6DkmpGkkXFLYj70= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 23B87C04F1; Fri, 22 May 2020 14:13:14 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:mime-version:content-transfer-encoding; s=mesmtp; bh=MfVQaEcryNZBBDMZXAWw63KdjjXbylT/RB6CzCuN1rk=; b=2KtYbGcm41FsSnijq8Oc0mBD4RhKUzP7R5E5GbFneAineIKkQnkzn1NPhnbyrOuXU2i+415mOWCQBHcDJODfcb9H1+8lcGh8valOV89uxShtqacoO0hmPOYXp71DrtMrNDRq/08ust4nSrgQ749eR/rG6fA1UhG2rFccVv7C86w= Received: from localhost (unknown [45.33.91.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 60338C04F0; Fri, 22 May 2020 14:13:11 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer Date: Fri, 22 May 2020 14:12:50 -0400 Message-Id: <20200522181250.2237-1-kyle@kyleam.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Pobox-Relay-ID: E57703C4-9C57-11EA-A3FB-B0405B776F7B-24757444!pb-smtp20.pobox.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=173.228.157.52; envelope-from=kyle@kyleam.com; helo=pb-smtp20.pobox.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/22 14:13:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20200522. [source]: Remove patch that is now in a release. * gnu/packages/patches/git-annex-S3v4.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister git-annex-S3v4.patch. --- gnu/local.mk | 1 - gnu/packages/haskell-apps.scm | 6 +- gnu/packages/patches/git-annex-S3v4.patch | 77 ----------------------- 3 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 gnu/packages/patches/git-annex-S3v4.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1d9de9a57e..ed3780102e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -979,7 +979,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/git-annex-S3v4.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.sc= m index ecfe439c4b..3089c17145 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -37,7 +37,6 @@ (define-module (gnu packages haskell-apps) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system haskell) - #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages curl) #:use-module (gnu packages gl) @@ -342,15 +341,14 @@ (define-public ghcid (define-public git-annex (package (name "git-annex") - (version "8.20200501") + (version "8.20200522") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) - (patches (search-patches "git-annex-S3v4.patch")) (sha256 - (base32 "19rggaymvqy7r61n2rl2nigwdi2hzq5l1afcd5l0k1vbacwgq4jl"))= )) + (base32 "1v71k5k9mcj1nq4pb8apx99rgw2rmckr6yshhvjl1dr6j70d67x8"))= )) (build-system haskell-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/git-annex-S3v4.patch b/gnu/packages/pat= ches/git-annex-S3v4.patch deleted file mode 100644 index 9f7cea329e..0000000000 --- a/gnu/packages/patches/git-annex-S3v4.patch +++ /dev/null @@ -1,77 +0,0 @@ -From the upstream commit, with the changes to CHANGELOG and the docs -folder removed. - -From 1532d67c3ecf452b8c86bcc5928525398755cd01 Mon Sep 17 00:00:00 2001 -From: Joey Hess -Date: Thu, 7 May 2020 13:18:11 -0400 -Subject: [PATCH] S3: Support signature=3Dv4 - -To use S3 Signature Version 4. Some S3 services seem to require v4, whil= e -others may only support v2, which remains the default. - -I'm also not sure if v4 works correctly in all cases, there is this -upstream bug report: https://github.com/aristidb/aws/issues/262 -I've only tested it against the default S3 endpoint. ---- - CHANGELOG | 3 +++ - Remote/S3.hs | 23 ++++++++++++++++++- - ..._3bbdf23c8a4a480f4f6b8e8a2f8ddecd._comment | 13 +++++++++++ - ..._854390b9a781da82ecb85ad85eecad04._comment | 13 +++++++++++ - doc/special_remotes/S3.mdwn | 4 ++++ - ..._cf57e8dbd9fdc7c487565b61808b6bb2._comment | 10 ++++++++ - 6 files changed, 65 insertions(+), 1 deletion(-) - create mode 100644 doc/bugs/S3_special_remote_support_for_DigitalOcean_= Spaces/comment_2_3bbdf23c8a4a480f4f6b8e8a2f8ddecd._comment - create mode 100644 doc/forum/backblaze_s3/comment_1_854390b9a781da82ecb= 85ad85eecad04._comment - create mode 100644 doc/special_remotes/S3/comment_34_cf57e8dbd9fdc7c487= 565b61808b6bb2._comment - -diff --git a/Remote/S3.hs b/Remote/S3.hs -index cb345d1f8..e3ea492f2 100644 ---- a/Remote/S3.hs -+++ b/Remote/S3.hs -@@ -99,6 +99,8 @@ remote =3D specialRemoteType $ RemoteType - (FieldDesc "port to connect to") - , optionalStringParser requeststyleField - (FieldDesc "for path-style requests, set to \"path\"") -+ , signatureVersionParser signatureField -+ (FieldDesc "S3 signature version") - , optionalStringParser mungekeysField HiddenField - , optionalStringParser AWS.s3credsField HiddenField - ] -@@ -148,6 +150,22 @@ protocolField =3D Accepted "protocol" - requeststyleField :: RemoteConfigField - requeststyleField =3D Accepted "requeststyle" -=20 -+signatureField :: RemoteConfigField -+signatureField =3D Accepted "signature" -+ -+newtype SignatureVersion =3D SignatureVersion Int -+ -+signatureVersionParser :: RemoteConfigField -> FieldDesc -> RemoteConfi= gFieldParser -+signatureVersionParser f fd =3D -+ genParser go f defver fd -+ (Just (ValueDesc "v2 or v4")) -+ where -+ go "v2" =3D Just (SignatureVersion 2) -+ go "v4" =3D Just (SignatureVersion 4) -+ go _ =3D Nothing -+ -+ defver =3D SignatureVersion 2 -+ - portField :: RemoteConfigField - portField =3D Accepted "port" -=20 -@@ -877,7 +895,10 @@ s3Configuration c =3D cfg - Nothing - | port =3D=3D 443 -> AWS.HTTPS - | otherwise -> AWS.HTTP -- cfg =3D S3.s3 proto endpoint False -+ cfg =3D case getRemoteConfigValue signatureField c of -+ Just (SignatureVersion 4) ->=20 -+ S3.s3v4 proto endpoint False S3.SignWithEffort -+ _ -> S3.s3 proto endpoint False -=20 - data S3Info =3D S3Info - { bucket :: S3.Bucket ---=20 -2.26.2 - base-commit: 50ea3135e0948a042cd3b899e970f6ade291a0c2 --=20 2.26.2 From unknown Sun Jun 22 00:21:19 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kyle Meyer Subject: bug#41464: closed (Re: [bug#41464] [PATCH] gnu: git-annex: Update to 8.20200522.) Message-ID: References: <20200522225648.GA13264@jasmine.lan> <20200522181250.2237-1-kyle@kyleam.com> X-Gnu-PR-Message: they-closed 41464 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 41464@debbugs.gnu.org Date: Fri, 22 May 2020 22:58:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1590188281-13885-1" This is a multi-part message in MIME format... ------------=_1590188281-13885-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #41464: [PATCH] gnu: git-annex: Update to 8.20200522. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 41464@debbugs.gnu.org. --=20 41464: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D41464 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1590188281-13885-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 41464-done) by debbugs.gnu.org; 22 May 2020 22:57:19 +0000 Received: from localhost ([127.0.0.1]:60731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcGbK-0003ZB-QZ for submit@debbugs.gnu.org; Fri, 22 May 2020 18:57:18 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:42611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcGbE-0003Yl-CP for 41464-done@debbugs.gnu.org; Fri, 22 May 2020 18:57:12 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 0836AAB7; Fri, 22 May 2020 18:57:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 22 May 2020 18:57:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=+OD0dQ7luUOs/OX0mPlbbZv9 tJSD03ZKXOrHEAq5EdA=; b=NcP/GMv7OoDO/un0hIthNke9Poro2jUGxxKqYs97 ny6/cinTXjNZ/3kUgC/Al3JtLLFunxxyWhR9eaMYwNdwkLQK30VTmloIzYpfxhTQ Z72hvWKz4fbdHQoCdyX0QN7jTLJS3hg8Rp0s0Ul2HvkHEjOAkDcb2kEZa8Bzn45j mHA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=+OD0dQ 7luUOs/OX0mPlbbZv9tJSD03ZKXOrHEAq5EdA=; b=uyff7JKgCa//60gnJIK/Ha Ey3PlZzckain+UpeuAbcPFXZlMSBDvs/ed+fnqNKirtmu4RByNk4pwPvCgCIuRBm iVYKF1YpI4coT19mS66y8nXkkMQH0zqBQFqmGnXsoz1KUTDL2G1nWOKBpC7yGPto wCo9KxDg2ntM6jHWYRXgdjXkewoPPBzWqBhC6QjSXgreSnSX5nN7VaV1jrQ0Vr8d FI5EehEsFnWFMNBA5QyBR0z9jD7d7pm6EQIDR3fAllPHaw+APstTbSAcfklYe7rk XlOADHUnyMVFXI3ER+MdRi0MJmOgOU1bU51rMnrTOLMihfbAEibui5qPtD8o0wIw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedruddugedgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpedukeevgeetkeeltefgiedtjefgjeekffduteehvdfhueekudelieekjeefheff teenucfkphepjeeirdduvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 0A6913280059; Fri, 22 May 2020 18:57:01 -0400 (EDT) Date: Fri, 22 May 2020 18:56:48 -0400 From: Leo Famulari To: Kyle Meyer Subject: Re: [bug#41464] [PATCH] gnu: git-annex: Update to 8.20200522. Message-ID: <20200522225648.GA13264@jasmine.lan> References: <20200522181250.2237-1-kyle@kyleam.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="+HP7ph2BbKc20aGI" Content-Disposition: inline In-Reply-To: <20200522181250.2237-1-kyle@kyleam.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41464-done Cc: 41464-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, May 22, 2020 at 02:12:50PM -0400, Kyle Meyer wrote: > * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20200522. > [source]: Remove patch that is now in a release. > * gnu/packages/patches/git-annex-S3v4.patch: Delete file. > * gnu/local.mk (dist_patch_DATA): Unregister git-annex-S3v4.patch. Thanks! Pushed as f64a74dd6c69a0e404b40b7688cdcbcaf63fdf42 --+HP7ph2BbKc20aGI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl7IWLAACgkQJkb6MLrK fwgnfg/+LyB0yoYwsTMAiFM13xYJ2720hzzT2fPwXWhEFgditWZAJmoWv5f9+BEm NWbN42XHkk7UIeJt2RIIjQED4cahQpiq0H/DuS9bwj7W/excK5VgKlA7VXr5UHSM 7El0OUS1s570sh0cLk/i3NnvWjddkmAZ6lrwEpS6/6kdpJaR7mOkeBu2rMEeCD1g fr7Nx2pb2T5J5bWJtHviRfjReM50fDPUrL0q/bj323VaMhzbo1Se7UAbKaBPL8cu QQfrGHYHeDDijKsEi7ba7HwNrv/qQl3Eozlzm+ekPfYZ+ZmBl0Cg8xath/pxtjq/ iRQis5hDydELEZw18+SO+LC1mfROm0dprjZhEnh3MHO2NpZ0jAhROCALXYKaC+nI NfbsHTadaooRXDg3HYjk8698dr4n6fgR/mxCL4hnsDmAgVdefdM5Gdven80rzqMi v8yXuAedWs8ECA6hq7orvhtKE9f0a0Ku15xU+TGVoWk5yq2WTlA3+/nkMPP4YesO JIJ16DHh3cyVCE3iYWhVJbtwDwiuWrApBzYtsZhb0fqyHKfZk/l7Rs/AYkeWF5O2 s4BDkZtqm5oDZ94FVeBtwfISBZRrjz9hefHKy/5Ky95WKxxbwrA3Uf9t6BQpceDr F+oli3gWtCKS6sawSjWLc3bFnKmVZHtlKgJmoPGuTMHQw7ihck8= =xxC1 -----END PGP SIGNATURE----- --+HP7ph2BbKc20aGI-- ------------=_1590188281-13885-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 May 2020 18:13:32 +0000 Received: from localhost ([127.0.0.1]:60345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcCAh-0002yQ-DN for submit@debbugs.gnu.org; Fri, 22 May 2020 14:13:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:36082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcCAc-0002yC-5f for submit@debbugs.gnu.org; Fri, 22 May 2020 14:13:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcCAb-0005J5-T0 for guix-patches@gnu.org; Fri, 22 May 2020 14:13:22 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:51396) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcCAX-0003RR-D7 for guix-patches@gnu.org; Fri, 22 May 2020 14:13:21 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 2BC1DC04F2; Fri, 22 May 2020 14:13:14 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=sasl; bh=6qAz+DgQkxLO3aJHBQ/wWieYvd0=; b=cMowZu7Y0rf9P+910LrJ Wko1B5/bUGen5oI3sfe9ZpNY5AWq86ORONHXLGn6R5Fj+JmSZBZkUuW2oWbMl+lk YSZpvDFmrXyxtJt8RHR5X4oMSgNTE/qb3xQJP0ii6uk9wo7Wu3bsPwOfmiBEkrS6 96wew6sG6DkmpGkkXFLYj70= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 23B87C04F1; Fri, 22 May 2020 14:13:14 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:mime-version:content-transfer-encoding; s=mesmtp; bh=MfVQaEcryNZBBDMZXAWw63KdjjXbylT/RB6CzCuN1rk=; b=2KtYbGcm41FsSnijq8Oc0mBD4RhKUzP7R5E5GbFneAineIKkQnkzn1NPhnbyrOuXU2i+415mOWCQBHcDJODfcb9H1+8lcGh8valOV89uxShtqacoO0hmPOYXp71DrtMrNDRq/08ust4nSrgQ749eR/rG6fA1UhG2rFccVv7C86w= Received: from localhost (unknown [45.33.91.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 60338C04F0; Fri, 22 May 2020 14:13:11 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer To: guix-patches@gnu.org Subject: [PATCH] gnu: git-annex: Update to 8.20200522. Date: Fri, 22 May 2020 14:12:50 -0400 Message-Id: <20200522181250.2237-1-kyle@kyleam.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Pobox-Relay-ID: E57703C4-9C57-11EA-A3FB-B0405B776F7B-24757444!pb-smtp20.pobox.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=173.228.157.52; envelope-from=kyle@kyleam.com; helo=pb-smtp20.pobox.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/22 14:13:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Kyle Meyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20200522. [source]: Remove patch that is now in a release. * gnu/packages/patches/git-annex-S3v4.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister git-annex-S3v4.patch. --- gnu/local.mk | 1 - gnu/packages/haskell-apps.scm | 6 +- gnu/packages/patches/git-annex-S3v4.patch | 77 ----------------------- 3 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 gnu/packages/patches/git-annex-S3v4.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1d9de9a57e..ed3780102e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -979,7 +979,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/git-annex-S3v4.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.sc= m index ecfe439c4b..3089c17145 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -37,7 +37,6 @@ (define-module (gnu packages haskell-apps) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system haskell) - #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages curl) #:use-module (gnu packages gl) @@ -342,15 +341,14 @@ (define-public ghcid (define-public git-annex (package (name "git-annex") - (version "8.20200501") + (version "8.20200522") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) - (patches (search-patches "git-annex-S3v4.patch")) (sha256 - (base32 "19rggaymvqy7r61n2rl2nigwdi2hzq5l1afcd5l0k1vbacwgq4jl"))= )) + (base32 "1v71k5k9mcj1nq4pb8apx99rgw2rmckr6yshhvjl1dr6j70d67x8"))= )) (build-system haskell-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/git-annex-S3v4.patch b/gnu/packages/pat= ches/git-annex-S3v4.patch deleted file mode 100644 index 9f7cea329e..0000000000 --- a/gnu/packages/patches/git-annex-S3v4.patch +++ /dev/null @@ -1,77 +0,0 @@ -From the upstream commit, with the changes to CHANGELOG and the docs -folder removed. - -From 1532d67c3ecf452b8c86bcc5928525398755cd01 Mon Sep 17 00:00:00 2001 -From: Joey Hess -Date: Thu, 7 May 2020 13:18:11 -0400 -Subject: [PATCH] S3: Support signature=3Dv4 - -To use S3 Signature Version 4. Some S3 services seem to require v4, whil= e -others may only support v2, which remains the default. - -I'm also not sure if v4 works correctly in all cases, there is this -upstream bug report: https://github.com/aristidb/aws/issues/262 -I've only tested it against the default S3 endpoint. ---- - CHANGELOG | 3 +++ - Remote/S3.hs | 23 ++++++++++++++++++- - ..._3bbdf23c8a4a480f4f6b8e8a2f8ddecd._comment | 13 +++++++++++ - ..._854390b9a781da82ecb85ad85eecad04._comment | 13 +++++++++++ - doc/special_remotes/S3.mdwn | 4 ++++ - ..._cf57e8dbd9fdc7c487565b61808b6bb2._comment | 10 ++++++++ - 6 files changed, 65 insertions(+), 1 deletion(-) - create mode 100644 doc/bugs/S3_special_remote_support_for_DigitalOcean_= Spaces/comment_2_3bbdf23c8a4a480f4f6b8e8a2f8ddecd._comment - create mode 100644 doc/forum/backblaze_s3/comment_1_854390b9a781da82ecb= 85ad85eecad04._comment - create mode 100644 doc/special_remotes/S3/comment_34_cf57e8dbd9fdc7c487= 565b61808b6bb2._comment - -diff --git a/Remote/S3.hs b/Remote/S3.hs -index cb345d1f8..e3ea492f2 100644 ---- a/Remote/S3.hs -+++ b/Remote/S3.hs -@@ -99,6 +99,8 @@ remote =3D specialRemoteType $ RemoteType - (FieldDesc "port to connect to") - , optionalStringParser requeststyleField - (FieldDesc "for path-style requests, set to \"path\"") -+ , signatureVersionParser signatureField -+ (FieldDesc "S3 signature version") - , optionalStringParser mungekeysField HiddenField - , optionalStringParser AWS.s3credsField HiddenField - ] -@@ -148,6 +150,22 @@ protocolField =3D Accepted "protocol" - requeststyleField :: RemoteConfigField - requeststyleField =3D Accepted "requeststyle" -=20 -+signatureField :: RemoteConfigField -+signatureField =3D Accepted "signature" -+ -+newtype SignatureVersion =3D SignatureVersion Int -+ -+signatureVersionParser :: RemoteConfigField -> FieldDesc -> RemoteConfi= gFieldParser -+signatureVersionParser f fd =3D -+ genParser go f defver fd -+ (Just (ValueDesc "v2 or v4")) -+ where -+ go "v2" =3D Just (SignatureVersion 2) -+ go "v4" =3D Just (SignatureVersion 4) -+ go _ =3D Nothing -+ -+ defver =3D SignatureVersion 2 -+ - portField :: RemoteConfigField - portField =3D Accepted "port" -=20 -@@ -877,7 +895,10 @@ s3Configuration c =3D cfg - Nothing - | port =3D=3D 443 -> AWS.HTTPS - | otherwise -> AWS.HTTP -- cfg =3D S3.s3 proto endpoint False -+ cfg =3D case getRemoteConfigValue signatureField c of -+ Just (SignatureVersion 4) ->=20 -+ S3.s3v4 proto endpoint False S3.SignWithEffort -+ _ -> S3.s3 proto endpoint False -=20 - data S3Info =3D S3Info - { bucket :: S3.Bucket ---=20 -2.26.2 - base-commit: 50ea3135e0948a042cd3b899e970f6ade291a0c2 --=20 2.26.2 ------------=_1590188281-13885-1--