cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to libnids 1.23.

Browse Source 
ok sthen@
This commit is contained in:
brad 2008-07-15 16:11:02 +00:00
parent d5403cd8ed
commit 6f482b0988
4 changed files with 33 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/libnids/Makefile
View File

@ -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 COMMENT= network monitoring library with TCP/IP reassembly
DISTNAME= libnids-1.20 DISTNAME= libnids-1.23
PKGNAME= ${DISTNAME}p1
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libnids/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libnids/}
HOMEPAGE= http://www.packetfactory.net/projects/libnids/ HOMEPAGE= http://www.packetfactory.net/projects/libnids/
BUILD_DEPENDS= :libnet-1.0*:net/libnet/1.0 BUILD_DEPENDS= :libnet-1.0*:net/libnet/1.0
# GPLv2
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
@ -20,7 +19,9 @@ PERMIT_DISTFILES_FTP= Yes
DESTDIRNAME= install_prefix DESTDIRNAME= install_prefix
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-libnet="${LOCALBASE}" CONFIGURE_ARGS+= --disable-libglib \
--with-libnet="${LOCALBASE}"
NO_REGRESS= Yes NO_REGRESS= Yes
.include <bsd.port.mk> .include <bsd.port.mk>

10
net/libnids/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libnids-1.20.tar.gz) = o2y9RcutoSQg7Mj4Kn4IUg== MD5 (libnids-1.23.tar.gz) = rzXo70A6DKld8tqU24VkKA==
RMD160 (libnids-1.20.tar.gz) = iWViKI3UPMd4mXTuD9VPnmjglEk= RMD160 (libnids-1.23.tar.gz) = OJlK0E9ogpExW/zeONh5XnpMQiY=
SHA1 (libnids-1.20.tar.gz) = uvvmUpQwzOJJbbsIaxfKoAdjaOE= SHA1 (libnids-1.23.tar.gz) = EFv/DQ01q5XskMzpjPtAn2TtRLQ=
SHA256 (libnids-1.20.tar.gz) = xadVP2S+0jhOzJU15nz32AzPf380q4sTJwO2DQ6uxgQ= SHA256 (libnids-1.23.tar.gz) = dVzXJIPCzcy8ZjTADeni2GZkGf2A2jaivbP4FlcTBkM=
SIZE (libnids-1.20.tar.gz) = 119226 SIZE (libnids-1.23.tar.gz) = 140975

8
net/libnids/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2005/05/24 00:01:46 mjc Exp $ $OpenBSD: patch-configure,v 1.2 2008/07/15 16:11:02 brad Exp $
--- configure.orig Tue Oct 14 16:40:09 2003 --- configure.orig Mon May 1 13:14:51 2006
+++ configure Sat May 21 21:19:46 2005 +++ configure Tue Jul 8 10:04:48 2008
@@ -3605,11 +3605,11 @@ echo "${ECHO_T}no" >&6 @@ -4399,11 +4399,11 @@ echo "${ECHO_T}no" >&6
*) *)
echo "$as_me:$LINENO: result: $withval" >&5 echo "$as_me:$LINENO: result: $withval" >&5
echo "${ECHO_T}$withval" >&6 echo "${ECHO_T}$withval" >&6

52
net/libnids/patches/patch-src_libnids_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_libnids_c,v 1.4 2008/03/31 11:39:48 sthen Exp $ $OpenBSD: patch-src_libnids_c,v 1.5 2008/07/15 16:11:02 brad Exp $
--- src/libnids.c.orig Sat Jan 29 05:03:24 2005 --- src/libnids.c.orig Thu Feb 21 05:47:12 2008
+++ src/libnids.c Fri Jan 25 19:06:09 2008 +++ src/libnids.c Wed Jul 9 23:20:06 2008
@@ -28,6 +28,12 @@ @@ -31,6 +31,12 @@
#include "util.h" #include <glib.h>
#include "nids.h" #endif
+#ifdef DLT_PFLOG +#ifdef DLT_PFLOG
+#include <sys/socket.h> +#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__ #ifdef __linux__
extern int set_all_promisc(); extern int set_all_promisc();
#endif #endif
@@ -214,6 +220,7 @@ static void pcap_hand(u_char * par, struct pcap_pkthdr @@ -618,22 +624,46 @@ int nids_init()
#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()
case DLT_NULL: case DLT_NULL:
linkoffset = 4; nids_linkoffset = 4;
break; break;
-#endif -#endif
+#endif +#endif
+#ifdef DLT_LOOP +#ifdef DLT_LOOP
+ case DLT_LOOP: + case DLT_LOOP:
+ linkoffset = 4; + nids_linkoffset = 4;
+ break; + break;
+#endif +#endif
case DLT_EN10MB: case DLT_EN10MB:
linkoffset = 14; nids_linkoffset = 14;
break; break;
case DLT_PPP: case DLT_PPP:
linkoffset = 4; nids_linkoffset = 4;
break; break;
+#ifdef DLT_PPP_ETHER +#ifdef DLT_PPP_ETHER
+ case DLT_PPP_ETHER: + case DLT_PPP_ETHER:
+ linkoffset = 8; + nids_linkoffset = 8;
+ break; + break;
+#endif +#endif
/* Token Ring Support by vacuum@technotronic.com, thanks dugsong! */ /* Token Ring Support by vacuum@technotronic.com, thanks dugsong! */
case DLT_IEEE802: case DLT_IEEE802:
linkoffset = 22; nids_linkoffset = 22;
break; break;
- -
case DLT_RAW: case DLT_RAW:
case DLT_SLIP: case DLT_SLIP:
linkoffset = 0; nids_linkoffset = 0;
break; break;
+#ifdef DLT_OLD_PFLOG +#ifdef DLT_OLD_PFLOG
+ case DLT_OLD_PFLOG: + case DLT_OLD_PFLOG:
+ linkoffset = 28; + nids_linkoffset = 28;
+ break; + break;
+#endif +#endif
+#ifdef DLT_PFLOG +#ifdef DLT_PFLOG
+ case DLT_PFLOG: + case DLT_PFLOG:
+ linkoffset = PFLOG_HDRLEN; + nids_linkoffset = PFLOG_HDRLEN;
+ break; + break;
+#endif +#endif
+#ifdef DLT_PFSYNC +#ifdef DLT_PFSYNC
+ case DLT_PFSYNC: + case DLT_PFSYNC:
+ linkoffset = 4; + nids_linkoffset = 4;
+ break; + break;
+#endif +#endif
#define DLT_LINUX_SLL 113 #define DLT_LINUX_SLL 113
case DLT_LINUX_SLL: case DLT_LINUX_SLL:
linkoffset = 16; nids_linkoffset = 16;