Skip to contentSkip to conversation

redis-plus-plus: upgrade 1.3.3 -> 1.3.5

PATCH New Wang Mingyu 1 participant 5 messages Jul 26, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 redis-plus-plus: upgrade 1.3.3 -> 1.3.5

0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch removed since it's included in 1.3.5

Changelog:
==========
Ensure running async callback when error happens. Add sentinel support for coroutine interface. Add publish command for async interface.

---
 ...E_INSTALL_LIBDIR-from-GNUInstallDirs.patch | 45 -------------------
 ...plus_1.3.3.bb => redis-plus-plus_1.3.5.bb} |  6 +--
 2 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch
 rename meta-oe/recipes-extended/redis-plus-plus/{redis-plus-plus_1.3.3.bb => redis-plus-plus_1.3.5.bb} (74%)
meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch deleted +0 -45
deleted file mode 100644
index 9ce39f3f77..0000000000
@@ -1,45 +0,0 @@
-From fbb13cdb0b3591616c3f77b6bc76e75af8906cda Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 19 Mar 2022 22:59:58 -0700
-Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs
-
-makes it portable across platforms e.g. ppc64/linux uses usr/lib64 for
-system libs
-
-Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/344]
-Signed-off-by: Khem Raj <[email protected]>
----
- CMakeLists.txt | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4f28ee4..8150f5c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -239,10 +239,12 @@ if(REDIS_PLUS_PLUS_BUILD_TEST)
-     add_subdirectory(test)
- endif()
- 
-+include(GNUInstallDirs)
-+
- install(TARGETS ${REDIS_PLUS_PLUS_TARGETS}
-         EXPORT redis++-targets
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         RUNTIME DESTINATION bin
-         INCLUDES DESTINATION include)
- 
-@@ -284,7 +286,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/redis++.pc.in"
-         "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" @ONLY)
- 
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc"
--        DESTINATION "lib/pkgconfig")
-+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- 
- # All the Debian-specific cpack defines.
- if(${CMAKE_VERSION} VERSION_GREATER 3.6)
--- 
-2.35.1
-
meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb renamed from meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.3.bb +2 -4
similarity index 74%
rename from meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.3.bb
rename to meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb
index 575443f0e5..de19dca387 100644
@@ -4,10 +4,8 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \
-           file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch \
-          "
-SRCREV = "389ffdf9e72035ea2096b03cda7f4a6809ae6363"
+SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https"
+SRCREV = "58084931ed1a056d91fe96da7b9ea81fa023560a"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 redis: upgrade 7.0.2 -> 7.0.4

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.

---
 .../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
#2 lore raw

PATCH 1/1 ser2net: upgrade 4.3.6 -> 4.3.7

In reply to Wang Mingyu
---
 .../ser2net/{ser2net_4.3.6.bb => ser2net_4.3.7.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-connectivity/ser2net/{ser2net_4.3.6.bb => ser2net_4.3.7.bb} (84%)
meta-oe/recipes-connectivity/ser2net/ser2net_4.3.7.bb renamed from meta-oe/recipes-connectivity/ser2net/ser2net_4.3.6.bb +1 -1
similarity index 84%
rename from meta-oe/recipes-connectivity/ser2net/ser2net_4.3.6.bb
rename to meta-oe/recipes-connectivity/ser2net/ser2net_4.3.7.bb
index 21fbdb6844..13ce13a0b9 100644
@@ -9,7 +9,7 @@ DEPENDS = "gensio libyaml"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz"
 
-SRC_URI[sha256sum] = "65515c7e9a5289167ae64c4032450904449a87ce20653241022af4f5db2e9510"
+SRC_URI[sha256sum] = "542915e240ae8b5c7dcec8d1589e6067818532900d45cfef226cea9f0e671d13"
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net"
 
Signature · 1 line
2.25.1
#3 lore raw

PATCH 1/1 stunnel: upgrade 5.64 -> 5.65

In reply to Wang Mingyu

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.

---
 .../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
#4 lore raw

PATCH 1/1 zenity: upgrade 3.42.1 -> 3.43.0

In reply to Wang Mingyu

Changelog:
==========
- Documentation updates
- Bump WebkitGTK dependency to API 4.1, for GNOME 43
- Translation updates:
Zurab Kargareteli

---
 .../recipes-gnome/zenity/{zenity_3.42.1.bb => zenity_3.43.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/zenity/{zenity_3.42.1.bb => zenity_3.43.0.bb} (88%)
meta-gnome/recipes-gnome/zenity/zenity_3.43.0.bb renamed from meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb +1 -1
similarity index 88%
rename from meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb
rename to meta-gnome/recipes-gnome/zenity/zenity_3.43.0.bb
index 2bcd8cc6ba..195e139e5f 100644
@@ -14,7 +14,7 @@ DEPENDS = " \
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-SRC_URI[archive.sha256sum] = "a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c"
+SRC_URI[archive.sha256sum] = "b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833"
 SRC_URI += "file://0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch"
 
 PACKAGECONFIG[libnotify] = "-Dlibnotify=true,-Dlibnotify=false,libnotify"
Signature · 1 line
2.25.1