Update libnids to 1.24.

Based on PR pkg/48217 by Leonardo Taccari.

Changes:
v1.24 Mar 14 2010
- fixed another remotely triggerable NULL dereference in ip_fragment.c
- unofficial patch that enables tracking of already established TCP connections
- missing reset of some tcp_* variables upon nids_exit
- correct calculation of radiotap header
- compilation warning fixes with newer gcc
- use pcap_get_selectable_fd() instead of pcap_fileno()

10 files changed, 74 insertions, 74 deletions

diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 3760d0f9f03..2a2c9512f4b 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/02/06 19:30:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2013/10/06 08:25:37 obache Exp $
 #
 
-DISTNAME=	libnids-1.23
-PKGREVISION=	6
+DISTNAME=	libnids-1.24
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libnids/}
 
diff --git a/net/libnids/buildlink3.mk b/net/libnids/buildlink3.mk
index 52775f218e1..c943f29f6b7 100644
--- a/net/libnids/buildlink3.mk
+++ b/net/libnids/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2012/09/15 10:06:04 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2013/10/06 08:25:37 obache Exp $
 
 BUILDLINK_TREE+=	libnids
 
@@ -6,8 +6,7 @@ BUILDLINK_TREE+=	libnids
 LIBNIDS_BUILDLINK3_MK:=
 
 
-BUILDLINK_API_DEPENDS.libnids+=	libnids>=1.18
-BUILDLINK_ABI_DEPENDS.libnids+=	libnids>=1.23nb5
+BUILDLINK_API_DEPENDS.libnids+=	libnids>=1.24
 BUILDLINK_PKGSRCDIR.libnids?=	../../net/libnids
 BUILDLINK_DEPMETHOD.libnids?=	build
 
diff --git a/net/libnids/distinfo b/net/libnids/distinfo
index d930822f42b..06531d9da1f 100644
--- a/net/libnids/distinfo
+++ b/net/libnids/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2012/04/17 17:45:35 joerg Exp $
+$NetBSD: distinfo,v 1.12 2013/10/06 08:25:37 obache Exp $
 
-SHA1 (libnids-1.23.tar.gz) = 105bff0d0d35ab95ec90cce98cfb409f64ed44b4
-RMD160 (libnids-1.23.tar.gz) = 38994ad04f688291315bfcde38d8795e7a4c4226
-Size (libnids-1.23.tar.gz) = 140975 bytes
-SHA1 (patch-src_killtcp.c) = 77977d660cb55405b3501375185200bc37b702b1
-SHA1 (patch-src_util.c) = 1308beb64054caadb69ac7ba4e82b4bd15d07a4b
-SHA1 (patch-src_util.h) = 808a0b9e926ac3aab753123b621933c85797e643
+SHA1 (libnids-1.24.tar.gz) = 9a421df05cefdc4f5f7db95efc001b3c2b5249ce
+RMD160 (libnids-1.24.tar.gz) = 66a1a332a70b316fd83905887dc731b5bf28d715
+Size (libnids-1.24.tar.gz) = 151021 bytes
+SHA1 (patch-configure) = 7ed332940901e91ddb2f48ebe6adc8fad2cdaf7c
+SHA1 (patch-configure.in) = e3a86bc1cf2fe4905f952a635b2b08a234e99c50
+SHA1 (patch-src_config.h.in) = 6662fa8279e5d4b5e2be3dc17dc28e489e05538d
+SHA1 (patch-src_libnids.c) = 121f1d119707e113e2e1ec80d798dd09bc335025
diff --git a/net/libnids/patches/patch-configure b/net/libnids/patches/patch-configure
new file mode 100644
index 00000000000..d165f94a09a
--- /dev/null
+++ b/net/libnids/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2013/10/06 08:25:37 obache Exp $
+
+* check existence of alloca.h
+
+--- configure.orig	2006-05-01 17:14:51.000000000 +0000
++++ configure
+@@ -2960,7 +2960,7 @@ fi
+ 
+ 
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-		  inttypes.h stdint.h unistd.h
++		  inttypes.h stdint.h unistd.h alloca.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/net/libnids/patches/patch-configure.in b/net/libnids/patches/patch-configure.in
new file mode 100644
index 00000000000..1fb7fff6001
--- /dev/null
+++ b/net/libnids/patches/patch-configure.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1 2013/10/06 08:25:37 obache Exp $
+
+* check existence of alloca.h
+
+--- configure.in.orig	2006-05-01 17:14:51.000000000 +0000
++++ configure.in
+@@ -27,7 +27,7 @@ AC_PROG_INSTALL
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(sys/time.h syslog.h unistd.h)
++AC_CHECK_HEADERS(sys/time.h syslog.h unistd.h alloca.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
diff --git a/net/libnids/patches/patch-src_config.h.in b/net/libnids/patches/patch-src_config.h.in
new file mode 100644
index 00000000000..eaa84a6debb
--- /dev/null
+++ b/net/libnids/patches/patch-src_config.h.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_config.h.in,v 1.1 2013/10/06 08:25:37 obache Exp $
+
+* check existence of alloca.h
+
+--- src/config.h.in.orig	2006-05-01 17:14:51.000000000 +0000
++++ src/config.h.in
+@@ -45,6 +45,9 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+ 
++/* Define to 1 if you have the <alloca.h> header file. */
++#undef HAVE_ALLOCA_H
++
+ /* if unaligned access fails */
+ #undef LBL_ALIGN
+ 
diff --git a/net/libnids/patches/patch-src_killtcp.c b/net/libnids/patches/patch-src_killtcp.c
deleted file mode 100644
index 8468833a8d6..00000000000
--- a/net/libnids/patches/patch-src_killtcp.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_killtcp.c,v 1.1 2011/11/26 17:17:53 joerg Exp $
-
---- src/killtcp.c.orig	2011-11-26 02:33:07.000000000 +0000
-+++ src/killtcp.c
-@@ -118,6 +118,6 @@ void nids_killtcp(struct tcp_stream *a_t
-     if (initialized)
- 	abort();
- }
--#elif
-+#else
- #error Something wrong with LIBNET_VER
- #endif
diff --git a/net/libnids/patches/patch-src_libnids.c b/net/libnids/patches/patch-src_libnids.c
new file mode 100644
index 00000000000..272e63df459
--- /dev/null
+++ b/net/libnids/patches/patch-src_libnids.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_libnids.c,v 1.1 2013/10/06 08:25:37 obache Exp $
+
+* check existence of alloca.h
+
+--- src/libnids.c.orig	2010-03-01 21:13:25.000000000 +0000
++++ src/libnids.c
+@@ -14,7 +14,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <syslog.h>
++#if (HAVE_ALLOCA_H)
+ #include <alloca.h>
++#endif
+ #include <pcap.h>
+ #include <errno.h>
+ #include <config.h>
diff --git a/net/libnids/patches/patch-src_util.c b/net/libnids/patches/patch-src_util.c
deleted file mode 100644
index 5c8c3cc5a76..00000000000
--- a/net/libnids/patches/patch-src_util.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_util.c,v 1.1 2012/04/17 17:45:36 joerg Exp $
-
---- src/util.c.orig	2012-04-16 22:20:17.000000000 +0000
-+++ src/util.c
-@@ -29,18 +29,6 @@ test_malloc(int x)
-   return ret;
- }
- 
--inline int
--before(u_int seq1, u_int seq2)
--{
--  return ((int)(seq1 - seq2) < 0);
--}
--
--inline int
--after(u_int seq1, u_int seq2)
--{
--  return ((int)(seq2 - seq1) < 0);
--}
--
- void
- register_callback(struct proc_node **procs, void (*x))
- {
diff --git a/net/libnids/patches/patch-src_util.h b/net/libnids/patches/patch-src_util.h
deleted file mode 100644
index 7cc83111d7b..00000000000
--- a/net/libnids/patches/patch-src_util.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_util.h,v 1.1 2012/04/17 17:45:36 joerg Exp $
-
---- src/util.h.orig	2012-04-16 22:20:32.000000000 +0000
-+++ src/util.h
-@@ -23,9 +23,19 @@ struct lurker_node {
- 
- void nids_no_mem(char *);
- char *test_malloc(int);
--inline int before(u_int seq1, u_int seq2);
--inline int after(u_int seq1, u_int seq2);
- void register_callback(struct proc_node **procs, void (*x));
- void unregister_callback(struct proc_node **procs, void (*x));
- 
-+static inline int
-+before(u_int seq1, u_int seq2)
-+{
-+  return ((int)(seq1 - seq2) < 0);
-+}
-+
-+static inline int
-+after(u_int seq1, u_int seq2)
-+{
-+  return ((int)(seq2 - seq1) < 0);
-+}
-+
- #endif /* _NIDS_UTIL_H */