diff options
author | taca <taca@pkgsrc.org> | 2015-06-12 23:40:16 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2015-06-12 23:40:16 +0000 |
commit | 67b688e1440acb3bb10c9bf4ecc1536859152ceb (patch) | |
tree | 032461c72c6e71ae5892e3b3201c7b3d1f26be4d | |
parent | d42d97a71ec982392d3f81249a44c38473287a49 (diff) | |
download | pkgsrc-67b688e1440acb3bb10c9bf4ecc1536859152ceb.tar.gz |
Update c-icap-modules to 0.3.2.
0.3.2
Changes
* Bug fix: "clamd_get_versions: parse error ..."
* Bug fix: Bug 66: decoding deflate encoded files produces huge files
0.3.1
New features
* The virus engines now loaded as external modules to c-icap. Currently the
"clamd" which uses clamd daemon and "clamav" which uses the libclamav,
engines are provided
0.2.5
* virus_scan viralator mode fixes
-rw-r--r-- | www/c-icap-modules/Makefile | 9 | ||||
-rw-r--r-- | www/c-icap-modules/PLIST | 10 | ||||
-rw-r--r-- | www/c-icap-modules/distinfo | 12 | ||||
-rw-r--r-- | www/c-icap-modules/options.mk | 5 | ||||
-rw-r--r-- | www/c-icap-modules/patches/patch-services_url_check_Makefile.in | 8 | ||||
-rw-r--r-- | www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in | 16 |
6 files changed, 35 insertions, 25 deletions
diff --git a/www/c-icap-modules/Makefile b/www/c-icap-modules/Makefile index 0e8c5571b69..2697be0073a 100644 --- a/www/c-icap-modules/Makefile +++ b/www/c-icap-modules/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2015/01/18 15:52:05 wiedi Exp $ +# $NetBSD: Makefile,v 1.7 2015/06/12 23:40:16 taca Exp $ -DISTNAME= c_icap_modules-0.2.4 +DISTNAME= c_icap_modules-0.3.2 PKGNAME= ${DISTNAME:S/_/-/g} CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=c-icap/} @@ -18,7 +18,10 @@ CONFIGURE_ARGS= --with-c-icap=${BUILDLINK_PREFIX.c-icap} EGDIR= ${PREFIX}/share/c-icap CONF_FILES= ${EGDIR}/srv_url_check.conf.default ${PKG_SYSCONFDIR}/srv_url_check.conf -INSTALLATION_DIRS= share/c-icap +INSTALLATION_DIRS= etc share/c-icap + +post-install: + ${FIND} ${DESTDIR}${PREFIX}/share/c_icap/templates -type f -exec ${CHMOD} -x {} \; .include "options.mk" diff --git a/www/c-icap-modules/PLIST b/www/c-icap-modules/PLIST index 0defd6bffa8..b650b03b648 100644 --- a/www/c-icap-modules/PLIST +++ b/www/c-icap-modules/PLIST @@ -1,10 +1,14 @@ -@comment $NetBSD: PLIST,v 1.2 2012/07/29 10:11:18 adam Exp $ -${PLIST.clamav}lib/c_icap/virus_scan.la +@comment $NetBSD: PLIST,v 1.3 2015/06/12 23:40:16 taca Exp $ bin/c-icap-mods-sguardDB +${PLIST.clamav}lib/c_icap/clamav_mod.la +${PLIST.clamav}lib/c_icap/clamd_mod.la lib/c_icap/srv_url_check.la -${PLIST.clamav}share/c-icap/virus_scan.conf.default +${PLIST.clamav}lib/c_icap/virus_scan.la man/man8/c-icap-mods-sguardDB.8 +${PLIST.clamav}share/c-icap/clamav_mod.conf.default +${PLIST.clamav}share/c-icap/clamd_mod.conf.default share/c-icap/srv_url_check.conf.default +${PLIST.clamav}share/c-icap/virus_scan.conf.default share/c_icap/templates/srv_url_check/en/DENY ${PLIST.clamav}share/c_icap/templates/virus_scan/en/VIRUS_FOUND ${PLIST.clamav}share/c_icap/templates/virus_scan/en/VIR_MODE_HEAD diff --git a/www/c-icap-modules/distinfo b/www/c-icap-modules/distinfo index 7b66997c244..84a11e98bf7 100644 --- a/www/c-icap-modules/distinfo +++ b/www/c-icap-modules/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2013/09/03 13:38:08 adam Exp $ +$NetBSD: distinfo,v 1.5 2015/06/12 23:40:16 taca Exp $ -SHA1 (c_icap_modules-0.2.4.tar.gz) = d563cdec9138366a2c044f2b452b3aa046fcaa5f -RMD160 (c_icap_modules-0.2.4.tar.gz) = 920cdf846dbb998a3da69d0e8a4c967276f7094b -Size (c_icap_modules-0.2.4.tar.gz) = 373120 bytes +SHA1 (c_icap_modules-0.3.2.tar.gz) = 98dd7b3bf40b8831e297ffa8c4e1eaf7cef57cd0 +RMD160 (c_icap_modules-0.3.2.tar.gz) = dfbce2a53e9b8d79ac7ad756cbad26881a1c6488 +Size (c_icap_modules-0.3.2.tar.gz) = 384788 bytes SHA1 (patch-configure) = f38098a56ae58ae89a5850dad176b539cf034836 -SHA1 (patch-services_url_check_Makefile.in) = 23a0660bf8060ade81f4d9654220a4ae0795811e -SHA1 (patch-services_virus_scan_Makefile.in) = 8a1ce7d863757f8851a06d621a1163d7a605b893 +SHA1 (patch-services_url_check_Makefile.in) = 9cb97ef3441ab4fb0346a96aff2b8f635c66ec11 +SHA1 (patch-services_virus_scan_Makefile.in) = 367f8de33f664447d815180f7a1e805c591198e1 diff --git a/www/c-icap-modules/options.mk b/www/c-icap-modules/options.mk index 24ee7b509db..32aba499fff 100644 --- a/www/c-icap-modules/options.mk +++ b/www/c-icap-modules/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2012/07/29 10:11:18 adam Exp $ +# $NetBSD: options.mk,v 1.3 2015/06/12 23:40:16 taca Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.c-icap PKG_SUPPORTED_OPTIONS= bdb clamav @@ -21,6 +21,9 @@ CONFIGURE_ARGS+= --without-bdb PLIST.clamav= yes CONFIGURE_ARGS+= --with-clamav CONF_FILES+= ${EGDIR}/virus_scan.conf.default ${PKG_SYSCONFDIR}/virus_scan.conf +CONF_FILES+= ${EGDIR}/clamd_mod.conf.default ${PKG_SYSCONFDIR}/clamd_mod.conf +CONF_FILES+= ${EGDIR}/clamav_mod.conf.default ${PKG_SYSCONFDIR}/clamav_mod.conf + . include "../../security/clamav/buildlink3.mk" .else CONFIGURE_ARGS+= --without-clamav diff --git a/www/c-icap-modules/patches/patch-services_url_check_Makefile.in b/www/c-icap-modules/patches/patch-services_url_check_Makefile.in index f3d40b80b39..6b213344c1b 100644 --- a/www/c-icap-modules/patches/patch-services_url_check_Makefile.in +++ b/www/c-icap-modules/patches/patch-services_url_check_Makefile.in @@ -1,16 +1,16 @@ -$NetBSD: patch-services_url_check_Makefile.in,v 1.3 2013/09/03 13:38:08 adam Exp $ +$NetBSD: patch-services_url_check_Makefile.in,v 1.4 2015/06/12 23:40:16 taca Exp $ Handle configuration files ---- services/url_check/Makefile.in.orig 2011-05-05 13:19:55.000000000 +0000 +--- services/url_check/Makefile.in.orig 2013-12-27 15:35:48.000000000 +0000 +++ services/url_check/Makefile.in -@@ -720,8 +720,7 @@ uninstall-man: uninstall-man8 +@@ -730,8 +730,7 @@ uninstall-man: uninstall-man8 $(do_subst) < $< > $@ install-data-local: - $(INSTALL) srv_url_check.conf $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf.default - if test ! -f $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf; then $(INSTALL) srv_url_check.conf $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf; fi -+ $(INSTALL) srv_url_check.conf $(DESTDIR)$(datadir)/c-icap/srv_url_check.conf.default ++ $(INSTALL) -m 0444 srv_url_check.conf $(DESTDIR)$(datadir)/c-icap/srv_url_check.conf.default $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en $(INSTALL) $(TMPLS) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en/ diff --git a/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in b/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in index 02fca805120..e3e560446f7 100644 --- a/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in +++ b/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in @@ -1,16 +1,16 @@ -$NetBSD: patch-services_virus_scan_Makefile.in,v 1.1 2012/07/29 10:12:08 adam Exp $ +$NetBSD: patch-services_virus_scan_Makefile.in,v 1.2 2015/06/12 23:40:16 taca Exp $ Handle configuration files ---- services/virus_scan/Makefile.in.orig 2012-07-29 09:31:53.000000000 +0000 +--- services/virus_scan/Makefile.in.orig 2013-12-27 15:35:48.000000000 +0000 +++ services/virus_scan/Makefile.in -@@ -586,8 +586,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB - +@@ -646,8 +646,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB install-data-local: -- $(INSTALL) virus_scan.conf $(DESTDIR)$(CONFIGDIR)/virus_scan.conf.default -- if test ! -f $(DESTDIR)$(CONFIGDIR)/virus_scan.conf; then $(INSTALL) virus_scan.conf $(DESTDIR)$(CONFIGDIR)/virus_scan.conf; fi -+ $(INSTALL) virus_scan.conf $(DESTDIR)$(datadir)/c-icap/virus_scan.conf.default + for f in $(CONFS); do \ +- $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.default; \ +- if test ! -f $(DESTDIR)$(CONFIGDIR)/$$f; then $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f; fi \ ++ $(INSTALL) -m 0444 $$f $(DESTDIR)$(datadir)/c-icap/$$f.default; \ + done $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/ for f in $(TMPLS); do $(INSTALL) $$f $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/; done - |