Index: head/www/c-icap/Makefile =================================================================== --- head/www/c-icap/Makefile (revision 480942) +++ head/www/c-icap/Makefile (revision 480943) @@ -1,87 +1,88 @@ # Created by: Elisey Savateev # $FreeBSD$ PORTNAME= c-icap -PORTVERSION= 0.5.3 +PORTVERSION= 0.5.5 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.5.x/ DISTNAME= c_icap-${PORTVERSION} MAINTAINER= rodrigo@FreeBSD.org COMMENT= ICAP server implementation LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libbrotlicommon.so:archivers/brotli \ libpcre.so:devel/pcre +USES= cpe libtool localbase + GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir="${PREFIX}/etc/c-icap" \ --localstatedir=/var INSTALL_TARGET= install-strip -USES= cpe libtool localbase CPE_VENDOR= c-icap_project USE_LDCONFIG= yes USE_RC_SUBR= c-icap USERS= ${CICAP_USER} GROUPS= ${CICAP_GROUP} CICAP_USER= c_icap CICAP_UID= 959 CICAP_GROUP= c_icap CICAP_GID= 959 LOG_DIR= /var/log/c-icap RUN_DIR= /var/run/c-icap PLIST_SUB= LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR} \ CICAP_USER=${CICAP_USER} CICAP_GROUP=${CICAP_GROUP} SUB_LIST= RUN_DIR=${RUN_DIR} CICAP_USER=${CICAP_USER} OPTIONS_DEFINE= BDB IPV6 LDAP PERL POSIXSEM LARGE_FILES MEMCACHE OPTIONS_SUB= yes LARGE_FILES_DESC= Enable large files support POSIXSEM_DESC= Use POSIX Semaphores instead of SYSV IPC MEMCACHE_DESC= Enable memcached IPV6_CONFIGURE_ENABLE= ipv6 LARGE_FILES_CONFIGURE_ENABLE= large-files MEMCACHE_CONFIGURE_WITH= memcached MEMCACHE_LIB_DEPENDS= libmemcached.so:databases/libmemcached LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_ON= --with-ldap=yes LDAP_CONFIGURE_OFF= --with-ldap=no PERL_USES= perl5 PERL_CONFIGURE_ON= --with-perl=${PERL} PERL_CONFIGURE_OFF= --without-perl BDB_USES= bdb BDB_CFLAGS= -I${BDB_INCLUDE_DIR} BDB_LDFLAGS= -L${BDB_LIB_DIR} BDB_CONFIGURE_ON= --with-bdb=yes BDB_CONFIGURE_OFF= --with-bdb=no post-patch: @${REINPLACE_CMD} \ -e 's|@prefix@/var/log|/var/log/c-icap|g' \ -e 's|@prefix@/etc/|@sysconfdir@/|g' \ ${WRKSRC}/c-icap.conf.in @${REINPLACE_CMD} \ -e 's|\.default|.sample|g' \ ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in post-patch-POSIXSEM-on: @${REINPLACE_CMD} \ -e 's|@SYSV_IPC@|0|g' \ ${WRKSRC}/include/c-icap-conf.h.in post-install: @${MKDIR} ${STAGEDIR}/${LOG_DIR} ${STAGEDIR}/${RUN_DIR} .include Index: head/www/c-icap/distinfo =================================================================== --- head/www/c-icap/distinfo (revision 480942) +++ head/www/c-icap/distinfo (revision 480943) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523315387 -SHA256 (c_icap-0.5.3.tar.gz) = 0238508c94a406c7a2c8a0ff9659e7ba631554eda55001b43351bb68f85121d2 -SIZE (c_icap-0.5.3.tar.gz) = 690423 +TIMESTAMP = 1537896280 +SHA256 (c_icap-0.5.5.tar.gz) = 5eafc7775ecb3fe49545451eaa31f045716d0242977588c0ba27c2c1b4683d8a +SIZE (c_icap-0.5.5.tar.gz) = 690954 Index: head/www/c-icap/files/patch-c-icap.conf.in =================================================================== --- head/www/c-icap/files/patch-c-icap.conf.in (revision 480942) +++ head/www/c-icap/files/patch-c-icap.conf.in (revision 480943) @@ -1,19 +1,11 @@ ---- c-icap.conf.in.orig 2016-03-29 09:27:15 UTC +--- c-icap.conf.in.orig 2018-09-12 13:40:37 UTC +++ c-icap.conf.in -@@ -123,6 +123,16 @@ MaxRequestsPerChild 0 +@@ -132,7 +132,7 @@ MaxRequestsPerChild 0 + # Port [::1]:1346 # Default: - # InterProcessLockingScheme file + # None +-Port 1344 ++Port 127.0.0.1:1344 -+# TAG: ListenAddress -+# Format: ListenAddress address -+# Description: -+# Network address that the c-icap server uses to listen to requests. -+# By default c-icap will bind to all available network addresses. Use -+# this directive to restrict it to specific network address. -+# Default: -+# No value -+ListenAddress 127.0.0.1 -+ - # TAG: Port - # Format: Port port - # Description: + # TAG: TlsPort + # Format: TlsPort [address:]port [tls-method=method] [cert=path_to_pem_cert] [key=path_to_pem_key] [client_ca=path_to_pem_file] [ciphers=ciph1:ciph2...] [tls_options=[!]Opt1|[!]Opt2|...] Index: head/www/c-icap/files/patch-modules_memcached.c =================================================================== --- head/www/c-icap/files/patch-modules_memcached.c (revision 480942) +++ head/www/c-icap/files/patch-modules_memcached.c (revision 480943) @@ -1,11 +1,11 @@ ---- modules/memcached.c.orig 2016-04-30 12:42:52 UTC +--- modules/memcached.c.orig 2017-10-21 06:57:48 UTC +++ modules/memcached.c @@ -47,7 +47,7 @@ #include #endif -#include +/* #include */ int USE_MD5_SUM_KEYS = 1; - + Index: head/www/c-icap/pkg-plist =================================================================== --- head/www/c-icap/pkg-plist (revision 480942) +++ head/www/c-icap/pkg-plist (revision 480943) @@ -1,64 +1,64 @@ bin/c-icap bin/c-icap-client bin/c-icap-config bin/c-icap-libicapapi-config %%BDB%%bin/c-icap-mkbdb bin/c-icap-stretch @sample etc/c-icap/c-icap.conf.sample @sample etc/c-icap/c-icap.magic.sample include/c_icap/access.h include/c_icap/acl.h include/c_icap/array.h include/c_icap/body.h 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 include/c_icap/dlib.h include/c_icap/filetype.h include/c_icap/hash.h include/c_icap/header.h include/c_icap/log.h include/c_icap/lookup_table.h include/c_icap/md5.h include/c_icap/mem.h include/c_icap/module.h include/c_icap/net_io.h include/c_icap/net_io_ssl.h include/c_icap/port.h include/c_icap/proc_mutex.h include/c_icap/proc_threads_queues.h include/c_icap/registry.h include/c_icap/request.h include/c_icap/service.h include/c_icap/shared_mem.h include/c_icap/simple_api.h include/c_icap/stats.h include/c_icap/txtTemplate.h include/c_icap/txt_format.h include/c_icap/types_ops.h 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 lib/c_icap/srv_ex206.so lib/c_icap/sys_logger.so lib/libicapapi.so lib/libicapapi.so.5 -lib/libicapapi.so.5.0.3 +lib/libicapapi.so.5.0.5 man/man8/c-icap-client.8.gz man/man8/c-icap-config.8.gz man/man8/c-icap-libicapapi-config.8.gz man/man8/c-icap-mkbdb.8.gz man/man8/c-icap-stretch.8.gz man/man8/c-icap.8.gz @dir(%%CICAP_USER%%,%%CICAP_GROUP%%,) %%RUN_DIR%% @dir(%%CICAP_USER%%,%%CICAP_GROUP%%,) %%LOG_DIR%%