add/replace acme/adblock with uacme/adguardhome

Author: anaelorlinski

README.md

@@ -38,8 +38,13 @@ Automated builds of OpenWrt for FriendlyARM NanoPi R2S & R4S boards
 
 
 ## Changelog
+#### 2022-04-30
+- (21.02) Remove acme/adblock in favor of uacme/adguardhome (mini)
+- (21.02) Add uacme/adguardhome (full)
+#### 2022-04-28
+- (22.03) Add NanoPi R2C support
 #### 2022-04-12
-- Add NanoPi R2C in uboot and branch 21.02
+- (21.02) Add NanoPi R2C support
 #### 2022-03-28
 - Add branch 22.03
 #### 2022-02-12

openwrt-21.02/release-info.md

@@ -13,6 +13,5 @@
 - vpn-routing-policy latest version from https://github.com/stangri/source.openwrt.melmac.net
 
 ### Changelog
-- Add losetup, cfdisk in builds. Fix issue #11 : Check docs/resize-f2fs.md how to resize.
-- Branch 21.02 : use gcc 10.2
-- Optimized builds for devices R4S:-mcpu=cortex-a72.cortex-a53+crypto+crc R2S:-mcpu=cortex-a53+crypto+crc
+- Remove acme/adblock in favor of uacme/adguardhome (mini)
+- Add uacme/adguardhome (full)

openwrt-21.02/seed/ao-R4S-full.seed

@@ -43,13 +43,13 @@ CONFIG_KERNEL_PROC_PID_CPUSET=y
 CONFIG_KERNEL_TRANSPARENT_HUGEPAGE=y
 CONFIG_KERNEL_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_LIBCURL_COOKIES=y
+CONFIG_LIBCURL_CRYPTO_AUTH=y
 CONFIG_LIBCURL_FILE=y
 CONFIG_LIBCURL_FTP=y
 CONFIG_LIBCURL_HTTP=y
 CONFIG_LIBCURL_NGHTTP2=y
-CONFIG_LIBCURL_NO_SMB="!"
+CONFIG_LIBCURL_OPENSSL=y
 CONFIG_LIBCURL_PROXY=y
-CONFIG_LIBCURL_WOLFSSL=y
 CONFIG_LUCI_LANG_en=y
 CONFIG_OPENSSL_ENGINE=y
 CONFIG_OPENSSL_OPTIMIZE_SPEED=y
@@ -73,6 +73,7 @@ CONFIG_OPENVPN_openssl_ENABLE_SMALL=y
 CONFIG_PACKAGE_acme=y
 CONFIG_PACKAGE_acme-dnsapi=y
 CONFIG_PACKAGE_adblock=y
+CONFIG_PACKAGE_adguardhome=y
 CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_alsa-ucm-conf=y
 CONFIG_PACKAGE_alsa-utils=y
@@ -495,6 +496,7 @@ CONFIG_PACKAGE_tc-tiny=y
 CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_tini=y
 CONFIG_PACKAGE_tinyproxy=y
+CONFIG_PACKAGE_uacme=y
 CONFIG_PACKAGE_uclibcxx=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y

openwrt-21.02/seed/ao-R4S-mini.seed

@@ -28,13 +28,13 @@ CONFIG_KERNEL_PERF_EVENTS=y
 CONFIG_KERNEL_TRANSPARENT_HUGEPAGE=y
 CONFIG_KERNEL_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_LIBCURL_COOKIES=y
+CONFIG_LIBCURL_CRYPTO_AUTH=y
 CONFIG_LIBCURL_FILE=y
 CONFIG_LIBCURL_FTP=y
 CONFIG_LIBCURL_HTTP=y
 CONFIG_LIBCURL_NGHTTP2=y
-CONFIG_LIBCURL_NO_SMB="!"
+CONFIG_LIBCURL_OPENSSL=y
 CONFIG_LIBCURL_PROXY=y
-CONFIG_LIBCURL_WOLFSSL=y
 CONFIG_LUCI_LANG_en=y
 CONFIG_OPENSSL_ENGINE=y
 CONFIG_OPENSSL_OPTIMIZE_SPEED=y
@@ -55,9 +55,7 @@ CONFIG_OPENVPN_openssl_ENABLE_MULTIHOME=y
 CONFIG_OPENVPN_openssl_ENABLE_PF=y
 CONFIG_OPENVPN_openssl_ENABLE_PORT_SHARE=y
 CONFIG_OPENVPN_openssl_ENABLE_SMALL=y
-CONFIG_PACKAGE_acme=y
-CONFIG_PACKAGE_acme-dnsapi=y
-CONFIG_PACKAGE_adblock=y
+CONFIG_PACKAGE_adguardhome=y
 CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_alsa-ucm-conf=y
 CONFIG_PACKAGE_alsa-utils=y
@@ -156,7 +154,6 @@ CONFIG_PACKAGE_iptables-mod-proto=y
 CONFIG_PACKAGE_iptables-mod-rpfilter=y
 CONFIG_PACKAGE_iptables-mod-tproxy=y
 CONFIG_PACKAGE_iptables-mod-u32=y
-CONFIG_PACKAGE_iw=y
 CONFIG_PACKAGE_jq=y
 CONFIG_PACKAGE_kmod-arptables=y
 CONFIG_PACKAGE_kmod-backlight=y
@@ -388,6 +385,7 @@ CONFIG_PACKAGE_tc-mod-iptables=y
 CONFIG_PACKAGE_tc-tiny=y
 CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_tinyproxy=y
+CONFIG_PACKAGE_uacme=y
 CONFIG_PACKAGE_uclibcxx=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y