From ff0c72f74ba3771499b9cab2966524334d627420 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Aug 2020 18:19:48 +0200 Subject: [PATCH] modules: update packages b3170384c simple-adblock: bugfix: update config; use command -v 4c1293e3f freeradius3: Fix proxy.conf file conflict. 3fd112e4a lvm2: fix CE in mac 2d1f83793 nano: update to 5.1 e6e24738e nano: update to 5.0 9c8671828 freeradius3: add missing conffiles to Makefile 8dc8d4c20 simple-adblock: README and config update --- modules | 2 +- .../routing/0002-batctl-remove-kmod-batman-adv-dependency.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules b/modules index 55da5509..aff84cea 100644 --- a/modules +++ b/modules @@ -6,7 +6,7 @@ OPENWRT_COMMIT=0c25ece262e8ec44d7414d472afa8d8e5858edfa PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-18.06 -PACKAGES_PACKAGES_COMMIT=f9daa828e02155977a09b0eef128b462ca8e0f1b +PACKAGES_PACKAGES_COMMIT=b2978d83db29693c00ed44547ab2967a764ef899 PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_BRANCH=openwrt-18.06 diff --git a/patches/packages/routing/0002-batctl-remove-kmod-batman-adv-dependency.patch b/patches/packages/routing/0002-batctl-remove-kmod-batman-adv-dependency.patch index dd4e066e..715324a4 100644 --- a/patches/packages/routing/0002-batctl-remove-kmod-batman-adv-dependency.patch +++ b/patches/packages/routing/0002-batctl-remove-kmod-batman-adv-dependency.patch @@ -8,7 +8,7 @@ batctl works just as well with batman-adv-legacy (compat 14). Signed-off-by: Linus Lüssing diff --git a/batctl/Makefile b/batctl/Makefile -index c74fdbd35f0adcc98814b8919a98a65b5cf918f3..422e5c415fb8112febab8b30d3cdffe76e1d18d9 100644 +index 95124f063ea7a3a385a2dc71008b899a56e4c5b6..7f358d5b17f5356f5150ddb9e484320658392646 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -23,7 +23,7 @@ define Package/batctl