feat: add support for RHEL/AlmaLinux/Rocky Linux 10

Author: jfut

.github/workflows/release.yaml

@@ -28,6 +28,7 @@ jobs:
           - almalinux_9_appstream_1.22
           - almalinux_9_appstream_1.24
           - almalinux_9_appstream_1.26
+          - almalinux_10
         arch:
           - linux/amd64
           - linux/arm64/v8

.github/workflows/test.yaml

@@ -29,6 +29,7 @@ jobs:
           - almalinux_9_appstream_1.22
           - almalinux_9_appstream_1.24
           - almalinux_9_appstream_1.26
+          - almalinux_10
         arch:
           - linux/amd64
           - linux/arm64/v8

README.md

@@ -57,6 +57,9 @@ Usage:
     Options:
         -d Debug mode.
 
+    Build for RHEL/AlmaLinux/Rocky Linux 10 + AppStream module:
+        build almalinux:10
+
     Build for RHEL/AlmaLinux/Rocky Linux 9 + AppStream module:
         build almalinux:9
         build almalinux:9:appstream:1.22
@@ -75,6 +78,9 @@ Usage:
         # EPEL 8 Modularity was going away on February 15, 2023
         build almalinux:8:epel-modular:mainline
 
+    Build for RHEL/AlmaLinux/Rocky Linux 10 linux/arm64/v8(aarch64) + AppStream module:
+        build -p linux/arm64/v8 almalinux:10
+
     Build for RHEL/AlmaLinux/Rocky Linux 9 linux/arm64/v8(aarch64) + AppStream module:
         build -p linux/arm64/v8 almalinux:9
         build -p linux/arm64/v8 almalinux:9:appstream:1.22
@@ -86,15 +92,15 @@ Usage:
 You can build RPM packages in Docker.
 
 ```bash
-# el9 + Non-modular package version
-./build almalinux:9
+# el10 + Non-modular package version
+./build almalinux:10
 ```
 
 - Debug shell
 
 ```bash
-# el9 + debug shell
-BUILD_HOSTNAME=el9.example.org ./build -d almalinux:9
+# el10 + debug shell
+BUILD_HOSTNAME=el10.example.org ./build -d almalinux:10
 /pkg/build-rpm /pkg/rpmbuild nginx-module-fancyindex.spec
 
 # el9 + linux/arm64/v8 + debug shell

build

@@ -29,6 +29,9 @@ Usage:
     Options:
         -d Debug mode.
 
+    Build for RHEL/AlmaLinux/Rocky Linux 10 + AppStream module:
+        ${PACKAGER} almalinux:10
+
     Build for RHEL/AlmaLinux/Rocky Linux 9 + AppStream module:
         ${PACKAGER} almalinux:9
         ${PACKAGER} almalinux:9:appstream:1.22
@@ -46,6 +49,9 @@ Usage:
         # EPEL 8 Modularity was going away on February 15, 2023
         ${PACKAGER} almalinux:8:epel-modular:mainline
 
+    Build for RHEL/AlmaLinux/Rocky Linux 10 linux/arm64/v8(aarch64) + AppStream module:
+        ${PACKAGER} -p linux/arm64/v8 almalinux:10
+
     Build for RHEL/AlmaLinux/Rocky Linux 9 linux/arm64/v8(aarch64) + AppStream module:
         ${PACKAGER} -p linux/arm64/v8 almalinux:9
         ${PACKAGER} -p linux/arm64/v8 almalinux:9:appstream:1.22

build-rpm

@@ -89,12 +89,12 @@ if [[ ! -d SOURCES ]]; then
     mkdir SOURCES
 fi
 
-if [[ "${RPM_DIST}" = ".el9" ]]; then
-    # el9 or later
-    spectool -g -a "SPECS/${SPEC_FILE_NAME}" -C SOURCES/
-else
+if [[ "${RPM_DIST}" = ".el8" ]]; then
     # el8
     spectool -g -A "SPECS/${SPEC_FILE_NAME}" -C SOURCES/
+else
+    # el9 or later
+    spectool -g -a "SPECS/${SPEC_FILE_NAME}" -C SOURCES/
 fi
 
 echo "Building RPM files:"

rpmbuild/SPECS/nginx-module-fancyindex.spec.in

@@ -21,14 +21,16 @@ Requires: nginx = %{nginx_epoch_version}:%{nginx_version}
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gd-devel
-%if 0%{?rhel} == 7
-BuildRequires: gperftools-devel
-%endif
 BuildRequires: libtool
 BuildRequires: libxslt-devel
 BuildRequires: nginx
 BuildRequires: openssl-devel
+%if 0%{?rhel} == 10
+BuildRequires: pcre2-devel
+%else
+# el8 and el9
 BuildRequires: pcre-devel
+%endif
 BuildRequires: perl-devel
 BuildRequires: perl(ExtUtils::Embed)
 BuildRequires: zlib-devel
@@ -46,7 +48,13 @@ Nginx module to use PAM for simple http authentication.
 
 %build
 cd %{_builddir}/nginx-%{nginx_version}
+%if 0%{?rhel} == 10
+# Fix ./configure: error: invalid option "--without-engine
+./configure %(nginx -V 2>&1 | grep 'configure arguments' | sed -r 's@^[^:]+: @@' | sed 's/--without-engine //') --add-dynamic-module=../%{mod_base_dir}-%{version}
+%else
+# el8 and el9
 ./configure %(nginx -V 2>&1 | grep 'configure arguments' | sed -r 's@^[^:]+: @@') --add-dynamic-module=../%{mod_base_dir}-%{version}
+%endif
 make modules
 
 %install