Skip to contentSkip to conversation

package/clamav: New package

PATCH New Bernd Kuhls 2 participants 4 messages Oct 31, 2014 – Nov 1, 2014

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v4 1/2 package/clamav: New package

---
v4: fixed typo in patch #0002, removed --sysconfdir (Peter)
v3: CLAMAV_CONF_OPT -> CLAMAV_CONF_OPTS
v2: - Reworked dependencies (Thomas)
- OpenSSL and zlib are mandatory dependencies
- iconv is an optional dependency
- gettext is an optional dependency (see shared/output.c, line 72)
- Added more license files (Thomas)
- patch #0002 renamed and submitted upstream (Thomas)
- package/Config.in: respect alphabetic ordering (Thomas)
- package/clamav/Config.in: moved bool (Thomas)

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/Config.in                               |    1 +
 package/clamav/Config.in                        |   16 ++++++
 package/clamav/clamav-0001-clamdscan.patch      |   21 ++++++++
 package/clamav/clamav-0002-static-linking.patch |   58 ++++++++++++++++++++++
 package/clamav/clamav.mk                        |   60 +++++++++++++++++++++++
 5 files changed, 156 insertions(+)
 create mode 100644 package/clamav/Config.in
 create mode 100644 package/clamav/clamav-0001-clamdscan.patch
 create mode 100644 package/clamav/clamav-0002-static-linking.patch
 create mode 100644 package/clamav/clamav.mk
package/Config.in +1 -0
index 6a643b0..ee3446d 100644
@@ -941,6 +941,7 @@ endmenu
 menu "Miscellaneous"
 	source "package/aespipe/Config.in"
 	source "package/bc/Config.in"
+	source "package/clamav/Config.in"
 	source "package/collectd/Config.in"
 	source "package/empty/Config.in"
 	source "package/googlefontdirectory/Config.in"
package/clamav/Config.in new file +16 -0
new file mode 100644
index 0000000..7ec402d
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_CLAMAV
+	bool "clamav"
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	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.
+
+	  http://www.clamav.net
+
+comment "clamav needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
package/clamav/clamav-0001-clamdscan.patch new file +21 -0
new file mode 100644
index 0000000..c395ae1
@@ -0,0 +1,21 @@
+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 <[email protected]>
+
+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
package/clamav/clamav-0002-static-linking.patch new file +58 -0

58 lines not on this page · raw message

package/clamav/clamav.mk new file +60 -0

60 lines not on this page · raw message

Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH v4 2/2 package/exim: Add ClamAV support

---
v4: rebased
v3: skipped
v2: skipped

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/exim/exim.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/exim/exim.mk +8 -0
index b6fe202..77f51e3 100644
@@ -55,6 +55,13 @@ define EXIM_USE_DEFAULT_CONFIG_FILE_DOVECOT
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_CLAMAV),y)
+EXIM_DEPENDENCIES += clamav
+define EXIM_USE_DEFAULT_CONFIG_FILE_CLAMAV
+	$(call exim-config-change,WITH_CONTENT_SCAN,yes)
+endef
+endif
+
 define EXIM_CONFIGURE_TOOLCHAIN
 	$(call exim-config-add,CC,$(TARGET_CC))
 	$(call exim-config-add,CFLAGS,$(TARGET_CFLAGS))

@@ -73,6 +80,7 @@ else # CUSTOM_CONFIG
 define EXIM_CONFIGURE_CMDS
 	$(EXIM_USE_DEFAULT_CONFIG_FILE)
 	$(EXIM_USE_DEFAULT_CONFIG_FILE_DOVECOT)
+	$(EXIM_USE_DEFAULT_CONFIG_FILE_CLAMAV)
 	$(EXIM_CONFIGURE_TOOLCHAIN)
 endef
 endif # CUSTOM_CONFIG
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH v4 2/2 package/exim: Add ClamAV support

Dear Bernd Kuhls,

Quoted 6 lines · Bernd Kuhls

---
v4: rebased
v3: skipped
v2: skipped

Signed-off-by Bernd Kuhls <[email protected]>

Again, SoB line before the first "---". I fixed it on this one, but forgot on the ClamAV patch it self :/

Applied nonetheless, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Applied
#3 lore raw

PATCH v4 1/2 package/clamav: New package

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 13 lines · Bernd Kuhls

---
v4: fixed typo in patch #0002, removed --sysconfdir (Peter)
v3: CLAMAV_CONF_OPT -> CLAMAV_CONF_OPTS
v2: - Reworked dependencies (Thomas)
- OpenSSL and zlib are mandatory dependencies
- iconv is an optional dependency
- gettext is an optional dependency (see shared/output.c, line 72)
- Added more license files (Thomas)
- patch #0002 renamed and submitted upstream (Thomas)
- package/Config.in: respect alphabetic ordering (Thomas)
- package/clamav/Config.in: moved bool (Thomas)

Signed-off-by Bernd Kuhls <[email protected]>
Quoted 11 lines
---
 package/Config.in                               |    1 +
 package/clamav/Config.in                        |   16 ++++++
 package/clamav/clamav-0001-clamdscan.patch      |   21 ++++++++
 package/clamav/clamav-0002-static-linking.patch |   58 ++++++++++++++++++++++
 package/clamav/clamav.mk                        |   60 +++++++++++++++++++++++
 5 files changed, 156 insertions(+)
 create mode 100644 package/clamav/Config.in
 create mode 100644 package/clamav/clamav-0001-clamdscan.patch
 create mode 100644 package/clamav/clamav-0002-static-linking.patch
 create mode 100644 package/clamav/clamav.mk

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com