bottlerocket-os · tjkirch · Dec 19, 2019 · Dec 18, 2019
diff --git a/packages/Cargo.lock b/packages/Cargo.lock
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-2019-08-28.pem"
-sha512 = "527e23d1e83381583cc2efe4625b01a00baa990afc877bb617727e8bffab17a0dc4f36b60162bad375b576ff09bc27acc7e0f095a34150f23d61825b8a7fb81f"
+url = "https://curl.haxx.se/ca/cacert-2019-11-27.pem"
+sha512 = "66816e077ee99ceb9535a472e6bbf4f0e48ca838099c8a97c7baf3297fcada9a43016ea1ded63a455ee56a8f18501417a0f744fc17b215bb599cafd76b754518"
diff --git a/packages/ca-certificates/ca-certificates.spec b/packages/ca-certificates/ca-certificates.spec
@@ -1,10 +1,12 @@
 Name: %{_cross_os}ca-certificates
-Version: 2019.08.28
+Version: 2019.11.27
 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-2019-08-28.pem
+Source0: https://curl.haxx.se/ca/cacert-2019-11-27.pem
 Source1: ca-certificates.conf
 
 %description

diff --git a/packages/chrony/Cargo.toml b/packages/chrony/Cargo.toml
@@ -15,5 +15,6 @@ sha512 = "c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b0
 [build-dependencies]
 glibc = { path = "../glibc" }
 libcap = { path = "../libcap" }
+libseccomp = { path = "../libseccomp" }
 ncurses = { path = "../ncurses" }
 readline = { path = "../readline" }
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.2/plugins-0.8.2.tar.gz"
-sha512 = "383540232593c7ef8c28f83e660a58ae6dd2592c6d97a43c8fc1f046a3fa448911d4066ec0a6a7d7e770a1a2dceee7c31d742100b0871e07d691fe6bdffd42f9"
+url = "https://github.com/containernetworking/plugins/archive/v0.8.3/plugins-0.8.3.tar.gz"
+sha512 = "054479a73ddbfbdb2986ac202ae2da7a69ae7bb693a250885f950a26973c60be3053d4e95ca24cf5eb67c104b9af8231f859e22c01a066ce3a206a186fc55a6d"
 
 [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.2
+%global gover 0.8.3
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0

diff --git a/packages/containerd/Cargo.toml b/packages/containerd/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/containerd/containerd/archive/v1.3.0/containerd-1.3.0.tar.gz"
-sha512 = "cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1"
+url = "https://github.com/containerd/containerd/archive/v1.3.2/containerd-1.3.2.tar.gz"
+sha512 = "768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/containerd/containerd.spec b/packages/containerd/containerd.spec
@@ -2,7 +2,7 @@
 %global gorepo containerd
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 1.3.0
+%global gover 1.3.2
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0

diff --git a/packages/coreutils/Cargo.toml b/packages/coreutils/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://ftp.gnu.org/gnu/coreutils/coreutils-8.30.tar.xz"
-sha512 = "25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda"
+url = "https://ftp.gnu.org/gnu/coreutils/coreutils-8.31.tar.xz"
+sha512 = "ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/coreutils/coreutils.spec b/packages/coreutils/coreutils.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}coreutils
-Version: 8.30
+Version: 8.31
 Release: 1%{?dist}
 Summary: A set of basic GNU tools
 License: GPLv3+
@@ -44,6 +44,7 @@ Requires: %{_cross_os}libxcrypt
 %{_cross_bindir}/base32
 %{_cross_bindir}/base64
 %{_cross_bindir}/basename
+%{_cross_bindir}/basenc
 %{_cross_bindir}/cat
 %{_cross_bindir}/chcon
 %{_cross_bindir}/chgrp

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/v18.09.6/cli-18.09.6.tar.gz"
-sha512 = "c2621391c3848cf348f7a719e72c07cb4c7e7d20ba3529a0ec188270b02d6b0e1fdea47b6a61a09228e98f1ebbe0f36e789821ff06dcd30cb17a9c4541b3d444"
+url = "https://github.com/docker/cli/archive/v18.09.9/cli-18.09.9.tar.gz"
+sha512 = "bc06dbbe8da1d9eaab509eadb6d6af3b2a603176c5c6b8432641dc0f2843a90f14b16455331540c30fd9b0039cc7936c334da3bdc957afebcf0b5a4caf312b7e"
 
 [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 18.09.6
+%global gover 18.09.9
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0

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/v18.09.6/engine-18.09.6.tar.gz"
-sha512 = "3ad016432b892fb9438fcb0b9218cd73fc720255c59cbcccd2f16b9325d5a1e848f115f67fc4131f1f659d98e1f93bf0a8cc3a49081a530dbb134dedee916bf8"
+url = "https://github.com/docker/engine/archive/v18.09.9/engine-18.09.9.tar.gz"
+sha512 = "070700e5b9dac439fd494ae52824ebbd0a8dbc4bf0351c4173c47f585ab81a0fb39470c4d566a7dc69481b03e04f073727062872d2550505ae67a5d1bb30132e"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/docker-engine/docker-engine.spec b/packages/docker-engine/docker-engine.spec
@@ -7,7 +7,7 @@
 %global dorepo docker
 %global doimport %{goproject}/%{dorepo}
 
-%global gover 18.09.6
+%global gover 18.09.9
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0

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

diff --git a/packages/docker-proxy/Cargo.toml b/packages/docker-proxy/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/docker/libnetwork/archive/872f0a83c98add6cae255c8859e29532febc0039/libnetwork-872f0a83c98add6cae255c8859e29532febc0039.tar.gz"
-sha512 = "c8e8544a3d8d44dc0f309aa3520a2cf62cee374a06d40473542078de94d88cb484c0dca1cee7ad89fb312c969af1694c848f464d04d61df5a9888058e21a485e"
+url = "https://github.com/docker/libnetwork/archive/48722da498b202dfed2eb4299dfcfbdf8b75392d/libnetwork-48722da498b202dfed2eb4299dfcfbdf8b75392d.tar.gz"
+sha512 = "58801dadbd70fc4df8f41d605f5721d93c562414241ac632f40e35a04163c3761904f5e917d3e078bf2a46fb873d918b5c31321c319b6db23d437e5875b49c54"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/docker-proxy/docker-proxy.spec b/packages/docker-proxy/docker-proxy.spec
@@ -1,12 +1,12 @@
 %global goproject github.com/docker
 %global gorepo libnetwork
 %global goimport %{goproject}/%{gorepo}
-%global commit 872f0a83c98add6cae255c8859e29532febc0039
+%global commit 48722da498b202dfed2eb4299dfcfbdf8b75392d
 
 %global _dwz_low_mem_die_limit 0
 
 Name: %{_cross_os}docker-proxy
-Version: 18.09.6
+Version: 18.09.9
 Release: 1%{?dist}
 Summary: Docker CLI
 License: ASL 2.0

diff --git a/packages/iptables/0002-extensions-format-security-fixes-in-libip-6-t_icmp.patch b/packages/iptables/0002-extensions-format-security-fixes-in-libip-6-t_icmp.patch
diff --git a/packages/iptables/Cargo.toml b/packages/iptables/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "http://www.netfilter.org/projects/iptables/files/iptables-1.8.2.tar.bz2"
-sha512 = "8cf0f515764e1dc6e03284581d682d1949b33e8f25fea29c27ae856f1089fe8ca7b1814524b85f4378fd1fc7c7c7d002f06557b257ae2bbc945f8555bad0dc76"
+url = "http://www.netfilter.org/projects/iptables/files/iptables-1.8.4.tar.bz2"
+sha512 = "a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/iptables/iptables.spec b/packages/iptables/iptables.spec
@@ -1,12 +1,11 @@
 Name: %{_cross_os}iptables
-Version: 1.8.2
+Version: 1.8.4
 Release: 1%{?dist}
 Summary: Tools for managing Linux kernel packet filtering capabilities
 License: GPLv2
 URL: http://www.netfilter.org/
 Source0: http://www.netfilter.org/projects/iptables/files/iptables-%{version}.tar.bz2
 Patch1: 0001-iptables-apply-Use-mktemp-instead-of-tempfile.patch
-Patch2: 0002-extensions-format-security-fixes-in-libip-6-t_icmp.patch
 
 BuildRequires: %{_cross_os}glibc-devel
 BuildRequires: %{_cross_os}libmnl-devel

diff --git a/packages/kubernetes/Cargo.toml b/packages/kubernetes/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/kubernetes/kubernetes/archive/v1.14.6/kubernetes-1.14.6.tar.gz"
-sha512 = "b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f"
+url = "https://github.com/kubernetes/kubernetes/archive/v1.14.10/kubernetes-1.14.10.tar.gz"
+sha512 = "25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/kubernetes/kubernetes.spec b/packages/kubernetes/kubernetes.spec
@@ -2,7 +2,7 @@
 %global gorepo kubernetes
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 1.14.6
+%global gover 1.14.10
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0

diff --git a/packages/libcap/9001-dont-test-during-install.patch b/packages/libcap/9001-dont-test-during-install.patch
@@ -0,0 +1,11 @@
+diff -ru libcap-2.28.orig/Makefile libcap-2.28/Makefile
+--- libcap-2.28.orig/Makefile	2019-12-07 11:45:11.000000000 -0800
++++ libcap-2.28/Makefile	2019-12-18 14:14:17.985096354 -0800
+@@ -16,7 +16,6 @@
+ ifeq ($(GOLANG),yes)
+ 	$(MAKE) -C go $@
+ endif
+-	$(MAKE) -C tests $@
+ 	$(MAKE) -C progs $@
+ 	$(MAKE) -C doc $@
+ 	$(MAKE) -C kdebug $@
diff --git a/packages/libcap/Cargo.toml b/packages/libcap/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.26.tar.gz"
-sha512 = "4a0bfbc1c3efb009a309d9b894aa553009a229323da4780caa424bd70d0579d6b156e2034bc4dee8dc3b2caaf8617a18c74a01095a4c2a8fbe732e5e8a304603"
+url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.28.tar.gz"
+sha512 = "eb89d3a4da986790d3679195f00dd907370e109acea65c19d60ea5ae5916a138370121b154cc7261a1ed4d403bfead002cfa160bf8f3473564c5f4c5f7ce6df9"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/libcap/libcap.spec b/packages/libcap/libcap.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}libcap
-Version: 2.26
+Version: 2.28
 Release: 1%{?dist}
 Summary: Library for getting and setting POSIX.1e capabilities
 License: GPLv2
@@ -10,6 +10,9 @@ BuildRequires: %{_cross_os}glibc-devel
 BuildRequires: %{_cross_os}libattr-devel
 Requires: %{_cross_os}libattr
 
+# Local changes.
+Patch9001: 9001-dont-test-during-install.patch
+
 %description
 %{summary}.
 

diff --git a/packages/libexpat/Cargo.toml b/packages/libexpat/Cargo.toml
@@ -9,9 +9,9 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-path = "expat-2.2.6.tar.gz"
-url = "https://github.com/libexpat/libexpat/archive/R_2_2_6.tar.gz#/expat-2.2.6.tar.gz"
-sha512 = "727fbd24041c9af71b32353448583a6d8b38ddf93b10c97510e847939c2ad2be9b40ff6e6e27b725bff277982c2fc96c75f19c4a3ac4a246133eb62870c963d8"
+path = "expat-2.2.9.tar.gz"
+url = "https://github.com/libexpat/libexpat/archive/R_2_2_9.tar.gz#/expat-2.2.9.tar.gz"
+sha512 = "e274fa7f30630450cb3ca681b266d765dbb7f5d00d1275ff9d9b2e2f6e1095893b8af4e3f4172ae6297c7a8a831a0a6becd484fe4bcdca09c37922f630780ef0"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/libexpat/libexpat.spec b/packages/libexpat/libexpat.spec
@@ -1,4 +1,4 @@
-%global unversion 2_2_6
+%global unversion 2_2_9
 
 Name: %{_cross_os}libexpat
 Version: %(echo %{unversion} | sed 's/_/./g')

diff --git a/packages/libnetfilter_queue/Cargo.toml b/packages/libnetfilter_queue/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.2.tar.bz2"
-sha512 = "89fec4d943b85f35e7cef3b1b9071b1280c6e1b282b7e5cb97eb17d05b9ddd175194639ead986767d27152540fe8e167383a1f7bbfe3cdf874a5a42a2c096f11"
+url = "https://netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.3.tar.bz2"
+sha512 = "1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/libnetfilter_queue/libnetfilter_queue.spec b/packages/libnetfilter_queue/libnetfilter_queue.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}libnetfilter_queue
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?dist}
 Summary: Library for netfilter queue
 License: GPLv2
@@ -32,7 +32,6 @@ Requires: %{name}
 
 %install
 %make_install
-rm %{buildroot}%{_cross_includedir}/internal.h
 
 %files
 %{_cross_libdir}/*.so.*

diff --git a/packages/libnftnl/Cargo.toml b/packages/libnftnl/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "http://netfilter.org/projects/libnftnl/files/libnftnl-1.1.3.tar.bz2"
-sha512 = "3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe"
+url = "http://netfilter.org/projects/libnftnl/files/libnftnl-1.1.5.tar.bz2"
+sha512 = "a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/libnftnl/libnftnl.spec b/packages/libnftnl/libnftnl.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}libnftnl
-Version: 1.1.3
+Version: 1.1.5
 Release: 1%{?dist}
 Summary: Library for nftables netlink
 License: GPLv2+

diff --git a/packages/libnl/Cargo.toml b/packages/libnl/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/thom311/libnl/archive/libnl3_4_0.tar.gz"
-sha512 = "f7fa6987130b58e4a9cbe5401333a94eec4069324b760bb3a58b0dca74a767e5289e43bcf1ee78ea43a3c9d44a27d3c0e1db5d97c8c208ee2be3ecd9080b269c"
+url = "https://github.com/thom311/libnl/archive/libnl3_5_0.tar.gz"
+sha512 = "2b762419a21b4560f7d488791a9d7aec0d1c6eac0cd2839ceec0bef5562f130ce44b826691276e1301b9e239f684063037959207474cefec4b46efc32039615d"
 
 [build-dependencies]
 glibc = { path = "../glibc" }