Merging upstream version 1.30.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 7 insertions, 7 deletions

diff --git a/packaging/makeself/install-alpine-packages.sh b/packaging/makeself/install-alpine-packages.sh
index b4e516be2..a3e8cf605 100755
--- a/packaging/makeself/install-alpine-packages.sh
+++ b/packaging/makeself/install-alpine-packages.sh
@@ -39,7 +39,7 @@ apk add --no-cache -U \
   gzip \
   xz || exit 1
 
-# snappy doesnt have static version in alpine, let's compile it
+# snappy doesn't have static version in alpine, let's compile it
 export SNAPPY_VER="1.1.7"
 wget -O /snappy.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VER}.tar.gz
 tar -C / -xf /snappy.tar.gz
diff --git a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh
index bbf631bcb..11fcc091c 100755
--- a/packaging/makeself/install-or-update.sh
+++ b/packaging/makeself/install-or-update.sh
@@ -58,7 +58,7 @@ while [ "${1}" ]; do
 done
 
 if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
-  REINSTALL_OPTIONS="${REINSTALL_OPTIONS} --disable-telemtry"
+  REINSTALL_OPTIONS="${REINSTALL_OPTIONS} --disable-telemetry"
 fi
 
 deleted_stock_configs=0
diff --git a/packaging/makeself/makeself-help-header.txt b/packaging/makeself/makeself-help-header.txt
index 9a8a3ec33..b2b1e4a76 100644
--- a/packaging/makeself/makeself-help-header.txt
+++ b/packaging/makeself/makeself-help-header.txt
@@ -28,7 +28,7 @@
 
    - /lib/systemd/system/netdata.service
 
-   or, for older Centos, Debian/Ubuntu or OpenRC Gentoo:
+   or, for older CentOS, Debian/Ubuntu or OpenRC Gentoo:
 
    - /etc/init.d/netdata         will be created
 
diff --git a/packaging/makeself/makeself-license.txt b/packaging/makeself/makeself-license.txt
index bf482c465..518d85d95 100644
--- a/packaging/makeself/makeself-license.txt
+++ b/packaging/makeself/makeself-license.txt
@@ -28,7 +28,7 @@
 
    - /lib/systemd/system/netdata.service
 
-   or, for older Centos, Debian/Ubuntu or OpenRC Gentoo:
+   or, for older CentOS, Debian/Ubuntu or OpenRC Gentoo:
 
    - /etc/init.d/netdata         will be created
 
diff --git a/packaging/makeself/makeself.sh b/packaging/makeself/makeself.sh
index f3cb69976..15a002884 100755
--- a/packaging/makeself/makeself.sh
+++ b/packaging/makeself/makeself.sh
@@ -40,7 +40,7 @@
 # - 2.0.1 : Added --copy
 # - 2.1.0 : Allow multiple tarballs to be stored in one archive, and incremental updates.
 #           Added --nochown for archives
-#           Stopped doing redundant checksums when not necesary
+#           Stopped doing redundant checksums when not necessary
 # - 2.1.1 : Work around insane behavior from certain Linux distros with no 'uncompress' command
 #           Cleaned up the code to handle error codes from compress. Simplified the extraction code.
 # - 2.1.2 : Some bug fixes. Use head -n to avoid problems.
@@ -63,7 +63,7 @@
 #           Check for available disk space before extracting to the target directory (Andreas Schweitzer)
 #           Allow extraction to run asynchronously (patch by Peter Hatch)
 #           Use file descriptors internally to avoid error messages (patch by Kay Tiong Khoo)
-# - 2.1.6 : Replaced one dot per file progress with a realtime progress percentage and a spining cursor (Guy Baconniere)
+# - 2.1.6 : Replaced one dot per file progress with a realtime progress percentage and a spinning cursor (Guy Baconniere)
 #           Added --noprogress to prevent showing the progress during the decompression (Guy Baconniere)
 #           Added --target dir to allow extracting directly to a target directory (Guy Baconniere)
 # - 2.2.0 : Many bugfixes, updates and contributions from users. Check out the project page on Github for the details.
diff --git a/packaging/makeself/openssl.version b/packaging/makeself/openssl.version
index adc000b35..aa2c66c02 100644
--- a/packaging/makeself/openssl.version
+++ b/packaging/makeself/openssl.version
@@ -1 +1 @@
-OpenSSL_1_1_1h
+OpenSSL_1_1_1k