Control: tags -1 + patch pending
attaching patch, uploaded to delayed.
diff -u xorp-1.8.5/debian/changelog xorp-1.8.5/debian/changelog
--- xorp-1.8.5/debian/changelog
+++ xorp-1.8.5/debian/changelog
@@ -1,3 +1,13 @@
+xorp (1.8.5-4.1) wily; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/rules: Handle GCC releases >= 5. Closes: #778188.
+ * Build with -ftemplate-depth=30.
+ * Build with -Werror=sizeof-array-argument.
+ * Rename out_of_range to xorp_out_of_range.
+
+ -- Matthias Klose <d...@debian.org> Wed, 08 Jul 2015 17:07:51 +0200
+
xorp (1.8.5-4) unstable; urgency=low
* Change email of Maintainer.
diff -u xorp-1.8.5/debian/patches/series xorp-1.8.5/debian/patches/series
--- xorp-1.8.5/debian/patches/series
+++ xorp-1.8.5/debian/patches/series
@@ -12,0 +13 @@
+gcc5.diff
diff -u xorp-1.8.5/debian/rules xorp-1.8.5/debian/rules
--- xorp-1.8.5/debian/rules
+++ xorp-1.8.5/debian/rules
@@ -78,6 +78,10 @@
CXXFLAGS += -Wno-error=cast-qual -Wno-error=sizeof-pointer-memaccess
CFLAGS += -Wno-error=maybe-uninitialized
endif
+ifeq (,$(findstring 4.,$(GXXVERSION)))
+ CXXFLAGS += -Wno-error=cast-qual -Wno-error=sizeof-pointer-memaccess
-Wno-error=sizeof-array-argument
+ CFLAGS += -Wno-error=maybe-uninitialized
+endif
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
diff -u xorp-1.8.5/debian/xorp_rtrmgr.8 xorp-1.8.5/debian/xorp_rtrmgr.8
--- xorp-1.8.5/debian/xorp_rtrmgr.8
+++ xorp-1.8.5/debian/xorp_rtrmgr.8
@@ -87 +87 @@
-.\" created by instant / docbook-to-man, Fri 29 Aug 2014, 04:44
+.\" created by instant / docbook-to-man
diff -u xorp-1.8.5/debian/xorpsh.1 xorp-1.8.5/debian/xorpsh.1
--- xorp-1.8.5/debian/xorpsh.1
+++ xorp-1.8.5/debian/xorpsh.1
@@ -67 +67 @@
-.\" created by instant / docbook-to-man, Fri 29 Aug 2014, 04:44
+.\" created by instant / docbook-to-man
only in patch2:
unchanged:
--- xorp-1.8.5.orig/debian/patches/gcc5.diff
+++ xorp-1.8.5/debian/patches/gcc5.diff
@@ -0,0 +1,44 @@
+Index: b/SConstruct
+===================================================================
+--- a/SConstruct
++++ b/SConstruct
+@@ -891,7 +891,7 @@ env.AppendUnique(CXXFLAGS = [
+ '-Wpointer-arith',
+ '-Wcast-align',
+ '-Woverloaded-virtual',
+- '-ftemplate-depth-25',
++ '-ftemplate-depth=30',
+ '-pipe',
+ ])
+
+Index: b/vrrp/vrrp.cc
+===================================================================
+--- a/vrrp/vrrp.cc
++++ b/vrrp/vrrp.cc
+@@ -36,7 +36,7 @@ namespace {
+
+ template <class T>
+ void
+-out_of_range(const string& msg, const T& x)
++xorp_out_of_range(const string& msg, const T& x)
+ {
+ ostringstream oss;
+
+@@ -64,7 +64,7 @@ Vrrp::Vrrp(VrrpVif& vif, EventLoop& e, u
+ //, _arpd(_vif)
+ {
+ if (_vrid < 1 || _vrid > 255)
+- out_of_range("VRID out of range", _vrid);
++ xorp_out_of_range("VRID out of range", _vrid);
+
+ char tmp[sizeof "ff:ff:ff:ff:ff:ff"];
+
+@@ -94,7 +94,7 @@ void
+ Vrrp::set_priority(uint32_t priority)
+ {
+ if (priority == PRIORITY_LEAVE || priority >= PRIORITY_OWN)
+- out_of_range("priority out of range", priority);
++ xorp_out_of_range("priority out of range", priority);
+
+ _priority = priority;
+
