Like this?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/iodine/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- Makefile    11 Oct 2013 23:50:18 -0000      1.13
+++ Makefile    19 Jun 2014 19:43:02 -0000
@@ -2,8 +2,7 @@
 
 COMMENT=               tunnel IPv4 data through DNS
 
-DISTNAME=              iodine-0.5.2
-REVISION=              0
+DISTNAME=              iodine-0.7.0
 CATEGORIES=            net
 
 HOMEPAGE=              http://code.kryo.se/iodine/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/iodine/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo    2 Jun 2009 06:27:05 -0000       1.3
+++ distinfo    19 Jun 2014 19:43:02 -0000
@@ -1,5 +1,2 @@
-MD5 (iodine-0.5.2.tar.gz) = aVI0PMRhSFf4PbuBJHhx5w==
-RMD160 (iodine-0.5.2.tar.gz) = LA1VIzwqYVeRGluGi8U40nwesIU=
-SHA1 (iodine-0.5.2.tar.gz) = KNDQDlE+IKp/38xhhy3uDsAy8RI=
-SHA256 (iodine-0.5.2.tar.gz) = y8FGZdMlY0MY69b3kvjcIikQG9WlUjJCBXBThhL2peQ=
-SIZE (iodine-0.5.2.tar.gz) = 50788
+SHA256 (iodine-0.7.0.tar.gz) = rStArPFCExbsFYANzeD1h6sx19b4kfqLmWfE3tk8AT4=
+SIZE (iodine-0.7.0.tar.gz) = 96181
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/net/iodine/patches/patch-src_Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-src_Makefile
--- patches/patch-src_Makefile  30 Mar 2009 09:17:45 -0000      1.2
+++ patches/patch-src_Makefile  19 Jun 2014 19:43:02 -0000
@@ -1,23 +1,16 @@
-$OpenBSD: patch-src_Makefile,v 1.2 2009/03/30 09:17:45 sthen Exp $
---- src/Makefile.orig  Sat Mar 21 13:07:49 2009
-+++ src/Makefile       Mon Mar 30 10:09:57 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
-@@ -10,7 +10,8 @@ ARCH = `uname -m`
+--- src/Makefile.orig  Thu Jun 19 12:05:05 2014
++++ src/Makefile       Thu Jun 19 12:05:38 2014
+@@ -9,7 +9,8 @@
  
  LIBPATH = -L.
- LDFLAGS =  -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
--CFLAGS = -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
+ LDFLAGS +=  -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
+-CFLAGS += -std=c99 -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) 
cflags`
 +CFLAGS ?= -g
-+CFLAGS += -c -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
++CFLAGS += -std=c99 -c -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
  
  all: stateos $(CLIENT) $(SERVER)
  
-@@ -18,18 +19,15 @@ stateos:
+@@ -17,18 +18,15 @@
        @echo OS is $(OS), arch is $(ARCH)
  
  $(CLIENT): $(COMMONOBJS) $(CLIENTOBJS)
@@ -32,10 +25,10 @@ $OpenBSD: patch-src_Makefile,v 1.2 2009/
 -      @$(CC) $(COMMONOBJS) $(SERVEROBJS) -o $(SERVER) $(LDFLAGS)
 +      $(CC) $(COMMONOBJS) $(SERVEROBJS) -o $(SERVER) $(LDFLAGS)
  
- .c.o: 
+ .c.o:
 -      @echo CC $<
 -      @$(CC) $(CFLAGS) $< -o $@
 +      $(CC) $(CFLAGS) $< -o $@
  
- clean:
-       @echo "Cleaning src/"
+ base64u.o client.o iodined.o: base64u.h
+ base64u.c: base64.c
Index: patches/patch-src_client_c
===================================================================
RCS file: patches/patch-src_client_c
diff -N patches/patch-src_client_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_client_c  19 Jun 2014 19:43:02 -0000
@@ -0,0 +1,16 @@
+--- src/client.c.orig  Thu Jun 19 12:23:49 2014
++++ src/client.c       Thu Jun 19 12:23:21 2014
+@@ -121,11 +121,11 @@
+       b64u = get_base64u_encoder();
+       b128 = get_base128_encoder();
+       dataenc = get_base32_encoder();
+-      rand_seed = ((unsigned int) rand()) & 0xFFFF;
++      rand_seed = ((unsigned int) arc4random()) & 0xFFFF;
+       send_ping_soon = 1;     /* send ping immediately after startup */
+       conn = CONN_DNS_NULL;
+ 
+-      chunkid = ((unsigned int) rand()) & 0xFFFF;
++      chunkid = ((unsigned int) arc4random()) & 0xFFFF;
+       chunkid_prev = 0;
+       chunkid_prev2 = 0;
+ 
Index: patches/patch-src_iodine_c
===================================================================
RCS file: /cvs/ports/net/iodine/patches/patch-src_iodine_c,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-src_iodine_c
--- patches/patch-src_iodine_c  30 Mar 2009 09:17:45 -0000      1.2
+++ patches/patch-src_iodine_c  19 Jun 2014 19:43:02 -0000
@@ -1,18 +1,24 @@
-$OpenBSD: patch-src_iodine_c,v 1.2 2009/03/30 09:17:45 sthen Exp $
-
-Drop privileges and chroot by default.
-
---- 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);
+--- src/iodine.c.orig  Mon Jun 16 13:28:43 2014
++++ src/iodine.c       Thu Jun 19 12:22:17 2014
+@@ -155,11 +155,10 @@
+ #ifndef WINDOWS32
+       pw = NULL;
+ #endif
 -      username = NULL;
 +      username = "_iodine";
+       memset(password, 0, 33);
+-      srand(time(NULL));
        foreground = 0;
 -      newroot = NULL;
 +      newroot = "/var/empty";
+       context = NULL;
        device = NULL;
-       chunkid = 0;
+       pidfile = NULL;
+@@ -177,7 +176,6 @@
+       WSAStartup(req_version, &wsa_data);
+ #endif
+ 
+-      srand((unsigned) time(NULL));
+       client_init();
  
+ #if !defined(BSD) && !defined(__GLIBC__)
Index: patches/patch-src_iodined_c
===================================================================
RCS file: /cvs/ports/net/iodine/patches/patch-src_iodined_c,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-src_iodined_c
--- patches/patch-src_iodined_c 30 Mar 2009 09:17:45 -0000      1.2
+++ patches/patch-src_iodined_c 19 Jun 2014 19:43:02 -0000
@@ -1,17 +1,39 @@
-$OpenBSD: patch-src_iodined_c,v 1.2 2009/03/30 09:17:45 sthen Exp $
-
-Drop privileges and chroot by default.
-
---- 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;
+--- src/iodined.c.orig Mon Jun 16 13:28:43 2014
++++ src/iodined.c      Thu Jun 19 12:21:31 2014
+@@ -771,7 +771,7 @@
+                               int i;
+                               struct sockaddr_in *tempin;
  
+-                              users[userid].seed = rand();
++                              users[userid].seed = arc4random();
+                               /* Store remote IP number */
+                               tempin = (struct sockaddr_in *) &(q->from);
+                               memcpy(&(users[userid].host), 
&(tempin->sin_addr), sizeof(struct in_addr));
+@@ -1100,7 +1100,7 @@
+               } else {
+                       char buf[2048];
+                       int i;
+-                      unsigned int v = ((unsigned int) rand()) & 0xff ;
++                      unsigned int v = ((unsigned int) arc4random()) & 0xff ;
+ 
+                       memset(buf, 0, sizeof(buf));
+                       buf[0] = (req_frag_size >> 8) & 0xff;
+@@ -2293,8 +2293,8 @@
+       pw = NULL;
+ #endif
+       errormsg = NULL;
 -      username = NULL;
 -      newroot = NULL;
 +      username = "_iodine";
-+      newroot = "/var/empty";
++      newroot = "/var/empty"; 
+       context = NULL;
        device = NULL;
        foreground = 0;
-       bind_enable = 0;
+@@ -2332,7 +2332,6 @@
+ #endif
+ 
+       memset(password, 0, sizeof(password));
+-      srand(time(NULL));
+       fw_query_init();
+ 
+       while ((choice = getopt(argc, argv, "vcsfhDu:t:d:m:l:p:n:b:P:z:F:i:")) 
!= -1) {

Reply via email to