diff options
| author | Breno Leitao <breno.leitao@gmail.com> | 2017-04-08 11:04:25 +0000 |
|---|---|---|
| committer | Breno Leitao <breno.leitao@gmail.com> | 2017-04-08 11:04:25 +0000 |
| commit | f7b39d5f6ce952a66aac3b1375c336b20a99e054 (patch) | |
| tree | 78ab5fdfd8ccccbaf258582c73724a7da5de323b /community/irssi-xmpp | |
| parent | 7e8aac71b4e5a11942a0032bdb55c52169cd8288 (diff) | |
| download | aports-f7b39d5f6ce952a66aac3b1375c336b20a99e054.tar.bz2 aports-f7b39d5f6ce952a66aac3b1375c336b20a99e054.tar.xz | |
community/irssi-xmpp: Fix FTBFS with new struct fields
use_ssl field of SERVER_CONNECT_REC has been renamed to use_tls.
Patch integrated upstream already
0d9e5f7f1a0edaea0de312828ce47d11f74ee3dc
Diffstat (limited to 'community/irssi-xmpp')
| -rw-r--r-- | community/irssi-xmpp/APKBUILD | 6 | ||||
| -rw-r--r-- | community/irssi-xmpp/fix_ssl_struct.patch | 57 |
2 files changed, 59 insertions, 4 deletions
diff --git a/community/irssi-xmpp/APKBUILD b/community/irssi-xmpp/APKBUILD index 3eb194d149..c387844f16 100644 --- a/community/irssi-xmpp/APKBUILD +++ b/community/irssi-xmpp/APKBUILD @@ -10,6 +10,7 @@ license="GPL2" makedepends="irssi-dev loudmouth-dev" subpackages="$pkgname-doc" source="https://cybione.org/~irssi-xmpp/files/$pkgname-$pkgver.tar.gz + fix_ssl_struct.patch musl-fixes.patch" builddir="$srcdir/$pkgname-$pkgver" @@ -23,9 +24,6 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -md5sums="8c9906e4efbd6f3c8bd8420f0ac8fd91 irssi-xmpp-0.53.tar.gz -f44711684e3c492b862fbe7b209b93da musl-fixes.patch" -sha256sums="6487362d23af7b9c185d8ac74e6b651e697cacc01de8bb9c750db1752140536f irssi-xmpp-0.53.tar.gz -cea5aacb88b49b40a919a8659e7dbc76bbc9100019bd55be7af3ba6c8e8e0be7 musl-fixes.patch" sha512sums="09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be irssi-xmpp-0.53.tar.gz +8fabc71b9b45eace69041c4b446f8227e92ce426980bb03f3251d7fac1d0cf96ef00a3f5f0a21b07590dabc97db605ac39f5d78131d945b95e466c3fd6a2cac7 fix_ssl_struct.patch d75fb0687ab9af9a87409e61605f2bb443729be06fc4d7f9e900783c7b9375efc43acec128c91bdeb2c19983c5bedac567a30042ff28f53e6817e976932de0ef musl-fixes.patch" diff --git a/community/irssi-xmpp/fix_ssl_struct.patch b/community/irssi-xmpp/fix_ssl_struct.patch new file mode 100644 index 0000000000..a92d4db473 --- /dev/null +++ b/community/irssi-xmpp/fix_ssl_struct.patch @@ -0,0 +1,57 @@ +From 0d9e5f7f1a0edaea0de312828ce47d11f74ee3dc Mon Sep 17 00:00:00 2001 +From: benaryorg <binary@benary.org> +Date: Fri, 20 Jan 2017 06:31:28 +0100 +Subject: [PATCH] fix build with irssi 1.0 + +use_ssl field of SERVER_CONNECT_REC has been renamed to use_tls. + +Original patch from darix. + +Signed-off-by: benaryorg <binary@benary.org> +--- + src/core/xmpp-servers.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c +index 405ecd9..8d0b62d 100644 +--- a/src/core/xmpp-servers.c ++++ b/src/core/xmpp-servers.c +@@ -32,6 +32,11 @@ + #include "rosters-tools.h" + #include "tools.h" + ++/* IRSSI_ABI_VERSION was introduced in 0.8.18 */ ++#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6 ++# define use_tls use_ssl ++#endif ++ + static void + channels_join(SERVER_REC *server, const char *data, int automatic) + { +@@ -151,7 +156,7 @@ xmpp_server_init_connect(SERVER_CONNECT_REC *connrec) + server->connect_pid = -1; + + if (server->connrec->port <= 0) +- server->connrec->port = (server->connrec->use_ssl) ? ++ server->connrec->port = (server->connrec->use_tls) ? + LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT; + + if (conn->real_jid == NULL) +@@ -335,7 +340,7 @@ lm_open_cb(LmConnection *connection, gboolean success, + g_free(host); + } else + signal_emit("server connecting", 1, server); +- if (server->connrec->use_ssl) ++ if (server->connrec->use_tls) + signal_emit("xmpp server status", 2, server, + "Using SSL encryption."); + else if (lm_ssl_get_use_starttls(lm_connection_get_ssl(server->lmconn))) +@@ -470,7 +475,7 @@ xmpp_server_connect(XMPP_SERVER_REC *server) + return; + error = NULL; + err_msg = NULL; +- if (server->connrec->use_ssl) { ++ if (server->connrec->use_tls) { + if (!set_ssl(server->lmconn, &error, server, FALSE)) { + err_msg = "Cannot init ssl"; + goto err; |