pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/c-icap
Module Name: pkgsrc
Committed By: sborrill
Date: Thu Oct 3 16:34:59 UTC 2019
Modified Files:
pkgsrc/www/c-icap: Makefile PLIST distinfo
pkgsrc/www/c-icap/patches: patch-Makefile.in patch-cfg__param.c
patch-configure
Log Message:
c-icap: update to 0.5.5
c-icap-0.5.5 changes
- c-icap may crash with a SIGBUS while using mmap to map files to memory.
- Fix multiple brotli decoding bugs
- c-icap-client does not send the ";ieof" preview termination sequence when sends zero sized files
c-icap-0.5.4 changes
- Bug fix: IPv6 address can not be used on Port configuration parameter
- Mark as deprecated the tls-method TlsPort option
- Bug fix: c-icap fails to decompress zero-sized files compressed with brotli
c-icap-0.5.2 changes
- Document the forceUnload=off option for Service/Module configuration parameter
- Bug fix: c-icap crashes when converting ci_simple_file_t to a memory object
- ci_headers_value* functions should remove spaces at the beginning of the returned value
c-icap-0.5.1 changes
The 0.5.1 release has the following new major features :
* TLS/SSL support. This feature sponsored by Ergon Informatik AG.
* A non-blocking ICAP client API. This feature sponsored by Ergon Informatik AG.
* Allow 204 response on preview handler even if the ICAP client does not support preview.
* New API functions.
Major bugs fixed:
* c-icap crashes on shutdown or on reconfigure, because of unloaded c++ dynamic libraries. The new release accepts the forceUnload=off parameter to Module and Service configuration parameters to
force c-icap to not actually unload dynamic libraries on reconfigure, or shutdown.
New configuration parameters:
* FakeAllow204
* TlsPort
* TlsPassphrase
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/c-icap/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/c-icap/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/c-icap/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/c-icap/patches/patch-Makefile.in
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/c-icap/patches/patch-cfg__param.c
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/c-icap/patches/patch-configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/c-icap/Makefile
diff -u pkgsrc/www/c-icap/Makefile:1.22 pkgsrc/www/c-icap/Makefile:1.23
--- pkgsrc/www/c-icap/Makefile:1.22 Sun Aug 11 13:24:17 2019
+++ pkgsrc/www/c-icap/Makefile Thu Oct 3 16:34:59 2019
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/10/03 16:34:59 sborrill Exp $
-DISTNAME= c_icap-0.4.4
+DISTNAME= c_icap-0.5.5
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=c-icap/}
@@ -23,12 +22,16 @@ CONF_FILES+= ${EGDIR}/c-icap.magic.defau
BUILD_DEFS+= VARBASE
-SUBST_CLASSES+= fix-path
+SUBST_CLASSES+= fix-path fix-ldap
SUBST_STAGE.fix-path= pre-configure
SUBST_MESSAGE.fix-path= Fixing paths.
SUBST_FILES.fix-path= c-icap.conf.in
SUBST_SED.fix-path= -e 's, @prefix@/var, ${VARBASE},g'
SUBST_SED.fix-path+= -e 's, /var, ${VARBASE},g'
+SUBST_STAGE.fix-ldap= post-configure
+SUBST_MESSAGE.fix-ldap= Fixing LDAP.
+SUBST_FILES.fix-ldap= modules/Makefile
+SUBST_SED.fix-ldap= -e 's,-DLDAP_DEPRECATED,,g'
.include "options.mk"
Index: pkgsrc/www/c-icap/PLIST
diff -u pkgsrc/www/c-icap/PLIST:1.4 pkgsrc/www/c-icap/PLIST:1.5
--- pkgsrc/www/c-icap/PLIST:1.4 Mon Feb 6 14:14:48 2017
+++ pkgsrc/www/c-icap/PLIST Thu Oct 3 16:34:59 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2017/02/06 14:14:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/10/03 16:34:59 sborrill Exp $
bin/c-icap
bin/c-icap-client
bin/c-icap-config
@@ -27,6 +27,8 @@ 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
Index: pkgsrc/www/c-icap/distinfo
diff -u pkgsrc/www/c-icap/distinfo:1.12 pkgsrc/www/c-icap/distinfo:1.13
--- pkgsrc/www/c-icap/distinfo:1.12 Mon May 8 09:18:31 2017
+++ pkgsrc/www/c-icap/distinfo Thu Oct 3 16:34:59 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2017/05/08 09:18:31 sborrill Exp $
+$NetBSD: distinfo,v 1.13 2019/10/03 16:34:59 sborrill Exp $
-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) = 6e2c2d8ae4204895c878e11ae7b023d6685fd66c
+SHA1 (c_icap-0.5.5.tar.gz) = 5757186185fe110fca8bd709e14633712225cfc8
+RMD160 (c_icap-0.5.5.tar.gz) = 36200e8a8ea390e38cc9006540124e2f4fca59db
+SHA512 (c_icap-0.5.5.tar.gz) = 7a24c90116df40c5a8dc29785efacba65f16557f44f6b26de7bb1bb4890e8bf017db582ccac7d82a1be4efe41d3a7f420ad27c3f012d9c1741c3fd69abd9e571
+Size (c_icap-0.5.5.tar.gz) = 690954 bytes
+SHA1 (patch-Makefile.in) = e8f3b47030f06051f392d4c343bc0c3f523320cc
+SHA1 (patch-cfg__param.c) = e25b0c8145e7bbe6eddc1f8eafbd2fa5304fdda6
+SHA1 (patch-configure) = be2393bfd2c99c92c3519c1f9492e2326f664e76
SHA1 (patch-os_unix_shared_mem.c) = 2510558df7be6cdb6169b45b0271dc47fc463095
Index: pkgsrc/www/c-icap/patches/patch-Makefile.in
diff -u pkgsrc/www/c-icap/patches/patch-Makefile.in:1.4 pkgsrc/www/c-icap/patches/patch-Makefile.in:1.5
--- pkgsrc/www/c-icap/patches/patch-Makefile.in:1.4 Mon Feb 6 14:14:48 2017
+++ pkgsrc/www/c-icap/patches/patch-Makefile.in Thu Oct 3 16:34:59 2019
@@ -1,21 +1,21 @@
-$NetBSD: patch-Makefile.in,v 1.4 2017/02/06 14:14:48 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2019/10/03 16:34:59 sborrill Exp $
Handle configuration files.
---- Makefile.in.orig 2016-09-21 12:09:38.000000000 +0000
-+++ Makefile.in
-@@ -1748,11 +1748,9 @@ doc:
- $(DOXYGEN) c-icap.dox
+--- Makefile.in.orig 2018-09-19 13:43:05.000000000 +0100
++++ Makefile.in 2019-10-03 13:23:37.000000000 +0100
+@@ -1829,11 +1829,9 @@
+ $(DOXYGEN) $(srcdir)/c-icap.dox
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
+- $(INSTALL) $(srcdir)/c-icap.magic $(DESTDIR)$(CONFIGDIR)/c-icap.magic.default
- if test ! -f $(DESTDIR)$(CONFIGDIR)/c-icap.conf; then $(INSTALL) c-icap.conf $(DESTDIR)$(CONFIGDIR)/c-icap.conf; fi
-- if test ! -f $(DESTDIR)$(CONFIGDIR)/c-icap.magic; then $(INSTALL) c-icap.magic $(DESTDIR)$(CONFIGDIR)/c-icap.magic; fi
+- if test ! -f $(DESTDIR)$(CONFIGDIR)/c-icap.magic; then $(INSTALL) $(srcdir)/c-icap.magic $(DESTDIR)$(CONFIGDIR)/c-icap.magic; fi
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/c-icap;
+ $(INSTALL) c-icap.conf $(DESTDIR)$(datadir)/c-icap/c-icap.conf.default
+ $(INSTALL) c-icap.magic $(DESTDIR)$(datadir)/c-icap/c-icap.magic.default
- $(mkinstalldirs) $(DESTDIR)$(LOGDIR);
+ $(mkinstalldirs) $(DESTDIR)$(LOGDIR);
$(mkinstalldirs) $(DESTDIR)$(SOCKDIR);
chgrp nogroup $(DESTDIR)$(LOGDIR) || echo -e "*********\nWARNING! Can not set group for the log dir $(DESTDIR)$(LOGDIR)\n*********\n"
Index: pkgsrc/www/c-icap/patches/patch-cfg__param.c
diff -u pkgsrc/www/c-icap/patches/patch-cfg__param.c:1.3 pkgsrc/www/c-icap/patches/patch-cfg__param.c:1.4
--- pkgsrc/www/c-icap/patches/patch-cfg__param.c:1.3 Mon Feb 6 14:14:48 2017
+++ pkgsrc/www/c-icap/patches/patch-cfg__param.c Thu Oct 3 16:34:59 2019
@@ -1,50 +1,47 @@
-$NetBSD: patch-cfg__param.c,v 1.3 2017/02/06 14:14:48 adam Exp $
+$NetBSD: patch-cfg__param.c,v 1.4 2019/10/03 16:34:59 sborrill Exp $
Fix compilation.
---- cfg_param.c.orig 2015-08-27 09:01:51.000000000 +0000
-+++ cfg_param.c
-@@ -699,14 +699,12 @@ int fread_line(FILE * f_conf, char *line
- struct ci_conf_entry *find_action(char *str, char **arg)
+--- cfg_param.c.orig 2018-09-13 15:15:05.000000000 +0100
++++ cfg_param.c 2019-10-03 13:26:05.000000000 +0100
+@@ -780,11 +780,11 @@
{
- char *end, *table, *s;
-- int size;
- end = str;
-- while (*end != '\0' && !isspace(*end))
-+ while (*end != '\0' && !isspace((unsigned char)*end))
- end++;
-- size = end - str;
- *end = '\0'; /*Mark the end of Variable...... */
- end++; /*... and continue.... */
-- while (*end != '\0' && isspace(*end)) /*Find the start of arguments ...... */
-+ while (*end != '\0' && isspace((unsigned char)*end)) /*Find the start of arguments ...... */
- end++;
- *arg = end;
- if ((s = strchr(str, '.')) != NULL) {
-@@ -744,7 +742,7 @@ char **split_args(char *args)
- else {
- /*Support arguments in the form arg{a, b...}*/
- brkt = 0;
-- while (*end != '\0' && (!isspace(*end) || brkt)) {
-+ while (*end != '\0' && (!isspace((unsigned char)*end) || brkt)) {
- if (*end == '{') brkt = 1;
- else if (brkt && *end == '}') brkt = 0;
- end++;
-@@ -763,7 +761,7 @@ char **split_args(char *args)
+ char *end, *table, *s;
+ end = str;
+- while (*end != '\0' && !isspace(*end))
++ while (*end != '\0' && !isspace((unsigned char)*end))
+ end++;
+ *end = '\0'; /*Mark the end of Variable...... */
+ end++; /*... and continue.... */
+- while (*end != '\0' && isspace(*end)) /*Find the start of arguments ...... */
++ while (*end != '\0' && isspace((unsigned char)*end)) /*Find the start of arguments ...... */
+ end++;
+ *arg = end;
+ if ((s = strchr(str, '.')) != NULL) {
+@@ -820,7 +820,7 @@
+ } else {
+ /*Support arguments in the form arg{a, b...}*/
+ brkt = 0;
+- while (*end != '\0' && (!isspace(*end) || brkt)) {
++ while (*end != '\0' && (!isspace((unsigned char)*end) || brkt)) {
+ if (*end == '{') brkt = 1;
+ else if (brkt && *end == '}') brkt = 0;
+ end++;
+@@ -839,7 +839,7 @@
- if (*end == '"')
- end++;
-- while (*end != '\0' && isspace(*end))
-+ while (*end != '\0' && isspace((unsigned char)*end))
- end++;
+ if (*end == '"')
+ end++;
+- while (*end != '\0' && isspace(*end))
++ while (*end != '\0' && isspace((unsigned char)*end))
+ end++;
- } while (*end != '\0');
-@@ -795,7 +793,7 @@ int process_line(char *orig_line)
- line[LINESIZE-1] = '\0';
+ } while (*end != '\0');
+@@ -871,7 +871,7 @@
+ line[LINESIZE-1] = '\0';
- str = line;
-- while (*str != '\0' && isspace(*str)) /*Eat the spaces in the begging */
-+ while (*str != '\0' && isspace((unsigned char)*str)) /*Eat the spaces in the begging */
- str++;
- if (*str == '\0' || *str == '#') /*Empty line or comment */
- return 1;
+ str = line;
+- while (*str != '\0' && isspace(*str)) /*Eat the spaces in the begging */
++ while (*str != '\0' && isspace((unsigned char)*str)) /*Eat the spaces in the begging */
+ str++;
+ if (*str == '\0' || *str == '#') /*Empty line or comment */
+ return 1;
Index: pkgsrc/www/c-icap/patches/patch-configure
diff -u pkgsrc/www/c-icap/patches/patch-configure:1.9 pkgsrc/www/c-icap/patches/patch-configure:1.10
--- pkgsrc/www/c-icap/patches/patch-configure:1.9 Mon May 8 09:18:31 2017
+++ pkgsrc/www/c-icap/patches/patch-configure Thu Oct 3 16:34:59 2019
@@ -1,36 +1,11 @@
-$NetBSD: patch-configure,v 1.9 2017/05/08 09:18:31 sborrill Exp $
+$NetBSD: patch-configure,v 1.10 2019/10/03 16:34:59 sborrill Exp $
-Detect Berkeley DB.
Link against librt on NetBSD, too.
Link-test for shm_* functions.
---- configure.orig 2016-09-21 12:09:36.000000000 +0000
-+++ configure 2017-04-24 14:23:58.000000000 +0000
-@@ -13210,12 +13210,11 @@
- OLDCFLAGS=$CFLAGS
- OLDLDFLAGS=$LDFLAGS
- OLDLIBS=$LIBS
-- LIBS="-ldb $OLDLIBS"
-- for DBVER in 54 53 52 51 50 49 48 47 46 45 44 43 42; do
-+ for DBVER in 4 5 6; do
- if test -d $libdbpath/include/db$DBVER; then
- echo -n "checking for Berleley DB under $libdbpath/include/db$DBVER and $libdbpath/lib/db$DBVER... "
- CFLAGS="-I$libdbpath/include/db$DBVER $OLDCFLAGS"
-- LDFLAGS="-L$libdbpath/lib/db$DBVER $OLDLDFLAGS"
-+ LDFLAGS="-L$libdbpath/lib -ldb$DBVER $OLDLDFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -13229,7 +13228,7 @@
-
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-- echo yes;BDB_ADD_LDADD="-L$libdbpath/lib/db$DBVER -ldb"; BDB_ADD_FLAG="-I$libdbpath/include/db$DBVER";libdb="yes";
-+ echo yes;BDB_ADD_LDADD="-L$libdbpath/lib -ldb$DBVER"; BDB_ADD_FLAG="-I$libdbpath/include/db$DBVER";libdb="yes";
- else
- libdb="no"; echo "no";
-
-@@ -14546,6 +14545,11 @@
+--- configure.orig 2018-09-19 13:43:03.000000000 +0100
++++ configure 2019-10-03 13:29:48.000000000 +0100
+@@ -16264,6 +16264,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if posix shared mem works" >&5
$as_echo_n "checking if posix shared mem works... " >&6; }
@@ -42,7 +17,7 @@ Link-test for shm_* functions.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -14566,7 +14570,7 @@
+@@ -16284,7 +16289,7 @@
return 0;
}
_ACEOF
@@ -51,12 +26,13 @@ Link-test for shm_* functions.
$as_echo "#define HAVE_POSIX_SHARED_MEM 1" >>confdefs.h
-@@ -14585,7 +14589,7 @@
+@@ -16303,7 +16308,7 @@
# Linux and solaris define the shm_open in -rt library.
# This library already included in LIBS for solaris
- case "$target_os" in
+ case "$host_os" in
- linux*)
+ linux*|netbsd*)
EXTRALIBS="$EXTRALIBS -lrt"
;;
*)
+v
\ No newline at end of file
Home |
Main Index |
Thread Index |
Old Index