diff --git a/package/ctcgfw/bpytop/Makefile b/package/ctcgfw/bpytop/Makefile index d4c882891d..2908832451 100644 --- a/package/ctcgfw/bpytop/Makefile +++ b/package/ctcgfw/bpytop/Makefile @@ -8,39 +8,46 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bpytop -PKG_VERSION:=1.0.52 +PKG_VERSION:=1.0.53 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/aristocratos/bpytop/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=15ef1bd094d945b9145343566c2596bb34922870e6be56c3cc028b33aff056fa -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PYPI_NAME:=bpytop +PKG_HASH:=d08b8120444e7f35fe032b33495ca551b5890702130c45ad8a56c1fa978fc358 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE +include $(TOPDIR)/feeds/packages/lang/python/pypi.mk include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk -define Package/$(PKG_NAME) +define Package/bpytop SECTION:=admin CATEGORY:=Administration TITLE:=Python port of bashtop URL:=https://github.com/aristocratos/bpytop - DEPENDS:=+python3-distutils +python3-logging +python3-openssl \ - +python3-psutil +python3-urllib + DEPENDS:=+python3-psutil +python3-setuptools endef -define Package/$(PKG_NAME)/description +define Package/bpytop/description Resource monitor that shows usage and stats for processor, memory, disks, network and processes. endef -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bpytop.py $(1)/usr/bin/bpytop - $(INSTALL_DIR) $(1)/usr/share/bpytop - $(CP) -pr $(PKG_BUILD_DIR)/themes $(1)/usr/share/bpytop - chmod 755 $(1)/usr/bin/bpytop +define Package/bpytop/install + $(call Py3Package/$(1)/install,$(1)) + $(call Py3Package/ProcessFilespec,$(1),$(PKG_INSTALL_DIR),$(1)) + $(FIND) $(1) -name '*.exe' -delete + $(call Python3/CompileAll,$(1)) + $(call Python3/DeleteSourceFiles,$(1)) + $(call Python3/DeleteEmptyDirs,$(1)) + if [ -d "$(1)/usr/bin" ]; then \ + $(call Python3/FixShebang,$(1)/usr/bin/*) ; \ + fi + $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/share/bpytop + $(CP) $(PKG_BUILD_DIR)/bpytop-themes/* $(PKG_INSTALL_DIR)/usr/share/bpytop/ endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call Py3Package,bpytop)) +$(eval $(call BuildPackage,bpytop)) +#$(eval $(call BuildPackage,bpytop-src)) diff --git a/package/ctcgfw/luci-app-jd-dailybonus/Makefile b/package/ctcgfw/luci-app-jd-dailybonus/Makefile index 2a4e56245a..b8a76bbd41 100644 --- a/package/ctcgfw/luci-app-jd-dailybonus/Makefile +++ b/package/ctcgfw/luci-app-jd-dailybonus/Makefile @@ -12,8 +12,8 @@ LUCI_DEPENDS:=+node +node-request +coreutils +coreutils-nohup +wget LUCI_PKGARCH:=all PKG_NAME:=luci-app-jd-dailybonus -PKG_VERSION:=0.8.8 -PKG_RELEASE:=20201204 +PKG_VERSION:=0.8.9 +PKG_RELEASE:=20201230 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-jd-dailybonus/htdocs/jd-dailybonus/JDCookie.crx b/package/ctcgfw/luci-app-jd-dailybonus/htdocs/jd-dailybonus/JDCookie.crx deleted file mode 100644 index c061b9c83c..0000000000 Binary files a/package/ctcgfw/luci-app-jd-dailybonus/htdocs/jd-dailybonus/JDCookie.crx and /dev/null differ diff --git a/package/ctcgfw/luci-app-jd-dailybonus/htdocs/jd-dailybonus/JDCookie.zip b/package/ctcgfw/luci-app-jd-dailybonus/htdocs/jd-dailybonus/JDCookie.zip index 412f30d8f1..54bcf0cd5c 100644 Binary files a/package/ctcgfw/luci-app-jd-dailybonus/htdocs/jd-dailybonus/JDCookie.zip and b/package/ctcgfw/luci-app-jd-dailybonus/htdocs/jd-dailybonus/JDCookie.zip differ diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm index 3e8df6bf00..a88d8248be 100644 --- a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm @@ -2,12 +2,11 @@
- - +
帮助 - <%= translate("Click to Install copy cookie tools,And click the jd link below. if you can't install the crx extensions,please download the JDCookie.zip,unzip it,and use load Unpacked extensions to install.link:[chrome://extensions/]")%> + <%= translate("Click to download the JDCookie.zip,unzip it,and use load Unpacked extensions to install.link:[chrome://extensions/]")%>
diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm index 26790dbbca..947f9d5057 100644 --- a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm @@ -213,11 +213,12 @@ //更新脚本 $("#update_script").click(function () { - if (!needUpdate) { - //获取远端脚本版本 check_version() - } else { - $("#update_script").attr("disabled", true); + return false; + }); + + function updateS(){ + $("#update_script").attr("disabled", true); $("#update_script").val(UPDATING_TEXT); //console.log(data); var data = { @@ -230,7 +231,6 @@ data: data, success: function (d) { if (d.error == 0) { - $("#update_script").val(NEW_VERSION); $(".cbi-value-version").text("v" + newVersion); } else { @@ -239,10 +239,7 @@ } } }); - } - - return false; - }); + } function get_realtime_log() { @@ -292,7 +289,7 @@ $("#update_script").val(UPDATE_TEXT + " v" + data.new_version); $("#update_script").attr("data-version", data.new_version); newVersion = data.new_version; - needUpdate = true; + updateS(); } else { $("#update_script").val(NEW_VERSION + " v" + data.new_version); } diff --git a/package/ctcgfw/luci-app-jd-dailybonus/po/zh-cn/jd-dailybonus.po b/package/ctcgfw/luci-app-jd-dailybonus/po/zh-cn/jd-dailybonus.po index e58389ae04..22daa12df6 100644 --- a/package/ctcgfw/luci-app-jd-dailybonus/po/zh-cn/jd-dailybonus.po +++ b/package/ctcgfw/luci-app-jd-dailybonus/po/zh-cn/jd-dailybonus.po @@ -22,6 +22,9 @@ msgstr "基本设置" msgid "Cookie Tools" msgstr "Cookie 工具" +msgid "JDCookie Tools" +msgstr "获取京东cookie扩展工具" + msgid "Source Update Url" msgstr "更新源地址" @@ -31,14 +34,14 @@ msgstr "主账号Cookie" msgid "Second Cookie" msgstr "第二账号Cookie" -msgid "Click to Install copy cookie tools,And click the jd link below. if you can't install the crx extensions,please download the JDCookie.zip,unzip it,and use load Unpacked extensions to install.link:[chrome://extensions/]" -msgstr "点击上面的按钮安装Cookie工具，然后点击下面的京东链接。如果浏览器禁止安装crx扩展，请下载第二个 JDCookie.zip，解压后在[chrome://extensions/]中使用加载已解压的扩展程序进行安装。 " +msgid "Click to download the JDCookie.zip,unzip it,and use load Unpacked extensions to install.link:[chrome://extensions/]")" +msgstr "点击上面的按钮安装下载JDCookie.zip（获取京东cookie扩展工具），解压后在[chrome://extensions/]中使用加载已解压的扩展程序进行安装。 " msgid "JD Url" msgstr "京东链接" msgid "Sign in ,then click JDCookie button.you will copy JD cookies, paste the cookie below." -msgstr "登录后点击JDCookie 扩展工具复制cookie，然后粘贴到下面输入框中。" +msgstr "登录后点击JDCookie 扩展工具复制cookie，然后粘贴到下面输入框中。（请使用F12调试工具，进入模拟手机浏览器模式）" msgid "Auto Update Script Service" msgstr "自动更新脚本服务" diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/JD_DailyBonus.js b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/JD_DailyBonus.js index 53c3585f1f..c6d411f1fc 100644 --- a/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/JD_DailyBonus.js +++ b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/JD_DailyBonus.js @@ -2,7 +2,7 @@ 京东多合一签到脚本 -更新时间: 2020.12.03 17:00 v1.87 +更新时间: 2020.12.25 17:50 v1.89 有效接口: 40+ 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js 电报频道: @NobyDa @@ -50,7 +50,7 @@ BoxJs订阅地址: https://raw.githubusercontent.com/NobyDa/Script/master/NobyDa ************************* [Script] -京东多合一签到 = type=cron,cronexp=5 0 * * *,wake-system=1,timeout=20,script-path=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js +京东多合一签到 = type=cron,cronexp=5 0 * * *,wake-system=1,timeout=60,script-path=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js 获取京东Cookie = type=http-request,pattern=https:\/\/api\.m\.jd\.com\/client\.action.*functionId=signBean,script-path=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js @@ -123,18 +123,17 @@ async function all() { JingDongShake(stop), //京东摇一摇 JDSecKilling(stop), //京东秒杀 JRLuckyLottery(stop), //金融抽奖顶部签到 - JingDongBuyCar(stop), //京东汽车 + JingDongBuyCar(stop, '5fc3c1f2e91f46f09ab2b722e10d92bf'), //京东汽车 + JingRongDoll(stop, 'JRDoll', '京东金融-签壹', '4D25A6F482'), JingRongDoll(stop, 'JRTwoDoll', '京东金融-签贰', '3A3E839252'), JingRongDoll(stop, 'JRThreeDoll', '京东金融-签叁', '69F5EC743C'), JingRongDoll(stop, 'JRFourDoll', '京东金融-签肆', '30C4F86264'), JingRongDoll(stop, 'JRFiveDoll', '京东金融-签伍', '1D06AA3B0F') ]); await Promise.all([ - // JDUserSignPre(stop, 'JDComputer', '京东电脑-数码', '31HbNBjr6YLyZfJtR5biFFc9ZYXN'), //京东电脑数码馆 + JDUserSignPre(stop, 'JDClothing', '京东商城-服饰', '4RBT3H9jmgYg1k2kBnHF8NAHm7m8'), //京东服饰 JDUserSignPre(stop, 'JDUnderwear', '京东商城-内衣', '4PgpL1xqPSW1sVXCJ3xopDbB1f69'), //京东内衣馆 - // JDUserSignPre(stop, 'JDToyMusic', '京东商城-乐器', '4N6RzwtBZdtdcgodvdsK7ZEzkUbZ'), //京东玩具乐器馆 JDUserSignPre(stop, 'JDShoes', '京东商城-鞋靴', '4RXyb1W4Y986LJW8ToqMK14BdTD'), //京东鞋靴 - // JDUserSignPre(stop, 'JDEsports', '京东商城-电竞', 'CHdHQhA5AYDXXQN9FLt3QUAPRsB'), //京东电竞 JDUserSignPre(stop, 'JDCalendar', '京东日历-翻牌', '36V2Qw59VPNsuLxY84vCFtxFzrFs'), //京东日历翻牌 JDUserSignPre(stop, 'JDChild', '京东商城-童装', '3Af6mZNcf5m795T8dtDVfDwWVNhJ'), //京东童装馆 JDUserSignPre(stop, 'JDBaby', '京东商城-母婴', '3BbAVGQPDd6vTyHYjmAutXrKAos6'), //京东母婴馆 @@ -143,11 +142,12 @@ async function all() { JDUserSignPre(stop, 'JDDrug', '京东商城-医药', '3tqTG5sF1xCUyC6vgEF5CLCxGn7w'), //京东医药馆 JDUserSignPre(stop, 'JDWomen', '京东商城-女装', 'DpSh7ma8JV7QAxSE2gJNro8Q2h9'), //京东女装馆 JDUserSignPre(stop, 'JDFineWine', '京东商城-酒饮', 'zGwAUzL3pVGjptBBGeYfpKjYdtX'), //京东酒饮馆 - JDUserSignPre(stop, 'JDBook', '京东商城-图书', '3SC6rw5iBg66qrXPGmZMqFDwcyXi') //京东图书 + JDUserSignPre(stop, 'JDBook', '京东商城-图书', '3SC6rw5iBg66qrXPGmZMqFDwcyXi'), //京东图书 + JingRongDoll(stop, 'JTDouble', '京东金贴-双签', '1DF13833F7'), //京东金融 金贴双签 + JingRongDoll(stop, 'XJDouble', '金融现金-双签', 'F68B2C3E71', '', '', '', 'xianjin') //京东金融 现金双签 ]); await Promise.all([ JDUserSignPre(stop, 'JDSuitcase', '京东商城-箱包', 'ZrH7gGAcEkY2gH8wXqyAPoQgk6t'), //京东箱包馆 - // JDUserSignPre(stop, 'JDConstell', '京东商城-京鱼', '3BPdJHCESW5cfak79ZRz37wTKbuV'), //京东京鱼座 JDUserSignPre(stop, 'JDSchool', '京东商城-校园', '4812pn2PAcUyfNdWr7Cvpww5MCyW'), //京东校园 JDUserSignPre(stop, 'JDHealth', '京东商城-健康', 'w2oeK5yLdHqHvwef7SMMy4PL8LF'), //京东健康 JDUserSignPre(stop, 'JDPet', '京东商城-宠物', '37ta5sh5ocrMZF3Fz5UMJbTsL42'), //京东宠物馆 @@ -157,15 +157,10 @@ async function all() { JDUserSignPre(stop, 'JDJewels', '京东商城-珠宝', 'zHUHpTHNTaztSRfNBFNVZscyFZU'), //京东珠宝馆 JDUserSignPre(stop, 'JDClocks', '京东商城-钟表', '2BcJPCVVzMEtMUynXkPscCSsx68W'), //京东钟表馆 JDUserSignPre(stop, 'JDMakeup', '京东商城-美妆', '2smCxzLNuam5L14zNJHYu43ovbAP'), //京东美妆馆 - JDUserSignPre(stop, 'JDVege', '京东商城-菜场', 'Wcu2LVCFMkBP3HraRvb7pgSpt64'), //京东菜场 - // JDUserSignPre(stop, 'JDFood', '京东商城-美食', '4PzvVmLSBq5K63oq4oxKcDtFtzJo') //京东美食馆 + JDUserSignPre(stop, 'JDVege', '京东商城-菜场', 'Wcu2LVCFMkBP3HraRvb7pgSpt64') //京东菜场 ]); - await Promise.all([ - JingRongDoll(stop, 'JRSixDoll', '金融现金-双签', 'F68B2C3E71'), //京东金融 现金双签 - JDJTDoubleSign(stop), //京东金融 金贴双签 - JRDoubleSign(stop), //京东金融 京豆双签 - JingDongSpeedUp(stop) //京东天天加速 - ]) + await JingDongSpeedUp(stop); //京东天天加速 + await JingRongDoll(stop, 'JDDouble', '金融京豆-双签', 'F68B2C3E71', '', '', '', 'jingdou'); //京东金融 京豆双签 break; default: await JingDongBean(stop); //京东京豆 @@ -184,20 +179,20 @@ async function all() { await JingDongShake(stop); //京东摇一摇 await JDSecKilling(stop); //京东秒杀 await JRLuckyLottery(stop); //金融抽奖顶部签到 - await JingDongBuyCar(stop); //京东汽车 + await JingDongBuyCar(stop, '5fc3c1f2e91f46f09ab2b722e10d92bf'); //京东汽车 await JingRongDoll(stop, 'JRTwoDoll', '京东金融-签贰', '3A3E839252'); await JingRongDoll(stop, 'JRThreeDoll', '京东金融-签叁', '69F5EC743C'); await JingRongDoll(stop, 'JRFourDoll', '京东金融-签肆', '30C4F86264'); await JingRongDoll(stop, 'JRFiveDoll', '京东金融-签伍', '1D06AA3B0F'); + await JingRongDoll(stop, 'JRDoll', '京东金融-签壹', '4D25A6F482'); + await JingRongDoll(stop, 'XJDouble', '金融现金-双签', 'F68B2C3E71', '', '', '', 'xianjin'); //京东金融 现金双签 + await JingRongDoll(stop, 'JTDouble', '京东金贴-双签', '1DF13833F7'); //京东金融 金贴双签 await JDUserSignPre(stop, 'JDUnderwear', '京东商城-内衣', '4PgpL1xqPSW1sVXCJ3xopDbB1f69'); //京东内衣馆 await JDUserSignPre(stop, 'JDSuitcase', '京东商城-箱包', 'ZrH7gGAcEkY2gH8wXqyAPoQgk6t'); //京东箱包馆 - // await JDUserSignPre(stop, 'JDComputer', '京东电脑-数码', '31HbNBjr6YLyZfJtR5biFFc9ZYXN'); //京东电脑数码馆 - // await JDUserSignPre(stop, 'JDConstell', '京东商城-京鱼', '3BPdJHCESW5cfak79ZRz37wTKbuV'); //京东京鱼座 - // await JDUserSignPre(stop, 'JDToyMusic', '京东商城-乐器', '4N6RzwtBZdtdcgodvdsK7ZEzkUbZ'); //京东玩具乐器馆 + await JDUserSignPre(stop, 'JDClothing', '京东商城-服饰', '4RBT3H9jmgYg1k2kBnHF8NAHm7m8'); //京东服饰 await JDUserSignPre(stop, 'JDSchool', '京东商城-校园', '4812pn2PAcUyfNdWr7Cvpww5MCyW'); //京东校园 await JDUserSignPre(stop, 'JDHealth', '京东商城-健康', 'w2oeK5yLdHqHvwef7SMMy4PL8LF'); //京东健康 await JDUserSignPre(stop, 'JDShoes', '京东商城-鞋靴', '4RXyb1W4Y986LJW8ToqMK14BdTD'); //京东鞋靴 - // await JDUserSignPre(stop, 'JDEsports', '京东商城-电竞', 'CHdHQhA5AYDXXQN9FLt3QUAPRsB'); //京东电竞 await JDUserSignPre(stop, 'JDCalendar', '京东日历-翻牌', '36V2Qw59VPNsuLxY84vCFtxFzrFs'); //京东日历翻牌 await JDUserSignPre(stop, 'JDChild', '京东商城-童装', '3Af6mZNcf5m795T8dtDVfDwWVNhJ'); //京东童装馆 await JDUserSignPre(stop, 'JDBaby', '京东商城-母婴', '3BbAVGQPDd6vTyHYjmAutXrKAos6'); //京东母婴馆 @@ -212,13 +207,10 @@ async function all() { await JDUserSignPre(stop, 'JDMakeup', '京东商城-美妆', '2smCxzLNuam5L14zNJHYu43ovbAP'); //京东美妆馆 await JDUserSignPre(stop, 'JDFineWine', '京东商城-酒饮', 'zGwAUzL3pVGjptBBGeYfpKjYdtX'); //京东酒饮馆 await JDUserSignPre(stop, 'JDVege', '京东商城-菜场', 'Wcu2LVCFMkBP3HraRvb7pgSpt64'); //京东菜场 - // await JDUserSignPre(stop, 'JDFood', '京东商城-美食', '4PzvVmLSBq5K63oq4oxKcDtFtzJo'); //京东美食馆 await JDUserSignPre(stop, 'JDClean', '京东商城-清洁', '2Tjm6ay1ZbZ3v7UbriTj6kHy9dn6'); //京东清洁馆 await JDUserSignPre(stop, 'JDCare', '京东商城-个护', 'NJ1kd1PJWhwvhtim73VPsD1HwY3'); //京东个人护理馆 await JDUserSignPre(stop, 'JDJewels', '京东商城-珠宝', 'zHUHpTHNTaztSRfNBFNVZscyFZU'); //京东珠宝馆 - await JingRongDoll(stop, 'JRSixDoll', '金融现金-双签', 'F68B2C3E71'); //京东金融 现金双签 - await JDJTDoubleSign(stop); //京东金融 金贴双签 - await JRDoubleSign(stop); //京东金融 京豆双签 + await JingRongDoll(stop, 'JDDouble', '金融京豆-双签', 'F68B2C3E71', '', '', '', 'jingdou'); //京东金融 京豆双签 await JingDongSpeedUp(stop); //京东天天加速 break; } @@ -256,10 +248,10 @@ function notify() { notify += merge[i].notify ? "\n" + merge[i].notify : "" } var Cash = merge.TotalCash && merge.TotalCash.TCash ? `${merge.TotalCash.TCash}红包` : "" - var Steel = merge.TotalSteel && merge.TotalSteel.TSteel ? `${merge.TotalSteel.TSteel}钢镚${Cash?`, `:``}` : `` - var beans = merge.TotalBean && merge.TotalBean.Qbear ? `${merge.TotalBean.Qbear}京豆${Steel||Cash?`, `:``}` : "" - var Money = merge.TotalMoney && merge.TotalMoney.TMoney ? `${merge.TotalMoney.TMoney}现金` : "" - var Subsidy = merge.TotalSubsidy && merge.TotalSubsidy.TSubsidy ? `${merge.TotalSubsidy.TSubsidy}金贴${Money?", ":""}` : "" + var Steel = merge.TotalSteel && merge.TotalSteel.TSteel ? `${merge.TotalSteel.TSteel}钢镚` : `` + var beans = merge.TotalBean && merge.TotalBean.Qbear ? `${merge.TotalBean.Qbear}京豆${Steel?`, `:``}` : "" + var Money = merge.TotalMoney && merge.TotalMoney.TMoney ? `${merge.TotalMoney.TMoney}现金${Cash?`, `:``}` : "" + var Subsidy = merge.TotalSubsidy && merge.TotalSubsidy.TSubsidy ? `${merge.TotalSubsidy.TSubsidy}金贴${Money||Cash?", ":""}` : "" var Tbean = bean ? `${bean.toFixed(0)}京豆${steel?", ":""}` : "" var TSteel = steel ? `${steel.toFixed(2)}钢镚` : "" var TCash = cash ? `${cash.toFixed(2)}红包${subsidy||money?", ":""}` : "" @@ -271,12 +263,17 @@ function notify() { var one = `【签到概览】: ${Ts+Tf+Te}${Ts||Tf||Te?`\n`:`获取失败\n`}` var two = Tbean || TSteel ? `【签到奖励】: ${Tbean+TSteel}\n` : `` var three = TCash || TSubsidy || TMoney ? `【其他奖励】: ${TCash+TSubsidy+TMoney}\n` : `` - var four = `【账号总计】: ${beans+Steel+Cash}${beans||Steel||Cash?`\n`:`获取失败\n`}` - var five = `【其他总计】: ${Subsidy+Money}${Subsidy||Money?`\n`:`获取失败\n`}` - var disa = $nobyda.disable ? "\n检测到上次执行意外崩溃, 已为您自动禁用相关接口. 如需开启请前往BoxJs ‼️‼️\n" : "" + var four = `【账号总计】: ${beans+Steel}${beans||Steel?`\n`:`获取失败\n`}` + var five = `【其他总计】: ${Subsidy+Money+Cash}${Subsidy||Money||Cash?`\n`:`获取失败\n`}` var DName = merge.TotalBean && merge.TotalBean.nickname ? merge.TotalBean.nickname : "获取失败" var Name = add ? DualAccount ? `【签到号一】: ${DName}\n` : `【签到号二】: ${DName}\n` : "" - console.log("\n" + Name + one + two + three + four + five + disa + notify) + const disables = $nobyda.read("JD_DailyBonusDisables") + const amount = disables ? disables.split(",").length : 0 + const disa = !notify || amount ? `【温馨提示】: 检测到${$nobyda.disable?`上次执行意外崩溃, `:``}已禁用${notify?`${amount}个`:`所有`}接口, 如需开启请前往BoxJs或查看脚本内第99行注释.\n` : `` + $nobyda.notify("", "", Name + one + two + three + four + five + disa + notify, { + 'media-url': $nobyda.headUrl || 'https://cdn.jsdelivr.net/gh/Orz-3/task@master/jd.png' + }); + $nobyda.headUrl = null; if ($nobyda.isJSBox) { if (add && DualAccount) { Shortcut = Name + one + two + three + "\n" @@ -286,7 +283,6 @@ function notify() { $intents.finish(Shortcut + Name + one + two + three) } } - if (!$nobyda.isNode) $nobyda.notify("", "", Name + one + two + three + four + five + disa + notify); if (DualAccount) { double(); } else { @@ -652,64 +648,6 @@ function JingRongSteel(s) { }); } -function JRDoubleSign(s) { - merge.JRDSign = {}; - return new Promise(resolve => { - if (disable("JRDSign")) return resolve() - setTimeout(() => { - const JRDSUrl = { - url: 'https://nu.jr.jd.com/gw/generic/jrm/h5/m/process?', - headers: { - Cookie: KEY - }, - body: "reqData=%7B%22actCode%22%3A%22FBBFEC496C%22%2C%22type%22%3A3%2C%22riskDeviceParam%22%3A%22%22%7D" - }; - $nobyda.post(JRDSUrl, function(error, response, data) { - try { - if (error) { - throw new Error(error) - } else { - const Details = LogDetails ? "response:\n" + data : ''; - if (data.match(/\"resultCode\":0/)) { - if (data.match(/\"count\":\d+/)) { - console.log("\n" + "京东金融-双签签到成功 " + Details) - merge.JRDSign.bean = data.match(/\"count\":(\d+)/)[1] - merge.JRDSign.notify = "京东金融-双签: 成功, 明细: " + merge.JRDSign.bean + "京豆 🐶" - merge.JRDSign.success = 1 - } else { - if (data.match(/已领取/)) { - merge.JRDSign.notify = "京东金融-双签: 失败, 原因: 已签过 ⚠️" - } else if (data.match(/未在/)) { - merge.JRDSign.notify = "京东金融-双签: 失败, 未在京东签到 ⚠️" - } else if (data.match(/303sq|400sq|重复提交/)) { - return - } else { - merge.JRDSign.notify = "京东金融-双签: 失败, 原因: 无奖励 ⚠️" - } - console.log("\n" + "京东金融-双签签到失败 " + Details) - merge.JRDSign.fail = 1 - } - } else { - console.log("\n" + "京东金融-双签签到失败 " + Details) - merge.JRDSign.fail = 1 - if (data.match(/(\"resultCode\":3|请先登录)/)) { - merge.JRDSign.notify = "京东金融-双签: 失败, 原因: Cookie失效‼️" - } else { - merge.JRDSign.notify = "京东金融-双签: 失败, 原因: 未知 ⚠️" - } - } - } - } catch (eor) { - $nobyda.AnError("京东金融-双签", "JRDSign", eor, response, data) - } finally { - resolve() - } - }) - }, s) - if (out) setTimeout(resolve, out + s) - }); -} - function JingDongShake(s) { if (!merge.JDShake) merge.JDShake = {}, merge.JDShake.success = 0, merge.JDShake.bean = 0, merge.JDShake.notify = ''; return new Promise(resolve => { @@ -1312,7 +1250,7 @@ function JingDongSpeedUp(s, id) { if (!$nobyda.isAllEvents) await JDSpaceEvent(s); //处理太空事件 if (!$nobyda.isAlltasks) await JDQueryTask(s); //处理太空任务 var step3 = await JDQueryTaskID(s); //查询道具ID - var step4 = await JDUseProps(s, step3); //使用道具 + var step4 = await JDUseProps(1000 + s, step3); //使用道具 if (step4 && $nobyda.ItemIsUsed) { //如果使用了道具, 则再次检查任务 await JingDongSpeedUp(s) } else { @@ -1583,47 +1521,45 @@ function JDQueryTaskID(s) { } function JDUseProps(s, PropID) { - return new Promise(resolve => { - if (PropID) { - setTimeout(() => { - var PropCount = 0 - var PropNumTask = 0 - for (var i = 0; i < PropID.length; i++) { - const PropUrl = { - url: 'https://api.m.jd.com/?appid=memberTaskCenter&functionId=energyProp_use&body=%7B%22source%22%3A%22game%22%2C%22energy_id%22%3A%22' + PropID[i] + '%22%7D', - headers: { - Referer: 'https://h5.m.jd.com/babelDiy/Zeus/6yCQo2eDJPbyPXrC3eMCtMWZ9ey/index.html', - Cookie: KEY - } - }; - $nobyda.get(PropUrl, function(error, response, data) { - try { - PropCount++ + return new Promise(async (resolve) => { + $nobyda.PropCount = 0 + $nobyda.PropNumTask = 0 + if (!PropID) return resolve() + for (var i = 0; i < PropID.length; i++) { + const sep = await new Promise(resolve => { + $nobyda.get({ + url: `https://api.m.jd.com/?appid=memberTaskCenter&functionId=energyProp_use&body=%7B%22source%22%3A%22game%22%2C%22energy_id%22%3A%22${PropID[i]}%22%7D`, + headers: { + Referer: 'https://h5.m.jd.com/babelDiy/Zeus/6yCQo2eDJPbyPXrC3eMCtMWZ9ey/index.html', + Cookie: KEY + } + }, (error, response, data) => { + try { + $nobyda.PropCount++ if (error) { throw new Error(error) } else { const cc = JSON.parse(data) const Details = LogDetails ? "response:\n" + data : ''; - console.log("\n天天加速-尝试使用第" + PropCount + "个道具 " + Details) + console.log(`\n天天加速-尝试使用第${$nobyda.PropCount}个道具 (${s/1000}s)${Details}`) if (cc.message == 'success' && cc.success == true) { - PropNumTask += 1 + $nobyda.PropNumTask += 1 } } - } catch (eor) { - $nobyda.AnError("使用道具-加速", "SpeedUp", eor, response, data) - } finally { - if (PropID.length == PropCount) { - console.log("\n天天加速-已成功使用" + PropNumTask + "个道具") - if (PropNumTask) $nobyda.ItemIsUsed = true; - resolve(PropNumTask) - } + } catch (eor) { + $nobyda.AnError("使用道具-加速", "SpeedUp", eor, response, data) + } finally { + if (PropID.length == $nobyda.PropCount) { + if ($nobyda.PropNumTask) $nobyda.ItemIsUsed = true; + console.log(`\n天天加速-已成功使用${$nobyda.PropNumTask}个道具`) + resolve(true) + } else { + setTimeout(resolve, s) } - }) - } - }, s) - if (out) setTimeout(resolve, out + s) - } else { - resolve() + } + }) + }) + if (sep) resolve($nobyda.PropNumTask); } }); } @@ -1646,16 +1582,16 @@ function JingDongSubsidy(s) { throw new Error(error) } else { const Details = LogDetails ? "response:\n" + data : ''; - if (data.match(/\"msg\":\"操作成功\"/)) { + const cc = JSON.parse(data) + if (cc.resultCode == 0 && cc.resultData.data.thisAmount) { console.log("\n" + "京东商城-金贴签到成功 " + Details) - const qt = data.match(/\"thisAmountStr\":\"(.+?)\"/) - merge.subsidy.subsidy = qt ? qt[1] : 0; - merge.subsidy.notify = `京东商城-金贴: 成功, 明细: ${qt?qt[1]:`无`}金贴 💰` + merge.subsidy.subsidy = cc.resultData.data.thisAmountStr + merge.subsidy.notify = `京东商城-金贴: 成功, 明细: ${merge.subsidy.subsidy||`无`}金贴 💰` merge.subsidy.success = 1 } else { console.log("\n" + "京东商城-金贴签到失败 " + Details) merge.subsidy.fail = 1 - if (data.match(/已存在/)) { + if (data.match(/已存在|"thisAmount":0/)) { merge.subsidy.notify = "京东商城-金贴: 失败, 原因: 已签过 ⚠️" } else if (data.match(/请先登录/)) { merge.subsidy.notify = "京东商城-金贴: 失败, 原因: Cookie失效‼️" @@ -1675,7 +1611,7 @@ function JingDongSubsidy(s) { }); } -function JingRongDoll(s, key, title, code, type, num, award) { +function JingRongDoll(s, key, title, code, type, num, award, belong) { merge[key] = {}; return new Promise(resolve => { if (disable(key)) return resolve() @@ -1685,7 +1621,7 @@ function JingRongDoll(s, key, title, code, type, num, award) { headers: { Cookie: KEY }, - body: `reqData=${encodeURIComponent(`{"actCode":"${code}","type":${type?type:`3`}${code=='F68B2C3E71'?`,"frontParam":{"belong":"xianjin"}`:``}}`)}` + body: `reqData=${encodeURIComponent(`{"actCode":"${code}","type":${type?type:`3`}${code=='F68B2C3E71'?`,"frontParam":{"belong":"${belong}"}`:code==`1DF13833F7`?`,"frontParam":{"channel":"JR","belong":4}`:``}}`)}` }; $nobyda.post(DollUrl, async function(error, response, data) { try { @@ -1706,11 +1642,27 @@ function JingRongDoll(s, key, title, code, type, num, award) { merge[key].success = 1 merge[key].notify = `${title}: 成功, 明细: 无奖励 🐶` } - } else if (cc.resultData.data.businessData.businessCode === '000sq' && code === 'F68B2C3E71') { - const ct = data.match(/"count":(\d+),/) - merge[key].success = 1 - merge[key].Money = ct ? ct[1] > 9 ? `0.${ct[1]}` : `0.0${ct[1]}` : 0 - merge[key].notify = `${title}: 成功, 明细: ${merge[key].Money||`无`}现金 💰` + } else if (code == 'F68B2C3E71' || code == '1DF13833F7') { + if (!data.match(/"businessCode":"30\dss?q"/)) { + merge[key].success = 1 + const ct = data.match(/\"count\":\"?(\d.*?)\"?,/) + if (code == 'F68B2C3E71' && belong == 'xianjin') { + merge[key].Money = ct ? ct[1] > 9 ? `0.${ct[1]}` : `0.0${ct[1]}` : 0 + merge[key].notify = `${title}: 成功, 明细: ${merge[key].Money||`无`}现金 💰` + } else if (code == 'F68B2C3E71' && belong == 'jingdou') { + merge[key].bean = ct ? ct[1] : 0; + merge[key].notify = `${title}: 成功, 明细: ${merge[key].bean||`无`}京豆 🐶` + } else if (code == '1DF13833F7') { + merge[key].subsidy = ct ? ct[1] : 0; + merge[key].notify = `${title}: 成功, 明细: ${merge[key].subsidy||`无`}金贴 💰` + } + } else { + const es = cc.resultData.data.businessMsg + const ep = cc.resultData.data.businessData.businessMsg + const tp = data.match(/已领取|300ss?q/) ? `已签过` : `${ep||es||cc.resultMsg||`未知`}` + merge[key].notify = `${title}: 失败, 原因: ${tp} ⚠️` + merge[key].fail = 1 + } } else { merge[key].notify = `${title}: 失败, 原因: 已签过 ⚠️`; merge[key].fail = 1 @@ -2033,46 +1985,6 @@ function JDSecKilling(s) { }, () => {}); } -function JDJTDoubleSign(s) { - merge.JTDouble = {}; - return new Promise(resolve => { - if (disable("JTDouble")) return resolve(); - setTimeout(() => { - $nobyda.post({ - url: 'https://nu.jr.jd.com/gw/generic/jrm/h5/m/process', - headers: { - Cookie: KEY - }, - body: `reqData=${encodeURIComponent('{"type":3,"frontParam":{"channel":"JR","belong":4},"actCode":"1DF13833F7"}')}` - }, (error, response, data) => { - try { - if (error) throw new Error(error); - const cc = JSON.parse(data); - const Details = LogDetails ? "response:\n" + data : ''; - if (cc.resultCode == 0 && cc.resultData.data.businessCode == '000ssq') { - console.log(`\n京东金贴-双签签到成功 ${Details}`) - const qt = data.match(/\"count\":\"?(\d.*?)\"?,/); - merge.JTDouble.success = 1; - merge.JTDouble.subsidy = qt ? qt[1] : 0; - merge.JTDouble.notify = `京东金贴-双签: 成功, 明细: ${merge.JTDouble.subsidy||`无`}金贴 💰`; - } else { - console.log(`\n京东金贴-双签签到失败 ${Details}`) - const es = cc.resultData && cc.resultData.data ? cc.resultData.data.businessMsg : null - const tp = data.match(/已领取|300ssq/) ? `已签过` : cc.resultCode == 3 ? `Cookie失效` : `${es||cc.resultMsg||`未知`}` - merge.JTDouble.notify = `京东金贴-双签: 失败, 原因: ${tp}${cc.resultCode==3?`‼️`:` ⚠️`}` - merge.JTDouble.fail = 1 - } - } catch (eor) { - $nobyda.AnError("京东金贴-双签", "JTDouble", eor, response, data) - } finally { - resolve() - } - }) - }, s) - if (out) setTimeout(resolve, out + s) - }); -} - function JRLuckyLottery(s) { //https://jdda.jd.com/app/hd/#/turntable merge.JRLottery = {}; return new Promise(resolve => { @@ -2111,7 +2023,7 @@ function JRLuckyLottery(s) { //https://jdda.jd.com/app/hd/#/turntable }); } -function JingDongBuyCar(s) { +function JingDongBuyCar(s, ActId) { merge.JDBuyCar = {}; return new Promise((resolve, reject) => { if (disable("JDBuyCar")) return reject(); @@ -2120,7 +2032,7 @@ function JingDongBuyCar(s) { url: 'https://cgame-stadium.jd.com/api/v1/first/login', headers: { Cookie: KEY, - ActivityId: `f4f998e5b91d48ce957983fe61b0ae90` + ActivityId: ActId } }, (error, response, data) => { try { @@ -2149,7 +2061,7 @@ function JingDongBuyCar(s) { url: 'https://cgame-stadium.jd.com/api/v1/sign', headers: { Cookie: KEY, - ActivityId: `f4f998e5b91d48ce957983fe61b0ae90` + ActivityId: ActId } }, (error, response, data) => { try { @@ -2221,6 +2133,7 @@ function TotalBean() { if (error) throw new Error(error); const Details = LogDetails ? "response:\n" + data : ''; const cc = JSON.parse(data) + $nobyda.headUrl = cc.base.headImageUrl if (cc.base.jdNum != 0) { console.log("\n" + "京东-总京豆查询成功 " + Details) merge.TotalBean.Qbear = cc.base.jdNum @@ -2438,10 +2351,46 @@ function nobyda() { return (null) } })() - const notify = (title, subtitle, message) => { - if (isQuanX) $notify(title, subtitle, message) - if (isSurge) $notification.post(title, subtitle, message) - if (isNode) console.log(`${title}\n${subtitle}\n${message}`) + const notify = (title, subtitle, message, rawopts) => { + const Opts = (rawopts) => { //Modified from https://github.com/chavyleung/scripts/blob/master/Env.js + if (!rawopts) return rawopts + if (typeof rawopts === 'string') { + if (isLoon) return rawopts + else if (isQuanX) return { + 'open-url': rawopts + } + else if (isSurge) return { + url: rawopts + } + else return undefined + } else if (typeof rawopts === 'object') { + if (isLoon) { + let openUrl = rawopts.openUrl || rawopts.url || rawopts['open-url'] + let mediaUrl = rawopts.mediaUrl || rawopts['media-url'] + return { + openUrl, + mediaUrl + } + } else if (isQuanX) { + let openUrl = rawopts['open-url'] || rawopts.url || rawopts.openUrl + let mediaUrl = rawopts['media-url'] || rawopts.mediaUrl + return { + 'open-url': openUrl, + 'media-url': mediaUrl + } + } else if (isSurge) { + let openUrl = rawopts.url || rawopts.openUrl || rawopts['open-url'] + return { + url: openUrl + } + } + } else { + return undefined + } + } + console.log(`${title}\n${subtitle}\n${message}`) + if (isQuanX) $notify(title, subtitle, message, Opts(rawopts)) + if (isSurge) $notification.post(title, subtitle, message, Opts(rawopts)) if (isJSBox) $push.schedule({ title: title, body: subtitle ? subtitle + "\n" + message : message diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh index ade596c959..938461c032 100755 --- a/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh +++ b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh @@ -155,15 +155,11 @@ update() { local_ver=0 fi remote_ver=$(get_ver $TEMP_SCRIPT) - if [ $(expr "$local_ver" \< "$remote_ver") -eq 1 ]; then - cp -r $TEMP_SCRIPT $JD_SCRIPT - fill_cookie - uci set jd-dailybonus.@global[0].version=$remote_ver - uci commit jd-dailybonus - cancel "0" - else - cancel "101" - fi + cp -r $TEMP_SCRIPT $JD_SCRIPT + fill_cookie + uci set jd-dailybonus.@global[0].version=$remote_ver + uci commit jd-dailybonus + cancel "0" } while getopts ":alnruswh" arg; do diff --git a/package/ctcgfw/oaf/Makefile b/package/ctcgfw/oaf/Makefile index a019a3f6db..883dd1735a 100644 --- a/package/ctcgfw/oaf/Makefile +++ b/package/ctcgfw/oaf/Makefile @@ -6,10 +6,10 @@ PKG_VERSION:=3.0 PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/destan19/OpenAppFilter.git -PKG_MIRROR_HASH:=d8d71c8dcdd6e130d2e1b4cddf37781fb95c5d1b8e7090fe49c0e761490be324 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-10-20 -PKG_SOURCE_VERSION:=b235da54c45ac4cd16ec96e1ec832d3851a247da +PKG_SOURCE_DATE:=2020-12-31 +PKG_SOURCE_VERSION:=5ac03f15728ad69805123637227a7777f0a50c7e +PKG_MIRROR_HASH:=d8d71c8dcdd6e130d2e1b4cddf37781fb95c5d1b8e7090fe49c0e761490be324 include $(INCLUDE_DIR)/package.mk diff --git a/package/ctcgfw/open-app-filter/files/feature.cfg b/package/ctcgfw/open-app-filter/files/feature.cfg index a9e39c490a..65dec5a9ca 100644 --- a/package/ctcgfw/open-app-filter/files/feature.cfg +++ b/package/ctcgfw/open-app-filter/files/feature.cfg @@ -41,6 +41,11 @@ 3014 哔哩哔哩:[tcp;;;bilivideo;;,tcp;;480;;upgcxcode;] 3016 芒果tv:[tcp;;443;mgtv;;,tcp;;80;mgtv;;,tcp;;443;hitv;;] 3017 西瓜视频:[tcp;;;xg.ixigua;;,tcp;;443;snsdk;;,tcp;;;xg-p.ixigua;;] +3018 搜狐视频:[tcp;;;aty.sohu.com;;,tcp;;;tv.itc.cn;;] +3019 播聊:[tcp;;80;randlove.cn;;,tcp;;;mob.com;;,tcp;;;yueliao;;,tcp;;;5glive;;] +3020 咪咕视频:[tcp;;;miguvideo;;,tcp;;;migu.cn;;] +3021 韩剧TV:[tcp;;;hanju.koudaibaobao;;] +3022 人人视频:[tcp;;;rr.tv;;] #class shopping 4001 淘宝:[tcp;;;taobao;;,tcp;;;alicdn.com;;,tcp;;;tmall.com;;,tcp;;;;;00:d3|01:00,,tcp;;;;;00:d4|01:00,,tcp;;;;;00:d3|01:00] diff --git a/package/lean/default-settings/files/openwrt_banner b/package/lean/default-settings/files/openwrt_banner index 399213dc2e..7fc51eddb3 100644 --- a/package/lean/default-settings/files/openwrt_banner +++ b/package/lean/default-settings/files/openwrt_banner @@ -8,5 +8,5 @@ │ # │ │ " │ │─────────────────────────────────────────────────│ -│ OpenWrt 18.06 by Lean | Mod 20.12 By CTCGFW │ +│ OpenWrt 18.06 by Lean | Mod 21.01 By CTCGFW │ └─────────────────────────────────────────────────┘ diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 2fa75ee818..c0d6548af4 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -42,14 +42,14 @@ sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh # NEVER DROP THE EXISTING AUTHORS INFO | 禁止删除现有作者信息 sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release -echo "DISTRIB_REVISION='| Mod 20.12 by CTCGFW'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='| Mod 21.01 by CTCGFW'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt 18.06 by Lean '" >> /etc/openwrt_release # NEVER DROP THE EXISTING AUTHORS INFO | 禁止删除现有作者信息 sed -i 's/LuCI openwrt-18.06 branch/LuCI 18.06 by Lean/g' /usr/lib/lua/luci/version.lua sed -i '/luciversion/d' /usr/lib/lua/luci/version.lua -echo 'luciversion = "Mod 20.12 by CTCGFW"' >> /usr/lib/lua/luci/version.lua +echo 'luciversion = "Mod 21.01 by CTCGFW"' >> /usr/lib/lua/luci/version.lua sed -i '/log-facility/d' /etc/dnsmasq.conf echo "log-facility=/dev/null" >> /etc/dnsmasq.conf diff --git a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua index 2fe43138a8..09c63309c6 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua @@ -4,7 +4,7 @@ module("luci.controller.shadowsocksr", package.seeall) function index() if not nixio.fs.access("/etc/config/shadowsocksr") then - call("act_reset") + return end entry({"admin", "services", "shadowsocksr"}, alias("admin", "services", "shadowsocksr", "client"), _("ShadowSocksR Plus+"), 10).dependent = true entry({"admin", "services", "shadowsocksr", "client"}, cbi("shadowsocksr/client"), _("SSR Client"), 10).leaf = true diff --git a/package/lean/qBittorrent-Enhanced-Edition/Makefile b/package/lean/qBittorrent-Enhanced-Edition/Makefile index 9889179d0c..056bd5796e 100644 --- a/package/lean/qBittorrent-Enhanced-Edition/Makefile +++ b/package/lean/qBittorrent-Enhanced-Edition/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qBittorrent-Enhanced-Edition -PKG_VERSION:=4.2.5.16 +PKG_VERSION:=4.3.2.10 PKG_RELEASE=1 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/c0re100/qBittorrent-Enhanced-Edition/tar.gz/release-$(PKG_VERSION)? -PKG_HASH:=ebae940c93bca2cdaf4fc353f1fe7177006e4ac25a921b42403b6296d4dc9d3e +PKG_HASH:=204da95489e6e6959561ea43fb1e16fe562d217932ae3b63a172db389f0c102e PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION) @@ -15,7 +15,6 @@ PKG_LICENSE_FILES:=COPYING PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 -PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk @@ -25,14 +24,14 @@ define Package/$(PKG_NAME) CATEGORY:=Network TITLE:=bittorrent client programmed in C++ / Qt URL:=https://github.com/c0re100/qBittorrent-Enhanced-Edition - DEPENDS:=+qt5-core +qt5-network +qt5-xml +libtorrent-rasterbar +python3 +boost-system + DEPENDS:=+boost-system +libtorrent-rasterbar +python3 +qt5-core +qt5-network +qt5-sql +qt5-xml endef define Package/$(PKG_NAME)/description -qBittorrent is a bittorrent client programmed in C++ / Qt that uses +qBittorrent is a bittorrent client programmed in C++ / Qt that uses libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg. -It aims to be a good alternative to all other bittorrent clients out -there. qBittorrent is fast, stable and provides unicode support as +It aims to be a good alternative to all other bittorrent clients out +there. qBittorrent is fast, stable and provides unicode support as well as many features. endef @@ -56,8 +55,6 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qbittorrent-nox $(1)/usr/bin - $(INSTALL_DIR) $(1)/etc/qBittorrent - $(INSTALL_DATA) ./files/ipfilter.dat $(1)/etc/qBittorrent/ipfilter.dat endef $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lean/qBittorrent-Enhanced-Edition/files/ipfilter.dat b/package/lean/qBittorrent-Enhanced-Edition/files/ipfilter.dat deleted file mode 100644 index 4cb41cd5db..0000000000 --- a/package/lean/qBittorrent-Enhanced-Edition/files/ipfilter.dat +++ /dev/null @@ -1,293 +0,0 @@ -14.17.29.0 - 14.17.44.255 , 0 , Tencent Offline -14.17.101.0 - 14.17.101.255 , 0 , Baidu Offline -14.29.92.0 - 14.29.92.255 , 0 , Xunlei Offline -14.215.177.0 - 14.215.177.255 , 0 , Baidu Offline -23.3.68.0 - 23.3.68.255 , 0 , Tencent Offline -27.221.20.0 - 27.221.21.255 , 0 , 360 -27.221.36.0 - 27.221.38.255 , 0 , Baidu Offline -36.110.198.0 - 36.110.198.255 , 0 , Baidu Offline -36.248.6.0 - 36.248.6.255 , 0 , Baidu Offline -36.250.0.0 - 36.250.0.255 , 0 , Baidu Offline -36.251.188.0 - 36.251.188.255 , 0 , Baidu Offline -42.56.64.0 - 42.56.65.255 , 0 , Tencent Offline -42.236.4.0 - 42.236.7.255 , 0 , Baidu Offline -45.113.68.0 - 45.113.71.255 , 0 , Tencent Offline -49.4.0.0 - 49.4.127.255 , 0 , HUAWEI -49.51.0.0 - 49.51.31.255 , 0 , Tencent Offline -58.48.212.0 - 58.48.212.255 , 0 , Tencent Offline -58.51.144.0 - 58.51.144.255 , 0 , Xunlei Offline -58.61.39.0 - 58.61.152.255 , 0 , Xunlei Offline -58.67.137.0 - 58.67.137.255 , 0 , Xunlei Offline -58.198.42.0 - 58.198.42.255 , 0 , Tencent Offline -58.215.118.0 - 58.215.123.255 , 0 , Baidu Offline -58.217.200.0 - 58.217.222.255 , 0 , Baidu Offline -58.220.12.0 - 58.220.12.255 , 0 , Xunlei Offline -58.222.18.0 - 58.222.25.255 , 0 , Baidu Offline -58.251.57.0 - 58.251.61.255 , 0 , Xunlei Offline -58.252.209.0 - 58.252.209.255 , 0 , Xunlei Offline -58.254.134.0 - 58.254.134.255 , 0 , Xunlei Offline -58.255.249.0 - 58.255.253.255 , 0 , Xunlei Offline -59.45.75.0 - 59.45.75.255 , 0 , Baidu Offline -59.51.81.0 - 59.51.81.255 , 0 , Baidu Offline -59.53.69.0 - 59.53.69.255 , 0 , Baidu Offline -59.53.86.0 - 59.53.86.255 , 0 , Tencent Offline -59.74.44.0 - 59.74.45.255 , 0 , Tencent Offline -60.2.237.0 - 60.2.237.255 , 0 , Tencent Offline -60.18.146.0 - 60.18.147.255 , 0 , Xunlei Offline -60.19.64.0 - 60.19.64.255 , 0 , Xunlei Offline -60.21.219.0 - 60.21.219.255 , 0 , Xunlei Offline -60.28.9.0 - 60.28.22.255 , 0 , Baidu Offline -60.160.190.0 - 60.160.190.255 , 0 , Xunlei Offline -60.211.226.0 - 60.211.226.255 , 0 , Baidu Offline -60.214.64.0 - 60.214.64.255 , 0 , Xunlei Offline -60.217.235.0 - 60.217.236.255 , 0 , Xunlei Offline -60.220.197.0 - 60.220.197.255 , 0 , Xunlei Offline -60.221.254.0 - 60.221.254.255 , 0 , Xunlei Offline -61.54.12.0 - 61.54.24.255 , 0 , Xunlei Offline -61.54.47.0 - 61.54.47.255 , 0 , Baidu Offline -61.132.226.0 - 61.132.226.255 , 0 , Baidu Offline -61.135.145.0 - 61.135.191.255 , 0 , Baidu Offline -61.137.90.0 - 61.137.90.255 , 0 , MNDISK Offline -61.137.191.0 - 61.137.191.255 , 0 , Xunlei Offline -61.138.131.0 - 61.138.131.255 , 0 , Tencent Offline -61.138.177.0 - 61.138.177.255 , 0 , Xunlei Offline -61.139.103.0 - 61.139.103.255 , 0 , Xunlei Offline -61.147.76.0 - 61.147.94.255 , 0 , Xunlei Offline -61.152.105.0 - 61.152.105.255 , 0 , Xunlei Offline -61.153.56.0 - 61.153.56.255 , 0 , Baidu Offline -61.155.149.0 - 61.155.165.255 , 0 , Baidu Offline -61.155.183.0 - 61.155.183.255 , 0 , Xunlei Offline -61.155.220.0 - 61.155.220.255 , 0 , Tencent Offline -61.160.224.0 - 61.160.224.255 , 0 , 360 -61.160.230.0 - 61.160.231.255 , 0 , Tencent Offline -61.160.253.0 - 61.160.253.255 , 0 , Tencent Offline -61.164.120.0 - 61.164.120.255 , 0 , Tencent Offline -61.164.155.0 - 61.164.155.255 , 0 , Baidu Offline -61.173.85.0 - 61.173.85.255 , 0 , Xunlei Offline -61.178.227.0 - 61.178.227.255 , 0 , Xunlei Offline -61.179.109.0 - 61.179.109.255 , 0 , Baidu Offline -61.182.137.0 - 61.182.137.255 , 0 , Baidu Offline -61.183.55.0 - 61.183.55.255 , 0 , Xunlei Offline -61.188.190.0 - 61.188.190.255 , 0 , Xunlei Offline -61.235.71.0 - 61.235.71.255 , 0 , Xunlei Offline -61.240.144.0 - 61.240.144.255 , 0 , 360 -64.251.96.0 - 64.251.111.255 , 0 , 360 -101.4.60.0 - 101.4.61.255 , 0 , 360 -101.64.181.0 - 101.64.181.255 , 0 , Baidu Offline -101.69.162.0 - 101.69.162.255 , 0 , Baidu Offline -101.71.56.0 - 101.71.56.255 , 0 , Baidu Offline -101.198.0.0 - 101.199.255.255 , 0 , 360 -101.226.4.0 - 101.226.4.255 , 0 , 360 -101.226.63.0 - 101.226.76.255 , 0 , Tencent Offline -101.226.180.0 - 101.226.180.255 , 0 , Xunlei Offline -101.227.130.0 - 101.227.143.255 , 0 , Tencent Offline -103.7.28.0 - 103.7.31.255 , 0 , Tencent Offline -103.28.8.0 - 103.28.11.255 , 0 , 360 -103.31.200.0 - 103.31.203.255 , 0 , HUAWEI -106.38.179.0 - 106.38.179.255 , 0 , Baidu Offline -106.120.159.0 - 106.120.159.255 , 0 , Baidu Offline -110.18.246.0 - 110.18.246.255 , 0 , Baidu Offline -110.188.3.0 - 110.188.3.255 , 0 , Tencent Offline -111.13.12.0 - 111.13.113.255 , 0 , Baidu Offline -111.30.135.0 - 111.30.135.255 , 0 , Tencent Offline -111.161.24.0 - 111.161.24.255 , 0 , Xunlei Offline -111.206.36.0 - 111.206.76.255 , 0 , Baidu Offline -112.25.34.0 - 112.25.34.255 , 0 , 115 Offline -112.25.60.0 - 112.25.60.255 , 0 , 360 -112.80.23.0 - 112.80.23.255 , 0 , Xunlei Offline -112.80.248.0 - 112.80.255.255 , 0 , Baidu Offline -112.87.43.0 - 112.87.43.227 , 0 , Xunlei Offline -112.90.17.0 - 112.90.17.255 , 0 , Xunlei Offline -112.117.217.0 - 112.117.217.255 , 0 , Xunlei Offline -112.253.12.0 - 112.253.12.255 , 0 , Baidu Offline -113.105.143.0 - 113.105.143.255 , 0 , 115 Offline -113.105.148.81 - 113.105.148.255 , 0 , Baidu Offline -113.107.248.0 - 113.107.248.255 , 0 , Baidu Offline -113.108.29.0 - 113.108.29.255 , 0 , Tencent Offline -113.115.10.0 - 113.115.10.255 , 0 , Tencent Offline -113.142.0.0 - 113.142.31.255 , 0 , Tencent Offline -113.200.90.0 - 113.200.90.255 , 0 , Tencent Offline -114.80.183.0 - 114.80.255.255 , 0 , Xunlei Offline -114.112.202.0 - 114.112.202.255 , 0 , Xunlei Offline -115.159.0.0 - 115.159.255.255 , 0 , Tencent Offline -115.231.38.0 - 115.231.45.255 , 0 , Xunlei Offline -115.236.96.0 - 115.236.153.255 , 0 , Tencent Offline -115.238.230.0 - 115.238.243.255 , 0 , UC Offline -115.239.210.0 - 115.239.212.255 , 0 , Baidu Offline -116.10.186.0 - 116.10.186.255 , 0 , Xunlei Offline -116.31.127.0 - 116.31.127.255 , 0 , Baidu Offline -116.55.230.0 - 116.55.255.255 , 0 , Xunlei Offline -116.57.183.0 - 116.57.255.255 , 0 , Tencent Offline -116.211.117.0 - 116.211.117.255 , 0 , Baidu Offline -116.253.190.0 - 116.253.190.255 , 0 , Tencent Offline -117.21.185.0 - 117.21.185.255 , 0 , Tencent Offline -117.25.132.0 - 117.25.132.255 , 0 , Tencent Offline -117.27.148.0 - 117.27.149.255 , 0 , Baidu Offline -117.34.6.0 - 117.34.6.255 , 0 , Tencent Offline -117.34.28.0 - 117.34.37.255 , 0 , Baidu Offline -117.34.91.0 - 117.34.91.255 , 0 , Xunlei Offline -117.34.112.0 - 117.34.112.255 , 0 , Baidu Offline -117.78.0.0 - 117.78.23.255 , 0 , HUAWEI -118.122.36.0 - 118.122.88.255 , 0 , Xunlei Offline -118.123.97.0 - 118.123.97.255 , 0 , Tencent Offline -118.123.116.0 - 118.123.223.255 , 0 , Baidu Offline -118.180.6.0 - 118.180.6.255 , 0 , Baidu Offline -119.75.208.0 - 119.75.223.255 , 0 , Baidu Offline -119.84.11.0 - 119.84.11.255 , 0 , Xunlei Offline -119.84.72.0 - 119.84.72.255 , 0 , Tencent Offline -119.84.110.0 - 119.84.114.255 , 0 , Xunlei Offline -119.97.178.0 - 119.97.183.255 , 0 , Xunlei Offline -119.120.94.0 - 119.120.94.255 , 0 , Xunlei Offline -119.134.253.0 - 119.134.253.255 , 0 , Baidu Offline -119.144.9.0 - 119.144.9.255 , 0 , Xunlei Offline -119.147.15.0 - 119.147.41.255 , 0 , Tencent Offline -119.147.99.0 - 119.147.249.255 , 0 , 115 Offline -119.167.241.0 - 119.167.241.255 , 0 , Tencent Offline -119.167.246.0 - 119.167.246.255 , 0 , Baidu Offline -119.178.12.0 - 119.178.12.255 , 0 , Xunlei Offline -119.188.11.0 - 119.188.132.255 , 0 , Xunlei Offline -119.189.1.0 - 119.189.1.255 , 0 , Xunlei Offline -120.52.114.0 - 120.52.114.255 , 0 , Baidu Offline -121.9.209.0 - 121.9.255.255 , 0 , Xunlei Offline -121.10.24.0 - 121.10.137.255 , 0 , Xunlei Offline -121.11.68.0 - 121.11.68.255 , 0 , Tencent Offline -121.12.94.0 - 121.12.94.255 , 0 , Baidu Offline -121.14.35.0 - 121.14.35.255 , 0 , Baidu Offline -121.14.82.0 - 121.14.97.255 , 0 , Xunlei Offline -121.14.131.0 - 121.14.131.255 , 0 , Tencent Offline -121.14.222.0 - 121.14.228.255 , 0 , Xunlei Offline -122.70.142.0 - 122.70.142.255 , 0 , Baidu Offline -122.136.46.0 - 122.136.46.255 , 0 , Baidu Offline -122.141.227.0 - 122.141.235.255 , 0 , Xunlei Offline -122.143.1.0 - 122.143.6.255 , 0 , Xunlei Offline -122.143.15.0 - 122.143.15.255 , 0 , 360 -122.192.32.0 - 122.192.32.255 , 0 , Tencent Offline -122.193.41.0 - 122.193.41.255 , 0 , Baidu Offline -122.224.10.0 - 122.224.10.255 , 0 , Baidu Offline -122.227.15.0 - 122.227.15.255 , 0 , Tencent Offline -122.228.218.0 - 122.228.234.255 , 0 , Baidu Offline -122.228.241.0 - 122.228.255.255 , 0 , Xunlei Offline -123.66.33.0 - 123.66.33.255 , 0 , Xunlei Offline -123.125.64.0 - 123.125.115.255 , 0 , Baidu Offline -123.125.160.0 - 123.125.161.255 , 0 , 360 -123.129.219.0 - 123.129.255.255 , 0 , Xunlei Offline -123.138.102.0 - 123.138.239.255 , 0 , Tencent Offline -123.151.44.0 - 123.151.138.255 , 0 , Tencent Offline -123.162.190.0 - 123.162.191.255 , 0 , Xunlei Offline -123.183.223.0 - 123.183.223.255 , 0 , Xunlei Offline -124.89.102.0 - 124.89.103.255 , 0 , Tencent Offline -124.95.156.0 - 124.95.174.255 , 0 , Xunlei Offline -124.115.1.0 - 124.115.14.255 , 0 , Tencent Offline -124.115.215.0 - 124.115.215.255 , 0 , Baidu Offline -124.160.163.0 - 124.160.171.255 , 0 , Tencent Offline -124.161.23.0 - 124.161.23.255 , 0 , Tencent Offline -124.165.216.0 - 124.165.216.255 , 0 , Baidu Offline -124.193.227.0 - 124.193.227.255 , 0 , Baidu Offline -124.225.122.0 - 124.225.122.255 , 0 , Tencent Offline -124.228.42.0 - 124.228.42.255 , 0 , Tencent Offline -124.232.148.0 - 124.232.148.255 , 0 , Xunlei Offline -124.238.238.0 - 124.238.238.255 , 0 , Baidu Offline -125.39.72.0 - 125.39.79.255 , 0 , Xunlei Offline -125.39.126.0 - 125.39.255.255 , 0 , Tencent Offline -125.46.42.0 - 125.46.42.255 , 0 , Xunlei Offline -125.78.242.0 - 125.78.247.255 , 0 , Xunlei Offline -125.218.29.0 - 125.218.29.255 , 0 , Tencent Offline -125.221.46.0 - 125.221.46.255 , 0 , Xunlei Offline -140.206.165.0 - 140.206.165.255 , 0 , Tencent Offline -159.226.50.0 - 159.226.50.255 , 0 , Baidu Offline -162.105.207.0 - 162.105.207.255 , 0 , Baidu Offline -171.111.152.0 - 171.112.96.255 , 0 , Baidu Offline -175.155.115.0 - 175.155.116.255 , 0 , Tencent Offline -180.76.0.0 - 180.76.255.255 , 0 , Baidu Offline -180.96.0.0 - 180.96.1.255 , 0 , Tencent Offline -180.97.7.0 - 180.97.7.255 , 0 , Tencent Offline -180.97.33.0 - 180.97.34.255 , 0 , Baidu Offline -180.97.151.0 - 180.97.152.255 , 0 , Xunlei Offline -180.149.131.0 - 180.149.145.255 , 0 , Baidu Offline -180.153.91.0 - 180.153.115.255 , 0 , Xunlei Offline -180.153.235.0 - 180.153.235.255 , 0 , 360 -182.86.197.0 - 182.86.197.255 , 0 , Baidu Offline -182.118.13.0 - 182.118.125.255 , 0 , Xunlei Offline -182.130.10.0 - 182.130.11.255 , 0 , Tencent Offline -182.131.8.0 - 182.131.11.255 , 0 , Tencent Offline -182.140.134.0 - 182.140.177.255 , 0 , Tencent Offline -182.140.227.0 - 182.140.227.255 , 0 , 360 -182.150.1.0 - 182.150.1.255 , 0 , Baidu Offline -182.247.251.0 - 182.247.251.255 , 0 , Xunlei Offline -182.254.0.0 - 182.254.255.255 , 0 , Tencent Offline -183.60.15.0 - 183.60.15.255 , 0 , Tencent Offline -183.60.131.0 - 183.60.131.255 , 0 , Baidu Offline -183.60.139.0 - 183.60.139.255 , 0 , 115 Offline -183.60.208.0 - 183.60.209.255 , 0 , Xunlei Offline -183.60.211.0 - 183.60.211.255 , 0 , 360 -183.60.235.0 - 183.60.235.255 , 0 , Baidu Offline -183.61.49.0 - 183.61.49.255 , 0 , Tencent Offline -183.61.133.0 - 183.61.133.255 , 0 , Baidu Offline -183.63.33.0 - 183.63.33.255 , 0 , Xunlei Offline -183.94.216.0 - 183.94.239.255 , 0 , Xunlei Offline -183.131.32.0 - 183.131.39.255 , 0 , Baidu Offline -183.136.133.0 - 183.136.133.255 , 0 , 360 -183.136.156.0 - 183.136.158.255 , 0 , Xunlei Offline -183.136.218.0 - 183.136.218.255 , 0 , Baidu Offline -183.157.36.0 - 183.157.36.255 , 0 , Xunlei Offline -183.221.245.0 - 183.221.245.255 , 0 , Baidu Offline -183.232.22.0 - 183.232.22.255 , 0 , Baidu Offline -202.38.194.0 - 202.38.194.255 , 0 , Tencent Offline -202.100.78.0 - 202.100.78.255 , 0 , Tencent Offline -202.105.139.0 - 202.105.139.255 , 0 , Xunlei Offline -202.105.182.0 - 202.105.182.255 , 0 , Tencent Offline -202.108.11.0 - 202.108.250.255 , 0 , Baidu Offline -203.195.64.0 - 203.195.95.255 , 0 , Tencent Offline -203.195.128.0 - 203.195.255.255 , 0 , Tencent Offline -203.205.128.0 - 203.205.255.255 , 0 , Tencent Offline -210.38.3.0 - 210.38.3.255 , 0 , Tencent Offline -210.39.2.0 - 210.39.2.255 , 0 , Tencent Offline -211.90.25.0 - 211.90.25.255 , 0 , Baidu Offline -211.98.168.0 - 211.98.171.255 , 0 , Xunlei Offline -211.137.100.0 - 211.137.100.255 , 0 , Xunlei Offline -211.151.210.0 - 211.151.210.255 , 0 , 115 Offline -211.162.73.0 - 211.162.73.255 , 0 , Xunlei Offline -218.6.13.0 - 218.6.13.255 , 0 , Xunlei Offline -218.8.242.0 - 218.8.242.255 , 0 , Tencent Offline -218.21.68.0 - 218.21.68.255 , 0 , Xunlei Offline -218.22.90.0 - 218.22.90.255 , 0 , Tencent Offline -218.26.232.0 - 218.26.232.255 , 0 , Xunlei Offline -218.30.73.0 - 218.30.73.255 , 0 , Tencent Offline -218.59.144.0 - 218.59.144.255 , 0 , Xunlei Offline -218.60.11.0 - 218.60.11.255 , 0 , Tencent Offline -218.75.140.0 - 218.75.140.255 , 0 , Baidu Offline -218.75.172.0 - 218.75.172.255 , 0 , Xunlei Offline -218.199.46.0 - 218.199.46.255 , 0 , Tencent Offline -219.129.83.0 - 219.129.83.255 , 0 , Xunlei Offline -219.134.132.0 - 219.134.132.255 , 0 , Xunlei Offline -219.151.4.0 - 219.151.4.255 , 0 , Tencent Offline -219.159.248.0 - 219.159.248.255 , 0 , MNDISK Offline -220.113.9.0 - 220.113.9.255 , 0 , Xunlei Offline -220.115.240.0 - 220.115.240.255 , 0 , Xunlei Offline -220.161.209.0 - 220.161.209.255 , 0 , Baidu Offline -220.170.192.0 - 220.170.192.255 , 0 , Tencent Offline -220.181.5.0 - 220.181.167.255 , 0 , Baidu Offline -220.249.103.0 - 220.249.103.255 , 0 , Xunlei Offline -221.4.246.0 - 221.4.246.255 , 0 , Xunlei Offline -221.5.8.0 - 221.5.8.255 , 0 , Xunlei Offline -221.203.176.0 - 221.204.232.255 , 0 , Xunlei Offline -221.215.87.0 - 221.215.87.255 , 0 , Xunlei Offline -221.233.79.0 - 221.233.79.255 , 0 , Baidu Offline -221.235.189.0 - 221.235.205.255 , 0 , Xunlei Offline -221.236.21.0 - 221.236.30.255 , 0 , Tencent Offline -221.238.25.0 - 221.238.25.255 , 0 , Xunlei Offline -222.24.133.0 - 222.24.133.255 , 0 , Tencent Offline -222.28.155.0 - 222.28.155.255 , 0 , Tencent Offline -222.73.49.0 - 222.73.133.255 , 0 , Xunlei Offline -222.73.183.0 - 222.73.183.255 , 0 , Tencent Offline -222.133.46.0 - 222.133.46.255 , 0 , Baidu Offline -222.141.53.0 - 222.141.53.255 , 0 , Xunlei Offline -222.141.220.0 - 222.141.220.255 , 0 , Tencent Offline -222.161.212.0 - 222.161.255.255 , 0 , Xunlei Offline -222.186.17.0 - 222.186.19.255 , 0 , Xunlei Offline -222.186.55.0 - 222.186.55.255 , 0 , Baidu Offline -222.199.144.0 - 222.199.191.255 , 0 , Baidu Offline -222.211.64.0 - 222.211.64.255 , 0 , Baidu Offline -222.215.119.0 - 222.215.119.255 , 0 , Tencent Offline -222.216.190.0 - 222.216.190.255 , 0 , Baidu Offline -222.218.45.0 - 222.218.45.255 , 0 , Baidu Offline diff --git a/package/lean/qt5/Makefile b/package/lean/qt5/Makefile index 43903c4e91..77571ee58e 100644 --- a/package/lean/qt5/Makefile +++ b/package/lean/qt5/Makefile @@ -24,11 +24,12 @@ PKG_SOURCE_URL:=https://mirrors.cloud.tencent.com/qt/archive/qt/$(QT5_VERSION_MA http://download.qt-project.org/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ PKG_HASH:=55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08 +PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION) + +PKG_BUILD_DEPENDS:=libdouble-conversion pcre2 zlib PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION) - include $(INCLUDE_DIR)/package.mk ifndef CONFIG_USE_GLIBC @@ -194,7 +195,7 @@ define Package/qt5-xml/install $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Xml.so* $(1)/usr/lib endef -$(eval $(call BuildPackage,qt5-core,+zlib,+libpcre2-16,+libdouble-conversion)) +$(eval $(call BuildPackage,qt5-core)) $(eval $(call BuildPackage,qt5-network)) $(eval $(call BuildPackage,qt5-sql)) $(eval $(call BuildPackage,qt5-xml)) diff --git a/package/ntlf9t/rtl8192du/patches/020-remove-repeat-flies.patch b/package/ntlf9t/rtl8192du/patches/020-remove-repeat-flies.patch new file mode 100644 index 0000000000..76baf2a24a --- /dev/null +++ b/package/ntlf9t/rtl8192du/patches/020-remove-repeat-flies.patch @@ -0,0 +1,39 @@ +From 9b2b0ec1bc2d31ddf93ed74d63fdfa6044e329a4 Mon Sep 17 00:00:00 2001 +From: Ben Greear +Date: Fri, 9 Nov 2018 16:21:43 -0800 +Subject: [PATCH] Fix build against openwrt backports tree. + +Like breaks builds elsewhere, can fix it up later. + +Signed-off-by: Ben Greear +--- + include/drv_conf.h | 4 +++- + .../{wireless.h => old_unused_rtl_wireless.h} | 0 + include/{autoconf.h => rtl_autoconf.h} | 0 + 3 files changed, 3 insertions(+), 1 deletions(-) + rename include/linux/{wireless.h => old_unused_rtl_wireless.h} (100%) + rename include/{autoconf.h => rtl_autoconf.h} (100%) + +diff --git a/include/drv_conf.h b/include/drv_conf.h +index 0d20a7e..f0a9f88 100644 +--- a/include/drv_conf.h ++++ b/include/drv_conf.h +@@ -14,7 +14,9 @@ + *****************************************************************************/ + #ifndef __DRV_CONF_H__ + #define __DRV_CONF_H__ +-#include "autoconf.h" ++ ++#include ++#include "rtl_autoconf.h" + #include "hal_ic_cfg.h" + + #if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) +diff --git a/include/linux/wireless.h b/include/linux/old_unused_rtl_wireless.h +similarity index 100% +rename from include/linux/wireless.h +rename to include/linux/old_unused_rtl_wireless.h +diff --git a/include/autoconf.h b/include/rtl_autoconf.h +similarity index 100% +rename from include/autoconf.h +rename to include/rtl_autoconf.h