Merge pull request #15212 from BKPepe/netdata-bump

netdata: update to version 1.29.3

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index c04c6371166bbb690e097ef603e43f2af8de25d4..e55c9b2d9572042733ebb1ca05f73dae95c0a86a 100644 (file)
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
-PKG_VERSION:=3.30.1
+PKG_VERSION:=3.31.2
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
@@ -11,7 +11,7 @@ PKG_CPE_ID:=cpe:/a:balabit:syslog-ng
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/syslog-ng/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_HASH:=44e54a6186af14d01affa06bf7391cfe8fc2460bd4ba211aab5469d8b1ca5b4b
+PKG_HASH:=2eeb8e0dbbcb556fdd4e50bc9f29bc8c66c9b153026f87caa7567bd3139c186a
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

diff --git a/admin/syslog-ng/files/syslog-ng.conf b/admin/syslog-ng/files/syslog-ng.conf
index 76412fabb3e0debf43ff5412a849940aab6528c4..3f39a2fe4600053ba090ff2039b2f030a08d8c5e 100644 (file)
--- a/admin/syslog-ng/files/syslog-ng.conf
+++ b/admin/syslog-ng/files/syslog-ng.conf
@@ -4,7 +4,7 @@
 # More details about these settings can be found here:
 # https://www.syslog-ng.com/technical-documents/list/syslog-ng-open-source-edition
 
-@version: 3.30
+@version: 3.31
 @include "scl.conf"
 
 options {

diff --git a/libs/nss/Makefile b/libs/nss/Makefile
index 2785dd2f8606bbd8deb9fc3e943d48af49c662d5..b7592263799915eeb51855aeaf74e79b6b9bc3de 100644 (file)
--- a/libs/nss/Makefile
+++ b/libs/nss/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nss
 PKG_VERSION:=3.61
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
@@ -80,7 +80,7 @@ MAKE_FLAGS += \
        NSS_USE_SYSTEM_SQLITE=1 \
        OS_ARCH=Linux \
        OS_TEST=$(ARCH) \
-       fpic=$(FPIC) \
+       fpic="$(FPIC)" \
        NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
        SEED_ONLY_DEV_URANDOM=1 \
        NS_USE_GCC=1 \
@@ -91,13 +91,10 @@ MAKE_FLAGS += \
        OS_REL_CFLAGS="$(TARGET_CFLAGS)"
 
 #native compile nsinstall
-define Build/Prepare
-       $(call Build/Prepare/Default)
-ifeq ($(QUILT),)
+define Build/Configure
        USE_NATIVE=1 OS_REL_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
        CC="$(HOSTCC)" CPU_ARCH="$(HOST_ARCH)" \
            $(MAKE) -C $(PKG_BUILD_DIR)/nss/coreconf/nsinstall
-endif
 endef
 
 define Build/Compile

diff --git a/net/bind/Makefile b/net/bind/Makefile
index 44219e424ad112441f83b2b579317b5ff617283c..f29ac6d6fee482972a9522052f75bd6d6bfa7688 100644 (file)
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -9,8 +9,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bind
-PKG_VERSION:=9.17.10
-PKG_RELEASE:=1
+PKG_VERSION:=9.17.11
+PKG_RELEASE:=$(AUTORELEASE)
 USERID:=bind=57:bind=57
 
 PKG_MAINTAINER:=Noah Meyerhans <frodo@morgul.net>
@@ -22,7 +22,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:= \
        https://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION) \
        https://ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_HASH:=26a90d28ad694029e480fadcdf60b6219e8128a02d3dd594f6c1a83d002890fd
+PKG_HASH:=00de7bad9291121f3b93e70a6959b540b002f742774823c358c7a416c2e2ed4b
 
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=aclocal.m4 libtool.m4

diff --git a/net/bind/patches/010-openssl-deprecated.patch b/net/bind/patches/010-openssl-deprecated.patch
new file mode 100644 (file)
index 0000000..2b88bd5
--- /dev/null
+++ b/net/bind/patches/010-openssl-deprecated.patch
@@ -0,0 +1,45 @@
+From a9f883cbc28b865d312918368772627cf9610a2f Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 16 Mar 2021 21:58:55 +0000
+Subject: [PATCH] Stop using deprecated calls in lib/isc/tls.c
+
+from Rosen Penev @neheb
+---
+ lib/isc/tls.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/lib/isc/tls.c
++++ b/lib/isc/tls.c
+@@ -12,10 +12,12 @@
+ #include <inttypes.h>
+ #include <nghttp2/nghttp2.h>
+ 
++#include <openssl/bn.h>
+ #include <openssl/conf.h>
+ #include <openssl/err.h>
+ #include <openssl/opensslv.h>
+ #include <openssl/rand.h>
++#include <openssl/rsa.h>
+ 
+ #include <isc/atomic.h>
+ #include <isc/log.h>
+@@ -274,11 +276,19 @@ isc_tlsctx_createserver(const char *keyf
+               rsa = NULL;
+               ASN1_INTEGER_set(X509_get_serialNumber(cert), 1);
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10101000L
+               X509_gmtime_adj(X509_get_notBefore(cert), 0);
++#else
++              X509_gmtime_adj(X509_getm_notBefore(cert), 0);
++#endif
+               /*
+                * We set the vailidy for 10 years.
+                */
++#if OPENSSL_VERSION_NUMBER < 0x10101000L
+               X509_gmtime_adj(X509_get_notAfter(cert), 3650 * 24 * 3600);
++#else
++              X509_gmtime_adj(X509_getm_notAfter(cert), 3650 * 24 * 3600);
++#endif
+ 
+               X509_set_pubkey(cert, pkey);
+ 

diff --git a/net/coova-chilli/patches/010-kernel510.patch b/net/coova-chilli/patches/010-kernel510.patch
new file mode 100644 (file)
index 0000000..afdd586
--- /dev/null
+++ b/net/coova-chilli/patches/010-kernel510.patch
@@ -0,0 +1,38 @@
+--- a/src/linux/xt_coova.c
++++ b/src/linux/xt_coova.c
+@@ -91,8 +91,12 @@ static DEFINE_MUTEX(coova_mutex);
+ 
+ #ifdef CONFIG_PROC_FS
+ static struct proc_dir_entry *coova_proc_dir;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)
++static const struct proc_ops coova_old_fops, coova_mt_fops;
++#else
+ static const struct file_operations coova_old_fops, coova_mt_fops;
+ #endif
++#endif
+ 
+ static u_int32_t hash_rnd;
+ static bool hash_rnd_initted;
+@@ -577,6 +581,14 @@ coova_mt_proc_write(struct file *file, c
+       return size + 1;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)
++static const struct proc_ops coova_mt_fops = {
++      .proc_open    = coova_seq_open,
++      .proc_read    = seq_read,
++      .proc_write   = coova_mt_proc_write,
++      .proc_release = seq_release_private,
++};
++#else
+ static const struct file_operations coova_mt_fops = {
+       .open    = coova_seq_open,
+       .read    = seq_read,
+@@ -584,6 +596,7 @@ static const struct file_operations coov
+       .release = seq_release_private,
+       .owner   = THIS_MODULE,
+ };
++#endif
+ #endif /* CONFIG_PROC_FS */
+ 
+ static struct xt_match coova_mt_reg[] __read_mostly = {

diff --git a/utils/nnn/Makefile b/utils/nnn/Makefile
index 77bb25128f318d444d150f8297edca67c97bb50e..6b105c7ebba728c5c94b9420c491e52cd54078bf 100644 (file)
--- a/utils/nnn/Makefile
+++ b/utils/nnn/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nnn
-PKG_VERSION:=3.4
+PKG_VERSION:=3.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/jarun/nnn/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=7803ae6e974aeb4008507d9d1afbcca8d084a435f36ff636b459ca50414930a1
+PKG_HASH:=875094caebcc22ecf53b3722d139b127d25e1d5563a954342f32ded8980978b5
 
 PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
 PKG_LICENSE:=BSD-2-Clause