summaryrefslogtreecommitdiff
path: root/net-analyzer/snort
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-02-05 18:44:56 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-02-05 18:44:56 +0000
commit29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
treeab466b4dfa7abecb401b2f8039d08af4689306bb /net-analyzer/snort
parentd42200bec37eef2a7478d88988ff00addd0a9202 (diff)
gentoo resync : 05.02.2020
Diffstat (limited to 'net-analyzer/snort')
-rw-r--r--net-analyzer/snort/Manifest3
-rw-r--r--net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch106
-rw-r--r--net-analyzer/snort/snort-2.9.15.1.ebuild15
3 files changed, 109 insertions, 15 deletions
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index bf8bb00dc8e9..cba9b38d69d6 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,4 +1,5 @@
AUX snort-2.9.12-snort.pc.patch 301 BLAKE2B 856d8b12dab5c6d6158f5717fd9e851fd81b62a378bedc9ab485b54bce489730ad76a4340d1eed8f9fb72d07643a939ce61e95e23eaa2b65751cd7755e6027f1 SHA512 0cbd3035a902728927fb1cebe220dd00ed7352c29416129ae7e72ede5549e8a36809ce106cd77fc5f73d03973449ca2f880fd08071c910e1fa00a6a0ebe03c74
+AUX snort-2.9.15.1-fno-common.patch 3174 BLAKE2B 46fbd5f5309321adb96acb0ba730dceb19c1d9c04cc1fc840ce87aebab35d048b04b45f8d9125c3309589d5471d1bf55f3ecdce3268b254ac0f8199c0cb188d8 SHA512 2c0e557806d93cd4999405a88a986a4724d4484ded85d9c706ea4c0e44a5f09af345fa8df5862bebf29cf709994db74cefc471168984bb27db9399a0fc0e0fb6
AUX snort-2.9.8.3-no-implicit.patch 299 BLAKE2B 61079829bd82915a8f7b98d9645cb7dda062c3c92558baad9d6052993b3c1f6ea668a1067b5c57e1f570be49e114bb526e45813aff662ff225e88ec4d201d8d6 SHA512 e3cc85c8a8608126880f46220cf889fcd8a7f6819c17bc14cdec2366a0673ec26734637c0185fa4a6be831efdc112678c6f3df08445922d362c79861d0aca832
AUX snort-2.9.8.3-rpc.patch 1010 BLAKE2B 69301ee21b7efb0bc7f4e3b266de315078d7cbc37a9ae8a4127091bc711650c65f2dc46e0f780a58653fc27606d7116d07a496af7bf7ea3693fc0d69f85b5e63 SHA512 1336fb39ad8f0a5f07c09a5310e4830058b4171fe70b549ad00cba4809f9e18ed0be559abd5c516c5c85b0be90340af3096d5963d9cf098ab26952b1cf93f5a9
AUX snort.confd.2 420 BLAKE2B 984bc3a1b4f9fea044b150d1362950cc2bc0fae07a92351a88f428befbe1fa35166809dfb9d350cd811bec1dd22f5392910a5f2ee2ec11f20a3dfe6bdff4c4c5 SHA512 f8b0dd74a601a8bfadc96f75caeb037059ba4330dc2b52cc113ce9be38b020f098cbc747bfe977ca4dfa6e2ce634a64949ca5cf41a40c16fa90227e49ac9052f
@@ -10,7 +11,7 @@ DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482
DIST snort-2.9.15.tar.gz 6704763 BLAKE2B adef13e3368dbbb9e023d79ec4f75c9652af8d26642b83f1f413e39faf966281b09713854e3a8aa385647b375102a667b10ee96d6f1cebb2f92c9fc7f29a2eb5 SHA512 21830dc4c9ce7b5bc96defa800f78de6ad24c1ab96dbeab0d79a7bf4298a81d6bdb4be8fd3bbec3b28b33aa7bb27cdc48a2a00b33c494f68d1649bc609928eea
DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127e4be207ba6cd3b7c7dff75f4537c86c6a88d744a924b99d0b4ac864add2c9111c63e51dc4c7dc23f8d19a6c792 SHA512 2f3dfe46e14a5106a02ca60b2d334549f4924ff916de0804b2b7792cdd31e104fbb454b4b932855b5f25a861698db0f8988844782b12b0e5fa132d88d4a7a687
EBUILD snort-2.9.12.ebuild 8872 BLAKE2B 84895cf9afb5ddf3079773ff50d730c56af2b01fc912c9d1fa74bead53fe30332d4971dde35cd3091057fadb06f32c25971823904c8d00caf185d9547ec32a63 SHA512 26ed8dc6c1d020a1fb73d1f12a81700a3d18103038340d00eb44d9891391eb49b2e8a611a3f46bf4d8423cb0586e8449933e7863e0184030f152b246e6696070
-EBUILD snort-2.9.15.1.ebuild 8847 BLAKE2B 9bf936653b94ad7bdf1cb0634cdf126b6c735240f089e589de424527bd2d3c062ba090231dc2f4cf99a667a95db3274b8d252d31a6bb21268f705e84ccaf6703 SHA512 58fc58ea9ee1fb1659969061f0ca037f37afa6f7f7b8e856b6b4f2b6432cffd04228f2dc0d630def5fd1a10914f76723477192a1aaa2a4eb9fa4677809ce679c
+EBUILD snort-2.9.15.1.ebuild 8322 BLAKE2B a30af887835e0d9c4205c323c1227402c444d31ad7fdb6a663932e4b885722f6e25b7c24bc9074c4573fe84facbb95790daa877267901d4dc5aa9a45ea2d0c1c SHA512 26fdf6db522b842641d3fef0ed7e16f1c2a8c1f260277769c8ae12566fad88337236231df2e2015cf8a7efeb04ed953c5edbc9ab8bbd9fe970919b896b3dc6d2
EBUILD snort-2.9.15.ebuild 8847 BLAKE2B 0103540218a24cceb191285c4dac236621c25f140a4842c7bf70cd3e438afcdebdacf66d9a23de6319028b7f7d8e891f3f2e1eaf0230bc8b034dc1b2e3b34ea5 SHA512 52e5f4bd4f68bb5a85ce4bd27e8067d6ed16b9586fd92f4dce18ccf4380232a78c8249967dc85a9e181c68b70ac3d3d92aa402bf24b146051f465d47e84e2e89
EBUILD snort-2.9.8.3-r2.ebuild 8505 BLAKE2B 82e9e4dbb2527f80ff87f3c95befb2b141e8ca55e1b097581b688c65e990c7cc0206388d98859f47e0f6b0a9ea52d2f6ff566ed67085de4f33c5023e7e4b86dc SHA512 8444c62e53db68fa39a85048b1ce01f30d16d636f4dd5eb3e51a1a5af3e393ca9bf0d4615c44b38bd57de050735b3666222c542c215b08f4f75c49613988a390
MISC metadata.xml 4042 BLAKE2B 931c99e6b1aee3727e47f32dff6399dc821624fc9cc3be496ba711d480edb04920d2ffcdc9ce4fe6a253be2bbcd4bb45f56a34da530c6dd60140c77b5cc45856 SHA512 2ade0995e40052f3be40a073458a19ea380bb2f75e24905c06b45e88d8956b118db73fbb0a1062e5c0ca837e04d1805a54785a84283e701534ec47c320833b1f
diff --git a/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch b/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch
new file mode 100644
index 000000000000..9fe39933ddfe
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch
@@ -0,0 +1,106 @@
+--- a/src/preprocessors/Stream6/stream_paf.h
++++ b/src/preprocessors/Stream6/stream_paf.h
+@@ -68,12 +68,14 @@
+ uint16_t s5_paf_port_registration_all (void* pv, uint16_t port, bool c2s, bool flush);
+ uint16_t s5_paf_service_registration (void* pv, uint16_t service, bool c2s, bool flush);
+
+-enum FlushMode
++typedef enum
+ {
+ FLUSH_MODE_NORMAL = 0,
+ FLUSH_MODE_PRE_DISCARD,
+ FLUSH_MODE_DISCARD
+-}FlushMode;
++} FlushMode_t;
++
++extern FlushMode_t FlushMode;
+
+ typedef struct {
+ void* user[MAX_PAF_USER]; // arbitrary user data
+--- a/src/sfutil/util_jsnorm.h
++++ b/src/sfutil/util_jsnorm.h
+@@ -42,5 +42,7 @@
+ uint16_t alerts;
+ }JSState;
+
++extern int hex_lookup[256];
++
+ int JSNormalizeDecode(char *, uint16_t , char *, uint16_t destlen, char **, int *, JSState *, uint8_t *);
+ void InitJSNormLookupTable(void);
+--- a/src/preprocessors/spp_session.h
++++ b/src/preprocessors/spp_session.h
+@@ -28,6 +28,8 @@
+ #include "decode.h"
+ #include "session_common.h"
+
++extern PreprocStats sessionPerfStats;
++
+ /* list of function prototypes for this preprocessor */
+ void SetupSessionManager(void);
+ void SessionReload(struct _SessionCache* lws_cache, uint32_t max_sessions,
+--- a/src/preprocessors/spp_httpinspect.c
++++ b/src/preprocessors/spp_httpinspect.c
+@@ -161,7 +161,6 @@
+ MemPool *http_mempool = NULL;
+ MemPool *mime_decode_mempool = NULL;
+ MemPool *mime_log_mempool = NULL;
+-int hex_lookup[256];
+ int valid_lookup[256];
+
+ char** xffFields = NULL;
+--- a/src/detection-plugins/sp_session.c
++++ b/src/detection-plugins/sp_session.c
+@@ -80,7 +80,7 @@
+ #include "snort.h"
+ #include "profiler.h"
+ #ifdef PERF_PROFILING
+-PreprocStats sessionPerfStats;
++PreprocStats sp_sessionPerfStats;
+ extern PreprocStats ruleOTNEvalPerfStats;
+ #endif
+
+@@ -149,7 +149,7 @@
+ /* map the keyword to an initialization/processing function */
+ RegisterRuleOption("session", SessionInit, NULL, OPT_TYPE_LOGGING, NULL);
+ #ifdef PERF_PROFILING
+- RegisterPreprocessorProfile("session", &sessionPerfStats, 3, &ruleOTNEvalPerfStats, NULL);
++ RegisterPreprocessorProfile("session", &sp_sessionPerfStats, 3, &ruleOTNEvalPerfStats, NULL);
+ #endif
+ DEBUG_WRAP(DebugMessage(DEBUG_PLUGIN, "Plugin: Session Setup\n"););
+ }
+@@ -287,7 +287,7 @@
+ FILE *session; /* session file ptr */
+ PROFILE_VARS;
+
+- PREPROC_PROFILE_START(sessionPerfStats);
++ PREPROC_PROFILE_START(sp_sessionPerfStats);
+
+ /* if there's data in this packet */
+ if(p != NULL)
+@@ -298,7 +298,7 @@
+
+ if(session == NULL)
+ {
+- PREPROC_PROFILE_END(sessionPerfStats);
++ PREPROC_PROFILE_END(sp_sessionPerfStats);
+ return DETECTION_OPTION_MATCH;
+ }
+
+@@ -308,7 +308,7 @@
+ }
+ }
+
+- PREPROC_PROFILE_END(sessionPerfStats);
++ PREPROC_PROFILE_END(sp_sessionPerfStats);
+ return DETECTION_OPTION_MATCH;
+ }
+
+--- a/src/detection-plugins/sp_session.h
++++ b/src/detection-plugins/sp_session.h
+@@ -29,5 +29,6 @@
+ void SetupSession(void);
+ uint32_t SessionHash(void *d);
+ int SessionCompare(void *l, void *r);
++extern PreprocStats sp_sessionPerfStats;
+
+ #endif /* __SP_SESSION_H__ */
diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild
index 03b19a935318..21aba42de764 100644
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch
"${FILESDIR}"/${PN}-2.9.8.3-rpc.patch
"${FILESDIR}"/${PN}-2.9.12-snort.pc.patch
+ "${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch
)
pkg_setup() {
@@ -49,20 +50,6 @@ pkg_setup() {
src_prepare() {
default
- # Multilib fix for the sf_engine
- ebegin "Applying multilib fix"
- sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
- "${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
- || die "sed for sf_engine failed"
-
- # Multilib fix for the curent set of dynamic-preprocessors
- for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
- sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
- "${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
- || die "sed for $i failed."
- done
- eend
-
mv configure.{in,ac} || die
AT_M4DIR=m4 eautoreconf