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] 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