mirror of
https://github.com/irssi/irssi.git
synced 2024-06-30 06:45:25 +00:00
Compare commits
19 Commits
7dbd00381a
...
2f2fa029f9
Author | SHA1 | Date | |
---|---|---|---|
|
2f2fa029f9 | ||
|
08bb648850 | ||
|
98b391f62e | ||
|
f2b97631e1 | ||
|
91dac0e5a1 | ||
|
aebc0667a6 | ||
|
cf6615a70e | ||
|
4dd57cf24e | ||
|
b3f6ed0b11 | ||
|
41f8213fe0 | ||
|
504fd7bc60 | ||
|
a0caf5e5e6 | ||
|
514f1cdcf6 | ||
|
2f16b554b5 | ||
|
a11df816b7 | ||
|
89adcc4ee8 | ||
|
ed2825f28b | ||
|
363fbf048f | ||
|
ea434591f4 |
1
INSTALL
1
INSTALL
|
@ -5,6 +5,7 @@
|
||||||
To compile Irssi you need:
|
To compile Irssi you need:
|
||||||
|
|
||||||
- meson-0.53 build system with ninja-1.8 or greater
|
- meson-0.53 build system with ninja-1.8 or greater
|
||||||
|
- pkg-config (or compatible)
|
||||||
- glib-2.32 or greater
|
- glib-2.32 or greater
|
||||||
- openssl (for ssl support)
|
- openssl (for ssl support)
|
||||||
- perl-5.8 or greater (for building, and optionally Perl scripts)
|
- perl-5.8 or greater (for building, and optionally Perl scripts)
|
||||||
|
|
|
@ -17,13 +17,15 @@ Details:
|
||||||
Adds or removes a binding; the binding itself is case-sensitive and may
|
Adds or removes a binding; the binding itself is case-sensitive and may
|
||||||
contain as many characters as you want.
|
contain as many characters as you want.
|
||||||
|
|
||||||
Uppercase characters usually indicate that you need to keep the shift-key
|
Key bindings are case sensitive so uppercase letters mean you also have
|
||||||
pressed to use the binding.
|
to use the shift key, except for ctrl which does not support shift but
|
||||||
|
the keys must always be typed in uppercase.
|
||||||
|
|
||||||
%9Examples:%9
|
%9Examples:%9
|
||||||
|
|
||||||
/BIND
|
/BIND
|
||||||
/BIND meta-c /CLEAR
|
/BIND meta-c /CLEAR
|
||||||
|
/BIND meta-C /CYCLE
|
||||||
/BIND meta-q change_window 16
|
/BIND meta-q change_window 16
|
||||||
/BIND -delete meta-y
|
/BIND -delete meta-y
|
||||||
/BIND ^W^C /WINDOW NEW HIDE
|
/BIND ^W^C /WINDOW NEW HIDE
|
||||||
|
|
|
@ -36,7 +36,8 @@
|
||||||
-cmdmax: Specifies the maximum number of commands to perform before
|
-cmdmax: Specifies the maximum number of commands to perform before
|
||||||
starting the internal flood protection.
|
starting the internal flood protection.
|
||||||
-sasl_mechanism Specifies the mechanism to use for the SASL authentication.
|
-sasl_mechanism Specifies the mechanism to use for the SASL authentication.
|
||||||
Irssi supports: PLAIN, EXTERNAL, SCRAM-SHA-1, SCRAM-SHA-256 and SCRAM-SHA-512
|
Irssi supports: PLAIN, EXTERNAL, SCRAM-SHA-1, SCRAM-SHA-256
|
||||||
|
and SCRAM-SHA-512
|
||||||
Use '' to disable the authentication.
|
Use '' to disable the authentication.
|
||||||
-sasl_username Specifies the username to use during the SASL authentication.
|
-sasl_username Specifies the username to use during the SASL authentication.
|
||||||
-sasl_password Specifies the password to use during the SASL authentication.
|
-sasl_password Specifies the password to use during the SASL authentication.
|
||||||
|
|
|
@ -20,10 +20,10 @@
|
||||||
|
|
||||||
%9Description:%9
|
%9Description:%9
|
||||||
|
|
||||||
Manipulate the text in the window to go to a to the given line number, or
|
Manipulate the text in the window to go to the given line number, or
|
||||||
clear the buffers.
|
clear the buffers.
|
||||||
|
|
||||||
The timestamp format is format is '[dd[.mm] | -<days ago>] hh:mi[:ss]'.
|
The timestamp format is '[dd[.mm] | -<days ago>] hh:mi[:ss]'.
|
||||||
|
|
||||||
%9Examples:%9
|
%9Examples:%9
|
||||||
|
|
||||||
|
|
|
@ -74,5 +74,5 @@
|
||||||
/WINDOW HIDELEVEL ^JOINS ^PARTS ^QUITS
|
/WINDOW HIDELEVEL ^JOINS ^PARTS ^QUITS
|
||||||
/WINDOW LOGFILE ~/logs/notices.log
|
/WINDOW LOGFILE ~/logs/notices.log
|
||||||
|
|
||||||
%9See also:%9 JOIN, LEVELS, LOG, QUERY
|
%9See also:%9 JOIN, LEVELS, LOG, QUERY, SET window_default_level, SET window_default_hidelevel
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
|
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
|
||||||
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
|
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
|
||||||
|
|
||||||
#define IRSSI_ABI_VERSION 52
|
#define IRSSI_ABI_VERSION 53
|
||||||
|
|
||||||
#define DEFAULT_SERVER_ADD_PORT 6667
|
#define DEFAULT_SERVER_ADD_PORT 6667
|
||||||
#define DEFAULT_SERVER_ADD_TLS_PORT 6697
|
#define DEFAULT_SERVER_ADD_TLS_PORT 6697
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
#include <irssi/src/core/misc.h>
|
#include <irssi/src/core/misc.h>
|
||||||
#include <irssi/src/core/servers-setup.h>
|
#include <irssi/src/core/servers-setup.h>
|
||||||
#include <irssi/src/core/rawlog.h>
|
#include <irssi/src/core/rawlog.h>
|
||||||
|
#include <irssi/src/core/network-openssl.h>
|
||||||
#include <irssi/src/core/net-sendbuffer.h>
|
#include <irssi/src/core/net-sendbuffer.h>
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
|
@ -148,8 +148,11 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
|
||||||
"missing or empty");
|
"missing or empty");
|
||||||
} else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) {
|
} else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) {
|
||||||
conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL;
|
conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL;
|
||||||
} else
|
} else {
|
||||||
g_warning("Unsupported SASL mechanism \"%s\" selected", ircnet->sasl_mechanism);
|
g_warning("Unsupported SASL mechanism \"%s\" selected",
|
||||||
|
ircnet->sasl_mechanism);
|
||||||
|
conn->sasl_mechanism = SASL_MECHANISM_MAX;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -475,6 +475,7 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
|
||||||
server->send_message = send_message;
|
server->send_message = send_message;
|
||||||
server->query_find_func = (QUERY_REC * (*) (SERVER_REC *, const char *) ) irc_query_find;
|
server->query_find_func = (QUERY_REC * (*) (SERVER_REC *, const char *) ) irc_query_find;
|
||||||
server->nick_comp_func = irc_nickcmp_rfc1459;
|
server->nick_comp_func = irc_nickcmp_rfc1459;
|
||||||
|
server->sasl_success = FALSE;
|
||||||
|
|
||||||
server_connect_init((SERVER_REC *) server);
|
server_connect_init((SERVER_REC *) server);
|
||||||
return (SERVER_REC *) server;
|
return (SERVER_REC *) server;
|
||||||
|
|
|
@ -92,6 +92,12 @@ static void sasl_start(IRC_SERVER_REC *server, const char *data, const char *fro
|
||||||
case SASL_MECHANISM_SCRAM_SHA_512:
|
case SASL_MECHANISM_SCRAM_SHA_512:
|
||||||
irc_send_cmd_now(server, "AUTHENTICATE SCRAM-SHA-512");
|
irc_send_cmd_now(server, "AUTHENTICATE SCRAM-SHA-512");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case SASL_MECHANISM_MAX:
|
||||||
|
signal_emit("server sasl failure", 2, server,
|
||||||
|
"Irssi: Unsupported SASL mechanism");
|
||||||
|
irc_cap_finish_negotiation(server);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
|
server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
|
||||||
}
|
}
|
||||||
|
@ -250,7 +256,7 @@ static void scram_authenticate(IRC_SERVER_REC *server, const char *data, const c
|
||||||
scram_session_create(digest, conn->sasl_username, conn->sasl_password);
|
scram_session_create(digest, conn->sasl_username, conn->sasl_password);
|
||||||
|
|
||||||
if (conn->scram_session == NULL) {
|
if (conn->scram_session == NULL) {
|
||||||
g_error("Could not create SCRAM session with digest %s", digest);
|
g_critical("Could not create SCRAM session with digest %s", digest);
|
||||||
irc_send_cmd_now(server, "AUTHENTICATE *");
|
irc_send_cmd_now(server, "AUTHENTICATE *");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -260,13 +266,13 @@ static void scram_authenticate(IRC_SERVER_REC *server, const char *data, const c
|
||||||
|
|
||||||
if (ret == SCRAM_IN_PROGRESS) {
|
if (ret == SCRAM_IN_PROGRESS) {
|
||||||
// Authentication is still in progress
|
// Authentication is still in progress
|
||||||
GString *resp = g_string_new(output);
|
GString *resp = g_string_new_len(output, output_len);
|
||||||
sasl_send_response(server, resp);
|
sasl_send_response(server, resp);
|
||||||
g_string_free(resp, TRUE);
|
g_string_free(resp, TRUE);
|
||||||
g_free(output);
|
g_free(output);
|
||||||
} else if (ret == SCRAM_SUCCESS) {
|
} else if (ret == SCRAM_SUCCESS) {
|
||||||
// Authentication succeeded
|
// Authentication succeeded
|
||||||
irc_send_cmd_now(server, "AUTHENTICATE +");
|
sasl_send_response(server, NULL);
|
||||||
scram_session_free(conn->scram_session);
|
scram_session_free(conn->scram_session);
|
||||||
conn->scram_session = NULL;
|
conn->scram_session = NULL;
|
||||||
} else if (ret == SCRAM_ERROR) {
|
} else if (ret == SCRAM_ERROR) {
|
||||||
|
|
|
@ -137,7 +137,8 @@ static scram_status process_server_first(SCRAM_SESSION_REC *session, const char
|
||||||
param_count = g_strv_length(params);
|
param_count = g_strv_length(params);
|
||||||
|
|
||||||
if (param_count < 3) {
|
if (param_count < 3) {
|
||||||
session->error = g_strdup_printf("Invalid server-first-message: %s", data);
|
/* Invalid server-first-message */
|
||||||
|
session->error = g_strdup_printf("%s", data);
|
||||||
g_strfreev(params);
|
g_strfreev(params);
|
||||||
return SCRAM_ERROR;
|
return SCRAM_ERROR;
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,10 +50,3 @@ sub eval_file {
|
||||||
die "cap_sasl has been unloaded from Irssi ".Irssi::version()." because it conflicts with the built-in SASL support. See /help network for configuring SASL or read the ChangeLog for more information.";
|
die "cap_sasl has been unloaded from Irssi ".Irssi::version()." because it conflicts with the built-in SASL support. See /help network for configuring SASL or read the ChangeLog for more information.";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $] >= 5.037005 && $] <= 5.038000 ) {
|
|
||||||
# https://github.com/Perl/perl5/issues/21366
|
|
||||||
print STDERR "\e7 \e[A Irssi: applying locale workaround for Perl 5.38.0 \e8";
|
|
||||||
require POSIX;
|
|
||||||
POSIX::setlocale(&POSIX::LC_ALL, "");
|
|
||||||
}
|
|
||||||
|
|
|
@ -90,21 +90,38 @@ static void xs_init(pTHX)
|
||||||
void perl_scripts_init(void)
|
void perl_scripts_init(void)
|
||||||
{
|
{
|
||||||
char *code, *use_code;
|
char *code, *use_code;
|
||||||
|
int broken_perl;
|
||||||
|
|
||||||
perl_scripts = NULL;
|
perl_scripts = NULL;
|
||||||
perl_sources_start();
|
perl_sources_start();
|
||||||
perl_signals_start();
|
perl_signals_start();
|
||||||
|
|
||||||
my_perl = perl_alloc();
|
my_perl = perl_alloc();
|
||||||
|
broken_perl = wcwidth(160);
|
||||||
perl_construct(my_perl);
|
perl_construct(my_perl);
|
||||||
|
broken_perl = broken_perl != wcwidth(160);
|
||||||
|
|
||||||
perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args)-1, perl_args, NULL);
|
perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args) - 1, perl_args, NULL);
|
||||||
|
|
||||||
perl_common_start();
|
perl_common_start();
|
||||||
|
|
||||||
use_code = perl_get_use_list();
|
use_code = perl_get_use_list();
|
||||||
code = g_strdup_printf(irssi_core_code, use_code);
|
code = g_strdup_printf(irssi_core_code, use_code);
|
||||||
perl_eval_pv(code, TRUE);
|
perl_eval_pv(code, TRUE);
|
||||||
|
if (broken_perl) {
|
||||||
|
g_warning("applying locale workaround for Perl %d.%d, see "
|
||||||
|
"https://github.com/Perl/perl5/issues/21366",
|
||||||
|
PERL_REVISION, PERL_VERSION);
|
||||||
|
perl_eval_pv("package Irssi::Core;"
|
||||||
|
/* https://github.com/Perl/perl5/issues/21746 */
|
||||||
|
"if ( $] == $] )"
|
||||||
|
"{"
|
||||||
|
"require POSIX;"
|
||||||
|
"POSIX::setlocale(&POSIX::LC_ALL, \"\");"
|
||||||
|
"}"
|
||||||
|
"1;",
|
||||||
|
TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
g_free(code);
|
g_free(code);
|
||||||
g_free(use_code);
|
g_free(use_code);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
DATE=`grep '^v' $1/NEWS | head -1`
|
DATE=`grep '^v' "$1"/NEWS | head -1`
|
||||||
VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
|
VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
|
||||||
case $VERSION_DATE in
|
case $VERSION_DATE in
|
||||||
*xx)
|
*xx)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user