Merge pull request #125 from bazsi/rhel-packaging-fixes-for-alma9

packaging/rhel: add fixes to adjust to AlmaLinux:9

.github/workflows/create-packages.yml

@@ -24,6 +24,7 @@ on:
           "ubuntu-lunar",
           "ubuntu-mantic",
           "almalinux-8",
+          "almalinux-9",
           "fedora-39",
           "fedora-40"
         ]'

.github/workflows/dbld-images.yml

@@ -29,6 +29,7 @@ jobs:
     strategy:
       matrix:
         image:
+          - almalinux-9
           - almalinux-8
           - fedora-39
           - fedora-40

.github/workflows/packages.yml

@@ -35,6 +35,7 @@ jobs:
       dbld-image-mode: cache
       distros: '[
         "almalinux-8",
+        "almalinux-9",
         "debian-bookworm",
         "debian-testing",
         "fedora-40",

dbld/Makefile.am

@@ -27,6 +27,7 @@ EXTRA_DIST += \
 	dbld/images/centos.prepare.sh \
 	dbld/images/fedora.prepare.sh \
 	dbld/images/almalinux-8.dockerfile \
+	dbld/images/almalinux-9.dockerfile \
 	dbld/images/devshell.dockerfile \
 	dbld/images/fedora-39.dockerfile \
 	dbld/images/fedora-40.dockerfile \

dbld/build.manifest

@@ -42,4 +42,5 @@ ubuntu-lunar		python3
 ubuntu-mantic		python3
 
 fedora			python3
-almalinux		python3,noriemann,nokafka,nomqtt,nojava
+almalinux-8		python3,noriemann,nokafka,nomqtt,nojava
+almalinux-9		python3,nojava,nosql

dbld/builddeps

@@ -113,8 +113,15 @@ function add_copr_repo {
     # PIP installation later.
     case "${OS_DISTRIBUTION}" in
         centos|almalinux)
-            $YUM_INSTALL yum-plugin-copr
-            yum config-manager --set-enabled powertools
+            case "${OS_DISTRIBUTION_CODE_NAME}" in
+                8)
+                    $YUM_INSTALL yum-plugin-copr
+                    yum config-manager --set-enabled powertools
+                ;;
+                9)
+                    dnf config-manager --set-enabled crb
+                ;;
+            esac
             ;;
         fedora)
             $DNF_INSTALL -y dnf-plugins-core

dbld/images/almalinux-9.dockerfile

@@ -0,0 +1,25 @@
+FROM almalinux:9
+LABEL maintainer="Laszlo Varady <[email protected]>, Balazs Scheidler <[email protected]>"
+ENV OS_DISTRIBUTION=almalinux
+ENV OS_DISTRIBUTION_CODE_NAME=9
+
+ARG ARG_IMAGE_PLATFORM
+ARG COMMIT
+ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM}
+LABEL COMMIT=${COMMIT}
+
+COPY images/entrypoint.sh /
+COPY . /dbld/
+
+RUN /dbld/builddeps install_dbld_dependencies
+RUN /dbld/builddeps add_epel_repo
+RUN /dbld/builddeps add_copr_repo
+RUN /dbld/builddeps install_yum_packages
+RUN /dbld/builddeps install_rpm_build_deps
+
+RUN /dbld/builddeps install_criterion
+
+VOLUME /source
+VOLUME /build
+
+ENTRYPOINT ["/entrypoint.sh"]

dbld/rules

@@ -2,6 +2,7 @@
 
 BUILDER_IMAGES=		\
 	almalinux-8	\
+	almalinux-9	\
 	fedora-39	\
 	fedora-40	\
 	debian-stretch	\

packaging/rhel/axosyslog.spec

@@ -27,6 +27,10 @@ Source4: syslog-ng.logrotate7
 %bcond_without mqtt
 
 
+%if 0%{?rhel} == 9
+%global		python_devel python3.11-devel
+%global         py_ver  3.11
+%else
 %if 0%{?rhel} == 8
 %global		python_devel python39-devel
 %global         py_ver  3.9
@@ -39,6 +43,7 @@ Source4: syslog-ng.logrotate7
 %global         py_ver  %{python3_version}
 %endif
 %endif
+%endif
 
 %if 0%{?rhel} >= 7 || 0%{?fedora} <= 32
 %bcond_without java
@@ -64,7 +69,9 @@ BuildRequires: glib2-devel
 BuildRequires: ivykis-devel
 BuildRequires: json-c-devel
 BuildRequires: libcap-devel
+%if 0%{?rhel} <= 8
 BuildRequires: libdbi-devel
+%endif
 BuildRequires: libnet-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre2-devel
@@ -371,6 +378,9 @@ make DESTDIR=%{buildroot} install
 %if 0%{?rhel} == 8
 %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
 %endif
+%if 0%{?rhel} >= 9
+%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog-ng
+%endif
 %if 0%{?fedora} >= 28
 %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog-ng
 %endif