[packages/clamav] - added workaround for broken OpenSSL detection - added missing R: and file - rel. 1

[kiesiu]

commit d03f44faa7f6a85376f162d5e4d72405fb7f21c1
Author: Łukasz Kieś <kiesiu at pld-linux.org>
Date:   Fri May 9 14:29:57 2014 +0200

    - added workaround for broken OpenSSL detection
    - added missing R: and file
    - rel. 1

 clamav-openssl.patch | 18 ++++++++++++++++++
 clamav.spec          |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/clamav.spec b/clamav.spec
index 332efad..fbab9d5 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -14,7 +14,7 @@ Summary:	An anti-virus utility for Unix
 Summary(pl.UTF-8):	Narzędzie antywirusowe dla Uniksów
 Name:		clamav
 Version:	0.98.3
-Release:	0.1
+Release:	1
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz
@@ -34,6 +34,7 @@ Patch1:		%{name}-nolibs.patch
 Patch2:		am-nosilentrules.patch
 %endif
 Patch3:		ac2.68.patch
+Patch4:		%{name}-openssl.patch
 URL:		http://www.clamav.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -138,7 +139,9 @@ Summary(pl.UTF-8):	clamav - Pliki nagłówkowe i biblioteki dla programistów
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	bzip2-devel
+Requires:	curl-devel
 Requires:	gmp-devel
+Requires:	openssl-devel
 Requires:	zlib-devel
 
 %description devel
@@ -169,6 +172,7 @@ Biblioteki statyczne clamav.
 %patch2 -p1
 %endif
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -322,6 +326,7 @@ fi
 %attr(755,root,root) %{_bindir}/clamdscan
 %attr(755,root,root) %{_bindir}/clamdtop
 %attr(755,root,root) %{_bindir}/clamscan
+%attr(755,root,root) %{_bindir}/clamsubmit
 %attr(755,root,root) %{_bindir}/freshclam
 %attr(755,root,root) %{_bindir}/sigtool
 %attr(755,root,root) %{_bindir}/clamconf
diff --git a/clamav-openssl.patch b/clamav-openssl.patch
new file mode 100644
index 0000000..dd8de6e
--- /dev/null
+++ b/clamav-openssl.patch
@@ -0,0 +1,18 @@
+diff -uNr clamav-0.98.3/m4/reorganization/libs/openssl.m4 clamav-0.98.3-openssl/m4/reorganization/libs/openssl.m4
+--- clamav-0.98.3/m4/reorganization/libs/openssl.m4	2014-05-06 20:39:56.000000000 +0200
++++ clamav-0.98.3-openssl/m4/reorganization/libs/openssl.m4	2014-05-09 13:51:47.581181238 +0200
+@@ -22,12 +22,12 @@
+     AC_MSG_ERROR([OpenSSL not found.])
+ fi
+ 
+-SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
++SSL_LDFLAGS=""
+ SSL_LIBS="-lssl -lcrypto"
+ SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
+ 
+ save_LDFLAGS="$LDFLAGS"
+-LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
++LDFLAGS="$SSL_LDFLAGS $SSL_LIBS"
+ 
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$SSL_CPPFLAGS"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clamav.git/commitdiff/d03f44faa7f6a85376f162d5e4d72405fb7f21c1