diff options
| author | Stefan Wagner <stw@bit-strickerei.de> | 2017-10-08 23:14:24 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-09 15:40:45 +0000 |
| commit | 0d3f39687b2b8841cb87fd0fe91467ad2c514caf (patch) | |
| tree | c05845af73dcad58b9b6c9e862ea71f3ddcbd74a | |
| parent | eb77cea77b81cd8b191cbae8cc0807bd3afde32d (diff) | |
| download | aports-0d3f39687b2b8841cb87fd0fe91467ad2c514caf.tar.bz2 aports-0d3f39687b2b8841cb87fd0fe91467ad2c514caf.tar.xz | |
community/irssi-xmpp: upgrade to 0.54
| -rw-r--r-- | community/irssi-xmpp/APKBUILD | 7 | ||||
| -rw-r--r-- | community/irssi-xmpp/fix_ssl_struct.patch | 57 |
2 files changed, 3 insertions, 61 deletions
diff --git a/community/irssi-xmpp/APKBUILD b/community/irssi-xmpp/APKBUILD index c387844f16..4dee6c792c 100644 --- a/community/irssi-xmpp/APKBUILD +++ b/community/irssi-xmpp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stefan Wagner <stw@bit-strickerei.de> # Maintainer: Stefan Wagner <stw@bit-strickerei.de> pkgname=irssi-xmpp -pkgver=0.53 +pkgver=0.54 pkgrel=0 pkgdesc="An irssi plugin to connect to the Jabber network" url="https://cybione.org/~irssi-xmpp/" @@ -9,8 +9,8 @@ arch="all" license="GPL2" makedepends="irssi-dev loudmouth-dev" subpackages="$pkgname-doc" +options="!check" source="https://cybione.org/~irssi-xmpp/files/$pkgname-$pkgver.tar.gz - fix_ssl_struct.patch musl-fixes.patch" builddir="$srcdir/$pkgname-$pkgver" @@ -24,6 +24,5 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be irssi-xmpp-0.53.tar.gz -8fabc71b9b45eace69041c4b446f8227e92ce426980bb03f3251d7fac1d0cf96ef00a3f5f0a21b07590dabc97db605ac39f5d78131d945b95e466c3fd6a2cac7 fix_ssl_struct.patch +sha512sums="31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14 irssi-xmpp-0.54.tar.gz d75fb0687ab9af9a87409e61605f2bb443729be06fc4d7f9e900783c7b9375efc43acec128c91bdeb2c19983c5bedac567a30042ff28f53e6817e976932de0ef musl-fixes.patch" diff --git a/community/irssi-xmpp/fix_ssl_struct.patch b/community/irssi-xmpp/fix_ssl_struct.patch deleted file mode 100644 index a92d4db473..0000000000 --- a/community/irssi-xmpp/fix_ssl_struct.patch +++ /dev/null @@ -1,57 +0,0 @@ -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; |