update mainline to 1.19.0
rework patches to work with %autosetup Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
This commit is contained in:
Felix Kaechele
parent
53e34450ce
commit
37f16a85df
|
|
@ -0,0 +1,31 @@
|
|||
From cb8f5d414202b098cadbbe5637d79a3cf73b4bf9 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Kaechele <felix@kaechele.ca>
|
||||
Date: Sun, 7 Jun 2020 12:14:02 -0400
|
||||
Subject: [PATCH 1/2] remove Werror in upstream build scripts
|
||||
|
||||
removes -Werror in upstream build scripts. -Werror conflicts with
|
||||
-D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
||||
|
||||
Signed-off-by: Felix Kaechele <felix@kaechele.ca>
|
||||
---
|
||||
auto/cc/gcc | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/auto/cc/gcc b/auto/cc/gcc
|
||||
index a5c5c18..cdbbadb 100644
|
||||
--- a/auto/cc/gcc
|
||||
+++ b/auto/cc/gcc
|
||||
@@ -166,7 +166,9 @@ esac
|
||||
|
||||
|
||||
# stop on warning
|
||||
-CFLAGS="$CFLAGS -Werror"
|
||||
+# This combined with Fedora's FORTIFY_SOURCE=2 option causes it nginx
|
||||
+# to not compile.
|
||||
+#CFLAGS="$CFLAGS -Werror"
|
||||
|
||||
# debug
|
||||
CFLAGS="$CFLAGS -g"
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
@ -1,8 +1,20 @@
|
|||
From 57187b92659e3b66fcbd4cc92a35bc11088e24e6 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Kaechele <felix@kaechele.ca>
|
||||
Date: Sun, 7 Jun 2020 12:14:54 -0400
|
||||
Subject: [PATCH 2/2] change logs permissions to 664
|
||||
|
||||
This patch is carried downstream only.
|
||||
|
||||
Signed-off-by: Felix Kaechele <felix@kaechele.ca>
|
||||
---
|
||||
src/core/ngx_cycle.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
|
||||
index aee7a58..bcceecb 100644
|
||||
index 95f4bdf..a0dcca6 100644
|
||||
--- a/src/core/ngx_cycle.c
|
||||
+++ b/src/core/ngx_cycle.c
|
||||
@@ -1108,7 +1108,7 @@ ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user)
|
||||
@@ -1182,7 +1182,7 @@ ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user)
|
||||
}
|
||||
|
||||
fd = ngx_open_file(file[i].name.data, NGX_FILE_APPEND,
|
||||
|
|
@ -11,3 +23,6 @@ index aee7a58..bcceecb 100644
|
|||
|
||||
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
||||
"reopen file \"%s\", old:%d new:%d",
|
||||
--
|
||||
2.26.2
|
||||
|
||||
194
maxim.key
194
maxim.key
|
|
@ -1,131 +1,69 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.11 (FreeBSD)
|
||||
|
||||
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
|
||||
=52bu
|
||||
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
|
||||
yh4LsaVRdhbFe9aNd/O5iNgDcQtCUg==
|
||||
=/pFc
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
--- auto/cc/gcc.orig 2007-03-22 08:34:53.000000000 -0600
|
||||
+++ auto/cc/gcc 2007-03-22 08:58:47.000000000 -0600
|
||||
@@ -172,7 +172,9 @@
|
||||
|
||||
|
||||
# stop on warning
|
||||
-CFLAGS="$CFLAGS -Werror"
|
||||
+# This combined with Fedora's FORTIFY_SOURCE=2 option causes it nginx
|
||||
+# to not compile.
|
||||
+#CFLAGS="$CFLAGS -Werror"
|
||||
|
||||
# debug
|
||||
CFLAGS="$CFLAGS -g"
|
||||
14
nginx.conf
14
nginx.conf
|
|
@ -36,17 +36,14 @@ http {
|
|||
include /etc/nginx/conf.d/*.conf;
|
||||
|
||||
server {
|
||||
listen 80 default_server;
|
||||
listen [::]:80 default_server;
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name _;
|
||||
root /usr/share/nginx/html;
|
||||
|
||||
# Load configuration files for the default server block.
|
||||
include /etc/nginx/default.d/*.conf;
|
||||
|
||||
location / {
|
||||
}
|
||||
|
||||
error_page 404 /404.html;
|
||||
location = /40x.html {
|
||||
}
|
||||
|
|
@ -59,8 +56,8 @@ http {
|
|||
# Settings for a TLS enabled server.
|
||||
#
|
||||
# server {
|
||||
# listen 443 ssl http2 default_server;
|
||||
# listen [::]:443 ssl http2 default_server;
|
||||
# listen 443 ssl http2;
|
||||
# listen [::]:443 ssl http2;
|
||||
# server_name _;
|
||||
# root /usr/share/nginx/html;
|
||||
#
|
||||
|
|
@ -74,9 +71,6 @@ http {
|
|||
# # Load configuration files for the default server block.
|
||||
# include /etc/nginx/default.d/*.conf;
|
||||
#
|
||||
# location / {
|
||||
# }
|
||||
#
|
||||
# error_page 404 /404.html;
|
||||
# location = /40x.html {
|
||||
# }
|
||||
|
|
|
|||
23
nginx.spec
23
nginx.spec
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
Name: nginx
|
||||
Epoch: 1
|
||||
Version: 1.17.10
|
||||
Version: 1.19.0
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: A high performance web server and reverse proxy server
|
||||
|
|
@ -52,11 +52,11 @@ Source210: UPGRADE-NOTES-1.6-to-1.10
|
|||
|
||||
# removes -Werror in upstream build scripts. -Werror conflicts with
|
||||
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
||||
Patch0: nginx-auto-cc-gcc.patch
|
||||
Patch0: 0001-remove-Werror-in-upstream-build-scripts.patch
|
||||
|
||||
# downstream patch - changing logs permissions to 664 instead
|
||||
# previous 644
|
||||
Patch2: nginx-1.12.1-logs-perm.patch
|
||||
Patch1: 0002-change-logs-permissions-to-664.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gnupg2
|
||||
|
|
@ -91,6 +91,7 @@ Requires(pre): nginx-filesystem
|
|||
Requires: nginx-mimetypes
|
||||
%endif
|
||||
Provides: webserver
|
||||
Recommends: logrotate
|
||||
|
||||
BuildRequires: systemd
|
||||
Requires(post): systemd
|
||||
|
|
@ -189,9 +190,7 @@ Requires: nginx
|
|||
# Combine all keys from upstream into one file
|
||||
cat %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} > %{_builddir}/%{name}.gpg
|
||||
%{gpgverify} --keyring='%{_builddir}/%{name}.gpg' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%setup -q
|
||||
%patch0 -p0
|
||||
%patch2 -p1
|
||||
%autosetup -p1
|
||||
cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} .
|
||||
|
||||
%if 0%{?rhel} > 0 && 0%{?rhel} < 8
|
||||
|
|
@ -488,6 +487,18 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Jun 07 2020 Felix Kaechele <heffer@fedoraproject.org> - 1:1.19.0-1
|
||||
- update mainline to 1.19.0
|
||||
- rework patches to work with %%autosetup
|
||||
|
||||
* Fri Apr 24 2020 Felix Kaechele <heffer@fedoraproject.org> - 1:1.18.0-1
|
||||
- Update to 1.18.0
|
||||
- Increased types_hash_max_size to 4096 in default config
|
||||
- Add gpg source verification
|
||||
- Add Recommends: logrotate
|
||||
- Drop location / from default config (rhbz#1564768)
|
||||
- Drop default_sever from default config (rhbz#1373822)
|
||||
|
||||
* Wed Apr 15 2020 Felix Kaechele <heffer@fedoraproject.org> - 1:1.17.10-1
|
||||
- update mainline to 1.17.10
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (nginx-1.17.10.tar.gz) = 0b49169bc49e07733862e09ec5bfa93601ffa57379f98d52a115e511502905baf4cd33b73a03d74416f8c6ffa95ebf4459fc934bd40bfdf54d5b6d35ac4f8756
|
||||
SHA512 (nginx-1.17.10.tar.gz.asc) = 389fb539530717f160227ce514c0b21405a45931b1c362f34967df30a2d9dc5f68e7d74616076c2bbe7a18e4c28c04253c5b9a109e49d3f5e936a06d3759d28c
|
||||
SHA512 (nginx-1.19.0.tar.gz) = 3240d5dc59877f9d6a95c8779240675cec9290df079b9d52c06147e58900f2e060e768729669ffaf9a2a90bb9abbe8ab7fba24ff65d45fec9eeb3b6733b65f30
|
||||
SHA512 (nginx-1.19.0.tar.gz.asc) = 87e5bc3432d5c1da16ad883d24ed73936bfa2686997d2680a04b944c33495f5c6fa21af60fe3b95a2ac7649354696297521358a2dd9809380da0420618f267e4
|
||||
|
|
|
|||
Loading…
Reference in New Issue