mirror of
https://github.com/openwrt/packages.git
synced 2026-10-12 05:57:04 +04:00
rsyslog: update to 8.2606.0
Drop 001-configure-make-libyaml-default-on-explicit.patch; it was a backport of upstream commit c5c24486 which is now part of this release, so configure.ac already makes libyaml default-on and fails fast when yaml-0.1 is missing. Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
This commit is contained in:
1 parent
0f55606b7f
commit
4417cbdb1b
2 files changed
+3
-56
No files matched your search
@@ -8,14 +8,14 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=rsyslog
|
||||
PKG_VERSION:=8.2604.0
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=8.2606.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:= \
|
||||
https://fossies.org/linux/misc \
|
||||
https://www.rsyslog.com/files/download/rsyslog
|
||||
PKG_HASH:=2a04b1cd6f0a5e2b60eec231acce3cf9927c4ed02bc5fbbe5dc4c35fcf887b64
|
||||
PKG_HASH:=2574b3f3068e6955eb94ef5643e2b6a5b8585cc8eaa77209ff5cbc1e2e5f71e5
|
||||
|
||||
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
From c5c2448617e72d088e818a5581a8a6cc85e81963 Mon Sep 17 00:00:00 2001
|
||||
From: Rainer Gerhards <rgerhards@adiscon.com>
|
||||
Date: Sat, 16 May 2026 10:44:45 +0200
|
||||
Subject: [PATCH] configure: make libyaml default-on explicit
|
||||
|
||||
Why: Distro builds must not silently change rsyslog features based
|
||||
on whether libyaml development files happen to be installed.
|
||||
|
||||
Impact: Default builds now require yaml-0.1 unless --disable-libyaml
|
||||
is passed explicitly.
|
||||
|
||||
Before/After: Before, configure auto-disabled libyaml features;
|
||||
after, the default fails fast and opt-out builds are explicit.
|
||||
|
||||
Closes https://github.com/rsyslog/rsyslog/issues/6914
|
||||
|
||||
Upstream-Status: Backport [v8.2604.0 -> 8.2606.0]
|
||||
Upstream-Commit: c5c2448617e72d088e818a5581a8a6cc85e81963
|
||||
---
|
||||
configure.ac | 17 +++++++++++++----
|
||||
1 file changed, 13 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -166,11 +166,24 @@ AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#i
|
||||
)
|
||||
|
||||
# Checks for libraries.
|
||||
-PKG_CHECK_MODULES([LIBYAML], [yaml-0.1], [
|
||||
- AC_DEFINE([HAVE_LIBYAML], [1], [Define if libyaml is available])
|
||||
- have_libyaml=yes
|
||||
+AC_ARG_ENABLE(libyaml,
|
||||
+ [AS_HELP_STRING([--disable-libyaml],
|
||||
+ [Disable libyaml-backed YAML configuration and policy file support @<:@default=enabled@:>@])],
|
||||
+ [case "${enableval}" in
|
||||
+ yes) enable_libyaml="yes" ;;
|
||||
+ no) enable_libyaml="no" ;;
|
||||
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-libyaml) ;;
|
||||
+ esac],
|
||||
+ [enable_libyaml="yes"]
|
||||
+)
|
||||
+AS_IF([test "x$enable_libyaml" = "xyes"], [
|
||||
+ PKG_CHECK_MODULES([LIBYAML], [yaml-0.1], [
|
||||
+ AC_DEFINE([HAVE_LIBYAML], [1], [Define if libyaml is available])
|
||||
+ have_libyaml=yes
|
||||
+ ], [
|
||||
+ AC_MSG_ERROR([libyaml support is enabled by default but yaml-0.1 was not found. Install libyaml development files or configure with --disable-libyaml.])
|
||||
+ ])
|
||||
], [
|
||||
- AC_MSG_WARN([libyaml not found, rate limiting policies from files and YAML configuration support will be disabled])
|
||||
have_libyaml=no
|
||||
])
|
||||
AM_CONDITIONAL(HAVE_LIBYAML, test x$have_libyaml = xyes)
|
||||
Reference in new issue
Block a user