summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2020-10-26 16:20:15 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2020-10-26 16:20:15 +0100
commit822a03f34774397104f1ee91cc00fbeb343efa3f (patch)
treeaa34245483f26fa45ae7ff89c60a6e6e09e212b6
parenta74d82aac0ede233692117a34d8ab8af31d8757b (diff)
downloadarbor-822a03f34774397104f1ee91cc00fbeb343efa3f.tar.gz
arbor-822a03f34774397104f1ee91cc00fbeb343efa3f.tar.xz
irssi: version bump to 1.2.2, CVE-2019-15717
-rw-r--r--metadata/repository_mask.conf8
-rw-r--r--packages/net-irc/irssi/files/a0544571a80196e5b7705f56e6e2cbcdf7b4d80e.patch41
-rw-r--r--packages/net-irc/irssi/irssi-1.2.1.exheres-07
-rw-r--r--packages/net-irc/irssi/irssi-1.2.2.exheres-011
-rw-r--r--packages/net-irc/irssi/irssi.exlib4
5 files changed, 58 insertions, 13 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 918e187d7..03e3a69ee 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -841,11 +841,11 @@ app-arch/gcab[<1.0] [[
description = [ CVE-2018-5345 ]
]]
-net-irc/irssi[<1.1.1] [[
- author = [ Rasmus Thomsen <cogitri@exherbo.org> ]
- date = [ 26 Feb 2018 ]
+net-irc/irssi[<1.2.2] [[
+ author = [ Timo Gurr <tgurr@exherbo.org> ]
+ date = [ 26 Oct 2020 ]
token = security
- description = [ CVE-2018-705{0..4} ]
+ description = [ CVE-2019-15717 ]
]]
net-dns/idnkit[>=2.3] [[
diff --git a/packages/net-irc/irssi/files/a0544571a80196e5b7705f56e6e2cbcdf7b4d80e.patch b/packages/net-irc/irssi/files/a0544571a80196e5b7705f56e6e2cbcdf7b4d80e.patch
new file mode 100644
index 000000000..505d78f40
--- /dev/null
+++ b/packages/net-irc/irssi/files/a0544571a80196e5b7705f56e6e2cbcdf7b4d80e.patch
@@ -0,0 +1,41 @@
+Source/Upstream: Yes, fixed in git master
+Reason: Fix for Irssi on GLib >2.62
+
+From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
+From: ailin-nemui <ailin-nemui@users.noreply.github.com>
+Date: Thu, 23 Apr 2020 21:45:15 +0200
+Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
+
+A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
+NUL / U+0000 is a valid Unicode character. This would occur when the
+user types Ctrl+Space. As a result, the input loop never manages to
+process the NUL-byte (and any other user input that follows, ever).
+
+This patch adds a manual check that properly advances the input loop if
+GLib returns -2 (incomplete character) despite the length being positive
+and a NUL is in first position.
+
+Fixes #1180
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
+https://gitlab.gnome.org/GNOME/glib/-/issues/2093
+---
+ src/fe-text/term-terminfo.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
+index 5235f72d2..78496a64f 100644
+--- a/src/fe-text/term-terminfo.c
++++ b/src/fe-text/term-terminfo.c
+@@ -672,7 +672,11 @@ void term_stop(void)
+
+ static int input_utf8(const unsigned char *buffer, int size, unichar *result)
+ {
+- unichar c = g_utf8_get_char_validated((char *)buffer, size);
++ unichar c = g_utf8_get_char_validated((char *) buffer, size);
++
++ /* GLib >= 2.63 do not accept Unicode NUL anymore */
++ if (c == (unichar) -2 && *buffer == 0 && size > 0)
++ c = 0;
+
+ switch (c) {
+ case (unichar)-1:
diff --git a/packages/net-irc/irssi/irssi-1.2.1.exheres-0 b/packages/net-irc/irssi/irssi-1.2.1.exheres-0
deleted file mode 100644
index e37a49cc9..000000000
--- a/packages/net-irc/irssi/irssi-1.2.1.exheres-0
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2007 Alexander Færøy <ahf@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require irssi autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-PLATFORMS="~amd64 ~x86"
-
diff --git a/packages/net-irc/irssi/irssi-1.2.2.exheres-0 b/packages/net-irc/irssi/irssi-1.2.2.exheres-0
new file mode 100644
index 000000000..dde012f77
--- /dev/null
+++ b/packages/net-irc/irssi/irssi-1.2.2.exheres-0
@@ -0,0 +1,11 @@
+# Copyright 2007 Alexander Færøy <ahf@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require irssi autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
+
+PLATFORMS="~amd64 ~x86"
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/a0544571a80196e5b7705f56e6e2cbcdf7b4d80e.patch
+)
+
diff --git a/packages/net-irc/irssi/irssi.exlib b/packages/net-irc/irssi/irssi.exlib
index d106a1782..17e380fba 100644
--- a/packages/net-irc/irssi/irssi.exlib
+++ b/packages/net-irc/irssi/irssi.exlib
@@ -1,7 +1,7 @@
-# Copyright (c) 2007 Alexander Færøy <ahf@exherbo.org>
+# Copyright 2007 Alexander Færøy <ahf@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require github [ release=${PV} suffix=tar.gz ]
+require github [ release=${PV} suffix=tar.xz ]
export_exlib_phases src_install