diff options
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/weechat/Manifest | 1 | ||||
| -rw-r--r-- | net-irc/weechat/files/2.7-CVE-2020-8955.patch | 46 | ||||
| -rw-r--r-- | net-irc/weechat/weechat-2.7-r2.ebuild | 158 |
3 files changed, 0 insertions, 205 deletions
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest index 87090b126f44..b3de02170e42 100644 --- a/net-irc/weechat/Manifest +++ b/net-irc/weechat/Manifest @@ -1,2 +1 @@ DIST weechat-2.7.1.tar.xz 2226768 BLAKE2B 0ce14646c8d383c3338a52bacbb9cac036c2611cc8aae2c790af73df5aab25e49f8bc2addcf4527884774925a9b222c15a7a696d93ad57197052a746a0da95f6 SHA512 eb0cc4c7e0f2cf18d522b49429fe2d77b1cee3225686d0bc09f80a69b17362af0923df4cd5f4859207d84acb762d4042cd5b57799705d0b7e4759eade6c660e0 -DIST weechat-2.7.tar.xz 2226876 BLAKE2B accb97f018c5405850df5ba7d1d8ad0b23ccfd478cedf29ebbd1f468f364efcfce7a7a34ef557ce7f64c2157392c1b281f8f74e57782ed69b4e0ada9f1b67b37 SHA512 5377cf9c37520cb2b7d1ba43251df3f33d814783ea4bd20d28cb08a2106c8db0e44a392a61929987b807a7d5e69a3c0ed1f3fec122a014b7ea7068e159341075 diff --git a/net-irc/weechat/files/2.7-CVE-2020-8955.patch b/net-irc/weechat/files/2.7-CVE-2020-8955.patch deleted file mode 100644 index 0bad821f9130..000000000000 --- a/net-irc/weechat/files/2.7-CVE-2020-8955.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6f4f147d8e86adf9ad34a8ffd7e7f1f23a7e74da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org> -Date: Sat, 8 Feb 2020 20:24:50 +0100 -Subject: [PATCH] irc: fix crash when receiving a malformed message 324 - (channel mode) - -Thanks to Stuart Nevans Locke for reporting the issue. ---- - ChangeLog.adoc | 1 + - src/plugins/irc/irc-mode.c | 21 ++++++++++++--------- - 2 files changed, 13 insertions(+), 9 deletions(-) - -diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c -index 2237a344b..e79f0deb7 100644 ---- a/src/plugins/irc/irc-mode.c -+++ b/src/plugins/irc/irc-mode.c -@@ -224,17 +224,20 @@ irc_mode_channel_update (struct t_irc_server *server, - current_arg++; - if (pos[0] == chanmode) - { -- chanmode_found = 1; -- if (set_flag == '+') -+ if (!chanmode_found) - { -- str_mode[0] = pos[0]; -- str_mode[1] = '\0'; -- strcat (new_modes, str_mode); -- if (argument) -+ chanmode_found = 1; -+ if (set_flag == '+') - { -- if (new_args[0]) -- strcat (new_args, " "); -- strcat (new_args, argument); -+ str_mode[0] = pos[0]; -+ str_mode[1] = '\0'; -+ strcat (new_modes, str_mode); -+ if (argument) -+ { -+ if (new_args[0]) -+ strcat (new_args, " "); -+ strcat (new_args, argument); -+ } - } - } - } diff --git a/net-irc/weechat/weechat-2.7-r2.ebuild b/net-irc/weechat/weechat-2.7-r2.ebuild deleted file mode 100644 index 36e757471243..000000000000 --- a/net-irc/weechat/weechat-2.7-r2.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) - -inherit cmake-utils python-single-r1 xdg-utils - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/weechat/weechat.git" -else - SRC_URI="https://weechat.org/files/src/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~ppc64 x86 ~x64-macos" -fi - -DESCRIPTION="Portable and multi-interface IRC client" -HOMEPAGE="https://weechat.org/" - -LICENSE="GPL-3" -SLOT="0" - -NETWORKS="+irc" -PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer" -# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support -SCRIPT_LANGS="guile lua +perl php +python ruby tcl" -LANGS=" cs de es fr it ja pl ru" -IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/libgcrypt:0= - net-misc/curl[ssl] - sys-libs/ncurses:0= - sys-libs/zlib - charset? ( virtual/libiconv ) - guile? ( >=dev-scheme/guile-2.0 ) - lua? ( dev-lang/lua:0[deprecated] ) - nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - php? ( >=dev-lang/php-7.0:*[embed] ) - python? ( ${PYTHON_DEPS} ) - ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) - ssl? ( net-libs/gnutls ) - spell? ( app-text/aspell ) - tcl? ( >=dev-lang/tcl-8.4.15:0= ) -" -DEPEND="${RDEPEND} - test? ( dev-util/cpputest ) -" - -BDEPEND=" - virtual/pkgconfig - doc? ( >=dev-ruby/asciidoctor-1.5.4 ) - man? ( >=dev-ruby/asciidoctor-1.5.4 ) - nls? ( >=sys-devel/gettext-0.15 ) -" - -DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc" - -# tests need to be fixed to not use system plugins if weechat is already installed -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${PV}-CVE-2020-8955.patch" ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - # install only required translations - local i - for i in ${LANGS} ; do - if ! has ${i} ${LINGUAS-${i}} ; then - sed -i \ - -e "/${i}.po/d" \ - po/CMakeLists.txt || die - fi - done - - # install only required documentation ; en always - for i in $(grep add_subdirectory doc/CMakeLists.txt \ - | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do - if ! has ${i} ${LINGUAS-${i}} ; then - sed -i \ - -e '/add_subdirectory('${i}')/d' \ - doc/CMakeLists.txt || die - fi - done - - # install docs in correct directory - sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die - - if [[ ${CHOST} == *-darwin* ]]; then - # fix linking error on Darwin - sed -i "s/+ get_config_var('LINKFORSHARED')//" \ - cmake/FindPython.cmake || die - # allow to find the plugins by default - sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \ - src/core/wee-config.c || die - fi -} - -src_configure() { - local mycmakeargs=( - -DLIBDIR=/usr/$(get_libdir) - -DENABLE_JAVASCRIPT=OFF - -DENABLE_LARGEFILE=ON - -DENABLE_NCURSES=ON - -DENABLE_ALIAS=$(usex alias) - -DENABLE_BUFLIST=$(usex buflist) - -DENABLE_CHARSET=$(usex charset) - -DENABLE_DOC=$(usex doc) - -DENABLE_EXEC=$(usex exec) - -DENABLE_FIFO=$(usex fifo) - -DENABLE_FSET=$(usex fset) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_GUILE=$(usex guile) - -DENABLE_IRC=$(usex irc) - -DENABLE_LOGGER=$(usex logger) - -DENABLE_LUA=$(usex lua) - -DENABLE_MAN=$(usex man) - -DENABLE_NLS=$(usex nls) - -DENABLE_PERL=$(usex perl) - -DENABLE_PHP=$(usex php) - -DENABLE_PYTHON=$(usex python) - -DENABLE_RELAY=$(usex relay) - -DENABLE_RUBY=$(usex ruby) - -DENABLE_SCRIPT=$(usex scripts) - -DENABLE_SCRIPTS=$(usex scripts) - -DENABLE_SPELL=$(usex spell) - -DENABLE_TCL=$(usex tcl) - -DENABLE_TESTS=$(usex test) - -DENABLE_TRIGGER=$(usex trigger) - -DENABLE_XFER=$(usex xfer) - ) - - if use python; then - python_is_python3 || mycmakeargs+=( -DENABLE_PYTHON2=ON ) - fi - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} |