From 42950f19477d526e3afdec7665aa4e69e6b59001 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Sat, 10 Feb 2024 03:34:39 +0900
Subject: [PATCH 1/3] Added modbus support for RHEL like systems

---
 Dockerfiles/agent/centos/Dockerfile                         | 1 +
 Dockerfiles/agent/ol/Dockerfile                             | 1 +
 Dockerfiles/agent/rhel/Dockerfile                           | 1 +
 Dockerfiles/agent2/centos/Dockerfile                        | 1 +
 Dockerfiles/agent2/ol/Dockerfile                            | 1 +
 Dockerfiles/agent2/rhel/Dockerfile                          | 1 +
 Dockerfiles/build-base/centos/Dockerfile                    | 4 +++-
 Dockerfiles/build-base/ol/Dockerfile                        | 4 ++++
 .../build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo | 6 ++++++
 Dockerfiles/build-base/rhel/Dockerfile                      | 5 +++++
 Dockerfiles/build-mysql/ol/Dockerfile                       | 2 +-
 Dockerfiles/build-mysql/rhel/Dockerfile                     | 2 +-
 Dockerfiles/build-pgsql/centos/Dockerfile                   | 2 +-
 13 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile
index e391eb15b..0099f37e5 100644
--- a/Dockerfiles/agent/centos/Dockerfile
+++ b/Dockerfiles/agent/centos/Dockerfile
@@ -39,6 +39,7 @@ RUN set -eux && \
             iputils \
             pcre2 \
             libcurl-minimal \
+            libmodbus \
             openssl-libs \
             zlib" && \
     dnf -y install epel-release && \
diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile
index 113ccf2dc..7d46795ef 100644
--- a/Dockerfiles/agent/ol/Dockerfile
+++ b/Dockerfiles/agent/ol/Dockerfile
@@ -39,6 +39,7 @@ RUN set -eux && \
             iputils \
             pcre2 \
             libcurl \
+            libmodbus \
             openssl-libs \
             zlib" && \
     microdnf -y install \
diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile
index 2871f2fe7..91e1b0728 100644
--- a/Dockerfiles/agent/rhel/Dockerfile
+++ b/Dockerfiles/agent/rhel/Dockerfile
@@ -57,6 +57,7 @@ RUN set -eux && \
             iputils \
             shadow-utils \
             pcre2 \
+            libmodbus \
             libcurl-minimal" && \
     curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile
index c3db7f7e6..5128455bb 100644
--- a/Dockerfiles/agent2/centos/Dockerfile
+++ b/Dockerfiles/agent2/centos/Dockerfile
@@ -44,6 +44,7 @@ RUN set -eux && \
             iputils \
             pcre2 \
             libcurl-minimal \
+            libmodbus \
             smartmontools \
             sudo \
             openssl-libs" && \
diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile
index 5de842648..671ccc93f 100644
--- a/Dockerfiles/agent2/ol/Dockerfile
+++ b/Dockerfiles/agent2/ol/Dockerfile
@@ -44,6 +44,7 @@ RUN set -eux && \
             iputils \
             pcre2 \
             libcurl \
+            libmodbus \
             smartmontools \
             sudo \
             openssl-libs" && \
diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile
index e34f56cb6..b155af91f 100644
--- a/Dockerfiles/agent2/rhel/Dockerfile
+++ b/Dockerfiles/agent2/rhel/Dockerfile
@@ -64,6 +64,7 @@ RUN set -eux && \
             pcre2 \
             smartmontools \
             sudo \
+            libmodbus \
             libcurl-minimal" && \
     curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile
index f90ecc439..402f01d41 100644
--- a/Dockerfiles/build-base/centos/Dockerfile
+++ b/Dockerfiles/build-base/centos/Dockerfile
@@ -19,7 +19,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
       org.opencontainers.image.version="${ZBX_VERSION}"
 
 RUN set -eux && \
-    REPOLIST="baseos,appstream,crb" && \
+    REPOLIST="baseos,appstream,crb,epel" && \
     INSTALL_PKGS="autoconf \
             automake \
             bash \
@@ -29,6 +29,7 @@ RUN set -eux && \
             libcurl-devel \
             libevent-devel \
             libssh-devel \
+            libmodbus-devel \
             libxml2-devel \
             openssl-devel \
             openldap-devel \
@@ -44,6 +45,7 @@ RUN set -eux && \
             gettext \
             go-toolset \
             unixODBC-devel" && \
+    dnf -y install epel-release && \
     dnf -y install \
         --disablerepo "*" \
         --enablerepo "${REPOLIST}" \
diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile
index d635f9260..a6f4b2bf3 100644
--- a/Dockerfiles/build-base/ol/Dockerfile
+++ b/Dockerfiles/build-base/ol/Dockerfile
@@ -17,6 +17,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
       org.opencontainers.image.vendor="Zabbix LLC" \
       org.opencontainers.image.version="${ZBX_VERSION}"
 
+COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
+
 RUN set -eux && \
     INSTALL_PKGS="autoconf \
             automake \
@@ -28,6 +30,7 @@ RUN set -eux && \
             libcurl-devel \
             libevent-devel \
             libssh-devel \
+            libmodbus-devel \
             libxml2-devel \
             openssl-devel \
             openldap-devel \
@@ -47,6 +50,7 @@ RUN set -eux && \
         --enablerepo "ol9_baseos_latest" \
         --enablerepo "ol9_appstream" \
         --enablerepo "ol9_codeready_builder" \
+        --enablerepo="ol9_developer_EPEL" \
         --setopt=install_weak_deps=0 \
         --best \
         --nodocs ${INSTALL_PKGS} && \
diff --git a/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
new file mode 100644
index 000000000..7fa64dc11
--- /dev/null
+++ b/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -0,0 +1,6 @@
+[ol9_developer_EPEL]
+name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
+baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+gpgcheck=1
+enabled=0
diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile
index e94f8bcc1..8a25b0751 100644
--- a/Dockerfiles/build-base/rhel/Dockerfile
+++ b/Dockerfiles/build-base/rhel/Dockerfile
@@ -40,6 +40,7 @@ RUN set -eux && \
             libcurl-devel \
             libevent-devel \
             libssh-devel \
+            libmodbus-devel \
             libxml2-devel \
             openssl-devel \
             openldap-devel \
@@ -54,6 +55,9 @@ RUN set -eux && \
             git \
             gettext \
             unixODBC-devel" && \
+    curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+    rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
+    rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
     ARCH_SUFFIX="$(arch)"; \
     microdnf -y install \
             --disablerepo "*" \
@@ -62,6 +66,7 @@ RUN set -eux && \
             --enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
             --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
             --enablerepo "codeready-builder-for-rhel-9-$ARCH_SUFFIX-rpms" \
+            --enablerepo "epel" \
             --setopt=install_weak_deps=0 \
             --best \
             --setopt=tsflags=nodocs \
diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile
index 8097cf3e2..0b8fde5cf 100644
--- a/Dockerfiles/build-mysql/ol/Dockerfile
+++ b/Dockerfiles/build-mysql/ol/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux && \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \
diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile
index e468fb2b7..1e1d1daa5 100644
--- a/Dockerfiles/build-mysql/rhel/Dockerfile
+++ b/Dockerfiles/build-mysql/rhel/Dockerfile
@@ -59,7 +59,7 @@ RUN set -eux && \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \
diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile
index 833546c25..835c4a92f 100644
--- a/Dockerfiles/build-pgsql/centos/Dockerfile
+++ b/Dockerfiles/build-pgsql/centos/Dockerfile
@@ -49,7 +49,7 @@ RUN set -eux && \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \

From 44815a423c5065a6e832102ca2e573616064ccbb Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Sun, 11 Feb 2024 17:20:14 +0900
Subject: [PATCH 2/3] Added modbus support for RHEL like systems

---
 Dockerfiles/build-mysql/centos/Dockerfile   | 2 +-
 Dockerfiles/build-pgsql/ol/Dockerfile       | 2 +-
 Dockerfiles/build-sqlite3/centos/Dockerfile | 2 +-
 Dockerfiles/build-sqlite3/ol/Dockerfile     | 2 +-
 Dockerfiles/build-sqlite3/rhel/Dockerfile   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile
index 6b2c4bbcb..26b21d291 100644
--- a/Dockerfiles/build-mysql/centos/Dockerfile
+++ b/Dockerfiles/build-mysql/centos/Dockerfile
@@ -49,7 +49,7 @@ RUN set -eux && \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \
diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile
index fe463015e..e4477c1ca 100644
--- a/Dockerfiles/build-pgsql/ol/Dockerfile
+++ b/Dockerfiles/build-pgsql/ol/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux && \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile
index 33a1fdf15..7a99e9ddf 100644
--- a/Dockerfiles/build-sqlite3/centos/Dockerfile
+++ b/Dockerfiles/build-sqlite3/centos/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux && \
             --enable-proxy \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile
index 7b0bdf78f..8590d808a 100644
--- a/Dockerfiles/build-sqlite3/ol/Dockerfile
+++ b/Dockerfiles/build-sqlite3/ol/Dockerfile
@@ -45,7 +45,7 @@ RUN set -eux && \
             --enable-proxy \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \
diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile
index 334edd17a..506b7174e 100644
--- a/Dockerfiles/build-sqlite3/rhel/Dockerfile
+++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile
@@ -54,7 +54,7 @@ RUN set -eux && \
             --enable-proxy \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \

From f12cf714e198daa2833b4a68755a0187c47b4b3a Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 26 Feb 2024 14:17:36 +0900
Subject: [PATCH 3/3] Resolved conflicts with 6.4 branch

---
 Dockerfiles/build-base/centos/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile
index d4fb071a6..067c7af2b 100644
--- a/Dockerfiles/build-base/centos/Dockerfile
+++ b/Dockerfiles/build-base/centos/Dockerfile
@@ -45,6 +45,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             gettext \
             go-toolset \
             unixODBC-devel" && \
+    microdnf -y install \
         --disablerepo "*" \
         --enablerepo "extras-common" \
         --setopt=install_weak_deps=0 \