summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Perez de Castro2017-03-06 22:48:25 +0200
committerAdrian Perez de Castro2017-03-06 22:48:25 +0200
commit32ef2814c0915b91ddf04daee5d8211e406d48c4 (patch)
tree4fa566d44563f926521f7305f28972e796a5b909
parentd6c9054dcc34020737820ebfc38966ad1ba23c8d (diff)
downloadaur-32ef2814c0915b91ddf04daee5d8211e406d48c4.tar.gz
Remove unneeded patch: use_tls.patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--use_tls.patch29
3 files changed, 4 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c045706edaa..fc656814ee5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = irssi-xmpp-git
pkgdesc = irssi plugin to connect to the Jabber network (cdidier version)
- pkgver = v0.53.1.gb12ca69
+ pkgver = v0.53.3.g6155e0f
pkgrel = 1
url = https://github.com/cdidier/irssi-xmpp
arch = arm
@@ -15,9 +15,7 @@ pkgbase = irssi-xmpp-git
conflicts = irssi-xmpp-cvs
conflicts = irssi-xmpp
source = irssi-xmpp-git::git+https://github.com/cdidier/irssi-xmpp
- source = use_tls.patch
sha512sums = SKIP
- sha512sums = 87fa715cdc438f2f5a7c1cbe64e168b624547b5ac4f5114687737cb65bc5f9c1016634dee05a7a0e2c831b18e5a415eea5c8f87caa50591e3977d873f76601d6
pkgname = irssi-xmpp-git
diff --git a/PKGBUILD b/PKGBUILD
index 4d17b8199ca..d976195065e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Adrian Perez de Castro <aperez@igalia.com>
pkgname='irssi-xmpp-git'
pkgdesc='irssi plugin to connect to the Jabber network (cdidier version)'
-pkgver=v0.53.1.gb12ca69
+pkgver=v0.53.3.g6155e0f
pkgrel=1
arch=('arm' 'armv6h' 'armv7h' 'i686' 'x86_64')
license=('GPL2')
@@ -10,20 +10,14 @@ depends=('loudmouth' 'irssi')
makepdends=('pkg-config')
conflicts=('irssi-xmpp-cvs' 'irssi-xmpp')
provides=('irssi-xmpp')
-source=("${pkgname}::git+${url}" use_tls.patch)
-sha512sums=('SKIP'
- '87fa715cdc438f2f5a7c1cbe64e168b624547b5ac4f5114687737cb65bc5f9c1016634dee05a7a0e2c831b18e5a415eea5c8f87caa50591e3977d873f76601d6')
+source=("${pkgname}::git+${url}")
+sha512sums=('SKIP')
pkgver () {
cd "${pkgname}"
git describe --long --tags | sed -r 's/^REL0(.*)$/r0.\1/;y/-/./'
}
-prepare () {
- cd "${pkgname}"
- patch -p0 < "${srcdir}/use_tls.patch"
-}
-
build () {
cd "${pkgname}"
make PREFIX=/usr IRSSI_INCLUDE=/usr/include/irssi
diff --git a/use_tls.patch b/use_tls.patch
deleted file mode 100644
index 832ae00fb1b..00000000000
--- a/use_tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/core/xmpp-servers.c.orig 2017-02-27 16:57:05.213460563 +0200
-+++ src/core/xmpp-servers.c 2017-02-27 16:57:31.583746615 +0200
-@@ -151,7 +151,7 @@
- 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 +335,7 @@
- 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 +470,7 @@
- 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;