Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -0,0 +1,34 @@
|
||||
From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Mon, 7 May 2018 23:14:46 +0200
|
||||
Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un
|
||||
definition
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
proto.c: In function ‘dconnect’:
|
||||
proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’
|
||||
if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0)
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html
|
||||
---
|
||||
clamdscan/proto.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/clamdscan/proto.c b/clamdscan/proto.c
|
||||
index 0205f6da0..d3396732f 100644
|
||||
--- a/clamdscan/proto.c
|
||||
+++ b/clamdscan/proto.c
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/types.h>
|
||||
+#include <sys/un.h>
|
||||
#ifdef HAVE_SYS_SELECT_H
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
Fixes build error
|
||||
|
||||
proto.c: In function ‘dconnect’:
|
||||
proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’
|
||||
if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0)
|
||||
|
||||
Patch sent upstream: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr clamav-0.98.3.org/clamdscan/proto.c clamav-0.98.3/clamdscan/proto.c
|
||||
--- clamav-0.98.3.org/clamdscan/proto.c 2014-05-06 20:39:56.000000000 +0200
|
||||
+++ clamav-0.98.3/clamdscan/proto.c 2014-05-10 10:41:44.000000000 +0200
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/types.h>
|
||||
+#include <sys/un.h>
|
||||
#ifdef HAVE_SYS_SELECT_H
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
@@ -1,4 +1,8 @@
|
||||
mbox: do not use backtrace if using uClibc without backtrace support
|
||||
From 053bac34b9f0f947c58fcdf80ac03d5a6b05aa12 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Mon, 7 May 2018 23:15:58 +0200
|
||||
Subject: [PATCH] mbox: do not use backtrace if using uClibc without backtrace
|
||||
support
|
||||
|
||||
Since uClibc can be configured without support for backtrace, disable
|
||||
the backtrace if we are building with a uClibc that was built without
|
||||
@@ -8,10 +12,15 @@ This is a bit hacky, and would greatly benefit from a test in ./configure
|
||||
instead, but does nicely as a quick fix for now.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
diff -durN clamav-0.98.4.orig/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c
|
||||
--- clamav-0.98.4.orig/libclamav/mbox.c 2014-05-21 17:25:05.000000000 +0200
|
||||
+++ clamav-0.98.4/libclamav/mbox.c 2014-11-16 17:21:04.885383286 +0100
|
||||
@@ -83,7 +83,7 @@
|
||||
---
|
||||
libclamav/mbox.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libclamav/mbox.c b/libclamav/mbox.c
|
||||
index 71f540c0a..4851297a9 100644
|
||||
--- a/libclamav/mbox.c
|
||||
+++ b/libclamav/mbox.c
|
||||
@@ -98,7 +98,7 @@
|
||||
#include <features.h>
|
||||
#endif
|
||||
|
||||
@@ -20,3 +29,6 @@ diff -durN clamav-0.98.4.orig/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c
|
||||
#define HAVE_BACKTRACE
|
||||
#endif
|
||||
#endif
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
From 6b6ff53b5931c162be13504a1efc53fc5212f9d1 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Mon, 7 May 2018 22:57:34 +0200
|
||||
Subject: [PATCH] m4/reorganization/libs/curl.m4: fix curl-config detection
|
||||
logic
|
||||
|
||||
The current logic in curl.m4 doesn't behave properly when
|
||||
--without-libcurl is passed to the ./configure script.
|
||||
|
||||
Indeed, in this case what happens is that:
|
||||
|
||||
(1) Since --without-libcurl is passed, LIBCURL_HOME is set to nothing
|
||||
|
||||
(2) find_curl is set to "no"
|
||||
|
||||
(3) Due to find_curl being "no", LIBCURL_HOME is not set to
|
||||
/usr/local and remains empty
|
||||
|
||||
(4) We test if $LIBCURL_HOME/bin/curl_config exists, which is
|
||||
equivalent to testing if /bin/curl-config exists. So curl.m4 is
|
||||
looking at /bin/curl-config, which is irrelevant in a
|
||||
cross-compilation context: it is not because the build machine
|
||||
has libcurl installed that it is available for the target.
|
||||
|
||||
Due to this mistake, it sets have_curl="yes"
|
||||
|
||||
Due to this, the ./configure script assumes it can build the
|
||||
clamsubmit program, which fails at build time because curl/curl.h
|
||||
doesn't exist.
|
||||
|
||||
To fix this, this commit rewrites the curl-config detection logic with
|
||||
a simpler loop. If find_curl=yes, it means we have to find libcurl
|
||||
ourselves, so we iterate over /usr/local and /usr, and check if a
|
||||
bin/curl-config binary is available there. If so, we use this path as
|
||||
LIBCURL_HOME and set have_curl="yes".
|
||||
|
||||
This preserves the existing behavior, while fixing the situation where
|
||||
--without-libcurl is passed, but /bin/curl-config exists.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Upstream-status: https://github.com/Cisco-Talos/clamav-devel/pull/87
|
||||
---
|
||||
m4/reorganization/libs/curl.m4 | 15 +++++----------
|
||||
1 file changed, 5 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/m4/reorganization/libs/curl.m4 b/m4/reorganization/libs/curl.m4
|
||||
index 2a5966ee7..b6a9c2137 100644
|
||||
--- a/m4/reorganization/libs/curl.m4
|
||||
+++ b/m4/reorganization/libs/curl.m4
|
||||
@@ -19,17 +19,12 @@ fi
|
||||
[find_curl="yes"])
|
||||
|
||||
if test "X$find_curl" = "Xyes"; then
|
||||
- LIBCURL_HOME=/usr/local
|
||||
-fi
|
||||
-if test -f "$LIBCURL_HOME/bin/curl-config"; then
|
||||
- have_curl="yes"
|
||||
-else
|
||||
- if test "X$find_curl" = "Xyes"; then
|
||||
- LIBCURL_HOME=/usr
|
||||
- if test -f "$LIBCURL_HOME/bin/curl-config"; then
|
||||
- have_curl="yes"
|
||||
+ for p in /usr/local /usr ; do
|
||||
+ if test -f "${p}/bin/curl-config"; then
|
||||
+ LIBCURL_HOME=$p
|
||||
+ have_curl="yes"
|
||||
fi
|
||||
- fi
|
||||
+ done
|
||||
fi
|
||||
|
||||
if test "X$have_curl" = "Xyes"; then
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
config BR2_PACKAGE_CLAMAV
|
||||
bool "clamav"
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBTOOL
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_ZLIB
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
ClamAV is an open source antivirus engine for detecting trojans,
|
||||
viruses, malware & other malicious threats.
|
||||
ClamAV is an open source antivirus engine for detecting
|
||||
trojans, viruses, malware & other malicious threats.
|
||||
|
||||
http://www.clamav.net
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 d72ac3273bde8d2e5e28ec9978373ee3ab4529fd868bc3fc4d2d2671228f2461 clamav-0.99.4.tar.gz
|
||||
sha256 4a2e4f0cd41e62adb5a713b4a1857c49145cd09a69957e6d946ecad575206dd6 clamav-0.100.2.tar.gz
|
||||
sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING
|
||||
sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2
|
||||
sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CLAMAV_VERSION = 0.99.4
|
||||
CLAMAV_VERSION = 0.100.2
|
||||
CLAMAV_SITE = https://www.clamav.net/downloads/production
|
||||
CLAMAV_LICENSE = GPLv2
|
||||
CLAMAV_LICENSE = GPL-2.0
|
||||
CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
|
||||
COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex \
|
||||
COPYING.unrar COPYING.zlib
|
||||
@@ -15,7 +15,9 @@ CLAMAV_DEPENDENCIES = \
|
||||
libtool \
|
||||
openssl \
|
||||
zlib \
|
||||
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
# 0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch
|
||||
CLAMAV_AUTORECONF = YES
|
||||
|
||||
# mmap cannot be detected when cross-compiling, needed for mempool support
|
||||
CLAMAV_CONF_ENV = \
|
||||
|
||||
Reference in New Issue
Block a user