From 0d9a2defb64e10e8167888d5758a45a58dba18cd Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Thu, 21 Feb 2019 17:27:26 -0300 Subject: [PATCH] package/snort: build with OpenAppID support if luajit/openssl is enabled Since version 2.9.12, OpenAppID [1] is enabled by default. OpenAppID depends on luajit and openssl. If we leave it enabled by default, snort would require luajit. Since luajit is not available on all architectures, that would limit the usage of the snort package. Since not all users will need/use OpenAppID, let's leave it disabled by default. To build with OpenAppID support, the user will need to enable luajit and libssl. Also, it is necessary to apply a patch to fix a compile error when building OpenAppID with uclibc and musl. The build fails when dereferencing the rpcent structure because rpc.h is not been included. [1] https://www.snort.org/downloads/openappid/9553 Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- ...r-when-building-against-uclibc-or-mu.patch | 34 +++++++++++++++++++ package/snort/snort.mk | 9 +++++ 2 files changed, 43 insertions(+) create mode 100644 package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch diff --git a/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch b/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch new file mode 100644 index 0000000000..ce9d5526c8 --- /dev/null +++ b/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch @@ -0,0 +1,34 @@ +From dc2f54097da3cd493b8f4d06a14ef40be484d24f Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Thu, 21 Feb 2019 15:02:08 -0300 +Subject: [PATCH] Fix compile error when building against uclibc or musl + +The build fails when dereferencing the rpcent structure with uclibc or musl C libraries. + +../../../src/dynamic-preprocessors/appid/service_plugins/service_rpc.c:241:20: +error: dereferencing pointer to incomplete type ‘struct rpcent’ + if (rpc->r_name) + +That's because rpc.h should be included when using these C libraries. + +Signed-off-by: Sergio Prado +--- + src/dynamic-preprocessors/appid/service_plugins/service_rpc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c b/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c +index 81bc8a5db8ab..2e45246083a8 100644 +--- a/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c ++++ b/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c +@@ -32,7 +32,7 @@ + #include "flow.h" + #include "service_api.h" + +-#if defined(FREEBSD) || defined(OPENBSD) ++#if defined(FREEBSD) || defined(OPENBSD) || (defined(LINUX) && defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__)) + #include "rpc/rpc.h" + #endif + +-- +2.7.4 + diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 30de02b3a8..c767d7c545 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -26,6 +26,15 @@ SNORT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` SNORT_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` endif +# luajit and openssl should be enabled to build with +# OpenAppID support +ifeq ($(BR2_PACKAGE_LUAJIT)$(BR2_PACKAGE_OPENSSL),yy) +SNORT_DEPENDENCIES += luajit openssl +SNORT_CONF_OPTS += --enable-open-appid +else +SNORT_CONF_OPTS += --disable-open-appid +endif + SNORT_CONF_ENV = \ CFLAGS="$(TARGET_CFLAGS) $(SNORT_CFLAGS)" \ LIBS="$(SNORT_LIBS)" \ -- 2.30.2