After some deep testing of 'cutting edge' 0.3.5a I found some significant flaws
in SOCKS5 negotiation. So finally decided to port latest production version
0.2.8.
OK?
--- Makefile.old Fri Jul 12 23:48:35 2019
+++ Makefile Tue Apr 28 22:45:00 2020
@@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:35 sthen Exp $
-COMMENT = IP-Transparent Tor Hidden Service Connector
+COMMENT = IP-Transparent Tor and I2P Hidden Service Connector
-V = 0.2.1
-DISTNAME = onioncat-$V
-REVISION = 1
+V = 0.2.8
+DISTNAME = onioncat-${V}
+REVISION = 0
CATEGORIES = net
-HOMEPAGE = https://www.cypherpunk.at/onioncat_trac/
+HOMEPAGE = https://www.onioncat.org
MAINTAINER= Paul Irofti <piro...@openbsd.org>
@@ -16,13 +16,12 @@
WANTLIB = c pthread
-MASTER_SITES = http://www.cypherpunk.at/ocat/download/Source/$V/
+MASTER_SITES = https://www.cypherpunk.at/ocat/download/Source/0.2.x/
RUN_DEPENDS = net/tor
SEPARATE_BUILD = Yes
-CONFIGURE_STYLE = simple
-CONFIGURE_ARGS += --mandir=${PREFIX}/man
+CONFIGURE_STYLE = gnu
# Do not pick up gawk or mawk
CONFIGURE_ENV = AWK=awk
--- distinfo.old Wed Apr 29 10:53:48 2020
+++ distinfo Tue Apr 28 22:47:46 2020
@@ -1,2 +1,2 @@
-SHA256 (onioncat-0.2.1.tar.gz) = Gge2K3LuZdEOcLly4q3hOH4iMrwGUnR+A76+cjXISo4=
-SIZE (onioncat-0.2.1.tar.gz) = 179988
+SHA256 (onioncat-0.2.8.tar.gz) =
fed003e151458ef2b6964e957266afbbb493e048cb54a46b948edb70df171d62
+SIZE (onioncat-0.2.8.tar.gz) = 227624
--- pkg/PLIST.old Wed Apr 29 10:54:03 2020
+++ pkg/PLIST Tue Apr 28 20:35:52 2020
@@ -2,4 +2,5 @@
@bin bin/ocat
@man man/man1/ocat.1
share/doc/onioncat/
+share/doc/onioncat/Garlicat-HOWTO
share/doc/onioncat/README
--- pkg/DESCR.old Wed Apr 29 10:54:17 2020
+++ pkg/DESCR Mon Apr 27 16:50:33 2020
@@ -1,4 +1,4 @@
-OnionCat creates a transparent IP layer on top of Tor's hidden services.
+OnionCat creates a transparent IP layer on top of Tor or I2P hidden services.
It transmits any kind of IP-based data transparently through the Tor
network on a location hidden basis. You can think of it as a
point-to-multipoint VPN between hidden services.
Martin
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Tuesday, April 28, 2020 5:34 PM, Martin <martin...@protonmail.com> wrote:
> --- pkg/PLIST.old Mon Oct 25 21:37:52 2010
> +++ pkg/PLIST Tue Apr 28 18:33:22 2020
> @@ -2,4 +2,5 @@
> @bin bin/ocat
> @man man/man1/ocat.1
> share/doc/onioncat/
> +share/doc/onioncat/Garlicat-HOWTO
> share/doc/onioncat/README
>
> Removed them both (@conflict, @bin for symlink) from PLIST.
>
> OK?
>
> Martin
>
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> On Tuesday, April 28, 2020 5:07 PM, Stuart Henderson s...@spacehopper.org
> wrote:
>
> > Oh, gcat is a symlink. Shouldn't have @bin and it seems pretty
> > useless since one can just use -I instead, so it's probably better to
> > remove rather than @conflict with a common package.
> > On 2020/04/28 16:29, Martin wrote:
> >
> > > 0.3.5a works stable for weeks. Anyway, I've asked the author about
> > > versioning.
> > > --- Makefile.old Fri Jul 12 23:48:35 2019
> > > +++ Makefile Tue Apr 28 18:28:15 2020
> > > @@ -1,13 +1,13 @@
> > > $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:35 sthen Exp $
> > > ==========================================================
> > > -COMMENT = IP-Transparent Tor Hidden Service Connector
> > > +COMMENT = IP-Transparent Tor and I2P Hidden Service Connector
> > > -V = 0.2.1
> > > -DISTNAME = onioncat-$V
> > > -REVISION = 1
> > > +V = 0.3.5a
> > > +DISTNAME = onioncat-${V}
> > > +REVISION = 0
> > > CATEGORIES = net
> > > -HOMEPAGE = https://www.cypherpunk.at/onioncat_trac/
> > > +HOMEPAGE = https://www.onioncat.org
> > > MAINTAINER= Paul Irofti piro...@openbsd.org
> > > @@ -16,13 +16,12 @@
> > > WANTLIB = c pthread
> > > -MASTER_SITES = http://www.cypherpunk.at/ocat/download/Source/$V/
> > > +MASTER_SITES = https://www.cypherpunk.at/ocat/download/Source/0.3/
> > > RUN_DEPENDS = net/tor
> > > SEPARATE_BUILD = Yes
> > > -CONFIGURE_STYLE = simple
> > > -CONFIGURE_ARGS += --mandir=${PREFIX}/man
> > > +CONFIGURE_STYLE = gnu
> > > Do not pick up gawk or mawk
> > > ============================
> > > CONFIGURE_ENV = AWK=awk
> > > --- distinfo.old Sun Jan 18 06:14:44 2015
> > > +++ distinfo Mon Apr 27 16:57:48 2020
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (onioncat-0.2.1.tar.gz) =
> > > Gge2K3LuZdEOcLly4q3hOH4iMrwGUnR+A76+cjXISo4=
> > > -SIZE (onioncat-0.2.1.tar.gz) = 179988
> > > +SHA256 (onioncat-0.3.5a.tar.gz) =
> > > 9346847ab65f4e8e63f9bf34eb25a6049bb653e66efc017123e866eb64f48854
> > > +SIZE (onioncat-0.3.5a.tar.gz) = 246122
> > > --- pkg/PLIST.old Mon Oct 25 21:37:52 2010
> > > +++ pkg/PLIST Tue Apr 28 18:33:22 2020
> > > @@ -1,5 +1,8 @@
> > > @comment $OpenBSD: PLIST,v 1.3 2010/10/25 17:37:52 pirofti Exp $
> > > +@conflict coreutils-*
> > > +@bin bin/gcat
> > > @bin bin/ocat
> > > @man man/man1/ocat.1
> > > share/doc/onioncat/
> > > +share/doc/onioncat/Garlicat-HOWTO
> > > share/doc/onioncat/README
> > > --- pkg/DESCR.old Tue Dec 30 16:56:39 2008
> > > +++ pkg/DESCR Mon Apr 27 16:50:33 2020
> > > @@ -1,4 +1,4 @@
> > > -OnionCat creates a transparent IP layer on top of Tor's hidden services.
> > > +OnionCat creates a transparent IP layer on top of Tor or I2P hidden
> > > services.
> > > It transmits any kind of IP-based data transparently through the Tor
> > > network on a location hidden basis. You can think of it as a
> > > point-to-multipoint VPN between hidden services.
> > > Martin
> > > ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> > > On Tuesday, April 28, 2020 3:04 PM, Stuart Henderson s...@spacehopper.org
> > > wrote:
> > >
> > > > On 2020/04/28 13:05, Martin wrote:
> > > >
> > > > > net/onioncat 0.2.1 -> 0.3.5
> > > > > OK?
> > > >
> > > > Not ok.
> > > > Should use CONFIGURE_STYLE=gnu and drop CONFIGURE_ARGS (fixes the path
> > > > to
> > > > config file), update the homepage (https://www.onioncat.org/), use https
> > > > for MASTER_SITES, and either comment-out bin/gcat or register a conflict
> > > > with coreutils.
> > > > Also there is a stable/ directory upstream, combined with the 'a' suffix
> > > > on version numbers in the current/ directory suggest maybe this is not
> > > > the best branch for ports to use - unfortunately upstream changelogs
> > > > stopped around 0.2.2 so it's difficult to figure out what's best.
> > > > Also need to see what the maintainer says.
> > > > (And send diffs, not tars, for updates..)
