use libmodsecurity3 from package source

Author: mib1185

.github/workflows/build.yml

@@ -62,7 +62,6 @@ jobs:
             CROWDSEC_OPENRESTY_BOUNCER_VERSION=${{ env.CROWDSEC_OPENRESTY_BOUNCER_VERSION }}
             LUA_VERSION=${{ env.LUA_VERSION }}
             LUAROCKS_VERSION=${{ env.LUAROCKS_VERSION }}
-            LIBMODSECURITY_VERSION=${{ env.LIBMODSECURITY_VERSION }}
             MODSECURITY_NGINX_VERSION=${{ env.MODSECURITY_NGINX_VERSION }}
             CRS_VERSION=${{ env.CRS_VERSION }}
 

docker/Dockerfile

@@ -7,7 +7,6 @@ FROM debian:bookworm-slim AS nginxbuilder
 ARG OPENRESTY_VERSION
 ARG LUA_VERSION
 ARG LUAROCKS_VERSION
-ARG LIBMODSECURITY_VERSION
 ARG MODSECURITY_NGINX_VERSION
 
 RUN apt-get update \
@@ -20,24 +19,16 @@ RUN apt-get update \
 	libssl-dev \
 	openssl \
 	unzip \
-	autoconf \
-	automake \
-	libtool \
-	libpcre2-dev \
-	libpcre2-posix3 \
 	wget \
 	zlib1g-dev \
 	git \
-	libmaxminddb-dev
+	libmaxminddb-dev \
+	libmodsecurity3
 
 # Lua build
 COPY ./scripts/build-lua /tmp/build-lua
 RUN /tmp/build-lua
 
-# LibModSecurity build
-COPY ./scripts/build-modsecurity /tmp/build-modsecurity
-RUN /tmp/build-modsecurity
-
 # Nginx build
 COPY ./scripts/build-openresty /tmp/build-openresty
 RUN /tmp/build-openresty
@@ -75,6 +66,7 @@ RUN apt-get update \
 	wget \
 	xz-utils \
 	libmaxminddb-dev \
+	libmodsecurity3 \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/cache/* /var/log/* /tmp/* /var/lib/dpkg/status-old
@@ -87,7 +79,6 @@ COPY --from=nginxbuilder /tmp/luarocks /tmp/luarocks
 COPY ./scripts/install-lua /tmp/install-lua
 
 # Copy openresty build from first image
-COPY --from=nginxbuilder /tmp/modsecurity /tmp/modsecurity
 COPY --from=nginxbuilder /tmp/openresty /tmp/openresty
 COPY ./scripts/install-openresty /tmp/install-openresty
 

local-build.sh

@@ -13,7 +13,6 @@ export OPENRESTY_VERSION=1.25.3.2
 export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7
 export LUA_VERSION=5.1.5
 export LUAROCKS_VERSION=3.3.1
-export LIBMODSECURITY_VERSION=3.0.13
 export MODSECURITY_NGINX_VERSION=1.0.3
 export CRS_VERSION=4.8.0
 

local-buildx.sh

@@ -13,7 +13,6 @@ export OPENRESTY_VERSION=1.25.3.2
 export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7
 export LUA_VERSION=5.1.5
 export LUAROCKS_VERSION=3.3.1
-export LIBMODSECURITY_VERSION=3.0.13
 export MODSECURITY_NGINX_VERSION=1.0.3
 export CRS_VERSION=4.8.0
 

scripts/build-modsecurity

@@ -8,10 +8,6 @@ RESET='\E[0m'
 
 echo -e "${BLUE}❯ ${CYAN}Installing OpenResty ${YELLOW}${OPENRESTY_VERSION}...${RESET}"
 
-cd /tmp/modsecurity
-make install
-rm -rf /tmp/modsecurity
-
 cd /tmp/openresty
 make install
 rm -rf /tmp/openresty

scripts/install-openresty

@@ -2,6 +2,5 @@ OPENRESTY_VERSION=1.25.3.2
 CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7
 LUA_VERSION=5.1.5
 LUAROCKS_VERSION=3.3.1
-LIBMODSECURITY_VERSION=3.0.13
 MODSECURITY_NGINX_VERSION=1.0.3
 CRS_VERSION=4.8.0