Index: head/net/xorp/Makefile =================================================================== --- head/net/xorp/Makefile (revision 396719) +++ head/net/xorp/Makefile (revision 396720) @@ -1,64 +1,61 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= xorp PORTVERSION= 1.8.5 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= net MAINTAINER= hrs@FreeBSD.org COMMENT= EXtensible Open Router Platform LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs \ libpcap.so:${PORTSDIR}/net/libpcap CONFLICTS_INSTALL= xorp-devel-* USES= tar:bzip2 ncurses scons shebangfix compiler:env python:2,build USE_GITHUB= yes USE_OPENSSL= yes USE_RC_SUBR= xorp GH_ACCOUNT= greearb GH_PROJECT= ${PORTNAME}.ct SHEBANG_FILES= xrl/scripts/clnt-gen xrl/scripts/tgt-gen python_OLD_CMD= .*python WRKSRC= ${WRKDIR}/${GH_PROJECT}-${DISTVERSIONPREFIX}${DISTVERSION}/${PORTNAME} MAKE_ARGS= prefix=${PREFIX} enable_boost=1 SUB_FILES= pkg-message GROUPS= xorp BROKEN_sparc64= Does not compile on sparc64 OPTIONS_DEFINE= OPTIMIZE ORIGIN SHARED STRIP TCP_RPC OPTIONS_DEFAULT= OPTIMIZE ORIGIN SHARED STRIP OPTIONS_SUB= yes OPTIMIZE_DESC= Build with optimization OPTIMIZE_MAKE_ARGS= optimize=highest OPTIMIZE_MAKE_ARGS_OFF= optimize=no ORIGIN_DESC= Use ORIGIN with shared libraries ORIGIN_MAKE_ARGS= origin=true ORIGIN_MAKE_ARGS_OFF= origin=false SHARED_DESC= Build with shared libraries SHARED_MAKE_ARGS= shared=true SHARED_MAKE_ARGS_OFF= shared=false SHARED_USE_ON= LDCONFIG=${PREFIX}/lib/xorp/lib STRIP_MAKE_ARGS= strip=true STRIP_MAKE_ARGS_OFF= strip=false TCP_RPC_DESC= Use TCP as RPC transport (defaults to AF_LOCAL) TCP_RPC_MAKE_ARGS= transport=tcp TCP_RPC_MAKE_ARGS_OFF= transport=local .include post-patch: ${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/SConstruct -.if ${COMPILER_TYPE} == "clang" - ${REINPLACE_CMD} 's,-Werror,& -Wno-unused-function,' ${WRKSRC}/SConstruct -.endif post-install: ${INSTALL_DATA} ${WRKSRC}/rtrmgr/config/multicast4.boot \ ${STAGEDIR}${PREFIX}/etc/xorp.conf.sample .include Index: head/net/xorp/files/patch-SConstruct =================================================================== --- head/net/xorp/files/patch-SConstruct (revision 396719) +++ head/net/xorp/files/patch-SConstruct (revision 396720) @@ -1,44 +1,35 @@ --- SConstruct.orig 2012-01-11 17:56:10 UTC +++ SConstruct @@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0): # XXX TODO: Make initial CPPPATH/LIBPATH derive from # autodetected host system *or* command line. -#env = Environment( -# TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen', -# 'TOOL_SUBST'], -# ENV = os.environ, -# BUILDDIR = builddir, -# CPPPATH=['/usr/local/include', '$BUILDDIR'], -# LIBPATH=['usr/lib', '/usr/local/lib'], -# variables = vars) - env = Environment( TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen', 'TOOL_SUBST'], ENV = os.environ, BUILDDIR = builddir, - CPPPATH=['$BUILDDIR'], - LIBPATH=['usr/lib'], + CPPPATH=['/usr/local/include', '$BUILDDIR'], + LIBPATH=['usr/lib', '/usr/local/lib'], variables = vars) prefix = env['prefix'] -@@ -858,13 +849,13 @@ if ((build != "i386-pc-mingw32") and - host_cpu == "i386" or - host_cpu == "x86_64")): - env.AppendUnique(CFLAGS = [ -- '-Werror', -+ '-Werror -Wno-unused-function', - ]) - env.AppendUnique(CXXFLAGS = [ -- '-Werror', -+ '-Werror -Wno-unused-function', - ]) - else: -- print "WARNING: Detected funky platform, will not enable -Werror compile option: ", host_cpu -+ print "WARNING: Detected funky platform, will not enable -Werror -Wno-unused-function compile option: ", host_cpu - +@@ -880,6 +871,7 @@ env.AppendUnique(CFLAGS = [ + '-Wcast-align', + '-Wstrict-prototypes', + '-Wnested-externs', ++ '-Wno-unused-function', + '-pipe', + ]) - # NOTE: gcc specific flags. Index: head/net/xorp/files/patch-bgp__path_attribute.cc =================================================================== --- head/net/xorp/files/patch-bgp__path_attribute.cc (revision 396719) +++ head/net/xorp/files/patch-bgp__path_attribute.cc (revision 396720) @@ -1,16 +1,35 @@ --- bgp/path_attribute.cc.orig 2012-01-11 17:56:10 UTC +++ bgp/path_attribute.cc -@@ -830,8 +830,11 @@ PathAttribute * +@@ -45,18 +45,6 @@ + + template AttributeManager* PAListRef::_att_mgr = 0; + +-#ifdef DEBUG_LOGGING +-inline static void +-dump_bytes(const uint8_t* d, uint8_t l) +-{ +- for (uint16_t i = 0; i < l; i++) { +- debug_msg("%3u 0x%02x\n", i, d[i]); +- } +-} +-#else +-inline static void dump_bytes(const uint8_t*, uint8_t) {} +-#endif /* DEBUG_LOGGING */ +- + /* + * Flags values crib: + * +@@ -830,8 +818,11 @@ PathAttribute * ClusterListAttribute::clone() const { ClusterListAttribute *ca = new ClusterListAttribute(); - list::const_reverse_iterator i = cluster_list().rbegin(); - for(; i != cluster_list().rend(); i++) + // list::const_reverse_iterator i = cluster_list().rbegin(); + list::const_iterator i = cluster_list().end(); + if (! cluster_list().empty()) + // for(; i != cluster_list().rend(); i++) + for(; i-- != cluster_list().begin(); ) ca->prepend_cluster_id(*i); return ca; } Index: head/net/xorp/files/patch-bgp__route_table_policy.cc =================================================================== --- head/net/xorp/files/patch-bgp__route_table_policy.cc (nonexistent) +++ head/net/xorp/files/patch-bgp__route_table_policy.cc (revision 396720) @@ -0,0 +1,11 @@ +--- bgp/route_table_policy.cc.orig 2015-09-12 04:01:52.945569000 +0900 ++++ bgp/route_table_policy.cc 2015-09-12 04:06:26.219083000 +0900 +@@ -69,7 +69,7 @@ + bool no_modify) const + { + if (!_enable_filtering) { +- return &rtmsg; ++ return true; + } + + _varrw->attach_route(rtmsg, no_modify); Property changes on: head/net/xorp/files/patch-bgp__route_table_policy.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/xorp/files/patch-libxipc-xrl_parser.cc =================================================================== --- head/net/xorp/files/patch-libxipc-xrl_parser.cc (nonexistent) +++ head/net/xorp/files/patch-libxipc-xrl_parser.cc (revision 396720) @@ -0,0 +1,72 @@ +--- libxipc/xrl_parser.cc.orig 2012-01-11 17:56:10 UTC ++++ libxipc/xrl_parser.cc +@@ -105,18 +105,6 @@ XrlParseError::pretty_print(const size_t + + _reason + string("\n") + snapshot + string("\n") + indicator; + } + +-// ---------------------------------------------------------------------------- +-// Utility routines for Xrl parsing +- +-static inline void +-advance_to_either(const string& input, string::const_iterator& sci, +- const char* choices) { +- while (sci != input.end()) { +- if (strchr(choices,*sci)) break; +- sci++; +- } +-} +- + static inline void + advance_to_char(const string& input, string::const_iterator& sci, char c) + { +@@ -132,16 +120,6 @@ isxrlplain(int c) + return (xorp_isalnum(c) || c == '_' || c == '-'); + } + +-static inline size_t +-skip_xrl_plain_chars(const string& input, string::const_iterator& sci) +-{ +- string::const_iterator start = sci; +- for ( ; sci != input.end() && isxrlplain(*sci); sci++) { +- // XXX: Empty body +- } +- return sci - start; +-} +- + static inline char + c_escape_to_char(const string& input, + string::const_iterator sci) { +@@ -238,12 +216,6 @@ skip_past_blanks(const string& s, string + } + + static inline void +-skip_one_char(const string&, string::const_iterator* sci) +-{ +- sci++; +-} +- +-static inline void + skip_cplusplus_comments(const string& s, string::const_iterator& sci) + { + assert(*sci == '/'); +@@ -367,20 +339,6 @@ get_unquoted_value(const string& input, + token = string(sci_start, sci); + } + +-static inline string::const_iterator +-uninterrupted_token_end(const string& input, +- string::const_iterator& sci) +-{ +- string::const_iterator end = sci; +- +- while (end != input.end() && +- ( !xorp_isspace(*end) && isascii(*end) && !xorp_iscntrl(*end) )) { +- end++; +- } +- +- return end; +-} +- + static inline void + get_protocol_target_and_command(const string& input, + string::const_iterator& sci, Property changes on: head/net/xorp/files/patch-libxipc-xrl_parser.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/xorp/files/patch-libxorp-ref_trie.hh =================================================================== --- head/net/xorp/files/patch-libxorp-ref_trie.hh (nonexistent) +++ head/net/xorp/files/patch-libxorp-ref_trie.hh (revision 396720) @@ -0,0 +1,25 @@ +--- libxorp/ref_trie.hh.orig 2015-09-12 03:45:51.752442000 +0900 ++++ libxorp/ref_trie.hh 2015-09-12 03:48:56.187304000 +0900 +@@ -1336,10 +1336,6 @@ + #ifdef DEBUG_LOGGING + debug_msg_indent(indent); + +- if (this == NULL) { +- debug_msg("%sNULL\n", msg); +- return; +- } + debug_msg("%skey: %s %s\n", + msg, _k.str().c_str(), _p ? "PL" : "[]"); + debug_msg(" U: %s\n", _up ? _up->_k.str().c_str() : "NULL"); +@@ -1356,10 +1352,7 @@ + RefTrieNode::str() const + { + string s; +- if (this == NULL) { +- s = "NULL"; +- return s; +- } ++ + s = c_format("key: %s ", _k.str().c_str()); + if (_p) + s += "PL"; Property changes on: head/net/xorp/files/patch-libxorp-ref_trie.hh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/xorp/files/patch-rip-port.cc =================================================================== --- head/net/xorp/files/patch-rip-port.cc (nonexistent) +++ head/net/xorp/files/patch-rip-port.cc (revision 396720) @@ -0,0 +1,19 @@ +--- rip/port.cc.orig 2012-01-11 17:56:10 UTC ++++ rip/port.cc +@@ -44,16 +44,6 @@ + #include "output_updates.hh" + + // ---------------------------------------------------------------------------- +-// Utilities +- +-inline static uint32_t +-range_random(uint32_t lo, uint32_t hi) +-{ +- if (hi < lo) swap(hi, lo); +- return lo + ( xorp_random() % (hi - lo) ); +-} +- +-// ---------------------------------------------------------------------------- + // Address Family specific Port methods + + #ifdef INSTANTIATE_IPV4 Property changes on: head/net/xorp/files/patch-rip-port.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property