Release v1.2.4.0

britannic · Aug 8, 2020 · d54d9ba · d54d9ba
1 parent 31f8ad6
commit d54d9ba
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 ## Releases
 
+## Release 1.2.4.0 (August 9, 2020)
+
+* Implement a workaround to conserve memory on the ER-X routers
+ * Fixes dnsmasq restart
+
+ ```bash
+ error: fork/exec /bin/bash: cannot allocate memory
+ ```
+
 ## Release 1.2.3.7 (August 8, 2020)
 
 * Remove [sysctl.org source](https://sysctl.org/cameleon/) as list is no longer maintained

diff --git a/README.header b/README.header
@@ -1,6 +1,6 @@
 # **UBNT edgeos-dnsmasq-blacklist dnsmasq DNS Blacklisting and Redirection**
 
-[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/britannic/blacklist/blob/master/LICENSE.txt "View the software license here")[![Version](https://img.shields.io/badge/version-v1.2.3.7-green.svg)](https://github.com/britannic/blacklist "Latest version")[![GoDoc](https://godoc.org/github.com/britannic/blacklist?status.svg)](https://godoc.org/github.com/britannic/blacklist "Go documentation")[![Build Status](https://travis-ci.org/britannic/blacklist.svg?branch=master)](https://travis-ci.org/britannic/blacklist "Build status for this version")[![Coverage Status](https://coveralls.io/repos/github/britannic/blacklist/badge.svg?branch=master "")](https://coveralls.io/github/britannic/blacklist?branch=master "Test coverage status for this version")[![Go Report Card](https://goreportcard.com/badge/gojp/goreportcard)](https://goreportcard.com/report/github.com/britannic/blacklist "Quality of Go code for this version")
+[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/britannic/blacklist/blob/master/LICENSE.txt "View the software license here")[![Version](https://img.shields.io/badge/version-v1.2.4.0-green.svg)](https://github.com/britannic/blacklist "Latest version")[![GoDoc](https://godoc.org/github.com/britannic/blacklist?status.svg)](https://godoc.org/github.com/britannic/blacklist "Go documentation")[![Build Status](https://travis-ci.org/britannic/blacklist.svg?branch=master)](https://travis-ci.org/britannic/blacklist "Build status for this version")[![Coverage Status](https://coveralls.io/repos/github/britannic/blacklist/badge.svg?branch=master "")](https://coveralls.io/github/britannic/blacklist?branch=master "Test coverage status for this version")[![Go Report Card](https://goreportcard.com/badge/gojp/goreportcard)](https://goreportcard.com/report/github.com/britannic/blacklist "Quality of Go code for this version")
 
 Follow the conversation @ [community.ubnt.com](https://community.ubnt.com/t5/EdgeRouter/DNS-Adblocking-amp-Blacklisting-dnsmasq-Configuration/td-p/2215008/jump-to/first-unread-message "Follow the conversation about this software in the EdgeRouter forum (https://community.ubnt.com/t5/EdgeRouter/)")
 
@@ -106,14 +106,20 @@ modification, are permitted provided that the following conditions are met:
 
 ## **Latest Version**
 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest](https://img.shields.io/badge/Release-v1.2.3.7-green.svg)](https://github.com/britannic/blacklist/releases/latest "Latest version")
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest](https://img.shields.io/badge/Release-v1.2.4.0-green.svg)](https://github.com/britannic/blacklist/releases/latest "Latest version")
 
-### Release v1.2.3.6 (July 8, 2020)
+## Release 1.2.4.0 (August 9, 2020)
 
-* Move "OISD Domains Light" to hosts source (per [amoeba00](https://community.ui.com/user/9f2abc79-fcd8-4dda-9233-c0306f22f4df))
-* Add -safe switch for fail-over mode
-* Remove hosts "OSID Mobile Blocklist"
-* Add "OISD Domains Light" (per [amoeba00](https://community.ui.com/user/9f2abc79-fcd8-4dda-9233-c0306f22f4df))
+* Implement a workaround to conserve memory on the ER-X routers
+ * Fixes dnsmasq restart
+
+ ```bash
+ error: fork/exec /bin/bash: cannot allocate memory
+ ```
+
+## Release 1.2.3.7 (August 8, 2020)
+
+* Remove [sysctl.org source](https://sysctl.org/cameleon/) as list is no longer maintained
 
 [[Top]](#contents)
 
@@ -178,8 +184,8 @@ sudo apt-get update && sudo apt-get install edgeos-dnsmasq-blacklist
 ### **EdgeRouter ERLite-3, ERPoe-5, ER4, UniFi-Gateway-3 & UniFi-Gateway-4**
 
 ```bash
-curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.3.7_mips.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.3.7_mips.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.4.0_mips.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.0_mips.deb
 ```
 
 [[Top]](#contents)
@@ -196,8 +202,8 @@ delete system image
 * Now download and install the edgeos-dnsmasq-blacklist package
 
 ```bash
-curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.3.7_mipsel.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.3.7_mipsel.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.4.0_mipsel.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.0_mipsel.deb
 ```
 
 [[Top]](#contents)

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # **UBNT edgeos-dnsmasq-blacklist dnsmasq DNS Blacklisting and Redirection**
 
-[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/britannic/blacklist/blob/master/LICENSE.txt "View the software license here")[![Version](https://img.shields.io/badge/version-v1.2.3.7-green.svg)](https://github.com/britannic/blacklist "Latest version")[![GoDoc](https://godoc.org/github.com/britannic/blacklist?status.svg)](https://godoc.org/github.com/britannic/blacklist "Go documentation")[![Build Status](https://travis-ci.org/britannic/blacklist.svg?branch=master)](https://travis-ci.org/britannic/blacklist "Build status for this version")[![Coverage Status](https://coveralls.io/repos/github/britannic/blacklist/badge.svg?branch=master "")](https://coveralls.io/github/britannic/blacklist?branch=master "Test coverage status for this version")[![Go Report Card](https://goreportcard.com/badge/gojp/goreportcard)](https://goreportcard.com/report/github.com/britannic/blacklist "Quality of Go code for this version")
+[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/britannic/blacklist/blob/master/LICENSE.txt "View the software license here")[![Version](https://img.shields.io/badge/version-v1.2.4.0-green.svg)](https://github.com/britannic/blacklist "Latest version")[![GoDoc](https://godoc.org/github.com/britannic/blacklist?status.svg)](https://godoc.org/github.com/britannic/blacklist "Go documentation")[![Build Status](https://travis-ci.org/britannic/blacklist.svg?branch=master)](https://travis-ci.org/britannic/blacklist "Build status for this version")[![Coverage Status](https://coveralls.io/repos/github/britannic/blacklist/badge.svg?branch=master "")](https://coveralls.io/github/britannic/blacklist?branch=master "Test coverage status for this version")[![Go Report Card](https://goreportcard.com/badge/gojp/goreportcard)](https://goreportcard.com/report/github.com/britannic/blacklist "Quality of Go code for this version")
 
 Follow the conversation @ [community.ubnt.com](https://community.ubnt.com/t5/EdgeRouter/DNS-Adblocking-amp-Blacklisting-dnsmasq-Configuration/td-p/2215008/jump-to/first-unread-message "Follow the conversation about this software in the EdgeRouter forum (https://community.ubnt.com/t5/EdgeRouter/)")
 
@@ -106,14 +106,20 @@ modification, are permitted provided that the following conditions are met:
 
 ## **Latest Version**
 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest](https://img.shields.io/badge/Release-v1.2.3.7-green.svg)](https://github.com/britannic/blacklist/releases/latest "Latest version")
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest](https://img.shields.io/badge/Release-v1.2.4.0-green.svg)](https://github.com/britannic/blacklist/releases/latest "Latest version")
 
-### Release v1.2.3.6 (July 8, 2020)
+## Release 1.2.4.0 (August 9, 2020)
 
-* Move "OISD Domains Light" to hosts source (per [amoeba00](https://community.ui.com/user/9f2abc79-fcd8-4dda-9233-c0306f22f4df))
-* Add -safe switch for fail-over mode
-* Remove hosts "OSID Mobile Blocklist"
-* Add "OISD Domains Light" (per [amoeba00](https://community.ui.com/user/9f2abc79-fcd8-4dda-9233-c0306f22f4df))
+* Implement a workaround to conserve memory on the ER-X routers
+ * Fixes dnsmasq restart
+
+ ```bash
+ error: fork/exec /bin/bash: cannot allocate memory
+ ```
+
+## Release 1.2.3.7 (August 8, 2020)
+
+* Remove [sysctl.org source](https://sysctl.org/cameleon/) as list is no longer maintained
 
 [[Top]](#contents)
 
@@ -178,8 +184,8 @@ sudo apt-get update && sudo apt-get install edgeos-dnsmasq-blacklist
 ### **EdgeRouter ERLite-3, ERPoe-5, ER4, UniFi-Gateway-3 & UniFi-Gateway-4**
 
 ```bash
-curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.3.7_mips.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.3.7_mips.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.4.0_mips.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.0_mips.deb
 ```
 
 [[Top]](#contents)
@@ -196,8 +202,8 @@ delete system image
 * Now download and install the edgeos-dnsmasq-blacklist package
 
 ```bash
-curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.3.7_mipsel.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.3.7_mipsel.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.4.0_mipsel.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.0_mipsel.deb
 ```
 
 [[Top]](#contents)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.3.7
+1.2.4.0
diff --git a/index.md b/index.md
@@ -2,6 +2,15 @@
 
 ## Releases
 
+## Release 1.2.4.0 (August 9, 2020)
+
+* Implement a workaround to conserve memory on the ER-X routers
+ * Fixes dnsmasq restart
+
+ ```bash
+ error: fork/exec /bin/bash: cannot allocate memory
+ ```
+
 ## Release 1.2.3.7 (August 8, 2020)
 
 * Remove [sysctl.org source](https://sysctl.org/cameleon/) as list is no longer maintained

diff --git a/internal/edgeos/config.go b/internal/edgeos/config.go
@@ -170,11 +170,11 @@ func (c *Config) GetTotalStats() (dropped, extracted, kept int32) {
  }
  }
 
- if kept+dropped != 0 {
- c.Log.Noticef("Total entries found: %d", extracted)
- c.Log.Noticef("Total entries extracted %d", kept)
- c.Log.Noticef("Total entries dropped %d", dropped)
- }
+ // if kept+dropped != 0 {
+ //  c.Log.Noticef("Total entries found: %d", extracted)
+ //  c.Log.Noticef("Total entries extracted %d", kept)
+ //  c.Log.Noticef("Total entries dropped %d", dropped)
+ // }
  return dropped, extracted, kept
 }
 
@@ -438,8 +438,11 @@ func (c *Config) Blacklist(r ConfLoader) error {
 // ReloadDNS reloads the dnsmasq configuration
 func (c *Config) ReloadDNS() ([]byte, error) {
  // nolint
- cmd := exec.Command(c.Bash)
- cmd.Stdin = strings.NewReader(c.DNSsvc)
+ bcmd := c.Bash
+ dnssvc := c.DNSsvc
+ c = nil // workaround to release memory for ER-X
+ cmd := exec.Command(bcmd)
+ cmd.Stdin = strings.NewReader(dnssvc)
  return cmd.CombinedOutput()
 }
 

diff --git a/main.go b/main.go
@@ -68,8 +68,15 @@ func main() {
  }
  }
 
- c.GetTotalStats()
+ dropped, extracted, kept := c.GetTotalStats()
+ if kept+dropped != 0 {
+ c.Log.Noticef("Total entries found: %d", extracted)
+ c.Log.Noticef("Total entries extracted %d", kept)
+ c.Log.Noticef("Total entries dropped %d", dropped)
+ }
+
  reloadDNS(c)
+
  logNoticef("%v", "Blacklist update completed......")
 }