From 298a91364ca8c3ecf0e452ad7d53575c4a921a38 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 1 Sep 2019 16:19:31 +0200 Subject: [PATCH 1/2] syslog-ng: Update to version 3.23.1 Signed-off-by: Josef Schlehofer --- admin/syslog-ng/Makefile | 4 ++-- admin/syslog-ng/files/syslog-ng.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index d75f534b1..7d03d2746 100644 --- 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.22.1 +PKG_VERSION:=3.23.1 PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer @@ -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/balabit/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_HASH:=0656443776fa554320cb81bbebeac72bdf871298dd2ebef7413c393aec4d74c8 +PKG_HASH:=fb36cfc1982831f74143b77a924ee79714745b5e2b3ff59d086d09a77d0acd38 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 be5c76a32..36a2ce576 100644 --- 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.22 +@version: 3.23 @include "scl.conf" @include "/etc/syslog-ng.d/" # Put any customization files in this directory From d4eed8c4224e88dc15a9eec6d6d14e57553472e6 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 1 Sep 2019 16:21:57 +0200 Subject: [PATCH 2/2] syslog-ng: Add GPL license for plugins - Correct SPDX License Identifier - Move DEPENDS under URL Signed-off-by: Josef Schlehofer --- admin/syslog-ng/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index 7d03d2746..57d3123de 100644 --- a/admin/syslog-ng/Makefile +++ b/admin/syslog-ng/Makefile @@ -5,8 +5,8 @@ PKG_VERSION:=3.23.1 PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer -PKG_LICENSE:=LGPL-2.1+ -PKG_LICENSE_FILES:=COPYING +PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING LGPL.txt GPL.txt PKG_CPE_ID:=cpe:/a:balabit:syslog-ng PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -25,9 +25,9 @@ include $(INCLUDE_DIR)/nls.mk define Package/syslog-ng SECTION:=admin CATEGORY:=Administration - DEPENDS:=+libpcre +glib2 +libopenssl +libpthread +librt +zlib +libdbi +libjson-c +libcurl +libuuid TITLE:=A powerful syslog daemon URL:=https://www.syslog-ng.com/products/open-source-log-management/ + DEPENDS:=+libpcre +glib2 +libopenssl +libpthread +librt +zlib +libdbi +libjson-c +libcurl +libuuid endef define Package/syslog-ng/description