From 3ea9761da6cba379f1e506bdbd150c15538929fe2f554855df4563bd77b9b4ff 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: Tue, 24 May 2022 18:53:10 +0000 Subject: [PATCH 1/7] Accepting request 979031 from home:13ilya:branches:server:http - Used pkgconfig wherever possible. - Updated to 1.22.0 (1.22.x stable branch). OBS-URL: https://build.opensuse.org/request/show/979031 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=223 --- nginx-1.21.6.tar.gz | 3 --- nginx-1.21.6.tar.gz.asc | 10 -------- nginx-1.22.0.tar.gz | 3 +++ nginx-1.22.0.tar.gz.asc | 14 +++++++++++ nginx.changes | 52 +++++++++++++++++++++++------------------ nginx.spec | 22 ++++++++--------- 6 files changed, 57 insertions(+), 47 deletions(-) delete mode 100644 nginx-1.21.6.tar.gz delete mode 100644 nginx-1.21.6.tar.gz.asc create mode 100644 nginx-1.22.0.tar.gz create mode 100644 nginx-1.22.0.tar.gz.asc diff --git a/nginx-1.21.6.tar.gz b/nginx-1.21.6.tar.gz deleted file mode 100644 index 7edfb51..0000000 --- a/nginx-1.21.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66dc7081488811e9f925719e34d1b4504c2801c81dee2920e5452a86b11405ae -size 1073364 diff --git a/nginx-1.21.6.tar.gz.asc b/nginx-1.21.6.tar.gz.asc deleted file mode 100644 index a37ab63..0000000 --- a/nginx-1.21.6.tar.gz.asc +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEcBAABCAAGBQJh8BL5AAoJEFIKmZOhwFL400cH/0RS572QTriJJ0FsZ64zmeQP -eE6uhvjnxDQq32kNUIUH1jycefOAG8qauVkTJHbVoDCvDpFI+72h3V5C2voWBHRc -aqLgr4KSxQ6ixX1W27legJ20bXOZFO7tRhPicA7zq1M6VqKYc6zPS40kMg6Nu3ZV -8qPkVhxEWXp03v6xIWg9F1FXGVU0kiGjdjaLZPylB+zGGHKTf/I+BMiB4KqGMbZd -af4NgaOR5YTgCSf0U1raJvqlhId89ViuiuTSmcvHz7KOIlWf6krhsY71DfB44AMT -GwJuu+R9rqZiRdI9DGRW7bQ47NHN89ZTe3+Nem7GwJaZq1IjdKxPQtx4cH4dkN8= -=vZO/ ------END PGP SIGNATURE----- diff --git a/nginx-1.22.0.tar.gz b/nginx-1.22.0.tar.gz new file mode 100644 index 0000000..040d13a --- /dev/null +++ b/nginx-1.22.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b33d569a6f11a01433a57ce17e83935e953ad4dc77cdd4d40f896c88ac26eb53 +size 1073322 diff --git a/nginx-1.22.0.tar.gz.asc b/nginx-1.22.0.tar.gz.asc new file mode 100644 index 0000000..10e2bb7 --- /dev/null +++ b/nginx-1.22.0.tar.gz.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQHEBAABCAAuFiEEE8gqY7YDV2FW4wpOoOqYG2aw2WcFAmKM6+8QHGsucGF2bG92 +QGY1LmNvbQAKCRCg6pgbZrDZZ6UoC/9RfOAJDP9HnXYTZfIvagxgZunO2FApIbVi +G6LOGFhDTCz4uBSHGTQXwkLn/i2TmvbFLMTelGjlZYGrARXBwfeMEZjeE038nemK +B4z0LCoRt8UiWTEV4T1OH06Xxl2ge6JgX4z4ZrQ1OKV0raGTCBrfz1VNUGAfPyQ5 +jCRZFm9ZEiMn0kbDDRz5/EV8rktFV3mShmz/+SfQqZLrAoG7rIOP3QRcVhuhGx/c +4uwX0hPpGVkorE93UxRela9yhxX4uLvrqNOyn398qfC55Gun1O3lh3LHXOu2Mv3r +buhMJ1Z7p67C1DxjU6qZ/NTvgE1l+BUgdujH3c5nNiIyHudAw9cOflT2OXXmzKDC +UNAL6lA8arGSmw5Tp+lqZdwY7TDKsMdZGPyokik8xLksxKmMZ6Aslp4LbZknVwmX +K5H5hfbJTSvJuQpluJQKKN59I5z7V2iMNucl3QPlDK1KeU8Pk/1sBOLbrXDzQ1Vy +dpDs/7OnFlnEohwYDh1ZqBV6fl+Sccc= +=8cch +-----END PGP SIGNATURE----- diff --git a/nginx.changes b/nginx.changes index 8677005..27bc49b 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,5 +1,11 @@ ------------------------------------------------------------------- -Tue Feb 1 14:50:56 UTC 2022 - Илья Индиго +Tue May 24 18:45:55 UTC 2022 - Илья Индиго + +- Used pkgconfig wherever possible. +- Updated to 1.22.0 (1.22.x stable branch). + +------------------------------------------------------------------- +Tue Feb 1 14:50:56 UTC 2022 - Илья Индиго - Updated to 1.21.6 * https://nginx.org/en/CHANGES @@ -20,7 +26,7 @@ Wed Dec 29 11:03:27 UTC 2021 - Andreas Stieger with the "sendfile" and "aio" directives. ------------------------------------------------------------------- -Fri Nov 5 21:24:19 UTC 2021 - Илья Индиго +Fri Nov 5 21:24:19 UTC 2021 - Илья Индиго - Updated to 1.21.4 * https://nginx.org/en/CHANGES @@ -59,7 +65,7 @@ Mon Oct 11 09:26:39 UTC 2021 - Johannes Segitz * nginx.service ------------------------------------------------------------------- -Fri Sep 10 17:44:54 UTC 2021 - Илья Индиго +Fri Sep 10 17:44:54 UTC 2021 - Илья Индиго - Updated to 1.21.3 * https://nginx.org/en/CHANGES @@ -68,7 +74,7 @@ Fri Sep 10 17:44:54 UTC 2021 - Илья Индиго buffering of the data being processed. ------------------------------------------------------------------- -Wed Sep 1 07:09:54 UTC 2021 - Илья Индиго +Wed Sep 1 07:09:54 UTC 2021 - Илья Индиго - Updated to 1.21.2 * https://nginx.org/en/CHANGES @@ -88,7 +94,7 @@ Wed Sep 1 07:09:54 UTC 2021 - Илья Индиго disk if the "Content-Length" header line was not present in the request. ------------------------------------------------------------------- -Wed Jul 7 18:53:17 UTC 2021 - Илья Индиго +Wed Jul 7 18:53:17 UTC 2021 - Илья Индиго - Updated to 1.21.1 * https://nginx.org/en/CHANGES @@ -137,7 +143,7 @@ Thu May 27 16:35:26 UTC 2021 - Dirk Müller closed unexpectedly when using SMTP pipelining. ------------------------------------------------------------------- -Wed May 26 02:44:27 UTC 2021 - Илья Индиго +Wed May 26 02:44:27 UTC 2021 - Илья Индиго - Update to 1.20.1 * https://nginx.org/en/CHANGES @@ -153,13 +159,13 @@ Wed Apr 21 04:54:21 UTC 2021 - Andreas Stieger also installed or selected (boo#1183710) ------------------------------------------------------------------- -Tue Apr 20 20:41:21 UTC 2021 - Илья Индиго +Tue Apr 20 20:41:21 UTC 2021 - Илья Индиго - Update to 1.20.0 * 1.20.x stable branch. ------------------------------------------------------------------- -Wed Apr 14 11:09:07 UTC 2021 - Илья Индиго +Wed Apr 14 11:09:07 UTC 2021 - Илья Индиго - Update to 1.19.10 * https://nginx.org/en/CHANGES @@ -169,7 +175,7 @@ Wed Apr 14 11:09:07 UTC 2021 - Илья Индиго appeared in logs when using zlib-ng. ------------------------------------------------------------------- -Sat Apr 3 10:29:25 UTC 2021 - Илья Индиго +Sat Apr 3 10:29:25 UTC 2021 - Илья Индиго - Update to 1.19.9 * https://nginx.org/en/CHANGES @@ -201,7 +207,7 @@ Fri Mar 12 20:17:06 UTC 2021 - Dirk Müller * Bugfix: in the eventport method. ------------------------------------------------------------------- -Sat Feb 27 12:04:02 UTC 2021 - Илья Индиго +Sat Feb 27 12:04:02 UTC 2021 - Илья Индиго - Refreshed spec-file via spec-cleaner and manual optimizations. * Droped obsolete conditional constructs. @@ -260,7 +266,7 @@ Wed Dec 23 07:18:28 UTC 2020 - Paolo Stivanin * Fix in the ngx_http_flv_module and ngx_http_mp4_module. ------------------------------------------------------------------- -Tue Nov 24 19:30:01 UTC 2020 - Илья Индиго +Tue Nov 24 19:30:01 UTC 2020 - Илья Индиго - Update to 1.19.5 * https://nginx.org/en/CHANGES @@ -273,12 +279,12 @@ Tue Nov 24 19:30:01 UTC 2020 - Илья Индиго * Fix in request body filters internal API. ------------------------------------------------------------------- -Mon Nov 9 11:07:07 UTC 2020 - Илья Индиго +Mon Nov 9 11:07:07 UTC 2020 - Илья Индиго - Refresh spec-file via spec-cleaner and manual optimizations. ------------------------------------------------------------------- -Tue Oct 27 20:23:09 UTC 2020 - Илья Индиго +Tue Oct 27 20:23:09 UTC 2020 - Илья Индиго - Update to 1.19.4 * https://nginx.org/en/CHANGES @@ -304,7 +310,7 @@ Fri Oct 2 01:58:09 UTC 2020 - Marcus Rueckert - The rtmp module is replaced with nginx-module-http-flv ------------------------------------------------------------------- -Wed Sep 30 11:28:16 UTC 2020 - Илья Индиго +Wed Sep 30 11:28:16 UTC 2020 - Илья Индиго - Update to 1.19.3 * https://nginx.org/en/CHANGES @@ -327,7 +333,7 @@ Wed Sep 30 11:28:16 UTC 2020 - Илья Индиго * Fix socket leak when using HTTP/2 and subrequests in the njs module. ------------------------------------------------------------------- -Wed Aug 12 15:23:16 UTC 2020 - Илья Индиго +Wed Aug 12 15:23:16 UTC 2020 - Илья Индиго - Update to 1.19.2 * https://nginx.org/en/CHANGES @@ -356,7 +362,7 @@ Tue Aug 4 19:10:24 UTC 2020 - Dirk Mueller * remove geoip_module which is no longer compiled (bsc#1156202) ------------------------------------------------------------------- -Wed Jul 8 11:52:53 UTC 2020 - Илья Индиго +Wed Jul 8 11:52:53 UTC 2020 - Илья Индиго - Update to 1.19.1 * https://nginx.org/en/CHANGES @@ -382,7 +388,7 @@ Wed Jul 8 11:52:53 UTC 2020 - Илья Индиго a memcached server returned a malformed response. ------------------------------------------------------------------- -Thu May 28 01:46:00 UTC 2020 - Илья Индиго +Thu May 28 01:46:00 UTC 2020 - Илья Индиго - Update to 1.19.0 * https://nginx.org/en/CHANGES @@ -401,7 +407,7 @@ Thu May 7 16:15:48 UTC 2020 - Cristian Rodríguez system's default (sysctl net.core.somaxconn) ------------------------------------------------------------------- -Wed Apr 22 16:46:27 UTC 2020 - Илья Индиго +Wed Apr 22 16:46:27 UTC 2020 - Илья Индиго - Update to 1.18.0 * 1.18.x stable branch. @@ -413,7 +419,7 @@ Fri Apr 17 12:28:02 UTC 2020 - Thorsten Kukuk - Remove self-conflict ------------------------------------------------------------------- -Wed Apr 15 13:12:58 UTC 2020 - Илья Индиго +Wed Apr 15 13:12:58 UTC 2020 - Илья Индиго - Update to 1.17.10 * https://nginx.org/en/CHANGES @@ -426,7 +432,7 @@ Tue Mar 10 10:49:35 UTC 2020 - Vítězslav Čížek (bsc#1156202) ------------------------------------------------------------------- -Wed Mar 4 12:35:47 UTC 2020 - Илья Индиго +Wed Mar 4 12:35:47 UTC 2020 - Илья Индиго - Update to 1.17.9 * https://nginx.org/en/CHANGES @@ -458,7 +464,7 @@ Tue Jan 21 16:35:28 UTC 2020 - Thorsten Kukuk without sysemd, too. ------------------------------------------------------------------- -Sat Dec 28 11:03:16 UTC 2019 - Илья Индиго +Sat Dec 28 11:03:16 UTC 2019 - Илья Индиго - Refresh spec-file via spec-cleaner. - Add in service-file Wants=network-online.target (boo#1155690) @@ -498,7 +504,7 @@ Mon Oct 28 01:37:06 UTC 2019 - Cristian Rodríguez no longer needed. ------------------------------------------------------------------- -Wed Oct 23 17:04:53 UTC 2019 - Илья Индиго +Wed Oct 23 17:04:53 UTC 2019 - Илья Индиго - Update to 1.17.5 * https://nginx.org/en/CHANGES @@ -511,7 +517,7 @@ Wed Oct 23 17:04:53 UTC 2019 - Илья Индиго * nginx could not be built with MinGW-w64 gcc 8.1 or newer. ------------------------------------------------------------------- -Mon Oct 21 22:27:00 UTC 2019 - Илья Индиго +Mon Oct 21 22:27:00 UTC 2019 - Илья Индиго - Update to 1.17.4 * https://nginx.org/en/CHANGES diff --git a/nginx.spec b/nginx.spec index eef52be..9dfb1b9 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ %bcond_with ngx_google_perftools # Name: nginx -Version: 1.21.6 +Version: 1.22.0 Release: 0 Summary: A HTTP server and IMAP/POP3 proxy server License: BSD-2-Clause @@ -48,18 +48,18 @@ Patch3: nginx-1.6.1-default_config.patch # PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO Patch4: nginx-aio.patch BuildRequires: gcc-c++ -BuildRequires: gd-devel BuildRequires: libatomic-ops-devel -BuildRequires: libxslt-devel BuildRequires: nginx-macros -BuildRequires: openssl-devel -BuildRequires: pcre2-devel BuildRequires: pkgconfig BuildRequires: sysuser-shadow BuildRequires: sysuser-tools BuildRequires: vim -BuildRequires: zlib-devel +BuildRequires: pkgconfig(gdlib) +BuildRequires: pkgconfig(libpcre2-8) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(zlib) %requires_eq perl Recommends: logrotate Recommends: nginx-module-fancyindex @@ -83,15 +83,15 @@ It has been running on many heavily loaded Russian sites for more than two years Summary: The nginx source Group: Development/Sources Requires: gcc-c++ -Requires: gd-devel Requires: libatomic-ops-devel -Requires: libxslt-devel Requires: nginx = %{version} -Requires: openssl-devel -Requires: pcre2-devel Requires: pkgconfig Requires: vim -Requires: zlib-devel +Requires: pkgconfig(gdlib) +Requires: pkgconfig(libpcre2-8) +Requires: pkgconfig(libxslt) +Requires: pkgconfig(openssl) +Requires: pkgconfig(zlib) %requires_ge nginx-macros BuildArch: noarch From cf83f78146b1ce2d540613d821987dc02702ea6006cffefce41169f67aced67d 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: Tue, 24 May 2022 19:03:56 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=224 --- nginx.keyring | 55 +++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/nginx.keyring b/nginx.keyring index fbe674a..58ba325 100644 --- a/nginx.keyring +++ b/nginx.keyring @@ -1,33 +1,28 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.11 (FreeBSD) +Version: GnuPG v2.0.22 (GNU/Linux) -mQENBE7SKu8BCADQo6x4ZQfAcPlJMLmL8zBEBUS6GyKMMMDtrTh3Yaq481HB54oR -0cpKL05Ff9upjrIzLD5TJUCzYYM9GQOhguDUP8+ZU9JpSz3yO2TvH7WBbUZ8FADf -hblmmUBLNgOWgLo3W+FYhl3mz1GFS2Fvid6Tfn02L8CBAj7jxbjL1Qj/OA/WmLLc -m6BMTqI7IBlYW2vyIOIHasISGiAwZfp0ucMeXXvTtt14LGa8qXVcFnJTdwbf03AS -ljhYrQnKnpl3VpDAoQt8C68YCwjaNJW59hKqWB+XeIJ9CW98+EOAxLAFszSyGanp -rCqPd0numj9TIddjcRkTA/ZbmCWK+xjpVBGXABEBAAG0IU1heGltIERvdW5pbiA8 -bWRvdW5pbkBtZG91bmluLnJ1PokBOAQTAQIAIgUCTtIq7wIbAwYLCQgHAwIGFQgC -CQoLBBYCAwECHgECF4AACgkQUgqZk6HAUvj+iwf/b4FS6zVzJ5T0v1vcQGD4ZzXe -D5xMC4BJW414wVMU15rfX7aCdtoCYBNiApPxEd7SwiyxWRhRA9bikUq87JEgmnyV -0iYbHZvCvc1jOkx4WR7E45t1Mi29KBoPaFXA9X5adZkYcOQLDxa2Z8m6LGXnlF6N -tJkxQ8APrjZsdrbDvo3HxU9muPcq49ydzhgwfLwpUs11LYkwB0An9WRPuv3jporZ -/XgI6RfPMZ5NIx+FRRCjn6DnfHboY9rNF6NzrOReJRBhXCi6I+KkHHEnMoyg8XET -9lVkfHTOl81aIZqrAloX3/00TkYWyM2zO9oYpOg6eUFCX/Lw4MJZsTcT5EKVxIhG -BBARAgAGBQJO01Y/AAoJEOzw6QssFyCDVyQAn3qwTZlcZgyyzWu9Cs8gJ0CXREaS -AJ92QjGLT9DijTcbB+q9OS/nl16Z/IhGBBARAgAGBQJO02JDAAoJEKk3YTmlJMU+ -P64AnjCKEXFelSVMtgefJk3+vpyt3QX1AKCH9M3MbTWPeDUL+MpULlfdyfvjj7kB -DQRO0irvAQgA0LjCc8S6oZzjiap2MjRNhRFA5BYjXZRZBdKF2VP74avt2/RELq8G -W0n7JWmKn6vvrXabEGLyfkCngAhTq9tJ/K7LPx/bmlO5+jboO/1inH2BTtLiHjAX -vicXZk3oaZt2Sotx5mMI3yzpFQRVqZXsi0LpUTPJEh3oS8IdYRjslQh1A7P5hfCZ -wtzwb/hKm8upODe/ITUMuXeWfLuQj/uEU6wMzmfMHb+jlYMWtb+v98aJa2FODeKP -mWCXLa7bliXp1SSeBOEfIgEAmjM6QGlDx5sZhr2Ss2xSPRdZ8DqD7oiRVzmstX1Y -oxEzC0yXfaefC7SgM0nMnaTvYEOYJ9CH3wARAQABiQEfBBgBAgAJBQJO0irvAhsM -AAoJEFIKmZOhwFL4844H/jo8icCcS6eOWvnen7lg0FcCo1fIm4wW3tEmkQdchSHE -CJDq7pgTloN65pwB5tBoT47cyYNZA9eTfJVgRc74q5cexKOYrMC3KuAqWbwqXhkV -s0nkWxnOIidTHSXvBZfDFA4Idwte94Thrzf8Pn8UESudTiqrWoCBXk2UyVsl03gJ -blSJAeJGYPPeo+Yj6m63OWe2+/S2VTgmbPS/RObn0Aeg7yuff0n5+ytEt2KL51gO -QE2uIxTCawHr12PsllPkbqPk/PagIttfEJqn9b0CrqPC3HREePb2aMJ/Ctw/76CO -wn0mtXeIXLCTvBmznXfaMKllsqbsy2nCJ2P2uJjOntw= -=Tavt +mQENBE5OMmIBCAD+FPYKGriGGf7NqwKfWC83cBV01gabgVWQmZbMcFzeW+hMsgxH +W6iimD0RsfZ9oEbfJCPG0CRSZ7ppq5pKamYs2+EJ8Q2ysOFHHwpGrA2C8zyNAs4I +QxnZZIbETgcSwFtDun0XiqPwPZgyuXVm9PAbLZRbfBzm8wR/3SWygqZBBLdQk5TE +fDR+Eny/M1RVR4xClECONF9UBB2ejFdI1LD45APbP2hsN/piFByU1t7yK2gpFyRt +97WzGHn9MV5/TL7AmRPM4pcr3JacmtCnxXeCZ8nLqedoSuHFuhwyDnlAbu8I16O5 +XRrfzhrHRJFM1JnIiGmzZi6zBvH0ItfyX6ttABEBAAG0KW5naW54IHNpZ25pbmcg +a2V5IDxzaWduaW5nLWtleUBuZ2lueC5jb20+iQE+BBMBAgAoAhsDBgsJCAcDAgYV +CAIJCgsEFgIDAQIeAQIXgAUCV2K1+AUJGB4fQQAKCRCr9b2Ce9m/YloaB/9XGrol +kocm7l/tsVjaBQCteXKuwsm4XhCuAQ6YAwA1L1UheGOG/aa2xJvrXE8X32tgcTjr +KoYoXWcdxaFjlXGTt6jV85qRguUzvMOxxSEM2Dn115etN9piPl0Zz+4rkx8+2vJG +F+eMlruPXg/zd88NvyLq5gGHEsFRBMVufYmHtNfcp4okC1klWiRIRSdp4QY1wdrN +1O+/oCTl8Bzy6hcHjLIq3aoumcLxMjtBoclc/5OTioLDwSDfVx7rWyfRhcBzVbwD +oe/PD08AoAA6fxXvWjSxy+dGhEaXoTHjkCbz/l6NxrK3JFyauDgU4K4MytsZ1HDi +MgMW8hZXxszoICTTiQEcBBABAgAGBQJOTkelAAoJEKZP1bF62zmo79oH/1XDb29S +YtWp+MTJTPFEwlWRiyRuDXy3wBd/BpwBRIWfWzMs1gnCjNjk0EVBVGa2grvy9Jtx +JKMd6l/PWXVucSt+U/+GO8rBkw14SdhqxaS2l14v6gyMeUrSbY3XfToGfwHC4sa/ +Thn8X4jFaQ2XN5dAIzJGU1s5JA0tjEzUwCnmrKmyMlXZaoQVrmORGjCuH0I0aAFk +RS0UtnB9HPpxhGVbs24xXZQnZDNbUQeulFxS4uP3OLDBAeCHl+v4t/uotIad8v6J +SO93vc1evIje6lguE81HHmJn9noxPItvOvSMb2yPsE8mH4cJHRTFNSEhPW6ghmlf +Wa9ZwiVX5igxcvaIRgQQEQIABgUCTk5b0gAKCRDs8OkLLBcgg1G+AKCnacLb/+W6 +cflirUIExgZdUJqoogCeNPVwXiHEIVqithAM1pdY/gcaQZmIRgQQEQIABgUCTk5f +YQAKCRCpN2E5pSTFPnNWAJ9gUozyiS+9jf2rJvqmJSeWuCgVRwCcCUFhXRCpQO2Y +Va3l3WuB+rgKjsQ= +=EWWI -----END PGP PUBLIC KEY BLOCK----- From 371e023fc6043a1625339903659ad0a11b3951162b7f5ece1580645cb05c81cb 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: Tue, 24 May 2022 19:05:30 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=225 --- nginx.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nginx.changes b/nginx.changes index 27bc49b..4880ef4 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Tue May 24 18:45:55 UTC 2022 - Илья Индиго +Tue May 24 19:04:48 UTC 2022 - Илья Индиго - Used pkgconfig wherever possible. +- Updated nginx.keyring. - Updated to 1.22.0 (1.22.x stable branch). ------------------------------------------------------------------- From 1272ec2e7133381a798966a8867a8d27161404fb0555833d1a1063e9b3e72ef3 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: Tue, 21 Jun 2022 22:52:57 +0000 Subject: [PATCH 4/7] Accepting request 984266 from home:13ilya - Updated nginx.keyring. - Updated to 1.23.0 * https://nginx.org/en/CHANGES * Now header lines are represented as linked lists. * Now nginx combines arbitrary header lines with identical names when sending to FastCGI, SCGI, and uwsgi backends, in the $r->header_in() method of the ngx_http_perl_module, and during lookup of the "$http_...", "$sent_http_...", "$sent_trailer_...", "$upstream_http_...", and "$upstream_trailer_..." variables. * Fixed: if there were multiple "Vary" header lines in the backend response, nginx only used the last of them when caching. * Fixed: if there were multiple "WWW-Authenticate" header lines in the backend response and errors with code 401 were intercepted or the "auth_request" directive was used, nginx only sent the first of the header lines to the client. * The logging level of the "application data after close notify" SSL errors has been lowered from "crit" to "info". * Fixed: connections might hang if nginx was built on Linux 2.6.17 or newer, but was used on systems without EPOLLRDHUP support, notably with epoll emulation layers; the bug had appeared in 1.17.5. * Fixed: nginx did not cache the response if the "Expires" response header line disabled caching, but following "Cache-Control" header line enabled caching. OBS-URL: https://build.opensuse.org/request/show/984266 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=226 --- nginx-1.22.0.tar.gz | 3 --- nginx-1.22.0.tar.gz.asc | 14 -------------- nginx-1.23.0.tar.gz | 3 +++ nginx-1.23.0.tar.gz.asc | 14 ++++++++++++++ nginx.changes | 26 +++++++++++++++++++++++--- nginx.spec | 4 ++-- 6 files changed, 42 insertions(+), 22 deletions(-) delete mode 100644 nginx-1.22.0.tar.gz delete mode 100644 nginx-1.22.0.tar.gz.asc create mode 100644 nginx-1.23.0.tar.gz create mode 100644 nginx-1.23.0.tar.gz.asc diff --git a/nginx-1.22.0.tar.gz b/nginx-1.22.0.tar.gz deleted file mode 100644 index 040d13a..0000000 --- a/nginx-1.22.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b33d569a6f11a01433a57ce17e83935e953ad4dc77cdd4d40f896c88ac26eb53 -size 1073322 diff --git a/nginx-1.22.0.tar.gz.asc b/nginx-1.22.0.tar.gz.asc deleted file mode 100644 index 10e2bb7..0000000 --- a/nginx-1.22.0.tar.gz.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQHEBAABCAAuFiEEE8gqY7YDV2FW4wpOoOqYG2aw2WcFAmKM6+8QHGsucGF2bG92 -QGY1LmNvbQAKCRCg6pgbZrDZZ6UoC/9RfOAJDP9HnXYTZfIvagxgZunO2FApIbVi -G6LOGFhDTCz4uBSHGTQXwkLn/i2TmvbFLMTelGjlZYGrARXBwfeMEZjeE038nemK -B4z0LCoRt8UiWTEV4T1OH06Xxl2ge6JgX4z4ZrQ1OKV0raGTCBrfz1VNUGAfPyQ5 -jCRZFm9ZEiMn0kbDDRz5/EV8rktFV3mShmz/+SfQqZLrAoG7rIOP3QRcVhuhGx/c -4uwX0hPpGVkorE93UxRela9yhxX4uLvrqNOyn398qfC55Gun1O3lh3LHXOu2Mv3r -buhMJ1Z7p67C1DxjU6qZ/NTvgE1l+BUgdujH3c5nNiIyHudAw9cOflT2OXXmzKDC -UNAL6lA8arGSmw5Tp+lqZdwY7TDKsMdZGPyokik8xLksxKmMZ6Aslp4LbZknVwmX -K5H5hfbJTSvJuQpluJQKKN59I5z7V2iMNucl3QPlDK1KeU8Pk/1sBOLbrXDzQ1Vy -dpDs/7OnFlnEohwYDh1ZqBV6fl+Sccc= -=8cch ------END PGP SIGNATURE----- diff --git a/nginx-1.23.0.tar.gz b/nginx-1.23.0.tar.gz new file mode 100644 index 0000000..6812583 --- /dev/null +++ b/nginx-1.23.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:820acaa35b9272be9e9e72f6defa4a5f2921824709f8aa4772c78ab31ed94cd1 +size 1102940 diff --git a/nginx-1.23.0.tar.gz.asc b/nginx-1.23.0.tar.gz.asc new file mode 100644 index 0000000..6dd613b --- /dev/null +++ b/nginx-1.23.0.tar.gz.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQHEBAABCAAuFiEEE8gqY7YDV2FW4wpOoOqYG2aw2WcFAmKx8EIQHGsucGF2bG92 +QGY1LmNvbQAKCRCg6pgbZrDZZ+pJDACRNHBfnWdlk6uTGmTj8Ov/9vJwjJ9TCNuG +oEnyALdA7+18XSvoifRN+XFaZhNEhgROYJ2uMXwlklEOewFTcjZy1aGlycFpomR5 ++rS+DSAeAfMD99PQdo0XUhnRnhSXN7Y1z1h/9wD/hCEagIBKLXSDYbAzfEs6mexE +ROjqqd97elGflA5uAJYtdVSv0hV97n3e9wGHNWGitothUl977ofCKT6M25DCTjnP +AJB5V/bJYfJu2Ce+8h+J7136bOd5ttkZuqcAf/YBnrcB9oepazqPU2Wm2sLHnZ1d +FPYTvw5k1k5G6m7S6iikwnsEyOY5uUrmX3umihEOP9Rnp1H48iSGejyaj8Hd7mXc +yXjC/AA3rcgim7r7DDS9dTYEXGaScJqa7JAuaJsuBW0i0Rkca4+K54274CHPBMPV +GRvSgB6NzVAfxdX+Ya0qEYlzVo30MK9HEPoZsAJMXEp70iK7SdyEKOZGgCYr2kkC +fmDCf/1XgbDkutGcSpOZWA9j0BGAfGk= +=E4i3 +-----END PGP SIGNATURE----- diff --git a/nginx.changes b/nginx.changes index 4880ef4..6a08b21 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,9 +1,29 @@ ------------------------------------------------------------------- -Tue May 24 19:04:48 UTC 2022 - Илья Индиго +Tue Jun 21 22:43:06 UTC 2022 - Илья Индиго -- Used pkgconfig wherever possible. - Updated nginx.keyring. -- Updated to 1.22.0 (1.22.x stable branch). +- Updated to 1.23.0 + * https://nginx.org/en/CHANGES + * Now header lines are represented as linked lists. + * Now nginx combines arbitrary header lines with identical + names when sending to FastCGI, SCGI, and uwsgi backends, in the + $r->header_in() method of the ngx_http_perl_module, and during lookup + of the "$http_...", "$sent_http_...", "$sent_trailer_...", + "$upstream_http_...", and "$upstream_trailer_..." variables. + * Fixed: if there were multiple "Vary" header lines in the backend + response, nginx only used the last of them when caching. + * Fixed: if there were multiple "WWW-Authenticate" header lines in the + backend response and errors with code 401 were intercepted or the + "auth_request" directive was used, nginx only sent the first of the + header lines to the client. + * The logging level of the "application data after close + notify" SSL errors has been lowered from "crit" to "info". + * Fixed: connections might hang if nginx was built on Linux 2.6.17 or + newer, but was used on systems without EPOLLRDHUP support, notably + with epoll emulation layers; the bug had appeared in 1.17.5. + * Fixed: nginx did not cache the response if the "Expires" response + header line disabled caching, but following "Cache-Control" header + line enabled caching. ------------------------------------------------------------------- Tue Feb 1 14:50:56 UTC 2022 - Илья Индиго diff --git a/nginx.spec b/nginx.spec index 9dfb1b9..0b96b3c 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ %bcond_with ngx_google_perftools # Name: nginx -Version: 1.22.0 +Version: 1.23.0 Release: 0 Summary: A HTTP server and IMAP/POP3 proxy server License: BSD-2-Clause @@ -36,7 +36,7 @@ Source3: nginx.service Source9: nginx.sysusers Source100: nginx.rpmlintrc Source101: https://nginx.org/download/%{name}-%{version}.tar.gz.asc -Source102: https://nginx.org/keys/mdounin.key#/%{name}.keyring +Source102: https://nginx.org/keys/nginx_signing.key#/%{name}.keyring # PATCH-FIX-UPSTREAM nginx-1.11.2-no_Werror.patch Patch0: nginx-1.11.2-no_Werror.patch # PATCH-FIX-OPENSUSE nginx-1.11.2-html.patch From 4539c3c0a047cfc4632a284ea7b184a97ff799d8279c85fac96417e61c2c2713 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: Tue, 21 Jun 2022 23:27:46 +0000 Subject: [PATCH 5/7] Accepting request 984271 from home:13ilya - Updated nginx.keyring. - Removed nginx.init. - Updated to 1.23.0 * https://nginx.org/en/CHANGES * Now header lines are represented as linked lists. * Now nginx combines arbitrary header lines with identical names when sending to FastCGI, SCGI, and uwsgi backends, in the $r->header_in() method of the ngx_http_perl_module, and during lookup of the "$http_...", "$sent_http_...", "$sent_trailer_...", "$upstream_http_...", and "$upstream_trailer_..." variables. * Fixed: if there were multiple "Vary" header lines in the backend response, nginx only used the last of them when caching. * Fixed: if there were multiple "WWW-Authenticate" header lines in the backend response and errors with code 401 were intercepted or the "auth_request" directive was used, nginx only sent the first of the header lines to the client. * The logging level of the "application data after close notify" SSL errors has been lowered from "crit" to "info". * Fixed: connections might hang if nginx was built on Linux 2.6.17 or newer, but was used on systems without EPOLLRDHUP support, notably with epoll emulation layers; the bug had appeared in 1.17.5. * Fixed: nginx did not cache the response if the "Expires" response header line disabled caching, but following "Cache-Control" header line enabled caching. OBS-URL: https://build.opensuse.org/request/show/984271 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=227 --- nginx.changes | 3 +- nginx.init | 282 -------------------------------------------------- nginx.spec | 85 ++++++++------- 3 files changed, 44 insertions(+), 326 deletions(-) delete mode 100644 nginx.init diff --git a/nginx.changes b/nginx.changes index 6a08b21..aa66c04 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Tue Jun 21 22:43:06 UTC 2022 - Илья Индиго +Tue Jun 21 23:26:17 UTC 2022 - Илья Индиго - Updated nginx.keyring. +- Removed nginx.init. - Updated to 1.23.0 * https://nginx.org/en/CHANGES * Now header lines are represented as linked lists. diff --git a/nginx.init b/nginx.init deleted file mode 100644 index e788194..0000000 --- a/nginx.init +++ /dev/null @@ -1,282 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 1995--2007 Marcus Rückert, SUSE / Novell Inc. -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or (at -# your option) any later version. -# -# This library is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, see . -# -# /etc/init.d/nginx -# and its symbolic link -# /(usr/)sbin/rcnginx -# -# Template system startup script for some example service/daemon nginx -# -# LSB compatible service control script; see http://www.linuxbase.org/spec/ -# -# Note: This template uses functions rc_XXX defined in /etc/rc.status on -# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your -# script on this template and ensure that it works on non UL based LSB -# compliant Linux distributions, you either have to provide the rc.status -# functions from UL or change the script to work without them. -# See skeleton.compat for a template that works with other distros as well. -# -### BEGIN INIT INFO -# Provides: nginx -# Required-Start: $syslog $remote_fs -# Should-Start: $time ypbind sendmail -# Required-Stop: $syslog $remote_fs -# Should-Stop: $time ypbind sendmail -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: nginx -# Description: nginx -### END INIT INFO -# -# Any extensions to the keywords given above should be preceeded by -# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. -# -# Notes on Required-Start/Should-Start: -# * There are two different issues that are solved by Required-Start -# and Should-Start -# (a) Hard dependencies: This is used by the runlevel editor to determine -# which services absolutely need to be started to make the start of -# this service make sense. Example: nfsserver should have -# Required-Start: $portmap -# Also, required services are started before the dependent ones. -# The runlevel editor will warn about such missing hard dependencies -# and suggest enabling. During system startup, you may expect an error, -# if the dependency is not fulfilled. -# (b) Specifying the init script ordering, not real (hard) dependencies. -# This is needed by insserv to determine which service should be -# started first (and at a later stage what services can be started -# in parallel). The tag Should-Start: is used for this. -# It tells, that if a service is available, it should be started -# before. If not, never mind. -# * When specifying hard dependencies or ordering requirements, you can -# use names of services (contents of their Provides: section) -# or pseudo names starting with a $. The following ones are available -# according to LSB (1.1): -# $local_fs all local file systems are mounted -# (most services should need this!) -# $remote_fs all remote file systems are mounted -# (note that /usr may be remote, so -# many services should Require this!) -# $syslog system logging facility up -# $network low level networking (eth card, ...) -# $named hostname resolution available -# $netdaemons all network daemons are running -# The $netdaemons pseudo service has been removed in LSB 1.2. -# For now, we still offer it for backward compatibility. -# These are new (LSB 1.2): -# $time the system time has been set correctly -# $portmap SunRPC portmapping service available -# UnitedLinux extensions: -# $ALL indicates that a script should be inserted -# at the end -# * The services specified in the stop tags -# (Required-Stop/Should-Stop) -# specify which services need to be still running when this service -# is shut down. Often the entries there are just copies or a subset -# from the respective start tag. -# * Should-Start/Stop are now part of LSB as of 2.0, -# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. -# insserv does support both variants. -# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time -# (%fillup_and_insserv macro in %post of many RPMs) to specify whether -# a startup script should default to be enabled after installation. -# It's not used by insserv. -# -# Note on runlevels: -# 0 - halt/poweroff 6 - reboot -# 1 - single user 2 - multiuser without network exported -# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) -# -# Note on script names: -# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html -# A registry has been set up to manage the init script namespace. -# http://www.lanana.org/ -# Please use the names already registered or register one or use a -# vendor prefix. - - -# Check for missing binaries (stale symlinks should not happen) -# Note: Special treatment of stop for LSB conformance -NGINX_BIN=/usr/sbin/nginx -test -x $NGINX_BIN || { echo "$NGINX_BIN not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } -NGINX_PID=/var/run/nginx.pid - -# Check for existence of needed config file and read it -#NGINX_CONFIG=/etc/sysconfig/nginx -#test -r $NGINX_CONFIG || { echo "$NGINX_CONFIG not existing"; -# if [ "$1" = "stop" ]; then exit 0; -# else exit 6; fi; } -# -# Read config -#. $NGINX_CONFIG - -# Source LSB init functions -# providing start_daemon, killproc, pidofproc, -# log_success_msg, log_failure_msg and log_warning_msg. -# This is currently not used by UnitedLinux based distributions and -# not needed for init scripts for UnitedLinux only. If it is used, -# the functions from rc.status should not be sourced or used. -#. /lib/lsb/init-functions - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks -. /etc/rc.status - -# Reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -case "$1" in - start) - echo -n "Starting nginx " - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - /sbin/startproc -p $NGINX_PID $NGINX_BIN - - # Remember status and be verbose - rc_status -v - ;; - stop) - echo -n "Shutting down nginx " - ## Stop daemon with killproc(8) and if this fails - ## killproc sets the return value according to LSB. - - /sbin/killproc -p $NGINX_PID -TERM $NGINX_BIN - - # Remember status and be verbose - rc_status -v - ;; - try-restart|condrestart) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; - force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart the service if it - ## is running. - - echo -n "Reload service nginx " - ## if it supports it: - /sbin/killproc -p $NGINX_PID -HUP $NGINX_BIN - #touch /run/nginx.pid - rc_status -v - - ## Otherwise: - #$0 try-restart - #rc_status - ;; - reload) - ## Like force-reload, but if daemon does not support - ## signaling, do nothing (!) - - # If it supports signaling: - echo -n "Reload service nginx " - /sbin/killproc -p $NGINX_PID -HUP $NGINX_BIN - #touch /run/nginx.pid - rc_status -v - - ## Otherwise if it does not support reload: - #rc_failed 3 - #rc_status -v - ;; - reopen) - echo -n "Reopen the logfiles " - /sbin/killproc -p $NGINX_PID -USR1 $NGINX_BIN - rc_status -v - ;; - - status) - echo -n "Checking for service nginx " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # NOTE: checkproc returns LSB compliant status values. - /sbin/checkproc -p $NGINX_PID $NGINX_BIN - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. - rc_status -v - ;; - probe) - ## Optional: Probe for the necessity of a reload, print out the - ## argument to this init script which is required for a reload. - ## Note: probe is not (yet) part of LSB (as of 1.9) - - test /etc/nginx/nginx.conf -nt /run/nginx.pid && echo reload - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" - exit 1 - ;; -esac -rc_exit diff --git a/nginx.spec b/nginx.spec index 0b96b3c..615aab2 100644 --- a/nginx.spec +++ b/nginx.spec @@ -30,26 +30,25 @@ License: BSD-2-Clause Group: Productivity/Networking/Web/Proxy URL: https://nginx.org Source0: https://nginx.org/download/%{name}-%{version}.tar.gz -Source1: nginx.init -Source2: nginx.logrotate -Source3: nginx.service -Source9: nginx.sysusers -Source100: nginx.rpmlintrc -Source101: https://nginx.org/download/%{name}-%{version}.tar.gz.asc -Source102: https://nginx.org/keys/nginx_signing.key#/%{name}.keyring +Source1: https://nginx.org/download/%{name}-%{version}.tar.gz.asc +Source2: https://nginx.org/keys/nginx_signing.key#/%{name}.keyring +Source3: %{name}.rpmlintrc +Source4: %{name}.logrotate +Source5: %{name}.service +Source6: %{name}.sysusers # PATCH-FIX-UPSTREAM nginx-1.11.2-no_Werror.patch -Patch0: nginx-1.11.2-no_Werror.patch +Patch0: %{name}-1.11.2-no_Werror.patch # PATCH-FIX-OPENSUSE nginx-1.11.2-html.patch -Patch1: nginx-1.11.2-html.patch +Patch1: %{name}-1.11.2-html.patch # PATCH-FIX-UPSTREAM nginx-1.2.4-perl_vendor_install.patch -Patch2: nginx-1.2.4-perl_vendor_install.patch +Patch2: %{name}-1.2.4-perl_vendor_install.patch # PATCH-FIX-UPSTREAM fix /etc/nginx/nginx.conf to suit Linux env -Patch3: nginx-1.6.1-default_config.patch +Patch3: %{name}-1.6.1-default_config.patch # PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO -Patch4: nginx-aio.patch +Patch4: %{name}-aio.patch BuildRequires: gcc-c++ BuildRequires: libatomic-ops-devel -BuildRequires: nginx-macros +BuildRequires: %{name}-macros BuildRequires: pkgconfig BuildRequires: sysuser-shadow BuildRequires: sysuser-tools @@ -62,10 +61,10 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(zlib) %requires_eq perl Recommends: logrotate -Recommends: nginx-module-fancyindex -Recommends: nginx-module-geoip2 -Recommends: nginx-module-headers-more -Recommends: nginx-module-http-flv +Recommends: %{name}-module-fancyindex +Recommends: %{name}-module-geoip2 +Recommends: %{name}-module-headers-more +Recommends: %{name}-module-http-flv Provides: http_daemon Provides: httpd %{?systemd_ordering} @@ -76,10 +75,10 @@ BuildRequires: google-perftools-devel %endif %description -nginx [engine x] is a HTTP server and IMAP/POP3 proxy server written by Igor Sysoev. +%{name} [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 nginx-source +%package source Summary: The nginx source Group: Development/Sources Requires: gcc-c++ @@ -92,11 +91,11 @@ Requires: pkgconfig(libpcre2-8) Requires: pkgconfig(libxslt) Requires: pkgconfig(openssl) Requires: pkgconfig(zlib) -%requires_ge nginx-macros +%requires_ge %{name}-macros BuildArch: noarch -%description -n nginx-source -The source of nginx [engine x] HTTP server and IMAP/POP3 proxy server. +%description source +The source of %{name} [engine x] HTTP server and IMAP/POP3 proxy server. %prep %setup -q @@ -120,17 +119,17 @@ sed -i 's/^\(#define NGX_LISTEN_BACKLOG \).*/\1-1/' src/os/unix/ngx_linux_config %{ngx_configure} %make_build -%sysusers_generate_pre %{SOURCE9} nginx nginx.conf +%sysusers_generate_pre %{SOURCE6} %{name} %{name}.conf %install %make_install %perl_process_packlist install -dpm0750 %{buildroot}%{ngx_home}/{,tmp,proxy,fastcgi,scgi,uwsgi} -install -Dpm0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -install -Dpm0644 %{SOURCE3} %{buildroot}%{_unitdir}/nginx.service -install -Dpm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/nginx.conf -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcnginx +install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -Dpm0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.service +install -Dpm0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/%{name}.conf +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} rm %{buildroot}/srv/www/htdocs/index.html @@ -138,13 +137,13 @@ mkdir -p %{buildroot}%{ngx_doc_dir} cp -av CHANGES* LICENSE \ %{buildroot}%{ngx_doc_dir} -mkdir -p %{buildroot}%{_datadir}/nginx/ +mkdir -p %{buildroot}%{_datadir}/%{name}/ mkdir -p %{buildroot}%{ngx_conf_dir}/vhosts.d/ mkdir -p %{buildroot}%{ngx_conf_dir}/conf.d/ chmod a+rx contrib/geo2nginx.pl cp -av contrib/geo2nginx.pl contrib/unicode2nginx/ \ - %{buildroot}%{_datadir}/nginx/ + %{buildroot}%{_datadir}/%{name}/ mkdir -p %{buildroot}%{src_install_dir} tar -xzf %{SOURCE0} --strip-components=1 -C %{buildroot}%{src_install_dir} @@ -158,17 +157,17 @@ copydocs() { popd } -%pre -f nginx.pre -%service_add_pre nginx.service +%pre -f %{name}.pre +%service_add_pre %{name}.service %preun -%service_del_preun nginx.service +%service_del_preun %{name}.service %post -%service_add_post nginx.service +%service_add_post %{name}.service %postun -%service_del_postun nginx.service +%service_del_postun %{name}.service %files %dir %{ngx_conf_dir}/ @@ -181,7 +180,7 @@ copydocs() { %config(noreplace) %{ngx_conf_dir}/mime.types %config %{ngx_conf_dir}/mime.types.default %config(noreplace) %{ngx_conf_dir}/nginx.conf -%config %{ngx_conf_dir}/nginx.conf.default +%config %{ngx_conf_dir}/%{name}.conf.default %config(noreplace) %{ngx_conf_dir}/fastcgi.conf %config %{ngx_conf_dir}/fastcgi.conf.default %config(noreplace) %{ngx_conf_dir}/win-utf @@ -189,17 +188,17 @@ copydocs() { %config %{ngx_conf_dir}/scgi_params.default %config(noreplace) %{ngx_conf_dir}/uwsgi_params %config %{ngx_conf_dir}/uwsgi_params.default -%{perl_vendorarch}/auto/nginx/ -%{perl_vendorarch}/nginx.pm +%{perl_vendorarch}/auto/%{name}/ +%{perl_vendorarch}/%{name}.pm %{ngx_sbin_path} -%dir %{_libdir}/nginx/ +%dir %{_libdir}/%{name}/ %dir %{ngx_module_dir}/ %{ngx_module_dir}/ngx_http_image_filter_module.so %{ngx_module_dir}/ngx_http_perl_module.so %{ngx_module_dir}/ngx_http_xslt_filter_module.so %{ngx_module_dir}/ngx_mail_module.so %{ngx_module_dir}/ngx_stream_module.so -%{_mandir}/man3/nginx.3pm* +%{_mandir}/man3/%{name}.3pm* /srv/www/htdocs/50x.html %{_sbindir}/rc%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} @@ -211,11 +210,11 @@ copydocs() { %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_scgi} %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_uwsgi} %doc %{ngx_doc_dir} -%{_unitdir}/nginx.service -%{_sysusersdir}/nginx.conf -%{_datadir}/nginx/ +%{_unitdir}/%{name}.service +%{_sysusersdir}/%{name}.conf +%{_datadir}/%{name}/ -%files -n nginx-source +%files source %{src_install_dir} %changelog From a4da3ae6f4c20ad841be0774d1f8265e1fb5436c90a50650a60ed98f2b0e16c0 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: Tue, 21 Jun 2022 23:35:17 +0000 Subject: [PATCH 6/7] Accepting request 984274 from home:13ilya Test keyring for factory-auto. OBS-URL: https://build.opensuse.org/request/show/984274 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=228 --- nginx.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 615aab2..660c23c 100644 --- a/nginx.spec +++ b/nginx.spec @@ -31,7 +31,8 @@ Group: Productivity/Networking/Web/Proxy URL: https://nginx.org Source0: https://nginx.org/download/%{name}-%{version}.tar.gz Source1: https://nginx.org/download/%{name}-%{version}.tar.gz.asc -Source2: https://nginx.org/keys/nginx_signing.key#/%{name}.keyring +#Source2: https://nginx.org/keys/nginx_signing.key#/#{name}.keyring +Source2: %{name}.keyring Source3: %{name}.rpmlintrc Source4: %{name}.logrotate Source5: %{name}.service From 49be8b975a54fb03455869fabd7cb4b5d0f531bca47cc026ba66c16ceb0f6a1f 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: Tue, 21 Jun 2022 23:47:25 +0000 Subject: [PATCH 7/7] Accepting request 984277 from home:13ilya MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Changed nginx.keyring to Konstantin Pavlov’s PGP public key. - Removed nginx.init. - Updated to 1.23.0 * https://nginx.org/en/CHANGES * Now header lines are represented as linked lists. * Now nginx combines arbitrary header lines with identical names when sending to FastCGI, SCGI, and uwsgi backends, in the $r->header_in() method of the ngx_http_perl_module, and during lookup of the "$http_...", "$sent_http_...", "$sent_trailer_...", "$upstream_http_...", and "$upstream_trailer_..." variables. * Fixed: if there were multiple "Vary" header lines in the backend response, nginx only used the last of them when caching. * Fixed: if there were multiple "WWW-Authenticate" header lines in the backend response and errors with code 401 were intercepted or the "auth_request" directive was used, nginx only sent the first of the header lines to the client. * The logging level of the "application data after close notify" SSL errors has been lowered from "crit" to "info". * Fixed: connections might hang if nginx was built on Linux 2.6.17 or newer, but was used on systems without EPOLLRDHUP support, notably with epoll emulation layers; the bug had appeared in 1.17.5. * Fixed: nginx did not cache the response if the "Expires" response header line disabled caching, but following "Cache-Control" header line enabled caching. OBS-URL: https://build.opensuse.org/request/show/984277 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=229 --- nginx.changes | 4 +- nginx.keyring | 169 ++++++++++++++++++++++++++++++++++++++++++-------- nginx.spec | 3 +- 3 files changed, 147 insertions(+), 29 deletions(-) diff --git a/nginx.changes b/nginx.changes index aa66c04..4d5108d 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Jun 21 23:26:17 UTC 2022 - Илья Индиго +Tue Jun 21 23:46:03 UTC 2022 - Илья Индиго -- Updated nginx.keyring. +- Changed nginx.keyring to Konstantin Pavlov’s PGP public key. - Removed nginx.init. - Updated to 1.23.0 * https://nginx.org/en/CHANGES diff --git a/nginx.keyring b/nginx.keyring index 58ba325..f1c0d5b 100644 --- a/nginx.keyring +++ b/nginx.keyring @@ -1,28 +1,147 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) -mQENBE5OMmIBCAD+FPYKGriGGf7NqwKfWC83cBV01gabgVWQmZbMcFzeW+hMsgxH -W6iimD0RsfZ9oEbfJCPG0CRSZ7ppq5pKamYs2+EJ8Q2ysOFHHwpGrA2C8zyNAs4I -QxnZZIbETgcSwFtDun0XiqPwPZgyuXVm9PAbLZRbfBzm8wR/3SWygqZBBLdQk5TE -fDR+Eny/M1RVR4xClECONF9UBB2ejFdI1LD45APbP2hsN/piFByU1t7yK2gpFyRt -97WzGHn9MV5/TL7AmRPM4pcr3JacmtCnxXeCZ8nLqedoSuHFuhwyDnlAbu8I16O5 -XRrfzhrHRJFM1JnIiGmzZi6zBvH0ItfyX6ttABEBAAG0KW5naW54IHNpZ25pbmcg -a2V5IDxzaWduaW5nLWtleUBuZ2lueC5jb20+iQE+BBMBAgAoAhsDBgsJCAcDAgYV -CAIJCgsEFgIDAQIeAQIXgAUCV2K1+AUJGB4fQQAKCRCr9b2Ce9m/YloaB/9XGrol -kocm7l/tsVjaBQCteXKuwsm4XhCuAQ6YAwA1L1UheGOG/aa2xJvrXE8X32tgcTjr -KoYoXWcdxaFjlXGTt6jV85qRguUzvMOxxSEM2Dn115etN9piPl0Zz+4rkx8+2vJG -F+eMlruPXg/zd88NvyLq5gGHEsFRBMVufYmHtNfcp4okC1klWiRIRSdp4QY1wdrN -1O+/oCTl8Bzy6hcHjLIq3aoumcLxMjtBoclc/5OTioLDwSDfVx7rWyfRhcBzVbwD -oe/PD08AoAA6fxXvWjSxy+dGhEaXoTHjkCbz/l6NxrK3JFyauDgU4K4MytsZ1HDi -MgMW8hZXxszoICTTiQEcBBABAgAGBQJOTkelAAoJEKZP1bF62zmo79oH/1XDb29S -YtWp+MTJTPFEwlWRiyRuDXy3wBd/BpwBRIWfWzMs1gnCjNjk0EVBVGa2grvy9Jtx -JKMd6l/PWXVucSt+U/+GO8rBkw14SdhqxaS2l14v6gyMeUrSbY3XfToGfwHC4sa/ -Thn8X4jFaQ2XN5dAIzJGU1s5JA0tjEzUwCnmrKmyMlXZaoQVrmORGjCuH0I0aAFk -RS0UtnB9HPpxhGVbs24xXZQnZDNbUQeulFxS4uP3OLDBAeCHl+v4t/uotIad8v6J -SO93vc1evIje6lguE81HHmJn9noxPItvOvSMb2yPsE8mH4cJHRTFNSEhPW6ghmlf -Wa9ZwiVX5igxcvaIRgQQEQIABgUCTk5b0gAKCRDs8OkLLBcgg1G+AKCnacLb/+W6 -cflirUIExgZdUJqoogCeNPVwXiHEIVqithAM1pdY/gcaQZmIRgQQEQIABgUCTk5f -YQAKCRCpN2E5pSTFPnNWAJ9gUozyiS+9jf2rJvqmJSeWuCgVRwCcCUFhXRCpQO2Y -Va3l3WuB+rgKjsQ= -=EWWI +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 +=t1B0 -----END PGP PUBLIC KEY BLOCK----- diff --git a/nginx.spec b/nginx.spec index 660c23c..33f9099 100644 --- a/nginx.spec +++ b/nginx.spec @@ -31,8 +31,7 @@ Group: Productivity/Networking/Web/Proxy URL: https://nginx.org Source0: https://nginx.org/download/%{name}-%{version}.tar.gz Source1: https://nginx.org/download/%{name}-%{version}.tar.gz.asc -#Source2: https://nginx.org/keys/nginx_signing.key#/#{name}.keyring -Source2: %{name}.keyring +Source2: https://nginx.org/keys/thresh.key#/%{name}.keyring Source3: %{name}.rpmlintrc Source4: %{name}.logrotate Source5: %{name}.service