summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 23:09:12 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:42 -0700
commit72d710cadcf0bc17fe676618daddbab8e1282fb2 (patch)
tree76160d6c2d8ddf5bd251b1881b2762d60cf69175 /meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
parent1eb1f5588146fcd4d555ecd2de420a7f8e186aa0 (diff)
downloadmeta-openembedded-72d710cadcf0bc17fe676618daddbab8e1282fb2.tar.gz
syslog-ng: refresh patches
WARNING: syslog-ng-3.8.1-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch configure.ac-add-option-enable-thread-tls-to-manage-.patch patching file configure.ac Hunk #1 succeeded at 147 with fuzz 2 (offset 27 lines). Hunk #2 succeeded at 489 (offset 105 lines). Now at patch configure.ac-add-option-enable-thread-tls-to-manage-.patch Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch')
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch15
1 files changed, 6 insertions, 9 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
index 755803c213..553f4a5171 100644
--- a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
+++ b/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
@@ -10,11 +10,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10 configure.ac | 27 +++++++++++++++++---------- 10 configure.ac | 27 +++++++++++++++++----------
11 1 files changed, 17 insertions(+), 10 deletions(-) 11 1 files changed, 17 insertions(+), 10 deletions(-)
12 12
13diff --git a/configure.ac b/configure.ac 13Index: syslog-ng-3.8.1/configure.ac
14index b1e18b4..8e13025 100644 14===================================================================
15--- a/configure.ac 15--- syslog-ng-3.8.1.orig/configure.ac
16+++ b/configure.ac 16+++ syslog-ng-3.8.1/configure.ac
17@@ -73,6 +73,9 @@ AC_CONFIG_HEADERS(config.h) 17@@ -104,6 +104,9 @@ AC_CONFIG_HEADERS(config.h)
18 dnl *************************************************************************** 18 dnl ***************************************************************************
19 dnl Arguments 19 dnl Arguments
20 20
@@ -24,7 +24,7 @@ index b1e18b4..8e13025 100644
24 AC_ARG_WITH(libnet, 24 AC_ARG_WITH(libnet,
25 [ --with-libnet=path use path to libnet-config script], 25 [ --with-libnet=path use path to libnet-config script],
26 , 26 ,
27@@ -768,22 +771,26 @@ dnl *************************************************************************** 27@@ -893,22 +896,26 @@ dnl ************************************
28 dnl libnet headers/libraries 28 dnl libnet headers/libraries
29 dnl *************************************************************************** 29 dnl ***************************************************************************
30 AC_MSG_CHECKING(for LIBNET) 30 AC_MSG_CHECKING(for LIBNET)
@@ -61,6 +61,3 @@ index b1e18b4..8e13025 100644
61 if test "x$enable_spoof_source" = "xauto"; then 61 if test "x$enable_spoof_source" = "xauto"; then
62 AC_MSG_CHECKING(whether to enable spoof source support) 62 AC_MSG_CHECKING(whether to enable spoof source support)
63 if test "x$LIBNET_LIBS" != "x"; then 63 if test "x$LIBNET_LIBS" != "x"; then
64--
651.7.1
66