hotdog: update to latest release on github

bottlerocket-os · Dec 23, 2021 · dc18e95 · dc18e95
1 parent c7c00d6
commit dc18e95
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/packages/hotdog/Cargo.toml b/packages/hotdog/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/bottlerocket-os/hotdog/archive/c32a7572e104d88e96ce2e6fbfb168387d289c80/hotdog-c32a757.tar.gz"
-sha512 = "1577bb4535b1c702788644f1793275a7a4ab2e2596c5e395d4b4e0124a833dc2b16d4ff8039dab6a92e75b3d09c003c70c6b1236f7efd30ad0cf94bb42f34c99"
+url = "https://github.com/bottlerocket-os/hotdog/archive/3f2ca9275fae8db87409c3a0999aa2c8a4bd44d1/hotdog-3f2ca92.tar.gz"
+sha512 = "ebf8f2f8f2c7b12443eae5eccdf0d37724637ac972874b9a88eb8d21d88cbe661b0b53680015ebb8c06e17bde708acf90f39fac82002a4c72266ecdac87c3fb5"
 
 [[package.metadata.build-package.external-files]]
 url = "https://github.com/opencontainers/runtime-spec/archive/v1.0.2/runtime-spec-1.0.2.tar.gz"
@@ -20,6 +20,16 @@ sha512 = "96676b702d02409d33a5c81886c4db4bf45283c628933c6f0f4c2ed0d7cc44fafe9524
 url = "https://github.com/golang/sys/archive/4abf325e0275e4ef0bdd441dcf497570f1419ab9/sys-4abf325.tar.gz"
 sha512 = "74c51b1eb48a0a31443f9cb7ee4e2d7550f2477cbc89fad3909f973f042c8bc2bfc378582847c498ce157c3c28d14a3b22d69e9220539dc5dd87a77bb7b407e3"
 
+[[package.metadata.build-package.external-files]]
+path = "go-selinux-v1.10.0.tar.gz"
+url = "https://github.com/opencontainers/selinux/archive/refs/tags/v1.10.0.tar.gz"
+sha512 = "88c2591416aaea346bf438021c5f5095212ab6eec765c4b9ba149bd229cdc92a6baddc11f4aef7cfa7f0a5df6eb453e5670689679fd831848860eb28aca034a2"
+
+[[package.metadata.build-package.external-files]]
+path = "libcap-v1.2.62.tar.gz"
+url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-cap/v1.2.62.tar.gz"
+sha512 = "d533563e4a2b4b9f910730286180d160c00e436e7f6970e124a67991ab2dcdeca4a6b07cb230d812cc6b4771935accc49ba0ed0465a581a571f0ddb4752284f7"
+
 [build-dependencies]
 glibc = { path = "../glibc" }
 

diff --git a/packages/hotdog/hotdog.spec b/packages/hotdog/hotdog.spec
@@ -7,14 +7,18 @@
 %global gorepo hotdog
 %global goimport %{goproject}/%{gorepo}
 
-%global gitrev c32a7572e104d88e96ce2e6fbfb168387d289c80
+%global gitrev 3f2ca9275fae8db87409c3a0999aa2c8a4bd44d1
 %global shortrev %(c=%{gitrev}; echo ${c:0:7})
 
 %global gosysrev 4abf325e0275e4ef0bdd441dcf497570f1419ab9
 %global gosysrevshort %(c=%{gosysrev}; echo ${c:0:7})
 
 %global runtimespec 1.0.2
 
+%global goselinux 1.10.0
+
+%global libcap 1.2.62
+
 Name: %{_cross_os}hotdog
 Version: 1.0.0
 Release: 1%{?dist}
@@ -24,6 +28,8 @@ URL: https://github.com/awslabs/oci-add-hooks
 Source0: https://%{goimport}/archive/%{gorev}/%{gorepo}-%{shortrev}.tar.gz
 Source1: https://github.com/opencontainers/runtime-spec/archive/v%{runtimespec}/runtime-spec-%{runtimespec}.tar.gz
 Source2: https://github.com/golang/sys/archive/%{gosysrev}/sys-%{gosysrevshort}.tar.gz
+Source3: https://github.com/opencontainers/selinux/archive/refs/tags/v%{goselinux}.tar.gz#/go-selinux-v%{goselinux}.tar.gz
+Source4: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-cap/v%{libcap}.tar.gz#/libcap-v%{libcap}.tar.gz
 
 BuildRequires: %{_cross_os}glibc-devel
 Requires: %{_cross_os}log4j2-hotpatch
@@ -44,9 +50,16 @@ cp GOPATH/src/github.com/opencontainers/runtime-spec/LICENSE LICENSE.runtime-spe
 
 mkdir -p GOPATH/src/golang.org/x/sys
 tar -C GOPATH/src/golang.org/x/sys -xzf %{SOURCE2} --strip 1
-ls -la GOPATH/src/golang.org/x/sys
 cp GOPATH/src/golang.org/x/sys/LICENSE LICENSE.golang-sys
 
+mkdir -p GOPATH/src/github.com/opencontainers/selinux
+tar -C GOPATH/src/github.com/opencontainers/selinux -xzf %{SOURCE3} --strip 1
+cp GOPATH/src/github.com/opencontainers/selinux/LICENSE LICENSE.go-selinux
+
+mkdir -p GOPATH/src/kernel.org/pub/linux/libs/security/libcap
+tar -C GOPATH/src/kernel.org/pub/linux/libs/security/libcap -xzf %{SOURCE4} --strip 2
+cp GOPATH/src/kernel.org/pub/linux/libs/security/libcap/License LICENSE.libcap
+
 %build
 %cross_go_configure %{goimport}
 
@@ -71,7 +84,7 @@ for cmd in hotdog-cc-hook hotdog-poststart-hook; do
 done
 
 %files
-%license LICENSE LICENSE.runtime-spec LICENSE.golang-sys
+%license LICENSE LICENSE.runtime-spec LICENSE.golang-sys LICENSE.go-selinux LICENSE.libcap
 %{_cross_attribution_file}
 %dir %{_cross_libexecdir}/hotdog
 %dir %{_cross_datadir}/hotdog