Update feed [ iopsys ] package [ dectmngr ]

-------------------------------------------------------------------------------
* 31602a48ca2a Makefile: Add -fcommon to CFLAGS
* 90979cf89bec app: ListAccess: sqlite: Ignore false return-local-addr warning
* c774379484a9 app: appcmbs: Fix inconsistent/misleading indentation
* b1694cb4a5fe Fix compilation with 64-bit time_t
* 56435633a6b4 Fix for setting extension_id for handset
-------------------------------------------------------------------------------
commit 31602a48ca2aee60d70a770834021100d4a17e6f
Author: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: 2022-06-28 08:36:08 +0200

    Makefile: Add -fcommon to CFLAGS

    Add -fcommon to CFLAGS. Newer GCC and clang use -fno-common as default.
    Unfortunately, a larger part of third-party code defines variables in
    header-files. Explicitly set -fcommon for now to make the code compile with
    newer compilers. In the long term, the code should be fixed.

    Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

Base directory -> /
 app/Makefile | 5 +++++
 1 file changed, 5 insertions(+)
-------------------------------------------------------------------------------
commit 90979cf89beccb55eff24519034179fa197182ce
Author: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: 2022-06-28 08:32:23 +0200

    app: ListAccess: sqlite: Ignore false return-local-addr warning

    The vendored copy of sqlite emits a -Wreturn-local-addr in its
    sqlite3SelectNew function. It has been fixed in sqlite 3.33, but this copy
    of sqlite is version 3.8.2 from 2013.  ignore the warning using gcc-pragmas,
    because we know it is not a problem.

    See also: https://www.sqlite.org/src/vinfo/04e1edd8e5821a37

    Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

Base directory -> /
 app/ListAccess/sqlite3.c | 3 +++
 1 file changed, 3 insertions(+)
-------------------------------------------------------------------------------
commit c774379484a9dbfe8dbdd11218786b7cda715b82
Author: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: 2022-06-28 08:28:47 +0200

    app: appcmbs: Fix inconsistent/misleading indentation

    Fixes warning caused by inconsistent and misleading intentation.

    ./appcmbs/appcmbs.c: In function 'appcmbs_WaitForContainer':
    ./appcmbs/appcmbs.c:348:6: error: this 'if' clause does not guard...
     [-Werror=misleading-indentation]
     348 |      if (g_stSwupSetup.inProgress == false)
         |      ^~
    ./appcmbs/appcmbs.c:351:9: note: ...this statement, but the latter is
     misleadingly indented as if it were guarded by the 'if'
     351 |         while (bo_Run)
         |         ^~~~~

    Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

Base directory -> /
 app/appcmbs/appcmbs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit b1694cb4a5fe12394238f56a1db8a61441bae946
Author: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: 2022-06-28 08:24:19 +0200

    Fix compilation with 64-bit time_t

    Fix compilation with 64-bit time_t introduced in musl 1.2.0.
    https://musl.libc.org/time64.html

    Most likely, this can also be reproduced using -D_TIME_BITS=64 on
    glibc-based systems.

    * ListAccess/ListsApp.c:882:107: error: format '%ld' expects argument of
     type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [Werror=format=]
    * ListAccess/ListsApp.c:1015:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [Werror=format=]
    * ListAccess/ListsApp.c:1274:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [-Werror=format=]
    * ListAccess/ListsApp.c:1783:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [-Werror=format=]
    * ListAccess/ListsApp.c:2126:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [-Werror=format=]
    * ListAccess/ListsApp.c:2589:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [-Werror=format=]

    * tcx_hostlog.c:478:94: error: format '%ld' expects argument of type
     'long int', but argument 9 has type 'suseconds_t'
     {aka 'long long int'} [-Werror=format=]
    * tcx_hostlog.c:525:94: error: format '%ld' expects argument of type
     'long int', but argument 9 has type 'suseconds_t'
     {aka 'long long int'} [-Werror=format=]

    * tcx_log.c:392:93: error: format '%ld' expects argument of type 'long
     int', but argument 9 has type 'suseconds_t'
     {aka 'long long int'} [-Werror=format=]

    Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

Base directory -> /
 app/ListAccess/ListsApp.c | 13 +++++++------
 app/tcx_hostlog.c         |  9 +++++----
 app/tcx_log.c             |  5 +++--
 3 files changed, 15 insertions(+), 12 deletions(-)
-------------------------------------------------------------------------------
commit 56435633a6b4f711ccfe7a4a6917b506d71ed3b4
Author: Grzegorz Sluja <grzegorz.sluja@iopsys.eu>
Date: 2022-06-24 07:21:16 +0000

    Fix for setting extension_id for handset

Base directory -> /
 app/dect_common.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------

bbf/Makefile

@@ -9,7 +9,7 @@ PKG_VERSION:=6.8.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=3f1d9e6b90a7efe08a3c4aa5323056edb89bc6a7
+PKG_SOURCE_VERSION:=d5798272529997b95decbefca5ead23d94244922
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

dectmngr/Makefile

@@ -14,7 +14,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0b48e92372c737855569c0b4f7966da7b06ec6b1
+PKG_SOURCE_VERSION:=31602a48ca2aee60d70a770834021100d4a17e6f
 PKG_MIRROR_HASH:=skip
 endif
 

endptmngr/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=c099d6b0438f945d91bf3c9718da730a8a52ff27
+PKG_SOURCE_VERSION:=20bdf55cd51274d405899f7cb79792abd3471548
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

ieee1905/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=4.9.3
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3281325085dfdd6d4d181c944daaf4623969a94e
+PKG_SOURCE_VERSION:=2ade9696979624031ac2144da24cb41347b0a8d2
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

ieee1905/patches/0001-timer-Use-uloop_timeout_remaining64.patch

@@ -0,0 +1,43 @@
+From 34eeb30ed57f13a4d69b0e7abb97b7f2871f963d Mon Sep 17 00:00:00 2001
+From: Andreas Gnau <andreas.gnau@iopsys.eu>
+Date: Thu, 23 Jun 2022 12:31:21 +0200
+Subject: [PATCH] timer: Use uloop_timeout_remaining64
+
+Fixes error: 'uloop_timeout_remaining' is deprecated: use
+uloop_timeout_remaining64 [-Werror=deprecated-declarations]
+
+Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
+---
+ src/timer.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/timer.c b/src/timer.c
+index ce749a2d6ee6..49f86944441f 100644
+--- a/src/timer.c
++++ b/src/timer.c
+@@ -19,6 +19,7 @@
+ #endif
+ 
+ #include "timer.h"
++#include <stdint.h>
+ 
+ void timer_init(atimer_t *t, void (*function)(atimer_t *))
+ {
+@@ -43,12 +44,11 @@ int timer_del(atimer_t *t)
+ 
+ int timer_pending(atimer_t *t)
+ {
+-	int ret;
++	int64_t ret;
+ 
+ 	struct uloop_timeout *ut = (struct uloop_timeout *)t;
+ 
+-	ret = uloop_timeout_remaining(ut);
++	ret = uloop_timeout_remaining64(ut);
+ 
+ 	return (ret < 0) ? 0 : 1;
+ }
+-
+-- 
+2.36.1
+

iop/config

@@ -115,7 +115,7 @@ CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_miniupnpd-iptables=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -136,7 +136,7 @@ CONFIG_PACKAGE_ethtool=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables=y
+CONFIG_PACKAGE_iptables-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
@@ -284,3 +284,10 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
+
+# Use fw3 iptables-based instead of newer nftables-based fw4
+# TODO: for now we cannot build an image with fw3 and luci-app-firewall (i.e. fw3)
+# Enabling luci-app-firewall enables fw4
+# CONFIG_PACKAGE_luci-app-firewall is not set
+CONFIG_PACKAGE_firewall=y
+# CONFIG_PACKAGE_firewall4 is not set

iop/scripts/feeds_update.sh

@@ -36,6 +36,17 @@ function feeds_update {
 		./scripts/feeds install -p targets $target
 	done
 
+	# Workaround for bug in 22.03.0-rc4 where installed target path has been
+	# moved to target/linux/feeds but Config.in and Makefile from installed
+	# targets are not properly included from the new location.
+	# This hack is to be removed once the issues are fixed.
+	# Note that the above block of code might no longer necessary because
+	# targets no longer need to be installed explicitly.
+	echo "Working around installed-target-bug"
+	for f in target/linux/feeds/*; do
+		ln -vsf "feeds/$(basename "$f")" "target/linux/$(basename "$f")"
+	done
+
 	# install all packages
 	./scripts/feeds install -a
 

iop/scripts/genconfig.sh

@@ -13,11 +13,11 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
-	ramips="target/linux/iopsys-ramips"
-	econet="target/linux/iopsys-econet"
-	x86="target/linux/iopsys-x86"
-	armvirt="target/linux/iopsys-armvirt"
+	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
+	ramips="target/linux/feeds/iopsys-ramips"
+	econet="target/linux/feeds/iopsys-econet"
+	x86="target/linux/feeds/iopsys-x86"
+	armvirt="target/linux/feeds/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -83,8 +83,8 @@ function genconfig {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
-			local targetpath="./target/linux/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
+			local targetpath="./target/linux/feeds/$TARGET"
 			local profiles=
 			local pfound=0
 

iop/scripts/genconfig_min.sh

@@ -12,11 +12,11 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
-	ramips="target/linux/iopsys-ramips"
-	econet="target/linux/iopsys-econet"
-	x86="target/linux/iopsys-x86"
-	armvirt="target/linux/iopsys-armvirt"
+	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
+	ramips="target/linux/feeds/iopsys-ramips"
+	econet="target/linux/feeds/iopsys-econet"
+	x86="target/linux/feeds/iopsys-x86"
+	armvirt="target/linux/feeds/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -82,8 +82,8 @@ function genconfig_min {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
-			local targetpath="./target/linux/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
+			local targetpath="./target/linux/feeds/$TARGET"
 			local profiles=
 			local pfound=0
 

map-topology/patches/0001-timer-Use-uloop_timeout_remaining64.patch

@@ -0,0 +1,43 @@
+From a0ba4512bbcb68d207dadddd616172072ded0302 Mon Sep 17 00:00:00 2001
+From: Andreas Gnau <andreas.gnau@iopsys.eu>
+Date: Thu, 23 Jun 2022 17:58:51 +0200
+Subject: [PATCH] timer: Use uloop_timeout_remaining64
+
+Fixes error: 'uloop_timeout_remaining' is deprecated: use
+uloop_timeout_remaining64 [-Werror=deprecated-declarations].
+
+Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
+---
+ src/timer.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/timer.c b/src/timer.c
+index e6e2f6ceb72a..373f9aa7a76e 100644
+--- a/src/timer.c
++++ b/src/timer.c
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <signal.h>
+@@ -44,12 +45,11 @@ int timer_del(atimer_t *t)
+ 
+ int timer_pending(atimer_t *t)
+ {
+-	int ret;
++	int64_t ret;
+ 
+ 	struct uloop_timeout *ut = (struct uloop_timeout *)t;
+ 
+-	ret = uloop_timeout_remaining(ut);
++	ret = uloop_timeout_remaining64(ut);
+ 
+ 	return (ret < 0) ? 0 : 1;
+ }
+-
+-- 
+2.36.1
+

wfadatad/patches/0001-timer-Use-uloop_timeout_remaining64.patch

@@ -0,0 +1,43 @@
+From d4b03e7fe288a006965463f74374e9da6e0f829b Mon Sep 17 00:00:00 2001
+From: Andreas Gnau <andreas.gnau@iopsys.eu>
+Date: Thu, 23 Jun 2022 15:18:30 +0200
+Subject: [PATCH] timer: Use uloop_timeout_remaining64
+
+Fixes error: 'uloop_timeout_remaining' is deprecated: use
+uloop_timeout_remaining64 [-Werror=deprecated-declarations].
+
+Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
+---
+ src/timer.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/timer.c b/src/timer.c
+index e6e2f6ceb72a..373f9aa7a76e 100644
+--- a/src/timer.c
++++ b/src/timer.c
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <signal.h>
+@@ -44,12 +45,11 @@ int timer_del(atimer_t *t)
+ 
+ int timer_pending(atimer_t *t)
+ {
+-	int ret;
++	int64_t ret;
+ 
+ 	struct uloop_timeout *ut = (struct uloop_timeout *)t;
+ 
+-	ret = uloop_timeout_remaining(ut);
++	ret = uloop_timeout_remaining64(ut);
+ 
+ 	return (ret < 0) ? 0 : 1;
+ }
+-
+-- 
+2.36.1
+