Merge branch '31-update-nginx-version-to-1-24-0' into 'master'

Resolve "Update nginx version to 1.24.0"

Closes #31

See merge request storm2/ngx_http_voms_module!24

.devcontainer/README.md

@@ -4,29 +4,29 @@ A devcontainer is ready to use for the developers. A set of packages without ngi
 
 ## How to build and install nginx with or without httpg patch
 
-To build and install the last stable version of [nginx](http://nginx.org/en/download.html) (1.22.1) you have to copy the ```nginx.repo``` file (it is contained in the ```docker``` directory) into the ```/etc/yum.repos.d/``` directory and install nginx with yum:
+To build and install the latest stable version of [nginx](http://nginx.org/en/download.html) (1.24.0) you have to copy the `nginx.repo` file (it is contained in the `docker` directory) into the `/etc/yum.repos.d/` directory and install nginx with `yum`:
 
 ```shell
 $ sudo cp docker/nginx.repo /etc/yum.repos.d/
 $ sudo yum install -y nginx
 ```
 
-Otherwise, if you want to build and install the last stable version of [nginx](http://nginx.org/en/download.html) (1.22.1) with the httpg patch, a bash library is ready to use. You can source it and follow the commands below:
+Otherwise, if you want to build and install the latest stable version of [nginx](http://nginx.org/en/download.html) (1.24.0) with the httpg patch, a bash library is ready to use. You can source it and follow the commands below:
 
 ```shell
 $ source .devcontainer/assets/build-library.sh
 $ downloadNginx
 $ buildHttpgNginxRPM
-$ sudo rpm -ivh ~/rpmbuild/RPMS/x86_64/nginx-httpg-1.22.1-1.el7.ngx.x86_64.rpm
+$ sudo rpm -ivh ~/rpmbuild/RPMS/x86_64/nginx-httpg-1.24.0-1.el7.ngx.x86_64.rpm
 ```
 
 ## How to build and install the `ngx_http_voms_module`
 
-If you want to build and install the `ngx_http_voms_module`, nginx have to be installed in the container (see the previous section). When this requirement is satisfied, you can use the library contained in the ```.devcontainer/assets``` folder as follows (NOTE: if you have already download nginx source file, you can skip the relative command):
+If you want to build and install the `ngx_http_voms_module`, nginx have to be installed in the container (see the previous section). When this requirement is satisfied, you can use the library contained in the `.devcontainer/assets` folder as follows (NOTE: if you have already download nginx source file, you can skip the relative command):
 
 ```shell
 $ source .devcontainer/assets/build-library.sh
 $ downloadNginx
 $ buildVomsModuleRPM
-$ sudo rpm -ivh ~/rpmbuild/RPMS/x86_64/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm
+$ sudo rpm -ivh ~/rpmbuild/RPMS/x86_64/nginx-module-http-voms-1.24.0-1.el7.x86_64.rpm
 ```

.devcontainer/assets/build-library.sh

@@ -7,7 +7,7 @@ downloadNginx() {
 
 # check if a version of nginx is specified
 if [ -z ${ngxVersion} ]; then
-    ngxVersion=1.22.1
+    ngxVersion=1.24.0
 fi
 echo "nginx version required: ${ngxVersion}";
 

docker/Dockerfile

@@ -20,13 +20,13 @@ COPY artifacts/*.rpm /pkgs/
 
 # install nginx httpg + voms and njs dynamic modules (latest version)
 COPY nginx.repo /etc/yum.repos.d/nginx.repo
-RUN rpm -ivh /pkgs/nginx-httpg-1.22.1-1.el7.ngx.x86_64.rpm && \
-    rpm -ivh /pkgs/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm && \
+RUN rpm -ivh /pkgs/nginx-httpg-1.24.0-1.el7.ngx.x86_64.rpm && \
+    rpm -ivh /pkgs/nginx-module-http-voms-1.24.0-1.el7.x86_64.rpm && \
     yum install -y nginx-module-njs
 
 # install nginx + voms and njs dynamic modules
 # RUN yum -y install nginx nginx-module-njs && \
-#     rpm -ivh /pkgs/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm
+#     rpm -ivh /pkgs/nginx-module-http-voms-1.24.0-1.el7.x86_64.rpm
 
 EXPOSE 80
 

rpm/nginx-module-http-voms.spec

 %define nginx_user nginx
 %define nginx_group nginx
-%define base_version 1.22.1
+%define base_version 1.24.0
 %define bdir %{_builddir}/%{name}-%{base_version}
 
 Name:           nginx-module-http-voms
-Version:        1.22.1
+Version:        1.24.0
 Release:        1%{?dist}
 Summary:        nginx http voms dynamic modules
 
 License:        EUPL-1.2
-URL:            https://github.com/lauracappelli/nginx-sd-rpm
+URL:            https://baltig.infn.it/storm2/ngx_http_voms_module
 
 Source0:        https://nginx.org/download/nginx-%{base_version}.tar.gz
 Source1:        ngx-http-voms-module
@@ -84,5 +84,8 @@ fi
 
 
 %changelog
+* Wed Apr 12 2023 Laura Cappelli
+- nginx http voms module updated to 1.24.0-1.0.0
+
 * Fri Nov 18 2022 Laura Cappelli
 - nginx http voms module updated to 1.22.1-1.0.0
\ No newline at end of file

rpm/nginx.spec

@@ -18,6 +18,7 @@ Requires(postun): systemd
 Epoch: %{epoch}
 Requires(pre): shadow-utils
 Requires: openssl >= 1.0.2
+Requires: procps-ng
 BuildRequires: openssl-devel >= 1.0.2
 %define dist .el7
 %endif
@@ -27,6 +28,7 @@ BuildRequires: openssl-devel >= 1.0.2
 Epoch: %{epoch}
 Requires(pre): shadow-utils
 Requires: openssl11 >= 1.1.1
+Requires: procps-ng
 BuildRequires: openssl11-devel >= 1.1.1
 %endif
 
@@ -34,6 +36,7 @@ BuildRequires: openssl11-devel >= 1.1.1
 %define epoch 1
 Epoch: %{epoch}
 Requires(pre): shadow-utils
+Requires: procps-ng
 BuildRequires: openssl-devel >= 1.1.1
 %define _debugsource_template %{nil}
 %endif
@@ -42,6 +45,7 @@ BuildRequires: openssl-devel >= 1.1.1
 %define epoch 1
 Epoch: %{epoch}
 Requires(pre): shadow-utils
+Requires: procps-ng
 BuildRequires: openssl-devel
 %define _debugsource_template %{nil}
 %endif
@@ -50,6 +54,7 @@ BuildRequires: openssl-devel
 %define _group Productivity/Networking/Web/Servers
 %define nginx_loggroup trusted
 Requires(pre): shadow
+Requires: procps
 BuildRequires: libopenssl-devel
 %define _debugsource_template %{nil}
 %endif
@@ -58,13 +63,14 @@ BuildRequires: libopenssl-devel
 %define _debugsource_template %{nil}
 %global _hardened_build 1
 %define _group System Environment/Daemons
+Requires: procps-ng
 BuildRequires: openssl-devel
 Requires(pre): shadow-utils
 %endif
 
 # end of distribution specific definitions
 
-%define base_version 1.22.1
+%define base_version 1.24.0
 %define base_release 1%{?dist}.ngx
 
 %define bdir %{_builddir}/%{name}-%{base_version}
@@ -302,11 +308,29 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
-* Wed Oct 19 2022 Nginx Packaging <nginx-packaging@f5.com> - 1.22.1-1%{?dist}.ngx
-- 1.22.1-1
+* Wed Apr 12 2023 Laura Cappelli - 1.24.0-1%{?dist}.ngx
+- Add HTTPG patch to nginx 1.24.0-1.0.0
 
-* Tue May 24 2022 Konstantin Pavlov <thresh@nginx.com> - 1.22.0-1%{?dist}.ngx
-- 1.22.0-1
+* Wed Apr 12 2023 Laura Cappelli - 1.24.0-1%{?dist}.ngx
+- 1.24.0-1
+
+* Tue Apr 11 2023 Nginx Packaging <nginx-packaging@f5.com> - 1.24.0-1%{?dist}.ngx
+- 1.24.0-1
+
+* Tue Mar 28 2023 Nginx Packaging <nginx-packaging@f5.com> - 1.23.4-1%{?dist}.ngx
+- 1.23.4-1
+
+* Tue Dec 13 2022 Nginx Packaging <nginx-packaging@f5.com> - 1.23.3-1%{?dist}.ngx
+- 1.23.3-1
+
+* Wed Oct 19 2022 Nginx Packaging <nginx-packaging@f5.com> - 1.23.2-1%{?dist}.ngx
+- 1.23.2-1
+
+* Tue Jul 19 2022 Nginx Packaging <nginx-packaging@f5.com> - 1.23.1-1%{?dist}.ngx
+- 1.23.1-1
+
+* Tue Jun 21 2022 Nginx Packaging <nginx-packaging@f5.com> - 1.23.0-1%{?dist}.ngx
+- 1.23.0-1
 
 * Tue Jan 25 2022 Mikhail Isachenkov <mikhail.isachenkov@nginx.com> - 1.21.6-1%{?dist}.ngx
 - 1.21.6-1