Hi,
Attached is the diff for my unicon 3.0.4-12.1 NMU.
Sorry, _this_ is the proper one.
diff -u unicon-3.0.4/unicon/server/TLS_Debug.cpp
unicon-3.0.4/unicon/server/TLS_Debug.cpp
--- unicon-3.0.4/unicon/server/TLS_Debug.cpp
+++ unicon-3.0.4/unicon/server/TLS_Debug.cpp
@@ -25,8 +25,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff -u unicon-3.0.4/debian/changelog unicon-3.0.4/debian/changelog
--- unicon-3.0.4/debian/changelog
+++ unicon-3.0.4/debian/changelog
@@ -1,3 +1,12 @@
+unicon (3.0.4-12.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.3 by replacing obsolete headers with their modern
+ versions, and by using namespace “std” when needed (Closes: #461689).
+ + Add debian/patches/fix_ftbfs_with_gcc-4.3.patch
+
+ -- Cyril Brulebois <[EMAIL PROTECTED]> Mon, 17 Mar 2008 05:11:19 +0100
+
unicon (3.0.4-12) unstable; urgency=low
* Merged CVE-2007-2835 to unstable. (Closes:Bug#431336)
only in patch2:
unchanged:
--- unicon-3.0.4.orig/unicon/server/TLS_ImmOp.cpp
+++ unicon-3.0.4/unicon/server/TLS_ImmOp.cpp
@@ -23,7 +23,7 @@
* Author: see CREDITS
*/
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <string.h>
#include <dlfcn.h>
only in patch2:
unchanged:
--- unicon-3.0.4.orig/unicon/server/TLS_LibMain.cpp
+++ unicon-3.0.4/unicon/server/TLS_LibMain.cpp
@@ -35,7 +35,7 @@
#include <signal.h>
#include <netdb.h>
#include <unistd.h>
-#include <iostream.h>
+#include <iostream>
#include <pth.h>
#include <TLS_MemFile.hpp>
only in patch2:
unchanged:
--- unicon-3.0.4.orig/unicon/server/TLS_MemFile.cpp
+++ unicon-3.0.4/unicon/server/TLS_MemFile.cpp
@@ -23,7 +23,7 @@
* Author: see CREDITS
*/
-#include <iostream.h>
+#include <iostream>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
@@ -32,6 +32,8 @@
#include <TLS_MemFile.hpp>
+using namespace std;
+
TLS_CMemFile::TLS_CMemFile (u_long max0)
{
buf = (char *) malloc (max0);
only in patch2:
unchanged:
--- unicon-3.0.4.orig/debian/patches/fix_ftbfs_with_gcc-4.3.patch
+++ unicon-3.0.4/debian/patches/fix_ftbfs_with_gcc-4.3.patch
@@ -0,0 +1,55 @@
+--- a/unicon/server/TLS_Debug.cpp
++++ b/unicon/server/TLS_Debug.cpp
+@@ -25,8 +25,8 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
+ #include <assert.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+--- a/unicon/server/TLS_ImmOp.cpp
++++ b/unicon/server/TLS_ImmOp.cpp
+@@ -23,7 +23,7 @@
+ * Author: see CREDITS
+ */
+
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ #include <string.h>
+ #include <dlfcn.h>
+--- a/unicon/server/TLS_LibMain.cpp
++++ b/unicon/server/TLS_LibMain.cpp
+@@ -35,7 +35,7 @@
+ #include <signal.h>
+ #include <netdb.h>
+ #include <unistd.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <pth.h>
+
+ #include <TLS_MemFile.hpp>
+--- a/unicon/server/TLS_MemFile.cpp
++++ b/unicon/server/TLS_MemFile.cpp
+@@ -23,7 +23,7 @@
+ * Author: see CREDITS
+ */
+
+-#include <iostream.h>
++#include <iostream>
+ #include <assert.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -32,6 +32,8 @@
+
+ #include <TLS_MemFile.hpp>
+
++using namespace std;
++
+ TLS_CMemFile::TLS_CMemFile (u_long max0)
+ {
+ buf = (char *) malloc (max0);
only in patch2:
unchanged:
--- unicon-3.0.4.orig/debian/patches/series
+++ unicon-3.0.4/debian/patches/series
@@ -0,0 +1 @@
+fix_ftbfs_with_gcc-4.3.patch
