fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Upstream

Browse Source
This commit is contained in:
CN_SZTL 2020-04-16 20:23:36 +08:00
commit 447dce768b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
12 changed files with 64 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/luci-app-ssr-plus/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=176
PKG_RELEASE:=6
PKG_RELEASE:=7
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server-config.lua
View File

@ -65,7 +65,7 @@ o.rmempty = false
o = s:option(ListValue, "type", translate("Server Type"))
o:value("socks5", translate("Socks5"))
if nixio.fs.access("/usr/bin/ss-server") then
if nixio.fs.access("/usr/bin/ssr-server") then
o:value("ssr", translate("ShadowsocksR"))
end
o.default = "socks5"

43
package/lean/pandownload-fake-server/Makefile Normal file
View File

@ -0,0 +1,43 @@
#
# Copyright (C) 2016-2017 GitHub
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=pandownload-fake-server
PKG_VERSION:=1
PKG_RELEASE:=1
PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
define Package/pandownload-fake-server
SECTION:=net
CATEGORY:=Network
SUBMENU:=Download Manager
TITLE:=pandownload-fake-server
PKGARCH:=all
endef
define Package/pandownload-fake-server/description
Fake server for Pandownload.
endef
define Build/Configure
endef
define Build/Compile
endef
define Package/pandownload-fake-server/install
$(INSTALL_DIR) $(1)/www
$(CP) ./files/* $(1)/www/
endef
$(eval $(call BuildPackage,pandownload-fake-server))

1
package/lean/pandownload-fake-server/files/api/init Normal file
View File

@ -0,0 +1 @@
{"srecord":{"autoQuery":true},"loginurl":{"url":"http:\/\/pandownload.com\/bdlogin.html"},"wke":"http:\/\/dl.pandownload.club\/dl\/node-190312.dll","pcscfg":{"appid":250528,"ua":"","ct":0},"flag":1,"ad":{"url":"https:\/\/pandownload.com\/donate.html","image":"http:\/\/pandownload.com\/images\/donate.png","attribute":"width=\"88\" height=\"100\" padding=\"0,0,5,0\"","rand":100},"bdc":["aF5yaHQQfQt3E3lxdHdjVmF4f3hae3JsfFxIbGxbW152FHF0anpdW3R5UHR1H1hxdwdoTGRMcXR1THsRbF92XXJbdmpveF93Yl9TE3dod3tYaXYIc1oRXGZKbVR1aGkGcV57dmleen1wEAYEdnV9BXF3BQFxd3sCaGh2BHB0BgdpW3F2c3pbAXF3ewJoaAYEcHQGBHZ1fQVxdwUBcXd7AmhoBgRwdAYEdnV9BXF3BQFxd3sCaGgGBHB0BgR2dX0FcXcFAXF3ewJoaAYEcHQGBHZ1fQVxdwUBcXd7AmhoBgRwdAYEdnV9BXF3BQFxd3sCaGgGBHB0BgRpB21SYXYFFH0UDmpben5afkgCdmsFAH9ydxMIflxqEnUHWxVpdgUTcwdsTH0UcBBpdndddV1+XWh2altzWlpLaVxbWH1cXEh1XWMXfAZ5FnR0fV99aXlcagZrWHUHaRZ9EXVJcnRTXH1MYhB9BlFddVoNDw=="],"timestamp":1586998638,"code":0,"message":"success"}

1
package/lean/pandownload-fake-server/files/api/latest Normal file
View File

@ -0,0 +1 @@
{"version":"2.2.2","url":"https:\/\/dl1.cnponer.com\/files\/PanDownload_v2.2.2.zip","web":"https:\/\/www.lanzous.com\/i8ua9na","detail":"\u66f4\u65b0\u65f6\u95f4: 2020-01-24\n\u66f4\u65b0\u5185\u5bb9:\n1. \u754c\u9762\u4f18\u5316\n2. bug\u4fee\u590d","md5":"13d3da755509afe3be8f7fc191a50cbd","code":0,"message":"success"}

1
package/lean/pandownload-fake-server/files/api/script/list Normal file
View File

@ -0,0 +1 @@
{"scripts":[{"name":"search_pandown.lua","remove":true},{"name":"search_ncckl.lua","remove":true},{"name":"search_quzhuanpan.lua","remove":true},{"name":"anime_01.lua","remove":true},{"name":"anime_02.lua","remove":true},{"name":"anime_dilidili.lua","remove":true},{"name":"anime","remove":true},{"name":"s","id":2,"url":"http:\/\/pandownload.com\/static\/scripts\/s008","md5":"8dfd9a6c08d06bec27ae358f315cca8f"},{"name":"download_pcs.lua","id":1000,"url":"http:\/\/pandownload.com\/static\/scripts\/download_pcs.lua","md5":"38770cd3e9bcd62f7212941b51ca1378"},{"name":"default","id":0,"url":"http:\/\/pandownload.com\/static\/scripts\/default_0.6.7_3fee3733","md5":"a1124f076924209d0322078000cdc882","key":"568729a30cee34aec0e6fc7a6e303272"}],"code":0,"message":"success"}

4
package/lienol/luci-theme-bootstrap-mod/Makefile
View File

@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Bootstrap Mod Theme By Lienol
LUCI_DEPENDS:=
PKG_VERSION:=1.4
PKG_RELEASE:=20200314
PKG_VERSION:=1.5
PKG_RELEASE:=20200413
include $(TOPDIR)/feeds/luci/luci.mk

BIN
package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/bg.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 75 KiB

9
package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css
View File

@ -445,7 +445,7 @@ h2+.cbi-map-descr {
position: relative;
padding: 15px;
margin-bottom: 10px;
background: #b4e7ff;
background: linear-gradient(to bottom, #fceec1, #eedc94) repeat-x;
/* border: 1px solid rgba(0, 0, 0, .1);
border-width: 2px 0; */
border-radius: 2px;
@ -1265,7 +1265,8 @@ footer a:hover {
/* login */
body.node-main-login {
background: url(bg.jpg);
/* background: url(bg.jpg); */
background: linear-gradient(#8f97f59e,#22b9a4);
background-repeat: no-repeat;
background-size: 100% 100%;
-moz-background-size: 100% 100%;
@ -1391,7 +1392,7 @@ body.modal-overlay-active #modal_overlay>.modal {
max-width: unset;
min-height: 32px;
min-width: 270px;
background: #b4e7ff !important;
background: linear-gradient(to bottom, #fceec1, #eedc94) repeat-x !important;
border-radius: 3px;
padding: 1em;
margin: 0;
@ -1425,7 +1426,7 @@ body.modal-overlay-active #modal_overlay>.modal {
position: absolute;
padding: 15px;
margin-bottom: 10px;
background: #b4e7ff;
background: linear-gradient(to bottom, #fceec1, #eedc94) repeat-x;
border: 1px solid rgba(0, 0, 0, .1);
border-width: 2px 0;
}*/

BIN
package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/bg.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 75 KiB

9
package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css
View File

@ -446,7 +446,7 @@ h2+.cbi-map-descr {
position: relative;
padding: 15px;
margin-bottom: 10px;
background: #b4e7ff;
background: linear-gradient(to bottom, #fceec1, #eedc94) repeat-x;
/* border: 1px solid rgba(0, 0, 0, .1);
border-width: 2px 0; */
border-radius: 2px;
@ -1258,7 +1258,8 @@ footer a {
/* login */
body.node-main-login {
background: url(bg.jpg);
/* background: url(bg.jpg); */
background: linear-gradient(#22b9a4, #9a87d4);
background-repeat: no-repeat;
background-size: 100% 100%;
-moz-background-size: 100% 100%;
@ -1384,7 +1385,7 @@ body.modal-overlay-active #modal_overlay>.modal {
max-width: unset;
min-height: 32px;
min-width: 270px;
background: #b4e7ff !important;
background: linear-gradient(to bottom, #fceec1, #eedc94) repeat-x !important;
border-radius: 3px;
padding: 1em;
margin: 0;
@ -1418,7 +1419,7 @@ body.modal-overlay-active #modal_overlay>.modal {
position: absolute;
padding: 15px;
margin-bottom: 10px;
background: #b4e7ff;
background: linear-gradient(to bottom, #fceec1, #eedc94) repeat-x;
border: 1px solid rgba(0, 0, 0, .1);
border-width: 2px 0;
}*/

4
package/network/utils/umbim/Makefile
View File

@ -36,6 +36,10 @@ endef
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include -ffunction-sections -fdata-sections
# Disable GCC 9 warning about pointers to members of a packed struct
GCCV_GE = $(filter $(1),$(shell echo -e "$(1)\n$(GCCV)" | sort -V | head -n1))
TARGET_CFLAGS += $(if $(call GCCV_GE,9),-Wno-address-of-packed-member)
TARGET_LDFLAGS += -Wl,--gc-sections
define Package/umbim/install