⛅ Sync 2026-11-15 21:18:12

This commit is contained in:
github-actions[bot] committed 2026-11-15 21:18:12 +08:00
1 parent 428976d40e
commit 86ad64b0d4
54 files changed
+6993 -297

No files matched your search

+33 -24
View File
@@ -1,5 +1,5 @@
#
# Copyright (C) 2015-2016 OpenWrt.org
# Copyright (C) 2015-2026 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v3.
#
@@ -8,55 +8,64 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=airconnect
PKG_VERSION:=1.12.4
PKG_RELEASE=1
PKG_RELEASE:=11
PKG_SOURCE:=AirConnect-$(PKG_VERSION).zip
PKG_SOURCE_URL:=https://github.com/philippe44/AirConnect/releases/download/$(PKG_VERSION)/
PKG_SOURCE:=AirConnect-$(PKG_VERSION)-src.tar.xz
PKG_SOURCE_URL:=https://github.com/sbwml/airconnect-src/releases/download/$(PKG_VERSION)/
PKG_HASH:=skip
PKG_BUILD_DIR:=$(BUILD_DIR)/airconnect-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/AirConnect-$(PKG_VERSION)
PKG_LICENSE:=MIT
PKG_LICENSE_FILE:=LICENSE
PKG_MAINTAINER:=sbwml <admin@cooluc.com>
ifeq ($(ARCH),arm)
ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
ifeq ($(ARM_CPU_FEATURES),)
ARCH:=armv6
endif
endif
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
define Package/airconnect
SECTION:=multimedia
CATEGORY:=Multimedia
TITLE:=AirConnect
DEPENDS:=+libpthread +libopenssl +libupnp +libflac +shine +jansson
URL:=https://github.com/philippe44/AirConnect
endef
define Package/$(PKG_NAME)/description
Use AirPlay to stream to UPnP/Sonos & Chromecast devices
define Package/airconnect/description
AirConnect enables AirPlay streaming to UPnP/Sonos and Chromecast devices.
endef
define Package/$(PKG_NAME)/conffiles
define Package/airconnect/conffiles
/etc/config/airconnect
endef
define Build/Prepare
unzip -q -d $(PKG_BUILD_DIR) $(DL_DIR)/AirConnect-$(PKG_VERSION).zip
endef
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include/upnp \
-I$(STAGING_DIR)/usr/include/shine \
-I$(STAGING_DIR)/usr/include
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
all
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/config $(1)/etc/init.d
$(INSTALL_BIN) ./files/airconnect.init $(1)/etc/init.d/airconnect
define Package/airconnect/install
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/airconnect.config $(1)/etc/config/airconnect
$(INSTALL_BIN) $(PKG_BUILD_DIR)/aircast-linux-$(ARCH)-static $(1)/usr/bin/aircast
$(INSTALL_BIN) $(PKG_BUILD_DIR)/airupnp-linux-$(ARCH)-static $(1)/usr/bin/airupnp
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/airconnect.init $(1)/etc/init.d/airconnect
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/aircast $(1)/usr/bin/aircast
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/airupnp $(1)/usr/bin/airupnp
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,airconnect))
+2 -2
View File
@@ -5,8 +5,8 @@ PKG_UPSTREAM_VERSION:=1.19.34
PKG_UPSTREAM_TAG:=v$(PKG_UPSTREAM_VERSION)
PKG_SHORT_SHA:=0455d0d
PKG_VERSION:=2026.11.12.$(PKG_UPSTREAM_VERSION)
PKG_RELEASE:=32
PKG_VERSION:=2026.11.15
PKG_RELEASE:=33
PKG_SOURCE:=$(PKG_NAME)-stable-$(PKG_UPSTREAM_TAG)-$(PKG_SHORT_SHA).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-stable-$(PKG_UPSTREAM_TAG)-$(PKG_SHORT_SHA)
+2 -2
View File
@@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=hysteria
PKG_VERSION:=2.13.0
PKG_RELEASE:=18
PKG_VERSION:=2.14.0
PKG_RELEASE:=19
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)?
+2 -1
View File
@@ -8,11 +8,12 @@ PKG_NAME:=luci-app-cloudflared-next
LUCI_TITLE:=LuCI for Cloudflared
LUCI_DEPENDS:=+cloudflared-next
LUCI_PKGARCH:=all
LUCI_DESCRIPTION:=LuCI support for Cloudflare Zero Trust Tunnels
PKG_MAINTAINER:=Hilman Maulana <hilman0.0maulana@gmail.com>, Sergey Ponomarev <stokito@gmail.com>
PKG_VERSION:=1.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
include $(TOPDIR)/feeds/luci/luci.mk
+4
View File
@@ -1,5 +1,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-easytier-next
PKG_VERSION:=1.0.0
PKG_RELEASE:=5
LUCI_TITLE:=LuCI support for EasyTier Next
LUCI_URL:=https://github.com/EasyTier/EasyTier
PKG_DESCRIPTION:=Provides a modern LuCI Web management interface for EasyTier decentralized mesh VPN.
+5 -11
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-frpc-next
PKG_VERSION:=1.0.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=MIT
PKG_MAINTAINER:=Dante <dante@seckv.com>
@@ -10,23 +10,17 @@ PKG_MAINTAINER:=Dante <dante@seckv.com>
LUCI_TITLE:=LuCI support for frp client (v0.68.x/v0.69.x+)
LUCI_DEPENDS:=+frpc-next +curl
LUCI_PKGARCH:=all
include $(TOPDIR)/feeds/luci/luci.mk
define Package/$(PKG_NAME)
$(call Package/luci/webtemplate)
TITLE:=$(LUCI_TITLE)
DEPENDS:=$(LUCI_DEPENDS)
PROVIDES:=luci-app-frpc
CONFLICTS:=luci-app-frpc
endef
PKG_PROVIDES:=luci-app-frpc
define Package/$(PKG_NAME)/postinst
#!/bin/sh
[ -n "$${IPKG_INSTROOT}" ] || {
chmod 0755 /etc/init.d/frpc /etc/hotplug.d/iface/99-frpc 2>/dev/null || true
/etc/init.d/rpcd restart >/dev/null 2>&1 || true
}
exit 0
endef
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature
+674
View File
@@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.
+20
View File
@@ -0,0 +1,20 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ghfu
PKG_VERSION:=1.6.1
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0-only
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Kiddin'
LUCI_TITLE:=LuCI for System Online Upgrade
LUCI_DEPENDS:=+luci-base +curl +wget-ssl +ca-bundle
LUCI_PKGARCH:=all
ifneq ($(wildcard $(TOPDIR)/feeds/luci/luci.mk),)
include $(TOPDIR)/feeds/luci/luci.mk
else
include $(TOPDIR)/feeds/luci/luci.mk
endif
# call BuildPackage - OpenWrt buildroot signature
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,31 @@
<%
local fs = require "nixio.fs"
local uci = require "luci.model.uci".cursor()
local autoupgrade_fm = "1"
if fs.access("/etc/config/luci") then
autoupgrade_fm = uci:get("luci", "main", "autoupgrade_fm") or autoupgrade_fm
end
if autoupgrade_fm == "1" then
-%>
<script type="text/javascript">
(function() {
var checkUrl = '<%=url([[admin]], [[system]], [[ghfu]], [[sysversion_check]])%>';
fetch(checkUrl, { method: 'GET', credentials: 'include' })
.then(function(r) { return r.json(); })
.then(function(json) {
if (json && json.code === 0 && json.notice && json.version) {
var mainContent = document.querySelector("#maincontent");
if (mainContent) {
var banner = document.createElement("div");
banner.className = "alert-message fade-in success";
banner.style.cssText = "display:flex;margin-top:-1.5rem;padding:0.31rem 0rem;";
banner.innerHTML = '<div style="flex:10"><a href="<%=url([[admin]], [[system]], [[ghfu]])%>"><p><%:New version available%>:' + json.version + '</p></a></div>';
mainContent.insertBefore(banner, mainContent.firstChild);
}
}
})
.catch(function() {});
})();
</script>
<% end -%>
File diff suppressed because it is too large. Load diff
+283
View File
@@ -0,0 +1,283 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
msgid "GitHub Firmware Upgrade"
msgstr "GitHub Firmware Upgrade"
msgid "Firmware upgrade assistant based on GitHub Release."
msgstr "Firmware upgrade assistant based on GitHub Release."
msgid "Basic Configuration"
msgstr "Basic Configuration"
msgid "GitHub Repository"
msgstr "GitHub Repository"
msgid "Firmware Fuzzy Search"
msgstr "Firmware Fuzzy Search"
msgid "Enter keyword to filter firmware names"
msgstr "Enter keyword to filter firmware names"
msgid "Last Updated Firmware"
msgstr "Last Updated Firmware"
msgid "Keep Configuration"
msgstr "Keep Configuration"
msgid "System and Release Status"
msgstr "System and Release Status"
msgid "Available Firmware (Filtered: %d)"
msgstr "Available Firmware (Filtered: %d)"
msgid "Filter Valid Extensions"
msgstr "Filter Valid Extensions"
msgid "Valid Extensions"
msgstr "Valid Extensions"
msgid "Valid Firmware Extensions"
msgstr "Valid Firmware Extensions"
msgid "One extension per line (e.g. .img .img.gz)"
msgstr "One extension per line (e.g. .img .img.gz)"
msgid "Cancel"
msgstr "Cancel"
msgid "Save"
msgstr "Save"
msgid "Saving extensions..."
msgstr "Saving extensions..."
msgid "Extensions saved"
msgstr "Extensions saved"
msgid "Logs"
msgstr "Logs"
msgid "Fetch Latest Release"
msgstr "Fetch Latest Release"
msgid "Download and Upgrade System"
msgstr "Download and Upgrade System"
msgid "Waiting to fetch latest release"
msgstr "Waiting to fetch latest release"
msgid "No matching firmware"
msgstr "No matching firmware"
msgid "Fetching latest release"
msgstr "Fetching latest release"
msgid "Fetch failed"
msgstr "Fetch failed"
msgid "Request failed: "
msgstr "Request failed: "
msgid "Latest release: "
msgstr "Latest release: "
msgid "Status updated"
msgstr "Status updated"
msgid "No new firmware currently, firmware selection is disabled"
msgstr "No new firmware currently, firmware selection is disabled"
msgid "System install time"
msgstr "System install time"
msgid "Latest release"
msgstr "Latest release"
msgid "Published time"
msgstr "Published time"
msgid "Assets total"
msgstr "Assets total"
msgid "Conclusion"
msgstr "Conclusion"
msgid "Fetching in progress"
msgstr "Fetching in progress"
msgid "Failed to fetch GitHub release"
msgstr "Failed to fetch GitHub release"
msgid "Please select firmware to upgrade"
msgstr "Please select firmware to upgrade"
msgid "Please select a firmware asset"
msgstr "Please select a firmware asset"
msgid "Preparing upgrade: "
msgstr "Preparing upgrade: "
msgid "Upgrade command started, device may reboot soon"
msgstr "Upgrade command started, device may reboot soon"
msgid "Upgrade request failed: "
msgstr "Upgrade request failed: "
msgid "Selected firmware: "
msgstr "Selected firmware: "
msgid "unknown"
msgstr "unknown"
msgid "Failed to fetch GitHub release data"
msgstr "Failed to fetch GitHub release data"
msgid "Failed to parse GitHub API response"
msgstr "Failed to parse GitHub API response"
msgid "GitHub API error: "
msgstr "GitHub API error: "
msgid "GitHub repository cannot be empty"
msgstr "GitHub repository cannot be empty"
msgid "New firmware is available"
msgstr "New firmware is available"
msgid "No firmware newer than current system was found"
msgstr "No firmware newer than current system was found"
msgid "Invalid firmware URL, only https is supported"
msgstr "Invalid firmware URL, only https is supported"
msgid "Downloading firmware: "
msgstr "Downloading firmware: "
msgid "Download progress: "
msgstr "Download progress: "
msgid "Speed: "
msgstr "Speed: "
msgid "Download finished: "
msgstr "Download finished: "
msgid " downloaded successfully"
msgstr " downloaded successfully"
msgid "Invalid firmware file name"
msgstr "Invalid firmware file name"
msgid "Firmware file not found, please download again"
msgstr "Firmware file not found, please download again"
msgid "Starting system upgrade"
msgstr "Starting system upgrade"
msgid "Backup failed"
msgstr "Backup failed"
msgid "Download Backup"
msgstr "Download Backup"
msgid "Upgrading System"
msgstr "Upgrading System"
msgid "System is upgrading, please wait. The page will reload automatically when the system comes back online."
msgstr "System is upgrading, please wait. The page will reload automatically when the system comes back online."
msgid "Firmware Download Completed"
msgstr "Firmware Download Completed"
msgid "Firmware is ready. System upgrade will start in %d seconds. Please do not leave this page."
msgstr "Firmware is ready. System upgrade will start in %d seconds. Please do not leave this page."
msgid "Starting download: "
msgstr "Starting download: "
msgid "System upgrade will start in "
msgstr "System upgrade will start in "
msgid " seconds"
msgstr " seconds"
msgid "Starting system upgrade..."
msgstr "Starting system upgrade..."
msgid "Firmware download failed, please check network or GitHub repository"
msgstr "Firmware download failed, please check network or GitHub repository"
msgid "SHA256 verification passed: "
msgstr "SHA256 verification passed: "
msgid "SHA256 verification failed, upgrade cancelled"
msgstr "SHA256 verification failed, upgrade cancelled"
msgid " Expected: "
msgstr " Expected: "
msgid " Got: "
msgstr " Got: "
msgid "Upgrade mode: keep configuration"
msgstr "Upgrade mode: keep configuration"
msgid "Upgrade mode: do not keep configuration"
msgstr "Upgrade mode: do not keep configuration"
msgid "Fetch Timeout (seconds)"
msgstr "Fetch Timeout (seconds)"
msgid "5 ~ 300 seconds. Limits GitHub API fetch time."
msgstr "5 ~ 300 seconds. Limits GitHub API fetch time."
msgid "Unable to fetch GitHub Release, please check your network connection"
msgstr "Unable to fetch GitHub Release, please check your network connection"
msgid "Read Latest Release Notes"
msgstr "Read Latest Release Notes"
msgid "Latest Release Notes"
msgstr "Latest Release Notes"
msgid "Close"
msgstr "Close"
msgid "No release notes content available"
msgstr "No release notes content available"
msgid "Latest release assets are not ready yet, using previous release with available firmware."
msgstr "Latest release assets are not ready yet, using previous release with available firmware."
msgid "Latest release partial firmware may still be compiling, waiting to upload, or failed to compile. If your platform is missing, please wait for the next build result."
msgstr "Latest release partial firmware may still be compiling, waiting to upload, or failed to compile. If your platform is missing, please wait for the next build result."
msgid "Save Basic Configuration"
msgstr "Save Basic Configuration"
msgid "Saving basic configuration..."
msgstr "Saving basic configuration..."
msgid "Basic configuration saved"
msgstr "Basic configuration saved"
msgid "已自动筛选为上次更新的固件名%s,如果需要更改请删除模糊检索内容"
msgstr "Automatically filtered to previously updated firmware name %s. If you need to change it, clear the fuzzy search text."
msgid "最新release中没有固件名称%s,请手动筛选或等待下次仓库编译。"
msgstr "No firmware named %s was found in the latest release. Please filter manually or wait for the next repository build."
msgid "Upgrade workflow is running, please wait until current operation finishes"
msgstr "Upgrade workflow is running, please wait until current operation finishes"
msgid "SHA256 verification passed: "
msgstr "SHA256 verification passed: "
msgid "SHA256 verification failed, upgrade cancelled"
msgstr "SHA256 verification failed, upgrade cancelled"
msgid " Expected: "
msgstr " Expected: "
msgid " Got: "
msgstr " Got: "
+317
View File
@@ -0,0 +1,317 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
msgid "System Online Upgrade"
msgstr "系统在线更新"
msgid "One-click firmware upgrade assistant powered by dl.openwrt.ai/firmware with automatic device adaptation."
msgstr "基于 dl.openwrt.ai/firmware 的智能设备识别一键系统升级助手。"
msgid "Warning: Custom firmware with modified root partition size should use"
msgstr "注意:修改过根目录大小的定制固件请使用"
msgid "or luci-app-attendedsysupgrade to rebuild, otherwise direct online upgrade will reset partitions and lose configuration."
msgstr "或安装 luci-app-attendedsysupgrade 重新生成定制固件,直接用此在线更新会重置分区、丢失配置。"
msgid "Warning: There are unsaved changes that will get lost on reboot!"
msgstr "警告:有未保存的 UCI 配置更改,重启后将会丢失!"
msgid "Firmware Fuzzy Search"
msgstr "模糊检索固件"
msgid "Enter keyword to filter firmware names"
msgstr "输入关键字筛选固件名"
msgid "Last Flashed Firmware"
msgstr "当前使用固件"
msgid "Selected Firmware"
msgstr "当前选定固件"
msgid "Keep Configuration"
msgstr "保留配置升级"
msgid "Retain Installed Packages"
msgstr "保留已安装软件包"
msgid "System and Firmware Status"
msgstr "系统与固件状态"
msgid "Available Firmware"
msgstr "可选固件"
msgid "Available Firmware (%d)"
msgstr "可选固件 (%d个)"
msgid "Logs"
msgstr "执行日志"
msgid "Firmware Changelog"
msgstr "固件更新日志"
msgid "No firmware changelog available"
msgstr "暂无固件更新日志内容"
msgid "Check Update"
msgstr "检查更新"
msgid "Flash this latest firmware"
msgstr "刷入此最新固件"
msgid "Already latest version, sure to reflash this version?"
msgstr "已是最新版,确定要重刷此版本?"
msgid "Sure to flash this older version?"
msgstr "确定要刷入此老版本?"
msgid "Waiting to check firmware"
msgstr "等待检查更新"
msgid "No matching firmware"
msgstr "没有匹配的固件"
msgid "Checking latest firmware"
msgstr "正在检查最新固件"
msgid "Check failed"
msgstr "检查失败"
msgid "Request failed: "
msgstr "请求失败: "
msgid "Latest version: "
msgstr "最新版本: "
msgid "Status updated"
msgstr "状态已更新"
msgid "Current system version"
msgstr "当前固件版本"
msgid "Current device"
msgstr "当前设备"
msgid "Latest version"
msgstr "最新版本号"
msgid "Published time"
msgstr "发布时间"
msgid "Firmware count"
msgstr "固件总数"
msgid "Checking..."
msgstr "正在检查更新..."
msgid "Failed to fetch firmware list"
msgstr "获取固件列表失败"
msgid "Failed to fetch firmware list from server"
msgstr "无法从固件服务器获取当前设备的固件信息"
msgid "Fetch failed"
msgstr "获取失败"
msgid "Please select firmware to upgrade"
msgstr "请选择要升级的固件"
msgid "Please select a firmware asset"
msgstr "请选择固件下载项"
msgid "Upgrade request failed: "
msgstr "升级请求失败: "
msgid "Selected firmware: "
msgstr "已选择固件: "
msgid "unknown"
msgstr "未知"
msgid "New firmware is available"
msgstr "检测到新固件,可升级"
msgid "No firmware newer than current system was found"
msgstr "当前系统已是最新版本"
msgid "New version available"
msgstr "新版本可用"
msgid "Formal Release"
msgstr "正式版"
msgid "Preview Release"
msgstr "尝鲜版"
msgid "Recommended"
msgstr "推荐"
msgid "Latest"
msgstr "最新"
msgid "Size"
msgstr "文件大小"
msgid "SHA256"
msgstr "SHA256"
msgid "Invalid firmware URL, only https://dl.openwrt.ai/firmware is supported"
msgstr "固件下载地址非法,仅支持 https://dl.openwrt.ai/firmware 官方源"
msgid "Downloading firmware: "
msgstr "正在下载固件: "
msgid "Download progress: "
msgstr "下载进度: "
msgid "Speed: "
msgstr "速率: "
msgid "Download finished: "
msgstr "下载完成: "
msgid " downloaded successfully"
msgstr " 下载成功"
msgid "Verifying firmware image format..."
msgstr "正在校验固件镜像格式与设备兼容性..."
msgid "Firmware image validation passed"
msgstr "固件镜像格式与设备兼容性校验通过"
msgid "Image check failed: "
msgstr "固件镜像校验未通过:"
msgid "The uploaded image file does not contain a supported format."
msgstr "所选固件文件不包含受支持的格式。"
msgid "Firmware Image Check Failed"
msgstr "固件镜像校验未通过"
msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
msgstr "下载的固件文件未通过系统格式或设备兼容性校验。请确认您选择了适合当前硬件平台的固件镜像。"
msgid "Force upgrade"
msgstr "强制升级 (Force upgrade)"
msgid "Select 'Force upgrade' to flash the image even if the image format check fails. Use only if you are sure that the firmware is correct and meant for your device!"
msgstr "勾选“强制升级”可在镜像格式校验失败时强行刷入固件。请仅在您完全确认该固件正确且适用于当前设备时使用!"
msgid "Force upgrade is disallowed for this image by the system validator."
msgstr "系统校验器禁止对该固件镜像执行强制升级。"
msgid "The image does not support keeping current configuration; configuration retention will be disabled (-n)."
msgstr "该固件镜像不支持保留当前配置,刷入时将自动禁用保留配置 (-n)。"
msgid "Cancel"
msgstr "取消"
msgid "Cancel Upgrade"
msgstr "取消升级"
msgid "Force Flash"
msgstr "强制刷入固件"
msgid "Upgrade cancelled by user after firmware check warning"
msgstr "用户已在固件校验警告弹窗中取消升级,临时固件已清理"
msgid "Upgrade countdown cancelled by user, temporary firmware removed"
msgstr "用户已中止升级倒计时,临时固件已清理"
msgid "Upgrade cancelled, temporary firmware file removed"
msgstr "已取消升级并清理临时固件文件"
msgid "Image check failed, confirmation of force upgrade is required"
msgstr "固件校验未通过,需要确认强制升级才能继续"
msgid "Firmware image validation failed and force upgrade is disallowed by system"
msgstr "固件校验失败且系统禁止强制刷入该镜像"
msgid "Firmware metadata does not allow keeping configuration, switched to -n"
msgstr "固件元数据不支持保留配置,已自动切换为不保留配置模式 (-n)"
msgid "Force upgrade enabled (--force)"
msgstr "已启用强制升级模式 (--force)"
msgid "Invalid firmware file name"
msgstr "固件文件名非法"
msgid "Firmware file not found, please download again"
msgstr "固件文件未找到,请重新下载"
msgid "Starting system upgrade"
msgstr "开始升级系统"
msgid "Backup failed"
msgstr "备份失败"
msgid "Download Backup"
msgstr "下载备份"
msgid "Upgrading System"
msgstr "正在升级系统"
msgid "Upgrade successful, Waiting for device..."
msgstr "更新成功,等待设备重启后响应..."
msgid "Device unreachable! Still waiting for device..."
msgstr "无法连接设备!继续等待设备重启..."
msgid "Firmware Download Completed"
msgstr "固件下载完成"
msgid "Firmware is ready. System upgrade will start in %d seconds. Please do not leave this page."
msgstr "固件已就绪,系统将在 %d 秒后开始刷入。请勿离开当前页面。"
msgid "Starting download: "
msgstr "开始下载: "
msgid "System upgrade will start in "
msgstr "系统将在 "
msgid " seconds"
msgstr " 秒后开始刷入"
msgid "Flashing..."
msgstr "正在刷入固件..."
msgid "Upgrade mode: keep configuration"
msgstr "本次升级: 保留配置"
msgid "Upgrade mode: do not keep configuration"
msgstr "本次升级: 不保留配置 (-n)"
msgid "Package mode: retain installed packages (-k)"
msgstr "软件包策略: 保留已安装软件包列表 (-k)"
msgid "Unable to fetch firmware list, please check your network connection"
msgstr "无法获取远程版本信息,请检查网络连接"
msgid "Open Firmware Directory"
msgstr "打开固件目录"
msgid "Firmware directory URL is unavailable, please check update again"
msgstr "固件目录链接不可用,请重新检查更新"
msgid "Unable to open a new window. Please allow pop-ups in your browser."
msgstr "无法打开新窗口,请允许浏览器弹窗。"
msgid "Firmware download failed, please check network connection"
msgstr "固件下载失败或超时,请检查网络连接后重试"
msgid "Automatically selected recommended firmware: %s"
msgstr "已自动匹配并选中最新固件:%s"
msgid "Upgrade workflow is running, please wait until current operation finishes"
msgstr "升级流程正在执行,请等待当前操作完成"
msgid "SHA256 verification passed: "
msgstr "SHA256 校验通过:"
msgid "SHA256 verification failed, upgrade cancelled"
msgstr "SHA256 校验失败,已取消升级"
msgid " Expected: "
msgstr " 期望值:"
msgid " Got: "
msgstr " 实际值:"
+1
View File
@@ -0,0 +1 @@
zh_Hans
+317
View File
@@ -0,0 +1,317 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
msgid "System Online Upgrade"
msgstr "系统在线更新"
msgid "One-click firmware upgrade assistant powered by dl.openwrt.ai/firmware with automatic device adaptation."
msgstr "基于 dl.openwrt.ai/firmware 的智能设备识别一键系统升级助手。"
msgid "Warning: Custom firmware with modified root partition size should use"
msgstr "注意:修改过根目录大小的定制固件请使用"
msgid "or luci-app-attendedsysupgrade to rebuild, otherwise direct online upgrade will reset partitions and lose configuration."
msgstr "或安装 luci-app-attendedsysupgrade 重新生成定制固件,直接用此在线更新会重置分区、丢失配置。"
msgid "Warning: There are unsaved changes that will get lost on reboot!"
msgstr "警告:有未保存的 UCI 配置更改,重启后将会丢失!"
msgid "Firmware Fuzzy Search"
msgstr "模糊检索固件"
msgid "Enter keyword to filter firmware names"
msgstr "输入关键字筛选固件名"
msgid "Last Flashed Firmware"
msgstr "当前使用固件"
msgid "Selected Firmware"
msgstr "当前选定固件"
msgid "Keep Configuration"
msgstr "保留配置升级"
msgid "Retain Installed Packages"
msgstr "保留已安装软件包"
msgid "System and Firmware Status"
msgstr "系统与固件状态"
msgid "Available Firmware"
msgstr "可选固件"
msgid "Available Firmware (%d)"
msgstr "可选固件 (%d个)"
msgid "Logs"
msgstr "执行日志"
msgid "Firmware Changelog"
msgstr "固件更新日志"
msgid "No firmware changelog available"
msgstr "暂无固件更新日志内容"
msgid "Check Update"
msgstr "检查更新"
msgid "Flash this latest firmware"
msgstr "刷入此最新固件"
msgid "Already latest version, sure to reflash this version?"
msgstr "已是最新版,确定要重刷此版本?"
msgid "Sure to flash this older version?"
msgstr "确定要刷入此老版本?"
msgid "Waiting to check firmware"
msgstr "等待检查更新"
msgid "No matching firmware"
msgstr "没有匹配的固件"
msgid "Checking latest firmware"
msgstr "正在检查最新固件"
msgid "Check failed"
msgstr "检查失败"
msgid "Request failed: "
msgstr "请求失败: "
msgid "Latest version: "
msgstr "最新版本: "
msgid "Status updated"
msgstr "状态已更新"
msgid "Current system version"
msgstr "当前固件版本"
msgid "Current device"
msgstr "当前设备"
msgid "Latest version"
msgstr "最新版本号"
msgid "Published time"
msgstr "发布时间"
msgid "Firmware count"
msgstr "固件总数"
msgid "Checking..."
msgstr "正在检查更新..."
msgid "Failed to fetch firmware list"
msgstr "获取固件列表失败"
msgid "Failed to fetch firmware list from server"
msgstr "无法从固件服务器获取当前设备的固件信息"
msgid "Fetch failed"
msgstr "获取失败"
msgid "Please select firmware to upgrade"
msgstr "请选择要升级的固件"
msgid "Please select a firmware asset"
msgstr "请选择固件下载项"
msgid "Upgrade request failed: "
msgstr "升级请求失败: "
msgid "Selected firmware: "
msgstr "已选择固件: "
msgid "unknown"
msgstr "未知"
msgid "New firmware is available"
msgstr "检测到新固件,可升级"
msgid "No firmware newer than current system was found"
msgstr "当前系统已是最新版本"
msgid "New version available"
msgstr "新版本可用"
msgid "Formal Release"
msgstr "正式版"
msgid "Preview Release"
msgstr "尝鲜版"
msgid "Recommended"
msgstr "推荐"
msgid "Latest"
msgstr "最新"
msgid "Size"
msgstr "文件大小"
msgid "SHA256"
msgstr "SHA256"
msgid "Invalid firmware URL, only https://dl.openwrt.ai/firmware is supported"
msgstr "固件下载地址非法,仅支持 https://dl.openwrt.ai/firmware 官方源"
msgid "Downloading firmware: "
msgstr "正在下载固件: "
msgid "Download progress: "
msgstr "下载进度: "
msgid "Speed: "
msgstr "速率: "
msgid "Download finished: "
msgstr "下载完成: "
msgid " downloaded successfully"
msgstr " 下载成功"
msgid "Verifying firmware image format..."
msgstr "正在校验固件镜像格式与设备兼容性..."
msgid "Firmware image validation passed"
msgstr "固件镜像格式与设备兼容性校验通过"
msgid "Image check failed: "
msgstr "固件镜像校验未通过:"
msgid "The uploaded image file does not contain a supported format."
msgstr "所选固件文件不包含受支持的格式。"
msgid "Firmware Image Check Failed"
msgstr "固件镜像校验未通过"
msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
msgstr "下载的固件文件未通过系统格式或设备兼容性校验。请确认您选择了适合当前硬件平台的固件镜像。"
msgid "Force upgrade"
msgstr "强制升级 (Force upgrade)"
msgid "Select 'Force upgrade' to flash the image even if the image format check fails. Use only if you are sure that the firmware is correct and meant for your device!"
msgstr "勾选“强制升级”可在镜像格式校验失败时强行刷入固件。请仅在您完全确认该固件正确且适用于当前设备时使用!"
msgid "Force upgrade is disallowed for this image by the system validator."
msgstr "系统校验器禁止对该固件镜像执行强制升级。"
msgid "The image does not support keeping current configuration; configuration retention will be disabled (-n)."
msgstr "该固件镜像不支持保留当前配置,刷入时将自动禁用保留配置 (-n)。"
msgid "Cancel"
msgstr "取消"
msgid "Cancel Upgrade"
msgstr "取消升级"
msgid "Force Flash"
msgstr "强制刷入固件"
msgid "Upgrade cancelled by user after firmware check warning"
msgstr "用户已在固件校验警告弹窗中取消升级,临时固件已清理"
msgid "Upgrade countdown cancelled by user, temporary firmware removed"
msgstr "用户已中止升级倒计时,临时固件已清理"
msgid "Upgrade cancelled, temporary firmware file removed"
msgstr "已取消升级并清理临时固件文件"
msgid "Image check failed, confirmation of force upgrade is required"
msgstr "固件校验未通过,需要确认强制升级才能继续"
msgid "Firmware image validation failed and force upgrade is disallowed by system"
msgstr "固件校验失败且系统禁止强制刷入该镜像"
msgid "Firmware metadata does not allow keeping configuration, switched to -n"
msgstr "固件元数据不支持保留配置,已自动切换为不保留配置模式 (-n)"
msgid "Force upgrade enabled (--force)"
msgstr "已启用强制升级模式 (--force)"
msgid "Invalid firmware file name"
msgstr "固件文件名非法"
msgid "Firmware file not found, please download again"
msgstr "固件文件未找到,请重新下载"
msgid "Starting system upgrade"
msgstr "开始升级系统"
msgid "Backup failed"
msgstr "备份失败"
msgid "Download Backup"
msgstr "下载备份"
msgid "Upgrading System"
msgstr "正在升级系统"
msgid "Upgrade successful, Waiting for device..."
msgstr "更新成功,等待设备重启后响应..."
msgid "Device unreachable! Still waiting for device..."
msgstr "无法连接设备!继续等待设备重启..."
msgid "Firmware Download Completed"
msgstr "固件下载完成"
msgid "Firmware is ready. System upgrade will start in %d seconds. Please do not leave this page."
msgstr "固件已就绪,系统将在 %d 秒后开始刷入。请勿离开当前页面。"
msgid "Starting download: "
msgstr "开始下载: "
msgid "System upgrade will start in "
msgstr "系统将在 "
msgid " seconds"
msgstr " 秒后开始刷入"
msgid "Flashing..."
msgstr "正在刷入固件..."
msgid "Upgrade mode: keep configuration"
msgstr "本次升级: 保留配置"
msgid "Upgrade mode: do not keep configuration"
msgstr "本次升级: 不保留配置 (-n)"
msgid "Package mode: retain installed packages (-k)"
msgstr "软件包策略: 保留已安装软件包列表 (-k)"
msgid "Unable to fetch firmware list, please check your network connection"
msgstr "无法获取远程版本信息,请检查网络连接"
msgid "Open Firmware Directory"
msgstr "打开固件目录"
msgid "Firmware directory URL is unavailable, please check update again"
msgstr "固件目录链接不可用,请重新检查更新"
msgid "Unable to open a new window. Please allow pop-ups in your browser."
msgstr "无法打开新窗口,请允许浏览器弹窗。"
msgid "Firmware download failed, please check network connection"
msgstr "固件下载失败或超时,请检查网络连接后重试"
msgid "Automatically selected recommended firmware: %s"
msgstr "已自动匹配并选中最新固件:%s"
msgid "Upgrade workflow is running, please wait until current operation finishes"
msgstr "升级流程正在执行,请等待当前操作完成"
msgid "SHA256 verification passed: "
msgstr "SHA256 校验通过:"
msgid "SHA256 verification failed, upgrade cancelled"
msgstr "SHA256 校验失败,已取消升级"
msgid " Expected: "
msgstr " 期望值:"
msgid " Got: "
msgstr " 实际值:"
+4
View File
@@ -0,0 +1,4 @@
config ghfu 'main'
option selected_release ''
option keep_config '1'
option retain_packages '0'
@@ -0,0 +1,18 @@
. /lib/functions/network.sh
network_flush_cache
network_find_wan NET_IF
network_find_wan6 NET_IF6
if [ "${INTERFACE}" != "${NET_IF}" ] \
&& [ "${INTERFACE}" != "${NET_IF6}" ]
then exit 0
fi
if [ "${ACTION}" != "ifup" ] \
&& [ "${ACTION}" != "ifupdate" ]
then exit 0
fi
if [ "${ACTION}" = "ifupdate" ] \
&& [ -z "${IFUPDATE_ADDRESSES}" ] \
&& [ -z "${IFUPDATE_DATA}" ]
then exit 0
fi
hotplug-call online
@@ -0,0 +1 @@
sleep 3
@@ -0,0 +1,39 @@
. /etc/profile.d/opkg.sh
OPKG_PI="$(opkg export pi)"
if [ ! -e /etc/opkg-restore-auto ] \
&& lock -n /var/lock/opkg-restore && [ -s "${OPKG_PI}" ]; then
c=0
while ! curl https://dl.openwrt.ai >/dev/null || ! opkg update >/dev/null; do
echo "Network error." | logger -t opkg
[[ "$(uci -q get dhcp.@dnsmasq[0].noresolv)" == 1 && $c == 3 ]] && {
uci -q del dhcp.@dnsmasq[0].noresolv
uci commit dhcp
uci -q get network.lan.dns || {
uci -q set network.lan.dns='223.5.5.5'
uci commit network
/etc/init.d/network reload
}
/etc/init.d/dnsmasq reload
}
[ $c -eq 300 ] && {
lock -u /var/lock/opkg-restore
exit 0
} || let c++
sleep 3
done
c1=0
logs="1"
while [ "$logs" != "" ]; do
logs="$(opkg restore)"
echo "${logs}" | logger -t opkg
[ $c1 -eq 5 ] && {
lock -u /var/lock/opkg-restore
exit 0
} || let c1++
sleep 2
done
touch /etc/opkg-restore-auto
fi
lock -u /var/lock/opkg-restore
@@ -0,0 +1,5 @@
if [ "$(uci -q get wizard.default.autoupgrade_pkg)" == '1' ] && lock -n /var/lock/opkg-upgrade && opkg update; then
. /etc/profile.d/opkg.sh
opkg upgr 2>&1 | logger -t opkg
fi
lock -u /var/lock/opkg-upgrade
+207
View File
@@ -0,0 +1,207 @@
opkg() {
local OPKG_CMD="${1}"
local OPKG_UCI="$(uci -q get opkg.defaults."${OPKG_CMD}")"
case "${OPKG_CMD}" in
(init|uci|import|save|restore|rollback\
|upgr|export|newconf|proc|reinstall) opkg_"${@}" ;;
(*) command opkg "${@}" ;;
esac
}
opkg_init() {
uci import opkg < /dev/null
uci -q batch << EOI
set opkg.defaults='opkg'
set opkg.defaults.save='auto'
set opkg.defaults.restore='auto'
set opkg.defaults.rollback='auto'
set opkg.defaults.upgr='ai'
set opkg.defaults.export='ai'
set opkg.defaults.proc='--force-overwrite --force-checksum --force-depends'
set opkg.defaults.reinstall='--force-reinstall --force-overwrite --force-checksum --force-depends'
set opkg.defaults.newconf='/etc'
EOI
echo "kmod busybox base-files " \
| sed -e "s/\s/ ipkg\n/g" | opkg uci ignore
}
opkg_uci() {
local OPKG_OPT="${1:-${OPKG_UCI}}"
local OPKG_OPT="${OPKG_OPT:-auto}"
if ! uci -q get opkg.defaults > /dev/null
then opkg init
fi
uci -q batch << EOI
delete opkg.'${OPKG_OPT}'
set opkg.'${OPKG_OPT}'='opkg'
$(sed -r -e "s/^(.*)\s(.*)$/\
del_list opkg.'${OPKG_OPT}'.'\2'='\1'\n\
add_list opkg.'${OPKG_OPT}'.'\2'='\1'/")
commit opkg
EOI
}
opkg_import() {
local OPKG_OPT="${1:-${OPKG_UCI}}"
if [ -e "${OPKG_OPT}" ]
then sed -n -r -e "s/\s(overlay|unknown)$/\
\tipkg/p" "${OPKG_OPT}" \
| opkg uci auto
fi
}
opkg_save() {
local OPKG_OPT="${1:-${OPKG_UCI}}"
local OPKG_WR="$(opkg export wr)"
local OPKG_WI="$(opkg export wi)"
local OPKG_UR="$(opkg export ur)"
local OPKG_CM="$(opkg export cm)"
local OPKG_UI="$(opkg export ui)"
if uci -q get fstab.rwm > /dev/null \
&& grep -q -e "\s/rwm\s" /etc/mtab
then {
sed -e "s/$/\trpkg/" "${OPKG_WR}"
sed -e "s/$/\tipkg/" "${OPKG_WI}"
} | opkg uci init
fi
{
sed -e "s/$/\trpkg/" "${OPKG_UR}"
sed -e "s/$/\trpkg/" "${OPKG_CM}" | grep "^-" | sed "s/^-//"
sed -e "s/$/\tipkg/" "${OPKG_UI}"
sed -e "s/$/\tipkg/" "${OPKG_CM}" | grep "^[^-]"
} | opkg uci "${OPKG_OPT}"
rm -f "${OPKG_WR}" "${OPKG_WI}" "${OPKG_UR}" "${OPKG_UI}"
}
opkg_restore() {
local OPKG_OPT="${1:-${OPKG_UCI}}"
local OPKG_CONF="${OPKG_OPT}"
local OPKG_AI="$(opkg export ai)"
local OPKG_PR="$(opkg export pr)"
local OPKG_PI="$(opkg export pi)"
if ! uci -q get opkg > /dev/null
then opkg init
fi
grep -x -f "${OPKG_AI}" "${OPKG_PR}" \
| opkg proc remove
grep -v -x -f "${OPKG_AI}" "${OPKG_PI}" \
| opkg proc install
rm -f "${OPKG_AI}" "${OPKG_PR}" "${OPKG_PI}"
}
opkg_rollback() {
local OPKG_OPT="${1:-${OPKG_UCI}}"
local OPKG_CONF="${OPKG_OPT}"
local OPKG_UR="$(opkg export ur)"
local OPKG_UI="$(opkg export ui)"
local OPKG_PR="$(opkg export pr)"
local OPKG_PI="$(opkg export pi)"
if uci -q get opkg."${OPKG_CONF}" > /dev/null
then opkg restore "${OPKG_CONF}"
grep -v -x -f "${OPKG_PI}" "${OPKG_UI}" \
| opkg proc remove
grep -v -x -f "${OPKG_PR}" "${OPKG_UR}" \
| opkg proc install
fi
rm -f "${OPKG_UR}" "${OPKG_UI}" "${OPKG_PR}" "${OPKG_PI}"
}
opkg_upgr() {
local OPKG_OPT="${1:-${OPKG_UCI}}"
if ! uci -q get opkg > /dev/null
then opkg init
fi
case "${OPKG_OPT}" in
(ai|oi) opkg_"${OPKG_CMD}"_type ;;
esac | opkg proc upgrade
}
opkg_upgr_type() {
local OPKG_AI="$(opkg export ai)"
local OPKG_OI="$(opkg export oi)"
local OPKG_AU="$(opkg export au)"
case "${OPKG_OPT::1}" in
(a) grep -x -f "${OPKG_AI}" "${OPKG_AU}" ;;
(o) grep -x -f "${OPKG_OI}" "${OPKG_AU}" ;;
esac
rm -f "${OPKG_AI}" "${OPKG_OI}" "${OPKG_AU}"
}
opkg_export() {
local OPKG_OPT="${1:-${OPKG_UCI}}"
local OPKG_TEMP="$(mktemp -t opkg.XXXXXX)"
case "${OPKG_OPT}" in
(ai|au) opkg_"${OPKG_CMD}"_cmd ;;
(ri|wr|wi|or|oi) opkg_"${OPKG_CMD}"_type ;;
(ur|ui) opkg_"${OPKG_CMD}"_run ;;
(pr|pi|ig|cm) opkg_"${OPKG_CMD}"_uci ;;
esac > "${OPKG_TEMP}"
echo "${OPKG_TEMP}"
}
opkg_export_cmd() {
local OPKG_TYPE
local OPKG_IG="$(opkg export ig)"
case "${OPKG_OPT:1}" in
(i) OPKG_TYPE="installed";opkg list-"${OPKG_TYPE}" | sed -e "s/\s.*$//" ;;
(u) OPKG_TYPE="upgradable";opkg list-"${OPKG_TYPE}" | sed -e "s/\s.*$//" | grep -v -f "${OPKG_IG}" ;;
esac
}
opkg_export_type() {
local OPKG_INFO="/usr/lib/opkg/info"
local OPKG_TYPE
case "${OPKG_OPT::1}" in
(r) OPKG_INFO="/rom${OPKG_INFO}" ;;
(w) OPKG_INFO="/rwm/upper${OPKG_INFO}" ;;
(o) OPKG_INFO="/overlay/upper${OPKG_INFO}" ;;
esac
case "${OPKG_OPT:1}" in
(r) OPKG_TYPE="c" ;;
(i) OPKG_TYPE="f" ;;
esac
find "${OPKG_INFO}" -name "*.control" \
-type "${OPKG_TYPE}" 2> /dev/null \
| sed -e "s/^.*\///;s/\.control$//"
}
opkg_export_run() {
local OPKG_AI="$(opkg export ai)"
local OPKG_RI="$(opkg export ri)"
case "${OPKG_OPT:1}" in
(r) grep -v -x -f "${OPKG_AI}" "${OPKG_RI}" ;;
(i) grep -v -x -f "${OPKG_RI}" "${OPKG_AI}" ;;
esac
rm -f "${OPKG_AI}" "${OPKG_RI}"
}
opkg_export_uci() {
local OPKG_TYPE
case "${OPKG_OPT:1}" in
(r) OPKG_TYPE="rpkg"; OPKG_CONF="auto" ;;
(i) OPKG_TYPE="ipkg"; OPKG_CONF="auto" ;;
(g) OPKG_TYPE="ipkg"; OPKG_CONF="ignore" ;;
(m) OPKG_TYPE="ipkg"; OPKG_CONF="custom" ;;
esac
uci -q get opkg."${OPKG_CONF}"."${OPKG_TYPE}" \
| sed -e "s/\s/\n/g"
}
opkg_proc() {
local OPKG_OPT="${OPKG_UCI}"
local OPKG_CMD="${1:?}"
local OPKG_PKG
while read -r OPKG_PKG
do opkg "${OPKG_CMD}" "${OPKG_PKG}" ${OPKG_OPT}
done
}
opkg_reinstall() {
local OPKG_OPT="${OPKG_UCI}"
opkg install "${@}" ${OPKG_OPT}
}
opkg_newconf() {
local OPKG_OPT="${1:-${OPKG_UCI}}"
find "${OPKG_OPT}" -name "*-opkg"
}
@@ -0,0 +1,31 @@
#!/bin/sh
uci -q get ghfu.main >/dev/null || {
uci -q batch <<EOF
set ghfu.main=ghfu
set ghfu.main.selected_release=''
set ghfu.main.keep_config='1'
set ghfu.main.retain_packages='0'
EOF
uci commit ghfu
}
if [ -f /etc/config/luci ]; then
uci -q get luci.main.autoupgrade_fm >/dev/null || {
uci -q set luci.main.autoupgrade_fm='1'
uci commit luci
}
fi
grep -q "opkg-upgrade" /etc/crontabs/root 2>/dev/null || {
hour="$(grep -m1 -ao '[4-6]' /dev/urandom 2>/dev/null | head -n1)"
[ -z "$hour" ] && hour=5
min="$(grep -m1 -ao '[0-5][0-9]' /dev/urandom 2>/dev/null | head -n1)"
[ -z "$min" ] && min=30
echo "$min $hour * * * . /etc/hotplug.d/online/51-opkg-upgrade" >> /etc/crontabs/root
}
date +%s > /etc/ghfu_flash_epoch
rm -rf /tmp/luci-modulecache /tmp/luci-indexcache*
exit 0
@@ -0,0 +1,11 @@
{
"luci-app-ghfu": {
"description": "Grant UCI access for luci-app-ghfu",
"read": {
"uci": [ "ghfu" ]
},
"write": {
"uci": [ "ghfu" ]
}
}
}
+7 -17
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-modem-manager-next
PKG_VERSION:=1.0.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_LICENSE:=MIT
PKG_MAINTAINER:=Dante <dante@seckv.com>
@@ -14,19 +14,7 @@ LUCI_DEPENDS:=+ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci \
+kmod-usb-net +kmod-usb-serial +kmod-usb-serial-option \
+kmod-usb-net-cdc-ncm +kmod-usb-net-cdc-ether +sms-tool
LUCI_PKGARCH:=all
include $(TOPDIR)/feeds/luci/luci.mk
define Package/$(PKG_NAME)
$(call Package/luci/webtemplate)
TITLE:=$(LUCI_TITLE)
DEPENDS:=$(LUCI_DEPENDS)
PROVIDES:=luci-app-modem-manager
endef
define Package/$(PKG_NAME)/description
Provides a modern LuCI Web management interface for 4G/5G cellular modems.
endef
PKG_PROVIDES:=luci-app-modem-manager
define Package/$(PKG_NAME)/conffiles
/etc/config/modem-manager
@@ -38,11 +26,13 @@ define Package/$(PKG_NAME)/postinst
chmod 0755 /etc/init.d/modem-manager 2>/dev/null || true
chmod 0755 /etc/hotplug.d/usb/20-modem-hotplug 2>/dev/null || true
chmod 0755 /usr/libexec/modem-at-executor /usr/libexec/modem-detect /usr/libexec/modem-collector 2>/dev/null || true
/etc/init.d/rpcd restart
/etc/init.d/modem-manager enable
/etc/init.d/modem-manager restart
/etc/init.d/rpcd restart >/dev/null 2>&1 || true
/etc/init.d/modem-manager enable >/dev/null 2>&1 || true
/etc/init.d/modem-manager restart >/dev/null 2>&1 || true
}
exit 0
endef
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature
+2 -2
View File
@@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-open-box
PKG_VERSION:=0.1.437
PKG_RELEASE:=78
PKG_VERSION:=0.1.442
PKG_RELEASE:=79
PKG_MAINTAINER:=liandu2024
PKG_LICENSE:=GPL-3.0-or-later
+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=26.11.11
PKG_RELEASE:=378
PKG_RELEASE:=379
PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \
@@ -463,6 +463,7 @@ function socks_status()
e.socks_status = luci.sys.call(string.format("/bin/busybox top -bn1 | grep -v -E 'grep|acl/|acl_' | grep '%s/bin/' | grep '/%s' > /dev/null", appname, id)) == 0
local use_http = uci_get(id, "http_port") or 0
e.use_http = 0
e.http_status = false
if tonumber(use_http) > 0 then
e.use_http = 1
e.http_status = luci.sys.call(string.format("/bin/busybox top -bn1 | grep -v -E 'grep|acl/|acl_' | grep '%s/bin/' | grep '/%s' | grep -E '\\+http|_http' > /dev/null", appname, id)) == 0
@@ -210,12 +210,6 @@
return `#${toHex(r)}${toHex(g)}${toHex(b)}`
}
function dl_isTransparent(color) {
const cleanColor = dl_parseColorToRgba(color);
// check #RRGGBBAA for transparency
return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a);
}
function dl_getColorSchema(color) {
const rgb = dl_parseColorToRgba(color);
if (!rgb) return 'unknown'; // Handle invalid colors
@@ -247,6 +241,57 @@
return dl_rgbToHex(r, g, b);
}
function dl_getNodeSelectorColors(select) {
const selectedIndex = select.selectedIndex;
const probe = document.createElement('option');
let backgroundColor, color;
// A selected option may use the theme's translucent accent, not its menu surface.
select.appendChild(probe);
try {
const style = getComputedStyle(probe);
backgroundColor = style.backgroundColor;
color = style.color;
} finally {
probe.remove();
if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex;
}
let ctx = dl_getNodeSelectorColors._context;
if (!ctx) {
const canvas = document.createElement('canvas');
canvas.width = canvas.height = 1;
ctx = dl_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true });
}
const rgb = [0, 0, 0];
let remaining = 1;
function composite(value) {
ctx.clearRect(0, 0, 1, 1);
ctx.fillStyle = value;
ctx.fillRect(0, 0, 1, 1);
const pixel = ctx.getImageData(0, 0, 1, 1).data;
const alpha = pixel[3] / 255;
for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining;
remaining *= 1 - alpha;
}
// Flatten transparent surfaces before the popup is moved outside the form.
composite(backgroundColor);
for (let element = select; element && remaining > 0; element = element.parentElement) {
composite(getComputedStyle(element).backgroundColor);
}
if (remaining > 0) {
const canvasColor = document.createElement('span');
canvasColor.style.cssText = 'display:none; background-color:Canvas;';
select.parentElement.appendChild(canvasColor);
try {
composite(getComputedStyle(canvasColor).backgroundColor);
} finally {
canvasColor.remove();
}
}
return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color };
}
// copy select styles
function dl_adaptiveStyle(cbid) {
const display = document.getElementById(cbid + ".display");
@@ -256,7 +301,6 @@
const elOption = hiddenRef.getElementsByTagName("option")[0]
const styleSelect = window.getComputedStyle(hiddenRef)
const styleOption = window.getComputedStyle(elOption)
const styleBody = window.getComputedStyle(document.body)
const styleNode = document.createElement('style')
const styleNames = ["width", "color", "height", "padding", "margin", "lineHeight", "border", "borderRadius", "minWidth", "minHeight"]
@@ -264,14 +308,14 @@
styleNames.push("borderBottomWidth", "borderBottomStyle", "borderBottomColor");
}
document.head.appendChild(styleNode)
// trace back from option -> select -> body for background color
const colors = dl_getNodeSelectorColors(hiddenRef);
const panelRadius = styleSelect.borderRadius;
const optionColor = !dl_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !dl_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor
const optionColor = colors.backgroundColor;
const titleColor = dl_getColorSchema(optionColor) === "light" ? dl_darker(optionColor, 30) : dl_lighter(optionColor, 30)
// 自带箭头已占据布局空间,右内边距使用主题的左内边距
const selectStyleCSS = [`#${CSS.escape(cbid + ".display")}, .dl-selected-item {`, dl_style2Css(styleSelect, styleNames), dl_style2Css(styleSelect, ["backgroundColor"]), `padding-right: ${styleSelect.paddingLeft} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, dl_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .dl-group-title {`, `background-color: ${titleColor} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, dl_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .dl-group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"]
styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n")
}
}
@@ -48,20 +48,15 @@
text-overflow: ellipsis;
transition: background-color 0.15s ease;
}
/* 鼠标悬停效果 - 使用透明度避免覆盖问题 */
.cbi-listvalue-panel li[data-key]:hover {
background-color: rgba(0, 123, 255, 0.1);
/* 悬停和选中颜色由当前控件的主题样式提供 */
.lv-dropdown-panel li[data-key]:hover {
background-color: var(--lv-hover-background, rgba(127, 127, 127, 0.1));
}
/* 选中项样式 - 使用更高优先级 */
.cbi-listvalue-panel li[data-key].is-selected {
background-color: #007bff !important;
color: white !important;
.lv-dropdown-panel li[data-key].is-selected {
background: var(--lv-selected-background, Highlight) !important;
color: var(--lv-selected-color, HighlightText) !important;
font-weight: 600 !important;
}
/* 选中项悬停时保持主色调 */
.cbi-listvalue-panel li[data-key].is-selected:hover {
background-color: #0056b3 !important;
}
.lv-dropdown-container {
display: inline-block;
@@ -69,11 +64,6 @@
min-width: 220px;
white-space: nowrap;
}
@media (max-width: 1152px) {
.lv-dropdown-container {
white-space: normal;
}
}
@media (max-width: 600px) {
.lv-dropdown-container {
display: block;
@@ -143,6 +133,32 @@
text-overflow: ellipsis;
text-align: left !important;
}
@media screen and (max-width: 1152px) {
.lv-dropdown-container {
width: 100%;
min-width: 0;
max-width: 100%;
white-space: normal;
}
/* Override widths copied from the theme by adaptiveStyle(). */
.lv-dropdown-display.cbi-input-select {
width: 100% !important;
min-width: 0 !important;
max-width: 100% !important;
}
.lv-dropdown-label {
flex: 1;
width: 0;
min-width: 0;
text-overflow: ellipsis;
}
.lv-arrow-down {
flex-shrink: 0;
}
}
</style>
<script type="text/javascript">
@@ -200,12 +216,6 @@
return `#${toHex(r)}${toHex(g)}${toHex(b)}`
}
function lv_isTransparent(color) {
const cleanColor = lv_parseColorToRgba(color);
// check #RRGGBBAA for transparency
return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a);
}
function lv_getColorSchema(color) {
const rgb = lv_parseColorToRgba(color);
if (!rgb) return 'unknown'; // Handle invalid colors
@@ -237,6 +247,67 @@
return lv_rgbToHex(r, g, b);
}
function lv_getNodeSelectorColors(select) {
const selectedIndex = select.selectedIndex;
const probe = document.createElement('option');
let backgroundColor, color;
let selectedBackground = 'Highlight', selectedColor = 'HighlightText';
// A selected option may use the theme's translucent accent, not its menu surface.
select.appendChild(probe);
try {
const style = getComputedStyle(probe);
backgroundColor = style.backgroundColor;
color = style.color;
const selectedOption = select.options[selectedIndex];
if (selectedOption) {
const selectedStyle = getComputedStyle(selectedOption);
// Preserve theme gradients and translucent tints for the selected row only.
if (selectedStyle.background !== style.background || selectedStyle.color !== color) {
selectedBackground = selectedStyle.background;
selectedColor = selectedStyle.color;
}
}
} finally {
probe.remove();
if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex;
}
let ctx = lv_getNodeSelectorColors._context;
if (!ctx) {
const canvas = document.createElement('canvas');
canvas.width = canvas.height = 1;
ctx = lv_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true });
}
const rgb = [0, 0, 0];
let remaining = 1;
function composite(value) {
ctx.clearRect(0, 0, 1, 1);
ctx.fillStyle = value;
ctx.fillRect(0, 0, 1, 1);
const pixel = ctx.getImageData(0, 0, 1, 1).data;
const alpha = pixel[3] / 255;
for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining;
remaining *= 1 - alpha;
}
// Flatten transparent surfaces before the popup is moved outside the form.
composite(backgroundColor);
for (let element = select; element && remaining > 0; element = element.parentElement) {
composite(getComputedStyle(element).backgroundColor);
}
if (remaining > 0) {
const canvasColor = document.createElement('span');
canvasColor.style.cssText = 'display:none; background-color:Canvas;';
select.parentElement.appendChild(canvasColor);
try {
composite(getComputedStyle(canvasColor).backgroundColor);
} finally {
canvasColor.remove();
}
}
return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color, selectedBackground, selectedColor };
}
// copy select styles
function lv_adaptiveStyle(cbid) {
const display = document.getElementById(cbid + ".display");
@@ -246,7 +317,6 @@
const elOption = hiddenSelect.getElementsByTagName("option")[0]
const styleSelect = window.getComputedStyle(hiddenSelect)
const styleOption = window.getComputedStyle(elOption)
const styleBody = window.getComputedStyle(document.body)
const styleNode = document.createElement('style')
const styleNames = ["width", "color", "height", "padding", "margin", "lineHeight", "border", "borderRadius", "minWidth", "minHeight"]
@@ -254,14 +324,14 @@
styleNames.push("borderBottomWidth", "borderBottomStyle", "borderBottomColor");
}
document.head.appendChild(styleNode)
// trace back from option -> select -> body for background color
const colors = lv_getNodeSelectorColors(hiddenSelect);
const panelRadius = styleSelect.borderRadius;
const optionColor = !lv_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !lv_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor
const optionColor = colors.backgroundColor;
const titleColor = lv_getColorSchema(optionColor) === "light" ? lv_darker(optionColor, 30) : lv_lighter(optionColor, 30)
// 自带箭头已占据布局空间,右内边距使用主题的左内边距
const selectStyleCSS = [`#${CSS.escape(cbid + ".display")} {`, lv_style2Css(styleSelect, styleNames), lv_style2Css(styleSelect, ["backgroundColor"]), `padding-right: ${styleSelect.paddingLeft} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, lv_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .lv-group-title {`, `background-color: ${titleColor} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, lv_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, `color-scheme: ${styleSelect.colorScheme};`, `--lv-selected-background: ${colors.selectedBackground};`, `--lv-selected-color: ${colors.selectedColor};`, `--lv-hover-background: ${titleColor};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .lv-group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"]
styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n")
}
}
@@ -319,7 +389,7 @@
});
span.textContent = "(" + selectedCount + "/" + items.length + ")";
if (selectedCount > 0) {
span.style.color = "#007bff";
span.style.color = "";
span.style.fontWeight = "600";
} else {
span.style.color = "";
@@ -156,12 +156,6 @@
return `#${toHex(r)}${toHex(g)}${toHex(b)}`
}
function mv_isTransparent(color) {
const cleanColor = mv_parseColorToRgba(color);
// check #RRGGBBAA for transparency
return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a);
}
function mv_getColorSchema(color) {
const rgb = mv_parseColorToRgba(color);
if (!rgb) return 'unknown'; // Handle invalid colors
@@ -193,6 +187,57 @@
return mv_rgbToHex(r, g, b);
}
function mv_getNodeSelectorColors(select) {
const selectedIndex = select.selectedIndex;
const probe = document.createElement('option');
let backgroundColor, color;
// A selected option may use the theme's translucent accent, not its menu surface.
select.appendChild(probe);
try {
const style = getComputedStyle(probe);
backgroundColor = style.backgroundColor;
color = style.color;
} finally {
probe.remove();
if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex;
}
let ctx = mv_getNodeSelectorColors._context;
if (!ctx) {
const canvas = document.createElement('canvas');
canvas.width = canvas.height = 1;
ctx = mv_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true });
}
const rgb = [0, 0, 0];
let remaining = 1;
function composite(value) {
ctx.clearRect(0, 0, 1, 1);
ctx.fillStyle = value;
ctx.fillRect(0, 0, 1, 1);
const pixel = ctx.getImageData(0, 0, 1, 1).data;
const alpha = pixel[3] / 255;
for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining;
remaining *= 1 - alpha;
}
// Flatten transparent surfaces before the popup is moved outside the form.
composite(backgroundColor);
for (let element = select; element && remaining > 0; element = element.parentElement) {
composite(getComputedStyle(element).backgroundColor);
}
if (remaining > 0) {
const canvasColor = document.createElement('span');
canvasColor.style.cssText = 'display:none; background-color:Canvas;';
select.parentElement.appendChild(canvasColor);
try {
composite(getComputedStyle(canvasColor).backgroundColor);
} finally {
canvasColor.remove();
}
}
return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color };
}
// copy select styles
function mv_adaptiveStyle(cbid) {
const mainDiv = document.getElementById(cbid);
@@ -203,20 +248,19 @@
const styleMain = window.getComputedStyle(mainDiv)
const styleSelect = window.getComputedStyle(hiddenRef)
const styleOption = window.getComputedStyle(elOption)
const styleBody = window.getComputedStyle(document.body)
const styleNode = document.createElement('style')
const styleNames = ["width", "color", "height", "margin", "lineHeight", "borderRadius", "minWidth", "minHeight"]
document.head.appendChild(styleNode)
// trace back from option -> select -> body for background color
const colors = mv_getNodeSelectorColors(hiddenRef);
const panelRadius = styleSelect.borderRadius;
const optionColor = !mv_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !mv_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor
const optionColor = colors.backgroundColor;
const titleColor = mv_getColorSchema(optionColor) === "light" ? mv_darker(optionColor, 30) : mv_lighter(optionColor, 30)
// 多选容器无需为下拉箭头留白,右内边距跟随当前主题的左内边距
const selectStyleCSS = [`#${CSS.escape(cbid)} {`, mv_style2Css(styleSelect, styleNames), `padding-right: ${styleMain.paddingLeft} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, mv_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .group-title {`, `background-color: ${titleColor} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, mv_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"]
styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n")
}
}
@@ -47,20 +47,15 @@
text-overflow: ellipsis;
transition: background-color 0.15s ease;
}
/* 鼠标悬停效果 - 使用透明度避免覆盖问题 */
.cbi-listvalue-panel li[data-key]:hover {
background-color: rgba(0, 123, 255, 0.1);
/* 悬停和选中颜色由当前控件的主题样式提供 */
.v-dropdown-panel li[data-key]:hover {
background-color: var(--v-hover-background, rgba(127, 127, 127, 0.1));
}
/* 选中项样式 - 使用更高优先级 */
.cbi-listvalue-panel li[data-key].is-selected {
background-color: #007bff !important;
color: white !important;
.v-dropdown-panel li[data-key].is-selected {
background: var(--v-selected-background, Highlight) !important;
color: var(--v-selected-color, HighlightText) !important;
font-weight: 600 !important;
}
/* 选中项悬停时保持主色调 */
.cbi-listvalue-panel li[data-key].is-selected:hover {
background-color: #0056b3 !important;
}
.v-dropdown-container {
display: inline-block;
@@ -138,6 +133,32 @@
text-overflow: ellipsis;
text-align: left !important;
}
@media screen and (max-width: 1152px) {
.v-dropdown-container {
width: 100%;
min-width: 0;
max-width: 100%;
white-space: normal;
}
/* Override widths copied from the theme by adaptiveStyle(). */
.v-dropdown-display.cbi-input-select {
width: 100% !important;
min-width: 0 !important;
max-width: 100% !important;
}
.v-dropdown-label {
flex: 1;
width: 0;
min-width: 0;
text-overflow: ellipsis;
}
.v-arrow-down {
flex-shrink: 0;
}
}
</style>
<script type="text/javascript">
@@ -195,12 +216,6 @@
return `#${toHex(r)}${toHex(g)}${toHex(b)}`
}
function v_isTransparent(color) {
const cleanColor = v_parseColorToRgba(color);
// check #RRGGBBAA for transparency
return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a);
}
function v_getColorSchema(color) {
const rgb = v_parseColorToRgba(color);
if (!rgb) return 'unknown'; // Handle invalid colors
@@ -232,6 +247,67 @@
return v_rgbToHex(r, g, b);
}
function v_getNodeSelectorColors(select) {
const selectedIndex = select.selectedIndex;
const probe = document.createElement('option');
let backgroundColor, color;
let selectedBackground = 'Highlight', selectedColor = 'HighlightText';
// A selected option may use the theme's translucent accent, not its menu surface.
select.appendChild(probe);
try {
const style = getComputedStyle(probe);
backgroundColor = style.backgroundColor;
color = style.color;
const selectedOption = select.options[selectedIndex];
if (selectedOption) {
const selectedStyle = getComputedStyle(selectedOption);
// Preserve theme gradients and translucent tints for the selected row only.
if (selectedStyle.background !== style.background || selectedStyle.color !== color) {
selectedBackground = selectedStyle.background;
selectedColor = selectedStyle.color;
}
}
} finally {
probe.remove();
if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex;
}
let ctx = v_getNodeSelectorColors._context;
if (!ctx) {
const canvas = document.createElement('canvas');
canvas.width = canvas.height = 1;
ctx = v_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true });
}
const rgb = [0, 0, 0];
let remaining = 1;
function composite(value) {
ctx.clearRect(0, 0, 1, 1);
ctx.fillStyle = value;
ctx.fillRect(0, 0, 1, 1);
const pixel = ctx.getImageData(0, 0, 1, 1).data;
const alpha = pixel[3] / 255;
for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining;
remaining *= 1 - alpha;
}
// Flatten transparent surfaces before the popup is moved outside the form.
composite(backgroundColor);
for (let element = select; element && remaining > 0; element = element.parentElement) {
composite(getComputedStyle(element).backgroundColor);
}
if (remaining > 0) {
const canvasColor = document.createElement('span');
canvasColor.style.cssText = 'display:none; background-color:Canvas;';
select.parentElement.appendChild(canvasColor);
try {
composite(getComputedStyle(canvasColor).backgroundColor);
} finally {
canvasColor.remove();
}
}
return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color, selectedBackground, selectedColor };
}
// copy select styles
function v_adaptiveStyle(cbid) {
const display = document.getElementById(cbid + ".display");
@@ -241,7 +317,6 @@
const elOption = hiddenRef.getElementsByTagName("option")[0]
const styleSelect = window.getComputedStyle(hiddenRef)
const styleOption = window.getComputedStyle(elOption)
const styleBody = window.getComputedStyle(document.body)
const styleNode = document.createElement('style')
const styleNames = ["color", "height", "padding", "margin", "lineHeight", "border", "borderRadius", "minWidth","minHeight"]
@@ -249,14 +324,14 @@
styleNames.push("borderBottomWidth", "borderBottomStyle", "borderBottomColor");
}
document.head.appendChild(styleNode)
// trace back from option -> select -> body for background color
const colors = v_getNodeSelectorColors(hiddenRef);
const panelRadius = styleSelect.borderRadius;
const optionColor = !v_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !v_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor
const optionColor = colors.backgroundColor;
const titleColor = v_getColorSchema(optionColor) === "light" ? v_darker(optionColor, 30) : v_lighter(optionColor, 30)
// 自带箭头已占据布局空间,右内边距使用主题的左内边距
const selectStyleCSS = [`#${CSS.escape(cbid + ".display")} {`, v_style2Css(styleSelect, styleNames), v_style2Css(styleSelect, ["backgroundColor"]), `padding-right: ${styleSelect.paddingLeft} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, v_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .v-group-title {`, `background-color: ${titleColor} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, v_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, `color-scheme: ${styleSelect.colorScheme};`, `--v-selected-background: ${colors.selectedBackground};`, `--v-selected-color: ${colors.selectedColor};`, `--v-hover-background: ${titleColor};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .v-group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"]
styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n")
}
}
@@ -314,7 +389,7 @@
});
span.textContent = "(" + selectedCount + "/" + items.length + ")";
if (selectedCount > 0) {
span.style.color = "#007bff";
span.style.color = "";
span.style.fontWeight = "600";
} else {
span.style.color = "";
@@ -8,16 +8,62 @@ local sid = "@global[0]"
#cbi-<%=appname%>-socks .td.cbi-value-field > div {
white-space: nowrap;
}
@media (max-width: 1152px) {
@media screen and (max-width: 1152px) {
#cbi-<%=appname%>-socks .td.cbi-value-field > div {
white-space: normal;
}
}
@media screen and (max-width: 1152px) {
/* Use the same narrow-screen table layout across themes. */
#cbi-<%=appname%>-socks .cbi-section-table,
#cbi-<%=appname%>-socks .cbi-section-table > tbody {
display: block;
}
#cbi-<%=appname%>-socks .cbi-section-table-titles {
display: none !important;
}
#cbi-<%=appname%>-socks .cbi-section-table-row {
display: flex;
flex-wrap: wrap;
}
#cbi-<%=appname%>-socks .cbi-section-table-row > .td {
display: block;
box-sizing: border-box;
margin: 0;
flex: 1 1 50%;
min-width: 0;
width: auto !important;
height: auto;
}
#cbi-<%=appname%>-socks .cbi-section-table-row > .td[data-title]::before {
content: attr(data-title);
display: block;
}
#cbi-<%=appname%>-socks .cbi-section-table-row > .td.cbi-section-actions {
flex: 1 1 100%;
}
#cbi-<%=appname%>-socks .cbi-value-field input:not([type="checkbox"], [type="radio"], [type="hidden"]),
#cbi-<%=appname%>-socks .cbi-value-field select {
box-sizing: border-box;
min-width: 0;
max-width: 100%;
}
/* Keep the enable column compact in mobile table cards. */
#cbi-<%=appname%>-socks .cbi-section-table-row > .td[data-name="enabled"] {
flex: 0 0 4.5em;
}
#cbi-<%=appname%>-socks .cbi-section-table-row > .td[data-name="node"] {
flex: 1 1 calc(100% - 4.5em);
min-width: 0;
}
}
</style>
<script type="text/javascript">
@@ -68,13 +114,9 @@ local sid = "@global[0]"
socks.style.color = result.socks_status ? "green" : "red";
}
if (http) {
if (result.use_http) {
http.textContent = result.http_status ? "✓" : "X";
http.style.fontWeight = "bold";
http.style.color = result.http_status ? "green" : "red";
} else {
http.textContent = "";
}
http.textContent = result.http_status ? "✓" : "X";
http.style.fontWeight = "bold";
http.style.color = result.http_status ? "green" : "red";
}
}
);
@@ -4,7 +4,7 @@ local appname = map.config
-%>
<style>
@media screen and (min-width: 1152px) {
@media screen and (min-width: 1153px) {
#cbi-<%=appname%>-haproxy_config input[id*=".<%=appname%>."][id$=".haproxy_port"],
#cbi-<%=appname%>-haproxy_config input[id*=".<%=appname%>."][id$=".lbweight"] {
width: 100px !important;
@@ -25,6 +25,59 @@ local appname = map.config
max-width: unset !important;
}
}
@media screen and (max-width: 1152px) {
/* Use the same narrow-screen table layout across themes. */
#cbi-<%=appname%>-haproxy_config .cbi-section-table,
#cbi-<%=appname%>-haproxy_config .cbi-section-table > tbody {
display: block;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-titles {
display: none !important;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row {
display: flex;
flex-wrap: wrap;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td {
display: block;
box-sizing: border-box;
margin: 0;
flex: 1 1 50%;
min-width: 0;
width: auto !important;
height: auto;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td[data-title]::before {
content: attr(data-title);
display: block;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td.cbi-section-actions {
flex: 1 1 100%;
}
#cbi-<%=appname%>-haproxy_config .cbi-value-field input:not([type="checkbox"], [type="radio"], [type="hidden"]),
#cbi-<%=appname%>-haproxy_config .cbi-value-field select {
box-sizing: border-box;
min-width: 0;
max-width: 100%;
}
/* Keep the enable column compact in mobile table cards. */
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td[data-name="enabled"] {
flex: 0 0 4.5em;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td[data-name="lbss"] {
flex: 1 1 calc(100% - 4.5em);
min-width: 0;
}
}
</style>
<script type="text/javascript">
//<![CDATA[
@@ -13,6 +13,59 @@ local tab_name = self.tab_name
display: none !important;
visibility: hidden !important;
}
@media screen and (max-width: 1152px) {
/* Use the same narrow-screen table layout across themes. */
#cbi-<%=config%>-<%=section_type%> .cbi-section-table,
#cbi-<%=config%>-<%=section_type%> .cbi-section-table > tbody {
display: block;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-titles {
display: none !important;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row {
display: flex;
flex-wrap: wrap;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td {
display: block;
box-sizing: border-box;
margin: 0;
flex: 1 1 50%;
min-width: 0;
width: auto !important;
height: auto;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td[data-title]::before {
content: attr(data-title);
display: block;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td.cbi-section-actions {
flex: 1 1 100%;
}
#cbi-<%=config%>-<%=section_type%> .cbi-value-field input:not([type="checkbox"], [type="radio"], [type="hidden"]),
#cbi-<%=config%>-<%=section_type%> .cbi-value-field select {
box-sizing: border-box;
min-width: 0;
max-width: 100%;
}
/* Leave most of each mobile row for the node selector. */
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td:is([data-name="remarks"], [data-name="_fakedns"]) {
flex: 0 0 6.5em;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td:is([data-name="_node"], [data-name="_proxy_tag"]) {
flex: 1 1 calc(100% - 6.5em);
min-width: 0;
}
}
</style>
<script type="text/javascript">
//<![CDATA[
@@ -144,4 +197,4 @@ local tab_name = self.tab_name
}, 200)
});
//]]>
</script>
</script>
+1 -1
View File
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2
PKG_VERSION:=26.11.11
PKG_RELEASE:=179
PKG_RELEASE:=180
PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \
@@ -349,12 +349,6 @@ function s2.create(e, t)
luci.http.redirect(e.extedit:format(uid))
end
o = s2:option(DummyValue, "status", translate("Status"))
o.rawhtml = true
o.cfgvalue = function(t, n)
return string.format('<div class="_status" socks_id="%s"></div>', n)
end
---- Enable
o = s2:option(Flag, "enabled", translate("Enable"))
o.default = 1
@@ -376,26 +370,19 @@ o.cfgvalue = function(_, n)
end
end
local n = 1
m:foreach("socks", function(s)
if s[".name"] == section then
return false
end
n = n + 1
end)
o = s2:option(Value, "port", "Socks " .. translate("Listen Port"))
o.default = n + 1080
o.datatype = "port"
o.rmempty = false
--[[
if has_singbox or has_xray then
o = s2:option(Value, "http_port", "HTTP " .. translate("Listen Port") .. " " .. translate("0 is not use"))
o.default = 0
o.datatype = "port"
o = s2:option(DummyValue, "port_status", translate("Port Status"))
o.rawhtml = true
o.cfgvalue = function(t, n)
local socks = m:get(n, "port") or "0"
local http = m:get(n, "http_port") or "0"
return string.format([[
<div class="_socks_status" socks_id="%s">
<span class="_socks"></span> SOCKS: %s
<br>
<span class="_http"></span> HTTP: %s
</div>
]], n, socks, http)
end
]]--
local o_node = s.fields["node"]
local o_socks = s2.fields["node"]
@@ -210,12 +210,6 @@
return `#${toHex(r)}${toHex(g)}${toHex(b)}`
}
function dl_isTransparent(color) {
const cleanColor = dl_parseColorToRgba(color);
// check #RRGGBBAA for transparency
return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a);
}
function dl_getColorSchema(color) {
const rgb = dl_parseColorToRgba(color);
if (!rgb) return 'unknown'; // Handle invalid colors
@@ -247,6 +241,57 @@
return dl_rgbToHex(r, g, b);
}
function dl_getNodeSelectorColors(select) {
const selectedIndex = select.selectedIndex;
const probe = document.createElement('option');
let backgroundColor, color;
// A selected option may use the theme's translucent accent, not its menu surface.
select.appendChild(probe);
try {
const style = getComputedStyle(probe);
backgroundColor = style.backgroundColor;
color = style.color;
} finally {
probe.remove();
if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex;
}
let ctx = dl_getNodeSelectorColors._context;
if (!ctx) {
const canvas = document.createElement('canvas');
canvas.width = canvas.height = 1;
ctx = dl_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true });
}
const rgb = [0, 0, 0];
let remaining = 1;
function composite(value) {
ctx.clearRect(0, 0, 1, 1);
ctx.fillStyle = value;
ctx.fillRect(0, 0, 1, 1);
const pixel = ctx.getImageData(0, 0, 1, 1).data;
const alpha = pixel[3] / 255;
for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining;
remaining *= 1 - alpha;
}
// Flatten transparent surfaces before the popup is moved outside the form.
composite(backgroundColor);
for (let element = select; element && remaining > 0; element = element.parentElement) {
composite(getComputedStyle(element).backgroundColor);
}
if (remaining > 0) {
const canvasColor = document.createElement('span');
canvasColor.style.cssText = 'display:none; background-color:Canvas;';
select.parentElement.appendChild(canvasColor);
try {
composite(getComputedStyle(canvasColor).backgroundColor);
} finally {
canvasColor.remove();
}
}
return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color };
}
// copy select styles
function dl_adaptiveStyle(cbid) {
const display = document.getElementById(cbid + ".display");
@@ -256,7 +301,6 @@
const elOption = hiddenRef.getElementsByTagName("option")[0]
const styleSelect = window.getComputedStyle(hiddenRef)
const styleOption = window.getComputedStyle(elOption)
const styleBody = window.getComputedStyle(document.body)
const styleNode = document.createElement('style')
const styleNames = ["width", "color", "height", "padding", "margin", "lineHeight", "border", "borderRadius", "minWidth", "minHeight"]
@@ -264,14 +308,14 @@
styleNames.push("borderBottomWidth", "borderBottomStyle", "borderBottomColor");
}
document.head.appendChild(styleNode)
// trace back from option -> select -> body for background color
const colors = dl_getNodeSelectorColors(hiddenRef);
const panelRadius = styleSelect.borderRadius;
const optionColor = !dl_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !dl_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor
const optionColor = colors.backgroundColor;
const titleColor = dl_getColorSchema(optionColor) === "light" ? dl_darker(optionColor, 30) : dl_lighter(optionColor, 30)
// 自带箭头已占据布局空间,右内边距使用主题的左内边距
const selectStyleCSS = [`#${CSS.escape(cbid + ".display")}, .dl-selected-item {`, dl_style2Css(styleSelect, styleNames), dl_style2Css(styleSelect, ["backgroundColor"]), `padding-right: ${styleSelect.paddingLeft} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, dl_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .dl-group-title {`, `background-color: ${titleColor} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, dl_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .dl-group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"]
styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n")
}
}
@@ -48,20 +48,15 @@
text-overflow: ellipsis;
transition: background-color 0.15s ease;
}
/* 鼠标悬停效果 - 使用透明度避免覆盖问题 */
.cbi-listvalue-panel li[data-key]:hover {
background-color: rgba(0, 123, 255, 0.1);
/* Use the current control theme for hover and selection colors. */
.lv-dropdown-panel li[data-key]:hover {
background-color: var(--lv-hover-background, rgba(127, 127, 127, 0.1));
}
/* 选中项样式 - 使用更高优先级 */
.cbi-listvalue-panel li[data-key].is-selected {
background-color: #007bff !important;
color: white !important;
.lv-dropdown-panel li[data-key].is-selected {
background: var(--lv-selected-background, Highlight) !important;
color: var(--lv-selected-color, HighlightText) !important;
font-weight: 600 !important;
}
/* 选中项悬停时保持主色调 */
.cbi-listvalue-panel li[data-key].is-selected:hover {
background-color: #0056b3 !important;
}
.lv-dropdown-container {
display: inline-block;
@@ -69,11 +64,6 @@
min-width: 220px;
white-space: nowrap;
}
@media (max-width: 1152px) {
.lv-dropdown-container {
white-space: normal;
}
}
@media (max-width: 600px) {
.lv-dropdown-container {
display: block;
@@ -143,6 +133,32 @@
text-overflow: ellipsis;
text-align: left !important;
}
@media screen and (max-width: 1152px) {
.lv-dropdown-container {
width: 100%;
min-width: 0;
max-width: 100%;
white-space: normal;
}
/* Override widths copied from the theme by adaptiveStyle(). */
.lv-dropdown-display.cbi-input-select {
width: 100% !important;
min-width: 0 !important;
max-width: 100% !important;
}
.lv-dropdown-label {
flex: 1;
width: 0;
min-width: 0;
text-overflow: ellipsis;
}
.lv-arrow-down {
flex-shrink: 0;
}
}
</style>
<script type="text/javascript">
@@ -200,12 +216,6 @@
return `#${toHex(r)}${toHex(g)}${toHex(b)}`
}
function lv_isTransparent(color) {
const cleanColor = lv_parseColorToRgba(color);
// check #RRGGBBAA for transparency
return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a);
}
function lv_getColorSchema(color) {
const rgb = lv_parseColorToRgba(color);
if (!rgb) return 'unknown'; // Handle invalid colors
@@ -237,6 +247,67 @@
return lv_rgbToHex(r, g, b);
}
function lv_getNodeSelectorColors(select) {
const selectedIndex = select.selectedIndex;
const probe = document.createElement('option');
let backgroundColor, color;
let selectedBackground = 'Highlight', selectedColor = 'HighlightText';
// A selected option may use the theme's translucent accent, not its menu surface.
select.appendChild(probe);
try {
const style = getComputedStyle(probe);
backgroundColor = style.backgroundColor;
color = style.color;
const selectedOption = select.options[selectedIndex];
if (selectedOption) {
const selectedStyle = getComputedStyle(selectedOption);
// Preserve theme gradients and translucent tints for the selected row only.
if (selectedStyle.background !== style.background || selectedStyle.color !== color) {
selectedBackground = selectedStyle.background;
selectedColor = selectedStyle.color;
}
}
} finally {
probe.remove();
if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex;
}
let ctx = lv_getNodeSelectorColors._context;
if (!ctx) {
const canvas = document.createElement('canvas');
canvas.width = canvas.height = 1;
ctx = lv_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true });
}
const rgb = [0, 0, 0];
let remaining = 1;
function composite(value) {
ctx.clearRect(0, 0, 1, 1);
ctx.fillStyle = value;
ctx.fillRect(0, 0, 1, 1);
const pixel = ctx.getImageData(0, 0, 1, 1).data;
const alpha = pixel[3] / 255;
for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining;
remaining *= 1 - alpha;
}
// Flatten transparent surfaces before the popup is moved outside the form.
composite(backgroundColor);
for (let element = select; element && remaining > 0; element = element.parentElement) {
composite(getComputedStyle(element).backgroundColor);
}
if (remaining > 0) {
const canvasColor = document.createElement('span');
canvasColor.style.cssText = 'display:none; background-color:Canvas;';
select.parentElement.appendChild(canvasColor);
try {
composite(getComputedStyle(canvasColor).backgroundColor);
} finally {
canvasColor.remove();
}
}
return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color, selectedBackground, selectedColor };
}
// copy select styles
function lv_adaptiveStyle(cbid) {
const display = document.getElementById(cbid + ".display");
@@ -246,7 +317,6 @@
const elOption = hiddenSelect.getElementsByTagName("option")[0]
const styleSelect = window.getComputedStyle(hiddenSelect)
const styleOption = window.getComputedStyle(elOption)
const styleBody = window.getComputedStyle(document.body)
const styleNode = document.createElement('style')
const styleNames = ["width", "color", "height", "padding", "margin", "lineHeight", "border", "borderRadius", "minWidth", "minHeight"]
@@ -254,14 +324,14 @@
styleNames.push("borderBottomWidth", "borderBottomStyle", "borderBottomColor");
}
document.head.appendChild(styleNode)
// trace back from option -> select -> body for background color
const colors = lv_getNodeSelectorColors(hiddenSelect);
const panelRadius = styleSelect.borderRadius;
const optionColor = !lv_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !lv_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor
const optionColor = colors.backgroundColor;
const titleColor = lv_getColorSchema(optionColor) === "light" ? lv_darker(optionColor, 30) : lv_lighter(optionColor, 30)
// 自带箭头已占据布局空间,右内边距使用主题的左内边距
const selectStyleCSS = [`#${CSS.escape(cbid + ".display")} {`, lv_style2Css(styleSelect, styleNames), lv_style2Css(styleSelect, ["backgroundColor"]), `padding-right: ${styleSelect.paddingLeft} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, lv_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .lv-group-title {`, `background-color: ${titleColor} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, lv_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, `color-scheme: ${styleSelect.colorScheme};`, `--lv-selected-background: ${colors.selectedBackground};`, `--lv-selected-color: ${colors.selectedColor};`, `--lv-hover-background: ${titleColor};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .lv-group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"]
styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n")
}
}
@@ -319,7 +389,7 @@
});
span.textContent = "(" + selectedCount + "/" + items.length + ")";
if (selectedCount > 0) {
span.style.color = "#007bff";
span.style.color = "";
span.style.fontWeight = "600";
} else {
span.style.color = "";
@@ -156,12 +156,6 @@
return `#${toHex(r)}${toHex(g)}${toHex(b)}`
}
function mv_isTransparent(color) {
const cleanColor = mv_parseColorToRgba(color);
// check #RRGGBBAA for transparency
return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a);
}
function mv_getColorSchema(color) {
const rgb = mv_parseColorToRgba(color);
if (!rgb) return 'unknown'; // Handle invalid colors
@@ -193,6 +187,57 @@
return mv_rgbToHex(r, g, b);
}
function mv_getNodeSelectorColors(select) {
const selectedIndex = select.selectedIndex;
const probe = document.createElement('option');
let backgroundColor, color;
// A selected option may use the theme's translucent accent, not its menu surface.
select.appendChild(probe);
try {
const style = getComputedStyle(probe);
backgroundColor = style.backgroundColor;
color = style.color;
} finally {
probe.remove();
if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex;
}
let ctx = mv_getNodeSelectorColors._context;
if (!ctx) {
const canvas = document.createElement('canvas');
canvas.width = canvas.height = 1;
ctx = mv_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true });
}
const rgb = [0, 0, 0];
let remaining = 1;
function composite(value) {
ctx.clearRect(0, 0, 1, 1);
ctx.fillStyle = value;
ctx.fillRect(0, 0, 1, 1);
const pixel = ctx.getImageData(0, 0, 1, 1).data;
const alpha = pixel[3] / 255;
for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining;
remaining *= 1 - alpha;
}
// Flatten transparent surfaces before the popup is moved outside the form.
composite(backgroundColor);
for (let element = select; element && remaining > 0; element = element.parentElement) {
composite(getComputedStyle(element).backgroundColor);
}
if (remaining > 0) {
const canvasColor = document.createElement('span');
canvasColor.style.cssText = 'display:none; background-color:Canvas;';
select.parentElement.appendChild(canvasColor);
try {
composite(getComputedStyle(canvasColor).backgroundColor);
} finally {
canvasColor.remove();
}
}
return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color };
}
// copy select styles
function mv_adaptiveStyle(cbid) {
const mainDiv = document.getElementById(cbid);
@@ -203,20 +248,19 @@
const styleMain = window.getComputedStyle(mainDiv)
const styleSelect = window.getComputedStyle(hiddenRef)
const styleOption = window.getComputedStyle(elOption)
const styleBody = window.getComputedStyle(document.body)
const styleNode = document.createElement('style')
const styleNames = ["width", "color", "height", "margin", "lineHeight", "borderRadius", "minWidth", "minHeight"]
document.head.appendChild(styleNode)
// trace back from option -> select -> body for background color
const colors = mv_getNodeSelectorColors(hiddenRef);
const panelRadius = styleSelect.borderRadius;
const optionColor = !mv_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !mv_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor
const optionColor = colors.backgroundColor;
const titleColor = mv_getColorSchema(optionColor) === "light" ? mv_darker(optionColor, 30) : mv_lighter(optionColor, 30)
// 多选容器无需为下拉箭头留白,右内边距跟随当前主题的左内边距
const selectStyleCSS = [`#${CSS.escape(cbid)} {`, mv_style2Css(styleSelect, styleNames), `padding-right: ${styleMain.paddingLeft} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, mv_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .group-title {`, `background-color: ${titleColor} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, mv_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"]
styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n")
}
}
@@ -47,20 +47,15 @@
text-overflow: ellipsis;
transition: background-color 0.15s ease;
}
/* 鼠标悬停效果 - 使用透明度避免覆盖问题 */
.cbi-listvalue-panel li[data-key]:hover {
background-color: rgba(0, 123, 255, 0.1);
/* Use the current control theme for hover and selection colors. */
.v-dropdown-panel li[data-key]:hover {
background-color: var(--v-hover-background, rgba(127, 127, 127, 0.1));
}
/* 选中项样式 - 使用更高优先级 */
.cbi-listvalue-panel li[data-key].is-selected {
background-color: #007bff !important;
color: white !important;
.v-dropdown-panel li[data-key].is-selected {
background: var(--v-selected-background, Highlight) !important;
color: var(--v-selected-color, HighlightText) !important;
font-weight: 600 !important;
}
/* 选中项悬停时保持主色调 */
.cbi-listvalue-panel li[data-key].is-selected:hover {
background-color: #0056b3 !important;
}
.v-dropdown-container {
display: inline-block;
@@ -138,6 +133,32 @@
text-overflow: ellipsis;
text-align: left !important;
}
@media screen and (max-width: 1152px) {
.v-dropdown-container {
width: 100%;
min-width: 0;
max-width: 100%;
white-space: normal;
}
/* Override widths copied from the theme by adaptiveStyle(). */
.v-dropdown-display.cbi-input-select {
width: 100% !important;
min-width: 0 !important;
max-width: 100% !important;
}
.v-dropdown-label {
flex: 1;
width: 0;
min-width: 0;
text-overflow: ellipsis;
}
.v-arrow-down {
flex-shrink: 0;
}
}
</style>
<script type="text/javascript">
@@ -195,12 +216,6 @@
return `#${toHex(r)}${toHex(g)}${toHex(b)}`
}
function v_isTransparent(color) {
const cleanColor = v_parseColorToRgba(color);
// check #RRGGBBAA for transparency
return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a);
}
function v_getColorSchema(color) {
const rgb = v_parseColorToRgba(color);
if (!rgb) return 'unknown'; // Handle invalid colors
@@ -232,6 +247,67 @@
return v_rgbToHex(r, g, b);
}
function v_getNodeSelectorColors(select) {
const selectedIndex = select.selectedIndex;
const probe = document.createElement('option');
let backgroundColor, color;
let selectedBackground = 'Highlight', selectedColor = 'HighlightText';
// A selected option may use the theme's translucent accent, not its menu surface.
select.appendChild(probe);
try {
const style = getComputedStyle(probe);
backgroundColor = style.backgroundColor;
color = style.color;
const selectedOption = select.options[selectedIndex];
if (selectedOption) {
const selectedStyle = getComputedStyle(selectedOption);
// Preserve theme gradients and translucent tints for the selected row only.
if (selectedStyle.background !== style.background || selectedStyle.color !== color) {
selectedBackground = selectedStyle.background;
selectedColor = selectedStyle.color;
}
}
} finally {
probe.remove();
if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex;
}
let ctx = v_getNodeSelectorColors._context;
if (!ctx) {
const canvas = document.createElement('canvas');
canvas.width = canvas.height = 1;
ctx = v_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true });
}
const rgb = [0, 0, 0];
let remaining = 1;
function composite(value) {
ctx.clearRect(0, 0, 1, 1);
ctx.fillStyle = value;
ctx.fillRect(0, 0, 1, 1);
const pixel = ctx.getImageData(0, 0, 1, 1).data;
const alpha = pixel[3] / 255;
for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining;
remaining *= 1 - alpha;
}
// Flatten transparent surfaces before the popup is moved outside the form.
composite(backgroundColor);
for (let element = select; element && remaining > 0; element = element.parentElement) {
composite(getComputedStyle(element).backgroundColor);
}
if (remaining > 0) {
const canvasColor = document.createElement('span');
canvasColor.style.cssText = 'display:none; background-color:Canvas;';
select.parentElement.appendChild(canvasColor);
try {
composite(getComputedStyle(canvasColor).backgroundColor);
} finally {
canvasColor.remove();
}
}
return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color, selectedBackground, selectedColor };
}
// copy select styles
function v_adaptiveStyle(cbid) {
const display = document.getElementById(cbid + ".display");
@@ -241,7 +317,6 @@
const elOption = hiddenRef.getElementsByTagName("option")[0]
const styleSelect = window.getComputedStyle(hiddenRef)
const styleOption = window.getComputedStyle(elOption)
const styleBody = window.getComputedStyle(document.body)
const styleNode = document.createElement('style')
const styleNames = ["color", "height", "padding", "margin", "lineHeight", "border", "borderRadius", "minWidth","minHeight"]
@@ -249,14 +324,14 @@
styleNames.push("borderBottomWidth", "borderBottomStyle", "borderBottomColor");
}
document.head.appendChild(styleNode)
// trace back from option -> select -> body for background color
const colors = v_getNodeSelectorColors(hiddenRef);
const panelRadius = styleSelect.borderRadius;
const optionColor = !v_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !v_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor
const optionColor = colors.backgroundColor;
const titleColor = v_getColorSchema(optionColor) === "light" ? v_darker(optionColor, 30) : v_lighter(optionColor, 30)
// 自带箭头已占据布局空间,右内边距使用主题的左内边距
const selectStyleCSS = [`#${CSS.escape(cbid + ".display")} {`, v_style2Css(styleSelect, styleNames), v_style2Css(styleSelect, ["backgroundColor"]), `padding-right: ${styleSelect.paddingLeft} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, v_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .v-group-title {`, `background-color: ${titleColor} !important;`, "}"]
const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, v_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, `color-scheme: ${styleSelect.colorScheme};`, `--v-selected-background: ${colors.selectedBackground};`, `--v-selected-color: ${colors.selectedColor};`, `--v-hover-background: ${titleColor};`, "}"]
const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .v-group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"]
styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n")
}
}
@@ -314,7 +389,7 @@
});
span.textContent = "(" + selectedCount + "/" + items.length + ")";
if (selectedCount > 0) {
span.style.color = "#007bff";
span.style.color = "";
span.style.fontWeight = "600";
} else {
span.style.color = "";
@@ -8,25 +8,61 @@ local sid = "@global[0]"
#cbi-<%=appname%>-socks .td.cbi-value-field > div {
white-space: nowrap;
}
@media (max-width: 1152px) {
@media screen and (max-width: 1152px) {
#cbi-<%=appname%>-socks .td.cbi-value-field > div {
white-space: normal;
}
}
@media screen and (max-width: 1152px) {
/* Use the same narrow-screen table layout across themes. */
#cbi-<%=appname%>-socks .cbi-section-table,
#cbi-<%=appname%>-socks .cbi-section-table > tbody {
display: block;
}
#cbi-<%=appname%>-socks .cbi-section-table-titles {
display: none !important;
}
}
@media screen and (min-width: 1152px) {
#cbi-<%=appname%>-socks input[id*=".<%=appname%>."][id$=".port"],
#cbi-<%=appname%>-socks input[id*=".<%=appname%>."][id$=".http_port"] {
width: 100px !important;
min-width: unset !important;
max-width: unset !important;
text-align: center !important;
#cbi-<%=appname%>-socks .cbi-section-table-row {
display: flex;
flex-wrap: wrap;
}
#cbi-<%=appname%>-socks .cbi-section-table-row > .td {
display: block;
box-sizing: border-box;
margin: 0;
flex: 1 1 50%;
min-width: 0;
width: auto !important;
height: auto;
}
#cbi-<%=appname%>-socks .cbi-section-table-row > .td[data-title]::before {
content: attr(data-title);
display: block;
}
#cbi-<%=appname%>-socks .cbi-section-table-row > .td.cbi-section-actions {
flex: 1 1 100%;
}
#cbi-<%=appname%>-socks .cbi-value-field input:not([type="checkbox"], [type="radio"], [type="hidden"]),
#cbi-<%=appname%>-socks .cbi-value-field select {
box-sizing: border-box;
min-width: 0;
max-width: 100%;
}
/* Keep the enable column compact in mobile table cards. */
#cbi-<%=appname%>-socks .cbi-section-table-row > .td[data-name="enabled"] {
flex: 0 0 4.5em;
}
#cbi-<%=appname%>-socks .cbi-section-table-row > .td[data-name="node"] {
flex: 1 1 calc(100% - 4.5em);
min-width: 0;
}
}
</style>
@@ -62,7 +98,7 @@ local sid = "@global[0]"
const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
async function go() {
const _status = document.getElementsByClassName('_status');
const _status = document.getElementsByClassName('_socks_status');
for (let i = 0; i < _status.length; i++) {
const id = _status[i].getAttribute("socks_id");
XHR.get('<%=api.url("socks_status")%>', {
@@ -70,24 +106,18 @@ local sid = "@global[0]"
id: id
},
function(x, result) {
const index = result.index;
let div = '';
const div1 = '<font style="font-weight:bold;" color="green">✓</font>&nbsp';
const div2 = '<font style="font-weight:bold;" color="red">X</font>&nbsp';
if (result.socks_status) {
div += div1;
} else {
div += div2;
const socks = _status[i].querySelector('._socks');
const http = _status[i].querySelector('._http');
if (socks) {
socks.textContent = result.socks_status ? "✓" : "X";
socks.style.fontWeight = "bold";
socks.style.color = result.socks_status ? "green" : "red";
}
if (result.use_http) {
if (result.http_status) {
div += div1;
} else {
div += div2;
}
if (http) {
http.textContent = result.http_status ? "✓" : "X";
http.style.fontWeight = "bold";
http.style.color = result.http_status ? "green" : "red";
}
_status[index].innerHTML = div;
}
);
}
@@ -4,7 +4,7 @@ local appname = map.config
-%>
<style>
@media screen and (min-width: 1152px) {
@media screen and (min-width: 1153px) {
#cbi-<%=appname%>-haproxy_config input[id*=".<%=appname%>."][id$=".haproxy_port"],
#cbi-<%=appname%>-haproxy_config input[id*=".<%=appname%>."][id$=".lbweight"] {
width: 100px !important;
@@ -25,6 +25,59 @@ local appname = map.config
max-width: unset !important;
}
}
@media screen and (max-width: 1152px) {
/* Use the same narrow-screen table layout across themes. */
#cbi-<%=appname%>-haproxy_config .cbi-section-table,
#cbi-<%=appname%>-haproxy_config .cbi-section-table > tbody {
display: block;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-titles {
display: none !important;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row {
display: flex;
flex-wrap: wrap;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td {
display: block;
box-sizing: border-box;
margin: 0;
flex: 1 1 50%;
min-width: 0;
width: auto !important;
height: auto;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td[data-title]::before {
content: attr(data-title);
display: block;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td.cbi-section-actions {
flex: 1 1 100%;
}
#cbi-<%=appname%>-haproxy_config .cbi-value-field input:not([type="checkbox"], [type="radio"], [type="hidden"]),
#cbi-<%=appname%>-haproxy_config .cbi-value-field select {
box-sizing: border-box;
min-width: 0;
max-width: 100%;
}
/* Keep the enable column compact in mobile table cards. */
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td[data-name="enabled"] {
flex: 0 0 4.5em;
}
#cbi-<%=appname%>-haproxy_config .cbi-section-table-row > .td[data-name="lbss"] {
flex: 1 1 calc(100% - 4.5em);
min-width: 0;
}
}
</style>
<script type="text/javascript">
//<![CDATA[
@@ -13,6 +13,59 @@ local tab_name = self.tab_name
display: none !important;
visibility: hidden !important;
}
@media screen and (max-width: 1152px) {
/* Use the same narrow-screen table layout across themes. */
#cbi-<%=config%>-<%=section_type%> .cbi-section-table,
#cbi-<%=config%>-<%=section_type%> .cbi-section-table > tbody {
display: block;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-titles {
display: none !important;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row {
display: flex;
flex-wrap: wrap;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td {
display: block;
box-sizing: border-box;
margin: 0;
flex: 1 1 50%;
min-width: 0;
width: auto !important;
height: auto;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td[data-title]::before {
content: attr(data-title);
display: block;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td.cbi-section-actions {
flex: 1 1 100%;
}
#cbi-<%=config%>-<%=section_type%> .cbi-value-field input:not([type="checkbox"], [type="radio"], [type="hidden"]),
#cbi-<%=config%>-<%=section_type%> .cbi-value-field select {
box-sizing: border-box;
min-width: 0;
max-width: 100%;
}
/* Leave most of each mobile row for the node selector. */
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td:is([data-name="remarks"], [data-name="_fakedns"]) {
flex: 0 0 6.5em;
}
#cbi-<%=config%>-<%=section_type%> .cbi-section-table-row > .td:is([data-name="_node"], [data-name="_proxy_tag"]) {
flex: 1 1 calc(100% - 6.5em);
min-width: 0;
}
}
</style>
<script type="text/javascript">
//<![CDATA[
@@ -144,4 +197,4 @@ local tab_name = self.tab_name
}, 200)
});
//]]>
</script>
</script>
+3
View File
@@ -112,6 +112,9 @@ msgstr "گره Socks"
msgid "Current Node"
msgstr "گره فعلی"
msgid "Port Status"
msgstr "وضعیت پورت‌ها"
msgid "Listen Port"
msgstr "پورت شنود"
+3
View File
@@ -109,6 +109,9 @@ msgstr "SOCKS-сервер"
msgid "Current Node"
msgstr "Активный сервер"
msgid "Port Status"
msgstr "Состояние портов"
msgid "Listen Port"
msgstr "Порт прослушивания"
+3
View File
@@ -109,6 +109,9 @@ msgstr "Socks 节点"
msgid "Current Node"
msgstr "当前节点"
msgid "Port Status"
msgstr "端口状态"
msgid "Listen Port"
msgstr "监听端口"
+3
View File
@@ -109,6 +109,9 @@ msgstr "Socks 節點"
msgid "Current Node"
msgstr "當前節點"
msgid "Port Status"
msgstr "連接埠狀態"
msgid "Listen Port"
msgstr "監聽端口"
+5 -4
View File
@@ -2,19 +2,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssserver-next
PKG_VERSION:=1.0.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_MAINTAINER:=Dante <dante@example.com>
PKG_LICENSE:=Apache-2.0
LUCI_TITLE:=LuCI support for Shadowsocks-rust Server (Next)
LUCI_DEPENDS:=+shadowsocks-rust-ssserver-next +luci-base +ucode +ucode-mod-fs +ucode-mod-ubus
LUCI_PKGARCH:=all
define Package/luci-app-ssserver/postinst
define Package/luci-app-ssserver-next/postinst
#!/bin/sh
[ -n "$${IPKG_INSTROOT}" ] || {
chmod +x /etc/init.d/ssserver
/etc/init.d/rpcd restart
chmod +x /etc/init.d/ssserver 2>/dev/null || true
/etc/init.d/rpcd restart >/dev/null 2>&1 || true
}
exit 0
endef
+4
View File
@@ -1,5 +1,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-tailscale-next
PKG_VERSION:=1.0.0
PKG_RELEASE:=2
LUCI_TITLE:=LuCI support for Tailscale Next
LUCI_URL:=https://github.com/tokisaki-galaxy/luci-app-tailscale-community
PKG_DESCRIPTION:=Provides a LuCI Web management interface for Tailscale, allowing viewing status, configuring nodes and daemons.
+7 -8
View File
@@ -5,8 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lucky
PKG_VERSION:=3.5.0
PKG_RELEASE:=5
PKGARCH:=all
PKG_RELEASE:=6
LUCKY_CONF_DIR := /etc/config/lucky.daji
LUCKY_TMP_BACKUP := /tmp/luckyconfdir
@@ -42,12 +41,15 @@ ifeq ($(ARCH),aarch64)
LUCKY_ARCH:=arm64
endif
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz
PKG_SOURCE_URL:=https://github.com/gdy666/lucky/releases/download/v$(PKG_VERSION)/
PKG_HASH:=skip
PKG_LICENSE:=GPL-3.0-only
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=GDY666 <gdy666@foxmail.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_HASH:=skip
include $(INCLUDE_DIR)/package.mk
@@ -63,12 +65,9 @@ define Package/$(PKG_NAME)/description
Main functions of Lucky: ipv4/ipv6 portforward,ddns,IOT wake on lan ,reverse proxy and more...
endef
define Build/Prepare
[ ! -f $(PKG_BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz ] && wget https://github.com/gdy666/lucky/releases/download/v$(PKG_VERSION)/$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz -O $(PKG_BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz
tar -xzvf $(PKG_BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz -C $(PKG_BUILD_DIR)
mkdir -p $(PKG_BUILD_DIR)
tar -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR)
endef
+2 -5
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shadowsocks-rust-next
PKG_VERSION:=1.25.0
PKG_RELEASE:=1
PKG_RELEASE:=2
# Architecture mapping to match shadowsocks-rust release naming
ifeq ($(ARCH),x86_64)
@@ -17,9 +17,6 @@ endif
ifeq ($(ARCH),i386)
SS_ARCH:=i686-unknown-linux-musl
endif
ifeq ($(ARCH),mipsel)
SS_ARCH:=mips-unknown-linux-musl
endif
PKG_SOURCE:=shadowsocks-v$(PKG_VERSION).$(SS_ARCH).tar.xz
PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-rust/releases/download/v$(PKG_VERSION)/
@@ -39,7 +36,7 @@ define Package/shadowsocks-rust-next/Default
SUBMENU:=Web Servers/Proxies
TITLE:=shadowsocks-rust (Next)
URL:=https://github.com/shadowsocks/shadowsocks-rust
DEPENDS:=@(i386||x86_64||arm||aarch64||mipsel||mips)
DEPENDS:=@(i386||x86_64||arm||aarch64)
endef
define Package/shadowsocks-rust-ssserver-next
+3 -3
View File
@@ -10,8 +10,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=v2raya-geosite
PKG_VERSION:=20261112220449
PKG_RELEASE:=2
PKG_VERSION:=20261115005626
PKG_RELEASE:=3
PKG_LICENSE:=MIT
PKG_MAINTAINER:=Amr Fateem <amr.fateem@yahoo.com>
@@ -19,7 +19,7 @@ PKG_MAINTAINER:=Amr Fateem <amr.fateem@yahoo.com>
include $(INCLUDE_DIR)/package.mk
GEOSITE_FILE:=dlc.dat.$(PKG_VERSION)
GEOSITE_HASH:=02ad51927d05608b672bbcdf37f37b94ce1fdb7dcd10852f367ed457ad56280b
GEOSITE_HASH:=26e5f04c498ea651f62fa864f8e83ac5198ca311724e634d79f0ac02cdfe74fc
define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(PKG_VERSION)/
+111
View File
@@ -0,0 +1,111 @@
#
# VoLTE for a LAN SIP phone over a cellular modem: the router as its own IMS
# UE (ue/, sipd) and a modem-IMS plugin for the wwand daemon. A wwand PLUGIN
# (wwand plugins.uc) plus a SIP daemon, kept out of the wwand sources on
# purpose: it is NOT meant for upstream.
#
# Sources live in https://github.com/ddimension/wwand-ims (branch main, no
# vX.Y.Z-dev marker scheme yet — it is pinned by commit like wwand-ipa, not via
# bump-source.sh). After a PKG_SOURCE_VERSION bump run
# `scripts/update-hashes.sh wwand-ims` to fill PKG_MIRROR_HASH from the SDK.
#
# GPL-2.0-only, and pure ucode + scripts (no compiled code): the NETLINK_XFRM
# binding sec-agree needs lives in wwand's own native module (wwand_io.so,
# sub-namespace xfrm), so wwand-ims just DEPENDS on wwand. A future mcfg C tool
# (mcfg_tools) is GPL-3.0 and ships as a SEPARATE package wwand-ims-mcfg with
# its own binaries (docs/design.md §7) — nothing GPL-3.0 or compiled is built
# here. The ucode tree ships as source (the wwand daemon loads the plugin; the
# sipd init loads the UE modules with `ucode -L`), like wwand-ipa.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=wwand-ims
PKG_VERSION:=0.1.0
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ddimension/wwand-ims.git
PKG_SOURCE_VERSION:=1ec70fa685404c54e060c53f3d13db0dad5ebaeb
PKG_MIRROR_HASH:=skip
PKG_LICENSE:=GPL-2.0-only
PKG_MAINTAINER:=
include $(INCLUDE_DIR)/package.mk
UCDIR:=/usr/share/ucode/wwand
IMSLIB:=/usr/share/wwand-ims
# +wwand: the daemon this plugs into, and the provider of the xfrm binding
# (wwand_io.so). ESP for sec-agree (TS 33.203) over NETLINK_XFRM: kmod-ipsec
# (xfrm core, and it already pulls crypto-authenc/cbc/hmac/sha1) + ipsec4/
# ipsec6 (ESP for v4/v6); AES is built into the kernel (CONFIG_CRYPTO_AES=y),
# so no crypto-aes kmod. The IMS VRF: kmod-vrf (netifd creates the `type vrf`
# device itself) plus ip-full — the l3mdev hotplug re-adds the `ip rule ...
# l3mdev` FIB rules netifd flushes, and the l3mdev selector is iproute2-only
# (busybox ip cannot). ucode stock modules the plugin/UE/sipd import.
define Package/wwand-ims
SECTION:=net
CATEGORY:=Network
SUBMENU:=WWAN
TITLE:=VoLTE for a LAN SIP phone over wwand (IMS UE + plugin)
DEPENDS:=+wwand \
+kmod-ipsec +kmod-ipsec4 +kmod-ipsec6 +kmod-vrf +ip-full \
+ucode-mod-fs +ucode-mod-uloop +ucode-mod-ubus +ucode-mod-socket \
+ucode-mod-uci +ucode-mod-digest +ucode-mod-struct
PKGARCH:=all
endef
define Package/wwand-ims/description
VoLTE for a LAN SIP phone or a PBX trunk through a cellular modem. The
router is its own IMS UE: it registers over the modem's IMS PDN, borrows the
USIM over wwand's APDU channel, runs sec-agree ESP in an IMS VRF, and bridges
RTP to the LAN (sipd, a SIP registrar/B2BUA). A wwand plugin also drives the
modem's own IMS over QMI, and "wwandctl ims" sets the router up from the
carrier MBN. Not for upstream.
endef
# user-edited operator/profile config; keep it across sysupgrade
define Package/wwand-ims/conffiles
/etc/config/wwand_ims
endef
# pure ucode + scripts: nothing to compile
define Build/Compile
endef
define Package/wwand-ims/install
# the modem-IMS plugin, loaded by the wwand daemon
$(INSTALL_DIR) $(1)$(UCDIR)/plugins $(1)$(UCDIR)/ctl
$(INSTALL_DATA) $(PKG_BUILD_DIR)/plugins/ims.uc $(1)$(UCDIR)/plugins/
# `wwandctl ims` and the MBN helper (installed under the module name)
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ctl/ims.uc $(1)$(UCDIR)/ctl/ims.uc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ctl/mcfg.uc $(1)$(UCDIR)/ims_mcfg.uc
# the router's own IMS UE + sipd, under their `ucode -L` module names
$(INSTALL_DIR) $(1)$(IMSLIB)
$(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/sipd.uc $(1)$(IMSLIB)/sipd.uc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/core.uc $(1)$(IMSLIB)/sipd_core.uc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/sip.uc $(1)$(IMSLIB)/sipd_sip.uc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/line_ue.uc $(1)$(IMSLIB)/sipd_line_ue.uc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/relay.uc $(1)$(IMSLIB)/sipd_relay.uc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/aka.uc $(1)$(IMSLIB)/ue_aka.uc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/secagree.uc $(1)$(IMSLIB)/ue_secagree.uc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/reg.uc $(1)$(IMSLIB)/ue_reg.uc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/call.uc $(1)$(IMSLIB)/ue_call.uc
# the proven UE driver, run by `wwandctl ims [modem] call <number>`
$(INSTALL_DATA) $(PKG_BUILD_DIR)/tools/ims-register.uc $(1)$(IMSLIB)/ims-register.uc
# init, setup helper, example config, l3mdev hotplug
$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin $(1)/etc/config $(1)/etc/hotplug.d/iface
$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/wwand-ims-sipd.init $(1)/etc/init.d/wwand-ims-sipd
$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/wwand-ims-setup $(1)/usr/sbin/wwand-ims-setup
$(INSTALL_CONF) $(PKG_BUILD_DIR)/files/wwand_ims.config $(1)/etc/config/wwand_ims
$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/wwand-ims-l3mdev.hotplug \
$(1)/etc/hotplug.d/iface/25-wwand-ims-l3mdev
# examples (IMS PDN network + firewall, Asterisk trunk)
$(INSTALL_DIR) $(1)$(IMSLIB)/examples
$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/ims-network.example $(1)$(IMSLIB)/examples/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/asterisk-pjsip.example $(1)$(IMSLIB)/examples/
endef
$(eval $(call BuildPackage,wwand-ims))
+3 -3
View File
@@ -50,12 +50,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wwand
PKG_VERSION:=1.9.0_pre27
PKG_RELEASE:=94
PKG_VERSION:=1.9.0_pre49
PKG_RELEASE:=95
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git
PKG_SOURCE_VERSION:=069546e1c817cac4c3936a1b98057b27cad7fd80
PKG_SOURCE_VERSION:=25e69856de205e6be33acbaba5a7657e89089de5
PKG_MIRROR_HASH:=skip
PKG_LICENSE:=GPL-2.0-only