From 396c327fe40b1db11fc204d7ae7ace84503de681 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 13 Feb 2023 18:16:02 +0100
Subject: Merging upstream version 1.38.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 packaging/makeself/jobs/20-openssl.install.sh     |  2 +-
 packaging/makeself/jobs/50-curl-7.82.0.install.sh | 62 -----------------------
 packaging/makeself/jobs/50-curl-7.87.0.install.sh | 62 +++++++++++++++++++++++
 packaging/makeself/jobs/50-ioping-1.2.install.sh  | 32 ------------
 packaging/makeself/jobs/50-ioping-1.3.install.sh  | 32 ++++++++++++
 packaging/makeself/openssl.version                |  2 +-
 packaging/version                                 |  2 +-
 7 files changed, 97 insertions(+), 97 deletions(-)
 delete mode 100755 packaging/makeself/jobs/50-curl-7.82.0.install.sh
 create mode 100755 packaging/makeself/jobs/50-curl-7.87.0.install.sh
 delete mode 100755 packaging/makeself/jobs/50-ioping-1.2.install.sh
 create mode 100755 packaging/makeself/jobs/50-ioping-1.3.install.sh

(limited to 'packaging')

diff --git a/packaging/makeself/jobs/20-openssl.install.sh b/packaging/makeself/jobs/20-openssl.install.sh
index 5d9aa068e..35667a51f 100755
--- a/packaging/makeself/jobs/20-openssl.install.sh
+++ b/packaging/makeself/jobs/20-openssl.install.sh
@@ -29,7 +29,7 @@ if [ -d "${cache}" ]; then
   CACHE_HIT=1
 else
   echo "No cached copy of build directory for openssl found, fetching sources instead."
-  run git clone --branch "${version}" --single-branch --depth 1 git://git.openssl.org/openssl.git "${NETDATA_MAKESELF_PATH}/tmp/openssl"
+  run git clone --branch "${version}" --single-branch --depth 1 https://github.com/openssl/openssl.git "${NETDATA_MAKESELF_PATH}/tmp/openssl"
   CACHE_HIT=0
 fi
 
diff --git a/packaging/makeself/jobs/50-curl-7.82.0.install.sh b/packaging/makeself/jobs/50-curl-7.82.0.install.sh
deleted file mode 100755
index 251d35095..000000000
--- a/packaging/makeself/jobs/50-curl-7.82.0.install.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# shellcheck source=packaging/makeself/functions.sh
-. "$(dirname "${0}")/../functions.sh" "${@}" || exit 1
-
-version="7.82.0"
-
-# shellcheck disable=SC2015
-[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Building cURL" || true
-
-fetch "curl-${version}" "https://curl.haxx.se/download/curl-${version}.tar.gz" \
-    910cc5fe279dc36e2cca534172c94364cf3fcf7d6494ba56e6c61a390881ddce curl
-
-export CFLAGS="-I/openssl-static/include -pipe"
-export LDFLAGS="-static -L/openssl-static/lib"
-export PKG_CONFIG="pkg-config --static"
-export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig"
-
-if [ "${CACHE_HIT:-0}" -eq 0 ]; then
-    run autoreconf -fi
-
-    run ./configure \
-        --prefix="${NETDATA_INSTALL_PATH}" \
-        --enable-optimize \
-        --disable-shared \
-        --enable-static \
-        --enable-http \
-        --disable-ldap \
-        --disable-ldaps \
-        --enable-proxy \
-        --disable-dict \
-        --disable-telnet \
-        --disable-tftp \
-        --disable-pop3 \
-        --disable-imap \
-        --disable-smb \
-        --disable-smtp \
-        --disable-gopher \
-        --enable-ipv6 \
-        --enable-cookies \
-        --with-ca-fallback \
-        --with-openssl \
-        --disable-dependency-tracking
-
-    # Curl autoconf does not honour the curl_LDFLAGS environment variable
-    run sed -i -e "s/LDFLAGS =/LDFLAGS = -all-static/" src/Makefile
-
-    run make clean
-    run make -j "$(nproc)"
-fi
-
-run make install
-
-store_cache curl "${NETDATA_MAKESELF_PATH}/tmp/curl-${version}"
-
-if [ "${NETDATA_BUILD_WITH_DEBUG}" -eq 0 ]; then
-  run strip "${NETDATA_INSTALL_PATH}"/bin/curl
-fi
-
-# shellcheck disable=SC2015
-[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Preparing build environment" || true
diff --git a/packaging/makeself/jobs/50-curl-7.87.0.install.sh b/packaging/makeself/jobs/50-curl-7.87.0.install.sh
new file mode 100755
index 000000000..84210e958
--- /dev/null
+++ b/packaging/makeself/jobs/50-curl-7.87.0.install.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# shellcheck source=packaging/makeself/functions.sh
+. "$(dirname "${0}")/../functions.sh" "${@}" || exit 1
+
+version="7.87.0"
+
+# shellcheck disable=SC2015
+[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Building cURL" || true
+
+fetch "curl-${version}" "https://curl.haxx.se/download/curl-${version}.tar.gz" \
+    8a063d664d1c23d35526b87a2bf15514962ffdd8ef7fd40519191b3c23e39548 curl
+
+export CFLAGS="-I/openssl-static/include -pipe"
+export LDFLAGS="-static -L/openssl-static/lib"
+export PKG_CONFIG="pkg-config --static"
+export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig"
+
+if [ "${CACHE_HIT:-0}" -eq 0 ]; then
+    run autoreconf -fi
+
+    run ./configure \
+        --prefix="${NETDATA_INSTALL_PATH}" \
+        --enable-optimize \
+        --disable-shared \
+        --enable-static \
+        --enable-http \
+        --disable-ldap \
+        --disable-ldaps \
+        --enable-proxy \
+        --disable-dict \
+        --disable-telnet \
+        --disable-tftp \
+        --disable-pop3 \
+        --disable-imap \
+        --disable-smb \
+        --disable-smtp \
+        --disable-gopher \
+        --enable-ipv6 \
+        --enable-cookies \
+        --with-ca-fallback \
+        --with-openssl \
+        --disable-dependency-tracking
+
+    # Curl autoconf does not honour the curl_LDFLAGS environment variable
+    run sed -i -e "s/LDFLAGS =/LDFLAGS = -all-static/" src/Makefile
+
+    run make clean
+    run make -j "$(nproc)"
+fi
+
+run make install
+
+store_cache curl "${NETDATA_MAKESELF_PATH}/tmp/curl-${version}"
+
+if [ "${NETDATA_BUILD_WITH_DEBUG}" -eq 0 ]; then
+  run strip "${NETDATA_INSTALL_PATH}"/bin/curl
+fi
+
+# shellcheck disable=SC2015
+[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Preparing build environment" || true
diff --git a/packaging/makeself/jobs/50-ioping-1.2.install.sh b/packaging/makeself/jobs/50-ioping-1.2.install.sh
deleted file mode 100755
index 160f45b98..000000000
--- a/packaging/makeself/jobs/50-ioping-1.2.install.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# shellcheck source=packaging/makeself/functions.sh
-. "$(dirname "${0}")/../functions.sh" "${@}" || exit 1
-
-version='1.2'
-
-# shellcheck disable=SC2015
-[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Building ioping" || true
-
-fetch "ioping-${version}" "https://github.com/koct9i/ioping/archive/v${version}.tar.gz" \
-    d3e4497c653a1e96df67c72ce2b70da18e9f5e3b93179a5bb57a6e30ceacfa75 ioping
-
-export CFLAGS="-static -pipe"
-
-if [ "${CACHE_HIT:-0}" -eq 0 ]; then
-    run make clean
-    run make -j "$(nproc)"
-fi
-
-run mkdir -p "${NETDATA_INSTALL_PATH}"/usr/libexec/netdata/plugins.d/
-run install -o root -g root -m 4750 ioping "${NETDATA_INSTALL_PATH}"/usr/libexec/netdata/plugins.d/
-
-store_cache ioping "${NETDATA_MAKESELF_PATH}/tmp/ioping-${version}"
-
-if [ "${NETDATA_BUILD_WITH_DEBUG}" -eq 0 ]; then
-  run strip "${NETDATA_INSTALL_PATH}"/usr/libexec/netdata/plugins.d/ioping
-fi
-
-# shellcheck disable=SC2015
-[ "${GITHUB_ACTIONS}" = "true" ] && echo "::endgroup::" || true
diff --git a/packaging/makeself/jobs/50-ioping-1.3.install.sh b/packaging/makeself/jobs/50-ioping-1.3.install.sh
new file mode 100755
index 000000000..88309c3eb
--- /dev/null
+++ b/packaging/makeself/jobs/50-ioping-1.3.install.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# shellcheck source=packaging/makeself/functions.sh
+. "$(dirname "${0}")/../functions.sh" "${@}" || exit 1
+
+version='1.3'
+
+# shellcheck disable=SC2015
+[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Building ioping" || true
+
+fetch "ioping-${version}" "https://github.com/koct9i/ioping/archive/v${version}.tar.gz" \
+    7aa48e70aaa766bc112dea57ebbe56700626871052380709df3a26f46766e8c8 ioping
+
+export CFLAGS="-static -pipe"
+
+if [ "${CACHE_HIT:-0}" -eq 0 ]; then
+    run make clean
+    run make -j "$(nproc)"
+fi
+
+run mkdir -p "${NETDATA_INSTALL_PATH}"/usr/libexec/netdata/plugins.d/
+run install -o root -g root -m 4750 ioping "${NETDATA_INSTALL_PATH}"/usr/libexec/netdata/plugins.d/
+
+store_cache ioping "${NETDATA_MAKESELF_PATH}/tmp/ioping-${version}"
+
+if [ "${NETDATA_BUILD_WITH_DEBUG}" -eq 0 ]; then
+  run strip "${NETDATA_INSTALL_PATH}"/usr/libexec/netdata/plugins.d/ioping
+fi
+
+# shellcheck disable=SC2015
+[ "${GITHUB_ACTIONS}" = "true" ] && echo "::endgroup::" || true
diff --git a/packaging/makeself/openssl.version b/packaging/makeself/openssl.version
index ad1bcee8f..374b3773c 100644
--- a/packaging/makeself/openssl.version
+++ b/packaging/makeself/openssl.version
@@ -1 +1 @@
-OpenSSL_1_1_1n
+OpenSSL_1_1_1t
diff --git a/packaging/version b/packaging/version
index 553ed7204..cbec0de06 100644
--- a/packaging/version
+++ b/packaging/version
@@ -1 +1 @@
-v1.38.0
+v1.38.1
-- 
cgit v1.2.3