Landry Breuil writes:
> Le Thu, Jun 16, 2022 at 09:43:42AM +0100, Stuart Henderson a écrit :
>> On 2022/06/16 16:11, Lauri Tirkkonen wrote:
>> > upstream has removed that file, shipping a pkg-config file instead. Not
>> > sure
>> > what to do with this; irssi-icb seems like it hasn't been maintained for a
>> > while, and I suspect there might have been other changes in irssi's plugin
>> > support that require some effort.
>>
>> irssi-icb is really a blocker for updating this in ports.
>
> the new below diff works for me in very light testing - extensive
> testing welcome now :D
Compiled it all together with this inline diff, to be applied inside
/usr/ports/net
tweaks:
- Lauri's net/irssi update with `make update-patches' to update patch
line numbers
- landry's net/irssi-icb update with @so tags
additions:
net/irssi-xmpp:
- mark broken
I propose waiting for upstream to fully support new irssi and marking
broken for now, since it seems too messy to use WIP fixes. latest
supported version is 1.0.0 according to ${WRKSRC}/NEWS. I opened an
issue here:
https://github.com/cdidier/irssi-xmpp/issues/56
net/twirssi:
- updated to latest git version
- upstream moved to gedge's github, current upstream according to HOMEPAGE
- https in HOMEPAGE and README
- add new RUN_DEPENDS on p5-Twitter-API
- install script from WRKSRC
For version number I left it as 2.8.0plDATE despite upstream changing it
to 2.8.1. This is so that once a 2.8.1 release is cut, it will update
properly from 2.8.0plDATE --> 2.8.1.
Testing
=======
I was able to test all consumers.
irssi-xmpp: broken
twirssi: works in posting tweets, posting DMs and viewing new tweets.
irssi-icb: works in posting to room and /msg
otr: works but AUTH was a bit janky.
I would AUTH <secret> and it would take a while to send on IRC.
sometimes multiple messages printed about AUTH failing would print
if I AUTH'ed multiple times. If you send AUTH and wait for over a
minute (patiently) it seems to mostly work. Sending messages
encrypted works even without AUTH.
Index: irssi/Makefile
===================================================================
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.96
diff -u -p -u -p -r1.96 Makefile
--- irssi/Makefile 11 Mar 2022 19:46:10 -0000 1.96
+++ irssi/Makefile 17 Jun 2022 00:10:37 -0000
@@ -6,7 +6,7 @@ MULTI_PACKAGES = -main -otr
COMMENT-main = modular IRC client with many features
COMMENT-otr = OTR (off-the-record) plugin for irssi
-V = 1.2.3
+V = 1.4.1
DISTNAME = irssi-$V
PKGSPEC-main = irssi-=$V
PKGNAME-main = irssi-$V
@@ -57,8 +57,5 @@ PORTHOME = ${WRKDIR}
post-patch:
${SUBST_CMD} ${WRKSRC}/docs/irssi.1
-
-post-install:
- ${INSTALL_DATA} ${WRKBUILD}/irssi-config ${PREFIX}/include/irssi/
.include <bsd.port.mk>
Index: irssi/distinfo
===================================================================
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 distinfo
--- irssi/distinfo 26 May 2021 13:50:02 -0000 1.36
+++ irssi/distinfo 17 Jun 2022 00:10:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (irssi-1.2.3.tar.gz) = Kcu3RtfldZHY/PeZQG+yjLfC1zS8QojLuLTE4Fz5nCU=
-SIZE (irssi-1.2.3.tar.gz) = 1824077
+SHA256 (irssi-1.4.1.tar.gz) = hmO9DzoxPj5rTA1NJDgd6ZCusidhpJr0erlYvpsOKy8=
+SIZE (irssi-1.4.1.tar.gz) = 1923982
Index: irssi/patches/patch-src_core_settings_c
===================================================================
RCS file: /cvs/ports/net/irssi/patches/patch-src_core_settings_c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-src_core_settings_c
--- irssi/patches/patch-src_core_settings_c 11 Mar 2022 19:46:10 -0000
1.8
+++ irssi/patches/patch-src_core_settings_c 17 Jun 2022 00:10:37 -0000
@@ -1,7 +1,7 @@
Index: src/core/settings.c
--- src/core/settings.c.orig
+++ src/core/settings.c
-@@ -726,7 +726,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
+@@ -750,7 +750,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
else {
/* user configuration file not found, use the default one
from sysconfdir */
Index: irssi/patches/patch-src_fe-common_core_Makefile_in
===================================================================
RCS file: /cvs/ports/net/irssi/patches/patch-src_fe-common_core_Makefile_in,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-src_fe-common_core_Makefile_in
--- irssi/patches/patch-src_fe-common_core_Makefile_in 11 Mar 2022 19:46:10
-0000 1.15
+++ irssi/patches/patch-src_fe-common_core_Makefile_in 17 Jun 2022 00:10:37
-0000
@@ -1,8 +1,8 @@
Index: src/fe-common/core/Makefile.in
--- src/fe-common/core/Makefile.in.orig
+++ src/fe-common/core/Makefile.in
-@@ -421,7 +421,7 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
+@@ -424,7 +424,7 @@ AM_CPPFLAGS = \
+ -I$(top_builddir) \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \
- -DTHEMESDIR=\""$(datadir)/irssi/themes"\"
Index: irssi/patches/patch-src_perl_Makefile_in
===================================================================
RCS file: /cvs/ports/net/irssi/patches/patch-src_perl_Makefile_in,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-src_perl_Makefile_in
--- irssi/patches/patch-src_perl_Makefile_in 11 Mar 2022 19:46:10 -0000
1.15
+++ irssi/patches/patch-src_perl_Makefile_in 17 Jun 2022 00:10:37 -0000
@@ -1,9 +1,9 @@
Index: src/perl/Makefile.in
--- src/perl/Makefile.in.orig
+++ src/perl/Makefile.in
-@@ -411,7 +411,7 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/src/core \
- -I$(top_srcdir)/src/fe-common/core \
+@@ -412,7 +412,7 @@ AM_CPPFLAGS = \
+ -I$(top_builddir) \
+ -I$(builddir) \
$(GLIB_CFLAGS) \
- -DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \
+ -DSCRIPTDIR=\""$(sysconfdir)/irssi/scripts"\" \
Index: irssi/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/irssi/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-main
--- irssi/pkg/PLIST-main 11 Mar 2022 19:46:10 -0000 1.5
+++ irssi/pkg/PLIST-main 17 Jun 2022 00:10:37 -0000
@@ -1,7 +1,6 @@
@pkgpath net/irssi,socks
@bin bin/irssi
include/irssi/
-include/irssi/irssi-config
include/irssi/irssi-config.h
include/irssi/irssi-version.h
include/irssi/src/
@@ -42,6 +41,7 @@ include/irssi/src/core/queries.h
include/irssi/src/core/query-rec.h
include/irssi/src/core/rawlog.h
include/irssi/src/core/recode.h
+include/irssi/src/core/refstrings.h
include/irssi/src/core/server-connect-rec.h
include/irssi/src/core/server-rec.h
include/irssi/src/core/server-setup-rec.h
@@ -102,6 +102,7 @@ include/irssi/src/fe-text/mainwindows.h
include/irssi/src/fe-text/statusbar-item.h
include/irssi/src/fe-text/statusbar.h
include/irssi/src/fe-text/term.h
+include/irssi/src/fe-text/textbuffer-formats.h
include/irssi/src/fe-text/textbuffer-view.h
include/irssi/src/fe-text/textbuffer.h
include/irssi/src/irc/
@@ -151,6 +152,7 @@ lib/irssi/
lib/irssi/modules/
lib/irssi/modules/libirc_proxy.la
@so lib/irssi/modules/libirc_proxy.so
+lib/pkgconfig/irssi-1.pc
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi.pm
Index: irssi-icb/Makefile
===================================================================
RCS file: /cvs/ports/net/irssi-icb/Makefile,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 Makefile
--- irssi-icb/Makefile 11 Mar 2022 19:46:10 -0000 1.46
+++ irssi-icb/Makefile 17 Jun 2022 00:10:37 -0000
@@ -5,7 +5,7 @@ GH_PROJECT= irssi-icb
GH_COMMIT= c4e2ea8939b5b75d1941ebe3335475482d218838
DISTNAME= irssi-icb-0.17
-REVISION= 1
+REVISION= 2
CATEGORIES= net
Index: irssi-icb/patches/patch-configure_ac
===================================================================
RCS file: irssi-icb/patches/patch-configure_ac
diff -N irssi-icb/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ irssi-icb/patches/patch-configure_ac 17 Jun 2022 00:10:37 -0000
@@ -0,0 +1,12 @@
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -33,7 +33,7 @@ IRSSI_INCLUDE=`cd $with_irssi; pwd`
+
+ AC_SUBST(IRSSI_INCLUDE)
+
+-AS_IF([test ! -f "$IRSSI_INCLUDE/irssi-config"],
++AS_IF([test ! -f "$IRSSI_INCLUDE/irssi-config.h"],
+ [AC_ERROR(Not irssi directory: $IRSSI_INCLUDE)]
+ )
+
Index: irssi-icb/patches/patch-src_core_icb-protocol_c
===================================================================
RCS file: irssi-icb/patches/patch-src_core_icb-protocol_c
diff -N irssi-icb/patches/patch-src_core_icb-protocol_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ irssi-icb/patches/patch-src_core_icb-protocol_c 17 Jun 2022 00:10:37
-0000
@@ -0,0 +1,14 @@
+Index: src/core/icb-protocol.c
+--- src/core/icb-protocol.c.orig
++++ src/core/icb-protocol.c
+@@ -340,8 +340,8 @@ static void sig_server_connected(ICB_SERVER_REC *serve
+ return;
+
+ server->readtag =
+- g_input_add(net_sendbuffer_handle(server->handle),
+- G_INPUT_READ,
++ i_input_add(net_sendbuffer_handle(server->handle),
++ I_INPUT_READ,
+ (GInputFunction) icb_parse_incoming, server);
+ }
+
Index: irssi-icb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/irssi-icb/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- irssi-icb/pkg/PLIST 11 Mar 2022 19:46:10 -0000 1.5
+++ irssi-icb/pkg/PLIST 17 Jun 2022 00:10:37 -0000
@@ -1,5 +1,5 @@
@comment lib/irssi/modules/libfe_icb.la
-lib/irssi/modules/libfe_icb.so
+@so lib/irssi/modules/libfe_icb.so
@comment lib/irssi/modules/libicb_core.la
-lib/irssi/modules/libicb_core.so
+@so lib/irssi/modules/libicb_core.so
share/doc/irssi/icb-plugin.txt
Index: irssi-xmpp/Makefile
===================================================================
RCS file: /cvs/ports/net/irssi-xmpp/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- irssi-xmpp/Makefile 11 Mar 2022 19:46:10 -0000 1.17
+++ irssi-xmpp/Makefile 17 Jun 2022 00:10:37 -0000
@@ -1,7 +1,9 @@
+BROKEN= needs to be updated to support irssi >1.0.0
+
COMMENT= XMPP plugin for irssi
DISTNAME= irssi-xmpp-0.54
-REVISION= 2
+REVISION= 3
CATEGORIES= net
Index: twirssi/Makefile
===================================================================
RCS file: /cvs/ports/net/twirssi/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- twirssi/Makefile 11 Mar 2022 19:47:57 -0000 1.16
+++ twirssi/Makefile 17 Jun 2022 00:10:38 -0000
@@ -1,22 +1,22 @@
COMMENT= Twitter script for irssi
-V= 2.6.3
+V= 2.8.0pl20190726
DISTNAME= twirssi-$V
-REVISION= 2
CATEGORIES= net
-HOMEPAGE= http://www.twirssi.com/
+HOMEPAGE= https://www.twirssi.com/
# GPLv2
PERMIT_PACKAGE= Yes
-MASTER_SITES= http://nerd.hu/distfiles/
-EXTRACT_ONLY=
-EXTRACT_SUFX= .pl
+GH_ACCOUNT = gedge
+GH_PROJECT = twirssi
+GH_COMMIT = 630a7019777911054e00dcc6b1ecb66dc1fed318
RUN_DEPENDS= converters/p5-JSON-Any \
net/irssi \
net/p5-Net-Twitter \
+ net/p5-Twitter-API \
www/p5-LWP-Protocol-https \
www/p5-WWW-Shorten
@@ -29,7 +29,7 @@ SUBST_VARS= SCRIPT_DATA_DIR
do-install:
${INSTALL_DATA_DIR} ${SCRIPT_DATA_DIR}
- ${INSTALL_SCRIPT} ${FULLDISTDIR}/twirssi-$V.pl \
+ ${INSTALL_SCRIPT} ${WRKSRC}/twirssi.pl \
${SCRIPT_DATA_DIR}/twirssi.pl
.include <bsd.port.mk>
Index: twirssi/distinfo
===================================================================
RCS file: /cvs/ports/net/twirssi/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- twirssi/distinfo 19 Oct 2015 12:52:27 -0000 1.8
+++ twirssi/distinfo 17 Jun 2022 00:10:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (twirssi-2.6.3.pl) = Az2x9CksB5QOIZNEUoQa+gpc6wIEBEtnOLlZehDShvU=
-SIZE (twirssi-2.6.3.pl) = 143169
+SHA256 (twirssi-2.8.0pl20190726-630a7019.tar.gz) =
bs7nFv6awTdkGhXrIuhi/ho+ifN+niLL7P8Gbm7PrOw=
+SIZE (twirssi-2.8.0pl20190726-630a7019.tar.gz) = 85980
Index: twirssi/pkg/README
===================================================================
RCS file: /cvs/ports/net/twirssi/pkg/README,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 README
--- twirssi/pkg/README 11 Mar 2022 19:47:57 -0000 1.3
+++ twirssi/pkg/README 17 Jun 2022 00:10:38 -0000
@@ -17,4 +17,4 @@ following commands from an irssi(1) wind
/set twitter_passwords <yourpassword>
More information is available at:
- http://www.twirssi.com/?using
+ https://www.twirssi.com/?using
