From 748fcc80ba88134eaefdc404e7f09a00595843d1 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 30 Nov 2020 20:34:09 +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#b9658ff8e6e303e69f05a609fdc46302ecff2484 --- .gitignore | 3 --- containers.conf | 3 +-- skopeo.spec | 21 +++------------------ sources | 2 +- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index b3ca221..9d0a918 100644 --- a/.gitignore +++ b/.gitignore @@ -211,6 +211,3 @@ /skopeo-bbd800f.tar.gz /skopeo-77293ff.tar.gz /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..f5ad076 100644 --- a/containers.conf +++ b/containers.conf @@ -60,7 +60,6 @@ # the default capabilities defined in the container engine will be added. # default_capabilities = [ - "AUDIT_WRITE", "CHOWN", "DAC_OVERRIDE", "FOWNER", @@ -78,7 +77,7 @@ default_capabilities = [ # for example:"net.ipv4.ping_group_range = 0 1000". # default_sysctls = [ - "net.ipv4.ping_group_range=0 1", + "net.ipv4.ping_group_range=0 65536", ] # A list of ulimits to be set in containers by default, specified as diff --git a/skopeo.spec b/skopeo.spec index 878b8e5..6f8bb2d 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 d8bc8b62e90912db24d090a1eca8b4fa46cba084 +%global commit0 8151b89b8161e4b0d378df2e10a9c8601fed08b2 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag @@ -45,8 +45,8 @@ Epoch: 1 %else Epoch: 2 %endif -Version: 1.2.1 -Release: 4.dev.git%{shortcommit0}%{?dist} +Version: 1.1.1 +Release: 50.dev.git%{shortcommit0}%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -447,21 +447,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog -* 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 - -* Fri Sep 25 2020 RH Container Bot - 1:1.2.1-2.dev.git44beab6 -- bump to 1.2.1 -- autobuilt 44beab6 - -* Fri Sep 25 2020 Dan Walsh - 1:1.1.1-51.dev.git5d5756c -- Modify the range of groups used in net.ipv4.ping_group_range to be 1 so that -- it will work more easily with User Namespaces -- Also turn back on AUDIT_WRITE until seccomp.json file is fixed - * Mon Sep 21 18:12:41 UTC 2020 RH Container Bot - 1:1.1.1-50.dev.git8151b89 - autobuilt 8151b89 diff --git a/sources b/sources index 5b466dd..871b711 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-d8bc8b6.tar.gz) = 04c3fcb4a61df01aad6fb2c938009524cce3476759d868c75b24641013a998db3c7f8a910b2a350f84d74c1bc5471fc20c5ea7939175faa25dccf17353d57823 +SHA512 (skopeo-8151b89.tar.gz) = ccc7c0dcc3996728c5c8ca51e5d0002dd06b9845d032e86b7240954d62718af193b6e7c6fde5a2034642c091fe9966e64ecc68a34ca69d833ef1cf6ffd09a203