Hi all, similarly to modsecurity, here is a proposal for mod_defender. Hope it is useful.
Kind regards.
From 8cbe58187a71eb505f7439b28847dccbc82a328a Mon Sep 17 00:00:00 2001 From: David Carlier <[email protected]> Date: Wed, 7 Jun 2017 12:39:16 +0100 Subject: [PATCH] BUG/MINOR: contrib/mod_defender: build fix In similar manner than modsecurity, making the build possible under *BSD flavors, the -lm for ceilf function. --- contrib/mod_defender/Makefile | 18 +++++++++++++----- contrib/mod_defender/spoa.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile index 119d8240..ac17774d 100644 --- a/contrib/mod_defender/Makefile +++ b/contrib/mod_defender/Makefile @@ -2,10 +2,10 @@ DESTDIR = PREFIX = /usr/local BINDIR = $(PREFIX)/bin -CC = gcc +CC ?= gcc LD = $(CC) -CXX = g++ +CXX ?= g++ ifeq ($(MOD_DEFENDER_SRC),) MOD_DEFENDER_SRC := ./mod_defender_src @@ -19,9 +19,17 @@ ifeq ($(APR_INC),) APR_INC := /usr/include/apr-1.0 endif -CFLAGS = -g -Wall -pthread -LDFLAGS = -lpthread -levent -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) +ifeq ($(EVENT_LIB),) +EVENT_LIB := -levent +endif + +ifeq ($(EVENT_INC),) +EVENT_INC := /usr/include +endif + +CFLAGS += -g -Wall -pthread +LDFLAGS += -lpthread $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm +INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC) LIBS = CXXFLAGS = -g -std=gnu++11 diff --git a/contrib/mod_defender/spoa.h b/contrib/mod_defender/spoa.h index 332f387d..726007fc 100644 --- a/contrib/mod_defender/spoa.h +++ b/contrib/mod_defender/spoa.h @@ -16,6 +16,7 @@ #define __SPOA_H__ #include <sys/time.h> +#undef LIST_HEAD #include <event2/util.h> #include <event2/event.h> -- 2.13.0
