[packages/squidclamav] - up to 6.16

[baggins]

commit 89c8f6e6cacecd7064f7592d71c49ccefd3b75bd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 17 00:55:54 2017 +0200

    - up to 6.16

 squidclamav-conf.patch | 42 ------------------------------------------
 squidclamav.spec       | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 50 deletions(-)
---
diff --git a/squidclamav.spec b/squidclamav.spec
index d0e7e0a..e6bdad4 100644
--- a/squidclamav.spec
+++ b/squidclamav.spec
@@ -2,14 +2,13 @@
 Summary:	A Clamav Antivirus scanner for Squid 3.x
 Summary(pl.UTF-8):	Skaner antywirusowy clamav dla Squida 3.x
 Name:		squidclamav
-Group:		Networking/Utilities
+Version:	6.16
+Release:	1
 License:	GPL v3
-Version:	6.10
-Release:	0.1
+Group:		Networking/Utilities
 Source0:	http://downloads.sourceforge.net/squidclamav/%{name}-%{version}.tar.gz
-# Source0-md5:	a26f3dccb425f046a8002befe242c2a1
+# Source0-md5:	d5c2e588b4162ed873aa678a47a65f0b
 Patch0:		%{name}-build.patch
-Patch1:		%{name}-conf.patch
 URL:		http://squidclamav.darold.net/
 BuildRequires:	c-icap-devel
 Requires:	c-icap
@@ -24,13 +23,14 @@ Skaner antywirusowy clamav dla Squida 3.x.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-%configure
 %{__automake}
+%configure
+
 %{__make}
 
 %install
@@ -46,6 +46,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog INSTALL README
 %attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/c-icap/squidclamav.conf
+%{_sysconfdir}/c-icap/squidclamav.conf.default
 %attr(755,root,root) %{_libdir}/c_icap/squidclamav.so
 %attr(755,root,root) %{_libdir}/squidclamav
-%{_mandir}/man1/squidclamav.1.gz
+%{_datadir}/c_icap/templates/squidclamav
+%{_mandir}/man1/squidclamav.1*
diff --git a/squidclamav-conf.patch b/squidclamav-conf.patch
deleted file mode 100644
index c8a2b94..0000000
--- a/squidclamav-conf.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur squidclamav-6.2.orig//etc/Makefile.am squidclamav-6.2.mod//etc/Makefile.am
---- squidclamav-6.2.orig//etc/Makefile.am	2010-02-19 17:40:28.000000000 +0100
-+++ squidclamav-6.2.mod//etc/Makefile.am	2011-03-21 12:44:04.244275635 +0100
-@@ -1,5 +1,5 @@
- EXTRA_DIST = squidclamav.conf
--CFGINST = @CFGDIR@
-+CFGINST = @CONFDIR@
- 
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
-diff -ur squidclamav-6.2.orig//etc/squidclamav.conf squidclamav-6.2.mod//etc/squidclamav.conf
---- squidclamav-6.2.orig//etc/squidclamav.conf	2011-02-27 11:32:12.000000000 +0100
-+++ squidclamav-6.2.mod//etc/squidclamav.conf	2011-03-21 12:45:48.662389568 +0100
-@@ -17,13 +17,13 @@
- redirect http://proxy.domain.dom/cgi-bin/clwarn.cgi
- 
- # Path to the squiGuard binary if you want URL filtering
--#squidguard /usr/local/squidGuard/bin/squidGuard
-+#squidguard /usr/bin/squidGuard
- 
- # Path to the clamd socket, use clamd_local if you use Unix socket or if clamd
- # is listening on an Inet socket, comment clamd_local and set the clamd_ip and
- # clamd_port to the corresponding value.
--clamd_local /tmp/clamd
--#clamd_ip 192.168.1.5,127.0.0.1
-+clamd_local /var/lib/clamav/clamd.socket
-+#clamd_ip 127.0.0.1
- #clamd_port 3310
- 
- # Set the timeout for clamd connection. Default is 1 second, this is a good
-diff -ur squidclamav-6.2.orig//src/squidclamav.h squidclamav-6.2.mod//src/squidclamav.h
---- squidclamav-6.2.orig//src/squidclamav.h	2010-10-21 23:23:47.000000000 +0200
-+++ squidclamav-6.2.mod//src/squidclamav.h	2011-03-21 12:44:15.448121918 +0100
-@@ -42,7 +42,7 @@
- 
- /* squidclamav.h */
- /*************  Default configuration file location  ***********/
--#define CONFIG_FILE "/etc/squidclamav.conf"
-+#define CONFIG_FILE "/etc/c-icap/squidclamav.conf"
- 
- /************* Proxy configuration *************/
- #define PROXY_SERVER "127.0.0.1"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/squidclamav.git/commitdiff/89c8f6e6cacecd7064f7592d71c49ccefd3b75bd