From 401cec248676d1e79d5b486577fa534d8d74f181 Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Sat, 7 Feb 2015 22:57:01 -0800
Subject: [PATCH] suricata: update to 2.0.6

fix new build issues with pcap-config
cleanup configure selection

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 recipes-security/suricata/libhtp_0.5.16.bb    |  2 +-
 .../no_libhtp_build.patch                     |  0
 .../no_pcap_pkgconf_check.patch               | 26 ++++++++++++++
 .../suricata.yaml                             |  0
 .../volatiles.03_suricata                     |  0
 recipes-security/suricata/suricata.inc        |  7 ++--
 .../{suricata_2.0.5.bb => suricata_2.0.6.bb}  | 35 +++++++++----------
 7 files changed, 47 insertions(+), 23 deletions(-)
 rename recipes-security/suricata/{suricata-2.0.5 => suricata-2.0.6}/no_libhtp_build.patch (100%)
 create mode 100644 recipes-security/suricata/suricata-2.0.6/no_pcap_pkgconf_check.patch
 rename recipes-security/suricata/{suricata-2.0.5 => suricata-2.0.6}/suricata.yaml (100%)
 rename recipes-security/suricata/{suricata-2.0.5 => suricata-2.0.6}/volatiles.03_suricata (100%)
 rename recipes-security/suricata/{suricata_2.0.5.bb => suricata_2.0.6.bb} (51%)

diff --git a/recipes-security/suricata/libhtp_0.5.16.bb b/recipes-security/suricata/libhtp_0.5.16.bb
index ede9022..9d07133 100644
--- a/recipes-security/suricata/libhtp_0.5.16.bb
+++ b/recipes-security/suricata/libhtp_0.5.16.bb
@@ -8,6 +8,6 @@ inherit autotools pkgconfig
 
 CFLAGS += "-D_DEFAULT_SOURCE"
 
-S = "${WORKDIR}/suricata-2.0.5/${BPN}"
+S = "${WORKDIR}/suricata-2.0.6/${BPN}"
 
 RDEPENDS_${PN} += "zlib"
diff --git a/recipes-security/suricata/suricata-2.0.5/no_libhtp_build.patch b/recipes-security/suricata/suricata-2.0.6/no_libhtp_build.patch
similarity index 100%
rename from recipes-security/suricata/suricata-2.0.5/no_libhtp_build.patch
rename to recipes-security/suricata/suricata-2.0.6/no_libhtp_build.patch
diff --git a/recipes-security/suricata/suricata-2.0.6/no_pcap_pkgconf_check.patch b/recipes-security/suricata/suricata-2.0.6/no_pcap_pkgconf_check.patch
new file mode 100644
index 0000000..ba9ff90
--- /dev/null
+++ b/recipes-security/suricata/suricata-2.0.6/no_pcap_pkgconf_check.patch
@@ -0,0 +1,26 @@
+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/suricata-2.0.5/suricata.yaml b/recipes-security/suricata/suricata-2.0.6/suricata.yaml
similarity index 100%
rename from recipes-security/suricata/suricata-2.0.5/suricata.yaml
rename to recipes-security/suricata/suricata-2.0.6/suricata.yaml
diff --git a/recipes-security/suricata/suricata-2.0.5/volatiles.03_suricata b/recipes-security/suricata/suricata-2.0.6/volatiles.03_suricata
similarity index 100%
rename from recipes-security/suricata/suricata-2.0.5/volatiles.03_suricata
rename to recipes-security/suricata/suricata-2.0.6/volatiles.03_suricata
diff --git a/recipes-security/suricata/suricata.inc b/recipes-security/suricata/suricata.inc
index 1dcffcd..a7f95b1 100644
--- a/recipes-security/suricata/suricata.inc
+++ b/recipes-security/suricata/suricata.inc
@@ -1,7 +1,8 @@
+HOMEPAGE = "http://suricata-ids.org/"
 SECTION = "security Monitor/Admin"
 LICENSE = "GPLv2"
 
-SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-2.0.5.tar.gz"
+SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-2.0.6.tar.gz"
 
-SRC_URI[md5sum] = "2ff10b929bf7d5fd4d345b0fd8f268a1"
-SRC_URI[sha256sum] = "57b1120e91bd4e348e1a4cee9eb7b197d05fc25169e062f1a11f5dd4b9322c60"
+SRC_URI[md5sum] = "14bfb3adc184d4da321c93ed9abae500"
+SRC_URI[sha256sum] = "e833e35ea3b6029bbdef81660af22e8f563494eac85d97618d761ce1b69c78ec"
diff --git a/recipes-security/suricata/suricata_2.0.5.bb b/recipes-security/suricata/suricata_2.0.6.bb
similarity index 51%
rename from recipes-security/suricata/suricata_2.0.5.bb
rename to recipes-security/suricata/suricata_2.0.6.bb
index f56c044..7e99791 100644
--- a/recipes-security/suricata/suricata_2.0.5.bb
+++ b/recipes-security/suricata/suricata_2.0.6.bb
@@ -5,37 +5,34 @@ 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 \
         "
 
-DEPENDS = "libhtp file libpcre libyaml libpcap libcap-ng libnet libnfnetlink"
-
 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 \
-    --with-libpcre-includes=${STAGING_INCDIR} \
-    --with-libpcre-libraries=${STAGING_LIBDIR} \
-    --with-libyaml-includes=${STAGING_INCDIR} \
-    --with-libyaml-libraries=${STAGING_LIBDIR} \
-    --with-libpcap-includes=${STAGING_INCDIR} \
-    --with-libpcap-libraries=${STAGING_LIBDIR} \
-    --with-libcap_ng-includes=${STAGING_INCDIR} \
-    --with-libcap_ng-libraries=${STAGING_LIBDIR} \
-    --with-libnfnetlink-includes=${STAGING_INCDIR} \
-    --with-libnfnetlink-libraries=${STAGING_LIBDIR} \
-    --with-libnet-includes=${STAGING_INCDIR} \
-    --with-libnet-libraries=${STAGING_LIBDIR} \
-    --with-libhtp-includes=${STAGING_INCDIR} \
-    --with-libhtp-libraries=${STAGING_LIBDIR} \
-    --with-libjansson-includes=${STAGING_INCDIR} \
-    --with-libjansson-libraries=${STAGING_LIBDIR} \
     "
 
+PACKAGECONFIG ??= "htp jansson file pcre yaml pcap cap-ng net nfnetlink"
+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"
+
 export logdir = "${localstatedir}/log"
 
 do_install_append () {
@@ -57,4 +54,4 @@ fi
 FILES_${PN} += "${sysconfdir}/suricata ${logdir}/suricata"
 FILES_${PN}-dev += "/usr/lib/python2.7/site-packages"
 
-RDEPENDS_${PN} += " file jansson"
+RDEPENDS_${PN} += " python"