Date: Fri, 16 Apr 2021 17:28:36 GMT From: Lewis Cook <lcook@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1ed838f5dead - main - irc/irssi: Update to 1.2.3 Message-ID: <202104161728.13GHSaW7002259@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ed838f5dead7db6ce68317480917f89461d848e commit 1ed838f5dead7db6ce68317480917f89461d848e Author: Lewis Cook <lcook@FreeBSD.org> AuthorDate: 2021-04-16 17:26:24 +0000 Commit: Lewis Cook <lcook@FreeBSD.org> CommitDate: 2021-04-16 17:28:17 +0000 irc/irssi: Update to 1.2.3 Changes: https://irssi.org/NEWS/#v1-2-3 PR: 255116 Submitted by: David O'Rourke <dor.bsd@xm0.uk> (maintainer) Approved by: mentors (implicit) --- irc/irssi/Makefile | 3 +- irc/irssi/distinfo | 6 +- irc/irssi/files/patch-src_core_modules.c | 20 ------ irc/irssi/files/patch-src_core_servers-reconnect.c | 61 ------------------ irc/irssi/files/patch-src_core_servers-setup.c | 72 ---------------------- irc/irssi/files/patch-src_fe-text_term-terminfo.c | 15 ----- irc/irssi/pkg-plist | 1 + 7 files changed, 5 insertions(+), 173 deletions(-) diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 5d939f1ba378..5567bec5196b 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -1,6 +1,5 @@ PORTNAME= irssi -PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTVERSION= 1.2.3 PORTEPOCH= 2 CATEGORIES?= irc MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo index 4131bae2724f..969342bbe3e9 100644 --- a/irc/irssi/distinfo +++ b/irc/irssi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615547467 -SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578 -SIZE (irssi-1.2.2.tar.xz) = 1140844 +TIMESTAMP = 1618317211 +SHA256 (irssi-1.2.3.tar.xz) = a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f +SIZE (irssi-1.2.3.tar.xz) = 1145292 diff --git a/irc/irssi/files/patch-src_core_modules.c b/irc/irssi/files/patch-src_core_modules.c deleted file mode 100644 index c0961ce9bcb9..000000000000 --- a/irc/irssi/files/patch-src_core_modules.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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; - } - diff --git a/irc/irssi/files/patch-src_core_servers-reconnect.c b/irc/irssi/files/patch-src_core_servers-reconnect.c deleted file mode 100644 index f7bc7ffd728d..000000000000 --- a/irc/irssi/files/patch-src_core_servers-reconnect.c +++ /dev/null @@ -1,61 +0,0 @@ ---- 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; - } diff --git a/irc/irssi/files/patch-src_core_servers-setup.c b/irc/irssi/files/patch-src_core_servers-setup.c deleted file mode 100644 index e565d2cd1eb5..000000000000 --- a/irc/irssi/files/patch-src_core_servers-setup.c +++ /dev/null @@ -1,72 +0,0 @@ ---- 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); - diff --git a/irc/irssi/files/patch-src_fe-text_term-terminfo.c b/irc/irssi/files/patch-src_fe-text_term-terminfo.c deleted file mode 100644 index 90a4774c014c..000000000000 --- a/irc/irssi/files/patch-src_fe-text_term-terminfo.c +++ /dev/null @@ -1,15 +0,0 @@ ---- 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: diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist index f75a37a79b30..ef16c1f83f8e 100644 --- a/irc/irssi/pkg-plist +++ b/irc/irssi/pkg-plist @@ -132,6 +132,7 @@ include/irssi/src/irc/notifylist/notify-setup.h include/irssi/src/irc/notifylist/notifylist.h include/irssi/src/lib-config/iconfig.h include/irssi/src/lib-config/module.h +@dir lib/irssi/modules %%PROXY%%lib/irssi/modules/libirc_proxy.a %%PROXY%%lib/irssi/modules/libirc_proxy.so %%OTR%%lib/irssi/modules/libotr_core.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104161728.13GHSaW7002259>