Attachment 163202 Details for Bug 204604 – diff

[patch] diff

c-icap-modules.diff (text/plain), 5.02 KB, created by Cassiano Peixoto on 2015-11-16 17:51:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cassiano Peixoto

Created: 2015-11-16 17:51:22 UTC

Size: 5.02 KB

patch

obsolete

>diff -ruN c-icap-modules.old/Makefile c-icap-modules/Makefile
>--- c-icap-modules.old/Makefile	2014-11-21 20:21:17.000000000 -0200
>+++ c-icap-modules/Makefile	2015-11-16 15:27:48.623395620 -0200
>@@ -2,10 +2,9 @@
> # $FreeBSD: head/www/c-icap-modules/Makefile 373019 2014-11-21 22:21:17Z mm $
> 
> PORTNAME=	c-icap
>-PORTVERSION=	0.3.2
>-PORTREVISION=	4
>+PORTVERSION=	0.4.1
> CATEGORIES=	www security
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.3.x/
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.4.x/
> PKGNAMESUFFIX=	-modules
> DISTNAME=	c_icap_modules-${PORTVERSION}
> 
>diff -ruN c-icap-modules.old/distinfo c-icap-modules/distinfo
>--- c-icap-modules.old/distinfo	2014-03-15 00:07:11.000000000 -0300
>+++ c-icap-modules/distinfo	2015-11-03 15:37:17.000000000 -0200
>@@ -1,2 +1,2 @@
>-SHA256 (c_icap_modules-0.3.2.tar.gz) = e3472662687cf9fa37a496df31436924326e315920056a404f023ec5e852e239
>-SIZE (c_icap_modules-0.3.2.tar.gz) = 384788
>+SHA256 (c_icap_modules-0.4.1.tar.gz) = 6488eb0ac1f9f15a1e47e9df012238085586a2f4d95a151fbb43a5f1ff21baeb
>+SIZE (c_icap_modules-0.4.1.tar.gz) = 428691
>diff -ruN c-icap-modules.old/files/patch-services__url_check__Makefile.in c-icap-modules/files/patch-services__url_check__Makefile.in
>--- c-icap-modules.old/files/patch-services__url_check__Makefile.in	2014-05-14 14:00:23.000000000 -0300
>+++ c-icap-modules/files/patch-services__url_check__Makefile.in	1969-12-31 21:00:00.000000000 -0300
>@@ -1,10 +0,0 @@
>---- services/url_check/Makefile.in.orig	2014-05-14 16:56:34.000000000 -0300
>-+++ services/url_check/Makefile.in	2014-05-14 16:56:46.000000000 -0300
>-@@ -731,7 +731,6 @@
>- 
>- install-data-local:
>- 	$(INSTALL) 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
>- 	$(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en
>- 	$(INSTALL) $(TMPLS) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en/
>- 
>diff -ruN c-icap-modules.old/files/patch-services__virus_scan__Makefile.in c-icap-modules/files/patch-services__virus_scan__Makefile.in
>--- c-icap-modules.old/files/patch-services__virus_scan__Makefile.in	2014-05-14 14:00:23.000000000 -0300
>+++ c-icap-modules/files/patch-services__virus_scan__Makefile.in	1969-12-31 21:00:00.000000000 -0300
>@@ -1,10 +0,0 @@
>---- services/virus_scan/Makefile.in.orig	2014-05-14 16:54:38.000000000 -0300
>-+++ services/virus_scan/Makefile.in	2014-05-14 16:54:56.000000000 -0300
>-@@ -647,7 +647,6 @@
>- 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 \
>- 	done
>- 	$(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/
>- 	for f in $(TMPLS); do $(INSTALL) $$f $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/; done
>diff -ruN c-icap-modules.old/pkg-plist c-icap-modules/pkg-plist
>--- c-icap-modules.old/pkg-plist	2015-07-13 00:01:00.000000000 -0300
>+++ c-icap-modules/pkg-plist	2015-11-16 14:43:59.000000000 -0200
>@@ -1,27 +1,28 @@
>-@unexec if cmp -s %D/etc/c-icap/clamav_mod.conf %D/etc/c-icap/clamav_mod.conf.default; then rm -f %D/etc/c-icap/clamav_mod.conf; fi
>-etc/c-icap/clamav_mod.conf.default
>-@exec [ -f %B/clamav_mod.conf ] || cp %B/%f %B/clamav_mod.conf
>-@unexec if cmp -s %D/etc/c-icap/clamd_mod.conf %D/etc/c-icap/clamd_mod.conf.default; then rm -f %D/etc/c-icap/clamd_mod.conf; fi
>-etc/c-icap/clamd_mod.conf.default
>-@exec [ -f %B/clamd_mod.conf ] || cp %B/%f %B/clamd_mod.conf
>-@unexec if cmp -s %D/etc/c-icap/srv_url_check.conf %D/etc/c-icap/srv_url_check.conf.default; then rm -f %D/etc/c-icap/srv_url_check.conf; fi
>-etc/c-icap/srv_url_check.conf.default
>-@exec [ -f %B/srv_url_check.conf ] || cp %B/%f %B/srv_url_check.conf
>-@unexec if cmp -s %D/etc/c-icap/virus_scan.conf %D/etc/c-icap/virus_scan.conf.default; then rm -f %D/etc/c-icap/virus_scan.conf; fi
>-etc/c-icap/virus_scan.conf.default
>-@exec [ -f %B/virus_scan.conf ] || cp %B/%f %B/virus_scan.conf
>+%%ETCDIR%%/clamav_mod.conf
>+%%ETCDIR%%/clamav_mod.conf.default
>+%%ETCDIR%%/clamd_mod.conf
>+%%ETCDIR%%/clamd_mod.conf.default
>+%%ETCDIR%%/srv_content_filtering.conf.default
>+%%ETCDIR%%/srv_url_check.conf
>+%%ETCDIR%%/srv_url_check.conf.default
>+%%ETCDIR%%/virus_scan.conf
>+%%ETCDIR%%/virus_scan.conf.default
> lib/c_icap/clamav_mod.a
> lib/c_icap/clamav_mod.so
> lib/c_icap/clamd_mod.a
> lib/c_icap/clamd_mod.so
>+lib/c_icap/srv_content_filtering.a
>+lib/c_icap/srv_content_filtering.so
> lib/c_icap/srv_url_check.a
> lib/c_icap/srv_url_check.so
> lib/c_icap/virus_scan.a
> lib/c_icap/virus_scan.so
> man/man8/c-icap-mods-sguardDB.8.gz
>+%%DATADIR%%/templates/srv_content_filtering/en/BLOCK
> %%DATADIR%%/templates/srv_url_check/en/DENY
>+%%DATADIR%%/templates/virus_scan/en/VIRUS_FOUND
> %%DATADIR%%/templates/virus_scan/en/VIR_MODE_HEAD
> %%DATADIR%%/templates/virus_scan/en/VIR_MODE_PROGRESS
> %%DATADIR%%/templates/virus_scan/en/VIR_MODE_TAIL
> %%DATADIR%%/templates/virus_scan/en/VIR_MODE_VIRUS_FOUND
>-%%DATADIR%%/templates/virus_scan/en/VIRUS_FOUND
>+

Actions: View | Diff

Attachments on bug 204604: 163202