libhtp: update to use suricata 2.0.8

PATCH New Armin Kuster 1 participant 3 messages May 23, 2015

lore

Share & tools

lore

Armin Kuster

author

2015-05-23 15:12 UTC #0 lore raw

PATCH 1/3 libhtp: update to use suricata 2.0.8

Signed-off-by Armin Kuster <[email protected]>

---
 recipes-security/suricata/libhtp_0.5.17.bb | 2 +-
 recipes-security/suricata/suricata.inc     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

recipes-security/suricata/libhtp_0.5.17.bb +1 -1

index 7390e20..baa5221 100644
@@ -10,6 +10,6 @@ inherit autotools pkgconfig
 
 CFLAGS += "-D_DEFAULT_SOURCE"
 
-S = "${WORKDIR}/suricata-2.0.7/${BPN}"
+S = "${WORKDIR}/suricata-2.0.8/${BPN}"
 
 RDEPENDS_${PN} += "zlib"

recipes-security/suricata/suricata.inc +4 -3

index 79622dc..b7d0181 100644
@@ -2,7 +2,8 @@ HOMEPAGE = "http://suricata-ids.org/"
 SECTION = "security Monitor/Admin"
 LICENSE = "GPLv2"
 
-SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-2.0.7.tar.gz"
+PV = "2.0.8"
+SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "43cd7dd958d434c580426020079914d7"
-SRC_URI[sha256sum] = "c5c3ccebeecbace39df0ff2d50ec4515b541103ffaa5e33cd1dc79d4955c0dfd"
+SRC_URI[md5sum] = "a9553ccf942c0c4aa1e1a188ec1f7d93"
+SRC_URI[sha256sum] = "7af6394cb81e464f5c1ac88a1444030e30940caab6e53688a6d9eb652226d1be"

Signature · 1 line

2.3.5

Armin Kuster

author

2015-05-23 15:12 UTC #1 lore raw

PATCH 2/3 suricata: package update to 2.0.8

includes security fix CVE-2015-0971

include nss and nspr to build

Signed-off-by Armin Kuster <[email protected]>

---
 recipes-security/suricata/{suricata_2.0.7.bb => suricata_2.0.8.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename recipes-security/suricata/{suricata_2.0.7.bb => suricata_2.0.8.bb} (95%)

recipes-security/suricata/suricata_2.0.8.bb renamed from recipes-security/suricata/suricata_2.0.7.bb +3 -3

similarity index 95%
rename from recipes-security/suricata/suricata_2.0.7.bb
rename to recipes-security/suricata/suricata_2.0.8.bb
index 2b5d088..21b22d1 100644
@@ -21,7 +21,7 @@ EXTRA_OECONF += " --disable-debug \
     --disable-gccmarch-native \
     "
 
-PACKAGECONFIG ??= "htp jansson file pcre yaml pcap cap-ng net nfnetlink"
+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 ,"

@@ -32,8 +32,8 @@ PACKAGECONFIG[nfnetlink] = "--with-libnfnetlink-includes=${STAGING_INCDIR} --wit
 
 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}, , libnss," 
-PACKAGECONFIG[nspr] = "--with-libnspr-includes=${STAGING_INCDIR} --with-libnspr-libraries=${STAGING_LIBDIR}, , libnspr," 
+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"

Signature · 1 line

2.3.5

Armin Kuster

author

2015-05-23 15:12 UTC #2 lore raw

PATCH 3/3 libewf: update to version 20140608

In reply to Armin Kuster

drop ubuntu patches, never used them.

Fix GCC 5.0 build.

Signed-off-by Armin Kuster <[email protected]>

---
 recipes-forensic/libewf/files/gcc5_fix.patch       | 22 ++++++++++++++++++++++
 .../{libewf_20130416.bb => libewf_20140608.bb}     |  4 +---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 recipes-forensic/libewf/files/gcc5_fix.patch
 rename recipes-forensic/libewf/{libewf_20130416.bb => libewf_20140608.bb} (78%)

recipes-forensic/libewf/files/gcc5_fix.patch new file +22 -0

new file mode 100644
index 0000000..0881f25
@@ -0,0 +1,22 @@
+Upstream Status: pending
+
+Don't use inline with gcc 5.0
+
+fixes:
+undefined reference to `libuna_unicode_character_size_to_utf8'
+
+Signed-off-by: Armin Kuster <[email protected]>
+
+Index: libuna/libuna_inline.h
+===================================================================
+--- a/libuna/libuna_inline.h
++++ b/libuna/libuna_inline.h
+@@ -27,7 +27,7 @@
+ #if defined( _MSC_VER )
+ #define LIBUNA_INLINE _inline
+ 
+-#elif defined( __BORLANDC__ ) || defined( __clang__ )
++#elif defined( __BORLANDC__ ) || defined( __clang__ ) || ( __GNUC__ > 4 )
+ #define LIBUNA_INLINE /* inline */
+ 
+ #else

recipes-forensic/libewf/libewf_20140608.bb renamed from recipes-forensic/libewf/libewf_20130416.bb +1 -3

similarity index 78%
rename from recipes-forensic/libewf/libewf_20130416.bb
rename to recipes-forensic/libewf/libewf_20140608.bb
index c070b80..98ebcce 100644
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=58c39b26c0549f8e1bb4122173f474cd"
 DEPENDS = "virtual/gettext libtool"
 
 SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/libe/${BPN}/${BPN}_${PV}.orig.tar.gz;name=orig \
-        http://archive.ubuntu.com/ubuntu/pool/universe/libe/${BPN}/${BPN}_${PV}-3.debian.tar.gz;name=dpatch \
+        file://gcc5_fix.patch \
         "
 SRC_URI[orig.md5sum] = "3791d6de5910a0f6b4427cdf1e6bc663"
 SRC_URI[orig.sha256sum] = "e0f14071665b24a8077a24f4cafbf092ad5ac1859f49994dc4e843e747ba7a89"
-SRC_URI[dpatch.md5sum] = "57fb17b34344f741b52dff3ae11fbbd6"
-SRC_URI[dpatch.sha256sum] = "988ee0a94f01d452cd227ed5c55401e7674dc6fa41da8358a6ad68e67175a5cc"
 
 inherit autotools-brokensep pkgconfig

Signature · 1 line

2.3.5