Skip to contentSkip to conversation

package/rsyslog: bump to 8.1910.0

PATCH New Matt Weber 2 participants 3 messages Oct 30, 2019 – Nov 4, 2019

lore
Share & tools
lore

Matt Weber

author
#0 lore raw

PATCH 1/1 package/rsyslog: bump to 8.1910.0

The rsyslog project removed the ability to toggle libcurl dependencies in
https://github.com/rsyslog/rsyslog/commit/dc95ef09bdb07cfb7b7df4ce87df629fc2c94f8f,
however there are a series of options that now add a libcurl dependency.

This bump disables the following options to prevent libcurl as a new dependency.
--disable-elasticsearch
--disable-clickhouse
--disable-omhttp
--disable-fmhttp
--disable-imdocker
--disable-omhttpfs
--disable-mmkubernetes

---

$ ./utils/test-pkg -p rsyslog -d testbuild
                             br-arm-full [1/6]: OK
                  br-arm-cortex-a9-glibc [2/6]: OK
                   br-arm-cortex-m4-full [3/6]: SKIPPED
                          br-x86-64-musl [4/6]: SKIPPED
                      br-arm-full-static [5/6]: SKIPPED
                            sourcery-arm [6/6]: OK
6 builds, 3 skipped, 0 build failed, 0 legal-info failed
---
 package/rsyslog/rsyslog.hash |  2 +-
 package/rsyslog/rsyslog.mk   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
package/rsyslog/rsyslog.hash +1 -1
index fb3a552b0b..a963b4e7bb 100644
@@ -1,5 +1,5 @@
 # From http://www.rsyslog.com/downloads/download-v8-stable/
-sha256	06e2884181333dccecceaca82827ae24ca7a258b4fbf7b1e07a80d4caae640ca	rsyslog-8.22.0.tar.gz
+sha256	0219ee692f31a39743acb62aaf4196b644ce94edf386df4605fd6a11a4fe0c93	rsyslog-8.1910.0.tar.gz
 
 # Locally calculated
 sha256	054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083	COPYING
package/rsyslog/rsyslog.mk +10 -1
index fcd476cee3..5bd6b59ba3 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RSYSLOG_VERSION = 8.22.0
+RSYSLOG_VERSION = 8.1910.0
 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog
 RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0
 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
@@ -17,6 +17,15 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
 RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
 	$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
 
+# Disable items requiring libcurl
+RSYSLOG_CONF_OPTS += --disable-elasticsearch \
+	--disable-clickhouse \
+	--disable-omhttp \
+	--disable-fmhttp \
+	--disable-imdocker \
+	--disable-omhttpfs \
+	--disable-mmkubernetes
+
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 RSYSLOG_DEPENDENCIES += gnutls
 RSYSLOG_CONF_OPTS += --enable-gnutls
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 package/rsyslog: bump to 8.1910.0

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Matt" == Matt Weber <[email protected]> writes:

The rsyslog project removed the ability to toggle libcurl dependencies in
https://github.com/rsyslog/rsyslog/commit/dc95ef09bdb07cfb7b7df4ce87df629fc2c94f8f,
however there are a series of options that now add a libcurl dependency.

Quoted 8 lines

This bump disables the following options to prevent libcurl as a new dependency.
--disable-elasticsearch
--disable-clickhouse
--disable-omhttp
--disable-fmhttp
--disable-imdocker
--disable-omhttpfs
--disable-mmkubernetes

Is that the only dependency they have? Do they add a lot of size? Do they need TLS support in libcurl? If not, we might consider enabling them when libcurl is enabled.

But OK, that can be done later.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/rsyslog: bump to 8.1910.0

Peter,

Quoted 16 lines · Peter Korsgaard
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

"Matt" == Matt Weber <[email protected]> writes:

The rsyslog project removed the ability to toggle libcurl dependencies in
https://github.com/rsyslog/rsyslog/commit/dc95ef09bdb07cfb7b7df4ce87df629fc2c94f8f,
however there are a series of options that now add a libcurl dependency.

Quoted 8 lines

This bump disables the following options to prevent libcurl as a new dependency.
--disable-elasticsearch
--disable-clickhouse
--disable-omhttp
--disable-fmhttp
--disable-imdocker
--disable-omhttpfs
--disable-mmkubernetes

Quoted 4 lines

Is that the only dependency they have? Do they add a lot of size? Do they need TLS support in libcurl? If not, we might consider enabling them when libcurl is enabled.

I have sent a patch which conditionally enables these when libcurl is enabled. We'll have to see what the autobuilders catch for other dependencies. The pkg seems to build Ok with just adding the libcurl dependency with TLS support disabled.

http://patchwork.ozlabs.org/patch/1189163/

Matt