Import rpm: 17cbd977a20897d0a56f473e1cee6ba311f4f08d

This commit is contained in:
James Antill 2023-02-23 12:39:31 -05:00
parent b6267c5798
commit 67a13d0401
3 changed files with 87 additions and 8 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/buildah-1.24.2-ce608bc.tar.gz SOURCES/release-1.28-7e4d9dd.tar.gz

View File

@ -11,13 +11,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
%endif %endif
%global import_path github.com/containers/buildah %global import_path github.com/containers/buildah
#%%global branch main %global branch release-1.28
%global commit0 ce608bcecdeb077daab846c83b026c508cff9688 %global commit0 7e4d9dd3a92fe092d118892d8667cc496711cd10
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Epoch: 1 Epoch: 1
Name: buildah Name: buildah
Version: 1.24.2 Version: 1.28.2
Release: 2%{?dist} Release: 2%{?dist}
Summary: A command line tool used for creating OCI Images Summary: A command line tool used for creating OCI Images
License: ASL 2.0 License: ASL 2.0
@ -29,14 +29,13 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar
%else %else
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
%endif %endif
Patch0: fix-bash-syntax.patch BuildRequires: golang >= 1.17.7
BuildRequires: golang >= 1.16.6
BuildRequires: git BuildRequires: git
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libseccomp-devel BuildRequires: libseccomp-devel
BuildRequires: ostree-devel BuildRequires: ostree-devel
BuildRequires: glibc-static BuildRequires: glibc-static
BuildRequires: go-md2man BuildRequires: /usr/bin/go-md2man
BuildRequires: gpgme-devel BuildRequires: gpgme-devel
BuildRequires: device-mapper-devel BuildRequires: device-mapper-devel
BuildRequires: libassuan-devel BuildRequires: libassuan-devel
@ -45,6 +44,10 @@ Requires: runc >= 1.0.0-26
Requires: containers-common >= 2:1-2 Requires: containers-common >= 2:1-2
Recommends: container-selinux Recommends: container-selinux
Requires: slirp4netns >= 0.3-0 Requires: slirp4netns >= 0.3-0
Requires: containernetworking-plugins >= 0.9.1-1
Suggests: netavark
Requires: iptables
Requires: nftables
%description %description
The %{name} package provides a command line tool which can be used to The %{name} package provides a command line tool which can be used to
@ -99,6 +102,7 @@ rm -f src/github.com/containers/storage/drivers/register/register_btrfs.go
%gobuild -o bin/%{name} %{import_path}/cmd/%{name} %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
%gobuild -o imgtype %{import_path}/tests/imgtype %gobuild -o imgtype %{import_path}/tests/imgtype
%gobuild -o bin/copy %{import_path}/tests/copy %gobuild -o bin/copy %{import_path}/tests/copy
%gobuild -o bin/tutorial %{import_path}/tests/tutorial
GOMD2MAN=go-md2man %{__make} -C docs GOMD2MAN=go-md2man %{__make} -C docs
%install %install
@ -108,6 +112,7 @@ install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy
cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
#define license tag if not already defined #define license tag if not already defined
@ -126,9 +131,83 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
%license LICENSE %license LICENSE
%{_bindir}/%{name}-imgtype %{_bindir}/%{name}-imgtype
%{_bindir}/%{name}-copy %{_bindir}/%{name}-copy
%{_bindir}/%{name}-tutorial
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%changelog %changelog
* Tue Dec 06 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.28.2-2
- update to the latest content of https://github.com/containers/buildah/tree/release-1.28
(https://github.com/containers/buildah/commit/7e4d9dd)
- Resolves: #2136319
* Mon Nov 28 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.28.2-1
- update to https://github.com/containers/buildah/releases/tag/v1.28.2
- Related: #2123641
* Thu Oct 06 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.28.0-1
- update to https://github.com/containers/buildah/releases/tag/v1.28.0
- Related: #2123641
* Wed Sep 21 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.27.2-1
- update to https://github.com/containers/buildah/releases/tag/v1.27.2
- Related: #2123641
* Mon Sep 12 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.27.1-2
- drop applied patch
- Related: #2123641
* Mon Sep 12 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.27.1-1
- update to https://github.com/containers/buildah/releases/tag/v1.27.1
- Related: #2123641
* Fri Aug 26 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.27.0-2
- fix CVE-2022-2990
- Related: #2061390
* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.27.0-1
- update to https://github.com/containers/buildah/releases/tag/v1.27.0
- Related: #2061390
* Mon Aug 08 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.26.4-3
- add buildah-tutorial to test subpackage
- Related: #2061390
* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.26.4-1
- update to https://github.com/containers/buildah/releases/tag/v1.26.4
- Related: #2061390
* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.26.3-1
- update to https://github.com/containers/buildah/releases/tag/v1.26.3
- Related: #2061390
* Thu Jul 07 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.26.2-1
- update to https://github.com/containers/buildah/releases/tag/v1.26.2
- Related: #2061390
* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.26.1-2
- BuildRequires: /usr/bin/go-md2man
- Related: #2061390
* Thu May 05 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.26.1-1
- update to https://github.com/containers/buildah/releases/tag/v1.26.1
- Related: #2061390
* Thu May 05 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.25.1-3
- add dependencies to network stack
- Related: #2061390
* Fri Apr 08 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.25.1-2
- bump golang BR to 1.17.7
- Related: #2061390
* Thu Mar 31 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.25.1-1
- update to https://github.com/containers/buildah/releases/tag/v1.25.1
- Related: #2061390
* Wed Mar 30 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.25.0-1
- update to https://github.com/containers/buildah/releases/tag/v1.25.0
- Related: #2061390
* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.24.2-2 * Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.24.2-2
- Add patch to fix bash symtax for gating tests - Add patch to fix bash symtax for gating tests
- Upstream PR: https://github.com/containers/buildah/pull/3792 - Upstream PR: https://github.com/containers/buildah/pull/3792

View File

@ -1 +1 @@
SHA512 (buildah-1.24.2-ce608bc.tar.gz) = 68c1f398653b90c54c1e8064c16495bc1908ed9cdf80e4c4aa3d76de3c87cdc247c68b4c0cea6b165370711d72d66ec21dca31329ce3ca43763a44f3379d64c7 SHA1 (release-1.28-7e4d9dd.tar.gz) = 3ea477d2dd6aae7ae31516bcbf04da569f332488