From owner-svn-ports-head@freebsd.org Sun May 1 05:03:26 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9A6CB24C4A; Sun, 1 May 2016 05:03:26 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8BD841210; Sun, 1 May 2016 05:03:26 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4153PW4012332; Sun, 1 May 2016 05:03:25 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4153Pdp012326; Sun, 1 May 2016 05:03:25 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201605010503.u4153Pdp012326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 1 May 2016 05:03:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414383 - in head/www: c-icap c-icap-modules c-icap-modules/files c-icap/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 May 2016 05:03:26 -0000 Author: pi Date: Sun May 1 05:03:25 2016 New Revision: 414383 URL: https://svnweb.freebsd.org/changeset/ports/414383 Log: www/c-icap{-modules}: 0.4.2 -> 0.4.3 c-icap-0.4.3 changes - ci_membuf_write: do not warn user about writting after eof, if not actualy someone try to write - Man pages spelling errors - Fix ModulesDir and ServicesDir default locations for some architectures - Crashes for modules if null argument passed to ci_list_first, ci_list_head and ci_list_tail macros - Fix allow204 outside preview responses - Use poll instead of select for polling network sockets and pipes - Fix core dumps inside client_parse_icap_header() c-icap-modules-0.4.3 changes - Fix content_filtering service config and template file permissions - Bug fixes in srv_content_filtering body data structures - Bug fix: The second argument of srv_content_filtering.Action never accepted Added: head/www/c-icap/files/patch-modules_memcached.c (contents, props changed) Deleted: head/www/c-icap-modules/files/patch-services_content__filtering_Makefile.in Modified: head/www/c-icap-modules/Makefile head/www/c-icap-modules/distinfo 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 May 1 04:44:14 2016 (r414382) +++ head/www/c-icap-modules/Makefile Sun May 1 05:03:25 2016 (r414383) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= c-icap -PORTVERSION= 0.4.2 -PORTREVISION= 1 +PORTVERSION= 0.4.3 CATEGORIES= www security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.4.x/ PKGNAMESUFFIX= -modules Modified: head/www/c-icap-modules/distinfo ============================================================================== --- head/www/c-icap-modules/distinfo Sun May 1 04:44:14 2016 (r414382) +++ head/www/c-icap-modules/distinfo Sun May 1 05:03:25 2016 (r414383) @@ -1,2 +1,2 @@ -SHA256 (c_icap_modules-0.4.2.tar.gz) = f7da6064550c842c13ffab36dd53f1427029a2e362bcf3a0375d99be469f4e29 -SIZE (c_icap_modules-0.4.2.tar.gz) = 428877 +SHA256 (c_icap_modules-0.4.3.tar.gz) = 89c0851d4fc6f6bdf7510bc1c2b23ae054db2548f68162356cfa3ca6ab1f6cde +SIZE (c_icap_modules-0.4.3.tar.gz) = 428936 Modified: head/www/c-icap/Makefile ============================================================================== --- head/www/c-icap/Makefile Sun May 1 04:44:14 2016 (r414382) +++ head/www/c-icap/Makefile Sun May 1 05:03:25 2016 (r414383) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= c-icap -PORTVERSION= 0.4.2 +PORTVERSION= 0.4.3 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.4.x/ @@ -20,10 +20,11 @@ CPE_VENDOR= c-icap_project USE_LDCONFIG= yes USE_RC_SUBR= c-icap -OPTIONS_DEFINE= BDB IPV6 LDAP PERL POSIXSEM LARGE_FILES +OPTIONS_DEFINE= BDB IPV6 LDAP PERL POSIXSEM LARGE_FILES MEMCACHE OPTIONS_DEFAULT= IPV6 LARGE_FILES_DESC= Enable large files support POSIXSEM_DESC= Use POSIX Semaphores instead of SYSV IPC +MEMCACHE_DESC= Enable memcached CICAP_USER= c_icap CICAP_UID= 959 @@ -54,6 +55,15 @@ CONFIGURE_ARGS+= --enable-large-files CONFIGURE_ARGS+= --disable-large-files .endif +.if ${PORT_OPTIONS:MMEMCACHE} +CONFIGURE_ARGS+= --with-memcached +BUILD_DEPENDS= memcached:databases/memcached +PLIST_SUB+= MEMCACHE="" +.else +CONFIGURE_ARGS+= --without-memcached +PLIST_SUB+= MEMCACHE="@comment " +.endif + .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= YES .endif Modified: head/www/c-icap/distinfo ============================================================================== --- head/www/c-icap/distinfo Sun May 1 04:44:14 2016 (r414382) +++ head/www/c-icap/distinfo Sun May 1 05:03:25 2016 (r414383) @@ -1,2 +1,2 @@ -SHA256 (c_icap-0.4.2.tar.gz) = b138c7d7d9828d54c3307bcfe7b4917911266593832ffc26a60df9a0dfd2511e -SIZE (c_icap-0.4.2.tar.gz) = 642379 +SHA256 (c_icap-0.4.3.tar.gz) = c46c7ab784e623bbf4bc4261702d6708127edf71dd2312b97440ab66ee75cfbf +SIZE (c_icap-0.4.3.tar.gz) = 643244 Added: head/www/c-icap/files/patch-modules_memcached.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/c-icap/files/patch-modules_memcached.c Sun May 1 05:03:25 2016 (r414383) @@ -0,0 +1,11 @@ +--- modules/memcached.c.orig 2016-04-30 12:42:52 UTC ++++ modules/memcached.c +@@ -47,7 +47,7 @@ + #include + #endif + +-#include ++/* #include */ + + int USE_MD5_SUM_KEYS = 1; + Modified: head/www/c-icap/pkg-plist ============================================================================== --- head/www/c-icap/pkg-plist Sun May 1 04:44:14 2016 (r414382) +++ head/www/c-icap/pkg-plist Sun May 1 05:03:25 2016 (r414383) @@ -43,6 +43,7 @@ include/c_icap/util.h %%BDB%%lib/c_icap/bdb_tables.so lib/c_icap/dnsbl_tables.so %%LDAP%%lib/c_icap/ldap_module.so +%%MEMCACHE%%lib/c_icap/memcached_cache.so %%PERL%%lib/c_icap/perl_handler.so lib/c_icap/shared_cache.so lib/c_icap/srv_echo.so @@ -50,7 +51,7 @@ lib/c_icap/srv_ex206.so lib/c_icap/sys_logger.so lib/libicapapi.so lib/libicapapi.so.4 -lib/libicapapi.so.4.0.2 +lib/libicapapi.so.4.0.3 man/man8/c-icap-client.8.gz man/man8/c-icap-config.8.gz man/man8/c-icap-libicapapi-config.8.gz