[PATCH] gnu: git-annex: Update to 8.20200522.

Kyle Meyer wrote on 22 May 2020 20:12

Recipients:(address . guix-patches@gnu.org)(name . Kyle Meyer)(address . kyle@kyleam.com)

Message-ID:20200522181250.2237-1-kyle@kyleam.com

* 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

Toggle diff (129 lines)diff --git a/gnu/local.mk b/gnu/local.mkindex 1d9de9a57e..ed3780102e 100644--- a/gnu/local.mk+++ b/gnu/local.mk@@ -979,7 +979,6 @@ dist_patch_DATA =						\   %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.scmindex 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-flagsdiff --git a/gnu/packages/patches/git-annex-S3v4.patch b/gnu/packages/patches/git-annex-S3v4.patchdeleted file mode 100644index 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 <joeyh@joeyh.name>-Date: Thu, 7 May 2020 13:18:11 -0400-Subject: [PATCH] S3: Support signature=v4--To use S3 Signature Version 4. Some S3 services seem to require v4, while-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_854390b9a781da82ecb85ad85eecad04._comment- create mode 100644 doc/special_remotes/S3/comment_34_cf57e8dbd9fdc7c487565b61808b6bb2._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 = 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 = Accepted "protocol"- requeststyleField :: RemoteConfigField- requeststyleField = Accepted "requeststyle"- -+signatureField :: RemoteConfigField-+signatureField = Accepted "signature"-+-+newtype SignatureVersion = SignatureVersion Int-+-+signatureVersionParser :: RemoteConfigField -> FieldDesc -> RemoteConfigFieldParser-+signatureVersionParser f fd =-+	genParser go f defver fd-+		(Just (ValueDesc "v2 or v4"))-+  where-+	go "v2" = Just (SignatureVersion 2)-+	go "v4" = Just (SignatureVersion 4)-+	go _ = Nothing-+-+	defver = SignatureVersion 2-+- portField :: RemoteConfigField- portField = Accepted "port"- -@@ -877,7 +895,10 @@ s3Configuration c = cfg- 		Nothing- 			| port == 443 -> AWS.HTTPS- 			| otherwise -> AWS.HTTP--	cfg = S3.s3 proto endpoint False-+	cfg = case getRemoteConfigValue signatureField c of-+		Just (SignatureVersion 4) -> -+			S3.s3v4 proto endpoint False S3.SignWithEffort-+		_ -> S3.s3 proto endpoint False- - data S3Info = S3Info- 	{ bucket :: S3.Bucket--- -2.26.2-
base-commit: 50ea3135e0948a042cd3b899e970f6ade291a0c2-- 2.26.2

Leo Famulari wrote on 23 May 2020 00:56

Recipients:(name . Kyle Meyer)(address . kyle@kyleam.com)(address . 41464-done@debbugs.gnu.org)

Message-ID:20200522225648.GA13264@jasmine.lan

On Fri, May 22, 2020 at 02:12:50PM -0400, Kyle Meyer wrote:

Toggle quote (5 lines)

> * 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

Closed

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send email to 41464@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date