From cd7ed12292aef11d9062b64f61215174e8cc1860 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 3 Sep 2019 12:23:48 +0200
Subject: Merging upstream version 1.17.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 contrib/debian/changelog      |  1 +
 contrib/debian/control.trusty | 56 +++++++++++++++++++++++++++++++++++++++++++
 contrib/debian/install_go.sh  | 14 ++++++-----
 contrib/debian/rules          |  6 ++---
 4 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 contrib/debian/control.trusty

(limited to 'contrib/debian')

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index d9cf8bdbe..ddfffe4ee 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -3,3 +3,4 @@ netdata (PREVIOUS_PACKAGE_VERSION) unstable; urgency=medium
   * Initial Release
 
 -- Netdata Builder <bot@netdata.cloud>  PREVIOUS_PACKAGE_DATE
+
diff --git a/contrib/debian/control.trusty b/contrib/debian/control.trusty
new file mode 100644
index 000000000..cb8a52e01
--- /dev/null
+++ b/contrib/debian/control.trusty
@@ -0,0 +1,56 @@
+Source: netdata
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
+               dh-systemd (>= 1.5),
+               dpkg-dev (>= 1.13.19),
+               zlib1g-dev,
+               uuid-dev,
+               liblz4-dev,
+               libjudy-dev,
+               libssl-dev,
+               libmnl-dev,
+               libjson-c-dev,
+               libcups2-dev,
+               libipmimonitoring-dev,
+               libnetfilter-acct-dev,
+               libsnappy-dev,
+               libprotobuf-dev,
+               libprotoc-dev,
+               autogen,
+               autoconf,
+               automake,
+               pkg-config,
+               curl,
+               gcc,
+               g++
+Section: net
+Priority: optional
+Maintainer: Netdata Builder <bot@netdata.cloud>
+Standards-Version: 3.9.6
+Homepage: https://netdata.cloud
+
+Package: netdata
+Architecture: any
+Depends: adduser,
+         libcap2-bin (>= 1:2.0),
+         lsb-base (>= 3.1-23.2),
+         zlib1g,
+         libuuid1,
+         liblz4-1,
+         libjudydebian1,
+         openssl,
+         libmnl0,
+         libjson-c2,
+         cups,
+         freeipmi,
+         libnetfilter-acct1,
+         libprotobuf-c0,
+         libsnappy1,
+         libprotoc8,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: real-time charts for system monitoring
+ Netdata is a daemon that collects data in realtime (per second)
+ and presents a web site to view and analyze them. The presentation
+ is also real-time and full of interactive charts that precisely
+ render all collected values.
diff --git a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh
index 17a3b409e..22ff691f9 100755
--- a/contrib/debian/install_go.sh
+++ b/contrib/debian/install_go.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
-LIB_DIR="$1"
-LIBEXEC_DIR="$2"
+GO_PACKAGE_VERSION="$1"
+LIB_DIR="$2"
+LIBEXEC_DIR="$3"
 
 # ############################################################
 # Package Go within netdata (TBD: Package it separately)
@@ -35,8 +36,6 @@ download_go() {
 }
 
 install_go() {
-	# When updating this value, ensure correct checksums in packaging/go.d.checksums
-	GO_PACKAGE_VERSION="v0.7.0"
 	ARCH_MAP=(
 		'i386::386'
 		'i686::386'
@@ -62,7 +61,7 @@ install_go() {
 			fi
 		done
 		tmp=$(mktemp -d /tmp/netdata-go-XXXXXX)
-		GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}"
+		GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}.tar.gz"
 		download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/${GO_PACKAGE_BASENAME}" "${tmp}/${GO_PACKAGE_BASENAME}"
 		download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/config.tar.gz" "${tmp}/config.tar.gz"
 
@@ -88,7 +87,10 @@ install_go() {
 
 		# Install files
 		tar -xf "${tmp}/config.tar.gz" -C "${LIB_DIR}/conf.d/"
-		mv "${tmp}/$GO_PACKAGE_BASENAME" "${LIBEXEC_DIR}/plugins.d/go.d.plugin"
+		tar xf "${tmp}/${GO_PACKAGE_BASENAME}"
+		mv "${GO_PACKAGE_BASENAME/\.tar\.gz/}" "${LIBEXEC_DIR}/plugins.d/go.d.plugin"
+
+		rm -rf "${tmp}"
 	fi
 	return 0
 }
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 88a8ab36a..036e0108e 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -18,8 +18,8 @@ TOP = $(CURDIR)/debian/netdata
 
 override_dh_auto_configure:
 	autoreconf -ivf
-	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-	--libexecdir=/usr/libexec --with-user=netdata --with-math --with-webdir=/var/lib/netdata/www
+	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib \
+	--libexecdir=/usr/libexec --with-user=netdata --with-math --with-zlib --with-webdir=/var/lib/netdata/www
 
 debian/%.postinst: debian/%.postinst.in
 	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
@@ -55,7 +55,7 @@ override_dh_install: debian/netdata.postinst
 
 	# Install go
 	#
-	debian/install_go.sh $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/ $(TOP)/usr/libexec/netdata
+	debian/install_go.sh $$(cat ${CURDIR}/packaging/go.d.version) $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/ $(TOP)/usr/libexec/netdata
 
 override_dh_installdocs:
 	dh_installdocs
-- 
cgit v1.2.3