Update libpurple, pidgin, and finch to 2.14.13.

See https://keep.imfreedom.org/pidgin/pidgin/file/v2.14.13/ChangeLog for
a list of changes in this release.
This commit is contained in:
Joe Marcus Clarke 2024-05-19 14:01:02 -04:00
parent 507134dd49
commit 62ae030ed1
6 changed files with 5 additions and 74 deletions

View file

@ -1,5 +1,4 @@
PORTNAME= finch PORTNAME= finch
PORTREVISION= 1
MAINTAINER= marcus@FreeBSD.org MAINTAINER= marcus@FreeBSD.org
COMMENT= Finch multi-protocol messaging client (Console UI) COMMENT= Finch multi-protocol messaging client (Console UI)

View file

@ -1,6 +1,6 @@
PORTNAME?= libpurple PORTNAME?= libpurple
PORTVERSION= 2.14.12 PORTVERSION= 2.14.13
PORTREVISION?= 1 PORTREVISION?= 0
CATEGORIES?= net-im CATEGORIES?= net-im
MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION} MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}
DISTNAME= pidgin-${PORTVERSION} DISTNAME= pidgin-${PORTVERSION}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1673974080 TIMESTAMP = 1716140467
SHA256 (pidgin-2.14.12.tar.bz2) = 2b05246be208605edbb93ae9edc079583d449e2a9710db6d348d17f59020a4b7 SHA256 (pidgin-2.14.13.tar.bz2) = 120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8
SIZE (pidgin-2.14.12.tar.bz2) = 8226145 SIZE (pidgin-2.14.13.tar.bz2) = 8230755

View file

@ -1,29 +0,0 @@
--- libpurple/protocols/irc/msgs.c.orig 2022-05-31 01:52:30 UTC
+++ libpurple/protocols/irc/msgs.c
@@ -1622,22 +1622,22 @@ irc_msg_cap(struct irc_conn *irc, const char *name, co
irc->sasl_cb = g_new0(sasl_callback_t, 5);
irc->sasl_cb[id].id = SASL_CB_AUTHNAME;
- irc->sasl_cb[id].proc = irc_sasl_cb_simple;
+ irc->sasl_cb[id].proc = (int(*)(void))irc_sasl_cb_simple;
irc->sasl_cb[id].context = (void *)irc;
id++;
irc->sasl_cb[id].id = SASL_CB_USER;
- irc->sasl_cb[id].proc = irc_sasl_cb_simple;
+ irc->sasl_cb[id].proc = (int(*)(void))irc_sasl_cb_simple;
irc->sasl_cb[id].context = (void *)irc;
id++;
irc->sasl_cb[id].id = SASL_CB_PASS;
- irc->sasl_cb[id].proc = irc_sasl_cb_secret;
+ irc->sasl_cb[id].proc = (int(*)(void))irc_sasl_cb_secret;
irc->sasl_cb[id].context = (void *)irc;
id++;
irc->sasl_cb[id].id = SASL_CB_LOG;
- irc->sasl_cb[id].proc = irc_sasl_cb_log;
+ irc->sasl_cb[id].proc = (int(*)(void))irc_sasl_cb_log;
irc->sasl_cb[id].context = (void *)irc;
id++;

View file

@ -1,38 +0,0 @@
--- libpurple/protocols/jabber/auth_cyrus.c.orig 2021-12-21 02:44:53 UTC
+++ libpurple/protocols/jabber/auth_cyrus.c
@@ -373,30 +373,30 @@ jabber_sasl_build_callbacks(JabberStream *js)
id = 0;
js->sasl_cb[id].id = SASL_CB_GETREALM;
- js->sasl_cb[id].proc = jabber_sasl_cb_realm;
+ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_realm;
js->sasl_cb[id].context = (void *)js;
id++;
js->sasl_cb[id].id = SASL_CB_AUTHNAME;
- js->sasl_cb[id].proc = jabber_sasl_cb_simple;
+ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_simple;
js->sasl_cb[id].context = (void *)js;
id++;
js->sasl_cb[id].id = SASL_CB_USER;
- js->sasl_cb[id].proc = jabber_sasl_cb_simple;
+ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_simple;
js->sasl_cb[id].context = (void *)js;
id++;
account = purple_connection_get_account(js->gc);
if (purple_account_get_password(account) != NULL ) {
js->sasl_cb[id].id = SASL_CB_PASS;
- js->sasl_cb[id].proc = jabber_sasl_cb_secret;
+ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_secret;
js->sasl_cb[id].context = (void *)js;
id++;
}
js->sasl_cb[id].id = SASL_CB_LOG;
- js->sasl_cb[id].proc = jabber_sasl_cb_log;
+ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_log;
js->sasl_cb[id].context = (void*)js;
id++;

View file

@ -1,5 +1,4 @@
PORTNAME= pidgin PORTNAME= pidgin
PORTREVISION= 4
MAINTAINER= marcus@FreeBSD.org MAINTAINER= marcus@FreeBSD.org
COMMENT= Pidgin multi-protocol messaging client (GTK UI) COMMENT= Pidgin multi-protocol messaging client (GTK UI)