From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 9 09:50:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F158416A421 for ; Thu, 9 Aug 2007 09:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CF7E913C46A for ; Thu, 9 Aug 2007 09:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l799o2ik078747 for ; Thu, 9 Aug 2007 09:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l799o2ej078745; Thu, 9 Aug 2007 09:50:02 GMT (envelope-from gnats) Resent-Date: Thu, 9 Aug 2007 09:50:02 GMT Resent-Message-Id: <200708090950.l799o2ej078745@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Boris Kovalenko Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7EEC16A417 for ; Thu, 9 Aug 2007 09:47:19 +0000 (UTC) (envelope-from boris@ntmk.ru) Received: from mail.ntmk.ru (mail.ntmk.ru [217.114.241.6]) by mx1.freebsd.org (Postfix) with ESMTP id 1760B13C45D for ; Thu, 9 Aug 2007 09:47:18 +0000 (UTC) (envelope-from boris@ntmk.ru) Received: from boris.nikom.ru ([10.1.16.195]) by mail.ntmk.ru with esmtps (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1IJ4FS-0001WU-Jx for FreeBSD-gnats-submit@freebsd.org; Thu, 09 Aug 2007 15:24:06 +0600 Received: from root by boris.nikom.ru with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1IJ4FS-0003mi-G4 for FreeBSD-gnats-submit@freebsd.org; Thu, 09 Aug 2007 15:24:06 +0600 Message-Id: Date: Thu, 09 Aug 2007 15:24:06 +0600 From: Boris Kovalenko To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/115343: [MAINTAINER UPDATE] net/quagga: update to 0.99.8 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2007 09:50:03 -0000 >Number: 115343 >Category: ports >Synopsis: [MAINTAINER UPDATE] net/quagga: update to 0.99.8 >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: Thu Aug 09 09:50:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Boris Kovalenko >Release: FreeBSD 6.2-RELEASE i386 >Organization: JSC "TAGNet" >Environment: System: FreeBSD boris.nikom.ru 6.2-RELEASE FreeBSD 6.2-RELEASE #7: Mon Jan 15 12:31:11 YEKT 2007 >Description: - Update to 0.99.8 - Fixed rc.d restart functionality Added file(s): - files/patch-configure Removed file(s): - files/patch-zebra-kernel_socket.c A summary of changes follows: * zebra: o rib loop check for RIB_ENTRY_REMOVED checks wrong var o [PtP] Fix BSD problems with PtP interfaces: must treat RTA_BRD as peer addre o Add zebra_routemap.c o Routemap support on received routes, with 'set src' command (linux) * lib o Add comments regarding setsockopt_multicast_ipv4 arguments. * build: o configure needs to check for struct icmphdr for IRDP o [linux] Fix strange compilation problem by explicitly including How-To-Repeat: >Fix: --- quagga-0.99.8.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/quagga/Makefile /usr/ports/net/quagga.new/Makefile --- /usr/ports/net/quagga/Makefile Wed Jul 4 12:54:29 2007 +++ /usr/ports/net/quagga.new/Makefile Thu Aug 9 15:22:39 2007 @@ -6,8 +6,7 @@ # PORTNAME= quagga -PORTVERSION= 0.99.7 -PORTREVISION= 2 +PORTVERSION= 0.99.8 CATEGORIES= net ipv6 MASTER_SITES= http://quagga.net/download/ \ http://www.ru.quagga.net/download/ \ diff -ruN --exclude=CVS /usr/ports/net/quagga/distinfo /usr/ports/net/quagga.new/distinfo --- /usr/ports/net/quagga/distinfo Mon May 7 13:10:20 2007 +++ /usr/ports/net/quagga.new/distinfo Thu Aug 2 09:17:31 2007 @@ -1,3 +1,3 @@ -MD5 (quagga-0.99.7.tar.gz) = f448281c50007408ce92c5d8e2107abc -SHA256 (quagga-0.99.7.tar.gz) = fd258e4503646129ca77f6fe9c16b69f36f320256768b84dbabd2e4915ab8eb4 -SIZE (quagga-0.99.7.tar.gz) = 2350372 +MD5 (quagga-0.99.8.tar.gz) = 0a53fb579033fa57ca0e5c3ff0b52105 +SHA256 (quagga-0.99.8.tar.gz) = 7e745118921982ad7f67a6733161f74c88ba71c587158ab335f0581124be551d +SIZE (quagga-0.99.8.tar.gz) = 2322571 diff -ruN --exclude=CVS /usr/ports/net/quagga/files/patch-configure /usr/ports/net/quagga.new/files/patch-configure --- /usr/ports/net/quagga/files/patch-configure Thu Jan 1 05:00:00 1970 +++ /usr/ports/net/quagga.new/files/patch-configure Thu Aug 2 09:58:49 2007 @@ -0,0 +1,10 @@ +--- configure.orig Fri Jul 27 22:59:02 2007 ++++ configure Thu Aug 2 09:58:32 2007 +@@ -23025,6 +23025,7 @@ + #endif + + ++#include + #include + _ACEOF + rm -f conftest.$ac_objext diff -ruN --exclude=CVS /usr/ports/net/quagga/files/patch-zebra-kernel_socket.c /usr/ports/net/quagga.new/files/patch-zebra-kernel_socket.c --- /usr/ports/net/quagga/files/patch-zebra-kernel_socket.c Sun May 27 15:30:14 2007 +++ /usr/ports/net/quagga.new/files/patch-zebra-kernel_socket.c Thu Jan 1 05:00:00 1970 @@ -1,132 +0,0 @@ ---- zebra/kernel_socket.c 2007/05/10 02:38:52 1.43 -+++ zebra/kernel_socket.c 2007/05/17 15:00:41 1.44 -@@ -494,6 +494,8 @@ - short *ifnlen) - { - caddr_t pnt, end; -+ union sockunion dst; -+ union sockunion gateway; - - pnt = (caddr_t)(ifm + 1); - end = ((caddr_t)ifm) + ifm->ifam_msglen; -@@ -502,10 +504,12 @@ - memset (mask, 0, sizeof (union sockunion)); - memset (addr, 0, sizeof (union sockunion)); - memset (brd, 0, sizeof (union sockunion)); -+ memset (&dst, 0, sizeof (union sockunion)); -+ memset (&gateway, 0, sizeof (union sockunion)); - - /* We fetch each socket variable into sockunion. */ -- RTA_ADDR_GET (NULL, RTA_DST, ifm->ifam_addrs, pnt); -- RTA_ADDR_GET (NULL, RTA_GATEWAY, ifm->ifam_addrs, pnt); -+ RTA_ADDR_GET (&dst, RTA_DST, ifm->ifam_addrs, pnt); -+ RTA_ADDR_GET (&gateway, RTA_GATEWAY, ifm->ifam_addrs, pnt); - RTA_ATTR_GET (mask, RTA_NETMASK, ifm->ifam_addrs, pnt); - RTA_ADDR_GET (NULL, RTA_GENMASK, ifm->ifam_addrs, pnt); - RTA_NAME_GET (ifname, RTA_IFP, ifm->ifam_addrs, pnt, *ifnlen); -@@ -519,31 +523,43 @@ - { - case AF_INET: - { -- char buf[2][INET_ADDRSTRLEN]; -+ char buf[4][INET_ADDRSTRLEN]; - zlog_debug ("%s: ifindex %d, ifname %s, ifam_addrs 0x%x, " -- "addr %s/%d broad %s", -- __func__, ifm->ifam_index, -+ "ifam_flags 0x%x, addr %s/%d broad %s dst %s " -+ "gateway %s", -+ __func__, ifm->ifam_index, - (ifnlen ? ifname : "(nil)"), ifm->ifam_addrs, -+ ifm->ifam_flags, - inet_ntop(AF_INET,&addr->sin.sin_addr, - buf[0],sizeof(buf[0])), - ip_masklen(mask->sin.sin_addr), - inet_ntop(AF_INET,&brd->sin.sin_addr, -- buf[1],sizeof(buf[1]))); -+ buf[1],sizeof(buf[1])), -+ inet_ntop(AF_INET,&dst.sin.sin_addr, -+ buf[2],sizeof(buf[2])), -+ inet_ntop(AF_INET,&gateway.sin.sin_addr, -+ buf[3],sizeof(buf[3]))); - } - break; - #ifdef HAVE_IPV6 - case AF_INET6: - { -- char buf[2][INET6_ADDRSTRLEN]; -+ char buf[4][INET6_ADDRSTRLEN]; - zlog_debug ("%s: ifindex %d, ifname %s, ifam_addrs 0x%x, " -- "addr %s/%d broad %s", -+ "ifam_flags 0x%x, addr %s/%d broad %s dst %s " -+ "gateway %s", - __func__, ifm->ifam_index, - (ifnlen ? ifname : "(nil)"), ifm->ifam_addrs, -+ ifm->ifam_flags, - inet_ntop(AF_INET6,&addr->sin6.sin6_addr, - buf[0],sizeof(buf[0])), - ip6_masklen(mask->sin6.sin6_addr), - inet_ntop(AF_INET6,&brd->sin6.sin6_addr, -- buf[1],sizeof(buf[1]))); -+ buf[1],sizeof(buf[1])), -+ inet_ntop(AF_INET6,&dst.sin6.sin6_addr, -+ buf[2],sizeof(buf[2])), -+ inet_ntop(AF_INET6,&gateway.sin6.sin6_addr, -+ buf[3],sizeof(buf[3]))); - } - break; - #endif /* HAVE_IPV6 */ -@@ -554,7 +570,7 @@ - break; - } - } -- -+ - /* Assert read up end point matches to end point */ - if (pnt != end) - zlog_warn ("ifam_read() does't read all socket data"); -@@ -569,6 +585,7 @@ - char ifname[INTERFACE_NAMSIZ]; - short ifnlen = 0; - char isalias = 0; -+ int flags = 0; - - ifname[0] = ifname[INTERFACE_NAMSIZ - 1] = '\0'; - -@@ -585,6 +602,12 @@ - if (ifnlen && strncmp (ifp->name, ifname, INTERFACE_NAMSIZ)) - isalias = 1; - -+ /* N.B. The info in ifa_msghdr does not tell us whether the RTA_BRD -+ field contains a broadcast address or a peer address, so we are forced to -+ rely upon the interface type. */ -+ if (if_is_pointopoint(ifp)) -+ SET_FLAG(flags, ZEBRA_IFA_PEER); -+ - #if 0 - /* it might seem cute to grab the interface metric here, however - * we're processing an address update message, and so some systems -@@ -599,12 +622,12 @@ - { - case AF_INET: - if (ifam->ifam_type == RTM_NEWADDR) -- connected_add_ipv4 (ifp, 0, &addr.sin.sin_addr, -+ connected_add_ipv4 (ifp, flags, &addr.sin.sin_addr, - ip_masklen (mask.sin.sin_addr), - &brd.sin.sin_addr, - (isalias ? ifname : NULL)); - else -- connected_delete_ipv4 (ifp, 0, &addr.sin.sin_addr, -+ connected_delete_ipv4 (ifp, flags, &addr.sin.sin_addr, - ip_masklen (mask.sin.sin_addr), - &brd.sin.sin_addr); - break; -@@ -616,8 +639,7 @@ - SET_IN6_LINKLOCAL_IFINDEX (addr.sin6.sin6_addr, 0); - - if (ifam->ifam_type == RTM_NEWADDR) -- connected_add_ipv6 (ifp, 0, -- &addr.sin6.sin6_addr, -+ connected_add_ipv6 (ifp, flags, &addr.sin6.sin6_addr, - ip6_masklen (mask.sin6.sin6_addr), - &brd.sin6.sin6_addr, - (isalias ? ifname : NULL)); diff -ruN --exclude=CVS /usr/ports/net/quagga/files/quagga.sh.in /usr/ports/net/quagga.new/files/quagga.sh.in --- /usr/ports/net/quagga/files/quagga.sh.in Wed Jul 4 12:54:29 2007 +++ /usr/ports/net/quagga.new/files/quagga.sh.in Thu Aug 9 15:16:01 2007 @@ -64,7 +64,7 @@ /sbin/ldconfig -m ${quagga_extralibs_path} fi ;; - stop) + stop|restart) quagga_daemons=$(reverse_list ${quagga_daemons}) ;; esac @@ -79,8 +79,12 @@ if [ ${quagga_cmd} = "stop" -a -z $(check_process ${command}) ]; then continue fi + if [ ${quagga_cmd} = "restart" -a -z $(check_process ${command}) ]; then + continue + fi eval flags=\$\{${daemon}_flags:-\"${quagga_flags}\"\} run_rc_command "$1" + _rc_restart_done=false done if [ "${quagga_delay}" != "0" ]; then --- quagga-0.99.8.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: