- Update to 0.99.16

Submitted by:	maintainer
Feature safe:	yes

7 files changed, 15 insertions, 91 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index b81dad406485..27145ee15461 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	quagga
-PORTVERSION=	0.99.15
-PORTREVISION=	5
+PORTVERSION=	0.99.16
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://quagga.net/download/ \
 		http://www.ru.quagga.net/download/ \
@@ -46,6 +45,9 @@ OPTIONS=	ISISD		"Enable experimental ISIS daemon"	off \
 .include <bsd.port.pre.mk>
 
 CFLAGS+=	-I${LOCALBASE}/include
+.if ${OSVERSION} >= 800000
+LDFLAGS+=      -fstack-protector
+.endif
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
 		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
diff --git a/net/quagga/distinfo b/net/quagga/distinfo
index 0b9d907a9dc8..abc371a53a9c 100644
--- a/net/quagga/distinfo
+++ b/net/quagga/distinfo
@@ -1,3 +1,3 @@
-MD5 (quagga-0.99.15.tar.gz) = 8975414c76a295f4855a417af0b5ddce
-SHA256 (quagga-0.99.15.tar.gz) = c86e8818b67cb0381c1821df4fd14ca92696d8b9d67d1c2b35b57b95cf53cdc2
-SIZE (quagga-0.99.15.tar.gz) = 2191159
+MD5 (quagga-0.99.16.tar.gz) = 350fb150be526cdfc4d2b093cb4d69a7
+SHA256 (quagga-0.99.16.tar.gz) = 840e376bf42a3c5ee1069eedddb195749b1ebadeef6cacd9fee24ed6f44c35c5
+SIZE (quagga-0.99.16.tar.gz) = 2168417
diff --git a/net/quagga/files/patch-bgpd__bgp_dump.c b/net/quagga/files/patch-bgpd__bgp_dump.c
deleted file mode 100644
index 759bc6534c1e..000000000000
--- a/net/quagga/files/patch-bgpd__bgp_dump.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- bgpd/bgp_dump.c.orig	2009-07-28 17:35:45.000000000 +0100
-+++ bgpd/bgp_dump.c	2009-12-02 05:46:16.000000000 +0000
-@@ -850,8 +850,12 @@
-   memset (&bgp_dump_updates, 0, sizeof (struct bgp_dump));
-   memset (&bgp_dump_routes, 0, sizeof (struct bgp_dump));
- 
-+#ifdef notsufficient
-   bgp_dump_obuf = stream_new (BGP_MAX_PACKET_SIZE + BGP_DUMP_MSG_HEADER
-                               + BGP_DUMP_HEADER_SIZE);
-+#else
-+  bgp_dump_obuf = stream_new(16384);
-+#endif
- 
-   install_node (&bgp_dump_node, config_write_bgp_dump);
- 
diff --git a/net/quagga/files/patch-configure b/net/quagga/files/patch-configure
index 242ec58e8ea9..1f2a44f1f41c 100644
--- a/net/quagga/files/patch-configure
+++ b/net/quagga/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig	Fri Jul 27 22:59:02 2007
-+++ configure	Thu Aug  2 09:58:32 2007
-@@ -23025,6 +23025,7 @@
+--- configure.orig	2010-06-19 15:58:32.000000000 +0600
++++ configure	2010-06-19 15:58:44.000000000 +0600
+@@ -25085,6 +25085,7 @@
+ #if HAVE_NETINET_IP_ICMP_H
+ # include <netinet/ip_icmp.h>
  #endif
- 
- 
 +#include <security/pam_types.h>
- #include <security/openpam.h>
- _ACEOF
- rm -f conftest.$ac_objext
+ 
+ "
+ if test "x$ac_cv_header_security_openpam_h" = x""yes; then :
diff --git a/net/quagga/files/patch-git-1-clock-monotonic b/net/quagga/files/patch-git-1-clock-monotonic
deleted file mode 100644
index eee85fc15ffd..000000000000
--- a/net/quagga/files/patch-git-1-clock-monotonic
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	2009-11-16 17:36:53.000000000 +0300
-+++ configure	2009-11-16 17:37:14.000000000 +0300
-@@ -30213,7 +30213,7 @@
- 
- 
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_MONOTONIC_CLOCK /**/
-+#define HAVE_CLOCK_MONOTONIC /**/
- _ACEOF
- 
- 
---- config.h.in.orig	2009-11-16 17:37:36.000000000 +0300
-+++ config.h.in	2009-11-16 17:40:55.000000000 +0300
-@@ -198,7 +198,7 @@
- #undef HAVE_MEMSET
- 
- /* Have monotonic clock */
--#undef HAVE_MONOTONIC_CLOCK
-+#undef HAVE_CLOCK_MONOTONIC
- 
- /* Define to 1 if you have the <netdb.h> header file. */
- #undef HAVE_NETDB_H
diff --git a/net/quagga/files/patch-lib-sockopt.c b/net/quagga/files/patch-lib-sockopt.c
deleted file mode 100644
index 5995b3756e5f..000000000000
--- a/net/quagga/files/patch-lib-sockopt.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/sockopt.c.orig	2008-01-11 16:47:21.000000000 +0300
-+++ lib/sockopt.c	2008-01-11 16:47:57.000000000 +0300
-@@ -23,6 +23,10 @@
- #include "log.h"
- #include "sockopt.h"
- 
-+#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX
-+#undef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX
-+#endif
-+
- int
- setsockopt_so_recvbuf (int sock, int size)
- {
diff --git a/net/quagga/files/patch-zebra-kernel_socket.c b/net/quagga/files/patch-zebra-kernel_socket.c
deleted file mode 100644
index 8fec80f09f48..000000000000
--- a/net/quagga/files/patch-zebra-kernel_socket.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- zebra/kernel_socket.c.orig	2009-01-03 20:20:10.000000000 +0300
-+++ zebra/kernel_socket.c	2009-01-03 20:22:37.000000000 +0300
-@@ -173,9 +173,13 @@
- #ifdef RTF_MASK
-   {RTF_MASK,      "MASK"},
- #endif /* RTF_MASK */
-+#ifdef RTF_CLONING
-   {RTF_CLONING,   "CLONING"},
-+#endif /* RTF_CLONING */
-   {RTF_XRESOLVE,  "XRESOLVE"},
-+#ifdef RTF_LLINFO
-   {RTF_LLINFO,    "LLINFO"},
-+#endif /* RTF_LLINFO */
-   {RTF_STATIC,    "STATIC"},
-   {RTF_BLACKHOLE, "BLACKHOLE"},
- #ifdef RTF_PRIVATE
-@@ -999,9 +1003,11 @@
-   if (gate && message == RTM_ADD)
-     msg.rtm.rtm_flags |= RTF_GATEWAY;
- 
-+#ifdef RTF_CLONING
-   if (! gate && message == RTM_ADD && ifp &&
-       (ifp->flags & IFF_POINTOPOINT) == 0)
-     msg.rtm.rtm_flags |= RTF_CLONING;
-+#endif */ RTF_CLONING */
- 
-   /* If no protocol specific gateway is specified, use link
-      address for gateway. */