diff --git a/nginx-1.23.4.tar.gz b/nginx-1.23.4.tar.gz deleted file mode 100644 index bde31fe..0000000 --- a/nginx-1.23.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d43300e36bb249a7e6edc60bca1b0fc372a0bafce2f346d76acfb677a8790fc0 -size 1112403 diff --git a/nginx-1.23.4.tar.gz.asc b/nginx-1.23.4.tar.gz.asc deleted file mode 100644 index 0c97cbf..0000000 --- a/nginx-1.23.4.tar.gz.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQHEBAABCAAuFiEEE8gqY7YDV2FW4wpOoOqYG2aw2WcFAmQjERUQHGsucGF2bG92 -QGY1LmNvbQAKCRCg6pgbZrDZZ8shC/kB58vrrH5QRF7TEI1XYBDHmkXFd87jsSMm -0ClQMnejaAvmt9mQ3oP5hbjKirktMiMP8Z8T8n1cEz61ZHcD5H80I+IHupCBvvWN -mucWuvk8M1VAYpDj+MzLjCX0hfCJNQS9kZ/j5jM4GSAbzD1UXqF53jedKemePRAH -7p2Cw25cy2MIusj/iCanuAPrrMTlcWDhSkq2PnMc5nlVIEhdpfnsdKNXHX1lRGkW -55k21+xfUfQ2oTpC+Qc+60ZnRo2OksQ1UKJ1SQRv6DS076APUfrNC/abdtg/bRzx -gA+Od/x7Rfp8Ka02h85e4HxcasfSh2QkKVtsZLpPOW3o147sQe4JKv0+ohxVUrBH -irCuWDf2kN9gYBq06Qqi9544FiOTJd5cWdvWRxnXPDzamgHwcSGMDGvwUtUanobY -yjYzWanCyBZ5uJ76kdPle4zxLvIJ0KJsGPY544UU9A5V/Sa0J/85subUCjhhsCEB -KOke7TRU6kERJtAAKqgEAwhsCvfhxtc= -=6BTp ------END PGP SIGNATURE----- diff --git a/nginx-1.27.2.tar.gz b/nginx-1.27.2.tar.gz new file mode 100644 index 0000000..4411639 --- /dev/null +++ b/nginx-1.27.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a91ecfc3a0b3a2c1413afca627bd886d76e0414b81cad0fb7872a9655a1b25fa +size 1258098 diff --git a/nginx-1.27.2.tar.gz.asc b/nginx-1.27.2.tar.gz.asc new file mode 100644 index 0000000..0f27c63 --- /dev/null +++ b/nginx-1.27.2.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJHBAABCAAxFiEE1nhs4wPZqQIpmNxsyEZNVJr3XAoFAmb9Z0ATHHMua2FuZGF1 +cm92QGY1LmNvbQAKCRDIRk1UmvdcCg6nD/9JY+oE21aFArOQQ3xjFQh1sIZVVzE0 +JrRqYtzj6Rd834+bHW2Q2dXIgkxRoau//9+bP3sjGfDzqtjUOTwc0Eu85GK+8PV9 +eqdLJDjBTMFd1L1Zha07N1Eimcb/M4+ttPtKszC/u6L6zHKvGzMWPq6xt/jqN2Bo +697Z26fTGV8k1oFmZj8Y7dZodIhykMjjea98R/uOKXsSqZGPw2u5xTWpab6ITB7i +vAnkV5d51roGmYfFXdBbxq3BvnpBWAVLL4FEWDWcNyMVAoW+GP68aaSyn4K4Enaq +fxyc6zcVeqhQsWdumE7EbT7cQIGBh+MbSYuApZQmr59sFOwHo+i/BBOHpzlv4LWH +Jo1tEOJWZNjliXGVKdf2v4nwfQOacsa36MMU0INO200c4PC6UZvGdJ8jPzARNSHK +EZy7VYTZ1l3UDnL3v+IqmIOWQNjyPNOjWvLgq9aZOp24GvzXMPGXiIL1JvTeM/po +u3vJR57w3Ioxfddmr4aqQQRVQDfNg9F/AnZXFk6Dss6h3C0L8cyi+NO+jpgf1h5a +Mv6nAaPyuzvgI5leKLnA5pMrfWxCJ2ZLgqPy0wz9Ckmd/ALAvT7FHv73XEEz5CJb +TQP1jloxJHsNmjMfkFX6rKuOwEYaSgQU8i7GCt0qYiv7y+C5GeHQSdAZk9apO0Q4 +063qFKVdOSNphQ== +=PkLy +-----END PGP SIGNATURE----- diff --git a/nginx-1.6.1-default_config.patch b/nginx-conf.patch similarity index 77% rename from nginx-1.6.1-default_config.patch rename to nginx-conf.patch index 7c85a06..543858f 100644 --- a/nginx-1.6.1-default_config.patch +++ b/nginx-conf.patch @@ -1,25 +1,27 @@ -Index: conf/nginx.conf -=================================================================== ---- conf/nginx.conf.orig -+++ conf/nginx.conf -@@ -1,16 +1,26 @@ +diff -Pdpru nginx-1.27.1.orig/conf/nginx.conf nginx-1.27.1/conf/nginx.conf +--- nginx-1.27.1.orig/conf/nginx.conf 2024-08-12 17:21:01.000000000 +0300 ++++ nginx-1.27.1/conf/nginx.conf 2024-08-16 02:08:46.680107766 +0300 +@@ -1,16 +1,28 @@ ++#user nginx nginx; ++#worker_processes 1; ++#pcre_jit off; -#user nobody; -+#user nginx; - worker_processes 1; +-worker_processes 1; ++# load_module #LIBDIR#/nginx/modules/ngx_http_echo_module.so; ++# load_module #LIBDIR#/nginx/modules/ngx_http_fancyindex_module.so; ++# load_module #LIBDIR#/nginx/modules/ngx_http_geoip2_module.so; ++# load_module #LIBDIR#/nginx/modules/ngx_http_image_filter_module.so; ++# load_module #LIBDIR#/nginx/modules/ngx_http_lua_module.so; ++# load_module #LIBDIR#/nginx/modules/ngx_http_perl_module.so; ++# load_module #LIBDIR#/nginx/modules/ngx_http_xslt_filter_module.so; ++# load_module #LIBDIR#/nginx/modules/ngx_mail_module.so; ++# load_module #LIBDIR#/nginx/modules/ngx_stream_geoip2_module.so; ++# load_module #LIBDIR#/nginx/modules/ngx_stream_module.so; -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; -+# load_module #LIBDIR#/nginx/modules/ngx_http_fancyindex_module.so; -+# load_module #LIBDIR#/nginx/modules/ngx_http_headers_more_filter_module.so; -+# load_module #LIBDIR#/nginx/modules/ngx_http_image_filter_module.so; -+# load_module #LIBDIR#/nginx/modules/ngx_http_perl_module.so; -+# load_module #LIBDIR#/nginx/modules/ngx_http_xslt_filter_module.so; -+# load_module #LIBDIR#/nginx/modules/ngx_mail_module.so; -+# load_module #LIBDIR#/nginx/modules/ngx_rtmp_module.so; -+# load_module #LIBDIR#/nginx/modules/ngx_stream_module.so; -+ +#error_log /var/log/nginx/error.log; +#error_log /var/log/nginx/error.log notice; +#error_log /var/log/nginx/error.log info; @@ -34,7 +36,7 @@ Index: conf/nginx.conf } -@@ -22,7 +32,7 @@ http { +@@ -22,7 +34,7 @@ http { # '$status $body_bytes_sent "$http_referer" ' # '"$http_user_agent" "$http_x_forwarded_for"'; @@ -43,7 +45,7 @@ Index: conf/nginx.conf sendfile on; #tcp_nopush on; -@@ -32,16 +42,18 @@ http { +@@ -32,16 +44,18 @@ http { #gzip on; @@ -64,7 +66,7 @@ Index: conf/nginx.conf index index.html index.htm; } -@@ -51,7 +63,7 @@ http { +@@ -51,7 +65,7 @@ http { # error_page 500 502 503 504 /50x.html; location = /50x.html { @@ -73,16 +75,16 @@ Index: conf/nginx.conf } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 -@@ -63,7 +75,7 @@ http { +@@ -63,7 +77,7 @@ http { # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 # #location ~ \.php$ { - # root html; -+ # root /srv/www/htdocs/; ++ # root /srv/www/htdocs/; # fastcgi_pass 127.0.0.1:9000; # fastcgi_index index.php; # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; -@@ -87,7 +99,7 @@ http { +@@ -87,7 +101,7 @@ http { # server_name somename alias another.alias; # location / { @@ -91,7 +93,7 @@ Index: conf/nginx.conf # index index.html index.htm; # } #} -@@ -102,6 +114,10 @@ http { +@@ -102,6 +116,10 @@ http { # ssl_certificate cert.pem; # ssl_certificate_key cert.key; @@ -102,7 +104,7 @@ Index: conf/nginx.conf # ssl_session_cache shared:SSL:1m; # ssl_session_timeout 5m; -@@ -109,9 +125,11 @@ http { +@@ -109,9 +127,11 @@ http { # ssl_prefer_server_ciphers on; # location / { diff --git a/nginx-1.2.4-perl_vendor_install.patch b/nginx-perl.patch similarity index 53% rename from nginx-1.2.4-perl_vendor_install.patch rename to nginx-perl.patch index a47016f..bb05467 100644 --- a/nginx-1.2.4-perl_vendor_install.patch +++ b/nginx-perl.patch @@ -1,8 +1,7 @@ -Index: auto/install -=================================================================== ---- auto/install.orig -+++ auto/install -@@ -8,7 +8,7 @@ if [ $USE_PERL = YES ]; then +diff -Pdpru nginx-1.27.1.orig/auto/install nginx-1.27.1/auto/install +--- nginx-1.27.1.orig/auto/install 2024-08-12 17:21:01.000000000 +0300 ++++ nginx-1.27.1/auto/install 2024-08-16 01:34:07.040688796 +0300 +@@ -8,7 +8,7 @@ if [ $USE_PERL != NO ]; then cat << END >> $NGX_MAKEFILE install_perl_modules: diff --git a/nginx.changes b/nginx.changes index 36a7be5..76b4d57 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,5 +1,140 @@ ------------------------------------------------------------------- -Wed Mar 29 18:38:46 UTC 2023 - Илья Индиго +Thu Oct 3 06:22:15 UTC 2024 - Илья Индиго + +- Updated to 1.27.2 + * https://nginx.org/en/CHANGES + * Added SSL certificates, secret keys, and CRLs are now cached on start + or during reconfiguration. + * Added client certificate validation with OCSP in the stream module. + * Added OCSP stapling support in the stream module. + * Added the "proxy_pass_trailers" directive in the ngx_http_proxy_module. + * Added the "ssl_client_certificate" directive now supports certificates + with auxiliary information. + * Changed now the "ssl_client_certificate" directive is not required + for client SSL certificates verification. + +------------------------------------------------------------------- +Fri Sep 27 17:32:21 UTC 2024 - Thorsten Kukuk + +- Add /srv/www to filelist [bsc#1231027] + +------------------------------------------------------------------- +Fri Aug 16 02:21:19 UTC 2024 - Илья Индиго + +- Renamed nginx-1.6.1-default_config.patch to nginx-conf.patch. +- Renamed nginx-1.2.4-perl_vendor_install.patch to nginx-perl.patch. +- Used atosetup -p1 macro and replaced editor from perl to sed. +- Added %check section with gpg signature source verification. +- Updated to 1.27.1 + * https://nginx.org/en/CHANGES + * Fixed crash in ngx_http_mp4_module via specially crafted mp4 file (CVE-2024-7347). + * Now the stream module handler is not mandatory. + * Fixed new HTTP/2 connections might ignore graceful shutdown of old worker processes. + +------------------------------------------------------------------- +Fri May 31 08:48:36 UTC 2024 - Илья Индиго + +- Updated to 1.27.0 + * Changed nginx.keyring to Sergey Kandaurov’s PGP public key. + * https://nginx.org/en/CHANGES + * Added variables support in the "proxy_limit_rate", "fastcgi_limit_rate", + "scgi_limit_rate", and "uwsgi_limit_rate" directives. + * Fixed reduced memory consumption for long-lived requests if "gzip", + "gunzip", "ssi", "sub_filter", or "grpc_pass" directives are used. + * Fixed building with gcc 14 with --with-atomic option. + +------------------------------------------------------------------- +Sat May 11 04:03:00 UTC 2024 - Илья Индиго + +- Updated list of recommended modules (deleted unavailable in TW). + +------------------------------------------------------------------- +Wed Apr 17 07:14:59 UTC 2024 - Илья Индиго + +- Updated to 1.25.5 + * Changed nginx.keyring to Roman Arutyunyan’s PGP public key. + * https://nginx.org/en/CHANGES + * Added virtual servers in the stream module. + * Fixed the ngx_stream_pass_module. + * Fixed the "deferred", "accept_filter", and "setfib" parameters + of the "listen" directive in the stream module. + * Added cache line size detection for some architectures. + +------------------------------------------------------------------- +Tue Apr 16 05:52:58 UTC 2024 - Georg Pfuetzenreuter + +- Set RuntimeDirectory to offer a location for Unix sockets at /run/nginx + +------------------------------------------------------------------- +Sun Mar 3 10:24:27 UTC 2024 - Adam Mizerski + +- logrotate: don't fail if service not running + +------------------------------------------------------------------- +Thu Feb 22 14:08:07 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + +------------------------------------------------------------------- +Sun Feb 18 16:23:59 UTC 2024 - Илья Индиго + +- Updated to 1.25.4 + * Changed nginx.keyring to Sergey Kandaurov’s PGP public key. + * https://nginx.org/en/CHANGES + * Fixed segmentation fault might occur in a worker process while + processing a specially crafted QUIC session (CVE-2024-24989, CVE-2024-24990). + * Fixed connections with pending AIO operations might be closed + prematurely during graceful shutdown of old worker processes. + * Fixed socket leak alerts no longer logged when fast shutdown was + requested after graceful shutdown of old worker processes. + * Fixed socket descriptor error, a socket leak, or a segmentation fault + in a worker process might occur if AIO was used in a subrequest. + * Fixed segmentation fault might occur in a worker process if SSL + proxying was used along with the "image_filter" directive and errors + with code 415 were redirected with the "error_page" directive. + +------------------------------------------------------------------- +Thu Oct 26 13:49:33 UTC 2023 - Илья Индиго + +- Updated to 1.25.3 + * https://nginx.org/en/CHANGES + * Changed: improved detection of misbehaving clients when using HTTP/2. + * Added: startup speedup when using a large number of locations. + * Fixed: a segmentation fault might occur in a worker process when + using HTTP/2 without SSL; the bug had appeared in 1.25.1. + * Fixed: the "Status" backend response header line with an empty + reason phrase was handled incorrectly. + * Fixed: memory leak during reconfiguration when using the PCRE2 library. + +------------------------------------------------------------------- +Sun Aug 20 16:10:31 UTC 2023 - Илья Индиго + +- Updated to 1.25.2 + * https://nginx.org/en/CHANGES + * Changed: uses appname "nginx" when loading OpenSSL configuration. + * Changed: does not try to load OpenSSL configuration if the + --with-openssl option was used to built OpenSSL and the OPENSSL_CONF + environment variable is not set. + +------------------------------------------------------------------- +Wed Jun 14 05:03:46 UTC 2023 - Илья Индиго + +- Updated to 1.25.1 + * https://nginx.org/en/CHANGES + * Added "http2" directive, which enables HTTP/2 on a per-server basis. + * Deprecated "http2" parameter of the "listen" directive. + * Removed HTTP/2 server push support. + * Deprecated "ssl" directive is not supported anymore. + +------------------------------------------------------------------- +Tue May 23 21:44:57 UTC 2023 - Илья Индиго + +- Updated to 1.25.0 + * https://nginx.org/en/CHANGES + * Added experimental HTTP/3 support. + +------------------------------------------------------------------- +Wed Mar 29 18:38:46 UTC 2023 - Илья Индиго - Updated to 1.23.4 * https://nginx.org/en/CHANGES @@ -64,7 +199,7 @@ Tue Jul 19 17:47:28 UTC 2022 - Michael Ströder on Linux; the bug had appeared in 1.17.5. ------------------------------------------------------------------- -Tue Jun 21 23:46:03 UTC 2022 - Илья Индиго +Tue Jun 21 23:46:03 UTC 2022 - Илья Индиго - Changed nginx.keyring to Konstantin Pavlov’s PGP public key. - Removed nginx.init. @@ -92,7 +227,7 @@ Tue Jun 21 23:46:03 UTC 2022 - Илья Индиго line enabled caching. ------------------------------------------------------------------- -Tue Feb 1 14:50:56 UTC 2022 - Илья Индиго +Tue Feb 1 14:50:56 UTC 2022 - Илья Индиго - Updated to 1.21.6 * https://nginx.org/en/CHANGES @@ -113,7 +248,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 @@ -152,7 +287,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 @@ -161,7 +296,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 @@ -181,7 +316,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 @@ -230,7 +365,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 @@ -246,13 +381,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 @@ -262,7 +397,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 @@ -294,7 +429,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. @@ -353,7 +488,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 @@ -366,12 +501,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 @@ -397,7 +532,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 @@ -420,7 +555,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 @@ -449,7 +584,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 @@ -475,7 +610,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 @@ -494,7 +629,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. @@ -506,7 +641,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 @@ -519,7 +654,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 @@ -551,7 +686,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) @@ -591,7 +726,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 @@ -604,7 +739,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.keyring b/nginx.keyring index f1c0d5b..da196a7 100644 --- a/nginx.keyring +++ b/nginx.keyring @@ -1,147 +1,65 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -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 -=t1B0 +mQINBGKE4psBEADpHSM/IxFD1nXBmnODYXzcl2A+6b6m9m1m2Y4Dlr0ed+y5Lxne +QidE9I74A2KSm6+eHW2yh4i1ZwZbmwpmQqM+j5BMt7axoXOdKSyN+fYtUakzNbBN +EDRKT79q/zIzkgTJradHkCQkwF1W3go+qPXjR2ZEnLma9dZED9VNI6PmOpeYaASo +IkEfbKbwa/vPrvnDSSYY6Y02RXSRk5U1NvQgVUTJP9WGK7NlPUcTBDELLQv6fFPU +kjBOel6MecsQ+v8iq4RJF2cbVF0hNjbAiNldjLV74Xd7yWVRlCbdb2agyvQjMNrD +jHSvbEMiNB3R8yBHVW2Zldv8q0XjcwoDfdiZYFJe3lRUYmv6I2p+/DptD4r/3ILI +peGZtSeOdQEw+vvODL/Ehq03anTrzcpZ6sDLfLrYJhYcrltj0/LMUnLDAjciwRUq +XI46EfxwqsdLeqoZFQeO3LOFsh0kJKR2xOrUHIVy84NJ4Gmro6WmUkb1NfdjyHzF +z8Lfbo46NKoTcwFsFF0q74jVVIVNUyIS91DusiMqLCsP8jqDOz/kyP4bOJQ+aUXf +BANn4Ll1TFWsJ417moxz+Pi5sTaI0na8z2XB1N9WPsSml3FS75hJPJshN2T3VIea +zB7GFWqk33ynSDt+cAisG5nsK9fFdcH+t5wm59oobyFbFhKxwX6ROuxlZwARAQAB +tCRTZXJnZXkgS2FuZGF1cm92IDxwbHVrbmV0QG5naW54LmNvbT6JAk4EEwEKADgW +IQTWeGzjA9mpAimY3GzIRk1UmvdcCgUCYoTimwIbAwULCQgHAwUVCgkICwUWAwIB +AAIeAQIXgAAKCRDIRk1UmvdcCqbOD/9Htgk3mWvUFmrApkWQTIDNmLACZ1Sw1PXj +Uqte8StYB0bYY+nmAXs7O5eC2h1ViParl7En1joEEMQQmH0qSnw4X1CM/hA8TAYW +mBPITTNWo/R52WoyWeWGFnFNIperQmuIZc+pXm0VEFVPiX/2DXbCIu+jaXySvlCN +LekmOD4VC7dJS8/ohoaXOR2T8ufS+1CsyPXomEb+COhqRZ3EVBa+k7pnElkFft3Y +a1fR0AgatZFQpy+ukePhK7s/M5RGhDJWHgSAZFkf+X2jVV4NRJ+XsY80gU5DD2ZX +QT6Je6Knxqk7FnWNSxkhReH6Ss5flZSoGDCmJ2AsPtGeUhus2fGqeN+waGKTZC35 +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 +x0VGHDmuaYQ= +=HmVo -----END PGP PUBLIC KEY BLOCK----- diff --git a/nginx.logrotate b/nginx.logrotate index 5ca17a5..6d64cb6 100644 --- a/nginx.logrotate +++ b/nginx.logrotate @@ -8,8 +8,7 @@ notifempty delaycompress lastaction - # -s reopen will use the pid file passed in the config file or the compiled in default path - /usr/sbin/nginx -s reopen - endscript + # "-s reopen" will use the pid file passed in the config file or the compiled in default path + [ -f /run/nginx.pid ] && /usr/sbin/nginx -s reopen + endscript } - diff --git a/nginx.service b/nginx.service index a9b409e..2516000 100644 --- a/nginx.service +++ b/nginx.service @@ -4,6 +4,7 @@ After=network-online.target remote-fs.target nss-lookup.target Wants=network-online.target [Service] +RuntimeDirectory=nginx PIDFile=/run/nginx.pid ExecStartPre=/usr/sbin/nginx -t ExecStart=/usr/sbin/nginx -g "daemon off;" diff --git a/nginx.spec b/nginx.spec index 486be86..de1d397 100644 --- a/nginx.spec +++ b/nginx.spec @@ -1,7 +1,7 @@ # # spec file for package nginx # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ %bcond_with ngx_google_perftools # Name: nginx -Version: 1.23.4 +Version: 1.27.2 Release: 0 Summary: A HTTP server and IMAP/POP3 proxy server License: BSD-2-Clause @@ -31,7 +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/thresh.key#/%{name}.keyring +Source2: https://nginx.org/keys/pluknet.key#/%{name}.keyring Source3: %{name}.rpmlintrc Source4: %{name}.logrotate Source5: %{name}.service @@ -41,13 +41,14 @@ Patch0: %{name}-1.11.2-no_Werror.patch # PATCH-FIX-OPENSUSE 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: %{name}-1.2.4-perl_vendor_install.patch +Patch2: %{name}-perl.patch # PATCH-FIX-UPSTREAM fix /etc/nginx/nginx.conf to suit Linux env -Patch3: %{name}-1.6.1-default_config.patch +Patch3: %{name}-conf.patch # PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO Patch4: %{name}-aio.patch BuildRequires: %{name}-macros BuildRequires: gcc-c++ +BuildRequires: gpg2 BuildRequires: libatomic-ops-devel BuildRequires: pkgconfig BuildRequires: sysuser-shadow @@ -60,16 +61,14 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(zlib) %requires_eq perl -Recommends: %{name}-module-fancyindex -Recommends: %{name}-module-geoip2 -Recommends: %{name}-module-headers-more -Recommends: %{name}-module-http-flv +Recommends: %{name}-module-echo +Recommends: %{name}-module-lua Recommends: logrotate Provides: http_daemon Provides: httpd %{?systemd_ordering} %sysusers_requires -# + %if %{with ngx_google_perftools} BuildRequires: google-perftools-devel %endif @@ -98,21 +97,9 @@ BuildArch: noarch The source of %{name} [engine x] HTTP server and IMAP/POP3 proxy server. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -%patch3 -%patch4 -p1 - -perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl -# we just use lib here because nginx loads them relative to _prefix -perl -pi -e 's|#LIBDIR#|%{_lib}|g' conf/nginx.conf - -%if %{with systemd} -sed -i "s/\/var\/run/\/run/" conf/nginx.conf -%endif - +%autosetup -p1 +sed -i 's/\r//g' contrib/geo2nginx.pl +sed -i -e 's|#LIBDIR#|%{_libdir}|g' -e 's|/var/run|/run|' conf/nginx.conf sed -i 's/^\(#define NGX_LISTEN_BACKLOG \).*/\1-1/' src/os/unix/ngx_linux_config.h %build @@ -129,21 +116,18 @@ install -dpm0750 %{buildroot}%{ngx_home}/{,tmp,proxy,fastcgi,scgi,uwsgi} 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 mkdir -p %{buildroot}%{ngx_doc_dir} -cp -av CHANGES* LICENSE \ - %{buildroot}%{ngx_doc_dir} +cp -av CHANGES* LICENSE %{buildroot}%{ngx_doc_dir} 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}/%{name}/ +cp -av contrib/geo2nginx.pl contrib/unicode2nginx/ %{buildroot}%{_datadir}/%{name}/ mkdir -p %{buildroot}%{src_install_dir} tar -xzf %{SOURCE0} --strip-components=1 -C %{buildroot}%{src_install_dir} @@ -157,6 +141,12 @@ copydocs() { popd } +%check +GPGTMP=`mktemp -d` +gpg --homedir $GPGTMP -q --no-default-keyring --keyring $GPGTMP/.gpg-keyring --trust-model always --import %{SOURCE2} +gpg --homedir $GPGTMP -q --no-default-keyring --keyring $GPGTMP/.gpg-keyring --trust-model always -q --verify -- %{SOURCE1} %{SOURCE0} +rm -r $GPGTMP + %pre -f %{name}.pre %service_add_pre %{name}.service @@ -199,8 +189,9 @@ copydocs() { %{ngx_module_dir}/ngx_mail_module.so %{ngx_module_dir}/ngx_stream_module.so %{_mandir}/man3/%{name}.3pm* +%dir /srv/www +%dir /srv/www/htdocs /srv/www/htdocs/50x.html -%{_sbindir}/rc%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{_localstatedir}/log/nginx/ %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_home}/