Tue Aug 31 13:20:13 2010 UTC ()
Replace with contents of quagga-devel, thus upgrading to 0.99.17.


(gdt)
diff -r1.4 -r1.5 pkgsrc/net/quagga/DESCR
diff -r1.36 -r1.37 pkgsrc/net/quagga/Makefile
diff -r1.10 -r1.11 pkgsrc/net/quagga/PLIST
diff -r1.10 -r1.11 pkgsrc/net/quagga/distinfo
diff -r1.2 -r1.3 pkgsrc/net/quagga/options.mk
diff -r1.3 -r0 pkgsrc/net/quagga/patches/patch-aa
diff -r1.3 -r0 pkgsrc/net/quagga/patches/patch-ab
diff -r1.3 -r0 pkgsrc/net/quagga/patches/patch-ac
cvs diff -r1.4 -r1.5 pkgsrc/net/quagga/DESCR (expand / switch to unified diff)

--- pkgsrc/net/quagga/DESCR 2010/08/31 12:55:16 1.4
+++ pkgsrc/net/quagga/DESCR 2010/08/31 13:20:13 1.5
@@ -1,11 +1,8 @@ @@ -1,11 +1,8 @@
1Quagga is a routing software suite, providing implementations of 1Quagga is a routing software suite, providing implementations of
2OSPFv2, OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for Unix platforms, 2OSPFv2, OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for Unix platforms,
3particularly FreeBSD and Linux and also NetBSD, to mention a few. 3including NetBSD, FreeBSD, OpenBSD, Linux, and Solaris.
4Quagga is a fork of GNU Zebra which was developed by Kunihiro 4Quagga is a fork of GNU Zebra which was developed by Kunihiro
5Ishiguro. The Quagga tree aims to build a more involved community 5Ishiguro. The Quagga tree aims to build a more involved community
6around Quagga than the current centralised model of GNU Zebra. 6around Quagga than the current centralised model of GNU Zebra.
7 7
8This version is obsolete and unmaintained. It is very unlikely that 8This package provides a development snapshot of quagga.
9security issues will be addressed. Users should run 0.99.x instead, 
10available in ../quagga-devel. 
11 
cvs diff -r1.36 -r1.37 pkgsrc/net/quagga/Makefile (expand / switch to unified diff)

--- pkgsrc/net/quagga/Makefile 2010/08/31 12:55:16 1.36
+++ pkgsrc/net/quagga/Makefile 2010/08/31 13:20:13 1.37
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1# $NetBSD: Makefile,v 1.36 2010/08/31 12:55:16 gdt Exp $ 1# $NetBSD: Makefile,v 1.37 2010/08/31 13:20:13 gdt Exp $
2# 2#
3 3
4DISTNAME= quagga-0.98.6 4DISTNAME= quagga-0.99.17
5PKGREVISION= 5 
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= http://www.quagga.net/download/ 6MASTER_SITES= http://www.quagga.net/download/
8 7
9MAINTAINER= gdt@NetBSD.org 8MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= http://www.quagga.net/ 9HOMEPAGE= http://www.quagga.net/
11COMMENT= Free multithreaded routing daemon software (fork of zebra) 10COMMENT= Free multithreaded routing daemon software
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
17 16
18GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
19USE_TOOLS+= gmake perl 18USE_TOOLS+= gawk gmake perl
20USE_LIBTOOL= YES 19USE_LIBTOOL= YES
21 20
22PKG_SYSCONFSUBDIR?= zebra 21PKG_SYSCONFSUBDIR?= zebra
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
24CONFIGURE_ARGS+= --enable-exampledir=${PREFIX}/share/examples/quagga 23CONFIGURE_ARGS+= --enable-exampledir=${PREFIX}/share/examples/quagga
25#CONFIGURE_ARGS+= --enable-pkgsrcrcdir=${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR} 24#CONFIGURE_ARGS+= --enable-pkgsrcrcdir=${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
26CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run/zebra 25CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run/zebra
27 26
28CONFLICTS+= zebra-[0-9]* 27CONFLICTS+= zebra-[0-9]*
29 28
30PLIST_SRC= ${WRKDIR}/PLIST 29PLIST_SRC= ${WRKDIR}/PLIST
31PLIST_CAT= # empty 30PLIST_CAT= # empty
32 31
cvs diff -r1.10 -r1.11 pkgsrc/net/quagga/PLIST (expand / switch to unified diff)

--- pkgsrc/net/quagga/PLIST 2009/06/14 18:09:41 1.10
+++ pkgsrc/net/quagga/PLIST 2010/08/31 13:20:13 1.11
@@ -1,54 +1,58 @@ @@ -1,54 +1,58 @@
1@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:09:41 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.11 2010/08/31 13:20:13 gdt Exp $
2include/quagga/buffer.h 2include/quagga/buffer.h
 3include/quagga/checksum.h
3include/quagga/command.h 4include/quagga/command.h
4include/quagga/distribute.h 5include/quagga/distribute.h
5include/quagga/filter.h 6include/quagga/filter.h
6include/quagga/getopt.h 7include/quagga/getopt.h
7include/quagga/hash.h 8include/quagga/hash.h
8include/quagga/if.h 9include/quagga/if.h
9include/quagga/if_rmap.h 10include/quagga/if_rmap.h
10include/quagga/jhash.h 11include/quagga/jhash.h
11include/quagga/keychain.h 12include/quagga/keychain.h
12include/quagga/linklist.h 13include/quagga/linklist.h
13include/quagga/log.h 14include/quagga/log.h
14include/quagga/md5-gnu.h 15include/quagga/md5.h
15include/quagga/memory.h 16include/quagga/memory.h
 17include/quagga/memtypes.h
16include/quagga/network.h 18include/quagga/network.h
17include/quagga/ospfd/ospf_api.h 19include/quagga/ospfd/ospf_api.h
18include/quagga/ospfd/ospf_asbr.h 20include/quagga/ospfd/ospf_asbr.h
19include/quagga/ospfd/ospf_dump.h 21include/quagga/ospfd/ospf_dump.h
20include/quagga/ospfd/ospf_ism.h 22include/quagga/ospfd/ospf_ism.h
21include/quagga/ospfd/ospf_lsa.h 23include/quagga/ospfd/ospf_lsa.h
22include/quagga/ospfd/ospf_lsdb.h 24include/quagga/ospfd/ospf_lsdb.h
23include/quagga/ospfd/ospf_nsm.h 25include/quagga/ospfd/ospf_nsm.h
24include/quagga/ospfd/ospf_opaque.h 26include/quagga/ospfd/ospf_opaque.h
25include/quagga/ospfd/ospfd.h 27include/quagga/ospfd/ospfd.h
26include/quagga/plist.h 28include/quagga/plist.h
27include/quagga/pqueue.h 29include/quagga/pqueue.h
28include/quagga/prefix.h 30include/quagga/prefix.h
29include/quagga/privs.h 31include/quagga/privs.h
 32include/quagga/route_types.h
30include/quagga/routemap.h 33include/quagga/routemap.h
31include/quagga/sigevent.h 34include/quagga/sigevent.h
32include/quagga/smux.h 35include/quagga/smux.h
33include/quagga/sockopt.h 36include/quagga/sockopt.h
34include/quagga/sockunion.h 37include/quagga/sockunion.h
35include/quagga/str.h 38include/quagga/str.h
36include/quagga/stream.h 39include/quagga/stream.h
37include/quagga/table.h 40include/quagga/table.h
38include/quagga/thread.h 41include/quagga/thread.h
39include/quagga/vector.h 42include/quagga/vector.h
40include/quagga/version.h 43include/quagga/version.h
41include/quagga/vty.h 44include/quagga/vty.h
 45include/quagga/workqueue.h
42include/quagga/zassert.h 46include/quagga/zassert.h
43include/quagga/zclient.h 47include/quagga/zclient.h
44include/quagga/zebra.h 48include/quagga/zebra.h
45info/quagga.info 49info/quagga.info
46lib/libospf.la 50lib/libospf.la
47lib/libzebra.la 51lib/libzebra.la
48man/man1/vtysh.1 52man/man1/vtysh.1
49man/man8/bgpd.8 53man/man8/bgpd.8
50man/man8/isisd.8 54man/man8/isisd.8
51man/man8/ospf6d.8 55man/man8/ospf6d.8
52man/man8/ospfd.8 56man/man8/ospfd.8
53man/man8/ripd.8 57man/man8/ripd.8
54man/man8/ripngd.8 58man/man8/ripngd.8
cvs diff -r1.10 -r1.11 pkgsrc/net/quagga/distinfo (expand / switch to unified diff)

--- pkgsrc/net/quagga/distinfo 2008/05/13 22:30:47 1.10
+++ pkgsrc/net/quagga/distinfo 2010/08/31 13:20:13 1.11
@@ -1,8 +1,5 @@ @@ -1,8 +1,5 @@
1$NetBSD: distinfo,v 1.10 2008/05/13 22:30:47 tonnerre Exp $ 1$NetBSD: distinfo,v 1.11 2010/08/31 13:20:13 gdt Exp $
2 2
3SHA1 (quagga-0.98.6.tar.gz) = 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 3SHA1 (quagga-0.99.17.tar.gz) = 31f42fa9f4d96aadf1bf97c3d9bf3308eb0d56c1
4RMD160 (quagga-0.98.6.tar.gz) = e15cd93b5d321660d7e29fc27174352967342879 4RMD160 (quagga-0.99.17.tar.gz) = f00bf01930f781ae0de9fe9981c74e7bae0798b5
5Size (quagga-0.98.6.tar.gz) = 2019992 bytes 5Size (quagga-0.99.17.tar.gz) = 2202151 bytes
6SHA1 (patch-aa) = 507d9cccd719e31d0710425858a80cef1215093d 
7SHA1 (patch-ab) = 3165bb9d31ea7a3a3231e3fe3a0c374ef7b98f00 
8SHA1 (patch-ac) = 401c64dd7588ca4736079ecd796deaff6a45d447 
cvs diff -r1.2 -r1.3 pkgsrc/net/quagga/options.mk (expand / switch to unified diff)

--- pkgsrc/net/quagga/options.mk 2007/09/16 11:36:52 1.2
+++ pkgsrc/net/quagga/options.mk 2010/08/31 13:20:13 1.3
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: options.mk,v 1.2 2007/09/16 11:36:52 gdt Exp $ 1# $NetBSD: options.mk,v 1.3 2010/08/31 13:20:13 gdt Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.quagga 3PKG_OPTIONS_VAR= PKG_OPTIONS.quagga
4PKG_SUPPORTED_OPTIONS= inet6 4PKG_SUPPORTED_OPTIONS= inet6
5PKG_SUPPORTED_OPTIONS+= quagga-ospf-opaque-lsa 5PKG_SUPPORTED_OPTIONS+= quagga-ospf-opaque-lsa
 6PKG_SUGGESTED_OPTIONS+= quagga-ospf-opaque-lsa
6PKG_SUPPORTED_OPTIONS+= quagga-vtysh 7PKG_SUPPORTED_OPTIONS+= quagga-vtysh
7PKG_SUGGESTED_OPTIONS= quagga-ospf-opaque-lsa quagga-vtysh 8PKG_SUGGESTED_OPTIONS+= quagga-vtysh
8 9
9PKG_OPTIONS_LEGACY_VARS+= USE_ZEBRA_OSPF_OPAQUELSA:quagga-ospf-opaque-lsa 10PKG_OPTIONS_LEGACY_VARS+= USE_ZEBRA_OSPF_OPAQUELSA:quagga-ospf-opaque-lsa
10PKG_OPTIONS_LEGACY_VARS+= USE_ZEBRA_VTYSH:quagga-vtysh 11PKG_OPTIONS_LEGACY_VARS+= USE_ZEBRA_VTYSH:quagga-vtysh
11 12
12.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
13 14
14### 15###
15### IPv6 support 16### IPv6 support
16### 17###
17.if !empty(PKG_OPTIONS:Minet6) 18.if !empty(PKG_OPTIONS:Minet6)
18PLIST_CAT+= ${PKGDIR}/PLIST.v6 19PLIST_CAT+= ${PKGDIR}/PLIST.v6
19RCD_SCRIPTS+= ospf6d ripngd 20RCD_SCRIPTS+= ospf6d ripngd
20. for _file_ in ospf6d.conf ripngd.conf 21. for _file_ in ospf6d.conf ripngd.conf
File Deleted: pkgsrc/net/quagga/patches/Attic/patch-aa
File Deleted: pkgsrc/net/quagga/patches/Attic/patch-ab
File Deleted: pkgsrc/net/quagga/patches/Attic/patch-ac