diff --git a/glib-2-63.patch b/glib-2-63.patch deleted file mode 100644 index 67ef727..0000000 --- a/glib-2-63.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001 -From: ailin-nemui -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/irssi-1.2.2.tar.xz b/irssi-1.2.2.tar.xz deleted file mode 100644 index 714379a..0000000 --- a/irssi-1.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578 -size 1140844 diff --git a/irssi-1.2.2.tar.xz.asc b/irssi-1.2.2.tar.xz.asc deleted file mode 100644 index 711cf4b..0000000 --- a/irssi-1.2.2.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQR+5l4wgqX7Bqx8No0AzLWH3b7w4QUCXWfrjgAKCRAAzLWH3b7w -4XTOAJ45Z9BGezlcN78LBpV1/qW+WFkqwwCdGDVIfozSFQ0T0OrbzUjZNVOwrJY= -=igYD ------END PGP SIGNATURE----- diff --git a/irssi-1.2.3.tar.xz b/irssi-1.2.3.tar.xz new file mode 100644 index 0000000..f2784fb --- /dev/null +++ b/irssi-1.2.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f +size 1145292 diff --git a/irssi-1.2.3.tar.xz.asc b/irssi-1.2.3.tar.xz.asc new file mode 100644 index 0000000..6b6900f --- /dev/null +++ b/irssi-1.2.3.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQR+5l4wgqX7Bqx8No0AzLWH3b7w4QUCYHCVXQAKCRAAzLWH3b7w +4SxeAJ4zt3SqP2mDe/bkUuDoq4zavdy/dACeNfr56+y6xifQvkSqQYHP00O4fg0= +=zNoe +-----END PGP SIGNATURE----- diff --git a/irssi.changes b/irssi.changes index 4ce2e99..a959aa7 100644 --- a/irssi.changes +++ b/irssi.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Fri Apr 9 14:48:52 UTC 2021 - Ailin Nemui + +- update to 1.2.3 + - Fix the compilation of utf8proc (#1021) + - Fix wrong call to free. By Zero King (#1076) + - Fix a colour reset in true colour themes when encountering + mIRC colours (#1059) + - Fix memory leak on malformed CAP requests (#1120) + - Fix an erroneous free of SASL data. Credit to Oss-Fuzz (#1128, + #1130) + - Re-set the TLS flag when reconnecting (#1027, #1134) + - Fix the scrollback getting stuck after /clear (#1115, #1136) + - Fix the input of Ctrl+C as the first character (#1153, #1154) + - Fix crash on quit during unloading of modules on certain + platforms (#1167) + - Fix Irssi freezing input after Ctrl+Space on GLib >2.62 (#1180, + #1183) + - Fix layout of IDCHANs. By Lauri Tirkkonen (#1197) + - Fix crash when server got reconnected before it was properly + connected (#1210, #1211) + - Fix multiple identical active caps (#1249) + - Minor help corrections (#1156, #1213, #1214, #1255) + - Remove erroneous colour in the colorless theme. Reported and + fixed by Nutchanon Wetchasit (#1220, #1221) + - Fix invalid bounds calculation when editing the text + entry. Found and fixed by Sergey Valentey (#1269) + - Fix passing of negative size in buffer writes. Found and + fixed by Sergey Valentey (#1270) + - Fix Irssi freezing on slow hardware and fast DCC transfers (#159, + #1271) + - Fix compilation on Solaris (#1291) + - Fix null pointer dereference when receiving broken JOIN + record. Credit to Oss-Fuzz (#1292) + - Fix crash on /connect to some sockets (#1239, #1298) + - Fix Irssi rendering on Apple ARM. By Misty De Méo (#1267, + #1268, #1290) + - Fix crash on /lastlog with broken lines (#1281, #1299) + - Fix memory leak when receiving bogus SASL authentication + data. Found and fixed by Sergey Valentey (#1293) + ------------------------------------------------------------------- Tue Apr 28 16:33:09 UTC 2020 - Ailin Nemui diff --git a/irssi.spec b/irssi.spec index 6c3e253..b4808e0 100644 --- a/irssi.spec +++ b/irssi.spec @@ -18,7 +18,7 @@ %bcond_with socks Name: irssi -Version: 1.2.2 +Version: 1.2.3 Release: 0 Summary: Modular IRC Client License: GPL-2.0-or-later @@ -31,7 +31,6 @@ Source3: https://github.com/irssi/irssi/releases/download/%{version}/irss # https://sks-keyservers.net/pks/lookup?op=get&search=0x00CCB587DDBEF0E1 Source4: %{name}.keyring Source99: irssi-rpmlintrc -Patch0: https://github.com/ailin-nemui/irssi/commit/glib-2-63.patch # PATCH-FIX-OPENSUSE irssi-0.8.16_missing_prototype_warnings.patch Patch1: irssi-0.8.16_missing_prototype_warnings.patch BuildRequires: glib2-devel @@ -79,7 +78,6 @@ compile plugins for the irssi package. %prep %setup -q -%patch0 -p1 %patch1 %build