pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/c-icap c-icap-0.4.4 changes:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/869cd97dfafe
branches:  trunk
changeset: 358166:869cd97dfafe
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Feb 06 14:14:48 2017 +0000

description:
c-icap-0.4.4 changes:
Fix c-icap.conf installation and build problems
Fix c-icap build problem when poll is disabled
Bug fix: body->unlocked can be greater than the body->readpos causing segfault
to c-icap
Handle correctly missing proxy-user header in the case the RemoteProxyUsers is
enabled
Bug fix: Unexpected error waiting for or reading events in control socket!
ci_client_icapfilter does not send correct eof line on zero-sized files

diffstat:

 www/c-icap/Makefile                           |    5 +-
 www/c-icap/PLIST                              |    4 +-
 www/c-icap/distinfo                           |   22 +-
 www/c-icap/patches/patch-Makefile.in          |    8 +-
 www/c-icap/patches/patch-aserver.c            |   46 ------
 www/c-icap/patches/patch-cfg__param.c         |  195 +-------------------------
 www/c-icap/patches/patch-configure            |    8 +-
 www/c-icap/patches/patch-include_cfg__param.h |   15 --
 www/c-icap/patches/patch-module.c             |  150 --------------------
 www/c-icap/patches/patch-mpmt__server.c       |  182 ------------------------
 www/c-icap/patches/patch-service.c            |   33 ----
 www/c-icap/patches/patch-winnt__server.c      |   99 -------------
 12 files changed, 28 insertions(+), 739 deletions(-)

diffs (truncated from 892 to 300 lines):

diff -r 19b2b60b4962 -r 869cd97dfafe www/c-icap/Makefile
--- a/www/c-icap/Makefile       Mon Feb 06 13:54:36 2017 +0000
+++ b/www/c-icap/Makefile       Mon Feb 06 14:14:48 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/06/08 19:24:53 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2017/02/06 14:14:48 adam Exp $
 
-DISTNAME=      c_icap-0.3.5
+DISTNAME=      c_icap-0.4.4
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=c-icap/}
 
diff -r 19b2b60b4962 -r 869cd97dfafe www/c-icap/PLIST
--- a/www/c-icap/PLIST  Mon Feb 06 13:54:36 2017 +0000
+++ b/www/c-icap/PLIST  Mon Feb 06 14:14:48 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/06/12 23:39:11 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/02/06 14:14:48 adam Exp $
 bin/c-icap
 bin/c-icap-client
 bin/c-icap-config
@@ -13,6 +13,7 @@
 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
@@ -42,6 +43,7 @@
 lib/c_icap/dnsbl_tables.la
 ${PLIST.ldap}lib/c_icap/ldap_module.la
 ${PLIST.perl}lib/c_icap/perl_handler.la
+lib/c_icap/shared_cache.la
 lib/c_icap/srv_echo.la
 lib/c_icap/srv_ex206.la
 lib/c_icap/sys_logger.la
diff -r 19b2b60b4962 -r 869cd97dfafe www/c-icap/distinfo
--- a/www/c-icap/distinfo       Mon Feb 06 13:54:36 2017 +0000
+++ b/www/c-icap/distinfo       Mon Feb 06 14:14:48 2017 +0000
@@ -1,15 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 02:46:50 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/02/06 14:14:48 adam Exp $
 
-SHA1 (c_icap-0.3.5.tar.gz) = 189db804146a5654105e8bf6791b5f6eebd5f068
-RMD160 (c_icap-0.3.5.tar.gz) = 32f4d7dbe2a6170b3858c6d05c3f3e388c1037bd
-SHA512 (c_icap-0.3.5.tar.gz) = 4de5608027930551a78d3507ae2263eb2688dc41e257c87578f39c435ed736545b9e77adcca6ac077b173472aea06675950c765ec4a4124eba296f9f9a2c8b35
-Size (c_icap-0.3.5.tar.gz) = 614388 bytes
-SHA1 (patch-Makefile.in) = 251eb502dd1a40ef45ff46f8814f12b098c01528
-SHA1 (patch-aserver.c) = cbcec895c718cb4270b1ac249b5ea0d425ed35ba
-SHA1 (patch-cfg__param.c) = 91cfa22762c9bf82eecc8d29afc9f08414124c3e
-SHA1 (patch-configure) = c1e533f47cc1a1e580337e8882b0222d966e6b30
-SHA1 (patch-include_cfg__param.h) = 02c094f42bb9b9395b1c9cbfb2bfb3715a8717b5
-SHA1 (patch-module.c) = 0b95917721340a1a78102b2b10033a0de0dfec31
-SHA1 (patch-mpmt__server.c) = d8ec64183acbd9e8b159fde4e92c92a79ab80da0
-SHA1 (patch-service.c) = ecb623c1bce5acce186a153abbb3129e8b15ccab
-SHA1 (patch-winnt__server.c) = c14bf29bf5d04bf127e1b2a22a68739144c496bd
+SHA1 (c_icap-0.4.4.tar.gz) = c2cf919215812a40053652f9501c1b8d3c40c684
+RMD160 (c_icap-0.4.4.tar.gz) = a69c5832951db9c424a3ea748d4512ec1ce313a2
+SHA512 (c_icap-0.4.4.tar.gz) = b98ddbe6da24d3a21d98e1acb72b34f65e115cf98c34a01a1ce5591975c8a8b9f59d04dd168f5111f3694ab9ff1ce303dd70e0ae5c67e90f01744146feb47f17
+Size (c_icap-0.4.4.tar.gz) = 636947 bytes
+SHA1 (patch-Makefile.in) = 103129c1bd438885290c3712c53b8e9d3cc3b1ab
+SHA1 (patch-cfg__param.c) = 005d22a2d0cc0f64b38a14477b1d21c28e361018
+SHA1 (patch-configure) = d7ed5a07c97b123a42af91df3efcd99c39a74a6b
diff -r 19b2b60b4962 -r 869cd97dfafe www/c-icap/patches/patch-Makefile.in
--- a/www/c-icap/patches/patch-Makefile.in      Mon Feb 06 13:54:36 2017 +0000
+++ b/www/c-icap/patches/patch-Makefile.in      Mon Feb 06 14:14:48 2017 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile.in,v 1.3 2015/06/12 23:39:11 taca Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2017/02/06 14:14:48 adam Exp $
 
 Handle configuration files.
 
---- Makefile.in.orig   2014-10-28 10:45:45.000000000 +0000
+--- Makefile.in.orig   2016-09-21 12:09:38.000000000 +0000
 +++ Makefile.in
-@@ -1718,11 +1718,9 @@ doc:
+@@ -1748,11 +1748,9 @@ doc:
        $(DOXYGEN) c-icap.dox
  
- install-data-local:
+ install-data-local: c-icap.conf
 -      $(mkinstalldirs) $(DESTDIR)$(CONFIGDIR);
 -      $(INSTALL) c-icap.conf $(DESTDIR)$(CONFIGDIR)/c-icap.conf.default
 -      $(INSTALL) c-icap.magic $(DESTDIR)$(CONFIGDIR)/c-icap.magic.default
diff -r 19b2b60b4962 -r 869cd97dfafe www/c-icap/patches/patch-aserver.c
--- a/www/c-icap/patches/patch-aserver.c        Mon Feb 06 13:54:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-aserver.c,v 1.2 2015/06/12 23:39:11 taca Exp $
-
-Avoid CONF name colision.
-
---- aserver.c.orig     2013-12-27 15:10:53.000000000 +0000
-+++ aserver.c
-@@ -125,9 +125,9 @@ int main(int argc, char **argv)
-      ci_txt_template_set_dir(DATADIR"templates");
-      commands_init();
- 
--     if (!(CONF.MAGIC_DB = ci_magic_db_load(CONF.magics_file))) {
-+     if (!(ci_CONF.MAGIC_DB = ci_magic_db_load(ci_CONF.magics_file))) {
-           ci_debug_printf(1, "Can not load magic file %s!!!\n",
--                          CONF.magics_file);
-+                          ci_CONF.magics_file);
-      }
-      init_conf_tables();
-      request_stats_init();
-@@ -143,22 +143,22 @@ int main(int argc, char **argv)
-      }
- 
- #if ! defined(_WIN32)
--     if (is_icap_running(CONF.PIDFILE)) {
-+     if (is_icap_running(ci_CONF.PIDFILE)) {
-           ci_debug_printf(1, "c-icap server already running!\n");
-           exit(-1);
-      }
-      if (DAEMON_MODE)
-           run_as_daemon();
--     if (!set_running_permissions(CONF.RUN_USER, CONF.RUN_GROUP))
-+     if (!set_running_permissions(ci_CONF.RUN_USER, ci_CONF.RUN_GROUP))
-           exit(-1);
--     store_pid(CONF.PIDFILE);
-+     store_pid(ci_CONF.PIDFILE);
- #endif
- 
--     if (!init_server(CONF.ADDRESS, CONF.PORT, &(CONF.PROTOCOL_FAMILY)))
-+     if (!init_server(ci_CONF.ADDRESS, ci_CONF.PORT, &(ci_CONF.PROTOCOL_FAMILY)))
-           return -1;
-      post_init_modules();
-      post_init_services();
-      start_server();
--     clear_pid(CONF.PIDFILE);
-+     clear_pid(ci_CONF.PIDFILE);
-      return 0;
- }
diff -r 19b2b60b4962 -r 869cd97dfafe www/c-icap/patches/patch-cfg__param.c
--- a/www/c-icap/patches/patch-cfg__param.c     Mon Feb 06 13:54:36 2017 +0000
+++ b/www/c-icap/patches/patch-cfg__param.c     Mon Feb 06 14:14:48 2017 +0000
@@ -1,124 +1,10 @@
-$NetBSD: patch-cfg__param.c,v 1.2 2015/06/12 23:39:11 taca Exp $
+$NetBSD: patch-cfg__param.c,v 1.3 2017/02/06 14:14:48 adam Exp $
 
-Avoid CONF name colision.
+Fix compilation.
 
---- cfg_param.c.orig   2014-10-23 09:20:46.000000000 +0000
+--- cfg_param.c.orig   2015-08-27 09:01:51.000000000 +0000
 +++ cfg_param.c
-@@ -40,7 +40,7 @@
- int ARGC;
- char **ARGV;
- 
--struct ci_server_conf CONF = {
-+struct ci_server_conf ci_CONF = {
-      NULL, /* LISTEN ADDRESS */ 1344, /*PORT*/ AF_INET,    /*SOCK_FAMILY */
- #ifdef _WIN32
-      "c:\\TEMP", /*TMPDIR*/ "c:\\TEMP\\c-icap.pid", /*PIDFILE*/ "\\\\.\\pipe\\c-icap",  /*COMMANDS_SOCKET; */
-@@ -134,34 +134,34 @@ struct sub_table {
- };
- 
- static struct ci_conf_entry conf_variables[] = {
--     {"ListenAddress", &CONF.ADDRESS, intl_cfg_set_str, NULL},
--     {"PidFile", &CONF.PIDFILE, intl_cfg_set_str, NULL},
--     {"CommandsSocket", &CONF.COMMANDS_SOCKET, intl_cfg_set_str, NULL},
-+     {"ListenAddress", &ci_CONF.ADDRESS, intl_cfg_set_str, NULL},
-+     {"PidFile", &ci_CONF.PIDFILE, intl_cfg_set_str, NULL},
-+     {"CommandsSocket", &ci_CONF.COMMANDS_SOCKET, intl_cfg_set_str, NULL},
-      {"Timeout", (void *) (&TIMEOUT), intl_cfg_set_int, NULL},
-      {"KeepAlive", NULL, NULL, NULL},
-      {"MaxKeepAliveRequests", &MAX_KEEPALIVE_REQUESTS, intl_cfg_set_int, NULL},
-      {"KeepAliveTimeout", &KEEPALIVE_TIMEOUT, intl_cfg_set_int, NULL},
--     {"StartServers", &CONF.START_SERVERS, intl_cfg_set_int, NULL},
--     {"MaxServers", &CONF.MAX_SERVERS, intl_cfg_set_int, NULL},
--     {"MinSpareThreads", &CONF.MIN_SPARE_THREADS, intl_cfg_set_int, NULL},
--     {"MaxSpareThreads", &CONF.MAX_SPARE_THREADS, intl_cfg_set_int, NULL},
--     {"ThreadsPerChild", &CONF.THREADS_PER_CHILD, intl_cfg_set_int, NULL},
-+     {"StartServers", &ci_CONF.START_SERVERS, intl_cfg_set_int, NULL},
-+     {"MaxServers", &ci_CONF.MAX_SERVERS, intl_cfg_set_int, NULL},
-+     {"MinSpareThreads", &ci_CONF.MIN_SPARE_THREADS, intl_cfg_set_int, NULL},
-+     {"MaxSpareThreads", &ci_CONF.MAX_SPARE_THREADS, intl_cfg_set_int, NULL},
-+     {"ThreadsPerChild", &ci_CONF.THREADS_PER_CHILD, intl_cfg_set_int, NULL},
-      {"MaxRequestsPerChild", &MAX_REQUESTS_PER_CHILD, intl_cfg_set_int, NULL},
-      {"MaxRequestsReallocateMem", &MAX_REQUESTS_BEFORE_REALLOCATE_MEM,
-       intl_cfg_set_int, NULL},
--     {"Port", &CONF.PORT, intl_cfg_set_int, NULL},
--     {"User", &CONF.RUN_USER, intl_cfg_set_str, NULL},
--     {"Group", &CONF.RUN_GROUP, intl_cfg_set_str, NULL},
--     {"ServerAdmin", &CONF.SERVER_ADMIN, intl_cfg_set_str, NULL},
--     {"ServerName", &CONF.SERVER_NAME, intl_cfg_set_str, NULL},
-+     {"Port", &ci_CONF.PORT, intl_cfg_set_int, NULL},
-+     {"User", &ci_CONF.RUN_USER, intl_cfg_set_str, NULL},
-+     {"Group", &ci_CONF.RUN_GROUP, intl_cfg_set_str, NULL},
-+     {"ServerAdmin", &ci_CONF.SERVER_ADMIN, intl_cfg_set_str, NULL},
-+     {"ServerName", &ci_CONF.SERVER_NAME, intl_cfg_set_str, NULL},
-      {"LoadMagicFile", NULL, cfg_load_magicfile, NULL},
-      {"Logger", &default_logger, cfg_set_logger, NULL},
-      {"ServerLog", &SERVER_LOG_FILE, intl_cfg_set_str, NULL},
-      {"AccessLog", NULL, cfg_set_accesslog, NULL},
-      {"LogFormat", NULL, cfg_set_logformat, NULL},
-      {"DebugLevel", NULL, cfg_set_debug_level, NULL},   /*Set library's debug level */
--     {"ServicesDir", &CONF.SERVICES_DIR, intl_cfg_set_str, NULL},
--     {"ModulesDir", &CONF.MODULES_DIR, intl_cfg_set_str, NULL},
-+     {"ServicesDir", &ci_CONF.SERVICES_DIR, intl_cfg_set_str, NULL},
-+     {"ModulesDir", &ci_CONF.MODULES_DIR, intl_cfg_set_str, NULL},
-      {"Service", NULL, cfg_load_service, NULL},
-      {"ServiceAlias", NULL, cfg_service_alias, NULL},
-      {"Module", NULL, cfg_load_module, NULL},
-@@ -451,7 +451,7 @@ int cfg_load_magicfile(const char *direc
-      }
- 
-      db_file = argv[0];
--     if (strcmp(CONF.magics_file, db_file) == 0) {
-+     if (strcmp(ci_CONF.magics_file, db_file) == 0) {
-          ci_debug_printf(2, "The db file %s is the same as default. Ignoring...\n", db_file); 
-          return 1;
-      }
-@@ -461,8 +461,8 @@ int cfg_load_magicfile(const char *direc
-           ci_debug_printf(1, "Can not load magic file %s!!!\n", db_file);
-           return 0;
-      }
--     if (!CONF.MAGIC_DB)
--       CONF.MAGIC_DB = ndb;
-+     if (!ci_CONF.MAGIC_DB)
-+       ci_CONF.MAGIC_DB = ndb;
- 
-      return 1;
- }
-@@ -517,24 +517,24 @@ int cfg_set_tmp_dir(const char *directiv
-           return 0;
-      }
- 
--     cfg_default_value_store(&CONF.TMPDIR, &CONF.TMPDIR, sizeof(char *));
-+     cfg_default_value_store(&ci_CONF.TMPDIR, &ci_CONF.TMPDIR, sizeof(char *));
-      len = strlen(argv[0]);
- 
--     CONF.TMPDIR = ci_cfg_alloc_mem((len + 2) * sizeof(char));
--     strcpy(CONF.TMPDIR, argv[0]);
-+     ci_CONF.TMPDIR = ci_cfg_alloc_mem((len + 2) * sizeof(char));
-+     strcpy(ci_CONF.TMPDIR, argv[0]);
- #ifdef _WIN32
--     if (CONF.TMPDIR[len] != '\\') {
--          CONF.TMPDIR[len] = '\\';
--          CONF.TMPDIR[len + 1] = '\0';
-+     if (ci_CONF.TMPDIR[len] != '\\') {
-+          ci_CONF.TMPDIR[len] = '\\';
-+          ci_CONF.TMPDIR[len + 1] = '\0';
-      }
- #else
--     if (CONF.TMPDIR[len] != '/') {
--          CONF.TMPDIR[len] = '/';
--          CONF.TMPDIR[len + 1] = '\0';
-+     if (ci_CONF.TMPDIR[len] != '/') {
-+          ci_CONF.TMPDIR[len] = '/';
-+          ci_CONF.TMPDIR[len + 1] = '\0';
-      }
- #endif
-      /*Check if tmpdir exists. If no try to build it , report an error and uses the default... */
--     CI_TMPDIR = CONF.TMPDIR;   /*Sets the library's temporary dir to .... */
-+     CI_TMPDIR = ci_CONF.TMPDIR;   /*Sets the library's temporary dir to .... */
-      ci_debug_printf(2, "Setting parameter :%s=%s\n", directive, argv[0]);
-      return 1;
- }
-@@ -675,14 +675,12 @@ int fread_line(FILE * f_conf, char *line
+@@ -699,14 +699,12 @@ int fread_line(FILE * f_conf, char *line
  struct ci_conf_entry *find_action(char *str, char **arg)
  {
       char *end, *table, *s;
@@ -135,7 +21,7 @@
            end++;
       *arg = end;
       if ((s = strchr(str, '.')) != NULL) {
-@@ -720,7 +718,7 @@ char **split_args(char *args)
+@@ -744,7 +742,7 @@ char **split_args(char *args)
            else {
                /*Support arguments in the form arg{a, b...}*/
                brkt = 0;
@@ -144,7 +30,7 @@
                      if (*end == '{') brkt = 1;
                      else if (brkt && *end == '}') brkt = 0;
                      end++;
-@@ -739,7 +737,7 @@ char **split_args(char *args)
+@@ -763,7 +761,7 @@ char **split_args(char *args)
  
            if (*end == '"')
                 end++;
@@ -153,7 +39,7 @@
                 end++;
  
       } while (*end != '\0');
-@@ -771,7 +769,7 @@ int process_line(char *orig_line)
+@@ -795,7 +793,7 @@ int process_line(char *orig_line)
       line[LINESIZE-1] = '\0';
  
       str = line;
@@ -162,70 +48,3 @@
            str++;
       if (*str == '\0' || *str == '#')   /*Empty line or comment */
            return 1;



Home | Main Index | Thread Index | Old Index