Unbreak build on 4-STABLE.

PR:             56725
Submitted by:   Simon Barner <barner@in.tum.de>
Reviewed by:	Rasmus Kaj <kaj@e.kth.se> (maintainer)
Tweaked by:	Rasmus Kaj, myself

2 files changed, 37 insertions, 0 deletions

diff --git a/www/webredirect/files/patch-incu::incu::log.hh b/www/webredirect/files/patch-incu::incu::log.hh
new file mode 100644
index 0000000..fce46d6
--- /dev/null
+++ b/www/webredirect/files/patch-incu::incu::log.hh
@@ -0,0 +1,18 @@
+--- incu/incu/log.hh.orig	Fri Sep 12 00:55:24 2003
++++ incu/incu/log.hh	Fri Sep 12 01:17:07 2003
+@@ -34,10 +34,15 @@
+     static void setTreshold(LogGrade t) { silence = t; }
+     /** Boring workaround ... Without this, the first thing to get appended to
+      * the Log gets broken. */
++
++    // The following does not work with gcc 2.95.4, but it was a workaround
++    // for GCC 3.x brokenness anyway.
++#if !defined (__GNUC__) || __GNUC__ > 2
+     template<typename T>
+     std::ostream& operator << (const T& t) {
+       return *((std::ostream*)(this)) << t;
+     }
++#endif
+   private:
+     static LogGrade silence;
+     class DeviceMgr;
diff --git a/www/webredirect/files/patch-webredirect.cc b/www/webredirect/files/patch-webredirect.cc
new file mode 100644
index 0000000..9230536
--- /dev/null
+++ b/www/webredirect/files/patch-webredirect.cc
@@ -0,0 +1,19 @@
+--- webredirect.cc.orig Fri Sep 12 00:55:12 2003
++++ webredirect.cc      Fri Sep 12 01:04:57 2003
+@@ -7,6 +7,7 @@
+ #include <iostream>
+ #include <stdexcept>
+ #include <map>
++#include <memory>
+ #include <incu/error.hh>
+ #include <incu/log.hh>
+ #include <incu/socket.hh>
+@@ -62,7 +62,7 @@
+ 
+ int checked_accept(int serv_sock) {
+   struct sockaddr_in remote;
+-  size_t len = sizeof(remote);
++  socklen_t len = sizeof(remote);
+   
+   int remote_fd = accept(serv_sock, reinterpret_cast<sockaddr*>(&remote),
+                         &len);