diff --git a/kubevela.yaml b/kubevela.yaml index ff2eb0b02d7..05d178c352b 100644 --- a/kubevela.yaml +++ b/kubevela.yaml @@ -1,6 +1,6 @@ package: name: kubevela - version: 1.7.7 + version: 1.8.0 epoch: 0 description: KubeVela is a modern application delivery platform that makes deploying and operating applications across today's hybrid, multi-cloud environments easier, faster and more reliable copyright: @@ -21,7 +21,7 @@ pipeline: - uses: fetch with: uri: https://github.com/kubevela/kubevela/archive/refs/tags/v${{package.version}}.tar.gz - expected-sha256: ae70ffabe5ee80288806770c608364fffca66e884c19d397b1aff42286995c46 + expected-sha256: 7738083803fb3e9f61260ff900cf8dfd935fc271873f776e62a66c22eb45f72d - runs: | export CGO_ENABLED=0 @@ -33,12 +33,6 @@ pipeline: ldflags: '"-X github.com/oam-dev/kubevela/version.VelaVersion=${{package.version}}"' output: manager - - uses: go/build - with: - packages: ./cmd/apiserver/main.go - ldflags: '"-X github.com/oam-dev/kubevela/version.VelaVersion=${{package.version}}"' - output: apiserver - - uses: go/build with: packages: ./references/cmd/cli/main.go diff --git a/libcap.yaml b/libcap.yaml index c51b3bd25df..57330a9865e 100644 --- a/libcap.yaml +++ b/libcap.yaml @@ -1,7 +1,7 @@ package: name: libcap - version: 2.26 - epoch: 2 + version: "2.68" + epoch: 0 description: "POSIX 1003.1e capabilities" copyright: - license: BSD-3-Clause OR GPL-2.0-only @@ -15,12 +15,13 @@ environment: - busybox - build-base - perl + - bash pipeline: - uses: fetch with: uri: https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${{package.version}}.tar.xz - expected-sha512: 1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0 + expected-sha512: ede3e1356aef22e18a46dc8ff0727500ab023bea698cf2bb822abb06625e272940afea52ad6457d0cd8cf1c7f435f1b568baf0a6bf0a08ae96fbf6d7502f9de2 - runs: | set -x diff --git a/openldap.yaml b/openldap.yaml index cfd735d1b03..9feed40c477 100644 --- a/openldap.yaml +++ b/openldap.yaml @@ -1,7 +1,7 @@ package: name: openldap - version: 2.6.3 - epoch: 1 + version: 2.6.4 + epoch: 0 description: LDAP Server copyright: - license: OLDAP-2.8 @@ -47,10 +47,6 @@ pipeline: with: patches: 0004-Fix-manpages.patch - - uses: patch - with: - patches: 0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch - - uses: patch with: patches: 0009-Include-more-schemas-in-default-config.patch diff --git a/openldap/0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch b/openldap/0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch deleted file mode 100644 index f002f1e2d69..00000000000 --- a/openldap/0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch +++ /dev/null @@ -1,29 +0,0 @@ -# originated from https://git.alpinelinux.org/aports/plain/main/openldap/0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch - -From daea61a39b53badef423af056eddf3f29803e948 Mon Sep 17 00:00:00 2001 -From: Lars Kellogg-Stedman -Date: Fri, 19 Aug 2022 22:42:28 -0400 -Subject: [PATCH 6/8] Fix build on mips* (inconsistent cacheflush() prototype) - -Apply the main/lmdb mips* build fix to the bundled lmdb copy. ---- - libraries/liblmdb/mdb.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c -index 8cecdb2..82cefc3 100644 ---- a/libraries/liblmdb/mdb.c -+++ b/libraries/liblmdb/mdb.c -@@ -77,8 +77,7 @@ - - #if defined(__mips) && defined(__linux) - /* MIPS has cache coherency issues, requires explicit cache control */ --#include --extern int cacheflush(char *addr, int nbytes, int cache); -+#include - #define CACHEFLUSH(addr, bytes, cache) cacheflush(addr, bytes, cache) - #else - #define CACHEFLUSH(addr, bytes, cache) --- -2.37.1 -