Skip to content

Commit

Permalink
Merge pull request #1018 from tjkirch/package-updates
Browse files Browse the repository at this point in the history
Package updates
  • Loading branch information
tjkirch authored Aug 10, 2020
2 parents 22fe9f9 + 9296494 commit 1fda186
Show file tree
Hide file tree
Showing 46 changed files with 241 additions and 158 deletions.
4 changes: 2 additions & 2 deletions packages/aws-iam-authenticator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0/aws-iam-authenticator-0.5.0.tar.gz"
sha512 = "abe725b61e8c645ceabad28804c2687def541e6f6beb305fd49b624ab150b9c4a2dad169958ea13ae7d42cf417a6627a1459702d5451f34139a2b5f70c46d37a"
url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.1/aws-iam-authenticator-0.5.1.tar.gz"
sha512 = "d2d3fb9eb800811f864b3fa3fa0f018bf382cc95339f57348df86917552a2d29203bec888cee0af34eee62562e754e1e01afd4d36a990ebeb98bbddda7b6ff07"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/aws-iam-authenticator/aws-iam-authenticator.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo aws-iam-authenticator
%global goimport %{goproject}/%{gorepo}

%global gover 0.5.0
%global gover 0.5.1
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down
4 changes: 2 additions & 2 deletions packages/ca-certificates/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://curl.haxx.se/ca/cacert-2020-01-01.pem"
sha512 = "cc129ae1a4377a43a74b0854b6eccb2b315cdfce018142d1dd5524fb64c8945cde067cb18f366351fa7d6af3f9f36cf21bc1f626f987f9e4627878472ea59cde"
url = "https://curl.haxx.se/ca/cacert-2020-07-22.pem"
sha512 = "0d49bd1435a25b113a34ac38b337a9c904b6ac720824fd55d410ff6d8f6d0f637b54fd92cdff31d1c632b6a77f35fe55de9c756f35365387cea94f0fd93631b1"
4 changes: 2 additions & 2 deletions packages/ca-certificates/ca-certificates.spec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Name: %{_cross_os}ca-certificates
Version: 2020.01.01
Version: 2020.07.22
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-01-01.pem
Source0: https://curl.haxx.se/ca/cacert-2020-07-22.pem
Source1: ca-certificates.conf

%description
Expand Down
4 changes: 2 additions & 2 deletions packages/cni-plugins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5/plugins-0.8.5.tar.gz"
sha512 = "e404ef69da189e2cc3e77ae1054fbea5232086066f2963d1ec824f63c02aede020ad8600d821ec47ae695043bd2c4a176d9e02b9a059024ff3a2fbeee9cb797a"
url = "https://github.com/containernetworking/plugins/archive/v0.8.6/plugins-0.8.6.tar.gz"
sha512 = "8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/cni-plugins/cni-plugins.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo plugins
%global goimport %{goproject}/%{gorepo}

%global gover 0.8.5
%global gover 0.8.6
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down
4 changes: 2 additions & 2 deletions packages/cni/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/containernetworking/cni/archive/v0.7.1/cni-0.7.1.tar.gz"
sha512 = "ca97ad8cd693a50c7c793266e23c2c38c4cb6917dc38c68f88921f48daf437375aa2d347eba70c8dc4e08ba6e6f008e0164282029fa36aab98417e763eb29285"
url = "https://github.com/containernetworking/cni/archive/v0.8.0/cni-0.8.0.tar.gz"
sha512 = "2b0baa5be5a8b4b886c821fb03d8a186b30afd1165d6c9ea6b876a0e93a5f54375ea5cf774dbdfcc648bab05ca368add59cea2c0e1c7a7f4f4bbb9634fed6280"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/cni/cni.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo cni
%global goimport %{goproject}/%{gorepo}

%global gover 0.7.1
%global gover 0.8.0
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down
4 changes: 2 additions & 2 deletions packages/containerd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/containerd-1.3.4.tar.gz"
sha512 = "b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa"
url = "https://github.com/containerd/containerd/archive/v1.3.7/containerd-1.3.7.tar.gz"
sha512 = "dab23d75b3c7cb5aa766f7424d0b1d2a3e316b926ad58426d062fb6d24a998df96ceb1d92bacceee93ff908ee22401e4bb7730cf9674c81766927858c106ba76"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
2 changes: 1 addition & 1 deletion packages/containerd/containerd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo containerd
%global goimport %{goproject}/%{gorepo}

%global gover 1.3.4
%global gover 1.3.7
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down
4 changes: 2 additions & 2 deletions packages/dbus-broker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/bus1/dbus-broker/releases/download/v22/dbus-broker-22.tar.xz"
sha512 = "70a6b75f428f141dab90d7e1fa6a667ee8783f570a8ae481bca78edcfcb3b6199d7ea220d2867fbc358d3fcb002a63a1ac3d918211e6f4f30b2aee92a88746eb"
url = "https://github.com/bus1/dbus-broker/releases/download/v23/dbus-broker-23.tar.xz"
sha512 = "b9431a9733342d4b6214a6a35ad05d3278ab2c8cfdc35537dba86ba9ee3f59eef4e31687c2fe8a6444072eaf8384bc71a41617fec0539a8c00be9eae0efa9832"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
2 changes: 1 addition & 1 deletion packages/dbus-broker/dbus-broker.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}dbus-broker
Version: 22
Version: 23
Release: 1%{?dist}
Summary: D-BUS message broker
License: Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions packages/docker-init/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/krallin/tini/archive/v0.18.0/tini-0.18.0.tar.gz"
sha512 = "83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1"
url = "https://github.com/krallin/tini/archive/v0.19.0/tini-0.19.0.tar.gz"
sha512 = "1fa85b56e2c6085ea474f251928e7a40510d92aeef60b3c145b0496969c1b5df86835d143cb91ef5b4bf4da63fa8a56947cc39a4276e4b72faa57276d432b292"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/docker-init/docker-init.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global debug_package %{nil}

%global tiniver 0.18.0
%global tiniver 0.19.0

Name: %{_cross_os}docker-init
Version: 18.09.9
Expand Down
4 changes: 2 additions & 2 deletions packages/iproute/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "http://kernel.org/pub/linux/utils/net/iproute2/iproute2-5.4.0.tar.xz"
sha512 = "26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051"
url = "http://kernel.org/pub/linux/utils/net/iproute2/iproute2-5.7.0.tar.xz"
sha512 = "d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
2 changes: 1 addition & 1 deletion packages/iproute/iproute.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}iproute
Version: 5.4.0
Version: 5.7.0
Release: 1%{?dist}
Summary: Tools for advanced IP routing and network device configuration
License: GPL-2.0-or-later AND GPL-2.0-only
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions packages/iptables/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.tar.bz2"
sha512 = "a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb"
url = "http://www.netfilter.org/projects/iptables/files/iptables-1.8.5.tar.bz2"
sha512 = "6a6baa541bb7aa331b176e0a91894e0766859814b59e77c71351ac34d6ebd337487981db48c70e476a48c67bcf891cfc663221a7582feb1496ad1df56eb28da8"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
4 changes: 2 additions & 2 deletions packages/iptables/iptables.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
Name: %{_cross_os}iptables
Version: 1.8.4
Version: 1.8.5
Release: 1%{?dist}
Summary: Tools for managing Linux kernel packet filtering capabilities
License: GPL-2.0-or-later AND GPL-2.0-only
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

BuildRequires: %{_cross_os}glibc-devel
BuildRequires: %{_cross_os}libmnl-devel
Expand Down Expand Up @@ -72,6 +71,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%{_cross_libdir}/xtables/*.so
%exclude %{_cross_mandir}/*
%exclude %{_cross_datadir}/xtables/pf.os
%exclude %{_cross_sbindir}/ip6tables-apply
%exclude %{_cross_sbindir}/nfnl_osf

%files devel
Expand Down
4 changes: 2 additions & 2 deletions packages/kernel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ path = "pkg.rs"

[[package.metadata.build-package.external-files]]
# Use latest-srpm-url.sh to get this.
url = "https://cdn.amazonlinux.com/blobstore/92ec64be321f67c52afa1eb77b3c301b082c2850ae3d45609bf4802cd6a20400/kernel-5.4.46-19.75.amzn2.src.rpm"
sha512 = "0ebc6e27448513ffc40d295f8a844d367a345ed242e19c862b1290bec895100dd220526c9f3b274bc75399b35c03c69356ce508872669c1d155dd47a91981cbe"
url = "https://cdn.amazonlinux.com/blobstore/9e3beaecef0b030d83fb215be7ca67c01009cfec52fe9b12eb4b24fdb46eebce/kernel-5.4.50-25.83.amzn2.src.rpm"
sha512 = "edc81ee7acdb9f34da2ca1a9ecef42a8c8daab01b7bc0fb130c04d53278091856fa9c65b740f41839a5d65b374f6953d553e6076c94aea578469ef0181014a76"
4 changes: 2 additions & 2 deletions packages/kernel/kernel.spec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%global debug_package %{nil}

Name: %{_cross_os}kernel
Version: 5.4.46
Version: 5.4.50
Release: 1%{?dist}
Summary: The Linux kernel
License: GPL-2.0 WITH Linux-syscall-note
URL: https://www.kernel.org/
# Use latest-srpm-url.sh to get this.
Source0: https://cdn.amazonlinux.com/blobstore/92ec64be321f67c52afa1eb77b3c301b082c2850ae3d45609bf4802cd6a20400/kernel-5.4.46-19.75.amzn2.src.rpm
Source0: https://cdn.amazonlinux.com/blobstore/9e3beaecef0b030d83fb215be7ca67c01009cfec52fe9b12eb4b24fdb46eebce/kernel-5.4.50-25.83.amzn2.src.rpm
Source100: config-bottlerocket
Patch0001: 0001-lustrefsx-Disable-Werror-stringop-overflow.patch
BuildRequires: bc
Expand Down
Loading

0 comments on commit 1fda186

Please sign in to comment.