diff --git a/net/quassel-irssi/Makefile b/net/quassel-irssi/Makefile deleted file mode 100644 index 7374f6910..000000000 --- a/net/quassel-irssi/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2016 Ben Rosser -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=quassel-irssi -PKG_SOURCE_DATE:=2017-11-30 -PKG_SOURCE_VERSION:=079be662dde374a383646256108a4974c2bc7796 -PKG_RELEASE:=4 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/phhusson/quassel-irssi/tar.gz/$(PKG_SOURCE_VERSION)? -PKG_HASH:=c276a92a47f8edf5ae1d9db0e72a69d078f2f3f80e055853fc6d06099d898966 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION) - -PKG_MAINTAINER:=Ben Rosser -PKG_LICENSE:=GPL-3.0-or-later -PKG_LICENSE_FILES:=core/COPYING - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -MAKE_PATH := core -MAKE_VARS += SYSTEM_QUASSELC=1 IRSSI_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" IRSSI_INCLUDE=$(STAGING_DIR)/usr/include/irssi - -define Package/quassel-irssi - SECTION:=net - CATEGORY:=Network - DEPENDS:=+irssi +quasselc - SUBMENU:=Instant Messaging - URL:=https://github.com/phhusson/quassel-irssi - TITLE:=An irssi plugin to connect to quassel core -endef - -define Package/quassel-irssi/description - An irssi plugin that supports connecting to a quassel core. -endef - -define Package/quassel-irssi/install - $(INSTALL_DIR) $(1)/usr/lib/irssi/modules/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/irssi/modules/libquassel_core.so* $(1)/usr/lib/irssi/modules/ -endef - -$(eval $(call BuildPackage,quassel-irssi)) diff --git a/net/quassel-irssi/patches/001-respect-cflags.patch b/net/quassel-irssi/patches/001-respect-cflags.patch deleted file mode 100644 index 291bed499..000000000 --- a/net/quassel-irssi/patches/001-respect-cflags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/core/Makefile -+++ b/core/Makefile -@@ -3,7 +3,7 @@ DESTDIR ?= - LIBDIR ?= /usr/lib - - #IRSSI_INCLUDE:=/home/phh/irssi-0.8.16-rc1.phh/ --IRSSI_INCLUDE:=/usr/include/irssi/ -+IRSSI_INCLUDE?=/usr/include/irssi/ - IRSSI_LIB?=$(DESTDIR)/$(LIBDIR)/irssi - IRSSI_CFLAGS+=-I$(IRSSI_INCLUDE)/src/ - IRSSI_CFLAGS+=-I$(IRSSI_INCLUDE)/src/core/ -@@ -28,7 +28,7 @@ else - LDFLAGS += -lquasselc - endif - --CFLAGS=-std=gnu11 -Wall -Wextra -Werror -g -O2 $(IRSSI_CFLAGS) $(QUASSELC_FLAGS) -Wmissing-prototypes -Wmissing-declarations -+CFLAGS+=-std=gnu11 -Wall -Wextra -g $(IRSSI_CFLAGS) $(QUASSELC_FLAGS) -Wmissing-prototypes -Wmissing-declarations - - CFLAGS += $(SSL_CFLAGS) - LDFLAGS+= $(SSL_LDLAGS) diff --git a/net/quassel-irssi/patches/002-use-cc-var.patch b/net/quassel-irssi/patches/002-use-cc-var.patch deleted file mode 100644 index aa7385081..000000000 --- a/net/quassel-irssi/patches/002-use-cc-var.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/core/Makefile -+++ b/core/Makefile -@@ -49,7 +49,7 @@ irssi/network-openssl.o: CFLAGS:=$(IRSSI - quasselc-connector.o: CFLAGS:=$(CFLAGS) - - $(TARGET): $(OBJECTS) -- gcc -shared $^ -o $@ -lz $(LDFLAGS) -+ $(CC) -shared $^ -o $@ -lz $(LDFLAGS) - - install: $(TARGET) - $(INSTALL) -d $(IRSSI_LIB)/modules diff --git a/net/quassel-irssi/patches/003-use-pkgconfig-ldflags-quasselc.patch b/net/quassel-irssi/patches/003-use-pkgconfig-ldflags-quasselc.patch deleted file mode 100644 index ddf313a9f..000000000 --- a/net/quassel-irssi/patches/003-use-pkgconfig-ldflags-quasselc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/core/Makefile -+++ b/core/Makefile -@@ -25,7 +25,7 @@ ifndef SYSTEM_QUASSELC - QUASSELC_FLAGS:=-Ilib - else - QUASSELC_FLAGS:=$(shell pkg-config --cflags quasselc) -- LDFLAGS += -lquasselc -+ LDFLAGS += $(shell pkg-config --libs quasselc) - endif - - CFLAGS+=-std=gnu11 -Wall -Wextra -g $(IRSSI_CFLAGS) $(QUASSELC_FLAGS) -Wmissing-prototypes -Wmissing-declarations diff --git a/net/quassel-irssi/patches/010-Get-compatible-with-potential-irssi-abi-8-and-drop-p.patch b/net/quassel-irssi/patches/010-Get-compatible-with-potential-irssi-abi-8-and-drop-p.patch deleted file mode 100644 index 5c84128b5..000000000 --- a/net/quassel-irssi/patches/010-Get-compatible-with-potential-irssi-abi-8-and-drop-p.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 19e810405789a35b92026b56ea49d01a3f544b07 Mon Sep 17 00:00:00 2001 -From: Pierre-Hugues Husson -Date: Tue, 17 Jan 2017 23:09:24 +0100 -Subject: [PATCH] Get compatible with potential irssi abi 8, and drop polling - ---- - core/Makefile | 1 - - core/quassel-net.c | 64 ++++++++++++++++++++++++++++++++++++++-------- - 2 files changed, 53 insertions(+), 10 deletions(-) - ---- a/core/Makefile -+++ b/core/Makefile -@@ -16,7 +16,6 @@ SSL_CFLAGS=$(shell pkg-config --cflags o - SSL_LDLAGS=$(shell pkg-config --libs openssl) - OBJECTS:=quasselc-connector.o quassel-core.o - OBJECTS+=quassel-net.o quassel-msgs.o quassel-cmds.o --OBJECTS+=irssi/network-openssl.o - OBJECTS+=quassel-fe-window.o quassel-fe-level.o quassel-cfg.o - - LDFLAGS ?= ---- a/core/quassel-net.c -+++ b/core/quassel-net.c -@@ -132,10 +132,10 @@ static SERVER_REC* quassel_server_init_c - 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; -@@ -161,12 +161,59 @@ void quassel_net_init(CHAT_PROTOCOL_REC* - signal_add_first("server connected", (SIGNAL_FUNC) sig_connected); - } - --GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_REC *server); -+static void quassel_net_final_setup(SERVER_REC* server, GIOChannel *handle) { -+ quassel_login(handle, server->connrec->nick, server->connrec->password); -+ server->handle->handle = handle; -+ -+ server->readtag = -+ g_input_add(handle, -+ G_INPUT_READ, -+ (GInputFunction) quassel_parse_incoming, server); -+} -+ -+static void quassel_net_ssl_callback(SERVER_REC *server, GIOChannel *handle) { -+ int error; -+ -+ g_return_if_fail(IS_SERVER(server)); -+ -+ error = irssi_ssl_handshake(handle); -+ if (error == -1) { -+ server->connection_lost = TRUE; -+ server_connect_failed(server, NULL); -+ return; -+ } -+ if (error & 1) { -+ if (server->connect_tag != -1) -+ g_source_remove(server->connect_tag); -+ server->connect_tag = g_input_add(handle, error == 1 ? G_INPUT_READ : G_INPUT_WRITE, -+ (GInputFunction) -+ quassel_net_ssl_callback, -+ server); -+ return; -+ } -+ -+ if (server->connect_tag != -1) { -+ g_source_remove(server->connect_tag); -+ server->connect_tag = -1; -+ } -+ -+ quassel_net_final_setup(server, handle); -+} -+ - void quassel_irssi_init_ack(void *arg) { - Quassel_SERVER_REC *server = (Quassel_SERVER_REC*)arg; -- if(!server->ssl) -- goto login; -- GIOChannel* ssl_handle = irssi_ssl_get_iochannel(server->handle->handle, 1337, SERVER(server)); -+ GIOChannel* ssl_handle = net_start_ssl((SERVER_REC*)server); -+ -+ if(server->readtag != -1) { -+ g_source_remove(server->readtag); -+ server->readtag = -1; -+ } -+ -+ if(!server->ssl) { -+ quassel_net_final_setup((SERVER_REC*)server, server->handle->handle); -+ return; -+ } -+ - int error; - //That's polling, and that's really bad... - while( (error=irssi_ssl_handshake(ssl_handle)) & 1) { -@@ -175,10 +222,7 @@ void quassel_irssi_init_ack(void *arg) { - return; - } - } -- server->handle->handle = ssl_handle; -- --login: -- quassel_login(server->handle->handle, server->connrec->nick, server->connrec->password); -+ quassel_net_ssl_callback((SERVER_REC*)server, ssl_handle); - } - - void quassel_irssi_init_nack(void *arg) { diff --git a/net/quassel-irssi/patches/100-Fix-compilation-error-with-new-version-of-irssi.patch b/net/quassel-irssi/patches/100-Fix-compilation-error-with-new-version-of-irssi.patch deleted file mode 100644 index bd1216292..000000000 --- a/net/quassel-irssi/patches/100-Fix-compilation-error-with-new-version-of-irssi.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 61aaa345d3924905aa26023b351fb9502a74de63 Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Sun, 5 Nov 2023 20:50:31 +0100 -Subject: [PATCH 2/2] Fix compilation error with new version of irssi - -Fix compilation error with new version of irssi that changed some -functions names. - -Caused by https://github.com/irssi/irssi/pull/1246 - -Signed-off-by: Christian Marangi ---- - core/quassel-net.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/core/quassel-net.c -+++ b/core/quassel-net.c -@@ -105,8 +105,8 @@ static void sig_connected(Quassel_SERVER - } - - r->readtag = -- g_input_add(net_sendbuffer_handle(r->handle), -- G_INPUT_READ, -+ i_input_add(net_sendbuffer_handle(r->handle), -+ I_INPUT_READ, - (GInputFunction) quassel_parse_incoming, r); - - quassel_init_packet(net_sendbuffer_handle(r->handle), r->ssl); -@@ -166,8 +166,8 @@ static void quassel_net_final_setup(SERV - server->handle->handle = handle; - - server->readtag = -- g_input_add(handle, -- G_INPUT_READ, -+ i_input_add(handle, -+ I_INPUT_READ, - (GInputFunction) quassel_parse_incoming, server); - } - -@@ -185,7 +185,7 @@ static void quassel_net_ssl_callback(SER - if (error & 1) { - if (server->connect_tag != -1) - g_source_remove(server->connect_tag); -- server->connect_tag = g_input_add(handle, error == 1 ? G_INPUT_READ : G_INPUT_WRITE, -+ server->connect_tag = i_input_add(handle, error == 1 ? I_INPUT_READ : I_INPUT_WRITE, - (GInputFunction) - quassel_net_ssl_callback, - server);