New patch 04_base64: don't build/test {src,tests}/base64* anymore, causes

  a FBTFS on hppa, and isn't actually used anyway (closes: #468404).

diff --git a/debian/changelog b/debian/changelog
index 796f24947cc82604be87c9da6d4ca4a3778fe21e..3a4e27d98578676676b95a388e825e63027ab89c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-iodine (0.4.1-3) UNRELEASED; urgency=low
+iodine (0.4.1-3) unstable; urgency=low
 
   * Fix LSB header in init.d script, thanks to Petter Reinholdtsen for the
     report and the patch (closes: #468653).
   * Set debhelper compatibility level to 6.
+  * New patch 04_base64: don't build/test {src,tests}/base64* anymore, causes
+    a FBTFS on hppa, and isn't actually used anyway (closes: #468404).
 
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 29 Feb 2008 23:14:51 +0100
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Sat, 01 Mar 2008 19:01:22 +0100
 
 iodine (0.4.1-2) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 399adf784f8ea205549c106d0e450b930eff6777..638e3714850409cf16f167c50d42037c18ac3013 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 01_mandir
 02_make
 03_cflags
+04_base64

diff --git a/debian/patches/04_base64.dpatch b/debian/patches/04_base64.dpatch
new file mode 100755 (executable)
index 0000000..748f568
--- /dev/null
+++ b/debian/patches/04_base64.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_base64.dpatch by  <gregor+debian@comodo.priv.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't build/test base64.*; causes a build failure on hppa,
+## DP: and isn't used anyway.
+
+@DPATCH@
+diff -urNad iodine~/src/Makefile iodine/src/Makefile
+--- iodine~/src/Makefile       2008-03-01 18:52:44.000000000 +0100
++++ iodine/src/Makefile        2008-03-01 18:53:00.000000000 +0100
+@@ -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
+diff -urNad iodine~/tests/Makefile iodine/tests/Makefile
+--- iodine~/tests/Makefile     2008-03-01 18:52:44.000000000 +0100
++++ iodine/tests/Makefile      2008-03-01 18:53:37.000000000 +0100
+@@ -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"`
+ 
+diff -urNad iodine~/tests/test.c iodine/tests/test.c
+--- iodine~/tests/test.c       2007-12-01 01:43:06.000000000 +0100
++++ iodine/tests/test.c        2008-03-01 18:53:46.000000000 +0100
+@@ -49,9 +49,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);
+