From cdff44452dfd4e49655c62f07b282af35db2c8ec Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 30 Sep 2018 17:39:49 +0200 Subject: [PATCH] www/c-icap: sync with upstream Taken from: HardenedBSD --- www/c-icap/Makefile | 3 ++- www/c-icap/distinfo | 2 +- www/c-icap/files/patch-c-icap.conf.in | 24 ++++++++-------------- www/c-icap/files/patch-modules_memcached.c | 4 ++-- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index 17d45603d4f..3cd81005444 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -17,11 +17,12 @@ 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 diff --git a/www/c-icap/distinfo b/www/c-icap/distinfo index c97f3907bd8..6ab91441702 100644 --- a/www/c-icap/distinfo +++ b/www/c-icap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537381523 +TIMESTAMP = 1537896280 SHA256 (c_icap-0.5.5.tar.gz) = 5eafc7775ecb3fe49545451eaa31f045716d0242977588c0ba27c2c1b4683d8a SIZE (c_icap-0.5.5.tar.gz) = 690954 diff --git a/www/c-icap/files/patch-c-icap.conf.in b/www/c-icap/files/patch-c-icap.conf.in index baeb5d8d8fe..1e795e66eca 100644 --- a/www/c-icap/files/patch-c-icap.conf.in +++ b/www/c-icap/files/patch-c-icap.conf.in @@ -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|...] diff --git a/www/c-icap/files/patch-modules_memcached.c b/www/c-icap/files/patch-modules_memcached.c index 56f0d7ed50d..3fd1844c9b2 100644 --- a/www/c-icap/files/patch-modules_memcached.c +++ b/www/c-icap/files/patch-modules_memcached.c @@ -1,4 +1,4 @@ ---- 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 @@ -8,4 +8,4 @@ +/* #include */ int USE_MD5_SUM_KEYS = 1; - +