On Mon, Feb 10 2020, Björn Ketelaars <bjorn.ketela...@hydroxide.nl> wrote: > Diff below brings e2guardian to 5.3.4, which is a bug fix release. From > changelog [0]: > - Fix #565 segfault when no write permission on generated certs > directory > - Fix #493 referexception not working > - Fix #549 - Url in CGI and bypass wrong in MITM > - Bug fix sigwait code for OpenBSD > > Changes to the port: > - Upstream has fixed sigwait code, as such remove relevant bits from > patch-src_FatController_cpp
It's sad that upstream has to emulate sigtimedwait using sigwait and SIGALRM. I hope the emulation is as correct as what our patch did. > Testing: > - Lightly run tested on amd64. Note that I only played a bit with this > port, nothing serious. > > Comments/OK? The new files in PLIST should probably be @sampled. > [0] https://github.com/e2guardian/e2guardian/blob/v5.3.4/ChangeLog > > > diff --git Makefile Makefile > index 6ed036472e1..188a525976b 100644 > --- Makefile > +++ Makefile > @@ -2,7 +2,7 @@ > > GH_ACCOUNT = e2guardian > GH_PROJECT = e2guardian > -GH_TAGNAME = 5.3.3 > +GH_TAGNAME = v5.3.4 > > COMMENT = content scanning web filter > CATEGORIES = www net > diff --git distinfo distinfo > index b8064b9d2a3..bc0d2e23fad 100644 > --- distinfo > +++ distinfo > @@ -1,2 +1,2 @@ > -SHA256 (e2guardian-5.3.3.tar.gz) = > nYj30sM54BWG0mfyWjAYaC0RW4qq3Bi+2uke+rUchbQ= > -SIZE (e2guardian-5.3.3.tar.gz) = 2009254 > +SHA256 (e2guardian-5.3.4.tar.gz) = > CaEH/Xkb6S7csIN7j9ytYmkoFi0F4xrlP6j+Ott9VlI= > +SIZE (e2guardian-5.3.4.tar.gz) = 2083057 > diff --git patches/patch-configs_e2guardian_conf_in > patches/patch-configs_e2guardian_conf_in > index f5554370e95..21b191f1cc9 100644 > --- patches/patch-configs_e2guardian_conf_in > +++ patches/patch-configs_e2guardian_conf_in > @@ -3,10 +3,10 @@ $OpenBSD: patch-configs_e2guardian_conf_in,v 1.1.1.1 > 2019/09/18 16:34:03 sthen E > Index: configs/e2guardian.conf.in > --- configs/e2guardian.conf.in.orig > +++ configs/e2guardian.conf.in > -@@ -568,7 +568,7 @@ logconnectionhandlingerrors = on > - # This figure is the maximum number of concurrent connections. > - # If more connections are made, connections will queue until a worker > thread is free. > - # On large site you might want to try 5000 (max value 20000) > +@@ -577,7 +577,7 @@ logconnectionhandlingerrors = on > + # On 32-bit systems reduce this to 300 to avoid exceeding the <4GB > + # virtual memory limit and on Linux decrease the thread stack size from > + # 10MB to 2MB (ulimit -s 2048) > -httpworkers = 500 > +httpworkers = 50 > > diff --git patches/patch-configs_e2guardianf1_conf_in > patches/patch-configs_e2guardianf1_conf_in > index 2d1623471ba..b68ad4f9c7c 100644 > --- patches/patch-configs_e2guardianf1_conf_in > +++ patches/patch-configs_e2guardianf1_conf_in > @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_e2guardianf1_conf_in,v 1.1.1.1 > 2019/09/18 16:34:03 sthen > Index: configs/e2guardianf1.conf.in > --- configs/e2guardianf1.conf.in.orig > +++ configs/e2guardianf1.conf.in > -@@ -303,7 +303,7 @@ bypasskey = '' > +@@ -308,7 +308,7 @@ bypasskey = '' > #cgikey = 'you must change this text in order to be secure' > > # Users will not be able to bypass sites/urls in these lists > diff --git patches/patch-src_FatController_cpp > patches/patch-src_FatController_cpp > index cbbe878a4e5..8b44d503ef4 100644 > --- patches/patch-src_FatController_cpp > +++ patches/patch-src_FatController_cpp > @@ -3,18 +3,7 @@ $OpenBSD: patch-src_FatController_cpp,v 1.1.1.1 2019/09/18 > 16:34:03 sthen Exp $ > Index: src/FatController.cpp > --- src/FatController.cpp.orig > +++ src/FatController.cpp > -@@ -46,6 +46,10 @@ > - #include <openssl/conf.h> > - #endif //__SSLMITM > - > -+#if defined(__OpenBSD__) > -+#include <sys/syscall.h> > -+#endif > -+ > - #include "FatController.hpp" > - #include "ConnectionHandler.hpp" > - #include "DynamicURLList.hpp" > -@@ -194,7 +198,7 @@ void stat_rec::reset() > +@@ -194,7 +194,7 @@ void stat_rec::reset() > fprintf(fs, "%s %d %d %d %d %ld %ld > %ld %ld %d %d\n", buffer, o.http_workers, > bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, > mfd, LC); > } else { > @@ -23,15 +12,3 @@ Index: src/FatController.cpp > bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, > mfd, LC); > } > > -@@ -1696,7 +1700,11 @@ int fc_controlit() // > - } > - timeout.tv_sec = 5; > - timeout.tv_nsec = (long) 0; > -+#if defined(__OpenBSD__) > -+ rc = syscall(SYS___thrsigdivert, signal_set, NULL, &timeout); > -+#else > - rc = sigtimedwait(&signal_set, NULL, &timeout); > -+#endif > - if (rc < 0) { > - if (errno != EAGAIN) { > - syslog(LOG_INFO, "%sUnexpected error from sigtimedwait() %d > %s", thread_id.c_str(), errno, strerror(errno)); > diff --git pkg/PLIST pkg/PLIST > index 969d2736f05..97401f52af8 100644 > --- pkg/PLIST > +++ pkg/PLIST > @@ -253,6 +253,7 @@ > share/examples/e2guardian/lists/contentscanners/exceptionvirussitelist > @sample ${SYSCONFDIR}/e2guardian/lists/contentscanners/exceptionvirussitelist > share/examples/e2guardian/lists/contentscanners/exceptionvirusurllist > @sample ${SYSCONFDIR}/e2guardian/lists/contentscanners/exceptionvirusurllist > +share/examples/e2guardian/lists/domainsnobypass > share/examples/e2guardian/lists/embededreferersiteiplist > @sample ${SYSCONFDIR}/e2guardian/lists/embededreferersiteiplist > share/examples/e2guardian/lists/embededreferersitelist > @@ -343,6 +344,9 @@ share/examples/e2guardian/lists/logsitelist > @sample ${SYSCONFDIR}/e2guardian/lists/logsitelist > share/examples/e2guardian/lists/logurllist > @sample ${SYSCONFDIR}/e2guardian/lists/logurllist > +share/examples/e2guardian/lists/newbannedphraselist > +share/examples/e2guardian/lists/newexceptionphraselist > +share/examples/e2guardian/lists/newweightedphraselist > share/examples/e2guardian/lists/nocheckcertsiteiplist > @sample ${SYSCONFDIR}/e2guardian/lists/nocheckcertsiteiplist > share/examples/e2guardian/lists/nocheckcertsitelist > @@ -367,10 +371,21 @@ > share/examples/e2guardian/lists/phraselists/chat/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/chat/weighted > share/examples/e2guardian/lists/phraselists/chat/weighted_italian > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/chat/weighted_italian > +share/examples/e2guardian/lists/phraselists/chinesebig5/ > +share/examples/e2guardian/lists/phraselists/chinesebig5/pornography/ > +share/examples/e2guardian/lists/phraselists/chinesebig5/pornography/weighted > +share/examples/e2guardian/lists/phraselists/chinesegb2312/ > +share/examples/e2guardian/lists/phraselists/chinesegb2312/pornography/ > +share/examples/e2guardian/lists/phraselists/chinesegb2312/pornography/weighted > share/examples/e2guardian/lists/phraselists/conspiracy/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/conspiracy/ > share/examples/e2guardian/lists/phraselists/conspiracy/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/conspiracy/weighted > +share/examples/e2guardian/lists/phraselists/danish/ > +share/examples/e2guardian/lists/phraselists/danish/goodphrases/ > +share/examples/e2guardian/lists/phraselists/danish/goodphrases/weighted_general > +share/examples/e2guardian/lists/phraselists/danish/pornography/ > +share/examples/e2guardian/lists/phraselists/danish/pornography/weighted > share/examples/e2guardian/lists/phraselists/domainsforsale/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/domainsforsale/ > share/examples/e2guardian/lists/phraselists/domainsforsale/weighted > @@ -379,10 +394,22 @@ > share/examples/e2guardian/lists/phraselists/drugadvocacy/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/drugadvocacy/ > share/examples/e2guardian/lists/phraselists/drugadvocacy/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/drugadvocacy/weighted > +share/examples/e2guardian/lists/phraselists/dutch/ > +share/examples/e2guardian/lists/phraselists/dutch/badwords/ > +share/examples/e2guardian/lists/phraselists/dutch/badwords/weighted > +share/examples/e2guardian/lists/phraselists/dutch/goodphrases/ > +share/examples/e2guardian/lists/phraselists/dutch/goodphrases/weighted_general > +share/examples/e2guardian/lists/phraselists/dutch/pornography/ > +share/examples/e2guardian/lists/phraselists/dutch/pornography/weighted > share/examples/e2guardian/lists/phraselists/forums/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/forums/ > share/examples/e2guardian/lists/phraselists/forums/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/forums/weighted > +share/examples/e2guardian/lists/phraselists/french/ > +share/examples/e2guardian/lists/phraselists/french/badwords/ > +share/examples/e2guardian/lists/phraselists/french/badwords/weighted > +share/examples/e2guardian/lists/phraselists/french/pornography/ > +share/examples/e2guardian/lists/phraselists/french/pornography/weighted > share/examples/e2guardian/lists/phraselists/gambling/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/gambling/ > share/examples/e2guardian/lists/phraselists/gambling/banned > @@ -397,6 +424,11 @@ share/examples/e2guardian/lists/phraselists/games/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/games/ > share/examples/e2guardian/lists/phraselists/games/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/games/weighted > +share/examples/e2guardian/lists/phraselists/german/ > +share/examples/e2guardian/lists/phraselists/german/badwords/ > +share/examples/e2guardian/lists/phraselists/german/badwords/weighted > +share/examples/e2guardian/lists/phraselists/german/pornography/ > +share/examples/e2guardian/lists/phraselists/german/pornography/weighted > share/examples/e2guardian/lists/phraselists/goodphrases/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/goodphrases/ > share/examples/e2guardian/lists/phraselists/goodphrases/exception > @@ -449,10 +481,25 @@ > share/examples/e2guardian/lists/phraselists/intolerance/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/intolerance/weighted > share/examples/e2guardian/lists/phraselists/intolerance/weighted_portuguese > @sample > ${SYSCONFDIR}/e2guardian/lists/phraselists/intolerance/weighted_portuguese > +share/examples/e2guardian/lists/phraselists/italian/ > +share/examples/e2guardian/lists/phraselists/italian/badwords/ > +share/examples/e2guardian/lists/phraselists/italian/badwords/weighted > +share/examples/e2guardian/lists/phraselists/italian/chat/ > +share/examples/e2guardian/lists/phraselists/italian/chat/weighted > +share/examples/e2guardian/lists/phraselists/italian/pornography/ > +share/examples/e2guardian/lists/phraselists/italian/pornography/weighted > +share/examples/e2guardian/lists/phraselists/japanese/ > +share/examples/e2guardian/lists/phraselists/japanese/pornography/ > +share/examples/e2guardian/lists/phraselists/japanese/pornography/weighted > share/examples/e2guardian/lists/phraselists/legaldrugs/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/legaldrugs/ > share/examples/e2guardian/lists/phraselists/legaldrugs/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/legaldrugs/weighted > +share/examples/e2guardian/lists/phraselists/malay/ > +share/examples/e2guardian/lists/phraselists/malay/goodphrases/ > +share/examples/e2guardian/lists/phraselists/malay/goodphrases/weighted_general > +share/examples/e2guardian/lists/phraselists/malay/pornography/ > +share/examples/e2guardian/lists/phraselists/malay/pornography/weighted > share/examples/e2guardian/lists/phraselists/malware/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/malware/ > share/examples/e2guardian/lists/phraselists/malware/weighted > @@ -465,6 +512,9 @@ share/examples/e2guardian/lists/phraselists/news/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/news/ > share/examples/e2guardian/lists/phraselists/news/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/news/weighted > +share/examples/e2guardian/lists/phraselists/norwegian/ > +share/examples/e2guardian/lists/phraselists/norwegian/pornography/ > +share/examples/e2guardian/lists/phraselists/norwegian/pornography/weighted > share/examples/e2guardian/lists/phraselists/nudism/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/nudism/ > share/examples/e2guardian/lists/phraselists/nudism/weighted > @@ -479,6 +529,11 @@ > share/examples/e2guardian/lists/phraselists/personals/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/personals/weighted > share/examples/e2guardian/lists/phraselists/personals/weighted_portuguese > @sample > ${SYSCONFDIR}/e2guardian/lists/phraselists/personals/weighted_portuguese > +share/examples/e2guardian/lists/phraselists/polish/ > +share/examples/e2guardian/lists/phraselists/polish/goodphrases/ > +share/examples/e2guardian/lists/phraselists/polish/goodphrases/weighted_general > +share/examples/e2guardian/lists/phraselists/polish/pornography/ > +share/examples/e2guardian/lists/phraselists/polish/pornography/weighted > share/examples/e2guardian/lists/phraselists/pornography/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/pornography/ > share/examples/e2guardian/lists/phraselists/pornography/banned > @@ -517,6 +572,30 @@ > share/examples/e2guardian/lists/phraselists/pornography/weighted_spanish > @sample > ${SYSCONFDIR}/e2guardian/lists/phraselists/pornography/weighted_spanish > share/examples/e2guardian/lists/phraselists/pornography/weighted_swedish > @sample > ${SYSCONFDIR}/e2guardian/lists/phraselists/pornography/weighted_swedish > +share/examples/e2guardian/lists/phraselists/portuguese/ > +share/examples/e2guardian/lists/phraselists/portuguese/badwords/ > +share/examples/e2guardian/lists/phraselists/portuguese/badwords/weighted > +share/examples/e2guardian/lists/phraselists/portuguese/gambling/ > +share/examples/e2guardian/lists/phraselists/portuguese/gambling/banned > +share/examples/e2guardian/lists/phraselists/portuguese/gambling/weighted > +share/examples/e2guardian/lists/phraselists/portuguese/goodphrases/ > +share/examples/e2guardian/lists/phraselists/portuguese/goodphrases/weighted_general > +share/examples/e2guardian/lists/phraselists/portuguese/gore/ > +share/examples/e2guardian/lists/phraselists/portuguese/gore/weighted > +share/examples/e2guardian/lists/phraselists/portuguese/illegaldrugs/ > +share/examples/e2guardian/lists/phraselists/portuguese/illegaldrugs/weighted > +share/examples/e2guardian/lists/phraselists/portuguese/intolerance/ > +share/examples/e2guardian/lists/phraselists/portuguese/intolerance/banned > +share/examples/e2guardian/lists/phraselists/portuguese/intolerance/weighted > +share/examples/e2guardian/lists/phraselists/portuguese/personals/ > +share/examples/e2guardian/lists/phraselists/portuguese/personals/banned > +share/examples/e2guardian/lists/phraselists/portuguese/personals/weighted > +share/examples/e2guardian/lists/phraselists/portuguese/pornography/ > +share/examples/e2guardian/lists/phraselists/portuguese/pornography/weighted > +share/examples/e2guardian/lists/phraselists/portuguese/violence/ > +share/examples/e2guardian/lists/phraselists/portuguese/violence/weighted > +share/examples/e2guardian/lists/phraselists/portuguese/weapons/ > +share/examples/e2guardian/lists/phraselists/portuguese/weapons/weighted > share/examples/e2guardian/lists/phraselists/proxies/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/proxies/ > share/examples/e2guardian/lists/phraselists/proxies/weighted > @@ -525,6 +604,12 @@ share/examples/e2guardian/lists/phraselists/rta/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/rta/ > share/examples/e2guardian/lists/phraselists/rta/banned > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/rta/banned > +share/examples/e2guardian/lists/phraselists/russian-1251/ > +share/examples/e2guardian/lists/phraselists/russian-1251/pornography/ > +share/examples/e2guardian/lists/phraselists/russian-1251/pornography/weighted > +share/examples/e2guardian/lists/phraselists/russian-koi8-r/ > +share/examples/e2guardian/lists/phraselists/russian-koi8-r/pornography/ > +share/examples/e2guardian/lists/phraselists/russian-koi8-r/pornography/weighted > share/examples/e2guardian/lists/phraselists/safelabel/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/safelabel/ > share/examples/e2guardian/lists/phraselists/safelabel/banned > @@ -533,10 +618,20 @@ > share/examples/e2guardian/lists/phraselists/secretsocieties/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/secretsocieties/ > share/examples/e2guardian/lists/phraselists/secretsocieties/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/secretsocieties/weighted > +share/examples/e2guardian/lists/phraselists/spanish/ > +share/examples/e2guardian/lists/phraselists/spanish/badwords/ > +share/examples/e2guardian/lists/phraselists/spanish/badwords/weighted > +share/examples/e2guardian/lists/phraselists/spanish/pornography/ > +share/examples/e2guardian/lists/phraselists/spanish/pornography/weighted > share/examples/e2guardian/lists/phraselists/sport/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/sport/ > share/examples/e2guardian/lists/phraselists/sport/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/sport/weighted > +share/examples/e2guardian/lists/phraselists/swedish/ > +share/examples/e2guardian/lists/phraselists/swedish/goodphrases/ > +share/examples/e2guardian/lists/phraselists/swedish/goodphrases/weighted_general > +share/examples/e2guardian/lists/phraselists/swedish/pornography/ > +share/examples/e2guardian/lists/phraselists/swedish/pornography/weighted > share/examples/e2guardian/lists/phraselists/translation/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/translation/ > share/examples/e2guardian/lists/phraselists/translation/weighted > @@ -545,6 +640,44 @@ share/examples/e2guardian/lists/phraselists/travel/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/travel/ > share/examples/e2guardian/lists/phraselists/travel/weighted > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/travel/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/ > +share/examples/e2guardian/lists/phraselists/ukenglish/badwords/ > +share/examples/e2guardian/lists/phraselists/ukenglish/badwords/banned > +share/examples/e2guardian/lists/phraselists/ukenglish/badwords/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/chat/ > +share/examples/e2guardian/lists/phraselists/ukenglish/chat/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/drugadvocacy/ > +share/examples/e2guardian/lists/phraselists/ukenglish/drugadvocacy/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/gambling/ > +share/examples/e2guardian/lists/phraselists/ukenglish/gambling/banned > +share/examples/e2guardian/lists/phraselists/ukenglish/gambling/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/games/ > +share/examples/e2guardian/lists/phraselists/ukenglish/games/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/goodphrases/ > +share/examples/e2guardian/lists/phraselists/ukenglish/goodphrases/exception_email > +share/examples/e2guardian/lists/phraselists/ukenglish/goodphrases/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/goodphrases/weighted_news > +share/examples/e2guardian/lists/phraselists/ukenglish/gore/ > +share/examples/e2guardian/lists/phraselists/ukenglish/gore/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/illegaldrugs/ > +share/examples/e2guardian/lists/phraselists/ukenglish/illegaldrugs/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/intolerance/ > +share/examples/e2guardian/lists/phraselists/ukenglish/intolerance/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/nudism/ > +share/examples/e2guardian/lists/phraselists/ukenglish/nudism/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/personals/ > +share/examples/e2guardian/lists/phraselists/ukenglish/personals/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/pornography/ > +share/examples/e2guardian/lists/phraselists/ukenglish/pornography/banned > +share/examples/e2guardian/lists/phraselists/ukenglish/pornography/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/proxies/ > +share/examples/e2guardian/lists/phraselists/ukenglish/proxies/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/violence/ > +share/examples/e2guardian/lists/phraselists/ukenglish/violence/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/warezhacking/ > +share/examples/e2guardian/lists/phraselists/ukenglish/warezhacking/weighted > +share/examples/e2guardian/lists/phraselists/ukenglish/weapons/ > +share/examples/e2guardian/lists/phraselists/ukenglish/weapons/weighted > share/examples/e2guardian/lists/phraselists/upstreamfilter/ > @sample ${SYSCONFDIR}/e2guardian/lists/phraselists/upstreamfilter/ > share/examples/e2guardian/lists/phraselists/upstreamfilter/weighted > @@ -579,6 +712,7 @@ share/examples/e2guardian/lists/searchregexplist > @sample ${SYSCONFDIR}/e2guardian/lists/searchregexplist > share/examples/e2guardian/lists/sslsiteregexplist > @sample ${SYSCONFDIR}/e2guardian/lists/sslsiteregexplist > +share/examples/e2guardian/lists/urlnobypass > share/examples/e2guardian/lists/urlredirectregexplist > @sample ${SYSCONFDIR}/e2guardian/lists/urlredirectregexplist > share/examples/e2guardian/lists/urlregexplist > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
