svn commit: r405200 - in head/www: c-icap c-icap-modules c-icap-modules/files c-icap/files
Martin Matuska
mm at FreeBSD.org
Sun Jan 3 23:48:45 UTC 2016
Author: mm
Date: Sun Jan 3 23:48:43 2016
New Revision: 405200
URL: https://svnweb.freebsd.org/changeset/ports/405200
Log:
Update c-icap and c-icap-modules to 0.4.2
Added:
head/www/c-icap-modules/files/patch-services_content__filtering_Makefile.in (contents, props changed)
head/www/c-icap-modules/files/patch-services_url__check_Makefile.in (contents, props changed)
head/www/c-icap-modules/files/patch-services_virus__scan_Makefile.in (contents, props changed)
Deleted:
head/www/c-icap-modules/files/patch-services__url_check__Makefile.in
head/www/c-icap-modules/files/patch-services__virus_scan__Makefile.in
head/www/c-icap/files/patch-aserver.c
head/www/c-icap/files/patch-cfg_param.c
head/www/c-icap/files/patch-include__cfg_param.h
head/www/c-icap/files/patch-module.c
head/www/c-icap/files/patch-mpmt_server.c
head/www/c-icap/files/patch-service.c
Modified:
head/www/c-icap-modules/Makefile
head/www/c-icap-modules/distinfo
head/www/c-icap-modules/pkg-plist
head/www/c-icap/Makefile
head/www/c-icap/distinfo
head/www/c-icap/pkg-plist
Modified: head/www/c-icap-modules/Makefile
==============================================================================
--- head/www/c-icap-modules/Makefile Sun Jan 3 23:37:51 2016 (r405199)
+++ head/www/c-icap-modules/Makefile Sun Jan 3 23:48:43 2016 (r405200)
@@ -2,15 +2,14 @@
# $FreeBSD$
PORTNAME= c-icap
-PORTVERSION= 0.3.2
-PORTREVISION= 5
+PORTVERSION= 0.4.2
CATEGORIES= www security
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.3.x/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.4.x/
PKGNAMESUFFIX= -modules
DISTNAME= c_icap_modules-${PORTVERSION}
MAINTAINER= mm at FreeBSD.org
-COMMENT= c-icap modules virus_scan and srv_url_check
+COMMENT= Modules for c-icap: virus_scan and srv_url_check
LICENSE= GPLv2
Modified: head/www/c-icap-modules/distinfo
==============================================================================
--- head/www/c-icap-modules/distinfo Sun Jan 3 23:37:51 2016 (r405199)
+++ head/www/c-icap-modules/distinfo Sun Jan 3 23:48:43 2016 (r405200)
@@ -1,2 +1,2 @@
-SHA256 (c_icap_modules-0.3.2.tar.gz) = e3472662687cf9fa37a496df31436924326e315920056a404f023ec5e852e239
-SIZE (c_icap_modules-0.3.2.tar.gz) = 384788
+SHA256 (c_icap_modules-0.4.2.tar.gz) = f7da6064550c842c13ffab36dd53f1427029a2e362bcf3a0375d99be469f4e29
+SIZE (c_icap_modules-0.4.2.tar.gz) = 428877
Added: head/www/c-icap-modules/files/patch-services_content__filtering_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/c-icap-modules/files/patch-services_content__filtering_Makefile.in Sun Jan 3 23:48:43 2016 (r405200)
@@ -0,0 +1,10 @@
+--- services/content_filtering/Makefile.in.orig 2016-01-03 23:26:06 UTC26:06 UTC
++++ services/content_filtering/Makefile.in
+@@ -691,7 +691,6 @@
+
+ install-data-local:
+ $(INSTALL) srv_content_filtering.conf.default $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf.default
+- if test ! -f $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf.default; then $(INSTALL) srv_content_filtering.conf.default $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf; fi
+ $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/srv_content_filtering/en
+ $(INSTALL) $(TMPLS) $(DESTDIR)$(cicapdatadir)/templates/srv_content_filtering/en/
+
Added: head/www/c-icap-modules/files/patch-services_url__check_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/c-icap-modules/files/patch-services_url__check_Makefile.in Sun Jan 3 23:48:43 2016 (r405200)
@@ -0,0 +1,10 @@
+--- services/url_check/Makefile.in.orig 2016-01-03 23:26:26 UTC
++++ services/url_check/Makefile.in
+@@ -843,7 +843,6 @@
+
+ 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
+ $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en
+ $(INSTALL) $(TMPLS) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en/
+
Added: head/www/c-icap-modules/files/patch-services_virus__scan_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/c-icap-modules/files/patch-services_virus__scan_Makefile.in Sun Jan 3 23:48:43 2016 (r405200)
@@ -0,0 +1,10 @@
+--- services/virus_scan/Makefile.in.orig 2016-01-03 23:26:16 UTC
++++ services/virus_scan/Makefile.in
+@@ -750,7 +750,6 @@
+ install-data-local:
+ for f in $(CONFS); do \
+ $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.default; \
+- if test ! -f $(DESTDIR)$(CONFIGDIR)/$$f; then $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f; fi \
+ done
+ $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/
+ for f in $(TMPLS); do $(INSTALL) $$f $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/; done
Modified: head/www/c-icap-modules/pkg-plist
==============================================================================
--- head/www/c-icap-modules/pkg-plist Sun Jan 3 23:37:51 2016 (r405199)
+++ head/www/c-icap-modules/pkg-plist Sun Jan 3 23:48:43 2016 (r405200)
@@ -4,6 +4,9 @@ etc/c-icap/clamav_mod.conf.default
@unexec if cmp -s %D/etc/c-icap/clamd_mod.conf %D/etc/c-icap/clamd_mod.conf.default; then rm -f %D/etc/c-icap/clamd_mod.conf; fi
etc/c-icap/clamd_mod.conf.default
@exec [ -f %B/clamd_mod.conf ] || cp %B/%f %B/clamd_mod.conf
+ at unexec if cmp -s %D/etc/c-icap/srv_content_filtering.conf %D/etc/c-icap/srv_content_filtering.conf.default; then rm -f %D/etc/c-icap/srv_content_filtering.conf; fi
+etc/c-icap/srv_content_filtering.conf.default
+ at exec [ -f %B/srv_url_check.conf ] || cp %B/%f %B/srv_url_check.conf
@unexec if cmp -s %D/etc/c-icap/srv_url_check.conf %D/etc/c-icap/srv_url_check.conf.default; then rm -f %D/etc/c-icap/srv_url_check.conf; fi
etc/c-icap/srv_url_check.conf.default
@exec [ -f %B/srv_url_check.conf ] || cp %B/%f %B/srv_url_check.conf
@@ -14,11 +17,14 @@ lib/c_icap/clamav_mod.a
lib/c_icap/clamav_mod.so
lib/c_icap/clamd_mod.a
lib/c_icap/clamd_mod.so
+lib/c_icap/srv_content_filtering.a
+lib/c_icap/srv_content_filtering.so
lib/c_icap/srv_url_check.a
lib/c_icap/srv_url_check.so
lib/c_icap/virus_scan.a
lib/c_icap/virus_scan.so
man/man8/c-icap-mods-sguardDB.8.gz
+%%DATADIR%%/templates/srv_content_filtering/en/BLOCK
%%DATADIR%%/templates/srv_url_check/en/DENY
%%DATADIR%%/templates/virus_scan/en/VIR_MODE_HEAD
%%DATADIR%%/templates/virus_scan/en/VIR_MODE_PROGRESS
Modified: head/www/c-icap/Makefile
==============================================================================
--- head/www/c-icap/Makefile Sun Jan 3 23:37:51 2016 (r405199)
+++ head/www/c-icap/Makefile Sun Jan 3 23:48:43 2016 (r405200)
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= c-icap
-PORTVERSION= 0.3.5
-PORTREVISION= 2
+PORTVERSION= 0.4.2
PORTEPOCH= 2
CATEGORIES= www
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.x/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.4.x/
DISTNAME= c_icap-${PORTVERSION}
MAINTAINER= mm at FreeBSD.org
Modified: head/www/c-icap/distinfo
==============================================================================
--- head/www/c-icap/distinfo Sun Jan 3 23:37:51 2016 (r405199)
+++ head/www/c-icap/distinfo Sun Jan 3 23:48:43 2016 (r405200)
@@ -1,2 +1,2 @@
-SHA256 (c_icap-0.3.5.tar.gz) = 46b97fab73dbb9e8def8e34c3f94048c92f50a5341bb85bec4f6f6349aec529a
-SIZE (c_icap-0.3.5.tar.gz) = 614388
+SHA256 (c_icap-0.4.2.tar.gz) = b138c7d7d9828d54c3307bcfe7b4917911266593832ffc26a60df9a0dfd2511e
+SIZE (c_icap-0.4.2.tar.gz) = 642379
Modified: head/www/c-icap/pkg-plist
==============================================================================
--- head/www/c-icap/pkg-plist Sun Jan 3 23:37:51 2016 (r405199)
+++ head/www/c-icap/pkg-plist Sun Jan 3 23:48:43 2016 (r405200)
@@ -14,6 +14,7 @@ include/c_icap/c-icap-conf.h
include/c_icap/c-icap.h
include/c_icap/cache.h
include/c_icap/cfg_param.h
+include/c_icap/ci_regex.h
include/c_icap/ci_threads.h
include/c_icap/commands.h
include/c_icap/debug.h
@@ -43,12 +44,13 @@ include/c_icap/util.h
lib/c_icap/dnsbl_tables.so
%%LDAP%%lib/c_icap/ldap_module.so
%%PERL%%lib/c_icap/perl_handler.so
+lib/c_icap/shared_cache.so
lib/c_icap/srv_echo.so
lib/c_icap/srv_ex206.so
lib/c_icap/sys_logger.so
lib/libicapapi.so
-lib/libicapapi.so.3
-lib/libicapapi.so.3.0.5
+lib/libicapapi.so.4
+lib/libicapapi.so.4.0.2
man/man8/c-icap-client.8.gz
man/man8/c-icap-config.8.gz
man/man8/c-icap-libicapapi-config.8.gz
More information about the svn-ports-all
mailing list