[PATCHv2 libubox] sh/jshn.sh: Add JSHN_DEBUG flag

2020-12-29 Thread Leonardo Mörlein 
This flag can be set to JSHN_DEBUG=1 to print all calls to json_*
to stderr. The variable JSHN_DEBUG_PREFIX can be used optionally
to add a string in front of every debug print.

The json_* commands internally use other json_* commands. As it is
not desired that this inner commands are also printed, a variable
JSHN_DEBUG_DEPTH is used. It is initialized to JSHN_DEBUG_DEPTH=0,
increased on any json_* call and decreased when leaving the json_*
call. Debug prints are only fired if JSHN_DEBUG_DEPTH=0.

Other scripts may abuse this variable to their own needs, if they
do it carefully.

---snip---
JSHN_DEBUG=1
JSHN_DEBUG_PREFIX="json_debug: "
json_init
json_add_string "foo" "bar"
json_add_string "val" "12"
json_dump
---stderr---
json_debug: json_init
json_debug: json_add_string foo bar
json_debug: json_add_string val 12
json_debug: json_dump
---stdout---
{ "foo": "bar", "val": "12" }
---snap---

This is a preparatory commit to eventually allow debugging netifd
protos in a better way.

Signed-off-by: Leonardo Mörlein 
---
 sh/jshn.sh | 69 --
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/sh/jshn.sh b/sh/jshn.sh
index 7b0155d..3cc07fb 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -1,5 +1,18 @@
 # functions for parsing and generating json
 
+JSHN_DEBUG_DEPTH=0
+
+_json_debug() {
+   JSHN_DEBUG_DEPTH="$((JSHN_DEBUG_DEPTH+1))"
+   if [ -n "$JSHN_DEBUG" ] && [ "$JSHN_DEBUG" -eq 1 ] && [ 
"$JSHN_DEBUG_DEPTH" -eq 1 ]; then
+   echo "${JSHN_DEBUG_PREFIX}$*" 1>&2
+   fi
+}
+
+_json_debug_end() {
+   JSHN_DEBUG_DEPTH="$((JSHN_DEBUG_DEPTH-1))"
+}
+
 _json_get_var() {
# dest=$1
# var=$2
@@ -93,14 +106,17 @@ _json_close_table() {
 }
 
 json_set_namespace() {
+   _json_debug json_set_namespace "$@"
local _new="$1"
local _old="$2"
 
[ -n "$_old" ] && _set_var "$_old" "$JSON_PREFIX"
JSON_PREFIX="$_new"
+   _json_debug_end
 }
 
 json_cleanup() {
+   _json_debug json_cleanup "$@"
local unset tmp
 
_json_get_var unset JSON_UNSET
@@ -118,86 +134,116 @@ json_cleanup() {
${JSON_PREFIX}JSON_SEQ \
${JSON_PREFIX}JSON_CUR \
${JSON_PREFIX}JSON_UNSET
+   _json_debug_end
 }
 
 json_init() {
+   _json_debug json_init "$@"
json_cleanup
export -n ${JSON_PREFIX}JSON_SEQ=0
export -- \
${JSON_PREFIX}JSON_CUR="J_V" \
${JSON_PREFIX}K_J_V=
+   _json_debug_end
 }
 
 json_add_object() {
+   _json_debug json_add_object "$@"
_json_add_table "$1" object T
+   _json_debug_end
 }
 
 json_close_object() {
+   _json_debug json_close_object "$@"
_json_close_table
+   _json_debug_end
 }
 
 json_add_array() {
+   _json_debug json_add_array "$@"
_json_add_table "$1" array A
+   _json_debug_end
 }
 
 json_close_array() {
+   _json_debug json_close_array "$@"
_json_close_table
+   _json_debug_end
 }
 
 json_add_string() {
+   _json_debug json_add_string "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic string "$1" "$2" "$cur"
+   _json_debug_end
 }
 
 json_add_int() {
+   _json_debug json_add_int "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic int "$1" "$2" "$cur"
+   _json_debug_end
 }
 
 json_add_boolean() {
+   _json_debug json_add_boolean "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic boolean "$1" "$2" "$cur"
+   _json_debug_end
 }
 
 json_add_double() {
+   _json_debug json_add_double "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic double "$1" "$2" "$cur"
+   _json_debug_end
 }
 
 json_add_null() {
+   _json_debug json_add_null "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic null "$1" "" "$cur"
+   _json_debug_end
 }
 
 # functions read access to json variables
 
 json_load() {
+   _json_debug json_load "$@"
eval "`jshn -r "$1"`"
+   _json_debug_end
 }
 
 json_load_file() {
+   _json_debug json_load_file "$@"
eval "`jshn -R "$1"`"
+   _json_debug_end
 }
 
 json_dump() {
-   jshn "$@" ${JSON_PREFIX:+-p "$JSON_PREFIX"} -w 
+   _json_debug json_dump "$@"
+   jshn "$@" ${JSON_PREFIX:+-p "$JSON_PREFIX"} -w
+   _json_debug_end
 }
 
 json_get_type() {
+   _json_debug json_get_type "$@"
local __dest="$1"
local __cur
 
_json_get_var __cur JSON_CUR
+   _json_debug_end
local __var="${JSON_PREFIX}T_${__cur}_${2//[^a-zA-Z0-9_]/_}"
eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
 }
 
 json_get_keys() {
+   _json_debug json_get_keys "$@"
local __dest="$1"
local _tbl_cur
 
@@ -206,11 +252,13 @@ json_get_keys() {
else
_json_get_var _tbl_cur JSON_CUR
fi
+

Re: [PATCH] usbutils: remove

2020-12-29 Thread Rosen Penev 
On Tue, Dec 29, 2020 at 8:12 PM Paul Spooren  wrote:
>
>
>
> On Di, Dez 29, 2020 at 19:35, Rosen Penev  wrote:
> > This package is not needed in base. It will be imported in the
> > packages
> > feed.
> >
> > Signed-off-by: Rosen Penev 
> > ---
>
> I'm in favor of this patch but please include the current maintainer
> (Felix) in CC.
I have git send-email preset to send stuff to this email address. I
usually don't CC anyone.
>
> Additional information provided by Rosen via IRC:
>
>  > I have a version bump to 013, but it requires libudev-zero from the
> packages feed
Alternative is to move that package here. Although the trend is to
move everything to packages feed.
>
> Acked-by: Paul Spooren 
>
> >  package/utils/usbutils/Makefile | 60
> > -
> >  1 file changed, 60 deletions(-)
> >  delete mode 100644 package/utils/usbutils/Makefile
> >
> > diff --git a/package/utils/usbutils/Makefile
> > b/package/utils/usbutils/Makefile
> > deleted file mode 100644
> > index 4e32e27a06..00
> > --- a/package/utils/usbutils/Makefile
> > +++ /dev/null
> > @@ -1,60 +0,0 @@
> > -#
> > -# Copyright (C) 2007-2016 OpenWrt.org
> > -#
> > -# This is free software, licensed under the GNU General Public
> > License v2.
> > -# See /LICENSE for more information.
> > -#
> > -
> > -include $(TOPDIR)/rules.mk
> > -
> > -PKG_NAME:=usbutils
> > -PKG_VERSION:=007
> > -PKG_RELEASE:=11
> > -
> > -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
> > -PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils
> > -PKG_HASH:=7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4
> > -PKG_LICENSE:=GPL-2.0
> > -PKG_LICENSE_FILES:=COPYING
> > -
> > -PKG_BUILD_PARALLEL:=1
> > -PKG_INSTALL:=1
> > -
> > -PKG_MAINTAINER:=Felix Fietkau 
> > -
> > -include $(INCLUDE_DIR)/package.mk
> > -
> > -define Package/usbutils
> > -  SECTION:=utils
> > -  CATEGORY:=Utilities
> > -  DEPENDS:=+libusb-1.0 +librt +libpthread
> > -  TITLE:=USB devices listing utilities
> > -  URL:=http://www.linux-usb.org/
> > -endef
> > -
> > -USB_IDS_VER:=0.339
> > -USB_IDS_FILE:=usb.ids.$(USB_IDS_VER)
> > -define Download/usb_ids
> > -  FILE:=$(USB_IDS_FILE)
> > -  URL_FILE:=usb.ids
> > -  URL:=@GITHUB/vcrhonek/hwdata/v$(USB_IDS_VER)
> > -
> > HASH:=5ab6b663d3119217aa4117e95063c9b82646107344f2ae1d22248c6c29389fd7
> > -endef
> > -$(eval $(call Download,usb_ids))
> > -
> > -define Build/Prepare
> > - $(Build/Prepare/Default)
> > - $(CP) $(DL_DIR)/$(USB_IDS_FILE) $(PKG_BUILD_DIR)/usb.ids
> > -endef
> > -
> > -CONFIGURE_ARGS += \
> > - --disable-zlib
> > -
> > -define Package/usbutils/install
> > - $(INSTALL_DIR) $(1)/usr/bin
> > - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsusb $(1)/usr/bin/
> > - $(INSTALL_DIR) $(1)/usr/share
> > - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(1)/usr/share/
> > -endef
> > -
> > -$(eval $(call BuildPackage,usbutils))
> > --
> > 2.17.1
> >
> >
> > ___
> > openwrt-devel mailing list
> > openwrt-devel@lists.openwrt.org
> > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
>
>

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] build/prereq: merge ifndef IB block together

2020-12-29 Thread Paul Spooren 
Multiple prereq checks are only required within the build system but not
for the ImageBuilder. These checks are excluded by using ifndef IB.

This commit merges the three ifndef IB blocks together.

Signed-off-by: Paul Spooren 
---
 include/prereq-build.mk | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index ad204e95e8..3a51c4cd70 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -38,9 +38,7 @@ $(eval $(call TestHostCommand,working-gcc, \
it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \
gcc -x c -o $(TMP_DIR)/a.out -))
-endif
 
-ifndef IB
 $(eval $(call SetupHostCommand,g++, \
Please install the GNU C++ Compiler (g++) 4.8 or later, \
$(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \
@@ -53,14 +51,12 @@ $(eval $(call TestHostCommand,working-g++, \
echo 'int main(int argc, char **argv) { return 0; }' | \
g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \
$(TMP_DIR)/a.out))
-endif
 
-ifndef IB
 $(eval $(call TestHostCommand,ncurses, \
Please install ncurses. (Missing libncurses.so or ncurses.h), \
echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \
gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out - -lncurses))
-endif
+endif # IB
 
 ifeq ($(HOST_OS),Linux)
   zlib_link_flags := -Wl,-Bstatic -lz -Wl,-Bdynamic
-- 
2.29.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] usbutils: remove

2020-12-29 Thread Paul Spooren 




On Di, Dez 29, 2020 at 19:35, Rosen Penev  wrote:
This package is not needed in base. It will be imported in the 
packages

feed.

Signed-off-by: Rosen Penev 
---


I'm in favor of this patch but please include the current maintainer 
(Felix) in CC.


Additional information provided by Rosen via IRC:

> I have a version bump to 013, but it requires libudev-zero from the 
packages feed


Acked-by: Paul Spooren 

 package/utils/usbutils/Makefile | 60 
-

 1 file changed, 60 deletions(-)
 delete mode 100644 package/utils/usbutils/Makefile

diff --git a/package/utils/usbutils/Makefile 
b/package/utils/usbutils/Makefile

deleted file mode 100644
index 4e32e27a06..00
--- a/package/utils/usbutils/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2007-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public 
License v2.

-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=usbutils
-PKG_VERSION:=007
-PKG_RELEASE:=11
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils
-PKG_HASH:=7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Felix Fietkau 
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/usbutils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libusb-1.0 +librt +libpthread
-  TITLE:=USB devices listing utilities
-  URL:=http://www.linux-usb.org/
-endef
-
-USB_IDS_VER:=0.339
-USB_IDS_FILE:=usb.ids.$(USB_IDS_VER)
-define Download/usb_ids
-  FILE:=$(USB_IDS_FILE)
-  URL_FILE:=usb.ids
-  URL:=@GITHUB/vcrhonek/hwdata/v$(USB_IDS_VER)
-  
HASH:=5ab6b663d3119217aa4117e95063c9b82646107344f2ae1d22248c6c29389fd7

-endef
-$(eval $(call Download,usb_ids))
-
-define Build/Prepare
-   $(Build/Prepare/Default)
-   $(CP) $(DL_DIR)/$(USB_IDS_FILE) $(PKG_BUILD_DIR)/usb.ids
-endef
-
-CONFIGURE_ARGS += \
-   --disable-zlib
-
-define Package/usbutils/install
-   $(INSTALL_DIR) $(1)/usr/bin
-   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsusb $(1)/usr/bin/
-   $(INSTALL_DIR) $(1)/usr/share
-   $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(1)/usr/share/
-endef
-
-$(eval $(call BuildPackage,usbutils))
--
2.17.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] usbutils: remove

2020-12-29 Thread Rosen Penev 
This package is not needed in base. It will be imported in the packages
feed.

Signed-off-by: Rosen Penev 
---
 package/utils/usbutils/Makefile | 60 -
 1 file changed, 60 deletions(-)
 delete mode 100644 package/utils/usbutils/Makefile

diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile
deleted file mode 100644
index 4e32e27a06..00
--- a/package/utils/usbutils/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2007-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=usbutils
-PKG_VERSION:=007
-PKG_RELEASE:=11
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils
-PKG_HASH:=7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Felix Fietkau 
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/usbutils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libusb-1.0 +librt +libpthread
-  TITLE:=USB devices listing utilities
-  URL:=http://www.linux-usb.org/
-endef
-
-USB_IDS_VER:=0.339
-USB_IDS_FILE:=usb.ids.$(USB_IDS_VER)
-define Download/usb_ids
-  FILE:=$(USB_IDS_FILE)
-  URL_FILE:=usb.ids
-  URL:=@GITHUB/vcrhonek/hwdata/v$(USB_IDS_VER)
-  HASH:=5ab6b663d3119217aa4117e95063c9b82646107344f2ae1d22248c6c29389fd7
-endef
-$(eval $(call Download,usb_ids))
-
-define Build/Prepare
-   $(Build/Prepare/Default)
-   $(CP) $(DL_DIR)/$(USB_IDS_FILE) $(PKG_BUILD_DIR)/usb.ids
-endef
-
-CONFIGURE_ARGS += \
-   --disable-zlib
-
-define Package/usbutils/install
-   $(INSTALL_DIR) $(1)/usr/bin
-   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsusb $(1)/usr/bin/
-   $(INSTALL_DIR) $(1)/usr/share
-   $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(1)/usr/share/
-endef
-
-$(eval $(call BuildPackage,usbutils))
-- 
2.17.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] trace-cmd: update to 2.9.1

2020-12-29 Thread Rosen Penev 
Fixed license information.

Adjusted Makefile to new install paths.

Backported upstream patch to fix compilation with musl. Replaces local
and incomplete patch.

Signed-off-by: Rosen Penev 
---
 package/devel/trace-cmd/Makefile  |  22 ++--
 .../devel/trace-cmd/patches/100-musl.patch| 104 ++
 .../patches/110-mac80211_tracepoint.patch |  10 +-
 .../devel/trace-cmd/patches/120-limits.patch  |  24 
 4 files changed, 121 insertions(+), 39 deletions(-)
 create mode 100644 package/devel/trace-cmd/patches/100-musl.patch
 delete mode 100644 package/devel/trace-cmd/patches/120-limits.patch

diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile
index d1f73ae9bb..e15b04ad23 100644
--- a/package/devel/trace-cmd/Makefile
+++ b/package/devel/trace-cmd/Makefile
@@ -1,16 +1,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=trace-cmd
-PKG_VERSION:=v2.6.1
-PKG_RELEASE:=3
+PKG_VERSION:=v2.9.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/
-PKG_HASH:=4eb79001778a77c0ada10265e7f4b5515a3e21a46f0a15c2e8cc614efdf3f5df
+PKG_HASH:=9404fc3cf540ea795304608068c9db6cdb38b90584c7f3c43249785913d54b38
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=COPYING
+
 PKG_INSTALL:=1
 PKG_USE_MIPS16:=0
-PKG_LICENSE:=GPL-2.0
-
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,27 +36,27 @@ MAKE_FLAGS += \
NO_AUDIT=1 \
prefix=/usr
 
-PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/trace-cmd/plugins
+PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/traceevent/plugins
 PLUGINS_MAIN := function hrtimer mac80211 sched_switch
 
 TARGET_CFLAGS += --std=gnu99 -D_GNU_SOURCE
 
 define Package/trace-cmd/install
-   $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/trace-cmd/plugins
+   $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/traceevent/plugins
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trace-cmd $(1)/usr/bin/
$(CP) \
$(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_MAIN)) \
-   $(1)/usr/lib/trace-cmd/plugins
+   $(1)/usr/lib/traceevent/plugins
 endef
 
 define Package/trace-cmd-extra/install
-   $(INSTALL_DIR) $(1)/usr/lib/trace-cmd/plugins
+   $(INSTALL_DIR) $(1)/usr/lib/traceevent/plugins
$(CP) \
$$(patsubst %,$(PLUGINS_DIR)/plugin_%.so, \
$$(filter-out $(PLUGINS_MAIN), \
$$(patsubst $(PLUGINS_DIR)/plugin_%.so,%, \
$$(wildcard 
$(PLUGINS_DIR)/plugin_*.so \
-   $(1)/usr/lib/trace-cmd/plugins
+   $(1)/usr/lib/traceevent/plugins
 endef
 
 $(eval $(call BuildPackage,trace-cmd))
diff --git a/package/devel/trace-cmd/patches/100-musl.patch 
b/package/devel/trace-cmd/patches/100-musl.patch
new file mode 100644
index 00..80b419eb82
--- /dev/null
+++ b/package/devel/trace-cmd/patches/100-musl.patch
@@ -0,0 +1,104 @@
+From 1a000636c1828eecdcec5360a51623ef4ffbff04 Mon Sep 17 00:00:00 2001
+From: Beniamin Sandu 
+Date: Mon, 30 Nov 2020 14:27:55 +0200
+Subject: trace-cmd: make it build against musl C library
+
+* add some missing headers and macros
+* set pthread affinity using pthread_setaffinity_np after creating the thread
+instead of pthread_attr_setaffinity_np (which seems to not be implemented
+in musl)
+
+Tested using https://musl.cc/x86_64-linux-musl-native.tgz
+
+Link: 
https://lore.kernel.org/linux-trace-devel/20201130122755.31000-1-beniaminsa...@gmail.com
+
+Reviewed-by: Tzvetomir Stoyanov (VMware) 
+Signed-off-by: Beniamin Sandu 
+[ Fixed a whitespace issue ]
+Signed-off-by: Steven Rostedt (VMware) 
+---
+ include/trace-cmd/trace-cmd.h |  1 +
+ lib/trace-cmd/include/trace-cmd-local.h   |  1 +
+ lib/tracefs/tracefs-events.c  |  1 +
+ tracecmd/include/trace-local.h|  1 +
+ tracecmd/trace-tsync.c| 16 +++-
+ 5 files changed, 20 insertions(+), 5 deletions(-)
+
+--- a/include/trace-cmd/trace-cmd.h
 b/include/trace-cmd/trace-cmd.h
+@@ -6,6 +6,7 @@
+ #ifndef _TRACE_CMD_H
+ #define _TRACE_CMD_H
+ 
++#include 
+ #include "traceevent/event-parse.h"
+ 
+ #define TRACECMD_MAGIC { 23, 8, 68 }
+--- a/lib/trace-cmd/include/trace-cmd-local.h
 b/lib/trace-cmd/include/trace-cmd-local.h
+@@ -26,5 +26,6 @@ void warning(const char *fmt, ...);
+ #endif
+ #endif
+ 
++#include 
+ 
+ #endif /* _TRACE_CMD_LOCAL_H */
+--- a/lib/tracefs/tracefs-events.c
 b/lib/tracefs/tracefs-events.c
+@@ -13,6 +13,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "kbuffer.h"
+ #include "tracefs.h"
+--- a/tracecmd/include/trace-local.h
 b/tracecmd/include/trace-local.h
+@@ -8,6 +8,7 @@
+ 
+ #include 
+ #include/* for DIR */
++#include 
+ 
+ #include "trace-cmd.h"
+ #include "event-utils.h"
+--- a/tracecmd/trace-tsync.c
 b/tracecmd/trace-tsync.c
+@

[PATCH] kexec-tools: update to 2.0.21

2020-12-29 Thread Rosen Penev 
kdump was removed in 7acd257ae67b4ca94f8c23cb8bda0ee0709b9216

gdb can be used as an alternative.

Remove autoreconf. It's not needed as the configure files are already
generated.

Remove upstreamed patch.

Signed-off-by: Rosen Penev 
---
 package/boot/kexec-tools/Makefile | 42 ++-
 ...rela-relocation-R_X86_64_PLT32-error.patch | 14 ---
 2 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 
package/boot/kexec-tools/patches/100-kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32-error.patch

diff --git a/package/boot/kexec-tools/Makefile 
b/package/boot/kexec-tools/Makefile
index 269345aa9d..36fe53671a 100644
--- a/package/boot/kexec-tools/Makefile
+++ b/package/boot/kexec-tools/Makefile
@@ -8,14 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kexec-tools
-PKG_VERSION:=2.0.16
-PKG_RELEASE:=2
+PKG_VERSION:=2.0.21
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/kexec
-PKG_HASH:=5b103351ad752c9badd1d65b00eb6de4bce579f944f4df4e3ef3a755ba567010
-
-PKG_FIXUP:=autoreconf
+PKG_HASH:=e113142dee891638ad96e0f72cf9277b244477619470b30c41999d312e8e8702
 
 PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB CONFIG_KEXEC_LZMA
 
@@ -51,17 +49,6 @@ define Package/kexec/description
  The kexec utility allows to load and boot another kernel.
 endef
 
-define Package/kdump
-  $(call Package/kexec-tools/Default)
-  TITLE:=Kernel crash analysis
-  DEPENDS:=+kexec @(i386||x86_64||arm) @KERNEL_CRASH_DUMP
-endef
-
-define Package/kdump/description
- The kdump package allows to automatically boot into a
- special kernel for analyzing kernel crashes using kdump.
-endef
-
 define Package/kexec/config
source "$(SOURCE)/Config.in"
 endef
@@ -108,28 +95,5 @@ define Package/kexec/install
$(LN) ../usr/sbin/kexec $(1)/sbin/kexec
 endef
 
-define Package/kdump/install
-   $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config 
$(1)/etc/uci-defaults
-   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kdump 
$(PKG_INSTALL_DIR)/usr/sbin/vmcore-dmesg $(1)/usr/sbin
-   $(INSTALL_BIN) ./files/kdump.init $(1)/etc/init.d/kdump
-   $(INSTALL_BIN) ./files/kdump.defaults $(1)/etc/uci-defaults/kdump
-   $(INSTALL_CONF) ./files/kdump.config $(1)/etc/config/kdump
-endef
-
-define Package/kdump/prerm
-#!/bin/sh
-
-case $$(uname -m) in
-   i?86|x86_64)
-   if grep -q " crashkernel=" /boot/grub/grub.cfg; then
-   mount /boot -o remount,rw
-   sed -i 's/ crashkernel=[^ ]*//' /boot/grub/grub.cfg
-   mount /boot -o remount,ro
-   fi
-   ;;
-esac
-endef
-
 $(eval $(call BuildPackage,kexec-tools))
 $(eval $(call BuildPackage,kexec))
-$(eval $(call BuildPackage,kdump))
diff --git 
a/package/boot/kexec-tools/patches/100-kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32-error.patch
 
b/package/boot/kexec-tools/patches/100-kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32-error.patch
deleted file mode 100644
index dfad21992b..00
--- 
a/package/boot/kexec-tools/patches/100-kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32-error.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 
b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
-index 7fdde73..af33689 100644
 a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
-+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
-@@ -78,7 +78,8 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr),
-   if ((int64_t)value != *(int32_t *)location)
-   goto overflow;
-   break;
--  case R_X86_64_PC32: 
-+  case R_X86_64_PC32:
-+  case R_X86_64_PLT32:
-   *(uint32_t *)location = value - address;
-   break;
-   default:
-- 
2.29.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH netifd] netifd-proto.sh: Add PROTO_DEBUG and proto_debug_*()

2020-12-29 Thread Leonardo Mörlein 
In order to ease the debugging of netifd protos, this commit adds a flag
PROTO_DEBUG, that dumps all proto_* and json_* calls in protos. This
relies on the fact, that netifd already forwards stderr of protos to the
syslog.

The feature can be activated by adding PROTO_DEBUG=1 in the beginning
of the proto.

Furthermore, we add the following two functions usable in the proto:

  proto_debug_print()   - Can be used to print to the syslog adding
  a proper context to identify the source
  of the information. The print is ommitted
  if PROTO_DEBUG=0.

  proto_debug_dump_json()   - Dumps the current jshn.sh stack to the
  syslog adding a proper context to identify
  the source of the information. The dump
  is ommitted if PROTO_DEBUG=0.

To print the json_* calls, this commit is based on a patch just
submitted to the queue for libubox:

[PATCH libubox] sh/jshn.sh: Add JSHN_DEBUG flag

Example for the vxlan proto. A debug print and a json dump have been
added to the proto to show the behaviour in the example:

--- snip syslog ---
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_get_vars ip6addr peer6addr tunlink
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> proto_add_host_dependency vx_mesh_vpn  
mesh_vpn
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_get_vars port vid ttl tos mtu macaddr 
zone rxcsum txcsum
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> proto_init_update vx_mesh_vpn 1
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> proto_add_tunnel
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_add_string mode vxlan6
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_add_string link mesh_vpn
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_add_string local 
fe80::2a4:18ff:fe7e:a10d
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_add_string remote fe80::1
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> proto_debug_print This is a test print. The 
following dump_json is hacked into the proto:
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> proto_debug_dump_json { "action": 0, 
"ifname": "vx_mesh_vpn", "link-up": true, "tunnel": { "mode": "vxlan6", "link": 
"mesh_vpn", "local": "fe80::2a4:18ff:fe7e:a10d", "remote": "fe80::1" } }
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_add_object data
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_add_int id 12376034
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_add_string macaddr da:2d:59:c4:41:2f
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_add_boolean rxcsum 0
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_add_boolean txcsum 0
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> json_close_object
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> proto_close_tunnel
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> proto_add_data
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> proto_close_data
Wed Dec 30 00:04:07 2020 daemon.notice netifd: vx_mesh_vpn (25452): 
proto_vxlan6_setup(vx_mesh_vpn,) -> proto_send_update vx_mesh_vpn
--- snap syslog ---

Signed-off-by: Leonardo Mörlein 
---
 scripts/netifd-proto.sh | 112 
 1 file changed, 112 insertions(+)

diff --git a/scripts/netifd-proto.sh b/scripts/netifd-proto.sh
index 87d337d..76a6b85 100644
--- a/scripts/netifd-proto.sh
+++ b/scripts/netifd-proto.sh
@@ -4,52 +4,113 @@ PROTO_DEFAULT_OPTIONS="defaultroute peerdns metric"
 . /usr/share/libubox/jshn.sh
 . $NETIFD_MAIN_DIR/utils.sh
 
+PROTO_DEBUG_DEPTH=0
+PROTO_DEBUG_STARTED=0
+
+proto_debug_print() {
+   _proto_debug proto_debug_print "$@"
+   _proto_debug_end
+}
+
+proto_debug_dump_json() {
+

[PATCH] scripts/qemustart: use squashfs instead of ext4

2020-12-29 Thread Paul Spooren 
The qemustart script currently picks the ext4 filesystem rather than
squashfs, while the latter is default for nearly all OpenWrt targets.

Change the default behaviour of qemustart to be in line with the rest.

Signed-off-by: Paul Spooren 
---
 scripts/qemustart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/qemustart b/scripts/qemustart
index 7a2878ea70..f0ddefb839 100755
--- a/scripts/qemustart
+++ b/scripts/qemustart
@@ -257,7 +257,7 @@ start_qemu_x86() {
local mach="${o_mach:-pc}"
 
[ -n "$rootfs" ] || {
-   
rootfs="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-generic-ext4-combined.img"
+   
rootfs="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-generic-squashfs-combined.img"
if [ ! -f "$rootfs" -a -s "$rootfs.gz" ]; then
gunzip "$rootfs.gz"
fi
-- 
2.29.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH libubox] sh/jshn.sh: Add JSHN_DEBUG flag

2020-12-29 Thread Leonardo Mörlein 
This flag can be set to JSHN_DEBUG=1 to print all calls to json_*
to stderr. The variable JSHN_DEBUG_PREFIX can be used optionally
to add a string in front of every debug print.

The json_* commands internally use other json_* commands. As it is
not desired that this inner commands are also printed, a variable
JSHN_DEBUG_DEPTH is used. It is initialized to JSHN_DEBUG_DEPTH=0,
increased on any json_* call and decreased when leaving the json_*
call. Debug prints are only fired if JSHN_DEBUG_DEPTH=0.

Other scripts may abuse this variable to their own needs, if they
do it carefully.

---snip---
JSHN_DEBUG=1
JSHN_DEBUG_PREFIX="json_debug: "
json_init
json_add_string "foo" "bar"
json_add_string "val" "12"
json_dump
---stderr---
json_debug: json_init
json_debug: json_add_string foo bar
json_debug: json_add_string val 12
json_debug: json_dump
---stdout---
{ "foo": "bar", "val": "12" }
---snap---

This is a preparatory commit to eventually allow debugging netifd
protos in a better way.

Signed-off-by: Leonardo Mörlein 
---
 sh/jshn.sh | 64 +-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/sh/jshn.sh b/sh/jshn.sh
index 7b0155d..50ec96f 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -1,5 +1,18 @@
 # functions for parsing and generating json
 
+JSHN_DEBUG_DEPTH=0
+
+_json_debug() {
+   JSHN_DEBUG_DEPTH="$((JSHN_DEBUG_DEPTH+1))"
+   if [ -n "$JSHN_DEBUG" ] && [ "$JSHN_DEBUG" -eq 1 ] && [ 
"$JSHN_DEBUG_DEPTH" -eq 1 ]; then
+   echo "${JSHN_DEBUG_PREFIX}$*" 1>&2
+   fi
+}
+
+_json_debug_end() {
+   JSHN_DEBUG_DEPTH="$((JSHN_DEBUG_DEPTH-1))"
+}
+
 _json_get_var() {
# dest=$1
# var=$2
@@ -93,14 +106,17 @@ _json_close_table() {
 }
 
 json_set_namespace() {
+   _json_debug json_set_namespace "$@"
local _new="$1"
local _old="$2"
 
[ -n "$_old" ] && _set_var "$_old" "$JSON_PREFIX"
JSON_PREFIX="$_new"
+   _json_debug_end
 }
 
 json_cleanup() {
+   _json_debug json_cleanup "$@"
local unset tmp
 
_json_get_var unset JSON_UNSET
@@ -118,86 +134,116 @@ json_cleanup() {
${JSON_PREFIX}JSON_SEQ \
${JSON_PREFIX}JSON_CUR \
${JSON_PREFIX}JSON_UNSET
+   _json_debug_end
 }
 
 json_init() {
+   _json_debug json_init "$@"
json_cleanup
export -n ${JSON_PREFIX}JSON_SEQ=0
export -- \
${JSON_PREFIX}JSON_CUR="J_V" \
${JSON_PREFIX}K_J_V=
+   _json_debug_end
 }
 
 json_add_object() {
+   _json_debug json_add_object "$@"
_json_add_table "$1" object T
+   _json_debug_end
 }
 
 json_close_object() {
+   _json_debug json_close_object "$@"
_json_close_table
+   _json_debug_end
 }
 
 json_add_array() {
+   _json_debug json_add_array "$@"
_json_add_table "$1" array A
+   _json_debug_end
 }
 
 json_close_array() {
+   _json_debug json_close_array "$@"
_json_close_table
+   _json_debug_end
 }
 
 json_add_string() {
+   _json_debug json_add_string "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic string "$1" "$2" "$cur"
+   _json_debug_end
 }
 
 json_add_int() {
+   _json_debug json_add_int "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic int "$1" "$2" "$cur"
+   _json_debug_end
 }
 
 json_add_boolean() {
+   _json_debug json_add_boolean "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic boolean "$1" "$2" "$cur"
+   _json_debug_end
 }
 
 json_add_double() {
+   _json_debug json_add_double "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic double "$1" "$2" "$cur"
+   _json_debug_end
 }
 
 json_add_null() {
+   _json_debug json_add_null "$@"
local cur
_json_get_var cur JSON_CUR
_json_add_generic null "$1" "" "$cur"
+   _json_debug_end
 }
 
 # functions read access to json variables
 
 json_load() {
+   _json_debug json_load "$@"
eval "`jshn -r "$1"`"
+   _json_debug_end
 }
 
 json_load_file() {
+   _json_debug json_load_file "$@"
eval "`jshn -R "$1"`"
+   _json_debug_end
 }
 
 json_dump() {
-   jshn "$@" ${JSON_PREFIX:+-p "$JSON_PREFIX"} -w 
+   _json_debug json_dump "$@"
+   jshn "$@" ${JSON_PREFIX:+-p "$JSON_PREFIX"} -w
+   _json_debug_end
 }
 
 json_get_type() {
+   _json_debug json_get_type "$@"
local __dest="$1"
local __cur
 
_json_get_var __cur JSON_CUR
local __var="${JSON_PREFIX}T_${__cur}_${2//[^a-zA-Z0-9_]/_}"
eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
+   _json_debug_end
 }
 
 json_get_keys() {
+   _json_debug json_get_keys "$@"
local __dest="$1"
local _tbl_cur
 
@@ -208,9 +254,11 @@ json_get_keys() {
fi
local __var="${JSON_PREFIX}K_${_tbl_cur}"
eval "ex

Re: [PATCH] wolfssl: Update to v4.6.0-stable

2020-12-29 Thread Rosen Penev 
On Tue, Dec 29, 2020 at 9:53 AM Eneas U de Queiroz
 wrote:
>
> This version fixes a large number of bugs, although no security
> vulnerabilities are listed.
>
> Full changelog at:
> https://www.wolfssl.com/docs/wolfssl-changelog/
> or, as part of the version's README.md:
> https://github.com/wolfSSL/wolfssl/blob/v4.6.0-stable/README.md
>
> Due a number of API additions, size increases from 374.7K to 408.8K for
> arm_cortex_a9_vfpv3-d16.  The ABI does not change from previous version.
>
> Backported patches were removed; remaining patch was refreshed.
>
> Signed-off-by: Eneas U de Queiroz 
https://github.com/transmission/transmission/issues/1537 is still an
issue. I was hoping an update would fix it but it did not.

I tried fixing it here: https://github.com/openwrt/packages/pull/14342
but no dice.
> ---
>
> Run-tested on a Linksys WRT3200ACM (arm) with uhttpd, uclient-fetch, and
> wpad-wolfssl.
>
> diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile
> index 6758f7dd08..dcc6aca40c 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.5.0-stable
> -PKG_RELEASE:=5
> +PKG_VERSION:=4.6.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:=7de62300ce14daa0051bfefc7c4d6302f96cabc768b6ae49eda77523b118250c
> +PKG_HASH:=053aefbb02d0b06b27c5e2df6875b4b587318755b7db9d6aa8d72206b310a848
>
>  PKG_FIXUP:=libtool
>  PKG_INSTALL:=1
> diff --git a/package/libs/wolfssl/patches/100-disable-hardening-check.patch 
> b/package/libs/wolfssl/patches/100-disable-hardening-check.patch
> index 43337ba970..c2793285e7 100644
> --- a/package/libs/wolfssl/patches/100-disable-hardening-check.patch
> +++ b/package/libs/wolfssl/patches/100-disable-hardening-check.patch
> @@ -1,6 +1,6 @@
>  --- a/wolfssl/wolfcrypt/settings.h
>  +++ b/wolfssl/wolfcrypt/settings.h
> -@@ -2128,7 +2128,7 @@ extern void uITRON4_free(void *p) ;
> +@@ -2248,7 +2248,7 @@ extern void uITRON4_free(void *p) ;
>   #endif
>
>   /* warning for not using harden build options (default with ./configure) */
> diff --git a/package/libs/wolfssl/patches/110-fix-build-on-big-endian.patch 
> b/package/libs/wolfssl/patches/110-fix-build-on-big-endian.patch
> deleted file mode 100644
> index 3838865559..00
> --- a/package/libs/wolfssl/patches/110-fix-build-on-big-endian.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From b90acc91d0cd276befe7f08f87ba2dc5ee7122ff Mon Sep 17 00:00:00 2001
> -From: Tesfa Mael 
> -Date: Wed, 26 Aug 2020 10:13:06 -0700
> -Subject: [PATCH] Make ByteReverseWords available for big and little endian
> -
> 
> - wolfcrypt/src/misc.c | 2 --
> - 1 file changed, 2 deletions(-)
> -
>  a/wolfcrypt/src/misc.c
> -+++ b/wolfcrypt/src/misc.c
> -@@ -120,7 +120,6 @@ WC_STATIC WC_INLINE word32 ByteReverseWo
> - return rotlFixed(value, 16U);
> - #endif
> - }
> --#if defined(LITTLE_ENDIAN_ORDER)
> - /* This routine performs a byte swap of words array of a given count. */
> - WC_STATIC WC_INLINE void ByteReverseWords(word32* out, const word32* in,
> - word32 byteCount)
> -@@ -131,7 +130,6 @@ WC_STATIC WC_INLINE void ByteReverseWord
> - out[i] = ByteReverseWord32(in[i]);
> -
> - }
> --#endif /* LITTLE_ENDIAN_ORDER */
> -
> - #if defined(WORD64_AVAILABLE) && !defined(WOLFSSL_NO_WORD64_OPS)
> -
> diff --git 
> a/package/libs/wolfssl/patches/200-fix-checkhostname-matching.patch 
> b/package/libs/wolfssl/patches/200-fix-checkhostname-matching.patch
> deleted file mode 100644
> index aaf14e46d9..00
> --- a/package/libs/wolfssl/patches/200-fix-checkhostname-matching.patch
> +++ /dev/null
> @@ -1,123 +0,0 @@
> -From ea5c290d605b2af7b10d6e5ce69aa3534f52385f Mon Sep 17 00:00:00 2001
> -From: Eric Blankenhorn 
> -Date: Fri, 17 Jul 2020 08:37:02 -0500
> -Subject: [PATCH] Fix CheckHostName matching
> -
> 
> - src/internal.c | 18 --
> - src/ssl.c  |  5 +
> - tests/api.c| 30 ++
> - 3 files changed, 47 insertions(+), 6 deletions(-)
> -
> -diff --git a/src/internal.c b/src/internal.c
> -index dc57df0242..cda815d875 100644
>  a/src/internal.c
> -+++ b/src/internal.c
> -@@ -9346,7 +9346,7 @@ int CheckForAltNames(DecodedCert* dCert, const char* 
> domain, int* checkCN)
> - altName = dCert->altNames;
> -
> - if (checkCN != NULL) {
> --*checkCN = altName == NULL;
> -+*checkCN = (altName == NULL) ? 1 : 0;
> - }
> -
> - while (altName) {
> -@@ -9415,23 +9415,29 @@ int CheckForAltNames(DecodedCert* dCert, const char* 
> domain, int* checkCN)
> - int CheckHostName(DecodedCert* dCert, const char *domainName, size_t 
> domainNameLen)
> - {
> - int checkCN;
> -+int ret = DOMAIN_NAME_MISMATCH;
> -
> - /* Assume name is NUL terminated. */
> - (void)domainNameLen;
> -
> -

[PATCH] wolfssl: Update to v4.6.0-stable

2020-12-29 Thread Eneas U de Queiroz 
This version fixes a large number of bugs, although no security
vulnerabilities are listed.

Full changelog at:
https://www.wolfssl.com/docs/wolfssl-changelog/
or, as part of the version's README.md:
https://github.com/wolfSSL/wolfssl/blob/v4.6.0-stable/README.md

Due a number of API additions, size increases from 374.7K to 408.8K for
arm_cortex_a9_vfpv3-d16.  The ABI does not change from previous version.

Backported patches were removed; remaining patch was refreshed.

Signed-off-by: Eneas U de Queiroz 
---

Run-tested on a Linksys WRT3200ACM (arm) with uhttpd, uclient-fetch, and
wpad-wolfssl.

diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile
index 6758f7dd08..dcc6aca40c 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.5.0-stable
-PKG_RELEASE:=5
+PKG_VERSION:=4.6.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:=7de62300ce14daa0051bfefc7c4d6302f96cabc768b6ae49eda77523b118250c
+PKG_HASH:=053aefbb02d0b06b27c5e2df6875b4b587318755b7db9d6aa8d72206b310a848
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
diff --git a/package/libs/wolfssl/patches/100-disable-hardening-check.patch 
b/package/libs/wolfssl/patches/100-disable-hardening-check.patch
index 43337ba970..c2793285e7 100644
--- a/package/libs/wolfssl/patches/100-disable-hardening-check.patch
+++ b/package/libs/wolfssl/patches/100-disable-hardening-check.patch
@@ -1,6 +1,6 @@
 --- a/wolfssl/wolfcrypt/settings.h
 +++ b/wolfssl/wolfcrypt/settings.h
-@@ -2128,7 +2128,7 @@ extern void uITRON4_free(void *p) ;
+@@ -2248,7 +2248,7 @@ extern void uITRON4_free(void *p) ;
  #endif
  
  /* warning for not using harden build options (default with ./configure) */
diff --git a/package/libs/wolfssl/patches/110-fix-build-on-big-endian.patch 
b/package/libs/wolfssl/patches/110-fix-build-on-big-endian.patch
deleted file mode 100644
index 3838865559..00
--- a/package/libs/wolfssl/patches/110-fix-build-on-big-endian.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b90acc91d0cd276befe7f08f87ba2dc5ee7122ff Mon Sep 17 00:00:00 2001
-From: Tesfa Mael 
-Date: Wed, 26 Aug 2020 10:13:06 -0700
-Subject: [PATCH] Make ByteReverseWords available for big and little endian
-

- wolfcrypt/src/misc.c | 2 --
- 1 file changed, 2 deletions(-)
-
 a/wolfcrypt/src/misc.c
-+++ b/wolfcrypt/src/misc.c
-@@ -120,7 +120,6 @@ WC_STATIC WC_INLINE word32 ByteReverseWo
- return rotlFixed(value, 16U);
- #endif
- }
--#if defined(LITTLE_ENDIAN_ORDER)
- /* This routine performs a byte swap of words array of a given count. */
- WC_STATIC WC_INLINE void ByteReverseWords(word32* out, const word32* in,
- word32 byteCount)
-@@ -131,7 +130,6 @@ WC_STATIC WC_INLINE void ByteReverseWord
- out[i] = ByteReverseWord32(in[i]);
- 
- }
--#endif /* LITTLE_ENDIAN_ORDER */
- 
- #if defined(WORD64_AVAILABLE) && !defined(WOLFSSL_NO_WORD64_OPS)
- 
diff --git a/package/libs/wolfssl/patches/200-fix-checkhostname-matching.patch 
b/package/libs/wolfssl/patches/200-fix-checkhostname-matching.patch
deleted file mode 100644
index aaf14e46d9..00
--- a/package/libs/wolfssl/patches/200-fix-checkhostname-matching.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From ea5c290d605b2af7b10d6e5ce69aa3534f52385f Mon Sep 17 00:00:00 2001
-From: Eric Blankenhorn 
-Date: Fri, 17 Jul 2020 08:37:02 -0500
-Subject: [PATCH] Fix CheckHostName matching
-

- src/internal.c | 18 --
- src/ssl.c  |  5 +
- tests/api.c| 30 ++
- 3 files changed, 47 insertions(+), 6 deletions(-)
-
-diff --git a/src/internal.c b/src/internal.c
-index dc57df0242..cda815d875 100644
 a/src/internal.c
-+++ b/src/internal.c
-@@ -9346,7 +9346,7 @@ int CheckForAltNames(DecodedCert* dCert, const char* 
domain, int* checkCN)
- altName = dCert->altNames;
- 
- if (checkCN != NULL) {
--*checkCN = altName == NULL;
-+*checkCN = (altName == NULL) ? 1 : 0;
- }
- 
- while (altName) {
-@@ -9415,23 +9415,29 @@ int CheckForAltNames(DecodedCert* dCert, const char* 
domain, int* checkCN)
- int CheckHostName(DecodedCert* dCert, const char *domainName, size_t 
domainNameLen)
- {
- int checkCN;
-+int ret = DOMAIN_NAME_MISMATCH;
- 
- /* Assume name is NUL terminated. */
- (void)domainNameLen;
- 
- if (CheckForAltNames(dCert, domainName, &checkCN) != 1) {
--WOLFSSL_MSG("DomainName match on alt names failed too");
--return DOMAIN_NAME_MISMATCH;
-+WOLFSSL_MSG("DomainName match on alt names failed");
- }
-+else {
-+ret = 0;
-+}
-+
- if (checkCN == 1) {
- if (MatchDomainName(dCert->subjectCN, dCert->subjectCNLen,
--domainName) == 0) {
-+domainName) == 1) {
-+ret = 0;
-+}
-+

Leonid Aronov Publishing Services. We can help you in many things:

2020-12-29 Thread Leonid Publisher 
Dear Colleagues,

This is the site of Leonid Aronov Publishing Services. We are a small
office in Belgium. Phone: +32 2 598 42 19, https://leonidpublisher.blogspot.com/

 We can help you in many things:
a) We can help you to find a good Scopus, Web of Science, EI Compendex
Indexed Journal to publish your papers with very low fees. We collect
many papers, we organize a pre-screen review and we are sending them
massively to many Open Access Publishers. So, we obtain much lower
fees! Open Access Publishers usual give to our Office a 30% - 80&
discount, when we provide them many good papers together.

Do not lose the opportunity send us your paper now (or at least a
Draft of 3 pages).

In December 8, 2020, we promoted to a Journal indexed in ISI
Web of Science and Scopus 30 good papers with good English and good
format. Our Authors obtained 40% discount!

b) We have collaboration with big publishers (Springer, Elsevier, ACM,
Emerald, AIP, IEEE, WorldScientific, SAGE etc) and small publishers.

c) We can find you also a good University in North America or West
Europe to elaborate M.Sc. or Ph.D. Dissertation

d) We can also help you in the Format of your paper or to improve the
language in your articles.

e) We can find the appropriate Journals for Authors from some
countries (like India, Italy, China) that have Specific Lists for
Journals that are recognized by their Countries or their Universities.

Note that you pay only if you receive the official letter of
acceptance from these publishers from their professional emails like
*@springer.com, *@ieee.org  etc


Do not hesitate to ask our advice!
Please, contact us for more details!

Dr. Leonid Aronov




LEONID PUBLISHER
Carrefour de l'Europe 3,
1000 Bruxelles, Belgium
Phone: +32 2 598 42 19
dr.leonid.aro...@gmail.com
https://leonidpublisher.blogspot.com/


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: New ath10k-ct driver available

2020-12-29 Thread Ben Greear 

On 12/28/20 2:11 PM, Hauke Mehrtens wrote:

On 12/24/20 10:28 PM, Ben Greear wrote:

I just pushed this commit.  I'm interested in feedback if anyone tests
it.  It could fix some of the strange tx issues, and for the 5.10 kernel,
at least, it fixes very obvious tx-path issues.

commit b753e8bf22b94297acbaa370b4cb0be87e3da4b8 (HEAD -> master, origin/master)
Author: Ben Greear 
Date:   Thu Dec 24 13:24:42 2020 -0800

 ath10k-ct:  Fix invalid use of ath-cb struct.

 This fixes some cases where -ct firmware would attempt
 to transmit a fixed-rate frame, thinking the packet was
 injected, when in fact it was not.

 Align the ath-cb pointers on 8-byte boundaries, which may
 give a minor performance boost.

 5.4 kernels and higher are modified, I'll check on older
 kernels later.

 Signed-off-by: Ben Greear 



Hi,

This change is integrated in OpenWrt master:
https://git.openwrt.org/da9beb070d112469adeb30dd79dcde3176bfb290

Should we backport this change https://github.com/greearb/ath10k-ct/commit/b753e8bf22b94297acbaa370b4cb0be87e3da4b8 to ath10k-ct 4.19 for the openwrt 19.07 
stable branch?


I think 4.19 will be OK as is, because the ieee80211_tx_info->control.flags is 
at offset 32,
and the sizeof ath10k_skb_cb is 28, so the ath10k skb portion should never 
overwrite
the control.flags.

Thanks,
Ben



Hauke




--
Ben Greear 
Candela Technologies Inc  http://www.candelatech.com

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel