Merge pull request #3028 from stangri/19.07-luci-app-simple-adblock

[19.07] luci-app-simple-adblock: dns resolver value bugfix (#3000)

luci-app-simple-adblock: dns resolver value bugfix (#3000)

Signed-off-by: Stan Grishin <stangri@melmac.net>

Merge pull request #3016 from stangri/19.07-luci-app-advanced-reboot

[19.07] luci-app-advanced-reboot/: bugfix for when network.lan.ipaddr is a table

Merge pull request #3019 from stangri/19.07-luci-app-simple-adblock

[19.07] luci-app-simple-adblock: delete extra file

luci-app-simple-adblock: delete extra file

Signed-off-by: Stan Grishin <stangri@melmac.net>

luci-app-advanced-reboot/: bugfix for when network.lan.ipaddr is a table

Signed-off-by: Stan Grishin <stangri@melmac.net>

luci-app-adblock: sync with adblock 3.8.0

* add support for the 'null' blocking variant in dnsmasq
  (via addn-hosts), see new select box 'DNS Variant'
* add support for 'DNS File Reset', where the final DNS blockfile
  will be purged after DNS backend loading (save storage space)
* Provide additional Runtime information:
  'DNS Variant' and 'Backup Directory'
* add E-Mail notification options to LuCI

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 9400fc7536399d38fb81a43a49911f0248a15e7b)

Merge pull request #2992 from stangri/19.07-luci-app-simple-adblock

[19.07] luci-app-simple-adblock: support for varios DNS resolvers/options

Merge pull request #2987 from stangri/19.07-luci-app-advanced-reboot

[19.07] luci-app-advanced-reboot: support for Linksys EA8300

[19.07] luci-app-simple-adblock: support for varios DNS resolvers/options

Signed-off-by: Stan Grishin <stangri@melmac.net>

[19.07] luci-app-advanced-reboot: [18.06] luci-app-advanced-reboot: luci-app-advanced-reboot: support for Linksys EA8300

Signed-off-by: Stan Grishin <stangri@melmac.net>

luci-app-travelmate: sync with 1.4.10

* wifi add/edit: add a select box to reference an external script
  for automated captive portal logins
* fix a visual issue with material theme

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 4e75e3710c6bf5595e9852dd99cadf3332cf484b)

luci-base: cbi.js: do not forcibly sort synamic list items

Ref: https://forum.openwrt.org/t/cannot-save-certain-fields/42738/2
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit dbf83e35bb6e4d203eca917d4dfef2b270dd34ff)

luci-base: cbi.js: save filled out but not added dynlist items on submit

Fixes: #2938
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-app-statistics: cpufreq: tweak graphs

* Frequency usage percentage stats are by kHz instead of Hz.
  Correct the labels. (Linux natively uses kHz for CPU frequency stats,
  but collectd scales the current frequency stats item to Hz.)

* Show frequency usage percentage graph before the transition counts,
  as it is more descriptive.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 24c0e7ca4c9d9fbffc94133e710facdb039fedab)

protocols: fix contains_interface() implementation in several backends

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1fc8d021edc6d60b49b607c917d23b0655a69d47)

luci-lib-ip: support specifying source address in route()

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d73553e5303587ccecf05a91ead258054c9a70eb)

luci-app-statistics: cpufreq: enhance additional data

* Use the new data series sorting and coloring options to
  display the frequencies in order and with matching coloring in
  different cores.

* Fix the y-axis text and legend in the frequency usage graph

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 05cad423ce2582a2828f35291c825f8ce7eb38a1)

luci-app-statistics: add options for graph series sorting and color

Add two data series-level options "negweight" and "posweight" that
will use the numerical value of the data instance name
as the sorting factor. This enables e.g. sorting by CPU frequency
in the cpufreq module.

Add new graph-level option "ordercolor" to use colorsfrom a
pre-defined color table for the data series. This enables keeping
similar colors for similar data series in different plugin instances.
E.g. CPU frequencies in several cores that are handled and displayed
separately.
 (note: the table has 8 items and if there are more series, it uses
  the same colors again. The table can be easily extended/modified)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 4ca5727785ddeec33e26c6f8e5f5390ac2c75ed7)

luci-base: index.html: add extend cache-control directive

Fixes: #2942
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1fe45a934445378115bfd09a48136c23b0df3a63)

luci-app-statistics: cpufreq: changes in data structure

Collectd 5.9.0 changed the data structure of the cpufreq plugin:
CPU cores are now handled as separate plugin instances.

There are also new data items per core:
 * time spent at each frequency
 * amount of frequency transitions

Enable these new data items, but initially hide them behind
a new config option "ExtraItems" (default: disabled), as
the amount of graphs in multi-core systems could be rather large.

Note that the frequencies are not (yet) sorted, so the
information value of the time-spent graph is semi-random.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit e6f30bb7f39c67e1b2eaf312aa8d1f06e7b0a0ab)

luci-app-https_dns_proxy: better handling of ports, update of dhcp config

Signed-off-by: Stan Grishin <stangri@melmac.net>
(cherry picked from commit 85989079f61598c826c8bfb45c1bdacaf468fa59)

Merge pull request #2913 from rosysong/openwrt-19.07

luci-theme-rosy: fix #2887

luci-theme-rosy: fix #2887

Signed-off-by: Rosy Song <rosysong@rosinson.com>

Merge pull request #2840 from stangri/19.07-luci-app-advanced-reboot

[19.07] luci-app-advanced-reboot: fix README url in Makefile

[19.07] luci-app-advanced-reboot: fix README url in Makefile

Signed-off-by: Stan Grishin <stangri@melmac.net>

Fix a overview page style issue for various themes

Fixed a overview page style issue with interface boxes for
bootstrap, material and rosy themes.

The issue only appears in the Chrome browser and lies in the
fact that the block with the device name and MAC address gets
out of the  interface block.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit 5d26fec0bf3701f5a0b875bacd0b2f3898449e96)

Revert "luci-base: luasrcdiet: switch to scm clone and fix tarball name"

This reverts commit faa5f0eacd2b2c90c33a75ee1e7fd3ec776601af.

Fixes: #2834
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8055ed4c469516932a7abceed41b13cc7a11de35)

luci-base: hide autocomplete-preventing password input with bigger offset

Fixes openwrt/luci#2624

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 3a24c2dbaa9b781504bb2847153e2514bcbe717e)

luci-base: nowrap for password input and reveal button

Fixes openwrt/luci#2624

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from commit 609f5290c8d582def0a6334519f5e31aad19abde)

Merge pull request #2829 from stangri/openwrt-19.07-luci-app-simple-adblock

luci-app-simple-adblock: sync with the latest version of simple-adblock

luci-app-simple-adblock: sync with the latest version of simple-adblock

Signed-off-by: Stan Grishin <stangri@melmac.net>

timezone data: update to 2019b

Update timezone data to 2019b

http://mm.icann.org/pipermail/tz-announce/2018-December/000055.html
http://mm.icann.org/pipermail/tz/2019-July/028249.html

2019a:
* Palestine "springs forward" on 2019-03-30 instead of 2019-03-23.
* Brazil no longer observes DST.

2019b:
* Palestine's 2019 spring-forward transition was on 03-29, not 03-30.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2f769ee0872aab8dd31bd793739b7a527e8789f6)

lucihttp: update to latest Git HEAD

a34a17d src: allow overriding buffer size from cli in multipart tester
730a46f lib: fix potentially lost bytes in boundary parsing across buffer limits
8734af2 lib: add buffer tracing to multipart parser
913051b src: add file dump option to multipart test utility
c419539 src: allow specifying custom buffer sizes in multipart testcases
f6e0564 lib: fix handling of empty multipart fields

Fixes: #2816
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 66c8ebfeffcffdcfcdf64888b7685dca26f82ff5)

luci-app-travelmate: sync with update 1.4.8

* add optional 'trm_scanbuffer' parm
* fix wrong lua escape character in wifi edit
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit ee80de6a7b2b24b56eb8280d7e21f6cd745d58c9)

luci-base: show niced processes on Status/Processes page

Modify the process status filter to allow also the processes
with a nice value to be visible on the Status/Processes page.

Filter out the top process itself.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1c80eb196282c7119fd26bc03451f4d6ca3710ac)

luci-mod-network: os-release variables have been renamed to OPENWRT_

commit 8a34a54b6aa6 ("base-files: use OPENWRT prefix for os-release
variables") changes the prefix of the os-release variables from LEDE_
to OPENWRT_.  Use the new name.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
(cherry picked from commit 689934196ffb76e12bbda3f06f1d9bf86b60311d)

luci-app-opkg: honor installed flag to skip half-installed packages

Do not consider half-installed packages (which happens after an
installation failure) to be installed.

Ref: https://github.com/openwrt/luci/pull/2775
Signed-off-by: Dirk Brenken <dev@brenken.org>
[split into multiple commits, refactored code, use local variables]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 88282c14cf521f195536370c004d953e289ea3e4)

treewide: fix datetype/datatype typo

Fix 'datetype' typo.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #2772 from jjm2473/patch-2

luci-app-aria2: fix: datatype

luci-app-aria2: fix: datatype

just a spelling mistake.

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>

luci-mod-system: prevent clearing rc.local on unrelated submit actions

Fixes: #2760
Fixes: 1c09ee5e4 ("luci-mod-system: fix SimpleForm usage on file editing pages")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-base: update Traditional Chinese translation

Signed-off-by: Perry Thompson <contact@ryper.org>

luci-base: update Traditional Chinese translation

update Traditional Chinese translations.

Signed-off-by: Andy Yun <a962702@yahoo.com>

luci-base: update Traditional Chinese translation
update Traditional Chinese translation.
Signed-off-by: Andy Yun <a962702@yahoo.com>

Merge pull request #2762 from musashino205/l10n/mwan3-upd-ja

luci-app-mwan3: update Japanese translation

luci-app-mwan3: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #2755 from dibdot/lxc

luci-app-lxc: add conffiles define

luci-app-lxc: add conffiles define

- fix #2754

Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #2753 from tano-systems/pr-luci-base-update-ru-translation

luci-base: update Russian translation

luci-base: update Russian translation

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>

luci-mod-system: fix SimpleForm usage on file editing pages

When a value identical to the stored one is submitted, the CBI framework
will not emit an option write event and therfore not store the value in
the form data dictionary passed to SimpleForm.handle().

This usage pattern usally works be accident for file editor views such
as admin_system/crontab because \r\n windows style line endings are
substituted with unix \n ones before writing the data, defeating the
equality check in CBI.

When a single line without trailing newline is submitted however, the
CBI will not see a difference to the data stored in the file and clear
out the value on subsequent saves.

This commit alignes the logic used by various SimpleForm views to
behave identically and predictable:

 - File data is handled in the SimpleForm.handle() callback
 - The forcewrite property is used to disable equality checks
 - Submission of an empty string empties the backing file

Fixes: #2737
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

lucihttp: update to latest Git HEAD

f6e0564 lib: fix handling of empty multipart fields
91c01c3 lib: fix multipart state transition in boundary parsing

Fixes: #2737
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #2744 from TDT-AG/pr/20190603-luci-app-mwan3

luci-app-mwan3: change flush_conntrack option to list option

Merge pull request #2748 from dibdot/duid-fix

luci-base: fix duid_to_mac reference in status.lua

luci-base: fix duid_to_mac reference in status.lua

* fix for openwrt/packages#9148

Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #2746 from TDT-AG/pr/20190603-luci-theme-material

luci-theme-material: fix checkbox css StaticList view

luci-theme-material: fix checkbox css StaticList view

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

themes: don't reset theme on package upgrades

Fixes: #2743
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #2742 from Ansuel/odhcp-lease

luci-base: handle dhcp lease from odhcpd

luci-app-mwan3: change flush_conntrack option to list option

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-base: handle dhcp lease from odhcpd

Currently only the dnsmasq lease file is read for hostname hint. If someone use only odhcpd as dhcp daemon the hostname resolution on wifi_assoc list is broken.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

luci-base: adds duid_to_mac to sys.lua

Move duid_to_mac function from status.lua to sys.lua.
Implement translation from DUID-LL without header to MAC

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

build: i18n-scan.pl: properly handle bracket-quoted strings

Fixes: #2738
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #2733 from castillofrancodamian/samba4

luci-app-samba4: Update Spanish translation

Merge pull request #2734 from castillofrancodamian/tinyproxy

luci-app-tinyproxy: Update Spanish translation

Merge pull request #2735 from castillofrancodamian/statistics

luci-app-statistics: Update Spanish translation

Merge pull request #2394 from gyr0tron/privoxy_hindi

luci-app-privoxy: Added Hindi translation

Added privoxy Hindi translations

Signed-off-by: Simmar Kalsi <simmarkalsi@gmail.com>

Merge pull request #2670 from TDT-AG/pr/20190410-luci-mod-network

luci-mod-network: move auto option to general tab

luci-app-statistics: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

Merge pull request #2673 from jose1711/mjpg-streamer-link

luci-app-mjpg-streamer: add link option

Merge pull request #2391 from Matthias84/patch-4

luci-app-uhttpd: German translation

luci-app-tinyproxy: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

luci-app-samba4: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

Merge pull request #2725 from EricLuehrsen/unbound_view

luci-app-unbound: match dependencies with unbound package

Merge pull request #2732 from castillofrancodamian/hd

luci-app-hd-idle: Update Spanish translation

luci-app-hd-idle: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

Merge pull request #2174 from rosysong/lease-status

luci-base: drop ipv6 lease status when IPV6 is not support

luci-app-unbound: match dependencies with unbound package

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>

Merge pull request #2691 from sumpfralle/patch-1

Various improvements of the German translation

luci-base: Update German translation

The following changes are included:
* properly handle "Präfix" as neuter
* add missing hyphens to many appearances of "Präfix"
* fix spelling
* add few missing translations

Signed-off-by: Lars Kruse <devel@sumpfralle.de>

Merge pull request #2716 from castillofrancodamian/base

luci-base: Update Spanish translation

Merge pull request #2719 from castillofrancodamian/aria2

luci-app-aria2: Update Spanish translation

Merge pull request #2718 from castillofrancodamian/firewall

luci-app-firewall: Update Spanish translation

Merge pull request #2717 from sotux/master-luci-base-zh_CN

luci-base: zh_CN: update Simplified Chinese translation

luci-app-aria2: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

luci-app-firewall: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

luci-base: zh_CN: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>

luci-base: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

Merge pull request #2715 from castillofrancodamian/mjpg

luci-app-mjpg-streamer: Add Spanish translation

luci-app-mjpg-streamer: Add Spanish translation

Add Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

Merge pull request #2714 from castillofrancodamian/watchcat

luci-app-watchcat: Update Spanish translation

Merge pull request #2713 from castillofrancodamian/opkg

luci-app-opkg: Update Spanish translation

luci-app-watchcat: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

luci-app-opkg: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>

Merge pull request #2711 from dibdot/banip

luci-app-banip: change maxqueue default / sync with banIP 0.1.1

Merge pull request #2703 from castillofrancodamian/polipo

luci-app-polipo: Update Spanish translation

Merge pull request #2707 from castillofrancodamian/shadowsocks-libev

luci-app-shadowsocks-libev: Udpate Spanish translation