From b4f03ed7a81b953016f320e2f6a8dc7cb800a728 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 22 Apr 2016 20:08:04 +0000 Subject: [PATCH] update to c-icap 0.4.3 --- www/c-icap/c-icap/Makefile | 5 ++--- www/c-icap/c-icap/distinfo | 4 ++-- www/c-icap/c-icap/patches/patch-c-icap_conf_in | 15 +++------------ .../c-icap/patches/patch-docs_man_c-icap_8_in | 16 ++++++++-------- www/c-icap/modules/Makefile | 4 ++-- www/c-icap/modules/distinfo | 4 ++-- 6 files changed, 19 insertions(+), 29 deletions(-) diff --git a/www/c-icap/c-icap/Makefile b/www/c-icap/c-icap/Makefile index f25c725b595..8ce374f2d2b 100644 --- a/www/c-icap/c-icap/Makefile +++ b/www/c-icap/c-icap/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.15 2016/01/11 17:05:46 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2016/04/22 20:08:04 sthen Exp $ MULTI_PACKAGES= -main -db -ldap COMMENT-main= ICAP server for use with web proxies COMMENT-db= Berkeley DB module for c-icap COMMENT-ldap= LDAP module for c-icap -V= 0.4.2 -REVISION-main= 1 +V= 0.4.3 DISTNAME= c_icap-$V PKGNAME-main= c-icap-$V PKGNAME-db= c-icap-db-$V diff --git a/www/c-icap/c-icap/distinfo b/www/c-icap/c-icap/distinfo index 9a5fff3b343..8a62dee0c2b 100644 --- a/www/c-icap/c-icap/distinfo +++ b/www/c-icap/c-icap/distinfo @@ -1,2 +1,2 @@ -SHA256 (c_icap-0.4.2.tar.gz) = sTjH19mCjVTDMHvP57SReREmZZODL/wmpg35oN/SUR4= -SIZE (c_icap-0.4.2.tar.gz) = 642379 +SHA256 (c_icap-0.4.3.tar.gz) = xGx6t4TmI7v0vEJhcC1nCBJ+33HdIxK5dECrZu51z78= +SIZE (c_icap-0.4.3.tar.gz) = 643244 diff --git a/www/c-icap/c-icap/patches/patch-c-icap_conf_in b/www/c-icap/c-icap/patches/patch-c-icap_conf_in index a6ae80560a1..25e6ab9dcaa 100644 --- a/www/c-icap/c-icap/patches/patch-c-icap_conf_in +++ b/www/c-icap/c-icap/patches/patch-c-icap_conf_in @@ -1,15 +1,6 @@ -$OpenBSD: patch-c-icap_conf_in,v 1.6 2015/11/20 17:34:25 sthen Exp $ ---- c-icap.conf.in.orig Tue Sep 15 10:00:59 2015 -+++ c-icap.conf.in Fri Nov 20 17:32:15 2015 -@@ -268,7 +268,7 @@ TemplateDefaultLanguage en - # It can be used more than once to use multiple magic files. - # Default: - # LoadMagicFile @prefix@/etc/c-icap.magic --LoadMagicFile @prefix@/etc/c-icap.magic -+LoadMagicFile @sysconfdir@/c-icap.magic - - # TAG: RemoteProxyUsers - # Format: RemoteProxyUsers onoff +$OpenBSD: patch-c-icap_conf_in,v 1.7 2016/04/22 20:08:04 sthen Exp $ +--- c-icap.conf.in.orig Tue Mar 29 10:27:15 2016 ++++ c-icap.conf.in Fri Apr 22 20:39:55 2016 @@ -335,7 +335,7 @@ RemoteProxyUserHeaderEncoded on # Default: # No value diff --git a/www/c-icap/c-icap/patches/patch-docs_man_c-icap_8_in b/www/c-icap/c-icap/patches/patch-docs_man_c-icap_8_in index 2f516b2f0e0..1781e63631b 100644 --- a/www/c-icap/c-icap/patches/patch-docs_man_c-icap_8_in +++ b/www/c-icap/c-icap/patches/patch-docs_man_c-icap_8_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-docs_man_c-icap_8_in,v 1.2 2013/11/05 15:05:04 sthen Exp $ ---- docs/man/c-icap.8.in.orig Fri Oct 25 15:59:55 2013 -+++ docs/man/c-icap.8.in Tue Nov 5 14:58:05 2013 +$OpenBSD: patch-docs_man_c-icap_8_in,v 1.3 2016/04/22 20:08:04 sthen Exp $ +--- docs/man/c-icap.8.in.orig Tue Mar 29 10:23:59 2016 ++++ docs/man/c-icap.8.in Fri Apr 22 20:40:50 2016 @@ -36,11 +36,11 @@ The main configuration file .RS In this file defined the types of files and the groups of file types. @@ -13,18 +13,18 @@ $OpenBSD: patch-docs_man_c-icap_8_in,v 1.2 2013/11/05 15:05:04 sthen Exp $ -.I /var/run/c-icap.ctl +.I /var/run/c-icap/c-icap.ctl .RS - The commands socket. This file used to send commands to the icap server from command line. For informations about implemented commands look below in the "Implemented commands" sub-section + The commands socket. This file used to send commands to the icap server from command line. For information about implemented commands look below in the "Implemented commands" sub-section .SH NOTES @@ -65,10 +65,10 @@ Services and modules can define their own commands. .PP \fBExamples:\fR .IP "To reconfigure c-icap:" -- echo -n "reconfigure" > /var/run/c-icap.ctl -+ echo -n "reconfigure" > /var/run/c-icap/c-icap.ctl +- echo \-n "reconfigure" > /var/run/c-icap.ctl ++ echo \-n "reconfigure" > /var/run/c-icap/c-icap.ctl .IP "To rotate access log:" mv /var/log/c-icap/access.log /var/log/c-icap/access.log.1 -- echo -n "relog" > /var/run/c-icap.ctl -+ echo -n "relog" > /var/run/c-icap/c-icap.ctl +- echo \-n "relog" > /var/run/c-icap.ctl ++ echo \-n "relog" > /var/run/c-icap/c-icap.ctl .RE .SS Lookup tables Lookup tables are simple read-only databases. diff --git a/www/c-icap/modules/Makefile b/www/c-icap/modules/Makefile index f8c22d18329..9cae852b1e1 100644 --- a/www/c-icap/modules/Makefile +++ b/www/c-icap/modules/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2015/11/25 14:24:12 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2016/04/22 20:08:04 sthen Exp $ MULTI_PACKAGES= -main -urlcheck COMMENT-main= libclamav-based virus scanner for c-icap COMMENT-urlcheck= basic URL filtering service for c-icap -V= 0.4.2 +V= 0.4.3 DISTNAME= c_icap_modules-$V PKGNAME-main= c-icap-clamav-$V PKGNAME-urlcheck= c-icap-urlcheck-$V diff --git a/www/c-icap/modules/distinfo b/www/c-icap/modules/distinfo index fe2dd0abe4d..e019e4f89e0 100644 --- a/www/c-icap/modules/distinfo +++ b/www/c-icap/modules/distinfo @@ -1,2 +1,2 @@ -SHA256 (c_icap_modules-0.4.2.tar.gz) = 99pgZFUMhCwT/6s23VPxQnApouNivPOgN12ZvkafTik= -SIZE (c_icap_modules-0.4.2.tar.gz) = 428877 +SHA256 (c_icap_modules-0.4.3.tar.gz) = icCFHU/G9r33UQvBwrI64FTbJUj2gWI1bPo8pqsfbN4= +SIZE (c_icap_modules-0.4.3.tar.gz) = 428936