7 files changed, 65 insertions, 50 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index a7349ce59cb1..12dc4332d035 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	quagga
-PORTVERSION=	0.98.5
-PORTREVISION=	2
+PORTVERSION=	0.99.3
+PORTREVISION=	0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://quagga.net/download/
 
diff --git a/net/quagga/distinfo b/net/quagga/distinfo
index 0336fb8fdb8d..4ccb07fef638 100644
--- a/net/quagga/distinfo
+++ b/net/quagga/distinfo
@@ -1,3 +1,4 @@
-MD5 (quagga-0.98.5.tar.gz) = ec09c1ec624aea98e18aa19282666784
-SHA256 (quagga-0.98.5.tar.gz) = 300ea3f91f98db7e36014fd76cc0db3d86d39417830fbd43239f457b26624e81
+MD5 (quagga-0.99.3.tar.gz) = d11dfb2d0eb9fa93e1aca882541e45d8
+SHA256 (quagga-0.99.3.tar.gz) = 3e319fa854d84eaf6a57513256b903f0d068be85dbce27cb7ec3cbac08e26aac
+SIZE (quagga-0.99.3.tar.gz) = 2203788
 SIZE (quagga-0.98.5.tar.gz) = 2018058
diff --git a/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.h b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.h
index 92ffb01ab343..9cfe64b67ebb 100644
--- a/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.h
+++ b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.h
@@ -1,22 +1,22 @@
---- bgpd/bgpd.h.orig	Tue Oct 12 22:06:09 2004
-+++ bgpd/bgpd.h	Fri Jan 28 21:03:40 2005
-@@ -335,6 +335,9 @@
- #define PEER_FLAG_DYNAMIC_CAPABILITY        (1 << 6) /* dynamic capability */
- #define PEER_FLAG_ENFORCE_MULTIHOP          (1 << 7) /* enforce-multihop */
- #define PEER_FLAG_LOCAL_AS_NO_PREPEND       (1 << 8) /* local-as no-prepend */
-+#ifdef QUAGGA_TCP_MD5SIG /* XXX should move to AF_INET/SFI_UNICAST below */
+--- bgpd/bgpd.h.orig	Wed Jan 11 03:10:10 2006
++++ bgpd/bgpd.h	Mon Jan 30 08:52:06 2006
+@@ -347,6 +347,9 @@
+ #define PEER_FLAG_DYNAMIC_CAPABILITY        (1 << 5) /* dynamic capability */
+ #define PEER_FLAG_DISABLE_CONNECTED_CHECK   (1 << 6) /* disable-connected-check */
+ #define PEER_FLAG_LOCAL_AS_NO_PREPEND       (1 << 7) /* local-as no-prepend */
++#ifdef QUAGGA_TCP_MD5SIG
 +#define PEER_FLAG_TCP_SIGNATURE             (1 << 9) /* use TCP-MD5 digest */
 +#endif /* QUAGGA_TCP_MD5SIG */
  
-   /* Per AF configuration flags. */
-   u_int32_t af_flags[AFI_MAX][SAFI_MAX];
-@@ -496,6 +499,13 @@
+   /* NSF mode (graceful restart) */
+   u_char nsf[AFI_MAX][SAFI_MAX];
+@@ -522,6 +525,13 @@
  #define PEER_RMAP_TYPE_NOSET          (1 << 5) /* not allow to set commands */
  #define PEER_RMAP_TYPE_IMPORT         (1 << 6) /* neighbor route-map import */
  #define PEER_RMAP_TYPE_EXPORT         (1 << 7) /* neighbor route-map export */
 +
 +#ifdef QUAGGA_TCP_MD5SIG
-+  /* TCP-MD5 Password Support -- bms */
++ /* TCP-MD5 Password Support -- bms */
 +#define PEER_PASSWORD_MINLEN		1
 +#define PEER_PASSWORD_MAXLEN		80	/* width of password field */
 + char password[PEER_PASSWORD_MAXLEN];
@@ -24,15 +24,15 @@
  };
  
  /* This structure's member directly points incoming packet data
-@@ -879,6 +889,11 @@
+@@ -904,6 +914,11 @@
  
- int peer_local_as_set (struct peer *, as_t, int);
- int peer_local_as_unset (struct peer *);
+ extern int peer_local_as_set (struct peer *, as_t, int);
+ extern int peer_local_as_unset (struct peer *);
 +
 +#ifdef QUAGGA_TCP_MD5SIG
-+int peer_password_set (struct peer *, char *);
-+int peer_password_unset (struct peer *);
++extern int peer_password_set (struct peer *, char *);
++extern int peer_password_unset (struct peer *);
 +#endif /* QUAGGA_TCP_MD5SIG */
  
- int peer_prefix_list_set (struct peer *, afi_t, safi_t, int, const char *);
- int peer_prefix_list_unset (struct peer *, afi_t, safi_t, int);
+ extern int peer_prefix_list_set (struct peer *, afi_t, safi_t, int, const char *);
+ extern int peer_prefix_list_unset (struct peer *, afi_t, safi_t, int);
diff --git a/net/quagga/files/patch-configure b/net/quagga/files/patch-configure
index ad68f3227038..b4ba2dcfd408 100644
--- a/net/quagga/files/patch-configure
+++ b/net/quagga/files/patch-configure
@@ -1,42 +1,29 @@
---- configure.orig	Sun Aug 28 21:37:37 2005
-+++ configure	Wed Sep 14 12:07:40 2005
-@@ -14751,13 +14751,13 @@
+--- configure.orig	Fri Jan 20 07:24:48 2006
++++ configure	Mon Jan 30 09:36:38 2006
+@@ -15056,7 +15056,7 @@
    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/local/include/net-snmp/library/asn1.h /usr/local/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/include/ucd-snmp/asn1.h /usr/local/include/net-snmp/library/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null
      do
        test -f "${ac_snmp}" && break
      done
+@@ -15111,7 +15111,7 @@
  
-     case ${ac_snmp} in
--      /usr/include/net-snmp/*)
-+      /usr/local/include/net-snmp/*)
  
  cat >>confdefs.h <<\_ACEOF
- #define HAVE_SNMP
-@@ -14773,20 +14773,20 @@
- #define UCD_COMPATIBLE
+-#define HAVE_NET_SNMP
++#define HAVE_NETSNMP
  _ACEOF
  
--                  CFLAGS="${CFLAGS} -I/usr/include/net-snmp -I/usr/include/net-snmp/library"
-+                  CFLAGS="${CFLAGS} -I/usr/local/include/net-snmp -I/usr/local/include/net-snmp/library"
- 		  if test "${HAVE_NETSNMP}" = "yes"; then
- 		        LIBS="${LIBS} -lnetsnmp"
- 		  else
- 			LIBS="${LIBS} -lsnmp"
- 		  fi
-                   ;;
--      /usr/include/ucd-snmp/*)
-+      /usr/local/include/ucd-snmp/*)
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SNMP
+@@ -15119,7 +15119,7 @@
+ #define UCD_COMPATIBLE
  _ACEOF
  
--                  CFLAGS="${CFLAGS} -I/usr/include/ucd-snmp"
-+                  CFLAGS="${CFLAGS} -I/usr/local/include/ucd-snmp"
-     		  LIBS="${LIBS} -lsnmp"
-                   ;;
-       /usr/local/include/ucd-snmp/*)
+-      		SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/local/include/net-snmp"
++      		SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/local/include/net-snmp -I/usr/local/include/net-snmp/library"
+       		LIBS="${LIBS} -L/usr/local/lib -lnetsnmp"
+       		;;
+     esac
diff --git a/net/quagga/files/patch-lib-buffer.c b/net/quagga/files/patch-lib-buffer.c
new file mode 100644
index 000000000000..61fda3c21d71
--- /dev/null
+++ b/net/quagga/files/patch-lib-buffer.c
@@ -0,0 +1,11 @@
+--- lib/buffer.c.orig	Fri Feb  3 13:24:03 2006
++++ lib/buffer.c	Fri Feb  3 13:24:15 2006
+@@ -53,7 +53,7 @@
+   size_t sp;
+ 
+   /* Actual data stream (variable length). */
+-  unsigned char data[];  /* real dimension is buffer->size */
++  unsigned char *data;  /* real dimension is buffer->size */
+ };
+ 
+ /* It should always be true that: 0 <= sp <= cp <= size */
diff --git a/net/quagga/files/patch-ospfd-ospfd.h b/net/quagga/files/patch-ospfd-ospfd.h
new file mode 100644
index 000000000000..05707c4b6e68
--- /dev/null
+++ b/net/quagga/files/patch-ospfd-ospfd.h
@@ -0,0 +1,13 @@
+--- ospfd/ospfd.h.orig	Fri Feb  3 13:39:58 2006
++++ ospfd/ospfd.h	Fri Feb  3 13:40:51 2006
+@@ -26,6 +26,10 @@
+ #include "filter.h"
+ #include "log.h"
+ 
++#if !defined(UINT16_MAX)
++#define UINT16_MAX 0xffff
++#endif
++
+ #define OSPF_VERSION            2
+ 
+ /* Default protocol, port number. */
diff --git a/net/quagga/pkg-plist b/net/quagga/pkg-plist
index 570432bc1939..3a5e7ed2098d 100644
--- a/net/quagga/pkg-plist
+++ b/net/quagga/pkg-plist
@@ -18,6 +18,7 @@ lib/libzebra.a
 lib/libzebra.so
 lib/libzebra.so.0
 include/quagga/buffer.h
+include/quagga/checksum.h
 include/quagga/command.h
 include/quagga/distribute.h
 include/quagga/filter.h
@@ -29,8 +30,9 @@ include/quagga/jhash.h
 include/quagga/keychain.h
 include/quagga/linklist.h
 include/quagga/log.h
-include/quagga/md5-gnu.h
+include/quagga/md5.h
 include/quagga/memory.h
+include/quagga/memtypes.h
 include/quagga/network.h
 %%OSPFAPI_HEADER%%
 include/quagga/ospfd/ospf_api.h
@@ -58,6 +60,7 @@ include/quagga/thread.h
 include/quagga/vector.h
 include/quagga/version.h
 include/quagga/vty.h
+include/quagga/workqueue.h
 include/quagga/zassert.h
 include/quagga/zclient.h
 include/quagga/zebra.h