update frr7

This commit is contained in:
2022-02-23 19:15:16 +02:00
parent a25d60e215
commit 9899ea62fa
26 changed files with 8 additions and 607 deletions

View File

@@ -1,114 +0,0 @@
#
# $Id$
#
PORTNAME= frr
PORTVERSION= 6.0.2
CATEGORIES= net
MASTER_SITES= https://github.com/FRRouting/frr/releases/download/frr-${PORTVERSION}/
PKGNAMESUFFIX= ${PORTVERSION:R}
MAINTAINER= onborodin@gmail.com
COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 route software
BUILD_DEPENDS+= gawk:text/gawk
LIB_DEPENDS+= libjson-c.so:devel/libjson-c
.include <bsd.port.pre.mk>
VAR_PREFIX= /var
CONF_SUBDIR= etc/${PORTNAME}
PLIST_SUB= CONF_SUBDIR=${CONF_SUBDIR}
CONF_DIR= ${PREFIX}/etc/${PORTNAME}
RUN_DIR= ${VAR_PREFIX}/run/${PORTNAME}
LOG_DIR= ${VAR_PREFIX}/log/${PORTNAME}
EXAMPLES_SUBDIR= share/examples/${PORTNAME}
EXAMPLES_DIR= ${PREFIX}/${EXAMPLES_SUBDIR}
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
USE_PERL5= build
GNU_CONFIGURE= yes
USES+= gmake readline compiler:c++11-lang perl5 makeinfo python:2.7-3.6,build bison
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --disable-shared
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ARGS+= --disable-ldpd
CONFIGURE_ARGS+= --disable-ospfapi
CONFIGURE_ARGS+= --disable-ospfclient
CONFIGURE_ARGS+= --disable-pimd
CONFIGURE_ARGS+= --disable-snmp
CONFIGURE_ARGS+= --disable-watchfrr
CONFIGURE_ARGS+= --disable-zeromq
CONFIGURE_ARGS+= --enable-bfdd
CONFIGURE_ARGS+= --enable-pbrd
CONFIGURE_ARGS+= --enable-babeld
CONFIGURE_ARGS+= --enable-eigrpd
CONFIGURE_ARGS+= --enable-isisd
CONFIGURE_ARGS+= --enable-sharpd
CONFIGURE_ARGS+= --enable-fpm
CONFIGURE_ARGS+= --enable-vtysh
CONFIGURE_ARGS+= --enable-exampledir=${EXAMPLESDIR}/
CONFIGURE_ARGS+= --enable-group=${FRR_GROUP}
CONFIGURE_ARGS+= --enable-user=${FRR_OWNER}
CONFIGURE_ARGS+= --includedir=${PREFIX}/include
CONFIGURE_ARGS+= --infodir=${PREFIX}/info
CONFIGURE_ARGS+= --localstatedir=${RUN_DIR}
CONFIGURE_ARGS+= --mandir=${PREFIX}/man
CONFIGURE_ARGS+= --sysconfdir=${CONF_DIR}
CONFIGURE_ARGS+= --without-libpam
FRR_OWNER= ${PORTNAME}
FRR_OWNER_ID= 795
FRR_GROUP= ${PORTNAME}
FRR_GROUP_ID= 795
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
PKGINSTALL= ${WRKDIR}/pkg-install
USE_RC_SUBR+= babeld.sh
USE_RC_SUBR+= bfdd.sh
USE_RC_SUBR+= bgpd.sh
USE_RC_SUBR+= eigrpd.sh
USE_RC_SUBR+= isisd.sh
USE_RC_SUBR+= ospf6d.sh
USE_RC_SUBR+= ospfd.sh
USE_RC_SUBR+= pbrd.sh
USE_RC_SUBR+= ripd.sh
USE_RC_SUBR+= ripngd.sh
USE_RC_SUBR+= sharpd.sh
USE_RC_SUBR+= staticd.sh
USE_RC_SUBR+= zebra.sh
SUB_FILES+= pkg-deinstall pkg-install
SUB_LIST+= FRR_OWNER=${FRR_OWNER}
SUB_LIST+= FRR_GROUP=${FRR_GROUP}
SUB_LIST+= FRR_OWNER_ID=${FRR_OWNER_ID}
SUB_LIST+= FRR_GROUP_ID=${FRR_GROUP_ID}
SUB_LIST+= RUN_DIR=${RUN_DIR}
SUB_LIST+= LOG_DIR=${LOG_DIR}
SUB_LIST+= CONF_DIR=${CONF_DIR}
SUB_LIST+= RC_SUBR=/etc/rc.subr
do-build:
cd ${WRKSRC} && ${GMAKE} -j${MAKE_JOBS_NUMBER}
do-install:
${MKDIR} -p ${STAGEDIR}
cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET} DESTDIR=${STAGEDIR}
.include <bsd.port.post.mk>
#EOF

View File

@@ -1,3 +0,0 @@
TIMESTAMP = 1569435179
SHA256 (frr-6.0.2.tar.gz) = 0089648d2dc13aeea5cf24e5c24ce3be8c626773066ffa21d5f10f3e063549b1
SIZE (frr-6.0.2.tar.gz) = 4784087

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: babeld
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="babeld"
rcvar="babeld_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${babeld_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: bfdd
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="bfdd"
rcvar="bfdd_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${bfdd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: bgpd
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="bgpd"
rcvar="bgpd_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${bgpd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: eigrpd
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="eigrpd"
rcvar="eigrpd_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${eigrpd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: isisd
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="isisd"
rcvar="isisd_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${isisd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: ospf6d
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="ospf6d"
rcvar="ospf6d_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${ospf6d_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: ospfd
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="ospfd"
rcvar="ospfd_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${ospfd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,11 +0,0 @@
--- ./configure.orig 2019-01-08 10:36:04.000000000 +0200
+++ ./configure 2019-09-25 21:23:35.571021000 +0200
@@ -15672,7 +15672,7 @@
if test "${with_vtysh_pager+set}" = set; then :
withval=$with_vtysh_pager; VTYSH_PAGER=$withval
else
- VTYSH_PAGER="more"
+ VTYSH_PAGER="less -F"
fi
# Check whether --enable-vtysh was given.

View File

@@ -1,36 +0,0 @@
--- ./ltmain.sh.orig 2019-06-18 08:10:14.000000000 +0200
+++ ./ltmain.sh 2019-09-21 20:27:05.594392000 +0200
@@ -8904,13 +8904,13 @@
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|freebsd-elf|linux|osf|windows|none)
+ darwin|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
age=$number_minor
revision=$number_revision
;;
- freebsd-aout|qnx|sunos)
+ freebsd*|qnx|sunos)
current=$number_major
revision=$number_minor
age=0
@@ -8993,15 +8993,9 @@
esac
;;
- freebsd-aout)
+ freebsd*)
major=.$current
- versuffix=.$current.$revision
- ;;
-
- freebsd-elf)
- func_arith $current - $age
- major=.$func_arith_result
- versuffix=$major.$age.$revision
+ versuffix=.$current
;;
irix | nonstopux)

View File

@@ -1,13 +0,0 @@
--- ./zebra/kernel_socket.c.orig 2019-09-25 23:31:33.843852000 +0200
+++ ./zebra/kernel_socket.c 2019-09-25 23:31:43.144239000 +0200
@@ -859,8 +859,8 @@
mask->sa.sa_family = dest->sa.sa_family;
/* Assert read up to the end of pointer. */
- if (pnt != end)
- zlog_warn("rtm_read() doesn't read all socket data.");
+ //if (pnt != end)
+ // zlog_warn("rtm_read() doesn't read all socket data.");
return rtm->rtm_flags;
}

View File

@@ -1,11 +0,0 @@
--- ./zebra/zebra_mpls.c.orig 2019-01-08 10:34:59.000000000 +0200
+++ ./zebra/zebra_mpls.c 2019-09-25 23:34:10.442055000 +0200
@@ -2945,7 +2945,7 @@
mpls_enabled = 0;
if (mpls_kernel_init() < 0) {
- zlog_warn("Disabling MPLS support (no kernel support)");
+// zlog_warn("Disabling MPLS support (no kernel support)");
return;
}

View File

@@ -1,13 +0,0 @@
--- zebra/ioctl.c.orig 2018-10-22 05:34:13 UTC
+++ zebra/ioctl.c
@@ -415,7 +415,9 @@ void if_get_flags(struct interface *ifp)
/* Seems not all interfaces implement this ioctl */
if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) < 0)
- flog_err_sys(LIB_ERR_SYSTEM_CALL,
+ /* Ignore EINVAL to avoid being too verbose */
+ if (errno != EINVAL)
+ flog_err_sys(LIB_ERR_SYSTEM_CALL,
"if_ioctl(SIOCGIFMEDIA) failed: %s",
safe_strerror(errno));
else if (ifmr.ifm_status & IFM_AVALID) /* Link state is valid */

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: pbrd
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="pbrd"
rcvar="pbrd_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${pbrd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,16 +0,0 @@
#!/bin/sh
set -x
RUN_DIR="%%RUN_DIR%%"
LOG_DIR="%%LOG_DIR%%"
case $2 in
DEINSTALL)
;;
POST-DEINSTALL)
for dir in ${LOG_DIR} ${RUN_DIR}; do
rmdir -p ${dir}
done
;;
esac
exit 0
#EOF

View File

@@ -1,40 +0,0 @@
#!/bin/sh
set -x
FRR_OWNER="%%FRR_OWNER%%"
FRR_GROUP="%%FRR_GROUP%%"
FRR_OWNER_ID="%%FRR_OWNER_ID%%"
FRR_GROUP_ID="%%FRR_GROUP_ID%%"
RUN_DIR="%%RUN_DIR%%"
LOG_DIR="%%LOG_DIR%%"
CONF_DIR="%%CONF_DIR%%"
PKG_PREFIX="/notexist"
case $2 in
PRE-INSTALL)
pw group add ${FRR_GROUP} -g ${FRR_GROUP_ID}
pw user add ${FRR_OWNER} -g ${FRR_GROUP} \
-d ${PKG_PREFIX} -s /usr/sbin/nologin -u ${FRR_OWNER_ID} \
-c "quagga"
pw group mod ${FRR_GROUP} -M ${FRR_OWNER}
pw group show ${FRR_GROUP}
pw user show ${FRR_OWNER}
mkdir -p ${RUN_DIR}
chown ${FRR_OWNER}:${FRR_GROUP} ${RUN_DIR}
chmod 0750 ${RUN_DIR}
mkdir -p ${LOG_DIR}
chown ${FRR_OWNER}:${FRR_GROUP} ${LOG_DIR}
chmod 0750 ${LOG_DIR}
mkdir -p ${CONF_DIR}
chown ${FRR_OWNER}:${FRR_GROUP} ${CONF_DIR}
chmod 0750 ${CONF_DIR}
;;
POST-INSTALL)
;;
esac
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: ripd
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="ripd"
rcvar="ripd_enable"
command="%%PREFIX%%/sbin/${name}"
#pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${ripd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,22 +0,0 @@
#!/bin/sh
#
# PROVIDE: ripngd
# REQUIRE: zebra
#
. /etc/rc.subr
name="ripngd"
rcvar="ripngd_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${name}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${ripngd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: sharpd
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="sharpd"
rcvar="sharpd_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${sharpd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: staticd
# REQUIRE: zebra
# KEYWORD: shutdown
#
. /etc/rc.subr
name="staticd"
rcvar="staticd_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${staticd_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,23 +0,0 @@
#!/bin/sh
#
# PROVIDE: zebra
# REQUIRE: DAEMON netif routing
# KEYWORD: shutdown
#
. /etc/rc.subr
name="zebra"
rcvar="zebra_enable"
command="%%PREFIX%%/sbin/${name}"
pidfile="%%RUN_DIR%%/${name}.pid"
procname="${command}"
required_dirs="%%RUN_DIR%% %%LOG_DIR%%"
required_files="%%CONF_DIR%%/${name}.conf"
command_args=" -d"
load_rc_config $name
: ${zebra_enable="NO"}
run_rc_command "$1"
#EOF

View File

@@ -1,5 +0,0 @@
FRRouting (FRR) is an IP routing protocol suite for Linux and Unix platforms
which includes protocol daemons for BGP, IS-IS, OSPF and RIP. FRR has its roots
in the Quagga project.
WWW: https://frrouting.org/

View File

@@ -1,13 +0,0 @@
[
{ type: install
message: <<EOM
FRR's OSPF daemons tries to allocate big socket buffer, so generate warning
messages like:
"setsockopt_so_sendbuf: fd 6: SO_SNDBUF set to 1048576 (requested 8388608)"
To prevent such message kern.ipc.maxsockbuf can be increased:
sysctl kern.ipc.maxsockbuf=16777216
Error message "ifam_read() doesn't read all socket data" is under investigation
EOM
}
]

View File

@@ -1,32 +0,0 @@
bin/vtysh
sbin/babeld
sbin/bfdd
sbin/bgpd
sbin/eigrpd
sbin/isisd
sbin/ospf6d
sbin/ospfd
sbin/pbrd
sbin/ripd
sbin/ripngd
sbin/sharpd
sbin/ssd
sbin/staticd
sbin/zebra
share/examples/frr/babeld.conf.sample
share/examples/frr/bfdd.conf.sample
share/examples/frr/bgpd.conf.sample
share/examples/frr/bgpd.conf.sample2
share/examples/frr/bgpd.conf.vnc.sample
share/examples/frr/eigrpd.conf.sample
share/examples/frr/isisd.conf.sample
share/examples/frr/ospf6d.conf.sample
share/examples/frr/ospfd.conf.sample
share/examples/frr/pbrd.conf.sample
share/examples/frr/ripd.conf.sample
share/examples/frr/ripngd.conf.sample
share/examples/frr/sharpd.conf.sample
share/examples/frr/staticd.conf.sample
share/examples/frr/vtysh.conf.sample
share/examples/frr/zebra.conf.sample
@dir share/examples/frr

View File

@@ -41,9 +41,10 @@ USE_PERL5= build
INSTALL_TARGET= install-strip
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -fPIC -I${LOCALBASE}/include
CPPFLAGS+= -fPIC -I${LOCALBASE}/include
CONFIGURE_ARGS+= --disable-werror
CONFIGURE_ARGS+= --disable-ldpd
CONFIGURE_ARGS+= --disable-ospfapi
CONFIGURE_ARGS+= --disable-ospfclient
@@ -136,6 +137,11 @@ SUB_LIST+= RC_SUBR=/etc/rc.subr
#USES+= libtool autoreconf
post-patch:
${REINPLACE_CMD} -e 's,WERROR="-Werror",WERROR="",' ${WRKSRC}/configure.ac
${REINPLACE_CMD} -e 's,ax_pthread_extra_flags="-Werror",ax_pthread_extra_flags="",' ${WRKSRC}/m4/ax_pthread.m4
#pre-configure:
# cd ${WRKSRC} && ${LIBTOOLIZE} --copy
# cd ${WRKSRC} && ${ACLOCAL} -I .