- drop patches 01_mandir.patch and 02_make.patch included upstream

  - refresh patches 03_cflags.patch  and 04_base64.patch

diff --git a/debian/changelog b/debian/changelog
index d54f7842c09173cae57bbfc4a3e9349590e924eb..55fb5dbd4b0ba6a8374eb1d2573c41bdc3446dbd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ iodine (0.4.2-1) UNRELEASED; urgency=low
   * 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
 

diff --git a/debian/patches/01_mandir.patch b/debian/patches/01_mandir.patch
deleted file mode 100644 (file)
index 2626fb8..0000000
--- a/debian/patches/01_mandir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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: 

diff --git a/debian/patches/02_make.patch b/debian/patches/02_make.patch
deleted file mode 100644 (file)
index 93e26fa..0000000
--- a/debian/patches/02_make.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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..."

diff --git a/debian/patches/03_cflags.patch b/debian/patches/03_cflags.patch
index 285601d7f3adb01ac40acab85056d932f3451678..4e114ebe4ee9ea78a4645c99bec32343dd6f4fce 100644 (file)
--- a/debian/patches/03_cflags.patch
+++ b/debian/patches/03_cflags.patch
@@ -1,18 +1,18 @@
 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"`
  

diff --git a/debian/patches/04_base64.patch b/debian/patches/04_base64.patch
index 8c5264aad93a1f92a1ea27346db815b7ad597553..14f63e20f0b252cdc1dfd7e5858fe121e8f72463 100644 (file)
--- a/debian/patches/04_base64.patch
+++ b/debian/patches/04_base64.patch
@@ -1,8 +1,8 @@
 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
@@ -10,8 +10,8 @@ and isn't used anyway.
  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
@@ -22,9 +22,9 @@ and isn't used anyway.
  
  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);
  

diff --git a/debian/patches/series b/debian/patches/series
index 4774ab7d556a15794540323df07b86ee3d254301..3da3179677f1bc335291dddf9a935d8d3fff5847 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-01_mandir.patch
-02_make.patch
 03_cflags.patch
 04_base64.patch