Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[23.05] unbound: pull in adblock-fast generated adb_list #24144

Merged
merged 1 commit into from
Jun 11, 2024

Conversation

stangri
Copy link
Member

@stangri stangri commented May 13, 2024

Maintainer: @EricLuehrsen
Compile tested: no, trivial change
Run tested: Tested by a user on the forum: https://forum.openwrt.org/t/adblock-fast-ad-blocking-service-for-dnsmasq-smartdns-and-unbound/170530/238

Description:

  • adblock-fast can generate the compatible adb_list-file, but it's only pulled if net/adblock installed, this patch also pulls in the adb_list file if net/adblock-fast is installed.
  • also bump PKG_RELEASE

Signed-off-by: Stan Grishin stangri@melmac.ca
(cherry picked from commit d7d1743)

* adblock-fast can generate the compatible adb_list-file, but it's
  only pulled if net/adblock installed, this patch also pulls in the
  adb_list file if net/adblock-fast is installed.
* also bump PKG_RELEASE

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit d7d1743)
@stangri stangri added the OpenWrt 23.05 Issue/PR on branch 23.05 label May 13, 2024
@stangri
Copy link
Member Author

stangri commented May 23, 2024

@EricLuehrsen please confirm this OK to cherry-pick for current release.

Copy link
Contributor

@EricLuehrsen EricLuehrsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay to merge

@1715173329 1715173329 merged commit e0d7863 into openwrt:openwrt-23.05 Jun 11, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OpenWrt 23.05 Issue/PR on branch 23.05
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants