diff options
author | Armin Kuster <akuster808@gmail.com> | 2016-02-15 18:41:33 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2016-03-14 12:52:45 -0700 |
commit | 162653fd27842a76b97429e479ea2b8a7f019431 (patch) | |
tree | 93101f89e046ee8abc22cff461f1c5517e949a11 /recipes-security/suricata | |
parent | 86ae983fb2626618e4af9606a17cdf385109721e (diff) | |
download | meta-security-162653fd27842a76b97429e479ea2b8a7f019431.tar.gz |
suricata: update to 3.0
removed patch no longer needded.
LIC_FILES_CHKSUM changed do to copyright date updates.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-security/suricata')
-rw-r--r-- | recipes-security/suricata/files/no_pcap_pkgconf_check.patch | 26 | ||||
-rw-r--r-- | recipes-security/suricata/libhtp_0.5.18.bb | 2 | ||||
-rw-r--r-- | recipes-security/suricata/suricata.inc | 7 | ||||
-rw-r--r-- | recipes-security/suricata/suricata_3.0.bb (renamed from recipes-security/suricata/suricata_2.0.11.bb) | 3 |
4 files changed, 6 insertions, 32 deletions
diff --git a/recipes-security/suricata/files/no_pcap_pkgconf_check.patch b/recipes-security/suricata/files/no_pcap_pkgconf_check.patch deleted file mode 100644 index ba9ff90..0000000 --- a/recipes-security/suricata/files/no_pcap_pkgconf_check.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Index: suricata-2.0.6/configure | ||
2 | =================================================================== | ||
3 | --- suricata-2.0.6.orig/configure | ||
4 | +++ suricata-2.0.6/configure | ||
5 | @@ -17372,8 +17372,6 @@ fi | ||
6 | |||
7 | if test "$HAVE_PCAP_CONFIG" = "no"; then | ||
8 | CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=1" | ||
9 | - else | ||
10 | - CFLAGS="${CFLAGS} `pcap-config --defines` `pcap-config --cflags` -DLIBPCAP_VERSION_MAJOR=1" | ||
11 | fi | ||
12 | else | ||
13 | CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=0" | ||
14 | Index: suricata-2.0.6/configure.ac | ||
15 | =================================================================== | ||
16 | --- suricata-2.0.6.orig/configure.ac | ||
17 | +++ suricata-2.0.6/configure.ac | ||
18 | @@ -1060,8 +1060,6 @@ | ||
19 | AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no") | ||
20 | if test "$HAVE_PCAP_CONFIG" = "no"; then | ||
21 | CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=1" | ||
22 | - else | ||
23 | - CFLAGS="${CFLAGS} `pcap-config --defines` `pcap-config --cflags` -DLIBPCAP_VERSION_MAJOR=1" | ||
24 | fi | ||
25 | else | ||
26 | CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=0" | ||
diff --git a/recipes-security/suricata/libhtp_0.5.18.bb b/recipes-security/suricata/libhtp_0.5.18.bb index 734b341..8305f70 100644 --- a/recipes-security/suricata/libhtp_0.5.18.bb +++ b/recipes-security/suricata/libhtp_0.5.18.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "LibHTP is a security-aware parser for the HTTP protocol and the relat | |||
2 | 2 | ||
3 | require suricata.inc | 3 | require suricata.inc |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://../LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8" | 5 | LIC_FILES_CHKSUM = "file://../LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" |
6 | 6 | ||
7 | DEPENDS = "zlib" | 7 | DEPENDS = "zlib" |
8 | 8 | ||
diff --git a/recipes-security/suricata/suricata.inc b/recipes-security/suricata/suricata.inc index 5684386..38b9572 100644 --- a/recipes-security/suricata/suricata.inc +++ b/recipes-security/suricata/suricata.inc | |||
@@ -2,8 +2,9 @@ HOMEPAGE = "http://suricata-ids.org/" | |||
2 | SECTION = "security Monitor/Admin" | 2 | SECTION = "security Monitor/Admin" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | 4 | ||
5 | VER = "2.0.11" | 5 | VER = "3.0" |
6 | SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" | 6 | SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" |
7 | 7 | ||
8 | SRC_URI[md5sum] = "4c05eebfb87c3c1ff51460f4e6318b9a" | 8 | SRC_URI[md5sum] = "a964af69263592c625b56f72d49e8d24" |
9 | SRC_URI[sha256sum] = "c607f1e18e5636830f42a83f7c67e1466f07db82853f3a9dba4ab8c6c3bc656e" | 9 | SRC_URI[sha256sum] = "4b8feb398a0800c955fe24aa31ca446c539e79492155717e826473f902c8e65a" |
10 | |||
diff --git a/recipes-security/suricata/suricata_2.0.11.bb b/recipes-security/suricata/suricata_3.0.bb index 21b22d1..ead568a 100644 --- a/recipes-security/suricata/suricata_2.0.11.bb +++ b/recipes-security/suricata/suricata_3.0.bb | |||
@@ -2,10 +2,9 @@ SUMMARY = "The Suricata Engine is an Open Source Next Generation Intrusion Detec | |||
2 | 2 | ||
3 | require suricata.inc | 3 | require suricata.inc |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" |
6 | 6 | ||
7 | SRC_URI += "file://no_libhtp_build.patch \ | 7 | SRC_URI += "file://no_libhtp_build.patch \ |
8 | file://no_pcap_pkgconf_check.patch \ | ||
9 | file://volatiles.03_suricata \ | 8 | file://volatiles.03_suricata \ |
10 | file://suricata.yaml \ | 9 | file://suricata.yaml \ |
11 | " | 10 | " |