Merge pull request #27 from jfut/el10

Author: matsumotory

.github/workflows/release.yaml

@@ -5,14 +5,19 @@ on:
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+*"
 
+permissions:
+  contents: read
+
 jobs:
   create-release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write
 
     steps:
       - name: Create Release
         id: create_release
-        uses: actions/create-release@v1
+        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -22,31 +27,36 @@ jobs:
           prerelease: false
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write
 
     strategy:
+      max-parallel: 20
       matrix:
         image:
-          - centos-7
           - almalinux-8
           - almalinux-9
+          - almalinux-10
 
     env:
       BUILD_IMAGE: ${{ matrix.image }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
       - name: Build RPM
         id: build_rpm
         run: |
           TAG_NAME=$(echo ${{ github.ref }} | sed -e 's|refs/tags/||g')
+          echo "TAG_NAME=${TAG_NAME}" >> "$GITHUB_ENV"
           ./redhat/build -t "${TAG_NAME}" "${BUILD_IMAGE/-/:}"
-          echo "##[set-output name=release-tag;]${TAG_NAME}"
+ 
       - name: Upload Assets
-        uses: AButler/upload-release-assets@v2.0
+        uses: AButler/upload-release-assets@3d6774fae0ed91407dc5ae29d576b166536d1777 # v3.0
         with:
           files: "redhat/rpmbuild/RPMS/x86_64/*.rpm;redhat/rpmbuild/SRPMS/*.rpm"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          release-tag: ${{ steps.build_rpm.outputs.release-tag }}
+          release-tag: ${{ env.TAG_NAME }}
 

.github/workflows/test.yaml

@@ -5,29 +5,35 @@ on:
     branches:
       - "**"
 
+permissions:
+  contents: read
+
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     strategy:
+      max-parallel: 20
       matrix:
         image:
-          - centos-7
           - almalinux-8
           - almalinux-9
+          - almalinux-10
 
     env:
       BUILD_IMAGE: ${{ matrix.image }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
       - name: Build RPM
         id: build_rpm
         run: |
           ./redhat/build -t "${GITHUB_SHA}" "${BUILD_IMAGE/-/:}"
+
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ matrix.image }}
           path: redhat/rpmbuild/**/*.rpm

redhat/README.md

@@ -18,16 +18,16 @@ Usage:
     Options:
         -d Debug mode.
         -t Build target tag (default: latest)
-            e.g.: v1.0.0, SHA_HASH
+            e.g.: v1.0.0, v1.0.0-1, SHA_HASH
+
+    Build for RHEL/AlmaLinux/Rocky Linux 10:
+        build -t vx.y.z almalinux:10
 
     Build for RHEL/AlmaLinux/Rocky Linux 9:
         build -t vx.y.z almalinux:9
 
     Build for RHEL/AlmaLinux/Rocky Linux 8:
         build -t vx.y.z almalinux:8
-
-    Build for RHEL/CentOS 7:
-        build -t vx.y.z centos:7
 ```
 
 ## Build RPM Packages with Docker

redhat/build

@@ -24,16 +24,16 @@ Usage:
     Options:
         -d Debug mode.
         -t Build target tag (default: latest)
-            e.g.: v1.0.0, SHA_HASH
+            e.g.: v1.0.0, v1.0.0-1, SHA_HASH
+
+    Build for RHEL/AlmaLinux/Rocky Linux 10:
+        ${PACKAGER} -t vx.y.z almalinux:10
 
     Build for RHEL/AlmaLinux/Rocky Linux 9:
         ${PACKAGER} -t vx.y.z almalinux:9
 
     Build for RHEL/AlmaLinux/Rocky Linux 8:
         ${PACKAGER} -t vx.y.z almalinux:8
-
-    Build for RHEL/CentOS 7:
-        ${PACKAGER} -t vx.y.z centos:7
 _EOF_
 }
 
@@ -43,28 +43,26 @@ setup() {
     echo "# Build environment"
     local PACKAGE_NAME="$(basename ${GITHUB_REPOSITORY})"
     # Fix for release tag
-    # 1.0.0
+    # v1.0.0
     # -> PACKAGE_DIR_VERSION: 1.0.0
     # -> PACKAGE_VERSION: 1.0.0
-    # -> PACKAGE_RELEASE: 1
-    # v1.0.0-beta1-a
-    # -> PACKAGE_DIR_VERSION: 1.0.0-beta1-a
-    # -> PACKAGE_VERSION: 1.0.0.beta1.a
-    # -> PACKAGE_RELEASE: 1
+    # -> PACKAGE_RELEASE: 1 (default)
+    # v1.0.1-2
+    # -> PACKAGE_DIR_VERSION: 1.0.1
+    # -> PACKAGE_VERSION: 1.0.1
+    # -> PACKAGE_RELEASE: 2
     local PACKAGE_DIR_VERSION="$(echo ${BUILD_TAG} | sed 's/^v//')"
-    local PACKAGE_VERSION="${PACKAGE_DIR_VERSION/-/.}"
-    local PACKAGE_RELEASE="1"
+    local PACKAGE_VERSION="$(echo "${PACKAGE_DIR_VERSION}" | sed 's/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/')"
+    local PACKAGE_RELEASE="$(echo "${PACKAGE_DIR_VERSION}" | sed 's/.*-\([0-9]\+\)$/\1/; t; s/.*/1/')"
     local PACKAGE_URL="https://github.com/${GITHUB_REPOSITORY}"
     local PACKAGE_SOURCE="${PACKAGE_URL}/archive/${BUILD_TAG}.tar.gz"
-    local PACKAGE_CHANGELOG="* $(date "+%a %h %d %Y") GitHub Actions <${PACKAGE_NAME}@noreply.github.com> - ${PACKAGE_VERSION}-${PACKAGE_RELEASE}\n- Update to version ${PACKAGE_DIR_VERSION}"
 
     echo "PACKAGE_NAME: ${PACKAGE_NAME}"
     echo "PACKAGE_DIR_VERSION: ${PACKAGE_DIR_VERSION}"
     echo "PACKAGE_VERSION: ${PACKAGE_VERSION}"
     echo "PACKAGE_RELEASE: ${PACKAGE_RELEASE}"
     echo "PACKAGE_URL: ${PACKAGE_URL}"
     echo "PACKAGE_SOURCE: ${PACKAGE_SOURCE}"
-    echo "PACKAGE_CHANGELOG: ${PACKAGE_CHANGELOG}"
 
     # Setup spec file
     echo "# Setup ${SPEC_FILE_NAME}"
@@ -76,7 +74,6 @@ setup() {
     sed -i -e "s|@PACKAGE_RELEASE@|${PACKAGE_RELEASE}|g" "${SPEC_FILE}"
     sed -i -e "s|@PACKAGE_URL@|${PACKAGE_URL}|g" "${SPEC_FILE}"
     sed -i -e "s|@PACKAGE_SOURCE@|${PACKAGE_SOURCE}|g" "${SPEC_FILE}"
-    sed -i -e "s|@PACKAGE_CHANGELOG@|${PACKAGE_CHANGELOG}|g" "${SPEC_FILE}"
 }
 
 build() {

redhat/build-rpm

@@ -22,10 +22,10 @@ pushd "${RPMBUILD_DIR}"
 # RPM macros
 RPM_MACROS=/usr/lib/rpm/macros.d/macros.dist
 if [[ -f /etc/rpm/macros.dist ]]; then
-    # el7 and el8
+    # el8
     RPM_MACROS=/etc/rpm/macros.dist
 fi
-RPM_DIST=.$(egrep -o "^%el[0-9]*" "${RPM_MACROS}" | tr -d '%')
+RPM_DIST=.$(grep -E -o "^%el[0-9]*" "${RPM_MACROS}" | tr -d '%')
 echo "RPM_DIST: ${RPM_DIST} (${RPM_MACROS})"
 
 # install dependencies
@@ -68,12 +68,12 @@ if [[ ! -d SOURCES ]]; then
     mkdir SOURCES
 fi
 
-if [[ "${RPM_DIST}" = ".el9" ]]; then
+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/
-else
-    # el7 or el8
-    spectool -g -A "SPECS/${SPEC_FILE_NAME}" -C SOURCES/
 fi
 
 echo "Building RPM:"

redhat/rpmbuild/SOURCES/mod_process_security.conf

@@ -1,14 +1,5 @@
 # This module requires MPM prefork and single thread mode
 
-# Red Hat Enterprise Linux 7 / CentOS 7
-#
-# Use prefork module
-#
-# - /etc/httpd/conf.modules.d/00-mpm.conf
-#   LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
-
-# Red Hat Enterprise Linux 8 / CentOS 8
-#
 # Disable modules that requires multi-threaded mode
 #
 # - /etc/httpd/conf.modules.d/00-mpm.conf

redhat/rpmbuild/SPECS/mod_process_security.spec.in

@@ -47,7 +47,9 @@ rm -rf %{buildroot}
 %{_httpd_moddir}/mod_process_security.so
 
 %changelog
-@PACKAGE_CHANGELOG@
+* Mon Jun  2 2025 Jun Futagawa <[email protected]> - 1.2.0-2
+- Drop RHEL/CentOS 7 support
+- Add support for RHEL/AlmaLinux/Rocky Linux 10
 
 * Thu Jun 25 2020 Jun Futagawa <[email protected]> - 1.2.0-1
 - Update to version 1.2.0