Attachment 161911 Details for Bug 198274 – update

[patch] update

squidclamav.diff (text/plain), 3.80 KB, created by Kurt Jaeger on 2015-10-11 14:25:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2015-10-11 14:25:12 UTC

Size: 3.80 KB

patch

obsolete

>diff -r -u -N www/squidclamav/Makefile /home/pi/myp/www/squidclamav/Makefile
>--- www/squidclamav/Makefile	2015-09-27 21:28:38.924941000 +0200
>+++ /home/pi/myp/www/squidclamav/Makefile	2015-10-11 16:24:08.749758000 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/www/squidclamav/Makefile 398003 2015-09-26 17:04:38Z bapt $
> 
> PORTNAME=	squidclamav
>-PORTVERSION=	6.10
>-PORTREVISION=	2
>+PORTVERSION=	6.13
> CATEGORIES=	www security
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
> 
>@@ -12,13 +11,11 @@
> 
> LICENSE=	GPLv3
> 
>-BROKEN=		Not fetchable
>-
> LIB_DEPENDS+=	libicapapi.so:${PORTSDIR}/www/c-icap
> 
> GNU_CONFIGURE=	yes
> CFLAGS+=	-DHAVE_STRNSTR
>-USES=		cpe shebangfix libtool
>+USES=		cpe libtool shebangfix
> SHEBANG_FILES=	cgi-bin/clwarn.cgi*
> INSTALL_TARGET=	install-strip
> CPE_VENDOR=	darold
>diff -r -u -N www/squidclamav/distinfo /home/pi/myp/www/squidclamav/distinfo
>--- www/squidclamav/distinfo	2015-08-01 00:48:46.124254000 +0200
>+++ /home/pi/myp/www/squidclamav/distinfo	2015-10-11 16:19:37.100442000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (squidclamav-6.10.tar.gz) = 4d1ed7012b5b8db4143d38196b0928bd44f2461226a3f9ae2cdc3643524a054b
>-SIZE (squidclamav-6.10.tar.gz) = 436639
>+SHA256 (squidclamav-6.13.tar.gz) = 67932f891278d7f2e2b2c1e746101041b02755453cf656db89c3d2345bbbd053
>+SIZE (squidclamav-6.13.tar.gz) = 676911
>diff -r -u -N www/squidclamav/files/patch-etc-Makefile.in /home/pi/myp/www/squidclamav/files/patch-etc-Makefile.in
>--- www/squidclamav/files/patch-etc-Makefile.in	2015-08-01 00:48:46.114010000 +0200
>+++ /home/pi/myp/www/squidclamav/files/patch-etc-Makefile.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,16 +0,0 @@
>---- etc/Makefile.in.orig	2014-05-14 16:04:39.000000000 -0300
>-+++ etc/Makefile.in	2014-05-14 16:04:57.000000000 -0300
>-@@ -338,12 +338,7 @@
>- 
>- install-data-local:
>- 	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
>--	@if test -f "$(DESTDIR)$(CFGINST)/squidclamav.conf" ; then \
>--		echo "$@ will not overwrite existing $(DESTDIR)$(CFGINST)/squidclamav.conf" ; \
>--	else \
>--		echo "$(INSTALL_DATA) $(srcdir)/squidclamav.conf $(DESTDIR)$(CFGINST)"; \
>--		$(INSTALL_DATA) $(srcdir)/squidclamav.conf $(DESTDIR)$(CFGINST)/squidclamav.conf; \
>--	fi
>-+	$(INSTALL_DATA) $(srcdir)/squidclamav.conf $(DESTDIR)$(CFGINST)/squidclamav.conf.default
>- # Tell versions [3.59,3.63) of GNU make to not export all variables.
>- # Otherwise a system limit (for SysV at least) may be exceeded.
>- .NOEXPORT:
>diff -r -u -N www/squidclamav/files/patch-etc_Makefile.in /home/pi/myp/www/squidclamav/files/patch-etc_Makefile.in
>--- www/squidclamav/files/patch-etc_Makefile.in	1970-01-01 01:00:00.000000000 +0100
>+++ /home/pi/myp/www/squidclamav/files/patch-etc_Makefile.in	2015-10-11 16:21:09.664811000 +0200
>@@ -0,0 +1,11 @@
>+--- etc/Makefile.in.orig	2015-10-11 14:20:10 UTC
>++++ etc/Makefile.in
>+@@ -371,7 +371,7 @@ uninstall-am:
>+ install-data-local:
>+ 	$(mkinstalldirs) $(DESTDIR)$(CONFIGDIR)
>+ 	for f in $(CONFS); do \
>+-		$(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.default; \
>++		$(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.sample; \
>+ 		if test ! -f $(DESTDIR)$(CONFIGDIR)/$$f; then $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f; fi \
>+ 	done
>+ 	$(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/squidclamav/en/
>diff -r -u -N www/squidclamav/pkg-plist /home/pi/myp/www/squidclamav/pkg-plist
>--- www/squidclamav/pkg-plist	2015-08-01 00:48:46.122781000 +0200
>+++ /home/pi/myp/www/squidclamav/pkg-plist	2015-10-11 16:18:45.503965000 +0200
>@@ -1,7 +1,6 @@
>-@unexec if cmp -s %D/etc/c-icap/squidclamav.conf %D/etc/c-icap/squidclamav.conf.default; then rm -f %D/etc/c-icap/squidclamav.conf; fi
>-etc/c-icap/squidclamav.conf.default
>-@exec [ -f %B/squidclamav.conf ] || cp %B/%f %B/squidclamav.conf
>+@sample etc/c-icap/squidclamav.conf.sample
> %%DATADIR%%/README
>+share/c_icap/templates/squidclamav/en/MALWARE_FOUND
> lib/c_icap/squidclamav.a
> lib/c_icap/squidclamav.so
> libexec/squidclamav/clwarn.cgi

Actions: View | Diff

Attachments on bug 198274: 161911