* [PATCH 0/2] ulogd: minor fix and improvement @ 2011-08-28 22:43 Eric Leblond 2011-08-28 22:43 ` [PATCH 1/2] pcap: fix build on some recent x86_64 platform Eric Leblond 2011-08-28 22:43 ` [PATCH 2/2] pcap: add file option to configuration file Eric Leblond 0 siblings, 2 replies; 5+ messages in thread From: Eric Leblond @ 2011-08-28 22:43 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel Hello, Here is a small patchset that fix the build of pcap output plugin on some platform (patch 1) and which adds a missing option of the pcap plugin to the configuration file (patch 2). BR, -- Eric ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] pcap: fix build on some recent x86_64 platform. 2011-08-28 22:43 [PATCH 0/2] ulogd: minor fix and improvement Eric Leblond @ 2011-08-28 22:43 ` Eric Leblond 2011-09-01 15:08 ` Pablo Neira Ayuso 2011-08-28 22:43 ` [PATCH 2/2] pcap: add file option to configuration file Eric Leblond 1 sibling, 1 reply; 5+ messages in thread From: Eric Leblond @ 2011-08-28 22:43 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel, Eric Leblond --- acinclude.m4 | 3 ++- configure.ac | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 9a8e1ae..56d47b8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -218,6 +218,7 @@ AC_ARG_WITH(pcap-lib, AC_SUBST(PCAP_INC) AC_SUBST(PCAP_LIB) +AC_SUBST(HAVE_PCAP_LIB) if test "$pcap_prefix" != "no"; then @@ -261,7 +262,7 @@ if test "$PCAP_INC" = "" ; then AC_CHECK_HEADER([pcap.h], [], AC_MSG_WARN(pcap.h not found)) fi if test "$PCAP_LIB" = "" ; then - AC_CHECK_LIB(pcap, pcap_close, [], AC_MSG_WARN(libpcap.so not found)) + AC_CHECK_LIB(pcap, pcap_close, [HAVE_PCAP_LIB="yes"], AC_MSG_WARN(libpcap.so not found)) fi fi diff --git a/configure.ac b/configure.ac index f835707..e8f8427 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ CT_CHECK_DBI() AM_CONDITIONAL(HAVE_DBI, test "x$DBI_LIB" != "x") CT_CHECK_PCAP() -AM_CONDITIONAL(HAVE_PCAP, test "x$PCAP_LIB" != "x") +AM_CONDITIONAL(HAVE_PCAP, test "x$HAVE_PCAP_LIB" != "x") dnl AC_SUBST(DATABASE_DIR) -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] pcap: fix build on some recent x86_64 platform. 2011-08-28 22:43 ` [PATCH 1/2] pcap: fix build on some recent x86_64 platform Eric Leblond @ 2011-09-01 15:08 ` Pablo Neira Ayuso 0 siblings, 0 replies; 5+ messages in thread From: Pablo Neira Ayuso @ 2011-09-01 15:08 UTC (permalink / raw) To: Eric Leblond; +Cc: netfilter-devel On Mon, Aug 29, 2011 at 12:43:31AM +0200, Eric Leblond wrote: > --- > acinclude.m4 | 3 ++- > configure.ac | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) Applied, thanks Eric. ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] pcap: add file option to configuration file 2011-08-28 22:43 [PATCH 0/2] ulogd: minor fix and improvement Eric Leblond 2011-08-28 22:43 ` [PATCH 1/2] pcap: fix build on some recent x86_64 platform Eric Leblond @ 2011-08-28 22:43 ` Eric Leblond 2011-09-01 15:09 ` Pablo Neira Ayuso 1 sibling, 1 reply; 5+ messages in thread From: Eric Leblond @ 2011-08-28 22:43 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel, Eric Leblond --- ulogd.conf.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ulogd.conf.in b/ulogd.conf.in index b7b714b..5fe2639 100644 --- a/ulogd.conf.in +++ b/ulogd.conf.in @@ -171,6 +171,8 @@ directory="/var/log/" sync=1 [pcap1] +#default file is /var/log/ulogd.pcap +#file=/var/log/ulogd.pcap sync=1 [mysql1] -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] pcap: add file option to configuration file 2011-08-28 22:43 ` [PATCH 2/2] pcap: add file option to configuration file Eric Leblond @ 2011-09-01 15:09 ` Pablo Neira Ayuso 0 siblings, 0 replies; 5+ messages in thread From: Pablo Neira Ayuso @ 2011-09-01 15:09 UTC (permalink / raw) To: Eric Leblond; +Cc: netfilter-devel On Mon, Aug 29, 2011 at 12:43:32AM +0200, Eric Leblond wrote: > --- > ulogd.conf.in | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) Also applied, thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-01 15:09 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-08-28 22:43 [PATCH 0/2] ulogd: minor fix and improvement Eric Leblond 2011-08-28 22:43 ` [PATCH 1/2] pcap: fix build on some recent x86_64 platform Eric Leblond 2011-09-01 15:08 ` Pablo Neira Ayuso 2011-08-28 22:43 ` [PATCH 2/2] pcap: add file option to configuration file Eric Leblond 2011-09-01 15:09 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).