diff options
author | Michał Górny <mgorny@gentoo.org> | 2020-05-31 12:26:54 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2020-05-31 12:29:52 +0200 |
commit | 9c4251f66f747ef671f52eec8bf6463109f4bc46 (patch) | |
tree | 2977c2322874836fb876d193d05000042434f2c1 /net-irc/quassel-irssi/files | |
parent | dev-python/asynctest: Remove last-rited pkg (diff) | |
download | gentoo-9c4251f66f747ef671f52eec8bf6463109f4bc46.tar.gz gentoo-9c4251f66f747ef671f52eec8bf6463109f4bc46.tar.bz2 gentoo-9c4251f66f747ef671f52eec8bf6463109f4bc46.zip |
net-irc/quassel-irssi: Remove last-rited pkg
Closes: https://bugs.gentoo.org/719728
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'net-irc/quassel-irssi/files')
-rw-r--r-- | net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch | 38 | ||||
-rw-r--r-- | net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch | 20 |
2 files changed, 0 insertions, 58 deletions
diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch deleted file mode 100644 index ddd96ff33316..000000000000 --- a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 35555999f810f49b49ca2a6ec13d4f5b03503007 Mon Sep 17 00:00:00 2001 -From: Pierre-Hugues Husson <husson@archos.com> -Date: Wed, 11 Jan 2017 10:24:08 +0100 -Subject: [PATCH] Fix build for irssi 1.0.0 - ---- - core/quassel-net.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/core/quassel-net.c b/core/quassel-net.c -index 8a6eb55..9ab4829 100644 ---- a/core/quassel-net.c -+++ b/core/quassel-net.c -@@ -117,6 +117,10 @@ static const char *get_nick_flags(SERVER_REC *server) { - return ""; - } - -+// 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 SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) { - Quassel_SERVER_CONNECT_REC *r = (Quassel_SERVER_CONNECT_REC*) conn; - -@@ -132,10 +136,10 @@ static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) { - ret->got = 0; - server_connect_ref(SERVER_CONNECT(conn)); - -- if(conn->use_ssl) { -+ if(conn->use_tls) - ret->ssl = 1; -- } -- ret->connrec->use_ssl = 0; -+ -+ ret->connrec->use_tls = 0; - - ret->channels_join = quassel_irssi_channels_join; - ret->send_message = quassel_irssi_send_message; diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch deleted file mode 100644 index b38154ea0551..000000000000 --- a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rupN quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c quassel-irssi-patched/core/irssi/network-openssl.c ---- quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c 2017-01-19 14:07:24.000000000 -0500 -+++ quassel-irssi-patched/core/irssi/network-openssl.c 2017-01-20 16:07:01.599114339 -0500 -@@ -437,11 +437,11 @@ GIOChannel *irssi_ssl_get_iochannel(GIOC - SSL *ssl; - SSL_CTX *ctx = NULL; - -- const char *mycert = server->connrec->ssl_cert; -- const char *mypkey = server->connrec->ssl_pkey; -- const char *cafile = server->connrec->ssl_cafile; -- const char *capath = server->connrec->ssl_capath; -- gboolean verify = server->connrec->ssl_verify; -+ const char *mycert = server->connrec->tls_cert; -+ const char *mypkey = server->connrec->tls_pkey; -+ const char *cafile = server->connrec->tls_cafile; -+ const char *capath = server->connrec->tls_capath; -+ gboolean verify = server->connrec->tls_verify; - - g_return_val_if_fail(handle != NULL, NULL); - |