From a48a06edeaf9253e68de1ec6cf5d5d686edb07dc Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Thu, 2 Sep 2021 19:34:00 +0200 Subject: [PATCH] upgrading package: opa 0.29.4.20210531 -> 0.32.0.20210902 --- opa/opa.patch | 27 ++++++++++++++------------- opa/opa.spec | 6 +++--- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/opa/opa.patch b/opa/opa.patch index 06ed18f545..dfd51260f9 100644 --- a/opa/opa.patch +++ b/opa/opa.patch @@ -1,16 +1,16 @@ Index: src/github.com/open-policy-agent/opa/Makefile ---- src/github.com/open-policy-agent/opa/Makefile.orig 2021-04-17 09:22:46.000000000 +0200 -+++ src/github.com/open-policy-agent/opa/Makefile 2021-04-17 19:50:49.057374000 +0200 -@@ -20,7 +20,7 @@ - GOARCH := $(shell go env GOARCH) - GOOS := $(shell go env GOOS) +--- src/github.com/open-policy-agent/opa/Makefile.orig 2021-09-02 17:20:55.000000000 +0200 ++++ src/github.com/open-policy-agent/opa/Makefile 2021-09-02 17:28:21.915058000 +0200 +@@ -25,7 +25,7 @@ + + GOLANGCI_LINT_VERSION := v1.40.1 -DOCKER_RUNNING := $(shell docker ps >/dev/null 2>&1 && echo 1 || echo 0) +DOCKER_RUNNING := 0 - ifeq ($(shell tty > /dev/null && echo 1 || echo 0), 1) - DOCKER_FLAGS := --rm -it -@@ -28,7 +28,7 @@ + # We use root because the windows build, invoked through the ci-go-build-windows + # target, installs the gcc mingw32 cross-compiler. +@@ -39,7 +39,7 @@ DOCKER_FLAGS := --rm endif @@ -19,7 +19,7 @@ Index: src/github.com/open-policy-agent/opa/Makefile BIN := opa_$(GOOS)_$(GOARCH) -@@ -91,7 +91,7 @@ +@@ -103,7 +103,7 @@ .PHONY: go-build go-build: generate @@ -29,19 +29,20 @@ Index: src/github.com/open-policy-agent/opa/Makefile .PHONY: go-test go-test: generate Index: src/github.com/open-policy-agent/opa/vendor/github.com/bytecodealliance/wasmtime-go/ffi.go ---- src/github.com/open-policy-agent/opa/vendor/github.com/bytecodealliance/wasmtime-go/ffi.go.orig 2021-04-17 09:22:47.000000000 +0200 -+++ src/github.com/open-policy-agent/opa/vendor/github.com/bytecodealliance/wasmtime-go/ffi.go 2021-04-17 19:53:42.737100000 +0200 -@@ -1,10 +1,13 @@ +--- src/github.com/open-policy-agent/opa/vendor/github.com/bytecodealliance/wasmtime-go/ffi.go.orig 2021-09-02 17:28:21.915259000 +0200 ++++ src/github.com/open-policy-agent/opa/vendor/github.com/bytecodealliance/wasmtime-go/ffi.go 2021-09-02 19:31:42.889872000 +0200 +@@ -1,11 +1,14 @@ package wasmtime // #cgo CFLAGS:-I${SRCDIR}/build/include --// #cgo !windows LDFLAGS:-lwasmtime -lm -ldl +-// #cgo !windows LDFLAGS:-lwasmtime -lm -ldl -pthread +// #cgo linux LDFLAGS:-lwasmtime -lm -ldl +// #cgo freebsd LDFLAGS:-lwasmtime -lutil -lm +// #cgo darwin LDFLAGS:-lwasmtime -lm // #cgo windows CFLAGS:-DWASM_API_EXTERN= -DWASI_API_EXTERN= // #cgo windows LDFLAGS:-lwasmtime -luserenv -lole32 -lntdll -lws2_32 -lkernel32 -lbcrypt // #cgo linux,amd64 LDFLAGS:-L${SRCDIR}/build/linux-x86_64 + // #cgo linux,arm64 LDFLAGS:-L${SRCDIR}/build/linux-aarch64 +// #cgo freebsd,amd64 LDFLAGS:-L${SRCDIR}/build/freebsd-x86_64 // #cgo darwin,amd64 LDFLAGS:-L${SRCDIR}/build/macos-x86_64 // #cgo windows,amd64 LDFLAGS:-L${SRCDIR}/build/windows-x86_64 diff --git a/opa/opa.spec b/opa/opa.spec index 52f02b8999..1b831c7409 100644 --- a/opa/opa.spec +++ b/opa/opa.spec @@ -22,8 +22,8 @@ ## # package version -%define V_opa_base 0.29.4 -%define V_opa_snap 20210531 +%define V_opa_base 0.32.0 +%define V_opa_snap 20210902 # package information Name: opa @@ -36,7 +36,7 @@ Class: EVAL Group: Networking License: Apache Version: %{V_opa_base}.%{V_opa_snap} -Release: 20210531 +Release: 20210902 # list of sources Source0: http://download.openpkg.org/components/versioned/opa/opa-%{V_opa_snap}.tar.xz