diff options
author | Peter Marko <peter.marko@siemens.com> | 2024-12-20 16:36:29 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-12-20 19:47:57 -0800 |
commit | 46f22a10bef77b1d83250d539b3f311c58a6acdf (patch) | |
tree | d799278a77abfe16237a796ac0bd5bcf1af46444 | |
parent | 2d3988f7b611f0ccf0ea4dff8fb7bd15b4dc8860 (diff) | |
download | meta-openembedded-46f22a10bef77b1d83250d539b3f311c58a6acdf.tar.gz |
weechat: upgrade 4.0.4 -> 4.5.0
Solves CVE-2024-46613
Update dependencies:
- remove openssl and icu
- add cjson and gettext-native
Remove patch to find gcrypt which is no longer needed.
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch | 37 | ||||
-rw-r--r-- | meta-networking/recipes-irc/weechat/weechat_4.5.0.bb (renamed from meta-networking/recipes-irc/weechat/weechat_4.0.4.bb) | 8 |
2 files changed, 3 insertions, 42 deletions
diff --git a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch b/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch deleted file mode 100644 index 4a33dd720..000000000 --- a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From dc6b11f4cc6035b4701e1d7f7c91b2f45757e7a2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alejandro Enedino Hernandez Samaniego | ||
3 | <alejandro@enedino.org> | ||
4 | Date: Wed, 26 Feb 2020 13:55:16 -0800 | ||
5 | Subject: [PATCH] use pkg-config for gcrypt instead | ||
6 | |||
7 | Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-specific] | ||
10 | |||
11 | --- | ||
12 | cmake/FindGCRYPT.cmake | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | Index: weechat-2.7.1/cmake/FindGCRYPT.cmake | ||
16 | =================================================================== | ||
17 | --- weechat-2.7.1.orig/cmake/FindGCRYPT.cmake | ||
18 | +++ weechat-2.7.1/cmake/FindGCRYPT.cmake | ||
19 | @@ -27,15 +27,15 @@ | ||
20 | # GCRYPT_LDFLAGS = ldflags to use to compile | ||
21 | # | ||
22 | |||
23 | -find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config) | ||
24 | +find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES pkg-config) | ||
25 | |||
26 | set(GCRYPT_LDFLAGS) | ||
27 | set(GCRYPT_CFLAGS) | ||
28 | |||
29 | if(LIBGCRYPT_CONFIG_EXECUTABLE) | ||
30 | |||
31 | - execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) | ||
32 | - execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) | ||
33 | + execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) | ||
34 | + execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) | ||
35 | |||
36 | if(NOT DEFINED ${GCRYPT_CFLAGS}) | ||
37 | set(GCRYPT_CFLAGS " ") | ||
diff --git a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb b/meta-networking/recipes-irc/weechat/weechat_4.5.0.bb index d13764e4c..cca2bf4ec 100644 --- a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb +++ b/meta-networking/recipes-irc/weechat/weechat_4.5.0.bb | |||
@@ -4,13 +4,11 @@ SECTION = "net" | |||
4 | LICENSE = "GPL-3.0-only" | 4 | LICENSE = "GPL-3.0-only" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" |
6 | 6 | ||
7 | DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell zstd" | 7 | DEPENDS = "zlib libgcrypt gnutls curl aspell zstd cjson gettext-native" |
8 | 8 | ||
9 | SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \ | 9 | SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz" |
10 | file://0001-use-pkg-config-for-gcrypt-instead.patch \ | ||
11 | " | ||
12 | 10 | ||
13 | SRC_URI[sha256sum] = "ae5f4979b5ada0339b84e741d5f7e481ee91e3fecd40a09907b64751829eb6f6" | 11 | SRC_URI[sha256sum] = "b85e800af0f7c9f2d60d72c0f7e56abbaa60274a4d47be17407907292da30398" |
14 | 12 | ||
15 | inherit cmake pkgconfig | 13 | inherit cmake pkgconfig |
16 | 14 | ||