From 54c65884d1b4e2febfe2d8328f0ef98461185277 Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 7 Jun 2017 21:59:08 +0000 Subject: [PATCH] remove the irssi-silc plugin, it's failing with irssi-1.0.3. i'd suggest using silc-client if this is still needed (it's based on irssi anyway). --- net/Makefile | 3 +- net/irssi-silc/Makefile | 53 -------- net/irssi-silc/distinfo | 2 - ...-apps_irssi_src_fe-common_silc_Makefile_in | 11 -- ..._irssi_src_fe-common_silc_fe-common-silc_c | 23 ---- ...patch-apps_irssi_src_silc_core_Makefile_in | 11 -- ...atch-apps_irssi_src_silc_core_client_ops_c | 83 ------------ ...patch-apps_irssi_src_silc_core_silc-core_c | 15 --- ...h-apps_irssi_src_silc_core_silc-nicklist_c | 15 --- net/irssi-silc/patches/patch-configure_ac | 113 ---------------- net/irssi-silc/patches/patch-doc_Makefile_in | 12 -- net/irssi-silc/patches/patch-lib_Makefile_in | 11 -- .../patch-lib_silcclient_client_connect_c | 13 -- .../patches/patch-lib_silcclient_command_c | 39 ------ .../patches/patch-lib_silccore_silcpacket_c | 15 --- .../patches/patch-lib_silcske_silcske_c | 12 -- net/irssi-silc/pkg/DESCR | 11 -- net/irssi-silc/pkg/MESSAGE | 3 - net/irssi-silc/pkg/PLIST | 121 ------------------ 19 files changed, 1 insertion(+), 565 deletions(-) delete mode 100644 net/irssi-silc/Makefile delete mode 100644 net/irssi-silc/distinfo delete mode 100644 net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_Makefile_in delete mode 100644 net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c delete mode 100644 net/irssi-silc/patches/patch-apps_irssi_src_silc_core_Makefile_in delete mode 100644 net/irssi-silc/patches/patch-apps_irssi_src_silc_core_client_ops_c delete mode 100644 net/irssi-silc/patches/patch-apps_irssi_src_silc_core_silc-core_c delete mode 100644 net/irssi-silc/patches/patch-apps_irssi_src_silc_core_silc-nicklist_c delete mode 100644 net/irssi-silc/patches/patch-configure_ac delete mode 100644 net/irssi-silc/patches/patch-doc_Makefile_in delete mode 100644 net/irssi-silc/patches/patch-lib_Makefile_in delete mode 100644 net/irssi-silc/patches/patch-lib_silcclient_client_connect_c delete mode 100644 net/irssi-silc/patches/patch-lib_silcclient_command_c delete mode 100644 net/irssi-silc/patches/patch-lib_silccore_silcpacket_c delete mode 100644 net/irssi-silc/patches/patch-lib_silcske_silcske_c delete mode 100644 net/irssi-silc/pkg/DESCR delete mode 100644 net/irssi-silc/pkg/MESSAGE delete mode 100644 net/irssi-silc/pkg/PLIST diff --git a/net/Makefile b/net/Makefile index b1515315f98..dd75224fbc5 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1008 2017/06/01 21:36:12 fcambus Exp $ +# $OpenBSD: Makefile,v 1.1009 2017/06/07 21:59:08 sthen Exp $ SUBDIR = SUBDIR += GeoIP @@ -173,7 +173,6 @@ SUBDIR += irssi,socks SUBDIR += irssi-icb SUBDIR += irssi-otr - SUBDIR += irssi-silc SUBDIR += irssi-xmpp SUBDIR += isc-bind SUBDIR += isc-bind,geoip diff --git a/net/irssi-silc/Makefile b/net/irssi-silc/Makefile deleted file mode 100644 index 01e1afe970f..00000000000 --- a/net/irssi-silc/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# $OpenBSD: Makefile,v 1.37 2017/02/06 20:28:32 sthen Exp $ - -COMMENT= SILC plugin for irssi - -DISTNAME= irssi-silc-1.1.8 -REVISION= 9 - -CATEGORIES= net - -HOMEPAGE= http://penguin-breeder.org/silc/ - -# GPLv2 -PERMIT_PACKAGE_CDROM= Yes - -WANTLIB += perl # uses perl ABI - -MASTER_SITES= http://martynas.blarzwurst.de/distfiles/ - -BUILD_DEPENDS= devel/gettext \ - devel/glib2 -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -BUILD_DEPENDS+= devel/yasm -.endif -RUN_DEPENDS= net/irssi>=0.8.15 - -MAKE_FLAGS= libfe_common_silc_la_LDFLAGS=-avoid-version \ - libsilc_core_la_LDFLAGS=-avoid-version - -LIBTOOL_FLAGS+= --tag=disable-static -CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.63 -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -CONFIGURE_ENV+= ac_cv_path_NASM=no YASM=${LOCALBASE}/bin/yasm -.endif -CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/irssi/silc \ - --enable-ipv6 \ - --enable-shared=no \ - --with-iconv=${LOCALBASE} \ - --with-perl \ - --with-perl-lib=${PREFIX}/libdata/perl5/site_perl \ - --with-pic \ - --with-silc-plugin=${PREFIX}/lib/irssi - -.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386" -CONFIGURE_ARGS+= --disable-asm -.endif - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/irssi - mv -f ${PREFIX}/share/irssi/scripts ${PREFIX}/share/examples/irssi/ - mv -f ${PREFIX}/share/irssi/themes ${PREFIX}/share/examples/irssi/ - -.include diff --git a/net/irssi-silc/distinfo b/net/irssi-silc/distinfo deleted file mode 100644 index 77917071944..00000000000 --- a/net/irssi-silc/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (irssi-silc-1.1.8.tar.gz) = fm/mVwMySUHERmt4Il+Ve/3dKkDtXXgYoU5X+mBrk98= -SIZE (irssi-silc-1.1.8.tar.gz) = 2392640 diff --git a/net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_Makefile_in b/net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_Makefile_in deleted file mode 100644 index e6b8dca7291..00000000000 --- a/net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-apps_irssi_src_fe-common_silc_Makefile_in,v 1.3 2009/05/23 17:51:14 martynas Exp $ ---- apps/irssi/src/fe-common/silc/Makefile.in.orig Sat May 23 05:35:29 2009 -+++ apps/irssi/src/fe-common/silc/Makefile.in Sat May 23 05:35:39 2009 -@@ -648,7 +648,6 @@ clean-local: - -rm -f libfe_common_silc.a - - libfe_common_silc.a: libfe_common_silc.la -- cp .libs/libfe_common_silc.a . - - install-data-hook: libfe_common_silc.la - -ln -s libfe_common_silc.so $(DESTDIR)$(moduledir)/libfe_silc.so diff --git a/net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c b/net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c deleted file mode 100644 index d55b36a0b93..00000000000 --- a/net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-apps_irssi_src_fe-common_silc_fe-common-silc_c,v 1.2 2016/03/17 23:01:09 sthen Exp $ ---- apps/irssi/src/fe-common/silc/fe-common-silc.c.orig Sat May 23 01:08:57 2009 -+++ apps/irssi/src/fe-common/silc/fe-common-silc.c Sun Mar 13 14:54:45 2016 -@@ -42,6 +42,7 @@ static void silc_init(void) - fe_silc_messages_init(); - fe_silc_queries_init(); - fe_silcnet_init(); -+ irssi_redraw(); - } - - void fe_common_silc_init(void) -@@ -71,3 +72,11 @@ void fe_silc_deinit(void) - { - fe_common_silc_deinit(); - } -+ -+#ifdef IRSSI_ABI_VERSION -+void -+silc_core_abicheck(int * version) -+{ -+ *version = IRSSI_ABI_VERSION; -+} -+#endif diff --git a/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_Makefile_in b/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_Makefile_in deleted file mode 100644 index b3f89abfc09..00000000000 --- a/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-apps_irssi_src_silc_core_Makefile_in,v 1.3 2009/05/23 17:51:14 martynas Exp $ ---- apps/irssi/src/silc/core/Makefile.in.orig Sat May 23 05:35:29 2009 -+++ apps/irssi/src/silc/core/Makefile.in Sat May 23 05:35:39 2009 -@@ -653,7 +653,6 @@ clean-local: - -rm -f libsilc_core.a - - libsilc_core.a: libsilc_core.la -- cp .libs/libsilc_core.a . - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_client_ops_c b/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_client_ops_c deleted file mode 100644 index 35af6ff4b5c..00000000000 --- a/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_client_ops_c +++ /dev/null @@ -1,83 +0,0 @@ -$OpenBSD: patch-apps_irssi_src_silc_core_client_ops_c,v 1.4 2016/03/17 23:01:09 sthen Exp $ ---- apps/irssi/src/silc/core/client_ops.c.orig Sat May 23 01:11:25 2009 -+++ apps/irssi/src/silc/core/client_ops.c Sun Mar 13 14:59:18 2016 -@@ -262,10 +262,11 @@ int verify_message_signature(SilcClientEntry sender, - sizeof(sender->fingerprint)); - if (strcmp(fingerprint, fingerprint2)) { - /* since the public key differs from the senders public key, the -- verification _failed_ */ -+ verification won't be done */ - silc_pkcs_public_key_free(pk); - silc_free(fingerprint); -- ret = SILC_MSG_SIGNED_UNKNOWN; -+ silc_free(fingerprint2); -+ return SILC_MSG_SIGNED_UNKNOWN; - } - silc_free(fingerprint2); - } -@@ -663,9 +664,15 @@ void silc_private_message(SilcClient client, SilcClien - sender->nickname[0] ? sender->nickname : "[]", - sender->username[0] ? userhost : NULL, verified); - else -+#if IRSSI_VERSION_DATE > 20141206 -+ signal_emit("message private", 5, server, cp, -+ sender->nickname[0] ? sender->nickname : "[]", -+ sender->username[0] ? userhost : NULL, server->nick); -+#else - signal_emit("message private", 4, server, cp, - sender->nickname[0] ? sender->nickname : "[]", - sender->username[0] ? userhost : NULL); -+#endif - silc_free(dm); - return; - } -@@ -675,9 +682,15 @@ void silc_private_message(SilcClient client, SilcClien - sender->nickname[0] ? sender->nickname : "[]", - sender->username[0] ? userhost : NULL, verified); - else -+#if IRSSI_VERSION_DATE > 20141206 -+ signal_emit("message private", 5, server, cp, -+ sender->nickname[0] ? sender->nickname : "[]", -+ sender->username[0] ? userhost : NULL, server->nick); -+#else - signal_emit("message private", 4, server, message, - sender->nickname[0] ? sender->nickname : "[]", - sender->username[0] ? userhost : NULL); -+#endif - } - } - -@@ -1069,6 +1082,8 @@ void silc_notify(SilcClient client, SilcClientConnecti - - nick = silc_nicklist_find(chanrec, client_entry2); - if (nick != NULL) { -+ strlcpy(nick->prefixes, (mode & SILC_CHANNEL_UMODE_CHANOP) ? "@" : "", -+ sizeof(nick->prefixes)); - nick->op = (mode & SILC_CHANNEL_UMODE_CHANOP) != 0; - nick->founder = (mode & SILC_CHANNEL_UMODE_CHANFO) != 0; - signal_emit("nick mode changed", 2, chanrec, nick); -@@ -2790,6 +2805,15 @@ static void silc_get_auth_ask_passphrase(const unsigne - silc_free(a); - } - -+static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address, -+ int port) { -+ SERVER_SETUP_REC *rec; -+ -+ rec = server_setup_find(address, port, NULL); -+ return (rec == NULL || rec->port != port) ? NULL : rec; -+} -+ -+ - /* Find authentication data by hostname and port. The hostname may be IP - address as well.*/ - -@@ -2811,7 +2835,7 @@ void silc_get_auth_method(SilcClient client, SilcClien - - /* Check whether we find the password for this server in our - configuration. If it's set, always send it server. */ -- setup = server_setup_find_port(hostname, port); -+ setup = silc_server_setup_find_port(hostname, port); - if (setup && setup->password) { - completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password), - context); diff --git a/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_silc-core_c b/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_silc-core_c deleted file mode 100644 index 3f6372883d8..00000000000 --- a/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_silc-core_c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-apps_irssi_src_silc_core_silc-core_c,v 1.1 2016/03/17 23:01:09 sthen Exp $ ---- apps/irssi/src/silc/core/silc-core.c.orig Sun Mar 13 14:52:09 2016 -+++ apps/irssi/src/silc/core/silc-core.c Sun Mar 13 14:53:23 2016 -@@ -883,3 +883,11 @@ void silc_core_deinit(void) - silc_pkcs_private_key_free(irssi_privkey); - silc_client_free(silc_client); - } -+ -+#ifdef IRSSI_ABI_VERSION -+void -+silc_core_abicheck(int * version) -+{ -+ *version = IRSSI_ABI_VERSION; -+} -+#endif diff --git a/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_silc-nicklist_c b/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_silc-nicklist_c deleted file mode 100644 index 385aa26dfe1..00000000000 --- a/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_silc-nicklist_c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-apps_irssi_src_silc_core_silc-nicklist_c,v 1.2 2009/07/26 15:39:52 martynas Exp $ ---- apps/irssi/src/silc/core/silc-nicklist.c.orig Sat May 23 03:11:25 2009 -+++ apps/irssi/src/silc/core/silc-nicklist.c Sun Jul 26 15:52:06 2009 -@@ -47,8 +47,10 @@ SILC_NICK_REC *silc_nicklist_insert(SILC_CHANNEL_REC * - rec->silc_user = user; - rec->unique_id = user->client; - -- if (user->mode & SILC_CHANNEL_UMODE_CHANOP) -+ if (user->mode & SILC_CHANNEL_UMODE_CHANOP) { - rec->op = TRUE; -+ strlcpy(rec->prefixes, "@", sizeof(rec->prefixes)); -+ } - if (user->mode & SILC_CHANNEL_UMODE_CHANFO) - rec->founder = TRUE; - rec->send_massjoin = send_massjoin; diff --git a/net/irssi-silc/patches/patch-configure_ac b/net/irssi-silc/patches/patch-configure_ac deleted file mode 100644 index 76798bf76dc..00000000000 --- a/net/irssi-silc/patches/patch-configure_ac +++ /dev/null @@ -1,113 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.3 2017/04/16 20:50:06 sthen Exp $ ---- configure.ac.orig Sat Aug 1 07:53:41 2009 -+++ configure.ac Sun Apr 16 21:39:20 2017 -@@ -51,7 +51,7 @@ case "$target" in - check_threads=true - ;; - *-*-openbsd*) -- check_threads=true -+ check_threads=false - ;; - *-*-*bsd*) - check_threads=false -@@ -97,9 +97,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue) - AM_CONDITIONAL(SILC_POWERPC, test x$cpu_ppc = xtrue) - AM_CONDITIONAL(SILC_IA64, test x$cpu_ia64 = xtrue) - --# Control compiler optimizations --CFLAGS=`echo $CFLAGS | sed 's/-O[ 0123456789s]*//g'` -- - AC_PROG_CC - AC_C_INLINE - AC_C_CONST -@@ -166,12 +163,13 @@ AC_DEFUN([SILC_ADD_CFLAGS], - # Function to check if compiler flag works, destination specifiable - # Usage: SILC_ADD_CC_FLAGS(VAR, FLAGS, [ACTION-IF-FAILED]) - AC_DEFUN([SILC_ADD_CC_FLAGS], --[ tmp_CFLAGS="$1_CFLAGS" -- $1_CFLAGS="${$1_CFLAGS} $2" -+[ tmp_CFLAGS="$CFLAGS" -+ CFLAGS="${$1_CFLAGS} $2" - AC_MSG_CHECKING(whether $CC accepts $2 flag) -- AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) -- $1_CFLAGS="$tmp_CFLAGS" -+ AC_TRY_LINK([], [], [AC_MSG_RESULT(yes) -+ $1_CFLAGS="$CFLAGS"], [AC_MSG_RESULT(no) - $3]) -+ CFLAGS="$tmp_CFLAGS" - unset tmp_CFLAGS - ]) - -@@ -471,59 +469,9 @@ fi - ## Compiler and compiler flag checks - ## - --if test "$GCC"; then -- # GCC specific options -- if test "x$summary_debug" = "xyes"; then -- SILC_ADD_CFLAGS(-g) -- else -- SILC_ADD_CFLAGS(-g) -- fi -- SILC_ADD_CFLAGS(-Wall -finline-functions) -- SILC_ADD_CFLAGS(-Wno-pointer-sign) --else -- # Other compilers -- case "$target" in -- alpha*-dec-osf*) -- SILC_ADD_CFLAGS(-g3) -- ;; -- mips*-sgi-irix*) -- SILC_ADD_CFLAGS(-g3) -- ;; -- *) -- SILC_ADD_CFLAGS(-g) -- ;; -- esac -+SILC_ADD_CFLAGS(-Wall -finline-functions) -+SILC_ADD_CFLAGS(-Wno-pointer-sign) - -- # Intel C++ Compiler needs -restrict -- if test "x$CC" = "xicc"; then -- SILC_ADD_CFLAGS(-restrict) -- fi --fi -- --if test x$want_cc_optimizations = xtrue; then -- if test "$GCC"; then -- # GCC specific options -- if test "x$summary_debug" = "xyes"; then -- SILC_ADD_CFLAGS(-O) -- else -- SILC_ADD_CFLAGS(-O2) -- fi -- else -- # Other compilers -- case "$target" in -- alpha*-dec-osf*) -- SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O)) -- ;; -- mips*-sgi-irix*) -- SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O)) -- ;; -- *) -- SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O)) -- ;; -- esac -- fi --fi -- - # - # Workaround a bug in GCC 2.x which causes memory exhaustion - # when compiling sha1 with optimizations on UltraSPARC. -@@ -616,8 +564,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil - - else - # pkg-config check -- PKG_CHECK_MODULES(SILC, [silc >= 1.1], compile_libs=false, compile_libs=true) -- PKG_CHECK_MODULES(SILCCLIENT, [silcclient >= 1.1.1], compile_libs=false, compile_libs=true) -+ #PKG_CHECK_MODULES(SILC, [silc >= 1.1], compile_libs=false, compile_libs=true) -+ #PKG_CHECK_MODULES(SILCCLIENT, [silcclient >= 1.1.1], compile_libs=false, compile_libs=true) - - if test x$compile_libs = xfalse; then - LIBSUBDIR= diff --git a/net/irssi-silc/patches/patch-doc_Makefile_in b/net/irssi-silc/patches/patch-doc_Makefile_in deleted file mode 100644 index 3cb1e975f42..00000000000 --- a/net/irssi-silc/patches/patch-doc_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.3 2009/08/03 21:29:47 martynas Exp $ ---- doc/Makefile.in.orig Sat Aug 1 09:53:41 2009 -+++ doc/Makefile.in Sun Aug 2 22:02:05 2009 -@@ -227,7 +227,7 @@ build_vendor = @build_vendor@ - builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ --docdir = @docdir@ -+docdir = $(DESTDIR)$(DOCDIR) - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ diff --git a/net/irssi-silc/patches/patch-lib_Makefile_in b/net/irssi-silc/patches/patch-lib_Makefile_in deleted file mode 100644 index 79c5b1dfbed..00000000000 --- a/net/irssi-silc/patches/patch-lib_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.3 2009/08/03 21:29:47 martynas Exp $ ---- lib/Makefile.in.orig Sat Aug 1 09:53:41 2009 -+++ lib/Makefile.in Sun Aug 2 22:02:05 2009 -@@ -583,7 +583,6 @@ install-dvi: install-dvi-recursive - - install-exec-am: - @$(NORMAL_INSTALL) -- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - - install-html: install-html-recursive - diff --git a/net/irssi-silc/patches/patch-lib_silcclient_client_connect_c b/net/irssi-silc/patches/patch-lib_silcclient_client_connect_c deleted file mode 100644 index 95fbc13d1d1..00000000000 --- a/net/irssi-silc/patches/patch-lib_silcclient_client_connect_c +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-lib_silcclient_client_connect_c,v 1.1 2009/10/12 18:52:28 sthen Exp $ ---- lib/silcclient/client_connect.c.orig Mon Oct 12 18:32:09 2009 -+++ lib/silcclient/client_connect.c Mon Oct 12 18:33:50 2009 -@@ -262,6 +262,9 @@ static void silc_client_rekey_completion(SilcSKE ske, - silc_ske_free(conn->internal->ske); - conn->internal->ske = NULL; - silc_fsm_finish(fsm); -+ -+ /* Close connection */ -+ silc_client_close_connection(client, conn); - return; - } - diff --git a/net/irssi-silc/patches/patch-lib_silcclient_command_c b/net/irssi-silc/patches/patch-lib_silcclient_command_c deleted file mode 100644 index c43bef3d098..00000000000 --- a/net/irssi-silc/patches/patch-lib_silcclient_command_c +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-lib_silcclient_command_c,v 1.1 2010/07/31 12:43:25 sthen Exp $ ---- lib/silcclient/command.c.orig Tue Aug 11 15:03:47 2009 -+++ lib/silcclient/command.c Tue Aug 11 15:05:30 2009 -@@ -956,7 +956,7 @@ SILC_FSM_STATE(silc_client_command_topic) - } - - if (client->internal->params->full_channel_names) -- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name); -+ silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name); - else - silc_snprintf(tmp, sizeof(tmp), "%s%s%s", - conn->current_channel->channel_name, -@@ -2144,7 +2144,7 @@ SILC_FSM_STATE(silc_client_command_kick) - } - - if (client->internal->params->full_channel_names) -- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name); -+ silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name); - else - silc_snprintf(tmp, sizeof(tmp), "%s%s%s", - conn->current_channel->channel_name, -@@ -2554,7 +2554,7 @@ SILC_FSM_STATE(silc_client_command_leave) - } - - if (client->internal->params->full_channel_names) -- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name); -+ silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name); - else - silc_snprintf(tmp, sizeof(tmp), "%s%s%s", - conn->current_channel->channel_name, -@@ -2621,7 +2621,7 @@ SILC_FSM_STATE(silc_client_command_users) - } - - if (conn->client->internal->params->full_channel_names) -- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name); -+ silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name); - else - silc_snprintf(tmp, sizeof(tmp), "%s%s%s", - conn->current_channel->channel_name, diff --git a/net/irssi-silc/patches/patch-lib_silccore_silcpacket_c b/net/irssi-silc/patches/patch-lib_silccore_silcpacket_c deleted file mode 100644 index 2d495f5b59a..00000000000 --- a/net/irssi-silc/patches/patch-lib_silccore_silcpacket_c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-lib_silccore_silcpacket_c,v 1.1 2010/07/31 12:43:25 sthen Exp $ ---- lib/silccore/silcpacket.c.orig Sat May 29 18:59:19 2010 -+++ lib/silccore/silcpacket.c Sat May 29 19:00:31 2010 -@@ -2231,8 +2231,9 @@ static void silc_packet_read_process(SilcPacketStream - - /* Padding sanity checks */ - if (cipher && silc_cipher_get_mode(cipher) != SILC_CIPHER_MODE_CTR && -- ((normal && paddedlen % block_len != 0) || -- (!normal && silc_packet_special_len(header) % block_len != 0))) { -+ ((normal && block_len && paddedlen % block_len != 0) || -+ (!normal && block_len && -+ silc_packet_special_len(header) % block_len != 0))) { - SILC_LOG_DEBUG(("Packet length %d not multiple by cipher block length", - paddedlen)); - silc_mutex_unlock(stream->lock); diff --git a/net/irssi-silc/patches/patch-lib_silcske_silcske_c b/net/irssi-silc/patches/patch-lib_silcske_silcske_c deleted file mode 100644 index a68d434570a..00000000000 --- a/net/irssi-silc/patches/patch-lib_silcske_silcske_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_silcske_silcske_c,v 1.1 2010/07/31 12:43:25 sthen Exp $ ---- lib/silcske/silcske.c.orig Sat May 29 19:00:50 2010 -+++ lib/silcske/silcske.c Sat May 29 19:01:32 2010 -@@ -2387,6 +2387,8 @@ SILC_FSM_STATE(silc_ske_st_responder_failure) - ske->packet = NULL; - } - ske->status = error; -+ if (ske->status == SILC_SKE_STATUS_OK) -+ ske->status = SILC_SKE_STATUS_ERROR; - - silc_packet_stream_unlink(ske->stream, &silc_ske_stream_cbs, ske); - silc_schedule_task_del_by_context(ske->schedule, ske); diff --git a/net/irssi-silc/pkg/DESCR b/net/irssi-silc/pkg/DESCR deleted file mode 100644 index 7adbe847fd8..00000000000 --- a/net/irssi-silc/pkg/DESCR +++ /dev/null @@ -1,11 +0,0 @@ -SILC is a protocol which allows you to chat using strongly encrypted -connections and secure authentication mechanisms. In other words, -SILC is a secure IRC variant. - -Thanks to Irssi's modularity it is rather easy to extend the SILC -client with an additional protocol handler. Even better, the protocol -can be compiled as a module and loaded during runtime in a "normal" -Irssi client. - -SILC plugin is just a bunch of Makefiles taking the SILC client's -source and compiling the protocol handler as a module. diff --git a/net/irssi-silc/pkg/MESSAGE b/net/irssi-silc/pkg/MESSAGE deleted file mode 100644 index c280fbe964c..00000000000 --- a/net/irssi-silc/pkg/MESSAGE +++ /dev/null @@ -1,3 +0,0 @@ -You need to change theme, otherwise you might experience problems related to -SILC-specific features (e.g. signed messages): /SET theme plugin -You may want to run silc script when working with SILC: /SCRIPT LOAD silc diff --git a/net/irssi-silc/pkg/PLIST b/net/irssi-silc/pkg/PLIST deleted file mode 100644 index a01174ac519..00000000000 --- a/net/irssi-silc/pkg/PLIST +++ /dev/null @@ -1,121 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.8 2014/06/14 10:34:45 sthen Exp $ -lib/irssi/modules/libfe_common_silc.la -lib/irssi/modules/libfe_common_silc.so -@comment lib/irssi/modules/libfe_silc.so -lib/irssi/modules/libsilc_core.la -lib/irssi/modules/libsilc_core.so -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi/Silc.pm -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Silc/ -@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Silc/Silc.bs -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Silc/Silc.so -@comment @man man/man1/silc.1 -share/doc/irssi/silc/ -@comment share/doc/irssi/silc/COPYING -@comment share/doc/irssi/silc/CREDITS -@comment share/doc/irssi/silc/ChangeLog -share/doc/irssi/silc/FAQ -@comment share/doc/irssi/silc/INSTALL -share/doc/irssi/silc/README -share/doc/irssi/silc/README.PLUGIN -@comment share/doc/irssi/silc/TODO -@comment share/doc/irssi/silc/example_silc.conf -share/doc/irssi/silc/formats.txt -share/doc/irssi/silc/manual.txt -share/doc/irssi/silc/signals.txt -share/doc/irssi/silc/special_vars.txt -share/doc/irssi/silc/startup-HOWTO.html -share/examples/irssi/scripts/silc.pl -@sample ${SYSCONFDIR}/irssi/scripts/silc.pl -share/examples/irssi/themes/plugin.theme -@sample ${SYSCONFDIR}/irssi/themes/plugin.theme -share/irssi/help/silc/ -share/irssi/help/silc/action -share/irssi/help/silc/admin -share/irssi/help/silc/alias -share/irssi/help/silc/attr -share/irssi/help/silc/away -share/irssi/help/silc/ban -share/irssi/help/silc/beep -share/irssi/help/silc/bind -share/irssi/help/silc/cat -share/irssi/help/silc/cd -share/irssi/help/silc/channel -share/irssi/help/silc/clear -share/irssi/help/silc/close -share/irssi/help/silc/cmode -share/irssi/help/silc/connect -share/irssi/help/silc/cumode -share/irssi/help/silc/cycle -share/irssi/help/silc/date -share/irssi/help/silc/dehilight -share/irssi/help/silc/detach -share/irssi/help/silc/disconnect -share/irssi/help/silc/echo -share/irssi/help/silc/eval -share/irssi/help/silc/exec -share/irssi/help/silc/file -share/irssi/help/silc/format -share/irssi/help/silc/getkey -share/irssi/help/silc/help -share/irssi/help/silc/hilight -share/irssi/help/silc/ignore -share/irssi/help/silc/info -share/irssi/help/silc/invite -share/irssi/help/silc/invitelist -share/irssi/help/silc/join -share/irssi/help/silc/key -share/irssi/help/silc/kick -share/irssi/help/silc/kickban -share/irssi/help/silc/kill -share/irssi/help/silc/knockout -share/irssi/help/silc/lastlog -share/irssi/help/silc/layout -share/irssi/help/silc/levels -share/irssi/help/silc/list -share/irssi/help/silc/listkeys -share/irssi/help/silc/load -share/irssi/help/silc/log -share/irssi/help/silc/me -share/irssi/help/silc/mmsg -share/irssi/help/silc/motd -share/irssi/help/silc/msg -share/irssi/help/silc/names -share/irssi/help/silc/nick -share/irssi/help/silc/notice -share/irssi/help/silc/oper -share/irssi/help/silc/part -share/irssi/help/silc/perlflush -share/irssi/help/silc/ping -share/irssi/help/silc/query -share/irssi/help/silc/quit -share/irssi/help/silc/recode -share/irssi/help/silc/reconnect -share/irssi/help/silc/reload -share/irssi/help/silc/rmreconns -share/irssi/help/silc/rmrejoins -share/irssi/help/silc/save -share/irssi/help/silc/sconnect -share/irssi/help/silc/script -share/irssi/help/silc/scrollback -share/irssi/help/silc/server -share/irssi/help/silc/set -share/irssi/help/silc/shutdown -share/irssi/help/silc/silc -share/irssi/help/silc/silcnet -share/irssi/help/silc/silcoper -share/irssi/help/silc/smsg -share/irssi/help/silc/stats -share/irssi/help/silc/statusbar -share/irssi/help/silc/toggle -share/irssi/help/silc/topic -share/irssi/help/silc/umode -share/irssi/help/silc/unalias -share/irssi/help/silc/unignore -share/irssi/help/silc/unload -share/irssi/help/silc/unquery -share/irssi/help/silc/users -share/irssi/help/silc/version -share/irssi/help/silc/watch -share/irssi/help/silc/whois -share/irssi/help/silc/whowas -share/irssi/help/silc/window