[PATCH] rpcd CMakeLists.txt: install unauthenticated.json

2021-01-18 Thread Sergey Ponomarev 
When installing rpcd directly from CMake then the file is missing.

Signed-off-by: Sergey Ponomarev 
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 266dbe4..213b4ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,3 +69,6 @@ INSTALL(TARGETS rpcd ${PLUGINS}
RUNTIME DESTINATION sbin
LIBRARY DESTINATION lib
 )
+INSTALL(FILES unauthenticated.json
+   DESTINATION share/rpcd/aclh.d
+)
-- 
2.27.0


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

[PATCH] rpcd CMakeLists.txt: drop legacy json-c support

2021-01-18 Thread Sergey Ponomarev 
The cmake logic is wrong (E.G. PKG_CHECK_FOR_MODULES fails unless all modules 
are found), and the legacy libjson.so name is also used by the other libjson 
(http://sourceforge.net/projects/libjson/) which provides an incompatible API, 
so just drop it.

Backported from libubox cbf80de7f4df61960f386cb01a899cf4228d38f3

Signed-off-by: Sergey Ponomarev 
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26e011e..266dbe4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ FIND_LIBRARY(uci NAMES uci)
 FIND_LIBRARY(ubus NAMES ubus)
 FIND_LIBRARY(ubox NAMES ubox)
 FIND_LIBRARY(blobmsg_json NAMES blobmsg_json)
-FIND_LIBRARY(json NAMES json-c json)
+FIND_LIBRARY(json NAMES json-c)
 FIND_LIBRARY(crypt NAMES crypt)
 IF(crypt STREQUAL "crypt-NOTFOUND")
   SET(crypt "")
-- 
2.27.0


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

[PATCH] examples: drop legacy json-c support

2021-01-18 Thread Sergey Ponomarev 
The cmake logic is wrong (E.G. PKG_CHECK_FOR_MODULES fails unless all modules 
are found), and the legacy libjson.so name is also used by the other libjson 
(http://sourceforge.net/projects/libjson/) which provides an incompatible API, 
so just drop it.

Backported from cbf80de7f4df61960f386cb01a899cf4228d38f3
---
 examples/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 04f18b0..1b71d06 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -7,7 +7,7 @@ IF (BUILD_EXAMPLES)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..)
 LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-FIND_LIBRARY(json NAMES json-c json)
+FIND_LIBRARY(json NAMES json-c)
 
 ADD_EXECUTABLE(ustream-example ustream-example.c)
 TARGET_LINK_LIBRARIES(ustream-example ubox)
-- 
2.27.0


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

[PATCH 2/2] CMakeLists.txt: use CMAKE_CURRENT_LIST_DIR

2021-01-18 Thread Sergey Ponomarev 
When building with debuild/fakeroot the build folder is different from sources

Signed-off-by: Sergey Ponomarev 
---
 CMakeLists.txt | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbfbf5d..44ebe3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,16 +19,16 @@ IF(JSONC_FOUND)
 ENDIF()
 
 ADD_CUSTOM_COMMAND(
-  OUTPUT contrib/lemon
-  DEPENDS contrib/lemon.c contrib/lempar.c
-  COMMAND gcc -o contrib/lemon contrib/lemon.c
+  OUTPUT ${CMAKE_CURRENT_LIST_DIR}/contrib/lemon
+  DEPENDS ${CMAKE_CURRENT_LIST_DIR}/contrib/lemon.c 
${CMAKE_CURRENT_LIST_DIR}/contrib/lempar.c
+  COMMAND gcc -o ${CMAKE_CURRENT_LIST_DIR}/contrib/lemon 
${CMAKE_CURRENT_LIST_DIR}/contrib/lemon.c
   COMMENT "Generating lemon parser generator"
 )
 
 ADD_CUSTOM_COMMAND(
-  OUTPUT parser.c
-  DEPENDS parser.y contrib/lemon
-  COMMAND ./contrib/lemon parser.y
+  OUTPUT ${CMAKE_CURRENT_LIST_DIR}/parser.c
+  DEPENDS ${CMAKE_CURRENT_LIST_DIR}/parser.y 
${CMAKE_CURRENT_LIST_DIR}/contrib/lemon
+  COMMAND ${CMAKE_CURRENT_LIST_DIR}/contrib/lemon 
${CMAKE_CURRENT_LIST_DIR}/parser.y
   COMMENT "Generating parser.c"
 )
 
-- 
2.27.0


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

[PATCH 1/2] jsonfilter: drop legacy json-c support

2021-01-18 Thread Sergey Ponomarev 
The cmake logic is wrong (E.G. PKG_CHECK_FOR_MODULES fails unless all modules 
are found), and the legacy libjson.so name is also used by the other libjson 
(http://sourceforge.net/projects/libjson/) which provides an incompatible API, 
so just drop it.

Backported from libubox cbf80de7f4df61960f386cb01a899cf4228d38f3

Signed-off-by: Sergey Ponomarev 
---
 CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7361eb2..dbfbf5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,14 +7,12 @@ IF(NOT APPLE)
   SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,--gc-sections")
 ENDIF()
 
-find_library(json NAMES json-c json)
-
 IF(DEBUG)
   ADD_DEFINITIONS(-DDEBUG -g3)
 ENDIF()
 
 INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(JSONC json-c json)
+PKG_CHECK_MODULES(JSONC json-c)
 IF(JSONC_FOUND)
   ADD_DEFINITIONS(-DJSONC)
   INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
@@ -40,6 +38,7 @@ INCLUDE_DIRECTORIES(${ubox_include_dir})
 SET_PROPERTY(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES 
"lemon;parser.h;parser.out")
 SET_SOURCE_FILES_PROPERTIES("parser.c" PROPERTIES GENERATED TRUE)
 ADD_EXECUTABLE(jsonpath main.c ast.c lexer.c parser.c matcher.c)
+find_library(json NAMES json-c)
 TARGET_LINK_LIBRARIES(jsonpath ubox ${json})
 
 INSTALL(TARGETS jsonpath RUNTIME DESTINATION bin)
-- 
2.27.0


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

[PATCH] tools/autoconf: update to 2.70

2021-01-18 Thread Rosen Penev 
Refreshed patches.

Removed emacs patch as upstream removed emacs completely.

Removed musl host patch. Upstream seems to have fixed it differently.

Added patch to skip building man pages. Removes help2man host build
dependency.

Signed-off-by: Rosen Penev 
---
 tools/autoconf/Makefile   |   4 +-
 tools/autoconf/patches/000-relocatable.patch  | 107 +++---
 tools/autoconf/patches/001-no_emacs_lib.patch |  22 
 .../patches/002-musl_host_fixup.patch |  24 
 tools/autoconf/patches/010-no-man.patch   |  21 
 5 files changed, 63 insertions(+), 115 deletions(-)
 delete mode 100644 tools/autoconf/patches/001-no_emacs_lib.patch
 delete mode 100644 tools/autoconf/patches/002-musl_host_fixup.patch
 create mode 100644 tools/autoconf/patches/010-no-man.patch

diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile
index 6eb64d77d5..0fac14a6be 100644
--- a/tools/autoconf/Makefile
+++ b/tools/autoconf/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=autoconf
-PKG_VERSION:=2.69
+PKG_VERSION:=2.70
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/autoconf
-PKG_HASH:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684
+PKG_HASH:=fa9e227860d9d845c0a07f63b88c8d7a2ae1aa2345fb619384bb8accc19fecc6
 
 include $(INCLUDE_DIR)/host-build.mk
 
diff --git a/tools/autoconf/patches/000-relocatable.patch 
b/tools/autoconf/patches/000-relocatable.patch
index 12e94ae9a1..930fdd880d 100644
--- a/tools/autoconf/patches/000-relocatable.patch
+++ b/tools/autoconf/patches/000-relocatable.patch
@@ -1,6 +1,6 @@
 --- a/bin/autoheader.in
 +++ b/bin/autoheader.in
-@@ -28,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+@@ -32,7 +32,8 @@ use warnings FATAL => 'all';
  
  BEGIN
  {
@@ -10,32 +10,27 @@
unshift @INC, "$pkgdatadir";
  
# Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -50,7 +51,7 @@ use strict;
- use vars qw ($config_h %verbatim %symbol);
+@@ -54,7 +55,7 @@ use Autom4te::XFile;
+ our ($config_h, %symbol, %verbatim);
  
  # Lib files.
 -my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
 +my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} 
. '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
- local $config_h;
  my $config_h_in;
  my @prepend_include;
+ my @include;
 --- a/bin/autom4te.in
 +++ b/bin/autom4te.in
-@@ -1,10 +1,12 @@
--#! @PERL@ -w
-+#! @PERL@
- # -*- perl -*-
- # @configure_input@
- 
+@@ -5,6 +5,8 @@
  eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
  if 0;
  
 +$^W = 1;
 +
  # autom4te - Wrapper around M4 libraries.
- # Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc.
- 
-@@ -24,7 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ # Copyright (C) 2001-2003, 2005-2017, 2020 Free Software Foundation,
+ # Inc.
+@@ -28,7 +30,8 @@ use warnings FATAL => 'all';
  
  BEGIN
  {
@@ -45,8 +40,8 @@
unshift @INC, $pkgdatadir;
  
# Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -44,7 +47,8 @@ use File::Basename;
- use strict;
+@@ -48,7 +51,8 @@ use Autom4te::General;
+ use Autom4te::XFile;
  
  # Data directory.
 -my $pkgdatadir = $ENV{'AC_MACRODIR'} || '@pkgdatadir@';
@@ -55,7 +50,7 @@
  
  # $LANGUAGE{LANGUAGE} -- Automatic options for LANGUAGE.
  my %language;
-@@ -87,7 +91,7 @@ my @include;
+@@ -91,7 +95,7 @@ my @include;
  my $freeze = 0;
  
  # $M4.
@@ -64,7 +59,7 @@
  # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
  fatal "need GNU m4 1.4 or later: $m4"
if system "$m4 --help &1 | grep reload-state >/dev/null";
-@@ -269,6 +273,12 @@ sub load_configuration ($)
+@@ -272,6 +276,12 @@ sub load_configuration ($)
  
my @words = shellwords ($_);
my $type = shift @words;
@@ -79,22 +74,17 @@
  fatal "$file:$.: end-language missing for: $lang"
 --- a/bin/autoreconf.in
 +++ b/bin/autoreconf.in
-@@ -1,10 +1,12 @@
--#! @PERL@ -w
-+#! @PERL@
- # -*- perl -*-
- # @configure_input@
- 
+@@ -5,6 +5,8 @@
  eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
  if 0;
  
 +$^W = 1;
 +
  # autoreconf - install the GNU Build System in a directory tree
- # Copyright (C) 1994, 1999-2012 Free Software Foundation, Inc.
- 
-@@ -26,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ # Copyright (C) 1994, 1999-2017, 2020 Free Software Foundation, Inc.
  
+@@ -31,7 +33,8 @@ use warnings FATAL => 'all';
+ my $buildauxdir;
  BEGIN
  {
 -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
@@ -102,31 +92,25 @@
 +  ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' 
: '@pkgdatadir@');
unshift @INC, $pkgdatadir;
  
-   # Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -106,9 +109,9 @@ Written by David J. MacKenzie and Akim D
+   $buildauxdir = $ENV{'autom4te_buildauxdir'} || $pkgdatadir . '/build-aux';
+@@ -116,9 +119,9 @@ Written by David J. MacKenzie and Akim D

Re: jffs2 broken after first reboot

2021-01-18 Thread Patrick Vorlicek 
Typical case of rubber duck debugging, sorry for bothering the list. I
just realized that I had enabled FSTOOLS_OVL_MOUNT_COMPRESS_ZLIB which
seems to cause the issue.

@john maybe you want to look into this? Can I be of any help?

Viele Grüße,
Patrick Vorlicek

Am 18.01.2021 um 19:59 schrieb Patrick Vorlicek:
> I hope someone can give me a hint where to look for the source of this
> issue.
>
> First boot is fine, jffs2 is created an mounted as overlay:
>
> [   16.379847] block: unable to load configuration (fstab: Entry not found)
> [   16.386627] block: no usable configuration
> [   16.391956] mount_root: jffs2 not ready yet, using temporary tmpfs
> overlay
> ...
> [   65.836222] jffs2_scan_eraseblock(): End of filesystem marker found
> at 0x0
> [   65.843158] jffs2_build_filesystem(): unlocking the mtd device...
> [   65.843240] done.
> [   65.851550] jffs2_build_filesystem(): erasing all blocks after the
> end marker...
> [   67.441440] done.
> [   67.450884] jffs2: notice: (5089) jffs2_build_xattr_subsystem:
> complete building xattr subsystem, 0 of xdatum (0 unchecked, 0 orphan)
> and 0 of xref (0 dead, 0 orphan) found.
> [   68.065796] overlayfs: upper fs does not support tmpfile.
>
> but once I reboot I get:
>
> [   16.402361] jffs2: notice: (657) jffs2_build_xattr_subsystem:
> complete building xattr subsystem, 11 of xdatum (9 unchecked, 1 orphan)
> and 13 of xref (1 dead, 0 orphan) found.
> [   16.418870] block: attempting to load
> /tmp/jffs_cfg/upper/etc/config/fstab
> [   16.431606] block: extroot: not configured
> [   16.438338] jffs2: Bad value for 'compr'
> [   16.442433] mount_root: failed to mount -t jffs2 /dev/mtdblock6
> /tmp/overlay: Invalid argument
> [   16.854603] jffs2: notice: (659) jffs2_build_xattr_subsystem:
> complete building xattr subsystem, 11 of xdatum (9 unchecked, 1 orphan)
> and 13 of xref (1 dead, 0 orphan) found.
> [   16.871006] block: attempting to load
> /tmp/jffs_cfg/upper/etc/config/fstab
> [   16.882280] block: extroot: not configured
> [   16.888491] mount_root: unable to set filesystem state
> [   16.893854] mount_root: switching to jffs2 overlay
> [   16.898759] mount_root: switching to jffs2 failed - fallback to
> ramoverlay
>


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

jffs2 broken after first reboot

2021-01-18 Thread Patrick Vorlicek 
I hope someone can give me a hint where to look for the source of this
issue.

First boot is fine, jffs2 is created an mounted as overlay:

[   16.379847] block: unable to load configuration (fstab: Entry not found)
[   16.386627] block: no usable configuration
[   16.391956] mount_root: jffs2 not ready yet, using temporary tmpfs
overlay
...
[   65.836222] jffs2_scan_eraseblock(): End of filesystem marker found
at 0x0
[   65.843158] jffs2_build_filesystem(): unlocking the mtd device...
[   65.843240] done.
[   65.851550] jffs2_build_filesystem(): erasing all blocks after the
end marker...
[   67.441440] done.
[   67.450884] jffs2: notice: (5089) jffs2_build_xattr_subsystem:
complete building xattr subsystem, 0 of xdatum (0 unchecked, 0 orphan)
and 0 of xref (0 dead, 0 orphan) found.
[   68.065796] overlayfs: upper fs does not support tmpfile.

but once I reboot I get:

[   16.402361] jffs2: notice: (657) jffs2_build_xattr_subsystem:
complete building xattr subsystem, 11 of xdatum (9 unchecked, 1 orphan)
and 13 of xref (1 dead, 0 orphan) found.
[   16.418870] block: attempting to load
/tmp/jffs_cfg/upper/etc/config/fstab
[   16.431606] block: extroot: not configured
[   16.438338] jffs2: Bad value for 'compr'
[   16.442433] mount_root: failed to mount -t jffs2 /dev/mtdblock6
/tmp/overlay: Invalid argument
[   16.854603] jffs2: notice: (659) jffs2_build_xattr_subsystem:
complete building xattr subsystem, 11 of xdatum (9 unchecked, 1 orphan)
and 13 of xref (1 dead, 0 orphan) found.
[   16.871006] block: attempting to load
/tmp/jffs_cfg/upper/etc/config/fstab
[   16.882280] block: extroot: not configured
[   16.888491] mount_root: unable to set filesystem state
[   16.893854] mount_root: switching to jffs2 overlay
[   16.898759] mount_root: switching to jffs2 failed - fallback to
ramoverlay

-- 
Viele Grüße,
Patrick Vorlicek


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

Re: [PATCH] autoconf: update to 2.70

2021-01-18 Thread Paul Spooren 




On So, Jan 17, 2021 at 17:50, Rosen Penev  wrote:

Refreshed patches.

Removed emacs patch as upstream removed emacs completely.

Removed musl host patch. Upstream seems to have fixed it differently.

Signed-off-by: Rosen Penev 
---


Please disable the doc building, at least that's how I interpret this 
error message:


/buildbot/shared-workdir/build/build_dir/host/autoconf-2.70/build-aux/missing: 
line 81: help2man: command not found

WARNING: 'help2man' is missing on your system.
You should only need it if you modified a dependency of a man 
page.

You may want to install the GNU Help2man package:

make[4]: *** [Makefile:2209: man/autoconf.1] Error 127

https://buildmaster.aparcar.org/master/phase1/#/builders/4/builds/6

Best,
Paul


 tools/autoconf/Makefile   |   4 +-
 tools/autoconf/patches/000-relocatable.patch  | 107 
+++---

 tools/autoconf/patches/001-no_emacs_lib.patch |  22 
 .../patches/002-musl_host_fixup.patch |  24 
 4 files changed, 42 insertions(+), 115 deletions(-)
 delete mode 100644 tools/autoconf/patches/001-no_emacs_lib.patch
 delete mode 100644 tools/autoconf/patches/002-musl_host_fixup.patch

diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile
index 6eb64d77d5..0fac14a6be 100644
--- a/tools/autoconf/Makefile
+++ b/tools/autoconf/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=autoconf
-PKG_VERSION:=2.69
+PKG_VERSION:=2.70

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/autoconf
-PKG_HASH:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684
+PKG_HASH:=fa9e227860d9d845c0a07f63b88c8d7a2ae1aa2345fb619384bb8accc19fecc6

 include $(INCLUDE_DIR)/host-build.mk

diff --git a/tools/autoconf/patches/000-relocatable.patch 
b/tools/autoconf/patches/000-relocatable.patch

index 12e94ae9a1..930fdd880d 100644
--- a/tools/autoconf/patches/000-relocatable.patch
+++ b/tools/autoconf/patches/000-relocatable.patch
@@ -1,6 +1,6 @@
 --- a/bin/autoheader.in
 +++ b/bin/autoheader.in
-@@ -28,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+@@ -32,7 +32,8 @@ use warnings FATAL => 'all';

  BEGIN
  {
@@ -10,32 +10,27 @@
unshift @INC, "$pkgdatadir";

# Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -50,7 +51,7 @@ use strict;
- use vars qw ($config_h %verbatim %symbol);
+@@ -54,7 +55,7 @@ use Autom4te::XFile;
+ our ($config_h, %symbol, %verbatim);

  # Lib files.
 -my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
 +my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? 
$ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : 
'@bindir@/@autom4te-name@');

- local $config_h;
  my $config_h_in;
  my @prepend_include;
+ my @include;
 --- a/bin/autom4te.in
 +++ b/bin/autom4te.in
-@@ -1,10 +1,12 @@
--#! @PERL@ -w
-+#! @PERL@
- # -*- perl -*-
- # @configure_input@
-
+@@ -5,6 +5,8 @@
  eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" 
"$@";; esac'

  if 0;

 +$^W = 1;
 +
  # autom4te - Wrapper around M4 libraries.
- # Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc.
-
-@@ -24,7 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ # Copyright (C) 2001-2003, 2005-2017, 2020 Free Software Foundation,
+ # Inc.
+@@ -28,7 +30,8 @@ use warnings FATAL => 'all';

  BEGIN
  {
@@ -45,8 +40,8 @@
unshift @INC, $pkgdatadir;

# Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -44,7 +47,8 @@ use File::Basename;
- use strict;
+@@ -48,7 +51,8 @@ use Autom4te::General;
+ use Autom4te::XFile;

  # Data directory.
 -my $pkgdatadir = $ENV{'AC_MACRODIR'} || '@pkgdatadir@';
@@ -55,7 +50,7 @@

  # $LANGUAGE{LANGUAGE} -- Automatic options for LANGUAGE.
  my %language;
-@@ -87,7 +91,7 @@ my @include;
+@@ -91,7 +95,7 @@ my @include;
  my $freeze = 0;

  # $M4.
@@ -64,7 +59,7 @@
  # Some non-GNU m4's don't reject the --help option, so give them 
/dev/null.

  fatal "need GNU m4 1.4 or later: $m4"
if system "$m4 --help &1 | grep reload-state 
>/dev/null";

-@@ -269,6 +273,12 @@ sub load_configuration ($)
+@@ -272,6 +276,12 @@ sub load_configuration ($)

my @words = shellwords ($_);
my $type = shift @words;
@@ -79,22 +74,17 @@
  fatal "$file:$.: end-language missing for: $lang"
 --- a/bin/autoreconf.in
 +++ b/bin/autoreconf.in
-@@ -1,10 +1,12 @@
--#! @PERL@ -w
-+#! @PERL@
- # -*- perl -*-
- # @configure_input@
-
+@@ -5,6 +5,8 @@
  eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" 
"$@";; esac'

  if 0;

 +$^W = 1;
 +
  # autoreconf - install the GNU Build System in a directory tree
- # Copyright (C) 1994, 1999-2012 Free Software Foundation, Inc.
-
-@@ -26,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ # Copyright (C) 1994, 1999-2017, 2020 Free Software Foundation, Inc.

+@@ -31,7 +33,8 @@ use warnings FATAL => 'all';
+ my $buildauxdir;
  BEGIN
  {
 -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
@@ -10

Re: [PATCH 2/2] bcm4908: build flashable & bootable firmware images

2021-01-18 Thread Rafał Miłecki 

On 2021-01-18 12:50, Adrian Schmutzler wrote:

> Note that if you do apply these two "changes", you get rid of the
> COMPATIBLE variable at all for the proposed patch, and this is
> probably the reason why a variable like this is not needed for "build
> steps" in the other targets (at least those I know closer by now),
> which simply use DEVICE_NAME for stuff like that. :-)
>
> I'd personally prefer going that way, as using DEVICE_NAME would be
> more consistent and expectable for this matter.

This is repository started by Álvaro, I just followed existing schema 
there.
I don't really think I want to start discussion on that and suggest 
another

naming schema.

One more thing to consider is that more project that just OpenWrt may 
want
to use that repository. I use it e.g. in my buildroot. Such external 
projects

may find DTS "compatible" string more common that OpenWrt-specific
device name.


I recently invested a great effort into having DEVICE_NAME and
compatible consistent on a multitude of targets (except for "," vs.
"_", obviously).

So, technically it's not a big difference at the moment anyway. But
let's live with the current state of the cfe repo here for now.

However, I'd propose to still get rid of the COMPATIBLE variable and
construct the cfe name from DEVICE_NAME directly in the Build command:

cp $(KDIR)/bcm63xx-cfe/$(subst _,$(comma),$(DEVICE_NAME))/cferam.000 
$@-bootfs/


This will remove the additional variable by simply making the current
soft rule to have matching device definition name and compatible a
hard one.


Are you still planning on adding generic COMPATIBLE variable filling in 
the include/*.mk ? That would be nice to have I think.


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

RE: [PATCH 2/2] bcm4908: build flashable & bootable firmware images

2021-01-18 Thread Adrian Schmutzler 
> > Note that if you do apply these two "changes", you get rid of the
> > COMPATIBLE variable at all for the proposed patch, and this is
> > probably the reason why a variable like this is not needed for "build
> > steps" in the other targets (at least those I know closer by now),
> > which simply use DEVICE_NAME for stuff like that. :-)
> >
> > I'd personally prefer going that way, as using DEVICE_NAME would be
> > more consistent and expectable for this matter.
> 
> This is repository started by Álvaro, I just followed existing schema there.
> I don't really think I want to start discussion on that and suggest another
> naming schema.
> 
> One more thing to consider is that more project that just OpenWrt may want
> to use that repository. I use it e.g. in my buildroot. Such external projects
> may find DTS "compatible" string more common that OpenWrt-specific
> device name.

I recently invested a great effort into having DEVICE_NAME and compatible 
consistent on a multitude of targets (except for "," vs. "_", obviously).

So, technically it's not a big difference at the moment anyway. But let's live 
with the current state of the cfe repo here for now.

However, I'd propose to still get rid of the COMPATIBLE variable and construct 
the cfe name from DEVICE_NAME directly in the Build command:

cp $(KDIR)/bcm63xx-cfe/$(subst _,$(comma),$(DEVICE_NAME))/cferam.000 $@-bootfs/

This will remove the additional variable by simply making the current soft rule 
to have matching device definition name and compatible a hard one.

Best

Adrian


openpgp-digital-signature.asc
Description: PGP signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH 2/2] bcm4908: build flashable & bootable firmware images

2021-01-18 Thread Rafał Miłecki 

On 2021-01-18 12:29, Adrian Schmutzler wrote:
Do you mean "files" as "directories" (I know every dir is a file ;) )? 
If you talk

about "asus,gt-ac5300", it's used by the:
cp -r $(COMPATIBLE)/* $@-bootfs/
line in the Build/bcm4908img.


Ah, okay. Yes, I was referring to the directory names here. I
personally consider a comma in a file name a bit disturbing/confusing
and since it's not really necessary I'd simply switch to the
underscore naming scheme (like done for images and tmp dirs. ($@)
anyway) here.
That would mean changing the folder name to "asus_gt-ac5300" and the
referenced line to

cp -r $(DEVICE_NAME)/* $@-bootfs/

Since this is pure image building code at this point, using the device
definition name (DEVICE_NAME) also appears the more direct approach
here compared to the compatible which is the relevant identifier on
the _running_ device.


I agree with that reasoning and I like that idea of reusing DEVICE_NAME.



As for naming, I followed what's used by the bcm63xx-cfe repo:
https://github.com/openwrt/bcm63xx-cfe


Since these are used/selected at build time as well, I'd personally
also haven chosen the underscore naming (according to DEVICE_NAME) for
these.

Note that if you do apply these two "changes", you get rid of the
COMPATIBLE variable at all for the proposed patch, and this is
probably the reason why a variable like this is not needed for "build
steps" in the other targets (at least those I know closer by now),
which simply use DEVICE_NAME for stuff like that. :-)

I'd personally prefer going that way, as using DEVICE_NAME would be
more consistent and expectable for this matter.


This is repository started by Álvaro, I just followed existing schema 
there.
I don't really think I want to start discussion on that and suggest 
another

naming schema.

One more thing to consider is that more project that just OpenWrt may 
want to
use that repository. I use it e.g. in my buildroot. Such external 
projects may
find DTS "compatible" string more common that OpenWrt-specific device 
name.


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

RE: [PATCH 2/2] bcm4908: build flashable & bootable firmware images

2021-01-18 Thread Adrian Schmutzler 
> Do you mean "files" as "directories" (I know every dir is a file ;) )? If you 
> talk
> about "asus,gt-ac5300", it's used by the:
> cp -r $(COMPATIBLE)/* $@-bootfs/
> line in the Build/bcm4908img.

Ah, okay. Yes, I was referring to the directory names here. I personally 
consider a comma in a file name a bit disturbing/confusing and since it's not 
really necessary I'd simply switch to the underscore naming scheme (like done 
for images and tmp dirs. ($@) anyway) here.
That would mean changing the folder name to "asus_gt-ac5300" and the referenced 
line to

cp -r $(DEVICE_NAME)/* $@-bootfs/

Since this is pure image building code at this point, using the device 
definition name (DEVICE_NAME) also appears the more direct approach here 
compared to the compatible which is the relevant identifier on the _running_ 
device.

> 
> As for naming, I followed what's used by the bcm63xx-cfe repo:
> https://github.com/openwrt/bcm63xx-cfe

Since these are used/selected at build time as well, I'd personally also haven 
chosen the underscore naming (according to DEVICE_NAME) for these.

Note that if you do apply these two "changes", you get rid of the COMPATIBLE 
variable at all for the proposed patch, and this is probably the reason why a 
variable like this is not needed for "build steps" in the other targets (at 
least those I know closer by now), which simply use DEVICE_NAME for stuff like 
that. :-)

I'd personally prefer going that way, as using DEVICE_NAME would be more 
consistent and expectable for this matter.

Best

Adrian


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


openpgp-digital-signature.asc
Description: PGP signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[no subject]

2021-01-18 Thread Etan Kissling via openwrt-devel 
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
This allows libnetfilter_queue to access connection tracking information
by requesting NFQA_CFG_F_CONNTRACK. Connection tracking information is
provided in the NFQA_CT attribute.
CONFIG_NETFILTER_NETLINK_GLUE_CT enables the interaction between
nf_queue and nf_conntrack_netlink. Without this option, trying to access
connection tracking information results in "Operation not supported".

Signed-off-by: Etan Kissling 
(cherry picked from commit 39add246c1e18afc1fe026b5f359a3acf8082279)
Signed-off-by: Etan Kissling 
---
 package/kernel/linux/modules/netfilter.mk | 2 +-
 target/linux/generic/config-4.14  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/kernel/linux/modules/netfilter.mk 
b/package/kernel/linux/modules/netfilter.mk
index 53188eab5a..c1db9aa203 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -1013,7 +1013,7 @@ $(eval $(call KernelPackage,nfnetlink-queue))
 define KernelPackage/nf-conntrack-netlink
   TITLE:=Connection tracking netlink interface
   FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.ko
-  KCONFIG:=CONFIG_NF_CT_NETLINK CONFIG_NF_CONNTRACK_EVENTS=y
+  KCONFIG:=CONFIG_NF_CT_NETLINK CONFIG_NF_CONNTRACK_EVENTS=y 
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
   AUTOLOAD:=$(call AutoProbe,nf_conntrack_netlink)
   $(call AddDepends/nfnetlink,+kmod-ipt-conntrack)
 endef
diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index d54ede9efd..25b3de9f18 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -3252,6 +3252,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 # CONFIG_NF_CONNTRACK_ZONES is not set
 # CONFIG_NF_CT_NETLINK is not set
 # CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NF_CT_NETLINK_HELPER is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set
 # CONFIG_NF_CT_PROTO_GRE is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
-- 
2.21.1 (Apple Git-122.3)




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

[no subject]

2021-01-18 Thread Etan Kissling via openwrt-devel 
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
Switch to normal tarballs for simplicity.

Removed upstream patch.

Fixed license information.

Signed-off-by: Rosen Penev 
(cherry picked from packages commit b60aa5ffdb258c0c94b375c4e972c587b572b1a7)
Signed-off-by: Etan Kissling 
---
 package/libs/libnetfilter-queue/Makefile  |  18 +--
 .../patches/100-checksum_computation.patch| 113 --
 2 files changed, 9 insertions(+), 122 deletions(-)
 delete mode 100644 
package/libs/libnetfilter-queue/patches/100-checksum_computation.patch

diff --git a/package/libs/libnetfilter-queue/Makefile 
b/package/libs/libnetfilter-queue/Makefile
index 38f148ef07..01ce1f80d1 100644
--- a/package/libs/libnetfilter-queue/Makefile
+++ b/package/libs/libnetfilter-queue/Makefile
@@ -8,18 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnetfilter_queue
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.5
+PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=https://git.netfilter.org/libnetfilter_queue
-PKG_SOURCE_DATE:=2017-06-27
-PKG_SOURCE_VERSION:=601abd1c71ccdf90753cf294c120ad43fb25dc54
-PKG_MIRROR_HASH:=283b99cfe5856dc87fd6bab8f78c0c59b72462d6b4f2b13111f928cf33020eb3
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://www.netfilter.org/projects/libnetfilter_queue/files
+PKG_HASH:=f9ff3c11305d6e03d81405957bdc11aea18e0d315c3e3f48da53a24ba251b9f5
 
-PKG_FIXUP:=autoreconf
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
 
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,7 +28,7 @@ define Package/libnetfilter-queue
   CATEGORY:=Libraries
   DEPENDS:=+libmnl +libnfnetlink
   TITLE:=Userspace API to packets queued by kernel packet filter
-  URL:=http://www.netfilter.org/projects/libnetfilter_queue/
+  URL:=https://www.netfilter.org/projects/libnetfilter_queue/
   ABI_VERSION:=1
 endef
 
diff --git 
a/package/libs/libnetfilter-queue/patches/100-checksum_computation.patch 
b/package/libs/libnetfilter-queue/patches/100-checksum_computation.patch
deleted file mode 100644
index 92e750d510..00
--- a/package/libs/libnetfilter-queue/patches/100-checksum_computation.patch
+++ /dev/null
@@ -1,113 +0,0 @@
 a/src/extra/checksum.c
-+++ b/src/extra/checksum.c
-@@ -11,6 +11,7 @@
- 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -26,8 +27,13 @@ uint16_t nfq_checksum(uint32_t sum, uint
-   sum += *buf++;
-   size -= sizeof(uint16_t);
-   }
--  if (size)
--  sum += *(uint8_t *)buf;
-+  if (size) {
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+  sum += (uint16_t)*(uint8_t *)buf << 8;
-+#else
-+  sum += (uint16_t)*(uint8_t *)buf;
-+#endif
-+  }
- 
-   sum = (sum >> 16) + (sum & 0x);
-   sum += (sum >>16);
-@@ -35,7 +41,7 @@ uint16_t nfq_checksum(uint32_t sum, uint
-   return (uint16_t)(~sum);
- }
- 
--uint16_t nfq_checksum_tcpudp_ipv4(struct iphdr *iph)
-+uint16_t nfq_checksum_tcpudp_ipv4(struct iphdr *iph, uint16_t protocol_id)
- {
-   uint32_t sum = 0;
-   uint32_t iph_len = iph->ihl*4;
-@@ -46,13 +52,13 @@ uint16_t nfq_checksum_tcpudp_ipv4(struct
-   sum += (iph->saddr) & 0x;
-   sum += (iph->daddr >> 16) & 0x;
-   sum += (iph->daddr) & 0x;
--  sum += htons(IPPROTO_TCP);
-+  sum += htons(protocol_id);
-   sum += htons(len);
- 
-   return nfq_checksum(sum, (uint16_t *)payload, len);
- }
- 
--uint16_t nfq_checksum_tcpudp_ipv6(struct ip6_hdr *ip6h, void *transport_hdr)
-+uint16_t nfq_checksum_tcpudp_ipv6(struct ip6_hdr *ip6h, void *transport_hdr, 
uint16_t protocol_id)
- {
-   uint32_t sum = 0;
-   uint32_t hdr_len = (uint32_t *)transport_hdr - (uint32_t *)ip6h;
-@@ -68,7 +74,7 @@ uint16_t nfq_checksum_tcpudp_ipv6(struct
-   sum += (ip6h->ip6_dst.s6_addr16[i] >> 16) & 0x;
-   sum += (ip6h->ip6_dst.s6_addr16[i]) & 0x;
-   }
--  sum += htons(IPPROTO_TCP);
-+  sum += htons(protocol_id);
-   sum += htons(ip6h->ip6_plen);
- 
-   return nfq_checksum(sum, (uint16_t *)payload, len);
 a/src/extra/tcp.c
-+++ b/src/extra/tcp.c
-@@ -96,7 +96,7 @@ nfq_tcp_compute_checksum_ipv4(struct tcp
- {
-   /* checksum field in header needs to be zero for calculation. */
-   tcph->check = 0;
--  tcph->check = nfq_checksum_tcpudp_ipv4(iph);
-+  tcph->check = nfq_checksum_tcpudp_ipv4(iph, IPPROTO_TCP);
- }
- EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv4);
- 
-@@ -110,7 +110,7 @@ nfq_tcp_compute_checksum_ipv6(struct tcp
- {
-   /* checksum field in header needs to be zero for calculation. */
-   tcph->check = 0;
--  tcph->check = nfq_checksum_tcpudp_ipv6(ip6h, tcph);
-+  tcph->check = nfq_checksum_tcpudp_ipv

[PATCH V2] bcm4908: build flashable & bootable firmware images

2021-01-18 Thread Rafał Miłecki 
From: Rafał Miłecki 

BCM4908 bootloader requires firmware with JFFS2 image containing:
1. cferam.000
2. 94908.dtb
3. vmlinux.lz
4. device custom files

cferam.000 can be obtained from the bcm63xx-cfe repository. It requires
specifying directory path that is defined using COMPATIBLE variable.

For convenience directories with device custom files are named the same
way.

Signed-off-by: Rafał Miłecki 
---
V2: Use SUPPORTED_DEVICES
---
 target/linux/bcm4908/image/Makefile | 17 +
 .../image/asus,gt-ac5300/rom/etc/image_ident|  2 ++
 .../image/asus,gt-ac5300/rom/etc/image_version  |  1 +
 .../image/netgear,r8000p/etc/image_ident|  4 
 .../image/netgear,r8000p/etc/image_version  |  1 +
 5 files changed, 25 insertions(+)
 create mode 100644 
target/linux/bcm4908/image/asus,gt-ac5300/rom/etc/image_ident
 create mode 100644 
target/linux/bcm4908/image/asus,gt-ac5300/rom/etc/image_version
 create mode 100644 target/linux/bcm4908/image/netgear,r8000p/etc/image_ident
 create mode 100644 target/linux/bcm4908/image/netgear,r8000p/etc/image_version

diff --git a/target/linux/bcm4908/image/Makefile 
b/target/linux/bcm4908/image/Makefile
index f5db38915d..03af253381 100644
--- a/target/linux/bcm4908/image/Makefile
+++ b/target/linux/bcm4908/image/Makefile
@@ -13,6 +13,19 @@ define Build/bcm4908kernel
mv $@.new $@
 endef
 
+define Build/bcm4908img
+   rm -fr $@-bootfs
+   mkdir -p $@-bootfs
+   cp -r $(firstword $(SUPPORTED_DEVICES))/* $@-bootfs/
+   touch $@-bootfs/1-dummy
+   cp $(DTS_DIR)/$(firstword $(DEVICE_DTS)).dtb $@-bootfs/94908.dtb
+   cp $(KDIR)/bcm63xx-cfe/$(firstword $(SUPPORTED_DEVICES))/cferam.000 
$@-bootfs/
+   cp $(IMAGE_KERNEL) $@-bootfs/vmlinux.lz
+
+   $(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad --little-endian --squash-uids 
-v -e 128KiB -o $@-bootfs.jffs2 -d $@-bootfs -m none -n
+   $(STAGING_DIR_HOST)/bin/bcm4908img create $@ -f $@-bootfs.jffs2
+endef
+
 define Device/Default
   KERNEL := kernel-bin | bcm4908lzma | bcm4908kernel
   KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
@@ -29,7 +42,9 @@ define Device/asus_gt-ac5300
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := GT-AC5300
   DEVICE_DTS := broadcom/bcm4908/bcm4908-asus-gt-ac5300
+  SUPPORTED_DEVICES := asus,gt-ac5300
   IMAGES := bin
+  IMAGE/bin := bcm4908img
 endef
 TARGET_DEVICES += asus_gt-ac5300
 
@@ -37,7 +52,9 @@ define Device/netgear_r8000p
   DEVICE_VENDOR := Netgear
   DEVICE_MODEL := R8000P
   DEVICE_DTS := broadcom/bcm4908/bcm4906-netgear-r8000p
+  SUPPORTED_DEVICES := netgear,r8000p
   IMAGES := bin
+  IMAGE/bin := bcm4908img
 endef
 TARGET_DEVICES += netgear_r8000p
 
diff --git a/target/linux/bcm4908/image/asus,gt-ac5300/rom/etc/image_ident 
b/target/linux/bcm4908/image/asus,gt-ac5300/rom/etc/image_ident
new file mode 100644
index 00..9e73fe74a7
--- /dev/null
+++ b/target/linux/bcm4908/image/asus,gt-ac5300/rom/etc/image_ident
@@ -0,0 +1,2 @@
+@(#) $imageversion: HND1731918 $
+@(#) $imageversion: HND1731918 $
diff --git a/target/linux/bcm4908/image/asus,gt-ac5300/rom/etc/image_version 
b/target/linux/bcm4908/image/asus,gt-ac5300/rom/etc/image_version
new file mode 100644
index 00..fd67746f78
--- /dev/null
+++ b/target/linux/bcm4908/image/asus,gt-ac5300/rom/etc/image_version
@@ -0,0 +1 @@
+HND1731918
diff --git a/target/linux/bcm4908/image/netgear,r8000p/etc/image_ident 
b/target/linux/bcm4908/image/netgear,r8000p/etc/image_ident
new file mode 100644
index 00..15cb69d1af
--- /dev/null
+++ b/target/linux/bcm4908/image/netgear,r8000p/etc/image_ident
@@ -0,0 +1,4 @@
+@(#) $imageversion: 5024HNDrc11R8000P2602103 $
+@(#) $imageversion: 5024HNDrc11R8000P2602103 $
+@(#) $changelist: Changelist: 
REL_502HND04rc11_BISON04T_REL_7_14_170_34Revision:   765096 $
+@(#) $changelist: Changelist: 
REL_502HND04rc11_BISON04T_REL_7_14_170_34Revision:   765096 $
diff --git a/target/linux/bcm4908/image/netgear,r8000p/etc/image_version 
b/target/linux/bcm4908/image/netgear,r8000p/etc/image_version
new file mode 100644
index 00..f469dfed31
--- /dev/null
+++ b/target/linux/bcm4908/image/netgear,r8000p/etc/image_version
@@ -0,0 +1 @@
+5024HNDrc11R8000P2602103
-- 
2.26.2


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

[no subject]

2021-01-18 Thread Etan Kissling via openwrt-devel 
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
This adds a config option to allow compiling with HKDF algorithm support
to support applications that require this feature.

Signed-off-by: Etan Kissling 
(cherry picked from commit 02abd99f89d98344d086d95b1ec1dfa9901351aa)
Signed-off-by: Etan Kissling 
---
 package/libs/mbedtls/Makefile | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 04033b1e47..ea8df0783c 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -20,7 +20,9 @@ PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0+
 PKG_CPE_ID:=cpe:/a:arm:mbed_tls
 
-PKG_CONFIG_DEPENDS:=CONFIG_LIBMBEDTLS_DEBUG_C
+PKG_CONFIG_DEPENDS := \
+   CONFIG_LIBMBEDTLS_DEBUG_C \
+   CONFIG_LIBMBEDTLS_HKDF_C
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -56,6 +58,14 @@ config LIBMBEDTLS_DEBUG_C
 by around 60 KiB (for an ARMv5 platform).
 
 Usually, you don't need this, so don't select this if you're unsure.
+
+config LIBMBEDTLS_HKDF_C
+   depends on PACKAGE_libmbedtls
+   bool "Enable the HKDF algorithm (RFC 5869)"
+   default n
+   help
+This option adds support for the Hashed Message Authentication Code
+(HMAC)-based key derivation function (HKDF).
 endef
 
 define Package/mbedtls-util
@@ -96,6 +106,13 @@ define Build/Configure
 END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \
 >$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \
mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new 
$(PKG_BUILD_DIR)/include/mbedtls/config.h
+
+   awk 'BEGIN { rc = 1 } \
+/#define MBEDTLS_HKDF_C/ { 0 = "$(if 
$(CONFIG_LIBMBEDTLS_HKDF_C),,// )#define MBEDTLS_HKDF_C"; rc = 0 } \
+{ print } \
+END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \
+>$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \
+   mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new 
$(PKG_BUILD_DIR)/include/mbedtls/config.h
 endef
 
 define Build/InstallDev
-- 
2.21.1 (Apple Git-122.3)




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

[no subject]

2021-01-18 Thread Etan Kissling via openwrt-devel 
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
This enables the CTRL_IFACE_MIB symbol for wpad-full and hostapd-full.
If it is not enabled, statistic outputs such as "hostapd_cli all_sta"
are empty.

Signed-off-by: David Bauer 
(cherry picked from commit 1ccf4bb93b0304c3c32a8a31a711a6ab889fd47a)
Signed-off-by: Etan Kissling 
---
 package/network/services/hostapd/files/hostapd-basic.config  | 5 +
 package/network/services/hostapd/files/hostapd-full.config   | 5 +
 package/network/services/hostapd/files/hostapd-mini.config   | 5 +
 .../services/hostapd/files/wpa_supplicant-basic.config   | 5 +
 .../services/hostapd/files/wpa_supplicant-full.config| 5 +
 .../services/hostapd/files/wpa_supplicant-mini.config| 5 +
 .../network/services/hostapd/files/wpa_supplicant-p2p.config | 5 +
 7 files changed, 35 insertions(+)

diff --git a/package/network/services/hostapd/files/hostapd-basic.config 
b/package/network/services/hostapd/files/hostapd-basic.config
index 461b178433..19ea850f6b 100644
--- a/package/network/services/hostapd/files/hostapd-basic.config
+++ b/package/network/services/hostapd/files/hostapd-basic.config
@@ -394,3 +394,8 @@ CONFIG_TLS=internal
 # Services can connect to the bus and provide methods
 # that can be called by other services or clients.
 CONFIG_UBUS=y
+
+# OpenWrt patch 380-disable-ctrl-iface-mib.patch
+# leads to the MIB only being compiled in if
+# CONFIG_CTRL_IFACE_MIB is enabled.
+#CONFIG_CTRL_IFACE_MIB=y
diff --git a/package/network/services/hostapd/files/hostapd-full.config 
b/package/network/services/hostapd/files/hostapd-full.config
index 5c9fbed2e4..0ecce423e7 100644
--- a/package/network/services/hostapd/files/hostapd-full.config
+++ b/package/network/services/hostapd/files/hostapd-full.config
@@ -394,3 +394,8 @@ CONFIG_TAXONOMY=y
 # Services can connect to the bus and provide methods
 # that can be called by other services or clients.
 CONFIG_UBUS=y
+
+# OpenWrt patch 380-disable-ctrl-iface-mib.patch
+# leads to the MIB only being compiled in if
+# CONFIG_CTRL_IFACE_MIB is enabled.
+CONFIG_CTRL_IFACE_MIB=y
diff --git a/package/network/services/hostapd/files/hostapd-mini.config 
b/package/network/services/hostapd/files/hostapd-mini.config
index f31e6467b0..d9511441e6 100644
--- a/package/network/services/hostapd/files/hostapd-mini.config
+++ b/package/network/services/hostapd/files/hostapd-mini.config
@@ -394,3 +394,8 @@ CONFIG_TLS=internal
 # Services can connect to the bus and provide methods
 # that can be called by other services or clients.
 CONFIG_UBUS=y
+
+# OpenWrt patch 380-disable-ctrl-iface-mib.patch
+# leads to the MIB only being compiled in if
+# CONFIG_CTRL_IFACE_MIB is enabled.
+#CONFIG_CTRL_IFACE_MIB=y
diff --git a/package/network/services/hostapd/files/wpa_supplicant-basic.config 
b/package/network/services/hostapd/files/wpa_supplicant-basic.config
index e2bd1866c4..a9da65deed 100644
--- a/package/network/services/hostapd/files/wpa_supplicant-basic.config
+++ b/package/network/services/hostapd/files/wpa_supplicant-basic.config
@@ -618,3 +618,8 @@ CONFIG_GETRANDOM=y
 # Services can connect to the bus and provide methods
 # that can be called by other services or clients.
 CONFIG_UBUS=y
+
+# OpenWrt patch 380-disable-ctrl-iface-mib.patch
+# leads to the MIB only being compiled in if
+# CONFIG_CTRL_IFACE_MIB is enabled.
+#CONFIG_CTRL_IFACE_MIB=y
diff --git a/package/network/services/hostapd/files/wpa_supplicant-full.config 
b/package/network/services/hostapd/files/wpa_supplicant-full.config
index e5a6752a8e..982f4d5534 100644
--- a/package/network/services/hostapd/files/wpa_supplicant-full.config
+++ b/package/network/services/hostapd/files/wpa_supplicant-full.config
@@ -618,3 +618,8 @@ CONFIG_IBSS_RSN=y
 # Services can connect to the bus and provide methods
 # that can be called by other services or clients.
 CONFIG_UBUS=y
+
+# OpenWrt patch 380-disable-ctrl-iface-mib.patch
+# leads to the MIB only being compiled in if
+# CONFIG_CTRL_IFACE_MIB is enabled.
+CONFIG_CTRL_IFACE_MIB=y
diff --git a/package/network/services/hostapd/files/wpa_supplicant-mini.config 
b/package/network/services/hostapd/files/wpa_supplicant-mini.config
index 6af4693c53..850d22febc 100644
--- a/package/network/services/hostapd/files/wpa_supplicant-mini.config
+++ b/package/network/services/hostapd/files/wpa_supplicant-mini.config
@@ -618,3 +618,8 @@ CONFIG_GETRANDOM=y
 # Services can connect to the bus and provide methods
 # that can be called by other services or clients.
 CONFIG_UBUS=y
+
+# OpenWrt patch 380-disable-ctrl-iface-mib.patch
+# leads to the MIB only being compiled in if
+# CONFIG_CTRL_IFACE_MIB is enabled.
+#CONFIG_CTRL_IFACE_MIB=y
diff --git a/package/network/services/hostapd/files/wpa_supplicant-p2p.config 
b/package

[no subject]

2021-01-18 Thread Etan Kissling via openwrt-devel 
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
This allows configuration of multicast_to_unicast and per_sta_vif options.
- multicast_to_unicast requests multicast-to-unicast conversion.
- per_sta_vif assigns each station its own AP_VLAN interface.

Signed-off-by: Etan Kissling 
(cherry picked from commit 7babb978ad9d7fc29acb1ff86afb1eb343af303a)
Signed-off-by: Etan Kissling 
---
 package/network/services/hostapd/files/hostapd.sh | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/network/services/hostapd/files/hostapd.sh 
b/package/network/services/hostapd/files/hostapd.sh
index 79e71616dc..603b5a0c80 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -245,6 +245,8 @@ hostapd_common_add_bss_config() {
config_add_boolean sae_require_mfp

config_add_string 'owe_transition_bssid:macaddr' 
'owe_transition_ssid:string'
+
+   config_add_boolean multicast_to_unicast per_sta_vif
 }
 
 hostapd_set_bss_options() {
@@ -267,7 +269,8 @@ hostapd_set_bss_options() {
iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
acct_server acct_secret acct_port acct_interval \
bss_load_update_period chan_util_avg_period sae_require_mfp \
-   multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key
+   multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key \
+   multicast_to_unicast per_sta_vif
 
set_default isolate 0
set_default maxassoc 0
@@ -627,6 +630,16 @@ hostapd_set_bss_options() {
}
}
 
+   set_default multicast_to_unicast 0
+   if [ "$multicast_to_unicast" -gt 0 ]; then
+   append bss_conf "multicast_to_unicast=$multicast_to_unicast" 
"$N"
+   fi
+
+   set_default per_sta_vif 0
+   if [ "$per_sta_vif" -gt 0 ]; then
+   append bss_conf "per_sta_vif=$per_sta_vif" "$N"
+   fi
+
append "$var" "$bss_conf" "$N"
return 0
 }
-- 
2.21.1 (Apple Git-122.3)




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

[no subject]

2021-01-18 Thread Etan Kissling via openwrt-devel 
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
This adds a config option to allow compiling with HKDF algorithm support
to support applications that require this feature.

Signed-off-by: Etan Kissling 
(cherry picked from commit 02abd99f89d98344d086d95b1ec1dfa9901351aa)
---
 package/libs/mbedtls/Makefile | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 04033b1e47..ea8df0783c 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -20,7 +20,9 @@ PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0+
 PKG_CPE_ID:=cpe:/a:arm:mbed_tls
 
-PKG_CONFIG_DEPENDS:=CONFIG_LIBMBEDTLS_DEBUG_C
+PKG_CONFIG_DEPENDS := \
+   CONFIG_LIBMBEDTLS_DEBUG_C \
+   CONFIG_LIBMBEDTLS_HKDF_C
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -56,6 +58,14 @@ config LIBMBEDTLS_DEBUG_C
 by around 60 KiB (for an ARMv5 platform).
 
 Usually, you don't need this, so don't select this if you're unsure.
+
+config LIBMBEDTLS_HKDF_C
+   depends on PACKAGE_libmbedtls
+   bool "Enable the HKDF algorithm (RFC 5869)"
+   default n
+   help
+This option adds support for the Hashed Message Authentication Code
+(HMAC)-based key derivation function (HKDF).
 endef
 
 define Package/mbedtls-util
@@ -96,6 +106,13 @@ define Build/Configure
 END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \
 >$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \
mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new 
$(PKG_BUILD_DIR)/include/mbedtls/config.h
+
+   awk 'BEGIN { rc = 1 } \
+/#define MBEDTLS_HKDF_C/ { 0 = "$(if 
$(CONFIG_LIBMBEDTLS_HKDF_C),,// )#define MBEDTLS_HKDF_C"; rc = 0 } \
+{ print } \
+END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \
+>$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \
+   mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new 
$(PKG_BUILD_DIR)/include/mbedtls/config.h
 endef
 
 define Build/InstallDev
-- 
2.21.1 (Apple Git-122.3)




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

Re: [PATCH] iperf3: move over to packages.git

2021-01-18 Thread Paul Spooren 




On Mo, Jan 18, 2021 at 08:05, Florian Eckert  wrote:




That package is not required for building OpenWrt so the maintenance
should happen over at packages.git.

Sounds about right. I think most people prefer to use iperf anyway...


But then I would also move the iperf package to the package feed.


Agree, patch sent.





CC: Felix Fietkau 

Signed-off-by: Paul Spooren 

Reviewed-by: Rosen Penev 
Reviewed-by: Florian Eckert 
---
 package/network/utils/iperf3/Makefile | 83 
---

 1 file changed, 83 deletions(-)
 delete mode 100644 package/network/utils/iperf3/Makefile

diff --git a/package/network/utils/iperf3/Makefile 
b/package/network/utils/iperf3/Makefile

deleted file mode 100644
index 6f90bc9221..00
--- a/package/network/utils/iperf3/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Copyright (C) 2007-2010 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:=iperf
-PKG_VERSION:=3.9
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://downloads.es.net/pub/iperf
-PKG_HASH:=24b63a26382325f759f11d421779a937b63ca1bc17c44587d2fcfedab60ac038
-
-PKG_MAINTAINER:=Felix Fietkau 
-PKG_LICENSE:=BSD-3-Clause
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-DISABLE_NLS:=
-
-define Package/iperf3/default
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Internet Protocol bandwidth measuring tool
-  URL:=https://github.com/esnet/iperf
-endef
-
-define Package/iperf3
-$(call Package/iperf3/default)
-  VARIANT:=nossl
-endef
-
-define Package/iperf3-ssl
-$(call Package/iperf3/default)
-  TITLE+= with iperf_auth support
-  VARIANT:=ssl
-  DEPENDS:= +libopenssl
-endef
-
-TARGET_CFLAGS += -D_GNU_SOURCE
-CONFIGURE_ARGS += --disable-shared
-
-ifeq ($(BUILD_VARIANT),ssl)
-   CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr"
-else
-   CONFIGURE_ARGS += --without-openssl
-endif
-
-MAKE_FLAGS += noinst_PROGRAMS=
-
-define Package/iperf3/description
- Iperf is a modern alternative for measuring TCP and UDP bandwidth
- performance, allowing the tuning of various parameters and
- characteristics.
-endef
-
-# autoreconf fails if the README file isn't present
-define Build/Prepare
-   $(call Build/Prepare/Default)
-   touch $(PKG_BUILD_DIR)/README
-endef
-
-define Package/iperf3/install
-   $(INSTALL_DIR) $(1)/usr/bin
-   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/iperf3 
$(1)/usr/bin/

-endef
-
-define Package/iperf3-ssl/install
-   $(INSTALL_DIR) $(1)/usr/bin
-   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/iperf3 
$(1)/usr/bin/

-endef
-
-$(eval $(call BuildPackage,iperf3))
-$(eval $(call BuildPackage,iperf3-ssl))
--
2.29.2


___
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




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