Index: head/net/quagga/Makefile =================================================================== --- head/net/quagga/Makefile (revision 384143) +++ head/net/quagga/Makefile (revision 384144) @@ -1,107 +1,107 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= quagga PORTVERSION= 0.99.24.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH MAINTAINER= mat@FreeBSD.org COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software LICENSE= GPLv2 BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk CONFLICTS= openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga INSTALL_TARGET= install-strip USES= gmake libtool makeinfo perl5 readline compiler:c11 tar:xz autoreconf cpe USE_LDCONFIG= yes USE_PERL5= build INFO= quagga OPTIONS_DEFINE= ISISD PIMD PAM OSPF_OPAQUE_LSA RTADV SNMP TCPSOCKETS DLMALLOC \ NO_BGP_ANNOUNCE OSPF_NEXTHOP IRDP ISIS_TOPOLOGY OPTIONS_DEFAULT= ISISD PIMD RTADV OSPF_OPAQUE_LSA OPTIONS_SUB= yes PIMD_DESC= PIM-SSM multicast routing IRDP_DESC= Enable IRDP server support ISISD_DESC= Enable ISIS daemon (beta) ISIS_TOPOLOGY_DESC= Enable IS-IS topology generator PAM_DESC= PAM authentication for vtysh OSPF_OPAQUE_LSA_DESC= OSPF Opaque-LSA support (RFC2370) RTADV_DESC= IPv6 Router Advertisements TCPSOCKETS_DESC= Use TCP/IP sockets for protocol daemons DLMALLOC_DESC= Use dlmalloc (makes bgpd much faster) NO_BGP_ANNOUNCE_DESC= Turn off BGP route announcement OSPF_NEXTHOP_DESC= Set ip next-hop in OSPF route maps ENABLE_USER?= quagga ENABLE_GROUP?= quagga USERS= ${ENABLE_USER} GROUPS= ${ENABLE_GROUP} SYSCONF_DIR?= ${ETCDIR} LOCALSTATE_DIR?=/var/run/quagga CONFIGURE_ARGS= --enable-user=${ENABLE_USER} \ --enable-group=${ENABLE_GROUP} \ --sysconfdir=${SYSCONF_DIR} \ --localstatedir=${LOCALSTATE_DIR} \ --enable-vtysh .if defined(ENABLE_VTY_GROUP) CONFIGURE_ARGS+=--enable-vty-group=${ENABLE_VTY_GROUP} .endif ISISD_CONFIGURE_ENABLE= isisd ISIS_TOPOLOGY_CONFIGURE_ENABLE= isis-topology PIMD_CONFIGURE_ENABLE= pimd IRDP_CONFIGURE_ENABLE= irdb PAM_CONFIGURE_WITH= libpam OSPF_OPAQUE_LSA_CONFIGURE_ENABLE= opaque-lsa RTADV_CONFIGURE_ENABLE= rtadv SNMP_CONFIGURE_ENABLE= snmp SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra DLMALLOC_LIB_DEPENDS= libdlmalloc.so:${PORTSDIR}/devel/libdlmalloc DLMALLOC_LIBS= -L${LOCALBASE}/lib -ldlmalloc OSPF_NEXTHOP_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ospf-nexthop # inverse option. NO_BGP_ANNOUNCE_CONFIGURE_ON= --disable-bgp-announce NO_BGP_ANNOUNCE_CONFIGURE_OFF= --enable-bgp-announce USE_RC_SUBR= quagga watchquagga SUB_LIST+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \ SYSCONF_DIR=${SYSCONF_DIR} PLIST_SUB+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \ SYSCONF_DIR=${SYSCONF_DIR} \ ENABLE_USER=${ENABLE_USER} \ ENABLE_GROUP=${ENABLE_GROUP} pre-everything:: @${ECHO} "=============================================================" @${ECHO} @${ECHO} "You can build ${PORTNAME} with the following options:" @${ECHO} @${ECHO} "ENABLE_USER Specify user to run Quagga suite as" @${ECHO} "ENABLE_GROUP Specify group to run Quagga suite as" @${ECHO} "ENABLE_VTY_GROUP Specify group for vty socket ownership" @${ECHO} "SYSCONF_DIR Specify directory for Quagga configuration files" @${ECHO} "LOCALSTATE_DIR Specify directory for Quagga runtime files" post-install: ${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} ${STAGEDIR}${SYSCONF_DIR} \ ${STAGEDIR}${EXAMPLESDIR} @${MV} ${STAGEDIR}${ETCDIR}/* ${STAGEDIR}${EXAMPLESDIR} .include Index: head/net/quagga/files/patch-zebra_kernel__socket.c =================================================================== --- head/net/quagga/files/patch-zebra_kernel__socket.c (nonexistent) +++ head/net/quagga/files/patch-zebra_kernel__socket.c (revision 384144) @@ -0,0 +1,29 @@ +From 3e07588e6c2d11464b458cef3965ae31b5f99181 Mon Sep 17 00:00:00 2001 +From: Greg Troxel +Date: Mon, 23 Mar 2015 15:16:29 -0400 +Subject: [PATCH] Fix alignment assumptions on non-RT_ROUNDUP platforms. + +The comment said that apple uses int and BSD traditionally used long, +but the code was backwards. This fixes apple to be int, and otherwise +long. That should make FreeBSD, which aligns to long, work correctly, +even without using SA_SIZE. + +(cherry picked from commit 941789e470199df4f612368f669ecc0fd096fb9a) +--- + zebra/kernel_socket.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +--- zebra/kernel_socket.c.orig 2015-03-07 06:58:00 UTC ++++ zebra/kernel_socket.c +@@ -78,9 +78,9 @@ extern struct zebra_t zebrad; + + /* OS X (Xcode as of 2014-12) is known not to define RT_ROUNDUP */ + #ifdef __APPLE__ +-#define ROUNDUP_TYPE long +-#else + #define ROUNDUP_TYPE int ++#else ++#define ROUNDUP_TYPE long + #endif + + #define ROUNDUP(a) \ Property changes on: head/net/quagga/files/patch-zebra_kernel__socket.c ___________________________________________________________________ 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