From 16ce5f48b759629276b305fa7772b4e07bfec4ca Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:07:09 +0000 Subject: [PATCH 001/184] Initialize branch F-13 for crun --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 48a90a8c9a50ee4ff7338ffb8aab564f87e53a1d Mon Sep 17 00:00:00 2001 From: Damien Durand Date: Fri, 5 Mar 2010 12:54:24 +0000 Subject: [PATCH 002/184] Initial import --- import.log | 1 + 1 file changed, 1 insertion(+) diff --git a/import.log b/import.log index a705c3b..a7848b0 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ crun-0_1_1-1_fc13:HEAD:crun-0.1.1-1.fc13.src.rpm:1262807578 +crun-0_1_1-1_fc12:F-13:crun-0.1.1-1.fc12.src.rpm:1267793642 From ed7a355dcc6b105d4b9e6b59ee56f5fbf8b51e84 Mon Sep 17 00:00:00 2001 From: Damien Durand Date: Fri, 5 Mar 2010 13:00:51 +0000 Subject: [PATCH 003/184] Initial import --- import.log | 1 + 1 file changed, 1 insertion(+) diff --git a/import.log b/import.log index a705c3b..088f91c 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ crun-0_1_1-1_fc13:HEAD:crun-0.1.1-1.fc13.src.rpm:1262807578 +crun-0_1_1-1_fc12:HEAD:crun-0.1.1-1.fc12.src.rpm:1267794025 From 1e791044a0b8bd649a737e5b496e570b366309ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:20:18 +0000 Subject: [PATCH 004/184] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 2 -- 4 files changed, 24 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6f0e9e3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: crun -# $Id$ -NAME := crun -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index a7848b0..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -crun-0_1_1-1_fc13:HEAD:crun-0.1.1-1.fc13.src.rpm:1262807578 -crun-0_1_1-1_fc12:F-13:crun-0.1.1-1.fc12.src.rpm:1267793642 From 94863f10982982bf2469e3f4f4f62de5e3d0e6a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:20:19 +0000 Subject: [PATCH 005/184] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 2 -- 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6f0e9e3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: crun -# $Id$ -NAME := crun -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 088f91c..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -crun-0_1_1-1_fc13:HEAD:crun-0.1.1-1.fc13.src.rpm:1262807578 -crun-0_1_1-1_fc12:HEAD:crun-0.1.1-1.fc12.src.rpm:1267794025 From 2010bba797bc4e20901c3acd1f4a558826f0ede6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 27 Aug 2010 14:58:16 -0400 Subject: [PATCH 006/184] Retire crun. --- crun.spec | 38 -------------------------------------- dead.package | 1 + sources | 1 - 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 crun.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/crun.spec b/crun.spec deleted file mode 100644 index d3d5ab2..0000000 --- a/crun.spec +++ /dev/null @@ -1,38 +0,0 @@ -Name: crun -Version: 0.1.1 -Release: 1%{?dist} -Summary: Lightweight, easy to use, simpler cron-like tool - -Group: Applications/System -License: GPLv2+ -URL: http://code.google.com/p/koolkit/wiki/crun -Source0: http://koolkit.googlecode.com/files/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%description -crun is a light weight, easy to use, simpler cron like tool. -It Executes a given program, a specified number of times, after a specified -time interval. - -%prep -%setup -q - -%build -%configure -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README -%{_bindir}/crun - -%changelog -* Fri Dec 11 2009 Damien Durand 0.1.1-1 -- Initial release diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..7dcad86 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired due to no active owner on 2010-08-27 diff --git a/sources b/sources deleted file mode 100644 index dfe7623..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -0865cb80e85afc598cab2ec5b4820c15 crun-0.1.1.tar.gz From a1607893138bf2f14dd4991ea9513731c90080d8 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 21 Jun 2019 13:01:30 -0400 Subject: [PATCH 007/184] Revert "Retire crun." Unretirement for https://pagure.io/releng/issue/8463 This reverts commit 2010bba797bc4e20901c3acd1f4a558826f0ede6. --- crun.spec | 38 ++++++++++++++++++++++++++++++++++++++ dead.package | 1 - sources | 1 + 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 crun.spec delete mode 100644 dead.package create mode 100644 sources diff --git a/crun.spec b/crun.spec new file mode 100644 index 0000000..d3d5ab2 --- /dev/null +++ b/crun.spec @@ -0,0 +1,38 @@ +Name: crun +Version: 0.1.1 +Release: 1%{?dist} +Summary: Lightweight, easy to use, simpler cron-like tool + +Group: Applications/System +License: GPLv2+ +URL: http://code.google.com/p/koolkit/wiki/crun +Source0: http://koolkit.googlecode.com/files/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +crun is a light weight, easy to use, simpler cron like tool. +It Executes a given program, a specified number of times, after a specified +time interval. + +%prep +%setup -q + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_bindir}/crun + +%changelog +* Fri Dec 11 2009 Damien Durand 0.1.1-1 +- Initial release diff --git a/dead.package b/dead.package deleted file mode 100644 index 7dcad86..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -This package was retired due to no active owner on 2010-08-27 diff --git a/sources b/sources new file mode 100644 index 0000000..dfe7623 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +0865cb80e85afc598cab2ec5b4820c15 crun-0.1.1.tar.gz From 8bf27bd1fbe41bb39a2d2cb406e888d9786b8210 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 21 Jun 2019 19:11:11 +0200 Subject: [PATCH 008/184] crun-0.6-1 Signed-off-by: Giuseppe Scrivano --- crun.spec | 59 ++++++++++++++++++++++++++++++++----------------------- sources | 2 +- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/crun.spec b/crun.spec index d3d5ab2..80add67 100644 --- a/crun.spec +++ b/crun.spec @@ -1,38 +1,47 @@ -Name: crun -Version: 0.1.1 -Release: 1%{?dist} -Summary: Lightweight, easy to use, simpler cron-like tool +Summary: OCI runtime written in C +Name: crun +Version: 0.6 +Release: 1%{?dist} +Source0: https://github.com/giuseppe/crun/releases/download/%{version}/%{name}-%{version}.tar.gz +License: GPLv3+ +URL: https://github.com/giuseppe/crun -Group: Applications/System -License: GPLv2+ -URL: http://code.google.com/p/koolkit/wiki/crun -Source0: http://koolkit.googlecode.com/files/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# We always run autogen.sh +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc +BuildRequires: python +BuildRequires: git +BuildRequires: libcap-devel +BuildRequires: systemd-devel +BuildRequires: yajl-devel +BuildRequires: libseccomp-devel +BuildRequires: libselinux-devel +BuildRequires: python3-libmount +BuildRequires: libtool +BuildRequires: go-md2man %description -crun is a light weight, easy to use, simpler cron like tool. -It Executes a given program, a specified number of times, after a specified -time interval. +crun is a OCI runtime %prep -%setup -q +%autosetup -n %{name}-%{version} %build -%configure -make %{?_smp_mflags} +./autogen.sh +%configure --disable-silent-rules + +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -%clean -rm -rf $RPM_BUILD_ROOT +%make_install +rm -rf $RPM_BUILD_ROOT/usr/lib* %files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README -%{_bindir}/crun +%license COPYING +%{_bindir}/%{name} +%{_mandir}/man1/* %changelog -* Fri Dec 11 2009 Damien Durand 0.1.1-1 -- Initial release +* Tue Jun 18 2019 Giuseppe Scrivano - 0.6-1 +- built version 0.6 diff --git a/sources b/sources index dfe7623..42e0932 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0865cb80e85afc598cab2ec5b4820c15 crun-0.1.1.tar.gz +SHA512 (crun-0.6.tar.gz) = 5303945770372d7a14bb79deb0dc6c75840e520bacf54880c21d6bb7122f32c0cba67dd6bf2b56dc1fb4878f194284f9d6b4dcf46bf6ce9667d38c267ff79542 From 7a1c7a937913d8575aebaa569d8f644fd7b92d9e Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 18 Jul 2019 14:10:44 +0200 Subject: [PATCH 009/184] crun-0.7-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 2 ++ crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 342aad3..f3fe4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ crun-0.1.1.tar.gz +/crun-0.6.tar.gz +/crun-0.7.tar.gz diff --git a/crun.spec b/crun.spec index 80add67..4b4c724 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.6 +Version: 0.7 Release: 1%{?dist} Source0: https://github.com/giuseppe/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -22,7 +22,7 @@ BuildRequires: libtool BuildRequires: go-md2man %description -crun is a OCI runtime +crun is a runtime for running OCI containers %prep %autosetup -n %{name}-%{version} @@ -43,5 +43,8 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Jul 18 2019 Giuseppe Scrivano - 0.7-1 +- built version 0.7 + * Tue Jun 18 2019 Giuseppe Scrivano - 0.6-1 - built version 0.6 diff --git a/sources b/sources index 42e0932..721e387 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.6.tar.gz) = 5303945770372d7a14bb79deb0dc6c75840e520bacf54880c21d6bb7122f32c0cba67dd6bf2b56dc1fb4878f194284f9d6b4dcf46bf6ce9667d38c267ff79542 +SHA512 (crun-0.7.tar.gz) = 948e7fc607d7371cdafb55d97717136201833dc258edcdbdc80bfe3ca50cbc5c3dcdffabecdb08391d4624eb1e115b633dfb16caa32a4332df438a4e1034e0ef From 00b021b851dcbff1175db6e22b249d8bf9a017fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 21:13:43 +0000 Subject: [PATCH 010/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 4b4c724..1a005a5 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/giuseppe/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/giuseppe/crun @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jul 18 2019 Giuseppe Scrivano - 0.7-1 - built version 0.7 From 2dbcdcdaf763bec13df591bcfd8b73d70d7117ba Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 12 Aug 2019 11:48:17 +0200 Subject: [PATCH 011/184] crun.spec: fix repository to containers/crun Signed-off-by: Giuseppe Scrivano --- crun.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 1a005a5..4c5763d 100644 --- a/crun.spec +++ b/crun.spec @@ -2,9 +2,9 @@ Summary: OCI runtime written in C Name: crun Version: 0.7 Release: 2%{?dist} -Source0: https://github.com/giuseppe/crun/releases/download/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ -URL: https://github.com/giuseppe/crun +URL: https://github.com/containers/crun # We always run autogen.sh BuildRequires: autoconf From 10538a2e0b692bb09a4685468c59a69a18c97ad3 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 19 Aug 2019 15:11:29 +0200 Subject: [PATCH 012/184] crun-0.8-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f3fe4ff..26a45bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ crun-0.1.1.tar.gz /crun-0.6.tar.gz /crun-0.7.tar.gz +/crun-0.8.tar.gz diff --git a/crun.spec b/crun.spec index 4c5763d..6f2df89 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.7 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Aug 19 2019 Giuseppe Scrivano - 0.8-1 +- built version 0.8 + * Wed Jul 24 2019 Fedora Release Engineering - 0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 721e387..74450e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.7.tar.gz) = 948e7fc607d7371cdafb55d97717136201833dc258edcdbdc80bfe3ca50cbc5c3dcdffabecdb08391d4624eb1e115b633dfb16caa32a4332df438a4e1034e0ef +SHA512 (crun-0.8.tar.gz) = f6dc135be388af456b9e9d3c2fac58186580440d3370c309c8d512e70e27edcc51b2ee1ef8801a19038eaadf70ba3fc92812774a4954a4657b28a971faaa2104 From abb2487055c4d694710e25bd27cca8e2f0a0b355 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 9 Sep 2019 13:49:51 +0200 Subject: [PATCH 013/184] crun-0.8-2 --- crun.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 6f2df89..e4318ae 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -20,6 +20,7 @@ BuildRequires: libselinux-devel BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: go-md2man +Provides: oci-runtime %description crun is a runtime for running OCI containers @@ -43,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Sep 9 2019 Dan Walsh - 0.8-2 +- Add provides oci-runtime + * Mon Aug 19 2019 Giuseppe Scrivano - 0.8-1 - built version 0.8 From d349fd9c3dcad2e130977a5eda98341a79432d7f Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Tue, 10 Sep 2019 12:00:43 +0200 Subject: [PATCH 014/184] Add versioned oci-runtime provide. Signed-off-by: Jindrich Novy --- crun.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index e4318ae..3af0319 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -20,7 +20,7 @@ BuildRequires: libselinux-devel BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: go-md2man -Provides: oci-runtime +Provides: oci-runtime = 2 %description crun is a runtime for running OCI containers @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Tue Sep 10 2019 Jindrich Novy - 0.8-3 +- Add versioned oci-runtime provide. + * Mon Sep 9 2019 Dan Walsh - 0.8-2 - Add provides oci-runtime From 2a8100f70c236e4e57e2c543a59e2a49c0080450 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 11 Sep 2019 23:27:29 +0200 Subject: [PATCH 015/184] crun-0.9 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 26a45bb..1eb52c0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ crun-0.1.1.tar.gz /crun-0.6.tar.gz /crun-0.7.tar.gz /crun-0.8.tar.gz +/crun-0.9.tar.gz diff --git a/crun.spec b/crun.spec index 3af0319..e02de6f 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.8 -Release: 3%{?dist} +Version: 0.9 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Sep 11 2019 Giuseppe Scrivano - 0.9-1 +- built version 0.9 + * Tue Sep 10 2019 Jindrich Novy - 0.8-3 - Add versioned oci-runtime provide. diff --git a/sources b/sources index 74450e5..211cd3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.8.tar.gz) = f6dc135be388af456b9e9d3c2fac58186580440d3370c309c8d512e70e27edcc51b2ee1ef8801a19038eaadf70ba3fc92812774a4954a4657b28a971faaa2104 +SHA512 (crun-0.9.tar.gz) = 2a946ac48acab5a9b19779352a1df58cb15a108932eb935775c02396dc76f7592a7530b2c831c5fc7f45d9103bb8d03fe29edfceaddc7b6625c6616cbcf03ff6 From b39231a7db198dc854c36db58cfafde4072137f2 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 13 Sep 2019 15:59:22 +0200 Subject: [PATCH 016/184] crun-0.9-2 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1eb52c0..878d67c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ crun-0.1.1.tar.gz /crun-0.7.tar.gz /crun-0.8.tar.gz /crun-0.9.tar.gz +/crun-6a2c111.tar.gz diff --git a/crun.spec b/crun.spec index e02de6f..0e27c68 100644 --- a/crun.spec +++ b/crun.spec @@ -1,8 +1,12 @@ +%global git0 https://github.com/containers/%{name} +%global commit0 6a2c11176300e86a99226d77777e1556d98f0416 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + Summary: OCI runtime written in C Name: crun Version: 0.9 -Release: 1%{?dist} -Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz +Release: 2%{?dist} +Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -44,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Fri Sep 13 2019 Giuseppe Scrivano - 0.9-2 +- built version 6a2c11176300e86a99226d77777e1556d98f0416 + * Wed Sep 11 2019 Giuseppe Scrivano - 0.9-1 - built version 0.9 diff --git a/sources b/sources index 211cd3d..f65b60e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.9.tar.gz) = 2a946ac48acab5a9b19779352a1df58cb15a108932eb935775c02396dc76f7592a7530b2c831c5fc7f45d9103bb8d03fe29edfceaddc7b6625c6616cbcf03ff6 +SHA512 (crun-6a2c111.tar.gz) = 8ac25cb2fd410ae90409ad0b85342a75867de2c15a1803cf2e8b70458d8a1ddd162aaeaf9884f822e3cf3852e8cff2e985ef75338ceaf2d8d69ed66ea1c370dd From 1f4b4282e6e3317fc9aa98ea3b176ea93920354b Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 13 Sep 2019 16:04:31 +0200 Subject: [PATCH 017/184] crun.spec: use commit for autosetup Signed-off-by: Giuseppe Scrivano --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 0e27c68..0b73c60 100644 --- a/crun.spec +++ b/crun.spec @@ -30,7 +30,7 @@ Provides: oci-runtime = 2 crun is a runtime for running OCI containers %prep -%autosetup -n %{name}-%{version} +%autosetup -Sgit -n %{name}-%{commit0} %build ./autogen.sh From 9976eadebc7acacf45eb971b61ccba90e13d55a6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 13 Sep 2019 16:24:46 +0200 Subject: [PATCH 018/184] crun-0.9.1-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 16 ++++++---------- sources | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 878d67c..d881dcf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ crun-0.1.1.tar.gz /crun-0.8.tar.gz /crun-0.9.tar.gz /crun-6a2c111.tar.gz +/crun-0.9.1.tar.gz diff --git a/crun.spec b/crun.spec index 0b73c60..ebfcec4 100644 --- a/crun.spec +++ b/crun.spec @@ -1,12 +1,8 @@ -%global git0 https://github.com/containers/%{name} -%global commit0 6a2c11176300e86a99226d77777e1556d98f0416 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - Summary: OCI runtime written in C Name: crun -Version: 0.9 -Release: 2%{?dist} -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Version: 0.9.1 +Release: 1%{?dist} +Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -30,7 +26,7 @@ Provides: oci-runtime = 2 crun is a runtime for running OCI containers %prep -%autosetup -Sgit -n %{name}-%{commit0} +%autosetup -n %{name}-%{version} %build ./autogen.sh @@ -48,8 +44,8 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog -* Fri Sep 13 2019 Giuseppe Scrivano - 0.9-2 -- built version 6a2c11176300e86a99226d77777e1556d98f0416 +* Fri Sep 13 2019 Giuseppe Scrivano - 0.9.1-1 +- built version 0.9.1 * Wed Sep 11 2019 Giuseppe Scrivano - 0.9-1 - built version 0.9 diff --git a/sources b/sources index f65b60e..1ab1fe3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-6a2c111.tar.gz) = 8ac25cb2fd410ae90409ad0b85342a75867de2c15a1803cf2e8b70458d8a1ddd162aaeaf9884f822e3cf3852e8cff2e985ef75338ceaf2d8d69ed66ea1c370dd +SHA512 (crun-0.9.1.tar.gz) = 0bd9d44461fa9a436a5a5fdd4f7706cad6b2bfd0d13defc66c5971c1c07c8613b5ead3b416ac334a7683694a2f9b951eeb6dfe4d993babd6861d6b0ffa4b6ee4 From 1368e5bb09ff85a70a1356034ca0e46984a006a2 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 1 Oct 2019 17:59:40 +0200 Subject: [PATCH 019/184] crun-0.10-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d881dcf..bda7935 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ crun-0.1.1.tar.gz /crun-0.9.tar.gz /crun-6a2c111.tar.gz /crun-0.9.1.tar.gz +/crun-0.10.tar.gz diff --git a/crun.spec b/crun.spec index ebfcec4..e716588 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.9.1 +Version: 0.10 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Tue Oct 1 2019 Giuseppe Scrivano - 0.10-1 +- built version 0.10 + * Fri Sep 13 2019 Giuseppe Scrivano - 0.9.1-1 - built version 0.9.1 diff --git a/sources b/sources index 1ab1fe3..94ebef3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.9.1.tar.gz) = 0bd9d44461fa9a436a5a5fdd4f7706cad6b2bfd0d13defc66c5971c1c07c8613b5ead3b416ac334a7683694a2f9b951eeb6dfe4d993babd6861d6b0ffa4b6ee4 +SHA512 (crun-0.10.tar.gz) = 19bcc2ae4f423583ab23442d5ec91d57d025cd76890752a95c49b9d6f5ad579456d6ad4145f0f520c46b6d1f69cf559c84591866af1ff4ddd7282eaf86a6cb6f From 2bce94eeae77f1829f2f9a6e675a391c99ccccc0 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 4 Oct 2019 14:59:10 +0200 Subject: [PATCH 020/184] crun-0.10.1-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bda7935..4c96072 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ crun-0.1.1.tar.gz /crun-6a2c111.tar.gz /crun-0.9.1.tar.gz /crun-0.10.tar.gz +/crun-0.10.1.tar.gz diff --git a/crun.spec b/crun.spec index e716588..5cf93ec 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.10 +Version: 0.10.1 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Fri Oct 4 2019 Giuseppe Scrivano - 0.10.1-1 +- built version 0.10.1 + * Tue Oct 1 2019 Giuseppe Scrivano - 0.10-1 - built version 0.10 diff --git a/sources b/sources index 94ebef3..6df1d45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.10.tar.gz) = 19bcc2ae4f423583ab23442d5ec91d57d025cd76890752a95c49b9d6f5ad579456d6ad4145f0f520c46b6d1f69cf559c84591866af1ff4ddd7282eaf86a6cb6f +SHA512 (crun-0.10.1.tar.gz) = 1d0a2fd74b2c506b5ccdeab0a776c37fc539ed49d9a33d26b76a4af0f69c1acd4a7c9c2670634482daea8bb983ae6dfd5ee0a7e175ee93e974654697d8a7c814 From dbc34055029dc6b79183cea3a90a8831f94f6e63 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 7 Oct 2019 14:44:12 +0200 Subject: [PATCH 021/184] crun-0.10.2-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4c96072..257c66d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ crun-0.1.1.tar.gz /crun-0.9.1.tar.gz /crun-0.10.tar.gz /crun-0.10.1.tar.gz +/crun-0.10.2.tar.gz diff --git a/crun.spec b/crun.spec index 5cf93ec..8cfba89 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.10.1 +Version: 0.10.2 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Oct 7 2019 Giuseppe Scrivano - 0.10.2-1 +- built version 0.10.2 + * Fri Oct 4 2019 Giuseppe Scrivano - 0.10.1-1 - built version 0.10.1 diff --git a/sources b/sources index 6df1d45..f067030 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.10.1.tar.gz) = 1d0a2fd74b2c506b5ccdeab0a776c37fc539ed49d9a33d26b76a4af0f69c1acd4a7c9c2670634482daea8bb983ae6dfd5ee0a7e175ee93e974654697d8a7c814 +SHA512 (crun-0.10.2.tar.gz) = b779b71c0584a18fb5cee1768b370540157351a7c4007835e6f1f6f864f1ce922cf225917c954548b02b087588d70e15b29dd6535d33623c804442edf83c8dd2 From 329363bc12f27d6fc4d3de1d46f7a12f9ce0e2d8 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 29 Oct 2019 16:38:05 +0100 Subject: [PATCH 022/184] crun-0.10.3-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 257c66d..8d6b8f0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ crun-0.1.1.tar.gz /crun-0.10.tar.gz /crun-0.10.1.tar.gz /crun-0.10.2.tar.gz +/crun-0.10.3.tar.gz diff --git a/crun.spec b/crun.spec index 8cfba89..9591b5b 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.10.2 +Version: 0.10.3 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Tue Oct 29 2019 Giuseppe Scrivano - 0.10.3-1 +- built version 0.10.3 + * Mon Oct 7 2019 Giuseppe Scrivano - 0.10.2-1 - built version 0.10.2 diff --git a/sources b/sources index f067030..f79ce2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.10.2.tar.gz) = b779b71c0584a18fb5cee1768b370540157351a7c4007835e6f1f6f864f1ce922cf225917c954548b02b087588d70e15b29dd6535d33623c804442edf83c8dd2 +SHA512 (crun-0.10.3.tar.gz) = df39e911b0f3b80861c1820806ce9cd0f9772711f7caf246fb4824beb19ddc6e6a593881a239a0e27ecd3bae7d823dde6893930618b43cd84623b5bcd510e8ae From 1aae9a1b9d63acb3c798f79a6171a2af24d8f460 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 31 Oct 2019 17:48:35 +0100 Subject: [PATCH 023/184] crun-0.10.4-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8d6b8f0..1dba782 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ crun-0.1.1.tar.gz /crun-0.10.1.tar.gz /crun-0.10.2.tar.gz /crun-0.10.3.tar.gz +/crun-0.10.4.tar.gz diff --git a/crun.spec b/crun.spec index 9591b5b..19a48e2 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.10.3 +Version: 0.10.4 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Oct 31 2019 Giuseppe Scrivano - 0.10.4-1 +- built version 0.10.4 + * Tue Oct 29 2019 Giuseppe Scrivano - 0.10.3-1 - built version 0.10.3 diff --git a/sources b/sources index f79ce2b..689ede6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.10.3.tar.gz) = df39e911b0f3b80861c1820806ce9cd0f9772711f7caf246fb4824beb19ddc6e6a593881a239a0e27ecd3bae7d823dde6893930618b43cd84623b5bcd510e8ae +SHA512 (crun-0.10.4.tar.gz) = 0658dbdeb3290426fca135d486f19b4c2d71ee7be21ba3b0898580550a2fdb5d0bd008acef56b6718525c690ec0515d36b61e1c7676142d1c131a6c2f839b642 From 61bdfa1e15c76282203f2cce60d1cced0a47bcda Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 10 Nov 2019 00:24:39 +0100 Subject: [PATCH 024/184] crun-0.10.5-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1dba782..c846333 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ crun-0.1.1.tar.gz /crun-0.10.2.tar.gz /crun-0.10.3.tar.gz /crun-0.10.4.tar.gz +/crun-0.10.5.tar.gz diff --git a/crun.spec b/crun.spec index 19a48e2..5067e97 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.10.4 +Version: 0.10.5 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Sun Nov 10 2019 Giuseppe Scrivano - 0.10.5-1 +- built version 0.10.5 + * Thu Oct 31 2019 Giuseppe Scrivano - 0.10.4-1 - built version 0.10.4 diff --git a/sources b/sources index 689ede6..9cdb82e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.10.4.tar.gz) = 0658dbdeb3290426fca135d486f19b4c2d71ee7be21ba3b0898580550a2fdb5d0bd008acef56b6718525c690ec0515d36b61e1c7676142d1c131a6c2f839b642 +SHA512 (crun-0.10.5.tar.gz) = 317e01dd8c750d0565268dafceb66d0e2c590a97fea3b7df1313df397498d010c0693496d2d63834abe67c530c12b3307dca80de08e491794f36685fedf49089 From 26d946539b49586517c351efe2833c0c9f644a95 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 10 Nov 2019 00:37:00 +0100 Subject: [PATCH 025/184] crun-0.10.5-2 Signed-off-by: Giuseppe Scrivano --- crun.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crun.spec b/crun.spec index 5067e97..a2b1489 100644 --- a/crun.spec +++ b/crun.spec @@ -44,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Sun Nov 10 2019 Giuseppe Scrivano - 0.10.5-2 +- built version 0.10.5 +- fix CVE-2019-18837 + * Sun Nov 10 2019 Giuseppe Scrivano - 0.10.5-1 - built version 0.10.5 From c0bba2b7d4916d735c6f59af5b2e9619651559b4 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 10 Nov 2019 00:39:38 +0100 Subject: [PATCH 026/184] fix release number Signed-off-by: Giuseppe Scrivano --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index a2b1489..148ff58 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.10.5 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun From df7717a21364643cd42106b71e734aba8ef56de7 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 18 Nov 2019 10:22:06 +0100 Subject: [PATCH 027/184] crun-0.10.6-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c846333..3f16836 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ crun-0.1.1.tar.gz /crun-0.10.3.tar.gz /crun-0.10.4.tar.gz /crun-0.10.5.tar.gz +/crun-0.10.6.tar.gz diff --git a/crun.spec b/crun.spec index 148ff58..d77f3fd 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.10.5 -Release: 2%{?dist} +Version: 0.10.6 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Nov 18 2019 Giuseppe Scrivano - 0.10.6-1 +- built version 0.10.6 + * Sun Nov 10 2019 Giuseppe Scrivano - 0.10.5-2 - built version 0.10.5 - fix CVE-2019-18837 diff --git a/sources b/sources index 9cdb82e..c636f12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.10.5.tar.gz) = 317e01dd8c750d0565268dafceb66d0e2c590a97fea3b7df1313df397498d010c0693496d2d63834abe67c530c12b3307dca80de08e491794f36685fedf49089 +SHA512 (crun-0.10.6.tar.gz) = b7db09d0c7d2d6e8b1ea239ead5a2ca2b97f188a74f08f0d5ac787e0a698fddf596e7cfdde482c6bc8790d06a7705613e877344a44691c0be7388e6d046c4b15 From 392c9ff2b91a8b962ad133d50c3c7fbb489d1222 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 23 Dec 2019 15:57:19 +0100 Subject: [PATCH 028/184] crun-0.11-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3f16836..aa4b4f0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ crun-0.1.1.tar.gz /crun-0.10.4.tar.gz /crun-0.10.5.tar.gz /crun-0.10.6.tar.gz +/crun-0.11.tar.gz diff --git a/crun.spec b/crun.spec index d77f3fd..d144236 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.10.6 +Version: 0.11 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Dec 23 2019 Giuseppe Scrivano - 0.11-1 +- built version 0.11 + * Mon Nov 18 2019 Giuseppe Scrivano - 0.10.6-1 - built version 0.10.6 diff --git a/sources b/sources index c636f12..de51550 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.10.6.tar.gz) = b7db09d0c7d2d6e8b1ea239ead5a2ca2b97f188a74f08f0d5ac787e0a698fddf596e7cfdde482c6bc8790d06a7705613e877344a44691c0be7388e6d046c4b15 +SHA512 (crun-0.11.tar.gz) = 290e325a7704da997514cfa4c674d7a1a986321f1eb9e45655880aaf7f40b786c53ea9dabc731edd37718bf8184fd6dccae82516b9ff27545a85a3d20fa65a20 From 927c4cc01b46cea25e53ed0b3191d5a7dacf3713 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 15:03:15 +0000 Subject: [PATCH 029/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index d144236..515f151 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 23 2019 Giuseppe Scrivano - 0.11-1 - built version 0.11 From 286645916b0ff1f7020105f626922cd8e37034e6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 3 Feb 2020 22:28:55 +0100 Subject: [PATCH 030/184] crun-0.12-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index aa4b4f0..f918e7b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ crun-0.1.1.tar.gz /crun-0.10.5.tar.gz /crun-0.10.6.tar.gz /crun-0.11.tar.gz +/crun-0.12.tar.gz diff --git a/crun.spec b/crun.spec index 515f151..45d842e 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.11 -Release: 2%{?dist} +Version: 0.12 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Feb 3 2019 Giuseppe Scrivano - 0.12-1 +- built version 0.12 + * Tue Jan 28 2020 Fedora Release Engineering - 0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index de51550..da4ec27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.11.tar.gz) = 290e325a7704da997514cfa4c674d7a1a986321f1eb9e45655880aaf7f40b786c53ea9dabc731edd37718bf8184fd6dccae82516b9ff27545a85a3d20fa65a20 +SHA512 (crun-0.12.tar.gz) = 10216ce3550916f42339b8345269449f1dde0bc8487a5c67dc3e5eba85a91ba25dc7b07df8530bcfb892171e7dfd327664d0adb34a6715da37b85a2634efca8a From bdb929e8ffdbc4a3307f5c67281c8b9ff5b2cea6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 6 Feb 2020 09:58:02 +0100 Subject: [PATCH 031/184] crun-0.12.1-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f918e7b..5c6b4f8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ crun-0.1.1.tar.gz /crun-0.10.6.tar.gz /crun-0.11.tar.gz /crun-0.12.tar.gz +/crun-0.12.1.tar.gz diff --git a/crun.spec b/crun.spec index 45d842e..318f3d1 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.12 +Version: 0.12.1 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,7 +44,10 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog -* Mon Feb 3 2019 Giuseppe Scrivano - 0.12-1 +* Thu Feb 6 2020 Giuseppe Scrivano - 0.12.1-1 +- built version 0.12.1 + +* Mon Feb 3 2020 Giuseppe Scrivano - 0.12-1 - built version 0.12 * Tue Jan 28 2020 Fedora Release Engineering - 0.11-2 diff --git a/sources b/sources index da4ec27..277a715 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.12.tar.gz) = 10216ce3550916f42339b8345269449f1dde0bc8487a5c67dc3e5eba85a91ba25dc7b07df8530bcfb892171e7dfd327664d0adb34a6715da37b85a2634efca8a +SHA512 (crun-0.12.1.tar.gz) = 13c95f0aa38842a70f1be32da38d85ee2696bf64c4fe293e41195d82ecf5eb22ab06ab879fe0850dcb02c2f5c0c04b24827b76b16ed90fa8e726d124c44bdfb2 From d1ffc6a7c11f00a69054605b5b8ee67b7783e685 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 17 Feb 2020 19:23:41 +0100 Subject: [PATCH 032/184] crun-0.12.2-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5c6b4f8..7dcf82b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ crun-0.1.1.tar.gz /crun-0.11.tar.gz /crun-0.12.tar.gz /crun-0.12.1.tar.gz +/crun-0.12.2.tar.gz diff --git a/crun.spec b/crun.spec index 318f3d1..43bd5da 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.12.1 +Version: 0.12.2 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Feb 17 2020 Giuseppe Scrivano - 0.12.2-1 +- built version 0.12.2 + * Thu Feb 6 2020 Giuseppe Scrivano - 0.12.1-1 - built version 0.12.1 diff --git a/sources b/sources index 277a715..2492e60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.12.1.tar.gz) = 13c95f0aa38842a70f1be32da38d85ee2696bf64c4fe293e41195d82ecf5eb22ab06ab879fe0850dcb02c2f5c0c04b24827b76b16ed90fa8e726d124c44bdfb2 +SHA512 (crun-0.12.2.tar.gz) = 0ee98dfe5facf248cea1e633c6156ebbcfe59cc829d998b70dab08f60d5b802fa517a3ee63ba79ce720e7063b6238b9b6818002404cc41cda288a6b2a5ef80f2 From 823fc62b2a771395f0021df92e19ff7234edd3d4 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 17 Feb 2020 23:39:22 +0100 Subject: [PATCH 033/184] crun-0.12.2.1-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7dcf82b..d183969 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ crun-0.1.1.tar.gz /crun-0.12.tar.gz /crun-0.12.1.tar.gz /crun-0.12.2.tar.gz +/crun-0.12.2.1.tar.gz diff --git a/crun.spec b/crun.spec index 43bd5da..063c946 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.12.2 +Version: 0.12.2.1 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Feb 17 2020 Giuseppe Scrivano - 0.12.2.1-1 +- built version 0.12.2.1 + * Mon Feb 17 2020 Giuseppe Scrivano - 0.12.2-1 - built version 0.12.2 diff --git a/sources b/sources index 2492e60..b55823f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.12.2.tar.gz) = 0ee98dfe5facf248cea1e633c6156ebbcfe59cc829d998b70dab08f60d5b802fa517a3ee63ba79ce720e7063b6238b9b6818002404cc41cda288a6b2a5ef80f2 +SHA512 (crun-0.12.2.1.tar.gz) = aaae4c9cc9bd4b51f22dbe519a3d208be775d96ca0bff9e6ac5e69e8e775e466bbef785423858515854f4e3bd23735e48e2c7ae709097a070fc52c46631fd6e6 From 27239f6dbf5327103c5320695dce189057866b56 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 5 Mar 2020 16:17:42 +0100 Subject: [PATCH 034/184] crun-0.13-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d183969..1d9fdb6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ crun-0.1.1.tar.gz /crun-0.12.1.tar.gz /crun-0.12.2.tar.gz /crun-0.12.2.1.tar.gz +/crun-0.13.tar.gz diff --git a/crun.spec b/crun.spec index 063c946..c9a269c 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.12.2.1 +Version: 0.13 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Mar 05 2020 Giuseppe Scrivano - 0.13-1 +- built version 0.13 + * Mon Feb 17 2020 Giuseppe Scrivano - 0.12.2.1-1 - built version 0.12.2.1 diff --git a/sources b/sources index b55823f..27ddfc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.12.2.1.tar.gz) = aaae4c9cc9bd4b51f22dbe519a3d208be775d96ca0bff9e6ac5e69e8e775e466bbef785423858515854f4e3bd23735e48e2c7ae709097a070fc52c46631fd6e6 +SHA512 (crun-0.13.tar.gz) = 314612eaf3097160e9369b3400ac8a83e173ef1a53295191c925e96212ba00d032883db1e4615b8ba42ddb08f1e31ca5e5088ea583a469835ac3c27087a88d6e From 8528d80e0bdb595a7ab6917e81e157dcf527dca5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 15 Apr 2020 10:08:02 -0400 Subject: [PATCH 035/184] crun-0.13-2 - release bump for correct upgrade path Signed-off-by: Lokesh Mandvekar --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index c9a269c..f3d322c 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Apr 15 2020 Lokesh Mandvekar - 0.13-2 +- release bump for correct upgrade path + * Thu Mar 05 2020 Giuseppe Scrivano - 0.13-1 - built version 0.13 From a05d0f3c440e6039c784bfbe277669c1dd2a3987 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 2 Jul 2020 21:08:04 +0200 Subject: [PATCH 036/184] crun-0.14-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1d9fdb6..1d2542e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ crun-0.1.1.tar.gz /crun-0.12.2.tar.gz /crun-0.12.2.1.tar.gz /crun-0.13.tar.gz +/crun-0.14.tar.gz diff --git a/crun.spec b/crun.spec index f3d322c..4a6ba33 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.13 -Release: 2%{?dist} +Version: 0.14 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Jul 02 2020 Giuseppe Scrivano - 0.14-1 +- built version 0.14 + * Wed Apr 15 2020 Lokesh Mandvekar - 0.13-2 - release bump for correct upgrade path diff --git a/sources b/sources index 27ddfc5..e4f6d19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.13.tar.gz) = 314612eaf3097160e9369b3400ac8a83e173ef1a53295191c925e96212ba00d032883db1e4615b8ba42ddb08f1e31ca5e5088ea583a469835ac3c27087a88d6e +SHA512 (crun-0.14.tar.gz) = a62e95945f94eb20b283bfd7ae24779b7f9b132521224f2a6db705967b53b049132c11a89dfb3ac385a2d6c2a7d9314d4a4b7f7585a516f170872d87ec36a6c0 From 8dfc67bbbeabe62a61de23c3a2e33fbfdeb79f8d Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 8 Jul 2020 09:32:06 +0200 Subject: [PATCH 037/184] crun-0.14.1-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1d2542e..ce20ab0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ crun-0.1.1.tar.gz /crun-0.12.2.1.tar.gz /crun-0.13.tar.gz /crun-0.14.tar.gz +/crun-0.14.1.tar.gz diff --git a/crun.spec b/crun.spec index 4a6ba33..7a6bc3b 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.14 +Version: 0.14.1 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Jul 08 2020 Giuseppe Scrivano - 0.14.1-1 +- built version 0.14.1 + * Thu Jul 02 2020 Giuseppe Scrivano - 0.14-1 - built version 0.14 diff --git a/sources b/sources index e4f6d19..0d91064 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.14.tar.gz) = a62e95945f94eb20b283bfd7ae24779b7f9b132521224f2a6db705967b53b049132c11a89dfb3ac385a2d6c2a7d9314d4a4b7f7585a516f170872d87ec36a6c0 +SHA512 (crun-0.14.1.tar.gz) = 420f1713653cbd17df83b2a63d163aaa41baf78115b093877a2241305e10b2ceeaf08ea6700658eca894729ff8a20cbc66f868d18d27fba3fbedf1a9993b122e From 5c853951ee29f8983f0132e5eff213f3d1a74823 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:46:08 +0000 Subject: [PATCH 038/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 7a6bc3b..b2aea90 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 08 2020 Giuseppe Scrivano - 0.14.1-1 - built version 0.14.1 From 40e728ef71ff6386b492e72b9026f3ff9c52dad7 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 27 Aug 2020 13:53:39 +0200 Subject: [PATCH 039/184] crun-0.14.1-3 Signed-off-by: Giuseppe Scrivano --- ...x-race-condition-when-reading-cgroup.patch | 42 +++++++++++++++++++ crun.spec | 7 +++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 0001-state-fix-race-condition-when-reading-cgroup.patch diff --git a/0001-state-fix-race-condition-when-reading-cgroup.patch b/0001-state-fix-race-condition-when-reading-cgroup.patch new file mode 100644 index 0000000..cbdaf76 --- /dev/null +++ b/0001-state-fix-race-condition-when-reading-cgroup.patch @@ -0,0 +1,42 @@ +From 1a71c82ea9fd3561b16e2730bea9673219c15843 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Thu, 27 Aug 2020 12:10:21 +0200 +Subject: [PATCH] state: fix race condition when reading cgroup + +by the time crun attempts to read from the cgroup, systemd might have +already cleaned it up. When using systemd, on ENOENT state reports +the container as "stopped" instead of an error. + +Closes: https://github.com/containers/podman/issues/7148 + +Signed-off-by: Giuseppe Scrivano +--- + src/libcrun/container.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/libcrun/container.c b/src/libcrun/container.c +index 3723300..289e551 100644 +--- a/src/libcrun/container.c ++++ b/src/libcrun/container.c +@@ -2112,7 +2112,17 @@ libcrun_get_container_state_string (const char *id, libcrun_container_status_t * + + ret = libcrun_cgroup_is_container_paused (status->cgroup_path, cgroup_mode, &paused, err); + if (UNLIKELY (ret < 0)) +- return ret; ++ { ++ /* The cgroup might have been cleaned up by systemd by the time we try to read it, so ignore ENOENT. */ ++ if (status->systemd_cgroup && crun_error_get_errno (err) == ENOENT) ++ { ++ crun_error_release (err); ++ *container_status = "stopped"; ++ return 0; ++ } ++ ++ return ret; ++ } + } + + if (! *running) +-- +2.26.2 + diff --git a/crun.spec b/crun.spec index b2aea90..195dcab 100644 --- a/crun.spec +++ b/crun.spec @@ -22,11 +22,13 @@ BuildRequires: libtool BuildRequires: go-md2man Provides: oci-runtime = 2 +Patch0: 0001-state-fix-race-condition-when-reading-cgroup.patch + %description crun is a runtime for running OCI containers %prep -%autosetup -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %build ./autogen.sh @@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Aug 27 2020 Giuseppe Scrivano - 0.14.1-3 +- backport ed9c3e6f466dfb6d2e79802060fabd5f4b66f78e + * Mon Jul 27 2020 Fedora Release Engineering - 0.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5a83a1c244cbef8f76173fb07bea120b7353fefd Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 27 Aug 2020 14:00:03 +0200 Subject: [PATCH 040/184] fix-nvr Signed-off-by: Giuseppe Scrivano Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 195dcab..27de1db 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.14.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun From fd0e61b120a0636a5e05ae3b83cac9f1305b8e7e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 31 Aug 2020 14:47:08 -0400 Subject: [PATCH 041/184] crun-0.14.1-4 - rebuild Signed-off-by: Lokesh Mandvekar (cherry picked from commit 98b1ba02049d617b04ee74dd753e14248cb8ba6e) --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 27de1db..23b9274 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.14.1 -Release: 3%{?dist} +Release: 4%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Aug 31 2020 Lokesh Mandvekar - 0.14.1-4 +- rebuild + * Thu Aug 27 2020 Giuseppe Scrivano - 0.14.1-3 - backport ed9c3e6f466dfb6d2e79802060fabd5f4b66f78e From f96e4628cde334eb838cc06f4cd866239949c0b5 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 14 Sep 2020 12:05:15 +0200 Subject: [PATCH 042/184] crun-0.14.1-5 Signed-off-by: Giuseppe Scrivano --- ...apabilities-get-last_cap-dynamically.patch | 100 ++++++++++++++++++ crun.spec | 6 +- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 0001-Capabilities-get-last_cap-dynamically.patch diff --git a/0001-Capabilities-get-last_cap-dynamically.patch b/0001-Capabilities-get-last_cap-dynamically.patch new file mode 100644 index 0000000..4a4751f --- /dev/null +++ b/0001-Capabilities-get-last_cap-dynamically.patch @@ -0,0 +1,100 @@ +From 2dd22b2f1aa13edc704cf5a6e50793457076789e Mon Sep 17 00:00:00 2001 +From: Ed Santiago +Date: Mon, 31 Aug 2020 12:09:39 -0600 +Subject: [PATCH] Capabilities: get last_cap dynamically + +Determine the kernel capability set at run time, for +consistency with runc. + +Signed-off-by: Ed Santiago +(cherry picked from commit 4453af4c060e380051552ee589af5cad37f2ae82) +--- + src/libcrun/container.c | 4 ++++ + src/libcrun/linux.c | 29 +++++++++++++++++++++++++++-- + src/libcrun/linux.h | 1 + + 3 files changed, 32 insertions(+), 2 deletions(-) + +diff --git a/src/libcrun/container.c b/src/libcrun/container.c +index 3723300..0870cf2 100644 +--- a/src/libcrun/container.c ++++ b/src/libcrun/container.c +@@ -480,6 +480,10 @@ initialize_security (runtime_spec_schema_config_schema_process *proc, libcrun_er + if (UNLIKELY (ret < 0)) + return ret; + ++ ret = libcrun_init_caps (err); ++ if (UNLIKELY (ret < 0)) ++ return ret; ++ + return 0; + } + +diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c +index fa87d82..316943d 100644 +--- a/src/libcrun/linux.c ++++ b/src/libcrun/linux.c +@@ -2291,6 +2291,28 @@ has_cap_on (int cap, long unsigned *caps) + return (CAP_TO_MASK_1 (cap) & caps[1]); + } + ++static unsigned long cap_last_cap; ++ ++int ++libcrun_init_caps (libcrun_error_t *err) ++{ ++ cleanup_close int fd = -1; ++ int ret; ++ char buffer[16]; ++ fd = open ("/proc/sys/kernel/cap_last_cap", O_RDONLY); ++ if (fd < 0) ++ return crun_make_error (err, errno, "open /proc/sys/kernel/cap_last_cap"); ++ ret = TEMP_FAILURE_RETRY (read (fd, buffer, sizeof (buffer))); ++ if (UNLIKELY (ret < 0)) ++ return crun_make_error (err, errno, "read from /proc/sys/kernel/cap_last_cap"); ++ ++ errno = 0; ++ cap_last_cap = strtoul (buffer, NULL, 10); ++ if (errno != 0) ++ return crun_make_error (err, errno, "strtoul() from /proc/sys/kernel/cap_last_cap"); ++ return 0; ++} ++ + static int + set_required_caps (struct all_caps_s *caps, uid_t uid, gid_t gid, int no_new_privs, libcrun_error_t *err) + { +@@ -2299,7 +2321,10 @@ set_required_caps (struct all_caps_s *caps, uid_t uid, gid_t gid, int no_new_pri + struct __user_cap_header_struct hdr = { _LINUX_CAPABILITY_VERSION_3, 0 }; + struct __user_cap_data_struct data[2] = { { 0 } }; + +- for (cap = 0; cap <= CAP_LAST_CAP; cap++) ++ if (cap_last_cap == 0) ++ return crun_make_error (err, 0, "internal error: max number of capabilities not initialized"); ++ ++ for (cap = 0; cap <= cap_last_cap; cap++) + if (! has_cap_on (cap, caps->bounding)) + { + ret = prctl (PR_CAPBSET_DROP, cap, 0, 0, 0); +@@ -2335,7 +2360,7 @@ set_required_caps (struct all_caps_s *caps, uid_t uid, gid_t gid, int no_new_pri + if (UNLIKELY (ret < 0 && !(errno == EINVAL || errno == EPERM))) + return crun_make_error (err, errno, "prctl reset ambient"); + +- for (cap = 0; cap <= CAP_LAST_CAP; cap++) ++ for (cap = 0; cap <= cap_last_cap; cap++) + if (has_cap_on (cap, caps->ambient)) + { + ret = prctl (PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, cap, 0, 0); +diff --git a/src/libcrun/linux.h b/src/libcrun/linux.h +index a92b5f1..fc70feb 100644 +--- a/src/libcrun/linux.h ++++ b/src/libcrun/linux.h +@@ -38,6 +38,7 @@ pid_t libcrun_run_linux_container (libcrun_container_t *container, + libcrun_error_t *err); + int get_notify_fd (libcrun_context_t *context, libcrun_container_t *container, int *notify_socket_out, libcrun_error_t *err); + int libcrun_set_mounts (libcrun_container_t *container, const char *rootfs, libcrun_error_t *err); ++int libcrun_init_caps (libcrun_error_t *err); + int libcrun_do_pivot_root (libcrun_container_t *container, bool no_pivot, const char *rootfs, libcrun_error_t *err); + int libcrun_reopen_dev_null (libcrun_error_t *err); + int libcrun_set_usernamespace (libcrun_container_t *container, pid_t pid, libcrun_error_t *err); +-- +2.26.2 + diff --git a/crun.spec b/crun.spec index 23b9274..e02c403 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.14.1 -Release: 4%{?dist} +Release: 5%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -23,6 +23,7 @@ BuildRequires: go-md2man Provides: oci-runtime = 2 Patch0: 0001-state-fix-race-condition-when-reading-cgroup.patch +Patch1: 0001-Capabilities-get-last_cap-dynamically.patch %description crun is a runtime for running OCI containers @@ -46,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Mon Sep 14 2020 Giuseppe Scrivano - 0.14.1-5 +- backport 4453af4c060e380051552ee589af5cad37f2ae82 + * Mon Aug 31 2020 Lokesh Mandvekar - 0.14.1-4 - rebuild From 56f816f3219ac5c364b5197298995cb9c34db25f Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 23 Sep 2020 17:06:30 +0200 Subject: [PATCH 043/184] crun-0.15-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + ...apabilities-get-last_cap-dynamically.patch | 100 ------------------ ...x-race-condition-when-reading-cgroup.patch | 42 -------- crun.spec | 10 +- sources | 2 +- 5 files changed, 7 insertions(+), 148 deletions(-) delete mode 100644 0001-Capabilities-get-last_cap-dynamically.patch delete mode 100644 0001-state-fix-race-condition-when-reading-cgroup.patch diff --git a/.gitignore b/.gitignore index ce20ab0..515f617 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ crun-0.1.1.tar.gz /crun-0.13.tar.gz /crun-0.14.tar.gz /crun-0.14.1.tar.gz +/crun-0.15.tar.gz diff --git a/0001-Capabilities-get-last_cap-dynamically.patch b/0001-Capabilities-get-last_cap-dynamically.patch deleted file mode 100644 index 4a4751f..0000000 --- a/0001-Capabilities-get-last_cap-dynamically.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 2dd22b2f1aa13edc704cf5a6e50793457076789e Mon Sep 17 00:00:00 2001 -From: Ed Santiago -Date: Mon, 31 Aug 2020 12:09:39 -0600 -Subject: [PATCH] Capabilities: get last_cap dynamically - -Determine the kernel capability set at run time, for -consistency with runc. - -Signed-off-by: Ed Santiago -(cherry picked from commit 4453af4c060e380051552ee589af5cad37f2ae82) ---- - src/libcrun/container.c | 4 ++++ - src/libcrun/linux.c | 29 +++++++++++++++++++++++++++-- - src/libcrun/linux.h | 1 + - 3 files changed, 32 insertions(+), 2 deletions(-) - -diff --git a/src/libcrun/container.c b/src/libcrun/container.c -index 3723300..0870cf2 100644 ---- a/src/libcrun/container.c -+++ b/src/libcrun/container.c -@@ -480,6 +480,10 @@ initialize_security (runtime_spec_schema_config_schema_process *proc, libcrun_er - if (UNLIKELY (ret < 0)) - return ret; - -+ ret = libcrun_init_caps (err); -+ if (UNLIKELY (ret < 0)) -+ return ret; -+ - return 0; - } - -diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c -index fa87d82..316943d 100644 ---- a/src/libcrun/linux.c -+++ b/src/libcrun/linux.c -@@ -2291,6 +2291,28 @@ has_cap_on (int cap, long unsigned *caps) - return (CAP_TO_MASK_1 (cap) & caps[1]); - } - -+static unsigned long cap_last_cap; -+ -+int -+libcrun_init_caps (libcrun_error_t *err) -+{ -+ cleanup_close int fd = -1; -+ int ret; -+ char buffer[16]; -+ fd = open ("/proc/sys/kernel/cap_last_cap", O_RDONLY); -+ if (fd < 0) -+ return crun_make_error (err, errno, "open /proc/sys/kernel/cap_last_cap"); -+ ret = TEMP_FAILURE_RETRY (read (fd, buffer, sizeof (buffer))); -+ if (UNLIKELY (ret < 0)) -+ return crun_make_error (err, errno, "read from /proc/sys/kernel/cap_last_cap"); -+ -+ errno = 0; -+ cap_last_cap = strtoul (buffer, NULL, 10); -+ if (errno != 0) -+ return crun_make_error (err, errno, "strtoul() from /proc/sys/kernel/cap_last_cap"); -+ return 0; -+} -+ - static int - set_required_caps (struct all_caps_s *caps, uid_t uid, gid_t gid, int no_new_privs, libcrun_error_t *err) - { -@@ -2299,7 +2321,10 @@ set_required_caps (struct all_caps_s *caps, uid_t uid, gid_t gid, int no_new_pri - struct __user_cap_header_struct hdr = { _LINUX_CAPABILITY_VERSION_3, 0 }; - struct __user_cap_data_struct data[2] = { { 0 } }; - -- for (cap = 0; cap <= CAP_LAST_CAP; cap++) -+ if (cap_last_cap == 0) -+ return crun_make_error (err, 0, "internal error: max number of capabilities not initialized"); -+ -+ for (cap = 0; cap <= cap_last_cap; cap++) - if (! has_cap_on (cap, caps->bounding)) - { - ret = prctl (PR_CAPBSET_DROP, cap, 0, 0, 0); -@@ -2335,7 +2360,7 @@ set_required_caps (struct all_caps_s *caps, uid_t uid, gid_t gid, int no_new_pri - if (UNLIKELY (ret < 0 && !(errno == EINVAL || errno == EPERM))) - return crun_make_error (err, errno, "prctl reset ambient"); - -- for (cap = 0; cap <= CAP_LAST_CAP; cap++) -+ for (cap = 0; cap <= cap_last_cap; cap++) - if (has_cap_on (cap, caps->ambient)) - { - ret = prctl (PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, cap, 0, 0); -diff --git a/src/libcrun/linux.h b/src/libcrun/linux.h -index a92b5f1..fc70feb 100644 ---- a/src/libcrun/linux.h -+++ b/src/libcrun/linux.h -@@ -38,6 +38,7 @@ pid_t libcrun_run_linux_container (libcrun_container_t *container, - libcrun_error_t *err); - int get_notify_fd (libcrun_context_t *context, libcrun_container_t *container, int *notify_socket_out, libcrun_error_t *err); - int libcrun_set_mounts (libcrun_container_t *container, const char *rootfs, libcrun_error_t *err); -+int libcrun_init_caps (libcrun_error_t *err); - int libcrun_do_pivot_root (libcrun_container_t *container, bool no_pivot, const char *rootfs, libcrun_error_t *err); - int libcrun_reopen_dev_null (libcrun_error_t *err); - int libcrun_set_usernamespace (libcrun_container_t *container, pid_t pid, libcrun_error_t *err); --- -2.26.2 - diff --git a/0001-state-fix-race-condition-when-reading-cgroup.patch b/0001-state-fix-race-condition-when-reading-cgroup.patch deleted file mode 100644 index cbdaf76..0000000 --- a/0001-state-fix-race-condition-when-reading-cgroup.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1a71c82ea9fd3561b16e2730bea9673219c15843 Mon Sep 17 00:00:00 2001 -From: Giuseppe Scrivano -Date: Thu, 27 Aug 2020 12:10:21 +0200 -Subject: [PATCH] state: fix race condition when reading cgroup - -by the time crun attempts to read from the cgroup, systemd might have -already cleaned it up. When using systemd, on ENOENT state reports -the container as "stopped" instead of an error. - -Closes: https://github.com/containers/podman/issues/7148 - -Signed-off-by: Giuseppe Scrivano ---- - src/libcrun/container.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/libcrun/container.c b/src/libcrun/container.c -index 3723300..289e551 100644 ---- a/src/libcrun/container.c -+++ b/src/libcrun/container.c -@@ -2112,7 +2112,17 @@ libcrun_get_container_state_string (const char *id, libcrun_container_status_t * - - ret = libcrun_cgroup_is_container_paused (status->cgroup_path, cgroup_mode, &paused, err); - if (UNLIKELY (ret < 0)) -- return ret; -+ { -+ /* The cgroup might have been cleaned up by systemd by the time we try to read it, so ignore ENOENT. */ -+ if (status->systemd_cgroup && crun_error_get_errno (err) == ENOENT) -+ { -+ crun_error_release (err); -+ *container_status = "stopped"; -+ return 0; -+ } -+ -+ return ret; -+ } - } - - if (! *running) --- -2.26.2 - diff --git a/crun.spec b/crun.spec index e02c403..3fc7c66 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.14.1 -Release: 5%{?dist} +Version: 0.15 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -22,9 +22,6 @@ BuildRequires: libtool BuildRequires: go-md2man Provides: oci-runtime = 2 -Patch0: 0001-state-fix-race-condition-when-reading-cgroup.patch -Patch1: 0001-Capabilities-get-last_cap-dynamically.patch - %description crun is a runtime for running OCI containers @@ -47,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Sep 23 2020 Giuseppe Scrivano - 0.15-1 +- build version 0.15 + * Mon Sep 14 2020 Giuseppe Scrivano - 0.14.1-5 - backport 4453af4c060e380051552ee589af5cad37f2ae82 diff --git a/sources b/sources index 0d91064..07332d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.14.1.tar.gz) = 420f1713653cbd17df83b2a63d163aaa41baf78115b093877a2241305e10b2ceeaf08ea6700658eca894729ff8a20cbc66f868d18d27fba3fbedf1a9993b122e +SHA512 (crun-0.15.tar.gz) = f9a9e94b6a9c5cff01fe93b1c3d5876a0794e6288b802cf579556e11411ca5d6e63cae3859aaa4df4bb600e2d27aa131872a93a92784b9b48f7885411d86f325 From 89169426ca4a015e5ca8af27d04bf2d6ab2097fa Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 23 Sep 2020 17:27:34 +0200 Subject: [PATCH 044/184] rebuild Signed-off-by: Giuseppe Scrivano --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 3fc7c66..a95d54d 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.15 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Sep 23 2020 Giuseppe Scrivano - 0.15-2 +- rebuild + * Wed Sep 23 2020 Giuseppe Scrivano - 0.15-1 - build version 0.15 From 706520a9d29080b515b483aba701e50bad94c59c Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 30 Sep 2020 14:33:23 +0200 Subject: [PATCH 045/184] crun-0.15-3 Signed-off-by: Giuseppe Scrivano --- 0001-exec-check-read-bytes-from-sync.patch | 35 ++++++++++++++++++++++ crun.spec | 7 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-exec-check-read-bytes-from-sync.patch diff --git a/0001-exec-check-read-bytes-from-sync.patch b/0001-exec-check-read-bytes-from-sync.patch new file mode 100644 index 0000000..fc41655 --- /dev/null +++ b/0001-exec-check-read-bytes-from-sync.patch @@ -0,0 +1,35 @@ +From 20c56beb3307b0ac07af0edbbbe49ec65819f559 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Tue, 29 Sep 2020 16:52:02 +0200 +Subject: [PATCH] exec: check read bytes from sync + +when reading from the exec sync pipe, make sure it reads exactly one +byte otherwise return an error. + +Closes: https://github.com/containers/crun/issues/511 + +Signed-off-by: Giuseppe Scrivano +--- + src/libcrun/container.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libcrun/container.c b/src/libcrun/container.c +index 927986a..0308992 100644 +--- a/src/libcrun/container.c ++++ b/src/libcrun/container.c +@@ -2595,10 +2595,10 @@ libcrun_container_exec (libcrun_context_t *context, const char *id, runtime_spec + } + } + +- TEMP_FAILURE_RETRY (read (pipefd0, &b, sizeof (b))); ++ ret = TEMP_FAILURE_RETRY (read (pipefd0, &b, sizeof (b))); + TEMP_FAILURE_RETRY (close (pipefd0)); + pipefd0 = -1; +- if (b != '0') ++ if (ret != 1 || b != '0') + ret = -1; + else + { +-- +2.26.2 + diff --git a/crun.spec b/crun.spec index a95d54d..65a45ca 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.15 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -22,6 +22,8 @@ BuildRequires: libtool BuildRequires: go-md2man Provides: oci-runtime = 2 +Patch0: 0001-exec-check-read-bytes-from-sync.patch + %description crun is a runtime for running OCI containers @@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Sep 30 2020 Giuseppe Scrivano - 0.15-3 +- backport "exec: check read bytes from sync" + * Wed Sep 23 2020 Giuseppe Scrivano - 0.15-2 - rebuild From 2d611f8179de715143822e36d37d59d28d8c471b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Sep 2020 11:49:43 -0400 Subject: [PATCH 046/184] crun-0.15-5 - rebuild to bump release tag ahead of older fedoras Signed-off-by: Lokesh Mandvekar --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 65a45ca..cc8a778 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.15 -Release: 3%{?dist} +Release: 5%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Sep 30 2020 Lokesh Mandvekar - 0.15-5 +- rebuild to bump release tag ahead of older fedoras + * Wed Sep 30 2020 Giuseppe Scrivano - 0.15-3 - backport "exec: check read bytes from sync" From 428de5e45ad66e1415b450adb054b9ad4d87e3d3 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 4 Nov 2020 09:48:37 +0100 Subject: [PATCH 047/184] crun-0.15.1-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + 0001-exec-check-read-bytes-from-sync.patch | 35 ---------------------- crun.spec | 9 +++--- sources | 2 +- 4 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 0001-exec-check-read-bytes-from-sync.patch diff --git a/.gitignore b/.gitignore index 515f617..3630bec 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ crun-0.1.1.tar.gz /crun-0.14.tar.gz /crun-0.14.1.tar.gz /crun-0.15.tar.gz +/crun-0.15.1.tar.gz diff --git a/0001-exec-check-read-bytes-from-sync.patch b/0001-exec-check-read-bytes-from-sync.patch deleted file mode 100644 index fc41655..0000000 --- a/0001-exec-check-read-bytes-from-sync.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 20c56beb3307b0ac07af0edbbbe49ec65819f559 Mon Sep 17 00:00:00 2001 -From: Giuseppe Scrivano -Date: Tue, 29 Sep 2020 16:52:02 +0200 -Subject: [PATCH] exec: check read bytes from sync - -when reading from the exec sync pipe, make sure it reads exactly one -byte otherwise return an error. - -Closes: https://github.com/containers/crun/issues/511 - -Signed-off-by: Giuseppe Scrivano ---- - src/libcrun/container.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libcrun/container.c b/src/libcrun/container.c -index 927986a..0308992 100644 ---- a/src/libcrun/container.c -+++ b/src/libcrun/container.c -@@ -2595,10 +2595,10 @@ libcrun_container_exec (libcrun_context_t *context, const char *id, runtime_spec - } - } - -- TEMP_FAILURE_RETRY (read (pipefd0, &b, sizeof (b))); -+ ret = TEMP_FAILURE_RETRY (read (pipefd0, &b, sizeof (b))); - TEMP_FAILURE_RETRY (close (pipefd0)); - pipefd0 = -1; -- if (b != '0') -+ if (ret != 1 || b != '0') - ret = -1; - else - { --- -2.26.2 - diff --git a/crun.spec b/crun.spec index cc8a778..571a8d9 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.15 -Release: 5%{?dist} +Version: 0.15.1 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ URL: https://github.com/containers/crun @@ -22,8 +22,6 @@ BuildRequires: libtool BuildRequires: go-md2man Provides: oci-runtime = 2 -Patch0: 0001-exec-check-read-bytes-from-sync.patch - %description crun is a runtime for running OCI containers @@ -46,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Nov 04 2020 Giuseppe Scrivano - 0.15.1-1 +- built version 0.15.1 + * Wed Sep 30 2020 Lokesh Mandvekar - 0.15-5 - rebuild to bump release tag ahead of older fedoras diff --git a/sources b/sources index 07332d6..f3a122c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.15.tar.gz) = f9a9e94b6a9c5cff01fe93b1c3d5876a0794e6288b802cf579556e11411ca5d6e63cae3859aaa4df4bb600e2d27aa131872a93a92784b9b48f7885411d86f325 +SHA512 (crun-0.15.1.tar.gz) = 470d69c6be809ac20bcbe33c9225aa4b6193fd95f0c469fc87b0d3bdccc4fb92ff31b60915fa93617fd2f89adee799818c85617ddd9f9dc20af00edb6482724e From b04364360fc09ac9d19995739bacf985bbd4e734 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 24 Nov 2020 10:03:57 +0100 Subject: [PATCH 048/184] crun-0.16-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3630bec..1c1c0cb 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ crun-0.1.1.tar.gz /crun-0.14.1.tar.gz /crun-0.15.tar.gz /crun-0.15.1.tar.gz +/crun-0.16.tar.gz diff --git a/crun.spec b/crun.spec index 571a8d9..127f8d6 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ Summary: OCI runtime written in C Name: crun -Version: 0.15.1 +Version: 0.16 Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv3+ @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Tue Nov 24 2020 Giuseppe Scrivano - 0.16-1 +- built version 0.16 + * Wed Nov 04 2020 Giuseppe Scrivano - 0.15.1-1 - built version 0.15.1 diff --git a/sources b/sources index f3a122c..5a02c82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.15.1.tar.gz) = 470d69c6be809ac20bcbe33c9225aa4b6193fd95f0c469fc87b0d3bdccc4fb92ff31b60915fa93617fd2f89adee799818c85617ddd9f9dc20af00edb6482724e +SHA512 (crun-0.16.tar.gz) = f5a0d19c037af55478ee5f83b63d74277c8640f715b81a8233d3f1acd4cdfdad491e5c1f5beda04d0d7aa16693e9a004b0bde71343b082aa514ae76e5907d029 From edfb80922420ab0bc49123147a09b09234c8cf09 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Wed, 25 Nov 2020 09:11:53 +0100 Subject: [PATCH 049/184] crun-0.16-2.fc34 - fix license Signed-off-by: Jindrich Novy --- crun.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 127f8d6..ce632f3 100644 --- a/crun.spec +++ b/crun.spec @@ -1,9 +1,9 @@ Summary: OCI runtime written in C Name: crun Version: 0.16 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz -License: GPLv3+ +License: GPLv2+ URL: https://github.com/containers/crun # We always run autogen.sh @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Nov 25 2020 Jindrich Novy - 0.16-2 +- fix license + * Tue Nov 24 2020 Giuseppe Scrivano - 0.16-1 - built version 0.16 From e91e3db8f3076653351bee87e0ebb7c1f8d8fc09 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 04:03:08 +0000 Subject: [PATCH 050/184] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- crun.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crun.spec b/crun.spec index ce632f3..26eba19 100644 --- a/crun.spec +++ b/crun.spec @@ -20,6 +20,7 @@ BuildRequires: libselinux-devel BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: go-md2man +BuildRequires: make Provides: oci-runtime = 2 %description From f12f3984bfa5ac94fcc91cefa4e16e5ba0c41daf Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 17 Dec 2020 14:57:56 +0100 Subject: [PATCH 051/184] crun-0.16-3.fc34 Signed-off-by: Giuseppe Scrivano --- crun.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 26eba19..0ffe8cb 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.16 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ URL: https://github.com/containers/crun @@ -21,6 +21,9 @@ BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: go-md2man BuildRequires: make +%ifnarch %ix86 +BuildRequires: criu-devel >= 3.15 +%endif Provides: oci-runtime = 2 %description @@ -45,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Dec 17 2020 Giuseppe Scrivano - 0.16-3 +- build with CRIU + * Wed Nov 25 2020 Jindrich Novy - 0.16-2 - fix license From 488dee986520f2c264b765baae12d5d8af10edb6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 21 Jan 2021 23:15:49 +0100 Subject: [PATCH 052/184] crun-0.17.1-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1c1c0cb..c227741 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ crun-0.1.1.tar.gz /crun-0.15.tar.gz /crun-0.15.1.tar.gz /crun-0.16.tar.gz +/crun-0.17.tar.gz diff --git a/crun.spec b/crun.spec index 0ffe8cb..e937320 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.16 -Release: 3%{?dist} +Version: 0.17 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ URL: https://github.com/containers/crun @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Jan 21 2021 Giuseppe Scrivano - 0.17-1 +- built version 0.17 + * Thu Dec 17 2020 Giuseppe Scrivano - 0.16-3 - build with CRIU diff --git a/sources b/sources index 5a02c82..8e3eccb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.16.tar.gz) = f5a0d19c037af55478ee5f83b63d74277c8640f715b81a8233d3f1acd4cdfdad491e5c1f5beda04d0d7aa16693e9a004b0bde71343b082aa514ae76e5907d029 +SHA512 (crun-0.17.tar.gz) = b095a3c4fca8ae683553805de468594e8dd891cc9911b56e8be7c429584e71fb40a364cf55a6a829950078a539d35308310f53f57b8fb40d483d394e91b20b01 From 647b9042335fde55f2468552e887ae21d4411719 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:44:47 +0000 Subject: [PATCH 053/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index e937320..cf3270c 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.17 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ URL: https://github.com/containers/crun @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 21 2021 Giuseppe Scrivano - 0.17-1 - built version 0.17 From 1526544102795dedad97a819e0b9230bae9a0ef2 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 19 Feb 2021 08:50:05 +0100 Subject: [PATCH 054/184] crun-0.18.1-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c227741..e9f2c58 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ crun-0.1.1.tar.gz /crun-0.15.1.tar.gz /crun-0.16.tar.gz /crun-0.17.tar.gz +/crun-0.18.tar.gz diff --git a/crun.spec b/crun.spec index cf3270c..b022909 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.17 -Release: 2%{?dist} +Version: 0.18 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ URL: https://github.com/containers/crun @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Fri Feb 19 2021 Giuseppe Scrivano - 0.17-1 +- built version 0.18 + * Tue Jan 26 2021 Fedora Release Engineering - 0.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 8e3eccb..8fdc941 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.17.tar.gz) = b095a3c4fca8ae683553805de468594e8dd891cc9911b56e8be7c429584e71fb40a364cf55a6a829950078a539d35308310f53f57b8fb40d483d394e91b20b01 +SHA512 (crun-0.18.tar.gz) = 94610d9d4ef95a9be708c6cf8cc38587c9c3b847d9da5cf9dfa4a2eddddb7e6724e39ffb222ed5d6c61bad8374ae50dc9e92d95b6d03ce0b185d5123afeeca46 From 4a6c717ca977550e0e61666516fc0c25e3487467 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 19 Feb 2021 08:55:38 +0100 Subject: [PATCH 055/184] crun.spec: add glibc-static Signed-off-by: Giuseppe Scrivano --- crun.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crun.spec b/crun.spec index b022909..c56b8aa 100644 --- a/crun.spec +++ b/crun.spec @@ -21,6 +21,7 @@ BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: go-md2man BuildRequires: make +BuildRequires: glibc-static %ifnarch %ix86 BuildRequires: criu-devel >= 3.15 %endif From 8f886d7652a2d0a461ef7b1ffd8f38a8199a6643 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 19 Feb 2021 09:15:29 +0100 Subject: [PATCH 056/184] crun.spec: fix changelog Signed-off-by: Giuseppe Scrivano --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index c56b8aa..6da0d74 100644 --- a/crun.spec +++ b/crun.spec @@ -49,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog -* Fri Feb 19 2021 Giuseppe Scrivano - 0.17-1 +* Fri Feb 19 2021 Giuseppe Scrivano - 0.18-1 - built version 0.18 * Tue Jan 26 2021 Fedora Release Engineering - 0.17-2 From 380d335bb6cf4b398056a1b3fe0f6c95d0db5968 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 25 Mar 2021 08:35:10 -0400 Subject: [PATCH 057/184] crun-0.18-2 - Requires: libcap >= 2.48 Signed-off-by: Lokesh Mandvekar --- crun.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 6da0d74..ce17be4 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.18 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ URL: https://github.com/containers/crun @@ -12,7 +12,7 @@ BuildRequires: automake BuildRequires: gcc BuildRequires: python BuildRequires: git -BuildRequires: libcap-devel +BuildRequires: libcap-devel >= 2.48 BuildRequires: systemd-devel BuildRequires: yajl-devel BuildRequires: libseccomp-devel @@ -26,6 +26,7 @@ BuildRequires: glibc-static BuildRequires: criu-devel >= 3.15 %endif Provides: oci-runtime = 2 +Requires: libcap >= 2.48 %description crun is a runtime for running OCI containers @@ -49,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Mar 25 2021 Lokesh Mandvekar - 0.18-2 +- Requires: libcap >= 2.48 + * Fri Feb 19 2021 Giuseppe Scrivano - 0.18-1 - built version 0.18 From 26f50cb29de58586894b1e6158c26f41f5deaf97 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 25 Mar 2021 09:40:29 -0400 Subject: [PATCH 058/184] crun-0.18-4 - bump release tag to stay ahead of older fedora Signed-off-by: Lokesh Mandvekar --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index ce17be4..8187f59 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.18 -Release: 2%{?dist} +Release: 4%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ URL: https://github.com/containers/crun @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Mar 25 2021 Lokesh Mandvekar - 0.18-4 +- bump release tag to stay ahead of older fedora + * Thu Mar 25 2021 Lokesh Mandvekar - 0.18-2 - Requires: libcap >= 2.48 From 6248751eb0cb44ecec0f0868d99c6497f6c74258 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 31 Mar 2021 14:25:47 -0400 Subject: [PATCH 059/184] crun-0.18-5 - linux: always remount bind mounts ghpr#640 Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ crun.spec | 7 ++++++- sources | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e9f2c58..5a35d45 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ crun-0.1.1.tar.gz /crun-0.16.tar.gz /crun-0.17.tar.gz /crun-0.18.tar.gz +/3e7fa1db14a3c4ad0605f1cb2851ec134f4ccc07.patch +/f642968ec5ae05b33f2545da6edf135c338b34d1.patch diff --git a/crun.spec b/crun.spec index 8187f59..e478473 100644 --- a/crun.spec +++ b/crun.spec @@ -1,8 +1,10 @@ Summary: OCI runtime written in C Name: crun Version: 0.18 -Release: 4%{?dist} +Release: 5%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz +Patch0: https://github.com/containers/crun/commit/f642968ec5ae05b33f2545da6edf135c338b34d1.patch +Patch1: https://github.com/containers/crun/commit/3e7fa1db14a3c4ad0605f1cb2851ec134f4ccc07.patch License: GPLv2+ URL: https://github.com/containers/crun @@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Mar 31 2021 Lokesh Mandvekar - 0.18-5 +- linux: always remount bind mounts ghpr#640 + * Thu Mar 25 2021 Lokesh Mandvekar - 0.18-4 - bump release tag to stay ahead of older fedora diff --git a/sources b/sources index 8fdc941..780a341 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (crun-0.18.tar.gz) = 94610d9d4ef95a9be708c6cf8cc38587c9c3b847d9da5cf9dfa4a2eddddb7e6724e39ffb222ed5d6c61bad8374ae50dc9e92d95b6d03ce0b185d5123afeeca46 +SHA512 (3e7fa1db14a3c4ad0605f1cb2851ec134f4ccc07.patch) = 62a2cd5f6020f3fe49177f6cc79583a8be5f7f0c8573d6063b323ca55b25cbfa6ee95601eb995383a3c94e751c62996c785f01c1cc19a0169939db678379be93 +SHA512 (f642968ec5ae05b33f2545da6edf135c338b34d1.patch) = 4d1c2bb8e32fd3b082099839f298d6cd5d14f195226f667091f7bfc0d1a9165f21a144f531a37e85a7ec567930ab41904067499f9651ae8ab437223a49bcf2ac From c0b699e701e84d8c287251ba4523a442121de252 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 6 Apr 2021 09:56:23 +0200 Subject: [PATCH 060/184] crun-0.19-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 12 ++++++------ sources | 4 +--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5a35d45..3b99289 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ crun-0.1.1.tar.gz /crun-0.18.tar.gz /3e7fa1db14a3c4ad0605f1cb2851ec134f4ccc07.patch /f642968ec5ae05b33f2545da6edf135c338b34d1.patch +/crun-0.19.tar.gz diff --git a/crun.spec b/crun.spec index e478473..4e9e917 100644 --- a/crun.spec +++ b/crun.spec @@ -1,10 +1,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.18 -Release: 5%{?dist} +Version: 0.19 +Release: 1%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch0: https://github.com/containers/crun/commit/f642968ec5ae05b33f2545da6edf135c338b34d1.patch -Patch1: https://github.com/containers/crun/commit/3e7fa1db14a3c4ad0605f1cb2851ec134f4ccc07.patch License: GPLv2+ URL: https://github.com/containers/crun @@ -14,7 +12,7 @@ BuildRequires: automake BuildRequires: gcc BuildRequires: python BuildRequires: git -BuildRequires: libcap-devel >= 2.48 +BuildRequires: libcap-devel BuildRequires: systemd-devel BuildRequires: yajl-devel BuildRequires: libseccomp-devel @@ -28,7 +26,6 @@ BuildRequires: glibc-static BuildRequires: criu-devel >= 3.15 %endif Provides: oci-runtime = 2 -Requires: libcap >= 2.48 %description crun is a runtime for running OCI containers @@ -52,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Tue Apr 06 2021 Giuseppe Scrivano - 0.19-1 +- built version 0.19 + * Wed Mar 31 2021 Lokesh Mandvekar - 0.18-5 - linux: always remount bind mounts ghpr#640 diff --git a/sources b/sources index 780a341..ee80c47 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (crun-0.18.tar.gz) = 94610d9d4ef95a9be708c6cf8cc38587c9c3b847d9da5cf9dfa4a2eddddb7e6724e39ffb222ed5d6c61bad8374ae50dc9e92d95b6d03ce0b185d5123afeeca46 -SHA512 (3e7fa1db14a3c4ad0605f1cb2851ec134f4ccc07.patch) = 62a2cd5f6020f3fe49177f6cc79583a8be5f7f0c8573d6063b323ca55b25cbfa6ee95601eb995383a3c94e751c62996c785f01c1cc19a0169939db678379be93 -SHA512 (f642968ec5ae05b33f2545da6edf135c338b34d1.patch) = 4d1c2bb8e32fd3b082099839f298d6cd5d14f195226f667091f7bfc0d1a9165f21a144f531a37e85a7ec567930ab41904067499f9651ae8ab437223a49bcf2ac +SHA512 (crun-0.19.tar.gz) = a23230307cba6c1348e4bb6fed3553f94409c2a667b38198b896955fa0dcb9c2d890c1b85bd240f5f9806f6dd3595c06333f8c672244776c07e25b7f633084a7 From aced1fa25215330cdb2f990c9a7f09f85b251315 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 13 Apr 2021 15:19:27 -0400 Subject: [PATCH 061/184] crun-0.19-2 - unversioned Provides: oci-runtime - runc package will also provide an unversioned Provides: oci-runtime. - user should pull in runc separately or else it will install crun by default (alphabetical order) - similar situation as caddy, httpd, lighttpd and nginx having Provides: webserver Signed-off-by: Lokesh Mandvekar --- crun.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 4e9e917..fe15712 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.19 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ URL: https://github.com/containers/crun @@ -25,7 +25,7 @@ BuildRequires: glibc-static %ifnarch %ix86 BuildRequires: criu-devel >= 3.15 %endif -Provides: oci-runtime = 2 +Provides: oci-runtime %description crun is a runtime for running OCI containers @@ -49,6 +49,14 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Tue Apr 13 2021 Lokesh Mandvekar - 0.19-2 +- unversioned Provides: oci-runtime +- runc package will also provide an unversioned Provides: oci-runtime. +- user should pull in runc separately or else it will install crun by default + (alphabetical order) +- similar situation as caddy, httpd, lighttpd and nginx having Provides: +webserver + * Tue Apr 06 2021 Giuseppe Scrivano - 0.19-1 - built version 0.19 From 4fa0fa9b9173932f1eee97d0db2429e87d36aba7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Apr 2021 12:15:40 -0400 Subject: [PATCH 062/184] rearrange URL and Source0 Signed-off-by: Lokesh Mandvekar --- crun.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index fe15712..a349de2 100644 --- a/crun.spec +++ b/crun.spec @@ -2,9 +2,9 @@ Summary: OCI runtime written in C Name: crun Version: 0.19 Release: 2%{?dist} -Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz -License: GPLv2+ URL: https://github.com/containers/crun +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz +License: GPLv2+ # We always run autogen.sh BuildRequires: autoconf From 36e4c1d08baaf687a12a3759a39f7ede901eaed2 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 22 Apr 2021 13:15:16 +0200 Subject: [PATCH 063/184] crun-0.19.1-1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3b99289..f173873 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ crun-0.1.1.tar.gz /3e7fa1db14a3c4ad0605f1cb2851ec134f4ccc07.patch /f642968ec5ae05b33f2545da6edf135c338b34d1.patch /crun-0.19.tar.gz +/crun-0.19.1.tar.gz diff --git a/crun.spec b/crun.spec index a349de2..a3ad2ba 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19 -Release: 2%{?dist} +Version: 0.19.1 +Release: 1%{?dist} URL: https://github.com/containers/crun Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Apr 22 2021 Giuseppe Scrivano - 0.19.1-1 +- built version 0.19.1 + * Tue Apr 13 2021 Lokesh Mandvekar - 0.19-2 - unversioned Provides: oci-runtime - runc package will also provide an unversioned Provides: oci-runtime. diff --git a/sources b/sources index ee80c47..afdd58b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.tar.gz) = a23230307cba6c1348e4bb6fed3553f94409c2a667b38198b896955fa0dcb9c2d890c1b85bd240f5f9806f6dd3595c06333f8c672244776c07e25b7f633084a7 +SHA512 (crun-0.19.1.tar.gz) = f93f79d1d63d6749bcf92d48542d9555f3ad47657c959c7c06701861d7a5a4171969f00f6dff3878286970a48aba3314c25e35c005463e606533b0ff7843d994 From 6cf17ade9e1361e3e24d46723b9b893d37adcfe2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 22 Apr 2021 09:48:33 -0400 Subject: [PATCH 064/184] crun-0.19.1-2 - rebuild for new bodhi Signed-off-by: Lokesh Mandvekar --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index a3ad2ba..b8ab0f0 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.19.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/containers/crun Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Apr 22 2021 Lokesh Mandvekar - 0.19.1-2 +- rebuild for new bodhi + * Thu Apr 22 2021 Giuseppe Scrivano - 0.19.1-1 - built version 0.19.1 From 64bd7244901daf90a986f4334c7cabb95b091145 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 28 Apr 2021 08:54:17 -0400 Subject: [PATCH 065/184] crun-0.19.1.7-0.1.git3886321 - built 3886321 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + crun.spec | 27 +++++++++++++++++++++------ sources | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f173873..b2a3847 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ crun-0.1.1.tar.gz /f642968ec5ae05b33f2545da6edf135c338b34d1.patch /crun-0.19.tar.gz /crun-0.19.1.tar.gz +/crun-0.19.1.7-3886.tar.xz diff --git a/crun.spec b/crun.spec index b8ab0f0..02cb326 100644 --- a/crun.spec +++ b/crun.spec @@ -1,9 +1,21 @@ +%global git0 https://github.com/containers/crun +%global commit0 3886321243a945d8ae50b19db7d4cdde3d8421f8 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) + +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%define built_tag 0.19.1 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url %{git0}/archive/%{built_tag}.tar.gz + Summary: OCI runtime written in C Name: crun -Version: 0.19.1 -Release: 2%{?dist} -URL: https://github.com/containers/crun -Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz +Version: 0.19.1.7 +Release: 0.1.git%{shortcommit0}%{?dist} +URL: %{git0} +# Source0 generated using `make dist` in upstream repo +Source0: %{name}-%{version}-%{shortercommit0}.tar.xz License: GPLv2+ # We always run autogen.sh @@ -31,7 +43,7 @@ Provides: oci-runtime crun is a runtime for running OCI containers %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version}-%{shortercommit0} %build ./autogen.sh @@ -41,7 +53,7 @@ crun is a runtime for running OCI containers %install %make_install -rm -rf $RPM_BUILD_ROOT/usr/lib* +rm -rf %{buildroot}%{_prefix}/lib* %files %license COPYING @@ -49,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Wed Apr 28 2021 Lokesh Mandvekar - 0.19.1.7-0.1.git3886321 +- built 3886321 + * Thu Apr 22 2021 Lokesh Mandvekar - 0.19.1-2 - rebuild for new bodhi diff --git a/sources b/sources index afdd58b..94d2176 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.tar.gz) = f93f79d1d63d6749bcf92d48542d9555f3ad47657c959c7c06701861d7a5a4171969f00f6dff3878286970a48aba3314c25e35c005463e606533b0ff7843d994 +SHA512 (crun-0.19.1.7-3886.tar.xz) = d16e69de0e1647a8377c4241ab5eb612fcaf9d23a6b11df178ef5ac857116cbadfda257863642c78f19b5bd7ae3b343a374d7941a684912a46b34afd3d1b8d7e From 0eb47bda3ded12708f437caae1bfd5b4905e1cf5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 May 2021 10:15:31 -0400 Subject: [PATCH 066/184] crun-0.19.1.11-0.1.git1dead7e - built 1dead7e Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b2a3847..438f2b9 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ crun-0.1.1.tar.gz /crun-0.19.tar.gz /crun-0.19.1.tar.gz /crun-0.19.1.7-3886.tar.xz +/crun-0.19.1.11-1dea.tar.xz diff --git a/crun.spec b/crun.spec index 02cb326..0681afa 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 3886321243a945d8ae50b19db7d4cdde3d8421f8 +%global commit0 1dead7ebaf4f80a2553ceb30da17e93017f8159e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,7 +11,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.7 +Version: 0.19.1.11 Release: 0.1.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo @@ -61,6 +61,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Mon May 03 2021 Lokesh Mandvekar - 0.19.1.11-0.1.git1dead7e +- built 1dead7e + * Wed Apr 28 2021 Lokesh Mandvekar - 0.19.1.7-0.1.git3886321 - built 3886321 diff --git a/sources b/sources index 94d2176..d4a8e4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.7-3886.tar.xz) = d16e69de0e1647a8377c4241ab5eb612fcaf9d23a6b11df178ef5ac857116cbadfda257863642c78f19b5bd7ae3b343a374d7941a684912a46b34afd3d1b8d7e +SHA512 (crun-0.19.1.11-1dea.tar.xz) = 9baeff7df4e61822f580f1d48c32b2b18a6dc336bdb7423eb22adbdd2f162ae59a5d8085b85a4e7541b88ae6d63131cda41c4e88913503f356f1200820e359c3 From 7d94be6616d1933ec6619a41761d21fcf7ec7580 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 May 2021 14:09:51 +0000 Subject: [PATCH 067/184] crun-0.19.1.17-0.2.git3f6a944 - bump to 0.19.1.17 - autobuilt 3f6a944 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 438f2b9..378c72f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.tar.gz /crun-0.19.1.7-3886.tar.xz /crun-0.19.1.11-1dea.tar.xz +/crun-0.19.1.17-3f6a.tar.xz diff --git a/crun.spec b/crun.spec index 0681afa..82dec7b 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 1dead7ebaf4f80a2553ceb30da17e93017f8159e +%global commit0 3f6a94429d8f3242fe9f4671adfafe2e2e314c69 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.11 -Release: 0.1.git%{shortcommit0}%{?dist} +Version: 0.19.1.17 +Release: 0.2.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Fri May 07 2021 RH Container Bot - 0.19.1.17-0.2.git3f6a944 +- bump to 0.19.1.17 +- autobuilt 3f6a944 + * Mon May 03 2021 Lokesh Mandvekar - 0.19.1.11-0.1.git1dead7e - built 1dead7e diff --git a/sources b/sources index d4a8e4a..b79247d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.11-1dea.tar.xz) = 9baeff7df4e61822f580f1d48c32b2b18a6dc336bdb7423eb22adbdd2f162ae59a5d8085b85a4e7541b88ae6d63131cda41c4e88913503f356f1200820e359c3 +SHA512 (crun-0.19.1.17-3f6a.tar.xz) = ac270b204e2eae7c48fad311995caa65e3883877d3cb30e5d2ba69fd22d7096362d8557b71c87fac8eaa62bdddfde9fecd65a00eb46168b74d20c7cd70b55b8f From b83a0706e5bde7761db5b0bf0c14879808711e2f Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 May 2021 04:21:37 +0000 Subject: [PATCH 068/184] crun-0.19.1.19-0.3.gitb6c3139 - bump to 0.19.1.19 - autobuilt b6c3139 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 378c72f..223ed2d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.7-3886.tar.xz /crun-0.19.1.11-1dea.tar.xz /crun-0.19.1.17-3f6a.tar.xz +/crun-0.19.1.19-b6c3.tar.xz diff --git a/crun.spec b/crun.spec index 82dec7b..7d4a18d 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 3f6a94429d8f3242fe9f4671adfafe2e2e314c69 +%global commit0 b6c3139229b6e62292fea63e3334dafc053bd4bc %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.17 -Release: 0.2.git%{shortcommit0}%{?dist} +Version: 0.19.1.19 +Release: 0.3.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Sat May 08 2021 RH Container Bot - 0.19.1.19-0.3.gitb6c3139 +- bump to 0.19.1.19 +- autobuilt b6c3139 + * Fri May 07 2021 RH Container Bot - 0.19.1.17-0.2.git3f6a944 - bump to 0.19.1.17 - autobuilt 3f6a944 diff --git a/sources b/sources index b79247d..bf88e0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.17-3f6a.tar.xz) = ac270b204e2eae7c48fad311995caa65e3883877d3cb30e5d2ba69fd22d7096362d8557b71c87fac8eaa62bdddfde9fecd65a00eb46168b74d20c7cd70b55b8f +SHA512 (crun-0.19.1.19-b6c3.tar.xz) = 8fbe6a42a5bd0aae7cbcd93a62fe71f2afb3651a31dc9d1d073688e2fd59179f876e424ea3ee981427ed1b5d5d94847a4147af2127a690c5b58c2fe3c362ff0f From bbd4c102a6b5472fc640a5304b601147d65e695d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 10 May 2021 04:11:07 +0000 Subject: [PATCH 069/184] crun-0.19.1.22-0.4.git4e968c9 - bump to 0.19.1.22 - autobuilt 4e968c9 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 223ed2d..9c2760a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.11-1dea.tar.xz /crun-0.19.1.17-3f6a.tar.xz /crun-0.19.1.19-b6c3.tar.xz +/crun-0.19.1.22-4e96.tar.xz diff --git a/crun.spec b/crun.spec index 7d4a18d..92f277e 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 b6c3139229b6e62292fea63e3334dafc053bd4bc +%global commit0 4e968c9edd19e2b6e55016e5218fb459dec08c6d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.19 -Release: 0.3.git%{shortcommit0}%{?dist} +Version: 0.19.1.22 +Release: 0.4.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Mon May 10 2021 RH Container Bot - 0.19.1.22-0.4.git4e968c9 +- bump to 0.19.1.22 +- autobuilt 4e968c9 + * Sat May 08 2021 RH Container Bot - 0.19.1.19-0.3.gitb6c3139 - bump to 0.19.1.19 - autobuilt b6c3139 diff --git a/sources b/sources index bf88e0b..e09b694 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.19-b6c3.tar.xz) = 8fbe6a42a5bd0aae7cbcd93a62fe71f2afb3651a31dc9d1d073688e2fd59179f876e424ea3ee981427ed1b5d5d94847a4147af2127a690c5b58c2fe3c362ff0f +SHA512 (crun-0.19.1.22-4e96.tar.xz) = 1ec091b4624c950b642fb34eb6f58ceecc8bde208a577c8ca372b4ec05b3f00d0fbf2a58a09efd0773b56465590200a6c41d9b92c3de0a8cd94a6a66577fcedb From 602869d3ad35bf822318900dafc8b56116688e31 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 11 May 2021 04:13:45 +0000 Subject: [PATCH 070/184] crun-0.19.1.26-0.5.git029e0ed - bump to 0.19.1.26 - autobuilt 029e0ed Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9c2760a..8e29742 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.17-3f6a.tar.xz /crun-0.19.1.19-b6c3.tar.xz /crun-0.19.1.22-4e96.tar.xz +/crun-0.19.1.26-029e.tar.xz diff --git a/crun.spec b/crun.spec index 92f277e..232814c 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 4e968c9edd19e2b6e55016e5218fb459dec08c6d +%global commit0 029e0ed49ff5fb7ca56a30ceb692b69575711d1f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.22 -Release: 0.4.git%{shortcommit0}%{?dist} +Version: 0.19.1.26 +Release: 0.5.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Tue May 11 2021 RH Container Bot - 0.19.1.26-0.5.git029e0ed +- bump to 0.19.1.26 +- autobuilt 029e0ed + * Mon May 10 2021 RH Container Bot - 0.19.1.22-0.4.git4e968c9 - bump to 0.19.1.22 - autobuilt 4e968c9 diff --git a/sources b/sources index e09b694..504e414 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.22-4e96.tar.xz) = 1ec091b4624c950b642fb34eb6f58ceecc8bde208a577c8ca372b4ec05b3f00d0fbf2a58a09efd0773b56465590200a6c41d9b92c3de0a8cd94a6a66577fcedb +SHA512 (crun-0.19.1.26-029e.tar.xz) = bfe37df10a2e101a6feb6be199e4faba217b8e3ce06b6fa0bca50c03dc3fbf3173924ba75628db82d22fda04b79e02ad50a6b80dd93e067c70900f99f8719757 From 4749c88b0eec8b13971e6761a83255d2d230ab52 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 13 May 2021 04:11:00 +0000 Subject: [PATCH 071/184] crun-0.19.1.31-0.6.gitb83eda7 - bump to 0.19.1.31 - autobuilt b83eda7 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8e29742..79fe050 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.19-b6c3.tar.xz /crun-0.19.1.22-4e96.tar.xz /crun-0.19.1.26-029e.tar.xz +/crun-0.19.1.31-b83e.tar.xz diff --git a/crun.spec b/crun.spec index 232814c..5428a75 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 029e0ed49ff5fb7ca56a30ceb692b69575711d1f +%global commit0 b83eda7c664cfdb53920ae2df3f8bd3d9a03a44b %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.26 -Release: 0.5.git%{shortcommit0}%{?dist} +Version: 0.19.1.31 +Release: 0.6.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Thu May 13 2021 RH Container Bot - 0.19.1.31-0.6.gitb83eda7 +- bump to 0.19.1.31 +- autobuilt b83eda7 + * Tue May 11 2021 RH Container Bot - 0.19.1.26-0.5.git029e0ed - bump to 0.19.1.26 - autobuilt 029e0ed diff --git a/sources b/sources index 504e414..670c340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.26-029e.tar.xz) = bfe37df10a2e101a6feb6be199e4faba217b8e3ce06b6fa0bca50c03dc3fbf3173924ba75628db82d22fda04b79e02ad50a6b80dd93e067c70900f99f8719757 +SHA512 (crun-0.19.1.31-b83e.tar.xz) = 192f74232345e920c240e930db5b7583533959eb7910484f54fba71c4fc6bb000d9234ba65b43f948ad7183a86c6860529b92207c094baf965835956bf256f33 From 18a138049936602dc22577dfc7b375859aa7935d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 14 May 2021 04:11:06 +0000 Subject: [PATCH 072/184] crun-0.19.1.36-0.7.git2badd69 - bump to 0.19.1.36 - autobuilt 2badd69 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 79fe050..346634d 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.22-4e96.tar.xz /crun-0.19.1.26-029e.tar.xz /crun-0.19.1.31-b83e.tar.xz +/crun-0.19.1.36-2bad.tar.xz diff --git a/crun.spec b/crun.spec index 5428a75..09f239b 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 b83eda7c664cfdb53920ae2df3f8bd3d9a03a44b +%global commit0 2badd6944814ab73ee3abf86ce67fc8efaab41de %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.31 -Release: 0.6.git%{shortcommit0}%{?dist} +Version: 0.19.1.36 +Release: 0.7.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Fri May 14 2021 RH Container Bot - 0.19.1.36-0.7.git2badd69 +- bump to 0.19.1.36 +- autobuilt 2badd69 + * Thu May 13 2021 RH Container Bot - 0.19.1.31-0.6.gitb83eda7 - bump to 0.19.1.31 - autobuilt b83eda7 diff --git a/sources b/sources index 670c340..d037759 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.31-b83e.tar.xz) = 192f74232345e920c240e930db5b7583533959eb7910484f54fba71c4fc6bb000d9234ba65b43f948ad7183a86c6860529b92207c094baf965835956bf256f33 +SHA512 (crun-0.19.1.36-2bad.tar.xz) = ef38bd9fd2583a271b917a1dfa17bbe387995faff8a0cc0eb6ae97d4c063385a48532027b8c9c1d6eb3bf9f75224396754861afd28828308bea7309bb44fc023 From 8ec308217a3dcdfdea91650c7556782f8d14ae62 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 15 May 2021 04:10:21 +0000 Subject: [PATCH 073/184] crun-0.19.1.41-0.8.gitf9c405d - bump to 0.19.1.41 - autobuilt f9c405d Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 346634d..c373992 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.26-029e.tar.xz /crun-0.19.1.31-b83e.tar.xz /crun-0.19.1.36-2bad.tar.xz +/crun-0.19.1.41-f9c4.tar.xz diff --git a/crun.spec b/crun.spec index 09f239b..2177ca8 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 2badd6944814ab73ee3abf86ce67fc8efaab41de +%global commit0 f9c405d3cd8727f98ac4cdf0d98722684ee5f0bb %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.36 -Release: 0.7.git%{shortcommit0}%{?dist} +Version: 0.19.1.41 +Release: 0.8.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Sat May 15 2021 RH Container Bot - 0.19.1.41-0.8.gitf9c405d +- bump to 0.19.1.41 +- autobuilt f9c405d + * Fri May 14 2021 RH Container Bot - 0.19.1.36-0.7.git2badd69 - bump to 0.19.1.36 - autobuilt 2badd69 diff --git a/sources b/sources index d037759..6119ccf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.36-2bad.tar.xz) = ef38bd9fd2583a271b917a1dfa17bbe387995faff8a0cc0eb6ae97d4c063385a48532027b8c9c1d6eb3bf9f75224396754861afd28828308bea7309bb44fc023 +SHA512 (crun-0.19.1.41-f9c4.tar.xz) = 221304420cf9c0185ab778309a35b084c2c37056a489d38c76e12394028dc3eb25667f48e7b13f955db76d4b5a54f010eccddaebb59449c7236f33be05cc6412 From 4eadb5f6a8eb1614ee2e18dbd97b149b5bae2111 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 21 May 2021 04:11:41 +0000 Subject: [PATCH 074/184] crun-0.19.1.45-0.9.git4cc7fa1 - bump to 0.19.1.45 - autobuilt 4cc7fa1 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c373992..ce34e53 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.31-b83e.tar.xz /crun-0.19.1.36-2bad.tar.xz /crun-0.19.1.41-f9c4.tar.xz +/crun-0.19.1.45-4cc7.tar.xz diff --git a/crun.spec b/crun.spec index 2177ca8..57b41df 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 f9c405d3cd8727f98ac4cdf0d98722684ee5f0bb +%global commit0 4cc7fa1124cce75dc26e12186d9cbeabded2b710 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.41 -Release: 0.8.git%{shortcommit0}%{?dist} +Version: 0.19.1.45 +Release: 0.9.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Fri May 21 2021 RH Container Bot - 0.19.1.45-0.9.git4cc7fa1 +- bump to 0.19.1.45 +- autobuilt 4cc7fa1 + * Sat May 15 2021 RH Container Bot - 0.19.1.41-0.8.gitf9c405d - bump to 0.19.1.41 - autobuilt f9c405d diff --git a/sources b/sources index 6119ccf..d37a91f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.41-f9c4.tar.xz) = 221304420cf9c0185ab778309a35b084c2c37056a489d38c76e12394028dc3eb25667f48e7b13f955db76d4b5a54f010eccddaebb59449c7236f33be05cc6412 +SHA512 (crun-0.19.1.45-4cc7.tar.xz) = f3c17c399284f02a682f8f894946d91deadd613c424b64eba3a94ac9d5ed0890536b85e50a7e5ca581ebe49cc15ee243b036499259b5f5f0be521c22986466f9 From a85d4bbb7f47d3336f631f970a6b2f51a9eecfb2 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 25 May 2021 04:11:07 +0000 Subject: [PATCH 075/184] crun-0.19.1.50-0.10.git1942907 - bump to 0.19.1.50 - autobuilt 1942907 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ce34e53..5a3a2fb 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.36-2bad.tar.xz /crun-0.19.1.41-f9c4.tar.xz /crun-0.19.1.45-4cc7.tar.xz +/crun-0.19.1.50-1942.tar.xz diff --git a/crun.spec b/crun.spec index 57b41df..b764975 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 4cc7fa1124cce75dc26e12186d9cbeabded2b710 +%global commit0 1942907e28e6bc04a97af452f3780c22157b2471 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.45 -Release: 0.9.git%{shortcommit0}%{?dist} +Version: 0.19.1.50 +Release: 0.10.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Tue May 25 2021 RH Container Bot - 0.19.1.50-0.10.git1942907 +- bump to 0.19.1.50 +- autobuilt 1942907 + * Fri May 21 2021 RH Container Bot - 0.19.1.45-0.9.git4cc7fa1 - bump to 0.19.1.45 - autobuilt 4cc7fa1 diff --git a/sources b/sources index d37a91f..9c39cf0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.45-4cc7.tar.xz) = f3c17c399284f02a682f8f894946d91deadd613c424b64eba3a94ac9d5ed0890536b85e50a7e5ca581ebe49cc15ee243b036499259b5f5f0be521c22986466f9 +SHA512 (crun-0.19.1.50-1942.tar.xz) = f1baf3f732367a1c3e7df5d346a08c9e30c0b5146dd888bd8c5808861a5f1d3dea59243ec1100488ade7790ffeb1a56e8ae8e64ebd169dc569340ee48578e2f4 From 6b88df75b7d5f4550e254f04c1891cdfa1651247 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 2 Jun 2021 04:10:45 +0000 Subject: [PATCH 076/184] crun-0.20.1-0.11.gitffb75b2 - bump to 0.20.1 - autobuilt ffb75b2 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5a3a2fb..f41cf82 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.41-f9c4.tar.xz /crun-0.19.1.45-4cc7.tar.xz /crun-0.19.1.50-1942.tar.xz +/crun-0.20.1-ffb7.tar.xz diff --git a/crun.spec b/crun.spec index b764975..f7ac30b 100644 --- a/crun.spec +++ b/crun.spec @@ -1,18 +1,18 @@ %global git0 https://github.com/containers/crun -%global commit0 1942907e28e6bc04a97af452f3780c22157b2471 +%global commit0 ffb75b2c126ade53c180c0ef5602a2286190a32d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag 0.19.1 +%define built_tag 0.20 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Summary: OCI runtime written in C Name: crun -Version: 0.19.1.50 -Release: 0.10.git%{shortcommit0}%{?dist} +Version: 0.20.1 +Release: 0.11.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Wed Jun 02 2021 RH Container Bot - 0.20.1-0.11.gitffb75b2 +- bump to 0.20.1 +- autobuilt ffb75b2 + * Tue May 25 2021 RH Container Bot - 0.19.1.50-0.10.git1942907 - bump to 0.19.1.50 - autobuilt 1942907 diff --git a/sources b/sources index 9c39cf0..5865534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.50-1942.tar.xz) = f1baf3f732367a1c3e7df5d346a08c9e30c0b5146dd888bd8c5808861a5f1d3dea59243ec1100488ade7790ffeb1a56e8ae8e64ebd169dc569340ee48578e2f4 +SHA512 (crun-0.20.1-ffb7.tar.xz) = c5e4f1ee9a0a89db64c638015e87134de8114bd7300764f5550da726976c6e1042c274cc6569cf9bc20fdf4e3944a8d5df43fc019decf06649c0988caacc7ecb From 0e87690fda61a5a571f0404ec318a58a2019ada0 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 3 Jun 2021 04:11:00 +0000 Subject: [PATCH 077/184] crun-0.20.3-0.12.git8d6a8b5 - bump to 0.20.3 - autobuilt 8d6a8b5 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f41cf82..694b559 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.45-4cc7.tar.xz /crun-0.19.1.50-1942.tar.xz /crun-0.20.1-ffb7.tar.xz +/crun-0.20.3-8d6a.tar.xz diff --git a/crun.spec b/crun.spec index f7ac30b..4638697 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 ffb75b2c126ade53c180c0ef5602a2286190a32d +%global commit0 8d6a8b5ab80461cfed19f020a36584af13c32038 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.20.1 -Release: 0.11.git%{shortcommit0}%{?dist} +Version: 0.20.3 +Release: 0.12.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Thu Jun 03 2021 RH Container Bot - 0.20.3-0.12.git8d6a8b5 +- bump to 0.20.3 +- autobuilt 8d6a8b5 + * Wed Jun 02 2021 RH Container Bot - 0.20.1-0.11.gitffb75b2 - bump to 0.20.1 - autobuilt ffb75b2 diff --git a/sources b/sources index 5865534..3e5aea6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.20.1-ffb7.tar.xz) = c5e4f1ee9a0a89db64c638015e87134de8114bd7300764f5550da726976c6e1042c274cc6569cf9bc20fdf4e3944a8d5df43fc019decf06649c0988caacc7ecb +SHA512 (crun-0.20.3-8d6a.tar.xz) = 98a2690c1f77e652a0601a53c12eb1cae82fcc4a01d530ce991963ccf0950ad7695793cfabb04f3ade865731b17643ae01d7a91a2ec156592f6571fd9b171f34 From 386c704b50042071c4726e56e57eb32f7c0eddaa Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 10 Jun 2021 04:12:07 +0000 Subject: [PATCH 078/184] crun-0.20.1.1-0.13.git7adf4d0 - bump to 0.20.1.1 - autobuilt 7adf4d0 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 694b559..ea20103 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.50-1942.tar.xz /crun-0.20.1-ffb7.tar.xz /crun-0.20.3-8d6a.tar.xz +/crun-0.20.1.1-7adf.tar.xz diff --git a/crun.spec b/crun.spec index 4638697..15924f0 100644 --- a/crun.spec +++ b/crun.spec @@ -1,18 +1,18 @@ %global git0 https://github.com/containers/crun -%global commit0 8d6a8b5ab80461cfed19f020a36584af13c32038 +%global commit0 7adf4d0c22d871a9aab71229c64a08e09bf9de0c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag 0.20 +%define built_tag 0.20.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Summary: OCI runtime written in C Name: crun -Version: 0.20.3 -Release: 0.12.git%{shortcommit0}%{?dist} +Version: 0.20.1.1 +Release: 0.13.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Thu Jun 10 2021 RH Container Bot - 0.20.1.1-0.13.git7adf4d0 +- bump to 0.20.1.1 +- autobuilt 7adf4d0 + * Thu Jun 03 2021 RH Container Bot - 0.20.3-0.12.git8d6a8b5 - bump to 0.20.3 - autobuilt 8d6a8b5 diff --git a/sources b/sources index 3e5aea6..2936098 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.20.3-8d6a.tar.xz) = 98a2690c1f77e652a0601a53c12eb1cae82fcc4a01d530ce991963ccf0950ad7695793cfabb04f3ade865731b17643ae01d7a91a2ec156592f6571fd9b171f34 +SHA512 (crun-0.20.1.1-7adf.tar.xz) = 914f3ff2ced16e59b0b3589e21f84875e727a82fdcd0e5ca1dd7c0ea847dff8e3df68d3a6b6b7454c34fa8f5f93251775885ec29ae9366fe767416a2ea937f04 From bbefb7a6a624c10f3432735ea418bb871aa6e59a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 15 Jun 2021 04:11:37 +0000 Subject: [PATCH 079/184] crun-0.20.1.3-0.14.git9dec366 - bump to 0.20.1.3 - autobuilt 9dec366 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ea20103..e7448ca 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ crun-0.1.1.tar.gz /crun-0.20.1-ffb7.tar.xz /crun-0.20.3-8d6a.tar.xz /crun-0.20.1.1-7adf.tar.xz +/crun-0.20.1.3-9dec.tar.xz diff --git a/crun.spec b/crun.spec index 15924f0..2de6761 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 7adf4d0c22d871a9aab71229c64a08e09bf9de0c +%global commit0 9dec366ed15c0cee945b3f1c95ffbd54a292a6aa %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.20.1.1 -Release: 0.13.git%{shortcommit0}%{?dist} +Version: 0.20.1.3 +Release: 0.14.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Tue Jun 15 2021 RH Container Bot - 0.20.1.3-0.14.git9dec366 +- bump to 0.20.1.3 +- autobuilt 9dec366 + * Thu Jun 10 2021 RH Container Bot - 0.20.1.1-0.13.git7adf4d0 - bump to 0.20.1.1 - autobuilt 7adf4d0 diff --git a/sources b/sources index 2936098..cea6534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.20.1.1-7adf.tar.xz) = 914f3ff2ced16e59b0b3589e21f84875e727a82fdcd0e5ca1dd7c0ea847dff8e3df68d3a6b6b7454c34fa8f5f93251775885ec29ae9366fe767416a2ea937f04 +SHA512 (crun-0.20.1.3-9dec.tar.xz) = 95e3d24ba76394ee798d6ed1599218f4faef1201dd38177b66726e66a1908a15ed81039d69922cd597d8b2c9a30129e86a10c340b1e9aa67f9148f789e8fde08 From 74031b37843102e10a992d8a1bfe437131032a38 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 19 Jun 2021 04:11:53 +0000 Subject: [PATCH 080/184] crun-0.19.1.13-0.15.git63400f2 - bump to 0.19.1.13 - autobuilt 63400f2 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e7448ca..0a19f6d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ crun-0.1.1.tar.gz /crun-0.20.3-8d6a.tar.xz /crun-0.20.1.1-7adf.tar.xz /crun-0.20.1.3-9dec.tar.xz +/crun-0.19.1.13-6340.tar.xz diff --git a/crun.spec b/crun.spec index 2de6761..33d45b7 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 9dec366ed15c0cee945b3f1c95ffbd54a292a6aa +%global commit0 63400f2b97b3793505d5b183d9e96d4c3c680185 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.20.1.3 -Release: 0.14.git%{shortcommit0}%{?dist} +Version: 0.19.1.13 +Release: 0.15.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Sat Jun 19 2021 RH Container Bot - 0.19.1.13-0.15.git63400f2 +- bump to 0.19.1.13 +- autobuilt 63400f2 + * Tue Jun 15 2021 RH Container Bot - 0.20.1.3-0.14.git9dec366 - bump to 0.20.1.3 - autobuilt 9dec366 diff --git a/sources b/sources index cea6534..e3eb710 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.20.1.3-9dec.tar.xz) = 95e3d24ba76394ee798d6ed1599218f4faef1201dd38177b66726e66a1908a15ed81039d69922cd597d8b2c9a30129e86a10c340b1e9aa67f9148f789e8fde08 +SHA512 (crun-0.19.1.13-6340.tar.xz) = 523d0fe64803456c1175217aea8a0b35efca005938906f55d60a6fd082327e1763708f1fdfc648151dba960ecd6a93e7b422c1918da486c06d2b4f33c07024d9 From a703d7ea386ae0f886448c4ef2490b8f97afeb73 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 21 Jun 2021 12:43:05 +0000 Subject: [PATCH 081/184] crun-0.20.1.7-0.16.git7ef74c9 - bump to 0.20.1.7 - autobuilt 7ef74c9 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0a19f6d..dba222e 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ crun-0.1.1.tar.gz /crun-0.20.1.1-7adf.tar.xz /crun-0.20.1.3-9dec.tar.xz /crun-0.19.1.13-6340.tar.xz +/crun-0.20.1.7-7ef7.tar.xz diff --git a/crun.spec b/crun.spec index 33d45b7..3b72582 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 63400f2b97b3793505d5b183d9e96d4c3c680185 +%global commit0 7ef74c9330033cb884507c28fd8c267861486633 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.19.1.13 -Release: 0.15.git%{shortcommit0}%{?dist} +Version: 0.20.1.7 +Release: 0.16.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Mon Jun 21 2021 RH Container Bot - 0.20.1.7-0.16.git7ef74c9 +- bump to 0.20.1.7 +- autobuilt 7ef74c9 + * Sat Jun 19 2021 RH Container Bot - 0.19.1.13-0.15.git63400f2 - bump to 0.19.1.13 - autobuilt 63400f2 diff --git a/sources b/sources index e3eb710..c3ed83c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.19.1.13-6340.tar.xz) = 523d0fe64803456c1175217aea8a0b35efca005938906f55d60a6fd082327e1763708f1fdfc648151dba960ecd6a93e7b422c1918da486c06d2b4f33c07024d9 +SHA512 (crun-0.20.1.7-7ef7.tar.xz) = a028ce0b7da88bbecf4c5030de8550471010bd2772b3da1f9c49b2a767a18ddfbf7b785bd4ff363fa384e3f80442656b1931bc944fe5d51b1b8a72e170ddc118 From 187be247805cf792946686f533da65fc06d97518 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 23 Jun 2021 04:12:06 +0000 Subject: [PATCH 082/184] crun-0.20.1.9-0.17.git60de767 - bump to 0.20.1.9 - autobuilt 60de767 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dba222e..93f28ea 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ crun-0.1.1.tar.gz /crun-0.20.1.3-9dec.tar.xz /crun-0.19.1.13-6340.tar.xz /crun-0.20.1.7-7ef7.tar.xz +/crun-0.20.1.9-60de.tar.xz diff --git a/crun.spec b/crun.spec index 3b72582..d47494e 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,5 @@ %global git0 https://github.com/containers/crun -%global commit0 7ef74c9330033cb884507c28fd8c267861486633 +%global commit0 60de7677f4ea9db37ce48964e995c2b0536af886 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) @@ -11,8 +11,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.20.1.7 -Release: 0.16.git%{shortcommit0}%{?dist} +Version: 0.20.1.9 +Release: 0.17.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,10 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Wed Jun 23 2021 RH Container Bot - 0.20.1.9-0.17.git60de767 +- bump to 0.20.1.9 +- autobuilt 60de767 + * Mon Jun 21 2021 RH Container Bot - 0.20.1.7-0.16.git7ef74c9 - bump to 0.20.1.7 - autobuilt 7ef74c9 diff --git a/sources b/sources index c3ed83c..8113764 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.20.1.7-7ef7.tar.xz) = a028ce0b7da88bbecf4c5030de8550471010bd2772b3da1f9c49b2a767a18ddfbf7b785bd4ff363fa384e3f80442656b1931bc944fe5d51b1b8a72e170ddc118 +SHA512 (crun-0.20.1.9-60de.tar.xz) = dfcb9f4d96dd6c4e485d0120cb9479b40f55b495abf700692c0341f1fb640962d7b0656b75c0af864e430065d56ca172d919c96f236cd672624fb230714f8800 From e2d0ef4862f5543fed9f55397d5cdcc8eff0ddd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:09:25 +0000 Subject: [PATCH 083/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index d47494e..dd22456 100644 --- a/crun.spec +++ b/crun.spec @@ -12,7 +12,7 @@ Summary: OCI runtime written in C Name: crun Version: 0.20.1.9 -Release: 0.17.git%{shortcommit0}%{?dist} +Release: 0.18.git%{shortcommit0}%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}-%{shortercommit0}.tar.xz @@ -61,6 +61,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.20.1.9-0.18.git60de767 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 23 2021 RH Container Bot - 0.20.1.9-0.17.git60de767 - bump to 0.20.1.9 - autobuilt 60de767 From c5ae9479bcd600f5015b71f3d6ad6e78c3e4a6c7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Aug 2021 15:33:05 -0400 Subject: [PATCH 084/184] crun-0.21-1 - bump to 0.21 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + crun.spec | 19 +++++++++---------- sources | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 93f28ea..6193b2d 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ crun-0.1.1.tar.gz /crun-0.19.1.13-6340.tar.xz /crun-0.20.1.7-7ef7.tar.xz /crun-0.20.1.9-60de.tar.xz +/crun-0.21-dirty.tar.xz diff --git a/crun.spec b/crun.spec index dd22456..dd935f1 100644 --- a/crun.spec +++ b/crun.spec @@ -1,21 +1,17 @@ %global git0 https://github.com/containers/crun -%global commit0 60de7677f4ea9db37ce48964e995c2b0536af886 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global shortercommit0 %(c=%{commit0}; echo ${c:0:4}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag 0.20.1 -%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%define download_url %{git0}/archive/%{built_tag}.tar.gz +%global built_tag 0.21 +%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Summary: OCI runtime written in C Name: crun -Version: 0.20.1.9 -Release: 0.18.git%{shortcommit0}%{?dist} +Version: 0.21 +Release: 1%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo -Source0: %{name}-%{version}-%{shortercommit0}.tar.xz +Source0: %{name}-%{version}-dirty.tar.xz License: GPLv2+ # We always run autogen.sh @@ -43,7 +39,7 @@ Provides: oci-runtime crun is a runtime for running OCI containers %prep -%autosetup -p1 -n %{name}-%{version}-%{shortercommit0} +%autosetup -p1 -n %{name}-%{version}-dirty %build ./autogen.sh @@ -61,6 +57,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Thu Aug 05 2021 Lokesh Mandvekar - 0.21-1 +- bump to 0.21 + * Wed Jul 21 2021 Fedora Release Engineering - 0.20.1.9-0.18.git60de767 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 8113764..7de76a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.20.1.9-60de.tar.xz) = dfcb9f4d96dd6c4e485d0120cb9479b40f55b495abf700692c0341f1fb640962d7b0656b75c0af864e430065d56ca172d919c96f236cd672624fb230714f8800 +SHA512 (crun-0.21-dirty.tar.xz) = 5177cc5a98ad77d5a70b9854bf87403f6f424a04cb462e80e899af6849ef0b89897fc96cbd105536925c461a8bd9d7a9eee5abf1adcce482d91f4d61da6a1b0a From ef2bd8a05783fe7685cf1242f28a1fb50642854a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 10 Aug 2021 15:44:32 -0400 Subject: [PATCH 085/184] update BUILD dir format Signed-off-by: Lokesh Mandvekar --- crun.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index dd935f1..7b0f7f8 100644 --- a/crun.spec +++ b/crun.spec @@ -11,7 +11,7 @@ Version: 0.21 Release: 1%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo -Source0: %{name}-%{version}-dirty.tar.xz +Source0: %{name}-%{version}.tar.xz License: GPLv2+ # We always run autogen.sh @@ -39,7 +39,7 @@ Provides: oci-runtime crun is a runtime for running OCI containers %prep -%autosetup -p1 -n %{name}-%{version}-dirty +%autosetup -p1 -n %{name}-%{version} %build ./autogen.sh From eb38015b7ee3f629629459a101da23f4836e51e4 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 10 Aug 2021 19:52:58 +0000 Subject: [PATCH 086/184] crun-0.21-1 autobuilt 0.21 Signed-off-by: RH Container Bot --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6193b2d..171c701 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ crun-0.1.1.tar.gz /crun-0.20.1.7-7ef7.tar.xz /crun-0.20.1.9-60de.tar.xz /crun-0.21-dirty.tar.xz +/crun-0.21.tar.xz diff --git a/sources b/sources index 7de76a7..facedfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.21-dirty.tar.xz) = 5177cc5a98ad77d5a70b9854bf87403f6f424a04cb462e80e899af6849ef0b89897fc96cbd105536925c461a8bd9d7a9eee5abf1adcce482d91f4d61da6a1b0a +SHA512 (crun-0.21.tar.xz) = d7b0a37c3c69fdbd8c1cc969867023c2c72fa59437378f04498e46956a35ee675b2599e720518ddf30eae2ce82629b07b76d681b3a9b5417aab6ea2794d2f54e From 40780036ae99e35314d57bfb6f23c1508236605f Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 25 Aug 2021 17:20:32 +0000 Subject: [PATCH 087/184] crun-1.0-1 autobuilt 1.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 171c701..c052f7b 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ crun-0.1.1.tar.gz /crun-0.20.1.9-60de.tar.xz /crun-0.21-dirty.tar.xz /crun-0.21.tar.xz +/crun-1.0.tar.xz diff --git a/crun.spec b/crun.spec index 7b0f7f8..16801af 100644 --- a/crun.spec +++ b/crun.spec @@ -2,12 +2,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag 0.21 +%global built_tag 1.0 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Summary: OCI runtime written in C Name: crun -Version: 0.21 +Version: 1.0 Release: 1%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo @@ -57,6 +57,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Wed Aug 25 2021 RH Container Bot - 1.0-1 +- autobuilt 1.0 + * Thu Aug 05 2021 Lokesh Mandvekar - 0.21-1 - bump to 0.21 diff --git a/sources b/sources index facedfd..fd85c32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.21.tar.xz) = d7b0a37c3c69fdbd8c1cc969867023c2c72fa59437378f04498e46956a35ee675b2599e720518ddf30eae2ce82629b07b76d681b3a9b5417aab6ea2794d2f54e +SHA512 (crun-1.0.tar.xz) = 91da1e50971417a9017f438e28a464dd9fd452bdca2c76e010500ea1f659863987b7a56a6b34e2c1777f74f6fd8db6899ed333118e928d281bb7b6ddfc35b9b7 From 8355bc9ad0aa53eee5bf0c6106dce095128f8558 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 27 Sep 2021 15:07:29 +0000 Subject: [PATCH 088/184] crun-1.1-1 autobuilt 1.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c052f7b..ee19a52 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ crun-0.1.1.tar.gz /crun-0.21-dirty.tar.xz /crun-0.21.tar.xz /crun-1.0.tar.xz +/crun-1.1.tar.xz diff --git a/crun.spec b/crun.spec index 16801af..db10d6c 100644 --- a/crun.spec +++ b/crun.spec @@ -2,12 +2,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag 1.0 +%global built_tag 1.1 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Summary: OCI runtime written in C Name: crun -Version: 1.0 +Version: 1.1 Release: 1%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo @@ -57,6 +57,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Mon Sep 27 2021 RH Container Bot - 1.1-1 +- autobuilt 1.1 + * Wed Aug 25 2021 RH Container Bot - 1.0-1 - autobuilt 1.0 diff --git a/sources b/sources index fd85c32..5614f9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.0.tar.xz) = 91da1e50971417a9017f438e28a464dd9fd452bdca2c76e010500ea1f659863987b7a56a6b34e2c1777f74f6fd8db6899ed333118e928d281bb7b6ddfc35b9b7 +SHA512 (crun-1.1.tar.xz) = afb4fd2bcd4bfb5cbfe33308499495fdb4b65f3cfce54a6055e0bc69f8f9b62d19ebc66eb306abe6ce0714741241ccad427b75ac81562dfc8254d83f9d2e19f1 From b101f2e9e1da16aa2d1167971ebd85e9c1839e31 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 28 Sep 2021 08:54:24 -0400 Subject: [PATCH 089/184] BR: protobuf-c-devel Signed-off-by: Lokesh Mandvekar --- crun.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crun.spec b/crun.spec index db10d6c..5ae233f 100644 --- a/crun.spec +++ b/crun.spec @@ -30,6 +30,7 @@ BuildRequires: libtool BuildRequires: go-md2man BuildRequires: make BuildRequires: glibc-static +BuildRequires: protobuf-c-devel %ifnarch %ix86 BuildRequires: criu-devel >= 3.15 %endif From e101b6216a0b7936cbe855ccde1ce826090f0d72 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 8 Oct 2021 07:09:38 +0000 Subject: [PATCH 090/184] crun-1.2-1 autobuilt 1.2 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ee19a52..3466472 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ crun-0.1.1.tar.gz /crun-0.21.tar.xz /crun-1.0.tar.xz /crun-1.1.tar.xz +/crun-1.2.tar.xz diff --git a/crun.spec b/crun.spec index 5ae233f..fabeb9d 100644 --- a/crun.spec +++ b/crun.spec @@ -2,12 +2,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag 1.1 +%global built_tag 1.2 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Summary: OCI runtime written in C Name: crun -Version: 1.1 +Version: 1.2 Release: 1%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo @@ -58,6 +58,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Fri Oct 08 2021 RH Container Bot - 1.2-1 +- autobuilt 1.2 + * Mon Sep 27 2021 RH Container Bot - 1.1-1 - autobuilt 1.1 diff --git a/sources b/sources index 5614f9c..96c2c2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.1.tar.xz) = afb4fd2bcd4bfb5cbfe33308499495fdb4b65f3cfce54a6055e0bc69f8f9b62d19ebc66eb306abe6ce0714741241ccad427b75ac81562dfc8254d83f9d2e19f1 +SHA512 (crun-1.2.tar.xz) = 44585d9854ef773c7f50f464c4c0dfcd687c6a627559a58aead1f2acfa734904f3d92a6d4454681a7a7c0295e61234e7124aa7ca8163084fa864b354f39839ae From 4074979a66a3c1a9b7a9ecb22afdcde221d31ef6 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 5 Nov 2021 07:07:24 +0000 Subject: [PATCH 091/184] crun-1.3-1 autobuilt 1.3 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3466472..759475f 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ crun-0.1.1.tar.gz /crun-1.0.tar.xz /crun-1.1.tar.xz /crun-1.2.tar.xz +/crun-1.3.tar.xz diff --git a/crun.spec b/crun.spec index fabeb9d..acb2246 100644 --- a/crun.spec +++ b/crun.spec @@ -2,12 +2,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag 1.2 +%global built_tag 1.3 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Summary: OCI runtime written in C Name: crun -Version: 1.2 +Version: 1.3 Release: 1%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo @@ -58,6 +58,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Fri Nov 05 2021 RH Container Bot - 1.3-1 +- autobuilt 1.3 + * Fri Oct 08 2021 RH Container Bot - 1.2-1 - autobuilt 1.2 diff --git a/sources b/sources index 96c2c2d..78d388d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.2.tar.xz) = 44585d9854ef773c7f50f464c4c0dfcd687c6a627559a58aead1f2acfa734904f3d92a6d4454681a7a7c0295e61234e7124aa7ca8163084fa864b354f39839ae +SHA512 (crun-1.3.tar.xz) = d22dfca5948bd2199d51e1baedad9c67d2a3420a476afa6f2fc2238a06773b1fb2e218dd012d2b676c8b4e556ce283d259332b78ee92560f83157a1fa243631e From e4b2afec9865be2e13684a2836ccda99f0cd19c4 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 22 Dec 2021 12:07:23 +0000 Subject: [PATCH 092/184] crun-1.4-1 autobuilt 1.4 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 759475f..36da6ba 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ crun-0.1.1.tar.gz /crun-1.1.tar.xz /crun-1.2.tar.xz /crun-1.3.tar.xz +/crun-1.4.tar.xz diff --git a/crun.spec b/crun.spec index acb2246..a2b6e49 100644 --- a/crun.spec +++ b/crun.spec @@ -2,12 +2,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag 1.3 +%global built_tag 1.4 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Summary: OCI runtime written in C Name: crun -Version: 1.3 +Version: 1.4 Release: 1%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo @@ -58,6 +58,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Wed Dec 22 2021 RH Container Bot - 1.4-1 +- autobuilt 1.4 + * Fri Nov 05 2021 RH Container Bot - 1.3-1 - autobuilt 1.3 diff --git a/sources b/sources index 78d388d..b50ef0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.3.tar.xz) = d22dfca5948bd2199d51e1baedad9c67d2a3420a476afa6f2fc2238a06773b1fb2e218dd012d2b676c8b4e556ce283d259332b78ee92560f83157a1fa243631e +SHA512 (crun-1.4.tar.xz) = c269d5b74471b4d0fdbf7ad0abe1ff53144bad5cfe530aed5e643fab4eafd3103fb3e28532cf1d51405d2b7dcc187a4d021e792360685ffede1a9b960b28ba20 From c5881e1cd02dced282562e0a88193705977c5b35 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 14 Jan 2022 10:07:27 +0000 Subject: [PATCH 093/184] crun-1.4.1-1 autobuilt 1.4.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 36da6ba..91af609 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ crun-0.1.1.tar.gz /crun-1.2.tar.xz /crun-1.3.tar.xz /crun-1.4.tar.xz +/crun-1.4.1.tar.xz diff --git a/crun.spec b/crun.spec index a2b6e49..a40a648 100644 --- a/crun.spec +++ b/crun.spec @@ -2,12 +2,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag 1.4 +%global built_tag 1.4.1 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Summary: OCI runtime written in C Name: crun -Version: 1.4 +Version: 1.4.1 Release: 1%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo @@ -58,6 +58,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Fri Jan 14 2022 RH Container Bot - 1.4.1-1 +- autobuilt 1.4.1 + * Wed Dec 22 2021 RH Container Bot - 1.4-1 - autobuilt 1.4 diff --git a/sources b/sources index b50ef0e..613a912 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.4.tar.xz) = c269d5b74471b4d0fdbf7ad0abe1ff53144bad5cfe530aed5e643fab4eafd3103fb3e28532cf1d51405d2b7dcc187a4d021e792360685ffede1a9b960b28ba20 +SHA512 (crun-1.4.1.tar.xz) = 49b73e47863601fdbc20b0b88b6b4b8da969660a4a8edc5646b2aa5c0b5ebe9e9f48e5a542b11c7d767c965250721a13afc5e537c3922226fc9e252b05d8e7cd From ae0357def6c747e8320758d1772a831eb2339910 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:02:27 +0000 Subject: [PATCH 094/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index a40a648..8e6690f 100644 --- a/crun.spec +++ b/crun.spec @@ -8,7 +8,7 @@ Summary: OCI runtime written in C Name: crun Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}.tar.xz @@ -58,6 +58,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 14 2022 RH Container Bot - 1.4.1-1 - autobuilt 1.4.1 From 654236e941ca7aaa3d0c50ce30f2b9e74913304e Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 26 Jan 2022 09:07:12 +0000 Subject: [PATCH 095/184] crun-1.4.2-1 autobuilt 1.4.2 Signed-off-by: RH Container Bot --- .gitignore | 1 + crun.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 91af609..4e9875d 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ crun-0.1.1.tar.gz /crun-1.3.tar.xz /crun-1.4.tar.xz /crun-1.4.1.tar.xz +/crun-1.4.2.tar.xz diff --git a/crun.spec b/crun.spec index 8e6690f..9a2b3f3 100644 --- a/crun.spec +++ b/crun.spec @@ -2,13 +2,13 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag 1.4.1 +%global built_tag 1.4.2 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Summary: OCI runtime written in C Name: crun -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.4.2 +Release: 1%{?dist} URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}.tar.xz @@ -58,6 +58,9 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +* Wed Jan 26 2022 RH Container Bot - 1.4.2-1 +- autobuilt 1.4.2 + * Thu Jan 20 2022 Fedora Release Engineering - 1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 613a912..a864b5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.4.1.tar.xz) = 49b73e47863601fdbc20b0b88b6b4b8da969660a4a8edc5646b2aa5c0b5ebe9e9f48e5a542b11c7d767c965250721a13afc5e537c3922226fc9e252b05d8e7cd +SHA512 (crun-1.4.2.tar.xz) = 034d7ff6b2b390a474dc9ab864c8af2cca1f990eee429332e4f6219e1b9b622dc3c9e8600c1208c2406298ef52dcdf719a4d83bf9744ccfe6b2e1c148c936bd0 From 4f5a1a66995237c3d978a877c6f1733380debfa5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 27 Jan 2022 12:59:35 -0500 Subject: [PATCH 096/184] switch to autospec Signed-off-by: Lokesh Mandvekar --- crun.spec | 259 +----------------------------------------------------- 1 file changed, 4 insertions(+), 255 deletions(-) diff --git a/crun.spec b/crun.spec index 9a2b3f3..24272e3 100644 --- a/crun.spec +++ b/crun.spec @@ -1,14 +1,12 @@ %global git0 https://github.com/containers/crun -# Used for comparing with latest upstream tag -# to decide whether to autobuild (non-rawhide only) %global built_tag 1.4.2 -%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C Name: crun -Version: 1.4.2 -Release: 1%{?dist} +Version: %{gen_version} +Release: %autorelease URL: %{git0} # Source0 generated using `make dist` in upstream repo Source0: %{name}-%{version}.tar.xz @@ -19,7 +17,6 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc BuildRequires: python -BuildRequires: git BuildRequires: libcap-devel BuildRequires: systemd-devel BuildRequires: yajl-devel @@ -58,252 +55,4 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog -* Wed Jan 26 2022 RH Container Bot - 1.4.2-1 -- autobuilt 1.4.2 - -* Thu Jan 20 2022 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jan 14 2022 RH Container Bot - 1.4.1-1 -- autobuilt 1.4.1 - -* Wed Dec 22 2021 RH Container Bot - 1.4-1 -- autobuilt 1.4 - -* Fri Nov 05 2021 RH Container Bot - 1.3-1 -- autobuilt 1.3 - -* Fri Oct 08 2021 RH Container Bot - 1.2-1 -- autobuilt 1.2 - -* Mon Sep 27 2021 RH Container Bot - 1.1-1 -- autobuilt 1.1 - -* Wed Aug 25 2021 RH Container Bot - 1.0-1 -- autobuilt 1.0 - -* Thu Aug 05 2021 Lokesh Mandvekar - 0.21-1 -- bump to 0.21 - -* Wed Jul 21 2021 Fedora Release Engineering - 0.20.1.9-0.18.git60de767 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jun 23 2021 RH Container Bot - 0.20.1.9-0.17.git60de767 -- bump to 0.20.1.9 -- autobuilt 60de767 - -* Mon Jun 21 2021 RH Container Bot - 0.20.1.7-0.16.git7ef74c9 -- bump to 0.20.1.7 -- autobuilt 7ef74c9 - -* Sat Jun 19 2021 RH Container Bot - 0.19.1.13-0.15.git63400f2 -- bump to 0.19.1.13 -- autobuilt 63400f2 - -* Tue Jun 15 2021 RH Container Bot - 0.20.1.3-0.14.git9dec366 -- bump to 0.20.1.3 -- autobuilt 9dec366 - -* Thu Jun 10 2021 RH Container Bot - 0.20.1.1-0.13.git7adf4d0 -- bump to 0.20.1.1 -- autobuilt 7adf4d0 - -* Thu Jun 03 2021 RH Container Bot - 0.20.3-0.12.git8d6a8b5 -- bump to 0.20.3 -- autobuilt 8d6a8b5 - -* Wed Jun 02 2021 RH Container Bot - 0.20.1-0.11.gitffb75b2 -- bump to 0.20.1 -- autobuilt ffb75b2 - -* Tue May 25 2021 RH Container Bot - 0.19.1.50-0.10.git1942907 -- bump to 0.19.1.50 -- autobuilt 1942907 - -* Fri May 21 2021 RH Container Bot - 0.19.1.45-0.9.git4cc7fa1 -- bump to 0.19.1.45 -- autobuilt 4cc7fa1 - -* Sat May 15 2021 RH Container Bot - 0.19.1.41-0.8.gitf9c405d -- bump to 0.19.1.41 -- autobuilt f9c405d - -* Fri May 14 2021 RH Container Bot - 0.19.1.36-0.7.git2badd69 -- bump to 0.19.1.36 -- autobuilt 2badd69 - -* Thu May 13 2021 RH Container Bot - 0.19.1.31-0.6.gitb83eda7 -- bump to 0.19.1.31 -- autobuilt b83eda7 - -* Tue May 11 2021 RH Container Bot - 0.19.1.26-0.5.git029e0ed -- bump to 0.19.1.26 -- autobuilt 029e0ed - -* Mon May 10 2021 RH Container Bot - 0.19.1.22-0.4.git4e968c9 -- bump to 0.19.1.22 -- autobuilt 4e968c9 - -* Sat May 08 2021 RH Container Bot - 0.19.1.19-0.3.gitb6c3139 -- bump to 0.19.1.19 -- autobuilt b6c3139 - -* Fri May 07 2021 RH Container Bot - 0.19.1.17-0.2.git3f6a944 -- bump to 0.19.1.17 -- autobuilt 3f6a944 - -* Mon May 03 2021 Lokesh Mandvekar - 0.19.1.11-0.1.git1dead7e -- built 1dead7e - -* Wed Apr 28 2021 Lokesh Mandvekar - 0.19.1.7-0.1.git3886321 -- built 3886321 - -* Thu Apr 22 2021 Lokesh Mandvekar - 0.19.1-2 -- rebuild for new bodhi - -* Thu Apr 22 2021 Giuseppe Scrivano - 0.19.1-1 -- built version 0.19.1 - -* Tue Apr 13 2021 Lokesh Mandvekar - 0.19-2 -- unversioned Provides: oci-runtime -- runc package will also provide an unversioned Provides: oci-runtime. -- user should pull in runc separately or else it will install crun by default - (alphabetical order) -- similar situation as caddy, httpd, lighttpd and nginx having Provides: -webserver - -* Tue Apr 06 2021 Giuseppe Scrivano - 0.19-1 -- built version 0.19 - -* Wed Mar 31 2021 Lokesh Mandvekar - 0.18-5 -- linux: always remount bind mounts ghpr#640 - -* Thu Mar 25 2021 Lokesh Mandvekar - 0.18-4 -- bump release tag to stay ahead of older fedora - -* Thu Mar 25 2021 Lokesh Mandvekar - 0.18-2 -- Requires: libcap >= 2.48 - -* Fri Feb 19 2021 Giuseppe Scrivano - 0.18-1 -- built version 0.18 - -* Tue Jan 26 2021 Fedora Release Engineering - 0.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 21 2021 Giuseppe Scrivano - 0.17-1 -- built version 0.17 - -* Thu Dec 17 2020 Giuseppe Scrivano - 0.16-3 -- build with CRIU - -* Wed Nov 25 2020 Jindrich Novy - 0.16-2 -- fix license - -* Tue Nov 24 2020 Giuseppe Scrivano - 0.16-1 -- built version 0.16 - -* Wed Nov 04 2020 Giuseppe Scrivano - 0.15.1-1 -- built version 0.15.1 - -* Wed Sep 30 2020 Lokesh Mandvekar - 0.15-5 -- rebuild to bump release tag ahead of older fedoras - -* Wed Sep 30 2020 Giuseppe Scrivano - 0.15-3 -- backport "exec: check read bytes from sync" - -* Wed Sep 23 2020 Giuseppe Scrivano - 0.15-2 -- rebuild - -* Wed Sep 23 2020 Giuseppe Scrivano - 0.15-1 -- build version 0.15 - -* Mon Sep 14 2020 Giuseppe Scrivano - 0.14.1-5 -- backport 4453af4c060e380051552ee589af5cad37f2ae82 - -* Mon Aug 31 2020 Lokesh Mandvekar - 0.14.1-4 -- rebuild - -* Thu Aug 27 2020 Giuseppe Scrivano - 0.14.1-3 -- backport ed9c3e6f466dfb6d2e79802060fabd5f4b66f78e - -* Mon Jul 27 2020 Fedora Release Engineering - 0.14.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 08 2020 Giuseppe Scrivano - 0.14.1-1 -- built version 0.14.1 - -* Thu Jul 02 2020 Giuseppe Scrivano - 0.14-1 -- built version 0.14 - -* Wed Apr 15 2020 Lokesh Mandvekar - 0.13-2 -- release bump for correct upgrade path - -* Thu Mar 05 2020 Giuseppe Scrivano - 0.13-1 -- built version 0.13 - -* Mon Feb 17 2020 Giuseppe Scrivano - 0.12.2.1-1 -- built version 0.12.2.1 - -* Mon Feb 17 2020 Giuseppe Scrivano - 0.12.2-1 -- built version 0.12.2 - -* Thu Feb 6 2020 Giuseppe Scrivano - 0.12.1-1 -- built version 0.12.1 - -* Mon Feb 3 2020 Giuseppe Scrivano - 0.12-1 -- built version 0.12 - -* Tue Jan 28 2020 Fedora Release Engineering - 0.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Dec 23 2019 Giuseppe Scrivano - 0.11-1 -- built version 0.11 - -* Mon Nov 18 2019 Giuseppe Scrivano - 0.10.6-1 -- built version 0.10.6 - -* Sun Nov 10 2019 Giuseppe Scrivano - 0.10.5-2 -- built version 0.10.5 -- fix CVE-2019-18837 - -* Sun Nov 10 2019 Giuseppe Scrivano - 0.10.5-1 -- built version 0.10.5 - -* Thu Oct 31 2019 Giuseppe Scrivano - 0.10.4-1 -- built version 0.10.4 - -* Tue Oct 29 2019 Giuseppe Scrivano - 0.10.3-1 -- built version 0.10.3 - -* Mon Oct 7 2019 Giuseppe Scrivano - 0.10.2-1 -- built version 0.10.2 - -* Fri Oct 4 2019 Giuseppe Scrivano - 0.10.1-1 -- built version 0.10.1 - -* Tue Oct 1 2019 Giuseppe Scrivano - 0.10-1 -- built version 0.10 - -* Fri Sep 13 2019 Giuseppe Scrivano - 0.9.1-1 -- built version 0.9.1 - -* Wed Sep 11 2019 Giuseppe Scrivano - 0.9-1 -- built version 0.9 - -* Tue Sep 10 2019 Jindrich Novy - 0.8-3 -- Add versioned oci-runtime provide. - -* Mon Sep 9 2019 Dan Walsh - 0.8-2 -- Add provides oci-runtime - -* Mon Aug 19 2019 Giuseppe Scrivano - 0.8-1 -- built version 0.8 - -* Wed Jul 24 2019 Fedora Release Engineering - 0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 18 2019 Giuseppe Scrivano - 0.7-1 -- built version 0.7 - -* Tue Jun 18 2019 Giuseppe Scrivano - 0.6-1 -- built version 0.6 +%autochangelog From f63c79c1210088adc26f20a22c4782cfee4f5dfd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 3 Mar 2022 09:53:05 -0500 Subject: [PATCH 097/184] bump to 1.4.3 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + crun.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4e9875d..28fac26 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ crun-0.1.1.tar.gz /crun-1.4.tar.xz /crun-1.4.1.tar.xz /crun-1.4.2.tar.xz +/crun-1.4.3.tar.xz diff --git a/crun.spec b/crun.spec index 24272e3..20cb9ba 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ %global git0 https://github.com/containers/crun -%global built_tag 1.4.2 +%global built_tag 1.4.3 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C @@ -9,7 +9,7 @@ Version: %{gen_version} Release: %autorelease URL: %{git0} # Source0 generated using `make dist` in upstream repo -Source0: %{name}-%{version}.tar.xz +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPLv2+ # We always run autogen.sh diff --git a/sources b/sources index a864b5f..f04d53f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.4.2.tar.xz) = 034d7ff6b2b390a474dc9ab864c8af2cca1f990eee429332e4f6219e1b9b622dc3c9e8600c1208c2406298ef52dcdf719a4d83bf9744ccfe6b2e1c148c936bd0 +SHA512 (crun-1.4.3.tar.xz) = ba44a843020de31a846abf4fc72b672e9311d9fdc877ca2d2c7c5e3a2ad4bc5dab10553a34e68d7cb1d25bc4b89d4c867152217e8529113e52f0bf370d29ee3d From d381ac634229eeaca0e748228538b43b23687e99 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 10 Mar 2022 13:22:48 -0500 Subject: [PATCH 098/184] specify BR: python3 and not python rhcontainerbot/podman4 copr centos 8 repo doesn't recognize python Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 20cb9ba..21b6e77 100644 --- a/crun.spec +++ b/crun.spec @@ -16,7 +16,7 @@ License: GPLv2+ BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc -BuildRequires: python +BuildRequires: python3 BuildRequires: libcap-devel BuildRequires: systemd-devel BuildRequires: yajl-devel From 2a5599c386390e2d6ba24760429e1c7324a28be4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 24 Mar 2022 08:27:34 -0400 Subject: [PATCH 099/184] bump to v1.4.4 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 28fac26..bf8acdd 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ crun-0.1.1.tar.gz /crun-1.4.1.tar.xz /crun-1.4.2.tar.xz /crun-1.4.3.tar.xz +/crun-1.4.4.tar.xz diff --git a/crun.spec b/crun.spec index 21b6e77..45aee07 100644 --- a/crun.spec +++ b/crun.spec @@ -1,6 +1,6 @@ %global git0 https://github.com/containers/crun -%global built_tag 1.4.3 +%global built_tag 1.4.4 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index f04d53f..8d8b8bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.4.3.tar.xz) = ba44a843020de31a846abf4fc72b672e9311d9fdc877ca2d2c7c5e3a2ad4bc5dab10553a34e68d7cb1d25bc4b89d4c867152217e8529113e52f0bf370d29ee3d +SHA512 (crun-1.4.4.tar.xz) = 1756dccf6509457a5dc114d43c4f4e99258a20c3437dfe06016d080989c5d3035f5735d62d18ab537b660ec36de04df369a2582745baf4ab680af367a19830fd From 7ad0ace3449cc983e17bd8685bbc2854cf8049cb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 31 Mar 2022 13:28:16 -0400 Subject: [PATCH 100/184] minor change: remove unnecessary git0 macro Signed-off-by: Lokesh Mandvekar --- crun.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/crun.spec b/crun.spec index 45aee07..430e3ea 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,3 @@ -%global git0 https://github.com/containers/crun - %global built_tag 1.4.4 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) @@ -7,8 +5,7 @@ Summary: OCI runtime written in C Name: crun Version: %{gen_version} Release: %autorelease -URL: %{git0} -# Source0 generated using `make dist` in upstream repo +URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPLv2+ @@ -34,7 +31,7 @@ BuildRequires: criu-devel >= 3.15 Provides: oci-runtime %description -crun is a runtime for running OCI containers +%{name} is a runtime for running OCI containers %prep %autosetup -p1 -n %{name}-%{version} From c4ffaf6186b3a3a6717c49a34343ec910fd38739 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 27 Apr 2022 11:04:33 +0000 Subject: [PATCH 101/184] auto bump to 1.4.5 --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bf8acdd..16c2d23 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ crun-0.1.1.tar.gz /crun-1.4.2.tar.xz /crun-1.4.3.tar.xz /crun-1.4.4.tar.xz +/crun-1.4.5.tar.xz diff --git a/crun.spec b/crun.spec index 430e3ea..214717f 100644 --- a/crun.spec +++ b/crun.spec @@ -1,4 +1,4 @@ -%global built_tag 1.4.4 +%global built_tag 1.4.5 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 8d8b8bd..afd9fb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.4.4.tar.xz) = 1756dccf6509457a5dc114d43c4f4e99258a20c3437dfe06016d080989c5d3035f5735d62d18ab537b660ec36de04df369a2582745baf4ab680af367a19830fd +SHA512 (crun-1.4.5.tar.xz) = 9f288279615fdf587018c465047fc8793daae280ab864bf9046994983239129d50f2eb89cac9b092e5cdc49a10f3523ab403a3f0e7451f7536b79f651a355153 From d7722b93716f1b1b5cf10467bde19cb2344643cd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 16 May 2022 16:36:52 -0400 Subject: [PATCH 102/184] build deb packages using debbuild Signed-off-by: Lokesh Mandvekar --- crun.spec | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/crun.spec b/crun.spec index 214717f..9a9976a 100644 --- a/crun.spec +++ b/crun.spec @@ -1,18 +1,32 @@ %global built_tag 1.4.5 -%global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C Name: crun -Version: %{gen_version} -Release: %autorelease +Version: 1.4.5 URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz +%if "%{_vendor}" == "debbuild" +Maintainer: Lokesh Mandvekar +License: GPL-2.0+ +Release: 0%{?dist} +%else License: GPLv2+ - -# We always run autogen.sh +Release: %autorelease +%endif BuildRequires: autoconf BuildRequires: automake +BuildRequires: go-md2man +BuildRequires: libtool +%if "%{_vendor}" == "debbuild" +BuildRequires: git +BuildRequires: libcap-dev +BuildRequires: libseccomp-dev +BuildRequires: libsystemd-dev +BuildRequires: libyajl-dev +BuildRequires: pkg-config +%else BuildRequires: gcc +BuildRequires: git-core BuildRequires: python3 BuildRequires: libcap-devel BuildRequires: systemd-devel @@ -20,21 +34,20 @@ BuildRequires: yajl-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel BuildRequires: python3-libmount -BuildRequires: libtool -BuildRequires: go-md2man BuildRequires: make BuildRequires: glibc-static BuildRequires: protobuf-c-devel %ifnarch %ix86 BuildRequires: criu-devel >= 3.15 %endif +%endif Provides: oci-runtime %description %{name} is a runtime for running OCI containers %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -Sgit %build ./autogen.sh @@ -52,4 +65,6 @@ rm -rf %{buildroot}%{_prefix}/lib* %{_mandir}/man1/* %changelog +%if "%{_vendor}" != "debbuild" %autochangelog +%endif From 80b16b4732e8249dc65d03f759c69bc0fa814e43 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 16 May 2022 16:36:52 -0400 Subject: [PATCH 103/184] bump to 1.5 Resolves: #2108456 - use latest criu Resolves: #2101691 - enable likbrun support in rawhide Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + crun.spec | 33 +++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 16c2d23..90071cc 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ crun-0.1.1.tar.gz /crun-1.4.3.tar.xz /crun-1.4.4.tar.xz /crun-1.4.5.tar.xz +/crun-1.5.tar.xz diff --git a/crun.spec b/crun.spec index 9a9976a..a413b00 100644 --- a/crun.spec +++ b/crun.spec @@ -1,12 +1,20 @@ -%global built_tag 1.4.5 +%if 0%{?fedora} >= 37 +%ifarch aarch64,x86_64 +%global krun_support enabled +%endif +%else +%global krun_support disabled +%endif + +%global built_tag 1.5 Summary: OCI runtime written in C Name: crun -Version: 1.4.5 +Version: 1.5 URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz %if "%{_vendor}" == "debbuild" -Maintainer: Lokesh Mandvekar +Packager: Lokesh Mandvekar License: GPL-2.0+ Release: 0%{?dist} %else @@ -31,6 +39,10 @@ BuildRequires: python3 BuildRequires: libcap-devel BuildRequires: systemd-devel BuildRequires: yajl-devel +%if "%{krun_support}" == "enabled" +BuildRequires: libkrun-devel +Provides: krun +%endif BuildRequires: libseccomp-devel BuildRequires: libselinux-devel BuildRequires: python3-libmount @@ -38,9 +50,10 @@ BuildRequires: make BuildRequires: glibc-static BuildRequires: protobuf-c-devel %ifnarch %ix86 -BuildRequires: criu-devel >= 3.15 +BuildRequires: criu-devel >= 3.17.1-2 %endif %endif +Requires: criu >= 3.17.1-2 Provides: oci-runtime %description @@ -51,7 +64,12 @@ Provides: oci-runtime %build ./autogen.sh + +%if "%{krun_support}" == "enabled" +%configure --disable-silent-rules --with-libkrun +%else %configure --disable-silent-rules +%endif %make_build @@ -59,9 +77,16 @@ Provides: oci-runtime %make_install rm -rf %{buildroot}%{_prefix}/lib* +%if "%{krun_support}" == "enabled" +ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun +%endif + %files %license COPYING %{_bindir}/%{name} +%if "%{krun_support}" == "enabled" +%{_bindir}/krun +%endif %{_mandir}/man1/* %changelog diff --git a/sources b/sources index afd9fb7..f94d63d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.4.5.tar.xz) = 9f288279615fdf587018c465047fc8793daae280ab864bf9046994983239129d50f2eb89cac9b092e5cdc49a10f3523ab403a3f0e7451f7536b79f651a355153 +SHA512 (crun-1.5.tar.xz) = 8ae5c6e306878194842f3a6a40bfc07038f69b9bd693395d64251133acf59186ce79272a45a3aee26b2a9812cbedb7a37370aece582abb3119ab7cdf7183e57b From 9e192ca81adc77e4ebc2a6fca078f168d975c60c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 25 Jul 2022 14:52:59 -0400 Subject: [PATCH 104/184] handle criu dep for debbuild as well Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index a413b00..b1f3200 100644 --- a/crun.spec +++ b/crun.spec @@ -53,7 +53,7 @@ BuildRequires: protobuf-c-devel BuildRequires: criu-devel >= 3.17.1-2 %endif %endif -Requires: criu >= 3.17.1-2 +Requires: criu >= 3.17.1 Provides: oci-runtime %description From f2635da7ab5bb509307222f7c97689266727cde2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 11 Aug 2022 15:59:09 -0400 Subject: [PATCH 105/184] fix libkrun conditionals Signed-off-by: Lokesh Mandvekar --- crun.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/crun.spec b/crun.spec index b1f3200..eca3ce3 100644 --- a/crun.spec +++ b/crun.spec @@ -1,9 +1,10 @@ +%global krun_opts %{nil} + %if 0%{?fedora} >= 37 -%ifarch aarch64,x86_64 +%ifarch aarch64 || x86_64 %global krun_support enabled +%global krun_opts --with-libkrun %endif -%else -%global krun_support disabled %endif %global built_tag 1.5 @@ -64,13 +65,7 @@ Provides: oci-runtime %build ./autogen.sh - -%if "%{krun_support}" == "enabled" -%configure --disable-silent-rules --with-libkrun -%else -%configure --disable-silent-rules -%endif - +%configure --disable-silent-rules %{krun_opts} %make_build %install From 9ee26cd4996c38bb355cd2a0229594fedb9e94b1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 16 Aug 2022 14:05:28 -0400 Subject: [PATCH 106/184] Fix debbuild maintainer and dep issues Signed-off-by: Lokesh Mandvekar --- crun.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index eca3ce3..8ba8f0f 100644 --- a/crun.spec +++ b/crun.spec @@ -15,7 +15,7 @@ Version: 1.5 URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz %if "%{_vendor}" == "debbuild" -Packager: Lokesh Mandvekar +Packager: Podman Debbuild Maintainers License: GPL-2.0+ Release: 0%{?dist} %else @@ -33,6 +33,7 @@ BuildRequires: libseccomp-dev BuildRequires: libsystemd-dev BuildRequires: libyajl-dev BuildRequires: pkg-config +Requires: criu %else BuildRequires: gcc BuildRequires: git-core @@ -53,8 +54,8 @@ BuildRequires: protobuf-c-devel %ifnarch %ix86 BuildRequires: criu-devel >= 3.17.1-2 %endif -%endif Requires: criu >= 3.17.1 +%endif Provides: oci-runtime %description From 590ccfd018e6c0649c4c6868755a864789b89b7b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 17 Aug 2022 14:48:15 -0400 Subject: [PATCH 107/184] use easier tag macros to make both fedora and debbuild happy Signed-off-by: Lokesh Mandvekar --- crun.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 8ba8f0f..e15ef41 100644 --- a/crun.spec +++ b/crun.spec @@ -7,7 +7,7 @@ %endif %endif -%global built_tag 1.5 +%global built_tag_strip 1.5 Summary: OCI runtime written in C Name: crun @@ -62,7 +62,7 @@ Provides: oci-runtime %{name} is a runtime for running OCI containers %prep -%autosetup -Sgit +%autosetup -Sgit %{name}-%{built_tag_strip} %build ./autogen.sh From 57e8839cbd4745910b558df682433b8f360c8ade Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 7 Sep 2022 15:03:24 +0000 Subject: [PATCH 108/184] auto bump to 1.6 --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 90071cc..c894000 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ crun-0.1.1.tar.gz /crun-1.4.4.tar.xz /crun-1.4.5.tar.xz /crun-1.5.tar.xz +/crun-1.6.tar.xz diff --git a/crun.spec b/crun.spec index e15ef41..f0ff775 100644 --- a/crun.spec +++ b/crun.spec @@ -11,7 +11,7 @@ Summary: OCI runtime written in C Name: crun -Version: 1.5 +Version: 1.6 URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz %if "%{_vendor}" == "debbuild" diff --git a/sources b/sources index f94d63d..223c0de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.5.tar.xz) = 8ae5c6e306878194842f3a6a40bfc07038f69b9bd693395d64251133acf59186ce79272a45a3aee26b2a9812cbedb7a37370aece582abb3119ab7cdf7183e57b +SHA512 (crun-1.6.tar.xz) = cb0464792df6167719fd21c3e1117dc0d89cf91c60d02b478774d14b73bdf49b0d138578b48803ff5af28f50740f5022b043fdf3198833d4a9b69e40974ced00 From 00068edb167eab56fad08b010ea5a19ea764cd93 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 7 Sep 2022 16:01:24 -0400 Subject: [PATCH 109/184] use correct tarball Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index f0ff775..d57b4a2 100644 --- a/crun.spec +++ b/crun.spec @@ -7,7 +7,7 @@ %endif %endif -%global built_tag_strip 1.5 +%global built_tag_strip 1.6 Summary: OCI runtime written in C Name: crun From 613edba48b303ed7a85435b79b3f6022ef7c65f8 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 28 Sep 2022 14:33:22 -0400 Subject: [PATCH 110/184] local build --- crun.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/crun.spec b/crun.spec index d57b4a2..29a5774 100644 --- a/crun.spec +++ b/crun.spec @@ -43,7 +43,6 @@ BuildRequires: systemd-devel BuildRequires: yajl-devel %if "%{krun_support}" == "enabled" BuildRequires: libkrun-devel -Provides: krun %endif BuildRequires: libseccomp-devel BuildRequires: libselinux-devel @@ -72,19 +71,29 @@ Provides: oci-runtime %install %make_install rm -rf %{buildroot}%{_prefix}/lib* - %if "%{krun_support}" == "enabled" -ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun +ln -s ../bin/%{name} %{buildroot}%{_bindir}/krun %endif %files %license COPYING %{_bindir}/%{name} -%if "%{krun_support}" == "enabled" -%{_bindir}/krun -%endif %{_mandir}/man1/* +%if "%{krun_support}" == "enabled" +%package krun +Summary: OCI Runtime providing Virtualization-based process isolation capabilities. +Provides: krun +Requires: libkrun + +%description krun +%{name}-krun OCI Runtime providing Virtualization-based process isolation capabilities. + +%files krun +%{_bindir}/krun + +%endif + %changelog %if "%{_vendor}" != "debbuild" %autochangelog From 263de70111d4a49a0ac3fdda1c005997101b1578 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 4 Oct 2022 15:02:13 -0400 Subject: [PATCH 111/184] remove debbuild macros to comply with fedora guidelines Signed-off-by: Lokesh Mandvekar --- crun.spec | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/crun.spec b/crun.spec index 29a5774..503b1de 100644 --- a/crun.spec +++ b/crun.spec @@ -7,34 +7,21 @@ %endif %endif -%global built_tag_strip 1.6 +%global built_tag 1.6 +%global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C Name: crun -Version: 1.6 +Version: %{gen_version} URL: https://github.com/containers/%{name} +# Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz -%if "%{_vendor}" == "debbuild" -Packager: Podman Debbuild Maintainers -License: GPL-2.0+ -Release: 0%{?dist} -%else License: GPLv2+ Release: %autorelease -%endif BuildRequires: autoconf BuildRequires: automake BuildRequires: go-md2man BuildRequires: libtool -%if "%{_vendor}" == "debbuild" -BuildRequires: git -BuildRequires: libcap-dev -BuildRequires: libseccomp-dev -BuildRequires: libsystemd-dev -BuildRequires: libyajl-dev -BuildRequires: pkg-config -Requires: criu -%else BuildRequires: gcc BuildRequires: git-core BuildRequires: python3 @@ -54,7 +41,6 @@ BuildRequires: protobuf-c-devel BuildRequires: criu-devel >= 3.17.1-2 %endif Requires: criu >= 3.17.1 -%endif Provides: oci-runtime %description @@ -95,6 +81,4 @@ Requires: libkrun %endif %changelog -%if "%{_vendor}" != "debbuild" %autochangelog -%endif From aac762a55d4423ef0b3e13a0a90e5718e867a5a3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Oct 2022 15:14:05 +0000 Subject: [PATCH 112/184] auto bump to 1.6 --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 503b1de..ffd5dc2 100644 --- a/crun.spec +++ b/crun.spec @@ -12,7 +12,7 @@ Summary: OCI runtime written in C Name: crun -Version: %{gen_version} +Version: 1.6 URL: https://github.com/containers/%{name} # Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz From 76df75985feee32d052a5975ba8237c81bb86434 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 7 Oct 2022 13:28:26 -0400 Subject: [PATCH 113/184] Revert "auto bump to 1.6" This reverts commit aac762a55d4423ef0b3e13a0a90e5718e867a5a3 by autobuilder. --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index ffd5dc2..503b1de 100644 --- a/crun.spec +++ b/crun.spec @@ -12,7 +12,7 @@ Summary: OCI runtime written in C Name: crun -Version: 1.6 +Version: %{gen_version} URL: https://github.com/containers/%{name} # Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz From db6cce4e02c8d54e79111ed9f719fd0e8345bc3e Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 28 Oct 2022 15:56:02 +0000 Subject: [PATCH 114/184] Add ExclusiveArch If using golang, then you needs to use ExclusiveArch for those arches that do not have golang. --- crun.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crun.spec b/crun.spec index 503b1de..2b53582 100644 --- a/crun.spec +++ b/crun.spec @@ -18,6 +18,7 @@ URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPLv2+ Release: %autorelease +ExclusiveArch: %{golang_arches} BuildRequires: autoconf BuildRequires: automake BuildRequires: go-md2man From f0e158812d12f51b877fffde769b6ab893d2054c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 3 Nov 2022 17:43:59 +0530 Subject: [PATCH 115/184] enable wasm support Currently, wasmedge is the only wasm provider in Fedora. That may change with time. All wasm providers will include a `Provides: wasm-library` which will be a hard dependency for crun along with a weak dependency that the user can change per need. Signed-off-by: Lokesh Mandvekar --- crun.spec | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 2b53582..31abf21 100644 --- a/crun.spec +++ b/crun.spec @@ -7,6 +7,14 @@ %endif %endif +# wasmedge built only for aarch64 and x86_64 +%if 0%{?fedora} >= 36 +%ifarch aarch64 || x86_64 +%global wasm_support enabled +%global wasm_opts --with-wasmedge +%endif +%endif + %global built_tag 1.6 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) @@ -32,6 +40,9 @@ BuildRequires: yajl-devel %if "%{krun_support}" == "enabled" BuildRequires: libkrun-devel %endif +%if "%{wasm_support}" == "enabled" +BuildRequires: wasmedge-devel +%endif BuildRequires: libseccomp-devel BuildRequires: libselinux-devel BuildRequires: python3-libmount @@ -52,7 +63,7 @@ Provides: oci-runtime %build ./autogen.sh -%configure --disable-silent-rules %{krun_opts} +%configure --disable-silent-rules %{krun_opts} %{wasm_opts} %make_build %install @@ -62,6 +73,10 @@ rm -rf %{buildroot}%{_prefix}/lib* ln -s ../bin/%{name} %{buildroot}%{_bindir}/krun %endif +%if "%{wasm_support}" == "enabled" +ln -s ../bin/%{name} %{buildroot}%{_bindir}/%{name}-wasm +%endif + %files %license COPYING %{_bindir}/%{name} @@ -71,6 +86,7 @@ ln -s ../bin/%{name} %{buildroot}%{_bindir}/krun %package krun Summary: OCI Runtime providing Virtualization-based process isolation capabilities. Provides: krun +Requires: %{name} = %{version}-%{release} Requires: libkrun %description krun @@ -78,7 +94,20 @@ Requires: libkrun %files krun %{_bindir}/krun +%endif +%if "%{wasm_support}" == "enabled" +%package wasm +Summary: wasm support for %{name} +Requires: wasm-library +Recommends: wasmedge +Requires: %{name} = %{version}-%{release} + +%description wasm +%{name}-wasm provides %{name} built with wasm support + +%files wasm +%{_bindir}/%{name}-wasm %endif %changelog From c587fe84e8b9f0f8c446f151be10c6630a18a062 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 7 Nov 2022 07:13:04 -0500 Subject: [PATCH 116/184] local build --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c894000..ab82f0d 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ crun-0.1.1.tar.gz /crun-1.4.5.tar.xz /crun-1.5.tar.xz /crun-1.6.tar.xz +/crun-1.7.tar.xz diff --git a/crun.spec b/crun.spec index 31abf21..a8a285e 100644 --- a/crun.spec +++ b/crun.spec @@ -15,7 +15,7 @@ %endif %endif -%global built_tag 1.6 +%global built_tag 1.7 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 223c0de..94f0e6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.6.tar.xz) = cb0464792df6167719fd21c3e1117dc0d89cf91c60d02b478774d14b73bdf49b0d138578b48803ff5af28f50740f5022b043fdf3198833d4a9b69e40974ced00 +SHA512 (crun-1.7.tar.xz) = acccd5f2c7f058b14147c3260bcc8cbb04eadeef44218086faa331e4335a56a8733c20f105d0c8d1a75878831d74937428fbf3beb3b0c6badc315b61f90224ac From d68ce50debfbacf9b4a873c188664963a2860318 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 16 Nov 2022 18:19:48 +0530 Subject: [PATCH 117/184] use correct macro Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index a8a285e..34e454b 100644 --- a/crun.spec +++ b/crun.spec @@ -59,7 +59,7 @@ Provides: oci-runtime %{name} is a runtime for running OCI containers %prep -%autosetup -Sgit %{name}-%{built_tag_strip} +%autosetup -Sgit %{name}-%{built_tag} %build ./autogen.sh From bdd508b2f6ffc64e5e527d105cbd44ec4c60ad74 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Nov 2022 09:34:59 +0530 Subject: [PATCH 118/184] wasmedge present on all active Fedoras Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/crun.spec b/crun.spec index 34e454b..55ae78c 100644 --- a/crun.spec +++ b/crun.spec @@ -8,12 +8,10 @@ %endif # wasmedge built only for aarch64 and x86_64 -%if 0%{?fedora} >= 36 %ifarch aarch64 || x86_64 %global wasm_support enabled %global wasm_opts --with-wasmedge %endif -%endif %global built_tag 1.7 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) From 07a7ba9e0170dc0cc5d2889b165f4377193ca3f7 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 25 Nov 2022 12:57:36 +0100 Subject: [PATCH 119/184] bump to 1.7.1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ab82f0d..e5ea8fc 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ crun-0.1.1.tar.gz /crun-1.5.tar.xz /crun-1.6.tar.xz /crun-1.7.tar.xz +/crun-1.7.1.tar.xz diff --git a/crun.spec b/crun.spec index 55ae78c..a80f990 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.7 +%global built_tag 1.7.1 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 94f0e6d..791cd98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.7.tar.xz) = acccd5f2c7f058b14147c3260bcc8cbb04eadeef44218086faa331e4335a56a8733c20f105d0c8d1a75878831d74937428fbf3beb3b0c6badc315b61f90224ac +SHA512 (crun-1.7.1.tar.xz) = d7a77fc9c2966ae2c3d8a1205e75bdd58e4eb862ab74e4a77b93fbaeb214f4b918f0c7e15f642627d5ab4121318bf7ab2996a21f5036802a964658f3b35d6672 From 8434a3b7bcf8512a4278091697585f8fcc8e960a Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 29 Nov 2022 20:52:27 +0100 Subject: [PATCH 120/184] bump to 1.7.2 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e5ea8fc..33625d5 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ crun-0.1.1.tar.gz /crun-1.6.tar.xz /crun-1.7.tar.xz /crun-1.7.1.tar.xz +/crun-1.7.2.tar.xz diff --git a/crun.spec b/crun.spec index a80f990..573fbf8 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.7.1 +%global built_tag 1.7.2 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 791cd98..608ef62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.7.1.tar.xz) = d7a77fc9c2966ae2c3d8a1205e75bdd58e4eb862ab74e4a77b93fbaeb214f4b918f0c7e15f642627d5ab4121318bf7ab2996a21f5036802a964658f3b35d6672 +SHA512 (crun-1.7.2.tar.xz) = e85659ef053a20554f4fede68cd913108a3bc946d3c2a1082a748cdad9a1ee17a6a5199dcc69ab7d6056bddad25ca409092a1da2a88d116d56bdd48084a998bd From c14e1218f5937622122158e11f5e777c1ee7065f Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 13 Dec 2022 11:18:29 +0100 Subject: [PATCH 121/184] make criu a weak dependency Signed-off-by: Giuseppe Scrivano --- crun.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 573fbf8..bcff79d 100644 --- a/crun.spec +++ b/crun.spec @@ -50,7 +50,8 @@ BuildRequires: protobuf-c-devel %ifnarch %ix86 BuildRequires: criu-devel >= 3.17.1-2 %endif -Requires: criu >= 3.17.1 +Recommends: criu >= 3.17.1 +Recommends: criu-libs Provides: oci-runtime %description From c81e179cdc77600d73f10508dd27aaaf299d7acc Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 3 Jan 2023 15:03:51 +0100 Subject: [PATCH 122/184] crun: add gcrypt dependency Signed-off-by: Giuseppe Scrivano --- crun.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crun.spec b/crun.spec index bcff79d..6a6c3ec 100644 --- a/crun.spec +++ b/crun.spec @@ -35,6 +35,7 @@ BuildRequires: python3 BuildRequires: libcap-devel BuildRequires: systemd-devel BuildRequires: yajl-devel +BuildRequires: libgcrypt-devel %if "%{krun_support}" == "enabled" BuildRequires: libkrun-devel %endif From 88465aa8a3144086f96f1aa352bc88fe31cc9193 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:43:56 +0000 Subject: [PATCH 123/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 885030c8cad06a1736aa0c3cd70edb4e94fefdea Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 2 Feb 2023 18:44:12 +0530 Subject: [PATCH 124/184] bump to v1.8 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 33625d5..49683b5 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ crun-0.1.1.tar.gz /crun-1.7.tar.xz /crun-1.7.1.tar.xz /crun-1.7.2.tar.xz +/crun-1.8.tar.xz diff --git a/crun.spec b/crun.spec index 6a6c3ec..163e242 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.7.2 +%global built_tag 1.8 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 608ef62..4ee56a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.7.2.tar.xz) = e85659ef053a20554f4fede68cd913108a3bc946d3c2a1082a748cdad9a1ee17a6a5199dcc69ab7d6056bddad25ca409092a1da2a88d116d56bdd48084a998bd +SHA512 (crun-1.8.tar.xz) = 373d4fa69085b1ffecff32b4f2da0ab7dd0ec80d68e24ab262127e71cdfcbee50b932aa109980ad683444fdfe288a6495fc40cd81beb8b56af5c244218c7157c From 68e76ac9922a8d3b6485bfa5461e7a2186ef1816 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 9 Feb 2023 16:49:50 +0530 Subject: [PATCH 125/184] use arch: golang_arches_future Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 163e242..23eaa93 100644 --- a/crun.spec +++ b/crun.spec @@ -24,7 +24,7 @@ URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPLv2+ Release: %autorelease -ExclusiveArch: %{golang_arches} +ExclusiveArch: %{golang_arches_future} BuildRequires: autoconf BuildRequires: automake BuildRequires: go-md2man From 42d7001ab491f163bbc054f563211c0efe949a15 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 27 Feb 2023 11:56:33 +0100 Subject: [PATCH 126/184] bump to 1.8.1 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 49683b5..00f243a 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ crun-0.1.1.tar.gz /crun-1.7.1.tar.xz /crun-1.7.2.tar.xz /crun-1.8.tar.xz +/crun-1.8.1.tar.xz diff --git a/crun.spec b/crun.spec index 23eaa93..463652d 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8 +%global built_tag 1.8.1 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 4ee56a5..cf842bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.tar.xz) = 373d4fa69085b1ffecff32b4f2da0ab7dd0ec80d68e24ab262127e71cdfcbee50b932aa109980ad683444fdfe288a6495fc40cd81beb8b56af5c244218c7157c +SHA512 (crun-1.8.1.tar.xz) = 6230b378f4746aff1d53f3ed797229b2056ece76e8e5b22d6f5f7b42e6042c6aff5294298f3cfd1293b4a87371dfa58cc69e57455e20948abd7269059ad39042 From 4f9a5d69a2a64e230e3f1f5ea070987156a801e8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 6 Mar 2023 16:42:00 +0530 Subject: [PATCH 127/184] migrated to SPDX license Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 463652d..f704275 100644 --- a/crun.spec +++ b/crun.spec @@ -22,7 +22,7 @@ Version: %{gen_version} URL: https://github.com/containers/%{name} # Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz -License: GPLv2+ +License: GPL-2.0-only Release: %autorelease ExclusiveArch: %{golang_arches_future} BuildRequires: autoconf From 5dc658ac42c2bc6ed3d4450c8fb0a9db7b0ec557 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 21 Mar 2023 15:27:32 +0100 Subject: [PATCH 128/184] bump to 1.8.2 Signed-off-by: Giuseppe Scrivano --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index f704275..3b68d3c 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.1 +%global built_tag 1.8.2 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C From 4f279e7a348dc626de83cbf9d3692e90e8e18f38 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 21 Mar 2023 16:03:33 +0100 Subject: [PATCH 129/184] update source for 1.8.2 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 00f243a..6e8369b 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ crun-0.1.1.tar.gz /crun-1.7.2.tar.xz /crun-1.8.tar.xz /crun-1.8.1.tar.xz +/crun-1.8.2.tar.xz diff --git a/sources b/sources index cf842bd..3d92f3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.1.tar.xz) = 6230b378f4746aff1d53f3ed797229b2056ece76e8e5b22d6f5f7b42e6042c6aff5294298f3cfd1293b4a87371dfa58cc69e57455e20948abd7269059ad39042 +SHA512 (crun-1.8.2.tar.xz) = d0190cc17dac44a314e1e5ab35aa4d1c6f42c6bfb87ea337a184453fabaa26324507be8b9fc9e34a0c66bc2eb8b8215fb3855ede6533563fc064052928346d89 From bca7bed7668523d916064934236de1db5d6f452b Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sat, 25 Mar 2023 08:41:13 +0100 Subject: [PATCH 130/184] bump to 1.8.3 Signed-off-by: Giuseppe Scrivano --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 3b68d3c..745ccaf 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.2 +%global built_tag 1.8.3 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C From 85c3a19695c7dda1cd4f335ca4acb3a23ca2b9db Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sat, 25 Mar 2023 08:48:07 +0100 Subject: [PATCH 131/184] update sources Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6e8369b..645e8b1 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ crun-0.1.1.tar.gz /crun-1.8.tar.xz /crun-1.8.1.tar.xz /crun-1.8.2.tar.xz +/crun-1.8.3.tar.xz diff --git a/sources b/sources index 3d92f3f..982e22f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.2.tar.xz) = d0190cc17dac44a314e1e5ab35aa4d1c6f42c6bfb87ea337a184453fabaa26324507be8b9fc9e34a0c66bc2eb8b8215fb3855ede6533563fc064052928346d89 +SHA512 (crun-1.8.3.tar.xz) = ac3a99c6d17724d356eb22af81c2b94f91d98d69763c34773260e549b159b1da5298a4387efa89615c510a24d65dc002ca3dce6dfb93ca5aa7513f328dbdb6ed From 83c9dde99833e45ef538bdd0e15ffd20d621c097 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 13 Apr 2023 21:24:13 +0200 Subject: [PATCH 132/184] bump to 1.8.4 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 645e8b1..afecd0a 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ crun-0.1.1.tar.gz /crun-1.8.1.tar.xz /crun-1.8.2.tar.xz /crun-1.8.3.tar.xz +/crun-1.8.4.tar.xz diff --git a/crun.spec b/crun.spec index 745ccaf..8d4495b 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.3 +%global built_tag 1.8.4 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 982e22f..5cb3680 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.3.tar.xz) = ac3a99c6d17724d356eb22af81c2b94f91d98d69763c34773260e549b159b1da5298a4387efa89615c510a24d65dc002ca3dce6dfb93ca5aa7513f328dbdb6ed +SHA512 (crun-1.8.4.tar.xz) = 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0 From c636b7586e57e9c04ff1de878ef12fd28d3036ef Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sat, 20 May 2023 21:29:36 +0200 Subject: [PATCH 133/184] bump to 1.8.5 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index afecd0a..972a61f 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ crun-0.1.1.tar.gz /crun-1.8.2.tar.xz /crun-1.8.3.tar.xz /crun-1.8.4.tar.xz +/crun-1.8.5.tar.xz diff --git a/crun.spec b/crun.spec index 8d4495b..ce794d5 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.4 +%global built_tag 1.8.5 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 5cb3680..dc99ef8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.4.tar.xz) = 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0 +SHA512 (crun-1.8.5.tar.xz) = 50b31435ee2cae9703d12f74e4d9083a2b0a3a7ce63f34ecbdc6b9c0f01f5948f22330b614d40933a9851289d9ed2f457c4599821f743c3569c329dad43678f7 From 86fd131d93d49f7cab39b88a9dcb66923f1755f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:40:22 +0000 Subject: [PATCH 134/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From af069bdab771992d1f3656c2973e40f738ab30fb Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 27 Jul 2023 09:52:51 +0200 Subject: [PATCH 135/184] bump to 1.8.6 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 972a61f..46feeb9 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ crun-0.1.1.tar.gz /crun-1.8.3.tar.xz /crun-1.8.4.tar.xz /crun-1.8.5.tar.xz +/crun-1.8.6.tar.xz diff --git a/crun.spec b/crun.spec index ce794d5..12e4646 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.5 +%global built_tag 1.8.6 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index dc99ef8..13f3791 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.5.tar.xz) = 50b31435ee2cae9703d12f74e4d9083a2b0a3a7ce63f34ecbdc6b9c0f01f5948f22330b614d40933a9851289d9ed2f457c4599821f743c3569c329dad43678f7 +SHA512 (crun-1.8.6.tar.xz) = d527b58ce4d5a7937260cc1336e10997595fed774e0faf4fed90e783de1ff4e3f036d800c7b92173f7fcad8bb1c0d6ee01989534d9b43eb0b937eef46a335f7d From b6961f245f4eda0f04bb9695fc77ca5d640ec6c2 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 3 Aug 2023 23:36:19 -0400 Subject: [PATCH 136/184] Disable wasm in RHEL builds crun-wasm is not shipped in RHEL, so avoid the build dependency by not building it at all. --- crun.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crun.spec b/crun.spec index 12e4646..492a68d 100644 --- a/crun.spec +++ b/crun.spec @@ -7,11 +7,13 @@ %endif %endif +%if 0%{?fedora} # wasmedge built only for aarch64 and x86_64 %ifarch aarch64 || x86_64 %global wasm_support enabled %global wasm_opts --with-wasmedge %endif +%endif %global built_tag 1.8.6 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) From 0c54bceac8f2ef5df1f2510f43835123f4de85bf Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 21 Aug 2023 13:59:22 +0000 Subject: [PATCH 137/184] [packit] 1.8.7 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: 1.8.7 Upstream commit: 53a9996c If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/crun.git refs/heads/*:refs/remotes/packit/* git checkout packit/1.8.7-rawhide-update-propose_downstream ``` --- .gitignore | 1 + .packit.yaml | 52 ++++++++++++++++++ README.packit | 3 ++ crun.spec | 142 ++++++++++++++++++++++++++++++-------------------- sources | 2 +- 5 files changed, 142 insertions(+), 58 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 46feeb9..1949827 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ crun-0.1.1.tar.gz /crun-1.8.4.tar.xz /crun-1.8.5.tar.xz /crun-1.8.6.tar.xz +/crun-1.8.7.tar.xz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..fa87387 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,52 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/crun.spec + +srpm_build_deps: + - git-archive-all + - make +actions: + create-archive: + - "git-archive-all -v --force-submodules rpm/crun-HEAD.tar.xz" + - bash -c "ls -1 rpm/crun-HEAD.tar.xz" + +jobs: + - job: copr_build + trigger: pull_request + # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + - fedora-eln-x86_64 + - fedora-eln-aarch64 + - centos-stream+epel-next-8-x86_64 + - centos-stream+epel-next-8-aarch64 + - centos-stream+epel-next-9-x86_64 + - centos-stream+epel-next-9-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" + + # Run on commit to main branch + - job: copr_build + trigger: commit + branch: main + owner: rhcontainerbot + project: podman-next + + - job: propose_downstream + trigger: release + update_release: false + dist_git_branches: + - fedora-all + + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..797aefb --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.79.0.post2+g93f33d9. diff --git a/crun.spec b/crun.spec index 492a68d..26563aa 100644 --- a/crun.spec +++ b/crun.spec @@ -1,82 +1,126 @@ %global krun_opts %{nil} +%global wasmedge_opts %{nil} +%global wasmtime_opts %{nil} -%if 0%{?fedora} >= 37 +# krun and wasm[edge,time] support only on aarch64 and x86_64 %ifarch aarch64 || x86_64 -%global krun_support enabled +%global wasm_support 1 + +# wasmedge not present on Fedora ELN environments +%if !0%{?eln} +%global wasmedge_support 1 +%global wasmedge_opts --with-wasmedge +%endif + +# krun only exists on fedora +%if %{defined fedora} +%global krun_support 1 %global krun_opts --with-libkrun %endif + +# wasmtime exists only on podman-next copr for now +%if %{defined copr_project} && "%{?copr_project}" == "podman-next" +%global wasmtime_support 1 +%global wasmtime_opts --with-wasmtime %endif -%if 0%{?fedora} -# wasmedge built only for aarch64 and x86_64 -%ifarch aarch64 || x86_64 -%global wasm_support enabled -%global wasm_opts --with-wasmedge %endif -%endif - -%global built_tag 1.8.6 -%global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C Name: crun -Version: %{gen_version} +%if %{defined copr_username} +Epoch: 102 +%endif +# DO NOT TOUCH the Version string! +# The TRUE source of this specfile is: +# https://github.com/containers/crun/blob/main/rpm/crun.spec +# If that's what you're reading, Version must be 0, and will be updated by Packit for +# copr and koji builds. +# If you're reading this on dist-git, the version is automatically filled in by Packit. +Version: 1.8.7 +Release: %autorelease URL: https://github.com/containers/%{name} -# Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPL-2.0-only -Release: %autorelease +%if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} +%else +ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64 +%endif BuildRequires: autoconf BuildRequires: automake -BuildRequires: go-md2man -BuildRequires: libtool BuildRequires: gcc BuildRequires: git-core -BuildRequires: python3 +BuildRequires: gperf BuildRequires: libcap-devel -BuildRequires: systemd-devel -BuildRequires: yajl-devel -BuildRequires: libgcrypt-devel -%if "%{krun_support}" == "enabled" +%if %{defined krun_support} BuildRequires: libkrun-devel %endif -%if "%{wasm_support}" == "enabled" -BuildRequires: wasmedge-devel -%endif +BuildRequires: systemd-devel +BuildRequires: yajl-devel BuildRequires: libseccomp-devel -BuildRequires: libselinux-devel BuildRequires: python3-libmount -BuildRequires: make -BuildRequires: glibc-static +BuildRequires: libtool BuildRequires: protobuf-c-devel -%ifnarch %ix86 BuildRequires: criu-devel >= 3.17.1-2 -%endif Recommends: criu >= 3.17.1 Recommends: criu-libs +%if %{defined wasmedge_support} +BuildRequires: wasmedge-devel +%endif +%if %{defined wasmtime_support} +BuildRequires: wasmtime-c-api-devel +%endif +%if %{defined rhel} && 0%{?rhel} == 8 +BuildRequires: python3 +%else +BuildRequires: python +%endif Provides: oci-runtime %description -%{name} is a runtime for running OCI containers +%{name} is a OCI runtime + +%if %{defined krun_support} +%package krun +Summary: %{name} with libkrun support +Requires: libkrun +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: krun = %{?epoch:%{epoch}:}%{version}-%{release} + +%description krun +krun is a symlink to the %{name} binary, with libkrun as an additional dependency. +%endif + +%if %{defined wasm_support} +%package wasm +Summary: %{name} with wasm support +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: wasm-library +Recommends: wasmedge + +%description wasm +%{name}-wasm is a symlink to the %{name} binary, with wasm as an additional dependency. +%endif %prep -%autosetup -Sgit %{name}-%{built_tag} +%autosetup -Sgit -n %{name}-%{version} %build ./autogen.sh -%configure --disable-silent-rules %{krun_opts} %{wasm_opts} +./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{wasmtime_opts} %make_build %install -%make_install +%make_install prefix=%{_prefix} rm -rf %{buildroot}%{_prefix}/lib* -%if "%{krun_support}" == "enabled" -ln -s ../bin/%{name} %{buildroot}%{_bindir}/krun + +%if %{defined krun_support} +ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun %endif -%if "%{wasm_support}" == "enabled" -ln -s ../bin/%{name} %{buildroot}%{_bindir}/%{name}-wasm +%if %{defined wasm_support} +ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %endif %files @@ -84,31 +128,15 @@ ln -s ../bin/%{name} %{buildroot}%{_bindir}/%{name}-wasm %{_bindir}/%{name} %{_mandir}/man1/* -%if "%{krun_support}" == "enabled" -%package krun -Summary: OCI Runtime providing Virtualization-based process isolation capabilities. -Provides: krun -Requires: %{name} = %{version}-%{release} -Requires: libkrun - -%description krun -%{name}-krun OCI Runtime providing Virtualization-based process isolation capabilities. - +%if %{defined krun_support} %files krun +%license COPYING %{_bindir}/krun %endif -%if "%{wasm_support}" == "enabled" -%package wasm -Summary: wasm support for %{name} -Requires: wasm-library -Recommends: wasmedge -Requires: %{name} = %{version}-%{release} - -%description wasm -%{name}-wasm provides %{name} built with wasm support - +%if %{defined wasm_support} %files wasm +%license COPYING %{_bindir}/%{name}-wasm %endif diff --git a/sources b/sources index 13f3791..45556df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.6.tar.xz) = d527b58ce4d5a7937260cc1336e10997595fed774e0faf4fed90e783de1ff4e3f036d800c7b92173f7fcad8bb1c0d6ee01989534d9b43eb0b937eef46a335f7d +SHA512 (crun-1.8.7.tar.xz) = 74d9f406de40512fa1694f9a744563c7a0eb217da700298da4afea065bd2181d818dd1d25098164eb3dacc47c149a45a57fd79445f40865ffcced383297491a4 From f8dd4474b10217f1f1e4a5dd81a1eb0d3b96de8d Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 7 Sep 2023 14:03:27 +0000 Subject: [PATCH 138/184] [packit] 1.9 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: 1.9 Upstream commit: a538ac4e If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/crun.git refs/heads/*:refs/remotes/packit/* git checkout packit/1.9-rawhide-update-propose_downstream ``` --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1949827..5f0563d 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ crun-0.1.1.tar.gz /crun-1.8.5.tar.xz /crun-1.8.6.tar.xz /crun-1.8.7.tar.xz +/crun-1.9.tar.xz diff --git a/README.packit b/README.packit index 797aefb..ea0650e 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.79.0.post2+g93f33d9. +The file was generated using packit 0.79.1.post14+g9e876412. diff --git a/crun.spec b/crun.spec index 26563aa..588db31 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.8.7 +Version: 1.9 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 45556df..438e926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.7.tar.xz) = 74d9f406de40512fa1694f9a744563c7a0eb217da700298da4afea065bd2181d818dd1d25098164eb3dacc47c149a45a57fd79445f40865ffcced383297491a4 +SHA512 (crun-1.9.tar.xz) = 04777626873743d0f5d9d0c0338a37be03c786a4b57b95b83caba0a9ef5b64280194c4e7973fd6bb2a52a7aed458e2e76b4c638d1a9cf3e69ff7176d71037d23 From b9acc599398cdc4aee6f249fa73f543cae15ec8a Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 26 Sep 2023 15:29:50 +0000 Subject: [PATCH 139/184] [packit] 1.9.1 upstream release Upstream tag: 1.9.1 Upstream commit: 1f2769e1 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 5 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5f0563d..69b0664 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ crun-0.1.1.tar.gz /crun-1.8.6.tar.xz /crun-1.8.7.tar.xz /crun-1.9.tar.xz +/crun-1.9.1.tar.xz diff --git a/README.packit b/README.packit index ea0650e..8b12de4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.79.1.post14+g9e876412. +The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. diff --git a/crun.spec b/crun.spec index 588db31..9b6e8f8 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.9 +Version: 1.9.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -126,12 +126,13 @@ ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %files %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/* +%{_mandir}/man1/crun.1 %if %{defined krun_support} %files krun %license COPYING %{_bindir}/krun +%{_mandir}/man1/krun.1 %endif %if %{defined wasm_support} diff --git a/sources b/sources index 438e926..6ea94e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.9.tar.xz) = 04777626873743d0f5d9d0c0338a37be03c786a4b57b95b83caba0a9ef5b64280194c4e7973fd6bb2a52a7aed458e2e76b4c638d1a9cf3e69ff7176d71037d23 +SHA512 (crun-1.9.1.tar.xz) = 5de6d16b2db3aaa5ec6fe9afc0df72eae5936fec2289fd31159ed81f39c73b8c61834ae587348ab76736394094333fdc0d7ecfa2002dd50f7430bf57627998f8 From 8de06754f3b5c08ead3d5f6f3fc50882614c758e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 26 Sep 2023 13:33:15 -0400 Subject: [PATCH 140/184] fix manpage installation --- crun.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 9b6e8f8..2227a5c 100644 --- a/crun.spec +++ b/crun.spec @@ -126,13 +126,13 @@ ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %files %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/crun.1 +%{_mandir}/man1/crun.1.gz %if %{defined krun_support} %files krun %license COPYING %{_bindir}/krun -%{_mandir}/man1/krun.1 +%{_mandir}/man1/krun.1.gz %endif %if %{defined wasm_support} From 612a96918ebaced4b9021a932b6a26e6e21c51d7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 26 Sep 2023 13:55:18 -0400 Subject: [PATCH 141/184] remove krun manpage if krun not supported --- crun.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crun.spec b/crun.spec index 2227a5c..1b0f737 100644 --- a/crun.spec +++ b/crun.spec @@ -117,6 +117,8 @@ rm -rf %{buildroot}%{_prefix}/lib* %if %{defined krun_support} ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun +%else +rm -f %{buildroot}%{_mandir}/man1/krun.1 %endif %if %{defined wasm_support} From fae9f7633f7f25debada236f82479e00a1cd7e74 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 27 Sep 2023 21:05:06 +0000 Subject: [PATCH 142/184] [packit] 1.9.2 upstream release Upstream tag: 1.9.2 Upstream commit: 35274d34 --- .gitignore | 1 + .packit.yaml | 7 ++++++- crun.spec | 6 ++---- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 69b0664..2919216 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ crun-0.1.1.tar.gz /crun-1.8.7.tar.xz /crun-1.9.tar.xz /crun-1.9.1.tar.xz +/crun-1.9.2.tar.xz diff --git a/.packit.yaml b/.packit.yaml index fa87387..2cb0456 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -15,7 +15,9 @@ actions: jobs: - job: copr_build trigger: pull_request - # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: - fedora-all-x86_64 - fedora-all-aarch64 @@ -31,6 +33,9 @@ jobs: # Run on commit to main branch - job: copr_build trigger: commit + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." branch: main owner: rhcontainerbot project: podman-next diff --git a/crun.spec b/crun.spec index 1b0f737..9c50b95 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.9.1 +Version: 1.9.2 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -117,8 +117,6 @@ rm -rf %{buildroot}%{_prefix}/lib* %if %{defined krun_support} ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun -%else -rm -f %{buildroot}%{_mandir}/man1/krun.1 %endif %if %{defined wasm_support} @@ -128,7 +126,7 @@ ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %files %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/crun.1.gz +%{_mandir}/man1/%{name}.1.gz %if %{defined krun_support} %files krun diff --git a/sources b/sources index 6ea94e0..d19d155 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.9.1.tar.xz) = 5de6d16b2db3aaa5ec6fe9afc0df72eae5936fec2289fd31159ed81f39c73b8c61834ae587348ab76736394094333fdc0d7ecfa2002dd50f7430bf57627998f8 +SHA512 (crun-1.9.2.tar.xz) = 277010c1057f5be2d75870685e539868f7289171ee607b15aab928ad9aeb176b17e6ab5a830495990307314b09791b7d2b93c2e731fd33dfd4cd9b5342db29f1 From 00b0bd05e7394e27dd9e01475d6d09cba0f31325 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 19 Oct 2023 10:12:18 +0000 Subject: [PATCH 143/184] [packit] 1.10 upstream release Upstream tag: 1.10 Upstream commit: c053c83c --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2919216..9832c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ crun-0.1.1.tar.gz /crun-1.9.tar.xz /crun-1.9.1.tar.xz /crun-1.9.2.tar.xz +/crun-1.10.tar.xz diff --git a/README.packit b/README.packit index 8b12de4..2a3acd4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. +The file was generated using packit 0.84.0. diff --git a/crun.spec b/crun.spec index 9c50b95..c71dde8 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.9.2 +Version: 1.10 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index d19d155..b10aff9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.9.2.tar.xz) = 277010c1057f5be2d75870685e539868f7289171ee607b15aab928ad9aeb176b17e6ab5a830495990307314b09791b7d2b93c2e731fd33dfd4cd9b5342db29f1 +SHA512 (crun-1.10.tar.xz) = bf1e154869687f59eb3efd9eed6d37712842a8953088a340f3fb7c1d451db0dadb66eae7161c0ad6e2ec29749167cc1ff0815f722882b1fc95f7bee4f154e3f8 From a055ddae3c7a0ebd87845ccaafb39b5b825de124 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 26 Oct 2023 20:19:49 +0000 Subject: [PATCH 144/184] [packit] 1.11 upstream release Upstream tag: 1.11 Upstream commit: 11f8d3dc --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9832c0e..536b469 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ crun-0.1.1.tar.gz /crun-1.9.1.tar.xz /crun-1.9.2.tar.xz /crun-1.10.tar.xz +/crun-1.11.tar.xz diff --git a/crun.spec b/crun.spec index c71dde8..4fb8604 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.10 +Version: 1.11 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index b10aff9..ab948da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.10.tar.xz) = bf1e154869687f59eb3efd9eed6d37712842a8953088a340f3fb7c1d451db0dadb66eae7161c0ad6e2ec29749167cc1ff0815f722882b1fc95f7bee4f154e3f8 +SHA512 (crun-1.11.tar.xz) = b7a7af9d0cf27d966e37c6a8022f5628e4c90b446f39feab19b01e56c2396be078815716adf38d3ee8930890a24fdd2e501e462ee045e2734c7346e610f8ec7f From d92e05e1948681654ff05b376691c8ba8ce5d7d5 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 30 Oct 2023 20:26:00 +0000 Subject: [PATCH 145/184] [packit] 1.11.1 upstream release Upstream tag: 1.11.1 Upstream commit: 1084f952 --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 536b469..0aafa9d 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ crun-0.1.1.tar.gz /crun-1.9.2.tar.xz /crun-1.10.tar.xz /crun-1.11.tar.xz +/crun-1.11.1.tar.xz diff --git a/crun.spec b/crun.spec index 4fb8604..febfc18 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.11 +Version: 1.11.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index ab948da..47b0f39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.11.tar.xz) = b7a7af9d0cf27d966e37c6a8022f5628e4c90b446f39feab19b01e56c2396be078815716adf38d3ee8930890a24fdd2e501e462ee045e2734c7346e610f8ec7f +SHA512 (crun-1.11.1.tar.xz) = c539b57f8419724dd6e9d3b7d0a3ed8d2f0d1e9089df66aa0a811fdf73ca72bc160424dea1cc597b0f98576e011b92eac39a62c7fddb67772ac5cf173c96e3fa From 8636b679c45fde11a3972696dc986e9bc9b492d8 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 7 Nov 2023 12:56:06 +0000 Subject: [PATCH 146/184] [packit] 1.11.2 upstream release Upstream tag: 1.11.2 Upstream commit: ab0edeef --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0aafa9d..82849e2 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ crun-0.1.1.tar.gz /crun-1.10.tar.xz /crun-1.11.tar.xz /crun-1.11.1.tar.xz +/crun-1.11.2.tar.xz diff --git a/README.packit b/README.packit index 2a3acd4..5998f60 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.84.0. +The file was generated using packit 0.85.0. diff --git a/crun.spec b/crun.spec index febfc18..e94dce0 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.11.1 +Version: 1.11.2 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 47b0f39..d382316 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.11.1.tar.xz) = c539b57f8419724dd6e9d3b7d0a3ed8d2f0d1e9089df66aa0a811fdf73ca72bc160424dea1cc597b0f98576e011b92eac39a62c7fddb67772ac5cf173c96e3fa +SHA512 (crun-1.11.2.tar.xz) = ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977 From 2e69b59d670a0fa8dc6eee3613bda9af85957886 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 23 Nov 2023 17:14:55 +0000 Subject: [PATCH 147/184] [packit] 1.12 upstream release Upstream tag: 1.12 Upstream commit: ce429cb2 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 82849e2..039a846 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ crun-0.1.1.tar.gz /crun-1.11.tar.xz /crun-1.11.1.tar.xz /crun-1.11.2.tar.xz +/crun-1.12.tar.xz diff --git a/README.packit b/README.packit index 5998f60..d778d97 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.85.0. +The file was generated using packit 0.86.2.post1.dev2+g209847d1. diff --git a/crun.spec b/crun.spec index e94dce0..11589d5 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.11.2 +Version: 1.12 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index d382316..a810830 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.11.2.tar.xz) = ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977 +SHA512 (crun-1.12.tar.xz) = 3ed4d2c2b27ea1b9c0c68762e2eff0f18ee9efcd401a9f7fc984459f1b593def2a353484c8c0c5967fb2aae11df446aca4353346f843e3a0298d2400721ee488 From 8a0eba933914f964edb130f8c637c503e0a68eab Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 15 Jan 2024 16:26:27 +0000 Subject: [PATCH 148/184] [packit] 1.13 upstream release Upstream tag: 1.13 Upstream commit: c7613497 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 039a846..d9d87fd 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ crun-0.1.1.tar.gz /crun-1.11.1.tar.xz /crun-1.11.2.tar.xz /crun-1.12.tar.xz +/crun-1.13.tar.xz diff --git a/README.packit b/README.packit index d778d97..8c508a5 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.86.2.post1.dev2+g209847d1. +The file was generated using packit 0.88.0. diff --git a/crun.spec b/crun.spec index 11589d5..3a47243 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.12 +Version: 1.13 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index a810830..174b110 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.12.tar.xz) = 3ed4d2c2b27ea1b9c0c68762e2eff0f18ee9efcd401a9f7fc984459f1b593def2a353484c8c0c5967fb2aae11df446aca4353346f843e3a0298d2400721ee488 +SHA512 (crun-1.13.tar.xz) = 55e2a1cea019dfa3bf3c4c4ae369ecbd13f348a8056d83ca6b4ff4d0c76c841631e38ccdb314ff31e87e92c817bc994412dbca0dd73c20475322efcd2c748837 From 6f3756d354b67979b1ecd5887ce78607e41e488a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:25:43 +0000 Subject: [PATCH 149/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 80581cdbcd14df21fa3348b7b9a8a1b022d2c682 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:32:27 +0000 Subject: [PATCH 150/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f0433c54af08412ebab32432be38eb257d2d67b9 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 24 Jan 2024 16:53:52 +0000 Subject: [PATCH 151/184] [packit] 1.14 upstream release Upstream tag: 1.14 Upstream commit: 667e6ebd --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d9d87fd..cf3517d 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ crun-0.1.1.tar.gz /crun-1.11.2.tar.xz /crun-1.12.tar.xz /crun-1.13.tar.xz +/crun-1.14.tar.xz diff --git a/README.packit b/README.packit index 8c508a5..bba9424 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.88.0. +The file was generated using packit 0.89.0.post1.dev4+gabf90471. diff --git a/crun.spec b/crun.spec index 3a47243..93dcbe3 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.13 +Version: 1.14 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 174b110..6ded306 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.13.tar.xz) = 55e2a1cea019dfa3bf3c4c4ae369ecbd13f348a8056d83ca6b4ff4d0c76c841631e38ccdb314ff31e87e92c817bc994412dbca0dd73c20475322efcd2c748837 +SHA512 (crun-1.14.tar.xz) = ec0dbbc6a0ad0f0beaf9384b2eda3b3d2ddbde1934f72312309cce9aeb38cf61937df7a5863a702e04251c511d6c5c56626e63b1f59a4c1cfeecd939f7c79f9d From 4fb0f0ab02aeb30a3dd3a67b118142f396e57109 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 8 Feb 2024 18:31:15 +0000 Subject: [PATCH 152/184] [packit] 1.14.1 upstream release Upstream tag: 1.14.1 Upstream commit: de537a79 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf3517d..b10d346 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ crun-0.1.1.tar.gz /crun-1.12.tar.xz /crun-1.13.tar.xz /crun-1.14.tar.xz +/crun-1.14.1.tar.xz diff --git a/README.packit b/README.packit index bba9424..29cc7d8 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.89.0.post1.dev4+gabf90471. +The file was generated using packit 0.90.0.post1.dev9+g1f0325d1. diff --git a/crun.spec b/crun.spec index 93dcbe3..69fe6d4 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.14 +Version: 1.14.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 6ded306..21b134f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.tar.xz) = ec0dbbc6a0ad0f0beaf9384b2eda3b3d2ddbde1934f72312309cce9aeb38cf61937df7a5863a702e04251c511d6c5c56626e63b1f59a4c1cfeecd939f7c79f9d +SHA512 (crun-1.14.1.tar.xz) = 4a45941e8257b5180e30bcd5b40837c632261187508693002c02c33764bc8e031a3c9345d8a5e5989a5427c7f237595c457f1eb8cdc7967867976cc4abe6bc5a From f133fdfcb3ba24782b98c0e261d62742be7c5be4 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 16 Feb 2024 17:13:05 +0000 Subject: [PATCH 153/184] [packit] 1.14.2 upstream release Upstream tag: 1.14.2 Upstream commit: 32b139f7 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b10d346..3db93c5 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ crun-0.1.1.tar.gz /crun-1.13.tar.xz /crun-1.14.tar.xz /crun-1.14.1.tar.xz +/crun-1.14.2.tar.xz diff --git a/README.packit b/README.packit index 29cc7d8..f592284 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.90.0.post1.dev9+g1f0325d1. +The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25. diff --git a/crun.spec b/crun.spec index 69fe6d4..a883365 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.14.1 +Version: 1.14.2 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 21b134f..1a138f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.1.tar.xz) = 4a45941e8257b5180e30bcd5b40837c632261187508693002c02c33764bc8e031a3c9345d8a5e5989a5427c7f237595c457f1eb8cdc7967867976cc4abe6bc5a +SHA512 (crun-1.14.2.tar.xz) = 816598207da38bb172d974b3d45ec2bb1781c202163a409765475aa742e2545f3e9b31e358a6742f05391e0cd6a012e615532b63ba0f445fbb6edb6ae2d120d8 From a5344701e79f516d618749e322af054365654fd9 Mon Sep 17 00:00:00 2001 From: Packit Date: Sat, 17 Feb 2024 08:36:04 +0000 Subject: [PATCH 154/184] [packit] 1.14.3 upstream release Upstream tag: 1.14.3 Upstream commit: 1961d211 --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3db93c5..8f10920 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ crun-0.1.1.tar.gz /crun-1.14.tar.xz /crun-1.14.1.tar.xz /crun-1.14.2.tar.xz +/crun-1.14.3.tar.xz diff --git a/crun.spec b/crun.spec index a883365..d48bda1 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.14.2 +Version: 1.14.3 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 1a138f6..c99de97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.2.tar.xz) = 816598207da38bb172d974b3d45ec2bb1781c202163a409765475aa742e2545f3e9b31e358a6742f05391e0cd6a012e615532b63ba0f445fbb6edb6ae2d120d8 +SHA512 (crun-1.14.3.tar.xz) = d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1 From 2807443b74a09518479d54bb0ad6e5a45ef9f4e2 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 29 Feb 2024 17:46:46 +0000 Subject: [PATCH 155/184] [packit] 1.14.4 upstream release Upstream tag: 1.14.4 Upstream commit: a220ca66 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 6 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8f10920..5ac2073 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ crun-0.1.1.tar.gz /crun-1.14.1.tar.xz /crun-1.14.2.tar.xz /crun-1.14.3.tar.xz +/crun-1.14.4.tar.xz diff --git a/README.packit b/README.packit index f592284..31341b6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25. +The file was generated using packit 0.93.0. diff --git a/crun.spec b/crun.spec index d48bda1..1cf5209 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.14.3 +Version: 1.14.4 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -116,11 +116,11 @@ Recommends: wasmedge rm -rf %{buildroot}%{_prefix}/lib* %if %{defined krun_support} -ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun +ln -s %{name} %{buildroot}%{_bindir}/krun %endif %if %{defined wasm_support} -ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm +ln -s %{name} %{buildroot}%{_bindir}/%{name}-wasm %endif %files diff --git a/sources b/sources index c99de97..f2ac790 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.3.tar.xz) = d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1 +SHA512 (crun-1.14.4.tar.xz) = 1681ea85de3540958b4d7efadcf22c6f47c991fc4681a5028404952567c0b1b0220ad0ce0e0f0d727da27d8e63495a8bfc43a13b3511b1455106fdfec2e32e49 From 73b7137ed8e03895afcbdae46f23a1aef6200fcb Mon Sep 17 00:00:00 2001 From: JasenChao Date: Tue, 5 Mar 2024 19:52:42 +0800 Subject: [PATCH 156/184] Add riscv64 support. --- crun.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index d48bda1..924bbe0 100644 --- a/crun.spec +++ b/crun.spec @@ -45,7 +45,7 @@ License: GPL-2.0-only %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else -ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64 +ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64 riscv64 %endif BuildRequires: autoconf BuildRequires: automake @@ -62,9 +62,11 @@ BuildRequires: libseccomp-devel BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: protobuf-c-devel +%ifnarch riscv64 BuildRequires: criu-devel >= 3.17.1-2 Recommends: criu >= 3.17.1 Recommends: criu-libs +%endif %if %{defined wasmedge_support} BuildRequires: wasmedge-devel %endif From d70c46713e8d76bd5ec713bd986cecb1871ad15b Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 5 Mar 2024 22:06:08 +0100 Subject: [PATCH 157/184] Revert "Add riscv64 support." This reverts commit 73b7137ed8e03895afcbdae46f23a1aef6200fcb. Signed-off-by: Giuseppe Scrivano --- crun.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/crun.spec b/crun.spec index 17f54dd..1cf5209 100644 --- a/crun.spec +++ b/crun.spec @@ -45,7 +45,7 @@ License: GPL-2.0-only %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else -ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64 riscv64 +ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64 %endif BuildRequires: autoconf BuildRequires: automake @@ -62,11 +62,9 @@ BuildRequires: libseccomp-devel BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: protobuf-c-devel -%ifnarch riscv64 BuildRequires: criu-devel >= 3.17.1-2 Recommends: criu >= 3.17.1 Recommends: criu-libs -%endif %if %{defined wasmedge_support} BuildRequires: wasmedge-devel %endif From 2f7268f661d1035d4391e675f68f6159514f4ce6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 27 Mar 2024 21:08:10 +0530 Subject: [PATCH 158/184] remove eln macro Resolves: #2271814 Signed-off-by: Lokesh Mandvekar --- crun.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 1cf5209..4eef9a3 100644 --- a/crun.spec +++ b/crun.spec @@ -6,8 +6,7 @@ %ifarch aarch64 || x86_64 %global wasm_support 1 -# wasmedge not present on Fedora ELN environments -%if !0%{?eln} +%if %{defined copr_project} && "%{?copr_project}" == "podman-next" %global wasmedge_support 1 %global wasmedge_opts --with-wasmedge %endif From 7d471b682cefc843f086df5cd464bbaa1c01ca56 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 27 Mar 2024 21:24:24 +0530 Subject: [PATCH 159/184] wasmedge should stay enabled for official fedora --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 4eef9a3..25fbd04 100644 --- a/crun.spec +++ b/crun.spec @@ -6,7 +6,7 @@ %ifarch aarch64 || x86_64 %global wasm_support 1 -%if %{defined copr_project} && "%{?copr_project}" == "podman-next" +%if %{defined fedora} || (%{defined copr_project} && "%{?copr_project}" == "podman-next") %global wasmedge_support 1 %global wasmedge_opts --with-wasmedge %endif From 15fe108e109549a95854bde3a1eff9479453abb0 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 2 May 2024 11:52:55 +0000 Subject: [PATCH 160/184] Update to 1.15 upstream release Upstream tag: 1.15 Upstream commit: e6eacaf4 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 89 ++++++++++++++++++++++++++++++++++++++++++++++----- README.packit | 2 +- crun.spec | 22 ++++++++----- sources | 2 +- 5 files changed, 98 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 5ac2073..573ee2f 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ crun-0.1.1.tar.gz /crun-1.14.2.tar.xz /crun-1.14.3.tar.xz /crun-1.14.4.tar.xz +/crun-1.15.tar.zst diff --git a/.packit.yaml b/.packit.yaml index 2cb0456..734d5a6 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,12 +2,22 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -specfile_path: rpm/crun.spec +downstream_package_name: crun + +packages: + crun-fedora: + pkg_tool: fedpkg + specfile_path: rpm/crun.spec + crun-centos: + pkg_tool: centpkg + specfile_path: rpm/crun.spec srpm_build_deps: - git-archive-all - make + actions: + # This action runs only on copr build jobs create-archive: - "git-archive-all -v --force-submodules rpm/crun-HEAD.tar.xz" - bash -c "ls -1 rpm/crun-HEAD.tar.xz" @@ -15,7 +25,8 @@ actions: jobs: - job: copr_build trigger: pull_request - notifications: + packages: [crun-fedora] + notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: @@ -23,12 +34,18 @@ jobs: - fedora-all-aarch64 - fedora-eln-x86_64 - fedora-eln-aarch64 - - centos-stream+epel-next-8-x86_64 - - centos-stream+epel-next-8-aarch64 - - centos-stream+epel-next-9-x86_64 - - centos-stream+epel-next-9-aarch64 - additional_repos: - - "copr://rhcontainerbot/podman-next" + + - job: copr_build + trigger: pull_request + packages: [crun-centos] + notifications: *copr_build_failure_notification + targets: + - epel-9-x86_64 + - epel-9-aarch64 + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 # Run on commit to main branch - job: copr_build @@ -40,12 +57,68 @@ jobs: owner: rhcontainerbot project: podman-next + # Podman system tests for Fedora and CentOS Stream + - job: tests + trigger: pull_request + packages: [crun-fedora] + notifications: &podman_system_test_fail_notification + failure_comment: + message: "podman system tests failed. @containers/packit-build please check." + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + identifier: podman_system_test_fedora + tmt_plan: "/plans/podman_system_test" + + # Podman system tests for Fedora and CentOS Stream + - job: tests + trigger: pull_request + packages: [crun-centos] + notifications: *podman_system_test_fail_notification + targets: + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + # TODO: Enable cs10 tests after netavark has finished defaulting to + # nftables + #- centos-stream-10-x86_64 + #- centos-stream-10-aarch64 + identifier: podman_system_test_centos + tmt_plan: "/plans/podman_system_test" + + # Podman system tests for RHEL + - job: tests + trigger: pull_request + packages: [crun-centos] + use_internal_tf: true + notifications: *podman_system_test_fail_notification + targets: + epel-9-x86_64: + distros: [RHEL-9.4.0-Nightly,RHEL-9-Nightly] + epel-9-aarch64: + distros: [RHEL-9.4.0-Nightly,RHEL-9-Nightly] + # TODO: Enable cs10 tests after netavark has finished defaulting to + # nftables + #centos-stream-10-x86_64: + # distros: [RHEL-10-Beta-Nightly] + #centos-stream-10-aarch64: + # distros: [RHEL-10-Beta-Nightly] + identifier: podman_system_test_internal + tmt_plan: "/plans/podman_system_test" + - job: propose_downstream trigger: release + packages: [crun-fedora] update_release: false dist_git_branches: - fedora-all + - job: propose_downstream + trigger: release + packages: [crun-centos] + update_release: false + dist_git_branches: + - c10s + - job: koji_build trigger: commit dist_git_branches: diff --git a/README.packit b/README.packit index 31341b6..066b312 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.93.0. +The file was generated using packit 0.95.0.post1.dev8+gce6bd577. diff --git a/crun.spec b/crun.spec index 25fbd04..f8f06c4 100644 --- a/crun.spec +++ b/crun.spec @@ -6,7 +6,11 @@ %ifarch aarch64 || x86_64 %global wasm_support 1 -%if %{defined fedora} || (%{defined copr_project} && "%{?copr_project}" == "podman-next") +%if %{defined copr_project} +%define copr_build 1 +%endif + +%if %{defined fedora} || %{defined copr_build} %global wasmedge_support 1 %global wasmedge_opts --with-wasmedge %endif @@ -27,7 +31,7 @@ Summary: OCI runtime written in C Name: crun -%if %{defined copr_username} +%if %{defined copr_build} Epoch: 102 %endif # DO NOT TOUCH the Version string! @@ -36,10 +40,10 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.14.4 +Version: 1.15 Release: %autorelease URL: https://github.com/containers/%{name} -Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst License: GPL-2.0-only %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} @@ -70,11 +74,7 @@ BuildRequires: wasmedge-devel %if %{defined wasmtime_support} BuildRequires: wasmtime-c-api-devel %endif -%if %{defined rhel} && 0%{?rhel} == 8 -BuildRequires: python3 -%else BuildRequires: python -%endif Provides: oci-runtime %description @@ -95,7 +95,13 @@ krun is a symlink to the %{name} binary, with libkrun as an additional dependenc %package wasm Summary: %{name} with wasm support Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +# The hard dep on wasm-library is causing trouble in internal testing farm +# with RHEL. +%if %{defined fedora} Requires: wasm-library +%else +Recommends: wasm-library +%endif Recommends: wasmedge %description wasm diff --git a/sources b/sources index f2ac790..7bf880b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.4.tar.xz) = 1681ea85de3540958b4d7efadcf22c6f47c991fc4681a5028404952567c0b1b0220ad0ce0e0f0d727da27d8e63495a8bfc43a13b3511b1455106fdfec2e32e49 +SHA512 (crun-1.15.tar.zst) = a6e141f372817ed8ad1776c3ee272f68fa69680ef4d51b56643c0e4985016a5a6a415cc8623aa211c511916f2c61a417864c24c8d35fde594b624c666a9cca32 From 675a199edbc90fb8735f3675b7490a098ef20076 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:16:14 +0000 Subject: [PATCH 161/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b8cbee4f4490433121376d2d0266221dc69d1016 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 10 Sep 2024 15:49:12 +0530 Subject: [PATCH 162/184] bump to 1.17 --- .fmf/version | 1 + .gitignore | 1 + crun.spec | 42 +++++++++++---------------------------- gating.yaml | 12 +++++++++++ plans/main.fmf | 20 +++++++++++++++++++ sources | 2 +- tests/tmt/Makefile | 3 +++ tests/tmt/main.fmf | 13 ++++++++++++ tests/tmt/podman-tests.sh | 22 ++++++++++++++++++++ 9 files changed, 85 insertions(+), 31 deletions(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/main.fmf create mode 100644 tests/tmt/Makefile create mode 100644 tests/tmt/main.fmf create mode 100644 tests/tmt/podman-tests.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 573ee2f..578a718 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ crun-0.1.1.tar.gz /crun-1.14.3.tar.xz /crun-1.14.4.tar.xz /crun-1.15.tar.zst +/crun-1.17.tar.zst diff --git a/crun.spec b/crun.spec index f8f06c4..f1869c0 100644 --- a/crun.spec +++ b/crun.spec @@ -1,16 +1,17 @@ %global krun_opts %{nil} %global wasmedge_opts %{nil} -%global wasmtime_opts %{nil} -# krun and wasm[edge,time] support only on aarch64 and x86_64 -%ifarch aarch64 || x86_64 -%global wasm_support 1 - -%if %{defined copr_project} +%if %{defined copr_username} %define copr_build 1 %endif -%if %{defined fedora} || %{defined copr_build} +# krun and wasm support only on aarch64 and x86_64 +%ifarch aarch64 || x86_64 + +# Disable wasmedge on rhel 10 until EPEL10 is in place, otherwise it causes +# build issues on copr +%if %{defined fedora} || (%{defined copr_build} && %{defined rhel} && 0%{?rhel} < 10) +%global wasm_support 1 %global wasmedge_support 1 %global wasmedge_opts --with-wasmedge %endif @@ -21,12 +22,6 @@ %global krun_opts --with-libkrun %endif -# wasmtime exists only on podman-next copr for now -%if %{defined copr_project} && "%{?copr_project}" == "podman-next" -%global wasmtime_support 1 -%global wasmtime_opts --with-wasmtime -%endif - %endif Summary: OCI runtime written in C @@ -40,7 +35,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.15 +Version: 1.17 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst @@ -71,9 +66,6 @@ Recommends: criu-libs %if %{defined wasmedge_support} BuildRequires: wasmedge-devel %endif -%if %{defined wasmtime_support} -BuildRequires: wasmtime-c-api-devel -%endif BuildRequires: python Provides: oci-runtime @@ -95,12 +87,10 @@ krun is a symlink to the %{name} binary, with libkrun as an additional dependenc %package wasm Summary: %{name} with wasm support Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -# The hard dep on wasm-library is causing trouble in internal testing farm -# with RHEL. +# wasm packages are not present on RHEL yet and are currently a PITA to test +# Best to only include wasmedge as weak dep on rhel %if %{defined fedora} Requires: wasm-library -%else -Recommends: wasm-library %endif Recommends: wasmedge @@ -113,21 +103,13 @@ Recommends: wasmedge %build ./autogen.sh -./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{wasmtime_opts} +./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %make_build %install %make_install prefix=%{_prefix} rm -rf %{buildroot}%{_prefix}/lib* -%if %{defined krun_support} -ln -s %{name} %{buildroot}%{_bindir}/krun -%endif - -%if %{defined wasm_support} -ln -s %{name} %{buildroot}%{_bindir}/%{name}-wasm -%endif - %files %license COPYING %{_bindir}/%{name} diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..dbb1d91 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,12 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: [] diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..b56d319 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,20 @@ +discover: + how: fmf +execute: + how: tmt + +/upstream: + summary: Run crun specific Podman system tests on upstream PRs + discover+: + filter: tag:upstream + adjust+: + enabled: false + when: initiator is not defined or initiator != packit + +/downstream: + summary: Run crun specific Podman system tests on bodhi / errata and dist-git PRs + discover+: + filter: tag:downstream + adjust+: + enabled: false + when: initiator == packit diff --git a/sources b/sources index 7bf880b..6f53768 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.15.tar.zst) = a6e141f372817ed8ad1776c3ee272f68fa69680ef4d51b56643c0e4985016a5a6a415cc8623aa211c511916f2c61a417864c24c8d35fde594b624c666a9cca32 +SHA512 (crun-1.17.tar.zst) = 3e46241b10c72fc4139c1b0256d3dcd012ffa4ec3e7db752d0eb0497b95e722b9345b77210197e88c9543a1270612ba768b343d16a151ea8154167292b2f7b1c diff --git a/tests/tmt/Makefile b/tests/tmt/Makefile new file mode 100644 index 0000000..b57ba2c --- /dev/null +++ b/tests/tmt/Makefile @@ -0,0 +1,3 @@ +.PHONY: podman_system_test +podman_system_test: + bash ./podman-tests.sh diff --git a/tests/tmt/main.fmf b/tests/tmt/main.fmf new file mode 100644 index 0000000..b0db617 --- /dev/null +++ b/tests/tmt/main.fmf @@ -0,0 +1,13 @@ +# Only common dependencies that are NOT required to run podman-tests.sh are +# specified here. Everything else is in podman-tests.sh. +require: + - make + +adjust: + duration: 10m + when: arch == aarch64 + +/podman_system_test: + tag: [ upstream, downstream ] + summary: Run crun specific Podman tests + test: make podman_system_test diff --git a/tests/tmt/podman-tests.sh b/tests/tmt/podman-tests.sh new file mode 100644 index 0000000..9d091c7 --- /dev/null +++ b/tests/tmt/podman-tests.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -exo pipefail + +if [[ "$(id -u)" -ne 0 ]];then + echo "Please run this script as superuser" + exit 1 +fi + +# Remove testing-farm repos if they exist because they interfere with the +# podman-next copr. The default distro repos will not be removed and can be +# used wherever relevant. +rm -f /etc/yum.repos.d/tag-repository.repo + +dnf -y install bats conmon podman podman-tests +dnf -y update --allowerasing + +cat /etc/redhat-release +rpm -q conmon containers-common crun podman podman-tests + +# Run crun specific podman tests +bats /usr/share/podman/test/system/030-run.bats From 3024c6913e3c21f45f05cb9da34053e83d2c7ccb Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Thu, 21 Jul 2022 17:34:00 +0200 Subject: [PATCH 163/184] Disable criu support on riscv64 criu is not ported to riscv64 arch. Signed-off-by: David Abdurachmanov Signed-off-by: Kristina Hanicova --- crun.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crun.spec b/crun.spec index f1869c0..2d9c787 100644 --- a/crun.spec +++ b/crun.spec @@ -60,9 +60,11 @@ BuildRequires: libseccomp-devel BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: protobuf-c-devel +%ifnarch riscv64 BuildRequires: criu-devel >= 3.17.1-2 Recommends: criu >= 3.17.1 Recommends: criu-libs +%endif %if %{defined wasmedge_support} BuildRequires: wasmedge-devel %endif From 366d677a3b573489cfc5b90f4d07ef285bb5d4f5 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 21 Oct 2024 15:24:03 -0400 Subject: [PATCH 164/184] Use embedded yajl in RHEL builds https://github.com/containers/crun/pull/1583 https://gitlab.com/redhat/centos-stream/rpms/crun/-/merge_requests/102 --- crun.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 2d9c787..48b52f7 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,6 @@ %global krun_opts %{nil} %global wasmedge_opts %{nil} +%global yajl_opts %{nil} %if %{defined copr_username} %define copr_build 1 @@ -24,6 +25,12 @@ %endif +%if %{defined fedora} || (%{defined rhel} && 0%{?rhel} < 10) +%global system_yajl 1 +%else +%global yajl_opts --enable-embedded-yajl +%endif + Summary: OCI runtime written in C Name: crun %if %{defined copr_build} @@ -55,7 +62,9 @@ BuildRequires: libcap-devel BuildRequires: libkrun-devel %endif BuildRequires: systemd-devel +%if %{defined system_yajl} BuildRequires: yajl-devel +%endif BuildRequires: libseccomp-devel BuildRequires: python3-libmount BuildRequires: libtool @@ -105,7 +114,7 @@ Recommends: wasmedge %build ./autogen.sh -./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} +./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{yajl_opts} %make_build %install From 01e5e28680661bd75429469ec9dc69138f54670a Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 22 Oct 2024 13:01:49 +0000 Subject: [PATCH 165/184] Update to 1.18 upstream release Upstream tag: 1.18 Upstream commit: 8656b254 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 106 ++++++++++++++++++++++++++++++++++---------------- README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 5 files changed, 76 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 578a718..2aecac4 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ crun-0.1.1.tar.gz /crun-1.14.4.tar.xz /crun-1.15.tar.zst /crun-1.17.tar.zst +/crun-1.18.tar.zst diff --git a/.packit.yaml b/.packit.yaml index 734d5a6..363614f 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -4,6 +4,24 @@ downstream_package_name: crun +# Ref: https://packit.dev/docs/configuration#files_to_sync +files_to_sync: + - src: rpm/gating.yaml + dest: gating.yaml + - src: plans/ + dest: plans/ + delete: true + mkpath: true + - src: tests/tmt/ + dest: tests/tmt/ + delete: true + mkpath: true + - src: .fmf/ + dest: .fmf/ + delete: true + mkpath: true + - .packit.yaml + packages: crun-fedora: pkg_tool: fedpkg @@ -11,6 +29,10 @@ packages: crun-centos: pkg_tool: centpkg specfile_path: rpm/crun.spec + crun-rhel: + specfile_path: rpm/crun.spec + crun-eln: + specfile_path: rpm/crun.spec srpm_build_deps: - git-archive-all @@ -29,9 +51,15 @@ jobs: notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - targets: + targets: &fedora_copr_targets - fedora-all-x86_64 - fedora-all-aarch64 + + - job: copr_build + trigger: pull_request + packages: [crun-eln] + notifications: *copr_build_failure_notification + targets: - fedora-eln-x86_64 - fedora-eln-aarch64 @@ -39,17 +67,30 @@ jobs: trigger: pull_request packages: [crun-centos] notifications: *copr_build_failure_notification + targets: ¢os_targets + # Need epel9 repos to fetch wasmedge build dependency + centos-stream-9-x86_64: + additional_repos: + - https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/ + centos-stream-9-aarch64: + additional_repos: + - https://dl.fedoraproject.org/pub/epel/9/Everything/aarch64/ + # TODO: build on CS10 with wasmedge once epel-10 is available + centos-stream-10-x86_64: {} + centos-stream-10-aarch64: {} + + - job: copr_build + trigger: pull_request + packages: [crun-rhel] + notifications: *copr_build_failure_notification targets: - epel-9-x86_64 - epel-9-aarch64 - - centos-stream-9-x86_64 - - centos-stream-9-aarch64 - - centos-stream-10-x86_64 - - centos-stream-10-aarch64 # Run on commit to main branch - job: copr_build trigger: commit + packages: [crun-fedora] notifications: failure_comment: message: "podman-next COPR build failed. @containers/packit-build please check." @@ -64,31 +105,29 @@ jobs: notifications: &podman_system_test_fail_notification failure_comment: message: "podman system tests failed. @containers/packit-build please check." - targets: - - fedora-all-x86_64 - - fedora-all-aarch64 - identifier: podman_system_test_fedora - tmt_plan: "/plans/podman_system_test" + targets: *fedora_copr_targets + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo - # Podman system tests for Fedora and CentOS Stream + # Podman system tests for CentOS Stream - job: tests trigger: pull_request packages: [crun-centos] notifications: *podman_system_test_fail_notification - targets: - - centos-stream-9-x86_64 - - centos-stream-9-aarch64 - # TODO: Enable cs10 tests after netavark has finished defaulting to - # nftables - #- centos-stream-10-x86_64 - #- centos-stream-10-aarch64 - identifier: podman_system_test_centos - tmt_plan: "/plans/podman_system_test" + targets: *centos_targets + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo # Podman system tests for RHEL - job: tests trigger: pull_request - packages: [crun-centos] + packages: [crun-rhel] use_internal_tf: true notifications: *podman_system_test_fail_notification targets: @@ -96,35 +135,34 @@ jobs: distros: [RHEL-9.4.0-Nightly,RHEL-9-Nightly] epel-9-aarch64: distros: [RHEL-9.4.0-Nightly,RHEL-9-Nightly] - # TODO: Enable cs10 tests after netavark has finished defaulting to - # nftables - #centos-stream-10-x86_64: - # distros: [RHEL-10-Beta-Nightly] - #centos-stream-10-aarch64: - # distros: [RHEL-10-Beta-Nightly] - identifier: podman_system_test_internal - tmt_plan: "/plans/podman_system_test" + #TODO: Enable RHEL10 targets once epel-10 copr target is available + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/epel-$releasever/rhcontainerbot-podman-next-epel-$releasever.repo + - type: repository-file + id: https://src.fedoraproject.org/rpms/epel-release/raw/epel9/f/epel.repo - job: propose_downstream trigger: release packages: [crun-fedora] - update_release: false - dist_git_branches: + dist_git_branches: &fedora_targets - fedora-all - job: propose_downstream trigger: release packages: [crun-centos] - update_release: false dist_git_branches: - c10s - job: koji_build trigger: commit - dist_git_branches: - - fedora-all + packages: [crun-fedora] + dist_git_branches: *fedora_targets - job: bodhi_update trigger: commit + packages: [crun-fedora] dist_git_branches: - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit index 066b312..2bd3f40 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.95.0.post1.dev8+gce6bd577. +The file was generated using packit 0.102.1.post1.dev6+g64f7460b. diff --git a/crun.spec b/crun.spec index 48b52f7..1e315b8 100644 --- a/crun.spec +++ b/crun.spec @@ -42,7 +42,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.17 +Version: 1.18 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/sources b/sources index 6f53768..285c15f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.17.tar.zst) = 3e46241b10c72fc4139c1b0256d3dcd012ffa4ec3e7db752d0eb0497b95e722b9345b77210197e88c9543a1270612ba768b343d16a151ea8154167292b2f7b1c +SHA512 (crun-1.18.tar.zst) = a1a77a74163bcad18541c688e8006449c86ff490c98485c1294bdbf892840d1add1d5a25de75950a21255185aebdb6136490512d4c7562a53ac4052669924fad From 37d91b502ed63fd9d4c1a7a403ac1a4bcf5b3512 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 30 Oct 2024 11:04:35 +0000 Subject: [PATCH 166/184] Update to 1.18.1 upstream release Upstream tag: 1.18.1 Upstream commit: c41f034f Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2aecac4..1b1ae71 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ crun-0.1.1.tar.gz /crun-1.15.tar.zst /crun-1.17.tar.zst /crun-1.18.tar.zst +/crun-1.18.1.tar.zst diff --git a/README.packit b/README.packit index 2bd3f40..3d207b6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.102.1.post1.dev6+g64f7460b. +The file was generated using packit 0.102.2.post1.dev2+gbdca14cb. diff --git a/crun.spec b/crun.spec index 1e315b8..8b3c9ed 100644 --- a/crun.spec +++ b/crun.spec @@ -42,7 +42,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.18 +Version: 1.18.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/sources b/sources index 285c15f..1e35bd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.18.tar.zst) = a1a77a74163bcad18541c688e8006449c86ff490c98485c1294bdbf892840d1add1d5a25de75950a21255185aebdb6136490512d4c7562a53ac4052669924fad +SHA512 (crun-1.18.1.tar.zst) = 3954d4c0f8732e760cf5ac02709de8b3cc93ee4d48083f6acc5e4a3e4d1a19dfb9687865dc1db66d5855d3588c13bfc788fa5d302ae6d06d9c8955c4c95fd7b0 From 4e043cf9e05c9482aff3e4f88243edb9458c53ed Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 31 Oct 2024 16:46:35 +0000 Subject: [PATCH 167/184] Update to 1.18.2 upstream release Upstream tag: 1.18.2 Upstream commit: 00ab38af Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1b1ae71..115f0f8 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ crun-0.1.1.tar.gz /crun-1.17.tar.zst /crun-1.18.tar.zst /crun-1.18.1.tar.zst +/crun-1.18.2.tar.zst diff --git a/crun.spec b/crun.spec index 8b3c9ed..997fe12 100644 --- a/crun.spec +++ b/crun.spec @@ -42,7 +42,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.18.1 +Version: 1.18.2 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/sources b/sources index 1e35bd8..5739bf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.18.1.tar.zst) = 3954d4c0f8732e760cf5ac02709de8b3cc93ee4d48083f6acc5e4a3e4d1a19dfb9687865dc1db66d5855d3588c13bfc788fa5d302ae6d06d9c8955c4c95fd7b0 +SHA512 (crun-1.18.2.tar.zst) = 78de21ea40a06c719a1f4d4e0aef99b2653c8324b47450598d05cd407cbe6b70105d4990d6cf6f686dcc1259e91e383f7850317f556caee7ce9270797a809de3 From 3a2e4feb280d5f1804ae3c8b68cadac834c74796 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 6 Dec 2024 14:47:31 +0000 Subject: [PATCH 168/184] Update to 1.19 upstream release Upstream tag: 1.19 Upstream commit: db31c42a Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 115f0f8..8c4460b 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ crun-0.1.1.tar.gz /crun-1.18.tar.zst /crun-1.18.1.tar.zst /crun-1.18.2.tar.zst +/crun-1.19.tar.zst diff --git a/README.packit b/README.packit index 3d207b6..13501e1 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.102.2.post1.dev2+gbdca14cb. +The file was generated using packit 0.104.1.post1.dev2+g8a1a06eb. diff --git a/crun.spec b/crun.spec index 997fe12..1b09599 100644 --- a/crun.spec +++ b/crun.spec @@ -42,7 +42,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.18.2 +Version: 1.19 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/sources b/sources index 5739bf5..58bc93b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.18.2.tar.zst) = 78de21ea40a06c719a1f4d4e0aef99b2653c8324b47450598d05cd407cbe6b70105d4990d6cf6f686dcc1259e91e383f7850317f556caee7ce9270797a809de3 +SHA512 (crun-1.19.tar.zst) = 30988650f1f6ff396818a71f3d75e9cea5b98e2c247f16a9e445e47a558438916fa256b3e50c9853d8deb1f2f663129e2a9ceabd9b6b8b8db2f7ee4d3791f669 From a4cf7dd241dc32dbd613b784def4b43f8a777d9d Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 17 Dec 2024 20:53:08 +0000 Subject: [PATCH 169/184] Update to 1.19.1 upstream release Upstream tag: 1.19.1 Upstream commit: 3e32a70c Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8c4460b..d352833 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ crun-0.1.1.tar.gz /crun-1.18.1.tar.zst /crun-1.18.2.tar.zst /crun-1.19.tar.zst +/crun-1.19.1.tar.zst diff --git a/README.packit b/README.packit index 13501e1..3826605 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.104.1.post1.dev2+g8a1a06eb. +The file was generated using packit 0.106.0. diff --git a/crun.spec b/crun.spec index 1b09599..18756c9 100644 --- a/crun.spec +++ b/crun.spec @@ -42,7 +42,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.19 +Version: 1.19.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/sources b/sources index 58bc93b..30431be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.19.tar.zst) = 30988650f1f6ff396818a71f3d75e9cea5b98e2c247f16a9e445e47a558438916fa256b3e50c9853d8deb1f2f663129e2a9ceabd9b6b8b8db2f7ee4d3791f669 +SHA512 (crun-1.19.1.tar.zst) = 4122b6474a1da4c17d781e0ccf2f97a89cbddd4bfca1bca55b4cb15b11bef03f9101b00a921dc6dbcac43be3661a64d61bb7ddfd750672b5bf85561df13cc7a8 From b6aa0a8fdf9f5339fdb62edd60cf5e214190b7e8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 26 Dec 2024 21:09:37 +0530 Subject: [PATCH 170/184] TMT: sync tests from upstream Signed-off-by: Lokesh Mandvekar --- gating.yaml | 7 +- plans/main.fmf | 28 ++++- tests/tmt/Makefile | 3 - tests/tmt/main.fmf | 13 --- tests/tmt/podman-tests.sh | 22 ---- tests/tmt/podman/system-test.fmf | 15 +++ tests/tmt/podman/system-test.sh | 16 +++ tests/tmt/sanity/config.json | 180 +++++++++++++++++++++++++++++++ tests/tmt/sanity/main.fmf | 5 + tests/tmt/sanity/runtest.sh | 91 ++++++++++++++++ 10 files changed, 336 insertions(+), 44 deletions(-) delete mode 100644 tests/tmt/Makefile delete mode 100644 tests/tmt/main.fmf delete mode 100644 tests/tmt/podman-tests.sh create mode 100644 tests/tmt/podman/system-test.fmf create mode 100644 tests/tmt/podman/system-test.sh create mode 100644 tests/tmt/sanity/config.json create mode 100644 tests/tmt/sanity/main.fmf create mode 100644 tests/tmt/sanity/runtest.sh diff --git a/gating.yaml b/gating.yaml index dbb1d91..4efb29f 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,9 @@ --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +decision_context: + - bodhi_update_push_stable + - bodhi_update_push_testing rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} @@ -9,4 +11,5 @@ rules: product_versions: - rhel-* decision_context: osci_compose_gate -rules: [] +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/plans/main.fmf b/plans/main.fmf index b56d319..d87b1f7 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -2,19 +2,39 @@ discover: how: fmf execute: how: tmt +adjust: + - when: initiator == packit + because: "We need to test with updated packages from rhcontainerbot/podman-next copr" + prepare+: + how: shell + script: | + sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo + dnf -y upgrade --allowerasing + # FIXME: Use epel10 once bats is available there + - when: distro == centos-stream-10 or distro == rhel-10 + because: "bats isn't yet available on epel10" + prepare+: + how: install + copr: rhcontainerbot/bats-el10 + package: bats + - when: distro == centos-stream-9 or distro == rhel-9 + because: "bats is present on EPEL on rhel9 / c9s" + prepare+: + how: feature + epel: enabled /upstream: summary: Run crun specific Podman system tests on upstream PRs discover+: filter: tag:upstream adjust+: - enabled: false - when: initiator is not defined or initiator != packit + - enabled: false + when: initiator is not defined or initiator != packit /downstream: summary: Run crun specific Podman system tests on bodhi / errata and dist-git PRs discover+: filter: tag:downstream adjust+: - enabled: false - when: initiator == packit + - enabled: false + when: initiator == packit diff --git a/tests/tmt/Makefile b/tests/tmt/Makefile deleted file mode 100644 index b57ba2c..0000000 --- a/tests/tmt/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -.PHONY: podman_system_test -podman_system_test: - bash ./podman-tests.sh diff --git a/tests/tmt/main.fmf b/tests/tmt/main.fmf deleted file mode 100644 index b0db617..0000000 --- a/tests/tmt/main.fmf +++ /dev/null @@ -1,13 +0,0 @@ -# Only common dependencies that are NOT required to run podman-tests.sh are -# specified here. Everything else is in podman-tests.sh. -require: - - make - -adjust: - duration: 10m - when: arch == aarch64 - -/podman_system_test: - tag: [ upstream, downstream ] - summary: Run crun specific Podman tests - test: make podman_system_test diff --git a/tests/tmt/podman-tests.sh b/tests/tmt/podman-tests.sh deleted file mode 100644 index 9d091c7..0000000 --- a/tests/tmt/podman-tests.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -exo pipefail - -if [[ "$(id -u)" -ne 0 ]];then - echo "Please run this script as superuser" - exit 1 -fi - -# Remove testing-farm repos if they exist because they interfere with the -# podman-next copr. The default distro repos will not be removed and can be -# used wherever relevant. -rm -f /etc/yum.repos.d/tag-repository.repo - -dnf -y install bats conmon podman podman-tests -dnf -y update --allowerasing - -cat /etc/redhat-release -rpm -q conmon containers-common crun podman podman-tests - -# Run crun specific podman tests -bats /usr/share/podman/test/system/030-run.bats diff --git a/tests/tmt/podman/system-test.fmf b/tests/tmt/podman/system-test.fmf new file mode 100644 index 0000000..9beb3c9 --- /dev/null +++ b/tests/tmt/podman/system-test.fmf @@ -0,0 +1,15 @@ +require: + - bats + - conmon + - crun + - make + - podman-tests + +adjust: + duration: 10m + when: arch == aarch64 + +/system_test: + tag: [ upstream, downstream ] + summary: Run crun specific Podman tests + test: bash ./system-test.sh diff --git a/tests/tmt/podman/system-test.sh b/tests/tmt/podman/system-test.sh new file mode 100644 index 0000000..4d04562 --- /dev/null +++ b/tests/tmt/podman/system-test.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +set -exo pipefail + +if [[ "$(id -u)" -ne 0 ]];then + echo "Please run this script as superuser" + exit 1 +fi + +cat /etc/redhat-release +rpm -q conmon containers-common crun podman podman-tests + +# Run crun specific podman tests +bats -t /usr/share/podman/test/system/030-run.bats +bats -t /usr/share/podman/test/system/075-exec.bats +bats -t /usr/share/podman/test/system/280-update.bats diff --git a/tests/tmt/sanity/config.json b/tests/tmt/sanity/config.json new file mode 100644 index 0000000..3a1f225 --- /dev/null +++ b/tests/tmt/sanity/config.json @@ -0,0 +1,180 @@ +{ + "ociVersion": "1.0.0", + "process": { + "terminal": false, + "user": { + "uid": 0, + "gid": 0 + }, + "args": [ + "sleep", "10" + ], + "env": [ + "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + "TERM=xterm" + ], + "cwd": "/", + "capabilities": { + "bounding": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE" + ], + "effective": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE" + ], + "inheritable": [ + ], + "permitted": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE" + ], + "ambient": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE" + ] + }, + "rlimits": [ + { + "type": "RLIMIT_NOFILE", + "hard": 1024, + "soft": 1024 + } + ], + "noNewPrivileges": true + }, + "root": { + "path": "rootfs", + "readonly": true + }, + "hostname": "crun", + "mounts": [ + { + "destination": "/proc", + "type": "proc", + "source": "proc" + }, + { + "destination": "/dev", + "type": "tmpfs", + "source": "tmpfs", + "options": [ + "nosuid", + "strictatime", + "mode=755", + "size=65536k" + ] + }, + { + "destination": "/dev/pts", + "type": "devpts", + "source": "devpts", + "options": [ + "nosuid", + "noexec", + "newinstance", + "ptmxmode=0666", + "mode=0620", + "gid=5" + ] + }, + { + "destination": "/dev/shm", + "type": "tmpfs", + "source": "shm", + "options": [ + "nosuid", + "noexec", + "nodev", + "mode=1777", + "size=65536k" + ] + }, + { + "destination": "/dev/mqueue", + "type": "mqueue", + "source": "mqueue", + "options": [ + "nosuid", + "noexec", + "nodev" + ] + }, + { + "destination": "/sys", + "type": "sysfs", + "source": "sysfs", + "options": [ + "nosuid", + "noexec", + "nodev", + "ro" + ] + }, + { + "destination": "/sys/fs/cgroup", + "type": "cgroup", + "source": "cgroup", + "options": [ + "nosuid", + "noexec", + "nodev", + "relatime", + "ro" + ] + } + ], + "linux": { + "resources": { + "devices": [ + { + "allow": false, + "access": "rwm" + } + ] + }, + "namespaces": [ + { + "type": "pid" + }, + { + "type": "network" + }, + { + "type": "ipc" + }, + { + "type": "uts" + }, + { + "type": "cgroup" + }, + { + "type": "mount" + } + ], + "maskedPaths": [ + "/proc/acpi", + "/proc/asound", + "/proc/kcore", + "/proc/keys", + "/proc/latency_stats", + "/proc/timer_list", + "/proc/timer_stats", + "/proc/sched_debug", + "/sys/firmware", + "/proc/scsi" + ], + "readonlyPaths": [ + "/proc/bus", + "/proc/fs", + "/proc/irq", + "/proc/sys", + "/proc/sysrq-trigger" + ] + } +} diff --git a/tests/tmt/sanity/main.fmf b/tests/tmt/sanity/main.fmf new file mode 100644 index 0000000..f430351 --- /dev/null +++ b/tests/tmt/sanity/main.fmf @@ -0,0 +1,5 @@ +require: [crun, podman] +summary: Sanity test for crun +tag: ['upstream', 'downstream'] +test: bash ./runtest.sh +duration: 10m diff --git a/tests/tmt/sanity/runtest.sh b/tests/tmt/sanity/runtest.sh new file mode 100644 index 0000000..d1d453c --- /dev/null +++ b/tests/tmt/sanity/runtest.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env bash + +set -exo pipefail + +TEMPDIR=$(mktemp -d) +TESTIMG="quay.io/libpod/busybox" +CNAME="mycont-$RANDOM" + +cat /etc/redhat-release +uname -r +rpm -q crun criu + +crun --version +[ $? -ne 0 ] && exit 1 + +crun features +[ $? -ne 0 ] && exit 1 + +crun list +[ $? -ne 0 ] && exit 1 + +# create the top most bundle and rootfs directory +mkdir -p $TEMPDIR/rootfs + +# export busybox via podman into the rootfs directory +podman export $(podman create $TESTIMG) | tar -C $TEMPDIR/rootfs -xvf - +[ $? -ne 0 ] && exit 1 + +# use existing spec +cp ./config.json $TEMPDIR +ls $TEMPDIR +cd $TEMPDIR + +crun create $CNAME +[ $? -ne 0 ] && exit 1 + +crun list +[ $? -ne 0 ] && exit 1 + +crun start $CNAME +[ $? -ne 0 ] && exit 1 + +crun list +[ $? -ne 0 ] && exit 1 + +crun state $CNAME +[ $? -ne 0 ] && exit 1 + +crun ps $CNAME +[ $? -ne 0 ] && exit 1 + +ret=$(crun exec $CNAME pwd) +[ $? -ne 0 ] || [ $ret != '/' ] && exit 1 + +crun pause $CNAME +[ $? -ne 0 ] && exit 1 + +crun state $CNAME +[ $? -ne 0 ] && exit 1 + +crun resume $CNAME +[ $? -ne 0 ] && exit 1 + +crun state $CNAME +[ $? -ne 0 ] && exit 1 + +ret=$(crun exec $CNAME pwd) +[ $? -ne 0 ] || [ $ret != '/' ] && exit 1 + +crun delete --force $CNAME +[ $? -ne 0 ] && exit 1 + +crun list +[ $? -ne 0 ] && exit 1 + +crun run $CNAME & +[ $? -ne 0 ] && exit 1 + +crun list +[ $? -ne 0 ] && exit 1 + +# make sure the container is running state +sleep 2 + +ret=$(crun exec $CNAME echo 'ok') +[ $? -ne 0 ] || [ $ret != 'ok' ] && exit 1 + +crun kill $CNAME +[ $? -ne 0 ] && exit 1 + +exit 0 From 50254510577218e81d9a0ab48fb78ae58b76dd23 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 15 Jan 2025 18:25:43 +0530 Subject: [PATCH 171/184] TMT: use prepare conditionals Signed-off-by: Lokesh Mandvekar --- plans/main.fmf | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/plans/main.fmf b/plans/main.fmf index d87b1f7..10bf493 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -2,26 +2,15 @@ discover: how: fmf execute: how: tmt -adjust: +prepare: + - how: feature + epel: enabled - when: initiator == packit because: "We need to test with updated packages from rhcontainerbot/podman-next copr" - prepare+: - how: shell - script: | - sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo - dnf -y upgrade --allowerasing - # FIXME: Use epel10 once bats is available there - - when: distro == centos-stream-10 or distro == rhel-10 - because: "bats isn't yet available on epel10" - prepare+: - how: install - copr: rhcontainerbot/bats-el10 - package: bats - - when: distro == centos-stream-9 or distro == rhel-9 - because: "bats is present on EPEL on rhel9 / c9s" - prepare+: - how: feature - epel: enabled + how: shell + script: | + sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo + dnf -y upgrade --allowerasing /upstream: summary: Run crun specific Podman system tests on upstream PRs From ddd2534e354c0290a37f726403878dc98e620436 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:57:04 +0000 Subject: [PATCH 172/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3c8e9346f2e76803af26b00e1c7be361cfdeadc9 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 5 Feb 2025 08:39:36 +0000 Subject: [PATCH 173/184] Update to 1.20 upstream release Upstream tag: 1.20 Upstream commit: 9c9a76ac Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 34 ++------------------------------ README.packit | 2 +- crun.spec | 2 +- plans/main.fmf | 22 ++++++++++++++++----- sources | 2 +- tests/tmt/podman/system-test.fmf | 7 ------- tests/tmt/sanity/main.fmf | 1 - 8 files changed, 23 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index d352833..26d3f06 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ crun-0.1.1.tar.gz /crun-1.18.2.tar.zst /crun-1.19.tar.zst /crun-1.19.1.tar.zst +/crun-1.20.tar.zst diff --git a/.packit.yaml b/.packit.yaml index 363614f..ecb0014 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -29,8 +29,6 @@ packages: crun-centos: pkg_tool: centpkg specfile_path: rpm/crun.spec - crun-rhel: - specfile_path: rpm/crun.spec crun-eln: specfile_path: rpm/crun.spec @@ -67,7 +65,7 @@ jobs: trigger: pull_request packages: [crun-centos] notifications: *copr_build_failure_notification - targets: ¢os_targets + targets: ¢os_copr_targets # Need epel9 repos to fetch wasmedge build dependency centos-stream-9-x86_64: additional_repos: @@ -79,14 +77,6 @@ jobs: centos-stream-10-x86_64: {} centos-stream-10-aarch64: {} - - job: copr_build - trigger: pull_request - packages: [crun-rhel] - notifications: *copr_build_failure_notification - targets: - - epel-9-x86_64 - - epel-9-aarch64 - # Run on commit to main branch - job: copr_build trigger: commit @@ -117,33 +107,13 @@ jobs: trigger: pull_request packages: [crun-centos] notifications: *podman_system_test_fail_notification - targets: *centos_targets + targets: *centos_copr_targets tf_extra_params: environments: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo - # Podman system tests for RHEL - - job: tests - trigger: pull_request - packages: [crun-rhel] - use_internal_tf: true - notifications: *podman_system_test_fail_notification - targets: - epel-9-x86_64: - distros: [RHEL-9.4.0-Nightly,RHEL-9-Nightly] - epel-9-aarch64: - distros: [RHEL-9.4.0-Nightly,RHEL-9-Nightly] - #TODO: Enable RHEL10 targets once epel-10 copr target is available - tf_extra_params: - environments: - - artifacts: - - type: repository-file - id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/epel-$releasever/rhcontainerbot-podman-next-epel-$releasever.repo - - type: repository-file - id: https://src.fedoraproject.org/rpms/epel-release/raw/epel9/f/epel.repo - - job: propose_downstream trigger: release packages: [crun-fedora] diff --git a/README.packit b/README.packit index 3826605..c1b4159 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.106.0. +The file was generated using packit 1.1.0. diff --git a/crun.spec b/crun.spec index 18756c9..e9924db 100644 --- a/crun.spec +++ b/crun.spec @@ -42,7 +42,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.19.1 +Version: 1.20 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/plans/main.fmf b/plans/main.fmf index 10bf493..1328f77 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -3,14 +3,26 @@ discover: execute: how: tmt prepare: - - how: feature - epel: enabled - - when: initiator == packit - because: "We need to test with updated packages from rhcontainerbot/podman-next copr" + - when: distro == centos-stream or distro == rhel how: shell script: | - sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm + dnf -y config-manager --set-enabled epel + order: 10 + - when: initiator == packit + how: shell + script: | + COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo" + if compgen -G $COPR_REPO_FILE > /dev/null; then + sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE + fi dnf -y upgrade --allowerasing + order: 20 + - how: install + package: + - bats + - crun + - podman-tests /upstream: summary: Run crun specific Podman system tests on upstream PRs diff --git a/sources b/sources index 30431be..aac6af3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.19.1.tar.zst) = 4122b6474a1da4c17d781e0ccf2f97a89cbddd4bfca1bca55b4cb15b11bef03f9101b00a921dc6dbcac43be3661a64d61bb7ddfd750672b5bf85561df13cc7a8 +SHA512 (crun-1.20.tar.zst) = cfc124dd88e590aafb28eccff0e598858a36436605863ed1cf2d95d0d3122af7981ac113887a3274e9c479d249dd8deaae7f624f5f2c1ea07cbdef049988c138 diff --git a/tests/tmt/podman/system-test.fmf b/tests/tmt/podman/system-test.fmf index 9beb3c9..1032f07 100644 --- a/tests/tmt/podman/system-test.fmf +++ b/tests/tmt/podman/system-test.fmf @@ -1,10 +1,3 @@ -require: - - bats - - conmon - - crun - - make - - podman-tests - adjust: duration: 10m when: arch == aarch64 diff --git a/tests/tmt/sanity/main.fmf b/tests/tmt/sanity/main.fmf index f430351..6355ff6 100644 --- a/tests/tmt/sanity/main.fmf +++ b/tests/tmt/sanity/main.fmf @@ -1,4 +1,3 @@ -require: [crun, podman] summary: Sanity test for crun tag: ['upstream', 'downstream'] test: bash ./runtest.sh From 890408dccfa169aa89f5452e0a41e81b8b834bca Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 10 Feb 2025 19:59:24 +0530 Subject: [PATCH 174/184] fix gating config --- gating.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 4efb29f..f86de09 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,7 @@ --- !Policy product_versions: - fedora-* -decision_context: +decision_contexts: - bodhi_update_push_stable - bodhi_update_push_testing rules: From a0b4675434587614aec96f55e7291cb2aae09a7c Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 28 Mar 2025 08:38:07 +0000 Subject: [PATCH 175/184] Update to 1.21 upstream release Upstream tag: 1.21 Upstream commit: 10269840 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 26d3f06..3f72d68 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ crun-0.1.1.tar.gz /crun-1.19.tar.zst /crun-1.19.1.tar.zst /crun-1.20.tar.zst +/crun-1.21.tar.zst diff --git a/README.packit b/README.packit index c1b4159..ad2b8e5 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.1.0. +The file was generated using packit 1.3.0.post1.dev4+gb85da743. diff --git a/crun.spec b/crun.spec index e9924db..5acd520 100644 --- a/crun.spec +++ b/crun.spec @@ -42,7 +42,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.20 +Version: 1.21 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/sources b/sources index aac6af3..0bdcdb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.20.tar.zst) = cfc124dd88e590aafb28eccff0e598858a36436605863ed1cf2d95d0d3122af7981ac113887a3274e9c479d249dd8deaae7f624f5f2c1ea07cbdef049988c138 +SHA512 (crun-1.21.tar.zst) = 022bb56dbf20eb7c479b76a92fc55c69b219e36233ee7e588eb883afd092fb4aaeca842e64d83e53bbb08bd09f635d582a86824950971842b73921d1ce134bd1 From 3b0f113331942e61f50ed044d2d2de060d0a1533 Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Wed, 30 Apr 2025 13:53:44 +0200 Subject: [PATCH 176/184] Revert "Disable criu support on riscv64" This reverts commit 3024c6913e3c21f45f05cb9da34053e83d2c7ccb. --- crun.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/crun.spec b/crun.spec index 5acd520..3079c66 100644 --- a/crun.spec +++ b/crun.spec @@ -69,11 +69,9 @@ BuildRequires: libseccomp-devel BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: protobuf-c-devel -%ifnarch riscv64 BuildRequires: criu-devel >= 3.17.1-2 Recommends: criu >= 3.17.1 Recommends: criu-libs -%endif %if %{defined wasmedge_support} BuildRequires: wasmedge-devel %endif From 554bf1b07a9cd28e0f7612d0ad9fac55b8122895 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 27 Jun 2025 13:22:58 +0000 Subject: [PATCH 177/184] Update to 1.22 upstream release Upstream tag: 1.22 Upstream commit: 4de19b63 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 15 ++-- README.packit | 2 +- crun.spec | 2 +- plans/main.fmf | 23 +++--- sources | 2 +- tests/tmt/podman/system-test.fmf | 7 +- tests/tmt/podman/system-test.sh | 1 + tests/tmt/sanity/main.fmf | 2 +- tests/tmt/sanity/runtest.sh | 118 ++++++++++++++++++------------- tests/tmt/shellcheck/main.fmf | 4 ++ 11 files changed, 105 insertions(+), 72 deletions(-) create mode 100644 tests/tmt/shellcheck/main.fmf diff --git a/.gitignore b/.gitignore index 3f72d68..fdd8502 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,4 @@ crun-0.1.1.tar.gz /crun-1.19.1.tar.zst /crun-1.20.tar.zst /crun-1.21.tar.zst +/crun-1.22.tar.zst diff --git a/.packit.yaml b/.packit.yaml index ecb0014..0c3381a 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -92,9 +92,9 @@ jobs: - job: tests trigger: pull_request packages: [crun-fedora] - notifications: &podman_system_test_fail_notification + notifications: &test_failure_notification failure_comment: - message: "podman system tests failed. @containers/packit-build please check." + message: "TMT tests failed. @containers/packit-build please check." targets: *fedora_copr_targets tf_extra_params: environments: @@ -106,8 +106,15 @@ jobs: - job: tests trigger: pull_request packages: [crun-centos] - notifications: *podman_system_test_fail_notification - targets: *centos_copr_targets + notifications: *test_failure_notification + # TODO: Re-enable centos-stream-10-x86_64 once criu issues are solved + # Ref: https://github.com/containers/crun/pull/1758#issuecomment-2901772392 + # Issue filed: https://github.com/containers/crun/issues/1759 + #targets: *centos_copr_targets + targets: + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + - centos-stream-10-aarch64 tf_extra_params: environments: - artifacts: diff --git a/README.packit b/README.packit index ad2b8e5..dde2a46 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.3.0.post1.dev4+gb85da743. +The file was generated using packit 1.9.0.post1.dev4+g48b4c222. diff --git a/crun.spec b/crun.spec index 3079c66..2ff630a 100644 --- a/crun.spec +++ b/crun.spec @@ -42,7 +42,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.21 +Version: 1.22 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/plans/main.fmf b/plans/main.fmf index 1328f77..7a4ae15 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -24,18 +24,17 @@ prepare: - crun - podman-tests -/upstream: - summary: Run crun specific Podman system tests on upstream PRs +/shellcheck: discover+: - filter: tag:upstream - adjust+: - - enabled: false - when: initiator is not defined or initiator != packit + filter: 'tag:shellcheck' + enabled: true + adjust: + enabled: false + when: distro == centos-stream-10 or distro == rhel-10 + prepare+: + - how: install + package: ShellCheck -/downstream: - summary: Run crun specific Podman system tests on bodhi / errata and dist-git PRs +/tests: discover+: - filter: tag:downstream - adjust+: - - enabled: false - when: initiator == packit + filter: 'tag:podman | tag:sanity' diff --git a/sources b/sources index 0bdcdb2..978beb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.21.tar.zst) = 022bb56dbf20eb7c479b76a92fc55c69b219e36233ee7e588eb883afd092fb4aaeca842e64d83e53bbb08bd09f635d582a86824950971842b73921d1ce134bd1 +SHA512 (crun-1.22.tar.zst) = 9a8199e7839be9f2594bf5549ea697dcd3f47ab5eb13f1e7e51d18e0091d8960185069c5e88033ab42cf0797795d687e608ddac81443f3896caf409192875d09 diff --git a/tests/tmt/podman/system-test.fmf b/tests/tmt/podman/system-test.fmf index 1032f07..8df55c2 100644 --- a/tests/tmt/podman/system-test.fmf +++ b/tests/tmt/podman/system-test.fmf @@ -2,7 +2,6 @@ adjust: duration: 10m when: arch == aarch64 -/system_test: - tag: [ upstream, downstream ] - summary: Run crun specific Podman tests - test: bash ./system-test.sh +summary: Run crun specific Podman tests +test: bash ./system-test.sh +tag: [ podman ] diff --git a/tests/tmt/podman/system-test.sh b/tests/tmt/podman/system-test.sh index 4d04562..974f829 100644 --- a/tests/tmt/podman/system-test.sh +++ b/tests/tmt/podman/system-test.sh @@ -14,3 +14,4 @@ rpm -q conmon containers-common crun podman podman-tests bats -t /usr/share/podman/test/system/030-run.bats bats -t /usr/share/podman/test/system/075-exec.bats bats -t /usr/share/podman/test/system/280-update.bats +bats -t /usr/share/podman/test/system/520-checkpoint.bats diff --git a/tests/tmt/sanity/main.fmf b/tests/tmt/sanity/main.fmf index 6355ff6..ccfa4ca 100644 --- a/tests/tmt/sanity/main.fmf +++ b/tests/tmt/sanity/main.fmf @@ -1,4 +1,4 @@ summary: Sanity test for crun -tag: ['upstream', 'downstream'] test: bash ./runtest.sh duration: 10m +tag: [ sanity ] diff --git a/tests/tmt/sanity/runtest.sh b/tests/tmt/sanity/runtest.sh index d1d453c..3e13986 100644 --- a/tests/tmt/sanity/runtest.sh +++ b/tests/tmt/sanity/runtest.sh @@ -10,82 +10,104 @@ cat /etc/redhat-release uname -r rpm -q crun criu -crun --version -[ $? -ne 0 ] && exit 1 +if ! crun --version; then + exit 1 +fi -crun features -[ $? -ne 0 ] && exit 1 +if ! crun features; then + exit 1 +fi -crun list -[ $? -ne 0 ] && exit 1 +if ! crun list; then + exit 1 +fi # create the top most bundle and rootfs directory -mkdir -p $TEMPDIR/rootfs +mkdir -p "$TEMPDIR"/rootfs # export busybox via podman into the rootfs directory -podman export $(podman create $TESTIMG) | tar -C $TEMPDIR/rootfs -xvf - -[ $? -ne 0 ] && exit 1 +if ! (podman export "$(podman create $TESTIMG)" | tar -C "$TEMPDIR"/rootfs -xvf -); then + exit 1 +fi # use existing spec -cp ./config.json $TEMPDIR -ls $TEMPDIR -cd $TEMPDIR +cp ./config.json "$TEMPDIR" +ls "$TEMPDIR" +cd "$TEMPDIR" -crun create $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun create $CNAME; then + exit 1 +fi -crun list -[ $? -ne 0 ] && exit 1 +if ! crun list; then + exit 1 +fi -crun start $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun start $CNAME; then + exit 1 +fi -crun list -[ $? -ne 0 ] && exit 1 +if ! crun list; then + exit 1 +fi -crun state $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun state $CNAME; then + exit 1 +fi -crun ps $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun ps $CNAME; then + exit 1 +fi -ret=$(crun exec $CNAME pwd) -[ $? -ne 0 ] || [ $ret != '/' ] && exit 1 +if ! ret=$(crun exec $CNAME pwd) || [[ "$ret" != '/' ]]; then + exit 1 +fi -crun pause $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun pause $CNAME; then + exit 1 +fi -crun state $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun state $CNAME; then + exit 1 +fi -crun resume $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun resume $CNAME; then + exit 1 +fi -crun state $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun state $CNAME; then + exit 1 +fi -ret=$(crun exec $CNAME pwd) -[ $? -ne 0 ] || [ $ret != '/' ] && exit 1 +if ! ret=$(crun exec $CNAME pwd) || [[ "$ret" != '/' ]]; then + exit 1 +fi -crun delete --force $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun delete --force $CNAME; then + exit 1 +fi -crun list -[ $? -ne 0 ] && exit 1 +if ! crun list; then + exit 1 +fi -crun run $CNAME & -[ $? -ne 0 ] && exit 1 +if ! (crun run $CNAME &); then + exit 1 +fi -crun list -[ $? -ne 0 ] && exit 1 +if ! crun list; then + exit 1 +fi # make sure the container is running state sleep 2 -ret=$(crun exec $CNAME echo 'ok') -[ $? -ne 0 ] || [ $ret != 'ok' ] && exit 1 +if ! ret=$(crun exec $CNAME echo 'ok') || [[ "$ret" != 'ok' ]]; then + exit 1 +fi -crun kill $CNAME -[ $? -ne 0 ] && exit 1 +if ! crun kill $CNAME; then + exit 1 +fi exit 0 diff --git a/tests/tmt/shellcheck/main.fmf b/tests/tmt/shellcheck/main.fmf new file mode 100644 index 0000000..7d220b4 --- /dev/null +++ b/tests/tmt/shellcheck/main.fmf @@ -0,0 +1,4 @@ +summary: Shellcheck tests +test: find ../ -type f -name "*.sh" -exec shellcheck {} + +duration: 10m +tag: [ shellcheck ] From d8749367c84cca2c35b5511ef9e1583b059f675a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:52:31 +0000 Subject: [PATCH 178/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From de0aacca89d0414d56f6800f5582e5b2cb1c2782 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 24 Jul 2025 20:40:07 +0000 Subject: [PATCH 179/184] Update to 1.23 upstream release Upstream tag: 1.23 Upstream commit: 3fc25616 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 17 ++++++----------- crun.spec | 20 ++++++++++---------- sources | 2 +- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index fdd8502..9eeecf3 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ crun-0.1.1.tar.gz /crun-1.20.tar.zst /crun-1.21.tar.zst /crun-1.22.tar.zst +/crun-1.23.tar.zst diff --git a/.packit.yaml b/.packit.yaml index 0c3381a..b7dc6ae 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -66,16 +66,10 @@ jobs: packages: [crun-centos] notifications: *copr_build_failure_notification targets: ¢os_copr_targets - # Need epel9 repos to fetch wasmedge build dependency - centos-stream-9-x86_64: - additional_repos: - - https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/ - centos-stream-9-aarch64: - additional_repos: - - https://dl.fedoraproject.org/pub/epel/9/Everything/aarch64/ - # TODO: build on CS10 with wasmedge once epel-10 is available - centos-stream-10-x86_64: {} - centos-stream-10-aarch64: {} + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 # Run on commit to main branch - job: copr_build @@ -127,8 +121,9 @@ jobs: dist_git_branches: &fedora_targets - fedora-all + # Disabled until we're switching to Packit for CentOS Stream - job: propose_downstream - trigger: release + trigger: ignore packages: [crun-centos] dist_git_branches: - c10s diff --git a/crun.spec b/crun.spec index 2ff630a..928e393 100644 --- a/crun.spec +++ b/crun.spec @@ -9,20 +9,17 @@ # krun and wasm support only on aarch64 and x86_64 %ifarch aarch64 || x86_64 -# Disable wasmedge on rhel 10 until EPEL10 is in place, otherwise it causes -# build issues on copr -%if %{defined fedora} || (%{defined copr_build} && %{defined rhel} && 0%{?rhel} < 10) +%if %{defined fedora} +# krun only exists on fedora +%global krun_support 1 +%global krun_opts --with-libkrun + +# Keep wasmedge enabled only on Fedora. It breaks a lot on EPEL. %global wasm_support 1 %global wasmedge_support 1 %global wasmedge_opts --with-wasmedge %endif -# krun only exists on fedora -%if %{defined fedora} -%global krun_support 1 -%global krun_opts --with-libkrun -%endif - %endif %if %{defined fedora} || (%{defined rhel} && 0%{?rhel} < 10) @@ -42,7 +39,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.22 +Version: 1.23 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst @@ -119,6 +116,9 @@ Recommends: wasmedge %make_install prefix=%{_prefix} rm -rf %{buildroot}%{_prefix}/lib* +# Placeholder check to silence rpmlint +%check + %files %license COPYING %{_bindir}/%{name} diff --git a/sources b/sources index 978beb9..431dcad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.22.tar.zst) = 9a8199e7839be9f2594bf5549ea697dcd3f47ab5eb13f1e7e51d18e0091d8960185069c5e88033ab42cf0797795d687e608ddac81443f3896caf409192875d09 +SHA512 (crun-1.23.tar.zst) = 7c13d7929d41a538b8a206b116f39af083e10d752b63a1283ed29ca3e46431c6cf3622a088059ffaa973e6e5f81bb7d21ebb2fffd824f28f209a087a1d2c0849 From dec4e2f02ce667c504014423f818985e594db037 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 31 Jul 2025 20:31:37 +0000 Subject: [PATCH 180/184] Update to 1.23.1 upstream release Upstream tag: 1.23.1 Upstream commit: d20b23db Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9eeecf3..26615fe 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,4 @@ crun-0.1.1.tar.gz /crun-1.21.tar.zst /crun-1.22.tar.zst /crun-1.23.tar.zst +/crun-1.23.1.tar.zst diff --git a/README.packit b/README.packit index dde2a46..3ad54d6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.9.0.post1.dev4+g48b4c222. +The file was generated using packit 1.11.0. diff --git a/crun.spec b/crun.spec index 928e393..6af483d 100644 --- a/crun.spec +++ b/crun.spec @@ -39,7 +39,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.23 +Version: 1.23.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/sources b/sources index 431dcad..f09a94d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.23.tar.zst) = 7c13d7929d41a538b8a206b116f39af083e10d752b63a1283ed29ca3e46431c6cf3622a088059ffaa973e6e5f81bb7d21ebb2fffd824f28f209a087a1d2c0849 +SHA512 (crun-1.23.1.tar.zst) = 3ccff7a8031ae4ff78d738b8994e865d1b69733c3875c3a338d0620efdc9b9e1c0e3d051cf80c21e6dcda37e903aa538c4601b24c3d03493ddf68e65673798a5 From fa91863b11848a1953e2827688483f0562be9743 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 9 Sep 2025 20:19:46 +0000 Subject: [PATCH 181/184] Update to 1.24 upstream release Upstream tag: 1.24 Upstream commit: 54693209 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- crun.spec | 3 ++- sources | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 26615fe..c6d5eb3 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ crun-0.1.1.tar.gz /crun-1.22.tar.zst /crun-1.23.tar.zst /crun-1.23.1.tar.zst +/crun-1.24.tar.zst diff --git a/README.packit b/README.packit index 3ad54d6..fb341a1 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/crun.spec b/crun.spec index 6af483d..a04cf3f 100644 --- a/crun.spec +++ b/crun.spec @@ -39,7 +39,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.23.1 +Version: 1.24 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst @@ -73,6 +73,7 @@ Recommends: criu-libs BuildRequires: wasmedge-devel %endif BuildRequires: python +BuildRequires: glibc-static Provides: oci-runtime %description diff --git a/sources b/sources index f09a94d..1a15fa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.23.1.tar.zst) = 3ccff7a8031ae4ff78d738b8994e865d1b69733c3875c3a338d0620efdc9b9e1c0e3d051cf80c21e6dcda37e903aa538c4601b24c3d03493ddf68e65673798a5 +SHA512 (crun-1.24.tar.zst) = 6f7cdd36b661abf5cacf01178e87bf4eefd5a297aca3452861f09921a18d15c8802083b2ebae93e3547f6486cc900f1234b6013161967a46d4efc1463dc8ca2f From 584087122b37e3d3129f6c348293cc0d57fec301 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 10 Nov 2025 13:34:54 +0000 Subject: [PATCH 182/184] Update to 1.25 upstream release Upstream tag: 1.25 Upstream commit: d9a0adce Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- plans/tmt.fmf | 9 +++++++++ sources | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 plans/tmt.fmf diff --git a/.gitignore b/.gitignore index c6d5eb3..6739b17 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ crun-0.1.1.tar.gz /crun-1.23.tar.zst /crun-1.23.1.tar.zst /crun-1.24.tar.zst +/crun-1.25.tar.zst diff --git a/README.packit b/README.packit index fb341a1..2511bf4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. +The file was generated using packit 1.12.0. diff --git a/crun.spec b/crun.spec index a04cf3f..649a1c0 100644 --- a/crun.spec +++ b/crun.spec @@ -39,7 +39,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.24 +Version: 1.25 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/plans/tmt.fmf b/plans/tmt.fmf new file mode 100644 index 0000000..1941978 --- /dev/null +++ b/plans/tmt.fmf @@ -0,0 +1,9 @@ +/: + inherit: false + +summary: Run tmt's integration tests +plan: + import: + url: https://github.com/teemtee/tmt + path: /plans/friends + name: /podman diff --git a/sources b/sources index 1a15fa8..be35dff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.24.tar.zst) = 6f7cdd36b661abf5cacf01178e87bf4eefd5a297aca3452861f09921a18d15c8802083b2ebae93e3547f6486cc900f1234b6013161967a46d4efc1463dc8ca2f +SHA512 (crun-1.25.tar.zst) = c95834eddf431305973c2ca1a984e1aa5b17290197117b68c4343077b42d68c1c4bbc001e6d0487abba712f5b8bcbb1ebbc0be23f195cf8f61485fd03bc61962 From 94c3dc6bac59aab62399ff5bed2991d9d27244cc Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 25 Nov 2025 14:50:56 +0000 Subject: [PATCH 183/184] Update to 1.25.1 upstream release Upstream tag: 1.25.1 Upstream commit: 156ae065 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6739b17..7a1b41d 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,4 @@ crun-0.1.1.tar.gz /crun-1.23.1.tar.zst /crun-1.24.tar.zst /crun-1.25.tar.zst +/crun-1.25.1.tar.zst diff --git a/README.packit b/README.packit index 2511bf4..a901bca 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.12.0. +The file was generated using packit 1.12.0.post1.dev18+gc39b0e7d4. diff --git a/crun.spec b/crun.spec index 649a1c0..de06fe5 100644 --- a/crun.spec +++ b/crun.spec @@ -39,7 +39,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.25 +Version: 1.25.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/sources b/sources index be35dff..0311b67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.25.tar.zst) = c95834eddf431305973c2ca1a984e1aa5b17290197117b68c4343077b42d68c1c4bbc001e6d0487abba712f5b8bcbb1ebbc0be23f195cf8f61485fd03bc61962 +SHA512 (crun-1.25.1.tar.zst) = 44b38ef939027dfad0ca72e9d5bbcefc05da66887c239fe441ca9e105ecb981aac517de3d1ebc6f9ba3d5061f7d1bcd6528099115ad45390fe56e492cdba47ff From dfa0f5cd2bcbf32bb0ce90c2274bfb958db13e60 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 22 Dec 2025 16:06:48 +0000 Subject: [PATCH 184/184] Update to 1.26 upstream release Upstream tag: 1.26 Upstream commit: 3241e671 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7a1b41d..62eb9bc 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ crun-0.1.1.tar.gz /crun-1.24.tar.zst /crun-1.25.tar.zst /crun-1.25.1.tar.zst +/crun-1.26.tar.zst diff --git a/README.packit b/README.packit index a901bca..9bb65f0 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.12.0.post1.dev18+gc39b0e7d4. +The file was generated using packit 1.13.0.post1.dev2+g84134016c. diff --git a/crun.spec b/crun.spec index de06fe5..5cfc631 100644 --- a/crun.spec +++ b/crun.spec @@ -39,7 +39,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.25.1 +Version: 1.26 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst diff --git a/sources b/sources index 0311b67..233ea40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.25.1.tar.zst) = 44b38ef939027dfad0ca72e9d5bbcefc05da66887c239fe441ca9e105ecb981aac517de3d1ebc6f9ba3d5061f7d1bcd6528099115ad45390fe56e492cdba47ff +SHA512 (crun-1.26.tar.zst) = 0785af6095a26290f433c5739bea5d98a029c3f0e8efbeed420481849ebddd70acde6c1105133c392abf26bca90d232cced5e5994da7506d66a020a02c129fb3