From b68613ae0671abb84eef50cae2639e22d6bfac47 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Mon, 17 Oct 2016 20:51:26 -0700 Subject: suricata: update package to 3.1.2 v2: rebased against master-next which has 3.1 Signed-off-by: Armin Kuster --- recipes-security/suricata/suricata.inc | 6 +-- recipes-security/suricata/suricata_3.1.2.bb | 58 +++++++++++++++++++++++++++++ recipes-security/suricata/suricata_3.1.bb | 58 ----------------------------- 3 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 recipes-security/suricata/suricata_3.1.2.bb delete mode 100644 recipes-security/suricata/suricata_3.1.bb diff --git a/recipes-security/suricata/suricata.inc b/recipes-security/suricata/suricata.inc index 178ad25..5bd9286 100644 --- a/recipes-security/suricata/suricata.inc +++ b/recipes-security/suricata/suricata.inc @@ -2,8 +2,8 @@ HOMEPAGE = "http://suricata-ids.org/" SECTION = "security Monitor/Admin" LICENSE = "GPLv2" -VER = "3.1" +VER = "3.1.2" SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" -SRC_URI[md5sum] = "5473b078c6c13552fa241850518d30ed" -SRC_URI[sha256sum] = "a05aa534166495a4d9ea6104a936bc8edb49376aeb3ba0b1b2a4d9687d016669" +SRC_URI[md5sum] = "c58e8ef56918c83ecf292d73f4b0c051" +SRC_URI[sha256sum] = "f9e7742580849f202254e75d9fc245ba53f4d7490f47a6d30f02a7b10aacc512" diff --git a/recipes-security/suricata/suricata_3.1.2.bb b/recipes-security/suricata/suricata_3.1.2.bb new file mode 100644 index 0000000..ead568a --- /dev/null +++ b/recipes-security/suricata/suricata_3.1.2.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" diff --git a/recipes-security/suricata/suricata_3.1.bb b/recipes-security/suricata/suricata_3.1.bb deleted file mode 100644 index ead568a..0000000 --- a/recipes-security/suricata/suricata_3.1.bb +++ /dev/null @@ -1,58 +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=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