Attachment #224158 for bug #255116

Lines 1-5 Link Here

(-)b/irc/irssi/Makefile (-1 / +1 lines)
1	PORTNAME= irssi	1	PORTNAME= irssi
2	PORTVERSION= 1.2.2	2	PORTVERSION= 1.2.3
3	PORTREVISION= 2	3	PORTREVISION= 2
4	PORTEPOCH= 2	4	PORTEPOCH= 2
5	CATEGORIES?= irc	5	CATEGORIES?= irc

Lines 1-3 Link Here

(-)b/irc/irssi/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1615547467	1	TIMESTAMP = 1618317211
2	SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578	2	SHA256 (irssi-1.2.3.tar.xz) = a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f
3	SIZE (irssi-1.2.2.tar.xz) = 1140844	3	SIZE (irssi-1.2.3.tar.xz) = 1145292




--- src/core/modules.c.orig	2021-03-13 16:34:06 UTC
+++ src/core/modules.c
@@ -214,7 +214,7 @@ MODULE_FILE_REC *module_register_full(const char *name
 		module = g_new0(MODULE_REC, 1);
 		module->name = g_strdup(name);
 
-                modules = g_slist_append(modules, module);
+                modules = g_slist_prepend(modules, module);
 	}
 
 	file = module_file_find(module, submodule);
@@ -226,7 +226,7 @@ MODULE_FILE_REC *module_register_full(const char *name
 	file->name = g_strdup(submodule);
         file->defined_module_name = g_strdup(defined_module_name);
 
-	module->files = g_slist_append(module->files, file);
+	module->files = g_slist_prepend(module->files, file);
         return file;
 }
 




--- src/core/servers-reconnect.c.orig	2019-08-29 13:48:46 UTC
+++ src/core/servers-reconnect.c
@@ -151,10 +151,6 @@ static int server_reconnect_timeout(void)
 
 static void sserver_connect(SERVER_SETUP_REC *rec, SERVER_CONNECT_REC *conn)
 {
-        conn->family = rec->family;
-	conn->address = g_strdup(rec->address);
-	if (conn->port == 0) conn->port = rec->port;
-
 	server_setup_fill_reconn(conn, rec);
 	server_reconnect_add(conn, rec->last_connect+reconnect_time);
 	server_connect_unref(conn);
@@ -181,10 +177,20 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, 
 	dest->tag = g_strdup(src->tag);
 
 	if (connect_info) {
-                dest->family = src->family;
+		dest->family = src->family;
 		dest->address = g_strdup(src->address);
 		dest->port = src->port;
 		dest->password = g_strdup(src->password);
+
+		dest->use_tls = src->use_tls;
+		dest->tls_cert = g_strdup(src->tls_cert);
+		dest->tls_pkey = g_strdup(src->tls_pkey);
+		dest->tls_verify = src->tls_verify;
+		dest->tls_cafile = g_strdup(src->tls_cafile);
+		dest->tls_capath = g_strdup(src->tls_capath);
+		dest->tls_ciphers = g_strdup(src->tls_ciphers);
+		dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert);
+		dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey);
 	}
 
 	dest->chatnet = g_strdup(src->chatnet);
@@ -207,16 +213,6 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, 
 	dest->no_autosendcmd = src->no_autosendcmd;
 	dest->unix_socket = src->unix_socket;
 
-	dest->use_tls = src->use_tls;
-	dest->tls_cert = g_strdup(src->tls_cert);
-	dest->tls_pkey = g_strdup(src->tls_pkey);
-	dest->tls_verify = src->tls_verify;
-	dest->tls_cafile = g_strdup(src->tls_cafile);
-	dest->tls_capath = g_strdup(src->tls_capath);
-	dest->tls_ciphers = g_strdup(src->tls_ciphers);
-	dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert);
-	dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey);
-
 	return dest;
 }
 
@@ -293,7 +289,7 @@ static void sig_reconnect(SERVER_REC *server)
 		    (!rec->last_connect || !rec->last_failed ||
 		     rec->last_connect < now-FAILED_RECONNECT_WAIT)) {
 			if (rec == sserver)
-                                conn->port = server->connrec->port;
+				conn->port = server->connrec->port;
 			sserver_connect(rec, conn);
 			return;
 		}




--- src/core/servers-setup.c.orig	2019-08-29 13:48:46 UTC
+++ src/core/servers-setup.c
@@ -108,6 +108,35 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn
 	if (sserver->password != NULL && conn->password == NULL)
 		conn->password = g_strdup(sserver->password);
 
+	if (sserver->no_proxy)
+		g_free_and_null(conn->proxy);
+
+	if (sserver->family != 0 && conn->family == 0)
+		conn->family = sserver->family;
+	if (sserver->address && !conn->address)
+		conn->address = g_strdup(sserver->address);
+	if (sserver->port > 0 && conn->port <= 0)
+		conn->port = sserver->port;
+
+	conn->use_tls = sserver->use_tls;
+	if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
+		conn->tls_cert = g_strdup(sserver->tls_cert);
+	if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0')
+		conn->tls_pkey = g_strdup(sserver->tls_pkey);
+	if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0')
+		conn->tls_pass = g_strdup(sserver->tls_pass);
+	conn->tls_verify = sserver->tls_verify;
+	if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0')
+		conn->tls_cafile = g_strdup(sserver->tls_cafile);
+	if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0')
+		conn->tls_capath = g_strdup(sserver->tls_capath);
+	if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
+		conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
+	if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0')
+		conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
+	if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0')
+		conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
+
 	signal_emit("server setup fill reconn", 2, conn, sserver);
 }
 
@@ -158,33 +187,6 @@ static void server_setup_fill_server(SERVER_CONNECT_RE
 	g_return_if_fail(IS_SERVER_SETUP(sserver));
 
 	sserver->last_connect = time(NULL);
-
-        if (sserver->no_proxy)
-		g_free_and_null(conn->proxy);
-
-	if (sserver->family != 0 && conn->family == 0)
-                conn->family = sserver->family;
-	if (sserver->port > 0 && conn->port <= 0)
-		conn->port = sserver->port;
-
-	conn->use_tls = sserver->use_tls;
-	if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
-		conn->tls_cert = g_strdup(sserver->tls_cert);
-	if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0')
-		conn->tls_pkey = g_strdup(sserver->tls_pkey);
-	if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0')
-		conn->tls_pass = g_strdup(sserver->tls_pass);
-	conn->tls_verify = sserver->tls_verify;
-	if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0')
-		conn->tls_cafile = g_strdup(sserver->tls_cafile);
-	if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0')
-		conn->tls_capath = g_strdup(sserver->tls_capath);
-	if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
-		conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
-	if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0')
-		conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
-	if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0')
-		conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
 
 	server_setup_fill_reconn(conn, sserver);
 




--- src/fe-text/term-terminfo.c.orig	2019-08-29 13:48:46 UTC
+++ src/fe-text/term-terminfo.c
@@ -672,7 +672,11 @@ void term_stop(void)
 
 static int input_utf8(const unsigned char *buffer, int size, unichar *result)
 {
-	unichar c = g_utf8_get_char_validated((char *)buffer, size);
+	unichar c = g_utf8_get_char_validated((char *) buffer, size);
+
+	/* GLib >= 2.63 do not accept Unicode NUL anymore */
+	if (c == (unichar) -2 && *buffer == 0 && size > 0)
+		c = 0;
 
 	switch (c) {
 	case (unichar)-1:

Lines 132-137 include/irssi/src/irc/notifylist/notify-setup.h Link Here

(-)b/irc/irssi/pkg-plist (+1 lines)
132	include/irssi/src/irc/notifylist/notifylist.h	132	include/irssi/src/irc/notifylist/notifylist.h
133	include/irssi/src/lib-config/iconfig.h	133	include/irssi/src/lib-config/iconfig.h
134	include/irssi/src/lib-config/module.h	134	include/irssi/src/lib-config/module.h
		135	@dir lib/irssi/modules
135	%%PROXY%%lib/irssi/modules/libirc_proxy.a	136	%%PROXY%%lib/irssi/modules/libirc_proxy.a
136	%%PROXY%%lib/irssi/modules/libirc_proxy.so	137	%%PROXY%%lib/irssi/modules/libirc_proxy.so
137	%%OTR%%lib/irssi/modules/libotr_core.a	138	%%OTR%%lib/irssi/modules/libotr_core.a

Return to bug 255116

Removed Link Here

(-)a/irc/irssi/files/patch-src_core_modules.c (-20 lines)
1	--- src/core/modules.c.orig 2021-03-13 16:34:06 UTC
2	+++ src/core/modules.c
3	@@ -214,7 +214,7 @@ MODULE_FILE_REC module_register_full(const char name
4	module = g_new0(MODULE_REC, 1);
5	module->name = g_strdup(name);
6
7	- modules = g_slist_append(modules, module);
8	+ modules = g_slist_prepend(modules, module);
9	}
10
11	file = module_file_find(module, submodule);
12	@@ -226,7 +226,7 @@ MODULE_FILE_REC module_register_full(const char name
13	file->name = g_strdup(submodule);
14	file->defined_module_name = g_strdup(defined_module_name);
15
16	- module->files = g_slist_append(module->files, file);
17	+ module->files = g_slist_prepend(module->files, file);
18	return file;
19	}
20

Removed Link Here

(-)a/irc/irssi/files/patch-src_core_servers-reconnect.c (-61 lines)
1	--- src/core/servers-reconnect.c.orig 2019-08-29 13:48:46 UTC
2	+++ src/core/servers-reconnect.c
3	@@ -151,10 +151,6 @@ static int server_reconnect_timeout(void)
4
5	static void sserver_connect(SERVER_SETUP_REC rec, SERVER_CONNECT_REC conn)
6	{
7	- conn->family = rec->family;
8	- conn->address = g_strdup(rec->address);
9	- if (conn->port == 0) conn->port = rec->port;
10	-
11	server_setup_fill_reconn(conn, rec);
12	server_reconnect_add(conn, rec->last_connect+reconnect_time);
13	server_connect_unref(conn);
14	@@ -181,10 +177,20 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src,
15	dest->tag = g_strdup(src->tag);
16
17	if (connect_info) {
18	- dest->family = src->family;
19	+ dest->family = src->family;
20	dest->address = g_strdup(src->address);
21	dest->port = src->port;
22	dest->password = g_strdup(src->password);
23	+
24	+ dest->use_tls = src->use_tls;
25	+ dest->tls_cert = g_strdup(src->tls_cert);
26	+ dest->tls_pkey = g_strdup(src->tls_pkey);
27	+ dest->tls_verify = src->tls_verify;
28	+ dest->tls_cafile = g_strdup(src->tls_cafile);
29	+ dest->tls_capath = g_strdup(src->tls_capath);
30	+ dest->tls_ciphers = g_strdup(src->tls_ciphers);
31	+ dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert);
32	+ dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey);
33	}
34
35	dest->chatnet = g_strdup(src->chatnet);
36	@@ -207,16 +213,6 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src,
37	dest->no_autosendcmd = src->no_autosendcmd;
38	dest->unix_socket = src->unix_socket;
39
40	- dest->use_tls = src->use_tls;
41	- dest->tls_cert = g_strdup(src->tls_cert);
42	- dest->tls_pkey = g_strdup(src->tls_pkey);
43	- dest->tls_verify = src->tls_verify;
44	- dest->tls_cafile = g_strdup(src->tls_cafile);
45	- dest->tls_capath = g_strdup(src->tls_capath);
46	- dest->tls_ciphers = g_strdup(src->tls_ciphers);
47	- dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert);
48	- dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey);
49	-
50	return dest;
51	}
52
53	@@ -293,7 +289,7 @@ static void sig_reconnect(SERVER_REC *server)
54	(!rec->last_connect \|\| !rec->last_failed \|\|
55	rec->last_connect < now-FAILED_RECONNECT_WAIT)) {
56	if (rec == sserver)
57	- conn->port = server->connrec->port;
58	+ conn->port = server->connrec->port;
59	sserver_connect(rec, conn);
60	return;
61	}

Removed Link Here

(-)a/irc/irssi/files/patch-src_core_servers-setup.c (-72 lines)
1	--- src/core/servers-setup.c.orig 2019-08-29 13:48:46 UTC
2	+++ src/core/servers-setup.c
3	@@ -108,6 +108,35 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn
4	if (sserver->password != NULL && conn->password == NULL)
5	conn->password = g_strdup(sserver->password);
6
7	+ if (sserver->no_proxy)
8	+ g_free_and_null(conn->proxy);
9	+
10	+ if (sserver->family != 0 && conn->family == 0)
11	+ conn->family = sserver->family;
12	+ if (sserver->address && !conn->address)
13	+ conn->address = g_strdup(sserver->address);
14	+ if (sserver->port > 0 && conn->port <= 0)
15	+ conn->port = sserver->port;
16	+
17	+ conn->use_tls = sserver->use_tls;
18	+ if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
19	+ conn->tls_cert = g_strdup(sserver->tls_cert);
20	+ if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0')
21	+ conn->tls_pkey = g_strdup(sserver->tls_pkey);
22	+ if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0')
23	+ conn->tls_pass = g_strdup(sserver->tls_pass);
24	+ conn->tls_verify = sserver->tls_verify;
25	+ if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0')
26	+ conn->tls_cafile = g_strdup(sserver->tls_cafile);
27	+ if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0')
28	+ conn->tls_capath = g_strdup(sserver->tls_capath);
29	+ if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
30	+ conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
31	+ if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0')
32	+ conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
33	+ if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0')
34	+ conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
35	+
36	signal_emit("server setup fill reconn", 2, conn, sserver);
37	}
38
39	@@ -158,33 +187,6 @@ static void server_setup_fill_server(SERVER_CONNECT_RE
40	g_return_if_fail(IS_SERVER_SETUP(sserver));
41
42	sserver->last_connect = time(NULL);
43	-
44	- if (sserver->no_proxy)
45	- g_free_and_null(conn->proxy);
46	-
47	- if (sserver->family != 0 && conn->family == 0)
48	- conn->family = sserver->family;
49	- if (sserver->port > 0 && conn->port <= 0)
50	- conn->port = sserver->port;
51	-
52	- conn->use_tls = sserver->use_tls;
53	- if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
54	- conn->tls_cert = g_strdup(sserver->tls_cert);
55	- if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0')
56	- conn->tls_pkey = g_strdup(sserver->tls_pkey);
57	- if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0')
58	- conn->tls_pass = g_strdup(sserver->tls_pass);
59	- conn->tls_verify = sserver->tls_verify;
60	- if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0')
61	- conn->tls_cafile = g_strdup(sserver->tls_cafile);
62	- if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0')
63	- conn->tls_capath = g_strdup(sserver->tls_capath);
64	- if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
65	- conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
66	- if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0')
67	- conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
68	- if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0')
69	- conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
70
71	server_setup_fill_reconn(conn, sserver);
72

Removed Link Here

(-)a/irc/irssi/files/patch-src_fe-text_term-terminfo.c (-15 lines)
1	--- src/fe-text/term-terminfo.c.orig 2019-08-29 13:48:46 UTC
2	+++ src/fe-text/term-terminfo.c
3	@@ -672,7 +672,11 @@ void term_stop(void)
4
5	static int input_utf8(const unsigned char buffer, int size, unichar result)
6	{
7	- unichar c = g_utf8_get_char_validated((char *)buffer, size);
8	+ unichar c = g_utf8_get_char_validated((char *) buffer, size);
9	+
10	+ /* GLib >= 2.63 do not accept Unicode NUL anymore */
11	+ if (c == (unichar) -2 && *buffer == 0 && size > 0)
12	+ c = 0;
13
14	switch (c) {
15	case (unichar)-1: