From 1f5ddcd953b9560e163f8a67a1fac5e5813d504c Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 6 Nov 2020 00:52:29 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/slirp4netns.git#2941c069d0b116a3ffd4f985b8d27627cf97f14e --- .gitignore | 68 +++++++++++++++++++++++++++++++++++++++++++++++- README.md | 3 +++ slirp4netns.spec | 24 +++++++++++------ sources | 2 +- 4 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 README.md diff --git a/.gitignore b/.gitignore index f6a3a77..ddb8ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,67 @@ -/*.tar.gz +/slirp4netns-c4e1bc5.tar.gz +/slirp4netns-0037042.tar.gz +/slirp4netns-30883b5.tar.gz +/slirp4netns-4992082.tar.gz +/slirp4netns-4889f52.tar.gz +/slirp4netns-5c690f7.tar.gz +/slirp4netns-f34ad90.tar.gz +/slirp4netns-6612517.tar.gz +/slirp4netns-d34e916.tar.gz +/slirp4netns-2f857ec.tar.gz +/slirp4netns-bf199bb.tar.gz +/slirp4netns-62cbdd3.tar.gz +/slirp4netns-4f5a083.tar.gz +/slirp4netns-85efff0.tar.gz +/slirp4netns-87a4bf7.tar.gz +/slirp4netns-10c0ee5.tar.gz +/slirp4netns-d23723e.tar.gz +/slirp4netns-b911c9a.tar.gz +/slirp4netns-96ff33c.tar.gz +/slirp4netns-1dfc6f6.tar.gz +/slirp4netns-aacef69.tar.gz +/slirp4netns-ed51817.tar.gz +/slirp4netns-bbd6f25.tar.gz +/slirp4netns-56c8370.tar.gz +/slirp4netns-4e51172.tar.gz +/slirp4netns-29db6bd.tar.gz +/slirp4netns-1a96e26.tar.gz +/slirp4netns-d2e449b.tar.gz +/slirp4netns-f9503fe.tar.gz +/slirp4netns-e8759b9.tar.gz +/slirp4netns-3527c98.tar.gz +/slirp4netns-0186bac.tar.gz +/slirp4netns-21fdece.tar.gz +/slirp4netns-1fea75f.tar.gz +/slirp4netns-e14da48.tar.gz +/slirp4netns-dad442a.tar.gz +/slirp4netns-e6b31fe.tar.gz +/slirp4netns-a8414d1.tar.gz +/slirp4netns-7ba0c6f.tar.gz +/slirp4netns-7560ba4.tar.gz +/slirp4netns-735fcd7.tar.gz +/slirp4netns-38334c4.tar.gz +/slirp4netns-b797921.tar.gz +/slirp4netns-4353fab.tar.gz +/slirp4netns-cac9a34.tar.gz +/slirp4netns-c0fef8d.tar.gz +/slirp4netns-bdcd9a7.tar.gz +/slirp4netns-c48f4d7.tar.gz +/slirp4netns-4367de7.tar.gz +/slirp4netns-ce56e0c.tar.gz +/slirp4netns-3caa737.tar.gz +/slirp4netns-56941dd.tar.gz +/slirp4netns-c2c87b9.tar.gz +/slirp4netns-94bd97d.tar.gz +/slirp4netns-483e855.tar.gz +/slirp4netns-fcda5d9.tar.gz +/slirp4netns-a32a0d0.tar.gz +/slirp4netns-99e1516.tar.gz +/slirp4netns-dd4af4f.tar.gz +/slirp4netns-4a30e56.tar.gz +/slirp4netns-8bf8338.tar.gz +/slirp4netns-23ce219.tar.gz +/slirp4netns-4c6befe.tar.gz +/slirp4netns-6d002ad.tar.gz +/slirp4netns-eecccdb.tar.gz +/slirp4netns-6767922.tar.gz +/slirp4netns-13ac4c2.tar.gz diff --git a/README.md b/README.md new file mode 100644 index 0000000..817070b --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# slirp4netns + +The slirp4netns package \ No newline at end of file diff --git a/slirp4netns.spec b/slirp4netns.spec index a86f3f2..b55a62e 100644 --- a/slirp4netns.spec +++ b/slirp4netns.spec @@ -1,12 +1,20 @@ %global git0 https://github.com/rootless-containers/%{name} +%global commit0 13ac4c2bed387384fcf0c01d1877913cbd110d0f +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%global built_tag v1.0.0 Name: slirp4netns -Version: 1.1.4 -Release: 8%{?dist} +Version: 1.1.6 +Release: 2.dev.git%{shortcommit0}%{?dist} +# no go-md2man in ppc64 +ExcludeArch: ppc64 Summary: slirp for network namespaces License: GPLv2 URL: %{git0} -Source0: %{git0}/archive/v%{version}.tar.gz +Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc @@ -15,8 +23,8 @@ BuildRequires: git BuildRequires: go-md2man BuildRequires: libcap-devel BuildRequires: libseccomp-devel -BuildRequires: make BuildRequires: libslirp-devel +BuildRequires: make %description slirp for network namespaces, without copying buffers across the namespaces. @@ -33,10 +41,9 @@ building other packages which use import path with %{import_path} prefix. %prep -%autosetup -Sgit +%autosetup -Sgit -n %{name}-%{commit0} %build -export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ./autogen.sh ./configure --prefix=%{_usr} --libdir=%{_libdir} %{__make} generate-man @@ -56,8 +63,9 @@ make DESTDIR=%{buildroot} install install-man %{_mandir}/man1/%{name}.1.gz %changelog -* Thu Oct 29 2020 Jindrich Novy - 1.1.4-8 -- synchronize with stream-container-tools-rhel8 +* Thu Nov 5 2020 RH Container Bot - 1.1.6-2.dev.git13ac4c2 +- bump to 1.1.6 +- autobuilt 13ac4c2 * Sat Oct 3 2020 RH Container Bot - 1.1.4-7.dev.git6767922 - autobuilt 6767922 diff --git a/sources b/sources index 9588193..b76ca0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7bfd1c1812b1f93d8a95356af3eeb0b v1.1.4.tar.gz +SHA512 (slirp4netns-13ac4c2.tar.gz) = 3eccfd18e325678ef1f975dc41c4b1d37ce56aa192d0dee7f9acdfd618ed92a2faf550dcbff19306efaa3d5ccfd2a48e785c3e3eb63c12b98c952cf11e1e9fd9