#1 Bump to upstream 88942b9c40a4c9d203b82b3731787b672d6e809b
Merged 6 years ago by jchaloup. Opened 6 years ago by eclipseo.
Unknown source master  into  master

file modified
+1
@@ -1,1 +1,2 @@

  /crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz

+ /crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz

@@ -1,32 +0,0 @@

- From 3680b74baed71629f388a7469a82ff4b295c2135 Mon Sep 17 00:00:00 2001

- From: Tobias Klauser <tklauser@distanz.ch>

- Date: Sun, 5 Nov 2017 16:25:19 +0100

- Subject: [PATCH] blake2s: fix vet format string issue

- 

- Fix the following format string issue reported by go vet:

- 

-   blake2s_test.go:188: Fatalf format %v reads arg #3, but call has only 2 args

- 

- Change-Id: I689eadb7d7310ae93acd8a8419755f2724ff41dd

- Reviewed-on: https://go-review.googlesource.com/75978

- Reviewed-by: Filippo Valsorda <hi@filippo.io>

- ---

-  blake2s/blake2s_test.go | 2 +-

-  1 file changed, 1 insertion(+), 1 deletion(-)

- 

- diff --git a/blake2s/blake2s_test.go b/blake2s/blake2s_test.go

- index 938fef3..cfeb18b 100644

- --- a/blake2s/blake2s_test.go

- +++ b/blake2s/blake2s_test.go

- @@ -185,7 +185,7 @@ func testHashes2X(t *testing.T) {

-  	if n, err := h.Read(result[:]); err != nil {

-  		t.Fatalf("#unknown length: error from Read: %v", err)

-  	} else if n != len(result) {

- -		t.Fatalf("#unknown length: Read returned %d bytes, want %d: %v", n, len(result))

- +		t.Fatalf("#unknown length: Read returned %d bytes, want %d", n, len(result))

-  	}

-  

-  	const expected = "2a9a6977d915a2c4dd07dbcafe1918bf1682e56d9c8e567ecd19bfd7cd93528833c764d12b34a5e2a219c9fd463dab45e972c5574d73f45de5b2e23af72530d8"

- -- 

- 2.7.5

- 

@@ -1,19 +1,18 @@

  # https://github.com/golang/crypto

  %global forgeurl        https://github.com/golang/crypto

  %global goipath         golang.org/x/crypto

- %global commit          9419663f5a44be8b34ca85f08abc5fe1be11f8a3

+ %global commit          88942b9c40a4c9d203b82b3731787b672d6e809b

  %global x_name          golang-golangorg-crypto

  

- %gometa -i

+ %gometa

  

  Name:           golang-googlecode-go-crypto

  Version:        0

- Release:        0.20%{?dist}

+ Release:        0.21%{?dist}

  Summary:        Supplementary Go cryptography libraries

  License:        BSD

  URL:            %{gourl}

  Source0:        %{gosource}

- Patch0:         blake2s-fix-vet-format-string-issue.patch

  

  %description

  %{summary}
@@ -32,11 +31,9 @@

  

  %prep

  %gosetup

- %patch0 -p1

  

  %install

- files="$(find . -iname testdata -type d)"

- %goinstall $files

+ %goinstall

  

  %check

  %gochecks -d chacha20poly1305 -d ocsp -d ssh
@@ -49,6 +46,9 @@

  %doc *.md AUTHORS CONTRIBUTORS

  

  %changelog

+ * Sat Mar 24 2018 Robert-André Mauchin <zebob.m@gmail.com> - 0-0.21.20180324git9419663

+ - Bump to upstream 88942b9c40a4c9d203b82b3731787b672d6e809b

+ 

  * Tue Mar 06 2018 Jan Chaloupka <jchaloup@redhat.com> - 0-0.20.git9419663

  - Bump to upstream 9419663f5a44be8b34ca85f08abc5fe1be11f8a3

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz) = 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e

+ SHA512 (crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz) = 2c81f213f5d934af9b449d0bcb4b6ee2078b4db842933aa84b6dcaf893029f2bba3657fd3cab14749cff8d4cca6ee64dc7478d4c790f314bb12ebb8fed88d179

I need a new update to use the new method HTTPHandler from autocert.Manager (from commit https://github.com/golang/crypto/commit/13931e22f9e72ea58bb73048bc752b48c6d4d4ac)

# golang.org/x/build/maintner/maintnerd
./maintnerd.go:283:29: autocertManager.HTTPHandler undefined (type *autocert.Manager has no field or method HTTPHandler)
FAIL    golang.org/x/build/maintner/maintnerd [build failed]

I tested this update in COPR. Also scratch build in Koji: https://koji.fedoraproject.org/koji/taskinfo?taskID=25930731

$ time gofed apidiff --compare-with upstream:github.com/golang/crypto:88942b9c40a4c9d203b82b3731787b672d6e809b --reference upstream:github.com/golang/crypto:9419663f5a44be8b34ca85f08abc5fe1be11f8a3 --prefix golang.org/x/crypto -ca
+golang.org/x/crypto/acme/autocert: new function: Manager.HTTPHandler
~golang.org/x/crypto/acme/autocert: type updated: +struct certTokens: new field 'tokensMu'
~golang.org/x/crypto/acme/autocert: type updated: +struct certTokens: new field 'tryHTTP01'
~golang.org/x/crypto/acme/autocert: type updated: +struct certTokens: new field 'httpTokens'
~golang.org/x/crypto/acme/autocert: type updated: +struct certTokens: new field 'certTokens'
~golang.org/x/crypto/acme/autocert: type updated: -struct certTokens: 'tokenCert' field removed
~golang.org/x/crypto/acme/autocert: type updated: -struct certTokens: 'tokenCertMu' field removed
+golang.org/x/crypto/blake2b: new function: New
+golang.org/x/crypto/ed25519/internal/edwards25519: new function: ScMinimal
+golang.org/x/crypto/ssh: new function: BannerDisplayStderr
+golang.org/x/crypto/ssh: new variable: ErrNoAuth
+golang.org/x/crypto/ssh: new type: BannerCallback
~golang.org/x/crypto/ssh: type updated: +struct BannerCallback: new field 'BannerCallback'
~golang.org/x/crypto/ssh: type updated: +struct Timeout: new field 'BannerCallback'
~golang.org/x/crypto/ssh: type updated: -identifiers differ in type: bool != authResult
~golang.org/x/crypto/ssh/terminal: type updated: -identifiers differ in type: syscall != unix

There are slight changes between the commits. However, looks like nothing series.

Pull-Request has been merged by jchaloup

6 years ago