diff --git a/dansguardian-2.10.1.1-Do-no-check-for-clamav-version.patch b/dansguardian-2.10.1.1-Do-no-check-for-clamav-version.patch new file mode 100644 index 0000000..8eb2d00 --- /dev/null +++ b/dansguardian-2.10.1.1-Do-no-check-for-clamav-version.patch @@ -0,0 +1,27 @@ +From 93874d8f7e87276931f4b2a34acf3ebffdcfa601 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 15 Feb 2012 14:53:12 +0100 +Subject: [PATCH] Do no check for clamav version + +clamav-0.95.2 used differnent version schema (6.4.something). Now, it +versions pkg-config module according to clamav version (0.97.3). +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8a95eb3..2cdcdbc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -333,7 +333,7 @@ clamav, + CLAMAVSHM="!! Not supported on this platform !!" + else + AC_MSG_RESULT(yes) +- PKG_CHECK_MODULES([CLAMAV],[libclamav >= 4]) ++ PKG_CHECK_MODULES([CLAMAV],[libclamav]) + + AC_DEFINE([HAVE_CLAMAV],[],[Define to enable ClamAV content scanner]) + +-- +1.7.7.6 + diff --git a/dansguardian-2.10.1.1-Include-stddef.h-for-offsetof.patch b/dansguardian-2.10.1.1-Include-stddef.h-for-offsetof.patch new file mode 100644 index 0000000..5fa65f4 --- /dev/null +++ b/dansguardian-2.10.1.1-Include-stddef.h-for-offsetof.patch @@ -0,0 +1,24 @@ +From ba141213c6636584ec3c98035255dea47103a6ef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 15 Feb 2012 15:30:39 +0100 +Subject: [PATCH] Include for offsetof() + +--- + src/authplugins/ntlm.cpp | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/authplugins/ntlm.cpp b/src/authplugins/ntlm.cpp +index 8e5379b..ba90497 100644 +--- a/src/authplugins/ntlm.cpp ++++ b/src/authplugins/ntlm.cpp +@@ -30,6 +30,7 @@ + + #include + ++#include + + // DEFINES + +-- +1.7.7.6 + diff --git a/dansguardian.spec b/dansguardian.spec index 7561620..5637f21 100644 --- a/dansguardian.spec +++ b/dansguardian.spec @@ -1,6 +1,6 @@ Name: dansguardian Version: 2.10.1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Content filtering web proxy Summary(de): Contentfilter-Proxy @@ -28,10 +28,16 @@ Patch1: dansguardian-gcc44.patch Patch2: dansguardian-clamav095.patch # Fix some typos ;) (Bug #515363) Patch3: dansguardian-must-be-successful.patch +# Remove check for clamav version +Patch4: dansguardian-2.10.1.1-Do-no-check-for-clamav-version.patch +# g++-4.7 does not provide sizeof() by default +Patch5: dansguardian-2.10.1.1-Include-stddef.h-for-offsetof.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: clamav-devel pcre-devel zlib-devel BuildRequires: pkgconfig +# For Do-no-check-for-clamav-version patch +BuildRequires: autoconf Requires(pre): shadow-utils Requires(post): chkconfig Requires(preun): chkconfig @@ -74,6 +80,9 @@ lokalen Netzwerk. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +autoconf %build %configure \ @@ -193,9 +202,14 @@ fi %changelog -* Tue Feb 28 2012 Fedora Release Engineering - 2.10.1.1-7 +* Tue Feb 28 2012 Fedora Release Engineering - 2.10.1.1-8 - Rebuilt for c++ ABI breakage +* Fri Feb 10 2012 Petr Pisar - 2.10.1.1-7 +- Rebuild against PCRE 8.30 +- Do not check for clamav version +- Fix compilation with GCC 4.7 + * Fri Jan 13 2012 Fedora Release Engineering - 2.10.1.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild