[arch-commits] Commit in rekor/trunk (PKGBUILD fix-expired-tuf-root.patch)

[Kpcyrd]

    Date: Saturday, February 5, 2022 @ 08:25:44
  Author: kpcyrd
Revision: 1126414

upgpkg: rekor 0.5.0-1

Modified:
  rekor/trunk/PKGBUILD
Deleted:
  rekor/trunk/fix-expired-tuf-root.patch

----------------------------+
 PKGBUILD                   |   13 +---
 fix-expired-tuf-root.patch |  118 -------------------------------------------
 2 files changed, 3 insertions(+), 128 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-05 08:21:29 UTC (rev 1126413)
+++ PKGBUILD	2022-02-05 08:25:44 UTC (rev 1126414)
@@ -2,7 +2,7 @@
 # Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
 
 pkgname=rekor
-pkgver=0.4.0
+pkgver=0.5.0
 pkgrel=1
 pkgdesc="Signature Transparency Log -- Sigstore client and server tools"
 arch=('x86_64')
@@ -10,16 +10,9 @@
 license=('Apache')
 makedepends=('go' 'git')
 checkdepends=('openssh')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/sigstore/rekor/archive/v${pkgver}.tar.gz"
-        "fix-expired-tuf-root.patch")
-sha256sums=('19c369f88d846098fb3895948af493f73c97f7211fd1714f9f77ab4395beef4d'
-            '1a39711c28f904409ed7e9027a0e2d7a41e1ddc3395703126df7c17f97f3b162')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/sigstore/rekor/archive/v${pkgver}.tar.gz")
+sha256sums=('3d235cc16df95c4fffc674ec968d301d351bc167ba197bd75f39679aec8f7bc5')
 
-prepare() {
-    cd "${pkgname}-${pkgver}"
-    patch -Np1 -i ../fix-expired-tuf-root.patch
-}
-
 build() {
   cd "${pkgname}-${pkgver}"
   export CGO_CPPFLAGS="${CPPFLAGS}"

Deleted: fix-expired-tuf-root.patch
===================================================================
--- fix-expired-tuf-root.patch	2022-02-05 08:21:29 UTC (rev 1126413)
+++ fix-expired-tuf-root.patch	2022-02-05 08:25:44 UTC (rev 1126414)
@@ -1,118 +0,0 @@
-diff --git a/pkg/pki/tuf/tuf_test.go b/pkg/pki/tuf/tuf_test.go
-index c244dc1..0668333 100644
---- a/pkg/pki/tuf/tuf_test.go
-+++ b/pkg/pki/tuf/tuf_test.go
-@@ -20,8 +20,22 @@ import (
- 	"io"
- 	"os"
- 	"testing"
-+	"time"
-+
-+	"github.com/theupdateframework/go-tuf/verify"
- )
- 
-+func patchIsExpired() func() {
-+	// Patch out the IsExpired to make the tests stable :)
-+	old := verify.IsExpired
-+	verify.IsExpired = func(t time.Time) bool {
-+		return false
-+	}
-+	return func() {
-+		verify.IsExpired = old
-+	}
-+}
-+
- func TestReadPublicKey(t *testing.T) {
- 	// Tests reading a valid public key (root.json)
- 	type test struct {
-@@ -37,6 +51,9 @@ func TestReadPublicKey(t *testing.T) {
- 		{caseDesc: "Valid TUF root.json", inputFile: "testdata/1.root.json", errorFound: false, specVersion: "1.0"},
- 	}
- 
-+	// Patch out the expired function to make tests stable :)
-+	defer patchIsExpired()()
-+
- 	for _, tc := range tests {
- 		file, err := os.Open(tc.inputFile)
- 		if err != nil {
-@@ -101,6 +118,9 @@ func TestCanonicalValue(t *testing.T) {
- 		t.Errorf("CanonicalValue did not error out for uninitialized key")
- 	}
- 
-+	// Patch out the expired function to make tests stable :)
-+	defer patchIsExpired()()
-+
- 	tests := []test{
- 		{caseDesc: "root", input: "testdata/1.root.json", output: "testdata/reformat.1.root.json", match: true},
- 	}
-@@ -115,7 +135,7 @@ func TestCanonicalValue(t *testing.T) {
- 
- 		inputKey, err := NewPublicKey(inputFile)
- 		if err != nil {
--			t.Errorf("%v: Error reading input for TestCanonicalValuePublicKey: %v", tc.caseDesc, err)
-+			t.Errorf("%v: Error reading input for TestCanonicalValue: %v", tc.caseDesc, err)
- 		}
- 
- 		cvInput, err := inputKey.CanonicalValue()
-@@ -130,7 +150,7 @@ func TestCanonicalValue(t *testing.T) {
- 
- 		outputKey, err := NewPublicKey(outputFile)
- 		if err != nil {
--			t.Errorf("%v: Error reading input for TestCanonicalValuePublicKey: %v", tc.caseDesc, err)
-+			t.Errorf("%v: Error reading input for TestCanonicalValue: %v", tc.caseDesc, err)
- 		}
- 
- 		cvOutput, err := outputKey.CanonicalValue()
-@@ -159,6 +179,8 @@ func TestVerifySignature(t *testing.T) {
- 		{caseDesc: "Valid root.json, unsigned root.json", keyFile: "testdata/1.root.json", sigFile: "testdata/unsigned_root.json", verified: false},
- 	}
- 
-+	defer patchIsExpired()()
-+
- 	for _, tc := range tests {
- 		keyFile, err := os.Open(tc.keyFile)
- 		if err != nil {
-diff --git a/pkg/types/tuf/v0.0.1/entry_test.go b/pkg/types/tuf/v0.0.1/entry_test.go
-index dd1b899..ffb8843 100644
---- a/pkg/types/tuf/v0.0.1/entry_test.go
-+++ b/pkg/types/tuf/v0.0.1/entry_test.go
-@@ -26,6 +26,7 @@ import (
- 	"net/http/httptest"
- 	"reflect"
- 	"testing"
-+	"time"
- 
- 	"github.com/go-openapi/runtime"
- 	"github.com/go-openapi/strfmt"
-@@ -33,10 +34,22 @@ import (
- 	"github.com/sigstore/rekor/pkg/generated/models"
- 	"github.com/sigstore/rekor/pkg/types"
- 	"github.com/theupdateframework/go-tuf/data"
-+	"github.com/theupdateframework/go-tuf/verify"
- 
- 	"go.uber.org/goleak"
- )
- 
-+func patchIsExpired() func() {
-+	// Patch out the IsExpired to make the tests stable :)
-+	old := verify.IsExpired
-+	verify.IsExpired = func(t time.Time) bool {
-+		return false
-+	}
-+	return func() {
-+		verify.IsExpired = old
-+	}
-+}
-+
- func TestMain(m *testing.M) {
- 	goleak.VerifyTestMain(m)
- }
-@@ -49,6 +62,8 @@ func TestNewEntryReturnType(t *testing.T) {
- }
- 
- func TestCrossFieldValidation(t *testing.T) {
-+	defer patchIsExpired()()
-+
- 	type TestCase struct {
- 		caseDesc                  string
- 		entry                     V001Entry