Hi,

this patch updates iodine to the latest version 0.5.1

Changelog: http://code.kryo.se/iodine/CHANGELOG.html

Builds and passes regression tests on amd64,
though I didn't test it there.

I have a non ports version of 0.5.1 iodined
running on sparc64 without problems so far.

Please test and comment.
-- 
Simon

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/iodine/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile    7 Feb 2008 12:42:11 -0000       1.2
+++ Makefile    30 Mar 2009 08:30:04 -0000
@@ -2,8 +2,7 @@
 
 COMMENT=               tunnel IPv4 data through DNS
 
-DISTNAME=              iodine-0.4.1
-PKGNAME=               ${DISTNAME}p0
+DISTNAME=              iodine-0.5.1
 CATEGORIES=            net
 
 HOMEPAGE=              http://code.kryo.se/iodine/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/iodine/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo    6 Feb 2008 21:42:28 -0000       1.1.1.1
+++ distinfo    30 Mar 2009 08:30:04 -0000
@@ -1,5 +1,5 @@
-MD5 (iodine-0.4.1.tar.gz) = WNgryhGkGgHQ3fp9EF5qSA==
-RMD160 (iodine-0.4.1.tar.gz) = xT0mmvy7M1Rq4LK2Mz9S2ux//eM=
-SHA1 (iodine-0.4.1.tar.gz) = odTPO7yY7DAqdU2yoP1HWkjYj1I=
-SHA256 (iodine-0.4.1.tar.gz) = Zcc4URlaHRRs/pTaGDw/npdtSlI2w5liB41Hlhc3G7Q=
-SIZE (iodine-0.4.1.tar.gz) = 33551
+MD5 (iodine-0.5.1.tar.gz) = W7C1bgR+FFOjaV7AuUeLhA==
+RMD160 (iodine-0.5.1.tar.gz) = BqZjjxOl3g3JIwkdKk/eqTJrIYs=
+SHA1 (iodine-0.5.1.tar.gz) = OE9dWWqNXoe2sO0CG3iL68qbSiA=
+SHA256 (iodine-0.5.1.tar.gz) = TZ3OOYstCokT5kzzaCzIG+7yt2itO4AQ0KNpxjoSw+8=
+SIZE (iodine-0.5.1.tar.gz) = 50636
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/net/iodine/patches/patch-src_Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-src_Makefile
--- patches/patch-src_Makefile  7 Feb 2008 12:42:11 -0000       1.1
+++ patches/patch-src_Makefile  30 Mar 2009 08:30:04 -0000
@@ -1,19 +1,19 @@
 $OpenBSD: patch-src_Makefile,v 1.1 2008/02/07 12:42:11 sthen Exp $
---- src/Makefile.orig  Fri Nov 30 22:11:30 2007
-+++ src/Makefile       Thu Feb  7 11:48:20 2008
+--- src/Makefile.orig  Sat Mar 21 14:07:49 2009
++++ src/Makefile       Mon Mar 30 10:26:51 2009
 @@ -1,4 +1,4 @@
 -CC = gcc
 +CC ?= gcc
  COMMONOBJS = tun.o dns.o read.o encoding.o login.o base32.o base64.o md5.o 
common.o
  CLIENTOBJS = iodine.o
  CLIENT = ../bin/iodine
-@@ -9,7 +9,8 @@ OS = `uname | tr "a-z" "A-Z"`
- ARCH = `uname -m`
+@@ -10,7 +10,8 @@ ARCH = `uname -m`
  
- LDFLAGS =  -lz
--CFLAGS = -c -g -Wall -D$(OS) -pedantic
+ LIBPATH = -L.
+ LDFLAGS =  -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
+-CFLAGS = -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
 +CFLAGS ?= -g
-+CFLAGS += -c -Wall -D$(OS) -pedantic
++CFLAGS += -c -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
  
- all: stateos $(CLIENT) $(SERVER) $(TESTSUITE) 
+ all: stateos $(CLIENT) $(SERVER)
  
Index: patches/patch-src_iodine_c
===================================================================
RCS file: /cvs/ports/net/iodine/patches/patch-src_iodine_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_iodine_c
--- patches/patch-src_iodine_c  6 Feb 2008 21:42:28 -0000       1.1.1.1
+++ patches/patch-src_iodine_c  30 Mar 2009 08:30:04 -0000
@@ -2,10 +2,10 @@
 
 Drop privileges and chroot by default.
 
---- src/iodine.c.orig  Fri Nov 30 23:11:30 2007
-+++ src/iodine.c       Fri Feb  1 20:54:41 2008
-@@ -621,9 +621,9 @@ main(int argc, char **argv)
-       int dns_fd;
+--- src/iodine.c.orig  Sat Mar 21 14:07:49 2009
++++ src/iodine.c       Mon Mar 30 10:25:08 2009
+@@ -1009,9 +1009,9 @@ main(int argc, char **argv)
+       int autodetect_frag_size;
  
        memset(password, 0, 33);
 -      username = NULL;
Index: patches/patch-src_iodined_c
===================================================================
RCS file: /cvs/ports/net/iodine/patches/patch-src_iodined_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_iodined_c
--- patches/patch-src_iodined_c 6 Feb 2008 21:42:28 -0000       1.1.1.1
+++ patches/patch-src_iodined_c 30 Mar 2009 08:30:04 -0000
@@ -2,11 +2,11 @@
 
 Drop privileges and chroot by default.
 
---- src/iodined.c.orig Fri Nov 30 23:11:30 2007
-+++ src/iodined.c      Fri Feb  1 20:54:41 2008
-@@ -447,8 +447,8 @@ main(int argc, char **argv)
-       int port;
-       int mtu;
+--- src/iodined.c.orig Sat Mar 21 14:07:49 2009
++++ src/iodined.c      Mon Mar 30 10:25:08 2009
+@@ -961,8 +961,8 @@ main(int argc, char **argv)
+       int skipipconfig;
+       char *netsize;
  
 -      username = NULL;
 -      newroot = NULL;
@@ -14,4 +14,4 @@
 +      newroot = "/var/empty";
        device = NULL;
        foreground = 0;
-       mtu = 1024;
+       bind_enable = 0;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/iodine/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST   7 Feb 2008 12:42:11 -0000       1.2
+++ pkg/PLIST   30 Mar 2009 08:30:04 -0000
@@ -1,7 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2008/02/07 12:42:11 sthen Exp $
 @newgroup _iodine:598
 @newuser _iodine:598:598:daemon:Iodine User:/nonexistent:/sbin/nologin
-sbin/iodine
-sbin/iodined
-man/man8/
 @man man/man8/iodine.8
+...@bin sbin/iodine
+...@bin sbin/iodined

Reply via email to