Date: Sat, 23 Mar 2013 08:05:46 GMT From: Boris Kovalenko <boris@tagnet.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177303: [patch] net/quagga update to 0.99.22 Message-ID: <201303230805.r2N85k7B083188@red.freebsd.org> Resent-Message-ID: <201303230810.r2N8A1hA089459@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177303
>Category: ports
>Synopsis: [patch] net/quagga update to 0.99.22
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 23 08:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Boris Kovalenko
>Release: 9.1
>Organization:
JSC "TAGnet"
>Environment:
FreeBSD japp01.tagnet.ru 9.1-RELEASE FreeBSD 9.1-RELEASE #3: Sun Jan 13 19:10:34 YEKT 2013 root@japp01.tagnet.ru:/usr/obj/usr/src/sys/JAPP amd64
>Description:
Update port net/quagga to the latest 0.99.22 version.
Also includes ports/173624, ports/176223, ports/176995
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
===> Generating patch
===> Viewing diff with more
diff -ruN ../quagga.orig/Makefile ./Makefile
--- ../quagga.orig/Makefile 2012-11-17 12:00:17.000000000 +0600
+++ ./Makefile 2013-03-23 13:53:13.315917221 +0600
@@ -1,12 +1,8 @@
-# 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: ports/net/quagga/Makefile,v 1.124 2012/11/17 06:00:17 svnexp Exp $
-#
PORTNAME= quagga
-PORTVERSION= 0.99.21
+PORTVERSION= 0.99.22
CATEGORIES= net ipv6
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= quagga
diff -ruN ../quagga.orig/distinfo ./distinfo
--- ../quagga.orig/distinfo 2012-06-11 17:07:47.000000000 +0600
+++ ./distinfo 2013-03-23 09:54:22.473916451 +0600
@@ -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
diff -ruN ../quagga.orig/files/patch-bgpd__bgp_open.c ./files/patch-bgpd__bgp_open.c
--- ../quagga.orig/files/patch-bgpd__bgp_open.c 2012-06-11 17:07:47.000000000 +0600
+++ ./files/patch-bgpd__bgp_open.c 1970-01-01 05:00:00.000000000 +0500
@@ -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:
diff -ruN ../quagga.orig/files/patch-doc-bgpd.8 ./files/patch-doc-bgpd.8
--- ../quagga.orig/files/patch-doc-bgpd.8 1970-01-01 05:00:00.000000000 +0500
+++ ./files/patch-doc-bgpd.8 2013-03-23 10:10:06.609917382 +0600
@@ -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
diff -ruN ../quagga.orig/files/quagga.in ./files/quagga.in
--- ../quagga.orig/files/quagga.in 2012-11-17 12:00:17.000000000 +0600
+++ ./files/quagga.in 2013-03-23 13:57:17.063917335 +0600
@@ -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 @@
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 @@
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 @@
_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 @@
: ${quagga_enable="NO"}
: ${quagga_flags="-d"}
: ${quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"}
+: ${quagga_vtysh_boot="NO"}
quagga_cmd=$1
===> Done
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303230805.r2N85k7B083188>