suricata: update to 3.0
PATCH 1/2 suricata: update to 3.0
removed patch no longer needded. LIC_FILES_CHKSUM changed do to copyright date updates.
---
.../suricata/files/no_pcap_pkgconf_check.patch | 26 ----------------------
recipes-security/suricata/libhtp_0.5.18.bb | 2 +-
recipes-security/suricata/suricata.inc | 7 +++---
.../{suricata_2.0.11.bb => suricata_3.0.bb} | 3 +--
4 files changed, 6 insertions(+), 32 deletions(-)
delete mode 100644 recipes-security/suricata/files/no_pcap_pkgconf_check.patch
rename recipes-security/suricata/{suricata_2.0.11.bb => suricata_3.0.bb} (95%)recipes-security/suricata/files/no_pcap_pkgconf_check.patch deleted +0 -26
@@ -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"
recipes-security/suricata/libhtp_0.5.18.bb +1 -1
@@ -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"
recipes-security/suricata/suricata.inc +4 -3
@@ -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" +
recipes-security/suricata/suricata_3.0.bb renamed from recipes-security/suricata/suricata_2.0.11.bb +1 -2
@@ -2,10 +2,9 @@ SUMMARY = "The Suricata Engine is an Open Source Next Generation Intrusion Detec 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" SRC_URI += "file://no_libhtp_build.patch \ - file://no_pcap_pkgconf_check.patch \ file://volatiles.03_suricata \ file://suricata.yaml \ "
Signature · 1 line
2.3.5
PATCH 2/2 clamav: update to 0.99
removed debian patches
---
...paths-in-sample-conf-file-to-match-Debian.patch | 40 -
...itional-n-after-the-number-in-the-pidfile.patch | 56 -
...increment-test-timeout-from-40secs-to-5mi.patch | 30 -
.../clamav-0.98.5/0004-Fix-compiling-on-Hurd.patch | 50 -
.../0005-Workaround-a-bug-in-libc-on-Hurd.patch | 35 -
...necessary-harmful-flags-from-libclamav.pc.patch | 22 -
.../0007-libclamav-use-libmspack.patch | 4042 --
...m-systemd-support-for-clamav-daemon-and-c.patch | 655 -
...-fix-ssize_t-size_t-off_t-printf-modifier.patch | 478 -
...VM-linker-flag-because-llvm-config-return.patch | 26 -
...ck-library-from-upstream-without-unnecess.patch | 56090 -------------------
...e-internal-libmspack-if-the-external-is-n.patch | 106 -
...13-fix-autoreconf-with-embedded-libmspack.patch | 27 -
...ONFIG_SRCDIR-llvm-configure-from-libclama.patch | 23 -
...low-to-specificy-a-group-for-the-socket-o.patch | 229 -
...er-add-additinal-SMFIF_-flags-before-invo.patch | 86 -
.../0017-Bump-.so-version-number.patch | 22 -
.../0018-llvm-don-t-use-system-libs.patch | 26 -
.../clamav-0.98.5/clamav-0001-clamdscan.patch | 21 -
recipes-security/clamav/clamav-0.98.5/series | 18 -
.../clamav-freshclam.service | 0
.../clamav-milter.conf.sample | 0
.../{clamav-0.98.5 => clamav-0.99}/clamav.service | 0
.../{clamav-0.98.5 => clamav-0.99}/clamd.conf | 0
.../{clamav-0.98.5 => clamav-0.99}/freshclam.conf | 0
.../clamav/clamav-0.99/mempool_build_fix.patch | 14 +
.../clamav/clamav-0.99/rpath_rmove.patch | 44 +
.../volatiles.03_clamav | 0
.../clamav/{clamav_0.98.5.bb => clamav_0.99.bb} | 63 +-
29 files changed, 88 insertions(+), 62115 deletions(-)
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0001-Change-paths-in-sample-conf-file-to-match-Debian.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0002-Add-an-additional-n-after-the-number-in-the-pidfile.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0003-unit_tests-increment-test-timeout-from-40secs-to-5mi.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0004-Fix-compiling-on-Hurd.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0005-Workaround-a-bug-in-libc-on-Hurd.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0006-remove-unnecessary-harmful-flags-from-libclamav.pc.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0007-libclamav-use-libmspack.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0008-Add-upstream-systemd-support-for-clamav-daemon-and-c.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0009-fix-ssize_t-size_t-off_t-printf-modifier.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0010-hardcode-LLVM-linker-flag-because-llvm-config-return.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0011-Add-libmspack-library-from-upstream-without-unnecess.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0012-allow-to-use-internal-libmspack-if-the-external-is-n.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0013-fix-autoreconf-with-embedded-libmspack.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0014-remove-AC_CONFIG_SRCDIR-llvm-configure-from-libclama.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0015-bb-10731-Allow-to-specificy-a-group-for-the-socket-o.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0016-clamav-milter-add-additinal-SMFIF_-flags-before-invo.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0017-Bump-.so-version-number.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/0018-llvm-don-t-use-system-libs.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/clamav-0001-clamdscan.patch
delete mode 100644 recipes-security/clamav/clamav-0.98.5/series
rename recipes-security/clamav/{clamav-0.98.5 => clamav-0.99}/clamav-freshclam.service (100%)
rename recipes-security/clamav/{clamav-0.98.5 => clamav-0.99}/clamav-milter.conf.sample (100%)
rename recipes-security/clamav/{clamav-0.98.5 => clamav-0.99}/clamav.service (100%)
rename recipes-security/clamav/{clamav-0.98.5 => clamav-0.99}/clamd.conf (100%)
rename recipes-security/clamav/{clamav-0.98.5 => clamav-0.99}/freshclam.conf (100%)
create mode 100644 recipes-security/clamav/clamav-0.99/mempool_build_fix.patch
create mode 100644 recipes-security/clamav/clamav-0.99/rpath_rmove.patch
rename recipes-security/clamav/{clamav-0.98.5 => clamav-0.99}/volatiles.03_clamav (100%)
rename recipes-security/clamav/{clamav_0.98.5.bb => clamav_0.99.bb} (68%)recipes-security/clamav/clamav-0.98.5/0001-Change-paths-in-sample-conf-file-to-match-Debian.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From a6d6189e25d0a1053dc1aaff1b4c71f84b4599cf Mon Sep 17 00:00:00 2001 -From: Scott Kitterman <[email protected]> -Date: Mon, 10 Mar 2014 19:20:18 -0400 -Subject: Change paths in sample conf file to match Debian - ---- - etc/clamav-milter.conf.sample | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/etc/clamav-milter.conf.sample b/etc/clamav-milter.conf.sample -index b7d66a4f9641..ed0d519ffb9b 100644 ---- a/etc/clamav-milter.conf.sample -+++ b/etc/clamav-milter.conf.sample -@@ -64,7 +64,7 @@ Example - # daemon (main thread). - # - # Default: disabled --#PidFile /var/run/clamav-milter.pid -+#PidFile /var/run/clamav/clamav-milter.pid - - # Optional path to the global temporary directory. - # Default: system specific (usually /tmp or /var/tmp). -@@ -90,7 +90,7 @@ Example - # with the same socket: clamd servers will be selected in a round-robin fashion. - # - # Default: no default --#ClamdSocket tcp:scanner.mydomain:7357 -+ClamdSocket /var/run/clamav/clamd - - - ## -@@ -212,7 +212,7 @@ Example - # A full path is required. - # - # Default: disabled --#LogFile /tmp/clamav-milter.log -+#LogFile /var/log/clamav/clamav-milter.log - - # By default the log file is locked for writing - the lock protects against - # running clamav-milter multiple times.
recipes-security/clamav/clamav-0.98.5/0002-Add-an-additional-n-after-the-number-in-the-pidfile.patch deleted +0 -56
56 lines not on this page · raw message
recipes-security/clamav/clamav-0.98.5/0003-unit_tests-increment-test-timeout-from-40secs-to-5mi.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From d5febd3fab63a6dc4af148ab1b94fe8a85412b46 Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior <[email protected]> -Date: Fri, 25 Apr 2014 22:06:23 +0200 -Subject: unit_tests: increment test-timeout from 40secs to 5mins - -I see now and then that tests on the slower archs (arm*, mips) fail due to -the timeout restriction. Often a second build even on the same buildd -succeeds. I think that the buildd is either close to the limit or has -something else (another sbuild running) going so it does not finish the -test in 40secs. -Therefore I raise the bar to a 5 minutes limit. The worst thing that can -happen is, that it takes more than 4 minutes before an enless loop will -be detected. - -Signed-off-by: Sebastian Andrzej Siewior <[email protected]> ---- - unit_tests/preload_run.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unit_tests/preload_run.sh b/unit_tests/preload_run.sh -index 8b8c8e3954dd..365b3a8e0edb 100755 ---- a/unit_tests/preload_run.sh -+++ b/unit_tests/preload_run.sh -@@ -5,5 +5,5 @@ - ulimit -c 0 || true - LD_PRELOAD=$LIBPRELOAD - export LD_PRELOAD --export CK_DEFAULT_TIMEOUT=40 -+export CK_DEFAULT_TIMEOUT=300 - exec $@
recipes-security/clamav/clamav-0.98.5/0004-Fix-compiling-on-Hurd.patch deleted +0 -50
50 lines not on this page · raw message
recipes-security/clamav/clamav-0.98.5/0005-Workaround-a-bug-in-libc-on-Hurd.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From b8e7d19ec50c30c59fa1038cd9da6d37c2176833 Mon Sep 17 00:00:00 2001 -From: Andreas Cadhalpun <[email protected]> -Date: Sat, 21 Jun 2014 17:02:06 +0200 -Subject: Workaround a bug in libc on Hurd - -The send() function, when asked to send 0 characters, doesn't trigger a corresponding recv(), except on Hurd. - -This breaks the communication between clamd and clamdscan. - -See: https://bugs.debian.org/752237 ---- - clamd/scanner.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/clamd/scanner.c b/clamd/scanner.c -index cd3d07c4ad3e..d531c4420686 100644 ---- a/clamd/scanner.c -+++ b/clamd/scanner.c -@@ -119,6 +119,7 @@ int scan_callback(STATBUF *sb, char *filename, const char *msg, enum cli_ftw_rea - - /* detect disconnected socket, - * this should NOT detect half-shutdown sockets (SHUT_WR) */ -+#if !defined(__GNU__) - if (send(scandata->conn->sd, &ret, 0, 0) == -1 && errno != EINTR) { - logg("$Client disconnected while command was active!\n"); - thrmgr_group_terminate(scandata->conn->group); -@@ -126,7 +127,7 @@ int scan_callback(STATBUF *sb, char *filename, const char *msg, enum cli_ftw_rea - free(filename); - return CL_BREAK; - } -- -+#endif - if (thrmgr_group_need_terminate(scandata->conn->group)) { - logg("^Client disconnected while scanjob was active\n"); - if (reason == visit_file)
recipes-security/clamav/clamav-0.98.5/0006-remove-unnecessary-harmful-flags-from-libclamav.pc.patch deleted +0 -22
@@ -1,22 +0,0 @@ -From 0fd50756af998fabc3393f67ff8b78a4855303d9 Mon Sep 17 00:00:00 2001 -From: Andreas Cadhalpun <[email protected]> -Date: Mon, 4 Aug 2014 22:44:40 +0200 -Subject: remove unnecessary/harmful flags from libclamav.pc - ---- - libclamav.pc.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libclamav.pc.in b/libclamav.pc.in -index 27db30e757ff..19ef1e4e0399 100644 ---- a/libclamav.pc.in -+++ b/libclamav.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libclamav - Description: A GPL virus scanner - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -+Libs: -L${libdir} -lclamav -+Cflags: -I${includedir} -
recipes-security/clamav/clamav-0.98.5/0007-libclamav-use-libmspack.patch deleted +0 -4042
2,767 lines not on this page · raw message
recipes-security/clamav/clamav-0.98.5/0008-Add-upstream-systemd-support-for-clamav-daemon-and-c.patch deleted +0 -655
655 lines not on this page · raw message
recipes-security/clamav/clamav-0.98.5/0009-fix-ssize_t-size_t-off_t-printf-modifier.patch deleted +0 -478
478 lines not on this page · raw message
recipes-security/clamav/clamav-0.98.5/0010-hardcode-LLVM-linker-flag-because-llvm-config-return.patch deleted +0 -26
Lines of this file are not shown. View the raw message.
recipes-security/clamav/clamav-0.98.5/0011-Add-libmspack-library-from-upstream-without-unnecess.patch deleted +0 -56090
56,090 lines not on this page · raw message
recipes-security/clamav/clamav-0.98.5/0012-allow-to-use-internal-libmspack-if-the-external-is-n.patch deleted +0 -106
106 lines not on this page · raw message
recipes-security/clamav/clamav-0.98.5/0013-fix-autoreconf-with-embedded-libmspack.patch deleted +0 -27
Lines of this file are not shown. View the raw message.
recipes-security/clamav/clamav-0.98.5/0014-remove-AC_CONFIG_SRCDIR-llvm-configure-from-libclama.patch deleted +0 -23
Lines of this file are not shown. View the raw message.
recipes-security/clamav/clamav-0.98.5/0015-bb-10731-Allow-to-specificy-a-group-for-the-socket-o.patch deleted +0 -229
229 lines not on this page · raw message
recipes-security/clamav/clamav-0.98.5/0016-clamav-milter-add-additinal-SMFIF_-flags-before-invo.patch deleted +0 -86
86 lines not on this page · raw message
recipes-security/clamav/clamav-0.98.5/0017-Bump-.so-version-number.patch deleted +0 -22
Lines of this file are not shown. View the raw message.
recipes-security/clamav/clamav-0.98.5/0018-llvm-don-t-use-system-libs.patch deleted +0 -26
Lines of this file are not shown. View the raw message.
recipes-security/clamav/clamav-0.98.5/clamav-0001-clamdscan.patch deleted +0 -21
Lines of this file are not shown. View the raw message.
recipes-security/clamav/clamav-0.98.5/series deleted +0 -18
Lines of this file are not shown. View the raw message.
recipes-security/clamav/clamav-0.99/clamav-freshclam.service renamed from recipes-security/clamav/clamav-0.98.5/clamav-freshclam.service +0 -0
recipes-security/clamav/clamav-0.99/clamav-milter.conf.sample renamed from recipes-security/clamav/clamav-0.98.5/clamav-milter.conf.sample +0 -0
recipes-security/clamav/clamav-0.99/clamav.service renamed from recipes-security/clamav/clamav-0.98.5/clamav.service +0 -0
recipes-security/clamav/clamav-0.99/clamd.conf renamed from recipes-security/clamav/clamav-0.98.5/clamd.conf +0 -0
recipes-security/clamav/clamav-0.99/freshclam.conf renamed from recipes-security/clamav/clamav-0.98.5/freshclam.conf +0 -0
recipes-security/clamav/clamav-0.99/mempool_build_fix.patch new file +14 -0
Lines of this file are not shown. View the raw message.
recipes-security/clamav/clamav-0.99/rpath_rmove.patch new file +44 -0
44 lines not on this page · raw message
recipes-security/clamav/clamav-0.99/volatiles.03_clamav renamed from recipes-security/clamav/clamav-0.98.5/volatiles.03_clamav +0 -0
recipes-security/clamav/clamav_0.99.bb renamed from recipes-security/clamav/clamav_0.98.5.bb +30 -33
63 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.3.5
Part of the diff is not shown here. View the raw message.