search

openwrt / luci

LuCI - OpenWrt Configuration Interface
Apache License 2.0
6.29k stars 2.51k forks source link

probably latest changes luci-app-adblock and/or other "adblock" - some erros to luci working #1087

Closed build000 closed 7 years ago

build000 commented 7 years ago

@dibdot or @hnyman , or someone... Page: https://192.168.1.1/cgi-bin/luci/admin/services , system: LEDE Reboot SNAPSHOT r3888-8fb39f1 / LuCI Master (git-17.086.51727-8504fd6), theme: OpenWrt, routers: WNDR4300,WITI,TL-WR1043NDv1(WNDR4700 - no any adblock packages - working fine), web browser: FF-52.0.1 - ubuntu-16.04.1-x64 .

Message from web browser:

XML Parsing Error: not well-formed Location: https://witi.lan/cgi-bin/luci/admin/services Line Number 122, Column 177:
<input name="runtime" id="runtime" type="text" class="cbi-input-text" style="border: none; box-shadow: none; background-color: #ffffff; color: #0069d6;" value="2.5.0" disabled />

@hnyman ...if you wish only english comunicate/messages...hmmm...fixing.

EDIT 1: WNDR4300,WITI,TL-WR1043NDv1: LEDE Reboot SNAPSHOT r3883-2ebfdab / LuCI Master (git-17.086.38025-98f0099) - working fine (no updates all packages "adblock" - source-lede and/or luci-lede ).

EDIT 2: WNDR4700 (no any "adblock" packages) - working fine: different kernel (4.9.17)/lede/luci version: LEDE Reboot SNAPSHOT r3883-2ebfdab / LuCI Master (git-17.086.38025-98f0099). updates:

dom@slawek:~/Pulpit/Projekty/WNDR4700-LEDE-REBOOT$ git pull
remote: Counting objects: 48, done.
remote: Compressing objects: 100% (44/44), done.
remote: Total 48 (delta 33), reused 0 (delta 0)
Unpacking objects: 100% (48/48), done.
From https://git.lede-project.org/source
   2ebfdab..8fb39f1  master     -> origin/master
   1b94737..910a943  lede-17.01 -> origin/lede-17.01
Updating 2ebfdab..8fb39f1
Fast-forward
 package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch       | 11 +++++++++++
 package/network/config/firewall/Makefile                                      |  2 +-
 package/network/config/firewall/files/firewall.config                         | 29 +++++++++++++++--------------
 target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi            | 28 ++++++++++++++--------------
 target/linux/ipq806x/patches-4.9/0032-phy-add-qcom-dwc3-phy.patch             |  2 +-
 target/linux/ramips/patches-4.9/0004-MIPS-ralink-add-MT7621-pcie-driver.patch | 28 ++++++++++++++++++----------
 6 files changed, 60 insertions(+), 40 deletions(-)
 create mode 100644 package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch
dom@slawek:~/Pulpit/Projekty/WNDR4700-LEDE-REBOOT$ make package/symlinks V=s
./scripts/feeds update -a
Updating feed 'packages' from 'https://git.lede-project.org/feed/packages.git' ...
remote: Counting objects: 65, done.
remote: Compressing objects: 100% (59/59), done.
remote: Total 65 (delta 36), reused 8 (delta 0)
Unpacking objects: 100% (65/65), done.
From https://git.lede-project.org/feed/packages
   a071401..afeac70  master     -> origin/master
Updating a071401..afeac70
Fast-forward
 lang/php7-pecl-dio/Makefile                                                         |   4 +-
 lang/php7-pecl-http/patches.old/100_config9-m4.patch                                |  22 -----------
 lang/ruby/Makefile                                                                  |   5 ++-
 libs/libsoc/Makefile                                                                |  71 ++++++++++++++++++++++++++++++++++
 net/haproxy/Makefile                                                                |   8 ++--
 net/haproxy/patches/0001-MINOR-config-warn-when-some-HTTP-rules-are-used-in-a.patch |  61 -----------------------------
 net/haproxy/patches/0002-BUG-MINOR-spoe-Fix-soft-stop-handler-using-a-specifi.patch |  58 ----------------------------
 net/haproxy/patches/0003-BUG-MINOR-spoe-Fix-parsing-of-arguments-in-spoe-mess.patch |  33 ----------------
 net/haproxy/patches/0004-BUG-MEDIUM-ssl-Clear-OpenSSL-error-stack-after-tryin.patch |  44 ---------------------
 net/haproxy/patches/0005-BUG-MEDIUM-cli-Prevent-double-free-in-CLI-ACL-lookup.patch |  32 ----------------
 net/haproxy/patches/0006-BUG-MINOR-Fix-get-map-map-value-CLI-command.patch          |  32 ----------------
 net/haproxy/patches/0007-BUG-MAJOR-connection-update-CO_FL_CONNECTED-before-c.patch | 100 ------------------------------------------------
 net/memcached/Makefile                                                              |   4 +-
 net/mwan3/Makefile                                                                  |   2 +-
 net/mwan3/files/lib/mwan3/mwan3.sh                                                  |   5 ++-
 net/mwan3/files/usr/sbin/mwan3track                                                 |  23 ++++++++---
 net/tcpreplay/Makefile                                                              |   5 ++-
 utils/mmc-utils/Makefile                                                            |   6 +--
 18 files changed, 111 insertions(+), 404 deletions(-)
 delete mode 100644 lang/php7-pecl-http/patches.old/100_config9-m4.patch
 create mode 100755 libs/libsoc/Makefile
 delete mode 100644 net/haproxy/patches/0001-MINOR-config-warn-when-some-HTTP-rules-are-used-in-a.patch
 delete mode 100644 net/haproxy/patches/0002-BUG-MINOR-spoe-Fix-soft-stop-handler-using-a-specifi.patch
 delete mode 100644 net/haproxy/patches/0003-BUG-MINOR-spoe-Fix-parsing-of-arguments-in-spoe-mess.patch
 delete mode 100644 net/haproxy/patches/0004-BUG-MEDIUM-ssl-Clear-OpenSSL-error-stack-after-tryin.patch
 delete mode 100644 net/haproxy/patches/0005-BUG-MEDIUM-cli-Prevent-double-free-in-CLI-ACL-lookup.patch
 delete mode 100644 net/haproxy/patches/0006-BUG-MINOR-Fix-get-map-map-value-CLI-command.patch
 delete mode 100644 net/haproxy/patches/0007-BUG-MAJOR-connection-update-CO_FL_CONNECTED-before-c.patch
Create index file './feeds/packages.index' 
Checking 'working-make'... ok.
Checking 'case-sensitive-fs'... ok.
Checking 'proper-umask'... ok.
Checking 'gcc'... ok.
Checking 'working-gcc'... ok.
Checking 'g++'... ok.
Checking 'working-g++'... ok.
Checking 'ncurses'... ok.
Checking 'zlib'... ok.
Checking 'perl-thread-queue'... ok.
Checking 'tar'... ok.
Checking 'find'... ok.
Checking 'bash'... ok.
Checking 'patch'... ok.
Checking 'diff'... ok.
Checking 'cp'... ok.
Checking 'seq'... ok.
Checking 'awk'... ok.
Checking 'grep'... ok.
Checking 'getopt'... ok.
Checking 'stat'... ok.
Checking 'unzip'... ok.
Checking 'bzip2'... ok.
Checking 'wget'... ok.
Checking 'perl'... ok.
Checking 'python'... ok.
Checking 'git'... ok.
Checking 'file'... ok.
Checking 'ldconfig-stub'... ok.
+ mkdir -p /home/dom/Pulpit/Projekty/WNDR4700-LEDE-REBOOT/staging_dir/toolchain-powerpc_464fp_gcc-5.4.0_musl
+ cd /home/dom/Pulpit/Projekty/WNDR4700-LEDE-REBOOT/staging_dir/toolchain-powerpc_464fp_gcc-5.4.0_musl
+ ln -nsf lib lib64
+ ln -nsf lib lib32
+ mkdir -p stamp lib usr/include usr/lib
Collecting package info: done
Updating feed 'luci' from 'https://git.lede-project.org/project/luci.git' ...
remote: Counting objects: 40, done.
remote: Compressing objects: 100% (30/30), done.
remote: Total 40 (delta 17), reused 0 (delta 0)
Unpacking objects: 100% (40/40), done.
From https://git.lede-project.org/project/luci
   98f0099..8504fd6  master     -> origin/master
Updating 98f0099..8504fd6
Fast-forward
 applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua |  51 +++++++++-------
 applications/luci-app-adblock/po/ja/adblock.po                          | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
 applications/luci-app-adblock/po/pt-br/adblock.po                       | 180 +++++++++++++++++++++++++++++++++++++++++++++---------
 applications/luci-app-adblock/po/sv/adblock.po                          | 137 +++++++++++++++++++++++++++++++++++------
 applications/luci-app-adblock/po/templates/adblock.pot                  | 112 +++++++++++++++++++++++++++++-----
 applications/luci-app-adblock/po/zh-cn/adblock.po                       | 158 ++++++++++++++++++++++++++++++++++++++++-------
 6 files changed, 703 insertions(+), 134 deletions(-)
Create index file './feeds/luci.index' 
Updating feed 'routing' from 'https://git.lede-project.org/feed/routing.git' ...
Already up-to-date.
Create index file './feeds/routing.index' 
Updating feed 'telephony' from 'https://git.lede-project.org/feed/telephony.git' ...
Already up-to-date.
Create index file './feeds/telephony.index' 
./scripts/feeds install -a
Collecting package info: done
Collecting target info: done
Installing all packages from feed packages.
Installing package 'libsoc' from packages
Installing all packages from feed luci.
Installing all packages from feed routing.
Installing all packages from feed telephony.
dom@slawek:~/Pulpit/Projekty/WNDR4700-LEDE-REBOOT$ git branch
* master
dom@slawek:~/Pulpit/Projekty/WNDR4700-LEDE-REBOOT$

...and build/installation new firmware: LEDE Reboot SNAPSHOT r3888-8fb39f1 / LuCI Master (git-17.086.51727-8504fd6) - https://192.168.1.1/cgi-bin/luci/admin/services still working fine - no any "adblock" packages.

Conclusion: adblock; luci-app-adblock or/and other packages "adblock" - requires fixing.

hnyman commented 7 years ago

Sorry, Polish is not my strong suit :-(

But how does the error manifest itself? just the error message about somthing invalid? and exactly on which page?

And with which theme...

cc to author: @dibdot

dibdot commented 7 years ago

OK, that's easy - I'll send a fix later today.

dibdot commented 7 years ago

1088

build000 commented 7 years ago

Confirm: this commit https://github.com/openwrt/luci/commit/3dc08a354b4f5212fdaf54764729a025a14167cf fixing problem. luci-app-adblock..."new" working...hehe (tested for all my routers).

@dibdot If possible add polish source list:

config source 'polish'
        option enabled '1'
        option adb_src 'http://adblocklist.org/adblock-pxf-polish.txt'
        option adb_src_rset '{FS=\"[|^]\"} \$0 ~/^\|\|([A-Za-z0-9_-]+\.){1,}[A-Za-z]+\^$/{print tolower(\$3)}'
        option adb_src_desc 'focus on polish ads'