mirror of
https://git.freebsd.org/ports.git
synced 2025-07-17 17:29:23 -04:00
- update to 0.99.22
PR: 177303 Submitted by: Boris Kovalenko <boris@tagnet.ru> (maintainer) - add "--no_kernel" option decription to man-page PR: 173624 Reported by: Rasmus G. Andersen <rga@abiosis.dk> - add integrated-vtysh-config mode to rc-script PR: 176223 Submitted by: Michael deMan <freebsd@deman.com> - add config file testing before start/restart in rc-script PR: 176995 Submitted by: Alexander Brovikov <alexander@brovikov.ru>
This commit is contained in:
Ruslan Makhmatkhanov
parent
703467be6b
commit
2c30c4dabb
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=315520
5 changed files with 49 additions and 59 deletions
|
|
@ -1,14 +1,10 @@
|
|||
# New ports collection makefile for: quagga
|
||||
# Date created: 3 September 2003
|
||||
# Whom: Bruce M Simpson <bms@FreeBSD.org>
|
||||
#
|
||||
# Created by: Bruce M Simpson <bms@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= quagga
|
||||
PORTVERSION= 0.99.21
|
||||
PORTVERSION= 0.99.22
|
||||
CATEGORIES= net ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
|
||||
MASTER_SITES= SAVANNAH
|
||||
MASTER_SITE_SUBDIR= quagga
|
||||
|
||||
PATCH_SITES= http://quagga.net/
|
||||
|
|
@ -17,7 +13,6 @@ MAINTAINER= boris@tagnet.ru
|
|||
COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software
|
||||
|
||||
LICENSE= GPLv2
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
CONFLICTS= openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]*
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (quagga-0.99.21.tar.gz) = 9b8aea9026b4771a28e254a66cbd854723bcd0d71eebd0201d11838d4eb392ee
|
||||
SIZE (quagga-0.99.21.tar.gz) = 2297174
|
||||
SHA256 (quagga-0.99.22.tar.gz) = 5e5f5506e9e53daf785e8bf2dc41ba09a13e6f45b558de4351fe08da8c6a75bd
|
||||
SIZE (quagga-0.99.22.tar.gz) = 2351197
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
--- ./bgpd/bgp_open.c.orig 2012-05-01 12:10:27.000000000 -0400
|
||||
+++ ./bgpd/bgp_open.c 2012-06-10 09:05:40.000000000 -0400
|
||||
@@ -232,7 +232,7 @@
|
||||
}
|
||||
|
||||
/* validate number field */
|
||||
- if (sizeof (struct capability_orf_entry) + (entry.num * 2) > hdr->length)
|
||||
+ if (sizeof (struct capability_orf_entry) + (entry.num * 2) != hdr->length)
|
||||
{
|
||||
zlog_info ("%s ORF Capability entry length error,"
|
||||
" Cap length %u, num %u",
|
||||
@@ -336,28 +336,6 @@
|
||||
}
|
||||
|
||||
static int
|
||||
-bgp_capability_orf (struct peer *peer, struct capability_header *hdr)
|
||||
-{
|
||||
- struct stream *s = BGP_INPUT (peer);
|
||||
- size_t end = stream_get_getp (s) + hdr->length;
|
||||
-
|
||||
- assert (stream_get_getp(s) + sizeof(struct capability_orf_entry) <= end);
|
||||
-
|
||||
- /* We must have at least one ORF entry, as the caller has already done
|
||||
- * minimum length validation for the capability code - for ORF there must
|
||||
- * at least one ORF entry (header and unknown number of pairs of bytes).
|
||||
- */
|
||||
- do
|
||||
- {
|
||||
- if (bgp_capability_orf_entry (peer, hdr) == -1)
|
||||
- return -1;
|
||||
- }
|
||||
- while (stream_get_getp(s) + sizeof(struct capability_orf_entry) < end);
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-static int
|
||||
bgp_capability_restart (struct peer *peer, struct capability_header *caphdr)
|
||||
{
|
||||
struct stream *s = BGP_INPUT (peer);
|
||||
@@ -575,7 +553,7 @@
|
||||
break;
|
||||
case CAPABILITY_CODE_ORF:
|
||||
case CAPABILITY_CODE_ORF_OLD:
|
||||
- if (bgp_capability_orf (peer, &caphdr))
|
||||
+ if (bgp_capability_orf_entry (peer, &caphdr))
|
||||
return -1;
|
||||
break;
|
||||
case CAPABILITY_CODE_RESTART:
|
||||
21
net/quagga/files/patch-doc-bgpd.8
Normal file
21
net/quagga/files/patch-doc-bgpd.8
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
--- doc/bgpd.8.orig 2012-07-13 23:02:24.000000000 +0600
|
||||
+++ doc/bgpd.8 2013-03-23 10:08:50.551916290 +0600
|
||||
@@ -28,6 +28,8 @@
|
||||
] [
|
||||
.B \-g
|
||||
.I group
|
||||
+] [
|
||||
+.B \--no_kernel
|
||||
]
|
||||
.SH DESCRIPTION
|
||||
.B bgpd
|
||||
@@ -76,6 +78,9 @@
|
||||
.TP
|
||||
\fB\-v\fR, \fB\-\-version\fR
|
||||
Print the version and exit.
|
||||
+.TP
|
||||
+\fB\--no_kernel\fR
|
||||
+Prevents route updates to be submitted to the kernel.
|
||||
.SH FILES
|
||||
.TP
|
||||
.BI /usr/local/sbin/bgpd
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
# You may also wish to use the following variables to fine-tune startup:
|
||||
# quagga_flags="-d"
|
||||
# quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"
|
||||
# quagga_vysh_boot="YES"
|
||||
# Per daemon tuning may be done with daemon_name_flags
|
||||
# zebra_flags="-dP 0"
|
||||
# bgpd_flags="-dnrP 0" and so on
|
||||
|
|
@ -32,6 +33,20 @@ rcvar=quagga_enable
|
|||
|
||||
start_postcmd=start_postcmd
|
||||
stop_postcmd=stop_postcmd
|
||||
configtest_cmd=check_config
|
||||
extra_commands="configtest"
|
||||
|
||||
check_config() {
|
||||
echo "Checking $daemon.conf"
|
||||
$command $daemon_flags -C
|
||||
result=$?
|
||||
if [ "$result" -eq "0" ]; then
|
||||
echo "OK"
|
||||
else
|
||||
echo "FAILED"
|
||||
exit
|
||||
fi
|
||||
}
|
||||
|
||||
start_postcmd()
|
||||
{
|
||||
|
|
@ -61,6 +76,9 @@ do_cmd()
|
|||
command=%%PREFIX%%/sbin/${daemon}
|
||||
required_files=%%SYSCONF_DIR%%/${daemon}.conf
|
||||
pidfile=%%LOCALSTATE_DIR%%/${daemon}.pid
|
||||
if [ ${quagga_cmd} = "restart" -o ${quagga_cmd} = "start" ]; then
|
||||
check_config
|
||||
fi
|
||||
if [ ${quagga_cmd} = "start" -a ! -f ${required_files} ]; then
|
||||
continue
|
||||
fi
|
||||
|
|
@ -72,6 +90,10 @@ do_cmd()
|
|||
_rc_restart_done=false
|
||||
run_rc_command "$1" || ret=1
|
||||
done
|
||||
if checkyesno quagga_vtysh_boot; then
|
||||
echo "Booting for integrated-vtysh-config..."
|
||||
%%PREFIX%%/bin/vtysh -b
|
||||
fi
|
||||
return ${ret}
|
||||
}
|
||||
|
||||
|
|
@ -82,6 +104,7 @@ load_rc_config $name
|
|||
: ${quagga_enable="NO"}
|
||||
: ${quagga_flags="-d"}
|
||||
: ${quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"}
|
||||
: ${quagga_vtysh_boot="NO"}
|
||||
|
||||
quagga_cmd=$1
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue