adblock: update 4.4.2-3

* minor reporting improvements in LuCI
* readme update
* cosmetics

Signed-off-by: Dirk Brenken <[email protected]>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 35945dbebf5ac86acbd21b1dceb2e0f300c3e624..9a341b03ce0decf72e876b0bf8dcb8e9d9a0df61 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.4.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <[email protected]>
 

diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md
index 2fc6a7de184081985eaa7d917e580f4912ef7a83..617e0611d0c1871870d8ea17853f32e075d728d6 100644 (file)
--- a/net/adblock/files/README.md
+++ b/net/adblock/files/README.md
@@ -128,6 +128,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 ## Installation & Usage
 * Make a backup and update your local opkg/apk repository
 * Install the LuCI companion package 'luci-app-adblock' which also installs the main 'adblock' package as a dependency
+* Enable the adblock system service (System -> Startup) and enable adblock itself (adblock -> General Settings)
 * It's strongly recommended to use the LuCI frontend to easily configure all aspects of adblock, the application is located in LuCI under the 'Services' menu
 * It is also strongly recommended to configure a ‘Startup Trigger Interface’ to ensure automatic adblock startup on WAN-ifup events during boot or reboot of your router
 
@@ -172,7 +173,7 @@ Available commands:
 | adb_trigger        | -, not set                         | trigger network interface or 'not set' to use a time-based startup                             |
 | adb_triggerdelay   | 5                                  | additional trigger delay in seconds before adblock processing begins                           |
 | adb_debug          | 0, disabled                        | set to 1 to enable the debug output                                                            |
-| adb_nice           | 0, standard prio.                  | valid nice level range 0-19 of the adblock processes                                           |
+| adb_nicelimit      | 0, standard prio.                  | valid nice level range 0-19 of the adblock processes                                           |
 | adb_dnsshift       | 0, disabled                        | shift the blocklist to the backup directory and only set a soft link to this file in memory    |
 | adb_dnsforce       | 0, disabled                        | set to 1 to force DNS requests to the local resolver                                           |
 | adb_dnsdir         | -, auto-detected                   | path for the generated blocklist file 'adb_list.overall'                                       |
@@ -270,6 +271,7 @@ In total, this feed selection blocks about 100K domains. It may also be useful t
 Please note: don't just blindly activate (too) many feeds at once, sooner or later this will lead to OOM conditions.  
 
 **DNS reporting, enable the GeoIP Map**  
+adblock includes a powerful reporting tool on the DNS Report tab which shows the latest DNS statistics generated by tcpdump. To get the latest statistics always press the "Refresh" button.  
 In addition to a tabular overview adblock reporting includes a GeoIP map in a modal popup window/iframe that shows the geolocation of your own uplink addresses (in green) and the locations of blocked domains in red. To enable the GeoIP Map set the following option in "Advanced Report Settings" config tab:  
 
     * set 'adb_map' to '1' to include the external components listed below and activate the GeoIP map

diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index 134844b229d3742f550cfb7bc8974d7f5a0310b6..af08de8297a534c985b0757e0666e8299c7de3a3 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -1222,7 +1222,6 @@ f_main() {
                src_tmpload="${adb_tmpload}.${src_name}.load"
                src_tmparchive="${adb_tmpload}.${src_name}.archive"
                src_tmpfile="${adb_tmpfile}.${src_name}"
-
                src_rc=4
 
                # basic pre-checks