diff --git a/www/c-icap/modules/Makefile b/www/c-icap/modules/Makefile index 3ed67d0c461..ef62246d299 100644 --- a/www/c-icap/modules/Makefile +++ b/www/c-icap/modules/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.17 2018/02/23 19:17:51 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2018/09/24 20:54:30 sthen Exp $ MULTI_PACKAGES= -main -urlcheck COMMENT-main= libclamav-based virus scanner for c-icap COMMENT-urlcheck= basic URL filtering service for c-icap -V= 0.4.5 -REVISION= 1 +V= 0.5.2 DISTNAME= c_icap_modules-$V PKGNAME-main= c-icap-clamav-$V PKGNAME-urlcheck= c-icap-urlcheck-$V @@ -25,9 +24,9 @@ RUN_DEPENDS$i = www/c-icap/c-icap>=0.4.1 cWANTLIB= bz2 pthread z LIB_DEPENDS-main= security/clamav -WANTLIB-main= ${cWANTLIB} -WANTLIB-main+= clamav crypto iconv ltdl lzma m pcre2-8 pthread ssl \ - xml2 z +WANTLIB-main += ${cWANTLIB} +WANTLIB-main += clamav clammspack crypto iconv json-c ltdl lzma m pcre2-8 +WANTLIB-main += ssl xml2 LIB_DEPENDS-urlcheck= archivers/bzip2 \ databases/db/v4 \ diff --git a/www/c-icap/modules/distinfo b/www/c-icap/modules/distinfo index ef20c6da64a..f5adf1b27dd 100644 --- a/www/c-icap/modules/distinfo +++ b/www/c-icap/modules/distinfo @@ -1,2 +1,2 @@ -SHA256 (c_icap_modules-0.4.5.tar.gz) = UxLm8gjiGReXAItKdrowOrgEihCKFyHN5KIXrtdNZnQ= -SIZE (c_icap_modules-0.4.5.tar.gz) = 450090 +SHA256 (c_icap_modules-0.5.2.tar.gz) = ZAKQ1HooXMiDF4kPILDUMfflXHUb2Yl8Wacu1FIqx3k= +SIZE (c_icap_modules-0.5.2.tar.gz) = 451800 diff --git a/www/c-icap/modules/patches/patch-configure_ac b/www/c-icap/modules/patches/patch-configure_ac index a87b6e9b844..d715a73bbf8 100644 --- a/www/c-icap/modules/patches/patch-configure_ac +++ b/www/c-icap/modules/patches/patch-configure_ac @@ -1,9 +1,9 @@ -$OpenBSD: patch-configure_ac,v 1.1 2017/09/25 20:05:49 sthen Exp $ +$OpenBSD: patch-configure_ac,v 1.2 2018/09/24 20:54:30 sthen Exp $ Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -392,14 +392,12 @@ AC_TRY_COMPILE( +@@ -288,14 +288,12 @@ AC_TRY_COMPILE( #include ], [ @@ -17,4 +17,4 @@ Index: configure.ac - } ], AC_DEFINE(HAVE_FD_PASSING,1,[Define HAVE_FD_PASSING if sending fd through unix socket supported]) - AC_MSG_RESULT(yes), + AC_MSG_RESULT(yes), diff --git a/www/c-icap/modules/patches/patch-services_content_filtering_srv_content_filtering_c b/www/c-icap/modules/patches/patch-services_content_filtering_srv_content_filtering_c index a613b90270d..2989bdfa2b7 100644 --- a/www/c-icap/modules/patches/patch-services_content_filtering_srv_content_filtering_c +++ b/www/c-icap/modules/patches/patch-services_content_filtering_srv_content_filtering_c @@ -1,7 +1,8 @@ -$OpenBSD: patch-services_content_filtering_srv_content_filtering_c,v 1.1 2015/09/08 18:17:49 sthen Exp $ ---- services/content_filtering/srv_content_filtering.c.orig Tue Sep 8 19:07:47 2015 -+++ services/content_filtering/srv_content_filtering.c Tue Sep 8 19:08:28 2015 -@@ -248,7 +248,7 @@ int srv_content_filtering_check_preview_handler(char * +$OpenBSD: patch-services_content_filtering_srv_content_filtering_c,v 1.2 2018/09/24 20:54:30 sthen Exp $ +Index: services/content_filtering/srv_content_filtering.c +--- services/content_filtering/srv_content_filtering.c.orig ++++ services/content_filtering/srv_content_filtering.c +@@ -251,7 +251,7 @@ int srv_content_filtering_check_preview_handler(char * srv_content_filtering_data->expectedData = content_len; if (content_len > srv_content_filtering_data->maxBodyData) {