[UPDATE] iodine-0.5.2-p1

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[UPDATE] iodine-0.5.2-p1

William Orr-2
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
Reply | Threaded
Open this post in threaded view
|

Re: [UPDATE] iodine-0.5.2-p1

William Orr-2
On Fri, Apr 1, 2011 at 1:29 PM, William Orr <[hidden email]> 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
Reply | Threaded
Open this post in threaded view
|

Re: [UPDATE] iodine-0.5.2-p1

Brad Smith-14
On 04/04/11 10:13 AM, William Orr wrote:
> On Fri, Apr 1, 2011 at 1:29 PM, William Orr<[hidden email]>  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: 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

New sentences start on a new line.

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply | Threaded
Open this post in threaded view
|

Re: [UPDATE] iodine-0.5.2-p1

William Orr-2
On Mon, Apr 4, 2011 at 6:35 PM, Brad <[hidden email]> wrote:

> On 04/04/11 10:13 AM, William Orr wrote:
>
>> On Fri, Apr 1, 2011 at 1:29 PM, William Orr<[hidden email]>  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: 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
>>>
>>
> New sentences start on a new line.
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
>
Is this commitable now? Thanks.

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/iodine/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile    3 Dec 2010 07:47:44 -0000       1.11
+++ Makefile    28 Feb 2011 01:43:21 -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/
Index: patches/patch-man_iodine_8
===================================================================
RCS file: patches/patch-man_iodine_8
diff -N patches/patch-man_iodine_8
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-man_iodine_8  6 Apr 2011 13:10:34 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- man/iodine.8.orig  Sat Mar 21 09:34:28 2009
++++ man/iodine.8       Wed Apr  6 09:07:34 2011
+@@ -77,9 +77,11 @@ Keep running in foreground.
+ .TP
+ .B -u user
+ Drop privileges and run as user 'user' after setting up tunnel.
++The default is to run as _iodine.
+ .TP
+ .B -t chrootdir
+ Chroot to 'chrootdir' after setting up tunnel.
++By default, iodine chroots to /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 -u -r1.3 PLIST
--- pkg/PLIST   30 Mar 2009 09:17:45 -0000      1.3
+++ pkg/PLIST   31 Mar 2011 13:18:31 -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 pkg/iodine.rc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/iodine.rc       31 Mar 2011 13:35:23 -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 pkg/iodined.rc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/iodined.rc      31 Mar 2011 13:24:48 -0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+daemon="${TRUEPREFIX}/sbin/iodined"
+
+. /etc/rc.d/rc.subr
+
+pexp=${daemon}
+
+rc_cmd $1


--
-Will Orr