Refresh patch 03_cflags.patch; drop patch 04_base64.patch, the base64

stuff is used now.

diff --git a/debian/changelog b/debian/changelog
index c0f749f9724302f539b9749f36e8b825c261a000..6056fe95f4db0e73a853896e8c61efa894f3e722 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ iodine (0.5.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/copyright: update years of upstream copyright.
   * Install the new protocol descriptions under doc/*.
+  * Refresh patch 03_cflags.patch; drop patch 04_base64.patch, the base64
+    stuff is used now.
+  
 
  -- gregor herrmann <gregoa@debian.org>  Sun, 25 Jan 2009 01:00:02 +0100
 

diff --git a/debian/patches/03_cflags.patch b/debian/patches/03_cflags.patch
index 4e114ebe4ee9ea78a4645c99bec32343dd6f4fce..4f77e166eb7cdeec5bb064fbeef66462c4b4dc2a 100644 (file)
--- a/debian/patches/03_cflags.patch
+++ b/debian/patches/03_cflags.patch
@@ -6,19 +6,19 @@ Description: Combine upstream CFLAGS with CFLAGS from debian/rules.
  ARCH = `uname -m`
  
  LDFLAGS =  -lz `sh osflags link`
--CFLAGS = -c -g -Wall -D$(OS) -pedantic
-+CFLAGS += -c -D$(OS) -pedantic
+-CFLAGS = -c -g -Wall -D$(OS) -pedantic `sh osflags cflags`
++CFLAGS += -c -D$(OS) -pedantic `sh osflags cflags`
  
  all: stateos $(CLIENT) $(SERVER)
  
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -6,7 +6,7 @@
- OS = `uname | tr "a-z" "A-Z"`
+@@ -7,7 +7,7 @@
  
- LDFLAGS =  -L/usr/local/lib -lcheck
--CFLAGS = -g -Wall -D$(OS) -I../src -I/usr/local/include -pedantic
-+CFLAGS += -D$(OS) -I../src -I/usr/local/include -pedantic
+ CHECK_PATH = /usr/local
+ LDFLAGS = -L$(CHECK_PATH)/lib -lcheck `../src/osflags link`
+-CFLAGS = -g -Wall -D$(OS) -I../src -I$(CHECK_PATH)/include -pedantic `../src/osflags cflags`
++CFLAGS += -D$(OS) -I../src -I$(CHECK_PATH)/include -pedantic `../src/osflags cflags`
  
  all: $(TEST)
-       @./$(TEST)
+       @LD_LIBRARY_PATH=${CHECK_PATH}/lib ./$(TEST)

diff --git a/debian/patches/04_base64.patch b/debian/patches/04_base64.patch
deleted file mode 100644 (file)
index 14f63e2..0000000
--- a/debian/patches/04_base64.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: <gregor+debian@comodo.priv.at>
-Description: Don't build/test base64.*; causes a build failure on hppa,
-and isn't used anyway.
---- 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
-+COMMONOBJS = tun.o dns.o read.o encoding.o login.o base32.o md5.o common.o
- CLIENTOBJS = iodine.o
- CLIENT = ../bin/iodine
- SERVEROBJS = iodined.o user.o
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -1,7 +1,7 @@
- CC = gcc
- TEST = test
--OBJS = test.o base32.o base64.o read.o dns.o encoding.o login.o user.o 
--SRCOBJS = ../src/base32.o  ../src/base64.o ../src/read.o ../src/dns.o ../src/encoding.o ../src/login.o ../src/md5.o ../src/user.o
-+OBJS = test.o base32.o read.o dns.o encoding.o login.o user.o
-+SRCOBJS = ../src/base32.o ../src/read.o ../src/dns.o ../src/encoding.o ../src/login.o ../src/md5.o ../src/user.o
- 
- OS = `uname | tr "a-z" "A-Z"`
- 
---- a/tests/test.c
-+++ b/tests/test.c
-@@ -35,9 +35,6 @@
-       test = test_base32_create_tests();
-       suite_add_tcase(iodine, test);
- 
--      test = test_base64_create_tests();
--      suite_add_tcase(iodine, test);
--
-       test = test_dns_create_tests();
-       suite_add_tcase(iodine, test);
- 

diff --git a/debian/patches/series b/debian/patches/series
index 3da3179677f1bc335291dddf9a935d8d3fff5847..e67e241bb9b27e9cb233e62780b14e48e5db0b06 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 03_cflags.patch
-04_base64.patch