Browse Source

upgrading package: opa 0.29.4.20210531 -> 0.32.0.20210902

master
parent
commit
a48a06edea
  1. 27
      opa/opa.patch
  2. 6
      opa/opa.spec

27
opa/opa.patch

@ -1,16 +1,16 @@
Index: src/github.com/open-policy-agent/opa/Makefile 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.orig 2021-09-02 17:20:55.000000000 +0200
+++ src/github.com/open-policy-agent/opa/Makefile 2021-04-17 19:50:49.057374000 +0200 +++ src/github.com/open-policy-agent/opa/Makefile 2021-09-02 17:28:21.915058000 +0200
@@ -20,7 +20,7 @@ @@ -25,7 +25,7 @@
GOARCH := $(shell go env GOARCH)
GOOS := $(shell go env GOOS) GOLANGCI_LINT_VERSION := v1.40.1
-DOCKER_RUNNING := $(shell docker ps >/dev/null 2>&1 && echo 1 || echo 0) -DOCKER_RUNNING := $(shell docker ps >/dev/null 2>&1 && echo 1 || echo 0)
+DOCKER_RUNNING := 0 +DOCKER_RUNNING := 0
ifeq ($(shell tty > /dev/null && echo 1 || echo 0), 1) # We use root because the windows build, invoked through the ci-go-build-windows
DOCKER_FLAGS := --rm -it # target, installs the gcc mingw32 cross-compiler.
@@ -28,7 +28,7 @@ @@ -39,7 +39,7 @@
DOCKER_FLAGS := --rm DOCKER_FLAGS := --rm
endif endif
@ -19,7 +19,7 @@ Index: src/github.com/open-policy-agent/opa/Makefile
BIN := opa_$(GOOS)_$(GOARCH) BIN := opa_$(GOOS)_$(GOARCH)
@@ -91,7 +91,7 @@ @@ -103,7 +103,7 @@
.PHONY: go-build .PHONY: go-build
go-build: generate go-build: generate
@ -29,19 +29,20 @@ Index: src/github.com/open-policy-agent/opa/Makefile
.PHONY: go-test .PHONY: go-test
go-test: generate go-test: generate
Index: src/github.com/open-policy-agent/opa/vendor/github.com/bytecodealliance/wasmtime-go/ffi.go 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.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-04-17 19:53:42.737100000 +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,10 +1,13 @@ @@ -1,11 +1,14 @@
package wasmtime package wasmtime
// #cgo CFLAGS:-I${SRCDIR}/build/include // #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 linux LDFLAGS:-lwasmtime -lm -ldl
+// #cgo freebsd LDFLAGS:-lwasmtime -lutil -lm +// #cgo freebsd LDFLAGS:-lwasmtime -lutil -lm
+// #cgo darwin LDFLAGS:-lwasmtime -lm +// #cgo darwin LDFLAGS:-lwasmtime -lm
// #cgo windows CFLAGS:-DWASM_API_EXTERN= -DWASI_API_EXTERN= // #cgo windows CFLAGS:-DWASM_API_EXTERN= -DWASI_API_EXTERN=
// #cgo windows LDFLAGS:-lwasmtime -luserenv -lole32 -lntdll -lws2_32 -lkernel32 -lbcrypt // #cgo windows LDFLAGS:-lwasmtime -luserenv -lole32 -lntdll -lws2_32 -lkernel32 -lbcrypt
// #cgo linux,amd64 LDFLAGS:-L${SRCDIR}/build/linux-x86_64 // #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 freebsd,amd64 LDFLAGS:-L${SRCDIR}/build/freebsd-x86_64
// #cgo darwin,amd64 LDFLAGS:-L${SRCDIR}/build/macos-x86_64 // #cgo darwin,amd64 LDFLAGS:-L${SRCDIR}/build/macos-x86_64
// #cgo windows,amd64 LDFLAGS:-L${SRCDIR}/build/windows-x86_64 // #cgo windows,amd64 LDFLAGS:-L${SRCDIR}/build/windows-x86_64

6
opa/opa.spec

@ -22,8 +22,8 @@
## ##
# package version # package version
%define V_opa_base 0.29.4 %define V_opa_base 0.32.0
%define V_opa_snap 20210531 %define V_opa_snap 20210902
# package information # package information
Name: opa Name: opa
@ -36,7 +36,7 @@ Class: EVAL
Group: Networking Group: Networking
License: Apache License: Apache
Version: %{V_opa_base}.%{V_opa_snap} Version: %{V_opa_base}.%{V_opa_snap}
Release: 20210531 Release: 20210902
# list of sources # list of sources
Source0: http://download.openpkg.org/components/versioned/opa/opa-%{V_opa_snap}.tar.xz Source0: http://download.openpkg.org/components/versioned/opa/opa-%{V_opa_snap}.tar.xz

Loading…
Cancel
Save