Merge pull request #1195 from tjkirch/update-packages

Update packages
bottlerocket-os · Nov 5, 2020 · 210f123 · 210f123
2 parents 3398112 + 429ce2e
commit 210f123
Show file tree

Hide file tree

Showing 46 changed files with 80 additions and 307 deletions.
diff --git a/packages/aws-iam-authenticator/Cargo.toml b/packages/aws-iam-authenticator/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.1/aws-iam-authenticator-0.5.1.tar.gz"
-sha512 = "d2d3fb9eb800811f864b3fa3fa0f018bf382cc95339f57348df86917552a2d29203bec888cee0af34eee62562e754e1e01afd4d36a990ebeb98bbddda7b6ff07"
+url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.2/aws-iam-authenticator-0.5.2.tar.gz"
+sha512 = "a16a630096ed3223d156e1586f02ffcfcf256f12530ba565f5f1f649c83418cd71ea66c554c9e1edd1b44dd745d9393f4ed4c63c62677ae973e9bd9a1a24fe5b"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/aws-iam-authenticator/aws-iam-authenticator.spec b/packages/aws-iam-authenticator/aws-iam-authenticator.spec
@@ -2,7 +2,7 @@
 %global gorepo aws-iam-authenticator
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 0.5.1
+%global gover 0.5.2
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0

diff --git a/packages/ca-certificates/Cargo.toml b/packages/ca-certificates/Cargo.toml
@@ -9,5 +9,5 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://curl.haxx.se/ca/cacert-2020-07-22.pem"
-sha512 = "0d49bd1435a25b113a34ac38b337a9c904b6ac720824fd55d410ff6d8f6d0f637b54fd92cdff31d1c632b6a77f35fe55de9c756f35365387cea94f0fd93631b1"
+url = "https://curl.haxx.se/ca/cacert-2020-10-14.pem"
+sha512 = "f72d08913f2e1271a2f4bb1b77144bbea21fff28113074474f83d0a3bafc54cad69449bd98d6c228d78b409b6055a7efb341b75878724bd9d6a468dab20cf541"
diff --git a/packages/ca-certificates/ca-certificates.spec b/packages/ca-certificates/ca-certificates.spec
@@ -1,12 +1,12 @@
 Name: %{_cross_os}ca-certificates
-Version: 2020.07.22
+Version: 2020.10.14
 Release: 1%{?dist}
 Summary: CA certificates extracted from Mozilla
 License: MPL-2.0
 # Note: You can see changes here:
 # https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
 URL: https://curl.haxx.se/docs/caextract.html
-Source0: https://curl.haxx.se/ca/cacert-2020-07-22.pem
+Source0: https://curl.haxx.se/ca/cacert-2020-10-14.pem
 Source1: ca-certificates.conf
 
 %description

diff --git a/packages/chrony/0001-sys_linux-add-support-for-TCP-sockets.patch b/packages/chrony/0001-sys_linux-add-support-for-TCP-sockets.patch
diff --git a/packages/chrony/0002-sys_linux-allow-F_GETFL-in-seccomp-filter.patch b/packages/chrony/0002-sys_linux-allow-F_GETFL-in-seccomp-filter.patch
diff --git a/packages/chrony/0003-sys_linux-allow-clock_adjtime-in-seccomp-filter.patch b/packages/chrony/0003-sys_linux-allow-clock_adjtime-in-seccomp-filter.patch
diff --git a/packages/chrony/0004-sys_linux-allow-renameat2-in-seccomp-filter.patch b/packages/chrony/0004-sys_linux-allow-renameat2-in-seccomp-filter.patch
diff --git a/packages/chrony/Cargo.toml b/packages/chrony/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://download.tuxfamily.org/chrony/chrony-3.5.1.tar.gz"
-sha512 = "489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984"
+url = "https://download.tuxfamily.org/chrony/chrony-4.0.tar.gz"
+sha512 = "a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/chrony/chrony.spec b/packages/chrony/chrony.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}chrony
-Version: 3.5.1
+Version: 4.0
 Release: 1%{?dist}
 Summary: A versatile implementation of the Network Time Protocol
 License: GPL-2.0-only
@@ -17,19 +17,6 @@ BuildRequires: %{_cross_os}readline-devel
 Requires: %{_cross_os}libcap
 Requires: %{_cross_os}libseccomp
 
-# Patches taken from upstream
-
-# Update seccomp filter to work with glibc 2.31
-# Reworked version of
-# https://git.tuxfamily.org/chrony/chrony.git/patch/sys_linux.c?id=02ada36838e48942dd1ecd0513c3449fcf9135df
-Patch0: 0001-sys_linux-add-support-for-TCP-sockets.patch
-# https://git.tuxfamily.org/chrony/chrony.git/patch/sys_linux.c?id=429c4468b0058d9c2e2fffbf6660b0f1581af6af
-Patch1: 0002-sys_linux-allow-F_GETFL-in-seccomp-filter.patch
-# https://git.tuxfamily.org/chrony/chrony.git/patch/sys_linux.c?id=0cf506c92967c84f9ed83ba9e1be946a7fda6425
-Patch2: 0003-sys_linux-allow-clock_adjtime-in-seccomp-filter.patch
-# https://git.tuxfamily.org/chrony/chrony.git/patch/sys_linux.c?id=994409a03697b8df68115342dc8d1e7ceeeb40bd
-Patch3: 0004-sys_linux-allow-renameat2-in-seccomp-filter.patch
-
 %description
 %{summary}.
 

diff --git a/packages/cni-plugins/Cargo.toml b/packages/cni-plugins/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/containernetworking/plugins/archive/v0.8.6/plugins-0.8.6.tar.gz"
-sha512 = "8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8"
+url = "https://github.com/containernetworking/plugins/archive/v0.8.7/plugins-0.8.7.tar.gz"
+sha512 = "1b11b080b1f54a8a792b1048573d7d882603b76929f0c9343eeb2e010f97700c0deea4489faeb493a1aeac12557b6847b26784c378d0430c47de6bdaca6aa70f"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/cni-plugins/cni-plugins.spec b/packages/cni-plugins/cni-plugins.spec
@@ -2,7 +2,7 @@
 %global gorepo plugins
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 0.8.6
+%global gover 0.8.7
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0

diff --git a/packages/docker-cli/Cargo.toml b/packages/docker-cli/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/docker/cli/archive/v19.03.12/cli-19.03.12.tar.gz"
-sha512 = "3114ba5134d8606393c526d9d780cae4ca8584017c734a49250be43eb84ab9c716c30735d04b33a1ef47475b06b31f269f4a020ac1b6647b58504acb9fed8be6"
+url = "https://github.com/docker/cli/archive/v19.03.13/cli-19.03.13.tar.gz"
+sha512 = "738745548bcb416ccadefe1c340b3206b36efb3c222c310b853146f9fe0839bd879576d895bcc53f1f709850ef77888a9990742dd647b9f3cccaa05876a7c9d1"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/docker-cli/docker-cli.spec b/packages/docker-cli/docker-cli.spec
@@ -2,7 +2,7 @@
 %global gorepo cli
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 19.03.12
+%global gover 19.03.13
 %global rpmver %{gover}
 %global gitrev 0ed913b885c8919944a2e4c8d0b80a318a8dd48b
 

diff --git a/packages/docker-engine/Cargo.toml b/packages/docker-engine/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/docker/engine/archive/v19.03.12/engine-19.03.12.tar.gz"
-sha512 = "51632ca8cff03440e3b76ad3e7f06b9c6275c776f4c4f9dc88cd7f5aa9b8aa8cb16ce2b3702426cb93f3714265a6cd28d4ba31612db37199e2915821b9ee8fd4"
+url = "https://github.com/moby/moby/archive/v19.03.13/moby-19.03.13.tar.gz"
+sha512 = "b034ba2d00f944bc57f44858f95f4db5960930e2fb3efe41183ed88a6f29fcb60ea007b0b28705a00b467ba38da557654c5611c6ef6731361802936568879698"
 
 [[package.metadata.build-package.external-files]]
 path = "awslogs_update_aws-sdk-go_to_support_imdsv2.patch.bz2"

diff --git a/packages/docker-engine/docker-engine.spec b/packages/docker-engine/docker-engine.spec
@@ -1,27 +1,23 @@
-%global goproject github.com/docker
-%global gorepo engine
-%global goimport %{goproject}/%{gorepo}
+%global project moby
+%global repo github.com/moby/%{project}
+%global goorg github.com/docker
+%global goimport %{goorg}/docker
 
-# Docker's remote repository location does not match its canonical
-# import path, so we define macros for that as well.
-%global dorepo docker
-%global doimport %{goproject}/%{dorepo}
-
-%global gover 19.03.12
+%global gover 19.03.13
 %global rpmver %{gover}
 %global gitrev 9dc6525e6118a25fab2be322d1914740ea842495
 
 %global source_date_epoch 1363394400
 
 %global _dwz_low_mem_die_limit 0
 
-Name: %{_cross_os}docker-%{gorepo}
+Name: %{_cross_os}docker-engine
 Version: %{rpmver}
 Release: 1%{?dist}
 Summary: Docker engine
 License: Apache-2.0
-URL: https://%{goimport}
-Source0: https://%{goimport}/archive/v%{gover}/%{gorepo}-%{gover}.tar.gz
+URL: https://%{repo}
+Source0: https://%{repo}/archive/v%{gover}/%{project}-%{gover}.tar.gz
 Source1: docker.service
 Source2: docker.socket
 Source3: docker-sysusers.conf
@@ -49,11 +45,11 @@ Requires: %{_cross_os}systemd
 %{summary}.
 
 %prep
-%autosetup -Sgit -n %{gorepo}-%{gover} -p1
-%cross_go_setup %{gorepo}-%{gover} %{goproject} %{doimport}
+%autosetup -Sgit -n %{project}-%{gover} -p1
+%cross_go_setup %{project}-%{gover} %{goorg} %{goimport}
 
 %build
-%cross_go_configure %{doimport}
+%cross_go_configure %{goimport}
 BUILDTAGS="autogen journald selinux seccomp"
 BUILDTAGS+=" exclude_graphdriver_btrfs"
 BUILDTAGS+=" exclude_graphdriver_devicemapper"
@@ -66,7 +62,7 @@ export BUILDTIME=$(date -u -d "@%{source_date_epoch}" --rfc-3339 ns 2> /dev/null
 export PLATFORM="Docker Engine - Community"
 chmod +x ./hack/make/.go-autogen
 ./hack/make/.go-autogen
-go build -buildmode pie -tags="${BUILDTAGS}" -o dockerd %{doimport}/cmd/dockerd
+go build -buildmode pie -tags="${BUILDTAGS}" -o dockerd %{goimport}/cmd/dockerd
 
 %install
 install -d %{buildroot}%{_cross_bindir}

diff --git a/packages/docker-init/docker-init.spec b/packages/docker-init/docker-init.spec
@@ -3,7 +3,7 @@
 %global tiniver 0.19.0
 
 Name: %{_cross_os}docker-init
-Version: 18.09.9
+Version: 19.03.13
 Release: 1%{?dist}
 Summary: Init for containers
 License: MIT