update adguardhome and remove libpfring fix

anaelorlinski · Sep 6, 2024 · 7e52f71 · 7e52f71
1 parent 9dd1b90
commit 7e52f71
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 301 deletions.
diff --git a/openwrt-23.05/patches/package/adguardhome/Makefile b/openwrt-23.05/patches/package/adguardhome/Makefile
@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.46
+PKG_VERSION:=0.107.52
 PKG_RELEASE:=1
 
 # WARNING : need rework for other arch
 PKG_SOURCE:=AdGuardHome_linux_arm64.tar.gz
 PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome/releases/download/v$(PKG_VERSION)/
-PKG_HASH:=5011096bae383e27db9f0de063caeea9ec4b0e0bcac6728409d223dc51c8c0d0
+PKG_HASH:=86ae7a7c2db9c158b9db9f350568485e3ccc43e7039624d1a5bc50bb1dee1048
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE.txt

diff --git a/openwrt-23.05/patches/package/libpfring/Makefile b/openwrt-23.05/patches/package/libpfring/Makefile
diff --git a/openwrt-23.05/patches/package/libpfring/patches/0001-fix-cross-compiling.patch b/openwrt-23.05/patches/package/libpfring/patches/0001-fix-cross-compiling.patch
diff --git a/openwrt-23.05/patches/package/libpfring/patches/002-implement-probabilistic-sampling.patch b/openwrt-23.05/patches/package/libpfring/patches/002-implement-probabilistic-sampling.patch
diff --git a/openwrt-23.05/patches/package/libpfring/patches/100-fix-compilation-warning.patch b/openwrt-23.05/patches/package/libpfring/patches/100-fix-compilation-warning.patch
diff --git a/....05/patches/package/libpfring/patches/101-kernel-pf_ring-better-define-sa_data-size.patch b/....05/patches/package/libpfring/patches/101-kernel-pf_ring-better-define-sa_data-size.patch
diff --git a/openwrt-23.05/release-info.md b/openwrt-23.05/release-info.md
@@ -19,6 +19,7 @@
 - pbr latest version from https://github.com/stangri/source.openwrt.melmac.net
 
 ### Changelog
+- [2024-09-06] Update adguardhome
 - [2024-07-22] OpenWrt 23.05.4
 - [2024-03-27] OpenWrt 23.05.3
 - [2023-11-15] OpenWrt 23.05.2

diff --git a/openwrt-23.05/steps/04-prepare_package.sh b/openwrt-23.05/steps/04-prepare_package.sh
@@ -28,11 +28,6 @@ cp -R ../stangri_repo/luci-app-pbr feeds/luci/applications/
 rm -rf feeds/packages/net/adguardhome
 cp -R $ROOTDIR/openwrt-$OPENWRT_BRANCH/patches/package/adguardhome feeds/packages/net/
 
-# replace libpfring that fails compiling
-rm -rf feeds/packages/libs/libpfring
-cp -R $ROOTDIR/openwrt-$OPENWRT_BRANCH/patches/package/libpfring feeds/packages/libs/
-
-
 ./scripts/feeds update -i && ./scripts/feeds install -a
 
 # Time stamp with $Build_Date=$(date +%Y.%m.%d)