Merge pull request #895 from etungsten/package-updates

Third-party software package version bumps
bottlerocket-os · Apr 9, 2020 · 892c0d2 · 892c0d2
2 parents a50b273 + 403bdea
commit 892c0d2
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 111 deletions.
diff --git a/packages/conntrack-tools/0001-disable-RPC-helper.patch b/packages/conntrack-tools/0001-disable-RPC-helper.patch
@@ -11,11 +11,25 @@ to avoid for now since we have no other need for it.
 
 Signed-off-by: Ben Cressey <[email protected]>
 ---
+ configure.ac            | 2 --
  src/helpers/Makefile.am | 5 -----
- 1 file changed, 5 deletions(-)
+ 2 files changed, 7 deletions(-)
 
+diff --git a/configure.ac b/configure.ac
+index d0565be..a417691 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,8 +50,6 @@ AC_ARG_ENABLE([systemd],
+         AS_HELP_STRING([--enable-systemd], [Build systemd support]),
+         [enable_systemd="$enableval"], [enable_systemd="no"])
+
+-AC_CHECK_HEADER([rpc/rpc_msg.h], [AC_SUBST([LIBTIRPC_CFLAGS],'')], [PKG_CHECK_MODULES([LIBTIRPC], [libtirpc])])
+-
+ PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
+ PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
+ PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.8])
 diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
-index 05801bc..adb6154 100644
+index e4f10c9..159362f 100644
 --- a/src/helpers/Makefile.am
 +++ b/src/helpers/Makefile.am
 @@ -4,7 +4,6 @@ pkglib_LTLIBRARIES = ct_helper_amanda.la \
@@ -26,13 +40,13 @@ index 05801bc..adb6154 100644
  		     ct_helper_tftp.la	\
  		     ct_helper_tns.la	\
  		     ct_helper_sane.la	\
-@@ -29,10 +28,6 @@ ct_helper_mdns_la_SOURCES = mdns.c
+@@ -30,10 +29,6 @@ ct_helper_mdns_la_SOURCES = mdns.c
  ct_helper_mdns_la_LDFLAGS = $(HELPER_LDFLAGS)
  ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS)
- 
+
 -ct_helper_rpc_la_SOURCES = rpc.c
 -ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS)
--ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS)
+-ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(LIBTIRPC_CFLAGS)
 -
  ct_helper_tftp_la_SOURCES = tftp.c
  ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS)

diff --git a/packages/conntrack-tools/Cargo.toml b/packages/conntrack-tools/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.5.tar.bz2"
-sha512 = "480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1"
+url = "https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.6.tar.bz2"
+sha512 = "a48260308a12b11b584fcf4658ec2c4c1adb2801c9cf9a73fc259e5c30d2fbe401aca21e931972413f03e415f98fbf9bd678d2126faa6c6d5748e8a652e58f1a"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/conntrack-tools/conntrack-tools.spec b/packages/conntrack-tools/conntrack-tools.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}conntrack-tools
-Version: 1.4.5
+Version: 1.4.6
 Release: 1%{?dist}
 Summary: Tools for managing Linux kernel connection tracking
 # src/utils.c contains GPLv2-only code from linux

diff --git a/packages/libnetfilter_conntrack/Cargo.toml b/packages/libnetfilter_conntrack/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.7.tar.bz2"
-sha512 = "5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b"
+url = "https://netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.8.tar.bz2"
+sha512 = "ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/libnetfilter_conntrack/libnetfilter_conntrack.spec b/packages/libnetfilter_conntrack/libnetfilter_conntrack.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}libnetfilter_conntrack
-Version: 1.0.7
+Version: 1.0.8
 Release: 1%{?dist}
 Summary: Library for netfilter conntrack
 License: GPL-2.0-or-later

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.5.tar.bz2"
-sha512 = "a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7"
+url = "http://netfilter.org/projects/libnftnl/files/libnftnl-1.1.6.tar.bz2"
+sha512 = "3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d"
 
 [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.5
+Version: 1.1.6
 Release: 1%{?dist}
 Summary: Library for nftables netlink
 License: GPL-2.0-or-later AND GPL-2.0-only

diff --git a/packages/libseccomp/0001-api-define-__SNR_ppoll-again.patch b/packages/libseccomp/0001-api-define-__SNR_ppoll-again.patch
diff --git a/packages/libseccomp/0002-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch b/packages/libseccomp/0002-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch
diff --git a/packages/libseccomp/Cargo.toml b/packages/libseccomp/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/seccomp/libseccomp/releases/download/v2.4.2/libseccomp-2.4.2.tar.gz"
-sha512 = "375a3c7c658be6a08b9bb30963e10bb49e8e066119e0be6d3d97faac3db18b8e2c6938d8b5d3874b2f5331ec8295170112fbae83b5a3b5a5bebc0d6705bdfdbb"
+url = "https://github.com/seccomp/libseccomp/releases/download/v2.4.3/libseccomp-2.4.3.tar.gz"
+sha512 = "7b7af2e98493243ffe1934fefff5723b24ae9b9bdc4bf039343ee8456c15acb0ea34e81ec292a41143848272aeca794ef92ad38fc3f42c77465170cb540479ef"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/libseccomp/libseccomp.spec b/packages/libseccomp/libseccomp.spec
@@ -1,16 +1,12 @@
 Name: %{_cross_os}libseccomp
-Version: 2.4.2
+Version: 2.4.3
 Release: 1%{?dist}
 Summary: Library for enhanced seccomp
 License: LGPL-2.1-only
 URL: https://github.com/seccomp/libseccomp
 Source0: https://github.com/seccomp/libseccomp/releases/download/v%{version}/libseccomp-%{version}.tar.gz
 BuildRequires: %{_cross_os}glibc-devel
 
-# Backports from upstream after 2.4.2 release
-Patch0001: 0001-api-define-__SNR_ppoll-again.patch
-Patch0002: 0002-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch
-
 %description
 %{summary}.
 
@@ -26,6 +22,11 @@ Requires: %{name}
 
 %build
 %cross_configure
+
+# "fix" rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 %make_build
 
 %install

diff --git a/packages/libxcrypt/Cargo.toml b/packages/libxcrypt/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/besser82/libxcrypt/archive/v4.4.15/libxcrypt-4.4.15.tar.gz"
-sha512 = "e325425d5865cc5d4d7d140a0ed99ba69eec04d5c0b3dbef01b28fb2b9420e86b6367702dfb258a8e0d817893dab6be4005825e4cb767e71f06309b69d93191a"
+url = "https://github.com/besser82/libxcrypt/archive/v4.4.16/libxcrypt-4.4.16.tar.gz"
+sha512 = "e1d3b1262c6be7c6c8847b8c4eb8191d9e5e482798be6f1186876c72f3d8c737124378ec45a38aa464f556e10a557b96f855bd371f03c3611eada27904bf6781"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/libxcrypt/libxcrypt.spec b/packages/libxcrypt/libxcrypt.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}libxcrypt
-Version: 4.4.15
+Version: 4.4.16
 Release: 1%{?dist}
 Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others
 License: LGPL-2.1-or-later

diff --git a/packages/strace/Cargo.toml b/packages/strace/Cargo.toml
@@ -9,8 +9,8 @@ build = "build.rs"
 path = "pkg.rs"
 
 [[package.metadata.build-package.external-files]]
-url = "https://strace.io/files/5.5/strace-5.5.tar.xz"
-sha512 = "317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231"
+url = "https://strace.io/files/5.6/strace-5.6.tar.xz"
+sha512 = "58c8a250e55a018206bee9468ea057c087d5d5bb523339ea3c01e0a19d8f84c95bd1398d66a6dca6ada45c6535aa44b776713a2bb080eebaa734ffb926ac5b38"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/strace/strace.spec b/packages/strace/strace.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}strace
-Version: 5.5
+Version: 5.6
 Release: 1%{?dist}
 Summary: Linux syscall tracer
 License: LGPL-2.1-or-later