- Update to 1.23

- Drop maintainership
- Use an option group for libnet version
- Add USE_DESTDIR support

v1.23 Feb 23 2008
- fixed remotely triggerable NULL dereference in ip_fragment.c
- fix DLT_PRISM_HEADER linkoffset calculation
- check for DATA_FRAME_IS_QOS in wireless frames
- free queued tcp segments with too old seq

v1.22 Jul 22 2007
- in TCP stream, the byte with absolute offset 0 was treated as urgent data;
fixed
- DLT_IEEE802_11_RADIO handling
- added a few missing checks for failed malloc

v1.21 May 10 2006
- more externals to access libnids' intrinsics from the outside
- nids_unregister_*()
- UDP checksumming fix (0 is not an error according to RFC768)
- nids_params.tcp_workarounds
- nids_params.multiproc and queue_limit: merged a patch which creates a
separate thread for packet capture;
- in killtcp.c, send two more RST packets (required because of MS05-019
patch)
- glibc 2.4 syslog.h disaster workaround

3 files changed, 19 insertions, 20 deletions

diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index d3e03a30e2f..b6c38f23533 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.21 2007/02/18 18:53:10 adrianp Exp $
+# $NetBSD: Makefile,v 1.22 2009/02/24 00:42:29 cube Exp $
 #
 
-DISTNAME=	libnids-1.20
-PKGREVISION=	1
+DISTNAME=	libnids-1.23
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libnids/}
 
-MAINTAINER=	cube@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://libnids.sourceforge.net/
 COMMENT=	Network monitoring library with TCP/IP reassembly
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 
+USE_TOOLS=	pkg-config
+
 BUILDLINK_DEPMETHOD.libpcap=	build
 
 SUBST_CLASSES+=		conf
@@ -19,8 +22,11 @@ SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	configure
 SUBST_MESSAGE.conf=	Fixing configuration script.
 
+INSTALL_MAKE_FLAGS+=	install_prefix=${DESTDIR}
+
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
 .include "../../net/libpcap/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libnids/distinfo b/net/libnids/distinfo
index a9c7879448e..aa70ce5dfa7 100644
--- a/net/libnids/distinfo
+++ b/net/libnids/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/03/23 17:06:33 wiz Exp $
+$NetBSD: distinfo,v 1.9 2009/02/24 00:42:29 cube Exp $
 
-SHA1 (libnids-1.20.tar.gz) = bafbe6529430cce2496dbb086b17caa0076368e1
-RMD160 (libnids-1.20.tar.gz) = 896562288dd43cc7789974ee0fd54f9e68e09449
-Size (libnids-1.20.tar.gz) = 119226 bytes
+SHA1 (libnids-1.23.tar.gz) = 105bff0d0d35ab95ec90cce98cfb409f64ed44b4
+RMD160 (libnids-1.23.tar.gz) = 38994ad04f688291315bfcde38d8795e7a4c4226
+Size (libnids-1.23.tar.gz) = 140975 bytes
diff --git a/net/libnids/options.mk b/net/libnids/options.mk
index 7fa434915a8..33fc5366fe0 100644
--- a/net/libnids/options.mk
+++ b/net/libnids/options.mk
@@ -1,20 +1,13 @@
-# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:54 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2009/02/24 00:42:29 cube Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.libnids
-PKG_SUPPORTED_OPTIONS=	libnet10 libnet11
-PKG_SUGGESTED_OPTIONS=	libnet10
+PKG_OPTIONS_VAR=		PKG_OPTIONS.libnids
+PKG_OPTIONS_REQUIRED_GROUPS=	libnet
+PKG_OPTIONS_GROUP.libnet=	libnet10 libnet11
+PKG_SUGGESTED_OPTIONS=		libnet10
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Can't support both versions of libnet
-###
-.if !empty(PKG_OPTIONS:Mlibnet10) && !empty(PKG_OPTIONS:Mlibnet11)
-PKG_FAIL_REASON+=	"libnet-1.0.x and libnet-1.1.x cannot both be selected." \
-			"This is due to the packages conflicting."
-.endif
-
-###
 ### libnet 1.0.x branch support
 ###
 .if !empty(PKG_OPTIONS:Mlibnet10)