From 1010275d866be66d020a96bdf67c52f98e40fcaa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 28 May 2021 08:08:50 +0200
Subject: update to 1.24.0

---
 unit-syspol.patch | 14 +++++++-------
 unit.spec         |  7 +++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/unit-syspol.patch b/unit-syspol.patch
index cff3889..c79025c 100644
--- a/unit-syspol.patch
+++ b/unit-syspol.patch
@@ -1,8 +1,8 @@
 diff -up ./src/nxt_openssl.c.syspol ./src/nxt_openssl.c
---- ./src/nxt_openssl.c.syspol	2021-03-25 15:15:30.000000000 +0100
-+++ ./src/nxt_openssl.c	2021-03-26 07:46:53.897688835 +0100
-@@ -261,7 +261,7 @@ nxt_openssl_server_init(nxt_task_t *task
-     nxt_mp_t *mp, nxt_bool_t last)
+--- ./src/nxt_openssl.c.syspol	2021-05-28 07:49:58.267866774 +0200
++++ ./src/nxt_openssl.c	2021-05-28 07:52:44.119844098 +0200
+@@ -269,7 +269,7 @@ nxt_openssl_server_init(nxt_task_t *task
+     nxt_mp_t *mp, nxt_conf_value_t *conf_cmds, nxt_bool_t last)
  {
      SSL_CTX                *ctx;
 -    const char             *ciphers, *ca_certificate;
@@ -10,10 +10,10 @@ diff -up ./src/nxt_openssl.c.syspol ./src/nxt_openssl.c
      STACK_OF(X509_NAME)    *list;
      nxt_tls_bundle_conf_t  *bundle;
  
-@@ -318,13 +318,13 @@ nxt_openssl_server_init(nxt_task_t *task
-         goto fail;
+@@ -327,13 +327,13 @@ nxt_openssl_server_init(nxt_task_t *task
      }
  */
+ 
 -    ciphers = (conf->ciphers != NULL) ? conf->ciphers : "HIGH:!aNULL:!MD5";
 -
 -    if (SSL_CTX_set_cipher_list(ctx, ciphers) == 0) {
@@ -29,4 +29,4 @@ diff -up ./src/nxt_openssl.c.syspol ./src/nxt_openssl.c
 +        }
      }
  
-     SSL_CTX_set_options(ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
+ #if (NXT_HAVE_OPENSSL_CONF_CMD)
diff --git a/unit.spec b/unit.spec
index a5b802e..1425c52 100644
--- a/unit.spec
+++ b/unit.spec
@@ -11,12 +11,12 @@
 
 %global gh_owner    nginx
 %global project     unit
-%global gh_commit   71d3700951f04a8f69664b5671864c824874b18e
+%global gh_commit   25d8e102b0b3ca6cfa15b752397566fdbe2f7eaa
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 
 Name:              unit
 Summary:           NGINX Unit application server
-Version:           1.23.0
+Version:           1.24.0
 Release:           1%{?dist}
 License:           ASL 2.0
 URL:               https://unit.nginx.org/
@@ -187,6 +187,9 @@ BANNER
 
 
 %changelog
+* Fri May 28 2021 Remi Collet <remi@remirepo.net> - 1.24.0-1
+- update to 1.24.0
+
 * Fri Mar 26 2021 Remi Collet <remi@remirepo.net> - 1.23.0-1
 - update to 1.23.0
 
-- 
cgit