[arch-commits] Commit in clamav/trunk (PKGBUILD gcc47.patch)

[Gaetan Bisson]

    Date: Friday, June 15, 2012 @ 11:31:42
  Author: bisson
Revision: 161849

upstream update

Modified:
  clamav/trunk/PKGBUILD
Deleted:
  clamav/trunk/gcc47.patch

-------------+
 PKGBUILD    |   12 +++---------
 gcc47.patch |   51 ---------------------------------------------------
 2 files changed, 3 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-15 14:38:56 UTC (rev 161848)
+++ PKGBUILD	2012-06-15 15:31:42 UTC (rev 161849)
@@ -4,8 +4,8 @@
 # Maintainer: Gaetan Bisson <bisson at archlinux.org>
 
 pkgname=clamav
-pkgver=0.97.4
-pkgrel=3
+pkgver=0.97.5
+pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
@@ -20,16 +20,14 @@
         'service.fresh'
         'logrotate'
         'tmpfiles.d'
-        'gcc47.patch'
         'config.patch')
-sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d'
+sha1sums=('1bb317ead4a1a677a9a11a063fc35a63f22309e9'
           'c9d508c1e5972f0f849d8694c1872455fa9e74de'
           'cb116cdab49a810381a515cbcfb6a6c148547f07'
           'df522b0488f3901e491f148c9300f6bae348c605'
           'cda9a087e5593992150cb456e34c5f6f589aca82'
           '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
           'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          'db6e090d540fe96fda71bd421aa9b699f0cc497b'
           '1c8ef193919b041135115170acd6313f008de808')
 
 install=install
@@ -38,7 +36,6 @@
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	patch -p1 -i ../config.patch
-	patch -p1 -i ../gcc47.patch
 
 	./configure \
 		--prefix=/usr \
@@ -64,7 +61,4 @@
 	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
 	install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav
 	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav
-
-	# Un-distribute databases to require freshclam.
-	rm "${pkgdir}"/var/lib/clamav/*.cvd
 }

Deleted: gcc47.patch
===================================================================
--- gcc47.patch	2012-06-15 14:38:56 UTC (rev 161848)
+++ gcc47.patch	2012-06-15 15:31:42 UTC (rev 161849)
@@ -1,51 +0,0 @@
-From 8b6757e866d1480c997d5ae497e0512000d82b35 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin at clamav.net>
-Date: Mon, 14 May 2012 20:13:21 +0300
-Subject: [PATCH 1/2] Fix build with gcc-4.7
-
----
- .../c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-index 274f816..a4e7eee 100644
---- a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-+++ b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-@@ -19,6 +19,7 @@
- #include "llvm/Support/ErrorHandling.h"
- #include "llvm/System/DynamicLibrary.h"
- #include "llvm/Config/config.h"
-+#include <unistd.h>
- using namespace llvm;
- 
- // AtExitHandlers - List of functions to call when the program exits,
--- 
-1.7.2.3
-
-
-From c609c8ea0409b2882aa3e6ef4dc48c210cf2d292 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin at clamav.net>
-Date: Tue, 15 May 2012 23:36:29 +0300
-Subject: [PATCH 2/2] wrap unistd in ifdef
-
----
- .../c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-index a4e7eee..c1cd5e8 100644
---- a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-+++ b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-@@ -19,7 +19,9 @@
- #include "llvm/Support/ErrorHandling.h"
- #include "llvm/System/DynamicLibrary.h"
- #include "llvm/Config/config.h"
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
- using namespace llvm;
- 
- // AtExitHandlers - List of functions to call when the program exits,
--- 
-1.7.2.3
-