diff --git a/404.html b/404.html index 71fa16cdb4c53827d2675a2e6ff6dcb18ea0e2a3..77a3cb83fec4409a7fe67e42e011780e4ac3add9 100644 --- a/404.html +++ b/404.html @@ -108,11 +108,6 @@ src="/nginx-logo.png" alt="[ Powered by nginx ]" width="121" height="32" /> - - [ Powered by Fedora ] diff --git a/50x.html b/50x.html index c296c61f79d024e65d8285252511988642874bf8..38c166ae749fbbfcbd2b3b407896e027719f0e87 100644 --- a/50x.html +++ b/50x.html @@ -108,11 +108,6 @@ src="/nginx-logo.png" alt="[ Powered by nginx ]" width="121" height="32" /> - - [ Powered by Fedora ] diff --git a/nginx-auto-cc-gcc.patch b/nginx-auto-cc-gcc.patch index c30346d042395233db4e9bfa16c72b0a0a2e89ab..0829d84523728235e85af171931c662ca7fd6ddc 100644 --- a/nginx-auto-cc-gcc.patch +++ b/nginx-auto-cc-gcc.patch @@ -1,13 +1,10 @@ --- a/auto/cc/gcc.orig 2007-03-22 08:34:53.000000000 -0600 +++ b/auto/cc/gcc 2007-03-22 08:58:47.000000000 -0600 -@@ -172,7 +172,9 @@ +@@ -172,7 +172,6 @@ # 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" diff --git a/nginx.spec b/nginx.spec index d1df6c1ea844424f6c81459f27c571f82c66568f..bdde5307a40c4dff4b21c9b10d2681e0150c35d8 100644 --- a/nginx.spec +++ b/nginx.spec @@ -14,7 +14,7 @@ Name: nginx Epoch: 1 Version: 1.16.1 -Release: 2 +Release: 3 Summary: A HTTP server, reverse proxy and mail proxy server License: BSD URL: http://nginx.org/ @@ -26,7 +26,6 @@ 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 @@ -195,7 +194,7 @@ install -p -d -m 0755 .%{_datadir}/nginx/modules install -p -d -m 0755 .%{_libdir}/nginx/modules install -p -m 0644 %{_builddir}/nginx-%{version}/nginx.conf .%{_sysconfdir}/nginx install -p -m 0644 %{SOURCE100} .%{_datadir}/nginx/html -install -p -m 0644 %{SOURCE101} %{SOURCE102} .%{_datadir}/nginx/html +install -p -m 0644 %{SOURCE102} .%{_datadir}/nginx/html install -p -m 0644 %{SOURCE103} %{SOURCE104} .%{_datadir}/nginx/html %if 0%{?with_mailcap_mimetypes} @@ -348,6 +347,9 @@ fi %{_mandir}/man8/nginx-upgrade.8* %changelog +* Mon May 11 2020 wutao - 1:1.16.1-3 +- modify patch and html + * Wed Mar 18 2020 yuxiangyang - 1:1.16.1-2 - delete http_stub_status_module.This configuration creates a simple web page with basic status data,but it will affect cpu scale-out because diff --git a/nginx.yaml b/nginx.yaml new file mode 100644 index 0000000000000000000000000000000000000000..e0b9c440cf6d5ef39ae8976a2ecc0f1490eb26ee --- /dev/null +++ b/nginx.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: nginx/nginx +tag_prefix: release- +seperator: . diff --git a/poweredby.png b/poweredby.png deleted file mode 100644 index b4aea88b9f33b00727d91327089a33d620ac3c32..0000000000000000000000000000000000000000 Binary files a/poweredby.png and /dev/null differ