Use pcre2 lib instead of old pcre

cosskay · Jan 22, 2022 · 9b38269 · 9b38269
1 parent edd6d8f
commit 9b38269
Show file tree

Hide file tree

Showing 49 changed files with 51 additions and 35 deletions.
diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile
@@ -37,7 +37,7 @@ RUN set -eux && \
             tzdata \
             coreutils \
             iputils \
-            pcre \
+            pcre2 \
             libcurl \
             libmodbus \
             libldap" && \

diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile
@@ -37,7 +37,7 @@ RUN set -eux && \
             tini \
             tzdata \
             iputils \
-            pcre \
+            pcre2 \
             libcurl-minimal \
             openssl-libs \
             zlib" && \

diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile
@@ -37,7 +37,7 @@ RUN set -eux && \
             tini \
             tzdata \
             iputils \
-            pcre \
+            pcre2 \
             libcurl \
             openssl-libs \
             zlib" && \

diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile
@@ -56,7 +56,7 @@ RUN set -eux && \
             tzdata \
             iputils \
             shadow-utils \
-            pcre \
+            pcre2 \
             libcurl" && \
     curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \

diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile
@@ -40,6 +40,7 @@ RUN set -eux && \
             libssl1.1 \
             libcurl4 \
             libmodbus5 \
+            libpcre2-8-0 \
             libldap-2.4" && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \

diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile
@@ -35,7 +35,7 @@ RUN set -eux && \
     INSTALL_PKGS="tini \
             tzdata \
             bash \
-            pcre \
+            pcre2 \
             coreutils \
             smartmontools \
             sudo \

diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile
@@ -37,7 +37,7 @@ RUN set -eux && \
             tini \
             tzdata \
             iputils \
-            pcre \
+            pcre2 \
             libcurl-minimal \
             smartmontools \
             sudo \

diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile
@@ -37,7 +37,7 @@ RUN set -eux && \
             tini \
             tzdata \
             iputils \
-            pcre \
+            pcre2 \
             libcurl \
             smartmontools \
             sudo \

diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile
@@ -56,7 +56,7 @@ RUN set -eux && \
             tzdata \
             iputils \
             shadow-utils \
-            pcre \
+            pcre2 \
             smartmontools \
             sudo \
             libcurl" && \

diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile
@@ -40,6 +40,7 @@ RUN set -eux && \
             sudo \
             libssl1.1 \
             libcurl4 \
+            libpcre2-8-0 \
             libldap-2.4" && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \

diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile
@@ -34,7 +34,7 @@ RUN set -eux && \
             openipmi-dev \
             openldap-dev \
             openssl-dev \
-            pcre-dev \
+            pcre2-dev \
             postgresql-dev \
             openjdk8 \
             gettext \

diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile
@@ -23,7 +23,7 @@ RUN set -eux && \
             automake \
             bash \
             gcc \
-            pcre-devel \
+            pcre2-devel \
             libcurl-devel \
             libevent-devel \
             libssh-devel \

diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile
@@ -22,7 +22,7 @@ RUN set -eux && \
             automake \
             bash \
             gcc \
-            pcre-devel \
+            pcre2-devel \
             libcurl-devel \
             libevent-devel \
             libssh-devel \

diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile
@@ -34,7 +34,7 @@ RUN set -eux && \
             automake \
             bash \
             gcc \
-            pcre-devel \
+            pcre2-devel \
             libcurl-devel \
             libevent-devel \
             libssh-devel \

diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile
@@ -30,7 +30,7 @@ RUN set -eux && \
             libldap2-dev \
             libmysqlclient-dev \
             libopenipmi-dev \
-            libpcre3-dev \
+            libpcre2-dev \
             libsnmp-dev \
             libsqlite3-dev \
             libpq-dev \

diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile
@@ -62,6 +62,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
             --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \
             --with-net-snmp \

diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile
@@ -56,6 +56,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
 #            --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \
             --with-net-snmp \

diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile
@@ -44,6 +44,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
 #            --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \
             --with-net-snmp \

diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile
@@ -66,6 +66,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
 #            --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \
             --with-net-snmp \

diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile
@@ -62,6 +62,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
             --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \
             --with-net-snmp \

diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile
@@ -62,6 +62,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
             --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
             --with-openipmi \

diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile
@@ -56,6 +56,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
 #            --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
             --with-openipmi \

diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile
@@ -44,6 +44,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
 #            --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
             --with-openipmi \

diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile
@@ -62,6 +62,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
             --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
             --with-openipmi \

diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile
@@ -60,6 +60,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
             --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
             --with-openipmi \

diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile
@@ -54,6 +54,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
 #            --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
             --with-openipmi \

diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile
@@ -42,6 +42,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
 #            --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
             --with-openipmi \

diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile
@@ -64,6 +64,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
 #            --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
             --with-openipmi \

diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
@@ -60,6 +60,7 @@ RUN set -eux && \
             --with-ldap \
             --with-libcurl \
             --with-libmodbus \
+            --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
             --with-openipmi \

diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux && \
             mariadb-connector-c \
             net-snmp-agent-libs \
             openipmi-libs \
-            pcre \
+            pcre2 \
             unixodbc \
             fping" && \
     apk add \

diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile
@@ -48,7 +48,7 @@ RUN set -eux && \
             OpenIPMI-libs \
             openldap \
             openssl-libs \
-            pcre \
+            pcre2 \
             zlib \
             unixODBC" && \
     dnf -y module enable mysql && \

diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile
@@ -48,7 +48,7 @@ RUN set -eux && \
             OpenIPMI-libs \
             openldap \
             openssl-libs \
-            pcre \
+            pcre2 \
             zlib \
             unixODBC" && \
     microdnf -y module enable mysql && \

diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile
@@ -67,7 +67,7 @@ RUN set -eux && \
             mysql-libs \
             net-snmp-agent-libs \
             OpenIPMI-libs \
-            pcre \
+            pcre2 \
             unixODBC" && \
     curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \

diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux && \
             libevent-2.1 \
             libmysqlclient21 \
             libopenipmi0 \
-            libpcre3 \
+            libpcre2-8-0 \
             libsnmp35 \
             libssh-4 \
             libssl1.1 \

diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux && \
             libxml2 \
             net-snmp-agent-libs \
             openipmi-libs \
-            pcre \
+            pcre2 \
             sqlite-libs \
             unixodbc" && \
     apk add \

diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile
@@ -45,7 +45,7 @@ RUN set -eux && \
             OpenIPMI-libs \
             openldap \
             openssl-libs \
-            pcre \
+            pcre2 \
             zlib \
             unixODBC" && \
     dnf -y install epel-release && \

diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile
@@ -45,7 +45,7 @@ RUN set -eux && \
             OpenIPMI-libs \
             openldap \
             openssl-libs \
-            pcre \
+            pcre2 \
             zlib \
             unixODBC" && \
     microdnf -y install \

diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
@@ -64,7 +64,7 @@ RUN set -eux && \
             libxml2 \
             net-snmp-agent-libs \
             OpenIPMI-libs \
-            pcre \
+            pcre2 \
             sqlite-libs \
             unixODBC" && \
     curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \

diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
@@ -41,7 +41,7 @@ RUN set -eux && \
             libcurl4 \
             libevent-2.1 \
             libopenipmi0 \
-            libpcre3 \
+            libpcre2-8-0 \
             libsnmp35 \
             libsqlite3-0 \
             libssh-4 \

diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -eux && \
             mariadb-connector-c \
             net-snmp-agent-libs \
             openipmi-libs \
-            pcre \
+            pcre2 \
             unixodbc" && \
     apk add \
             --no-cache \

diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux && \
             OpenIPMI-libs \
             openldap \
             openssl-libs \
-            pcre \
+            pcre2 \
             zlib \
             unixODBC" && \
     dnf -y module enable mysql && \

diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile
@@ -51,7 +51,7 @@ RUN set -eux && \
             OpenIPMI-libs \
             openldap \
             openssl-libs \
-            pcre \
+            pcre2 \
             zlib \
             unixODBC" && \
     microdnf -y module enable mysql && \

diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile
@@ -68,7 +68,7 @@ RUN set -eux && \
             mysql-libs \
             net-snmp-agent-libs \
             OpenIPMI-libs \
-            pcre \
+            pcre2 \
             unixODBC" && \
     curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \

diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux && \
             libevent-2.1 \
             libmysqlclient21 \
             libopenipmi0 \
-            libpcre3 \
+            libpcre2-8-0 \
             libsnmp35 \
             libssh-4 \
             libssl1.1 \

diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile
@@ -47,7 +47,7 @@ RUN set -eux && \
             libxml2 \
             net-snmp-agent-libs \
             openipmi-libs \
-            pcre \
+            pcre2 \
             postgresql-client \
             postgresql-libs \
             unixodbc" && \

diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile
@@ -49,7 +49,7 @@ RUN set -eux && \
             OpenIPMI-libs \
             openldap \
             openssl-libs \
-            pcre \
+            pcre2 \
             postgresql \
             postgresql-libs \
             zlib \