Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package irssi for openSUSE:Factory checked in at 2022-10-31 10:45:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irssi (Old) and /work/SRC/openSUSE:Factory/.irssi.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irssi" Mon Oct 31 10:45:12 2022 rev:64 rq:1032371 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2022-07-18 18:34:48.897832871 +0200 +++ /work/SRC/openSUSE:Factory/.irssi.new.2275/irssi.changes 2022-10-31 10:45:13.973014907 +0100 @@ -1,0 +2,12 @@ +Mon Oct 31 07:38:51 UTC 2022 - Ailin Nemui <[email protected]> + +- update to 1.4.3 + - Fix freeze on Alt+arrows (#1416, #1417) + - Fix crash on /upgrade (#1399, #1419) + - Fix saving of -disallow_starttls (#1401, #1420) + - Fix libnv detection on FreeBSD (freebsd#265397, #1407). By + Guido Falsi and Kristof Provost + - Minor help and script fixes (#1380, #1393, #1411, #1413, + #1414, #1415) + +------------------------------------------------------------------- Old: ---- irssi-1.4.2.tar.xz irssi-1.4.2.tar.xz.asc New: ---- irssi-1.4.3.tar.xz irssi-1.4.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irssi.spec ++++++ --- /var/tmp/diff_new_pack.XwfaWo/_old 2022-10-31 10:45:14.545017789 +0100 +++ /var/tmp/diff_new_pack.XwfaWo/_new 2022-10-31 10:45:14.553017829 +0100 @@ -17,7 +17,7 @@ Name: irssi -Version: 1.4.2 +Version: 1.4.3 Release: 0 Summary: Modular IRC Client License: GPL-2.0-or-later ++++++ irssi-1.4.2.tar.xz -> irssi-1.4.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/ChangeLog new/irssi-1.4.3/ChangeLog --- old/irssi-1.4.2/ChangeLog 2022-07-13 20:09:40.000000000 +0200 +++ new/irssi-1.4.3/ChangeLog 2022-10-29 12:14:54.000000000 +0200 @@ -1,3 +1,109 @@ +commit c99c8b444da5b2a2ff53e86de02e924e3b728993 +Author: Ailin Nemui <[email protected]> +Date: Sat Oct 29 12:13:46 2022 +0200 + + tag as 1.4.3 + +commit f9f6341c20d9e12241d357058a469cb82520dcb9 +Author: ailin-nemui <[email protected]> +Date: Sat Oct 15 08:52:40 2022 +0200 + + Merge pull request #1420 from ailin-nemui/starttls-config + + enable saving of -disallow_starttls + + (cherry picked from commit afba1480562bba77b127322eb55a3a768a1e98b4) + +commit 9a95edc69a4a20e5f215c2f887022ea7beacc1c7 +Author: ailin-nemui <[email protected]> +Date: Sat Oct 15 08:52:32 2022 +0200 + + Merge pull request #1419 from ailin-nemui/init-irc-funcs + + move irc server functions to object creation time + + (cherry picked from commit a661e2fb35d4683871a374805daf8a20935f313f) + +commit 93a94308bd8fcc871291afb94026640f6e28a08e +Author: ailin-nemui <[email protected]> +Date: Sat Oct 15 08:52:20 2022 +0200 + + Merge pull request #1417 from ailin-nemui/loop + + do not freeze on alt+left/right + + (cherry picked from commit 0c97433c7c41e50744da1c2ceaf19131e96fdf18) + +commit 26f9750ad174a2cfd228f5498dd0f35b2e6e6df6 +Author: ailin-nemui <[email protected]> +Date: Wed Sep 14 09:24:35 2022 +0200 + + Merge pull request #1414 from irssi/vague666-patch-4 + + Add -nocap to /connect and /server connect syntax + + (cherry picked from commit 55913ade1350a4c1087b0238ac863e0bab081fd7) + +commit 277923aaac5c6e65d5b9686ee3d9e4968858141a +Author: ailin-nemui <[email protected]> +Date: Tue Sep 13 09:52:30 2022 +0200 + + Merge pull request #1413 from irssi/vague666-patch-3 + + Update /server syntax line + + (cherry picked from commit 238d7cfd08d14115762d78b11c567c850133f72a) + +commit 23419e586699bf653d1ca81bd3fe45f9b8730344 +Author: ailin-nemui <[email protected]> +Date: Tue Sep 13 09:51:57 2022 +0200 + + Merge pull request #1415 from irssi/vague666-patch-5 + + /server: Add help for -cap/-nocap + + (cherry picked from commit f76d41953f94bab519dec99c38d0b7fdb8bca1f4) + +commit 2c18da3cc60e6a8320138b7671d5660c3ae708dd +Author: ailin-nemui <[email protected]> +Date: Tue Sep 13 09:51:43 2022 +0200 + + Merge pull request #1411 from irssi/vague666-patch-1 + + /connect: Add help for -nocap + + (cherry picked from commit 38b18bd84da03f127e0ed51154923576bf22ae6f) + +commit c01b35b062278258c5431955d1ed39bcf870cda9 +Author: ailin-nemui <[email protected]> +Date: Fri Aug 19 10:42:05 2022 +0200 + + Merge pull request #1407 from madpilot78/Fix_libnv_detection + + Fix libnv detection on recent FreeBSD + + (cherry picked from commit f32d0ab51a5569ad908cefa3b033a7fb367240e7) + +commit f51bc42429a7a8026a5205dc7f0fa0400564208d +Author: ailin-nemui <[email protected]> +Date: Sun Jun 12 18:11:05 2022 +0200 + + Merge pull request #1380 from ailin-nemui/scriptassist + + run syncscripts.sh + + (cherry picked from commit 68823eb6af68d941e94327170d6f5261568b6899) + +commit be5f917f07e6c4d4de643d307048281e87717a67 +Author: ailin-nemui <[email protected]> +Date: Thu Jun 30 23:25:35 2022 +0200 + + Merge pull request #1393 from ailin-nemui/eval-help + + minor rendering fix in eval help + + (cherry picked from commit 0bf18beed75e0423c7848908ebc4ba6f39cc96c7) + commit bc805f9bcdbba0814ebf94ff6c91c2666a73dbbe Author: Ailin Nemui <[email protected]> Date: Wed Jul 13 20:08:52 2022 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/NEWS new/irssi-1.4.3/NEWS --- old/irssi-1.4.2/NEWS 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/NEWS 2022-10-29 12:14:44.000000000 +0200 @@ -1,3 +1,12 @@ +v1.4.3 2022-10-31 The Irssi team <[email protected]> + - Fix freeze on Alt+arrows (#1416, #1417) + - Fix crash on /upgrade (#1399, #1419) + - Fix saving of -disallow_starttls (#1401, #1420) + - Fix libnv detection on FreeBSD (freebsd#265397, #1407). By + Guido Falsi and Kristof Provost + - Minor help and script fixes (#1380, #1393, #1411, #1413, + #1414, #1415) + v1.4.2 2022-07-17 The Irssi team <[email protected]> * Add irssimoduledir to irssi-1.pc in the Meson build (#1383, #1378) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/configure new/irssi-1.4.3/configure --- old/irssi-1.4.2/configure 2022-07-13 20:09:43.000000000 +0200 +++ new/irssi-1.4.3/configure 2022-10-29 12:14:56.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for irssi 1.4.2. +# Generated by GNU Autoconf 2.71 for irssi 1.4.3. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -618,8 +618,8 @@ # Identity of this package. PACKAGE_NAME='irssi' PACKAGE_TARNAME='irssi' -PACKAGE_VERSION='1.4.2' -PACKAGE_STRING='irssi 1.4.2' +PACKAGE_VERSION='1.4.3' +PACKAGE_STRING='irssi 1.4.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1449,7 +1449,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.4.2 to adapt to many kinds of systems. +\`configure' configures irssi 1.4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1520,7 +1520,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of irssi 1.4.2:";; + short | recursive ) echo "Configuration of irssi 1.4.3:";; esac cat <<\_ACEOF @@ -1676,7 +1676,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -irssi configure 1.4.2 +irssi configure 1.4.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2221,7 +2221,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.4.2, which was +It was created by irssi $as_me 1.4.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3497,7 +3497,7 @@ # Define the identity of the package. PACKAGE='irssi' - VERSION='1.4.2' + VERSION='1.4.3' # Some tools Automake needs. @@ -16304,7 +16304,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.4.2, which was +This file was extended by irssi $as_me 1.4.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16376,7 +16376,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -irssi config.status 1.4.2 +irssi config.status 1.4.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/configure.ac new/irssi-1.4.3/configure.ac --- old/irssi-1.4.2/configure.ac 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/configure.ac 2022-10-29 12:14:44.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(irssi, 1.4.2) +AC_INIT(irssi, 1.4.3) AC_CONFIG_SRCDIR([src]) AC_CONFIG_AUX_DIR(build-aux) AC_PREREQ(2.50) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/docs/help/connect new/irssi-1.4.3/docs/help/connect --- old/irssi-1.4.2/docs/help/connect 2022-07-13 20:09:40.000000000 +0200 +++ new/irssi-1.4.3/docs/help/connect 2022-10-29 12:14:54.000000000 +0200 @@ -1,7 +1,7 @@ %9Syntax:%9 -CONNECT %|[-4 | -6] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>] [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>] [-!] [-noautosendcmd] [-tls | -notls] [-starttls | -disallow_starttls] [-noproxy] [-network <network>] [-host <hostname>] [-rawlog <file>] <address>|<chatnet> [<port> [<password> [<nick>]]] +CONNECT %|[-4 | -6] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>] [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>] [-!] [-noautosendcmd] [-tls | -notls] [-nocap] [-starttls | -disallow_starttls] [-noproxy] [-network <network>] [-host <hostname>] [-rawlog <file>] <address>|<chatnet> [<port> [<password> [<nick>]]] %9Parameters:%9 @@ -17,6 +17,7 @@ -tls_ciphers: TLS cipher suite preference lists. -tls_pinned_cert: Pinned x509 certificate fingerprint. -tls_pinned_pubkey: Pinned public key fingerprint. + -nocap: Disable CAPREQ during connect -noproxy: Ignores the global proxy configuration. -network: The network this connection belongs to. -host: The hostname you would like to connect from. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/docs/help/eval new/irssi-1.4.3/docs/help/eval --- old/irssi-1.4.2/docs/help/eval 2022-07-13 20:09:40.000000000 +0200 +++ new/irssi-1.4.3/docs/help/eval 2022-10-29 12:14:54.000000000 +0200 @@ -10,18 +10,22 @@ %9Description:%9 Evaluates the given commands and executes them; you can use internal - variables and separate multiple commands by using the ';' character. - If the command contains a string with '$', '\' or ';' those characters + variables and separate multiple commands by using the `;' character. + If the command contains a string with `$', `\' or `;' those characters need to be escaped: - '$' -> '$$' - '\' -> '\\' (or even '\\\\', depending on where they are used) - ';' -> '\;' + + `$' -> `$$' + `\' -> `\\' (or even `\\\\', depending on where they are used) + `;' -> `\;' %9Examples:%9 /EVAL echo I am connected to ${S} on ${chatnet} as ${N} /EVAL echo My user privileges are +${usermode}; echo Let's party! - to print '1;2$3\4': /EVAL echo 1\;2$$3\\4 + + to print `1;2$3\4': + + /EVAL echo 1\;2$$3\\4 %9References:%9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/docs/help/in/connect.in new/irssi-1.4.3/docs/help/in/connect.in --- old/irssi-1.4.2/docs/help/in/connect.in 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/docs/help/in/connect.in 2022-10-29 12:14:44.000000000 +0200 @@ -17,6 +17,7 @@ -tls_ciphers: TLS cipher suite preference lists. -tls_pinned_cert: Pinned x509 certificate fingerprint. -tls_pinned_pubkey: Pinned public key fingerprint. + -nocap: Disable CAPREQ during connect -noproxy: Ignores the global proxy configuration. -network: The network this connection belongs to. -host: The hostname you would like to connect from. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/docs/help/in/eval.in new/irssi-1.4.3/docs/help/in/eval.in --- old/irssi-1.4.2/docs/help/in/eval.in 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/docs/help/in/eval.in 2022-10-29 12:14:44.000000000 +0200 @@ -10,18 +10,22 @@ %9Description:%9 Evaluates the given commands and executes them; you can use internal - variables and separate multiple commands by using the ';' character. - If the command contains a string with '$', '\' or ';' those characters + variables and separate multiple commands by using the `;' character. + If the command contains a string with `$', `\' or `;' those characters need to be escaped: - '$' -> '$$' - '\' -> '\\' (or even '\\\\', depending on where they are used) - ';' -> '\;' + + `$' -> `$$' + `\' -> `\\' (or even `\\\\', depending on where they are used) + `;' -> `\;' %9Examples:%9 /EVAL echo I am connected to ${S} on ${chatnet} as ${N} /EVAL echo My user privileges are +${usermode}; echo Let's party! - to print '1;2$3\4': /EVAL echo 1\;2$$3\\4 + + to print `1;2$3\4': + + /EVAL echo 1\;2$$3\\4 %9References:%9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/docs/help/in/server.in new/irssi-1.4.3/docs/help/in/server.in --- old/irssi-1.4.2/docs/help/in/server.in 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/docs/help/in/server.in 2022-10-29 12:14:44.000000000 +0200 @@ -28,6 +28,8 @@ -tls_pinned_pubkey: Pinned public key fingerprint. -auto: Automatically connects to the server on startup. -noauto: Doesn't connect to the server on startup. + -cap: Enable CAPREQ for server. + -nocap: Disable CAPREQ for server. -network: The network the server belongs to. -host: The hostname you would like to connect from. -cmdspeed: Specifies the minimum amount of time, expressed in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/docs/help/server new/irssi-1.4.3/docs/help/server --- old/irssi-1.4.2/docs/help/server 2022-07-13 20:09:40.000000000 +0200 +++ new/irssi-1.4.3/docs/help/server 2022-10-29 12:14:54.000000000 +0200 @@ -1,9 +1,9 @@ %9Syntax:%9 -SERVER CONNECT %|[-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>] [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>] [-!] [-noautosendcmd] [-noproxy] [-network <network>] [-host <hostname>] [-rawlog <file>] [+]<address>|<chatnet> [<port> [<password> [<nick>]]] +SERVER CONNECT %|[-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>] [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>] [-!] [-noautosendcmd] [-nocap] [-noproxy] [-network <network>] [-host <hostname>] [-rawlog <file>] [+]<address>|<chatnet> [<port> [<password> [<nick>]]] SERVER REMOVE %|<address> [<port>] [<network>] -SERVER ADD%||MODIFY [-4 | -6] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>] [-tls_ciphers <list>] [-tls | -notls] [-starttls | -nostarttls | -disallow_starttls | -nodisallow_starttls] [-auto | -noauto] [-network <network>] [-host <hostname>] [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>] <address> [<port> [<password>]] +SERVER ADD%||MODIFY [-4 | -6] [-cap | -nocap] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>] [-tls_ciphers <list>] [-tls | -notls] [-starttls | -nostarttls | -disallow_starttls | -nodisallow_starttls] [-auto | -noauto] [-network <network>] [-host <hostname>] [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>] <address> [<port> [<password>]] SERVER LIST%| SERVER PURGE %|[<target>] @@ -32,6 +32,8 @@ -tls_pinned_pubkey: Pinned public key fingerprint. -auto: Automatically connects to the server on startup. -noauto: Doesn't connect to the server on startup. + -cap: Enable CAPREQ for server. + -nocap: Disable CAPREQ for server. -network: The network the server belongs to. -host: The hostname you would like to connect from. -cmdspeed: Specifies the minimum amount of time, expressed in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/irssi-config.h new/irssi-1.4.3/irssi-config.h --- old/irssi-1.4.2/irssi-config.h 2022-07-13 20:09:46.000000000 +0200 +++ new/irssi-1.4.3/irssi-config.h 2022-10-29 12:14:59.000000000 +0200 @@ -89,7 +89,7 @@ #define PACKAGE_NAME "irssi" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "irssi 1.4.2" +#define PACKAGE_STRING "irssi 1.4.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "irssi" @@ -98,7 +98,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.2" +#define PACKAGE_VERSION "1.4.3" /* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */ /* #undef PRIuUOFF_T */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/irssi-version.h new/irssi-1.4.3/irssi-version.h --- old/irssi-1.4.2/irssi-version.h 2022-07-13 20:09:50.000000000 +0200 +++ new/irssi-1.4.3/irssi-version.h 2022-10-29 12:15:01.000000000 +0200 @@ -1,2 +1,2 @@ -#define IRSSI_VERSION_DATE 20220717 -#define IRSSI_VERSION_TIME 1402 +#define IRSSI_VERSION_DATE 20221031 +#define IRSSI_VERSION_TIME 1403 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/meson.build new/irssi-1.4.3/meson.build --- old/irssi-1.4.2/meson.build 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/meson.build 2022-10-29 12:14:44.000000000 +0200 @@ -1,5 +1,5 @@ project('irssi', 'c', - version : '1.4.2', + version : '1.4.3', meson_version : '>=0.49', default_options : ['warning_level=1']) @@ -492,7 +492,7 @@ if want_capsicum if cc.has_function('cap_enter', dependencies : cc.find_library('c')) libnv = cc.find_library('nv', required : require_capsicum) - nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv) + nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv, prefix : '#include <sys/nv.h>') if nvlist_create_found dep += libnv have_capsicum = true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/scripts/scriptassist.pl new/irssi-1.4.3/scripts/scriptassist.pl --- old/irssi-1.4.2/scripts/scriptassist.pl 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/scripts/scriptassist.pl 2022-10-29 12:14:44.000000000 +0200 @@ -5,7 +5,7 @@ use strict; -our $VERSION = '2020042700'; +our $VERSION = '2022053100'; our %IRSSI = ( authors => 'Stefan \'tommie\' Tomanek', contact => '[email protected]', @@ -30,7 +30,7 @@ eval "use GnuPG qw(:algo :trust);"; $have_gpg = 1 if not ($@); -my $irssi_version = qv(Irssi::parse_special('v$J') =~ s/-.*//r); +my $irssi_version = qv('v'.Irssi::parse_special('$J') =~ s/[^.\d].*//r); sub show_help { my $help = "scriptassist $VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/src/core/chat-commands.c new/irssi-1.4.3/src/core/chat-commands.c --- old/irssi-1.4.2/src/core/chat-commands.c 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/src/core/chat-commands.c 2022-10-29 12:14:44.000000000 +0200 @@ -114,8 +114,8 @@ [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>] [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>] [-!] [-noautosendcmd] [-tls | -notls] - [-starttls | -disallow_starttls] [-noproxy] [-network <network>] - [-host <hostname>] [-rawlog <file>] + [-nocap] [-starttls | -disallow_starttls] [-noproxy] + [-network <network>] [-host <hostname>] [-rawlog <file>] <address>|<chatnet> [<port> [<password> [<nick>]]] */ /* NOTE: -network replaces the old -ircnet flag. */ static void cmd_connect(const char *data) @@ -211,14 +211,14 @@ command_runsub("server", data, server, item); } -/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] - [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] - [-tls_capath <capath>] - [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>] - [-!] [-noautosendcmd] - [-noproxy] [-network <network>] [-host <hostname>] - [-rawlog <file>] - [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */ +/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] + [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] + [-tls_capath <capath>] [-tls_ciphers <list>] + [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>] + [-!] [-noautosendcmd] [-nocap] + [-noproxy] [-network <network>] [-host <hostname>] + [-rawlog <file>] + [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */ /* NOTE: -network replaces the old -ircnet flag. */ static void cmd_server_connect(const char *data, SERVER_REC *server) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/src/fe-common/irc/fe-irc-server.c new/irssi-1.4.3/src/fe-common/irc/fe-irc-server.c --- old/irssi-1.4.2/src/fe-common/irc/fe-irc-server.c 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/src/fe-common/irc/fe-irc-server.c 2022-10-29 12:14:44.000000000 +0200 @@ -51,7 +51,7 @@ return target; } -/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-tls_cert <cert>] [-tls_pkey <pkey>] +/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-cap | -nocap] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>] [-tls_ciphers <list>] [-tls | -notls] [-starttls | -nostarttls | -disallow_starttls | -nodisallow_starttls] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/src/fe-text/mainwindows.c new/irssi-1.4.3/src/fe-text/mainwindows.c --- old/irssi-1.4.2/src/fe-text/mainwindows.c 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/src/fe-text/mainwindows.c 2022-10-29 12:14:44.000000000 +0200 @@ -1629,6 +1629,7 @@ { MAIN_WINDOW_REC *find_sticky; WINDOW_REC *window; + int start_refnum = refnum; window = window_find_refnum(refnum); g_return_val_if_fail(window != NULL, -1); @@ -1638,7 +1639,7 @@ do { refnum = window_refnum_prev(refnum, wrap); - if (refnum < 0) + if (refnum < 0 || refnum == start_refnum) break; window = window_find_refnum(refnum); @@ -1651,6 +1652,7 @@ { MAIN_WINDOW_REC *find_sticky; WINDOW_REC *window; + int start_refnum = refnum; window = window_find_refnum(refnum); g_return_val_if_fail(window != NULL, -1); @@ -1660,7 +1662,7 @@ do { refnum = window_refnum_next(refnum, wrap); - if (refnum < 0) + if (refnum < 0 || refnum == start_refnum) break; window = window_find_refnum(refnum); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/src/irc/core/irc-servers-setup.c new/irssi-1.4.3/src/irc/core/irc-servers-setup.c --- old/irssi-1.4.2/src/irc/core/irc-servers-setup.c 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/src/irc/core/irc-servers-setup.c 2022-10-29 12:14:44.000000000 +0200 @@ -220,9 +220,11 @@ iconfig_node_set_int(node, "cmd_queue_speed", rec->cmd_queue_speed); if (rec->max_query_chans > 0) iconfig_node_set_int(node, "max_query_chans", rec->max_query_chans); - if (rec->starttls != STARTTLS_NOTSET) - iconfig_node_set_bool(node, "starttls", rec->starttls); - else + if (rec->starttls == STARTTLS_DISALLOW) + iconfig_node_set_bool(node, "starttls", FALSE); + else if (rec->starttls == STARTTLS_ENABLED) + iconfig_node_set_bool(node, "starttls", TRUE); + else if (rec->starttls == STARTTLS_NOTSET) iconfig_node_set_str(node, "starttls", NULL); if (rec->no_cap) iconfig_node_set_bool(node, "no_cap", TRUE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.4.2/src/irc/core/irc-servers.c new/irssi-1.4.3/src/irc/core/irc-servers.c --- old/irssi-1.4.2/src/irc/core/irc-servers.c 2022-07-13 20:09:12.000000000 +0200 +++ new/irssi-1.4.3/src/irc/core/irc-servers.c 2022-10-29 12:14:44.000000000 +0200 @@ -79,11 +79,11 @@ if (*data == '\0') return FALSE; - chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes"); + chantypes = g_hash_table_lookup(irc_server->isupport, "CHANTYPES"); if (chantypes == NULL) chantypes = "#&!+"; /* normal, local, secure, modeless */ - statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg"); + statusmsg = g_hash_table_lookup(irc_server->isupport, "STATUSMSG"); if (statusmsg == NULL && strchr(chantypes, '@') == NULL) statusmsg = "@"; @@ -296,11 +296,12 @@ irc_cap_toggle(server, CAP_STARTTLS, TRUE); } - server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal); - /* set the standards */ - g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst")); - g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+")); + if (!g_hash_table_contains(server->isupport, "CHANMODES")) + g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), + g_strdup("beI,k,l,imnpst")); + if (!g_hash_table_contains(server->isupport, "PREFIX")) + g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+")); server->cmdcount = 0; @@ -466,7 +467,16 @@ modes_server_init(server); - server_connect_init((SERVER_REC *) server); + server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal); + + server->isnickflag = isnickflag_func; + server->ischannel = ischannel_func; + server->split_message = split_message; + server->send_message = send_message; + server->query_find_func = (QUERY_REC * (*) (SERVER_REC *, const char *) ) irc_query_find; + server->nick_comp_func = irc_nickcmp_rfc1459; + + server_connect_init((SERVER_REC *) server); return (SERVER_REC *) server; } @@ -556,14 +566,6 @@ if (!IS_IRC_SERVER(server)) return; - server->isnickflag = isnickflag_func; - server->ischannel = ischannel_func; - server->split_message = split_message; - server->send_message = send_message; - server->query_find_func = - (QUERY_REC *(*)(SERVER_REC *, const char *)) irc_query_find; - server->nick_comp_func = irc_nickcmp_rfc1459; - server->splits = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal); if (!server->session_reconnect)
