From 5b82bd77ff51a3b6e8f472f75b7a7e4f01382033 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Mon, 4 Mar 2019 18:22:38 +0000 Subject: [PATCH] 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