CVS commit: pkgsrc/www/c-icap-modules

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/c-icap-modules
From: "Stephen Borrill" <sborrill%netbsd.org@localhost>
Date: Thu, 3 Oct 2019 16:36:54 +0000

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Thu Oct  3 16:36:54 UTC 2019

Modified Files:
        pkgsrc/www/c-icap-modules: Makefile distinfo
        pkgsrc/www/c-icap-modules/patches:
            patch-services_content__filtering_Makefile.in
            patch-services_url_check_Makefile.in
            patch-services_virus_scan_Makefile.in
Removed Files:
        pkgsrc/www/c-icap-modules/patches: patch-configure

Log Message:
c-icap-modules: update to 0.5.3

c-icap-modules-0.5.3 changes
- Add support for ClamAV 0.101.x
- Bug fix: use url-decoded string as filename on viralator mode

c-icap-modules-0.5.2 changes
- virus_scan: Add the counter AV_SCAN_FAILURES to count scan engine failures
- virus_scan: fix error handling when PassOnError is set to on
- virus_scan: Report correctly the X-Violations-Found header and the virus_scan:viruses-list attribute.
- url_check: Fix misplaced space in added headers using the HttpHeaderReplace and HttpHeaderAdd* rules

c-icap-modules-0.4.5 changes
- Fixes to compile with the c-icap-0.5.x releases


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/c-icap-modules/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/c-icap-modules/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/www/c-icap-modules/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/c-icap-modules/patches/patch-services_content__filtering_Makefile.in
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/www/c-icap-modules/patches/patch-services_url_check_Makefile.in
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in

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-modules/Makefile
diff -u pkgsrc/www/c-icap-modules/Makefile:1.10 pkgsrc/www/c-icap-modules/Makefile:1.11
--- pkgsrc/www/c-icap-modules/Makefile:1.10     Mon Feb  6 14:15:18 2017
+++ pkgsrc/www/c-icap-modules/Makefile  Thu Oct  3 16:36:54 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2017/02/06 14:15:18 adam Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/03 16:36:54 sborrill Exp $
 
-DISTNAME=      c_icap_modules-0.4.4
+DISTNAME=      c_icap_modules-0.5.3
 PKGNAME=       ${DISTNAME:S/_/-/g}
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=c-icap/}

Index: pkgsrc/www/c-icap-modules/distinfo
diff -u pkgsrc/www/c-icap-modules/distinfo:1.7 pkgsrc/www/c-icap-modules/distinfo:1.8
--- pkgsrc/www/c-icap-modules/distinfo:1.7      Mon Feb  6 14:15:18 2017
+++ pkgsrc/www/c-icap-modules/distinfo  Thu Oct  3 16:36:54 2019
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.7 2017/02/06 14:15:18 adam Exp $
+$NetBSD: distinfo,v 1.8 2019/10/03 16:36:54 sborrill Exp $
 
-SHA1 (c_icap_modules-0.4.4.tar.gz) = 87cda48500107a58ada1abcb16907f7f4862ca36
-RMD160 (c_icap_modules-0.4.4.tar.gz) = 6e68ed062a59248c6ac0d21068a33dfd277f9027
-SHA512 (c_icap_modules-0.4.4.tar.gz) = 3374dff7e3275ef7da7d727d098ca7bb17b401379e9f88ac5a6e6f7475b3a0859d1d4f5ac9037d35babf5079dd0a7893c9975a005c97cbd209699b04a4a6b76b
-Size (c_icap_modules-0.4.4.tar.gz) = 429224 bytes
-SHA1 (patch-configure) = c3db6a813132d052cb07008da5caa23e8e4a7dce
-SHA1 (patch-services_content__filtering_Makefile.in) = 665d10b59f2f26be7568a6f476db0fe7e64b58e1
-SHA1 (patch-services_url_check_Makefile.in) = e9a7caa1ab388fc49b36dcd199e124f058ca8300
-SHA1 (patch-services_virus_scan_Makefile.in) = c9ebb1986d0a36151eb949546ad6ad6fabb1108f
+SHA1 (c_icap_modules-0.5.3.tar.gz) = df76f30b2cc29aeef700f477693e7017eaa847f4
+RMD160 (c_icap_modules-0.5.3.tar.gz) = 350b5dec612dbb9efc1a57792c6ed2ea6a7c8c06
+SHA512 (c_icap_modules-0.5.3.tar.gz) = 5f3bf494b3a1a0e108b6502252eba39d804bc66fae4be23dc8b19680c0a0b21e6b5f805501f6c26237ff3c81aafbd7a409bf72196813ee5c51cd27994e8b564e
+Size (c_icap_modules-0.5.3.tar.gz) = 452505 bytes
+SHA1 (patch-services_content__filtering_Makefile.in) = cf07c131df55622100106964ae06f4bd946044dc
+SHA1 (patch-services_url_check_Makefile.in) = 159f8ec62edc350086ba803cf9c51e9a8c063318
+SHA1 (patch-services_virus_scan_Makefile.in) = 2bd465cfddd34e04ea8c47fc247ff5a0066f01c6

Index: pkgsrc/www/c-icap-modules/patches/patch-services_content__filtering_Makefile.in
diff -u pkgsrc/www/c-icap-modules/patches/patch-services_content__filtering_Makefile.in:1.1 pkgsrc/www/c-icap-modules/patches/patch-services_content__filtering_Makefile.in:1.2
--- pkgsrc/www/c-icap-modules/patches/patch-services_content__filtering_Makefile.in:1.1 Mon Feb  6 14:15:18 2017
+++ pkgsrc/www/c-icap-modules/patches/patch-services_content__filtering_Makefile.in     Thu Oct  3 16:36:54 2019
@@ -1,16 +1,16 @@
-$NetBSD: patch-services_content__filtering_Makefile.in,v 1.1 2017/02/06 14:15:18 adam Exp $
+$NetBSD: patch-services_content__filtering_Makefile.in,v 1.2 2019/10/03 16:36:54 sborrill Exp $
 
 Handle configuration files.
 
---- services/content_filtering/Makefile.in.orig        2017-02-06 13:15:55.000000000 +0000
-+++ services/content_filtering/Makefile.in
-@@ -690,8 +690,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB
+--- services/content_filtering/Makefile.in.orig        2019-01-17 10:57:18.000000000 +0000
++++ services/content_filtering/Makefile.in     2019-10-03 17:20:44.000000000 +0100
+@@ -702,8 +702,7 @@
  
  
  install-data-local:
--      $(INSTALL) -m 0644 srv_content_filtering.conf.default $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf.default
--      if test ! -f $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf.default; then $(INSTALL) -m 0644 srv_content_filtering.conf.default $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf; fi
+-      $(INSTALL) -m 0644 $(srcdir)/srv_content_filtering.conf.default $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf.default
+-      if test ! -f $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf.default; then $(INSTALL) -m 0644 $(srcdir)/srv_content_filtering.conf.default $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf; 
fi
 +      $(INSTALL) -m 0644 srv_content_filtering.conf.default $(DESTDIR)$(datadir)/c-icap/srv_content_filtering.conf.default
        $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/srv_content_filtering/en
-       $(INSTALL) -m 0644 $(TMPLS) $(DESTDIR)$(cicapdatadir)/templates/srv_content_filtering/en/
+       for f in $(TMPLS); do $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(cicapdatadir)/templates/srv_content_filtering/en/; done
  

Index: pkgsrc/www/c-icap-modules/patches/patch-services_url_check_Makefile.in
diff -u pkgsrc/www/c-icap-modules/patches/patch-services_url_check_Makefile.in:1.5 pkgsrc/www/c-icap-modules/patches/patch-services_url_check_Makefile.in:1.6
--- pkgsrc/www/c-icap-modules/patches/patch-services_url_check_Makefile.in:1.5  Mon Feb  6 14:15:18 2017
+++ pkgsrc/www/c-icap-modules/patches/patch-services_url_check_Makefile.in      Thu Oct  3 16:36:54 2019
@@ -1,16 +1,16 @@
-$NetBSD: patch-services_url_check_Makefile.in,v 1.5 2017/02/06 14:15:18 adam Exp $
+$NetBSD: patch-services_url_check_Makefile.in,v 1.6 2019/10/03 16:36:54 sborrill Exp $
 
-Handle configuration files
+Handle configuration files.
 
---- services/url_check/Makefile.in.orig        2013-12-27 15:35:48.000000000 +0000
-+++ services/url_check/Makefile.in
-@@ -842,8 +842,7 @@ uninstall-man: uninstall-man8
+--- services/url_check/Makefile.in.orig        2019-01-17 10:57:18.000000000 +0000
++++ services/url_check/Makefile.in     2019-10-03 17:21:21.000000000 +0100
+@@ -854,8 +854,7 @@
        $(do_subst) < $< > $@
  
  install-data-local:
--      $(INSTALL) srv_url_check.conf $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf.default
+-      $(INSTALL) $(srcdir)/srv_url_check.conf $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf.default
 -      if test ! -f $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf; then $(INSTALL) srv_url_check.conf $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf; fi
 +      $(INSTALL) -m 0444 srv_url_check.conf $(DESTDIR)$(datadir)/c-icap/srv_url_check.conf.default
        $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en
-       $(INSTALL) $(TMPLS) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en/
+       for f in $(TMPLS); do  $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en/; done
  

Index: pkgsrc/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in
diff -u pkgsrc/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in:1.3 pkgsrc/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in:1.4
--- pkgsrc/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in:1.3 Mon Feb  6 14:15:18 2017
+++ pkgsrc/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in     Thu Oct  3 16:36:54 2019
@@ -1,16 +1,16 @@
-$NetBSD: patch-services_virus_scan_Makefile.in,v 1.3 2017/02/06 14:15:18 adam Exp $
+$NetBSD: patch-services_virus_scan_Makefile.in,v 1.4 2019/10/03 16:36:54 sborrill Exp $
 
-Handle configuration files
+Handle configuration files.
 
---- services/virus_scan/Makefile.in.orig       2013-12-27 15:35:48.000000000 +0000
-+++ services/virus_scan/Makefile.in
-@@ -749,8 +749,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB
+--- services/virus_scan/Makefile.in.orig       2019-01-17 10:57:18.000000000 +0000
++++ services/virus_scan/Makefile.in    2019-10-03 17:21:47.000000000 +0100
+@@ -753,8 +753,7 @@
  
  install-data-local:
        for f in $(CONFS); do \
--              $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.default; \
--              if test ! -f $(DESTDIR)$(CONFIGDIR)/$$f; then $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f; fi \
+-              $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(CONFIGDIR)/$$f.default; \
+-              if test ! -f $(DESTDIR)$(CONFIGDIR)/$$f; then $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(CONFIGDIR)/$$f; fi \
 +              $(INSTALL) -m 0444 $$f $(DESTDIR)$(datadir)/c-icap/$$f.default; \
        done
        $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/
-       for f in $(TMPLS); do $(INSTALL) $$f $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/; done
+       for f in $(TMPLS); do $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/; done

Prev by Date: CVS commit: pkgsrc/www/c-icap
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/www/c-icap
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index