Upgrade to 5.4.6, enable sslmitm, and add the new list definitions

1 files changed, 165 insertions, 109 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5a09cd83f33..e41cb0b06267 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = e2guardian
 	pkgdesc = Fork of dansguardian, an open source web content filter. It filters the actual content of pages based on many methods including phrase matching, request header and URL filtering, etc. It does not purely filter based on a banned list of sites.
-	pkgver = 5.3.4
-	pkgrel = 1
+	pkgver = 5.4.6r
+	pkgrel = 2
 	url = http://e2guardian.org
 	install = e2guardian.install
 	arch = i686
@@ -24,119 +24,175 @@ pkgbase = e2guardian
 	backup = etc/e2guardian/e2guardianf1.conf
 	backup = etc/e2guardian/downloadmanagers/default.conf
 	backup = etc/e2guardian/authplugins/proxy-digest.conf
-	backup = etc/e2guardian/authplugins/proxy-basic.conf
+	backup = etc/e2guardian/authplugins/pf-basic.conf
+	backup = etc/e2guardian/authplugins/port.conf
 	backup = etc/e2guardian/authplugins/ident.conf
+	backup = etc/e2guardian/authplugins/proxy-basic.conf
 	backup = etc/e2guardian/authplugins/ip.conf
-	backup = etc/e2guardian/authplugins/port.conf
-	backup = etc/e2guardian/lists/weightedphraselist
-	backup = etc/e2guardian/lists/contentregexplist
-	backup = etc/e2guardian/lists/exceptionfileurllist
-	backup = etc/e2guardian/lists/exceptionextensionlist
-	backup = etc/e2guardian/lists/bannedextensionlist
-	backup = etc/e2guardian/lists/exceptionmimetypelist
-	backup = etc/e2guardian/lists/exceptionregexpurllist
+	backup = etc/e2guardian/lists/example.group/greysiteiplist
+	backup = etc/e2guardian/lists/example.group/localbannedsearchlist
+	backup = etc/e2guardian/lists/example.group/logurllist
+	backup = etc/e2guardian/lists/example.group/localexceptionsitelist
+	backup = etc/e2guardian/lists/example.group/greysslsitelist
+	backup = etc/e2guardian/lists/example.group/domainsnobypass
+	backup = etc/e2guardian/lists/example.group/logsitelist
+	backup = etc/e2guardian/lists/example.group/refererexceptionsiteiplist
+	backup = etc/e2guardian/lists/example.group/bannedsearchlist
+	backup = etc/e2guardian/lists/example.group/exceptionurllist
+	backup = etc/e2guardian/lists/example.group/bannedmimetypelist
+	backup = etc/e2guardian/lists/example.group/greyurllist
+	backup = etc/e2guardian/lists/example.group/oldweightedphraselist
+	backup = etc/e2guardian/lists/example.group/localbannedsslsitelist
+	backup = etc/e2guardian/lists/example.group/bannedextensionlist
+	backup = etc/e2guardian/lists/example.group/localgreysiteiplist
+	backup = etc/e2guardian/lists/example.group/localgreysslsitelist
+	backup = etc/e2guardian/lists/example.group/bannedurllist
+	backup = etc/e2guardian/lists/example.group/exceptionvirussiteiplist
+	backup = etc/e2guardian/lists/example.group/greysitelist
+	backup = etc/e2guardian/lists/example.group/bannedtimelist
+	backup = etc/e2guardian/lists/example.group/ipnobypass
+	backup = etc/e2guardian/lists/example.group/refererexceptionsitelist
+	backup = etc/e2guardian/lists/example.group/localbannedurllist
+	backup = etc/e2guardian/lists/example.group/bannedregexpurllist
+	backup = etc/e2guardian/lists/example.group/localgreysitelist
+	backup = etc/e2guardian/lists/example.group/sslsiteregexplist
+	backup = etc/e2guardian/lists/example.group/localbannedsslsiteiplist
+	backup = etc/e2guardian/lists/example.group/bannedsitelist
+	backup = etc/e2guardian/lists/example.group/exceptionphraselist
+	backup = etc/e2guardian/lists/example.group/bannedphraselist
+	backup = etc/e2guardian/lists/example.group/bannedsiteiplist
+	backup = etc/e2guardian/lists/example.group/oldbannedphraselist
+	backup = etc/e2guardian/lists/example.group/exceptionsiteiplist
+	backup = etc/e2guardian/lists/example.group/logregexpurllist
+	backup = etc/e2guardian/lists/example.group/exceptionregexpheaderlist
+	backup = etc/e2guardian/lists/example.group/weightedphraselist
+	backup = etc/e2guardian/lists/example.group/bannedsslsiteiplist
+	backup = etc/e2guardian/lists/example.group/urlredirectregexplist
+	backup = etc/e2guardian/lists/example.group/localgreyurllist
+	backup = etc/e2guardian/lists/example.group/urlregexplist
+	backup = etc/e2guardian/lists/example.group/exceptionregexpurllist
+	backup = etc/e2guardian/lists/example.group/blankettimelist
+	backup = etc/e2guardian/lists/example.group/localexceptionsiteiplist
+	backup = etc/e2guardian/lists/example.group/bannedregexpheaderlist
+	backup = etc/e2guardian/lists/example.group/oldexceptionphraselist
+	backup = etc/e2guardian/lists/example.group/localexceptionurllist
+	backup = etc/e2guardian/lists/example.group/localgreysslsiteiplist
+	backup = etc/e2guardian/lists/example.group/headerregexplist
+	backup = etc/e2guardian/lists/example.group/greysslsiteiplist
+	backup = etc/e2guardian/lists/example.group/bannedsearchoveridelist
+	backup = etc/e2guardian/lists/example.group/localbannedsiteiplist
+	backup = etc/e2guardian/lists/example.group/responseheaderregexplist
+	backup = etc/e2guardian/lists/example.group/bannedsslsitelist
+	backup = etc/e2guardian/lists/example.group/exceptionfileurllist
+	backup = etc/e2guardian/lists/example.group/exceptionregexpuseragentlist
+	backup = etc/e2guardian/lists/example.group/localbannedsitelist
+	backup = etc/e2guardian/lists/example.group/logsiteiplist
+	backup = etc/e2guardian/lists/example.group/exceptionfilesitelist
+	backup = etc/e2guardian/lists/example.group/refererexceptionurllist
+	backup = etc/e2guardian/lists/example.group/exceptionsitelist
+	backup = etc/e2guardian/lists/example.group/bannedregexpuseragentlist
+	backup = etc/e2guardian/lists/example.group/urlnobypass
+	backup = etc/e2guardian/lists/example.group/nocheckcertsiteiplist
+	backup = etc/e2guardian/lists/example.group/exceptionfilesiteiplist
+	backup = etc/e2guardian/lists/example.group/contentregexplist
+	backup = etc/e2guardian/lists/example.group/addheaderregexplist
+	backup = etc/e2guardian/lists/example.group/exceptionmimetypelist
+	backup = etc/e2guardian/lists/example.group/exceptionextensionlist
+	backup = etc/e2guardian/lists/example.group/exceptionvirusextensionlist
+	backup = etc/e2guardian/lists/example.group/nocheckcertsitelist
+	backup = etc/e2guardian/lists/common/exceptioniplist
+	backup = etc/e2guardian/lists/common/embededreferersiteiplist
+	backup = etc/e2guardian/lists/common/browserregexplist
+	backup = etc/e2guardian/lists/common/nologextensionlist
+	backup = etc/e2guardian/lists/common/searchexceptionregexplist
+	backup = etc/e2guardian/lists/common/authexceptioniplist
+	backup = etc/e2guardian/lists/common/nologurllist
+	backup = etc/e2guardian/lists/common/embededreferersitelist
+	backup = etc/e2guardian/lists/common/bannedclientlist
+	backup = etc/e2guardian/lists/common/nologsitelist
+	backup = etc/e2guardian/lists/common/nomitmsiteiplist
+	backup = etc/e2guardian/lists/common/nologsiteiplist
+	backup = etc/e2guardian/lists/common/bannediplist
+	backup = etc/e2guardian/lists/common/authexceptionsitelist
+	backup = etc/e2guardian/lists/common/embededrefererurllist
+	backup = etc/e2guardian/lists/common/exceptionclientlist
+	backup = etc/e2guardian/lists/common/nomitmsitelist
+	backup = etc/e2guardian/lists/common/nologregexpurllist
+	backup = etc/e2guardian/lists/common/searchregexplist
+	backup = etc/e2guardian/lists/common/authexceptionurllist
+	backup = etc/e2guardian/lists/phraselists/spanish/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/spanish/badwords/weighted
+	backup = etc/e2guardian/lists/phraselists/dutch/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/dutch/badwords/weighted
+	backup = etc/e2guardian/lists/phraselists/dutch/goodphrases/weighted
+	backup = etc/e2guardian/lists/phraselists/chinesebig5/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/french/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/french/badwords/weighted
+	backup = etc/e2guardian/lists/phraselists/danish/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/danish/goodphrases/weighted
+	backup = etc/e2guardian/lists/phraselists/norwegian/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/polish/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/polish/goodphrases/weighted
+	backup = etc/e2guardian/lists/phraselists/russian-1251/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/chinesegb2312/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/illegaldrugs/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/gore/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/gambling/banned
+	backup = etc/e2guardian/lists/phraselists/portuguese/gambling/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/violence/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/badwords/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/personals/banned
+	backup = etc/e2guardian/lists/phraselists/portuguese/personals/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/intolerance/banned
+	backup = etc/e2guardian/lists/phraselists/portuguese/intolerance/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/goodphrases/weighted
+	backup = etc/e2guardian/lists/phraselists/portuguese/weapons/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/pornography/banned
+	backup = etc/e2guardian/lists/phraselists/ukenglish/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/illegaldrugs/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/gore/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/gambling/banned
+	backup = etc/e2guardian/lists/phraselists/ukenglish/gambling/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/proxies/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/violence/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/badwords/banned
+	backup = etc/e2guardian/lists/phraselists/ukenglish/badwords/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/personals/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/warezhacking/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/nudism/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/intolerance/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/drugadvocacy/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/goodphrases/exception_email
+	backup = etc/e2guardian/lists/phraselists/ukenglish/goodphrases/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/goodphrases/weighted_news
+	backup = etc/e2guardian/lists/phraselists/ukenglish/weapons/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/games/weighted
+	backup = etc/e2guardian/lists/phraselists/ukenglish/chat/weighted
+	backup = etc/e2guardian/lists/phraselists/malay/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/malay/goodphrases/weighted
+	backup = etc/e2guardian/lists/phraselists/russian-koi8-r/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/swedish/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/swedish/goodphrases/weighted
+	backup = etc/e2guardian/lists/phraselists/german/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/german/badwords/weighted
+	backup = etc/e2guardian/lists/phraselists/japanese/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/italian/pornography/weighted
+	backup = etc/e2guardian/lists/phraselists/italian/badwords/weighted
+	backup = etc/e2guardian/lists/phraselists/italian/chat/weighted
+	backup = etc/e2guardian/lists/contentscanners/exceptionvirusmimetypelist
+	backup = etc/e2guardian/lists/contentscanners/exceptionvirusurllist
+	backup = etc/e2guardian/lists/contentscanners/exceptionvirusextensionlist
+	backup = etc/e2guardian/lists/contentscanners/exceptionvirussitelist
 	backup = etc/e2guardian/lists/authplugins/ipgroups
-	backup = etc/e2guardian/lists/bannedregexpheaderlist
-	backup = etc/e2guardian/lists/phraselists/rta/banned
-	backup = etc/e2guardian/lists/phraselists/sport/weighted
-	backup = etc/e2guardian/lists/phraselists/proxies/weighted
-	backup = etc/e2guardian/lists/phraselists/safelabel/banned
-	backup = etc/e2guardian/lists/phraselists/peer2peer/weighted
-	backup = etc/e2guardian/lists/phraselists/drugadvocacy/weighted
-	backup = etc/e2guardian/lists/phraselists/googlesearches/banned
-	backup = etc/e2guardian/lists/phraselists/conspiracy/weighted
-	backup = etc/e2guardian/lists/phraselists/secretsocieties/weighted
-	backup = etc/e2guardian/lists/phraselists/idtheft/weighted
-	backup = etc/e2guardian/lists/phraselists/illegaldrugs/banned
-	backup = etc/e2guardian/lists/phraselists/illegaldrugs/weighted_portuguese
-	backup = etc/e2guardian/lists/phraselists/illegaldrugs/weighted
-	backup = etc/e2guardian/lists/phraselists/violence/weighted_portuguese
-	backup = etc/e2guardian/lists/phraselists/violence/weighted
-	backup = etc/e2guardian/lists/phraselists/domainsforsale/weighted
-	backup = etc/e2guardian/lists/phraselists/music/weighted
-	backup = etc/e2guardian/lists/phraselists/upstreamfilter/weighted
-	backup = etc/e2guardian/lists/phraselists/games/weighted
-	backup = etc/e2guardian/lists/phraselists/weapons/weighted_portuguese
-	backup = etc/e2guardian/lists/phraselists/weapons/weighted
-	backup = etc/e2guardian/lists/phraselists/legaldrugs/weighted
-	backup = etc/e2guardian/lists/phraselists/gore/weighted_portuguese
-	backup = etc/e2guardian/lists/phraselists/gore/weighted
-	backup = etc/e2guardian/lists/phraselists/warezhacking/weighted
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_chinese
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_malay
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_german
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_dutch
-	backup = etc/e2guardian/lists/phraselists/pornography/banned_portuguese
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_french
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_polish
-	backup = etc/e2guardian/lists/phraselists/pornography/banned
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_danish
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_japanese
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_portuguese
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_russian
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_italian
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_swedish
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_norwegian
-	backup = etc/e2guardian/lists/phraselists/pornography/weighted_spanish
-	backup = etc/e2guardian/lists/phraselists/personals/weighted_portuguese
-	backup = etc/e2guardian/lists/phraselists/personals/weighted
-	backup = etc/e2guardian/lists/phraselists/nudism/weighted
-	backup = etc/e2guardian/lists/phraselists/malware/weighted
-	backup = etc/e2guardian/lists/phraselists/goodphrases/weighted_general_polish
-	backup = etc/e2guardian/lists/phraselists/goodphrases/weighted_general_swedish
-	backup = etc/e2guardian/lists/phraselists/goodphrases/exception_email
-	backup = etc/e2guardian/lists/phraselists/goodphrases/exception
-	backup = etc/e2guardian/lists/phraselists/goodphrases/weighted_general
-	backup = etc/e2guardian/lists/phraselists/goodphrases/weighted_general_danish
-	backup = etc/e2guardian/lists/phraselists/goodphrases/weighted_general_malay
-	backup = etc/e2guardian/lists/phraselists/goodphrases/weighted_general_dutch
-	backup = etc/e2guardian/lists/phraselists/goodphrases/weighted_general_portuguese
-	backup = etc/e2guardian/lists/phraselists/goodphrases/weighted_news
-	backup = etc/e2guardian/lists/phraselists/translation/weighted
-	backup = etc/e2guardian/lists/phraselists/chat/weighted_italian
-	backup = etc/e2guardian/lists/phraselists/chat/weighted
-	backup = etc/e2guardian/lists/phraselists/news/weighted
-	backup = etc/e2guardian/lists/phraselists/badwords/weighted_german
-	backup = etc/e2guardian/lists/phraselists/badwords/weighted_dutch
-	backup = etc/e2guardian/lists/phraselists/badwords/weighted_french
-	backup = etc/e2guardian/lists/phraselists/badwords/weighted_portuguese
-	backup = etc/e2guardian/lists/phraselists/badwords/weighted_spanish
-	backup = etc/e2guardian/lists/phraselists/webmail/weighted
-	backup = etc/e2guardian/lists/phraselists/travel/weighted
-	backup = etc/e2guardian/lists/phraselists/gambling/banned_portuguese
-	backup = etc/e2guardian/lists/phraselists/gambling/banned
-	backup = etc/e2guardian/lists/phraselists/gambling/weighted_portuguese
-	backup = etc/e2guardian/lists/phraselists/gambling/weighted
-	backup = etc/e2guardian/lists/phraselists/forums/weighted
-	backup = etc/e2guardian/lists/phraselists/intolerance/banned_portuguese
-	backup = etc/e2guardian/lists/phraselists/intolerance/weighted_portuguese
-	backup = etc/e2guardian/lists/phraselists/intolerance/weighted
-	backup = etc/e2guardian/lists/logsitelist
-	backup = etc/e2guardian/lists/logregexpurllist
-	backup = etc/e2guardian/lists/greysitelist
-	backup = etc/e2guardian/lists/filtergroupslist
-	backup = etc/e2guardian/lists/exceptionfilesitelist
-	backup = etc/e2guardian/lists/bannedmimetypelist
-	backup = etc/e2guardian/lists/exceptionurllist
-	backup = etc/e2guardian/lists/logurllist
-	backup = etc/e2guardian/lists/exceptionphraselist
-	backup = etc/e2guardian/lists/bannedurllist
-	backup = etc/e2guardian/lists/headerregexplist
-	backup = etc/e2guardian/lists/bannediplist
-	backup = etc/e2guardian/lists/exceptionsitelist
-	backup = etc/e2guardian/lists/bannedphraselist
-	backup = etc/e2guardian/lists/exceptioniplist
-	backup = etc/e2guardian/lists/bannedregexpurllist
-	backup = etc/e2guardian/lists/bannedsitelist
-	backup = etc/e2guardian/lists/urlregexplist
-	backup = etc/e2guardian/lists/greyurllist
-	source = https://github.com/e2guardian/e2guardian/archive/5.3.4.tar.gz
+	backup = etc/e2guardian/lists/authplugins/portgroups
+	backup = etc/e2guardian/lists/authplugins/filtergroupslist
+	backup = etc/e2guardian/lists/rooms/default
+	source = e2guardian-5.4.6r.tar.gz::https://github.com/e2guardian/e2guardian/archive/v5.4.6r.tar.gz
 	source = e2guardian
 	source = e2guardian.service
-	sha1sums = 4b2aa428418b0bd8a4aa22a0e4d15dc82e910290
+	sha1sums = 3f3563c6ea702a374f5dd9908cf69bad0bbeab43
 	sha1sums = 4505b1e66cc1f64b06eacb277de24c453831f215
 	sha1sums = a4179286aa0d0bf3bb71f5459075a02ceaf0d518
 
 pkgname = e2guardian
-