New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg

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

15 files changed, 39 insertions, 85 deletions

diff --git a/build/Dockerfile b/build/Dockerfile
new file mode 100644
index 000000000..8a816b825
--- /dev/null
+++ b/build/Dockerfile
@@ -0,0 +1,8 @@
+FROM gcc:8
+
+RUN apt-get update && apt-get install -y \
+    autoconf-archive \
+    autogen \
+    libmnl-dev \
+    uuid-dev \
+ && rm -rf /var/lib/apt/lists/*
diff --git a/build/build.sh b/build/build.sh
new file mode 100755
index 000000000..ee087b98f
--- /dev/null
+++ b/build/build.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ -f build.sh ]; then
+    cd ../ || exit 1
+fi
+
+if [ "$IS_CONTAINER" != "" ]; then
+  autoreconf -ivf
+  ./configure --enable-maintainer-mode
+  make dist
+  rm -rf autom4te.cache
+else
+  if [[ "$(docker images -q netdata-gcc-builder:latest 2> /dev/null)" == "" ]]; then
+      docker build -t netdata-gcc-builder:latest -f build/Dockerfile .
+  fi
+  docker run --rm -it \
+    --env IS_CONTAINER=TRUE \
+    --volume "${PWD}:/project:Z" \
+    --workdir "/project" \
+    netdata:gcc \
+    ./.travis/build.sh
+fi
diff --git a/m4/ax_c___atomic.m4 b/build/m4/ax_c___atomic.m4
index dd5ee3d1c..dd5ee3d1c 100644
--- a/m4/ax_c___atomic.m4
+++ b/build/m4/ax_c___atomic.m4
diff --git a/m4/ax_c__generic.m4 b/build/m4/ax_c__generic.m4
index 0c4dd52c6..0c4dd52c6 100644
--- a/m4/ax_c__generic.m4
+++ b/build/m4/ax_c__generic.m4
diff --git a/m4/ax_c_lto.m4 b/build/m4/ax_c_lto.m4
index 7e6bc0119..7e6bc0119 100644
--- a/m4/ax_c_lto.m4
+++ b/build/m4/ax_c_lto.m4
diff --git a/m4/ax_c_mallinfo.m4 b/build/m4/ax_c_mallinfo.m4
index af8d0481e..af8d0481e 100644
--- a/m4/ax_c_mallinfo.m4
+++ b/build/m4/ax_c_mallinfo.m4
diff --git a/m4/ax_c_mallopt.m4 b/build/m4/ax_c_mallopt.m4
index 31c4fdc36..31c4fdc36 100644
--- a/m4/ax_c_mallopt.m4
+++ b/build/m4/ax_c_mallopt.m4
diff --git a/m4/ax_c_statement_expressions.m4 b/build/m4/ax_c_statement_expressions.m4
index fb259e727..fb259e727 100644
--- a/m4/ax_c_statement_expressions.m4
+++ b/build/m4/ax_c_statement_expressions.m4
diff --git a/m4/ax_check_compile_flag.m4 b/build/m4/ax_check_compile_flag.m4
index 51df0c09a..c515602f0 100644
--- a/m4/ax_check_compile_flag.m4
+++ b/build/m4/ax_check_compile_flag.m4
@@ -29,31 +29,7 @@
 #   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
 #   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
 #
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
+#   SPDX-License-Identifier: GPL-3.0
 
 #serial 3
 
diff --git a/m4/ax_check_enable_debug.m4 b/build/m4/ax_check_enable_debug.m4
index f99d75feb..db5bab2f4 100644
--- a/m4/ax_check_enable_debug.m4
+++ b/build/m4/ax_check_enable_debug.m4
@@ -38,9 +38,7 @@
 #   Copyright (c) 2011 Rhys Ulerich <rhys.ulerich@gmail.com>
 #   Copyright (c) 2014, 2015 Philip Withnall <philip@tecnocode.co.uk>
 #
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
+#   SPDX-License-Identifier: FSFAP
 
 #serial 5
 
diff --git a/m4/ax_gcc_func_attribute.m4 b/build/m4/ax_gcc_func_attribute.m4
index a6d9f6c5f..6f1e1b051 100644
--- a/m4/ax_gcc_func_attribute.m4
+++ b/build/m4/ax_gcc_func_attribute.m4
@@ -69,10 +69,7 @@
 #
 #   Copyright (c) 2013 Gabriele Svelto <gabriele.svelto@gmail.com>
 #
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
+#   SPDX-License-Identifier: FSFAP
 
 #serial 4
 
diff --git a/m4/ax_pthread.m4 b/build/m4/ax_pthread.m4
index d383ad5c6..ba9ac28a5 100644
--- a/m4/ax_pthread.m4
+++ b/build/m4/ax_pthread.m4
@@ -56,31 +56,7 @@
 #   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
 #   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
 #
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
+#   SPDX-License-Identifier: GPL-3.0-or-later
 
 #serial 21
 
diff --git a/m4/jemalloc.m4 b/build/m4/jemalloc.m4
index bb5dceb81..c2008a8ea 100644
--- a/m4/jemalloc.m4
+++ b/build/m4/jemalloc.m4
@@ -1,18 +1,5 @@
 dnl -------------------------------------------------------- -*- autoconf -*-
-dnl Licensed to the Apache Software Foundation (ASF) under one or more
-dnl contributor license agreements.  See the NOTICE file distributed with
-dnl this work for additional information regarding copyright ownership.
-dnl The ASF licenses this file to You under the Apache License, Version 2.0
-dnl (the "License"); you may not use this file except in compliance with
-dnl the License.  You may obtain a copy of the License at
-dnl
-dnl     http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS,
-dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-dnl See the License for the specific language governing permissions and
-dnl limitations under the License.
+dnl SPDX-License-Identifier: Apache-2.0
 
 dnl
 dnl jemalloc.m4: Trafficserver's jemalloc autoconf macros
diff --git a/m4/tcmalloc.m4 b/build/m4/tcmalloc.m4
index e84697dc7..765d2accc 100644
--- a/m4/tcmalloc.m4
+++ b/build/m4/tcmalloc.m4
@@ -1,18 +1,5 @@
 dnl -------------------------------------------------------- -*- autoconf -*-
-dnl Licensed to the Apache Software Foundation (ASF) under one or more
-dnl contributor license agreements.  See the NOTICE file distributed with
-dnl this work for additional information regarding copyright ownership.
-dnl The ASF licenses this file to You under the Apache License, Version 2.0
-dnl (the "License"); you may not use this file except in compliance with
-dnl the License.  You may obtain a copy of the License at
-dnl
-dnl     http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS,
-dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-dnl See the License for the specific language governing permissions and
-dnl limitations under the License.
+dnl SPDX-License-Identifier: Apache-2.0
 
 dnl
 dnl tcmalloc.m4: Trafficserver's tcmalloc autoconf macros
diff --git a/build/subst.inc b/build/subst.inc
index 9682cf882..8f9ac0551 100644
--- a/build/subst.inc
+++ b/build/subst.inc
@@ -4,6 +4,9 @@
 		-e 's#[@]sbindir_POST@#$(sbindir)#g' \
 		-e 's#[@]sysconfdir_POST@#$(sysconfdir)#g' \
 		-e 's#[@]pythondir_POST@#$(pythondir)#g' \
+		-e 's#[@]configdir_POST@#$(configdir)#g' \
+		-e 's#[@]libconfigdir_POST@#$(libconfigdir)#g' \
+		-e 's#[@]cachedir_POST@#$(cachedir)#g' \
 		$< > $@.tmp; then \
 		mv "$@.tmp" "$@"; \
 	else \