From nobody Sun Oct 06 09:40:54 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLy2Z4mRFz5XZSJ; Sun, 06 Oct 2024 09:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLy2Z2V8tz4jnL; Sun, 6 Oct 2024 09:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728207654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/h5hvcPb9V8c8CK/X0qxGkd6lZIyp0wGRblpeGw2JIY=; b=rI/U6/VodCaLCLWQhgQFhGGHuiguck9lz1bH7jPnt0T6+Ycx2USigDuA9VD/7UvMtx0nQl jFIyjhcqVfFMP1/H2XFlIlGg1eBK/dZUkxemIeWLWAsszcowmuGpQR/ZpqBx3LIf7TQybM +kBBqMW0IUYGMIH0depVmCeiygRFLiDi9xSlQ5yV2DZAkAytQ53u8kZc/4ogz8Z/ouzS0r IRSwiALglNEma+4MUekqaltOEjvJkqx41MBSjOUfyXmebt/zAihxGr3vbqUdlakdqzDVk3 wef9oxqi3PlaRi5kfF86S0o8AeIbLHlY0n6vg6PCZkuXOUA5ksdvt8ubNfxV/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728207654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/h5hvcPb9V8c8CK/X0qxGkd6lZIyp0wGRblpeGw2JIY=; b=xVFAlbQa2K/qni69glvgXzhRjzYXVdDMhY7VfW3W4ibONXVdmAvKG1Pg0cfkzFnNS81tWL S56liW9CPVUVlvYDxQri29Xc2DQRAolYJnAmxEUWOS+R9PZncErJc/kb2wlpQI0lJoKjWy p/HX0OCD/UA+6e7VeRwcfyfDkmCg1m5O5drCZQ4dBl70sQvRv87xy6QAEe1EksVjBj2Qqy 7MgkC9KhS72QaWhyk4Zdh58in85+Xjqc3uvtjBipx5W4VHQ4RIxUh8auQxdy7uX+9Yl1Ik KFcMr1+DqOQwDwonHC8CM/QQBtdYVpWwRgE9kGAPbNnlurto0gr/HamZhcFAzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728207654; a=rsa-sha256; cv=none; b=hfAYgwT5i9NnS6KnwYWqyzwmYLO80HRr0GFa7Lp3QRUuNhlQ4PbMXchtLxvgQrj+H6ujTj gmWqWBmT3i/cCfcD0TziaJfnl/x+akjP4+p3Vm9rg/dryTQgD7MSkJxHkkneT/NLyJlAiA NpI79VfVXgVDb4oxtBXbE178EhZg62XPobKtChpXjtO4oHiewH010X9b+MbNOJgCBiaD1F 0nO2dFMidyVP4x4vm0q8aGrgZ1T7js6TnWdz41PZKJ9Vf/syD3uRGTH8ry5dEdb/pmHJBm AGagFAO9lcj8i5D6Mw0kpWyYa5ex3iJzpdz/+RLCX8KxrYUcC2+iBViSBVIYfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLy2Z26JBzx9X; Sun, 6 Oct 2024 09:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4969esAs096046; Sun, 6 Oct 2024 09:40:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4969esAr096042; Sun, 6 Oct 2024 09:40:54 GMT (envelope-from git) Date: Sun, 6 Oct 2024 09:40:54 GMT Message-Id: <202410060940.4969esAr096042@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: c27d2322b009 - main - www/c-icap: update to 0.6.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c27d2322b009732adbdc4211c38e1ff66dedf987 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=c27d2322b009732adbdc4211c38e1ff66dedf987 commit c27d2322b009732adbdc4211c38e1ff66dedf987 Author: Rodrigo Osorio AuthorDate: 2024-10-04 08:58:16 +0000 Commit: Rodrigo Osorio CommitDate: 2024-10-06 09:38:55 +0000 www/c-icap: update to 0.6.3 Switch c-icap server from branch 5.X to 6.X Full changelog: 0.6.2 changelog: - link c-icap server binaries with the math library - Add new records to c-icap.magic, which are required for virus scan service. 0.6.1 changelog: - Internal web server for use with services - Improved statistics and statistics API - Support histograms creation from statistic values - The pthread inter-process locking scheme - The new lmdb_tables module, to provide support for lmdb based lookup tables - Extended changes and fixes to the ldap support module - The ci_server_shared_memblob_* functions to access small memory blocks which are shared across c-icap processes. - Many fixes/improvements and new API functions. 0.6.0 changelog: - Support for lmdb based databases as an alternate to BerkeleyDB. - Improved info service to show c-icap statistics - Internal web server - The pthread inter-process locking scheme. - New development APIs: c-icap server shared memblocks, flat arrays - C-icap statistics for server and services: Time based statistics, histograms, API to retrieve statistics values, improved update operations --- UPDATING | 11 +++++++++++ www/c-icap/Makefile | 13 ++++++++----- www/c-icap/distinfo | 8 +++++--- www/c-icap/files/patch-c_icap_stretch.c | 11 +++++++++++ www/c-icap/files/patch-mpmt__server.c | 15 --------------- www/c-icap/files/patch-txt__format.c | 11 ----------- www/c-icap/pkg-plist | 13 +++++++++++-- 7 files changed, 46 insertions(+), 36 deletions(-) diff --git a/UPDATING b/UPDATING index d1d05921154e..42d09e72f139 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20241004: + AFFECTS:users of www/c-icap + AUTHOR: rodrigo@FreeBSD.org + + The c-icap server version is moving from branch 5.X to 6.X. + An in-place upgrade may require some changes in your current + configuration. + For installation instructions please refer : + https://sourceforge.net/p/c-icap/wiki/configcicap + https://sourceforge.net/p/c-icap/wiki + 20240930: AFFECTS: users of sysutils/nq AUTHOR: 0mp@FreeBSD.org diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index 737fbd3947de..63067addf0d4 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -1,10 +1,13 @@ PORTNAME= c-icap -PORTVERSION= 0.5.12 +PORTVERSION= 0.6.3 PORTEPOCH= 2 CATEGORIES= www -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.5.x/ +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.6.x/ DISTNAME= c_icap-${PORTVERSION} +PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}-server/commit/ +PATCHFILES+= aa28041.patch:-p1 # https://github.com/c-icap/c-icap-server/pull/67 + MAINTAINER= rodrigo@FreeBSD.org COMMENT= ICAP server implementation WWW= https://c-icap.sourceforge.net/ @@ -20,9 +23,9 @@ CPE_VENDOR= c-icap_project USE_LDCONFIG= yes USE_RC_SUBR= c-icap -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var \ - --sysconfdir="${PREFIX}/etc/c-icap" +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir=/var \ + --sysconfdir="${PREFIX}/etc/c-icap" GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share INSTALL_TARGET= install-strip diff --git a/www/c-icap/distinfo b/www/c-icap/distinfo index 7ce97b5be7fd..217f1e40a5ef 100644 --- a/www/c-icap/distinfo +++ b/www/c-icap/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1720627955 -SHA256 (c_icap-0.5.12.tar.gz) = 765263ddfb3eea9904e1e47c14021d29a5892904116cfb0f9b21412f3f2b92d1 -SIZE (c_icap-0.5.12.tar.gz) = 699391 +TIMESTAMP = 1728030106 +SHA256 (c_icap-0.6.3.tar.gz) = 3ead2da64f75383dd449750ad1d9d1a18957fa527957137cdf15d1335fb80e7c +SIZE (c_icap-0.6.3.tar.gz) = 812473 +SHA256 (aa28041.patch) = f6c2fe0ca011f7269b97c3773bf00fd6fb96f98aa7ebc20460306e4a00097d26 +SIZE (aa28041.patch) = 7444 diff --git a/www/c-icap/files/patch-c_icap_stretch.c b/www/c-icap/files/patch-c_icap_stretch.c new file mode 100644 index 000000000000..db7141393928 --- /dev/null +++ b/www/c-icap/files/patch-c_icap_stretch.c @@ -0,0 +1,11 @@ +--- utils/c-icap-stretch.c.orig 2024-10-04 08:22:44 UTC ++++ utils/c-icap-stretch.c +@@ -71,7 +71,7 @@ + + int pid_to_int(ci_thread_t id) + { +-#if defined(_WIN32)|| defined(__CYGWIN__) ++#if defined(_WIN32)|| defined(__CYGWIN__) || defined(__FreeBSD__) + return (int)(uintptr_t)id; + #else + return id; diff --git a/www/c-icap/files/patch-mpmt__server.c b/www/c-icap/files/patch-mpmt__server.c deleted file mode 100644 index 856677fbfe85..000000000000 --- a/www/c-icap/files/patch-mpmt__server.c +++ /dev/null @@ -1,15 +0,0 @@ -Invalid integer/pointer conversion. Already fixed upstream: -https://github.com/c-icap/c-icap-server/commit/8ef8966237865ec699ab16d208ff56edaac4ff7b - -Index: mpmt_server.c ---- mpmt_server.c.orig 2021-09-02 14:45:30 UTC -+++ mpmt_server.c -@@ -75,7 +75,7 @@ server_decl_t **threads_list = NULL; - - ci_thread_mutex_t threads_list_mtx; - server_decl_t **threads_list = NULL; --ci_thread_t listener_thread_id = -1; -+ci_thread_t listener_thread_id; - int listener_running = 0; - - ci_thread_cond_t free_server_cond; diff --git a/www/c-icap/files/patch-txt__format.c b/www/c-icap/files/patch-txt__format.c deleted file mode 100644 index 50e1c92d9569..000000000000 --- a/www/c-icap/files/patch-txt__format.c +++ /dev/null @@ -1,11 +0,0 @@ ---- txt_format.c.orig 2018-11-09 09:42:02 UTC -+++ txt_format.c -@@ -417,7 +417,7 @@ int fmt_seconds(ci_request_t *req, char *buf,int len, - { - time_t tm; - time(&tm); -- return snprintf(buf, len, "%ld", tm); -+ return snprintf(buf, len, "%" PRId64 , (uint64_t) tm); - } - - int fmt_httpclientip(ci_request_t *req, char *buf,int len, const char *param) diff --git a/www/c-icap/pkg-plist b/www/c-icap/pkg-plist index d0620eebd7b9..cd9c858fafe3 100644 --- a/www/c-icap/pkg-plist +++ b/www/c-icap/pkg-plist @@ -9,6 +9,7 @@ bin/c-icap-stretch include/c_icap/access.h include/c_icap/acl.h include/c_icap/array.h +include/c_icap/atomic.h include/c_icap/body.h include/c_icap/c-icap-conf.h include/c_icap/c-icap.h @@ -16,12 +17,16 @@ 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/ci_time.h +include/c_icap/client.h include/c_icap/commands.h include/c_icap/debug.h include/c_icap/dlib.h +include/c_icap/encoding.h include/c_icap/filetype.h include/c_icap/hash.h include/c_icap/header.h +include/c_icap/http_server.h include/c_icap/log.h include/c_icap/lookup_table.h include/c_icap/md5.h @@ -29,11 +34,14 @@ 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/openssl_support.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/request_util.h +include/c_icap/server.h include/c_icap/service.h include/c_icap/shared_mem.h include/c_icap/simple_api.h @@ -52,12 +60,13 @@ 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.12 +lib/libicapapi.so.6 +lib/libicapapi.so.6.0.3 share/man/man8/c-icap-client.8.gz share/man/man8/c-icap-config.8.gz share/man/man8/c-icap-libicapapi-config.8.gz share/man/man8/c-icap-mkbdb.8.gz +share/man/man8/c-icap-mklmdb.8.gz share/man/man8/c-icap-stretch.8.gz share/man/man8/c-icap.8.gz @dir(%%CICAP_USER%%,%%CICAP_GROUP%%,) %%RUN_DIR%%