[Buildroot] [PATCH 1/2] package/rsyslog: add imhttp support

[Buildroot] [PATCH 1/2] package/rsyslog: add imhttp support

[Fabrice Fontaine]

imhttp support is available since version 8.2010.0 and only depends on
civetweb:
https://github.com/rsyslog/rsyslog/commit/6102f6083cfa73fe4a91e3d34c4d1dc924465278

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/rsyslog/rsyslog.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index d20a13dbdd..6da2a469a9 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -30,11 +30,17 @@ RSYSLOG_CONF_OPTS += --disable-elasticsearch \
 	--disable-omhttp \
 	--disable-fmhttp \
 	--disable-imdocker \
-	--disable-imhttp \
 	--disable-impcap \
 	--disable-omhttpfs \
 	--disable-mmkubernetes
 
+ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y)
+RSYSLOG_DEPENDENCIES += civetweb
+RSYSLOG_CONF_OPTS += --enable-imhttp
+else
+RSYSLOG_CONF_OPTS += --disable-imhttp
+endif
+
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 RSYSLOG_DEPENDENCIES += gnutls
 RSYSLOG_CONF_OPTS += --enable-gnutls
-- 
2.30.0

[Buildroot] [PATCH 2/2] package/rsyslog: add impcap support

[Fabrice Fontaine]

impcap is available since version 8.2006.0 and only depends on libpcap:
https://github.com/rsyslog/rsyslog/commit/76318ad9269309d0423358c545f72f3f79c12203

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/rsyslog/rsyslog.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 6da2a469a9..99e80ae268 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -30,7 +30,6 @@ RSYSLOG_CONF_OPTS += --disable-elasticsearch \
 	--disable-omhttp \
 	--disable-fmhttp \
 	--disable-imdocker \
-	--disable-impcap \
 	--disable-omhttpfs \
 	--disable-mmkubernetes
 
@@ -60,6 +59,13 @@ else
 RSYSLOG_CONF_OPTS += --disable-libgcrypt
 endif
 
+ifeq ($(BR2_PACKAGE_LIBPCAP),y)
+RSYSLOG_DEPENDENCIES += libpcap
+RSYSLOG_CONF_OPTS += --enable-impcap
+else
+RSYSLOG_CONF_OPTS += --disable-impcap
+endif
+
 ifeq ($(BR2_PACKAGE_MYSQL),y)
 RSYSLOG_DEPENDENCIES += mysql
 RSYSLOG_CONF_OPTS += --enable-mysql
-- 
2.30.0

[Buildroot] [PATCH 1/2] package/rsyslog: add imhttp support

[Thomas Petazzoni]

On Mon, 15 Mar 2021 08:44:22 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> imhttp support is available since version 8.2010.0 and only depends on
> civetweb:
> https://github.com/rsyslog/rsyslog/commit/6102f6083cfa73fe4a91e3d34c4d1dc924465278
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/rsyslog/rsyslog.mk | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

Both applied to master. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com