From f114552b3c2669bf73cec0ebe67db6fb6d7e4d05 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 30 Nov 2020 20:35:05 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/skopeo.git#957b2447574845b5977154d8742cf3c132cf0232 --- .gitignore | 1 + containers.conf | 2 +- skopeo.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ba41f41..b3ca221 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,4 @@ /skopeo-8151b89.tar.gz /skopeo-44beab6.tar.gz /skopeo-6dabefa.tar.gz +/skopeo-d8bc8b6.tar.gz diff --git a/containers.conf b/containers.conf index 1abf943..3e53958 100644 --- a/containers.conf +++ b/containers.conf @@ -60,13 +60,13 @@ # the default capabilities defined in the container engine will be added. # default_capabilities = [ - "AUDIT_WRITE", "CHOWN", "DAC_OVERRIDE", "FOWNER", "FSETID", "KILL", "NET_BIND_SERVICE", + "SETFCAP", "SETGID", "SETPCAP", "SETUID", diff --git a/skopeo.spec b/skopeo.spec index 70cd76b..8f1d4ce 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -28,7 +28,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{import_path} -%global commit0 6dabefa9db30a172d68267d2ed864712d2d25aa1 +%global commit0 d8bc8b62e90912db24d090a1eca8b4fa46cba084 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag @@ -46,7 +46,7 @@ Epoch: 1 Epoch: 2 %endif Version: 1.2.1 -Release: 3.dev.git%{shortcommit0}%{?dist} +Release: 5.dev.git%{shortcommit0}%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -447,6 +447,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Fri Oct 2 2020 Dan Walsh - 1:1.2.1-5.dev.gitd8bc8b6 +- Add SETFCAP back into default capabilities +- Remove AUDIT_WRITE from default capabilities + +* Fri Oct 2 2020 RH Container Bot - 1:1.2.1-4.dev.gitd8bc8b6 +- autobuilt d8bc8b6 + * Wed Sep 30 2020 RH Container Bot - 1:1.2.1-3.dev.git6dabefa - autobuilt 6dabefa diff --git a/sources b/sources index 503c16f..5b466dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-6dabefa.tar.gz) = 637b23a4df7c97e5fe49771be004813ef8e59f2b18e949239239772bb7ea7aa6d6f6e75a3daff74b985e870756a5f4cf46ff47214efe4ce2800e65fa858f0bb1 +SHA512 (skopeo-d8bc8b6.tar.gz) = 04c3fcb4a61df01aad6fb2c938009524cce3476759d868c75b24641013a998db3c7f8a910b2a350f84d74c1bc5471fc20c5ea7939175faa25dccf17353d57823