From ab143ca8c663a09c5a9d2ee73d0415a07187b089ca7e652e30c07357abf98de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Fri, 5 Nov 2021 20:27:23 +0000 Subject: [PATCH 1/4] Accepting request 929740 from home:mimi_vx:branches:server:http - drop vim-plugin-nginx, now is provided directly by vim OBS-URL: https://build.opensuse.org/request/show/929740 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=216 --- nginx.changes | 5 +++++ nginx.spec | 25 ------------------------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/nginx.changes b/nginx.changes index b2ab385..558c69e 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 5 18:10:15 UTC 2021 - Ondřej Súkup + +- drop vim-plugin-nginx, now is provided directly by vim + ------------------------------------------------------------------- Fri Oct 15 14:23:41 UTC 2021 - Callum Farmer diff --git a/nginx.spec b/nginx.spec index b7b737f..1d11bcc 100644 --- a/nginx.spec +++ b/nginx.spec @@ -79,19 +79,6 @@ BuildRequires: google-perftools-devel nginx [engine x] is a HTTP server and IMAP/POP3 proxy server written by Igor Sysoev. It has been running on many heavily loaded Russian sites for more than two years. -%package -n vim-plugin-nginx -Summary: VIM support for nginx config files -Group: Productivity/Text/Editors -%requires_eq vim -Supplements: (nginx and vim_client) -BuildArch: noarch - -%description -n vim-plugin-nginx -nginx [engine x] is a HTTP server and IMAP/POP3 proxy server written by Igor Sysoev. -It has been running on many heavily loaded Russian sites for more than two years. - -This package holds the VIM support for nginx config files. - %package -n nginx-source Summary: The nginx source Group: Development/Sources @@ -151,10 +138,6 @@ mkdir -p %{buildroot}%{ngx_doc_dir} cp -av CHANGES* LICENSE \ %{buildroot}%{ngx_doc_dir} -mkdir -p %{buildroot}%{vim_data_dir}/ -cp -av contrib/vim/* \ - %{buildroot}%{vim_data_dir}/ - mkdir -p %{buildroot}%{_datadir}/nginx/ mkdir -p %{buildroot}%{ngx_conf_dir}/vhosts.d/ mkdir -p %{buildroot}%{ngx_conf_dir}/conf.d/ @@ -232,14 +215,6 @@ copydocs() { %{_sysusersdir}/nginx.conf %{_datadir}/nginx/ -%files -n vim-plugin-nginx -%license LICENSE -%dir %{vim_data_dir}/ftdetect/ -%{vim_data_dir}/ftdetect/nginx.vim -%{vim_data_dir}/ftplugin/nginx.vim -%{vim_data_dir}/indent/nginx.vim -%{vim_data_dir}/syntax/nginx.vim - %files -n nginx-source %{src_install_dir} From e89e7af7f8c1f364241a18429a3672b42df7acaf8dd3e842830501aba1595272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Fri, 5 Nov 2021 21:39:19 +0000 Subject: [PATCH 2/4] Accepting request 929778 from home:13ilya:branches:server:http - Updated to 1.21.4 * https://nginx.org/en/CHANGES * Support for NPN instead of ALPN to establish HTTP/2 connections has been removed. * Now nginx rejects SSL connections if ALPN is used by the client, but no supported protocols can be negotiated. * The default value of the "sendfile_max_chunk" directive was changed to 2 megabytes. * The "proxy_half_close" directive in the stream module. * The "ssl_alpn" directive in the stream module. * The $ssl_alpn_protocol variable. * Support for SSL_sendfile() when using OpenSSL 3.0. * The "mp4_start_key_frame" directive in the ngx_http_mp4_module. * In the $content_length variable when using chunked transfer encoding. * After receiving a response with incorrect length from a proxied backend nginx might nevertheless cache the connection. * Invalid headers from backends were logged at the "info" level instead of "error"; the bug had appeared in 1.21.1. * Requests might hang when using HTTP/2 and the "aio_write" directive. OBS-URL: https://build.opensuse.org/request/show/929778 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=217 --- nginx-1.21.3.tar.gz | 3 --- nginx-1.21.3.tar.gz.asc | 10 ---------- nginx-1.21.4.tar.gz | 3 +++ nginx-1.21.4.tar.gz.asc | 10 ++++++++++ nginx.changes | 23 +++++++++++++++++++++++ nginx.spec | 2 +- 6 files changed, 37 insertions(+), 14 deletions(-) delete mode 100644 nginx-1.21.3.tar.gz delete mode 100644 nginx-1.21.3.tar.gz.asc create mode 100644 nginx-1.21.4.tar.gz create mode 100644 nginx-1.21.4.tar.gz.asc diff --git a/nginx-1.21.3.tar.gz b/nginx-1.21.3.tar.gz deleted file mode 100644 index 2f6f8bf..0000000 --- a/nginx-1.21.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14774aae0d151da350417efc4afda5cce5035056e71894836797e1f6e2d1175a -size 1066609 diff --git a/nginx-1.21.3.tar.gz.asc b/nginx-1.21.3.tar.gz.asc deleted file mode 100644 index d60349a..0000000 --- a/nginx-1.21.3.tar.gz.asc +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEcBAABCAAGBQJhN4QmAAoJEFIKmZOhwFL4AxgH/2uSU5GPtc3oPsV1oS2CAr12 -PXDx6wN29awiIbcAgOAbvB+gIjZC/RQ2IKKRxI8GKfm6ghJCpnlb4Q2j2JdwF9// -3+SQHLd+2XZoEPED8+G5rQvvU1qDTdYIGN8/7mMTMeLjzKKJt8JDamQJkBSp/Xtm -7wRqt5Vqt1GqhNWpp4Bes0kcUXzg+rrzIKRqzPVnUPt/xmpDZNsMv4QA2T5ZVBRf -EzIHp+vrJKjlmfrEapks13T82hSmYwZ3CYtPsiZy3JrIHinv/RzkHQKTnuLWCmj3 -Q90IlRKzbODTnLxEvojAF+lbnw1uJsjxLWsKLLp+KWQIAFNgPwtmu/hwxQOduF4= -=0/Da ------END PGP SIGNATURE----- diff --git a/nginx-1.21.4.tar.gz b/nginx-1.21.4.tar.gz new file mode 100644 index 0000000..ee0de0f --- /dev/null +++ b/nginx-1.21.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1f72f474e71bcaaf465dcc7e6f7b6a4705e4b1ed95c581af31df697551f3bfe +size 1070260 diff --git a/nginx-1.21.4.tar.gz.asc b/nginx-1.21.4.tar.gz.asc new file mode 100644 index 0000000..1e9c09d --- /dev/null +++ b/nginx-1.21.4.tar.gz.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- + +iQEcBAABCAAGBQJhgVCFAAoJEFIKmZOhwFL4xFcH/j4FDvbtb5q4gEyWhoaBLdP/ +NEDgdwnFbUILELfwHeySyJIf/FypMAO1R8vKUy26zyzM97QdcmOlqnknUGWXfuJF +cj67l8nWXzsMifuxe1JJZ3SUZPL1QNiMdVyf+pUXQVZ/A2RcUnECwIhVneLq4n9m +UQbE3XGvMYK7cdXupYBW7auyU+eWrgYR32h5R1+7jtTdvg5yqFqPLCXea9S1ck6b +IaxbtU2VgytmlBnRZ7X2bMpFsKZ8b1sI1NsoN05NQsv8hA0CByFsVY8JR67DwjQ9 +XUGh7ApSkN8rJZyegoZ+R4rDFt6erqRbrChU6MnemdiZ81izfEuHZlUtghDsGDE= +=cnf4 +-----END PGP SIGNATURE----- diff --git a/nginx.changes b/nginx.changes index 558c69e..1f36cb3 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Nov 5 21:24:19 UTC 2021 - Илья Индиго + +- Updated to 1.21.4 + * https://nginx.org/en/CHANGES + * Support for NPN instead of ALPN to establish HTTP/2 + connections has been removed. + * Now nginx rejects SSL connections if ALPN is used by the + client, but no supported protocols can be negotiated. + * The default value of the "sendfile_max_chunk" directive was + changed to 2 megabytes. + * The "proxy_half_close" directive in the stream module. + * The "ssl_alpn" directive in the stream module. + * The $ssl_alpn_protocol variable. + * Support for SSL_sendfile() when using OpenSSL 3.0. + * The "mp4_start_key_frame" directive in the ngx_http_mp4_module. + * In the $content_length variable when using chunked transfer encoding. + * After receiving a response with incorrect length from a proxied + backend nginx might nevertheless cache the connection. + * Invalid headers from backends were logged at the "info" level + instead of "error"; the bug had appeared in 1.21.1. + * Requests might hang when using HTTP/2 and the "aio_write" directive. + ------------------------------------------------------------------- Fri Nov 5 18:10:15 UTC 2021 - Ondřej Súkup diff --git a/nginx.spec b/nginx.spec index 1d11bcc..cd5086d 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ %bcond_with ngx_google_perftools # Name: nginx -Version: 1.21.3 +Version: 1.21.4 Release: 0 Summary: A HTTP server and IMAP/POP3 proxy server License: BSD-2-Clause From 9f0de931579c818ad06665081739f996b770809a2b0149eb3ebb694da2484ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Mon, 8 Nov 2021 10:38:48 +0000 Subject: [PATCH 3/4] Accepting request 930116 from home:susnux:branches:server:http - Add nginx-vim-syntax.patch * Fix the vim syntax file to work with vim 8, boo#1187888 https://trac.nginx.org/nginx/ticket/2276 OBS-URL: https://build.opensuse.org/request/show/930116 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=218 --- nginx-vim-syntax.patch | 23 +++++++++++++++++++++++ nginx.changes | 7 +++++++ nginx.spec | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 nginx-vim-syntax.patch diff --git a/nginx-vim-syntax.patch b/nginx-vim-syntax.patch new file mode 100644 index 0000000..dada676 --- /dev/null +++ b/nginx-vim-syntax.patch @@ -0,0 +1,23 @@ +diff -Nur nginx-1.21.4/contrib/vim/syntax/nginx.vim new/contrib/vim/syntax/nginx.vim +--- nginx-1.21.4/contrib/vim/syntax/nginx.vim 2021-11-02 15:49:22.000000000 +0100 ++++ new/contrib/vim/syntax/nginx.vim 2021-11-08 09:58:58.283999487 +0100 +@@ -5,6 +5,10 @@ + finish + end + ++" Reset compatible-options to Vim default value, just in case: ++let s:save_cpo = &cpo ++set cpo&vim ++ + " general syntax + + if has("patch-7.4.1142") +@@ -2447,4 +2451,8 @@ + hi def link ngxListenOptions Keyword + hi def link ngxListenOptionsDeprecated Error + ++" Restore current compatible-options: ++let &cpo = s:save_cpo ++unlet s:save_cpo ++ + let b:current_syntax = "nginx" diff --git a/nginx.changes b/nginx.changes index 1f36cb3..5f7403c 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 8 08:56:05 UTC 2021 - Ferdinand Thiessen + +- Add nginx-vim-syntax.patch + * Fix the vim syntax file to work with vim 8, boo#1187888 + https://trac.nginx.org/nginx/ticket/2276 + ------------------------------------------------------------------- Fri Nov 5 21:24:19 UTC 2021 - Илья Индиго diff --git a/nginx.spec b/nginx.spec index cd5086d..86ca86e 100644 --- a/nginx.spec +++ b/nginx.spec @@ -47,6 +47,8 @@ Patch2: nginx-1.2.4-perl_vendor_install.patch Patch3: nginx-1.6.1-default_config.patch # PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO Patch4: nginx-aio.patch +# PATCH-FIX-UPSTREAM nginx-vim-syntax.patch fix vim syntax file for vim 8 +Patch5: nginx-vim-syntax.patch BuildRequires: gcc-c++ BuildRequires: gd-devel BuildRequires: libatomic-ops-devel @@ -105,6 +107,7 @@ The source of nginx [engine x] HTTP server and IMAP/POP3 proxy server. %patch2 %patch3 %patch4 -p1 +%patch5 -p1 perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl # we just use lib here because nginx loads them relative to _prefix From d8ce311b4109b761d14b4d8b474f88c7e883a95e3169faf262693ccbd5672d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Mon, 8 Nov 2021 11:22:33 +0000 Subject: [PATCH 4/4] Accepting request 930155 from server:http Revert to 217. OBS-URL: https://build.opensuse.org/request/show/930155 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=219 --- nginx-vim-syntax.patch | 23 ----------------------- nginx.changes | 7 ------- nginx.spec | 3 --- 3 files changed, 33 deletions(-) delete mode 100644 nginx-vim-syntax.patch diff --git a/nginx-vim-syntax.patch b/nginx-vim-syntax.patch deleted file mode 100644 index dada676..0000000 --- a/nginx-vim-syntax.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur nginx-1.21.4/contrib/vim/syntax/nginx.vim new/contrib/vim/syntax/nginx.vim ---- nginx-1.21.4/contrib/vim/syntax/nginx.vim 2021-11-02 15:49:22.000000000 +0100 -+++ new/contrib/vim/syntax/nginx.vim 2021-11-08 09:58:58.283999487 +0100 -@@ -5,6 +5,10 @@ - finish - end - -+" Reset compatible-options to Vim default value, just in case: -+let s:save_cpo = &cpo -+set cpo&vim -+ - " general syntax - - if has("patch-7.4.1142") -@@ -2447,4 +2451,8 @@ - hi def link ngxListenOptions Keyword - hi def link ngxListenOptionsDeprecated Error - -+" Restore current compatible-options: -+let &cpo = s:save_cpo -+unlet s:save_cpo -+ - let b:current_syntax = "nginx" diff --git a/nginx.changes b/nginx.changes index 5f7403c..1f36cb3 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Mon Nov 8 08:56:05 UTC 2021 - Ferdinand Thiessen - -- Add nginx-vim-syntax.patch - * Fix the vim syntax file to work with vim 8, boo#1187888 - https://trac.nginx.org/nginx/ticket/2276 - ------------------------------------------------------------------- Fri Nov 5 21:24:19 UTC 2021 - Илья Индиго diff --git a/nginx.spec b/nginx.spec index 86ca86e..cd5086d 100644 --- a/nginx.spec +++ b/nginx.spec @@ -47,8 +47,6 @@ Patch2: nginx-1.2.4-perl_vendor_install.patch Patch3: nginx-1.6.1-default_config.patch # PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO Patch4: nginx-aio.patch -# PATCH-FIX-UPSTREAM nginx-vim-syntax.patch fix vim syntax file for vim 8 -Patch5: nginx-vim-syntax.patch BuildRequires: gcc-c++ BuildRequires: gd-devel BuildRequires: libatomic-ops-devel @@ -107,7 +105,6 @@ The source of nginx [engine x] HTTP server and IMAP/POP3 proxy server. %patch2 %patch3 %patch4 -p1 -%patch5 -p1 perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl # we just use lib here because nginx loads them relative to _prefix