From 46f22a10bef77b1d83250d539b3f311c58a6acdf Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Fri, 20 Dec 2024 16:36:29 +0100 Subject: 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 Signed-off-by: Khem Raj --- .../0001-use-pkg-config-for-gcrypt-instead.patch | 37 ---------------------- .../recipes-irc/weechat/weechat_4.0.4.bb | 36 --------------------- .../recipes-irc/weechat/weechat_4.5.0.bb | 34 ++++++++++++++++++++ 3 files changed, 34 insertions(+), 73 deletions(-) delete mode 100644 meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch delete mode 100644 meta-networking/recipes-irc/weechat/weechat_4.0.4.bb create mode 100644 meta-networking/recipes-irc/weechat/weechat_4.5.0.bb (limited to 'meta-networking') 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 4a33dd7204..0000000000 --- a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch +++ /dev/null @@ -1,37 +0,0 @@ -From dc6b11f4cc6035b4701e1d7f7c91b2f45757e7a2 Mon Sep 17 00:00:00 2001 -From: Alejandro Enedino Hernandez Samaniego - -Date: Wed, 26 Feb 2020 13:55:16 -0800 -Subject: [PATCH] use pkg-config for gcrypt instead - -Signed-off-by: Alejandro Enedino Hernandez Samaniego - -Upstream-Status: Inappropriate [oe-specific] - ---- - cmake/FindGCRYPT.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: weechat-2.7.1/cmake/FindGCRYPT.cmake -=================================================================== ---- weechat-2.7.1.orig/cmake/FindGCRYPT.cmake -+++ weechat-2.7.1/cmake/FindGCRYPT.cmake -@@ -27,15 +27,15 @@ - # GCRYPT_LDFLAGS = ldflags to use to compile - # - --find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config) -+find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES pkg-config) - - set(GCRYPT_LDFLAGS) - set(GCRYPT_CFLAGS) - - if(LIBGCRYPT_CONFIG_EXECUTABLE) - -- execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) -- execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) -+ execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) -+ execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) - - if(NOT DEFINED ${GCRYPT_CFLAGS}) - set(GCRYPT_CFLAGS " ") diff --git a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb b/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb deleted file mode 100644 index d13764e4c7..0000000000 --- a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Full-featured IRC plugin: multi-servers, proxy support, IPv6, SASL authentication, nicklist, DCC, and many other features" -HOMEPAE = "https://weechat.org/" -SECTION = "net" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell zstd" - -SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \ - file://0001-use-pkg-config-for-gcrypt-instead.patch \ - " - -SRC_URI[sha256sum] = "ae5f4979b5ada0339b84e741d5f7e481ee91e3fecd40a09907b64751829eb6f6" - -inherit cmake pkgconfig - -PACKAGECONFIG ??= " ncurses python" -PACKAGECONFIG[ncurses] = "-DENABLE_NCURSES=ON,-DENABLE_NCURSES=OFF,ncurses" -PACKAGECONFIG[python] = "-DENABLE_PYTHON=ON,-DENABLE_PYTHON=OFF,python3,python3" - -EXTRA_OECMAKE:append = " -DENABLE_PHP=OFF -DENABLE_TCL=OFF -DENABLE_LUA=OFF \ - -DENABLE_JAVASCRIPT=OFF -DENABLE_RUBY=OFF \ - -DENABLE_GUILE=OFF -DENABLE_PERL=OFF -DENABLE_ASPELL=ON \ - -DLIBDIR=${libdir}" - -do_configure:prepend(){ - # Make sure we get dependencies from recipe-sysroot - sed -i -e 's# /usr/bin# ${RECIPE_SYSROOT}/${bindir}/#g' ${S}/cmake/FindPerl.cmake - sed -i -e 's# /usr/local/bin##g' ${S}/cmake/FindPerl.cmake - sed -i -e 's# /usr/pkg/bin##g' ${S}/cmake/FindPerl.cmake -} - -do_install:append(){ - rm -rf ${D}/${datadir} -} - diff --git a/meta-networking/recipes-irc/weechat/weechat_4.5.0.bb b/meta-networking/recipes-irc/weechat/weechat_4.5.0.bb new file mode 100644 index 0000000000..cca2bf4ecc --- /dev/null +++ b/meta-networking/recipes-irc/weechat/weechat_4.5.0.bb @@ -0,0 +1,34 @@ +SUMMARY = "Full-featured IRC plugin: multi-servers, proxy support, IPv6, SASL authentication, nicklist, DCC, and many other features" +HOMEPAE = "https://weechat.org/" +SECTION = "net" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = "zlib libgcrypt gnutls curl aspell zstd cjson gettext-native" + +SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz" + +SRC_URI[sha256sum] = "b85e800af0f7c9f2d60d72c0f7e56abbaa60274a4d47be17407907292da30398" + +inherit cmake pkgconfig + +PACKAGECONFIG ??= " ncurses python" +PACKAGECONFIG[ncurses] = "-DENABLE_NCURSES=ON,-DENABLE_NCURSES=OFF,ncurses" +PACKAGECONFIG[python] = "-DENABLE_PYTHON=ON,-DENABLE_PYTHON=OFF,python3,python3" + +EXTRA_OECMAKE:append = " -DENABLE_PHP=OFF -DENABLE_TCL=OFF -DENABLE_LUA=OFF \ + -DENABLE_JAVASCRIPT=OFF -DENABLE_RUBY=OFF \ + -DENABLE_GUILE=OFF -DENABLE_PERL=OFF -DENABLE_ASPELL=ON \ + -DLIBDIR=${libdir}" + +do_configure:prepend(){ + # Make sure we get dependencies from recipe-sysroot + sed -i -e 's# /usr/bin# ${RECIPE_SYSROOT}/${bindir}/#g' ${S}/cmake/FindPerl.cmake + sed -i -e 's# /usr/local/bin##g' ${S}/cmake/FindPerl.cmake + sed -i -e 's# /usr/pkg/bin##g' ${S}/cmake/FindPerl.cmake +} + +do_install:append(){ + rm -rf ${D}/${datadir} +} + -- cgit v1.2.3-54-g00ecf