diff options
| author | hubertf <hubertf@pkgsrc.org> | 2001-11-07 03:03:05 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2001-11-07 03:03:05 +0000 |
| commit | 121139a0b5835c8da779972f0dc588f361c28858 (patch) | |
| tree | c37558381f252af1dcb1d3bf510adecb79bade38 /net/snort | |
| parent | b3e7e7baec6a5647fd31d96d89c77b833f613825 (diff) | |
| download | pkgsrc-121139a0b5835c8da779972f0dc588f361c28858.tar.gz | |
Only use DLT_PPP_{SERIAL,ETHER} on systems that actually have it
(i.e. on 1.5 and up). (I *love* digging such stuff out of CVS
logs...)
Requested by wiz in private mail.
Diffstat (limited to 'net/snort')
| -rw-r--r-- | net/snort/distinfo | 4 | ||||
| -rw-r--r-- | net/snort/patches/patch-aa | 29 |
2 files changed, 26 insertions, 7 deletions
diff --git a/net/snort/distinfo b/net/snort/distinfo index dc583e5a54b..b1fc347e421 100644 --- a/net/snort/distinfo +++ b/net/snort/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2001/08/22 18:07:50 hubertf Exp $ +$NetBSD: distinfo,v 1.6 2001/11/07 03:03:05 hubertf Exp $ SHA1 (snort-1.8.1-RELEASE.tar.gz) = 0a167b87b51a62bc9bbf06ef84e2941574327af9 Size (snort-1.8.1-RELEASE.tar.gz) = 1026894 bytes -SHA1 (patch-aa) = 99f6d436940ab8ddc80f123ac2438380983e8953 +SHA1 (patch-aa) = cb6a8ec346646a3e1a28163eccea773f152c3cfc diff --git a/net/snort/patches/patch-aa b/net/snort/patches/patch-aa index e815da913f0..4b9a46230e2 100644 --- a/net/snort/patches/patch-aa +++ b/net/snort/patches/patch-aa @@ -1,15 +1,34 @@ -$NetBSD: patch-aa,v 1.3 2001/08/22 01:20:26 hubertf Exp $ +$NetBSD: patch-aa,v 1.4 2001/11/07 03:03:06 hubertf Exp $ ---- snort.c.orig Tue Jul 10 04:47:17 2001 +--- snort.c.orig Fri Aug 10 22:39:52 2001 +++ snort.c -@@ -1266,6 +1266,10 @@ +@@ -43,6 +43,9 @@ + + /* I N C L U D E S **********************************************************/ + #include "snort.h" ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#endif + + /* G L O B A L S ************************************************************/ + extern OutputFuncNode *AlertList; +@@ -1386,6 +1389,19 @@ break; -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) ++# if defined(__NetBSD_Version__) ++# if (__NetBSD_Version__ >= 105000000) + case DLT_PPP_SERIAL: /* PPP over serial (async and sync) */ + case DLT_PPP_ETHER: /* PPP over Ethernet */ -+#endif ++ ++# else ++ /* no DLT_PPP_* on <1.5 */ ++# endif /* >= NetBSD 1.5 */ ++# else ++ /* no __NetBSD_Version__ on <1.4 */ ++# endif /* __NetBSD_Version__ */ ++#endif /* NetBSD */ case DLT_PPP: /* point-to-point protocol */ if(!pv.readmode_flag) { |