Skip to content

Commit ede57a8

Browse files
authored
Merge pull request openwrt#7121 from stangri/master-luci-app-adblock-fast
luci-app-adblock-fast: update to 1.1.2-1
2 parents b57c6ff + d18f58b commit ede57a8

File tree

4 files changed

+91
-57
lines changed

4 files changed

+91
-57
lines changed

applications/luci-app-adblock-fast/Makefile

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
# Copyright 2023 MOSSDeF, Stan Grishin (stangri@melmac.ca)
2-
# This is free software, licensed under the GNU General Public License v3.
1+
# Copyright 2023-2024 MOSSDeF, Stan Grishin (stangri@melmac.ca).
2+
# This is free software, licensed under AGPL-3.0-or-later.
33

44
include $(TOPDIR)/rules.mk
55

6-
PKG_LICENSE:=GPL-3.0-or-later
6+
PKG_NAME:=luci-app-adblock-fast
7+
PKG_LICENSE:=AGPL-3.0-or-later
78
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
8-
PKG_VERSION:=1.1.1-r7
9+
PKG_VERSION:=1.1.2
10+
PKG_RELEASE:=1
911

1012
LUCI_TITLE:=AdBlock-Fast Web UI
1113
LUCI_DESCRIPTION:=Provides Web UI for adblock-fast service.
1214
LUCI_DEPENDS:=+luci-base +adblock-fast +jsonfilter
13-
LUCI_PKGARCH:=all
15+
16+
define Package/$(PKG_NAME)/config
17+
# shown in make menuconfig <Help>
18+
help
19+
$(LUCI_TITLE)
20+
.
21+
Version: $(PKG_VERSION)-$(PKG_RELEASE)
22+
endef
1423

1524
include ../../luci.mk
1625

applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,12 @@ var status = baseclass.extend({
189189
warningMissingRecommendedPackages: _(
190190
"Some recommended packages are missing"
191191
),
192+
warningOutdatedLuciPackage: _(
193+
"The WebUI application (luci-app-adblock-fast) is outdated, please update it"
194+
),
195+
warningOutdatedPrincipalPackage: _(
196+
"The principal package (adblock-fast) is outdated, please update it"
197+
),
192198
warningInvalidCompressedCacheDir: _(
193199
"Invalid compressed cache directory '%s'"
194200
),

0 commit comments

Comments
 (0)