From 50485bedfd9818165aa1d039d0abe95a559134b7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 8 Feb 2019 08:31:03 +0100
Subject: Merging upstream version 1.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 makeself/jobs/10-prepare-destination.install.sh |  17 ----
 makeself/jobs/50-bash-4.4.18.install.sh         |  54 -----------
 makeself/jobs/50-curl-7.60.0.install.sh         |  34 -------
 makeself/jobs/50-fping-4.0.install.sh           |  29 ------
 makeself/jobs/70-netdata-git.install.sh         |  26 ------
 makeself/jobs/99-makeself.install.sh            | 117 ------------------------
 6 files changed, 277 deletions(-)
 delete mode 100755 makeself/jobs/10-prepare-destination.install.sh
 delete mode 100755 makeself/jobs/50-bash-4.4.18.install.sh
 delete mode 100755 makeself/jobs/50-curl-7.60.0.install.sh
 delete mode 100755 makeself/jobs/50-fping-4.0.install.sh
 delete mode 100755 makeself/jobs/70-netdata-git.install.sh
 delete mode 100755 makeself/jobs/99-makeself.install.sh

(limited to 'makeself/jobs')

diff --git a/makeself/jobs/10-prepare-destination.install.sh b/makeself/jobs/10-prepare-destination.install.sh
deleted file mode 100755
index 019732636..000000000
--- a/makeself/jobs/10-prepare-destination.install.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. $(dirname "${0}")/../functions.sh "${@}" || exit 1
-
-[ -d "${NETDATA_INSTALL_PATH}.old" ] && run rm -rf "${NETDATA_INSTALL_PATH}.old"
-[ -d "${NETDATA_INSTALL_PATH}" ] && run mv -f "${NETDATA_INSTALL_PATH}" "${NETDATA_INSTALL_PATH}.old"
-
-run mkdir -p "${NETDATA_INSTALL_PATH}/bin"
-run mkdir -p "${NETDATA_INSTALL_PATH}/usr"
-run cd "${NETDATA_INSTALL_PATH}"
-run ln -s bin sbin
-run cd "${NETDATA_INSTALL_PATH}/usr"
-run ln -s ../bin bin
-run ln -s ../sbin sbin
-run ln -s . local
-
diff --git a/makeself/jobs/50-bash-4.4.18.install.sh b/makeself/jobs/50-bash-4.4.18.install.sh
deleted file mode 100755
index 000765825..000000000
--- a/makeself/jobs/50-bash-4.4.18.install.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. $(dirname "${0}")/../functions.sh "${@}" || exit 1
-
-fetch "bash-4.4.18" "http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz"
-
-run ./configure \
-	--prefix=${NETDATA_INSTALL_PATH} \
-	--without-bash-malloc \
-	--enable-static-link \
-	--enable-net-redirections \
-	--enable-array-variables \
-	--disable-profiling \
-	--disable-nls \
-#	--disable-rpath \
-#	--enable-alias \
-#	--enable-arith-for-command \
-#	--enable-array-variables \
-#	--enable-brace-expansion \
-#	--enable-casemod-attributes \
-#	--enable-casemod-expansions \
-#	--enable-command-timing \
-#	--enable-cond-command \
-#	--enable-cond-regexp \
-#	--enable-directory-stack \
-#	--enable-dparen-arithmetic \
-#	--enable-function-import \
-#	--enable-glob-asciiranges-default \
-#	--enable-help-builtin \
-#	--enable-job-control \
-#	--enable-net-redirections \
-#	--enable-process-substitution \
-#	--enable-progcomp \
-#	--enable-prompt-string-decoding \
-#	--enable-readline \
-#	--enable-select \
-		
-
-run make clean
-run make -j${SYSTEM_CPUS}
-
-cat >examples/loadables/Makefile <<EOF
-all:
-clean:
-install:
-EOF
-
-run make install
-
-if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]
-then
-    run strip ${NETDATA_INSTALL_PATH}/bin/bash
-fi
diff --git a/makeself/jobs/50-curl-7.60.0.install.sh b/makeself/jobs/50-curl-7.60.0.install.sh
deleted file mode 100755
index 2b5c8f139..000000000
--- a/makeself/jobs/50-curl-7.60.0.install.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. $(dirname "${0}")/../functions.sh "${@}" || exit 1
-
-fetch "curl-curl-7_60_0" "https://github.com/curl/curl/archive/curl-7_60_0.tar.gz"
-
-export LDFLAGS="-static"
-export PKG_CONFIG="pkg-config --static"
-
-run ./buildconf
-
-run ./configure \
-	--prefix=${NETDATA_INSTALL_PATH} \
-	--enable-optimize \
-	--disable-shared \
-	--enable-static \
-	--enable-http \
-	--enable-proxy \
-	--enable-ipv6 \
-	--enable-cookies \
-	${NULL}
-
-# Curl autoconf does not honour the curl_LDFLAGS environment variable
-run sed -i -e "s/curl_LDFLAGS =/curl_LDFLAGS = -all-static/" src/Makefile
-
-run make clean
-run make -j${SYSTEM_CPUS}
-run make install
-
-if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]
-then
-    run strip ${NETDATA_INSTALL_PATH}/bin/curl
-fi
diff --git a/makeself/jobs/50-fping-4.0.install.sh b/makeself/jobs/50-fping-4.0.install.sh
deleted file mode 100755
index 7928f1aa4..000000000
--- a/makeself/jobs/50-fping-4.0.install.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. $(dirname "${0}")/../functions.sh "${@}" || exit 1
-
-fetch "fping-4.0" "https://github.com/schweikert/fping/releases/download/v4.0/fping-4.0.tar.gz"
-
-export CFLAGS="-static"
-
-run ./configure \
-	--prefix=${NETDATA_INSTALL_PATH} \
-	--enable-ipv4 \
-	--enable-ipv6 \
-	${NULL}
-
-cat >doc/Makefile <<EOF
-all:
-clean:
-install:
-EOF
-
-run make clean
-run make -j${SYSTEM_CPUS}
-run make install
-
-if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]
-then
-    run strip ${NETDATA_INSTALL_PATH}/bin/fping
-fi
diff --git a/makeself/jobs/70-netdata-git.install.sh b/makeself/jobs/70-netdata-git.install.sh
deleted file mode 100755
index 71ea0f63a..000000000
--- a/makeself/jobs/70-netdata-git.install.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. ${NETDATA_MAKESELF_PATH}/functions.sh "${@}" || exit 1
-
-cd "${NETDATA_SOURCE_PATH}" || exit 1
-
-if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]
-then
-    export CFLAGS="-static -O3"
-else
-    export CFLAGS="-static -O1 -ggdb -Wall -Wextra -Wformat-signedness -fstack-protector-all -D_FORTIFY_SOURCE=2 -DNETDATA_INTERNAL_CHECKS=1"
-#    export CFLAGS="-static -O1 -ggdb -Wall -Wextra -Wformat-signedness"
-fi
-
-run ./netdata-installer.sh --install "${NETDATA_INSTALL_PARENT}" \
-    --dont-wait \
-    --dont-start-it \
-    ${NULL}
-
-if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]
-then
-    run strip ${NETDATA_INSTALL_PATH}/bin/netdata
-    run strip ${NETDATA_INSTALL_PATH}/usr/libexec/netdata/plugins.d/apps.plugin
-    run strip ${NETDATA_INSTALL_PATH}/usr/libexec/netdata/plugins.d/cgroup-network
-fi
diff --git a/makeself/jobs/99-makeself.install.sh b/makeself/jobs/99-makeself.install.sh
deleted file mode 100755
index 0e0d5c9da..000000000
--- a/makeself/jobs/99-makeself.install.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. $(dirname "${0}")/../functions.sh "${@}" || exit 1
-
-run cd "${NETDATA_SOURCE_PATH}" || exit 1
-
-# -----------------------------------------------------------------------------
-# find the netdata version
-
-NOWNER="unknown"
-ORIGIN="$(git config --get remote.origin.url || echo "unknown")"
-if [[ "${ORIGIN}" =~ ^git@github.com:.*/netdata.*$ ]]
-    then
-    NOWNER="${ORIGIN/git@github.com:/}"
-    NOWNER="$( echo ${NOWNER} | cut -d '/' -f 1 )"
-
-elif [[ "${ORIGIN}" =~ ^https://github.com/.*/netdata.*$ ]]
-    then
-    NOWNER="${ORIGIN/https:\/\/github.com\//}"
-    NOWNER="$( echo ${NOWNER} | cut -d '/' -f 1 )"
-fi
-
-# make sure it does not have any slashes in it
-NOWNER="${NOWNER//\//_}"
-
-if [ "${NOWNER}" = "netdata" ]
-    then
-    NOWNER=
-else
-    NOWNER="-${NOWNER}"
-fi
-
-VERSION="$(git describe || echo "undefined")"
-[ -z "${VERSION}" ] && VERSION="undefined"
-
-FILE_VERSION="${VERSION}-$(uname -m)-$(date +"%Y%m%d-%H%M%S")${NOWNER}"
-
-
-# -----------------------------------------------------------------------------
-# copy the files needed by makeself installation
-
-run mkdir -p "${NETDATA_INSTALL_PATH}/system"
-
-run cp \
-    makeself/post-installer.sh \
-    makeself/install-or-update.sh \
-    installer/functions.sh \
-    configs.signatures \
-    system/netdata-init-d \
-    system/netdata-lsb \
-    system/netdata-openrc \
-    system/netdata.logrotate \
-    system/netdata.service \
-    "${NETDATA_INSTALL_PATH}/system/"
-
-
-# -----------------------------------------------------------------------------
-# create a wrapper to start our netdata with a modified path
-
-run mkdir -p "${NETDATA_INSTALL_PATH}/bin/srv"
-
-run mv "${NETDATA_INSTALL_PATH}/bin/netdata" \
-    "${NETDATA_INSTALL_PATH}/bin/srv/netdata" || exit 1
-
-cat >"${NETDATA_INSTALL_PATH}/bin/netdata" <<EOF
-#!${NETDATA_INSTALL_PATH}/bin/bash
-export NETDATA_BASH_LOADABLES="DISABLE"
-export PATH="${NETDATA_INSTALL_PATH}/bin:\${PATH}"
-exec "${NETDATA_INSTALL_PATH}/bin/srv/netdata" "\${@}"
-EOF
-run chmod 755 "${NETDATA_INSTALL_PATH}/bin/netdata"
-
-
-# -----------------------------------------------------------------------------
-# remove the links to allow untaring the archive
-
-run rm "${NETDATA_INSTALL_PATH}/sbin" \
-    "${NETDATA_INSTALL_PATH}/usr/bin" \
-    "${NETDATA_INSTALL_PATH}/usr/sbin" \
-    "${NETDATA_INSTALL_PATH}/usr/local"
-
-
-# -----------------------------------------------------------------------------
-# create the makeself archive
-
-run sed "s|NETDATA_VERSION|${FILE_VERSION}|g" <"${NETDATA_MAKESELF_PATH}/makeself.lsm" >"${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp"
-
-run "${NETDATA_MAKESELF_PATH}/makeself.sh" \
-    --gzip \
-    --complevel 9 \
-    --notemp \
-    --needroot \
-    --target "${NETDATA_INSTALL_PATH}" \
-    --header "${NETDATA_MAKESELF_PATH}/makeself-header.sh" \
-    --lsm "${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp" \
-    --license "${NETDATA_MAKESELF_PATH}/makeself-license.txt" \
-    --help-header "${NETDATA_MAKESELF_PATH}/makeself-help-header.txt" \
-    "${NETDATA_INSTALL_PATH}" \
-    "${NETDATA_INSTALL_PATH}.gz.run" \
-    "netdata, the real-time performance and health monitoring system" \
-    ./system/post-installer.sh \
-    ${NULL}
-
-run rm "${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp"
-
-# -----------------------------------------------------------------------------
-# copy it to the netdata build dir
-
-FILE="netdata-${FILE_VERSION}.gz.run"
-
-run cp "${NETDATA_INSTALL_PATH}.gz.run" "${FILE}"
-echo >&2 "Self-extracting installer copied to '${FILE}'"
-
-[ -f netdata-latest.gz.run ] && rm netdata-latest.gz.run
-run ln -s "${FILE}" netdata-latest.gz.run
-echo >&2 "Self-extracting installer linked to 'netdata-latest.gz.run'"
-- 
cgit v1.2.3