On Fri, Apr 1, 2011 at 1:29 PM, William Orr <w...@worrbase.com> wrote:
> I made some changes to this patch at Paul de Weerd's request (added a > client side rc script). > > Comments? Ok? Would someone be able to commit this? > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/iodine/Makefile,v > retrieving revision 1.11 > diff -N -u Makefile > --- Makefile 3 Dec 2010 07:47:44 -0000 1.11 > +++ Makefile 31 Mar 2011 13:42:18 -0000 > @@ -3,7 +3,7 @@ > COMMENT= tunnel IPv4 data through DNS > > DISTNAME= iodine-0.5.2 > -REVISION= 0 > +REVISION= 1 > CATEGORIES= net > > HOMEPAGE= http://code.kryo.se/iodine/ > ? diff > Index: patches/patch-man_iodine_8 > =================================================================== > RCS file: patches/patch-man_iodine_8 > diff -N -u patches/patch-man_iodine_8 > --- /dev/null 31 Mar 2011 07:42:18 -0000 > +++ patches/patch-man_iodine_8 31 Mar 2011 13:42:18 -0000 > @@ -0,0 +1,16 @@ > +$OpenBSD$ > +--- man/iodine.8.orig Tue Jan 4 21:00:27 2011 > ++++ man/iodine.8 Tue Jan 4 21:01:53 2011 > +@@ -103,10 +103,10 @@ Print usage info and exit. > + Keep running in foreground. > + .TP > + .B -u user > +-Drop privileges and run as user 'user' after setting up tunnel. > ++Drop privileges and run as user 'user' after setting up tunnel. Default > is _iodine. > + .TP > + .B -t chrootdir > +-Chroot to 'chrootdir' after setting up tunnel. > ++Chroot to 'chrootdir' after setting up tunnel. Default is /var/empty. > + .TP > + .B -d device > + Use the TUN device 'device' instead of the normal one, which is dnsX on > Linux > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/iodine/pkg/PLIST,v > retrieving revision 1.3 > diff -N -u pkg/PLIST > --- pkg/PLIST 30 Mar 2009 09:17:45 -0000 1.3 > +++ pkg/PLIST 31 Mar 2011 13:42:18 -0000 > @@ -4,3 +4,5 @@ > @man man/man8/iodine.8 > @bin sbin/iodine > @bin sbin/iodined > +@rcscript ${RCDIR}/iodined > +@rcscript ${RCDIR}/iodine > Index: pkg/iodine.rc > =================================================================== > RCS file: pkg/iodine.rc > diff -N -u pkg/iodine.rc > --- /dev/null 31 Mar 2011 07:42:18 -0000 > +++ pkg/iodine.rc 31 Mar 2011 13:42:18 -0000 > @@ -0,0 +1,9 @@ > +#!/bin/sh > + > +daemon="${TRUEPREFIX}/sbin/iodine" > + > +. /etc/rc.d/rc.subr > + > +pexp="${daemon}[^d]" > + > +rc_cmd $1 > Index: pkg/iodined.rc > =================================================================== > RCS file: pkg/iodined.rc > diff -N -u pkg/iodined.rc > --- /dev/null 31 Mar 2011 07:42:18 -0000 > +++ pkg/iodined.rc 31 Mar 2011 13:42:18 -0000 > @@ -0,0 +1,9 @@ > +#!/bin/sh > + > +daemon="${TRUEPREFIX}/sbin/iodined" > + > +. /etc/rc.d/rc.subr > + > +pexp=${daemon} > + > +rc_cmd $1 > > > > -- > -Will Orr > Anyone? -- -Will Orr
