do not attempt to use bash loadable modules on static builds; update bash to 4.4.18 and curl to 7.60.0
Costa Tsaousis (ktsaou) committed
May 26, 2018 at 19:55 UTC
2a608cea6ae5ee25976a1394dec8e322f1a6d995
5 files changed
+10
-6
makeself/Makefile.am
+2
-2
@@ -10,8 +10,8 @@ dist_noinst_SCRIPTS = \
10
install-alpine-packages.sh \
11
post-installer.sh \
12
jobs/10-prepare-destination.install.sh \
13
- jobs/50-curl-7.53.1.install.sh \
14
- jobs/50-bash-4.4.install.sh \
13
+ jobs/50-curl-7.60.0.install.sh \
14
+ jobs/50-bash-4.4.18.install.sh \
15
jobs/50-fping-4.0.install.sh \
16
jobs/70-netdata-git.install.sh \
17
jobs/99-makeself.install.sh \
makeself/jobs/50-bash-4.4.18.install.sh
renamed
+5
-2
@@ -2,13 +2,16 @@
2
3
. $(dirname "${0}")/../functions.sh "${@}" || exit 1
4
5
-fetch "bash-4.4" "http://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz"
5
+fetch "bash-4.4.18" "http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz"
6
7
run ./configure \
8
--prefix=${NETDATA_INSTALL_PATH} \
9
+ --without-bash-malloc \
10
--enable-static-link \
11
+ --enable-net-redirections \
12
+ --enable-array-variables \
13
+ --disable-profiling \
14
--disable-nls \
11
- --without-bash-malloc \
15
# --disable-rpath \
16
# --enable-alias \
17
# --enable-arith-for-command \
makeself/jobs/50-curl-7.60.0.install.sh
renamed
+1
-1
@@ -2,7 +2,7 @@
2
3
. $(dirname "${0}")/../functions.sh "${@}" || exit 1
4
5
-fetch "curl-curl-7_53_1" "https://github.com/curl/curl/archive/curl-7_53_1.tar.gz"
5
+fetch "curl-curl-7_60_0" "https://github.com/curl/curl/archive/curl-7_60_0.tar.gz"
6
7
export LDFLAGS="-static"
8
export PKG_CONFIG="pkg-config --static"
makeself/jobs/99-makeself.install.sh
+1
@@ -64,6 +64,7 @@ run mv "${NETDATA_INSTALL_PATH}/bin/netdata" \
64
65
cat >"${NETDATA_INSTALL_PATH}/bin/netdata" <<EOF
66
#!${NETDATA_INSTALL_PATH}/bin/bash
67
+export BASH_LOADABLES_PATH="${NETDATA_INSTALL_PATH}/lib/bash"
68
export PATH="${NETDATA_INSTALL_PATH}/bin:\${PATH}"
69
exec "${NETDATA_INSTALL_PATH}/bin/srv/netdata" "\${@}"
70
EOF
plugins.d/loopsleepms.sh.inc
+1
-1
@@ -117,7 +117,7 @@ mysleep_builtin() {
117
fi
118
}
119
120
-if [ -z "${mysleep}" -a "$((BASH_VERSINFO[0] +0))" -ge 3 ]
120
+if [ -z "${mysleep}" -a "$((BASH_VERSINFO[0] +0))" -ge 3 -a "${NETDATA_BASH_LOADABLES}" != "DISABLE" ]
121
then
122
# enable modules only for bash version 3+
123