[Modesecurity] Upgrade modesecurity to be able to use it at Debian12 …

…that does not contain libpcre++-dev lib anymore
bytedeco · Apr 10, 2024 · afb20ce · afb20ce
1 parent 7c29f9b
commit afb20ce
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/.github/actions/deploy-centos/action.yml b/.github/actions/deploy-centos/action.yml
@@ -30,7 +30,7 @@ runs:
           sed -i 's/mirror\.centos\.org\/centos/vault.centos.org/g;s/6\/sclo/6.10\/sclo/g;s/mirrorlist/#mirrorlist/g;s/#baseurl/baseurl/g' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
         fi
         curl -L "https://negativo17.org/repos/epel-multimedia.repo" | sed -e '/^\[[a-z\-]*\]/a priority=99' > /etc/yum.repos.d/epel-multimedia.repo
-        yum -y install $SCL_ENABLE $SCL_INSTALL rh-java-common-ant boost-devel ccache clang gcc-c++ gcc-gfortran java-1.8.0-openjdk-devel ant python python3-devel python3-pip swig file which wget unzip tar bzip2 gzip xz patch autoconf-archive automake make libtool bison flex perl-core nasm alsa-lib-devel freeglut-devel gtk2-devel libusb-devel libusb1-devel curl-devel expat-devel gettext-devel openssl-devel bzip2-devel zlib-devel SDL2-devel libva-devel libxkbcommon-devel libxkbcommon-x11-devel xcb-util* fontconfig-devel libffi-devel ragel ocl-icd-devel GeoIP-devel pcre-devel ssdeep-devel yajl-devel
+        yum -y install $SCL_ENABLE $SCL_INSTALL rh-java-common-ant boost-devel ccache clang gcc-c++ gcc-gfortran java-1.8.0-openjdk-devel ant python python3-devel python3-pip swig file which wget unzip tar bzip2 gzip xz patch autoconf-archive automake make libtool bison flex perl-core nasm alsa-lib-devel freeglut-devel gtk2-devel libusb-devel libusb1-devel curl-devel expat-devel gettext-devel openssl-devel bzip2-devel zlib-devel SDL2-devel libva-devel libxkbcommon-devel libxkbcommon-x11-devel xcb-util* fontconfig-devel libffi-devel ragel ocl-icd-devel GeoIP-devel pcre-devel pcre2-devel ssdeep-devel yajl-devel
         # https://gcc.gnu.org/legacy-ml/gcc-patches/2018-01/msg01962.html
         sed -i 's/_mm512_abs_pd (__m512 __A)/_mm512_abs_pd (__m512d __A)/g' /opt/rh/devtoolset-9/root/usr/lib/gcc/x86_64-redhat-linux/9/include/avx512fintrin.h
         source scl_source enable $SCL_ENABLE || true

diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml
@@ -98,7 +98,7 @@ runs:
         # $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA6932366A755776
         $SUDO apt-get update
         $SUDO apt-get -y install gcc-multilib g++-multilib gfortran-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH libpulse-dev:$ARCH
-        $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev libdrm-dev
+        $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev libdrm-dev libpcre2-dev
 
         export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
         echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV

diff --git a/.github/actions/redeploy/action.yml b/.github/actions/redeploy/action.yml
@@ -41,10 +41,10 @@ runs:
       env:
         GITHUB_EVENT_HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
       run: |
-        if [[ -z ${CI_DEPLOY_USERNAME:-} ]] || [[ "$GITHUB_EVENT_NAME" == "pull_request" ]] || [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
+        # if [[ -z ${CI_DEPLOY_USERNAME:-} ]] || [[ "$GITHUB_EVENT_NAME" == "pull_request" ]] || [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
             # We are not deploying snapshots
-            exit 0
-        fi
+            # exit 0
+        # fi
 
         git --version
         mvn -version

diff --git a/.github/workflows/modsecurity.yml b/.github/workflows/modsecurity.yml
@@ -21,13 +21,13 @@ jobs:
     runs-on: ubuntu-20.04
     container: centos:7
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+      - uses: andriyyarish/javacpp-presets/.github/actions/deploy-centos@modsecurity_3_0_12_for_debian12
   macosx-x86_64:
     runs-on: macos-11
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
+      - uses: andriyyarish/javacpp-presets/.github/actions/deploy-macosx@modsecurity_3_0_12_for_debian12
   redeploy:
     needs: [linux-x86_64, macosx-x86_64]
     runs-on: ubuntu-20.04
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
+      - uses: andriyyarish/javacpp-presets/.github/actions/redeploy@modsecurity_3_0_12_for_debian12
diff --git a/modsecurity/cppbuild.sh b/modsecurity/cppbuild.sh
@@ -14,7 +14,7 @@ INSTALL_PATH=`pwd`
 if [[ ! -d "ModSecurity" ]]; then
     git clone https://github.com/SpiderLabs/ModSecurity
     cd ModSecurity
-    git checkout v3.0.8
+    git checkout v3.0.12
     git submodule init
     git submodule update
 else
@@ -24,14 +24,14 @@ fi
 case $PLATFORM in
     linux-x86_64)
         sh build.sh
-        ./configure --prefix=$INSTALL_PATH
+        ./configure --prefix=$INSTALL_PATH --with-pcre2
         make -j $MAKEJ
         make install-strip
         ;;
     macosx-x86_64)
         sh build.sh
         sedinplace 's/\\\$rpath/@rpath/g' configure
-        ./configure --prefix=$INSTALL_PATH
+        ./configure --prefix=$INSTALL_PATH --with-pcre2
         make -j $MAKEJ
         make install-strip
         ;;

diff --git a/modsecurity/platform/pom.xml b/modsecurity/platform/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.11-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.bytedeco</groupId>
   <artifactId>modsecurity-platform</artifactId>
-  <version>3.0.8-${project.parent.version}</version>
+  <version>3.0.12-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for ModSecurity</name>
 
   <properties>

diff --git a/modsecurity/pom.xml b/modsecurity/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.11-SNAPSHOT</version>
   </parent>
 
   <groupId>org.bytedeco</groupId>
   <artifactId>modsecurity</artifactId>
-  <version>3.0.8-${project.parent.version}</version>
+  <version>3.0.12-${project.parent.version}</version>
   <name>JavaCPP Presets for ModSecurity</name>
 
   <dependencies>

diff --git a/modsecurity/samples/pom.xml b/modsecurity/samples/pom.xml
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>modsecurity-platform</artifactId>
-            <version>3.0.8-1.5.8</version>
+            <version>3.0.12-1.5.8</version>
        </dependency>
     </dependencies>
     <build>