mirror of
https://github.com/openwrt/luci.git
synced 2026-05-31 10:31:55 +08:00
Stan Grishin
e42b52a348
Maintainer: me Compile tested: x86_64, Dell EMC Edge620, OpenWrt 25.12.1 Run tested: x86_64, Dell EMC Edge620, OpenWrt 25.12.1 Description: update to PKG_RELEASE 5 and status page improvements - Bump PKG_RELEASE from 4 to 5. htdocs/luci-static/resources/https-dns-proxy/status.js: - Remove redundant 'cbi-value-description' class from statusText element. - Remove old README link from instances description. - Restructure instances description to correctly display donate link. - Add a line break element after the instancesText output. po/templates/https-dns-proxy.pot: - Update POT file to reflect changes in status.js. root/usr/libexec/rpcd/luci.https-dns-proxy: - Redirect stderr for is_enabled and is_running functions to /dev/null. - Correctly retrieve service name in `get_init_list` using basename. - Remove extraneous `json_close_array` call from `get_init_status`. - Ensure `ubus_get_ports` uses correct JSON quoting. Signed-off-by: Stan Grishin <stangri@melmac.ca>
49 lines
1.9 KiB
Makefile
49 lines
1.9 KiB
Makefile
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
# Copyright 2017-2026 MOSSDeF, Stan Grishin (stangri@melmac.ca).
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=luci-app-https-dns-proxy
|
|
PKG_LICENSE:=AGPL-3.0-or-later
|
|
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
|
PKG_VERSION:=2025.12.29
|
|
PKG_RELEASE:=5
|
|
|
|
LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
|
|
LUCI_URL:=https://github.com/mossdef-org/luci-app-https-dns-proxy/
|
|
LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy
|
|
LUCI_DEPENDS:=+luci-base +https-dns-proxy
|
|
|
|
define Package/$(PKG_NAME)/config
|
|
# shown in make menuconfig <Help>
|
|
help
|
|
$(LUCI_TITLE)
|
|
.
|
|
Version: $(PKG_VERSION)-$(PKG_RELEASE)
|
|
endef
|
|
|
|
# Consolidate individual provider JSON files into providers.json in the build tree.
|
|
# luci.mk's Build/Prepare calls Build/Prepare/$(LUCI_NAME) as a per-package hook.
|
|
# The merged file lands in root/ so luci.mk's install step copies it automatically.
|
|
define Build/Prepare/luci-app-https-dns-proxy
|
|
@if [ -d $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers ] \
|
|
&& ls $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers/*.json >/dev/null 2>&1; then \
|
|
sep=''; printf '[' > $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
|
|
for f in $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers/*.json; do \
|
|
printf '%s' "$$$$sep" >> $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
|
|
cat "$$$$f" >> $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
|
|
sep=','; \
|
|
done; \
|
|
printf ']' >> $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
|
|
fi
|
|
@if grep -q '"title"' $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json 2>/dev/null; then \
|
|
rm -rf $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers; \
|
|
else \
|
|
rm -f $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
|
|
fi
|
|
endef
|
|
|
|
include ../../luci.mk
|
|
|
|
# call BuildPackage - OpenWrt buildroot signature
|