From 162653fd27842a76b97429e479ea2b8a7f019431 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Mon, 15 Feb 2016 18:41:33 -0800 Subject: suricata: update to 3.0 removed patch no longer needded. LIC_FILES_CHKSUM changed do to copyright date updates. Signed-off-by: Armin Kuster --- .../suricata/files/no_pcap_pkgconf_check.patch | 26 ---------- recipes-security/suricata/libhtp_0.5.18.bb | 2 +- recipes-security/suricata/suricata.inc | 7 +-- recipes-security/suricata/suricata_2.0.11.bb | 59 ---------------------- recipes-security/suricata/suricata_3.0.bb | 58 +++++++++++++++++++++ 5 files changed, 63 insertions(+), 89 deletions(-) delete mode 100644 recipes-security/suricata/files/no_pcap_pkgconf_check.patch delete mode 100644 recipes-security/suricata/suricata_2.0.11.bb create mode 100644 recipes-security/suricata/suricata_3.0.bb 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 @@ -Index: suricata-2.0.6/configure -=================================================================== ---- suricata-2.0.6.orig/configure -+++ suricata-2.0.6/configure -@@ -17372,8 +17372,6 @@ fi - - if test "$HAVE_PCAP_CONFIG" = "no"; then - CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=1" -- else -- CFLAGS="${CFLAGS} `pcap-config --defines` `pcap-config --cflags` -DLIBPCAP_VERSION_MAJOR=1" - fi - else - CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=0" -Index: suricata-2.0.6/configure.ac -=================================================================== ---- suricata-2.0.6.orig/configure.ac -+++ suricata-2.0.6/configure.ac -@@ -1060,8 +1060,6 @@ - AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no") - if test "$HAVE_PCAP_CONFIG" = "no"; then - CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=1" -- else -- CFLAGS="${CFLAGS} `pcap-config --defines` `pcap-config --cflags` -DLIBPCAP_VERSION_MAJOR=1" - fi - else - 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 require suricata.inc -LIC_FILES_CHKSUM = "file://../LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8" +LIC_FILES_CHKSUM = "file://../LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" DEPENDS = "zlib" 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/" SECTION = "security Monitor/Admin" LICENSE = "GPLv2" -VER = "2.0.11" +VER = "3.0" SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" -SRC_URI[md5sum] = "4c05eebfb87c3c1ff51460f4e6318b9a" -SRC_URI[sha256sum] = "c607f1e18e5636830f42a83f7c67e1466f07db82853f3a9dba4ab8c6c3bc656e" +SRC_URI[md5sum] = "a964af69263592c625b56f72d49e8d24" +SRC_URI[sha256sum] = "4b8feb398a0800c955fe24aa31ca446c539e79492155717e826473f902c8e65a" + diff --git a/recipes-security/suricata/suricata_2.0.11.bb b/recipes-security/suricata/suricata_2.0.11.bb deleted file mode 100644 index 21b22d1..0000000 --- a/recipes-security/suricata/suricata_2.0.11.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "The Suricata Engine is an Open Source Next Generation Intrusion Detection and Prevention Engine" - -require suricata.inc - -LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8" - -SRC_URI += "file://no_libhtp_build.patch \ - file://no_pcap_pkgconf_check.patch \ - file://volatiles.03_suricata \ - file://suricata.yaml \ - " - -inherit autotools-brokensep pkgconfig - -CFLAGS += "-D_DEFAULT_SOURCE" - -CACHED_CONFIGUREVARS = "ac_cv_header_htp_htp_h=yes ac_cv_lib_htp_htp_conn_create=yes " - -EXTRA_OECONF += " --disable-debug \ - --enable-non-bundled-htp \ - --disable-gccmarch-native \ - " - -PACKAGECONFIG ??= "htp jansson file pcre yaml pcap cap-ng net nfnetlink nss nspr" -PACKAGECONFIG[htp] = "--with-libhtp-includes=${STAGING_INCDIR} --with-libhtp-libraries=${STAGING_LIBDIR}, ,libhtp," -PACKAGECONFIG[pcre] = "--with-libpcre-includes=${STAGING_INCDIR} --with-libpcre-libraries=${STAGING_LIBDIR}, ,libpcre ," -PACKAGECONFIG[yaml] = "--with-libyaml-includes=${STAGING_INCDIR} --with-libyaml-libraries=${STAGING_LIBDIR}, ,libyaml ," -PACKAGECONFIG[pcap] = "--with-libpcap-includes=${STAGING_INCDIR} --with-libpcap-libraries=${STAGING_LIBDIR}, ,libpcap ," -PACKAGECONFIG[cap-ng] = "--with-libcap_ng-includes=${STAGING_INCDIR} --with-libcap_ng-libraries=${STAGING_LIBDIR}, ,libcap-ng , " -PACKAGECONFIG[net] = "--with-libnet-includes=${STAGING_INCDIR} --with-libnet-libraries=${STAGING_LIBDIR}, , libnet," -PACKAGECONFIG[nfnetlink] = "--with-libnfnetlink-includes=${STAGING_INCDIR} --with-libnfnetlink-libraries=${STAGING_LIBDIR}, ,libnfnetlink ," - -PACKAGECONFIG[jansson] = "--with-libjansson-includes=${STAGING_INCDIR} --with-libjansson-libraries=${STAGING_LIBDIR},,jansson, jansson" -PACKAGECONFIG[file] = ",,file, file" -PACKAGECONFIG[nss] = "--with-libnss-includes=${STAGING_INCDIR} --with-libnss-libraries=${STAGING_LIBDIR}, nss, nss," -PACKAGECONFIG[nspr] = "--with-libnspr-includes=${STAGING_INCDIR} --with-libnspr-libraries=${STAGING_LIBDIR}, nspr, nspr," - -export logdir = "${localstatedir}/log" - -do_install_append () { - install -d ${D}${sysconfdir}/suricata - install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles - install -m 644 classification.config ${D}${sysconfdir}/suricata - install -m 644 reference.config ${D}${sysconfdir}/suricata - install -m 644 ${WORKDIR}/suricata.yaml ${D}${sysconfdir}/suricata - install -m 0644 ${WORKDIR}/volatiles.03_suricata ${D}${sysconfdir}/default/volatiles/volatiles.03_suricata -} - -pkg_postinst_${PN} () { -if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then - ${sysconfdir}/init.d/populate-volatile.sh update -fi - ${bindir}/suricata -c ${sysconfdir}/suricata.yaml -i eth0 -} - -FILES_${PN} += "${sysconfdir}/suricata ${logdir}/suricata" -FILES_${PN}-dev += "/usr/lib/python2.7/site-packages" - -RDEPENDS_${PN} += " python" diff --git a/recipes-security/suricata/suricata_3.0.bb b/recipes-security/suricata/suricata_3.0.bb new file mode 100644 index 0000000..ead568a --- /dev/null +++ b/recipes-security/suricata/suricata_3.0.bb @@ -0,0 +1,58 @@ +SUMMARY = "The Suricata Engine is an Open Source Next Generation Intrusion Detection and Prevention Engine" + +require suricata.inc + +LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" + +SRC_URI += "file://no_libhtp_build.patch \ + file://volatiles.03_suricata \ + file://suricata.yaml \ + " + +inherit autotools-brokensep pkgconfig + +CFLAGS += "-D_DEFAULT_SOURCE" + +CACHED_CONFIGUREVARS = "ac_cv_header_htp_htp_h=yes ac_cv_lib_htp_htp_conn_create=yes " + +EXTRA_OECONF += " --disable-debug \ + --enable-non-bundled-htp \ + --disable-gccmarch-native \ + " + +PACKAGECONFIG ??= "htp jansson file pcre yaml pcap cap-ng net nfnetlink nss nspr" +PACKAGECONFIG[htp] = "--with-libhtp-includes=${STAGING_INCDIR} --with-libhtp-libraries=${STAGING_LIBDIR}, ,libhtp," +PACKAGECONFIG[pcre] = "--with-libpcre-includes=${STAGING_INCDIR} --with-libpcre-libraries=${STAGING_LIBDIR}, ,libpcre ," +PACKAGECONFIG[yaml] = "--with-libyaml-includes=${STAGING_INCDIR} --with-libyaml-libraries=${STAGING_LIBDIR}, ,libyaml ," +PACKAGECONFIG[pcap] = "--with-libpcap-includes=${STAGING_INCDIR} --with-libpcap-libraries=${STAGING_LIBDIR}, ,libpcap ," +PACKAGECONFIG[cap-ng] = "--with-libcap_ng-includes=${STAGING_INCDIR} --with-libcap_ng-libraries=${STAGING_LIBDIR}, ,libcap-ng , " +PACKAGECONFIG[net] = "--with-libnet-includes=${STAGING_INCDIR} --with-libnet-libraries=${STAGING_LIBDIR}, , libnet," +PACKAGECONFIG[nfnetlink] = "--with-libnfnetlink-includes=${STAGING_INCDIR} --with-libnfnetlink-libraries=${STAGING_LIBDIR}, ,libnfnetlink ," + +PACKAGECONFIG[jansson] = "--with-libjansson-includes=${STAGING_INCDIR} --with-libjansson-libraries=${STAGING_LIBDIR},,jansson, jansson" +PACKAGECONFIG[file] = ",,file, file" +PACKAGECONFIG[nss] = "--with-libnss-includes=${STAGING_INCDIR} --with-libnss-libraries=${STAGING_LIBDIR}, nss, nss," +PACKAGECONFIG[nspr] = "--with-libnspr-includes=${STAGING_INCDIR} --with-libnspr-libraries=${STAGING_LIBDIR}, nspr, nspr," + +export logdir = "${localstatedir}/log" + +do_install_append () { + install -d ${D}${sysconfdir}/suricata + install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles + install -m 644 classification.config ${D}${sysconfdir}/suricata + install -m 644 reference.config ${D}${sysconfdir}/suricata + install -m 644 ${WORKDIR}/suricata.yaml ${D}${sysconfdir}/suricata + install -m 0644 ${WORKDIR}/volatiles.03_suricata ${D}${sysconfdir}/default/volatiles/volatiles.03_suricata +} + +pkg_postinst_${PN} () { +if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then + ${sysconfdir}/init.d/populate-volatile.sh update +fi + ${bindir}/suricata -c ${sysconfdir}/suricata.yaml -i eth0 +} + +FILES_${PN} += "${sysconfdir}/suricata ${logdir}/suricata" +FILES_${PN}-dev += "/usr/lib/python2.7/site-packages" + +RDEPENDS_${PN} += " python" -- cgit v1.2.3-54-g00ecf