Re: [PATCH] kernel: DSA roaming fix for Marvell Link Street switch series
On Tue Feb 2, 2021 at 11:03 PM CET, DENG Qingfang wrote: > On Tue, Feb 2, 2021 at 9:22 PM Tobias Waldekranz > wrote: > > > > > > > > Tobias, what happens if the switch receives a frame that violates ATU > > > portvec member? Is the frame trapped to the CPU or dropped? > > > > The frame will be dropped. So the flow will be blocked until the DSA > > driver removes the static entry. Once the it has been removed, the > > switch is free to learn it in the normal way again. > > Can the switch be configured to trap those frames to the CPU? So the > bridge subsystem can handle them. AFAIK, no. There is a per-port bit that you can set to ignore the errors, i.e. no violation is generated, but I am pretty sure that the frame is still dropped. This is why you really want the CPU to send FORWARDs. That way, the switch can handle all aging entries. It is on my TODO, but it is not obvious how to get the bridge to cooperate. > > > > But I would strongly advise against removing the message as it often > > provides important clues when debugging connectivity issues. > > Use dev_dbg_ratelimited instead? Today it uses dev_err_ratelimited, which seems sensible to me. My guess is 99% of users won't have debug messages compiled in, so that is essentially the same as removing it. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Security Advisory 2021-02-02-2 - wolfSSL heap buffer overflow in RsaPad_PSS (CVE-2020-36177)
DESCRIPTION RsaPad_PSS in wolfcrypt/src/rsa.c in wolfSSL before 4.6.0 has an out-of-bounds write for certain relationships between key size and digest size. The issue is marked as critical with CVSS score of 9.8 (10 is most severe)[0]. wolfSSL library is provided as `libwolfssl24` package in OpenWrt and shipped by default in snapshots since August 27th 2020[1]. It's NOT shipped by default in latest stable OpenWrt release 19.07. REQUIREMENTS It's still work in progress, there is not that much information about it available yet, but according to the very high CVSS score of 9.8 (10 is most severe) it's likely, that this issue has RCE potential. You can check for updates on dedicated wiki page[2] and forum topic[3] if interested. MITIGATIONS You need to update the affected `libwolfssl24` package you're using with the command below. opkg update; opkg upgrade libwolfssl24 Then verify, that you're running fixed version. opkg list-installed libwolfssl24 The above command should output following: libwolfssl24 - 4.6.0-stable-1 - for stable OpenWrt 19.07 release libwolfssl24 - 4.6.0-stable-1 - for master/snapshot The fix is contained in the following and later versions: * OpenWrt master: 2021-01-01 reboot-15389-gba40da9045f7 * OpenWrt 19.07: 2021-02-02 v19.07.6-11-g2044c01de8f2 AFFECTED VERSIONS To our knowledge, OpenWrt snapshot images are affected. OpenWrt stable release versions 19.07.0 to 19.07.6 are not affected, because vulnerable `libwolfssl24` package is not shipped by default in the official firmware images. Older versions of OpenWrt (e.g. OpenWrt 18.06, OpenWrt 15.05 and LEDE 17.01) are end of life and not supported any more. CREDITS This issue seems to be found by libFuzzer's address sanitizer in OSS-Fuzz[4] project and fixed by Sean Parkinson[5] from wolfSSL team. REFERENCES 0. https://nvd.nist.gov/vuln/detail/CVE-2020-36177 1. https://git.openwrt.org/e79df3516d3e2931a2a2964cadfed0af99acef49 2. https://openwrt.org/advisory/2021-02-02-2 3. https://forum.openwrt.org/t/security-advisory-2021-02-02-2-wolfssl-heap-buffer-overflow-in-rsapad-pss-cve-2020-36177 4. https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=26567 5. https://github.com/wolfSSL/wolfssl/commit/fb2288c46dd4c864b78f00a47a364b96a09a5c0f signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
C++ libubus wrapper
Hi, I would like to write a libubus wrapper in C++. When looking into ubus_method and ubus_handler_t structures I don't see a place where I could pass a this pointer. It makes the handling of ubus calls in C++ a bit complicated. The solution to that case would be adding a void pointer to the ubus_method structure (like in the ubus_request struct). This way it would be possible to pass e.g function pointer. Would it be possible to add a void pointer to ubus_method structure? If yes then I will provide the patch asap. BR, Wojtek ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH iwinfo] iwinfo: add basic IEEE 802.11ax support
This adds basic support for IEEE 802.11ax when requesting HW or HT
Modelist for a PHY from iwinfo. This way, applications using iwinfo can
detect HE phys.
Signed-off-by: David Bauer
---
api/nl80211.h| 38 ++
include/iwinfo.h | 8 +++-
iwinfo_cli.c | 3 ++-
iwinfo_lib.c | 7 ++-
iwinfo_lua.c | 3 +++
iwinfo_nl80211.c | 34 ++
6 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/api/nl80211.h b/api/nl80211.h
index 5b7b5eb..3d252e4 100644
--- a/api/nl80211.h
+++ b/api/nl80211.h
@@ -2582,6 +2582,41 @@ enum nl80211_mpath_info {
NL80211_MPATH_INFO_MAX = __NL80211_MPATH_INFO_AFTER_LAST - 1
};
+/**
+ * enum nl80211_band_iftype_attr - Interface type data attributes
+ *
+ * @__NL80211_BAND_IFTYPE_ATTR_INVALID: attribute number 0 is reserved
+ * @NL80211_BAND_IFTYPE_ATTR_IFTYPES: nested attribute containing a flag
attribute
+ * for each interface type that supports the band data
+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC: HE MAC capabilities as in HE
+ * capabilities IE
+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY: HE PHY capabilities as in HE
+ * capabilities IE
+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET: HE supported NSS/MCS as in HE
+ * capabilities IE
+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE: HE PPE thresholds information as
+ * defined in HE capabilities IE
+ * @NL80211_BAND_IFTYPE_ATTR_MAX: highest band HE capability attribute
currently
+ * defined
+ * @NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA: HE 6GHz band capabilities (__le16),
+ * given for all 6 GHz band channels
+ * @__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST: internal use
+ */
+enum nl80211_band_iftype_attr {
+ __NL80211_BAND_IFTYPE_ATTR_INVALID,
+
+ NL80211_BAND_IFTYPE_ATTR_IFTYPES,
+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC,
+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY,
+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET,
+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE,
+ NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA,
+
+ /* keep last */
+ __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST,
+ NL80211_BAND_IFTYPE_ATTR_MAX = __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST - 1
+};
+
/**
* enum nl80211_band_attr - band attributes
* @__NL80211_BAND_ATTR_INVALID: attribute number 0 is reserved
@@ -2597,6 +2632,8 @@ enum nl80211_mpath_info {
* @NL80211_BAND_ATTR_VHT_MCS_SET: 32-byte attribute containing the MCS set as
* defined in 802.11ac
* @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE
+ * @NL80211_BAND_ATTR_IFTYPE_DATA: nested array attribute, with each entry
using
+ * attributes from &enum nl80211_band_iftype_attr
* @NL80211_BAND_ATTR_MAX: highest band attribute currently defined
* @__NL80211_BAND_ATTR_AFTER_LAST: internal use
*/
@@ -2612,6 +2649,7 @@ enum nl80211_band_attr {
NL80211_BAND_ATTR_VHT_MCS_SET,
NL80211_BAND_ATTR_VHT_CAPA,
+ NL80211_BAND_ATTR_IFTYPE_DATA,
/* keep last */
__NL80211_BAND_ATTR_AFTER_LAST,
diff --git a/include/iwinfo.h b/include/iwinfo.h
index 5e64294..d1753ef 100644
--- a/include/iwinfo.h
+++ b/include/iwinfo.h
@@ -29,6 +29,7 @@
#define IWINFO_80211_N (1 << 3)
#define IWINFO_80211_AC (1 << 4)
#define IWINFO_80211_AD (1 << 5)
+#define IWINFO_80211_AX (1 << 6)
#define IWINFO_CIPHER_NONE (1 << 0)
#define IWINFO_CIPHER_WEP40 (1 << 1)
@@ -89,8 +90,13 @@ enum iwinfo_htmode {
IWINFO_HTMODE_VHT80_80 = (1 << 5),
IWINFO_HTMODE_VHT160 = (1 << 6),
IWINFO_HTMODE_NOHT = (1 << 7),
+ IWINFO_HTMODE_HE20 = (1 << 8),
+ IWINFO_HTMODE_HE40 = (1 << 9),
+ IWINFO_HTMODE_HE80 = (1 << 10),
+ IWINFO_HTMODE_HE80_80= (1 << 11),
+ IWINFO_HTMODE_HE160 = (1 << 12),
- IWINFO_HTMODE_COUNT = 8
+ IWINFO_HTMODE_COUNT = 13
};
extern const char *IWINFO_HTMODE_NAMES[IWINFO_HTMODE_COUNT];
diff --git a/iwinfo_cli.c b/iwinfo_cli.c
index 0332bc2..c18ea49 100644
--- a/iwinfo_cli.c
+++ b/iwinfo_cli.c
@@ -282,7 +282,8 @@ static char * format_hwmodes(int modes)
(modes & IWINFO_80211_G) ? "g" : "",
(modes & IWINFO_80211_N) ? "n" : "",
(modes & IWINFO_80211_AC) ? "ac" : "",
- (modes & IWINFO_80211_AD) ? "ad" : "");
+ (modes & IWINFO_80211_AD) ? "ad" : "",
+ (modes & IWINFO_80211_AX) ? "ax" : "");
return buf;
}
diff --git a/iwinfo_lib.c b/iwinfo_lib.c
index 7a33a35..70b080c 100644
--- a/iwinfo_lib.c
+++ b/iwinfo_lib.c
@@ -65,7 +65,12 @@ const char *IWINFO_HTMODE_NAMES[] = {
"VHT80",
"VHT80+80",
"VHT160",
- "NOHT"
+ "NOHT",
+ "HE20",
+ "HE40",
+ "HE80",
+ "HE80+80",
+ "HE160"
};
diff --git a/iwinfo_lua.c b/iwinfo_lua.c
index 58a5537..652633b 100644
--- a/iwinfo_lua.c
+++ b/iwinfo_lua.c
@@ -
[PATCH] dnsmasq: Update to final version 2.84
Only small changes compared to the 2.84test3 version.
Signed-off-by: Hauke Mehrtens
---
package/network/services/dnsmasq/Makefile | 6 +++---
.../patches/100-remove-old-runtime-kernel-support.patch | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/network/services/dnsmasq/Makefile
b/package/network/services/dnsmasq/Makefile
index 2e404dfef337..fc733a4eaf09 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.84test3
+PKG_UPSTREAM_VERSION:=2.84
PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
-PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases
-PKG_HASH:=20d1109c991ca08778ea20322b8f3245f2e974688d494b59b2e6ae096ec592b1
+PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
+PKG_HASH:=603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c
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 bd11806ae0a3..12436ef01b11 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
@@ -27,7 +27,7 @@ Signed-off-by: Kevin Darbyshire-Bryant
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
-@@ -1125,7 +1125,7 @@ extern struct daemon {
+@@ -1130,7 +1130,7 @@ extern struct daemon {
int inotifyfd;
#endif
#if defined(HAVE_LINUX_NETWORK)
@@ -36,7 +36,7 @@ Signed-off-by: Kevin Darbyshire-Bryant
#elif defined(HAVE_BSD_NETWORK)
int dhcp_raw_fd, dhcp_icmp_fd, routefd;
#endif
-@@ -1306,9 +1306,6 @@ int read_write(int fd, unsigned char *pa
+@@ -1312,9 +1312,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);
--
2.20.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH] ppp: Update to version 2.4.9
Upstream integrated multiple patches from Distributions and did other
changes:
* rp-pppoe.so was renamed to pppoe.so
* Converted to ANSI C
The following patches were applied upstream:
* 100-debian_ip-ip_option.patch
* 101-debian_close_dev_ppp.patch
* 103-debian_fix_link_pidfile.patch
* 106-debian_stripMSdomain.patch
* 107-debian_pppoatm_wildcard.patch
* 110-debian_defaultroute.patch
* 202-no_strip.patch
Compilation with musl libx was fixed upstream so
140-pppoe_compile_fix.patch is not needed any more
Parts of the 203-opt_flags.patch patch were applied in a different way
upstream.
Signed-off-by: Hauke Mehrtens
---
package/network/services/ppp/Makefile | 10 +-
package/network/services/ppp/files/ppp.sh | 4 +-
.../010-use_target_for_configure.patch| 22 +-
.../ppp/patches/100-debian_ip-ip_option.patch | 96 --
.../patches/101-debian_close_dev_ppp.patch| 28 --
.../patches/103-debian_fix_link_pidfile.patch | 23 --
.../ppp/patches/105-debian_demand.patch | 30 +-
.../patches/106-debian_stripMSdomain.patch| 47 ---
.../patches/107-debian_pppoatm_wildcard.patch | 25 --
.../ppp/patches/110-debian_defaultroute.patch | 314 --
.../120-debian_ipv6_updown_option.patch | 18 +-
.../ppp/patches/140-pppoe_compile_fix.patch | 36 --
.../services/ppp/patches/200-makefile.patch | 23 +-
.../ppp/patches/201-mppe_mppc_1.1.patch | 133 +---
.../services/ppp/patches/202-no_strip.patch | 88 -
.../services/ppp/patches/203-opt_flags.patch | 36 +-
.../patches/205-no_exponential_timeout.patch | 4 +-
.../ppp/patches/207-lcp_mtu_max.patch | 2 +-
.../ppp/patches/208-fix_status_code.patch | 2 +-
.../300-filter-pcap-includes-lib.patch| 6 +-
.../ppp/patches/310-precompile_filter.patch | 20 +-
...multilink_support_custom_iface_names.patch | 33 +-
.../330-retain_foreign_default_routes.patch | 2 +-
.../340-populate_default_gateway.patch| 6 +-
.../patches/400-simplify_kernel_checks.patch | 32 +-
.../ppp/patches/401-no_record_file.patch | 6 +-
.../services/ppp/patches/403-no_wtmp.patch| 4 +-
.../404-remove_obsolete_protocol_names.patch | 16 +-
.../ppp/patches/405-no_multilink_option.patch | 2 +-
.../ppp/patches/500-add-pptp-plugin.patch | 14 +-
...openssl-for-the-DES-instead-of-the-l.patch | 25 +-
31 files changed, 222 insertions(+), 885 deletions(-)
delete mode 100644
package/network/services/ppp/patches/100-debian_ip-ip_option.patch
delete mode 100644
package/network/services/ppp/patches/101-debian_close_dev_ppp.patch
delete mode 100644
package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch
delete mode 100644
package/network/services/ppp/patches/106-debian_stripMSdomain.patch
delete mode 100644
package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch
delete mode 100644
package/network/services/ppp/patches/110-debian_defaultroute.patch
delete mode 100644
package/network/services/ppp/patches/140-pppoe_compile_fix.patch
delete mode 100644 package/network/services/ppp/patches/202-no_strip.patch
diff --git a/package/network/services/ppp/Makefile
b/package/network/services/ppp/Makefile
index 48d7120a7296..8f4fed169bcf 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -13,14 +13,14 @@ PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/paulusmack/ppp
-PKG_SOURCE_DATE:=2020-10-03
-PKG_SOURCE_VERSION:=ad3937a0a38a696eb1a37dbf8f92e8e6072cdccb
-PKG_MIRROR_HASH:=c5b39615eb62728431b19f3ae5428eb1e2fc705b4b7b960228fe5b5d7b5a4bca
+PKG_SOURCE_DATE:=2021-01-04
+PKG_SOURCE_VERSION:=4fb319056f168bb8379865b91b4fd3e1ada73f1e
+PKG_MIRROR_HASH:=889041bbf917d1f040bb316ea863a991755aa8c2c7f38717806a05b919036c65
PKG_MAINTAINER:=Felix Fietkau
PKG_LICENSE:=BSD-4-Clause
PKG_CPE_ID:=cpe:/a:samba:ppp
-PKG_RELEASE_VERSION:=2.4.8
+PKG_RELEASE_VERSION:=2.4.9
PKG_VERSION:=$(PKG_RELEASE_VERSION).git-$(PKG_SOURCE_DATE)
PKG_BUILD_DEPENDS:=libpcap
@@ -242,7 +242,7 @@ endef
define Package/ppp-mod-pppoe/install
$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)
- $(INSTALL_BIN)
$(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/rp-pppoe.so \
+ $(INSTALL_BIN)
$(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/pppoe.so \
$(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/
endef
diff --git a/package/network/services/ppp/files/ppp.sh
b/package/network/services/ppp/files/ppp.sh
index b553effd889e..7bbc497c43bd 100755
--- a/package/network/services/ppp/files/ppp.sh
+++ b/package/network/services/ppp/files/ppp.sh
@@ -234,7 +234,7 @@ proto_pppoe_setup() {
json_get_var padi_timeout padi_timeout
ppp_generic_setup "$config" \
- plugin rp-pppoe.so \
+ plugin pppoe.so \
${ac:+rp_pppoe_ac "$ac"} \
${service:+rp_pppoe_service "$service"} \
${host_
Re: [PATCHv3 2/3] busybox: update to 1.33
On 2/1/21 1:15 AM, Rosen Penev wrote: Remove stime backport. Remove static libgcc patch as upstream fixed it with BUSYBOX_DEFAULT_STATIC_LIBGCC which defauls to off. Remove date -k patch as it no longer applies. It's also pointless as busybox' hwclock utility can do the same thing. Remove ntpd patch as that seems to have been applied upstream. Add smalll patch fixing compilation with SELinux. Upstream commit 2496616b0a8d1c80cd1416b73a4847b59b9f969a renamed the variable without renaming it in the SELinux path. Refresh config and patches. Signed-off-by: Rosen Penev --- v2: refreshed config and slight rewording. package/utils/busybox/Config-defaults.in | 48 ++- package/utils/busybox/Makefile| 6 +- package/utils/busybox/config/Config.in| 38 -- .../utils/busybox/config/archival/Config.in | 2 +- .../busybox/config/console-tools/Config.in| 13 -- .../utils/busybox/config/coreutils/Config.in | 10 +- .../utils/busybox/config/e2fsprogs/Config.in | 1 - .../utils/busybox/config/findutils/Config.in | 8 ++ .../busybox/config/klibc-utils/Config.in | 1 - package/utils/busybox/config/libbb/Config.in | 2 - .../utils/busybox/config/miscutils/Config.in | 36 + .../utils/busybox/config/modutils/Config.in | 6 - .../utils/busybox/config/networking/Config.in | 68 ++ .../busybox/config/networking/udhcp/Config.in | 2 - package/utils/busybox/config/procps/Config.in | 3 - package/utils/busybox/config/shell/Config.in | 124 ++ .../utils/busybox/config/sysklogd/Config.in | 10 +- .../utils/busybox/config/util-linux/Config.in | 62 ++--- .../config/util-linux/volume_id/Config.in | 6 + .../001-remove-stime-function-calls.patch | 84 .../patches/010-fix-wrong-variable.patch | 11 ++ .../patches/110-no_static_libgcc.patch| 11 -- .../busybox/patches/120-lto-jobserver.patch | 6 +- .../patches/200-udhcpc_reduce_msgs.patch | 4 +- .../patches/201-udhcpc_changed_ifindex.patch | 2 +- .../203-udhcpc_renew_no_deconfig.patch| 2 +- .../patches/230-add_nslookup_lede.patch | 6 +- .../busybox/patches/250-date-k-flag.patch | 92 - .../500-move-traceroute-applets-to-bin.patch | 2 +- ...520-loginutils-handle-crypt-failures.patch | 6 +- .../patches/600-allow-ntpd-non-root.patch | 12 -- 31 files changed, 255 insertions(+), 429 deletions(-) delete mode 100644 package/utils/busybox/patches/001-remove-stime-function-calls.patch create mode 100644 package/utils/busybox/patches/010-fix-wrong-variable.patch delete mode 100644 package/utils/busybox/patches/110-no_static_libgcc.patch delete mode 100644 package/utils/busybox/patches/250-date-k-flag.patch delete mode 100644 package/utils/busybox/patches/600-allow-ntpd-non-root.patch Do we want to merge this into OpenWrt master before the 21.X branch is created? As 21.X is delayed again I would prefer to merge this now, then we have a more recent base for potential security updates later. The commit message should probably extended with some content Hannu suggested. Hauke ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH] ppp: Update to version 2.4.9
On Wed, Feb 3, 2021 at 3:28 PM Hauke Mehrtens wrote:
>
> Upstream integrated multiple patches from Distributions and did other
> changes:
> * rp-pppoe.so was renamed to pppoe.so
> * Converted to ANSI C
>
> The following patches were applied upstream:
> * 100-debian_ip-ip_option.patch
> * 101-debian_close_dev_ppp.patch
> * 103-debian_fix_link_pidfile.patch
> * 106-debian_stripMSdomain.patch
> * 107-debian_pppoatm_wildcard.patch
> * 110-debian_defaultroute.patch
> * 202-no_strip.patch
>
> Compilation with musl libx was fixed upstream so
> 140-pppoe_compile_fix.patch is not needed any more
>
> Parts of the 203-opt_flags.patch patch were applied in a different way
> upstream.
>
> Signed-off-by: Hauke Mehrtens
> ---
> package/network/services/ppp/Makefile | 10 +-
> package/network/services/ppp/files/ppp.sh | 4 +-
> .../010-use_target_for_configure.patch| 22 +-
> .../ppp/patches/100-debian_ip-ip_option.patch | 96 --
> .../patches/101-debian_close_dev_ppp.patch| 28 --
> .../patches/103-debian_fix_link_pidfile.patch | 23 --
> .../ppp/patches/105-debian_demand.patch | 30 +-
> .../patches/106-debian_stripMSdomain.patch| 47 ---
> .../patches/107-debian_pppoatm_wildcard.patch | 25 --
> .../ppp/patches/110-debian_defaultroute.patch | 314 --
> .../120-debian_ipv6_updown_option.patch | 18 +-
> .../ppp/patches/140-pppoe_compile_fix.patch | 36 --
> .../services/ppp/patches/200-makefile.patch | 23 +-
> .../ppp/patches/201-mppe_mppc_1.1.patch | 133 +---
> .../services/ppp/patches/202-no_strip.patch | 88 -
> .../services/ppp/patches/203-opt_flags.patch | 36 +-
> .../patches/205-no_exponential_timeout.patch | 4 +-
> .../ppp/patches/207-lcp_mtu_max.patch | 2 +-
> .../ppp/patches/208-fix_status_code.patch | 2 +-
> .../300-filter-pcap-includes-lib.patch| 6 +-
> .../ppp/patches/310-precompile_filter.patch | 20 +-
> ...multilink_support_custom_iface_names.patch | 33 +-
> .../330-retain_foreign_default_routes.patch | 2 +-
> .../340-populate_default_gateway.patch| 6 +-
> .../patches/400-simplify_kernel_checks.patch | 32 +-
> .../ppp/patches/401-no_record_file.patch | 6 +-
> .../services/ppp/patches/403-no_wtmp.patch| 4 +-
> .../404-remove_obsolete_protocol_names.patch | 16 +-
> .../ppp/patches/405-no_multilink_option.patch | 2 +-
> .../ppp/patches/500-add-pptp-plugin.patch | 14 +-
> ...openssl-for-the-DES-instead-of-the-l.patch | 25 +-
> 31 files changed, 222 insertions(+), 885 deletions(-)
> delete mode 100644
> package/network/services/ppp/patches/100-debian_ip-ip_option.patch
> delete mode 100644
> package/network/services/ppp/patches/101-debian_close_dev_ppp.patch
> delete mode 100644
> package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch
> delete mode 100644
> package/network/services/ppp/patches/106-debian_stripMSdomain.patch
> delete mode 100644
> package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch
> delete mode 100644
> package/network/services/ppp/patches/110-debian_defaultroute.patch
> delete mode 100644
> package/network/services/ppp/patches/140-pppoe_compile_fix.patch
> delete mode 100644 package/network/services/ppp/patches/202-no_strip.patch
>
> diff --git a/package/network/services/ppp/Makefile
> b/package/network/services/ppp/Makefile
> index 48d7120a7296..8f4fed169bcf 100644
> --- a/package/network/services/ppp/Makefile
> +++ b/package/network/services/ppp/Makefile
> @@ -13,14 +13,14 @@ PKG_RELEASE:=3
>
> PKG_SOURCE_PROTO:=git
> PKG_SOURCE_URL:=https://github.com/paulusmack/ppp
> -PKG_SOURCE_DATE:=2020-10-03
> -PKG_SOURCE_VERSION:=ad3937a0a38a696eb1a37dbf8f92e8e6072cdccb
> -PKG_MIRROR_HASH:=c5b39615eb62728431b19f3ae5428eb1e2fc705b4b7b960228fe5b5d7b5a4bca
> +PKG_SOURCE_DATE:=2021-01-04
> +PKG_SOURCE_VERSION:=4fb319056f168bb8379865b91b4fd3e1ada73f1e
> +PKG_MIRROR_HASH:=889041bbf917d1f040bb316ea863a991755aa8c2c7f38717806a05b919036c65
> PKG_MAINTAINER:=Felix Fietkau
> PKG_LICENSE:=BSD-4-Clause
> PKG_CPE_ID:=cpe:/a:samba:ppp
>
> -PKG_RELEASE_VERSION:=2.4.8
> +PKG_RELEASE_VERSION:=2.4.9
> PKG_VERSION:=$(PKG_RELEASE_VERSION).git-$(PKG_SOURCE_DATE)
>
> PKG_BUILD_DEPENDS:=libpcap
> @@ -242,7 +242,7 @@ endef
>
> define Package/ppp-mod-pppoe/install
> $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)
> - $(INSTALL_BIN)
> $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/rp-pppoe.so \
> + $(INSTALL_BIN)
> $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/pppoe.so \
> $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/
> endef
>
> diff --git a/package/network/services/ppp/files/ppp.sh
> b/package/network/services/ppp/files/ppp.sh
> index b553effd889e..7bbc497c43bd 100755
> --- a/package/network/services/ppp/files/ppp.sh
> +++ b/package/network/services/ppp/files/ppp.sh
> @@ -234,7 +234,7 @@ proto_pppoe_setup() {
> json_get_
Re: [PATCH] kernel: DSA roaming fix for Marvell Link Street switch series
On Wed, Feb 3, 2021 at 4:20 PM Tobias Waldekranz wrote: > > AFAIK, no. There is a per-port bit that you can set to ignore the > errors, i.e. no violation is generated, but I am pretty sure that the > frame is still dropped. I just tested on my WRT1900AC v2. It seems that the CPU can receive those frames just fine. So it is safe to disable the ATU warnings, at least for OpenWrt. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
