Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package irssi for openSUSE:Factory checked in at 2021-04-12 12:37:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irssi (Old) and /work/SRC/openSUSE:Factory/.irssi.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irssi" Mon Apr 12 12:37:11 2021 rev:58 rq:884405 version:1.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2020-04-28 22:33:57.769932033 +0200 +++ /work/SRC/openSUSE:Factory/.irssi.new.2401/irssi.changes 2021-04-12 12:40:03.281556907 +0200 @@ -1,0 +2,41 @@ +Fri Apr 9 14:48:52 UTC 2021 - Ailin Nemui <ailin.ne...@gmail.com> + +- 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) + +------------------------------------------------------------------- Old: ---- glib-2-63.patch irssi-1.2.2.tar.xz irssi-1.2.2.tar.xz.asc New: ---- irssi-1.2.3.tar.xz irssi-1.2.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irssi.spec ++++++ --- /var/tmp/diff_new_pack.Zyjcbb/_old 2021-04-12 12:40:03.957557693 +0200 +++ /var/tmp/diff_new_pack.Zyjcbb/_new 2021-04-12 12:40:03.961557698 +0200 @@ -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 @@ # 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 @@ %prep %setup -q -%patch0 -p1 %patch1 %build ++++++ irssi-1.2.2.tar.xz -> irssi-1.2.3.tar.xz ++++++ ++++ 7563 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/ChangeLog new/irssi-1.2.3/ChangeLog --- old/irssi-1.2.2/ChangeLog 2019-08-29 15:48:55.000000000 +0200 +++ new/irssi-1.2.3/ChangeLog 2021-04-09 18:36:16.000000000 +0200 @@ -1,3 +1,296 @@ +commit 91dc3e4dfa1a9558c5a7fe0ea982cb9df0e2de65 +Author: Ailin Nemui <ailin@d5401s.localdomain> +Date: Fri Apr 9 00:11:47 2021 +0200 + + tag as 1.2.3 + +commit 843c3968c738753d41df5c3a02a57449afc7370b +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Fri Mar 8 13:57:04 2019 +0000 + + Merge pull request #1021 from ailin-nemui/fix-1019 + + fix the compilation of utf8proc code if desired + + (cherry picked from commit 26d96a7bb2e89a84b6d866eaeb312dcd8dbdaede) + +commit b114201b7b76aa534b29e30ffd091431f5abc34c +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Sat Jul 27 21:49:55 2019 +0200 + + Merge pull request #1076 from l2dy/gfree + + Free g_strdup() allocated memory with g_free() + + (cherry picked from commit 7e767e144409f8f86172740c8d0e2a66a6a4a286) + +commit e8457188ced5c9db765eb10d4cf074d64c77d543 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Mon Sep 16 11:42:48 2019 +0200 + + Merge pull request #1120 from ailin-nemui/invalid-cap-free + + free params + + (cherry picked from commit 8a1a96c12c3f99275522640600bd53dcf66c8f68) + +commit 18e97d9e8bcebb171668180985a4b46e0e919aba +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Tue Oct 1 13:55:46 2019 +0200 + + Merge pull request #1130 from ailin-nemui/string-free + + Only call g_string_free if there is a string + + (cherry picked from commit 49c6c2b69f5c7bc579153456d1eecdf03eef715e) + +commit aae1e3392a345d073c3ede021f9b8b5166d11bbc +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Fri Feb 14 20:17:50 2020 +0100 + + Merge pull request #1154 from ailin-nemui/zerowidth + + refine zero width input test in empty line + + (cherry picked from commit b38ae68fb544612c8899d1e1196b434f7e7ba70b) + +commit d3bb5d701571074e63596a2d61de841ccaf53d79 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Tue Mar 17 01:54:34 2020 +0100 + + Merge pull request #1156 from vague666/add_server_nopass + + Improve help for how to remove saved server password + + (cherry picked from commit f0c1bc4dde6b89f4c89a843c2a0e08b871023891) + +commit e814df5422c108973a3dbb7f483216c40581ad1c +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Fri Apr 3 23:26:54 2020 +0200 + + Merge pull request #1167 from ailin-nemui/quit-crash + + fix crash on /quit when unloading modules + + (cherry picked from commit 8b7bf1f04eefea51fdeb9d151ef0be2c5956c0ea) + +commit 33c741639023a383314a0a8e6b67a86ef1c8797c +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Thu May 21 16:00:30 2020 +0200 + + Merge pull request #1197 from lotheac/master + + use visible channel name in layout save + + (cherry picked from commit 99b941db8e7af78c40901fd554e78682f7edc099) + +commit fc93d11bf6731bf78f2c884ba0e83d8e79d6b5e8 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Sun Jul 26 10:43:51 2020 +0200 + + Merge pull request #1211 from ailin-nemui/disco_lastmsg + + fix crash when server got disconnected/reconnected before it was properly connected + + (cherry picked from commit cd10745711e4fa3bff965a6eecadfe1526850c6e) + +commit c165f38ca58d26954b4d77aa85f0f12e25111035 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Wed Jan 6 19:23:07 2021 +0100 + + Merge pull request #1249 from ailin-nemui/dup-caps + + fix multiple identical active caps + + (cherry picked from commit 0ae27530d6d2ff3e575fbb07f34b64d7141a8f05) + +commit 6d352cfd795c85615fe3f243ec9cd728d37feedc +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Sat Jan 9 10:38:36 2021 +0100 + + Merge pull request #1255 from irssi/vague666-patch-1 + + Update ignore.in examples + + (cherry picked from commit cd8a0cb701efa7ccb273b8efa3df37d74e4a00ea) + +commit 4f8838651150ab8175803b2c338dfa93959320e1 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Wed Feb 10 10:59:39 2021 +0100 + + Merge pull request #1269 from ihsinme/patch-1 + + fix invalid unsigned arithmetic. + + (cherry picked from commit 0dd60755f0428cbc8042a421dfdd4c6ea5c392cf) + +commit 80a338fe10b144edbe63ff17c28f24154ce368f0 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Mon Feb 8 17:17:07 2021 +0100 + + Merge pull request #1270 from ihsinme/ihsinme-patch-238 + + correction of incorrect sequence of checks. + + (cherry picked from commit 33b4154b0cb476725c84955c340b0f61af513386) + +commit 93c57050788fe311d37cba36a37e5a08a52bda0b +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Wed Feb 24 21:50:18 2021 +0100 + + Merge pull request #1271 from irssi/vague666-fix-159 + + Update dcc-get.c + + (cherry picked from commit 672f12754434ea7195e257c5848a716fee717c75) + +commit b00b17a4851234f5a2b769ece02ab5d13f3eacb2 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Thu Apr 1 21:28:16 2021 +0200 + + Merge pull request #1291 from ailin-nemui/nobool + + remove unused bool include + + (cherry picked from commit cdb30695f997754c48a97d8c5196aa7d959a46dd) + +commit ef4bad3600e821232bb9781fd0579f4ec648f5a7 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Thu Apr 1 22:13:01 2021 +0200 + + Merge pull request #1292 from ailin-nemui/nonick + + don't bother if we don't have a nick + + (cherry picked from commit e0b98e1fa57a2f9faf6616af404f630e8c7527e6) + +commit d05e65b2f9bb039f2799087d12478cbc0852accc +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Fri Apr 2 14:44:32 2021 +0200 + + Merge pull request #1293 from ihsinme/patch-1 + + fix memory leak. + + (cherry picked from commit 628ca79e6afc7008fd615598cc6797537f2bf065) + +commit aa7dfea534f9bdb1ff476016c4a9f4fdd55bcafe +Merge: 11905bad dee05547 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Thu Apr 8 17:27:46 2021 +0200 + + Merge pull request #1299 from ailin-nemui/null-text-save + + fail on empty text + +commit 11905badcbd01e18541c20e139956fdfc075f46d +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Thu Apr 1 21:28:04 2021 +0200 + + Merge pull request #1290 from mistydemeo/check_for_term_h + + Add a check for term.h + + (cherry picked from commit a7315250128ad93ac03ceed4b8ee91833f3f3d3e) + +commit ef124d7378a78e7124641fb1776dcd82e513a95b +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Wed Feb 3 17:46:11 2021 +0100 + + Merge pull request #1268 from ailin-nemui/nostdinc + + configure automake with nostdinc + + (cherry picked from commit 95f131da2d741f4ad13c2c045253dc2b80b03f40) + +commit c72ff03d9ca7ba5ca83e01bebff7fe770ab46411 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Thu Apr 8 15:46:18 2021 +0200 + + Merge pull request #1298 from ailin-nemui/connect-crashes + + fix crash on /connect -tls + + (cherry picked from commit 9b02424f3030362572dfa6acfd8b1ef1ea54cc8a) + +commit 6ad105487effa82d47c2a1aabfae9e17083d1c90 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Fri Sep 11 14:15:41 2020 +0200 + + Merge pull request #1221 from nachanon/bug1220 + + Decolor the vertical window split bar in stock `colorless` theme + + (cherry picked from commit 561619f23ca2db21616d13f2291f3d46d649987c) + +commit ec0b17305a9c73cf926b9e8f14c33ba99b44b095 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Thu Jul 30 19:09:28 2020 +0200 + + Merge pull request #1214 from irssi/vague666-update-help-1 + + Update ignore help + + (cherry picked from commit 300cd14a705872df3245cb5235c3d7a84e178b7d) + +commit b47bc61866a25191cffdcf30a1e227e196524e9c +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Thu Jul 30 09:04:03 2020 +0200 + + Merge pull request #1213 from irssi/vague666-update-help + + Update help with HIDDEN level + + (cherry picked from commit dfba73225d1c29c6f6d3c438dfe996d67302d7fe) + +commit 41c3ec7445fd27c9dc2619ada89447f8fc6222e0 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Wed Jul 8 17:43:11 2020 +0200 + + Merge pull request #1183 from ailin-nemui/glib-2-63 + + manually handle NUL unicode in g_utf8_get_next_char_validated + + (cherry picked from commit 76802985a4d99105374a64cea5f973298ed89ca5) + +commit 07472fc569c3dcbcf0e485a072ed65159a094c2d +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Tue Oct 15 12:56:36 2019 +0200 + + Merge pull request #1136 from ailin-nemui/lines + + Make sure the bottom_startline is not lost when removing lines + + (cherry picked from commit bf3565a720c0dd2519eb5549508b463b927d7d6f) + +commit da12a0361bdfad89cfcef9745364bc4b9fef1058 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Tue Oct 15 11:02:22 2019 +0200 + + Merge pull request #1134 from horgh/horgh/tls-reconnect + + Use correct TLS settings when reconnecting + + (cherry picked from commit 156d02c5cff459bf2210992bee73127ff84292e1) + +commit 4b5e0de15b50fb1198aaee830d64528042392d08 +Author: ailin-nemui <ailin-ne...@users.noreply.github.com> +Date: Thu Jun 27 07:46:41 2019 +0200 + + Merge pull request #1059 from ailin-nemui/mirc-24 + + Use the 24bit mIRC colour mappings if colors_ansi_24bit is enabled + + (cherry picked from commit d34bd858d068ae5da99fc7caa03b64350646ae87) + +commit dee0554731a59ae67fa93102276159cad26b1f59 +Author: Ailin Nemui <ailin@d5401s.localdomain> +Date: Wed Apr 7 11:46:24 2021 +0200 + + fail on empty text + + reported by @dwfreed + commit 42110b92e92cb40e82fd736d88b099d096483939 Author: ailin-nemui <ailin-ne...@users.noreply.github.com> Date: Thu Aug 29 02:25:21 2019 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/NEWS new/irssi-1.2.3/NEWS --- old/irssi-1.2.2/NEWS 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/NEWS 2021-04-09 18:33:12.000000000 +0200 @@ -1,3 +1,41 @@ +v1.2.3 2021-04-11 The Irssi team <st...@irssi.org> + - 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) + v1.2.2 2019-08-29 The Irssi team <st...@irssi.org> - Fix a use after free issue when receiving IRCv3 CAP information from the server (GL#34) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/build-aux/compile new/irssi-1.2.3/build-aux/compile --- old/irssi-1.2.2/build-aux/compile 2019-08-29 15:49:03.000000000 +0200 +++ new/irssi-1.2.3/build-aux/compile 2021-04-09 18:36:23.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/build-aux/missing new/irssi-1.2.3/build-aux/missing --- old/irssi-1.2.2/build-aux/missing 2019-08-29 15:49:03.000000000 +0200 +++ new/irssi-1.2.3/build-aux/missing 2021-04-09 18:36:23.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/build-aux/test-driver new/irssi-1.2.3/build-aux/test-driver --- old/irssi-1.2.2/build-aux/test-driver 2019-08-29 15:49:04.000000000 +0200 +++ new/irssi-1.2.3/build-aux/test-driver 2021-04-09 18:36:23.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,11 +42,13 @@ { cat <<END Usage: - test-driver --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] + test-driver --test-name NAME --log-file PATH --trs-file PATH + [--expect-failure {yes|no}] [--color-tests {yes|no}] + [--enable-hard-errors {yes|no}] [--] TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] + The '--test-name', '--log-file' and '--trs-file' options are mandatory. +See the GNU Automake documentation for information. END } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/configure.ac new/irssi-1.2.3/configure.ac --- old/irssi-1.2.2/configure.ac 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/configure.ac 2021-04-09 00:08:42.000000000 +0200 @@ -1,11 +1,11 @@ -AC_INIT(irssi, 1.2.2) +AC_INIT(irssi, 1.2.3) AC_CONFIG_SRCDIR([src]) AC_CONFIG_AUX_DIR(build-aux) AC_PREREQ(2.50) AC_CONFIG_HEADERS([irssi-config.h]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects]) +AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects nostdinc]) AM_SILENT_RULES([yes]) @@ -342,6 +342,7 @@ AC_CHECK_HEADER([utf8proc.h], [ AC_CHECK_LIB([utf8proc], [utf8proc_version], [ want_utf8proc=yes + AC_DEFINE(HAVE_LIBUTF8PROC,, [Define to 1 if you have the `utf8proc' library (-lutf8proc).]) LIBS="$LIBS -lutf8proc" ], [ want_utf8proc="no, library not found" @@ -368,6 +369,10 @@ AC_SUBST(TEXTUI_LIBS) LIBS="$TEXTUI_NO_LIBS" + AC_CHECK_HEADER([term.h], [ + AC_DEFINE(HAVE_TERM_H, [], [Define to 1 if you have the `term.h' header.]) + ]) + fi dnl ** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/docs/help/ignore new/irssi-1.2.3/docs/help/ignore --- old/irssi-1.2.2/docs/help/ignore 2019-08-29 15:48:55.000000000 +0200 +++ new/irssi-1.2.3/docs/help/ignore 2021-04-09 18:36:16.000000000 +0200 @@ -26,6 +26,8 @@ The special level 'NO_ACT' can be used to ignore activity in the statusbar without actually ignoring the message; this behavior is somewhat special because it is allowed in addition to other ignores for the same target. + The special level 'HIDDEN' can be used to hide matching messages that can + later be revealed using /WINDOW HIDELEVEL -HIDDEN %9Examples:%9 @@ -36,12 +38,13 @@ /IGNORE #irssi ALL -PUBLIC -ACTIONS /IGNORE -replies *!*@*.irssi.org ALL /IGNORE -regexp -pattern (away|gone|back|playing|returned) * ACTIONS + /IGNORE -regexp -pattern (away|gone|back|playing|returned) #channel ACTIONS /IGNORE *zzz* NICKS /IGNORE *afk* NICKS /IGNORE *away* NICKS /IGNORE #irssi NO_ACT JOINS PARTS QUITS /IGNORE mike NO_ACT -MSGS - /IGNORE -regexp -pattern + /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS %9See also:%9 ACCEPT, SILENCE, UNIGNORE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/docs/help/in/ignore.in new/irssi-1.2.3/docs/help/in/ignore.in --- old/irssi-1.2.2/docs/help/in/ignore.in 2019-08-29 15:48:43.000000000 +0200 +++ new/irssi-1.2.3/docs/help/in/ignore.in 2021-04-08 23:23:55.000000000 +0200 @@ -25,6 +25,8 @@ The special level 'NO_ACT' can be used to ignore activity in the statusbar without actually ignoring the message; this behavior is somewhat special because it is allowed in addition to other ignores for the same target. + The special level 'HIDDEN' can be used to hide matching messages that can + later be revealed using /WINDOW HIDELEVEL -HIDDEN %9Examples:%9 @@ -35,12 +37,13 @@ /IGNORE #irssi ALL -PUBLIC -ACTIONS /IGNORE -replies *!*@*.irssi.org ALL /IGNORE -regexp -pattern (away|gone|back|playing|returned) * ACTIONS + /IGNORE -regexp -pattern (away|gone|back|playing|returned) #channel ACTIONS /IGNORE *zzz* NICKS /IGNORE *afk* NICKS /IGNORE *away* NICKS /IGNORE #irssi NO_ACT JOINS PARTS QUITS /IGNORE mike NO_ACT -MSGS - /IGNORE -regexp -pattern + /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS %9See also:%9 ACCEPT, SILENCE, UNIGNORE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/docs/help/in/levels.in new/irssi-1.2.3/docs/help/in/levels.in --- old/irssi-1.2.2/docs/help/in/levels.in 2019-08-29 15:48:43.000000000 +0200 +++ new/irssi-1.2.3/docs/help/in/levels.in 2021-04-08 16:04:00.000000000 +0200 @@ -32,6 +32,7 @@ HILIGHT The text is highlighted. NEVER Never ignores or logs the message. + HIDDEN Hides the message when window HIDELEVEL includes HIDDEN. NO_ACT Doesn't trigger any activity in the statusbar. NOHILIGHT The text is not highlighted. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/docs/help/in/server.in new/irssi-1.2.3/docs/help/in/server.in --- old/irssi-1.2.2/docs/help/in/server.in 2019-08-29 15:48:43.000000000 +0200 +++ new/irssi-1.2.3/docs/help/in/server.in 2021-04-08 23:38:50.000000000 +0200 @@ -56,6 +56,8 @@ disconnected unless you prepend the server with the '+' character; the same method is applicable to the CONNECT parameter. + Specify '-' as password to remove a server password + %9Examples:%9 /SERVER @@ -64,6 +66,7 @@ /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667 /SERVER MODIFY -network Freenode -noauto orwell.freenode.net + /SERVER MODIFY -network Freenode orwell.freenode.net 6697 - /SERVER REMOVE orwell.freenode.net 6667 Freenode /SERVER PURGE /SERVER PURGE orwell.freenode.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/docs/help/levels new/irssi-1.2.3/docs/help/levels --- old/irssi-1.2.2/docs/help/levels 2019-08-29 15:48:55.000000000 +0200 +++ new/irssi-1.2.3/docs/help/levels 2021-04-09 18:36:16.000000000 +0200 @@ -32,6 +32,7 @@ HILIGHT The text is highlighted. NEVER Never ignores or logs the message. + HIDDEN Hides the message when window HIDELEVEL includes HIDDEN. NO_ACT Doesn't trigger any activity in the statusbar. NOHILIGHT The text is not highlighted. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/docs/help/server new/irssi-1.2.3/docs/help/server --- old/irssi-1.2.2/docs/help/server 2019-08-29 15:48:55.000000000 +0200 +++ new/irssi-1.2.3/docs/help/server 2021-04-09 18:36:16.000000000 +0200 @@ -60,6 +60,8 @@ disconnected unless you prepend the server with the '+' character; the same method is applicable to the CONNECT parameter. + Specify '-' as password to remove a server password + %9Examples:%9 /SERVER @@ -68,6 +70,7 @@ /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667 /SERVER MODIFY -network Freenode -noauto orwell.freenode.net + /SERVER MODIFY -network Freenode orwell.freenode.net 6697 - /SERVER REMOVE orwell.freenode.net 6667 Freenode /SERVER PURGE /SERVER PURGE orwell.freenode.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/irssi-config.h new/irssi-1.2.3/irssi-config.h --- old/irssi-1.2.2/irssi-config.h 2019-08-29 15:49:24.000000000 +0200 +++ new/irssi-1.2.3/irssi-config.h 2021-04-09 18:36:26.000000000 +0200 @@ -17,7 +17,10 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `otr' library (-lotr). */ -#define HAVE_LIBOTR 1 +/* #undef HAVE_LIBOTR */ + +/* Define to 1 if you have the `utf8proc' library (-lutf8proc). */ +/* #undef HAVE_LIBUTF8PROC */ /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 @@ -32,7 +35,7 @@ /* #undef HAVE_STATIC_OTR */ /* */ -/* #undef HAVE_STATIC_PERL */ +#define HAVE_STATIC_PERL 1 /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -67,6 +70,9 @@ /* Define to 1 if you have the <sys/utsname.h> header file. */ #define HAVE_SYS_UTSNAME_H 1 +/* Define to 1 if you have the `term.h' header. */ +#define HAVE_TERM_H /**/ + /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 @@ -80,7 +86,7 @@ #define PACKAGE_NAME "irssi" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "irssi 1.2.2" +#define PACKAGE_STRING "irssi 1.2.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "irssi" @@ -89,7 +95,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.2" +#define PACKAGE_VERSION "1.2.3" /* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */ #define PRIuUOFF_T "lu" @@ -110,7 +116,7 @@ #define STDC_HEADERS 1 /* true color support in terminal */ -#define TERM_TRUECOLOR /**/ +/* #undef TERM_TRUECOLOR */ /* What type should be used for uoff_t */ /* #undef UOFF_T_INT */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/irssi-config.h.in new/irssi-1.2.3/irssi-config.h.in --- old/irssi-1.2.2/irssi-config.h.in 2019-08-29 15:49:02.000000000 +0200 +++ new/irssi-1.2.3/irssi-config.h.in 2021-04-09 18:36:23.000000000 +0200 @@ -18,6 +18,9 @@ /* Define to 1 if you have the `otr' library (-lotr). */ #undef HAVE_LIBOTR +/* Define to 1 if you have the `utf8proc' library (-lutf8proc). */ +#undef HAVE_LIBUTF8PROC + /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -66,6 +69,9 @@ /* Define to 1 if you have the <sys/utsname.h> header file. */ #undef HAVE_SYS_UTSNAME_H +/* Define to 1 if you have the `term.h' header. */ +#undef HAVE_TERM_H + /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/irssi-version.h new/irssi-1.2.3/irssi-version.h --- old/irssi-1.2.2/irssi-version.h 2019-08-29 15:49:27.000000000 +0200 +++ new/irssi-1.2.3/irssi-version.h 2021-04-09 18:36:27.000000000 +0200 @@ -1,2 +1,2 @@ -#define IRSSI_VERSION_DATE 20190829 -#define IRSSI_VERSION_TIME 225 +#define IRSSI_VERSION_DATE 20210409 +#define IRSSI_VERSION_TIME 11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/irssi.conf new/irssi-1.2.3/irssi.conf --- old/irssi-1.2.2/irssi.conf 2019-08-29 15:48:43.000000000 +0200 +++ new/irssi-1.2.3/irssi.conf 2021-04-08 23:32:59.000000000 +0200 @@ -107,7 +107,7 @@ aliases = { ATAG = "WINDOW SERVER"; - ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}"; + ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{visible_name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}"; B = "BAN"; BACK = "AWAY"; BANS = "BAN"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/core/Makefile.am new/irssi-1.2.3/src/core/Makefile.am --- old/irssi-1.2.2/src/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/core/Makefile.am 2021-04-08 16:19:21.000000000 +0200 @@ -1,6 +1,7 @@ noinst_LIBRARIES = libcore.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ $(GLIB_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/core/modules.c new/irssi-1.2.3/src/core/modules.c --- old/irssi-1.2.2/src/core/modules.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/core/modules.c 2021-04-08 23:35:45.000000000 +0200 @@ -214,7 +214,7 @@ module = g_new0(MODULE_REC, 1); module->name = g_strdup(name); - modules = g_slist_append(modules, module); + modules = g_slist_prepend(modules, module); } file = module_file_find(module, submodule); @@ -226,8 +226,8 @@ file->name = g_strdup(submodule); file->defined_module_name = g_strdup(defined_module_name); - module->files = g_slist_append(module->files, file); - return file; + module->files = g_slist_prepend(module->files, file); + return file; } MODULE_REC *module_find(const char *name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/core/network-openssl.c new/irssi-1.2.3/src/core/network-openssl.c --- old/irssi-1.2.2/src/core/network-openssl.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/core/network-openssl.c 2021-04-08 23:58:03.000000000 +0200 @@ -226,7 +226,7 @@ } else { g_warning("No subjectAltNames and no valid common name in certificate"); } - free(cert_subject_cn); + g_free(cert_subject_cn); } return matched; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/core/servers-reconnect.c new/irssi-1.2.3/src/core/servers-reconnect.c --- old/irssi-1.2.2/src/core/servers-reconnect.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/core/servers-reconnect.c 2021-04-08 15:58:41.000000000 +0200 @@ -151,10 +151,6 @@ static void sserver_connect(SERVER_SETUP_REC *rec, SERVER_CONNECT_REC *conn) { - conn->family = rec->family; - conn->address = g_strdup(rec->address); - if (conn->port == 0) conn->port = rec->port; - server_setup_fill_reconn(conn, rec); server_reconnect_add(conn, rec->last_connect+reconnect_time); server_connect_unref(conn); @@ -181,10 +177,20 @@ dest->tag = g_strdup(src->tag); if (connect_info) { - dest->family = src->family; + dest->family = src->family; dest->address = g_strdup(src->address); dest->port = src->port; dest->password = g_strdup(src->password); + + dest->use_tls = src->use_tls; + dest->tls_cert = g_strdup(src->tls_cert); + dest->tls_pkey = g_strdup(src->tls_pkey); + dest->tls_verify = src->tls_verify; + dest->tls_cafile = g_strdup(src->tls_cafile); + dest->tls_capath = g_strdup(src->tls_capath); + dest->tls_ciphers = g_strdup(src->tls_ciphers); + dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert); + dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey); } dest->chatnet = g_strdup(src->chatnet); @@ -207,16 +213,6 @@ dest->no_autosendcmd = src->no_autosendcmd; dest->unix_socket = src->unix_socket; - dest->use_tls = src->use_tls; - dest->tls_cert = g_strdup(src->tls_cert); - dest->tls_pkey = g_strdup(src->tls_pkey); - dest->tls_verify = src->tls_verify; - dest->tls_cafile = g_strdup(src->tls_cafile); - dest->tls_capath = g_strdup(src->tls_capath); - dest->tls_ciphers = g_strdup(src->tls_ciphers); - dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert); - dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey); - return dest; } @@ -293,7 +289,7 @@ (!rec->last_connect || !rec->last_failed || rec->last_connect < now-FAILED_RECONNECT_WAIT)) { if (rec == sserver) - conn->port = server->connrec->port; + conn->port = server->connrec->port; sserver_connect(rec, conn); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/core/servers-setup.c new/irssi-1.2.3/src/core/servers-setup.c --- old/irssi-1.2.2/src/core/servers-setup.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/core/servers-setup.c 2021-04-08 15:58:41.000000000 +0200 @@ -108,6 +108,35 @@ if (sserver->password != NULL && conn->password == NULL) conn->password = g_strdup(sserver->password); + if (sserver->no_proxy) + g_free_and_null(conn->proxy); + + if (sserver->family != 0 && conn->family == 0) + conn->family = sserver->family; + if (sserver->address && !conn->address) + conn->address = g_strdup(sserver->address); + if (sserver->port > 0 && conn->port <= 0) + conn->port = sserver->port; + + conn->use_tls = sserver->use_tls; + if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0') + conn->tls_cert = g_strdup(sserver->tls_cert); + if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0') + conn->tls_pkey = g_strdup(sserver->tls_pkey); + if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0') + conn->tls_pass = g_strdup(sserver->tls_pass); + conn->tls_verify = sserver->tls_verify; + if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0') + conn->tls_cafile = g_strdup(sserver->tls_cafile); + if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0') + conn->tls_capath = g_strdup(sserver->tls_capath); + if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0') + conn->tls_ciphers = g_strdup(sserver->tls_ciphers); + if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0') + conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert); + if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0') + conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey); + signal_emit("server setup fill reconn", 2, conn, sserver); } @@ -159,33 +188,6 @@ sserver->last_connect = time(NULL); - if (sserver->no_proxy) - g_free_and_null(conn->proxy); - - if (sserver->family != 0 && conn->family == 0) - conn->family = sserver->family; - if (sserver->port > 0 && conn->port <= 0) - conn->port = sserver->port; - - conn->use_tls = sserver->use_tls; - if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0') - conn->tls_cert = g_strdup(sserver->tls_cert); - if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0') - conn->tls_pkey = g_strdup(sserver->tls_pkey); - if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0') - conn->tls_pass = g_strdup(sserver->tls_pass); - conn->tls_verify = sserver->tls_verify; - if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0') - conn->tls_cafile = g_strdup(sserver->tls_cafile); - if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0') - conn->tls_capath = g_strdup(sserver->tls_capath); - if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0') - conn->tls_ciphers = g_strdup(sserver->tls_ciphers); - if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0') - conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert); - if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0') - conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey); - server_setup_fill_reconn(conn, sserver); signal_emit("server setup fill server", 2, conn, sserver); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/core/servers.c new/irssi-1.2.3/src/core/servers.c --- old/irssi-1.2.2/src/core/servers.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/core/servers.c 2021-04-08 16:11:17.000000000 +0200 @@ -206,7 +206,7 @@ const char *errmsg; char *errmsg2; char ipaddr[MAX_IP_LEN]; - int port; + int port = 0; g_return_if_fail(ip != NULL || unix_socket != NULL); @@ -219,12 +219,22 @@ own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4; port = server->connrec->proxy != NULL ? server->connrec->proxy_port : server->connrec->port; - handle = server->connrec->use_tls ? - net_connect_ip_ssl(ip, port, own_ip, server) : net_connect_ip(ip, port, own_ip); + handle = net_connect_ip(ip, port, own_ip); } else { handle = net_connect_unix(unix_socket); } + if (server->connrec->use_tls && handle != NULL) { + server->handle = net_sendbuffer_create(handle, 0); + handle = net_start_ssl(server); + if (handle == NULL) { + net_sendbuffer_destroy(server->handle, TRUE); + server->handle = NULL; + } else { + server->handle->handle = handle; + } + } + if (handle == NULL) { /* failed */ errmsg = g_strerror(errno); @@ -244,7 +254,8 @@ server_connect_failed(server, errmsg2 ? errmsg2 : errmsg); g_free(errmsg2); } else { - server->handle = net_sendbuffer_create(handle, 0); + if (!server->connrec->use_tls) + server->handle = net_sendbuffer_create(handle, 0); if (server->connrec->use_tls) server_connect_callback_init_ssl(server, handle); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/core/tls.h new/irssi-1.2.3/src/core/tls.h --- old/irssi-1.2.2/src/core/tls.h 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/core/tls.h 2021-04-08 23:13:50.000000000 +0200 @@ -21,8 +21,6 @@ #include <openssl/ssl.h> -#include <stdbool.h> - typedef struct _TLS_REC TLS_REC; typedef struct _TLS_CERT_REC TLS_CERT_REC; typedef struct _TLS_CERT_ENTRY_REC TLS_CERT_ENTRY_REC; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/core/write-buffer.c new/irssi-1.2.3/src/core/write-buffer.c --- old/irssi-1.2.2/src/core/write-buffer.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/core/write-buffer.c 2021-04-08 23:20:52.000000000 +0200 @@ -63,14 +63,14 @@ const char *cdata = data; int next_size; + if (size <= 0) + return size; + if (write_buffer_max_blocks <= 0) { /* no write buffer */ return write(handle, data, size); } - if (size <= 0) - return size; - rec = g_hash_table_lookup(buffers, GINT_TO_POINTER(handle)); if (rec == NULL) { rec = g_new0(BUFFER_REC, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-common/core/Makefile.am new/irssi-1.2.3/src/fe-common/core/Makefile.am --- old/irssi-1.2.2/src/fe-common/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-common/core/Makefile.am 2021-04-08 16:19:28.000000000 +0200 @@ -1,6 +1,7 @@ noinst_LIBRARIES = libfe_common_core.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-common/core/chat-completion.c new/irssi-1.2.3/src/fe-common/core/chat-completion.c --- old/irssi-1.2.2/src/fe-common/core/chat-completion.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-common/core/chat-completion.c 2021-04-08 23:30:27.000000000 +0200 @@ -1195,6 +1195,9 @@ g_return_if_fail(server != NULL); mserver = MODULE_DATA(server); + if (mserver == NULL) + return; + while (mserver->lastmsgs) last_msg_destroy(&mserver->lastmsgs, mserver->lastmsgs->data); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-common/core/windows-layout.c new/irssi-1.2.3/src/fe-common/core/windows-layout.c --- old/irssi-1.2.2/src/fe-common/core/windows-layout.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-common/core/windows-layout.c 2021-04-08 23:32:59.000000000 +0200 @@ -169,12 +169,12 @@ chat_protocol_find_id(item->chat_type); if (proto != NULL) iconfig_node_set_str(subnode, "chat_type", proto->name); - iconfig_node_set_str(subnode, "name", item->name); + iconfig_node_set_str(subnode, "name", item->visible_name); if (item->server != NULL) { iconfig_node_set_str(subnode, "tag", item->server->tag); if (IS_CHANNEL(item)) { - rec = window_bind_add(window, item->server->tag, item->name); + rec = window_bind_add(window, item->server->tag, item->visible_name); if (rec != NULL) rec->sticky = TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-common/irc/Makefile.am new/irssi-1.2.3/src/fe-common/irc/Makefile.am --- old/irssi-1.2.2/src/fe-common/irc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-common/irc/Makefile.am 2021-04-08 16:19:33.000000000 +0200 @@ -3,6 +3,7 @@ noinst_LIBRARIES = libfe_common_irc.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-common/irc/dcc/Makefile.am new/irssi-1.2.3/src/fe-common/irc/dcc/Makefile.am --- old/irssi-1.2.2/src/fe-common/irc/dcc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-common/irc/dcc/Makefile.am 2021-04-08 16:19:39.000000000 +0200 @@ -1,6 +1,7 @@ noinst_LIBRARIES = libfe_irc_dcc.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-common/irc/notifylist/Makefile.am new/irssi-1.2.3/src/fe-common/irc/notifylist/Makefile.am --- old/irssi-1.2.2/src/fe-common/irc/notifylist/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-common/irc/notifylist/Makefile.am 2021-04-08 16:19:45.000000000 +0200 @@ -1,6 +1,7 @@ noinst_LIBRARIES = libfe_irc_notifylist.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-fuzz/Makefile.am new/irssi-1.2.3/src/fe-fuzz/Makefile.am --- old/irssi-1.2.2/src/fe-fuzz/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-fuzz/Makefile.am 2021-04-08 16:19:50.000000000 +0200 @@ -6,6 +6,7 @@ CCLD=$(CXX) $(CXXFLAGS) AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-fuzz/fe-common/core/Makefile.am new/irssi-1.2.3/src/fe-fuzz/fe-common/core/Makefile.am --- old/irssi-1.2.2/src/fe-fuzz/fe-common/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-fuzz/fe-common/core/Makefile.am 2021-04-08 16:19:55.000000000 +0200 @@ -4,6 +4,7 @@ CCLD=$(CXX) $(CXXFLAGS) AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-fuzz/irc/core/Makefile.am new/irssi-1.2.3/src/fe-fuzz/irc/core/Makefile.am --- old/irssi-1.2.2/src/fe-fuzz/irc/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-fuzz/irc/core/Makefile.am 2021-04-08 16:20:02.000000000 +0200 @@ -4,6 +4,7 @@ CCLD=$(CXX) $(CXXFLAGS) AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-none/Makefile.am new/irssi-1.2.3/src/fe-none/Makefile.am --- old/irssi-1.2.2/src/fe-none/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-none/Makefile.am 2021-04-08 16:20:06.000000000 +0200 @@ -1,6 +1,7 @@ bin_PROGRAMS = botti AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-text/Makefile.am new/irssi-1.2.3/src/fe-text/Makefile.am --- old/irssi-1.2.2/src/fe-text/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-text/Makefile.am 2021-04-08 16:20:11.000000000 +0200 @@ -1,6 +1,7 @@ bin_PROGRAMS = irssi AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/fe-common/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-text/gui-entry.c new/irssi-1.2.3/src/fe-text/gui-entry.c --- old/irssi-1.2.2/src/fe-text/gui-entry.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-text/gui-entry.c 2021-04-08 23:40:51.000000000 +0200 @@ -654,7 +654,7 @@ if (chr == 0 || chr == 13 || chr == 10) return; /* never insert NUL, CR or LF characters */ - if (entry->utf8 && entry->pos == 0 && i_wcwidth(chr) == 0) + if (entry->utf8 && entry->pos == 0 && unichar_isprint(chr) && i_wcwidth(chr) == 0) return; gui_entry_redraw_from(entry, entry->pos); @@ -835,8 +835,8 @@ } if (entry->utf8) - while (entry->pos-size-w > 0 && - i_wcwidth(entry->text[entry->pos-size-w]) == 0) w++; + while (entry->pos > size + w && i_wcwidth(entry->text[entry->pos - size - w]) == 0) + w++; g_memmove(entry->text + entry->pos - size, entry->text + entry->pos, (entry->text_len-entry->pos+1) * sizeof(unichar)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-text/gui-printtext.c new/irssi-1.2.3/src/fe-text/gui-printtext.c --- old/irssi-1.2.2/src/fe-text/gui-printtext.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-text/gui-printtext.c 2021-04-08 15:54:05.000000000 +0200 @@ -30,6 +30,7 @@ #include "gui-printtext.h" #include "gui-windows.h" +/* Terminal indexed colour map */ int mirc_colors[] = { 15, 0, 1, 2, 12, 4, 5, 6, 14, 10, 3, 11, 9, 13, 8, 7, /* 16-27 */ 52, 94, 100, 58, 22, 29, 23, 24, 17, 54, 53, 89, /* 28-39 */ 88, 130, 142, 64, 28, 35, 30, 25, 18, 91, 90, 125, @@ -38,6 +39,17 @@ /* 64-75 */ 203, 215, 227, 191, 83, 122, 87, 111, 63, 177, 207, 205, /* 76-87 */ 217, 223, 229, 193, 157, 158, 159, 153, 147, 183, 219, 212, /* 88-98 */ 16, 233, 235, 237, 239, 241, 244, 247, 250, 254, 231, -1 }; + +/* RGB colour map */ +int mirc_colors24[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + /* 16-27 */ 0x470000, 0x472100, 0x474700, 0x324700, 0x004700, 0x00472c, 0x004747, 0x002747, 0x000047, 0x2e0047, 0x470047, 0x47002a, + /* 28-39 */ 0x740000, 0x743a00, 0x747400, 0x517400, 0x007400, 0x007449, 0x007474, 0x004074, 0x000074, 0x4b0074, 0x740074, 0x740045, + /* 40-51 */ 0xb50000, 0xb56300, 0xb5b500, 0x7db500, 0x00b500, 0x00b571, 0x00b5b5, 0x0063b5, 0x0000b5, 0x7500b5, 0xb500b5, 0xb5006b, + /* 52-63 */ 0xff0000, 0xff8c00, 0xffff00, 0xb2ff00, 0x00ff00, 0x00ffa0, 0x00ffff, 0x008cff, 0x0000ff, 0xa500ff, 0xff00ff, 0xff0098, + /* 64-75 */ 0xff5959, 0xffb459, 0xffff71, 0xcfff60, 0x6fff6f, 0x65ffc9, 0x6dffff, 0x59b4ff, 0x5959ff, 0xc459ff, 0xff66ff, 0xff59bc, + /* 76-87 */ 0xff9c9c, 0xffd39c, 0xffff9c, 0xe2ff9c, 0x9cff9c, 0x9cffdb, 0x9cffff, 0x9cd3ff, 0x9c9cff, 0xdc9cff, 0xff9cff, 0xff94d3, + /* 88-98 */ 0x000000, 0x131313, 0x282828, 0x363636, 0x4d4d4d, 0x656565, 0x818181, 0x9f9f9f, 0xbcbcbc, 0xe2e2e2, 0xffffff, -1 }; + static int scrollback_lines, scrollback_time, scrollback_burst_remove; static int next_xpos, next_ypos; @@ -202,28 +214,42 @@ } } -static void get_colors(int flags, int *fg, int *bg, int *attr) +static void get_colors(int *flags, int *fg, int *bg, int *attr) { *attr = 0; - if (flags & GUI_PRINT_FLAG_MIRC_COLOR) { + if (*flags & GUI_PRINT_FLAG_MIRC_COLOR) { /* mirc colors - extended colours proposal */ - if (*bg >= 0) { - *bg = mirc_colors[*bg % 100]; - flags &= ~GUI_PRINT_FLAG_COLOR_24_BG; - /* ignore mirc color 99 = -1 (reset) */ - if (*bg != -1 && settings_get_bool("mirc_blink_fix")) { - if (*bg < 16) /* ansi bit flip :-( */ - *bg = (*bg&8) | (*bg&4)>>2 | (*bg&2) | (*bg&1)<<2; - *bg = term_color256map[*bg&0xff] & 7; + gboolean use_24_map = FALSE; +#ifdef TERM_TRUECOLOR + use_24_map = settings_get_bool("colors_ansi_24bit"); +#endif + if (*bg >= 0) { + if (use_24_map && mirc_colors24[*bg % 100] != -1) { + *bg = mirc_colors24[*bg % 100]; + *flags |= GUI_PRINT_FLAG_COLOR_24_BG; + } else { + *bg = mirc_colors[*bg % 100]; + *flags &= ~GUI_PRINT_FLAG_COLOR_24_BG; + /* ignore mirc color 99 = -1 (reset) */ + if (*bg != -1 && settings_get_bool("mirc_blink_fix")) { + if (*bg < 16) /* ansi bit flip :-( */ + *bg = (*bg&8) | (*bg&4)>>2 | (*bg&2) | (*bg&1)<<2; + *bg = term_color256map[*bg&0xff] & 7; + } } } if (*fg >= 0) { - *fg = mirc_colors[*fg % 100]; - flags &= ~GUI_PRINT_FLAG_COLOR_24_FG; + if (use_24_map && mirc_colors24[*fg % 100] != -1) { + *fg = mirc_colors24[*fg % 100]; + *flags |= GUI_PRINT_FLAG_COLOR_24_FG; + } else { + *fg = mirc_colors[*fg % 100]; + *flags &= ~GUI_PRINT_FLAG_COLOR_24_FG; + } } } - if (flags & GUI_PRINT_FLAG_COLOR_24_FG) + if (*flags & GUI_PRINT_FLAG_COLOR_24_FG) *attr |= ATTR_FGCOLOR24; else if (*fg < 0 || *fg > 255) { *fg = -1; @@ -232,7 +258,7 @@ else *attr |= *fg; - if (flags & GUI_PRINT_FLAG_COLOR_24_BG) + if (*flags & GUI_PRINT_FLAG_COLOR_24_BG) *attr |= ATTR_BGCOLOR24; else if (*bg < 0 || *bg > 255) { *bg = -1; @@ -241,11 +267,11 @@ else *attr |= (*bg << BG_SHIFT); - if (flags & GUI_PRINT_FLAG_REVERSE) *attr |= ATTR_REVERSE; - if (flags & GUI_PRINT_FLAG_ITALIC) *attr |= ATTR_ITALIC; - if (flags & GUI_PRINT_FLAG_BOLD) *attr |= ATTR_BOLD; - if (flags & GUI_PRINT_FLAG_UNDERLINE) *attr |= ATTR_UNDERLINE; - if (flags & GUI_PRINT_FLAG_BLINK) *attr |= ATTR_BLINK; + if (*flags & GUI_PRINT_FLAG_REVERSE) *attr |= ATTR_REVERSE; + if (*flags & GUI_PRINT_FLAG_ITALIC) *attr |= ATTR_ITALIC; + if (*flags & GUI_PRINT_FLAG_BOLD) *attr |= ATTR_BOLD; + if (*flags & GUI_PRINT_FLAG_UNDERLINE) *attr |= ATTR_UNDERLINE; + if (*flags & GUI_PRINT_FLAG_BLINK) *attr |= ATTR_BLINK; } static void view_add_eol(TEXT_BUFFER_VIEW_REC *view, LINE_REC **line) @@ -286,7 +312,7 @@ flags = GPOINTER_TO_INT(pflags); fg = GPOINTER_TO_INT(fgcolor); bg = GPOINTER_TO_INT(bgcolor); - get_colors(flags, &fg, &bg, &attr); + get_colors(&flags, &fg, &bg, &attr); if (window == NULL) { print_text_no_window(flags, fg, bg, attr, str); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-text/term-terminfo.c new/irssi-1.2.3/src/fe-text/term-terminfo.c --- old/irssi-1.2.2/src/fe-text/term-terminfo.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-text/term-terminfo.c 2021-04-08 16:03:01.000000000 +0200 @@ -672,7 +672,11 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-text/terminfo-core.c new/irssi-1.2.3/src/fe-text/terminfo-core.c --- old/irssi-1.2.2/src/fe-text/terminfo-core.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-text/terminfo-core.c 2021-04-08 16:42:39.000000000 +0200 @@ -12,6 +12,9 @@ return fputc(c, current_term->out); } +#ifdef HAVE_TERM_H +#include <term.h> +#else /* Don't bother including curses.h because of these - they might not even be defined there */ char *tparm(); @@ -21,6 +24,8 @@ char *tigetstr(); int tigetnum(); int tigetflag(); +#endif + #define term_getstr(x, buffer) tigetstr(x.ti_name) #define term_getnum(x) tigetnum(x.ti_name); #define term_getflag(x) tigetflag(x.ti_name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-text/textbuffer-view.c new/irssi-1.2.3/src/fe-text/textbuffer-view.c --- old/irssi-1.2.2/src/fe-text/textbuffer-view.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-text/textbuffer-view.c 2021-04-08 16:00:20.000000000 +0200 @@ -1204,14 +1204,14 @@ LINE_REC *prevline; prevline = view->buffer->first_line == line ? NULL : - textbuffer_line_last(view->buffer); + textbuffer_line_last(view->buffer)->prev; view->cache->last_linecount = prevline == NULL ? 0 : view_get_linecount(view, prevline); } + /* first line in the buffer - this is the most commonly + removed line.. */ if (view->buffer->first_line == line) { - /* first line in the buffer - this is the most commonly - removed line.. */ if (view->bottom_startline == line) { /* very small scrollback.. */ view->bottom_startline = view->bottom_startline->next; @@ -1288,6 +1288,11 @@ } textbuffer_remove(view->buffer, line); + if (view->bottom_startline == NULL) { + /* We may have removed the bottom_startline, make sure + that scroll doesn't get stuck */ + textbuffer_view_init_bottom(view); + } } void textbuffer_view_remove_lines_by_level(TEXT_BUFFER_VIEW_REC *view, int level) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/fe-text/textbuffer.c new/irssi-1.2.3/src/fe-text/textbuffer.c --- old/irssi-1.2.2/src/fe-text/textbuffer.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/fe-text/textbuffer.c 2021-04-08 17:27:56.000000000 +0200 @@ -450,8 +450,9 @@ g_return_if_fail(line != NULL); g_return_if_fail(str != NULL); - g_string_truncate(str, 0); + g_string_truncate(str, 0); + g_return_if_fail(line->text != NULL); for (ptr = line->text;;) { if (*ptr != 0) { g_string_append_c(str, (char) *ptr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/core/Makefile.am new/irssi-1.2.3/src/irc/core/Makefile.am --- old/irssi-1.2.2/src/irc/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/core/Makefile.am 2021-04-08 16:20:16.000000000 +0200 @@ -1,6 +1,7 @@ noinst_LIBRARIES = libirc_core.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/core/irc-cap.c new/irssi-1.2.3/src/irc/core/irc-cap.c --- old/irssi-1.2.2/src/irc/core/irc-cap.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/core/irc-cap.c 2021-04-08 23:49:19.000000000 +0200 @@ -131,6 +131,7 @@ /* Malformed request, terminate the negotiation */ else { irc_cap_finish_negotiation(server); + g_free(params); g_warn_if_reached(); return; } @@ -220,7 +221,7 @@ if (disable) server->cap_active = gslist_delete_string(server->cap_active, caps[i] + 1, g_free); - else + else if (!gslist_find_string(server->cap_active, caps[i])) server->cap_active = g_slist_prepend(server->cap_active, g_strdup(caps[i])); if (!strcmp(caps[i], "sasl")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/core/irc-servers.c new/irssi-1.2.3/src/irc/core/irc-servers.c --- old/irssi-1.2.2/src/irc/core/irc-servers.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/core/irc-servers.c 2021-04-08 23:46:46.000000000 +0200 @@ -451,7 +451,11 @@ gslist_free_full(server->cap_queue, (GDestroyNotify) g_free); server->cap_queue = NULL; - g_free_and_null(server->sasl_buffer); + /* was g_free_and_null, but can't use on a GString */ + if (server->sasl_buffer != NULL) { + g_string_free(server->sasl_buffer, TRUE); + server->sasl_buffer = NULL; + } /* these are dynamically allocated only if isupport was sent */ g_hash_table_foreach(server->isupport, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/core/massjoin.c new/irssi-1.2.3/src/irc/core/massjoin.c --- old/irssi-1.2.2/src/irc/core/massjoin.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/core/massjoin.c 2021-04-08 23:56:11.000000000 +0200 @@ -66,6 +66,11 @@ /* add user to nicklist */ nickrec = irc_nicklist_insert(chanrec, nick, FALSE, FALSE, FALSE, TRUE, NULL); + if (nickrec == NULL) { + /* invalid nick? */ + return; + } + nicklist_set_host(CHANNEL(chanrec), nickrec, address); if (chanrec->massjoins == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/core/sasl.c new/irssi-1.2.3/src/irc/core/sasl.c --- old/irssi-1.2.2/src/irc/core/sasl.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/core/sasl.c 2021-04-08 23:06:33.000000000 +0200 @@ -158,6 +158,7 @@ * Fail authentication with this server. They have sent too much data. */ if (enc_req->len > AUTHENTICATE_MAX_SIZE) { + g_string_free(enc_req, TRUE); return FALSE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/dcc/Makefile.am new/irssi-1.2.3/src/irc/dcc/Makefile.am --- old/irssi-1.2.2/src/irc/dcc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/dcc/Makefile.am 2021-04-08 16:20:20.000000000 +0200 @@ -1,6 +1,7 @@ noinst_LIBRARIES = libirc_dcc.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/dcc/dcc-get.c new/irssi-1.2.3/src/irc/dcc/dcc-get.c --- old/irssi-1.2.2/src/irc/dcc/dcc-get.c 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/dcc/dcc-get.c 2021-04-08 23:18:34.000000000 +0200 @@ -178,6 +178,7 @@ return; } dcc->transfd += ret; + break; } /* send number of total bytes received */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/flood/Makefile.am new/irssi-1.2.3/src/irc/flood/Makefile.am --- old/irssi-1.2.2/src/irc/flood/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/flood/Makefile.am 2021-04-08 16:20:25.000000000 +0200 @@ -1,6 +1,7 @@ noinst_LIBRARIES = libirc_flood.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/notifylist/Makefile.am new/irssi-1.2.3/src/irc/notifylist/Makefile.am --- old/irssi-1.2.2/src/irc/notifylist/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/notifylist/Makefile.am 2021-04-08 16:20:29.000000000 +0200 @@ -1,6 +1,7 @@ noinst_LIBRARIES = libirc_notifylist.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/irc/proxy/Makefile.am new/irssi-1.2.3/src/irc/proxy/Makefile.am --- old/irssi-1.2.2/src/irc/proxy/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/irc/proxy/Makefile.am 2021-04-08 16:20:34.000000000 +0200 @@ -2,6 +2,7 @@ module_LTLIBRARIES = libirc_proxy.la AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/lib-config/Makefile.am new/irssi-1.2.3/src/lib-config/Makefile.am --- old/irssi-1.2.2/src/lib-config/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/lib-config/Makefile.am 2021-04-08 16:20:38.000000000 +0200 @@ -1,6 +1,7 @@ noinst_LIBRARIES = libirssi_config.a AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ $(GLIB_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/otr/Makefile.am new/irssi-1.2.3/src/otr/Makefile.am --- old/irssi-1.2.2/src/otr/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/otr/Makefile.am 2021-04-08 16:20:44.000000000 +0200 @@ -8,6 +8,7 @@ libotr_core_static.la AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/src/perl/Makefile.am new/irssi-1.2.3/src/perl/Makefile.am --- old/irssi-1.2.2/src/perl/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/src/perl/Makefile.am 2021-04-08 16:20:54.000000000 +0200 @@ -15,6 +15,8 @@ perl-signals.lo: perl-signals-list.h AM_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ -I$(top_srcdir)/src/fe-common/core \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/tests/fe-common/core/Makefile.am new/irssi-1.2.3/tests/fe-common/core/Makefile.am --- old/irssi-1.2.2/tests/fe-common/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/tests/fe-common/core/Makefile.am 2021-04-08 16:21:00.000000000 +0200 @@ -3,6 +3,7 @@ PACKAGE_STRING=fe-common/core AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ $(GLIB_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/tests/fe-text/Makefile.am new/irssi-1.2.3/tests/fe-text/Makefile.am --- old/irssi-1.2.2/tests/fe-text/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/tests/fe-text/Makefile.am 2021-04-08 16:21:05.000000000 +0200 @@ -3,6 +3,7 @@ PACKAGE_STRING=fe-text AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ -I$(top_srcdir)/src/fe-common/core \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/tests/irc/core/Makefile.am new/irssi-1.2.3/tests/irc/core/Makefile.am --- old/irssi-1.2.2/tests/irc/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/tests/irc/core/Makefile.am 2021-04-08 16:21:10.000000000 +0200 @@ -3,6 +3,7 @@ PACKAGE_STRING=irc/core AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/tests/irc/flood/Makefile.am new/irssi-1.2.3/tests/irc/flood/Makefile.am --- old/irssi-1.2.2/tests/irc/flood/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ new/irssi-1.2.3/tests/irc/flood/Makefile.am 2021-04-08 16:21:14.000000000 +0200 @@ -3,6 +3,7 @@ PACKAGE_STRING=irc/flood AM_CPPFLAGS = \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/irssi-1.2.2/themes/colorless.theme new/irssi-1.2.3/themes/colorless.theme --- old/irssi-1.2.2/themes/colorless.theme 2019-08-29 15:48:43.000000000 +0200 +++ new/irssi-1.2.3/themes/colorless.theme 2021-04-08 16:05:39.000000000 +0200 @@ -251,6 +251,7 @@ # default background for all statusbars. You can also give # the default foreground color for statusbar items. sb_background = "%8"; + window_border = "%8"; # default backround for "default" statusbar group #sb_default_bg = "%8";
