Skip to contentSkip to conversation

package/clamav: add hash

PATCH New Bernd Kuhls 2 participants 4 messages Nov 3, 2014 – Nov 8, 2014

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 package/clamav: add hash

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/clamav/clamav.hash |    2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/clamav/clamav.hash
package/clamav/clamav.hash new file +2 -0
new file mode 100644
index 0000000..4f21a50
@@ -0,0 +1,2 @@
+# From http://sourceforge.net/projects/clamav/files/clamav/0.98.4/
+sha1	f1003d04f34efb0aede05395d3c7cc22c944e4ef	clamav-0.98.4.tar.gz
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 package/clamav: Fix build error

Fixes
http://autobuild.buildroot.net/results/2a6/2a68aa790b1e8d6fd4dc41f2ab724dfc03b3806d/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/clamav/clamav-0003-execinfo_h.patch |   44 +++++++++++++++++++++++++++
 package/clamav/clamav.mk                    |    1 +
 2 files changed, 45 insertions(+)
 create mode 100644 package/clamav/clamav-0003-execinfo_h.patch
package/clamav/clamav-0003-execinfo_h.patch new file +44 -0
new file mode 100644
index 0000000..29df52d
@@ -0,0 +1,44 @@
+Fixes uclibc build as uclibc does not include backtrace functionality
+
+Patch sent upstream:
+http://lurker.clamav.net/message/20141103.185534.c932b7fc.en.html
+
+Bugtracker: https://bugzilla.clamav.net/show_bug.cgi?id=11170
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr clamav-0.98.4.org/clamav-config.h.in clamav-0.98.4/clamav-config.h.in
+--- clamav-0.98.4.org/clamav-config.h.in	2014-05-21 17:25:38.000000000 +0200
++++ clamav-0.98.4/clamav-config.h.in	2014-11-03 19:57:23.569041159 +0100
+@@ -178,6 +178,9 @@
+ /* Define to 1 if the system has the type `error_t'. */
+ #undef HAVE_ERROR_T
+ 
++/* Define to 1 if you have the <execinfo.h> header file. */
++#undef HAVE_EXECINFO_H
++
+ /* have working file descriptor passing support */
+ #undef HAVE_FD_PASSING
+ 
+diff -uNr clamav-0.98.4.org/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c
+--- clamav-0.98.4.org/libclamav/mbox.c	2014-05-21 17:25:05.000000000 +0200
++++ clamav-0.98.4/libclamav/mbox.c	2014-11-03 19:31:24.544320180 +0100
+@@ -89,7 +89,9 @@
+ #endif
+ 
+ #ifdef HAVE_BACKTRACE
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ #include <syslog.h>
+ 
+ static	void	sigsegv(int sig);
+diff -uNr clamav-0.98.4.org/m4/reorganization/headers.m4 clamav-0.98.4/m4/reorganization/headers.m4
+--- clamav-0.98.4.org/m4/reorganization/headers.m4	2014-05-21 17:25:05.000000000 +0200
++++ clamav-0.98.4/m4/reorganization/headers.m4	2014-11-03 19:28:01.827005127 +0100
+@@ -1,4 +1,4 @@
+-AC_CHECK_HEADERS([stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h sys/times.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h])
++AC_CHECK_HEADERS([stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h sys/times.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h execinfo.h])
+ AC_CHECK_HEADER([syslog.h],AC_DEFINE([USE_SYSLOG],1,[use syslog]),)
+ 
+ have_pthreads=no
package/clamav/clamav.mk +1 -0
index c064d4e..6cf3c7d 100644
@@ -11,6 +11,7 @@ CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
 	COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.regex COPYING.sha256 \
 	COPYING.unrar COPYING.zlib
 # clamav-0002-static-linking.patch touches configure.ac
+# clamav-0003-execinfo_h.patch touches configure.ac
 CLAMAV_AUTORECONF = YES
 CLAMAV_DEPENDENCIES = openssl zlib $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/2 package/clamav: Fix build error

Quoted 40 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Fixes
http://autobuild.buildroot.net/results/2a6/2a68aa790b1e8d6fd4dc41f2ab724dfc03b3806d/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/clamav/clamav-0003-execinfo_h.patch |   44 +++++++++++++++++++++++++++
 package/clamav/clamav.mk                    |    1 +
 2 files changed, 45 insertions(+)
 create mode 100644 package/clamav/clamav-0003-execinfo_h.patch
package/clamav/clamav-0003-execinfo_h.patch new file +22 -0
new file mode 100644
index 0000000..29df52d
@@ -0,0 +1,44 @@
+Fixes uclibc build as uclibc does not include backtrace functionality
+
+Patch sent upstream:
+http://lurker.clamav.net/message/20141103.185534.c932b7fc.en.html
+
+Bugtracker: https://bugzilla.clamav.net/show_bug.cgi?id=11170
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr clamav-0.98.4.org/clamav-config.h.in clamav-0.98.4/clamav-config.h.in
+--- clamav-0.98.4.org/clamav-config.h.in	2014-05-21 17:25:38.000000000 +0200
++++ clamav-0.98.4/clamav-config.h.in	2014-11-03 19:57:23.569041159 +0100
+@@ -178,6 +178,9 @@
+ /* Define to 1 if the system has the type `error_t'. */
+ #undef HAVE_ERROR_T
+ 
++/* Define to 1 if you have the <execinfo.h> header file. */
++#undef HAVE_EXECINFO_H
++
+ /* have working file descriptor passing support */
+ #undef HAVE_FD_PASSING
+

package/clamav/clamav-0003-execinfo_h.patch line 32

Quoted 10 lines
package/clamav/clamav-0003-execinfo_h.patch new file +10 -0
+diff -uNr clamav-0.98.4.org/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c
+--- clamav-0.98.4.org/libclamav/mbox.c	2014-05-21 17:25:05.000000000 +0200
++++ clamav-0.98.4/libclamav/mbox.c	2014-11-03 19:31:24.544320180 +0100
+@@ -89,7 +89,9 @@
+ #endif
+ 
+ #ifdef HAVE_BACKTRACE
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif

But HAVE_BACKTRACE shouldn't be true in that case either, so why not simply fix the HAVE_BACKTRACE test instead? That seems a lot simpler.

The problem is that uClibc also defines __GLIBC__, so the check evaluates to true:

#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1
#define HAVE_BACKTRACE
#endif

uClibc unconditionally defines __UCLIBC__ and defines __UCLIBC_HAS_BACKTRACE__ if it has backtrace support, so we could simply stick something like this below:

/* uClibc pretends to be glibc but may not have backtrace support */ #if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_BACKTRACE__) #undef HAVE_BACKTRACE
#endif

Care to send a patch doing that (and send it upstream)?

Signature · 1 line
Bye, Peter Korsgaard