Hello community,
here is the log from the commit of package irssi for openSUSE:Factory checked in at 2019-01-10 15:23:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/irssi (Old)
and /work/SRC/openSUSE:Factory/.irssi.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irssi"
Thu Jan 10 15:23:49 2019 rev:52 rq:664343 version:1.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2018-02-16 21:44:30.915427529 +0100
+++ /work/SRC/openSUSE:Factory/.irssi.new.28833/irssi.changes 2019-01-10 15:23:51.586298270 +0100
@@ -1,0 +2,23 @@
+Wed Jan 9 13:29:11 UTC 2019 - Ailin Nemui
+
+- update to 1.1.2
+ - Fix the resetting of window hiddenlevel (#861)
+ - Fix clearing of hidelevel in layout (#951)
+ - Fix accessing unallocated text when checking entry position
+ (#930)
+ - Fix uninitialised memory on empty lines (#873, GL#31, #878,
+ #877, #907, #914)
+ - Fix use-after-free on expiration of hidden lines (#948)
+ (CVE-2019-5882 boo#1121396)
+ - Fix use-after-frees. By Maya Rashish (#919)
+ - Fix out of bounds access in help display when window width
+ is small (#949)
+ - Fix paste_join_multiline (#971)
+ - Correctly check for errno when displaying SSL errors. By
+ Janik Rabe (#895)
+ - Fix wrong signal emission argument count (#965)
+ - Documentation (#920). Sync NEWS, scripts (#849)
+ - Fix Perl detection on MacOS. By Dominyk Tiller (#927)
+ - Misc fixes. By Jaroslav Škarvada (#982)
+
+-------------------------------------------------------------------
Old:
----
irssi-1.1.1.tar.xz
irssi-1.1.1.tar.xz.asc
New:
----
irssi-1.1.2.tar.xz
irssi-1.1.2.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ irssi.spec ++++++
--- /var/tmp/diff_new_pack.Vyo5YI/_old 2019-01-10 15:23:52.086297753 +0100
+++ /var/tmp/diff_new_pack.Vyo5YI/_new 2019-01-10 15:23:52.086297753 +0100
@@ -1,7 +1,7 @@
#
# spec file for package irssi
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,20 +12,20 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%bcond_with socks
Name: irssi
-Version: 1.1.1
+Version: 1.1.2
Release: 0
#
Summary: Modular, Secure, and Well Designed IRC Client
#
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Productivity/Networking/IRC
-Url: http://www.irssi.org
+URL: http://www.irssi.org
Source: https://github.com/irssi/irssi/releases/download/%{version}/irssi-%{version}.tar.xz
Source1: irssi.desktop
Source2: irssi.png
@@ -132,7 +132,7 @@
%dir %{_defaultdocdir}/irssi
%docdir %{_defaultdocdir}/irssi/
%doc %{_defaultdocdir}/irssi/*
-%{_mandir}/man1/*.1%{ext_man}
+%{_mandir}/man1/*.1%{?ext_man}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/irssi.png
++++++ irssi-1.1.1.tar.xz -> irssi-1.1.2.tar.xz ++++++
++++ 7481 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.1.1/ChangeLog new/irssi-1.1.2/ChangeLog
--- old/irssi-1.1.1/ChangeLog 2018-02-15 01:05:25.000000000 +0100
+++ new/irssi-1.1.2/ChangeLog 2019-01-08 21:50:39.000000000 +0100
@@ -1,3 +1,153 @@
+commit 7bf94c28a0a8c6be8ec5840f09a5b5d343f42374
+Author: ailin-nemui
+Date: Tue Jan 8 21:46:17 2019 +0100
+
+ tag as 1.1.2
+
+commit 7616687f6a211e8dac7308e05be99d80357c0a73
+Author: ailin-nemui
+Date: Tue Oct 2 00:09:01 2018 +0200
+
+ Merge pull request #949 from ailin-nemui/help-narrow
+
+ Fix insufficient size of help column when the window width is small
+
+ (cherry picked from commit f207e844f1299933b6e508c54804e27f42844547)
+
+commit eab3608651016936335f85c896faf0b3312e5be7
+Author: ailin-nemui
+Date: Tue Oct 2 00:08:30 2018 +0200
+
+ Merge pull request #948 from ailin-nemui/invalid-startline
+
+ invalidate startline and bottom_startline when hidden
+
+ (cherry picked from commit 011372ecdd966531c1fd6638a3c5b239c27112ed)
+
+commit 33dcf7a337df5af14df13567618c822e2043ee0a
+Author: ailin-nemui
+Date: Tue Sep 4 09:35:47 2018 +0200
+
+ Merge pull request #919 from ailin-nemui/uafs
+
+ Use-after-frees
+
+ (cherry picked from commit afb3daaf65095447f0b0ce64f68363f6f17dcd34)
+
+commit dccab4c5f83605f92f8b17678b6d4931ae80f5b3
+Author: ailin-nemui
+Date: Tue Jan 8 21:39:35 2019 +0100
+
+ Merge pull request #971 from ailin-nemui/paste-join-lines
+
+ fix paste_join_multiline
+
+ (cherry picked from commit 257cb2f5f91cbc08b20199f92a5d1923bc5ca4f2)
+
+commit acdfeb216a4af9248e3c2ce922978f3485cc4f6c
+Author: LemonBoy
+Date: Tue Jul 24 09:38:02 2018 +0200
+
+ Merge pull request #895 from janikrabe/master
+
+ Keep errstr set to NULL if errno is not set
+
+ (cherry picked from commit 88f77cb6f8fbbd553dfe45db9aede8a6d8905b49)
+
+commit ad4faa77e4ca7ee1caf71f3222fab97c3f323d16
+Author: ailin-nemui
+Date: Tue Sep 4 09:37:10 2018 +0200
+
+ Merge pull request #914 from ailin-nemui/textbuffer_lineinfo
+
+ properly record line info on empty lines
+
+ (cherry picked from commit e5759a7fb708fe461a35bf3bf37852cfbbaa2498)
+
+commit bc7dac6d7c28cf21ba5ad3a65298dbd29910c167
+Author: ailin-nemui
+Date: Tue Dec 18 16:57:36 2018 +0100
+
+ Merge pull request #982 from yarda/coverity
+
+ Fixed problem found by Coverity Scan
+
+ (cherry picked from commit c044fe397e1c235d91361bc60a74e6d2839f0237)
+
+commit a98bb2009d5c8d0a06e46c4a5bc737f3a48ce5ba
+Author: ailin-nemui
+Date: Tue Sep 4 09:34:14 2018 +0200
+
+ Merge pull request #927 from DomT4/perl_mojave
+
+ configure: fix Perl detection on macOS Mojave
+ (cherry picked from commit 0346638547adb63f5a1d9c74be0c77106ad6cfa9)
+
+commit 0f978ce28eae85449b740e33ee4bc623a5101515
+Author: ailin-nemui
+Date: Fri Feb 23 00:28:47 2018 +0100
+
+ run syncscripts.sh
+
+commit d50fe73c4ed9004e67d3c9edbf24b0f386eba453
+Author: ailin-nemui
+Date: Thu Feb 15 19:46:32 2018 +0100
+
+ Merge pull request #849 from ailin-nemui/news-update
+
+ add additional notes to NEWS
+
+ (cherry picked from commit a72e706667e963a013ca8c8fd02af1c74ffbd40d)
+
+commit 85320f106c325b50e402d13a00d9636e047ebe13
+Author: ailin-nemui
+Date: Tue Sep 4 09:35:32 2018 +0200
+
+ Merge pull request #920 from irssi/ailin-nemui-urchlay
+
+ Add information about crash on unload to perl.txt
+
+ (cherry picked from commit 735730299385c6e9173f1f46e7f8d529634dd1fa)
+
+commit 1e88d4631ec295774af71942727550c3d8228df1
+Author: ailin-nemui
+Date: Fri Oct 19 02:08:08 2018 +0200
+
+ Merge pull request #965 from ailin-nemui/fix-signal-emit
+
+ Fix wrong signal emission arg count
+
+ (cherry picked from commit 524f31b026051a9692b8978d5013f9e43efcfa82)
+
+commit 2d803ddd66f607d19737cf35dfd19d2681249d8b
+Author: ailin-nemui
+Date: Thu Sep 20 17:37:50 2018 +0200
+
+ Merge pull request #930 from ailin-nemui/fix-928
+
+ fix accessing unallocated text when checking entry position
+
+ (cherry picked from commit 708ba06dbc30dcec99cf057a1f36fc9857308b72)
+
+commit 5216d091c92c2a4afc869d700381528375e9f9c8
+Author: ailin-nemui
+Date: Fri Oct 5 10:47:12 2018 +0200
+
+ Merge pull request #951 from dwfreed/patch-1
+
+ fe-text: clear hidelevel in layout if default
+ (cherry picked from commit b96a41cf3daff342ae04fa59d8f2c903dffe0f2b)
+
+commit 7b637e87557adb6633c2554c8ae3641667229edd
+Author: ailin-nemui
+Date: Thu Mar 15 17:23:40 2018 +0100
+
+ Merge pull request #861 from ailin-nemui/stay-hidden
+
+ in fact hidden levels should not be re-set when you run /set
+
+ (cherry picked from commit 3f217ae14951afac8a98ec7bb1a497b3a1c0cf8b)
+
commit 8cec161a8f252fd8d57677eb961ffd87987b9d30
Author: ailin-nemui
Date: Tue Feb 13 12:56:25 2018 +0100
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.1.1/NEWS new/irssi-1.1.2/NEWS
--- old/irssi-1.1.1/NEWS 2018-02-15 01:03:35.000000000 +0100
+++ new/irssi-1.1.2/NEWS 2019-01-08 21:50:01.000000000 +0100
@@ -1,3 +1,22 @@
+v1.1.2 2019-01-09 The Irssi team
+ - Fix the resetting of window hiddenlevel (#861)
+ - Fix clearing of hidelevel in layout (#951)
+ - Fix accessing unallocated text when checking entry position
+ (#930)
+ - Fix uninitialised memory on empty lines (#873, GL#31, #878,
+ #877, #907, #914)
+ - Fix use-after-free on expiration of hidden lines (#948)
+ - Fix use-after-frees. By Maya Rashish (#919)
+ - Fix out of bounds access in help display when window width
+ is small (#949)
+ - Fix paste_join_multiline (#971)
+ - Correctly check for errno when displaying SSL errors. By
+ Janik Rabe (#895)
+ - Fix wrong signal emission argument count (#965)
+ - Documentation (#920). Sync NEWS, scripts (#849)
+ - Fix Perl detection on MacOS. By Dominyk Tiller (#927)
+ - Misc fixes. By Jaroslav Škarvada (#982)
+
v1.1.1 2018-02-15 The Irssi team
! Contains all changes from 1.0.7
- Restore compatibility with OpenSSL < 1.0.2 (#820, #831)
@@ -25,6 +44,9 @@
- Minor help correction. By William Jackson (#834).
v1.1.0 2018-01-15 The Irssi team
+ ! Warning. Irssi is broken and will crash with OpenSSL < 1.0.2
+ due to openssl/openssl commit
+ 5b4b9ce976fce09a7a92e2f25b91a1635cb840fe
* Colour is now re-set when reaching a comma, matching mIRC
behaviour (#742, #740, #790)
* Irssi now shows the initial nick and name on first start
@@ -104,6 +126,9 @@
- Fix space issue in glib-2.0.m4 (#621)
v1.0.6 2018-01-07 The Irssi team
+ ! Note: Code and aliases using `$($'-like constructs are no
+ longer supported due to issue GL#18. Sorry about the
+ inconvenience.
- Fix invalid memory access when reading hilight configuration
(#787, #788).
- Fix null pointer dereference when the channel topic is set
@@ -147,6 +172,7 @@
- Minor help update (#729).
v1.0.3 2017-06-06 The Irssi team
+ ! Regression info in 1.0.3: #716 Warnings on start up: invalid time '-1'
- Fix out of bounds read when scanning expandos (GL!11).
- Fix invalid memory access with quoted filenames in DCC
(GL#8, GL!12).
@@ -165,6 +191,7 @@
- Minor typo correction in help. By Michael Hansen (#707).
v1.0.2 2017-03-10 The Irssi team
+ ! Warning. Irssi is broken on GLib 2.46 (bgo#755496)
- Prevent some null-pointer crashes (GL!9).
- Fix compilation with OpenSSL 1.1.0 (#628, #597).
- Correct dereferencing of already freed server objects during
@@ -303,6 +330,8 @@
Quarkslab.
v0.8.19 2016-03-23 The Irssi team
+ ! If your cursor keys stopped working, try this first: `/bind
+ meta-O key meta2'
- Fixed regression when joining and parting channels on IRCnet (#435)
- Fixed SASL EXTERNAL. By Mantas Mikulėnas (grawity, #432)
- Fixed regression when not using SASL (#438)
@@ -318,11 +347,15 @@
v0.8.18 2016-02-13 The Irssi team
* Modules will now require to define a
+
void MODULENAME ## _abicheck(int *version)
+
method to ensure that they are compiled against the correct Irssi
version.
* The signature of "message private" has been changed to
+
5: server, message, nick, address, target
+
in order to support "self messages". Module authors should
implement this change if they are using this signal.
* Removing networks will now remove all attached servers and channels
@@ -335,12 +368,14 @@
effect for anyone given that it has been unsupported for several years.
+ CAP SASL PLAIN login is now supported natively.
+ Paste bracket markers can be requested from terminal with
+
/set paste_use_bracketed_mode on
+
+ "Self messages" generated by some bouncers can now be received in the
proper window.
+ Try to split long lines on spaces to avoid words being splitted. Adds
- a new option: 'split_line_on_space' which defaults to on.
- + Add setting hilight_nick_matches_everywhere (#56).
+ a new option: `split_line_on_space' which defaults to on.
+ + Add setting `hilight_nick_matches_everywhere' (#56).
+ The config parser is more robust and prints out better diagnostics on
incorrect config files.
+ Ctrl+^ (FS#721) and Ctrl+J can now be bound.
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.1.1/build-aux/compile new/irssi-1.1.2/build-aux/compile
--- old/irssi-1.1.1/build-aux/compile 2018-02-15 01:05:32.000000000 +0100
+++ new/irssi-1.1.2/build-aux/compile 2019-01-08 21:50:46.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# along with this program. If not, see https://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -340,7 +340,7 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
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.1.1/build-aux/missing new/irssi-1.1.2/build-aux/missing
--- old/irssi-1.1.1/build-aux/missing 2018-02-15 01:05:32.000000000 +0100
+++ new/irssi-1.1.2/build-aux/missing 2019-01-08 21:50:46.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# along with this program. If not, see https://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,7 +207,7 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
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.1.1/build-aux/test-driver new/irssi-1.1.2/build-aux/test-driver
--- old/irssi-1.1.1/build-aux/test-driver 2018-02-15 01:05:32.000000000 +0100
+++ new/irssi-1.1.2/build-aux/test-driver 2019-01-08 21:50:47.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-2018 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
@@ -16,7 +16,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# along with this program. If not, see https://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -145,7 +145,7 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
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.1.1/configure.ac new/irssi-1.1.2/configure.ac
--- old/irssi-1.1.1/configure.ac 2018-02-15 01:04:21.000000000 +0100
+++ new/irssi-1.1.2/configure.ac 2019-01-08 21:50:01.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.1.1)
+AC_INIT(irssi, 1.1.2)
AC_CONFIG_SRCDIR([src])
AC_CONFIG_AUX_DIR(build-aux)
AC_PREREQ(2.50)
@@ -373,8 +373,8 @@
dnl * fix those command line options a bit so GCC won't
dnl * complain about them. Normally there's only few options
dnl * that we want to keep:
- dnl * -Ddefine -Uundef -I/path -fopt -mopt
- PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIfm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'`
+ dnl * -Ddefine -Uundef -I/path -fopt -mopt -iwithsysroot
+ PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIifm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'`
PERL_EXTRA_OPTS="CCCDLFLAGS=\"-fPIC\""
AC_SUBST(PERL_EXTRA_OPTS)
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.1.1/docs/perl.txt new/irssi-1.1.2/docs/perl.txt
--- old/irssi-1.1.1/docs/perl.txt 2018-02-03 19:58:58.000000000 +0100
+++ new/irssi-1.1.2/docs/perl.txt 2019-01-08 21:47:45.000000000 +0100
@@ -1192,6 +1192,7 @@
Bugs and Limitations
--------------------
* Calling die in 'script error' handler causes segfault (#101)
+* Calling "script unload" from your own script causes segfault
* Storing and later using any Irssi object may result in use-after-free related crash
- Workaround: always acquire fresh objects
* Calling $dcc->close from the "dcc created" signal will cause unstable behaviour and crashes (#386)
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.1.1/irssi-config.h new/irssi-1.1.2/irssi-config.h
--- old/irssi-1.1.1/irssi-config.h 2018-02-15 01:05:36.000000000 +0100
+++ new/irssi-1.1.2/irssi-config.h 2019-01-08 21:50:52.000000000 +0100
@@ -26,7 +26,7 @@
/* #undef HAVE_SOCKS_H */
/* */
-/* #undef HAVE_STATIC_PERL */
+#define HAVE_STATIC_PERL 1
/* Define to 1 if you have the header file. */
#define HAVE_STDINT_H 1
@@ -74,7 +74,7 @@
#define PACKAGE_NAME "irssi"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "irssi 1.1.1"
+#define PACKAGE_STRING "irssi 1.1.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "irssi"
@@ -83,7 +83,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.1"
+#define PACKAGE_VERSION "1.1.2"
/* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */
#define PRIuUOFF_T "lu"
@@ -104,7 +104,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.1.1/irssi-version.h new/irssi-1.1.2/irssi-version.h
--- old/irssi-1.1.1/irssi-version.h 2018-02-15 01:05:37.000000000 +0100
+++ new/irssi-1.1.2/irssi-version.h 2019-01-08 21:51:46.000000000 +0100
@@ -1,2 +1,2 @@
-#define IRSSI_VERSION_DATE 20180213
-#define IRSSI_VERSION_TIME 1256
+#define IRSSI_VERSION_DATE 20190108
+#define IRSSI_VERSION_TIME 2146
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.1.1/scripts/scriptassist.pl new/irssi-1.1.2/scripts/scriptassist.pl
--- old/irssi-1.1.1/scripts/scriptassist.pl 2018-02-03 19:58:58.000000000 +0100
+++ new/irssi-1.1.2/scripts/scriptassist.pl 2019-01-08 21:47:45.000000000 +0100
@@ -5,7 +5,7 @@
use strict;
-our $VERSION = '2003020804';
+our $VERSION = '2003020806';
our %IRSSI = (
authors => 'Stefan \'tommie\' Tomanek',
contact => 'stefan@pico.ruhr.de',
@@ -315,6 +315,7 @@
my $xml = get_scripts();
foreach (sort {$xml->{$b}{last_modified} cmp $xml->{$a}{last_modified}} keys %$xml) {
my %entry = %{ $xml->{$_} };
+ next if $entry{HIDDEN};
$result->{$_} = \%entry;
$num--;
last unless $num;
@@ -390,6 +391,7 @@
my %result;
foreach (sort keys %{$database}) {
my %entry = %{$database->{$_}};
+ next if $entry{HIDDEN};
my $string = $_." ";
$string .= $entry{description} if defined $entry{description};
if ($string =~ /$query/i) {
@@ -1051,7 +1053,7 @@
my $dir = Irssi::get_irssi_dir()."/scripts/";
mkdir $dir."autorun/" unless (-e $dir."autorun/");
return unless (-e $dir.$plname);
- if (check_autorun($sname)) {
+ if (-e $dir."/autorun/".$plname) {
if (readlink($dir."/autorun/".$plname) eq "../".$plname) {
if (unlink($dir."/autorun/".$plname)) {
print CLIENTCRAP "%R>>%n Autorun of ".$sname." disabled";
@@ -1062,8 +1064,11 @@
print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$plname." is not a correct link";
}
} else {
- symlink("../".$plname, $dir."/autorun/".$plname);
- print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
+ if (symlink("../".$plname, $dir."/autorun/".$plname)) {
+ print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
+ } else {
+ print CLIENTCRAP "%R>>%n Unable to create autorun link";
+ }
}
}
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.1.1/src/core/commands.c new/irssi-1.1.2/src/core/commands.c
--- old/irssi-1.1.1/src/core/commands.c 2018-02-06 14:50:10.000000000 +0100
+++ new/irssi-1.1.2/src/core/commands.c 2019-01-08 21:47:45.000000000 +0100
@@ -305,7 +305,7 @@
if (*data == '\0') {
/* no subcommand given - list the subcommands */
- signal_emit("list subcommands", 2, cmd);
+ signal_emit("list subcommands", 1, cmd);
return;
}
@@ -891,7 +891,7 @@
if (rec != NULL && !cmd_protocol_match(rec, server)) {
g_free(orig);
- signal_emit("error command", 2,
+ signal_emit("error command", 1,
GINT_TO_POINTER(server == NULL ?
CMDERR_NOT_CONNECTED :
CMDERR_ILLEGAL_PROTO));
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.1.1/src/core/modules.c new/irssi-1.1.2/src/core/modules.c
--- old/irssi-1.1.1/src/core/modules.c 2018-02-03 19:58:58.000000000 +0100
+++ new/irssi-1.1.2/src/core/modules.c 2019-01-08 21:47:45.000000000 +0100
@@ -288,9 +288,10 @@
g_hash_table_foreach(stridlookup, (GHFunc) uniq_get_modules, &list);
while (list != NULL) {
+ void *tmp = list->data;
module_uniq_destroy(list->data);
- g_free(list->data);
list = g_slist_remove(list, list->data);
+ g_free(tmp);
}
g_hash_table_destroy(idlookup);
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.1.1/src/core/network-openssl.c new/irssi-1.1.2/src/core/network-openssl.c
--- old/irssi-1.1.1/src/core/network-openssl.c 2018-02-15 00:53:44.000000000 +0100
+++ new/irssi-1.1.2/src/core/network-openssl.c 2019-01-08 21:50:01.000000000 +0100
@@ -840,7 +840,7 @@
return -1;
case SSL_ERROR_SYSCALL:
errstr = ERR_reason_error_string(ERR_get_error());
- if (errstr == NULL && ret == -1)
+ if (errstr == NULL && ret == -1 && errno)
errstr = strerror(errno);
g_warning("SSL handshake failed: %s", errstr != NULL ? errstr : "server closed connection unexpectedly");
return -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.1.1/src/core/rawlog.c new/irssi-1.1.2/src/core/rawlog.c
--- old/irssi-1.1.1/src/core/rawlog.c 2018-02-15 00:50:34.000000000 +0100
+++ new/irssi-1.1.2/src/core/rawlog.c 2019-01-08 21:50:01.000000000 +0100
@@ -64,9 +64,10 @@
if (rawlog->nlines < rawlog_lines || rawlog_lines <= 2)
rawlog->nlines++;
else {
- g_free(rawlog->lines->data);
+ void *tmp = rawlog->lines->data;
rawlog->lines = g_slist_remove(rawlog->lines,
rawlog->lines->data);
+ g_free(tmp);
}
if (rawlog->logging) {
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.1.1/src/core/special-vars.c new/irssi-1.1.2/src/core/special-vars.c
--- old/irssi-1.1.1/src/core/special-vars.c 2018-02-15 00:59:22.000000000 +0100
+++ new/irssi-1.1.2/src/core/special-vars.c 2019-01-08 21:50:01.000000000 +0100
@@ -611,8 +611,8 @@
/* FIXME: window item would need reference counting as well,
eg. "/EVAL win close;say hello" wouldn't work now.. */
- g_free(ret);
commands = g_slist_remove(commands, commands->data);
+ g_free(ret);
}
g_free(orig);
}
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.1.1/src/fe-common/core/fe-help.c new/irssi-1.1.2/src/fe-common/core/fe-help.c
--- old/irssi-1.1.1/src/fe-common/core/fe-help.c 2018-02-03 19:58:58.000000000 +0100
+++ new/irssi-1.1.2/src/fe-common/core/fe-help.c 2019-01-08 21:47:45.000000000 +0100
@@ -77,7 +77,12 @@
max_width, 6, 1, 3, &columns, &rows);
cmdlist = columns_sort_list(cmdlist, rows);
- /* rows in last column */
+ /* if the screen is too narrow the window width may be not
+ enough for even 1 column */
+ if (cols == 1 && columns[0] > max_width)
+ max_width = columns[0];
+
+ /* rows in last column */
last_col_rows = rows-(cols*rows-g_slist_length(cmdlist));
if (last_col_rows == 0)
last_col_rows = rows;
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.1.1/src/fe-common/core/formats.c new/irssi-1.1.2/src/fe-common/core/formats.c
--- old/irssi-1.1.1/src/fe-common/core/formats.c 2018-02-15 00:59:22.000000000 +0100
+++ new/irssi-1.1.2/src/fe-common/core/formats.c 2019-01-08 21:50:01.000000000 +0100
@@ -1230,6 +1230,13 @@
dup = str = g_strdup(text);
flags = 0; fgcolor = theme->default_color; bgcolor = -1;
+
+ if (*str == '\0') {
+ /* empty line, write line info only */
+ signal_emit_id(signal_gui_print_text, 6, dest->window, GINT_TO_POINTER(fgcolor),
+ GINT_TO_POINTER(bgcolor), GINT_TO_POINTER(flags), str, dest);
+ }
+
while (*str != '\0') {
type = '\0';
for (ptr = str; *ptr != '\0'; 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.1.1/src/fe-common/core/themes.c new/irssi-1.1.2/src/fe-common/core/themes.c
--- old/irssi-1.1.1/src/fe-common/core/themes.c 2018-02-15 00:59:22.000000000 +0100
+++ new/irssi-1.1.2/src/fe-common/core/themes.c 2019-01-08 21:50:01.000000000 +0100
@@ -1400,8 +1400,9 @@
change_theme(settings_get_str("theme"), FALSE);
while (refs != NULL) {
- theme_unref(refs->data);
+ void *tmp = refs->data;
refs = g_slist_remove(refs, refs->data);
+ theme_unref(tmp);
}
}
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.1.1/src/fe-text/gui-entry.c new/irssi-1.1.2/src/fe-text/gui-entry.c
--- old/irssi-1.1.1/src/fe-text/gui-entry.c 2018-02-15 00:59:22.000000000 +0100
+++ new/irssi-1.1.2/src/fe-text/gui-entry.c 2019-01-08 21:50:01.000000000 +0100
@@ -171,7 +171,7 @@
int i;
int xpos = 0;
- for (i = 0; i < pos; i++) {
+ for (i = 0; i < entry->text_len && i < pos; i++) {
unichar c = entry->text[i];
if (term_type == TERM_TYPE_BIG5)
@@ -181,7 +181,7 @@
else
xpos++;
}
- return xpos;
+ return xpos + pos - i;
}
static int scrpos2pos(GUI_ENTRY_REC *entry, int pos)
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.1.1/src/fe-text/gui-printtext.c new/irssi-1.1.2/src/fe-text/gui-printtext.c
--- old/irssi-1.1.1/src/fe-text/gui-printtext.c 2018-02-15 00:59:22.000000000 +0100
+++ new/irssi-1.1.2/src/fe-text/gui-printtext.c 2019-01-08 21:50:01.000000000 +0100
@@ -256,9 +256,15 @@
}
textbuffer_line_add_colors(view->buffer, &insert_after, fg, bg, flags);
- insert_after = textbuffer_insert(view->buffer, insert_after,
- (unsigned char *) str,
- strlen(str), &lineinfo);
+ /* for historical reasons, the \n will set
+ GUI_PRINT_FLAG_NEWLINE and print an empty string. in this
+ special case, ignore the empty string which would otherwise
+ start another new line */
+ if (~flags & GUI_PRINT_FLAG_NEWLINE || *str != '\0') {
+ insert_after = textbuffer_insert(view->buffer, insert_after, (unsigned char *) str,
+ strlen(str), &lineinfo);
+ }
+
if (gui->use_insert_after)
gui->insert_after = insert_after;
}
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.1.1/src/fe-text/gui-readline.c new/irssi-1.1.2/src/fe-text/gui-readline.c
--- old/irssi-1.1.1/src/fe-text/gui-readline.c 2018-02-15 00:59:22.000000000 +0100
+++ new/irssi-1.1.2/src/fe-text/gui-readline.c 2019-01-08 21:50:01.000000000 +0100
@@ -160,6 +160,7 @@
gui_window_scroll(active_win, get_scroll_count());
}
+#define isnewline(x) ((x) == '\n' || (x) == '\r')
static void paste_buffer_join_lines(GArray *buf)
{
unsigned int i, count, indent, line_len;
@@ -199,7 +200,7 @@
/* find the first beginning of indented line */
for (i = 1; i < buf->len; i++) {
- if (arr[i-1] == '\n' && isblank(arr[i]))
+ if (isnewline(arr[i-1]) && isblank(arr[i]))
break;
}
if (i == buf->len)
@@ -226,7 +227,7 @@
count = 0;
}
}
- if (arr[i] == '\n')
+ if (isnewline(arr[i]))
last_lf = TRUE;
}
@@ -236,11 +237,12 @@
for (i = 0; i < buf->len; i++) {
if (last_lf && isblank(arr[i])) {
/* whitespace, ignore */
- } else if (arr[i] == '\n') {
+ } else if (isnewline(arr[i])) {
if (!last_lf && i+1 != buf->len &&
isblank(arr[i+1])) {
last_lf_pos = dest;
- *dest++ = ' ';
+ if (i != 0 && !isblank(arr[i-1]))
+ *dest++ = ' ';
} else {
*dest++ = '\n'; /* double-LF */
line_len = 0;
@@ -287,7 +289,7 @@
/* first line has to be kludged kind of to get pasting in the
middle of line right.. */
for (i = 0; i < paste_buffer->len; i++) {
- if (arr[i] == '\r' || arr[i] == '\n') {
+ if (isnewline(arr[i])) {
i++;
break;
}
@@ -303,7 +305,7 @@
/* rest of the lines */
str = g_string_new(NULL);
for (; i < paste_buffer->len; i++) {
- if (arr[i] == '\r' || arr[i] == '\n') {
+ if (isnewline(arr[i])) {
paste_send_line(str->str);
g_string_truncate(str, 0);
} else if (active_entry->utf8) {
@@ -769,7 +771,7 @@
last_char = g_array_index(paste_buffer, unichar, i - 1);
- if (paste_line_count > 0 && last_char != '\n' && last_char != '\r') {
+ if (paste_line_count > 0 && !isnewline(last_char)) {
/* there are newlines, but there's also stuff after the newline
* adjust line count to reflect this */
paste_line_count++;
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.1.1/src/fe-text/gui-windows.c new/irssi-1.1.2/src/fe-text/gui-windows.c
--- old/irssi-1.1.1/src/fe-text/gui-windows.c 2018-02-15 00:59:22.000000000 +0100
+++ new/irssi-1.1.2/src/fe-text/gui-windows.c 2019-01-08 21:50:01.000000000 +0100
@@ -206,8 +206,6 @@
WINDOW_REC *rec = tmp->data;
GUI_WINDOW_REC *gui = WINDOW_GUI(rec);
- textbuffer_view_set_hidden_level(gui->view, MSGLEVEL_HIDDEN);
-
textbuffer_view_set_break_wide(gui->view, settings_get_bool("break_wide"));
textbuffer_view_set_default_indent(gui->view,
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.1.1/src/fe-text/mainwindows-layout.c new/irssi-1.1.2/src/fe-text/mainwindows-layout.c
--- old/irssi-1.1.1/src/fe-text/mainwindows-layout.c 2018-02-15 00:59:22.000000000 +0100
+++ new/irssi-1.1.2/src/fe-text/mainwindows-layout.c 2019-01-08 21:50:01.000000000 +0100
@@ -46,6 +46,8 @@
char *level = bits2level(gui->view->hidden_level);
iconfig_node_set_str(node, "hidelevel", level);
g_free(level);
+ } else {
+ iconfig_node_set_str(node, "hidelevel", NULL);
}
if (gui->use_scroll)
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.1.1/src/fe-text/textbuffer-view.c new/irssi-1.1.2/src/fe-text/textbuffer-view.c
--- old/irssi-1.1.1/src/fe-text/textbuffer-view.c 2018-02-15 00:59:22.000000000 +0100
+++ new/irssi-1.1.2/src/fe-text/textbuffer-view.c 2019-01-08 21:50:01.000000000 +0100
@@ -1210,6 +1210,11 @@
if (is_last == 1)
view->startline = NULL;
}
+
+ if (view->startline == line) {
+ view->startline = line->next;
+ view->subline = 0;
+ }
} else {
if (textbuffer_line_exists_after(view->bottom_startline,
line)) {
@@ -1219,6 +1224,11 @@
view->empty_linecount += linecount-realcount;
}
+ if (view->bottom_startline == line) {
+ view->bottom_startline = view->bottom_startline->next;
+ view->bottom_subline = 0;
+ }
+
if (textbuffer_line_exists_after(view->startline,
line)) {
view_remove_line_update_startline(view, line,
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.1.1/src/fe-text/textbuffer.c new/irssi-1.1.2/src/fe-text/textbuffer.c
--- old/irssi-1.1.1/src/fe-text/textbuffer.c 2018-02-15 00:50:34.000000000 +0100
+++ new/irssi-1.1.2/src/fe-text/textbuffer.c 2019-01-08 21:47:46.000000000 +0100
@@ -192,7 +192,7 @@
if (buffer->cur_text == NULL)
text_chunk_create(buffer);
- rec = g_slice_new(LINE_REC);
+ rec = g_slice_new0(LINE_REC);
rec->text = buffer->cur_text->buffer + buffer->cur_text->pos;
buffer->cur_text->refcount++;
@@ -333,8 +333,9 @@
data[pos++] = LINE_CMD_INDENT;
}
- if (pos > 0)
+ if (pos > 0) {
*line = textbuffer_insert(buffer, *line, data, pos, NULL);
+ }
buffer->last_flags = flags;
}
@@ -355,9 +356,6 @@
g_return_val_if_fail(buffer != NULL, NULL);
g_return_val_if_fail(data != NULL, NULL);
- if (len == 0)
- return insert_after;
-
line = !buffer->last_eol ? insert_after :
textbuffer_line_insert(buffer, insert_after);
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.1.1/src/irc/dcc/dcc-send.c new/irssi-1.1.2/src/irc/dcc/dcc-send.c
--- old/irssi-1.1.1/src/irc/dcc/dcc-send.c 2018-02-06 14:50:10.000000000 +0100
+++ new/irssi-1.1.2/src/irc/dcc/dcc-send.c 2019-01-08 21:47:46.000000000 +0100
@@ -425,6 +425,7 @@
g_free(str);
if (dcc == NULL) {
g_warn_if_reached();
+ close(hfile);
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.1.1/src/irc/dcc/dcc.c new/irssi-1.1.2/src/irc/dcc/dcc.c
--- old/irssi-1.1.1/src/irc/dcc/dcc.c 2018-02-06 14:50:10.000000000 +0100
+++ new/irssi-1.1.2/src/irc/dcc/dcc.c 2019-01-08 21:47:46.000000000 +0100
@@ -57,8 +57,9 @@
pos = gslist_find_string(dcc_types, type);
if (pos != NULL) {
- g_free(pos->data);
- dcc_types = g_slist_remove(dcc_types, pos->data);
+ void *tmp = pos->data;
+ dcc_types = g_slist_remove(dcc_types, pos->data);
+ g_free(tmp);
}
}