diff options
Diffstat (limited to 'net/snort/patches/patch-aa')
| -rw-r--r-- | net/snort/patches/patch-aa | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/snort/patches/patch-aa b/net/snort/patches/patch-aa index 64e6ed264a0..e4d7136db1b 100644 --- a/net/snort/patches/patch-aa +++ b/net/snort/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.13 2006/02/16 20:45:52 joerg Exp $ +$NetBSD: patch-aa,v 1.14 2007/05/18 22:20:10 adrianp Exp $ ---- src/snort.c.orig Wed Dec 3 16:22:22 2003 -+++ src/snort.c Sat Jan 31 21:25:32 2004 -@@ -105,7 +105,6 @@ extern OutputFuncNode *LogList; +--- src/snort.c.orig 2007-03-15 18:58:28.000000000 +0000 ++++ src/snort.c +@@ -148,7 +148,6 @@ extern OutputFuncNode *LogList; long start_time; /* tracks how many seconds snort actually ran */ #endif @@ -10,31 +10,31 @@ $NetBSD: patch-aa,v 1.13 2006/02/16 20:45:52 joerg Exp $ /*extern char *malloc_options;*/ /* exported variables *********************************************************/ -@@ -1771,6 +1770,18 @@ int SetPktProcessor() +@@ -2590,6 +2589,18 @@ int SetPktProcessor() break; +#if defined(__NetBSD__) +# if defined(__NetBSD_Version__) +# if (__NetBSD_Version__ >= 105000000) -+ case DLT_PPP_ETHER: /* PPP over Ethernet */ ++ case DLT_PPP_ETHER: /* PPP over Ethernet */ + +# else -+ /* no DLT_PPP_* on <1.5 */ ++ /* no DLT_PPP_* on <1.5 */ +# endif /* >= NetBSD 1.5 */ +# else -+ /* no __NetBSD_Version__ on <1.4 */ ++ /* no __NetBSD_Version__ on <1.4 */ +# endif /* __NetBSD_Version__ */ +#endif /* NetBSD */ case DLT_PPP: /* point-to-point protocol */ if(!pv.readmode_flag) { -@@ -2164,7 +2175,7 @@ static char *ConfigFileSearch() +@@ -3116,7 +3127,7 @@ static char *ConfigFileSearch() { struct stat st; int i; - char *conf_files[]={"/etc/snort.conf", "./snort.conf", NULL}; -+ char *conf_files[]={ "@PKG_SYSCONFDIR@/snort.conf", "./snort.conf", NULL}; ++ char *conf_files[]={"@PKG_SYSCONFDIR@/snort.conf", "./snort.conf", NULL}; char *fname = NULL; - char *home_dir = NULL; char *rval = NULL; + |