diff --git a/runc-1.0.0-rc8.tar.xz b/runc-1.0.0-rc8.tar.xz deleted file mode 100644 index aa2af22..0000000 --- a/runc-1.0.0-rc8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d46f01bca203ae226f107f8e3351211f492d43038af19b8337acffab6c4f576 -size 605828 diff --git a/runc-1.0.0-rc8.tar.xz.asc b/runc-1.0.0-rc8.tar.xz.asc deleted file mode 100644 index 1a77cdd..0000000 --- a/runc-1.0.0-rc8.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJDBAABCAAtFiEEXzbGxhtUYBJKdfWmnhiqJn3bjbQFAlzBCX4PHGFzYXJhaUBz -dXNlLmRlAAoJEJ4YqiZ924203EoP+gMcVwgZr/vTP919zc3Ct2g/jy6PVJ8mwAjY -tyKF3CBBoz4HQZpzPxWrH/eVN0118/7SK2klOqvP/bE18H2Fy3aclaO4Kfv4YfK7 -UV8ejLPCxOzxcb/ZHn0sOStqFRVnnlR1OnCyzM2rd0Jy+w1GelHUSNLGrriPkXA/ -QfR7MEqtITnHmyHvgORdfe/aRzErqXaHvtTQp5spqKF4SGPb+5Dsio1A/cZWiQy6 -XqdD0i5qkzthKkyarxuPuW9FbnLigCYyuJQfJg2sxa32fbQdO23M0FH1s2hTtmDF -CTmKF4SUpBvGe7EIoX5Jo7+NZK9msi2gnYTPNDHpgvMpB9nbAXERZpi2IrAmUA1F -c5CwgNOx7nGEy1MYloesYApAQA/lVEnEpmU1mUnNCSM7SjUgOW6bPmPMlww9jcis -N1qGvQLCMI2TBd3JD89us0qsS0YN5u8KiaXPyW9WKqSEdZliMMPEkf3d7pzyU5un -EFybWwMVgbNDuj1++KOjTQFHT2g1AhCzkqoqP4aB9g6vgHpO4ThUxTcMVmDGXleB -FYqSgYNwP5D8NaWj+PcbBExQyqxs6geygRTcbO+r+F0yNyGPet2I/1zDRe7r48TC -G9BGtNqRkBklieOSmP9zFZG9EWltzoSxy9MsThTSCMEWrt5nuDzVflk8uhYVnYTq -E9Hb2HPf -=ZrUD ------END PGP SIGNATURE----- diff --git a/runc-1.0.0-rc9.tar.xz b/runc-1.0.0-rc9.tar.xz new file mode 100644 index 0000000..081bbe4 --- /dev/null +++ b/runc-1.0.0-rc9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f1c7ebac67c779affe2bb4370bba44b08ed280144ba58c86219186e303832ba +size 711184 diff --git a/runc-1.0.0-rc9.tar.xz.asc b/runc-1.0.0-rc9.tar.xz.asc new file mode 100644 index 0000000..26eb25b --- /dev/null +++ b/runc-1.0.0-rc9.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJDBAABCAAtFiEEXzbGxhtUYBJKdfWmnhiqJn3bjbQFAl2SMNUPHGFzYXJhaUBz +dXNlLmRlAAoJEJ4YqiZ92420L3MP/jX4BABEWVD2oF5PsqB9MadkngQ85ZfJPr8w +0g9UcangIIJsx8vSt22qQbWMcyZH5rZ89NPIs6+xoRhRVJWA1ByPJpGnx+/7p25z +S5hCe753rs51MczvYbRLlWCl4BuHeXsJb+FHvUI70G8WyZNZuS+4bdJTpWWTL8u4 +P/9MTvKWsVp5BdI4k3h/OXD1i4GT/9nZFCKG9wfuBWGwp5po8/Izi+tZ0ZN9RZMG +Lz2YaS/Z5cP+OSKepyCXXzlhx0+eeQ5NrjK/DQirwA4jzR1NAVKJd6npJSglra6q +3FGDdNGf+Kod3IaCStnRaZU/gHjJLIWO6rtAQy2aZDB73eHcqG3B9xoPRuWSLzdY +uJO2xdh/wI69md2qtxBnP2EGZi2y7s5sp2FHbYV8gkBluynak6Ig3WAaewHm9mx1 +NpwIV+YuSoSwb+s+jxGg1y3pV6UaeraYYy1G3Zv+94vj7fIfRpmtRyjhhKU38sOp +6jjIGLEnXof7tij09sIwZAdRugJUP8aT6xA05/JAo+kT2ooXEAYC3P5OMUhULX7k +LIflH3Znq/ZFKBH8kKxghQ+Iwy5yzfGiCJd2lWfZ631L5md6WSPtTFabcGhgOc43 +CrF5bU0bkgokyNLqc7y80ou0uGyC3c5f4SB7cf/Jq6Jvo4EgTLWAzYBY5bTZ1zv6 +xl2XtUcX +=Aezk +-----END PGP SIGNATURE----- diff --git a/runc-rpmlintrc b/runc-rpmlintrc new file mode 100644 index 0000000..ca46b2b --- /dev/null +++ b/runc-rpmlintrc @@ -0,0 +1,2 @@ +# -test is something that is used internally and isn't actually shipped -- it's a pseudo-source package. +addFilter ("^runc(-kubic)?-test.*") diff --git a/runc.changes b/runc.changes index 6f47841..e112ae2 100644 --- a/runc.changes +++ b/runc.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Oct 5 11:40:13 UTC 2019 - Aleksa Sarai + +- Upgrade to runc v1.0.0~rc9. Upstream changelog is available from + https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc9 +- Remove upstreamed patches: + - CVE-2019-16884.patch + +------------------------------------------------------------------- +Thu Sep 26 14:54:07 UTC 2019 - Aleksa Sarai + +- Add backported fix for CVE-2019-16884. bsc#1152308 + + CVE-2019-16884.patch +- Add runc-rpmlintrc to drop runc-test rpmlint warnings. + ------------------------------------------------------------------- Mon Apr 29 11:56:21 UTC 2019 - Aleksa Sarai diff --git a/runc.spec b/runc.spec index c210651..5e7cbc2 100644 --- a/runc.spec +++ b/runc.spec @@ -24,7 +24,7 @@ # Package-wide golang version %define go_version 1.10 %define go_tool go -%define _version 1.0.0-rc8 +%define _version 1.0.0-rc9 %define project github.com/opencontainers/runc # enable libseccomp for sle >= sle12sp2 @@ -41,7 +41,7 @@ %endif Name: runc -Version: 1.0.0~rc8 +Version: 1.0.0~rc9 Release: 0 Summary: Tool for spawning and running OCI containers License: Apache-2.0 @@ -50,6 +50,7 @@ Url: https://github.com/opencontainers/runc Source0: https://github.com/opencontainers/runc/releases/download/v%{_version}/runc.tar.xz#/runc-%{_version}.tar.xz Source1: https://github.com/opencontainers/runc/releases/download/v%{_version}/runc.tar.xz.asc#/runc-%{_version}.tar.xz.asc Source2: runc.keyring +Source3: runc-rpmlintrc BuildRequires: fdupes BuildRequires: go-go-md2man BuildRequires: golang(API) = %{go_version} @@ -90,9 +91,9 @@ Test package for runc. It contains the source code and the tests. # some point during the build and you need to directly use go list directly it # will get confused by symlinks. export GOPATH=${HOME}/go -mkdir -pv $HOME/go/src/%project +mkdir -p $HOME/go/src/%project rm -rf $HOME/go/src/%project/* -cp -av * $HOME/go/src/%project +cp -a * $HOME/go/src/%project # Additionally enable seccomp. %if 0%{?with_libseccomp} @@ -113,7 +114,7 @@ EOF source ./.runc_build_env # Build runc. -make -C "$HOME/go/src/%project" EXTRA_FLAGS="-x $BUILDFLAGS" BUILDTAGS="$BUILDTAGS" COMMIT_NO="%{git_version}" runc +make -C "$HOME/go/src/%project" EXTRA_FLAGS="$BUILDFLAGS" BUILDTAGS="$BUILDTAGS" COMMIT_NO="%{git_version}" runc mv "$HOME/go/src/%project/runc" %{name}-%{version} # Build man pages, this can only be done on arches where we can build go-md2man.