I have seen a bunch of people confused by the "socks" FLAVOR of irssi.
Specifically, it's not clear how to use it. After a few tests the
simplest recipe I found is ''SOCKS_SERVER=127.0.0.1:1080 irssi''.
On a system with no shared libs, the irssi--socks FLAVOR might make
sense. But all our architectures now use shared libs and ld.so. Which
means we can use socksify(1) - also from the dante package - to
transparently use a SOCKS proxy with an unflavored irssi program.
socksify(1) has a nice manpage that explains how to use SOCKS5 or even
an HTTP proxy.
We obviously don't need to point people at socksify(1) in all ports that
do network connections. But do we want to give a hint at irssi--socks
users? Maybe a MESSAGE like
"The irssi socks FLAVOR has been removed, please use socksify(1) from
the dante package."
I'm not even sure there is anyone actually using the socks FLAVOR. (If
you do, please speak up!)
Cleanup diff below which includes an automatic upgrade from irssi--socks
to irssi--. The REVISION-otr bump may not be technically needed but
I included it to be safe. I don't use irssi on OpenBSD much but this
survived IRC and ICB tests with socksify(1).
Thoughts? oks?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1137
diff -u -p -r1.1137 Makefile
--- Makefile 16 Jun 2019 22:14:18 -0000 1.1137
+++ Makefile 2 Jul 2019 16:59:25 -0000
@@ -168,7 +168,6 @@
SUBDIR += ircd-ratbox
SUBDIR += irrtoolset
SUBDIR += irssi
- SUBDIR += irssi,socks
SUBDIR += irssi-icb
SUBDIR += irssi-xmpp
SUBDIR += isc-bind
Index: irssi/Makefile
===================================================================
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- irssi/Makefile 1 Jul 2019 13:52:09 -0000 1.84
+++ irssi/Makefile 2 Jul 2019 16:59:25 -0000
@@ -9,13 +9,10 @@ V = 1.2.1
DISTNAME = irssi-$V
PKGSPEC = irssi-=$V
PKGNAME-main = irssi-$V
+PKGNAME-otr = irssi-otr-$V
-REVISION-main = 0
-REVISION-otr = 0
-
-# -otr module doesn't vary between FLAVORs; override default FLAVOR suffix
-FULLPKGNAME-otr = irssi-otr-$V
-FULLPKGPATH-otr = net/irssi,-otr
+REVISION-main = 1
+REVISION-otr = 1
CATEGORIES = net
@@ -31,9 +28,6 @@ WANTLIB += c crypto curses glib-2.0 gmod
MASTER_SITES = https://github.com/irssi/irssi/releases/download/${V}/
-FLAVORS = socks
-FLAVOR ?=
-
LIB_DEPENDS = devel/glib2>=2.28.0
RUN_DEPENDS-otr = net/irssi,-main
@@ -53,12 +47,6 @@ CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_lib_utf8proc_utf8proc_version=no
SEPARATE_BUILD = Yes
-
-.if ${FLAVOR:Msocks}
-CONFIGURE_ARGS += --with-socks
-LIB_DEPENDS += security/dante
-WANTLIB += socks
-.endif
MAKE_FLAGS = scriptdir="${SYSCONFDIR}/irssi/scripts" \
themedir="${SYSCONFDIR}/irssi/themes"
Index: irssi/pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/net/irssi/pkg/DESCR-main,v
retrieving revision 1.1
diff -u -p -r1.1 DESCR-main
--- irssi/pkg/DESCR-main 29 Jun 2019 14:54:09 -0000 1.1
+++ irssi/pkg/DESCR-main 2 Jul 2019 16:59:25 -0000
@@ -1,5 +1,3 @@
Irssi is a modular, console-based IRC client with scripting support
that can also connect to other protocols (like ICB) through the use
of plugins.
-
-Flavor: socks support for dante socks firewall implementation
Index: irssi/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/irssi/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- irssi/pkg/PLIST-main 29 Jun 2019 14:54:09 -0000 1.1
+++ irssi/pkg/PLIST-main 2 Jul 2019 16:59:25 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.1 2019/06/29 14:54:09 tj Exp $
@pkgpath net/irssi
+@pkgpath net/irssi,socks
@bin bin/irssi
include/irssi/
include/irssi/irssi-config
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
