From 445fdc8f47979487f3b592b5f7871d45841c0c23 Mon Sep 17 00:00:00 2001 From: rui Date: Wed, 20 Jun 2007 18:05:36 +0000 Subject: [PATCH] update quagga to 0.99.7 help and ok pyr@ --- net/quagga/Makefile | 47 +++---- net/quagga/distinfo | 10 +- net/quagga/patches/patch-bgpd_bgp_snmp_c | 17 +-- net/quagga/patches/patch-configure | 93 ++++++------ net/quagga/patches/patch-doc_Makefile_in | 68 ++++----- net/quagga/patches/patch-lib_smux_c | 17 +-- .../patches/patch-ospfclient_Makefile_in | 30 ++-- net/quagga/patches/patch-ospfd_ospf_packet_c | 19 --- net/quagga/patches/patch-ospfd_ospf_snmp_c | 17 +-- net/quagga/patches/patch-ripd_rip_snmp_c | 17 +-- .../patches/patch-zebra_kernel_socket_c | 18 +-- net/quagga/patches/patch-zebra_zebra_snmp_c | 17 +-- net/quagga/pkg/MESSAGE | 7 +- net/quagga/pkg/PFRAG.shared | 3 + net/quagga/pkg/PLIST | 132 ++++++++++-------- 15 files changed, 226 insertions(+), 286 deletions(-) delete mode 100644 net/quagga/patches/patch-ospfd_ospf_packet_c create mode 100644 net/quagga/pkg/PFRAG.shared diff --git a/net/quagga/Makefile b/net/quagga/Makefile index ab7b303bd46..a976839a5b9 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2006/04/12 21:01:45 david Exp $ +# $OpenBSD: Makefile,v 1.8 2007/06/20 18:05:36 rui Exp $ COMMENT= "multi-threaded routing daemon" -DISTNAME= quagga-0.96.4 -PKGNAME= ${DISTNAME}p3 +DISTNAME= quagga-0.99.7 +SHARED_LIBS= ospf 0.0 \ + zebra 0.0 CATEGORIES= net MASTER_SITES= http://www.quagga.net/download/ @@ -16,28 +17,29 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c curses m -STATEDIR?= /var/zebra +STATEDIR?= /var/quagga SUBST_VARS= CONFDIR STATEDIR -# you might need debugging, it's a developer release ! -#CFLAGS+= -g - USE_GMAKE= Yes -CONFDIR= ${SYSCONFDIR}/zebra +CONFDIR= ${SYSCONFDIR}/quagga SEPARATE_BUILD= concurrent CONFIGURE_STYLE=gnu old -CONFIGURE_ARGS+=--includedir=${PREFIX}/include/zebra -CONFIGURE_ARGS+=--sysconfdir=${CONFDIR} -CONFIGURE_ARGS+=--localstatedir=${STATEDIR} -CONFIGURE_ARGS+=--enable-user=_quagga -CONFIGURE_ARGS+=--enable-group=_quagga +CONFIGURE_ARGS+=--includedir=${PREFIX}/include/quagga \ + --sysconfdir=${CONFDIR} \ + --localstatedir=${STATEDIR} \ + --enable-user=_quagga \ + --enable-group=_quagga \ + --enable-vtysh \ + --enable-vtysh-group=_quagga CONFIGURE_ENV= LIBS=-lcurses +FAKE_FLAGS= exampledir='${PREFIX}/share/examples/quagga' + FLAVORS= snmp FLAVOR?= .if ${FLAVOR:L:Msnmp} -LIB_DEPENDS= netsnmp.6.2::net/net-snmp +LIB_DEPENDS= ::net/net-snmp CONFIGURE_ARGS+= --enable-snmp CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -45,20 +47,9 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS+= --disable-snmp .endif -post-extract: -.for f in vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 quagga.info - @cd ${WRKSRC}/doc; sed \ - -e s#/usr/local/etc#@sysconfdir@#g \ - -e s#/usr/local/sbin#@prefix@/sbin#g \ - ${f} > ${f}.in && \ - rm -f ${f} -.endfor - post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zebra - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/zebra - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/zebra - ${INSTALL_DATA} ${WRKSRC}/SERVICES ${PREFIX}/share/doc/zebra - ${INSTALL_DATA} ${WRKINST}${SYSCONFDIR}/zebra/* ${PREFIX}/share/examples/zebra + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/quagga + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/quagga + ${INSTALL_DATA} ${WRKSRC}/SERVICES ${PREFIX}/share/doc/quagga .include diff --git a/net/quagga/distinfo b/net/quagga/distinfo index b08d8d76d27..e1d287be514 100644 --- a/net/quagga/distinfo +++ b/net/quagga/distinfo @@ -1,5 +1,5 @@ -MD5 (quagga-0.96.4.tar.gz) = VfWjB8RT+Q19/ME/Dau4PQ== -RMD160 (quagga-0.96.4.tar.gz) = PMMpux0MINCTl/jefCuzs1/riH8= -SHA1 (quagga-0.96.4.tar.gz) = 6xvU0pY4zEUaA9bKqLaUhelkUQ0= -SHA256 (quagga-0.96.4.tar.gz) = n4/VeEwNS76ZUWRBoGqTwqSx7+j+/kvuVNk+IVKlBhc= -SIZE (quagga-0.96.4.tar.gz) = 1401066 +MD5 (quagga-0.99.7.tar.gz) = 9EgoHFAAdAjOksXY4hB6vA== +RMD160 (quagga-0.99.7.tar.gz) = 966U8rX0eC76e3C9WZJEkmGBM/4= +SHA1 (quagga-0.99.7.tar.gz) = 2i1pAnXji7WIQe3CZbo70VSxDdI= +SHA256 (quagga-0.99.7.tar.gz) = /SWORQNkYSnKd/b+nBa2nzbzICVnaLhNur0uSRWrjrQ= +SIZE (quagga-0.99.7.tar.gz) = 2350372 diff --git a/net/quagga/patches/patch-bgpd_bgp_snmp_c b/net/quagga/patches/patch-bgpd_bgp_snmp_c index 4d09a02f14f..da8e3f8cd14 100644 --- a/net/quagga/patches/patch-bgpd_bgp_snmp_c +++ b/net/quagga/patches/patch-bgpd_bgp_snmp_c @@ -1,20 +1,17 @@ -$OpenBSD: patch-bgpd_bgp_snmp_c,v 1.1 2004/10/13 03:10:49 danh Exp $ ---- bgpd/bgp_snmp.c.orig Wed Jun 18 21:21:07 2003 -+++ bgpd/bgp_snmp.c Tue Oct 12 22:51:17 2004 -@@ -21,12 +21,14 @@ Software Foundation, Inc., 59 Temple Pla +$OpenBSD: patch-bgpd_bgp_snmp_c,v 1.2 2007/06/20 18:05:36 rui Exp $ +--- bgpd/bgp_snmp.c.orig Sat Jun 16 20:31:05 2007 ++++ bgpd/bgp_snmp.c Sat Jun 16 20:31:42 2007 +@@ -21,12 +21,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330 #include #ifdef HAVE_SNMP -#ifdef HAVE_NETSNMP -+#ifdef HAVE_NET_SNMP #include -#endif +-#include +-#include +-#include +#include -+#else - #include - #include - #include -+#endif /* HAVE_NET_SNMP */ #include "if.h" #include "log.h" diff --git a/net/quagga/patches/patch-configure b/net/quagga/patches/patch-configure index a965814915f..3d7a3f731f6 100644 --- a/net/quagga/patches/patch-configure +++ b/net/quagga/patches/patch-configure @@ -1,48 +1,49 @@ -$OpenBSD: patch-configure,v 1.2 2004/10/13 03:13:15 danh Exp $ ---- configure.orig Sun Nov 2 00:14:09 2003 -+++ configure Tue Oct 12 22:58:38 2004 -@@ -7512,7 +7512,7 @@ if test "${ac_cv_lib_netsnmp_asn_parse_i - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lnetsnmp $LIBS" -+LIBS="-lnetsnmp -lm $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -7571,7 +7571,7 @@ if test "${ac_cv_lib_netsnmp_asn_parse_i - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lnetsnmp "-lcrypto" $LIBS" -+LIBS="-lnetsnmp -lcrypto -lm $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -7987,7 +7987,7 @@ fi - fi - - if test "${HAVE_SNMP}" = "yes"; then -- for ac_snmp in /usr/include/net-snmp/library/asn1.h /usr/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null -+ for ac_snmp in /usr/include/net-snmp/library/asn1.h /usr/local/include/net-snmp/library/asn1.h /usr/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null - do - test -f "${ac_snmp}" && break - done -@@ -8051,7 +8051,7 @@ cat >>confdefs.h <<\_ACEOF +$OpenBSD: patch-configure,v 1.3 2007/06/20 18:05:36 rui Exp $ +--- configure.orig Sun Apr 29 21:14:32 2007 ++++ configure Sat Jun 16 00:11:09 2007 +@@ -19895,6 +19895,15 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#ifdef HAVE_SYS_SOCKET_H ++#include ++#endif ++#ifdef HAVE_NET_IF_H ++#include ++#endif ++#ifdef HAVE_NETINET_IN_H ++#include ++#endif + #include <$ac_header> _ACEOF + rm -f conftest.$ac_objext +@@ -23640,6 +23649,18 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#ifdef HAVE_SYS_SOCKET_H ++#include ++#endif ++#ifdef HAVE_NET_IF_H ++#include ++#endif ++#ifdef HAVE_IPV6 ++#include ++#endif ++#ifdef HAVE_NETINET6_IN6_VAR_H ++#include ++#endif + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +@@ -28184,10 +28205,3 @@ log file mask : ${enable_logfile_mask} - CFLAGS="${CFLAGS} -I/usr/local/include/net-snmp" -- LIBS="${LIBS} -L/usr/local/lib -lnetsnmp" -+ LIBS="${LIBS} -L/usr/local/lib -lnetsnmp -lm" - ;; - esac - if test "${NEED_CRYPTO}" = "yes"; then -@@ -9190,7 +9190,7 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_htonl_works" >&5 - echo "${ECHO_T}$ac_cv_htonl_works" >&6 - -- ac_config_files="$ac_config_files Makefile lib/Makefile zebra/Makefile ripd/Makefile ripngd/Makefile bgpd/Makefile ospfd/Makefile ospf6d/Makefile vtysh/Makefile doc/Makefile ospfclient/Makefile redhat/quagga.spec lib/version.h" -+ ac_config_files="$ac_config_files Makefile lib/Makefile zebra/Makefile ripd/Makefile ripngd/Makefile bgpd/Makefile ospfd/Makefile ospf6d/Makefile vtysh/Makefile doc/Makefile doc/bgpd.8 doc/ospf6d.8 doc/ospfd.8 doc/ripd.8 doc/ripngd.8 doc/vtysh.1 doc/zebra.8 ospfclient/Makefile redhat/quagga.spec lib/version.h" - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure + The above user and group must have read/write access to the state file + directory and to the config files in the config file directory." +- +-if test x"$quagga_cv_gnu_make" = x"no"; then echo " +-Warning: The ${MAKE-make} programme detected, either in your path or +-via the MAKE variable, is not GNU Make. GNU make may be installed as +-gmake on some systems. and is required to complete a build of Quagga +-" > /dev/stderr +-fi diff --git a/net/quagga/patches/patch-doc_Makefile_in b/net/quagga/patches/patch-doc_Makefile_in index a3a8d394f69..b7115d62a6a 100644 --- a/net/quagga/patches/patch-doc_Makefile_in +++ b/net/quagga/patches/patch-doc_Makefile_in @@ -1,57 +1,37 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2003/12/11 19:00:59 david Exp $ ---- doc/Makefile.in.orig 2003-11-01 23:26:38.000000000 -0600 -+++ doc/Makefile.in 2003-11-17 19:40:12.000000000 -0600 -@@ -36,6 +36,7 @@ oldincludedir = /usr/include +$OpenBSD: patch-doc_Makefile_in,v 1.2 2007/06/20 18:05:36 rui Exp $ +--- doc/Makefile.in.orig Fri Jun 15 17:05:39 2007 ++++ doc/Makefile.in Fri Jun 15 17:05:20 2007 +@@ -19,6 +19,7 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +builddir = @builddir@ top_builddir = .. - - ACLOCAL = @ACLOCAL@ -@@ -84,6 +85,7 @@ LIBCAP = @LIBCAP@ - LIBPAM = @LIBPAM@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + INSTALL = @INSTALL@ +@@ -125,6 +126,7 @@ LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ LIB_IPV6 = @LIB_IPV6@ LIB_REGEX = @LIB_REGEX@ +MAKEINFOFLAGS = --no-split -I $(srcdir) - MULTIPATH_NUM = @MULTIPATH_NUM@ - OSPF6D = @OSPF6D@ - OSPFAPI = @OSPFAPI@ -@@ -141,21 +143,19 @@ quagga.info: quagga.texi $(quagga_TEXINF - quagga.dvi: quagga.texi $(quagga_TEXINFOS) - - .texi.info: -- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] -- cd $(srcdir) \ -- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -- `echo $< | sed 's,.*/,,'` -+ @rm -f $@ $@-[0-9] $@-[0-9][0-9] -+ $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -+ `echo $< | sed 's,.*/,,'` + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +@@ -331,7 +333,7 @@ distclean-libtool: .texi.dvi: - TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" \ + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ -+ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) ' \ ++ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)' \ $(TEXI2DVI) $< - .texi: -- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] -- cd $(srcdir) \ -- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -- `echo $< | sed 's,.*/,,'` -+ @rm -f $@ $@-[0-9] $@-[0-9][0-9] -+ $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -+ `echo $< | sed 's,.*/,,'` - - MAKEINFO = @MAKEINFO@ - TEXI2DVI = texi2dvi -@@ -382,7 +382,7 @@ install-info-am: $(INFO_DEPS) - $(mkinstalldirs) $(DESTDIR)$(infodir) - @list='$(INFO_DEPS)'; \ - for file in $$list; do \ -- d=$(srcdir); \ -+ d=$(builddir); \ - for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \ - if test -f $$ifile; then \ - relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \ + .texi.pdf: +@@ -624,7 +626,7 @@ install-info-am: $(INFO_DEPS) + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ +- if test -f $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -f $$file; then d=.; else d=$(buildir); fi; \ + file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ + for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ + $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ diff --git a/net/quagga/patches/patch-lib_smux_c b/net/quagga/patches/patch-lib_smux_c index 27506976b6b..b796c90ca18 100644 --- a/net/quagga/patches/patch-lib_smux_c +++ b/net/quagga/patches/patch-lib_smux_c @@ -1,20 +1,17 @@ -$OpenBSD: patch-lib_smux_c,v 1.1 2004/10/13 03:10:49 danh Exp $ ---- lib/smux.c.orig Tue Aug 12 22:54:44 2003 -+++ lib/smux.c Tue Oct 12 22:45:15 2004 -@@ -22,12 +22,14 @@ +$OpenBSD: patch-lib_smux_c,v 1.2 2007/06/20 18:05:36 rui Exp $ +--- lib/smux.c.orig Sat Jun 16 20:32:10 2007 ++++ lib/smux.c Sat Jun 16 20:32:42 2007 +@@ -22,12 +22,8 @@ #include #ifdef HAVE_SNMP -#ifdef HAVE_NETSNMP -+#ifdef HAVE_NET_SNMP #include -#endif +-#include +-#include +-#include +#include -+#else - #include - #include - #include -+#endif /* HAVE_NET_SNMP */ #include "log.h" #include "thread.h" diff --git a/net/quagga/patches/patch-ospfclient_Makefile_in b/net/quagga/patches/patch-ospfclient_Makefile_in index 88c5cd0a697..7d0c6a083f7 100644 --- a/net/quagga/patches/patch-ospfclient_Makefile_in +++ b/net/quagga/patches/patch-ospfclient_Makefile_in @@ -1,21 +1,13 @@ -$OpenBSD: patch-ospfclient_Makefile_in,v 1.1 2004/01/02 06:45:19 david Exp $ ---- ospfclient/Makefile.in.orig 2003-11-01 23:54:59.000000000 -0600 -+++ ospfclient/Makefile.in 2003-12-31 15:13:22.000000000 -0600 -@@ -77,7 +77,7 @@ DEPDIR = @DEPDIR@ - IF_METHOD = @IF_METHOD@ - IF_PROC = @IF_PROC@ - --INCLUDES = -I../lib -I../ -+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - IPFORWARD = @IPFORWARD@ - KERNEL_METHOD = @KERNEL_METHOD@ -@@ -104,6 +104,8 @@ ZEBRA = @ZEBRA@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ +$OpenBSD: patch-ospfclient_Makefile_in,v 1.2 2007/06/20 18:05:36 rui Exp $ +--- ospfclient/Makefile.in.orig Fri Jun 15 17:11:45 2007 ++++ ospfclient/Makefile.in Fri Jun 15 17:11:32 2007 +@@ -109,7 +109,8 @@ CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ + CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEFS = @DEFS@ +DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" +INSTALL_SDATA = @INSTALL@ -m 600 - - lib_LIBRARIES = libospfapiclient.a - sbin_PROGRAMS = ospfclient + DEPDIR = @DEPDIR@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ diff --git a/net/quagga/patches/patch-ospfd_ospf_packet_c b/net/quagga/patches/patch-ospfd_ospf_packet_c deleted file mode 100644 index 452beb871a4..00000000000 --- a/net/quagga/patches/patch-ospfd_ospf_packet_c +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-ospfd_ospf_packet_c,v 1.1.1.1 2003/12/11 19:00:59 david Exp $ ---- ospfd/ospf_packet.c.orig 2003-09-24 08:28:30.000000000 -0500 -+++ ospfd/ospf_packet.c 2003-12-03 01:14:31.000000000 -0600 -@@ -1936,13 +1936,13 @@ ospf_recv_packet (int fd, struct interfa - return NULL; - } - --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || (defined(__OpenBSD__) && (OpenBSD < 200311)) - ip_len = iph.ip_len; - #else - ip_len = ntohs (iph.ip_len); - #endif - --#if !defined(GNU_LINUX) -+#if !defined(GNU_LINUX) && (OpenBSD < 200311) - /* - * Kernel network code touches incoming IP header parameters, - * before protocol specific processing. diff --git a/net/quagga/patches/patch-ospfd_ospf_snmp_c b/net/quagga/patches/patch-ospfd_ospf_snmp_c index 8950f56ff8e..961aa3411de 100644 --- a/net/quagga/patches/patch-ospfd_ospf_snmp_c +++ b/net/quagga/patches/patch-ospfd_ospf_snmp_c @@ -1,20 +1,17 @@ -$OpenBSD: patch-ospfd_ospf_snmp_c,v 1.1 2004/10/13 03:10:49 danh Exp $ ---- ospfd/ospf_snmp.c.orig Mon Sep 29 12:59:43 2003 -+++ ospfd/ospf_snmp.c Tue Oct 12 22:52:24 2004 -@@ -24,12 +24,14 @@ +$OpenBSD: patch-ospfd_ospf_snmp_c,v 1.2 2007/06/20 18:05:36 rui Exp $ +--- ospfd/ospf_snmp.c.orig Sat Jun 16 20:33:07 2007 ++++ ospfd/ospf_snmp.c Sat Jun 16 20:33:32 2007 +@@ -25,12 +25,8 @@ #include #ifdef HAVE_SNMP -#ifdef HAVE_NETSNMP -+#ifdef HAVE_NET_SNMP #include -#endif +-#include +-#include +-#include +#include -+#else - #include - #include - #include -+#endif /* HAVE_NET_SNMP */ #include "if.h" #include "log.h" diff --git a/net/quagga/patches/patch-ripd_rip_snmp_c b/net/quagga/patches/patch-ripd_rip_snmp_c index c158f18535d..e79e5f671e9 100644 --- a/net/quagga/patches/patch-ripd_rip_snmp_c +++ b/net/quagga/patches/patch-ripd_rip_snmp_c @@ -1,20 +1,17 @@ -$OpenBSD: patch-ripd_rip_snmp_c,v 1.1 2004/10/13 03:10:49 danh Exp $ ---- ripd/rip_snmp.c.orig Wed Jun 18 21:21:07 2003 -+++ ripd/rip_snmp.c Tue Oct 12 22:51:50 2004 -@@ -22,12 +22,14 @@ +$OpenBSD: patch-ripd_rip_snmp_c,v 1.2 2007/06/20 18:05:36 rui Exp $ +--- ripd/rip_snmp.c.orig Sat Jun 16 20:33:53 2007 ++++ ripd/rip_snmp.c Sat Jun 16 20:34:20 2007 +@@ -22,12 +22,8 @@ #include #ifdef HAVE_SNMP -#ifdef HAVE_NETSNMP -+#ifdef HAVE_NET_SNMP #include -#endif +-#include +-#include +-#include +#include -+#else - #include - #include - #include -+#endif /* HAVE_NET_SNMP */ #include "if.h" #include "log.h" diff --git a/net/quagga/patches/patch-zebra_kernel_socket_c b/net/quagga/patches/patch-zebra_kernel_socket_c index 5a63074197b..cd9e692bec7 100644 --- a/net/quagga/patches/patch-zebra_kernel_socket_c +++ b/net/quagga/patches/patch-zebra_kernel_socket_c @@ -1,16 +1,12 @@ -$OpenBSD: patch-zebra_kernel_socket_c,v 1.1 2005/06/09 20:42:37 robert Exp $ ---- zebra/kernel_socket.c.orig Mon Oct 20 14:15:29 2003 -+++ zebra/kernel_socket.c Thu Jun 9 13:55:35 2005 -@@ -76,8 +76,12 @@ +$OpenBSD: patch-zebra_kernel_socket_c,v 1.2 2007/06/20 18:05:36 rui Exp $ +--- zebra/kernel_socket.c.orig Fri Jun 15 17:15:18 2007 ++++ zebra/kernel_socket.c Fri Jun 15 17:14:52 2007 +@@ -136,7 +136,7 @@ struct message rtm_type_str[] = {RTM_REDIRECT, "RTM_REDIRECT"}, {RTM_MISS, "RTM_MISS"}, {RTM_LOCK, "RTM_LOCK"}, +-#ifdef OLDADD +#ifdef RTM_OLDADD {RTM_OLDADD, "RTM_OLDADD"}, -+#endif /* RTM_OLDADD */ -+#ifdef RTM_OLDDEL - {RTM_OLDDEL, "RTM_OLDDEL"}, -+#endif /* RTM_OLDDEL */ - {RTM_RESOLVE, "RTM_RESOLVE"}, - {RTM_NEWADDR, "RTM_NEWADDR"}, - {RTM_DELADDR, "RTM_DELADDR"}, + #endif /* RTM_OLDADD */ + #ifdef RTM_OLDDEL diff --git a/net/quagga/patches/patch-zebra_zebra_snmp_c b/net/quagga/patches/patch-zebra_zebra_snmp_c index 88458f50440..ea769766ac0 100644 --- a/net/quagga/patches/patch-zebra_zebra_snmp_c +++ b/net/quagga/patches/patch-zebra_zebra_snmp_c @@ -1,20 +1,17 @@ -$OpenBSD: patch-zebra_zebra_snmp_c,v 1.1 2004/10/13 03:10:49 danh Exp $ ---- zebra/zebra_snmp.c.orig Wed Jun 18 21:21:08 2003 -+++ zebra/zebra_snmp.c Tue Oct 12 22:50:06 2004 -@@ -22,12 +22,14 @@ +$OpenBSD: patch-zebra_zebra_snmp_c,v 1.2 2007/06/20 18:05:36 rui Exp $ +--- zebra/zebra_snmp.c.orig Sat Jun 16 20:34:39 2007 ++++ zebra/zebra_snmp.c Sat Jun 16 20:35:10 2007 +@@ -22,12 +22,8 @@ #include #ifdef HAVE_SNMP -#ifdef HAVE_NETSNMP -+#ifdef HAVE_NET_SNMP #include -#endif +-#include +-#include +-#include +#include -+#else - #include - #include - #include -+#endif /* HAVE_NET_SNMP */ #include "if.h" #include "log.h" diff --git a/net/quagga/pkg/MESSAGE b/net/quagga/pkg/MESSAGE index f0067e4cd1d..7c0e6abe2b6 100644 --- a/net/quagga/pkg/MESSAGE +++ b/net/quagga/pkg/MESSAGE @@ -1,4 +1,5 @@ Sample Quagga configuration files have been installed in -${PREFIX}/share/examples/zebra -Please rename and install these files into ${CONFDIR} -Change the configuration to meet your needs. +${PREFIX}/share/examples/quagga You will need to create a ${CONFDIR} +directory and install your configuration files there. + +You will also need to create a ${STATEDIR} directory for quagga runtime. diff --git a/net/quagga/pkg/PFRAG.shared b/net/quagga/pkg/PFRAG.shared new file mode 100644 index 00000000000..169c006045d --- /dev/null +++ b/net/quagga/pkg/PFRAG.shared @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1 2007/06/20 18:05:36 rui Exp $ +@lib lib/libospf.so.${LIBospf_VERSION} +@lib lib/libzebra.so.${LIBzebra_VERSION} diff --git a/net/quagga/pkg/PLIST b/net/quagga/pkg/PLIST index fdee2d3f71b..f1fb28ef6cb 100644 --- a/net/quagga/pkg/PLIST +++ b/net/quagga/pkg/PLIST @@ -1,54 +1,67 @@ -@comment $OpenBSD: PLIST,v 1.6 2005/08/09 22:55:34 aanriot Exp $ +@comment $OpenBSD: PLIST,v 1.7 2007/06/20 18:05:36 rui Exp $ @conflict zebra-* @newgroup _quagga:525 @newuser _quagga:525:_quagga:daemon:Quagga Account:/nonexistent:/sbin/nologin -include/zebra/ -include/zebra/buffer.h -include/zebra/command.h -include/zebra/debug.h -include/zebra/distribute.h -include/zebra/filter.h -include/zebra/getopt.h -include/zebra/hash.h -include/zebra/if.h -include/zebra/if_rmap.h -include/zebra/keychain.h -include/zebra/linklist.h -include/zebra/log.h -include/zebra/md5-gnu.h -include/zebra/memory.h -include/zebra/network.h -include/zebra/ospfd/ -include/zebra/ospfd/ospf_api.h -include/zebra/ospfd/ospf_asbr.h -include/zebra/ospfd/ospf_dump.h -include/zebra/ospfd/ospf_ism.h -include/zebra/ospfd/ospf_lsa.h -include/zebra/ospfd/ospf_lsdb.h -include/zebra/ospfd/ospf_nsm.h -include/zebra/ospfd/ospf_opaque.h -include/zebra/ospfd/ospfd.h -include/zebra/plist.h -include/zebra/prefix.h -include/zebra/privs.h -include/zebra/routemap.h -include/zebra/smux.h -include/zebra/sockopt.h -include/zebra/sockunion.h -include/zebra/str.h -include/zebra/stream.h -include/zebra/table.h -include/zebra/thread.h -include/zebra/vector.h -include/zebra/version.h -include/zebra/vty.h -include/zebra/zclient.h -include/zebra/zebra.h -@info info/quagga.info +%%SHARED%% +bin/vtysh +include/quagga/ +include/quagga/quagga/ +include/quagga/quagga/buffer.h +include/quagga/quagga/checksum.h +include/quagga/quagga/command.h +include/quagga/quagga/distribute.h +include/quagga/quagga/filter.h +include/quagga/quagga/getopt.h +include/quagga/quagga/hash.h +include/quagga/quagga/if.h +include/quagga/quagga/if_rmap.h +include/quagga/quagga/jhash.h +include/quagga/quagga/keychain.h +include/quagga/quagga/linklist.h +include/quagga/quagga/log.h +include/quagga/quagga/md5.h +include/quagga/quagga/memory.h +include/quagga/quagga/memtypes.h +include/quagga/quagga/network.h +include/quagga/quagga/ospfd/ +include/quagga/quagga/ospfd/ospf_api.h +include/quagga/quagga/ospfd/ospf_asbr.h +include/quagga/quagga/ospfd/ospf_dump.h +include/quagga/quagga/ospfd/ospf_ism.h +include/quagga/quagga/ospfd/ospf_lsa.h +include/quagga/quagga/ospfd/ospf_lsdb.h +include/quagga/quagga/ospfd/ospf_nsm.h +include/quagga/quagga/ospfd/ospf_opaque.h +include/quagga/quagga/ospfd/ospfd.h +include/quagga/quagga/plist.h +include/quagga/quagga/pqueue.h +include/quagga/quagga/prefix.h +include/quagga/quagga/privs.h +include/quagga/quagga/route_types.h +include/quagga/quagga/routemap.h +include/quagga/quagga/sigevent.h +include/quagga/quagga/smux.h +include/quagga/quagga/sockopt.h +include/quagga/quagga/sockunion.h +include/quagga/quagga/str.h +include/quagga/quagga/stream.h +include/quagga/quagga/table.h +include/quagga/quagga/thread.h +include/quagga/quagga/vector.h +include/quagga/quagga/version.h +include/quagga/quagga/vty.h +include/quagga/quagga/workqueue.h +include/quagga/quagga/zassert.h +include/quagga/quagga/zclient.h +include/quagga/quagga/zebra.h +info/quagga.info lib/libospf.a +lib/libospf.la lib/libzebra.a +lib/libzebra.la @man man/man1/vtysh.1 @man man/man8/bgpd.8 +@man man/man8/isisd.8 @man man/man8/ospf6d.8 @man man/man8/ospfd.8 @man man/man8/ripd.8 @@ -59,25 +72,22 @@ sbin/ospf6d sbin/ospfd sbin/ripd sbin/ripngd +sbin/watchquagga sbin/zebra -share/doc/zebra/ -share/doc/zebra/README -share/doc/zebra/SERVICES -share/examples/zebra/ -share/examples/zebra/bgpd.conf.sample -share/examples/zebra/bgpd.conf.sample2 -share/examples/zebra/ospf6d.conf.sample -share/examples/zebra/ospfd.conf.sample -share/examples/zebra/ripd.conf.sample -share/examples/zebra/ripngd.conf.sample +share/doc/quagga/ +share/doc/quagga/README +share/doc/quagga/SERVICES +share/examples/quagga/ +share/examples/quagga/bgpd.conf.sample +share/examples/quagga/bgpd.conf.sample2 +share/examples/quagga/ospf6d.conf.sample +share/examples/quagga/ospfd.conf.sample +share/examples/quagga/ripd.conf.sample +share/examples/quagga/ripngd.conf.sample +share/examples/quagga/vtysh.conf.sample +share/examples/quagga/zebra.conf.sample @owner _quagga @group _quagga -@sample ${SYSCONFDIR}/zebra/ +@sample ${SYSCONFDIR}/quagga/ @sample ${STATEDIR}/ -@owner -@group -share/examples/zebra/zebra.conf.sample -@owner _quagga -@group _quagga -@sample ${SYSCONFDIR}/zebra/zebra.conf @extraunexec rm -rf ${STATEDIR}