From 965b79921b30ac54022f7744d669fadf2cec4b51 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 11 Dec 2018 09:41:48 +0000 Subject: [PATCH 01/14] fix unexpanded paths in nginx(8) --- nginx.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nginx.spec b/nginx.spec index b1e0f0f..b30f3bb 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ Name: nginx Epoch: 1 Version: 1.14.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -314,7 +314,7 @@ install -p -m 0644 %{SOURCE103} %{SOURCE104} \ rm -f %{buildroot}%{_sysconfdir}/nginx/mime.types %endif -install -p -D -m 0644 %{_builddir}/nginx-%{version}/man/nginx.8 \ +install -p -D -m 0644 %{_builddir}/nginx-%{version}/objs/nginx.8 \ %{buildroot}%{_mandir}/man8/nginx.8 install -p -D -m 0755 %{SOURCE13} %{buildroot}%{_bindir}/nginx-upgrade @@ -472,7 +472,10 @@ fi %changelog -* Tue Nov 20 2018 Luboš Uhliarik - 1:1.14.12 +* Tue Dec 11 2018 Joe Orton - 1:1.14.1-3 +- fix unexpanded paths in nginx(8) + +* Tue Nov 20 2018 Luboš Uhliarik - 1:1.14.1-2 - new version 1.14.1 - Resolves: #1584426 - Upstream Nginx 1.14.0 is now available - Resolves: #1647255 - CVE-2018-16845 nginx: Denial of service and memory From 4ee79c10a6f7844b71dcf8162986186ce946b166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 14 Jan 2019 19:10:22 +0100 Subject: [PATCH 02/14] Rebuilt for libcrypt.so.2 (#1666033) --- nginx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index b30f3bb..6f06d9c 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ Name: nginx Epoch: 1 Version: 1.14.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -472,6 +472,9 @@ fi %changelog +* Mon Jan 14 2019 Björn Esser - 1:1.14.1-4 +- Rebuilt for libcrypt.so.2 (#1666033) + * Tue Dec 11 2018 Joe Orton - 1:1.14.1-3 - fix unexpanded paths in nginx(8) From 0db4756fd42e23986a181d3cb040636fcf7894f1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:55 +0100 Subject: [PATCH 03/14] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- nginx.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/nginx.spec b/nginx.spec index 6f06d9c..1d19f35 100644 --- a/nginx.spec +++ b/nginx.spec @@ -26,7 +26,6 @@ Version: 1.14.1 Release: 4%{?dist} Summary: A high performance web server and reverse proxy server -Group: System Environment/Daemons # BSD License (two clause) # http://www.freebsd.org/copyright/freebsd-license.html License: BSD @@ -93,7 +92,6 @@ IMAP protocols, with a strong focus on high concurrency, performance and low memory usage. %package all-modules -Group: System Environment/Daemons Summary: A meta package that installs all available Nginx modules BuildArch: noarch @@ -118,7 +116,6 @@ Fedora 24, modules are optional. %endif %package filesystem -Group: System Environment/Daemons Summary: The basic directory layout for the Nginx server BuildArch: noarch Requires(pre): shadow-utils @@ -130,7 +127,6 @@ directories. %if %{with geoip} %package mod-http-geoip -Group: System Environment/Daemons Summary: Nginx HTTP geoip module BuildRequires: GeoIP-devel Requires: nginx @@ -141,7 +137,6 @@ Requires: GeoIP %endif %package mod-http-image-filter -Group: System Environment/Daemons Summary: Nginx HTTP image filter module BuildRequires: gd-devel Requires: nginx @@ -151,7 +146,6 @@ Requires: gd %{summary}. %package mod-http-perl -Group: System Environment/Daemons Summary: Nginx HTTP perl module BuildRequires: perl-devel %if 0%{?fedora} >= 24 @@ -166,7 +160,6 @@ Requires: perl(constant) %{summary}. %package mod-http-xslt-filter -Group: System Environment/Daemons Summary: Nginx XSLT module BuildRequires: libxslt-devel Requires: nginx @@ -175,7 +168,6 @@ Requires: nginx %{summary}. %package mod-mail -Group: System Environment/Daemons Summary: Nginx mail modules Requires: nginx @@ -183,7 +175,6 @@ Requires: nginx %{summary}. %package mod-stream -Group: System Environment/Daemons Summary: Nginx stream modules Requires: nginx From d99d389f9e0da295949816a47b6925d2a02e5dfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 12:20:31 +0000 Subject: [PATCH 04/14] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nginx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 1d19f35..d29db7e 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ Name: nginx Epoch: 1 Version: 1.14.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -463,6 +463,9 @@ fi %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1:1.14.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 14 2019 Björn Esser - 1:1.14.1-4 - Rebuilt for libcrypt.so.2 (#1666033) From 5b82bd77ff51a3b6e8f472f75b7a7e4f01382033 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Mon, 4 Mar 2019 18:22:38 +0000 Subject: [PATCH 05/14] Update to 1.15.9 --- ...ply-fix-for-really-old-bug-in-glibc-.patch | 30 ------------------- nginx.spec | 28 +++++++---------- sources | 2 +- 3 files changed, 11 insertions(+), 49 deletions(-) delete mode 100644 0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch diff --git a/0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch b/0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch deleted file mode 100644 index 4868b3d..0000000 --- a/0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f446736d4f4c5f7ae81bb8bf84fda7ce3c9d49a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Wed, 24 Jan 2018 12:37:48 +0100 -Subject: [PATCH] unix/ngx_user: Apply fix for really old bug in glibc libcrypt - if needed - ---- - src/os/unix/ngx_user.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c -index 7ebe2b57..d0fe9238 100644 ---- a/src/os/unix/ngx_user.c -+++ b/src/os/unix/ngx_user.c -@@ -21,8 +21,10 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) - struct crypt_data cd; - - cd.initialized = 0; --#ifdef __GLIBC__ -- /* work around the glibc bug */ -+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \ -+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4) -+ /* work around glibc-2.2.5 bug, -+ * has been fixed at some time in glibc-2.3.X */ - cd.current_salt[0] = ~salt[0]; - #endif - --- -2.16.1 - diff --git a/nginx.spec b/nginx.spec index d29db7e..6190351 100644 --- a/nginx.spec +++ b/nginx.spec @@ -22,8 +22,8 @@ Name: nginx Epoch: 1 -Version: 1.14.1 -Release: 5%{?dist} +Version: 1.15.9 +Release: 1%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -49,11 +49,6 @@ Source210: UPGRADE-NOTES-1.6-to-1.10 # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors. Patch0: nginx-auto-cc-gcc.patch -# Apply fix for bug in glibc libcrypt, if needed only. -# That has been fixed some time in glibc-2.3.X and is -# not needed with libxcrypt anyways. -Patch1: 0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch - # downstream patch - changing logs permissions to 664 instead # previous 644 Patch2: nginx-1.12.1-logs-perm.patch @@ -68,7 +63,7 @@ BuildRequires: zlib-devel Requires: nginx-filesystem = %{epoch}:%{version}-%{release} -%if 0%{?rhel} || 0%{?fedora} < 24 +%if 0%{?rhel} > 0 && 0%{?rhel} < 8 # Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later. Requires: nginx-all-modules = %{epoch}:%{version}-%{release} %endif @@ -105,15 +100,7 @@ Requires: nginx-mod-mail = %{epoch}:%{version}-%{release} Requires: nginx-mod-stream = %{epoch}:%{version}-%{release} %description all-modules -%{summary}. -%if 0%{?rhel} -The main nginx package depends on this to ease the upgrade path. After a grace -period of several months, modules will become optional. -%endif -%if 0%{?fedora} && 0%{?fedora} < 24 -The main nginx package depends on this to ease the upgrade path. Starting from -Fedora 24, modules are optional. -%endif +Meta package that installs all available nginx modules. %package filesystem Summary: The basic directory layout for the Nginx server @@ -185,7 +172,6 @@ Requires: nginx %prep %setup -q %patch0 -p0 -%patch1 -p1 %patch2 -p1 cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} . @@ -226,6 +212,7 @@ if ! ./configure \ --with-http_ssl_module \ --with-http_v2_module \ --with-http_realip_module \ + --with-stream_ssl_preread_module \ --with-http_addition_module \ --with-http_xslt_module=dynamic \ --with-http_image_filter_module=dynamic \ @@ -463,6 +450,11 @@ fi %changelog +* Mon Mar 04 2019 Jamie Nguyen - 1:1.15.9-1 +- Update to upstream release 1.15.9 +- Enable ngx_stream_ssl_preread module +- Remove redundant conditionals + * Fri Feb 01 2019 Fedora Release Engineering - 1:1.14.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 308278d..144a893 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nginx-1.14.1.tar.gz) = 906c9f44462c0a6b3d9d968641038511012de2662d8490bdb863e540988c2fb15f5cf8a8172e65267dab525e5edf2e9945d7da42a0aa2de5ac81de33fadcd9f3 +SHA512 (nginx-1.15.9.tar.gz) = 24dcd5b9bae966244663ff71a625ca90fbe1b29b5717e88aca96ac0c4772108a234647a8c7456154f34ef34d27ebffdce82ad30d2900f24ef5536af6080a6ba8 From ec48d4f27295d253ab86daa8968b4de2001e3544 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Fri, 26 Apr 2019 05:04:15 +0100 Subject: [PATCH 06/14] Update to 1.16.0 --- nginx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 6190351..889f0d0 100644 --- a/nginx.spec +++ b/nginx.spec @@ -22,7 +22,7 @@ Name: nginx Epoch: 1 -Version: 1.15.9 +Version: 1.16.0 Release: 1%{?dist} Summary: A high performance web server and reverse proxy server @@ -450,6 +450,9 @@ fi %changelog +* Fri Apr 26 2019 Jamie Nguyen - 1:1.16.0-1 +- Update to upstream release 1.16.0 + * Mon Mar 04 2019 Jamie Nguyen - 1:1.15.9-1 - Update to upstream release 1.15.9 - Enable ngx_stream_ssl_preread module From 454b523fb32ece2d628fba788a68a11b1d331e0b Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Fri, 26 Apr 2019 05:05:49 +0100 Subject: [PATCH 07/14] Upload sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 144a893..0a97e76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nginx-1.15.9.tar.gz) = 24dcd5b9bae966244663ff71a625ca90fbe1b29b5717e88aca96ac0c4772108a234647a8c7456154f34ef34d27ebffdce82ad30d2900f24ef5536af6080a6ba8 +SHA512 (nginx-1.16.0.tar.gz) = e99cfaa4538f209c096ea2f93c04b5019756617f3bcd3305c273e98ddc89fed5bf90d65fb9b493149bc47d55ff79e73850bfcac20505fab74930d0102075df3d From d8c792dc0bf9f578aee54c7c365ccbcf4191b67f Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Tue, 7 May 2019 05:58:57 +0100 Subject: [PATCH 08/14] Add missing vim directory --- nginx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 889f0d0..2e88e57 100644 --- a/nginx.spec +++ b/nginx.spec @@ -298,7 +298,7 @@ install -p -D -m 0644 %{_builddir}/nginx-%{version}/objs/nginx.8 \ install -p -D -m 0755 %{SOURCE13} %{buildroot}%{_bindir}/nginx-upgrade install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_mandir}/man8/nginx-upgrade.8 -for i in ftdetect indent syntax; do +for i in ftdetect ftplugin indent syntax; do install -p -D -m644 contrib/vim/${i}/nginx.vim \ %{buildroot}%{_datadir}/vim/vimfiles/${i}/nginx.vim done From 078d1528aa999cf2f5cad93871216c2c5ea5cf82 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Tue, 7 May 2019 06:40:42 +0100 Subject: [PATCH 09/14] Bump release, add to %files and %changelog --- nginx.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 2e88e57..4630948 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ Name: nginx Epoch: 1 Version: 1.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -379,6 +379,7 @@ fi %{_bindir}/nginx-upgrade %{_sbindir}/nginx %{_datadir}/vim/vimfiles/ftdetect/nginx.vim +%{_datadir}/vim/vimfiles/ftplugin/nginx.vim %{_datadir}/vim/vimfiles/syntax/nginx.vim %{_datadir}/vim/vimfiles/indent/nginx.vim %{_mandir}/man3/nginx.3pm* @@ -450,6 +451,9 @@ fi %changelog +* Tue May 07 2019 Jamie Nguyen - 1:1.16.0-2 +- Add missing directory for vim plugin + * Fri Apr 26 2019 Jamie Nguyen - 1:1.16.0-1 - Update to upstream release 1.16.0 From 8e14a8bd2363b55e278f5cdc29cae5c634cdd834 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 14 May 2019 14:58:45 -0400 Subject: [PATCH 10/14] Move to common default index.html Resolves: rhbz#1636235 Signed-off-by: Stephen Gallagher --- index.html | 116 -------------------------------------------------- nginx.spec | 24 ++++++++--- poweredby.png | Bin 2811 -> 0 bytes 3 files changed, 18 insertions(+), 122 deletions(-) delete mode 100644 index.html delete mode 100644 poweredby.png diff --git a/index.html b/index.html deleted file mode 100644 index dea2265..0000000 --- a/index.html +++ /dev/null @@ -1,116 +0,0 @@ - - - - - Test Page for the Nginx HTTP Server on Fedora - - - - - -

Welcome to nginx on Fedora!

- -
-

This page is used to test the proper operation of the - nginx HTTP server after it has been - installed. If you can read this page, it means that the - web server installed at this site is working - properly.

- -
-

Website Administrator

-
-

This is the default index.html page that - is distributed with nginx on - Fedora. It is located in - /usr/share/nginx/html.

- -

You should now put your content in a location of - your choice and edit the root configuration - directive in the nginx - configuration file - /etc/nginx/nginx.conf.

- -
-
- -
- [ Powered by nginx ] - - [ Powered by Fedora ] -
-
- - diff --git a/nginx.spec b/nginx.spec index 4630948..589d326 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ Name: nginx Epoch: 1 Version: 1.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -37,8 +37,6 @@ Source11: nginx.logrotate Source12: nginx.conf Source13: nginx-upgrade Source14: nginx-upgrade.8 -Source100: index.html -Source101: poweredby.png Source102: nginx-logo.png Source103: 404.html Source104: 50x.html @@ -62,6 +60,7 @@ BuildRequires: pcre-devel BuildRequires: zlib-devel Requires: nginx-filesystem = %{epoch}:%{version}-%{release} +Requires: system-logos-httpd %if 0%{?rhel} > 0 && 0%{?rhel} < 8 # Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later. @@ -281,10 +280,19 @@ install -p -d -m 0755 %{buildroot}%{_libdir}/nginx/modules install -p -m 0644 ./nginx.conf \ %{buildroot}%{_sysconfdir}/nginx -install -p -m 0644 %{SOURCE100} \ - %{buildroot}%{_datadir}/nginx/html -install -p -m 0644 %{SOURCE101} %{SOURCE102} \ + +rm -f %{buildroot}%{_datadir}/nginx/html/index.html +ln -s ../../fedora-testpage/index.html \ + %{buildroot}%{_datadir}/nginx/html/index.html +install -p -m 0644 %{SOURCE102} \ %{buildroot}%{_datadir}/nginx/html +ln -s nginx-logo.png %{buildroot}%{_datadir}/nginx/html/poweredby.png +mkdir -p %{buildroot}%{_datadir}/nginx/html/icons + +# Symlink for the powered-by-$DISTRO image: +ln -s ../../../pixmaps/poweredby.png \ + %{buildroot}%{_datadir}/nginx/html/icons/poweredby.png + install -p -m 0644 %{SOURCE103} %{SOURCE104} \ %{buildroot}%{_datadir}/nginx/html @@ -451,6 +459,10 @@ fi %changelog +* Tue May 14 2019 Stephen Gallagher - 1.16.0-3 +- Move to common default index.html +- Resolves: rhbz#1636235 + * Tue May 07 2019 Jamie Nguyen - 1:1.16.0-2 - Add missing directory for vim plugin diff --git a/poweredby.png b/poweredby.png deleted file mode 100644 index b4aea88b9f33b00727d91327089a33d620ac3c32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2811 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 N002ovPDHLkV1nUENR Date: Thu, 30 May 2019 13:20:26 +0200 Subject: [PATCH 11/14] Perl 5.30 rebuild --- nginx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 589d326..7204abc 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ Name: nginx Epoch: 1 Version: 1.16.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -459,6 +459,9 @@ fi %changelog +* Thu May 30 2019 Jitka Plesnikova - 1:1.16.0-4 +- Perl 5.30 rebuild + * Tue May 14 2019 Stephen Gallagher - 1.16.0-3 - Move to common default index.html - Resolves: rhbz#1636235 From 2ebd7fd66c052ae7128cab639077af5b37648cac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 18:39:40 +0000 Subject: [PATCH 12/14] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nginx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 7204abc..fb8e2a5 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ Name: nginx Epoch: 1 Version: 1.16.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -459,6 +459,9 @@ fi %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1:1.16.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu May 30 2019 Jitka Plesnikova - 1:1.16.0-4 - Perl 5.30 rebuild From b589a2b452b4c8d4912a321a13471525bcdc8ff4 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Tue, 13 Aug 2019 20:38:29 +0100 Subject: [PATCH 13/14] Update to upstream release 1.16.1 --- nginx.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nginx.spec b/nginx.spec index fb8e2a5..bf92802 100644 --- a/nginx.spec +++ b/nginx.spec @@ -22,8 +22,8 @@ Name: nginx Epoch: 1 -Version: 1.16.0 -Release: 5%{?dist} +Version: 1.16.1 +Release: 1%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -459,6 +459,10 @@ fi %changelog +* Tue Aug 13 2019 Jamie Nguyen - 1:1.16.1-1 +- Update to upstream release 1.16.1 +- Fixes CVE-2019-9511, CVE-2019-9513, CVE-2019-9516 + * Thu Jul 25 2019 Fedora Release Engineering - 1:1.16.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d62a4ee6ef8a49eb77525fda9f37e5832b9750a9 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Tue, 13 Aug 2019 20:43:16 +0100 Subject: [PATCH 14/14] Commit sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 0a97e76..bd874f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nginx-1.16.0.tar.gz) = e99cfaa4538f209c096ea2f93c04b5019756617f3bcd3305c273e98ddc89fed5bf90d65fb9b493149bc47d55ff79e73850bfcac20505fab74930d0102075df3d +SHA512 (nginx-1.16.1.tar.gz) = 17e95b43fa47d4fef5e652dea587518e16ab5ec562c9c94355c356440166d4b6a6a41ee520d406e5a34791a327d2e3c46b3f9b105ac9ce07afdd495c49eca437