Christian Marangi [Mon, 15 May 2023 16:44:52 +0000 (18:44 +0200)]
nginx-util: add version to UCI conf template
Add versioning to UCI conf template as a commented version.
This permits the introduction of migration script since the template is
saved and restored config restore. The migration script are handled by
nginx init.d script.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
W. Michael Petullo [Fri, 19 May 2023 15:41:29 +0000 (10:41 -0500)]
vips: update to 8.14.2
Signed-off-by: W. Michael Petullo <mike@flyn.org>
Oskari Rauta [Fri, 19 May 2023 18:14:59 +0000 (21:14 +0300)]
zmq: fix gcc 13 errors
gcc 13 compatibility patch is from alpine linux.
https://git.alpinelinux.org/aports/tree/main/zeromq/gcc13.patch
fixes #20972
I also renamed one of patches, so patch filenames are more unified.
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
Michal Hrusecky [Mon, 15 May 2023 12:30:29 +0000 (14:30 +0200)]
openvpn: Add more hotplug events
OpenVPN supports more hooks than just 'up' and 'down'. Especially
reacting to 'route-up' and 'route-pre-down' events could be important.
When routing table changes, it can make sense to adapt firewall, run
some tests or change even more routes. This change passes those events
to hotplug, so it is easy to react to them without changing
configuration files provided by VPN provider.
Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
Oskari Rauta [Thu, 18 May 2023 16:58:42 +0000 (19:58 +0300)]
ttyd: update to 1.7.3
also fixes linking issue that appeared after gcc 13
removed obsolete (merged) patch, ttyd now depends on
libcap, added that as a dependency.
remaining patch refreshed.
release notes: https://github.com/tsl0922/ttyd/releases
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
W. Michael Petullo [Sat, 20 May 2023 01:35:59 +0000 (20:35 -0500)]
scapy: update to 2.5.0
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 16:40:28 +0000 (11:40 -0500)]
syslog-ng: update to 4.2.0
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 17:20:27 +0000 (12:20 -0500)]
php8-pecl-mcrypt: update to 1.0.6
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 16:38:49 +0000 (11:38 -0500)]
php8-pecl-krb5: update to 1.1.5
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 16:37:11 +0000 (11:37 -0500)]
openldap: update to 2.6.4
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 16:35:38 +0000 (11:35 -0500)]
nfdump: update to 4.2.0
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 16:34:09 +0000 (11:34 -0500)]
luasec: update to 1.3.1
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 16:32:39 +0000 (11:32 -0500)]
libsoup3: update to 2.6.4
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 16:30:33 +0000 (11:30 -0500)]
libgpg-error: update to 1.47
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 16:28:21 +0000 (11:28 -0500)]
libgcrypt: update to 1.10.2
Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo [Fri, 19 May 2023 13:26:18 +0000 (08:26 -0500)]
libpsl: update to 0.21.2
Signed-off-by: W. Michael Petullo <mike@flyn.org>
Michael Heimpold [Fri, 19 May 2023 11:51:13 +0000 (13:51 +0200)]
evtest: don't build man page
Just selecting this package resulted in a build error:
/home/mhei/openwrt.git/staging_dir/hostpkg/bin/python3: No module named asciidoc
make[4]: *** [Makefile:856: evtest.xml] Error 1
Since we usually do not need the man page, just prevent to
build it by pre-setting two environments variables. Then
the makefile warns about, but don't try to build.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Tianling Shen [Sat, 20 May 2023 05:09:04 +0000 (13:09 +0800)]
Merge pull request #21103 from jefferyto/gensio-without-go
gensio: Fix build on build host with Go compiler
Tianling Shen [Fri, 19 May 2023 13:45:21 +0000 (21:45 +0800)]
python3-libselinux: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Oskari Rauta [Thu, 18 May 2023 16:24:21 +0000 (19:24 +0300)]
mariadb: fix gcc 13 building
fixes:
FAILED: tpool/CMakeFiles/tpool.dir/aio_liburing.cc.o
/usr/src/openwrt/staging_dir/toolchain-x86_64_gcc-13.1.0_musl/bin/x86_64-openwrt-linux-musl-g++ -DDBUG_TRACE -DHAVE_CONFIG_H -DHAVE_URING -D_FILE_OFFSET_BITS=64 -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/wsrep-lib/include -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/wsrep-lib/wsrep-API/v26 -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/include -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/include/providers -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/tpool -Os -pipe -fno-caller-saves -fno-plt -fhonour-copts -fmacro-prefix-map=/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3=mariadb-10.9.3 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -I/usr/src/openwrt/staging_dir/toolchain-x86_64_gcc-13.1.0_musl/usr/include -I/usr/src/openwrt/staging_dir/toolchain-x86_64_gcc-13.1.0_musl/include/fortify -I/usr/src/openwrt/staging_dir/toolchain-x86_64_gcc-13.1.0_musl/include -DNDEBUG -DDBUG_OFF -std=gnu++11 -DHAVE_IO_URING_MLOCK_SIZE -MD -MT tpool/CMakeFiles/tpool.dir/aio_liburing.cc.o -MF tpool/CMakeFiles/tpool.dir/aio_liburing.cc.o.d -o tpool/CMakeFiles/tpool.dir/aio_liburing.cc.o -c /usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/tpool/aio_liburing.cc
/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/tpool/aio_liburing.cc: In constructor '{anonymous}::aio_uring::aio_uring(tpool::thread_pool*, int)':
/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/tpool/aio_liburing.cc:64:18: error: 'runtime_error' is not a member of 'std'
64 | throw std::runtime_error("aio_uring()");
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
Tianling Shen [Fri, 19 May 2023 07:42:22 +0000 (15:42 +0800)]
gnutls: fix build with zabbix
Zabbix verifies the version of gnutls by search in the header gnutls.h.
This is done with 'cat' and 'egrep'. The problem here is now that the
preprocess definition did changed in gnutls.h, so the regex does not
match anymore.
The following error message acourse in the log:
> configure: error: GnuTLS library version requirement not met (>= 3.1.18)
To fix this backport an upstream patch to let the regex work again.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Fri, 19 May 2023 09:37:24 +0000 (17:37 +0800)]
efivar: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Backport an upstream fix to replace these old data types.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Fri, 19 May 2023 13:03:09 +0000 (21:03 +0800)]
perl: perlmod: append _LARGEFILE64_SOURCE flag for musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Scott McKenzie [Fri, 19 May 2023 17:38:27 +0000 (03:38 +1000)]
cloudflared: support setting tunnel token
Allows user to provide a token for Cloudflare tunnel.
When provided along with credentials, this will take precedence.
Signed-off-by: Scott McKenzie <scott@noizyland.net>
Tianling Shen [Sat, 20 May 2023 00:01:25 +0000 (08:01 +0800)]
Merge pull request #20981 from jefferyto/python3-packages-fix-build
python3-packages: Set PYTHON3_PKG_BUILD:=0
Ray Wang [Fri, 19 May 2023 15:16:04 +0000 (23:16 +0800)]
natmap: add myself to maintainers
Signed-off-by: Ray Wang <r@hev.cc>
Ray Wang [Fri, 19 May 2023 14:53:20 +0000 (22:53 +0800)]
natmap: update to
20230519
Signed-off-by: Ray Wang <r@hev.cc>
Tianling Shen [Fri, 19 May 2023 07:53:38 +0000 (15:53 +0800)]
podman: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Jeffery To [Fri, 19 May 2023 12:03:43 +0000 (20:03 +0800)]
gensio: Fix build on build host with Go compiler
If the build host has the Go compiler installed, then configure will
detect this and will try to compile gensio's Go support, leading to a
build failure.
This disables Go support entirely to fix this build failure.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Daniel Golle [Fri, 19 May 2023 01:53:53 +0000 (02:53 +0100)]
transmission: add missing ftruncate64 syscall
Transmission 4.0.3 started using the ftruncate64 syscall.
Add it to the list of allowed syscalls.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Javier Marcet [Thu, 18 May 2023 17:01:11 +0000 (19:01 +0200)]
docker-compose: Update to version 2.18.1
Signed-off-by: Javier Marcet <javier@marcet.info>
Michael Heimpold [Mon, 15 May 2023 06:32:28 +0000 (08:32 +0200)]
php8: update to 8.2.6
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Michael Heimpold [Mon, 15 May 2023 06:32:28 +0000 (08:32 +0200)]
php8: fix compilation with musl 1.2.4
As noted in the release notes of musl 1.2.4, we can use
CFLAGS to pass -D_LARGEFILE64_SOURCE to allow to keep
using LFS64 definitions (as a short-term solution).
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Tianling Shen [Wed, 17 May 2023 06:43:07 +0000 (14:43 +0800)]
mariadb: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Nick Hainke [Tue, 16 May 2023 21:41:26 +0000 (23:41 +0200)]
inotify-tools: fix compilation with musl 1.2.4
Fixes errors in the form of:
inotifytools.c: In function 'inotifytools_watch_recursively_with_exclude':
inotifytools.c:1335:30: error: storage size of 'my_stat' isn't known
1335 | static struct stat64 my_stat;
| ^~~~~~~
inotifytools.c:1342:36: error: implicit declaration of function 'lstat64'; did you mean 'lstat'? [-Werror=implicit-function-declaration]
1342 | if ( -1 == lstat64( next_file, &my_stat ) ) {
| ^~~~~~~
| lstat
inotifytools.c:1335:30: error: unused variable 'my_stat' [-Werror=unused-variable]
1335 | static struct stat64 my_stat;
| ^~~~~~~
inotifytools.c: In function 'isdir':
inotifytools.c:1621:30: error: storage size of 'my_stat' isn't known
1621 | static struct stat64 my_stat;
| ^~~~~~~
inotifytools.c:1621:30: error: unused variable 'my_stat' [-Werror=unused-variable]
inotifytools.c:1630:1: error: control reaches end of non-void function [-Werror=return-type]
1630 | }
| ^
cc1: all warnings being treated as errors
Signed-off-by: Nick Hainke <vincent@systemli.org>
Nick Hainke [Tue, 16 May 2023 21:52:46 +0000 (23:52 +0200)]
arp-scan: fix missing libcap dependency
arp-scan complains about missing libcap dependency. Disable the
dependency.
Signed-off-by: Nick Hainke <vincent@systemli.org>
S. Brusch [Wed, 17 May 2023 20:09:53 +0000 (22:09 +0200)]
crowdsec: new upstream release version 1.5.1
Update crowdsec to latest upstream release version 1.5.1
Signed-off-by: S. Brusch <ne20002@gmx.ch>
Maintainer: Kerma Gérald <gandalf@gk2.net>
Run tested: ipq40xx/generic, Fritzbox 4040, Openwrt 22.03.5
Description: update to latest version of upstream
Tianling Shen [Wed, 17 May 2023 08:24:49 +0000 (16:24 +0800)]
tgt: Update to 1.0.86
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Nick Hainke [Wed, 17 May 2023 20:45:11 +0000 (22:45 +0200)]
pcre: move pcre from base repository to packages feed
pcre is no longer needed in the base repository. However, some packages
still rely on it in the packages and telephony feed.
Cross-reference to base repository:
e3e6652a550d ("pcre: move package to packages feed")
While working on it remove AUTORELEASE.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Nick Hainke [Wed, 17 May 2023 17:40:33 +0000 (19:40 +0200)]
pcre2: package moved to base feed
The package is needed by selinux, so it was moved to the base repository.
Remove it from openwrt packages feed.
Cross-reference:
c39b0646f3f2 ("pcre2: import pcre2 from packages feed")
Signed-off-by: Nick Hainke <vincent@systemli.org>
Jeffery To [Wed, 17 May 2023 09:51:11 +0000 (17:51 +0800)]
python-packaging: Update to 23.1
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Jeffery To [Wed, 17 May 2023 08:27:16 +0000 (16:27 +0800)]
python-attrs: Update to 23.1.0
The package now uses pyproject.toml-based builds with additional build
dependencies.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Robert Högberg [Thu, 11 May 2023 06:54:02 +0000 (08:54 +0200)]
libvorbisidec: Fix error in package description
libvorbisidec needs libogg since
https://gitlab.xiph.org/xiph/tremor/-/commit/
8886a2805fc107489912f8c500db3373e04a316d
Signed-off-by: Robert Högberg <robert.hogberg@gmail.com>
Jeffery To [Wed, 17 May 2023 11:03:52 +0000 (19:03 +0800)]
python-automat: Update to 22.10.0, refresh patches
This also removes the patch to avoid setuptools-scm and adds a build
dependency on python-setuptools-scm/host.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Tianling Shen [Wed, 17 May 2023 12:15:52 +0000 (20:15 +0800)]
gpgme: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Wed, 17 May 2023 13:34:02 +0000 (21:34 +0800)]
libdeflate: Update to 1.18
Release note:
https://github.com/ebiggers/libdeflate/blob/master/NEWS.md#version-118
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Hirokazu MORIKAWA [Thu, 18 May 2023 00:41:16 +0000 (09:41 +0900)]
libupm: Workaround for errors with GCC13
Workaround for errors with GCC13
https://github.com/openwrt/packages/issues/20994
patch
https://github.com/oskarirauta/local-overrides/blob/main/libs/libupm/patches/011-gcc-13-compatibility-fixes.patch
Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Robert Marko [Wed, 17 May 2023 08:18:57 +0000 (10:18 +0200)]
perl: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
_LARGEFILE64_SOURCE has to be defined in the source, or CFLAGS can be used
to pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Robert Marko <robimarko@gmail.com>
Thlv Alivs [Wed, 17 May 2023 15:17:12 +0000 (23:17 +0800)]
oath-toolkit: add InstallDev section
This package seems to be missing an InstallDev section. Had a compile
failure for an application that needs to compile against liboath
Signed-off-by: Thlv Alivs <zgmzzzz18@gmail.com>
Nikos Mavrogiannopoulos [Thu, 18 May 2023 07:09:53 +0000 (09:09 +0200)]
Merge pull request #21007 from micmac1/gnutls-unistring-optional
gnutls: load libunistring-optional gnulib module
Tianling Shen [Wed, 17 May 2023 08:07:43 +0000 (16:07 +0800)]
lttng-modules: Update to 2.13.9
* Added new dependency
* Enabled parallel build
* Switched to use KERNEL_MAKE
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Wed, 17 May 2023 08:06:01 +0000 (16:06 +0800)]
lttng-tools: Update to 2.13.9
Backported a upstream commit (with manually rebased) to fix build
with musl 1.2.4.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Wed, 17 May 2023 08:04:48 +0000 (16:04 +0800)]
lttng-ust: Update to 2.13.5
Added a patch to disable building tests.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Daniel Golle [Thu, 18 May 2023 02:15:52 +0000 (03:15 +0100)]
transmission: add new syscall needed with musl 1.2.4
Apparently the "revcmsg" syscall is now needed, add it to the list
of allowed syscalls.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Daniel Golle [Thu, 18 May 2023 02:14:29 +0000 (03:14 +0100)]
cryptsetup: fix compilation with musl 1.2.4
Similar to mdadm also cryptsetup now requires _LARGEFILE64_SOURCE.
Add -D_LARGEFILE64_SOURCE to TARGET_CFLAGS to fix compilation.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Tianling Shen [Wed, 17 May 2023 12:41:47 +0000 (20:41 +0800)]
xupnpd: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Nick Hainke [Tue, 16 May 2023 22:20:44 +0000 (00:20 +0200)]
crowdsec: fix compilation with musl 1.2.4
_LARGEFILE64_SOURCE has to be defined in the source, or CFLAGS can be used
to pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Fixes errors in the form of:
Building targets
github.com/mattn/go-sqlite3
sqlite3-binding.c:35901:42: error: 'pread64' undeclared here (not in a function); did you mean 'pread'?
35901 | { "pread64", (sqlite3_syscall_ptr)pread64, 0 },
| ^~~~~~~
| pread
sqlite3-binding.c:35919:42: error: 'pwrite64' undeclared here (not in a function); did you mean 'pwrite'?
35919 | { "pwrite64", (sqlite3_syscall_ptr)pwrite64, 0 },
| ^~~~~~~~
| pwrite
sqlite3-binding.c: In function 'seekAndRead':
sqlite3-binding.c:35905:49: error: unknown type name 'off64_t'; did you mean 'off_t'?
35905 | #define osPread64 ((ssize_t(*)(int,void*,size_t,off64_t))aSyscall[10].pCurrent)
| ^~~~~~~
sqlite3-binding.c:38767:11: note: in expansion of macro 'osPread64'
38767 | got = osPread64(id->h, pBuf, cnt, offset);
| ^~~~~~~~~
sqlite3-binding.c:35905:58: error: expected ')' before 'aSyscall'
35905 | #define osPread64 ((ssize_t(*)(int,void*,size_t,off64_t))aSyscall[10].pCurrent)
| ~ ^~~~~~~~
sqlite3-binding.c:38767:11: note: in expansion of macro 'osPread64'
38767 | got = osPread64(id->h, pBuf, cnt, offset);
| ^~~~~~~~~
sqlite3-binding.c: In function 'seekAndWriteFd':
sqlite3-binding.c:35923:57: error: unknown type name 'off64_t'; did you mean 'off_t'?
35923 | #define osPwrite64 ((ssize_t(*)(int,const void*,size_t,off64_t))\
| ^~~~~~~
sqlite3-binding.c:38896:17: note: in expansion of macro 'osPwrite64'
38896 | do{ rc = (int)osPwrite64(fd, pBuf, nBuf, iOff);}while( rc<0 && errno==EINTR);
| ^~~~~~~~~~
sqlite3-binding.c:35924:21: error: expected ')' before 'aSyscall'
35924 | aSyscall[13].pCurrent)
| ^~~~~~~~
sqlite3-binding.c:38896:17: note: in expansion of macro 'osPwrite64'
38896 | do{ rc = (int)osPwrite64(fd, pBuf, nBuf, iOff);}while( rc<0 && errno==EINTR);
| ^~~~~~~~~~
sqlite3-binding.c:35923:21: note: to match this '('
35923 | #define osPwrite64 ((ssize_t(*)(int,const void*,size_t,off64_t))\
| ^
sqlite3-binding.c:38896:17: note: in expansion of macro 'osPwrite64'
38896 | do{ rc = (int)osPwrite64(fd, pBuf, nBuf, iOff);}while( rc<0 && errno==EINTR);
| ^~~~~~~~~~
make[2]: *** [Makefile:153: /home/nick/openwrt/build_dir/target-aarch64_cortex-a53_musl/crowdsec-1.4.6/.built] Error 1
make[2]: Leaving directory '/home/nick/openwrt/feeds/packages/net/crowdsec'
Signed-off-by: Nick Hainke <vincent@systemli.org>
Tianling Shen [Wed, 17 May 2023 05:33:38 +0000 (13:33 +0800)]
btrfs-progs: Update to 6.3
Fixed build issue with musl 1.2.4.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Wed, 17 May 2023 12:29:40 +0000 (20:29 +0800)]
xfsprogs: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Wed, 17 May 2023 12:10:04 +0000 (20:10 +0800)]
mblaze: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Backport an upstream fix to replace these old data types.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Josef Schlehofer [Wed, 17 May 2023 08:23:17 +0000 (10:23 +0200)]
Merge pull request #21066 from jefferyto/python-hatchling-1.17.0
python-hatchling: Update to 1.17.0
Tianling Shen [Wed, 17 May 2023 05:51:14 +0000 (13:51 +0800)]
acpid: Update to 2.0.34
Backported an upstream commit to fix build with musl 1.2.4.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Wed, 17 May 2023 03:26:29 +0000 (11:26 +0800)]
nfs-kernel-server: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Wed, 17 May 2023 07:01:41 +0000 (15:01 +0800)]
libpciaccess: Update to 0.17
Backported an upstream commit to fix build with musl 1.2.4.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Darren Tucker [Thu, 11 May 2023 06:33:31 +0000 (16:33 +1000)]
openssh: sftp no longer needs crypto or zlib.
OpenSSH 9.1p1 removed remaining dependencies and stopped linking sftp,
sftp-server and scp against libcrypto or libz. This change moves those
package dependencies from the default to those that still need them.
In particular, this will allow sftp-server to be installed for use with
Dropbear without needing to install zlib or openssl.
Signed-off-by: Darren Tucker <dtucker@dtucker.net>
Darren Tucker [Thu, 11 May 2023 06:31:44 +0000 (16:31 +1000)]
openssh: Use CDN first for source downloads.
Also point to https for website.
Signed-off-by: Darren Tucker <dtucker@dtucker.net>
Jeffery To [Wed, 17 May 2023 07:11:08 +0000 (15:11 +0800)]
python-hatchling: Update to 1.17.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Tianling Shen [Wed, 17 May 2023 05:39:21 +0000 (13:39 +0800)]
apk: Update to 2.14.0
* Fixed build issue with musl 1.2.4.
* Refreshed patches.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Tue, 16 May 2023 09:17:06 +0000 (17:17 +0800)]
acl: fix compilation with musl 1.2.4
musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so
just having _GNU_SOURCE defined is not enough anymore.
Backport an upstream fix to replace these old functions.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Lucian Cristian [Tue, 16 May 2023 20:37:12 +0000 (20:37 +0000)]
libreswan: update to 4.11
Fixes https://libreswan.org/security/CVE-2023-30570
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
Tianling Shen [Wed, 17 May 2023 02:27:37 +0000 (10:27 +0800)]
Revert "gptfdisk: fix some warnings treated as errors"
The bug was fixed in 1.0.9, so remove this hack.
This reverts commit
5899a16f4ba70689055f7276e84aa96adce14373.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Wed, 17 May 2023 02:22:20 +0000 (10:22 +0800)]
gptfdisk: Update to 1.0.9
Backported an upstream commit to fix build with musl 1.2.4.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Tue, 16 May 2023 14:05:12 +0000 (22:05 +0800)]
alsa-utils: Update to 1.2.9
* updated source url (prefer https rather than http/ftp)
* fixed build with musl 1.2.4
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Tue, 16 May 2023 14:04:51 +0000 (22:04 +0800)]
alsa-ucm-conf: Update to 1.2.9
* updated source url (prefer https rather than http/ftp)
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Tianling Shen [Tue, 16 May 2023 14:02:20 +0000 (22:02 +0800)]
alsa-lib: Update to 1.2.9
* updated source url (prefer https rather than http/ftp)
* refreshed patches
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Nick Hainke [Tue, 16 May 2023 22:08:36 +0000 (00:08 +0200)]
btop: fix compilation with musl 1.2.4
_LARGEFILE64_SOURCE has to be defined in the source, or CFLAGS can be used
to pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Fixes errors in the form of:
Compiling src/linux/btop_collect.cpp
src/linux/btop_collect.cpp: In function 'Mem::mem_info& Mem::collect(bool)':
src/linux/btop_collect.cpp:1082:58: error: aggregate 'Mem::collect(bool)::statvfs64 vfs' has incomplete type and cannot be defined
1082 | struct statvfs64 vfs;
| ^~~
src/linux/btop_collect.cpp:1083:79: error: invalid use of incomplete type 'struct Mem::collect(bool)::statvfs64'
1083 | if (statvfs64(mountpoint.c_str(), &vfs) < 0) {
| ^
src/linux/btop_collect.cpp:1082:48: note: forward declaration of 'struct Mem::collect(bool)::statvfs64'
1082 | struct statvfs64 vfs;
| ^~~~~~~~~
make[3]: *** [Makefile:274: obj/linux/btop_collect.o] Error 1
make[3]: Leaving directory '/home/nick/openwrt/build_dir/target-aarch64_cortex-a53_musl/btop-1.2.13'
make[2]: *** [Makefile:53: /home/nick/openwrt/build_dir/target-aarch64_cortex-a53_musl/btop-1.2.13/.built] Error 2
make[2]: Leaving directory '/home/nick/openwrt/feeds/packages/admin/btop'
time: package/feeds/packages/btop/compile#2.57#0.17#3.02
ERROR: package/feeds/packages/btop failed to build.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Lucian Cristian [Tue, 16 May 2023 16:54:46 +0000 (16:54 +0000)]
openfortivpn: update to 1.20.3
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
S. Brusch [Tue, 16 May 2023 16:18:32 +0000 (18:18 +0200)]
crowdsec-firewall-bouncer: new upstream release version 0.0.27
Update crowdsec-firewall-bouncer to latest upstream release version 0.0.27
Signed-off-by: S. Brusch <ne20002@gmx.ch>
Maintainer: Kerma Gérald <gandalf@gk2.net>
Run tested: ipq40xx/generic, Fritzbox 4040, Openwrt 22.03.5
Lucian Cristian [Tue, 16 May 2023 20:23:01 +0000 (20:23 +0000)]
nspr: fix musl compile
Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
Lucian Cristian [Tue, 16 May 2023 20:30:50 +0000 (20:30 +0000)]
nss: update to 3.89.1
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
Nick Hainke [Wed, 26 Apr 2023 06:39:14 +0000 (08:39 +0200)]
libpng: update to 1.6.39
Changelog:
https://github.com/glennrp/libpng/blob/v1.6.39/CHANGES
Fixes CVE-2019-6129.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Nick Hainke [Wed, 26 Apr 2023 07:09:37 +0000 (09:09 +0200)]
tiff: update to 4.5.0
Release Notes:
http://www.simplesystems.org/libtiff/releases/v4.5.0.html
Remove upstreamed:
- 010-CVE-2022-2519.patch
- 020-CVE-2022-2520.patch
Fixes: CVE-2022-2056, CVE-2022-2057, CVE-2022-2058, CVE-2022-3570,
CVE-2022-3598, CVE-2022-3627, CVE-2022-3597, CVE-2022-3626,
CVE-2022-3599, CVE-2022-34526
Signed-off-by: Nick Hainke <vincent@systemli.org>
Nick Hainke [Sun, 30 Apr 2023 11:01:55 +0000 (13:01 +0200)]
arp-scan: update to 1.10.0
ieee-iab is removed, see:
https://github.com/royhills/arp-scan/commit/
2a56a066494cb67e1c932cc64e739b326ef9a272
Release Notes:
https://github.com/royhills/arp-scan/releases/tag/1.10.0
Signed-off-by: Nick Hainke <vincent@systemli.org>
Lucian Cristian [Tue, 16 May 2023 15:57:08 +0000 (15:57 +0000)]
frr: update to 8.5.1 branch
also fixes gcc 13 compile
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
Nick Hainke [Fri, 12 May 2023 11:53:32 +0000 (13:53 +0200)]
gcc: update to 12.3.0
Release notes:
https://gcc.gnu.org/gcc-12/changes.html
Refresh patches:
- 230-musl_libssp.patch
- 910-mbsd_multi.patch
- 920-specs_nonfatal_getenv.patch
- 970-macos_arm64-building-fix.patch
Signed-off-by: Nick Hainke <vincent@systemli.org>
Nick Hainke [Fri, 12 May 2023 10:49:06 +0000 (12:49 +0200)]
gcc: copy patches from 12.2.0 to 12.3.0
This simplifies reviewing process.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Alexandru Ardelean [Tue, 16 May 2023 14:17:25 +0000 (17:17 +0300)]
Merge pull request #21024 from commodo/python-updates1
python-{django,requests}: bump versions
Dirk Brenken [Tue, 16 May 2023 10:27:13 +0000 (12:27 +0200)]
banip: update 0.8.6-2
* fix/rework no-op loop
* small fixes & cosmetics
* update readme
Signed-off-by: Dirk Brenken <dev@brenken.org>
Tianling Shen [Mon, 15 May 2023 14:58:42 +0000 (22:58 +0800)]
libunistring: remove package
It's merged into core now [1], so remove it here.
1. https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=
d3c3b79c1e46c49cfa5de9df6a740d5fcda46471
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Andrew Sim [Mon, 15 May 2023 05:12:06 +0000 (07:12 +0200)]
transmission: Update to v4.03
Update transmission to latest stable v4.0.3 release
Changelog: https://github.com/transmission/transmission/releases/tag/4.0.3
Signed-off-by: Andrew Sim <andrewsimz@gmail.com>
Alexandru Ardelean [Sat, 13 May 2023 09:48:26 +0000 (12:48 +0300)]
python-requests: bump to version 2.30.0
Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
Alexandru Ardelean [Sat, 13 May 2023 09:47:28 +0000 (12:47 +0300)]
django: bump to version 4.2.1
Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
Christian Marangi [Sun, 14 May 2023 22:28:56 +0000 (00:28 +0200)]
jool: fix compilation warning
Add patch fixing compilation warning due to wrong cast.
Fix compilation warning:
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/xlator.c: In function 'offset_equals':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/xlator.c:878:32: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
878 | return (offset->ns == ((__u64)instance->jool.ns & 0xFFFFFFFF))
| ^
cc1: all warnings being treated as errors
In file included from ./include/linux/kernel.h:19,
from ./include/linux/skbuff.h:13,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/../../mod/common/skbuff.h:4,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:1:
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c: In function 'print_skb_fields':
./include/linux/kern_levels.h:5:25: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'int' [-Werror=format=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap'
422 | _p_func(_fmt, ##__VA_ARGS__); \
| ^~~~
./include/linux/printk.h:535:9: note: in expansion of macro 'printk'
535 | printk(KERN_CONT fmt, ##__VA_ARGS__)
| ^~~~~~
./include/linux/kern_levels.h:24:25: note: in expansion of macro 'KERN_SOH'
24 | #define KERN_CONT KERN_SOH "c"
| ^~~~~~~~
./include/linux/printk.h:535:16: note: in expansion of macro 'KERN_CONT'
535 | printk(KERN_CONT fmt, ##__VA_ARGS__)
| ^~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:38:17: note: in expansion of macro 'pr_cont'
38 | pr_cont(text "\n", ##__VA_ARGS__); \
| ^~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:112:9: note: in expansion of macro 'print'
112 | print(tabs, "data:%ld", skb->data - skb->head);
| ^~~~~
./include/linux/kern_levels.h:5:25: error: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'sk_buff_data_t' {aka 'unsigned char *'} [-Werror=format=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap'
422 | _p_func(_fmt, ##__VA_ARGS__); \
| ^~~~
./include/linux/printk.h:535:9: note: in expansion of macro 'printk'
535 | printk(KERN_CONT fmt, ##__VA_ARGS__)
| ^~~~~~
./include/linux/kern_levels.h:24:25: note: in expansion of macro 'KERN_SOH'
24 | #define KERN_CONT KERN_SOH "c"
| ^~~~~~~~
./include/linux/printk.h:535:16: note: in expansion of macro 'KERN_CONT'
535 | printk(KERN_CONT fmt, ##__VA_ARGS__)
| ^~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:38:17: note: in expansion of macro 'pr_cont'
38 | pr_cont(text "\n", ##__VA_ARGS__); \
| ^~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:113:9: note: in expansion of macro 'print'
113 | print(tabs, "tail:%u", skb->tail);
| ^~~~~
./include/linux/kern_levels.h:5:25: error: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'sk_buff_data_t' {aka 'unsigned char *'} [-Werror=format=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap'
422 | _p_func(_fmt, ##__VA_ARGS__); \
| ^~~~
./include/linux/printk.h:535:9: note: in expansion of macro 'printk'
535 | printk(KERN_CONT fmt, ##__VA_ARGS__)
| ^~~~~~
./include/linux/kern_levels.h:24:25: note: in expansion of macro 'KERN_SOH'
24 | #define KERN_CONT KERN_SOH "c"
| ^~~~~~~~
./include/linux/printk.h:535:16: note: in expansion of macro 'KERN_CONT'
535 | printk(KERN_CONT fmt, ##__VA_ARGS__)
| ^~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:38:17: note: in expansion of macro 'pr_cont'
38 | pr_cont(text "\n", ##__VA_ARGS__); \
| ^~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:114:9: note: in expansion of macro 'print'
114 | print(tabs, "end:%u", skb->end);
| ^~~~~
cc1: all warnings being treated as errors
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/nl/instance.c: In function 'serialize_instance':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/nl/instance.c:40:46: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
40 | error = nla_put_u32(skb, JNLAIE_NS, ((__u64)entry->ns) & 0xFFFFFFFF);
| ^
cc1: all warnings being treated as errors
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Tianling Shen [Sun, 14 May 2023 17:12:22 +0000 (01:12 +0800)]
Merge pull request #20985 from jefferyto/python-incremental-fix-host-build
python-incremental: Add missing host build dependencies
Georgi Valkov [Sun, 14 May 2023 15:33:03 +0000 (18:33 +0300)]
xtables-addons: bump to 3.24
fa35c29 Xtables-addons 3.24
9db4d8d DHCPMAC: resolve cppcheck warnings
4599c30 ipv4options: resolve cppcheck warnings
5a714b6 geoip: set autoflush on stdout
f16ed5c geoip: Use stdout for output and stderr for errors/diag
a711985 build: resolve compiler warnings with gcc-13
97181e3 doc, src: improve spelling
30ddb4f doc, src: improve spelling
f3f8155 xt_geoip: bump number of territories per rule
e426ad9 Xtables-addons 3.23
51761c3 build: support for Linux 6.2
409cb5a build: replace `AC_DISABLE_STATIC` macro with an argument to `LT_INIT`
0454ff6 build: replace obsolete `AC_PROG_LIBTOOL` macro with `LT_INIT`
5b3fae8 Xtables-addons 3.22
71396f9 build: support for Linux 6.1
7ad55ad build: eliminate geoip/ make recursion
b950dae build: fix failure to recurse into asn/
cd77880 xt_asn: new module
Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
[ add changelog from 3.21 to 3.24 ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Georgi Valkov [Sun, 14 May 2023 00:18:11 +0000 (03:18 +0300)]
xtables-addons: fix build warnings treated as errors since
b2d1eb7
Use kcalloc and remove conflicting #include <stdarg.h> to fix
the following build warnings treated as errors since
b2d1eb7:
error: ISO C90 forbids variable length array 'buf' [-Werror=vla]
error: "va_start" redefined [-Werror]
error: "va_arg" redefined [-Werror]
error: "va_copy" redefined [-Werror]
getstr(s)==NULL is always false
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/byte_array.c: In function 'byte_array_to_string':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/byte_array.c:110:9: error: ISO C90 forbids variable length array 'buf' [-Werror=vla]
110 | uint8_t buf[(array->length * 3) + 255];
| ^~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/byte_array.c:112:9: error: ISO C90 forbids variable length array 'res' [-Werror=vla]
112 | char res[255 + (array->length * 3)]; /* make sure the buffer is big enough*/
| ^~~~
cc1: all warnings being treated as errors
In file included from ./include/linux/string.h:9,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/include/string.h:1,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldebug.c:10:
./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror]
6 | #define va_start(v, l) __builtin_va_start(v, l)
|
CC [M] /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lstrlib.o
In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldebug.c:8:
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition
47 | #define va_start(v,l) __builtin_va_start(v,l)
|
./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror]
8 | #define va_arg(v, T) __builtin_va_arg(v, T)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition
49 | #define va_arg(v,l) __builtin_va_arg(v,l)
|
./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror]
9 | #define va_copy(d, s) __builtin_va_copy(d, s)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition
52 | #define va_copy(d,s) __builtin_va_copy(d,s)
|
CC [M] /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ltable.o
In file included from ./include/linux/kernel.h:5,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldump.c:12:
./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror]
6 | #define va_start(v, l) __builtin_va_start(v, l)
|
In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12:
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition
47 | #define va_start(v,l) __builtin_va_start(v,l)
|
./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror]
8 | #define va_arg(v, T) __builtin_va_arg(v, T)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition
49 | #define va_arg(v,l) __builtin_va_arg(v,l)
|
./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror]
9 | #define va_copy(d, s) __builtin_va_copy(d, s)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition
52 | #define va_copy(d,s) __builtin_va_copy(d,s)
|
In file included from ./include/linux/kernel.h:5,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lfunc.c:13:
./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror]
6 | #define va_start(v, l) __builtin_va_start(v, l)
|
In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12:
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition
47 | #define va_start(v,l) __builtin_va_start(v,l)
|
./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror]
8 | #define va_arg(v, T) __builtin_va_arg(v, T)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition
49 | #define va_arg(v,l) __builtin_va_arg(v,l)
|
./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror]
9 | #define va_copy(d, s) __builtin_va_copy(d, s)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition
52 | #define va_copy(d,s) __builtin_va_copy(d,s)
|
In file included from ./include/linux/kernel.h:5,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lmem.c:13:
./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror]
6 | #define va_start(v, l) __builtin_va_start(v, l)
|
In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12:
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition
47 | #define va_start(v,l) __builtin_va_start(v,l)
|
./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror]
8 | #define va_arg(v, T) __builtin_va_arg(v, T)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition
49 | #define va_arg(v,l) __builtin_va_arg(v,l)
|
./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror]
9 | #define va_copy(d, s) __builtin_va_copy(d, s)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition
52 | #define va_copy(d,s) __builtin_va_copy(d,s)
|
In file included from ./include/linux/kernel.h:5,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/include/stdio.h:1,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lobject.c:10:
./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror]
6 | #define va_start(v, l) __builtin_va_start(v, l)
|
In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lobject.c:7:
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition
47 | #define va_start(v,l) __builtin_va_start(v,l)
|
./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror]
8 | #define va_arg(v, T) __builtin_va_arg(v, T)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition
49 | #define va_arg(v,l) __builtin_va_arg(v,l)
|
./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror]
9 | #define va_copy(d, s) __builtin_va_copy(d, s)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition
52 | #define va_copy(d,s) __builtin_va_copy(d,s)
|
In file included from ./include/linux/kernel.h:5,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/llimits.h:12,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lopcodes.h:10,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lopcodes.c:11:
./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror]
6 | #define va_start(v, l) __builtin_va_start(v, l)
|
In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12:
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition
47 | #define va_start(v,l) __builtin_va_start(v,l)
|
./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror]
8 | #define va_arg(v, T) __builtin_va_arg(v, T)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition
49 | #define va_arg(v,l) __builtin_va_arg(v,l)
|
./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror]
9 | #define va_copy(d, s) __builtin_va_copy(d, s)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition
52 | #define va_copy(d,s) __builtin_va_copy(d,s)
|
In file included from ./include/linux/kernel.h:5,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lstate.c:13:
./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror]
6 | #define va_start(v, l) __builtin_va_start(v, l)
|
In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12:
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition
47 | #define va_start(v,l) __builtin_va_start(v,l)
|
./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror]
8 | #define va_arg(v, T) __builtin_va_arg(v, T)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition
49 | #define va_arg(v,l) __builtin_va_arg(v,l)
|
./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror]
9 | #define va_copy(d, s) __builtin_va_copy(d, s)
|
/home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition
52 | #define va_copy(d,s) __builtin_va_copy(d,s)
|
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldump.c: In function 'DumpString':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldump.c:63:26: error: the comparison will always evaluate as 'false' for the pointer operand in 's + 24' must not be NULL [-Werror=address]
63 | if (s==NULL || getstr(s)==NULL)
| ^~
cc1: all warnings being treated as errors
Fixes: #20993
Fixes: #21006
Co-developed-by: Chen Minqiang <ptpt52@gmail.com>
Co-developed-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
Stan Grishin [Sun, 14 May 2023 14:55:38 +0000 (08:55 -0600)]
Merge pull request #20991 from stangri/master-pbr
pbr: bugfix: create IPv6 routes
Christian Marangi [Sun, 14 May 2023 14:48:38 +0000 (16:48 +0200)]
xr_usb_serial_common: fix compilation warning
Add patch fixing compilation warning due to unused function.
Fix compilation warning:
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/usb-serial-xr_usb_serial_common-2022-03-30-
ecc6ebe0/xr_usb_serial_common-1a/xr_usb_serial_common.c: In function 'xr_usb_serial_ctrl_irq':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/usb-serial-xr_usb_serial_common-2022-03-30-
ecc6ebe0/xr_usb_serial_common-1a/xr_usb_serial_common.c:261:28: error: unused variable 'tty' [-Werror=unused-variable]
261 | struct tty_struct *tty;
| ^~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/usb-serial-xr_usb_serial_common-2022-03-30-
ecc6ebe0/xr_usb_serial_common-1a/xr_usb_serial_common.c: In function 'xr_usb_serial_process_read_urb':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/usb-serial-xr_usb_serial_common-2022-03-30-
ecc6ebe0/xr_usb_serial_common-1a/xr_usb_serial_common.c:393:28: error: unused variable 'tty' [-Werror=unused-variable]
393 | struct tty_struct *tty;
| ^~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/usb-serial-xr_usb_serial_common-2022-03-30-
ecc6ebe0/xr_usb_serial_common-1a/xr_usb_serial_common.c: In function 'xr_usb_serial_softint':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/usb-serial-xr_usb_serial_common-2022-03-30-
ecc6ebe0/xr_usb_serial_common-1a/xr_usb_serial_common.c:468:28: error: unused variable 'tty' [-Werror=unused-variable]
468 | struct tty_struct *tty;
| ^~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/usb-serial-xr_usb_serial_common-2022-03-30-
ecc6ebe0/xr_usb_serial_common-1a/xr_usb_serial_common.c: In function 'xr_usb_serial_reset_resume':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/usb-serial-xr_usb_serial_common-2022-03-30-
ecc6ebe0/xr_usb_serial_common-1a/xr_usb_serial_common.c:1634:28: error: unused variable 'tty' [-Werror=unused-variable]
1634 | struct tty_struct *tty;
| ^~~
cc1: all warnings being treated as errors
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Christian Marangi [Sun, 14 May 2023 14:29:48 +0000 (16:29 +0200)]
gl-mifi-mcu: fix compilation warning for conflicting function
Module called the exit module function "exit", This conflicts with the
stdlib header that use exit() to exit userspace program.
Correctly assign a namespace to these functions. (init and exit)
Fix compilation warning:
warning: the compiler differs from the one used to build the kernel
The kernel was built by: aarch64-openwrt-linux-musl-gcc (OpenWrt GCC 12.2.0 r21757+608-
895f38ca1e) 12.2.0
You are using: aarch64-openwrt-linux-musl-gcc (OpenWrt GCC 12.2.0 r21757+1091-
895f38ca1e) 12.2.0
CC [M] /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/gl-mifi-mcu-1/module.o
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/gl-mifi-mcu-1/module.c:196:20: error: conflicting types for built-in function 'exit'; expected 'void(int)' [-Werror=builtin-declaration-mismatch]
196 | static void __exit exit(void)
| ^~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/gl-mifi-mcu-1/module.c:9:1: note: 'exit' is declared in header '<stdlib.h>'
8 | #include <linux/version.h>
+++ |+#include <stdlib.h>
9 |
cc1: all warnings being treated as errors
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Christian Marangi [Sun, 14 May 2023 14:03:20 +0000 (16:03 +0200)]
dmx_usb_module: fix compilation warning
Fix compilation warning due to wrong cast.
In file included from ./include/linux/kernel.h:19,
from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/dmx_usb_module-19.12.1/dmx_usb.c:16:
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/dmx_usb_module-19.12.1/dmx_usb.c: In function 'dmx_usb_write':
./include/linux/kern_levels.h:5:25: error: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' {aka 'long unsigned int'} [-Werror=format=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap'
422 | _p_func(_fmt, ##__VA_ARGS__); \
| ^~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/dmx_usb_module-19.12.1/dmx_usb.c:41:45: note: in expansion of macro 'printk'
41 | #define dbg(format, arg...) do { if (debug) printk(KERN_DEBUG __FILE__ ": " format "\n" , ## arg); } while (0)
| ^~~~~~
./include/linux/kern_levels.h:15:25: note: in expansion of macro 'KERN_SOH'
15 | #define KERN_DEBUG KERN_SOH "7" /* debug-level messages */
| ^~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/dmx_usb_module-19.12.1/dmx_usb.c:41:52: note: in expansion of macro 'KERN_DEBUG'
41 | #define dbg(format, arg...) do { if (debug) printk(KERN_DEBUG __FILE__ ": " format "\n" , ## arg); } while (0)
| ^~~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/dmx_usb_module-19.12.1/dmx_usb.c:409:9: note: in expansion of macro 'dbg'
409 | dbg("%s - minor %d, count = %d", __FUNCTION__, dev->minor, count);
| ^~~
cc1: all warnings being treated as errors
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>