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 4868b3d5d2474eb7ccbdb74b65f89652a054dbb7..0000000000000000000000000000000000000000 --- 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-1.12.1.tar.gz b/nginx-1.12.1.tar.gz deleted file mode 100644 index fc90539cb625a2e00a483870a0a88b66a7de22a2..0000000000000000000000000000000000000000 Binary files a/nginx-1.12.1.tar.gz and /dev/null differ diff --git a/nginx-1.16.1.tar.gz b/nginx-1.16.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d172fc5bfac01c198d0ce22e877f25234f8b63ea Binary files /dev/null and b/nginx-1.16.1.tar.gz differ diff --git a/nginx.spec b/nginx.spec index 6d094567f1d00607b0b0772402e2f1413b0fc365..b73e69ee5356822136535521315a81647213ff66 100644 --- a/nginx.spec +++ b/nginx.spec @@ -13,8 +13,8 @@ Name: nginx Epoch: 1 -Version: 1.12.1 -Release: 17 +Version: 1.16.1 +Release: 1 Summary: A HTTP server, reverse proxy and mail proxy server License: BSD URL: http://nginx.org/ @@ -34,7 +34,6 @@ Source200: README.dynamic Source210: UPGRADE-NOTES-1.6-to-1.10 Patch0: nginx-auto-cc-gcc.patch -Patch1: 0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch Patch2: nginx-1.12.1-logs-perm.patch Patch3: CVE-2019-20372.patch BuildRequires: gcc openssl-devel pcre-devel zlib-devel systemd gperftools-devel @@ -349,6 +348,9 @@ fi %{_mandir}/man8/nginx-upgrade.8* %changelog +* Mon Mar 16 2020 likexin - 1:1.16.1-1 +- update to 1.16.1 + * Mon Mar 16 2020 openEuler Buildteam - 1:1.12.1-17 - Type:bugfix - ID:NA