Fix build warnings. Add docker build

.gitignore

@@ -0,0 +1 @@
+.cache

CONTRIBUTORS

@@ -2,4 +2,5 @@ Christos Tsantilas
 Alexandros Tsantilas : has wrote some of the parsers used by c-icap
 Tofig Suleymanov: Implemented the ListenAddress configuration option
 Alfred Klomp, Bokxing IT: bug fixes
-Trever L. Adams: Implement txtTemplates
+Trever L. Adams: txtTemplates, bzip,gzip/deflate encoding routings
+Jeffrey Merkey: brotli compression/decompression support

COPYING

@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an

Dockerfile.c-icap

@@ -0,0 +1,59 @@
+ARG DEPS_IMAGE=deps_cache
+
+################################################################################
+# Dependencies Stage
+################################################################################
+FROM alpine:3.15 as deps_cache
+
+ARG builddeps=" \
+    autoconf \
+    automake \
+    bzip2 \
+    g++ \
+    gcc \
+    libtool \
+    make \
+    tar \
+    zlib \
+    zlib-dev \
+    "
+
+ARG deps=" \
+    bzip2-dev \
+    dumb-init \
+    "
+
+RUN apk --update --no-cache add ${deps} && \
+    apk --update --no-cache add --virtual build-deps ${builddeps}
+
+################################################################################
+# Building Stage
+################################################################################
+# Build a docker image for meta's censor c-icap
+FROM ${DEPS_IMAGE} AS builder
+
+ARG TEMP=/tmp/install
+ARG C_ICAP_DIR=/opt/c-icap
+
+WORKDIR /
+
+ADD . /build_icap
+
+RUN mkdir -p /var/log/c-icap/ && \
+    mkdir -p ${TEMP} && \
+    cp -r /build_icap ${TEMP} && \
+    cd ${TEMP}/build_icap && \
+    echo "unversioned" > VERSION.m4 && \
+    autoreconf -i && \
+    ./configure --quiet --prefix=${C_ICAP_DIR} --enable-large-files && \
+    make -j$(awk '/^processor/{n+=1}END{print n}' /proc/cpuinfo) && \
+    make install && \
+    make clean && \
+    make distclean && \
+    cd - && \
+    rm -rf ${TEMP} && \
+    apk del --purge build-deps && \
+    addgroup -S c-icap && adduser -S c-icap -G c-icap && \
+    chown -R c-icap:c-icap ${C_ICAP_DIR} /var/log/c-icap /var/run/c-icap
+
+USER c-icap

Makefile

@@ -0,0 +1,31 @@
+DOCKERFILE=Dockerfile.c-icap
+TAG=c-icap
+CACHE=.cache
+DEPS_IMAGE=$(TAG):deps_cache
+
+.PHONY: build
+
+all: build
+
+clean:
+	@rm -f $(CACHE)
+
+$(CACHE):
+	DOCKER_BUILDKIT=1 docker build -f $(DOCKERFILE) -t $(DEPS_IMAGE) --target=deps_cache .
+	@touch $(CACHE)
+
+.PHONY: verify_cache_integrity
+verify_cache_integrity:
+	@docker image inspect $(DEPS_IMAGE) > /dev/null 2>&1 || rm -f $(CACHE)
+
+build: verify_cache_integrity $(CACHE)
+	@DOCKER_BUILDKIT=1 docker build -t $(TAG) -f $(DOCKERFILE) \
+		--build-arg DEPS_IMAGE=$(DEPS_IMAGE) \
+		--target=builder .
+	@docker tag $(TAG) $(TAG):latest
+
+verify_clean:
+	@git diff-index --quiet HEAD || (echo "git repo must be clean!" && exit 1)
+
+run:
+	@docker run --rm $(TAG)

Makefile.am

@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+top_builddir=@top_builddir@
 
 CONFIGDIR=@sysconfdir@
 PKGLIBDIR=@pkglibdir@
@@ -14,6 +16,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS =  . utils modules services tests docs
 
+CFLAGS += -fdiagnostics-color=always -Werror
 
 lib_LTLIBRARIES=libicapapi.la
 bin_PROGRAMS = c-icap
@@ -29,9 +32,12 @@ UTIL_LIB_SOURCES += regex.c
 endif
 UTIL_SOURCES=os/unix/proc_utils.c
 
+RPATH_FLAG=
+if USE_RPATH
+RPATH_FLAG+=-rpath @libdir@
+endif
 
-
-libicapapi_la_SOURCES=  header.c body.c decode.c simple_api.c request_common.c \
+libicapapi_la_SOURCES=  header.c body.c decode.c encode.c simple_api.c request_common.c \
                         filetype.c debug.c cfg_lib.c mem.c  service_lib.c \
                         cache.c lookup_table.c lookup_file_table.c hash.c \
 			txt_format.c stats.c types_ops.c acl.c txtTemplate.c \
@@ -45,23 +51,22 @@ c_icap_SOURCES = aserver.c request.c cfg_param.c \
 
 
 # libicapapi ......
-libicapapi_la_CFLAGS= $(INVISIBILITY_CFLAG) -Iinclude/ @ZLIB_ADD_FLAG@ @OPENSSL_ADD_FLAG@ @BZLIB_ADD_FLAG@ @PCRE_ADD_FLAG@ -DCI_BUILD_LIB
+libicapapi_la_CFLAGS= $(INVISIBILITY_CFLAG) -I$(srcdir)/include/ -Iinclude/ @ZLIB_ADD_FLAG@ @OPENSSL_ADD_FLAG@ @BZLIB_ADD_FLAG@ @BROTLI_ADD_FLAG@ @PCRE_ADD_FLAG@ -DCI_BUILD_LIB
 
-libicapapi_la_LIBADD = @ZLIB_ADD_LDADD@ @BZLIB_ADD_LDADD@ @PCRE_ADD_LDADD@ @DL_ADD_FLAG@ @THREADS_LDADD@ @OPENSSL_ADD_LDADD@
+libicapapi_la_LIBADD = @ZLIB_ADD_LDADD@ @BZLIB_ADD_LDADD@ @BROTLI_ADD_LDADD@ @PCRE_ADD_LDADD@ @DL_ADD_FLAG@ @THREADS_LDADD@ @OPENSSL_ADD_LDADD@
 libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@ @THREADS_LDFLAGS@
 
+export EXT_PROGRAMS_MKLIB = @ZLIB_LNDIR_LDADD@ @BZLIB_LNDIR_LDADD@ @BROTLI_LNDIR_LDADD@ @PCRE_LNDIR_LDADD@ @OPENSSL_LNDIR_LDADD@
 
-#c_icap the main server 
+#c_icap the main server
 c_icap_DEPENDENCIES=libicapapi.la
-c_icap_CFLAGS= $(INVISIBILITY_CFLAG) -Iinclude/  \
+c_icap_CFLAGS= $(INVISIBILITY_CFLAG) -I$(top_srcdir)/include/ -I$(top_builddir)/include/ \
                         -DCONFDIR=\"$(CONFIGDIR)\" -DMODSDIR=\"$(MODULESDIR)\" \
                         -DSERVDIR=\"$(SERVICESDIR)\" -DLOGDIR=\"$(LOGDIR)\"  \
                         -DDATADIR=\"$(DATADIR)\" @OPENSSL_ADD_FLAG@
 
-c_icap_LDADD = libicapapi.la @DL_ADD_FLAG@ @THREADS_LDADD@ @OPENSSL_ADD_LDADD@
-c_icap_LDFLAGS = -rdynamic -rpath @libdir@ @THREADS_LDFLAGS@
-
-EXT_PROGRAMS_MKLIB = -licapapi
+c_icap_LDADD = libicapapi.la @DL_ADD_FLAG@ @THREADS_LDADD@ $(EXT_PROGRAMS_MKLIB)
+c_icap_LDFLAGS = -rdynamic $(RPATH_FLAG) @THREADS_LDFLAGS@
 
 
 INCS = access.h body.h cfg_param.h c-icap-conf.h c-icap.h ci_threads.h \
@@ -93,30 +98,30 @@ do_subst=sed -e 's%[@]SYSCONFDIR[@]%$(CONFIGDIR)%g' \
 
 CLEANFILES = c-icap-config c-icap-libicapapi-config
 
-# The c-icap.conf, c-icap-config, and c-icap-libicapapi-config must rebuild 
+# The c-icap.conf, c-icap-config, and c-icap-libicapapi-config must rebuild
 # on every new configure run. The include/c-icap-conf.h is rebuild when
 # configure runs so it is a good test.
 c-icap.conf: c-icap.conf.in include/c-icap-conf.h
-	$(do_subst) < c-icap.conf.in > $@
+	$(do_subst) < $(srcdir)/c-icap.conf.in > $@
 
 c-icap-config: c-icap-config.in include/c-icap-conf.h
-	$(do_subst) < c-icap-config.in > $@
+	$(do_subst) < $(srcdir)/c-icap-config.in > $@
 	chmod 755 $@
 
 c-icap-libicapapi-config:  c-icap-libicapapi-config.in include/c-icap-conf.h
-	$(do_subst) < c-icap-libicapapi-config.in > $@
+	$(do_subst) < $(srcdir)/c-icap-libicapapi-config.in > $@
 	chmod 755 $@
 
 doc:
-	$(DOXYGEN) c-icap.dox
+	$(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
-	$(mkinstalldirs)  $(DESTDIR)$(LOGDIR); 
+	if test ! -f $(DESTDIR)$(CONFIGDIR)/c-icap.magic; then $(INSTALL) $(srcdir)/c-icap.magic $(DESTDIR)$(CONFIGDIR)/c-icap.magic; fi
+	$(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"
 	chmod 775 $(DESTDIR)$(LOGDIR)

README

@@ -1,44 +1,23 @@
-This is NOT a real release. Must considered just as a stable snapshot 
-from cvs repository. Read the INSTALL.txt file and web pages at 
-http://c-icap.sourceforge.net/ for information about how to configure.
+The c-icap server                         http://c-icap.sourceforge.net/
 
-COMMENTS:
-*c-icap is more tested in Linux systems. However compiles and runs at least 
-in FreeBSD 6.x and possibly in other platforms. At regular times I am 
-testing it also in solaris 10. I was not able to check this release due 
-to a problem in my solaris machine. I will do it soon...
+c-icap is an implementation of an ICAP server. It can be used with HTTP
+proxies that support the ICAP protocol to implement content adaptation
+and filtering services.
 
-*ipv6 support for Linux and Solaris looks that works OK but it is not 
-enough tested.
+Most of the commercial HTTP proxies must support the ICAP protocol. The
+open source Squid proxy server supports it.
 
-*Although I was able to compile c-icap with IPv6 support in FreeBSD 5.x-6.x
-it was not possible for me to make it to work. Maybe becouse of bugs in 
-implementation maybe becouse of my inability to correctly setup the ipv6
-in FreeBSD.
+Major features:
+  - ICAP over TLS support
+  - C API for developing custom content adaptation and filtering services
+  - plugins interface
+  - LDAP integration
+  - simple ICAP client API
 
-NEW FEATURES:
-* ServiceAlias: They are useful in the case the icap client has hardcoded 
-the service name. As an example in the default config  file there is the 
-avscan service alias which can used by samba vscan-icap module.
-
-* You can send commands to the c-icap server from command line using the 
-following syndax:
-   echo -n command_name  > /var/run/c-icap.ctl
-Currently the following commands are implemented:
-  "stop":        The c-icap will shutdown
-  "reconfigure": The service will reread the config file without the need 
-	         for stop and restart the c-icap server. The services will
-		 be reinitialized
-  "relog":       This command causes c_icap to close and reopen the log files.
-                 This is very useful for log rotation if you have services that
-                 take a long time to start, such as srv_classify can.
-  "srv_clamav:dbreload"
-	       : It reloads the clamav virus database
-
-Examples:
- - To reconfigure c-icap:
-      echo -n "reconfigure" > /var/run/c-icap.ctl
- - To close and reopen all log files (for log rotation, etc.)
-      echo -n "relog" > /var/run/c-icap.ctl
- - To reload clamav virusdb without stoping the c-icap:
-      echo -n "srv_clamav:dbreload" > /var/run/c-icap.ctl
+For support, use the following resources:
+ - General discussion related to c-icap server:
+   [email protected]
+ - Basic installation and configuration instructions:
+   https://sourceforge.net/p/c-icap/wiki/configcicap/
+ - c-icap service developers should start from here:
+   https://sourceforge.net/p/c-icap/wiki/Developers/

RECONF

@@ -1,5 +1,5 @@
 echo trunk-`svnversion | cut -d ':' -f 2` > VERSION.m4
-autoreconf -f -i -v  
+autoreconf -f -i -v
 #aclocal
 #autoconf
 ##autoheader

access.c

@@ -91,9 +91,9 @@ int access_check_request(ci_request_t * req)
 
     res = check_request(req);
 
-    ci_debug_printf(9,"Access control: %s\n", (res==CI_ACCESS_ALLOW?
+    ci_debug_printf(9,"Access control: %s\n", (res == CI_ACCESS_ALLOW?
                     "ALLOW":
-                    (res==CI_ACCESS_DENY?"DENY":"UNKNOWN")));
+                    (res == CI_ACCESS_DENY?"DENY":"UNKNOWN")));
     return res;
 }