Skip to contentSkip to conversation

stunnel: upgrade 5.63 -> 5.64

PATCH New Armin Kuster 1 participant 5 messages Jul 29, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 stunnel: upgrade 5.63 -> 5.64

From: wangmy <[email protected]>

Changelog:
==========

Security bugfixes
OpenSSL DLLs updated to version 3.0.3.
New features
Updated the pkcs11 engine for Windows.
Bugfixes
Removed the SERVICE_INTERACTIVE_PROCESS flag in "stunnel -install".

(cherry picked from commit 6f3b52f4589bfa942e473488f91ecef85d339e78)
[New feature does not affect linux]
---
 .../stunnel/{stunnel_5.63.bb => stunnel_5.64.bb}                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-networking/recipes-support/stunnel/{stunnel_5.63.bb => stunnel_5.64.bb} (93%)
meta-networking/recipes-support/stunnel/stunnel_5.64.bb renamed from meta-networking/recipes-support/stunnel/stunnel_5.63.bb +1 -1
similarity index 93%
rename from meta-networking/recipes-support/stunnel/stunnel_5.63.bb
rename to meta-networking/recipes-support/stunnel/stunnel_5.64.bb
index 325737e8c9..13ecd5c5bf 100644
@@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \
            file://fix-openssl-no-des.patch \
 "
 
-SRC_URI[sha256sum] = "c74c4e15144a3ae34b8b890bb31c909207301490bd1e51bfaaa5ffeb0a994617"
+SRC_URI[sha256sum] = "eebe53ed116ba43b2e786762b0c2b91511e7b74857ad4765824e7199e6faf883"
 
 inherit autotools bash-completion pkgconfig
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/5 stunnel: upgrade 5.64 -> 5.65

From: wangmy <[email protected]>

fix-openssl-no-des.patch
refreshed for version 5.65

Changelog:
==========
Security bugfixes
OpenSSL DLLs updated to version 3.0.5.
Bugfixes
Fixed handling globally enabled FIPS. Fixed the default openssl.cnf path in stunnel.exe. Fixed a number of MSVC warnings.

(cherry picked from commit 72f84335cb372dbf00d2d07429a595fced0c4f4f)
---
 .../stunnel/stunnel/fix-openssl-no-des.patch  | 24 +++++++++++++------
 .../{stunnel_5.64.bb => stunnel_5.65.bb}      |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)
 rename meta-networking/recipes-support/stunnel/{stunnel_5.64.bb => stunnel_5.65.bb} (93%)
meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch +17 -7
index aeb0bece97..0840cbbd8b 100644
@@ -1,3 +1,8 @@
+From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001
+From: Kai Kang <[email protected]>
+Date: Wed, 1 Nov 2017 09:23:41 -0400
+Subject: [PATCH] stunnel: fix compile error when openssl disable des support
+
 Upstream-Status: Pending
 
 When openssl disable des support with configure option 'no-des', it doesn't
@@ -6,12 +11,17 @@ failed. Fix it by checking macro OPENSSL_NO_DES to use openssl des related
 library conditionaly.
 
 Signed-off-by: Kai Kang <[email protected]>
+
 ---
+ src/common.h   | 2 ++
+ src/protocol.c | 6 +++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
 diff --git a/src/common.h b/src/common.h
-index f7d38b0..bf485af 100644
+index bc37eb5..03ee3e5 100644
 --- a/src/common.h
 +++ b/src/common.h
-@@ -478,7 +478,9 @@ extern char *sys_errlist[];
+@@ -486,7 +486,9 @@ extern char *sys_errlist[];
  #ifndef OPENSSL_NO_MD4
  #include <openssl/md4.h>
  #endif /* !defined(OPENSSL_NO_MD4) */
@@ -22,19 +32,19 @@ index f7d38b0..bf485af 100644
  #include <openssl/dh.h>
  #if OPENSSL_VERSION_NUMBER<0x10100000L
 diff --git a/src/protocol.c b/src/protocol.c
-index 587df09..8198eb6 100644
+index 804f115..d9b2b50 100644
 --- a/src/protocol.c
 +++ b/src/protocol.c
-@@ -67,7 +67,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE);
+@@ -66,7 +66,7 @@ NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE);
  NOEXPORT char *ldap_client(CLI *, SERVICE_OPTIONS *, const PHASE);
  NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE);
  NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE);
 -#ifndef OPENSSL_NO_MD4
 +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
  NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *);
- NOEXPORT char *ntlm1();
+ NOEXPORT char *ntlm1(void);
  NOEXPORT char *ntlm3(char *, char *, char *, char *);
-@@ -1332,7 +1332,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
+@@ -1351,7 +1351,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
      fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host);
      if(opt->protocol_username && opt->protocol_password) {
          if(!strcasecmp(opt->protocol_authentication, "ntlm")) {
@@ -43,7 +53,7 @@ index 587df09..8198eb6 100644
              ntlm(c, opt);
  #else
              s_log(LOG_ERR, "NTLM authentication is not available");
-@@ -1376,7 +1376,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
+@@ -1395,7 +1395,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
      return NULL;
  }
  
meta-networking/recipes-support/stunnel/stunnel_5.65.bb renamed from meta-networking/recipes-support/stunnel/stunnel_5.64.bb +1 -1
similarity index 93%
rename from meta-networking/recipes-support/stunnel/stunnel_5.64.bb
rename to meta-networking/recipes-support/stunnel/stunnel_5.65.bb
index 13ecd5c5bf..ab7ff43223 100644
@@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \
            file://fix-openssl-no-des.patch \
 "
 
-SRC_URI[sha256sum] = "eebe53ed116ba43b2e786762b0c2b91511e7b74857ad4765824e7199e6faf883"
+SRC_URI[sha256sum] = "60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc"
 
 inherit autotools bash-completion pkgconfig
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/5 redis: upgrade 7.0.2 -> 7.0.4

In reply to Armin Kuster

From: wangmy <[email protected]>

Changelog:
==========
Upgrade urgency: SECURITY, contains fixes to security issues.

Security Fixes:
----------------
(CVE-2022-31144) A specially crafted XAUTOCLAIM command on a stream key in a specific state may result with heap overflow, and potentially remote code execution. The problem affects Redis versions 7.0.0 or newer.

(cherry picked from commit d9f8d015a45188c3cf2d6841ea05319032930dbc)
---
 .../recipes-extended/redis/{redis_7.0.2.bb => redis_7.0.4.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-extended/redis/{redis_7.0.2.bb => redis_7.0.4.bb} (96%)
meta-oe/recipes-extended/redis/redis_7.0.4.bb renamed from meta-oe/recipes-extended/redis/redis_7.0.2.bb +1 -1
similarity index 96%
rename from meta-oe/recipes-extended/redis/redis_7.0.2.bb
rename to meta-oe/recipes-extended/redis/redis_7.0.4.bb
index b188278e1c..993ff34b10 100644
@@ -19,7 +19,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://GNU_SOURCE.patch \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
            "
-SRC_URI[sha256sum] = "5e57eafe7d4ac5ecb6a7d64d6b61db775616dbf903293b3fcc660716dbda5eeb"
+SRC_URI[sha256sum] = "f0e65fda74c44a3dd4fa9d512d4d4d833dd0939c934e946a5c622a630d057f2f"
 
 inherit autotools-brokensep update-rc.d systemd useradd
 
Signature · 1 line
2.25.1
#3 lore raw

PATCH 4/5 tracker: upgrade 3.3.0 -> 3.3.1

In reply to Armin Kuster

From: Wang Mingyu <[email protected]>

Changelog:
=========
* Fixed blank nodes to return the correct identifier in certain queries.
* Fixes to FTS consistency after updates
* Fixes to HTTP module linking
* Fix handling of STRING_LITERAL_LONG1/2 terminals
* Fix handling of negated property paths
* Use .so suffix for modules on all platforms
* Added code examples in JS/Python
* Developer documentation improvements

(cherry picked from commit 91d468a051f90d4df3550b911a4604db490d8d50)
---
 .../tracker/{tracker_3.3.0.bb => tracker_3.3.1.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/tracker/{tracker_3.3.0.bb => tracker_3.3.1.bb} (93%)
meta-gnome/recipes-gnome/tracker/tracker_3.3.1.bb renamed from meta-gnome/recipes-gnome/tracker/tracker_3.3.0.bb +1 -1
similarity index 93%
rename from meta-gnome/recipes-gnome/tracker/tracker_3.3.0.bb
rename to meta-gnome/recipes-gnome/tracker/tracker_3.3.1.bb
index bb2396af7c..42f44863ba 100644
@@ -22,7 +22,7 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check python3native
 
-SRC_URI[archive.sha256sum] = "0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda"
+SRC_URI[archive.sha256sum] = "5ad6f5bc97781ebf55ecd6947cd4ae7ff4192516580d10bd8380f1dd47196ed2"
 
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
Signature · 1 line
2.25.1
#4 lore raw

PATCH 5/5 tracker: upgrade 3.3.1 -> 3.3.2

In reply to Armin Kuster

From: wangmy <[email protected]>

Changelog:
==========
* Avoid redundant queries in TrackerNotifiers proxied through an D-Bus connection
* Do not attempt to rebuild non-existing FTS tables on parser updates
* Convert values to the right type when propagating insertions over superproperties
* Fix test to handle SQLite >= 3.39.0
* Fix handling of nrl:modified after opening existing databases
* Linking fixes to CLI executables

(cherry picked from commit a7f5d549e6152292e73e0039f4b7b0a2936a395c)
---
 .../tracker/{tracker_3.3.1.bb => tracker_3.3.2.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/tracker/{tracker_3.3.1.bb => tracker_3.3.2.bb} (93%)
meta-gnome/recipes-gnome/tracker/tracker_3.3.2.bb renamed from meta-gnome/recipes-gnome/tracker/tracker_3.3.1.bb +1 -1
similarity index 93%
rename from meta-gnome/recipes-gnome/tracker/tracker_3.3.1.bb
rename to meta-gnome/recipes-gnome/tracker/tracker_3.3.2.bb
index 42f44863ba..eaa0e065d1 100644
@@ -22,7 +22,7 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check python3native
 
-SRC_URI[archive.sha256sum] = "5ad6f5bc97781ebf55ecd6947cd4ae7ff4192516580d10bd8380f1dd47196ed2"
+SRC_URI[archive.sha256sum] = "0ed2b98918956d6f16429c607dd8a14c84f4da0a48970fd2eb8c93aba3cf9913"
 
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
Signature · 1 line
2.25.1