upgrade to libnids 1.23.
ok sthen@
This commit is contained in:
brad
parent
d5403cd8ed
commit
6f482b0988
@ -1,17 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2008/03/31 11:39:48 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2008/07/15 16:11:02 brad Exp $
|
||||
|
||||
COMMENT= network monitoring library with TCP/IP reassembly
|
||||
|
||||
DISTNAME= libnids-1.20
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
DISTNAME= libnids-1.23
|
||||
CATEGORIES= net
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libnids/}
|
||||
|
||||
HOMEPAGE= http://www.packetfactory.net/projects/libnids/
|
||||
|
||||
BUILD_DEPENDS= :libnet-1.0*:net/libnet/1.0
|
||||
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
@ -20,7 +19,9 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
DESTDIRNAME= install_prefix
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= --with-libnet="${LOCALBASE}"
|
||||
CONFIGURE_ARGS+= --disable-libglib \
|
||||
--with-libnet="${LOCALBASE}"
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (libnids-1.20.tar.gz) = o2y9RcutoSQg7Mj4Kn4IUg==
|
||||
RMD160 (libnids-1.20.tar.gz) = iWViKI3UPMd4mXTuD9VPnmjglEk=
|
||||
SHA1 (libnids-1.20.tar.gz) = uvvmUpQwzOJJbbsIaxfKoAdjaOE=
|
||||
SHA256 (libnids-1.20.tar.gz) = xadVP2S+0jhOzJU15nz32AzPf380q4sTJwO2DQ6uxgQ=
|
||||
SIZE (libnids-1.20.tar.gz) = 119226
|
||||
MD5 (libnids-1.23.tar.gz) = rzXo70A6DKld8tqU24VkKA==
|
||||
RMD160 (libnids-1.23.tar.gz) = OJlK0E9ogpExW/zeONh5XnpMQiY=
|
||||
SHA1 (libnids-1.23.tar.gz) = EFv/DQ01q5XskMzpjPtAn2TtRLQ=
|
||||
SHA256 (libnids-1.23.tar.gz) = dVzXJIPCzcy8ZjTADeni2GZkGf2A2jaivbP4FlcTBkM=
|
||||
SIZE (libnids-1.23.tar.gz) = 140975
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2005/05/24 00:01:46 mjc Exp $
|
||||
--- configure.orig Tue Oct 14 16:40:09 2003
|
||||
+++ configure Sat May 21 21:19:46 2005
|
||||
@@ -3605,11 +3605,11 @@ echo "${ECHO_T}no" >&6
|
||||
$OpenBSD: patch-configure,v 1.2 2008/07/15 16:11:02 brad Exp $
|
||||
--- configure.orig Mon May 1 13:14:51 2006
|
||||
+++ configure Tue Jul 8 10:04:48 2008
|
||||
@@ -4399,11 +4399,11 @@ echo "${ECHO_T}no" >&6
|
||||
*)
|
||||
echo "$as_me:$LINENO: result: $withval" >&5
|
||||
echo "${ECHO_T}$withval" >&6
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-src_libnids_c,v 1.4 2008/03/31 11:39:48 sthen Exp $
|
||||
--- src/libnids.c.orig Sat Jan 29 05:03:24 2005
|
||||
+++ src/libnids.c Fri Jan 25 19:06:09 2008
|
||||
@@ -28,6 +28,12 @@
|
||||
#include "util.h"
|
||||
#include "nids.h"
|
||||
$OpenBSD: patch-src_libnids_c,v 1.5 2008/07/15 16:11:02 brad Exp $
|
||||
--- src/libnids.c.orig Thu Feb 21 05:47:12 2008
|
||||
+++ src/libnids.c Wed Jul 9 23:20:06 2008
|
||||
@@ -31,6 +31,12 @@
|
||||
#include <glib.h>
|
||||
#endif
|
||||
|
||||
+#ifdef DLT_PFLOG
|
||||
+#include <sys/socket.h>
|
||||
@ -14,68 +14,52 @@ $OpenBSD: patch-src_libnids_c,v 1.4 2008/03/31 11:39:48 sthen Exp $
|
||||
#ifdef __linux__
|
||||
extern int set_all_promisc();
|
||||
#endif
|
||||
@@ -214,6 +220,7 @@ static void pcap_hand(u_char * par, struct pcap_pkthdr
|
||||
#endif
|
||||
#ifdef DLT_IEEE802_11
|
||||
case DLT_IEEE802_11:
|
||||
+ case DLT_IEEE802_11_RADIO:
|
||||
/* I don't know why frame control is always little endian, but it
|
||||
* works for tcpdump, so who am I to complain? (wam)
|
||||
*/
|
||||
@@ -462,6 +469,7 @@ int nids_init()
|
||||
case DLT_PRISM_HEADER:
|
||||
#endif
|
||||
case DLT_IEEE802_11:
|
||||
+ case DLT_IEEE802_11_RADIO:
|
||||
/* wireless, need to calculate offset per frame */
|
||||
break;
|
||||
#endif
|
||||
@@ -469,22 +477,46 @@ int nids_init()
|
||||
@@ -618,22 +624,46 @@ int nids_init()
|
||||
case DLT_NULL:
|
||||
linkoffset = 4;
|
||||
nids_linkoffset = 4;
|
||||
break;
|
||||
-#endif
|
||||
+#endif
|
||||
+#ifdef DLT_LOOP
|
||||
+ case DLT_LOOP:
|
||||
+ linkoffset = 4;
|
||||
+ nids_linkoffset = 4;
|
||||
+ break;
|
||||
+#endif
|
||||
case DLT_EN10MB:
|
||||
linkoffset = 14;
|
||||
nids_linkoffset = 14;
|
||||
break;
|
||||
case DLT_PPP:
|
||||
linkoffset = 4;
|
||||
nids_linkoffset = 4;
|
||||
break;
|
||||
+#ifdef DLT_PPP_ETHER
|
||||
+ case DLT_PPP_ETHER:
|
||||
+ linkoffset = 8;
|
||||
+ nids_linkoffset = 8;
|
||||
+ break;
|
||||
+#endif
|
||||
/* Token Ring Support by vacuum@technotronic.com, thanks dugsong! */
|
||||
case DLT_IEEE802:
|
||||
linkoffset = 22;
|
||||
nids_linkoffset = 22;
|
||||
break;
|
||||
-
|
||||
case DLT_RAW:
|
||||
case DLT_SLIP:
|
||||
linkoffset = 0;
|
||||
nids_linkoffset = 0;
|
||||
break;
|
||||
+#ifdef DLT_OLD_PFLOG
|
||||
+ case DLT_OLD_PFLOG:
|
||||
+ linkoffset = 28;
|
||||
+ nids_linkoffset = 28;
|
||||
+ break;
|
||||
+#endif
|
||||
+#ifdef DLT_PFLOG
|
||||
+ case DLT_PFLOG:
|
||||
+ linkoffset = PFLOG_HDRLEN;
|
||||
+ nids_linkoffset = PFLOG_HDRLEN;
|
||||
+ break;
|
||||
+#endif
|
||||
+#ifdef DLT_PFSYNC
|
||||
+ case DLT_PFSYNC:
|
||||
+ linkoffset = 4;
|
||||
+ nids_linkoffset = 4;
|
||||
+ break;
|
||||
+#endif
|
||||
#define DLT_LINUX_SLL 113
|
||||
case DLT_LINUX_SLL:
|
||||
linkoffset = 16;
|
||||
nids_linkoffset = 16;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user