Attachment 164811 Details for Bug 202705 – patch for 3.2.0

[patch] patch for 3.2.0

e2guardian.patch (text/plain), 10.21 KB, created by acop on 2015-12-29 08:42:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: acop

Created: 2015-12-29 08:42:55 UTC

Size: 10.21 KB

patch

obsolete

>diff -ruN e2guardian.bak/Makefile e2guardian/Makefile
>--- e2guardian.bak/Makefile	2015-12-29 09:24:24.000000000 +0100
>+++ e2guardian/Makefile	2015-12-28 09:10:00.000000000 +0100
>@@ -1,8 +1,8 @@
> # Created by: Marcello Coutinho
>-# $FreeBSD$
>+# $FreeBSD: head/www/e2guardian/Makefile 387986 2015-05-30 21:25:06Z mat $
> 
> PORTNAME=	e2guardian
>-PORTVERSION=	3.0.4
>+PORTVERSION=	3.2.0
> DISTVERSIONPREFIX=	v
> PORTREVISION=	1
> CATEGORIES=	www
>@@ -23,6 +23,13 @@
> 		--with-logdir=/var/log \
> 		--with-piddir=/var/run \
> 		--enable-fancydm
>+ACLOCAL_ARGS= -I m4
>+AUTOMAKE_ARGS= --add-missing --copy
>+USE_AUTOTOOLS=  aclocal
>+USE_AUTOTOOLS+=  autoheader
>+USE_AUTOTOOLS+= automake
>+USE_AUTOTOOLS+=  autoconf
>+
> 
> OPTIONS_DEFINE=	APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM DNS EMAIL DEBUG SSL DOCS
> OPTIONS_DEFAULT=TRICKLE DOCS 1024
>@@ -81,6 +88,7 @@
> .endif
> 
> post-extract:
>+	@${CP} ${WRKSRC}/README.md ${WRKSRC}/README
> .if ${PORT_OPTIONS:M2048} || ${PORT_OPTIONS:M4096} || ${PORT_OPTIONS:M8192}
> 	@${ECHO_MSG} ""
> 	@${ECHO_MSG} "######################################################"
>diff -ruN e2guardian.bak/distinfo e2guardian/distinfo
>--- e2guardian.bak/distinfo	2015-12-29 09:25:34.000000000 +0100
>+++ e2guardian/distinfo	2015-12-28 08:35:34.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (e2guardian-e2guardian-v3.0.4_GH0.tar.gz) = 8817a0e95f38982520b87bb7cd7b34b7ab752f37bc2307065a82d59960b52530
>-SIZE (e2guardian-e2guardian-v3.0.4_GH0.tar.gz) = 793490
>+SHA256 (e2guardian-e2guardian-v3.2.0_GH0.tar.gz) = cae011aacf6b250fc021c861fe46e15310349c474bca4553c0f829620e53e3bf
>+SIZE (e2guardian-e2guardian-v3.2.0_GH0.tar.gz) = 514303
>diff -ruN e2guardian.bak/pkg-plist e2guardian/pkg-plist
>--- e2guardian.bak/pkg-plist	2015-12-29 09:26:35.000000000 +0100
>+++ e2guardian/pkg-plist	2015-12-28 09:18:50.000000000 +0100
>@@ -1,73 +1,66 @@
>-%%DNS%%@sample %%ETCDIR%%/authplugins/dnsauth.conf.sample
>-@sample %%ETCDIR%%/authplugins/ident.conf.sample
>-@sample %%ETCDIR%%/authplugins/ip.conf.sample
>-@sample %%ETCDIR%%/authplugins/port.conf.sample
>-@sample %%ETCDIR%%/authplugins/proxy-basic.conf.sample
>-@sample %%ETCDIR%%/authplugins/proxy-digest.conf.sample
>-%%TRICKLE%%@sample %%ETCDIR%%/downloadmanagers/trickle.conf.sample
>-%%NTLM%%@sample %%ETCDIR%%/authplugins/proxy-ntlm.conf.sample
>-%%CLAMD%%@sample %%ETCDIR%%/contentscanners/clamdscan.conf.sample
>-%%ICAP%%@sample %%ETCDIR%%/contentscanners/icapscan.conf.sample
>-%%CLISCAN%%@sample %%ETCDIR%%/contentscanners/commandlinescan.conf.sample
>-%%KAV%%@sample %%ETCDIR%%/contentscanners/kavdscan.conf.sample
>-@sample %%ETCDIR%%/downloadmanagers/default.conf.sample
>-@sample %%ETCDIR%%/downloadmanagers/fancy.conf.sample
>-@sample %%ETCDIR%%/e2guardian.conf.sample
>-@sample %%ETCDIR%%/e2guardianf1.conf.sample
>-%%ETCDIR%%/installation_or_migration_from_dg.sh
>-@sample %%ETCDIR%%/lists/addheaderregexplist.sample
>-%%DNS%%@sample %%ETCDIR%%/lists/authexceptionsitelist.sample
>-%%DNS%%@sample %%ETCDIR%%/lists/authexceptionurllist.sample
>-@sample %%ETCDIR%%/lists/authplugins/ipgroups.sample
>-@sample %%ETCDIR%%/lists/authplugins/portgroups.sample
>-@sample %%ETCDIR%%/lists/bannedextensionlist.sample
>-@sample %%ETCDIR%%/lists/bannediplist.sample
>-@sample %%ETCDIR%%/lists/bannedmimetypelist.sample
>-@sample %%ETCDIR%%/lists/bannedphraselist.sample
>-@sample %%ETCDIR%%/lists/bannedregexpheaderlist.sample
>-@sample %%ETCDIR%%/lists/bannedregexpurllist.sample
>-@sample %%ETCDIR%%/lists/bannedrooms/default.sample
>-@sample %%ETCDIR%%/lists/bannedsearchlist.sample
>-@sample %%ETCDIR%%/lists/bannedsitelist.sample
>-@sample %%ETCDIR%%/lists/bannedsslsitelist.sample
>-@sample %%ETCDIR%%/lists/bannedurllist.sample
>-%%ETCDIR%%/lists/blacklists/ads/domains
>-%%ETCDIR%%/lists/blacklists/ads/urls
>-@sample %%ETCDIR%%/lists/contentregexplist.sample
>-%%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusextensionlist.sample
>-%%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusmimetypelist.sample
>-%%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirussitelist.sample
>-%%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusurllist.sample
>-@sample %%ETCDIR%%/lists/downloadmanagers/managedextensionlist.sample
>-@sample %%ETCDIR%%/lists/downloadmanagers/managedmimetypelist.sample
>-@sample %%ETCDIR%%/lists/embededreferersitelist.sample
>-@sample %%ETCDIR%%/lists/embededrefererurllist.sample
>-@sample %%ETCDIR%%/lists/exceptionextensionlist.sample
>-@sample %%ETCDIR%%/lists/exceptionfilesitelist.sample
>-@sample %%ETCDIR%%/lists/exceptionfileurllist.sample
>-@sample %%ETCDIR%%/lists/exceptioniplist.sample
>-@sample %%ETCDIR%%/lists/exceptionmimetypelist.sample
>-@sample %%ETCDIR%%/lists/exceptionphraselist.sample
>-@sample %%ETCDIR%%/lists/exceptionregexpurllist.sample
>-@sample %%ETCDIR%%/lists/exceptionsitelist.sample
>-@sample %%ETCDIR%%/lists/exceptionurllist.sample
>-@sample %%ETCDIR%%/lists/filtergroupslist.sample
>-@sample %%ETCDIR%%/lists/greysitelist.sample
>-@sample %%ETCDIR%%/lists/greysslsitelist.sample
>-@sample %%ETCDIR%%/lists/greyurllist.sample
>-@sample %%ETCDIR%%/lists/headerregexplist.sample
>-@sample %%ETCDIR%%/lists/localbannedsearchlist.sample
>-@sample %%ETCDIR%%/lists/localbannedsitelist.sample
>-@sample %%ETCDIR%%/lists/localbannedsslsitelist.sample
>-@sample %%ETCDIR%%/lists/localbannedurllist.sample
>-@sample %%ETCDIR%%/lists/localexceptionsitelist.sample
>-@sample %%ETCDIR%%/lists/localexceptionurllist.sample
>-@sample %%ETCDIR%%/lists/localgreysitelist.sample
>-@sample %%ETCDIR%%/lists/localgreysslsitelist.sample
>-@sample %%ETCDIR%%/lists/localgreyurllist.sample
>-@sample %%ETCDIR%%/lists/logregexpurllist.sample
>-@sample %%ETCDIR%%/lists/logsitelist.sample
>-@sample %%ETCDIR%%/lists/logurllist.sample
>+%%ETCDIR%%/authplugins/ident.conf.sample
>+%%ETCDIR%%/authplugins/ip.conf.sample
>+%%ETCDIR%%/authplugins/port.conf.sample
>+%%ETCDIR%%/authplugins/proxy-basic.conf.sample
>+%%ETCDIR%%/authplugins/proxy-digest.conf.sample
>+%%ETCDIR%%/contentscanners/clamdscan.conf.sample
>+%%ETCDIR%%/downloadmanagers/default.conf.sample
>+%%ETCDIR%%/downloadmanagers/fancy.conf.sample
>+%%ETCDIR%%/downloadmanagers/trickle.conf.sample
>+%%ETCDIR%%/%%AP_NAME%%.conf.sample
>+%%ETCDIR%%/%%AP_NAME%%f1.conf.sample
>+%%ETCDIR%%/lists/addheaderregexplist.sample
>+%%ETCDIR%%/lists/authexceptionsitelist.sample
>+%%ETCDIR%%/lists/authexceptionurllist.sample
>+%%ETCDIR%%/lists/authplugins/ipgroups.sample
>+%%ETCDIR%%/lists/authplugins/portgroups.sample
>+%%ETCDIR%%/lists/bannedextensionlist.sample
>+%%ETCDIR%%/lists/bannediplist.sample
>+%%ETCDIR%%/lists/bannedmimetypelist.sample
>+%%ETCDIR%%/lists/bannedphraselist.sample
>+%%ETCDIR%%/lists/bannedregexpheaderlist.sample
>+%%ETCDIR%%/lists/bannedregexpurllist.sample
>+%%ETCDIR%%/lists/bannedrooms/default.sample
>+%%ETCDIR%%/lists/bannedsearchlist.sample
>+%%ETCDIR%%/lists/bannedsitelist.sample
>+%%ETCDIR%%/lists/bannedsslsitelist.sample
>+%%ETCDIR%%/lists/bannedurllist.sample
>+%%ETCDIR%%/lists/contentregexplist.sample
>+%%ETCDIR%%/lists/contentscanners/exceptionvirusextensionlist.sample
>+%%ETCDIR%%/lists/contentscanners/exceptionvirusmimetypelist.sample
>+%%ETCDIR%%/lists/contentscanners/exceptionvirussitelist.sample
>+%%ETCDIR%%/lists/contentscanners/exceptionvirusurllist.sample
>+%%ETCDIR%%/lists/downloadmanagers/managedextensionlist.sample
>+%%ETCDIR%%/lists/downloadmanagers/managedmimetypelist.sample
>+%%ETCDIR%%/lists/embededreferersitelist.sample
>+%%ETCDIR%%/lists/embededrefererurllist.sample
>+%%ETCDIR%%/lists/exceptionextensionlist.sample
>+%%ETCDIR%%/lists/exceptionfilesitelist.sample
>+%%ETCDIR%%/lists/exceptionfileurllist.sample
>+%%ETCDIR%%/lists/exceptioniplist.sample
>+%%ETCDIR%%/lists/exceptionmimetypelist.sample
>+%%ETCDIR%%/lists/exceptionphraselist.sample
>+%%ETCDIR%%/lists/exceptionregexpurllist.sample
>+%%ETCDIR%%/lists/exceptionsitelist.sample
>+%%ETCDIR%%/lists/exceptionurllist.sample
>+%%ETCDIR%%/lists/filtergroupslist.sample
>+%%ETCDIR%%/lists/greysitelist.sample
>+%%ETCDIR%%/lists/greysslsitelist.sample
>+%%ETCDIR%%/lists/greyurllist.sample
>+%%ETCDIR%%/lists/headerregexplist.sample
>+%%ETCDIR%%/lists/localbannedsearchlist.sample
>+%%ETCDIR%%/lists/localbannedsitelist.sample
>+%%ETCDIR%%/lists/localbannedsslsitelist.sample
>+%%ETCDIR%%/lists/localbannedurllist.sample
>+%%ETCDIR%%/lists/localexceptionsitelist.sample
>+%%ETCDIR%%/lists/localexceptionurllist.sample
>+%%ETCDIR%%/lists/localgreysitelist.sample
>+%%ETCDIR%%/lists/localgreysslsitelist.sample
>+%%ETCDIR%%/lists/localgreyurllist.sample
>+%%ETCDIR%%/lists/logregexpurllist.sample
>+%%ETCDIR%%/lists/logsitelist.sample
>+%%ETCDIR%%/lists/logurllist.sample
>+%%ETCDIR%%/lists/nocheckcertsitelist.sample
> %%ETCDIR%%/lists/phraselists/badwords/weighted_dutch
> %%ETCDIR%%/lists/phraselists/badwords/weighted_french
> %%ETCDIR%%/lists/phraselists/badwords/weighted_german
>@@ -145,21 +138,23 @@
> %%ETCDIR%%/lists/phraselists/weapons/weighted_portuguese
> %%ETCDIR%%/lists/phraselists/webmail/weighted
> %%ETCDIR%%/lists/pics
>-@sample %%ETCDIR%%/lists/refererexceptionsitelist.sample
>-@sample %%ETCDIR%%/lists/refererexceptionurllist.sample
>-@sample %%ETCDIR%%/lists/searchregexplist.sample
>-@sample %%ETCDIR%%/lists/urlredirectregexplist.sample
>-@sample %%ETCDIR%%/lists/urlregexplist.sample
>-@sample %%ETCDIR%%/lists/weightedphraselist.sample
>-man/man8/e2guardian.8.gz
>-sbin/e2guardian
>+%%ETCDIR%%/lists/refererexceptionsitelist.sample
>+%%ETCDIR%%/lists/refererexceptionurllist.sample
>+%%ETCDIR%%/lists/searchregexplist.sample
>+%%ETCDIR%%/lists/urlredirectregexplist.sample
>+%%ETCDIR%%/lists/urlregexplist.sample
>+%%ETCDIR%%/lists/weightedphraselist.sample
>+etc/rc.d/%%AP_NAME%%
>+man/man8/%%AP_NAME%%.8.gz
>+sbin/%%AP_NAME%%
> %%PORTDOCS%%%%DOCSDIR%%/AuthPlugins
> %%PORTDOCS%%%%DOCSDIR%%/ContentScanners
> %%PORTDOCS%%%%DOCSDIR%%/DownloadManagers
> %%PORTDOCS%%%%DOCSDIR%%/FAQ
> %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
> %%PORTDOCS%%%%DOCSDIR%%/Plugins
>-%%DATADIR%%/e2guardian.pl
>+%%DATADIR%%/blockedflash.swf
>+%%DATADIR%%/%%AP_NAME%%.pl
> %%DATADIR%%/languages/arspanish/fancydmtemplate.html
> %%DATADIR%%/languages/arspanish/messages
> %%DATADIR%%/languages/arspanish/template.html
>@@ -242,9 +237,9 @@
> %%DATADIR%%/languages/ukenglish/messages
> %%DATADIR%%/languages/ukenglish/template.html
> %%DATADIR%%/scripts/bsd-init
>-%%DATADIR%%/scripts/e2guardian
>+%%DATADIR%%/scripts/%%AP_NAME%%
>+%%DATADIR%%/scripts/%%AP_NAME%%.service
> %%DATADIR%%/scripts/logrotation
> %%DATADIR%%/scripts/solaris-init
> %%DATADIR%%/scripts/systemv-init
> %%DATADIR%%/transparent1x1.gif
>-%%DATADIR%%/blockedflash.swf

Actions: View | Diff

Attachments on bug 202705: 164810 | 164811