update to 1.14.2

0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch

@@ -1,30 +0,0 @@
-From f446736d4f4c5f7ae81bb8bf84fda7ce3c9d49a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-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
-

nginx.spec

@@ -22,11 +22,10 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.12.1
-Release:           14%{?dist}
+Version:           1.14.2
+Release:           1%{?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
@@ -50,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
@@ -93,7 +87,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 +111,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 +122,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 +132,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 +141,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 +155,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 +163,6 @@ Requires:          nginx
 %{summary}.
 
 %package mod-mail
-Group:             System Environment/Daemons
 Summary:           Nginx mail modules
 Requires:          nginx
 
@@ -183,7 +170,6 @@ Requires:          nginx
 %{summary}.
 
 %package mod-stream
-Group:             System Environment/Daemons
 Summary:           Nginx stream modules
 Requires:          nginx
 
@@ -194,7 +180,6 @@ Requires:          nginx
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
 %patch2 -p1
 cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} .
 
@@ -314,7 +299,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,6 +457,28 @@ fi
 
 
 %changelog
+* Sun Oct 20 2019 Felix Kaechele <heffer@fedoraproject.org> - 1:1.14.2-1
+- update to 1.14.2
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.14.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1:1.14.1-4
+- Rebuilt for libcrypt.so.2 (#1666033)
+
+* Tue Dec 11 2018 Joe Orton <jorton@redhat.com> - 1:1.14.1-3
+- fix unexpanded paths in nginx(8)
+
+* Tue Nov 20 2018 Luboš Uhliarik <luhliari@redhat.com> - 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
+  disclosure via mp4 module
+- Resolves: #1647259 - CVE-2018-16843 nginx: Excessive memory consumption
+  via flaw in HTTP/2 implementation
+- Resolves: #1647258 - CVE-2018-16844 nginx: Excessive CPU usage via flaw
+  in HTTP/2 implementation
+
 * Mon Aug 06 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.1-14
 - add requires on perl(constant) for mod-http-perl
 

sources

@@ -1 +1 @@
-SHA512 (nginx-1.12.1.tar.gz) = 3a2ad2a559b366dda92dd58c0fe40ee84dd60a3eaf72071454110e032c3e9a03f2a63b28fe3a615b527950521eeb533c687a2cc4c87524e1d8f3a0a5f043fdb6
+SHA512 (nginx-1.14.2.tar.gz) = d8362dbd86435657d6b13156bd6ad1b251d2ab10bc11cdda959b142dd6120b087e4b314f0025d9bbcc88529cb4b9407fb4df1cfae5d081b7ea1db51ccfc2dbe7