Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump ModSecurity to 3.0.12 #1526

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions .github/workflows/modsecurity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,36 @@ on:
- .github/workflows/modsecurity.yml
workflow_dispatch:
env:
CI_DEPLOY_NEED_GCC: 1
CI_DEPLOY_MODULE: ${{ github.workflow }}
CI_DEPLOY_PLATFORM: ${{ github.job }}
CI_DEPLOY_SETTINGS: ${{ secrets.CI_DEPLOY_SETTINGS }}
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
jobs:
linux-arm64:
runs-on: ubuntu-20.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-ppc64le:
runs-on: ubuntu-20.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-x86_64:
runs-on: ubuntu-20.04
container: centos:7
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
macosx-x86_64:
runs-on: macos-11
runs-on: macos-12
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
windows-x86_64:
runs-on: windows-2019
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
redeploy:
needs: [linux-x86_64, macosx-x86_64]
needs: [linux-arm64, linux-ppc64le, linux-x86_64, macosx-x86_64, windows-x86_64]
runs-on: ubuntu-20.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Upgrade ModSecurity to 3.0.12 ([pull #1526](https://github.com/bytedeco/javacpp-presets/pull/1526))
* Add new `ClangMemoryMgmtExample` in samples for LLVM ([pull #1522](https://github.com/bytedeco/javacpp-presets/pull/1522))
* Enable `opencv_python3` module for `macosx-arm64` as well ([pull #1517](https://github.com/bytedeco/javacpp-presets/pull/1517))
* Introduce `macosx-arm64` builds for CPython ([pull #1511](https://github.com/bytedeco/javacpp-presets/pull/1511)), NumPy ([pull #1515](https://github.com/bytedeco/javacpp-presets/pull/1515)), SciPy ([pull #1516](https://github.com/bytedeco/javacpp-presets/pull/1516))
Expand Down
4 changes: 2 additions & 2 deletions modsecurity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* ModSecurity 3.0.8 https://github.com/SpiderLabs/ModSecurity
* ModSecurity 3.0.12 https://github.com/SpiderLabs/ModSecurity

Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.

Expand Down Expand Up @@ -56,7 +56,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>modsecurity-platform</artifactId>
<version>3.0.8-1.5.8</version>
<version>3.0.123_0-1.5.8</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modsecurity/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modsecurity/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<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>
Expand Down
4 changes: 2 additions & 2 deletions modsecurity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modsecurity/samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
31 changes: 16 additions & 15 deletions modsecurity/src/gen/java/org/bytedeco/modsecurity/Collection.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand All @@ -17,8 +17,6 @@ public class Collection extends Pointer {
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public Collection(Pointer p) { super(p); }

public native void store(@StdString BytePointer key, @StdString BytePointer value);
public native void store(@StdString String key, @StdString String value);

public native @Cast("bool") boolean storeOrUpdateFirst(@StdString BytePointer key,
@StdString BytePointer value);
Expand All @@ -33,18 +31,8 @@ public class Collection extends Pointer {
public native void del(@StdString BytePointer key);
public native void del(@StdString String key);


/* store */
public native void store(@StdString BytePointer key, @StdString BytePointer compartment,
@StdString BytePointer value);
public native void store(@StdString String key, @StdString String compartment,
@StdString String value);


public native void store(@StdString BytePointer key, @StdString BytePointer compartment,
@StdString BytePointer compartment2, @StdString BytePointer value);
public native void store(@StdString String key, @StdString String compartment,
@StdString String compartment2, @StdString String value);
public native void setExpiry(@StdString BytePointer key, int expiry_seconds);
public native void setExpiry(@StdString String key, int expiry_seconds);


/* storeOrUpdateFirst */
Expand Down Expand Up @@ -86,6 +74,19 @@ public native void del(@StdString String key, @StdString String compartment,
@StdString String compartment2);


/* setExpiry */
public native void setExpiry(@StdString BytePointer key, @StdString BytePointer compartment,
int expiry_seconds);
public native void setExpiry(@StdString String key, @StdString String compartment,
int expiry_seconds);


public native void setExpiry(@StdString BytePointer key, @StdString BytePointer compartment,
@StdString BytePointer compartment2, int expiry_seconds);
public native void setExpiry(@StdString String key, @StdString String compartment,
@StdString String compartment2, int expiry_seconds);


/* resolveFirst */


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand All @@ -22,6 +22,7 @@ public class RuleMessageList extends Pointer {
public boolean empty() { return size() == 0; }
public native long size();

public RuleMessage front() { try (Iterator it = begin()) { return it.get(); } }
public native @ByVal Iterator insert(@ByVal Iterator pos, @ByRef RuleMessage value);
public native @ByVal Iterator erase(@ByVal Iterator pos);
public native @ByVal Iterator begin();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down Expand Up @@ -152,6 +152,7 @@ public class RulesSetProperties extends Pointer {
public native @ByRef ConfigDouble m_requestBodyLimit(); public native RulesSetProperties m_requestBodyLimit(ConfigDouble setter);
public native @ByRef ConfigDouble m_requestBodyNoFilesLimit(); public native RulesSetProperties m_requestBodyNoFilesLimit(ConfigDouble setter);
public native @ByRef ConfigDouble m_responseBodyLimit(); public native RulesSetProperties m_responseBodyLimit(ConfigDouble setter);
public native @ByRef ConfigInt m_pcreMatchLimit(); public native RulesSetProperties m_pcreMatchLimit(ConfigInt setter);
public native @ByRef ConfigInt m_uploadFileLimit(); public native RulesSetProperties m_uploadFileLimit(ConfigInt setter);
public native @ByRef ConfigInt m_uploadFileMode(); public native RulesSetProperties m_uploadFileMode(ConfigInt setter);
public native DebugLog m_debugLog(); public native RulesSetProperties m_debugLog(DebugLog setter);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand All @@ -22,6 +22,7 @@ public class StringList extends Pointer {
public boolean empty() { return size() == 0; }
public native long size();

public BytePointer front() { try (Iterator it = begin()) { return it.get(); } }
public native @ByVal Iterator insert(@ByVal Iterator pos, @StdString BytePointer value);
public native @ByVal Iterator erase(@ByVal Iterator pos);
public native @ByVal Iterator begin();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand All @@ -22,6 +22,7 @@ public class StringSet extends Pointer {
public boolean empty() { return size() == 0; }
public native long size();

public BytePointer front() { try (Iterator it = begin()) { return it.get(); } }
public native void insert(@StdString BytePointer value);
public native void erase(@StdString BytePointer value);
public native @ByVal Iterator begin();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
2 changes: 1 addition & 1 deletion modsecurity/src/gen/java/org/bytedeco/modsecurity/XML.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.modsecurity;

Expand Down
Loading
Loading