[PATCH] Updated OpenSSL and zlib versions

[Maxim Dounin]

Hello!

On Tue, Sep 26, 2023 at 02:14:18PM +0100, Yaroslav Zhuravlev wrote:

>  xml/en/docs/configure.xml            |   6 +++---
>  xml/en/docs/howto_build_on_win32.xml |  10 +++++-----
>  xml/ru/docs/configure.xml            |   6 +++---
>  3 files changed, 11 insertions(+), 11 deletions(-)
> 
> 

> # HG changeset patch
> # User Yaroslav Zhuravlev <yar at nginx.com>
> # Date 1695733917 -3600
> #      Tue Sep 26 14:11:57 2023 +0100
> # Node ID 32a78db44cf00ab54063905e2a2ff4e5092a7b28
> # Parent  1ad61bfc7630adf1d6460cf84cec484de4017326
> Updated OpenSSL and zlib versions.
> 
> diff --git a/xml/en/docs/configure.xml b/xml/en/docs/configure.xml
> --- a/xml/en/docs/configure.xml
> +++ b/xml/en/docs/configure.xml
> @@ -8,7 +8,7 @@
>  <article name="Building nginx from Sources"
>           link="/en/docs/configure.html"
>           lang="en"
> -         rev="22">
> +         rev="23">
>  
>  <section>
>  
> @@ -1270,7 +1270,7 @@
>  <tag-desc>
>  sets the path to the sources of the zlib library.
>  The library distribution (version
> -1.1.3—1.2.11) needs to be downloaded from the
> +1.1.3—1.2.13) needs to be downloaded from the
>  <link url="http://zlib.net">zlib</link> site and extracted.
>  The rest is done by nginx’s <command>./configure</command> and
>  <command>make</command>.

> @@ -1359,7 +1359,7 @@
>      --pid-path=/usr/local/nginx/nginx.pid
>      --with-http_ssl_module
>      --with-pcre=../pcre2-10.39
> -    --with-zlib=../zlib-1.2.11
> +    --with-zlib=../zlib-1.2.13
>  </programlisting>
>  </para>
>  

zlib 1.3 was recently released and works just fine, so this 
probably should be bumped to 1.3 instead.

> diff --git a/xml/en/docs/howto_build_on_win32.xml b/xml/en/docs/howto_build_on_win32.xml
> --- a/xml/en/docs/howto_build_on_win32.xml
> +++ b/xml/en/docs/howto_build_on_win32.xml
> @@ -9,7 +9,7 @@
>  <article name="Building nginx on the Win32 platform with Visual C"
>           link="/en/docs/howto_build_on_win32.html"
>           lang="en"
> -         rev="25">
> +         rev="26">
>  
>  <section name="Prerequisites">
>  
> @@ -81,8 +81,8 @@
>  mkdir objs/lib
>  cd objs/lib
>  tar -xzf ../../pcre2-10.39.tar.gz
> -tar -xzf ../../zlib-1.2.11.tar.gz
> -tar -xzf ../../openssl-1.1.1m.tar.gz
> +tar -xzf ../../zlib-1.2.13.tar.gz
> +tar -xzf ../../openssl-3.0.10.tar.gz
>  </programlisting>
>  </listitem>
>  
> @@ -105,8 +105,8 @@
>      --http-uwsgi-temp-path=temp/uwsgi_temp \
>      --with-cc-opt=-DFD_SETSIZE=1024 \
>      --with-pcre=objs/lib/pcre2-10.39 \
> -    --with-zlib=objs/lib/zlib-1.2.11 \
> -    --with-openssl=objs/lib/openssl-1.1.1m \
> +    --with-zlib=objs/lib/zlib-1.2.13 \
> +    --with-openssl=objs/lib/openssl-3.0.10 \
>      --with-openssl-opt=no-asm \
>      --with-http_ssl_module
>  </programlisting>

And this used to match latest release of nginx/Windows, so zlib 
1.2.13 and OpenSSL 3.0.10 are probably fine here.  On the other 
hand, bumping to zlib 1.3 and OpenSSL 3.0.11 might be good enough 
as well (and will save an update to this file).

> diff --git a/xml/ru/docs/configure.xml b/xml/ru/docs/configure.xml
> --- a/xml/ru/docs/configure.xml
> +++ b/xml/ru/docs/configure.xml
> @@ -8,7 +8,7 @@
>  <article name="Сборка nginx из исходных файлов"
>           link="/ru/docs/configure.html"
>           lang="ru"
> -         rev="22">
> +         rev="23">
>  
>  <section>
>  
> @@ -1250,7 +1250,7 @@
>  <tag-desc>
>  задаёт путь к исходным текстам библиотеки zlib.
>  Дистрибутив библиотеки (версию
> -1.1.3—1.2.11) нужно взять на сайте
> +1.1.3—1.2.13) нужно взять на сайте
>  <link url="http://zlib.net">zlib</link> и распаковать.
>  Всё остальное сделают <command>./configure</command> nginx’а и
>  <command>make</command>.
> @@ -1339,7 +1339,7 @@
>      --pid-path=/usr/local/nginx/nginx.pid
>      --with-http_ssl_module
>      --with-pcre=../pcre2-10.39
> -    --with-zlib=../zlib-1.2.11
> +    --with-zlib=../zlib-1.2.13
>  </programlisting>
>  </para>
>  

Otherwise looks good to me.

-- 
Maxim Dounin
http://mdounin.ru/