Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=30e54034d5afb72851ef128b82faea70ddabcf36
commit 30e54034d5afb72851ef128b82faea70ddabcf36
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sat Jun 9 13:54:39 2012 +0200
clamav-0.97.4-2-x86_64
- add patches to fix build and to have a new --nofork cmdline switch
diff --git a/source/apps-extra/clamav/FrugalBuild
b/source/apps-extra/clamav/FrugalBuild
index 890f418..180c2dd 100644
--- a/source/apps-extra/clamav/FrugalBuild
+++ b/source/apps-extra/clamav/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=clamav
pkgver=0.97.4
-pkgrel=1
+pkgrel=2
pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX"
depends=('gmp>=5.0.1' 'bzip2' 'curl>=7.19.0')
rodepends=('shadow')
@@ -11,10 +11,12 @@ backup=(etc/{freshclam,clamd}.conf)
groups=('apps-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
-source=($source rc.clamav rc.clamav-hu.po)
+source=($source rc.clamav rc.clamav-hu.po clamav-0.95-cliopts.patch
llvm-glibc.patch)
sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d' \
'90b22c99927b56992ac05042029d2702db79a8b0' \
- '57d36966c45adfd6b3ebd10b91874194924ab2c3')
+ '57d36966c45adfd6b3ebd10b91874194924ab2c3' \
+ 'a9d3c548a23935a31f783a0aeec3373c784fd40c' \
+ '79080dd02903aa0463a1e837e8c0afaa9cf4348b')
build()
{
diff --git a/source/apps-extra/clamav/clamav-0.95-cliopts.patch
b/source/apps-extra/clamav/clamav-0.95-cliopts.patch
new file mode 100644
index 0000000..e2bb19b
--- /dev/null
+++ b/source/apps-extra/clamav/clamav-0.95-cliopts.patch
@@ -0,0 +1,13 @@
+Index: clamav-0.96.1/shared/optparser.c
+===================================================================
+--- clamav-0.96.1.orig/shared/optparser.c
++++ clamav-0.96.1/shared/optparser.c
+@@ -242,7 +242,7 @@ const struct clam_option __clam_options[
+
+ { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD,
"Stop the daemon when libclamav reports an out of memory condition.", "yes" },
+
+- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD |
OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" },
++ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD
| OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" },
+
+ { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD |
OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" },
+
diff --git a/source/apps-extra/clamav/llvm-glibc.patch
b/source/apps-extra/clamav/llvm-glibc.patch
new file mode 100644
index 0000000..67dbdd7
--- /dev/null
+++ b/source/apps-extra/clamav/llvm-glibc.patch
@@ -0,0 +1,12 @@
+Index: clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
+===================================================================
+--- clamav-0.97.3.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
++++ clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
+@@ -52,6 +52,7 @@ static void runAtExitHandlers() {
+ #include <sys/stat.h>
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+ /* stat functions are redirecting to __xstat with a version number. On x86-64
+ * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat'
+ * available as an exported symbol, so we have to add it explicitly.
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
