[PATCH 1/2] libtool: bump to 2.4.6
This updates libtool to its current release, from 2015. Current patches
were renumbered and given a description text. The fix in
160-passthrough-ssp.patch is no longer needed.
A patch to speed up build was cherry-picked, and another openwrt
specific patch was needed to not use quotes in $(SHELL), to acommodate
our "SHELL=/usr/bin/env bash" usage.
The already present call to ./bootstrap ensures that generated files are
refreshed, so the patches are applied only to their sources. Also, that
bootstrap call was adjusted to run at the appropriate time when QUILT=1.
Signed-off-by: Eneas U de Queiroz
---
tools/libtool/Makefile| 11 +-
tools/libtool/patches/000-relocatable.patch | 108 ++---
.../libtool/patches/001-fix-func_append.patch | 22 --
tools/libtool/patches/100-libdir-fixes.patch | 97 +++-
...10-dont-use-target-dir-for-relinking.patch | 51 ++--
.../120-strip-unsafe-dirs-for-relinking.patch | 36 +--
...ingslash.patch => 130-trailingslash.patch} | 33 +--
...140-don-t-quote-SHELL-in-Makefile.am.patch | 72 ++
...itigate-the-sed_quote_subst-slowdown.patch | 224 ++
.../libtool/patches/160-passthrough-ssp.patch | 12 -
.../patches/200-openwrt-branding.patch| 134 ++-
11 files changed, 444 insertions(+), 356 deletions(-)
delete mode 100644 tools/libtool/patches/001-fix-func_append.patch
rename tools/libtool/patches/{150-trailingslash.patch =>
130-trailingslash.patch} (57%)
create mode 100644
tools/libtool/patches/140-don-t-quote-SHELL-in-Makefile.am.patch
create mode 100644
tools/libtool/patches/150-libtool-mitigate-the-sed_quote_subst-slowdown.patch
delete mode 100644 tools/libtool/patches/160-passthrough-ssp.patch
diff --git a/tools/libtool/Makefile b/tools/libtool/Makefile
index dd4a7f6380..b237884b64 100644
--- a/tools/libtool/Makefile
+++ b/tools/libtool/Makefile
@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libtool
PKG_CPE_ID:=cpe:/a:gnu:libtool
-PKG_VERSION:=2.4
+PKG_VERSION:=2.4.6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae
+PKG_HASH:=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f
HOST_BUILD_PARALLEL:=1
@@ -24,7 +24,12 @@ HOST_CONFIGURE_VARS += \
define Host/Prepare
$(call Host/Prepare/Default)
(cd $(STAGING_DIR_HOST)/share/aclocal/ && rm -f libtool.m4 ltdl.m4
lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4)
- (cd $(HOST_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap)
+ $(if $(QUILT),,(cd $(HOST_BUILD_DIR); touch README-release;
$(AM_TOOL_PATHS) ./bootstrap --skip-git --skip-po --force))
+endef
+
+define Host/Configure
+ $(if $(QUILT),(cd $(HOST_BUILD_DIR); touch README-release;
$(AM_TOOL_PATHS) ./bootstrap --skip-git --skip-po --force))
+ $(call Host/Configure/Default)
endef
define Host/Install
diff --git a/tools/libtool/patches/000-relocatable.patch
b/tools/libtool/patches/000-relocatable.patch
index 55265fe533..88d1eaed02 100644
--- a/tools/libtool/patches/000-relocatable.patch
+++ b/tools/libtool/patches/000-relocatable.patch
@@ -1,46 +1,24 @@
a/libltdl/config/general.m4sh
-+++ b/libltdl/config/general.m4sh
-@@ -45,15 +45,22 @@ progpath="$0"
- M4SH_VERBATIM([[
- : ${CP="cp -f"}
- test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
--: ${EGREP="@EGREP@"}
--: ${FGREP="@FGREP@"}
--: ${GREP="@GREP@"}
- : ${LN_S="@LN_S@"}
- : ${MAKE="make"}
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
--: ${SED="@SED@"}
-+if test -n "$STAGING_DIR"; then
-+ : ${EGREP="$STAGING_DIR/../host/bin/grep -E"}
-+ : ${FGREP="$STAGING_DIR/../host/bin/grep -F"}
-+ : ${GREP="$STAGING_DIR/../host/bin/grep"}
-+ : ${SED="$STAGING_DIR/../host/bin/sed"}
-+else
-+ : ${EGREP="@EGREP@"}
-+ : ${FGREP="@FGREP@"}
-+ : ${GREP="@GREP@"}
-+ : ${SED="@SED@"}
-+fi
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- : ${Xsed="$SED -e 1s/^X//"}
-
+From ca10caa502f971f90d8c041aa2476de54ef0ce2b Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz
+Date: Tue, 20 Jul 2021 16:41:11 -0300
+Subject: openwrt: make relocatable, search resources relative to STAGING_DIR
+
+This was originally commited to openwrt by Jo-Philipp Wich
+.
+
+(adjusted to v2.4.6)
+Signed-off-by: Eneas U de Queiroz
+
--- a/libtoolize.in
+++ b/libtoolize.in
-@@ -326,15 +326,22 @@ as_unset=as_fn_unset
+@@ -40,11 +40,18 @@
- : ${CP="cp -f"}
- test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+ : ${AUTOCONF="autoconf"}
+ : ${AUTOMAKE="automake"}
-: ${EGREP="@EGREP@"}
-: ${FGREP="@FGREP@"}
-: ${GREP="@GREP@"}
: ${LN_S="@LN_S@"}
- : ${MAKE="make"}
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
-: ${SED="@SED@"}
+if test -n "$STAGING_DIR"; then
+ : ${EGREP="$STAGING_DIR/../host/bin/grep -E"}
@@ -53,58 +31,12 @@
+ : ${GREP="@GREP@"}
+ : ${SED="@SED@"}
+fi
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- :
[PATCH 2/2] wolfssl: bump to v4.8.0-stable
Release 4.8.0 of wolfSSL embedded TLS has bug fixes and new features including this vulnerability: * [Low] OCSP request/response verification issue. In the case that the serial number in the OCSP request differs from the serial number in the OCSP response the error from the comparison was not resulting in a failed verification. Signed-off-by: Eneas U de Queiroz --- package/libs/wolfssl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile index 0c95288a2a..38c284ec5d 100644 --- a/package/libs/wolfssl/Makefile +++ b/package/libs/wolfssl/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wolfssl -PKG_VERSION:=4.7.0-stable -PKG_RELEASE:=2 +PKG_VERSION:=4.8.0-stable +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION) -PKG_HASH:=b0e740b31d4d877d540ad50cc539a8873fc41af02bd3091c4357b403f7106e31 +PKG_HASH:=72c22efcdab0f18f9b0bb45621c213144f88b4a9e9b9cc06878b47744e058885 PKG_FIXUP:=libtool libtool-abiver PKG_INSTALL:=1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 0/2] Bump WolfSSL and libtool
WolfSSL has decided it needs at least libtool 2.4.2 to build. From
their commit 92854a5dd message:
advance LT_PREREQ from 2.2 (2008) to 2.4.2 (2011) to reflect current
automated testing coverage.
We could easily patch our way out of it, but I decided to try the
upgrade first. It appears to work just fine. I've just rebuilt the
whole tree for my Linksys E8450 (mt7622), and tested the WolfSSL update
with hostapd and uhttpd. I've had no hickups, but of course ymmv.
My major concern while bumping a core building tool was how it could
affect the changes we have in place. I've looked at both our patches,
and at what was changed upstream.
The major changes were related to getting the gnulib sources from git,
and refreshing them when running bootstrap. Since we are applying
patches, getting fresh copies are not viable, but there's a command-line
option to avoid doing it.
I'm not so sure what to do about 21.02.
1. Patch WolfSSL to accept building with libtool 2.4;
2. Bump libtool to 2.4.2: 11 *relevant* files changed from 2.4,
424 insertions(+), 198 deletions(-).
This was before the gnulib changes. For a comparison, there are
71 files changed, 17143 insertions(+), 5697 deletions(-), when going
from 2.4 to 2.4.6.
3. Bump both to keep in sync with master.
My vote: do 1 now, and wait for possible fallout from master. Then,
perhaps try to keep them in sync, at the following point release.
Cheers
Eneas U de Queiroz (2):
libtool: bump to 2.4.6
wolfssl: bump to v4.8.0-stable
package/libs/wolfssl/Makefile | 6 +-
tools/libtool/Makefile| 11 +-
tools/libtool/patches/000-relocatable.patch | 108 ++---
.../libtool/patches/001-fix-func_append.patch | 22 --
tools/libtool/patches/100-libdir-fixes.patch | 97 +++-
...10-dont-use-target-dir-for-relinking.patch | 51 ++--
.../120-strip-unsafe-dirs-for-relinking.patch | 36 +--
...ingslash.patch => 130-trailingslash.patch} | 33 +--
...140-don-t-quote-SHELL-in-Makefile.am.patch | 72 ++
...itigate-the-sed_quote_subst-slowdown.patch | 224 ++
.../libtool/patches/160-passthrough-ssp.patch | 12 -
.../patches/200-openwrt-branding.patch| 134 ++-
12 files changed, 447 insertions(+), 359 deletions(-)
delete mode 100644 tools/libtool/patches/001-fix-func_append.patch
rename tools/libtool/patches/{150-trailingslash.patch =>
130-trailingslash.patch} (57%)
create mode 100644
tools/libtool/patches/140-don-t-quote-SHELL-in-Makefile.am.patch
create mode 100644
tools/libtool/patches/150-libtool-mitigate-the-sed_quote_subst-slowdown.patch
delete mode 100644 tools/libtool/patches/160-passthrough-ssp.patch
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH] mwlwifi: downgrade the 88W8964's firmware to 9.3.2.6 to prevent instability
Scratch this email, I couldn't include [PATCH 21.02]. This patch was intended for the OpenWrt 21.02 branch. On Thu, Jul 22, 2021 at 7:47 PM Arınç ÜNAL wrote: > > Avoid 88W8964 firmware 9.3.2.12 for Wi-Fi instabilities it causes on Linksys > WRT3200ACM & WRT32X until fixes on master branch are backported to > openwrt-21.02. > > A lot of users, me included, with Linksys WRT32X & WRT3200ACM devices > experience often Wi-Fi cutouts on OpenWrt 21.02.0-rc3. > Here are people who had issues with 9.3.2.12 on WRT3200ACM. They no longer > have the issue after installing OpenWrt 19.07 or downgrading to the 9.3.2.6 > firmware. > https://forum.openwrt.org/t/pre-compiled-updated-mwlwifi-drivers-for-stable-releases/3262/682 > https://forum.openwrt.org/t/pre-compiled-updated-mwlwifi-drivers-for-stable-releases/3262/688 > https://forum.openwrt.org/t/connectivity-issues-with-wifi/79003 > https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700/2 > https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700/14 > https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700/16 > > I can confirm downgrading to 9.3.2.6 fixed the Wi-Fi cut-outs on my WRT32X. > https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700 > > Signed-off-by: Arınç ÜNAL > --- > package/kernel/mwlwifi/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile > index eb986dca03..0d0ac701d9 100644 > --- a/package/kernel/mwlwifi/Makefile > +++ b/package/kernel/mwlwifi/Makefile > @@ -15,9 +15,9 @@ PKG_LICENSE_FILES:= > > PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi > PKG_SOURCE_PROTO:=git > -PKG_SOURCE_DATE:=2020-02-06 > -PKG_SOURCE_VERSION:=a2fd00bb74c35820dfe233d762690c0433a87ef5 > -PKG_MIRROR_HASH:=0eda0e774a87e58e611d6436350e1cf2be3de50fddde334909a07a15b0c9862b > +PKG_SOURCE_DATE:=2019-08-18 > +PKG_SOURCE_VERSION:=747796b2f126df01c3c5442c607b4ea0497b1c6c > +PKG_MIRROR_HASH:=11985b8132edd1db1001748b0fc6d915205b7bcaf2a7512a4befb5ef3cc83bb9 > > PKG_MAINTAINER:=Imre Kaloz > PKG_BUILD_PARALLEL:=1 > -- > 2.25.1 > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 21.02] mwlwifi: downgrade the 88W8964's firmware to 9.3.2.6 to prevent instability
Avoid 88W8964 firmware 9.3.2.12 for Wi-Fi instabilities it causes on Linksys WRT3200ACM & WRT32X until fixes on master branch are backported to openwrt-21.02. A lot of users, me included, with Linksys WRT32X & WRT3200ACM devices experience often Wi-Fi cutouts on OpenWrt 21.02.0-rc3. Here are people who had issues with 9.3.2.12 on WRT3200ACM. They no longer have the issue after installing OpenWrt 19.07 or downgrading to the 9.3.2.6 firmware. https://forum.openwrt.org/t/pre-compiled-updated-mwlwifi-drivers-for-stable-releases/3262/682 https://forum.openwrt.org/t/pre-compiled-updated-mwlwifi-drivers-for-stable-releases/3262/688 https://forum.openwrt.org/t/connectivity-issues-with-wifi/79003 https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700/2 https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700/14 https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700/16 I can confirm downgrading to 9.3.2.6 fixed the Wi-Fi cut-outs on my WRT32X. https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700 Signed-off-by: Arınç ÜNAL --- package/kernel/mwlwifi/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile index eb986dca03..0d0ac701d9 100644 --- a/package/kernel/mwlwifi/Makefile +++ b/package/kernel/mwlwifi/Makefile @@ -15,9 +15,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-02-06 -PKG_SOURCE_VERSION:=a2fd00bb74c35820dfe233d762690c0433a87ef5 -PKG_MIRROR_HASH:=0eda0e774a87e58e611d6436350e1cf2be3de50fddde334909a07a15b0c9862b +PKG_SOURCE_DATE:=2019-08-18 +PKG_SOURCE_VERSION:=747796b2f126df01c3c5442c607b4ea0497b1c6c +PKG_MIRROR_HASH:=11985b8132edd1db1001748b0fc6d915205b7bcaf2a7512a4befb5ef3cc83bb9 PKG_MAINTAINER:=Imre Kaloz PKG_BUILD_PARALLEL:=1 -- 2.25.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH] mwlwifi: downgrade the 88W8964's firmware to 9.3.2.6 to prevent instability
Avoid 88W8964 firmware 9.3.2.12 for Wi-Fi instabilities it causes on Linksys WRT3200ACM & WRT32X until fixes on master branch are backported to openwrt-21.02. A lot of users, me included, with Linksys WRT32X & WRT3200ACM devices experience often Wi-Fi cutouts on OpenWrt 21.02.0-rc3. Here are people who had issues with 9.3.2.12 on WRT3200ACM. They no longer have the issue after installing OpenWrt 19.07 or downgrading to the 9.3.2.6 firmware. https://forum.openwrt.org/t/pre-compiled-updated-mwlwifi-drivers-for-stable-releases/3262/682 https://forum.openwrt.org/t/pre-compiled-updated-mwlwifi-drivers-for-stable-releases/3262/688 https://forum.openwrt.org/t/connectivity-issues-with-wifi/79003 https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700/2 https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700/14 https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700/16 I can confirm downgrading to 9.3.2.6 fixed the Wi-Fi cut-outs on my WRT32X. https://forum.openwrt.org/t/users-needed-to-test-wi-fi-stability-on-linksys-wrt3200acm-wrt32x-on-openwrt-21-02-0-rc3/101700 Signed-off-by: Arınç ÜNAL --- package/kernel/mwlwifi/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile index eb986dca03..0d0ac701d9 100644 --- a/package/kernel/mwlwifi/Makefile +++ b/package/kernel/mwlwifi/Makefile @@ -15,9 +15,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-02-06 -PKG_SOURCE_VERSION:=a2fd00bb74c35820dfe233d762690c0433a87ef5 -PKG_MIRROR_HASH:=0eda0e774a87e58e611d6436350e1cf2be3de50fddde334909a07a15b0c9862b +PKG_SOURCE_DATE:=2019-08-18 +PKG_SOURCE_VERSION:=747796b2f126df01c3c5442c607b4ea0497b1c6c +PKG_MIRROR_HASH:=11985b8132edd1db1001748b0fc6d915205b7bcaf2a7512a4befb5ef3cc83bb9 PKG_MAINTAINER:=Imre Kaloz PKG_BUILD_PARALLEL:=1 -- 2.25.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v8 1/2] dnsmasq: Update to version 2.86test6
Need this version to add config option for connmark DNS filtering.
Summary of upstream CHANGELOG:
* Handle DHCPREBIND requests in the DHCPv6 server code.
* Fix bug which caused dnsmasq to lose track of processes forked.
* Major rewrite of the DNS server and domain handling code.
* Revise resource handling for number of concurrent DNS queries.
* Improve efficiency of DNSSEC.
* Connection track mark based DNS query filtering.
* Allow smaller then 64 prefix lengths in synth-domain.
* Make domains generated by --synth-domain appear in replies
when in authoritative mode.
Signed-off-by: Etan Kissling
---
v3: Refreshed patches.
v4: Fix crash when running multiple dnsmasq instances.
v5: Workaround from v4 is no longer required.
Update to version 2.86test4.
v7: Additional patch no longer needed for update (fix already applied).
Update to version 2.86test5.
v8: Update to version 2.86test6 (contains security patches).
package/network/services/dnsmasq/Makefile | 6 +++---
.../patches/100-remove-old-runtime-kernel-support.patch | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package/network/services/dnsmasq/Makefile
b/package/network/services/dnsmasq/Makefile
index 90a81b5f65..e41a1b0eaf 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
-PKG_UPSTREAM_VERSION:=2.85
+PKG_UPSTREAM_VERSION:=2.86test6
PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
-PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_HASH:=ad98d3803df687e5b938080f3d25c628fe41c878752d03fbc6199787fee312fa
+PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases
+PKG_HASH:=df5f70be63f8bc6ee9222a185d2651b34901b0704a089b7a055463963fb0533f
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
diff --git
a/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch
b/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch
index b601bce1a9..4f8fe4ecbe 100644
---
a/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch
+++
b/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch
@@ -26,7 +26,7 @@ Signed-off-by: Kevin Darbyshire-Bryant
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
-@@ -1144,7 +1144,7 @@ extern struct daemon {
+@@ -1201,7 +1201,7 @@ extern struct daemon {
int inotifyfd;
#endif
#if defined(HAVE_LINUX_NETWORK)
@@ -35,7 +35,7 @@ Signed-off-by: Kevin Darbyshire-Bryant
#elif defined(HAVE_BSD_NETWORK)
int dhcp_raw_fd, dhcp_icmp_fd, routefd;
#endif
-@@ -1326,9 +1326,6 @@ int read_write(int fd, unsigned char *pa
+@@ -1388,9 +1388,6 @@ int read_write(int fd, unsigned char *pa
void close_fds(long max_fd, int spare1, int spare2, int spare3);
int wildcard_match(const char* wildcard, const char* match);
int wildcard_matchn(const char* wildcard, const char* match, int num);
@@ -140,7 +140,7 @@ Signed-off-by: Kevin Darbyshire-Bryant
my_syslog(LOG_ERR, _("failed to update ipset %s: %s"), setname,
strerror(errno));
--- a/src/util.c
+++ b/src/util.c
-@@ -786,22 +786,3 @@ int wildcard_matchn(const char* wildcard
+@@ -796,22 +796,3 @@ int wildcard_matchn(const char* wildcard
return (!num) || (*wildcard == *match);
}
--
2.30.1 (Apple Git-130)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v8 2/2] dnsmasq: add config option for connmark DNS filtering
This adds uci support to configure connmark based DNS filtering.
Signed-off-by: Etan Kissling
(imported from upstream mailing list
https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2021q2/015151.html)
Signed-off-by: Etan Kissling
---
v2: Bundle with patch to update dnsmasq.
v8: Update commit message to clarify multiple signed-off-by lines.
package/network/services/dnsmasq/files/dnsmasq.init | 12
1 file changed, 12 insertions(+)
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init
b/package/network/services/dnsmasq/files/dnsmasq.init
index d5f70a0ee5..ef438a9e52 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -172,6 +172,10 @@ append_ipset() {
xappend "--ipset=$1"
}
+append_connmark_allowlist() {
+ xappend "--connmark-allowlist=$1"
+}
+
append_interface() {
network_get_device ifname "$1" || ifname="$1"
xappend "--interface=$ifname"
@@ -921,6 +925,14 @@ dnsmasq_start()
config_list_foreach "$cfg" "rev_server" append_rev_server
config_list_foreach "$cfg" "address" append_address
config_list_foreach "$cfg" "ipset" append_ipset
+
+ local connmark_allowlist_enable
+ config_get connmark_allowlist_enable "$cfg" connmark_allowlist_enable 0
+ [ "$connmark_allowlist_enable" -gt 0 ] && {
+ append_parm "$cfg" "connmark_allowlist_enable"
"--connmark-allowlist-enable"
+ config_list_foreach "$cfg" "connmark_allowlist"
append_connmark_allowlist
+ }
+
[ -n "$BOOT" ] || {
config_list_foreach "$cfg" "interface" append_interface
config_list_foreach "$cfg" "notinterface" append_notinterface
--
2.30.1 (Apple Git-130)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
