Hello community, here is the log from the commit of package irssi for openSUSE:Factory checked in at 2019-06-30 10:22:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irssi (Old) and /work/SRC/openSUSE:Factory/.irssi.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irssi" Sun Jun 30 10:22:03 2019 rev:55 rq:712533 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2019-02-27 17:27:40.999352315 +0100 +++ /work/SRC/openSUSE:Factory/.irssi.new.4615/irssi.changes 2019-06-30 10:22:09.839681965 +0200 @@ -1,0 +2,20 @@ +Fri Jun 28 21:27:15 UTC 2019 - Ailin Nemui <[email protected]> + +- update to 1.2.1 + ! Contains all changes from 1.1.3 + ! Contains all changes from 1.0.8 + - Fix a test on big endian machines (#1014) + - Fix the compile time conditionality of wcwidth + implementation (#1019, gentoo#677804, #720) + - Fix /save no longer working on old Solaris (pre + POSIX.1-2008) (#1042, #1043) + - Fix regression of #764 where display of 8-bit (legacy + encoding) in the input prompt was broken (#1018, + #1057). Initial patch by Артём Курашов + - Fix regression of #779 where autolog_ignore_targets would + not matching itemless windows anymore (#1012, #1013) + - Fix a use after free issue when sending the SASL login on + (automatic and manual) reconnects (#1055, #1058). Reported + by ilbelkyr. CVE-2019-13045 + +------------------------------------------------------------------- Old: ---- irssi-1.2.0.tar.xz irssi-1.2.0.tar.xz.asc New: ---- irssi-1.2.1.tar.xz irssi-1.2.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irssi.spec ++++++ --- /var/tmp/diff_new_pack.ZoGuCm/_old 2019-06-30 10:22:11.539684606 +0200 +++ /var/tmp/diff_new_pack.ZoGuCm/_new 2019-06-30 10:22:11.567684649 +0200 @@ -18,7 +18,7 @@ %bcond_with socks Name: irssi -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: Modular IRC Client License: GPL-2.0-or-later ++++++ irssi-1.2.0.tar.xz -> irssi-1.2.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/ChangeLog new/irssi-1.2.1/ChangeLog --- old/irssi-1.2.0/ChangeLog 2019-02-11 18:35:23.000000000 +0100 +++ new/irssi-1.2.1/ChangeLog 2019-06-28 13:54:31.000000000 +0200 @@ -1,3 +1,69 @@ +commit 248a1591a26e0bf3fda3545fe54ebd0c27f4419d +Author: Ailin Nemui <[email protected]> +Date: Fri Jun 28 13:52:47 2019 +0200 + + tag as 1.2.1 + +commit 27c02a2d961e83e5c509bbcaca3e01825bfbc9df +Author: ailin-nemui <[email protected]> +Date: Fri Jun 28 11:28:30 2019 +0200 + + Merge pull request #1058 from ailin-nemui/sasl-reconnect + + copy sasl username and password values + + (cherry picked from commit d23b0d22cc611e43c88d99192a59f413f951a955) + +commit bb7e81438dd0a0822bb7d140881e858365d392cd +Author: ailin-nemui <[email protected]> +Date: Mon Feb 18 09:36:34 2019 +0100 + + Merge pull request #1013 from ailin-nemui/fix-1012 + + do not stop autolog_ignore_targets from matching itemless targets + + (cherry picked from commit df532d4461fa0e1aba8672fa6d56e3056ce52272) + +commit fddcbe56c9c0f97ecea73ab9e39787f02ba72a68 +Author: ailin-nemui <[email protected]> +Date: Fri Jun 28 11:29:19 2019 +0200 + + Merge pull request #1057 from ailin-nemui/entry-8bit + + restore 8bit support in input entry + + (cherry picked from commit 8551dd99cc6ad29b1b356acc4f4c92209ed98eed) + +commit 309ea8825281b1eb30f78c009df4f11611223513 +Author: ailin-nemui <[email protected]> +Date: Mon May 13 15:26:21 2019 +0200 + + Merge pull request #1043 from ailin-nemui/solaris10 + + fix realpath on old solaris + + (cherry picked from commit 7654f30d04f2b4fae7b49f8b1579bdf77dfca900) + +commit 24547829e7c7c9b6cf41d38c672a64cf1b9fd1a2 +Author: ailin-nemui <[email protected]> +Date: Wed Feb 27 13:00:22 2019 +0100 + + Merge pull request #1019 from ailin-nemui/configure-utf8proc + + make utf8proc configurable + + (cherry picked from commit 6242d25055520a0abcdd95cbf969479c99d36700) + +commit bb600a65753aa34e7c41b59c3d5dcfdcd48bda4f +Author: ailin-nemui <[email protected]> +Date: Tue Feb 19 07:22:06 2019 +0100 + + Merge pull request #1014 from ailin-nemui/fix-be64 + + fix test on Big Endian 64bit, due to pointer size mismatch + + (cherry picked from commit 01ce66c684b66860b9c0dae04912d7cf3ebb9aeb) + commit bd2ff8c99c41f35430a945e888db828a9925dce7 Author: ailin-nemui <[email protected]> Date: Mon Feb 11 18:05:57 2019 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/NEWS new/irssi-1.2.1/NEWS --- old/irssi-1.2.0/NEWS 2019-02-11 18:35:17.000000000 +0100 +++ new/irssi-1.2.1/NEWS 2019-06-28 13:52:07.000000000 +0200 @@ -1,3 +1,24 @@ +v1.2.1 2019-06-29 The Irssi team <[email protected]> + ! Contains all changes from 1.1.3 + - Fix a test on big endian machines (#1014) + - Fix the compile time conditionality of wcwidth + implementation (#1019, gentoo#677804, #720) + - Fix /save no longer working on old Solaris (pre + POSIX.1-2008) (#1042, #1043) + - Fix regression of #764 where display of 8-bit (legacy + encoding) in the input prompt was broken (#1018, + #1057). Initial patch by Артём Курашов + +v1.1.3 2019-06-29 The Irssi team <[email protected]> + ! Contains all changes from 1.0.8 + - Fix regression of #779 where autolog_ignore_targets would + not matching itemless windows anymore (#1012, #1013) + +v1.0.8 2019-06-29 The Irssi team <[email protected]> + - Fix a use after free issue when sending the SASL login on + (automatic and manual) reconnects (#1055, #1058). Reported + by ilbelkyr + v1.2.0 2019-02-11 The Irssi team <[email protected]> ! Contains all changes from 1.1.2 * Improved the /STATUSBAR commands (#858) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/configure new/irssi-1.2.1/configure --- old/irssi-1.2.0/configure 2019-02-11 18:35:30.000000000 +0100 +++ new/irssi-1.2.1/configure 2019-06-28 13:54:40.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for irssi 1.2.0. +# Generated by GNU Autoconf 2.69 for irssi 1.2.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='irssi' PACKAGE_TARNAME='irssi' -PACKAGE_VERSION='1.2.0' -PACKAGE_STRING='irssi 1.2.0' +PACKAGE_VERSION='1.2.1' +PACKAGE_STRING='irssi 1.2.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -843,6 +843,7 @@ with_otr enable_true_color enable_gregex +enable_utf8proc with_capsicum enable_glibtest enable_installed_tests @@ -1406,7 +1407,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures irssi 1.2.0 to adapt to many kinds of systems. +\`configure' configures irssi 1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1476,7 +1477,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of irssi 1.2.0:";; + short | recursive ) echo "Configuration of irssi 1.2.1:";; esac cat <<\_ACEOF @@ -1501,6 +1502,7 @@ --disable-largefile omit support for large files --enable-true-color Build with true color support in terminal --disable-gregex Build without GRegex (fall back to regex.h) + --disable-utf8proc Build without Julia's utf8proc --disable-glibtest do not try to compile and run a test GLIB program --enable-installed-tests Enable installation of some test cases @@ -1628,7 +1630,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -irssi configure 1.2.0 +irssi configure 1.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2230,7 +2232,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by irssi $as_me 1.2.0, which was +It was created by irssi $as_me 1.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3099,7 +3101,7 @@ # Define the identity of the package. PACKAGE='irssi' - VERSION='1.2.0' + VERSION='1.2.1' # Some tools Automake needs. @@ -12866,6 +12868,18 @@ fi +# Check whether --enable-utf8proc was given. +if test "${enable_utf8proc+set}" = set; then : + enableval=$enable_utf8proc; if test x$enableval = xno ; then + want_utf8proc=no + else + want_utf8proc=yes + fi +else + want_utf8proc=yes +fi + + # Check whether --with-capsicum was given. if test "${with_capsicum+set}" = set; then : @@ -13859,7 +13873,11 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8proc_version in -lutf8proc" >&5 +if test "x$want_utf8proc" != "xno"; then + ac_fn_c_check_header_mongrel "$LINENO" "utf8proc.h" "ac_cv_header_utf8proc_h" "$ac_includes_default" +if test "x$ac_cv_header_utf8proc_h" = xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8proc_version in -lutf8proc" >&5 $as_echo_n "checking for utf8proc_version in -lutf8proc... " >&6; } if ${ac_cv_lib_utf8proc_utf8proc_version+:} false; then : $as_echo_n "(cached) " >&6 @@ -13896,15 +13914,26 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_utf8proc_utf8proc_version" >&5 $as_echo "$ac_cv_lib_utf8proc_utf8proc_version" >&6; } if test "x$ac_cv_lib_utf8proc_utf8proc_version" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBUTF8PROC 1 -_ACEOF - LIBS="-lutf8proc $LIBS" + want_utf8proc=yes + LIBS="$LIBS -lutf8proc" + +else + + want_utf8proc="no, library not found" + +fi + + +else + + want_utf8proc="no, library header not found" fi +fi + if test "x$want_textui" != "xno"; then @@ -15364,7 +15393,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by irssi $as_me 1.2.0, which was +This file was extended by irssi $as_me 1.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15430,7 +15459,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -irssi config.status 1.2.0 +irssi config.status 1.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17232,7 +17261,7 @@ echo "Building with true color support.. : $want_truecolor" echo "Building with GRegex ............. : $want_gregex" echo "Building with Capsicum ........... : $want_capsicum" -echo "Building with utf8proc ........... : $ac_cv_lib_utf8proc_utf8proc_version" +echo "Building with utf8proc ........... : $want_utf8proc" if test "x$want_otr" = "xstatic"; then echo "Building with OTR support ........ : static (in irssi binary)" elif test "x$want_otr" = "xmodule"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/configure.ac new/irssi-1.2.1/configure.ac --- old/irssi-1.2.0/configure.ac 2019-02-11 18:35:17.000000000 +0100 +++ new/irssi-1.2.1/configure.ac 2019-06-28 13:50:42.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(irssi, 1.2.0) +AC_INIT(irssi, 1.2.1) AC_CONFIG_SRCDIR([src]) AC_CONFIG_AUX_DIR(build-aux) AC_PREREQ(2.50) @@ -181,6 +181,15 @@ fi, want_gregex=yes) +AC_ARG_ENABLE(utf8proc, +[ --disable-utf8proc Build without Julia's utf8proc], + if test x$enableval = xno ; then + want_utf8proc=no + else + want_utf8proc=yes + fi, + want_utf8proc=yes) + AC_ARG_WITH(capsicum, [ --with-capsicum Build with Capsicum support], if test x$withval = xno; then @@ -329,7 +338,18 @@ dnl ** dnl ** utf8proc dnl ** -AC_CHECK_LIB([utf8proc], [utf8proc_version]) +if test "x$want_utf8proc" != "xno"; then + AC_CHECK_HEADER([utf8proc.h], [ + AC_CHECK_LIB([utf8proc], [utf8proc_version], [ + want_utf8proc=yes + LIBS="$LIBS -lutf8proc" + ], [ + want_utf8proc="no, library not found" + ]) + ], [ + want_utf8proc="no, library header not found" + ]) +fi dnl ** dnl ** curses checks @@ -821,7 +841,7 @@ echo "Building with true color support.. : $want_truecolor" echo "Building with GRegex ............. : $want_gregex" echo "Building with Capsicum ........... : $want_capsicum" -echo "Building with utf8proc ........... : $ac_cv_lib_utf8proc_utf8proc_version" +echo "Building with utf8proc ........... : $want_utf8proc" if test "x$want_otr" = "xstatic"; then echo "Building with OTR support ........ : static (in irssi binary)" elif test "x$want_otr" = "xmodule"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/irssi-config.h new/irssi-1.2.1/irssi-config.h --- old/irssi-1.2.0/irssi-config.h 2019-02-11 18:35:39.000000000 +0100 +++ new/irssi-1.2.1/irssi-config.h 2019-06-28 13:54:51.000000000 +0200 @@ -17,10 +17,7 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `otr' library (-lotr). */ -#define HAVE_LIBOTR 1 - -/* Define to 1 if you have the `utf8proc' library (-lutf8proc). */ -#define HAVE_LIBUTF8PROC 1 +/* #undef HAVE_LIBOTR */ /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 @@ -35,7 +32,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 @@ -83,7 +80,7 @@ #define PACKAGE_NAME "irssi" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "irssi 1.2.0" +#define PACKAGE_STRING "irssi 1.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "irssi" @@ -92,7 +89,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.0" +#define PACKAGE_VERSION "1.2.1" /* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */ #define PRIuUOFF_T "lu" @@ -113,7 +110,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' old/irssi-1.2.0/irssi-config.h.in new/irssi-1.2.1/irssi-config.h.in --- old/irssi-1.2.0/irssi-config.h.in 2019-02-11 18:35:30.000000000 +0100 +++ new/irssi-1.2.1/irssi-config.h.in 2019-06-28 13:54:40.000000000 +0200 @@ -18,9 +18,6 @@ /* 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/irssi-version.h new/irssi-1.2.1/irssi-version.h --- old/irssi-1.2.0/irssi-version.h 2019-02-11 18:35:42.000000000 +0100 +++ new/irssi-1.2.1/irssi-version.h 2019-06-28 13:54:57.000000000 +0200 @@ -1,2 +1,2 @@ -#define IRSSI_VERSION_DATE 20190211 -#define IRSSI_VERSION_TIME 1805 +#define IRSSI_VERSION_DATE 20190628 +#define IRSSI_VERSION_TIME 1352 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/src/fe-common/core/fe-common-core.c new/irssi-1.2.1/src/fe-common/core/fe-common-core.c --- old/irssi-1.2.0/src/fe-common/core/fe-common-core.c 2019-02-11 18:27:58.000000000 +0100 +++ new/irssi-1.2.1/src/fe-common/core/fe-common-core.c 2019-06-28 13:42:49.000000000 +0200 @@ -486,9 +486,6 @@ strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE; item = window_item_find_window(dest->window, dest->server, dest->target); - if (item == NULL) { - return FALSE; - } server_tag_len = dest->server_tag != NULL ? strlen(dest->server_tag) : 0; for (tmp = array; *tmp != NULL; tmp++) { @@ -507,11 +504,11 @@ return TRUE; } else if (g_ascii_strcasecmp(str, dest->target) == 0) { return TRUE; - } else if (item->type == query_type && + } else if (item != NULL && item->type == query_type && g_strcmp0(str, dest->target[0] == '=' ? "::dccqueries" : "::queries") == 0) { return TRUE; - } else if (item->type == channel_type && + } else if (item != NULL && item->type == channel_type && g_strcmp0(str, "::channels") == 0) { return TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/src/fe-text/gui-entry.c new/irssi-1.2.1/src/fe-text/gui-entry.c --- old/irssi-1.2.0/src/fe-text/gui-entry.c 2019-02-11 18:27:58.000000000 +0100 +++ new/irssi-1.2.1/src/fe-text/gui-entry.c 2019-06-28 11:53:32.000000000 +0200 @@ -379,11 +379,19 @@ if (new_xpos > end_xpos) break; - if (entry->hidden) + if (entry->hidden) { g_string_append_c(str, ' '); - else if (unichar_isprint(c)) - g_string_append_unichar(str, c); - else { + } else if (unichar_isprint(c)) { + if (entry->utf8) { + g_string_append_unichar(str, c); + } else if (term_type == TERM_TYPE_BIG5) { + if(c > 0xff) + g_string_append_c(str, (c >> 8) & 0xff); + g_string_append_c(str, c & 0xff); + } else { + g_string_append_c(str, c); + } + } else { g_string_append_c(str, 4); g_string_append_c(str, FORMAT_STYLE_REVERSE); g_string_append_c(str, (c & 127)+'A'-1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/src/irc/core/irc-core.c new/irssi-1.2.1/src/irc/core/irc-core.c --- old/irssi-1.2.0/src/irc/core/irc-core.c 2019-02-11 18:27:58.000000000 +0100 +++ new/irssi-1.2.1/src/irc/core/irc-core.c 2019-06-28 13:48:28.000000000 +0200 @@ -75,6 +75,8 @@ g_free_not_null(ircconn->usermode); g_free_not_null(ircconn->alternate_nick); + g_free_not_null(ircconn->sasl_username); + g_free_not_null(ircconn->sasl_password); } void irc_core_init(void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/src/irc/core/irc-servers-reconnect.c new/irssi-1.2.1/src/irc/core/irc-servers-reconnect.c --- old/irssi-1.2.0/src/irc/core/irc-servers-reconnect.c 2019-02-11 18:27:58.000000000 +0100 +++ new/irssi-1.2.1/src/irc/core/irc-servers-reconnect.c 2019-06-28 13:48:28.000000000 +0200 @@ -49,8 +49,8 @@ rec->usermode = g_strdup(src->usermode); rec->alternate_nick = g_strdup(src->alternate_nick); rec->sasl_mechanism = src->sasl_mechanism; - rec->sasl_username = src->sasl_username; - rec->sasl_password = src->sasl_password; + rec->sasl_username = g_strdup(src->sasl_username); + rec->sasl_password = g_strdup(src->sasl_password); *dest = (SERVER_CONNECT_REC *) rec; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/src/irc/core/irc-servers-setup.c new/irssi-1.2.1/src/irc/core/irc-servers-setup.c --- old/irssi-1.2.0/src/irc/core/irc-servers-setup.c 2019-02-11 18:27:58.000000000 +0100 +++ new/irssi-1.2.1/src/irc/core/irc-servers-setup.c 2019-06-28 13:48:28.000000000 +0200 @@ -101,8 +101,8 @@ conn->sasl_mechanism = SASL_MECHANISM_PLAIN; if (ircnet->sasl_username != NULL && *ircnet->sasl_username && ircnet->sasl_password != NULL && *ircnet->sasl_password) { - conn->sasl_username = ircnet->sasl_username; - conn->sasl_password = ircnet->sasl_password; + conn->sasl_username = g_strdup(ircnet->sasl_username); + conn->sasl_password = g_strdup(ircnet->sasl_password); } else g_warning("The fields sasl_username and sasl_password are either missing or empty"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/src/lib-config/write.c new/irssi-1.2.1/src/lib-config/write.c --- old/irssi-1.2.0/src/lib-config/write.c 2019-02-11 18:27:58.000000000 +0100 +++ new/irssi-1.2.1/src/lib-config/write.c 2019-06-28 11:51:54.000000000 +0200 @@ -315,6 +315,15 @@ /* expand all symlinks; else we may replace a symlink with a regular file */ dest_name = realpath(base_name, NULL); + if (errno == EINVAL) { + /* variable path length not supported by glibc < 2.3, Solaris < 11 */ + char resolved_path[PATH_MAX] = { 0 }; + errno = 0; + if ((dest_name = realpath(base_name, resolved_path)) != NULL) { + dest_name = g_strdup(dest_name); + } + } + if (dest_name == NULL) { if (errno == ENOENT) { dest_name = g_strdup(base_name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.2.0/tests/fe-text/test-paste-join-multiline.c new/irssi-1.2.1/tests/fe-text/test-paste-join-multiline.c --- old/irssi-1.2.0/tests/fe-text/test-paste-join-multiline.c 2019-02-11 18:27:58.000000000 +0100 +++ new/irssi-1.2.1/tests/fe-text/test-paste-join-multiline.c 2019-06-28 11:46:13.000000000 +0200 @@ -54,7 +54,12 @@ g_test_message("INPUT: \"%s\"", (t1 = g_strescape(test->input, NULL))); g_free(t1); - buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, (glong *) &buffer->len); + { + glong buf_len; + buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, &buf_len); + buffer->len = buf_len; + } + paste_buffer_join_lines(buffer); resultstr = g_ucs4_to_utf8((unichar *) buffer->data, buffer->len, NULL, NULL, NULL);
