From 2f5fce8209abcfa75dd586685bd6fef06ba372ac Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sat, 7 Mar 2020 09:54:13 +0100 Subject: [PATCH] syslog-ng: update to version 3.26.1 - Bump version also in the config file - Move logread to /sbin location instead of /usr/sbin Because package logd in OpenWrt's ubox Makefile uses /sbin folder and LuCI has the same path hardcoded in modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json and using different location results that LuCI is not able to load log data as it is not found. Signed-off-by: Josef Schlehofer (cherry picked from commit fe165eeb94d2e7fb35fee93e64336afa024a1283) --- admin/syslog-ng/Makefile | 11 ++++++----- admin/syslog-ng/files/syslog-ng.conf | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index a6825b64b7..b47151e467 100644 --- a/admin/syslog-ng/Makefile +++ b/admin/syslog-ng/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syslog-ng -PKG_VERSION:=3.25.1 -PKG_RELEASE:=2 +PKG_VERSION:=3.26.1 +PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later @@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=COPYING LGPL.txt GPL.txt 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:=34cb9673bcde58d543890e6c1189f466f938e199f227c524a6fa2f47f4db6817 +PKG_SOURCE_URL:=https://github.com/syslog-ng/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_HASH:=90214223864df252cea80dbb35c88a2464edcbbb2c9fbc6f6f6c13ee60cb62cd PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -85,7 +85,8 @@ define Package/syslog-ng/install $(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc touch $(1)/etc/syslog-ng.d/.keep - $(INSTALL_BIN) ./files/logread $(1)/usr/sbin + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) ./files/logread $(1)/sbin endef define Package/syslog-ng/postinst diff --git a/admin/syslog-ng/files/syslog-ng.conf b/admin/syslog-ng/files/syslog-ng.conf index 6dcfead867..01538f9c9a 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.25 +@version: 3.26 @include "scl.conf" @include "/etc/syslog-ng.d/" # Put any customization files in this directory -- 2.30.2