[prev in list] [next in list] [prev in thread] [next in thread]
List: macports-changes
Subject: [macports-ports] branch master updated: adblock2privoxy: Portfile enhancements
From: Steve Smith <s.t.smith () ieee ! org>
Date: 2019-11-06 10:26:56
Message-ID: 20191106102707.2235.4940 () braeburn ! macports ! org
[Download RAW message or body]
<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6331e5a56595a44fe9dbef7f \
5cf1c6ddfd5f6f0c">https://github.com/macports/macports-ports/commit/6331e5a56595a44fe9dbef7f5cf1c6ddfd5f6f0c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were \
added to refs/heads/master by this push: <span style='display:block; \
white-space:pre;color:#404040;'> new 6331e5a adblock2privoxy: Portfile \
enhancements </span>6331e5a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit \
6331e5a56595a44fe9dbef7f5cf1c6ddfd5f6f0c </span>Author: Steven Thomas Smith \
<s.t.smith@ieee.org>
AuthorDate: Sun Nov 3 10:51:21 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> adblock2privoxy: \
Portfile enhancements </span><span style='display:block; \
white-space:pre;color:#404040;'> </span><span style='display:block; \
white-space:pre;color:#404040;'> * Fix initialize_always variant per comments at \
https://github.com/macports/macports-ports/pull/4978 </span><span \
style='display:block; white-space:pre;color:#404040;'> * Fix spaces </span>---
www/adblock2privoxy/Portfile | 62 +++++++++++++++++++++++++++++---------------
1 file changed, 41 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git \
a/www/adblock2privoxy/Portfile b/www/adblock2privoxy/Portfile </span><span \
style='display:block; white-space:pre;color:#808080;'>index 377742d..dfa57ef 100644 \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- \
a/www/adblock2privoxy/Portfile </span><span style='display:block; \
white-space:pre;background:#e0e0ff;'>+++ b/www/adblock2privoxy/Portfile </span><span \
style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,20 +14,20 @@ \
homepage https://github.com/essandess/adblock2privoxy </span>
description Convert adblock config files to privoxy format
long_description ${description}. \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AdBlock \
Plus browser plugin has great block list files \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- provided by big community, but it \
is client software and \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- cannot work on a server as proxy. \
Privoxy proxy has good \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- potential to block ads at server \
side, but it experiences \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- acute shortage of updated block \
lists. This software \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- converts adblock lists to privoxy \
config files format. \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- Almost all adblock features are \
supported including \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- block/unblock requests (on privoxy) \
all syntax features \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- are supported except for regex \
templates matching host \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- name hide/unhide page elements (via \
CSS) all syntax \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- features are supported all block \
request options except \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- for outdated ones: Supported: \
script, image, stylesheet, \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- object, xmlhttprequest, \
object-subrequest, subdocument, \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- document, elemhide, other, popup, \
third-party, domain=..., \ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ AdBlock Plus browser plugin has \
great block list files\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ provided by big community, but it \
is client software and\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ cannot work on a server as proxy. \
Privoxy proxy has good\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ potential to block ads at server \
side, but it experiences\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ acute shortage of updated block \
lists. This software\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ converts adblock lists to privoxy \
config files format.\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ Almost all adblock features are \
supported including\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ block/unblock requests (on privoxy) \
all syntax features\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ are supported except for regex \
templates matching host\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ name hide/unhide page elements (via \
CSS) all syntax\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ features are supported all block \
request options except\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ for outdated ones: Supported: \
script, image, stylesheet,\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ object, xmlhttprequest, \
object-subrequest, subdocument,\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ document, elemhide, other, popup, \
third-party, domain=...,\ </span> match-case, donottrack.
master_sites https://hackage.haskell.org/package/${name}-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +40,19 @@ \
depends_run-append \ </span> port:nginx \
port:privoxy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant initialize \
\ </span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
description {Initialize all configuration files. Existing </span><span \
style='display:block; white-space:pre;background:#ffe0e0;'>- configurations \
files are not overwritten by default.} {} </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+variant initialize_always \ </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Always \
initialize all configuration files. Intended\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ for development and troubleshooting \
only. Working deployments\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ must disable this variant to prevent \
configuration files\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ being overwritten at the next upgrade. \
Existing configuration\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ files are not overwritten by default.} \
{ </span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
ui_warn \ </span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
" </span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\tAll \
configuration files will be initialized because </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\tthe variant +initialize_always is set. Please \
disable </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\tthis variant for working deployments. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} </span>
# relative paths to ${prefix}
set ab2p_datadir share/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,7 +152,7 @@ \
post-activate { </span> ${prefix}/etc/${name}/nginx.conf \
${prefix}/etc/${name}/css/default.html \
] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { \
[variant_isset "initialize"] </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ if { [variant_isset \
"initialize_always"] </span> && [file exists ${f}]
} {
delete ${f}.previous
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +160,7 @@ \
post-activate { </span> ${f} \
${f}.previous
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { \
[variant_isset "initialize"] </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ if { [variant_isset \
"initialize_always"] </span> || ![file exists ${f}]
} {
if { [file isfile ${f}.macports] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,5 +187,15 @@ \
adblock2privoxy -p ${prefix}/etc/adblock2privoxy/privoxy -w ${prefix}/etc/adbloc \
</span> Update run:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-adblock2privoxy -t \
${prefix}/etc/adblock2privoxy/privoxy/ab2p.task </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-" </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+adblock2privoxy -t \
${prefix}/etc/adblock2privoxy/privoxy/ab2p.task" </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+if { [variant_isset "initialize_always"] } { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if \
{[exists notes]} { </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ # leave a blank line after the existing \
notes </span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
notes-append "" </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ } </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ notes-append \ </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+ "The variant \
+initialize_always is set, which initializes\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ all configuration files. Please disable \
this variant for\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ working deployments." </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+} </span></pre><pre \
style='margin:0'>
</pre>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic