diff --git a/.cvsignore b/.cvsignore index a42871a..913c744 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -quagga-0.99.9.tar.gz +quagga-0.99.10.tar.gz diff --git a/quagga-0.99.9-ipv6_advert.patch b/quagga-0.99.9-ipv6_advert.patch deleted file mode 100644 index 6a6a705..0000000 --- a/quagga-0.99.9-ipv6_advert.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up quagga-0.99.9/bgpd/bgp_open.c.ipv6_advert quagga-0.99.9/bgpd/bgp_open.c ---- quagga-0.99.9/bgpd/bgp_open.c.ipv6_advert 2008-03-05 20:44:20.000000000 +0100 -+++ quagga-0.99.9/bgpd/bgp_open.c 2008-03-05 20:44:59.000000000 +0100 -@@ -177,7 +177,7 @@ bgp_capability_mp (struct peer *peer, st - peer->afc_recv[mpc.afi][mpc.safi] = 1; - - if (peer->afc[mpc.afi][mpc.safi]) -- peer->afc_nego[mpc.safi][mpc.safi] = 1; -+ peer->afc_nego[mpc.afi][mpc.safi] = 1; - else - return -1; - diff --git a/quagga-0.99.9-port_overflow.patch b/quagga-0.99.9-port_overflow.patch deleted file mode 100644 index 7e08468..0000000 --- a/quagga-0.99.9-port_overflow.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -up quagga-0.99.9/ripngd/ripng_main.c.port_overflow quagga-0.99.9/ripngd/ripng_main.c ---- quagga-0.99.9/ripngd/ripng_main.c.port_overflow 2006-10-16 01:34:48.000000000 +0200 -+++ quagga-0.99.9/ripngd/ripng_main.c 2008-01-29 17:39:58.000000000 +0100 -@@ -240,7 +240,8 @@ main (int argc, char **argv) - break; - } - vty_port = atoi (optarg); -- vty_port = (vty_port ? vty_port : RIPNG_VTY_PORT); -+ if (vty_port <= 0 || vty_port > 0xffff) -+ vty_port = RIPNG_VTY_PORT; - break; - case 'r': - retain_mode = 1; -diff -up quagga-0.99.9/bgpd/bgp_main.c.port_overflow quagga-0.99.9/bgpd/bgp_main.c ---- quagga-0.99.9/bgpd/bgp_main.c.port_overflow 2006-10-16 01:34:47.000000000 +0200 -+++ quagga-0.99.9/bgpd/bgp_main.c 2008-01-29 17:58:31.000000000 +0100 -@@ -201,6 +201,7 @@ main (int argc, char **argv) - int dryrun = 0; - char *progname; - struct thread thread; -+ int tmp_port; - - /* Set umask before anything for security */ - umask (0027); -@@ -236,7 +237,11 @@ main (int argc, char **argv) - pid_file = optarg; - break; - case 'p': -- bm->port = atoi (optarg); -+ tmp_port = atoi (optarg); -+ if (tmp_port <= 0 || tmp_port > 0xffff) -+ bm->port = BGP_PORT_DEFAULT; -+ else -+ bm->port = tmp_port; - break; - case 'A': - vty_addr = optarg; -@@ -250,7 +255,8 @@ main (int argc, char **argv) - break; - } - vty_port = atoi (optarg); -- vty_port = (vty_port ? vty_port : BGP_VTY_PORT); -+ if (vty_port <= 0 || vty_port > 0xffff) -+ vty_port = BGP_VTY_PORT; - break; - case 'r': - retain_mode = 1; -diff -up quagga-0.99.9/ripd/rip_main.c.port_overflow quagga-0.99.9/ripd/rip_main.c ---- quagga-0.99.9/ripd/rip_main.c.port_overflow 2006-10-16 01:34:48.000000000 +0200 -+++ quagga-0.99.9/ripd/rip_main.c 2008-01-29 17:39:58.000000000 +0100 -@@ -236,7 +236,8 @@ main (int argc, char **argv) - break; - } - vty_port = atoi (optarg); -- vty_port = (vty_port ? vty_port : RIP_VTY_PORT); -+ if (vty_port <= 0 || vty_port > 0xffff) -+ vty_port = RIP_VTY_PORT; - break; - case 'r': - retain_mode = 1; -diff -up quagga-0.99.9/ospfd/ospf_main.c.port_overflow quagga-0.99.9/ospfd/ospf_main.c ---- quagga-0.99.9/ospfd/ospf_main.c.port_overflow 2006-10-16 01:34:48.000000000 +0200 -+++ quagga-0.99.9/ospfd/ospf_main.c 2008-01-29 17:39:58.000000000 +0100 -@@ -245,7 +245,8 @@ main (int argc, char **argv) - break; - } - vty_port = atoi (optarg); -- vty_port = (vty_port ? vty_port : OSPF_VTY_PORT); -+ if (vty_port <= 0 || vty_port > 0xffff) -+ vty_port = OSPF_VTY_PORT; - break; - case 'u': - ospfd_privs.user = optarg; -diff -up quagga-0.99.9/ospf6d/ospf6_main.c.port_overflow quagga-0.99.9/ospf6d/ospf6_main.c ---- quagga-0.99.9/ospf6d/ospf6_main.c.port_overflow 2006-10-16 01:34:48.000000000 +0200 -+++ quagga-0.99.9/ospf6d/ospf6_main.c 2008-01-29 17:39:58.000000000 +0100 -@@ -227,7 +227,8 @@ main (int argc, char *argv[], char *envp - break; - } - vty_port = atoi (optarg); -- vty_port = (vty_port ? vty_port : OSPF6_VTY_PORT); -+ if (vty_port <= 0 || vty_port > 0xffff) -+ vty_port = OSPF6_VTY_PORT; - break; - case 'u': - ospf6d_privs.user = optarg; -diff -up quagga-0.99.9/zebra/main.c.port_overflow quagga-0.99.9/zebra/main.c ---- quagga-0.99.9/zebra/main.c.port_overflow 2007-05-02 17:28:33.000000000 +0200 -+++ quagga-0.99.9/zebra/main.c 2008-01-29 17:39:58.000000000 +0100 -@@ -276,7 +276,8 @@ main (int argc, char **argv) - break; - } - vty_port = atoi (optarg); -- vty_port = (vty_port ? vty_port : ZEBRA_VTY_PORT); -+ if (vty_port <= 0 || vty_port > 0xffff) -+ vty_port = ZEBRA_VTY_PORT; - break; - case 'r': - retain_mode = 1; diff --git a/quagga.spec b/quagga.spec index c0224cb..756bd48 100644 --- a/quagga.spec +++ b/quagga.spec @@ -31,8 +31,8 @@ Summary: Routing daemon Name: quagga -Version: 0.99.9 -Release: 6%{?dist} +Version: 0.99.10 +Release: 1%{?dist} Epoch: 0 License: GPL Group: System Environment/Daemons @@ -41,8 +41,6 @@ Source1: quagga-filter-perl-requires.sh Patch2: quagga-0.96.5-nostart.patch #Patch6: quagga-0.98.5-pie.patch Patch7: quagga-0.99.9-initscript.patch -Patch8: quagga-0.99.9-port_overflow.patch -Patch9: quagga-0.99.9-ipv6_advert.patch URL: http://www.quagga.net %if %with_snmp @@ -100,8 +98,6 @@ developing OSPF-API and quagga applications. # This creates a .diff file that we apply after configuring #%patch6 -p1 %patch7 -p1 -b .initscript -%patch8 -p1 -b .port_overflow -%patch9 -p1 -b .ipv6_advert %build # FC5+ automatic -fstack-protector-all switch @@ -352,6 +348,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jun 11 2008 Martin Nagy - 0.99.10-1 +- upgrade to new upstream 0.99.10 + * Wed Mar 05 2008 Martin Nagy - 0.99.9-6 - fix vtysh.conf owner and group (#416121) - fix bpgd IPv6 advertisements, patch from upstream (#429448) diff --git a/sources b/sources index afdc5ba..47e1a41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dbdaf91bf6609803819d97d5fccc4c9 quagga-0.99.9.tar.gz +c7a2d92e1c42214afef9b2e1cd4b5d06 quagga-0.99.10.tar.gz