Change-Id: I3045db94e9484cf3e2e34adde9ea94675fa0293b
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5237
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: High-performance HTTP server and reverse proxy |
| 2 | 2 |
Name: nginx |
| 3 | 3 |
Version: 1.13.8 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: BSD-2-Clause |
| 6 | 6 |
URL: http://nginx.org/download/nginx-%{version}.tar.gz
|
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -10,13 +10,20 @@ Distribution: Photon |
| 10 | 10 |
Source0: %{name}-%{version}.tar.gz
|
| 11 | 11 |
%define sha1 nginx=a1f9348c9c46f449a0b549d0519dd34191d30cee |
| 12 | 12 |
Source1: nginx.service |
| 13 |
+Source2: nginx-njs-0.2.1.tar.gz |
|
| 14 |
+%define sha1 nginx-njs=fd8c3f2d219f175be958796e3beaa17f3b465126 |
|
| 13 | 15 |
BuildRequires: openssl-devel |
| 14 | 16 |
BuildRequires: pcre-devel |
| 17 |
+BuildRequires: which |
|
| 15 | 18 |
%description |
| 16 | 19 |
NGINX is a free, open-source, high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server. |
| 17 | 20 |
|
| 18 | 21 |
%prep |
| 19 | 22 |
%setup -q |
| 23 |
+pushd ../ |
|
| 24 |
+mkdir nginx-njs |
|
| 25 |
+tar -C nginx-njs -xf %{SOURCE2}
|
|
| 26 |
+popd |
|
| 20 | 27 |
|
| 21 | 28 |
%build |
| 22 | 29 |
./configure \ |
| ... | ... |
@@ -27,6 +34,7 @@ NGINX is a free, open-source, high-performance HTTP server and reverse proxy, as |
| 27 | 27 |
--lock-path=/var/run/nginx.lock \ |
| 28 | 28 |
--error-log-path=/var/log/nginx/error.log \ |
| 29 | 29 |
--http-log-path=/var/log/nginx/access.log \ |
| 30 |
+ --add-module=../nginx-njs/njs-0.2.1/nginx \ |
|
| 30 | 31 |
--with-http_ssl_module \ |
| 31 | 32 |
--with-pcre \ |
| 32 | 33 |
--with-ipv6 \ |
| ... | ... |
@@ -47,6 +55,8 @@ install -p -m 0644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/nginx.service
|
| 47 | 47 |
%dir %{_var}/log/nginx
|
| 48 | 48 |
|
| 49 | 49 |
%changelog |
| 50 |
+* Fri Jun 08 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.13.8-2 |
|
| 51 |
+- adding module njs. |
|
| 50 | 52 |
* Wed Mar 28 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.13.8-1 |
| 51 | 53 |
- Update to version 1.13.8 to support nginx-ingress |
| 52 | 54 |
* Wed Oct 04 2017 Xiaolin Li <xiaolinl@vmware.com> 1.13.5-1 |