mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

syslog-ng: upgrade 3.19.1 -> 3.24.1

Browse Source 
(1) Refresh three patches for new version.
    fix-config-libnet.patch
    syslog-ng.service-the-syslog-ng-service.patch
    0001-syslog-ng-fix-segment-fault-during-service-start.patch

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zheng Ruoqin
2019-11-08 18:08:44 +08:00
committed by Khem Raj
parent b0b9cebc72
commit 75afdfd44d
4 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
+24 -22
View File
@@ -6,25 +6,28 @@ This would avoid a implicit auto-detecting result.
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
configure.ac | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
Index: syslog-ng-3.8.1/configure.ac
===================================================================
--- syslog-ng-3.8.1.orig/configure.ac
+++ syslog-ng-3.8.1/configure.ac
@@ -104,6 +104,9 @@ AC_CONFIG_HEADERS(config.h)
Update for 3.24.1.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
configure.ac | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 00eb566..e7d5ac1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h)
dnl ***************************************************************************
dnl Arguments
+AC_ARG_ENABLE(libnet,
+AC_ARG_ENABLE(libnet,
+ [ --enable-libnet Enable libnet support.],, enable_libnet="no")
+
AC_ARG_WITH(libnet,
[ --with-libnet=path use path to libnet-config script],
,
@@ -893,22 +896,26 @@ dnl ************************************
@@ -1047,19 +1050,20 @@ dnl ***************************************************************************
dnl libnet headers/libraries
dnl ***************************************************************************
AC_MSG_CHECKING(for LIBNET)
@@ -39,7 +42,14 @@ Index: syslog-ng-3.8.1/configure.ac
+ else
+ LIBNET_CONFIG="$with_libnet/libnet-config"
+ fi
+
-if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`"
- LIBNET_LIBS="`$LIBNET_CONFIG --libs`"
- AC_MSG_RESULT(yes)
-dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build
-dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till
- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE"
+ if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
+ LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`"
+ LIBNET_LIBS="`$LIBNET_CONFIG --libs`"
@@ -48,16 +58,8 @@ Index: syslog-ng-3.8.1/configure.ac
+ AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.])
+ fi
-if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`"
- LIBNET_LIBS="`$LIBNET_CONFIG --libs`"
- AC_MSG_RESULT(yes)
else
LIBNET_LIBS=
AC_MSG_RESULT(no)
fi
-
if test "x$enable_spoof_source" = "xauto"; then
AC_MSG_CHECKING(whether to enable spoof source support)
if test "x$LIBNET_LIBS" != "x"; then
--
2.7.4