From 092de221aaaa894dc734f4cbad81a68bc56352b8 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 27 Oct 2020 18:51:19 +0100 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#8a8daa96efbe2ded6b1f47af64331807d040e1e8 --- .gitignore | 1 + seccomp.json | 14 +++++++++++++- skopeo.spec | 18 +++++++++++++++--- sources | 2 +- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 53ee2dc..41da832 100644 --- a/.gitignore +++ b/.gitignore @@ -218,3 +218,4 @@ /skopeo-4cc72b9.tar.gz /skopeo-10da9f7.tar.gz /skopeo-362f70b.tar.gz +/skopeo-ceaee44.tar.gz diff --git a/seccomp.json b/seccomp.json index 07cdd6c..ec24538 100644 --- a/seccomp.json +++ b/seccomp.json @@ -68,9 +68,13 @@ "chown", "chown32", "clock_adjtime", + "clock_adjtime64", "clock_getres", + "clock_getres_time64", "clock_gettime", + "clock_gettime64", "clock_nanosleep", + "clock_nanosleep_time64", "clone", "close", "connect", @@ -223,17 +227,20 @@ "openat", "openat2", "pause", + "pidfd_getfd", "pipe", "pipe2", "pivot_root", "poll", "ppoll", + "ppoll_time64", "prctl", "pread64", "preadv", "preadv2", "prlimit64", "pselect6", + "pselect6_time64", "pwrite64", "pwritev", "pwritev2", @@ -346,10 +353,13 @@ "timer_delete", "timer_getoverrun", "timer_gettime", + "timer_gettime64", "timer_settime", "timerfd_create", "timerfd_gettime", + "timerfd_gettime64", "timerfd_settime", + "timerfd_settime64", "times", "tkill", "truncate", @@ -364,6 +374,7 @@ "unshare", "utime", "utimensat", + "utimensat_time64", "utimes", "vfork", "vmsplice", @@ -750,7 +761,8 @@ "names": [ "settimeofday", "stime", - "clock_settime" + "clock_settime", + "clock_settime64" ], "action": "SCMP_ACT_ALLOW", "args": [], diff --git a/skopeo.spec b/skopeo.spec index ec88399..97e46b8 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 362f70b056a1f5d2bd4184527a0ae0d20c4d35d3 +%global commit0 ceaee440a68e53652fb9abb913ff0a251655e800 %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: 10.dev.git%{shortcommit0}%{?dist} +Release: 14.dev.git%{shortcommit0}%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -79,7 +79,7 @@ BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel # Dependencies for containers/storage -%if 0%{?fedora} && ! 0%{?centos} >= 8 && ! 0%{?eln} +%if 0%{?fedora} && ! 0%{?centos} >= 8 && ! 0%{?rhel} BuildRequires: btrfs-progs-devel %endif BuildRequires: pkgconfig(devmapper) @@ -449,6 +449,18 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Mon Oct 26 2020 Dan Walsh - 1:1.2.1-14.dev.gitceaee44 +- fix seccomp.json typos + +* Thu Oct 22 2020 Jindrich Novy - 1:1.2.1-13.dev.gitceaee44 +- use %%rhel instead of %%eln + +* Wed Oct 21 2020 Dan Walsh - 1:1.2.1-12.dev.gitceaee44 +- Add time64 syscalls to seccomp.json + +* Wed Oct 21 2020 RH Container Bot - 1:1.2.1-11.dev.gitceaee44 +- autobuilt ceaee44 + * Thu Oct 15 2020 RH Container Bot - 1:1.2.1-10.dev.git362f70b - autobuilt 362f70b diff --git a/sources b/sources index 2319957..b7addda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-362f70b.tar.gz) = 0a3f2b9de8c28d70c39fb475e4ae6b0759c448bdf14b7c56ba3fbaf058e7ad88ddfbfe7a5a9abc22722e25eb3be6ee8acd9e1e2422ed97909bd540f9e28105a9 +SHA512 (skopeo-ceaee44.tar.gz) = 0b6b6aded0fbe8345fa27b9d6b9fb702bbe60e704e729192c288d73cd43a8d9284e7a9e4cd02c16e6ba6a368d2e381c44166b37a6d05c37b8c50af668867b473