convert snmp FLAVOR to use net-snmp.
I do not see how this worked in the first place without smux support.
This commit is contained in:
parent
11dbad1923
commit
7a537a525f
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2004/01/02 06:50:55 david Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2004/10/13 03:10:49 danh Exp $
|
||||
|
||||
COMMENT= "multi-threaded routing daemon"
|
||||
|
||||
@ -37,8 +37,10 @@ FLAVORS= snmp
|
||||
FLAVOR?=
|
||||
|
||||
.if ${FLAVOR:L:Msnmp}
|
||||
LIB_DEPENDS= snmp.42::net/ucd-snmp
|
||||
LIB_DEPENDS= netsnmp.6.2::net/net-snmp
|
||||
CONFIGURE_ARGS+= --enable-snmp
|
||||
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-snmp
|
||||
.endif
|
||||
|
20
net/quagga/patches/patch-bgpd_bgp_snmp_c
Normal file
20
net/quagga/patches/patch-bgpd_bgp_snmp_c
Normal file
@ -0,0 +1,20 @@
|
||||
$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
|
||||
#include <zebra.h>
|
||||
|
||||
#ifdef HAVE_SNMP
|
||||
-#ifdef HAVE_NETSNMP
|
||||
+#ifdef HAVE_NET_SNMP
|
||||
#include <net-snmp/net-snmp-config.h>
|
||||
-#endif
|
||||
+#include <net-snmp/net-snmp-includes.h>
|
||||
+#else
|
||||
#include <asn1.h>
|
||||
#include <snmp.h>
|
||||
#include <snmp_impl.h>
|
||||
+#endif /* HAVE_NET_SNMP */
|
||||
|
||||
#include "if.h"
|
||||
#include "log.h"
|
20
net/quagga/patches/patch-lib_smux_c
Normal file
20
net/quagga/patches/patch-lib_smux_c
Normal file
@ -0,0 +1,20 @@
|
||||
$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 @@
|
||||
#include <zebra.h>
|
||||
|
||||
#ifdef HAVE_SNMP
|
||||
-#ifdef HAVE_NETSNMP
|
||||
+#ifdef HAVE_NET_SNMP
|
||||
#include <net-snmp/net-snmp-config.h>
|
||||
-#endif
|
||||
+#include <net-snmp/net-snmp-includes.h>
|
||||
+#else
|
||||
#include <asn1.h>
|
||||
#include <snmp.h>
|
||||
#include <snmp_impl.h>
|
||||
+#endif /* HAVE_NET_SNMP */
|
||||
|
||||
#include "log.h"
|
||||
#include "thread.h"
|
20
net/quagga/patches/patch-ospfd_ospf_snmp_c
Normal file
20
net/quagga/patches/patch-ospfd_ospf_snmp_c
Normal file
@ -0,0 +1,20 @@
|
||||
$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 @@
|
||||
#include <zebra.h>
|
||||
|
||||
#ifdef HAVE_SNMP
|
||||
-#ifdef HAVE_NETSNMP
|
||||
+#ifdef HAVE_NET_SNMP
|
||||
#include <net-snmp/net-snmp-config.h>
|
||||
-#endif
|
||||
+#include <net-snmp/net-snmp-includes.h>
|
||||
+#else
|
||||
#include <asn1.h>
|
||||
#include <snmp.h>
|
||||
#include <snmp_impl.h>
|
||||
+#endif /* HAVE_NET_SNMP */
|
||||
|
||||
#include "if.h"
|
||||
#include "log.h"
|
20
net/quagga/patches/patch-ripd_rip_snmp_c
Normal file
20
net/quagga/patches/patch-ripd_rip_snmp_c
Normal file
@ -0,0 +1,20 @@
|
||||
$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 @@
|
||||
#include <zebra.h>
|
||||
|
||||
#ifdef HAVE_SNMP
|
||||
-#ifdef HAVE_NETSNMP
|
||||
+#ifdef HAVE_NET_SNMP
|
||||
#include <net-snmp/net-snmp-config.h>
|
||||
-#endif
|
||||
+#include <net-snmp/net-snmp-includes.h>
|
||||
+#else
|
||||
#include <asn1.h>
|
||||
#include <snmp.h>
|
||||
#include <snmp_impl.h>
|
||||
+#endif /* HAVE_NET_SNMP */
|
||||
|
||||
#include "if.h"
|
||||
#include "log.h"
|
20
net/quagga/patches/patch-zebra_zebra_snmp_c
Normal file
20
net/quagga/patches/patch-zebra_zebra_snmp_c
Normal file
@ -0,0 +1,20 @@
|
||||
$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 @@
|
||||
#include <zebra.h>
|
||||
|
||||
#ifdef HAVE_SNMP
|
||||
-#ifdef HAVE_NETSNMP
|
||||
+#ifdef HAVE_NET_SNMP
|
||||
#include <net-snmp/net-snmp-config.h>
|
||||
-#endif
|
||||
+#include <net-snmp/net-snmp-includes.h>
|
||||
+#else
|
||||
#include <asn1.h>
|
||||
#include <snmp.h>
|
||||
#include <snmp_impl.h>
|
||||
+#endif /* HAVE_NET_SNMP */
|
||||
|
||||
#include "if.h"
|
||||
#include "log.h"
|
Loading…
Reference in New Issue
Block a user