* New upstream release:
- new command line switch "-s" to skip configration of the tun interface
(closes: #477692)
+ - drop patches 01_mandir.patch and 02_make.patch included upstream
+ - refresh patches 03_cflags.patch and 04_base64.patch
-- gregor herrmann <gregoa@debian.org> Fri, 08 Aug 2008 15:22:19 -0300
+++ /dev/null
-Author: <gregor+debian@comodo.priv.at>
-Description: escape - in manpage
---- iodine.orig/man/iodine.8
-+++ iodine/man/iodine.8
-@@ -124,13 +124,13 @@
- .TP
- Try it out within your own LAN! Follow these simple steps:
- .TP
--- On your server, run: ./iodined -f 10.0.0.1 test.asdf
-+- On your server, run: ./iodined \-f 10.0.0.1 test.asdf
- (If you already use the 10.0.0.0 network, use another internal net like
- 172.16.0.0)
- .TP
- - Enter a password
- .TP
--- On the client, run: ./iodine -f 192.168.0.1 test.asdf
-+- On the client, run: ./iodine \-f 192.168.0.1 test.asdf
- (Replace 192.168.0.1 with the server's ip address)
- .TP
- - Enter the same password
-@@ -160,10 +160,10 @@
- Now any DNS querys for domains ending with tunnel1.mytunnnel.com will be sent
- to your server. Start iodined on the server. The first argument is the tunnel
- IP address (like 192.168.99.1) and the second is the assigned domain (in this
--case tunnel1.mytunnel.com). The -f argument will keep iodined running in the
-+case tunnel1.mytunnel.com). The \-f argument will keep iodined running in the
- foreground, which helps when testing. iodined will start a virtual interface,
- and also start listening for DNS queries on UDP port 53. Either enter a
--password on the commandline (-P pass) or after the server has started. Now
-+password on the commandline (\-P pass) or after the server has started. Now
- everything is ready for the client.
- .TP
- .B Client side:
+++ /dev/null
-Author: <gregor+debian@comodo.priv.at>
-Description: Always use $(MAKE)
---- iodine.orig/Makefile
-+++ iodine/Makefile
-@@ -35,7 +35,7 @@
- test: all
- @echo "!! The check library is required for compiling and running the tests"
- @echo "!! Get it at http://check.sf.net"
-- @(cd tests; make all)
-+ @(cd tests; $(MAKE) all)
-
- clean:
- @echo "Cleaning..."
Author: <gregor+debian@comodo.priv.at>
Description: Combine upstream CFLAGS with CFLAGS from debian/rules.
---- iodine.orig/src/Makefile
-+++ iodine/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
@@ -9,7 +9,7 @@
ARCH = `uname -m`
- LDFLAGS = -lz
+ LDFLAGS = -lz `sh osflags link`
-CFLAGS = -c -g -Wall -D$(OS) -pedantic
+CFLAGS += -c -D$(OS) -pedantic
- all: stateos $(CLIENT) $(SERVER) $(TESTSUITE)
+ all: stateos $(CLIENT) $(SERVER)
---- iodine.orig/tests/Makefile
-+++ iodine/tests/Makefile
+--- a/tests/Makefile
++++ b/tests/Makefile
@@ -6,7 +6,7 @@
OS = `uname | tr "a-z" "A-Z"`
Author: <gregor+debian@comodo.priv.at>
Description: Don't build/test base64.*; causes a build failure on hppa,
and isn't used anyway.
---- iodine.orig/src/Makefile
-+++ iodine/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
@@ -1,5 +1,5 @@
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
SERVEROBJS = iodined.o user.o
---- iodine.orig/tests/Makefile
-+++ iodine/tests/Makefile
+--- a/tests/Makefile
++++ b/tests/Makefile
@@ -1,7 +1,7 @@
CC = gcc
TEST = test
OS = `uname | tr "a-z" "A-Z"`
---- iodine.orig/tests/test.c
-+++ iodine/tests/test.c
-@@ -49,9 +49,6 @@
+--- a/tests/test.c
++++ b/tests/test.c
+@@ -35,9 +35,6 @@
test = test_base32_create_tests();
suite_add_tcase(iodine, test);
-01_mandir.patch
-02_make.patch
03_cflags.patch
04_base64.patch