On Sun, Jun 21, 2020 at 12:31:45PM +0100, Stuart Henderson wrote: > On 2020/06/20 10:07, Martin wrote: > > Improved port of net/onioncat. > > > > * Stability to prevent segmentation faults > > * New functionality implemented > > Like "distributed virtual switch" functionality; > > Additional integrated loopback responders to simplify setup and debugging > > * gcat symlink has been removed completely because of coreutils conflict > > * man page has been improved to reflect all the changes made > > > > OK? > > Your emailed diff doesn't apply (whitespace/quoted-printable problems, > your mail provider is not a very good choice for technical emails as > it often mangles them in one way or another). > > Here is one that works which has a bit of other tidying. This one is OK > with me (at least ports-wise; I am not interested in running it!) but > the compiler warnings look like real problems so if you're talking to > upstream it maybe a good idea to report them.
That's also OK by me, please go ahead and commit :) > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/onioncat/Makefile,v > retrieving revision 1.15 > diff -u -p -r1.15 Makefile > --- Makefile 6 Apr 2020 08:48:06 -0000 1.15 > +++ Makefile 21 Jun 2020 11:27:43 -0000 > @@ -1,13 +1,12 @@ > # $OpenBSD: Makefile,v 1.15 2020/04/06 08:48:06 pirofti Exp $ > > -COMMENT = IP-Transparent Tor Hidden Service Connector > +COMMENT = IP-Transparent Tor/I2P Hidden Service Connector > > -V = 0.2.1 > +V = 0.3.8 > DISTNAME = onioncat-$V > -REVISION = 2 > CATEGORIES = net > > -HOMEPAGE = https://www.cypherpunk.at/onioncat_trac/ > +HOMEPAGE = https://www.onioncat.org/ > > MAINTAINER= Paul Irofti <p...@irofti.net> > > @@ -16,14 +15,11 @@ PERMIT_PACKAGE = Yes > > WANTLIB = c pthread > > -MASTER_SITES = http://www.cypherpunk.at/ocat/download/Source/$V/ > +MASTER_SITES = https://www.cypherpunk.at/ocat/download/Source/${V:R}/ > > RUN_DEPENDS = net/tor > > SEPARATE_BUILD = Yes > -CONFIGURE_STYLE = simple > -CONFIGURE_ARGS += --mandir=${PREFIX}/man > -# Do not pick up gawk or mawk > -CONFIGURE_ENV = AWK=awk > +CONFIGURE_STYLE = gnu > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/onioncat/distinfo,v > retrieving revision 1.4 > diff -u -p -r1.4 distinfo > --- distinfo 18 Jan 2015 03:14:44 -0000 1.4 > +++ distinfo 21 Jun 2020 11:27:43 -0000 > @@ -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.8.tar.gz) = > 9564d10c64161408a573256ba8aece9296499a753cbdae6bfbc3544e72a1d63b > +SIZE (onioncat-0.3.8.tar.gz) = 242144 > Index: pkg/DESCR > =================================================================== > RCS file: /cvs/ports/net/onioncat/pkg/DESCR,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 DESCR > --- pkg/DESCR 30 Dec 2008 13:56:39 -0000 1.1.1.1 > +++ pkg/DESCR 21 Jun 2020 11:27:43 -0000 > @@ -1,4 +1,4 @@ > -OnionCat creates a transparent IP layer on top of Tor's 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. > +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. > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/onioncat/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -r1.3 PLIST > --- pkg/PLIST 25 Oct 2010 17:37:52 -0000 1.3 > +++ pkg/PLIST 21 Jun 2020 11:27:43 -0000 > @@ -2,4 +2,5 @@ > @bin bin/ocat > @man man/man1/ocat.1 > share/doc/onioncat/ > +share/doc/onioncat/Garlicat-HOWTO > share/doc/onioncat/README