Compare commits

..
113 Commits
Author SHA1 Message Date
Peter Korsgaard cc34b5b2ab Update for 2023.02.11
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-26 21:13:41 +01:00
Peter Korsgaard 33e2f18b3c Revert "package/libdrm: disable tests"
This reverts commit 3daacade13.

The libdrm tests also include the useful command line utilities such as
modetest and modeprint, so leave them enabled.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-26 18:06:03 +01:00
Peter Korsgaard a8ea81b2e6 package/xvisor: use BR2_PYTHON3_HOST_DEPENDENCY to ensure python3 is available
Commit 24e996d14d (package/xvisor: fix build without python interpreter)
added a dependency on host-python3 for the d2c.py script, but this script
does not use any non-standard python modules so we can instead use
BR2_PYTHON3_HOST_DEPENDENCY to only build host-python3 if the build host
does not have python3.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 7f08dc612c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 23:18:29 +01:00
Fabrice Fontaine f332cb2453 package/privoxy: fix build with root
Fix the following build failure when the configuration files are
installed as root:

id: 'privoxy': no such user
******************************************************************
 WARNING! WARNING! installing config files as root!
 It is strongly recommended to run privoxy as a non-root user,
 and to install the config files as that user and/or group!
 Please read INSTALL, and create a privoxy user and group!
*******************************************************************
make[1]: *** [GNUmakefile:861: install] Error 1

This failure is probably raised since the addition of the package in
commit f8a263fe36 and
https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=26baf6bcc0b5db47b8cf5c55eece0614712b5180

Fixes:
 - http://autobuild.buildroot.org/results/28d8ca6f0e2d81d62196a0958c9274ad2c8c9871

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit b6816034eb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 19:10:50 +01:00
Fabrice Fontaine 69cc76cb0d package/libunwind: drop autoreconf
Commit 67d87bf7d2 forgot to drop autoreconf

Fixes: 67d87bf7d2

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 4eba5e002c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 19:05:40 +01:00
Fabrice Fontaine 0cea473c18 package/xvisor: fix build without python interpreter
Fix the following build failures on a system not providing the "python"
interpreter binary raised at least since bump to version 0.3.1 in commit
c4f8b89687 and more probably
since the addition of the package in commit
e23ddf0c13 and
https://github.com/xvisor/xvisor/commit/ba904b4066f4b375cb1ad76ca41570741dbec62e:

/bin/sh: line 1: /home/buildroot/autobuild/instance-2/output-1/build/xvisor-0.3.1/tools/scripts/d2c.py: cannot execute: required file not found

or

/bin/sh: /home/buildroot/instance-0/output-1/build/xvisor-0.3.2/tools/scripts/d2c.py: /usr/bin/python: bad interpreter: No such file or directory

Fixes:
 - http://autobuild.buildroot.org/results/2e100bacc9e9face8351287e4c979c1729709d7b
 - http://autobuild.buildroot.org/results/5d8a08512db1b3095158753e3a7843b0fd6c9749

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 24e996d14d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 19:04:57 +01:00
Bernd Kuhls 02aa5bd419 package/pure-ftpd: remove optional dependency to libiconv
Buildroot commit 26d5d1c0a2 removed the
configure option --with-rfc2640 due to upstream commit:
https://github.com/jedisct1/pure-ftpd/commit/33eda763bfca8dfcf736275272b84602dcd18549

In the same upstream commit the iconv support was also removed because
it was only needed for rfc2640 support, this removal was forgotten in
the forementioned buildroot commit.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit f30f5e4f61)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 11:30:55 +01:00
Bernd Kuhls 26c53a47bc {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 75bad69099)
[Peter: update BR2_LINUX_KERNEL_LATEST_VERSION to match, drop 6.6.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 11:12:11 +01:00
Fabrice Fontaine aaaeff3550 package/cvs: fix build without editor
Set default editor to /bin/vi to fix the following build failure when no
editor is found on host:

configure:40833: checking for vim
configure:40862: result: no
configure:40833: checking for vi
configure:40862: result: no
configure:40833: checking for emacs
configure:40862: result: no
configure:40833: checking for nano
configure:40862: result: no
configure:40833: checking for pico
configure:40862: result: no
configure:40833: checking for edit
configure:40862: result: no
configure:40874: error:
    Failed to find a text file editor.  CVS cannot be compiled
    without a default log message editor.  Searched for
    `vim vi emacs nano pico edit'.  Try `configure --with-editor'.

While at it, drop CVS_CONFIGURE_ARGS variable for simplicity

Fixes:
 - http://autobuild.buildroot.org/results/5b8a747698bc2e64eb1f001e87577e86e4cb8d14

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 1455d5241b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 10:00:39 +01:00
Lukasz Tekieli 64673eb1e6 board/visionfive2: fix genimage.cfg path
Set correct directory for the BR2_ROOTFS_POST_SCRIPT_ARGS.

Signed-off-by: Lukasz Tekieli <tekieli.lukasz@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 9d48748199)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 08:57:11 +01:00
Fabrice Fontaine 3daacade13 package/libdrm: disable tests
Disable tests to avoid the following build failure with amdgpu and gcc 5
if cunit is built before libdrm:

In file included from ../tests/amdgpu/shader_test_util.c:10:0:
../tests/amdgpu/shader_code.h:113:2: error: initializer element is not constant
  ps_##_ps##_shader_patchinfo_code_size_gfx##_n, \
  ^

tests can be disabled since
https://gitlab.freedesktop.org/mesa/drm/-/commit/46d1e99a5d291b22d86ac52710b079491beedff8

Fixes:
 - http://autobuild.buildroot.org/results/612aad1fa642993da36bbec6c16c9020ac283e34

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit f95069814b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 08:55:58 +01:00
Fabrice Fontaine bdf7db258e package/spice: fix libressl build
Fix the following build failure raised since bump of libressl to version
3.5.2 in commit 8b216927db:

red-stream.cpp: In function 'RedStreamSslStatus red_stream_ssl_accept(RedStream*)':
red-stream.cpp:526:22: error: invalid use of incomplete type 'SSL' {aka 'struct ssl_st'}
  526 |     stream->priv->ssl->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;
      |                      ^~
In file included from /home/buildroot/autobuild/instance-1/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/include/openssl/err.h:120,
                 from red-stream.cpp:33:
/home/buildroot/autobuild/instance-1/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/include/openssl/ossl_typ.h:173:16: note: forward declaration of 'SSL' {aka 'struct ssl_st'}
  173 | typedef struct ssl_st SSL;
      |                ^~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/273eadf9e49af55e0932a8293ca65762fb43114f
 - http://autobuild.buildroot.org/results/97601f321efc532de0c2ea6aa618ce11fad9e851

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 4e5ea31630)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-25 08:32:09 +01:00
Maxim Kochetkov f47b3d5918 package/postgresql: security bump version to 15.6
Release notes: https://www.postgresql.org/docs/release/15.6/

Fixes CVE-2024-0985: PostgreSQL non-owner REFRESH MATERIALIZED VIEW
CONCURRENTLY executes arbitrary SQL

Update COPYRIGHT hash for a change in copyright year (2023->2024).

Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
[Peter: Fix COPYRIGHT hash, extend commit message]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-23 13:33:39 +01:00
Fabrice Fontaine 8878a7f479 package/putty: fix arm uclibc build
Fix the following arm uclibc build failure raised since bump to version
0.78 in commit 5673ea3ce4 which wrongly
removed patch because file was renamed. Patch was sent upstream in 2021
but rejected, even a second iteration defining AT_HWCAP2 to 26 if needed
was also rejected.

Fixes: 5673ea3ce4
 - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Arnout: add Upstream: to patch comment]
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 455ce5fc02)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-22 21:09:48 +01:00
Fabrice Fontaine d0e6a85aba package/poco: needs C++17
poco needs C++17 and gcc >=8 since bump to version 1.13.2 in commit
433c4fd38b and
https://github.com/pocoproject/poco/commit/78234857bf416b718455496800d1b7be3a0d0a53
https://github.com/pocoproject/poco/commit/10f41c06d9416a6ae0884c4827ea2a91bf5d2cf8
resulting in the following build failure with gcc 7:

In file included from src/Thread.cpp:28:0:
src/Thread_POSIX.cpp: In member function 'void Poco::ThreadImpl::setNameImpl(const string&)':
src/Thread_POSIX.cpp:162:56: error: no matching function for call to 'std::__cxx11::basic_string<char>::append(const string&, std::__cxx11::basic_string<char>::size_type)'
   truncName.append(threadName, threadName.size() - half);
                                                        ^

Fixes: 433c4fd38b
 - http://autobuild.buildroot.org/results/7b1c144f39a8be4ce8f964aa13a52d0bf62dd0aa

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 54dbd8e2c5)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-22 20:56:30 +01:00
Fabrice Fontaine 98958c49b9 package/squid: fix build with host gcc 10
Pass -std=c++17 to fix the following build failure with host gcc 10
raised since bump to version 6.6 in commit
c13199c932:

/usr/bin/g++ -O2 -I/home/buildroot/instance-0/output-1/host/include -o cf_gen ./cf_gen.cc -I. -I../include/ -I../src
./cf_gen.cc: In function 'int main(int, char**)':
./cf_gen.cc:268:63: error: forming reference to void
  268 |                     auto &newEntry = entries.emplace_back(name);
      |                                                               ^

Fixes:
 - http://autobuild.buildroot.org/results/613fee008c77f8dbbe04df9a4ce4347e43de9ef9
 - https://bugs.buildroot.org/show_bug.cgi?id=15997

Reported-by: Roland Franke
Suggested-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 9347905b95)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-22 20:54:13 +01:00
Jeremy J. Peper 218b5454ea package/python-rtslib-fb: 2.1.76
bump to latest version because previous version did not work with python 3.11

Signed-off-by: Jeremy J. Peper <jeremy@jeremypeper.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 8a69af5fa4)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 22:01:01 +01:00
Jeremy J. Peper 92f4820374 package/python-configshell-fb: bump version to 1.1.30
bump to latest version because previous version did not work with python 3.11

Signed-off-by: Jeremy J. Peper <jeremy@jeremypeper.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 0c27711002)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:59:54 +01:00
Jeremy J. Peper a20c9280ae package/targetcli-fb: bump version to 2.1.58
bump to latest version because previous version did not work with python 3.11
corrected version mismatch with my first submission

Signed-off-by: Jeremy J. Peper <jeremy@jeremypeper.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 242781bb61)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:58:23 +01:00
Jeremy J. Peper 11f142563e package/targetcli-fb: needs python-gobject
Without python-gobject, we get the following runtime error:

   ModuleNotFoundError: No module named 'gi'

Add python-gobject and propagate its dependencies.

While we're at it, split the DEPENDENCIES over several line and sort
them alphabetically.

Signed-off-by: Jeremy J. Peper <jeremy@jeremypeper.com>
Reviewed-by: Adam Duskett <adam.duskett@amarulasolutions.com>
[Arnout: reorder everything alphabeticall, split DEPENDENCIES over
several lines.]
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 945b9f8d8e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:55:13 +01:00
Fabrice Fontaine 8bbf172fcf package/libkrb5: force arm mode instead of Thumb mode
Fix the following build failure in Thumb mode:

/tmp/ccdzbA2E.s:845: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode

Fixes:
 - http://autobuild.buildroot.org/results/08be1fa0fee0f05818cd78d4718caa3476c570ae

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: André Zwing <nerv@dawncrow.de>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 355ceb8930)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:47:09 +01:00
Peter Korsgaard b79aceec50 package/libgit2: security bump to version 1.6.5
Fixes the following security issues:

- CVE-2024-24575 (infinite loop DoS on revision lookup) and
- CVE-2024-24577 (heap out of bound write on index update)

https://github.com/libgit2/libgit2/releases/tag/v1.6.5

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:34:48 +01:00
Nicolas Cavallari 5d36747c70 package/libgit2: bump version to 1.6.4
* Remove patch applied upstream.
* Upstream fixed building inside the source tree, but still does not
  recommend it, so keep LIBGIT2_SUPPORTS_IN_SOURCE_BUILD = NO

Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 4aef53575b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:28:54 +01:00
Nicolas Cavallari a442714e74 package/libgit2: bump to version 1.6.2
* Fix the license because libgit2 has been using some android code
  without attribution. This explains the change of the hash in the
  license file, which now includes the text of the BSD-2-Clause
  license.
* Building in-source is accidentely broken in this release and upstream
  recommends a separate build directory anyway, so use a separate build
  directory.
* Some win32-specific declarations use wchar_t, add an upstreamed patch
  to avoid a dependency to wchar_t elsewhere.

Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit f32176a767)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:28:15 +01:00
Sébastien Szymanski 1ae6b35f46 package/expat: security bump to version 2.6.2
Security fixes:
	- CVE-2024-28757 -- Prevent billion laughs attacks with isolated
	  use of external parsers.  Please see the commit message of
	  commit 1d50b80cf31de87750103656f6eb693746854aa8 for details.

https://blog.hartwork.org/posts/expat-2-6-2-released/
https://github.com/libexpat/libexpat/blob/R_2_6_2/expat/Changes

Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 1dfe980b19)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:26:48 +01:00
Bernd Kuhls 9cce7be846 {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit bb8766cc54)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:25:19 +01:00
Julien Olivain a7affb39bc package/bitcoin: security bump to version 26.0
For all release notes since 0.21.2, see [1].

This commit also:
- removes the package patches, all included in this release,
- removes the patch entry in ".checkpackageignore",
- adds a comment about pgp signature check in the hash file,
- updates the license hash, due to year update,
- adds the requirement on gcc >= 9, see [2],
- removes the dependency on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which
  is no longer needed, due to the gcc version requirement.

Fixes:
- [3]

Note: this CVE-2023-33297 is not explicitly mentioned in the Bitcoin
core release notes. It is not either appearing in CVE list at [4].
The change corresponding to this vulnerability is "#27610 Improve
performance of p2p inv to send queues" in the version 24.1 release
note. See [5] and [6].

[1] https://github.com/bitcoin/bitcoin/tree/v26.0/doc/release-notes
[2] https://github.com/bitcoin/bitcoin/blob/v26.0/doc/dependencies.md
[3] https://nvd.nist.gov/vuln/detail/CVE-2023-33297
[4] https://en.bitcoin.it/wiki/Common_Vulnerabilities_and_Exposures
[5] https://github.com/bitcoin/bitcoin/blob/v26.0/doc/release-notes/release-notes-24.1.md?plain=1#L45
[6] https://github.com/bitcoin/bitcoin/pull/27610

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit a3a88ff1c8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:16:51 +01:00
Bernd Kuhls ee5d27d199 package/bitcoin: fix build with gcc 13.x
Fixes:
http://autobuild.buildroot.net/results/8ac/8aceefdb71814c48163d7b171783172b6e1fdf27/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit dc08ac951d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:16:28 +01:00
Fabrice Fontaine 299412bed4 package/squid: needs gcc and host gcc >= 8
cf_gen.cc is compiled by host compiler and unconditionally uses auto
since bump to version 6.6 in commit
c13199c932 and
https://github.com/squid-cache/squid/commit/09835feb258c3058d028918e36d959dccb3f7496
resulting in the following build failure with host gcc < 8:

/usr/bin/g++ -O2 -I/home/buildroot/autobuild/run/instance-1/output-1/host/include -o cf_gen ./cf_gen.cc -I. -I../include/ -I../src
./cf_gen.cc: In function 'int main(int, char**)':
./cf_gen.cc:268:63: error: forming reference to void
                     auto &newEntry = entries.emplace_back(name);
                                                               ^

So add a dependency on host gcc >= 8 and gcc >= 8 as advocated by
upstream in
https://github.com/squid-cache/squid/blob/9d3433c4ac6cd547c10cf298b8a5e61a463fb753/doc/release-notes/release-6.sgml.in:

  This release adds a dependency on C++17 support in any compiler used to build Squid.
  GCC 8+ and Clang 8+ support C++17.

While at it, drop BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is always false
with gcc >= 7

Fixes: c13199c932
 - http://autobuild.buildroot.org/results/f1766d1a3b2ce7745fa23cdeae1101806cd97aea

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit b8db5c4660)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-21 21:11:13 +01:00
Fabrice Fontaine d8a0e66314 package/iwd: security bump to version 2.16
Fix CVE-2023-52161: The Access Point functionality in
eapol_auth_key_handle in eapol.c in iNet wireless daemon (IWD) before
2.14 allows attackers to gain unauthorized access to a protected Wi-Fi
network. An attacker can complete the EAPOL handshake by skipping Msg2/4
and instead sending Msg4/4 with an all-zero key.

https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=2.16

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit e2bcdcdd10)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-20 21:30:37 +01:00
Bernd Kuhls 416abafa6f package/iwd: bump version to 2.6
Changelog:
https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog

Depends on ell >= 0.57:
https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/configure.ac?id=464f5c25db8150dc8cea21042a5bac09a8880edc

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 4d6fe4ae3e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-20 21:30:28 +01:00
Fabrice Fontaine 30612fbf97 package/ell: bump to version 0.63
https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.63

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 2695f48ead)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-20 21:30:02 +01:00
Fabrice Fontaine 9d85021091 package/ell: bump to version 0.61
https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.61

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit c0275ce343)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-20 21:29:49 +01:00
Bernd Kuhls d9ec1a4bca package/ell: bump version to 0.57
Changelog:
https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 0eb4ac98a3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-20 21:29:44 +01:00
Fabrice Fontaine b4b2b8c970 package/poco: fix BR2_SHARED_STATIC_LIBS build
poco can't be built statically since commit
073a89196a. However, commit
add7c433d2 enabled static (and shared)
build with BR2_SHARED_STATIC_LIBS resulting in the following build
failure since at least version 1.11.1:

/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips-buildroot-linux-gnu/11.2.0/../../../../mips-buildroot-linux-gnu/bin/ld: /home/buildroot/autobuild/instance-1/output-1/build/poco-1.11.1/lib/Linux/mips/libPocoXML.a(ParserEngine.o): in function `Poco::XML::ParserEngine::handleStartElement(void*, char const*, char const**)':
ParserEngine.cpp:(.text+0x2f8): undefined reference to `XML_GetSpecifiedAttributeCount'

Fixes: add7c433d2
 - http://autobuild.buildroot.org/results/afc434a13d5e7a8affa4abb4058d7bebc81aca29
 - http://autobuild.buildroot.org/results/860b70a8c9c4a6a53247ac4bdb4fd0851b28c61a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit fd484c1f57)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 17:35:32 +01:00
Peter Korsgaard c635c4cb98 package/python-django: security bump to version 4.2.11
Fixes: CVE-2024-27351: Potential regular expression
denial-of-service in django.utils.text.Truncator.words()

https://www.djangoproject.com/weblog/2024/mar/04/security-releases/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 17:32:22 +01:00
Fabrice Fontaine de816dd6de package/luvi: fix build with aarch64_be
Fix the following build failure with aarch64_be raised since the
addition of aarch64_be support to luajit in commit
28e5c2f2bd:

luajit: unknown architecture

Fixes: 28e5c2f2bd
 - http://autobuild.buildroot.org/results/9b89eff7d90173b8c74b8f676650709cc4418e65

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 34d473b5cc)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 16:37:09 +01:00
Fabrice Fontaine 4160f33807 package/strongswan: drop BR2_PACKAGE_STRONGSWAN_SCEP
scepclient is unrecognized since bump to version 5.9.8 in commit
b79d735139 and
https://github.com/strongswan/strongswan/commit/8716f7c03c6193b1cb53837243177f36280ff4f7:

configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --disable-nls, --enable-scepclient

Fixes: b79d735139

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit ed2090717f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 13:20:47 +01:00
Fabrice Fontaine 5ea4551d53 package/dash: fix static build
Drop -Wl,--fatal-warnings with --enable-static to avoid the following
static build failure:

configure:4778: checking for strtod
configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0  -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c  >&5
/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions
collect2: error: ld returned 1 exit status

[...]

In file included from arith_yylex.c:44:
system.h:74:22: error: static declaration of 'strtod' follows non-static declaration
 static inline double strtod(const char *nptr, char **endptr)
                      ^~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c
 - http://autobuild.buildroot.org/results/a4287b86186bf0a1d5370cf53123b324ae65c1da

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit c9de634b08)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 13:17:13 +01:00
Fabrice Fontaine b01b157029 package/gstreamer1/gst1-vaapi: fix wayland build
wayland-protocols is a mandatory dependency with wayland since
bump to version 1.22.0 in commit
33d4c226e5 and
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/3c713cc16ee1d374213cb2b47a3127e14e5ff8a5:

Run-time dependency wayland-protocols found: NO (tried pkgconfig and cmake)

../output-1/build/gst1-vaapi-1.22.0/meson.build:111:0: ERROR: Dependency "wayland-protocols" not found, tried pkgconfig and cmake

Fixes: 33d4c226e5
 - http://autobuild.buildroot.org/results/b5e79d4e10fdf24c3fd43ab742d9d14a5d07824b
 - http://autobuild.buildroot.org/results/ad624cd11d5a1b3346974000ae2b61f4261af02c

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 9d74e5af71)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 13:09:04 +01:00
Thomas Devoogdt b726ccc0c9 package/sdl2: drop video-x11-{xinerama, vm}
Support has been dropped since the major release 2.24.0:
https://github.com/libsdl-org/SDL/commit/7d7ec9c95146c44d4b4643ed552796bf07937057

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 1692f2514a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 13:05:30 +01:00
Fabrice Fontaine 9acadac3e7 package/strace: musl on aarch64 needs headers >= 5.0
strace needs headers >= 5.0 and
https://github.com/torvalds/linux/commit/9966a05c7b80f075f2bc7e48dbb108d3f2927234
to avoid the following build failure on musl and aarch64 due to headers
conflict raised at least since bump to version 6.0 in commit
544806bfd8:

In file included from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/signal.h:48,
                 from strace.c:17:
/home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/bits/signal.h:18:16: error: redefinition of 'struct sigcontext'
   18 | typedef struct sigcontext {
      |                ^~~~~~~~~~
In file included from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/asm/ptrace.h:26,
                 from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/linux/ptrace.h:107,
                 from ptrace.h:33,
                 from strace.c:16:
/home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/asm/sigcontext.h:28:8: note: originally defined here
   28 | struct sigcontext {
      |        ^~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/74a480aa76970b36dcd890d9bd7a9df1d49e8e16
 - http://autobuild.buildroot.org/results/79ee8ae5fb9712fd874b56e836eca1b997c50cd9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Peter: fix architecture conditional]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit e2e8e655fe)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 13:04:49 +01:00
Fabrice Fontaine ebfc153e28 package/python-cheroot: drop host-python-setuptools-scm-git-archive
Drop host-python-setuptools-scm-git-archive dependency

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit b8707cee5e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 12:38:52 +01:00
Fabrice Fontaine 11eadeee2c package/parted: needs gcc >= 5
Fix the following build failure raised since bump to version 3.5 in
commit 57817fe05a and
https://git.savannah.gnu.org/cgit/parted.git/commit/?id=15c49ec04f7eaff014d2e1eddd0aecf4150db63d:

gpt.c:181:5: error: initializer element is not constant
     { PED_PARTITION_APPLE_TV_RECOVERY,  PARTITION_APPLE_TV_RECOVERY_GUID },
     ^
gpt.c:181:5: error: (near initialization for 'flag_uuid_mapping[0].type_uuid')

Fixes: 57817fe05a
 - http://autobuild.buildroot.org/results/1f0af75ec55da9052fbfb195a0699f84619eac81
 - http://autobuild.buildroot.org/results/438b5f40e8b393801f36c691d239e298998cb9d2

Note that udisks also select parted, but it already has a more stringent
dependency on GCC >= 7.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 2934a4692c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-19 12:16:28 +01:00
Fabrice Fontaine ec16e3ee7a package/nginx-naxsi: needs pcre2
Commit 722b84eafa forgot to update
nginx-naxsi resulting in the following build failure:

In file included from ../nginx-naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834/naxsi_src/naxsi_runtime.c:7:
../nginx-naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834/naxsi_src/naxsi.h:147:3: error: unknown type name 'ngx_regex_compile_t'
  147 |   ngx_regex_compile_t* target_rx;
      |   ^~~~~~~~~~~~~~~~~~~

Fixes: 722b84eafa
 - http://autobuild.buildroot.org/results/87bbcf946ccbd8e3bf1ca9f39464f4bb198c8d42

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 73c83dbe3e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 17:49:38 +01:00
Francois Perrad c173e18ae8 package/expat: bump to version 2.6.1
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 44dc77af0e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 17:48:29 +01:00
Fabrice Fontaine 77d0b0253e package/openvmtools: needs dynamic library
openvmtools can't be built statically since at least bump to version
10.3.5 in commit 5f0f0f7e4f:

libtool: link: /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/i586-buildroot-linux-musl-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -Wall -Wno-pointer-sign -Wno-unused-value -fno-strict-aliasing -Wno-unknown-pragmas -Wno-uninitialized -Wno-deprecated-declarations -Wno-unused-const-variable -Wno-unused-but-set-variable -static -o vmtoolsd vmtoolsd-cmdLine.o vmtoolsd-mainLoop.o vmtoolsd-mainPosix.o vmtoolsd-pluginMgr.o vmtoolsd-serviceObj.o vmtoolsd-threadPool.o vmtoolsd-toolsRpc.o vmtoolsd-svcSignals.o vmtoolsd-toolsHangDetector.o -pthread -Wl,--export-dynamic -pthread -pthread -pthread  /home/autobuild/autobuild/instance-9/output-1/build/openvmtools-11.3.5-18557794/libvmtools/.libs/libvmtools.a -L/home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/../i586-buildroot-linux-musl/sysroot/usr/lib /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-li
 nux-musl/sysroot/usr/lib/libdnet.a /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libtirpc.a -lrt -lcrypt -lpthread -lgmodule-2.0 -lgobject-2.0 /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libffi.a -lgthread-2.0 -lglib-2.0 -lm /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libpcre.a ../../lib/globalConfig/.libs/libGlobalConfig.a -pthread
/home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/../lib/gcc/i586-buildroot-linux-musl/10.4.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-9/output-1/build/openvmtools-11.3.5-18557794/libvmtools/.libs/libvmtools.a(libvmtools_la-vmtools.o):(.modinfo+0x0): multiple definition of `vm_version'; vmtoolsd-mainPosix.o:(.modinfo+0x0): first defined here

Fixes:
 - http://autobuild.buildroot.org/results/61b03301bc36247c75e797fb294ec7f96bce6e22
 - http://autobuild.buildroot.org/results/eea487eb0de911f4e4bce7a557d4c93d732181cf

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit a8b33cb87b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 17:47:40 +01:00
Fabrice Fontaine ea9992b99e package/libcoap: fix CVE-2024-0962
A vulnerability was found in obgm libcoap 4.3.4. It has been rated as
critical. Affected by this issue is the function get_split_entry of the
file src/coap_oscore.c of the component Configuration File Handler. The
manipulation leads to stack-based buffer overflow. The attack may be
launched remotely. The exploit has been disclosed to the public and may
be used. It is recommended to apply a patch to fix this issue.
VDB-252206 is the identifier assigned to this vulnerability.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 9002b818be)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 17:43:46 +01:00
Fabrice Fontaine 8873d98abe package/libcoap: bump to version 4.3.4
- Drop patch (already in version)
- LIBCOAP_IGNORE_CVES is not needed after bump
- Update hash of license file: LGPL-2.1 added when RIOT support with
  https://github.com/obgm/libcoap/commit/8d869fff047d34a1c825ffc1bab5d3fde28c75b7

https://github.com/obgm/libcoap/blob/v4.3.4/ChangeLog
https://github.com/obgm/libcoap/compare/v4.3.1...v4.3.4

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit f5d88d8db3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 17:43:41 +01:00
Fabrice Fontaine 99947363dd package/vim: security bump to version 9.1.0145
Fix CVE-2024-22667: Vim before 9.0.2142 has a stack-based buffer
overflow because did_set_langmap in map.c calls sprintf to write to the
error buffer that is passed down to the option callback functions.

Update hash of README.txt (version number updated with
https://github.com/vim/vim/commit/b4ddc6c11e95cef4b372e239871fae1c8d4f72b6)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit ef65c4f90b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 16:18:02 +01:00
Peter Korsgaard 0722334c8a package/libxml2: security bump to version 2.11.7
Fix CVE-2024-25062: An issue was discovered in libxml2 before 2.11.7 and
2.12.x before 2.12.5. When using the XML Reader interface with DTD
validation and XInclude expansion enabled, processing crafted XML
documents can lead to an xmlValidatePopElement use-after-free.

https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.11.7/NEWS

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 16:17:47 +01:00
Christian Hitz 526b91ba8a package/freetype: use correct license format for dual licensed package
Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit def3b9d9a8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 14:28:34 +01:00
Fabrice Fontaine 83c305da5b package/squid: needs C++17
C++17 is mandatory since bump to version 6.2 in commit
2a7c6816f0 and
https://github.com/squid-cache/squid/commit/09835feb258c3058d028918e36d959dccb3f7496
resulting in the following build failure:

configure: error: *** A compiler with support for C++17 language features is required.

Fixes: 2a7c6816f0
 - http://autobuild.buildroot.org/results/06755c324f0bf37e52976fce48a5ad62915193da

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 1e57659260)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 14:27:35 +01:00
Fabrice Fontaine 315a591532 boot/shim: force arm mode instead of Thumb mode
Use OPTIMIZATIONS parameter to pass -marm to fix the following build
failure in Thumb mode:

/tmp/ccEjPM4h.s:941: Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode

CFLAGS can't be overridden as it is defined as:
CFLAGS		= $(FEATUREFLAGS) \
		  $(OPTIMIZATIONS) \
		  $(WARNFLAGS) \
		  $(if $(findstring clang,$(CC)),$(CLANG_WARNINGS)) \
		  $(ARCH_CFLAGS) \
		  $(WERRFLAGS) \
		  $(INCLUDES) \
		  $(DEFINES)

Fixes:
 - http://autobuild.buildroot.org/results/580156f89cfd72122fef07aa2fe37b4fdd4c316b
 - http://autobuild.buildroot.org/results/8980c0f422516c7263d8d0c9cc6123f30c4b7ee4

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 66a202325a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 14:26:23 +01:00
Peter Korsgaard 14b07f82e4 package/python3: security bump to version 3.11.8
Fixes the following security issue:

gh-113659: Skip .pth files with names starting with a dot or hidden file
attribute
https://github.com/python/cpython/issues/113659

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit c7b52c3ccf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 12:44:12 +01:00
Yann E. MORIN 30ee53d5e2 package/openssh: fix dependencies with refpolicy
Commit 2c5a82a29c (package/openssh: select linux-pam if refpolicy
upstream is selected) did not account for the linux-pam dependencies
before selecting it, causing unmet dependencies warnings (unfortunately,
not errors), such as:

    $ KCONFIG_SEED=0xCF227CF4 make randconfig
    WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM
      Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y]
      Selected by [y]:
      - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y]

2c5a82a29c made the choice of having openssl bear the responsibility
to select linux-pam when the upstream refpolicy version was enabled.
Semantically however, the responsibility really lies within refpolicy
itself, since that's what imposes linux-pam to openssh.

Move the select to refpolicy and drop it from openssh. Then, ensure that
linux-pam is only selected when it is available.

That means that one may get an openssh that is not linked against
linux-pam, when the linux-pam dependencies are not met; refpolicy (by
way of libsepol) also has a more stringent requirement on gcc version
than linux-pam, so most probably the missing dependencies would be
locale, wchar, or a static build. We consider that situation to be a
corner case that we do not want to address.

In the future, we may have more similar situations, whereby refpolicy
would impose other packages be linked with otherwise optional
dependencies. If (when) that were (will be) the case, then the proposed
mechanism would quickly become ugly; we could then re-assess a nicer way
to do that. Until then, this is good ebough.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <adam.duskett@amarulasolutions.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit c20b2ae4ec)
[Peter: drop gcc >= 4.9 dependency]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 12:42:36 +01:00
Fabrice Fontaine 3c376e5434 package/poco: bump to version 1.13.2
This bump will fix the following build failure raised since bump of
expat to version 2.6.0 in commit
9dad5e7d7f thanks to
https://github.com/pocoproject/poco/commit/75f7042b70092e79c6b770b18d033a061c84e2c5:

src/ParserEngine.cpp: In member function 'void Poco::XML::ParserEngine::init()':
src/ParserEngine.cpp:510:17: error: 'XML_SetBillionLaughsAttackProtectionMaximumAmplification' was not declared in this scope; did you mean 'setBillionLaughsAttackProtectionMaximumAmplification'?
  510 |                 XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

https://github.com/pocoproject/poco/blob/poco-1.13.2-release/CHANGELOG

Fixes: 9dad5e7d7f
 - http://autobuild.buildroot.org/results/7fad881f85d3b89abdee35388088965f05ead277

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 433c4fd38b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 12:38:29 +01:00
Julien Olivain 85dba7acde package/poco: bump version to 1.12.4
For change log, see:
https://github.com/pocoproject/poco/blob/poco-1.12.4-release/CHANGELOG

This commit also drop the package patch, which was included upstream in
version 1.12.3:
https://github.com/pocoproject/poco/commit/3884c734c261231c34f59e56cde7ae02945b4dae

The file .checkpackageignore is also updated to reflect this patch
removal.

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 50ef6a6f59)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 12:38:06 +01:00
Sen Hastings be4b55ea52 support/scripts/pkg-stats: make current version cell scrollable
Currently, when the version string is "too long", it is arbitrarily
truncated.

This works well for commit hashes, because usually the truncation is
long enough to provide a short hash that is still unique in the
upstream VCS.

However, there are non-hash-like versions strings that get truncated
and wihch the discriminant part is toward the end.

Yet, adapting the version cell to the widest versions string (most
probably a git hash) is not very interesting; the table is already very
large.

Make the cell with the version string scrollable: we get to keep the
best of both worlds: a narrow version cell, and a full-length version
string that can be copy-pasted if needed.

Signed-off-by: Sen Hastings <sen@hastings.org>
[yann.morin.1998@free.fr: reword commit log]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 4533e42622)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-18 12:24:54 +01:00
Bernd Kuhls 9bbb6ad2a6 package/php: bump version to 8.2.16
Changelog: https://www.php.net/ChangeLog-8.php#8.2.16
Release notes: https://www.php.net/releases/8_2_16.php

Updated license hash due to copyright year bump:
https://github.com/php/php-src/commit/2575e6b88c3d3bbd53383fb65057c9b7b029e264

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit d8982b02b6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 20:40:09 +01:00
Peter Korsgaard eddba7834f package/nodejs: security bump to version 16.20.2
Fixes the following security issues:

CVE-2023-32002: Policies can be bypassed via Module._load (High)
CVE-2023-32006: Policies can be bypassed by module.constructor.createRequire (Medium)
CVE-2023-32559: Policies can be bypassed via process.binding (Medium)
CVE-2023-30581: mainModule.__proto__ Bypass Experimental Policy Mechanism (High)
CVE-2023-30585: Privilege escalation via Malicious Registry Key manipulation during Node.js installer repair process (Medium)
CVE-2023-30588: Process interuption due to invalid Public Key information in x509 certificates (Medium)
CVE-2023-30589: HTTP Request Smuggling via Empty headers separated by CR (Medium)
CVE-2023-30590: DiffieHellman does not generate keys after setting a private key (Medium)

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 15:35:27 +01:00
Fabrice Fontaine d129f6d8ee package/c-ares: security bump to version 1.27.0
Fix CVE-2024-25629: Reading malformatted /etc/resolv.conf,
/etc/nsswitch.conf or the HOSTALIASES file could result in a crash.

https://github.com/c-ares/c-ares/security/advisories/GHSA-mg26-v6qh-x48q
https://github.com/c-ares/c-ares/releases/tag/cares-1_27_0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 66cfd29e97)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 13:58:30 +01:00
Marcus Hoffmann 0878e32c06 package/libuv: security bump to version 1.48
Fixes: CVE-2024-24806 / GHSA-f74f-cvh7-c6q6 [1]

Release Notes: https://github.com/libuv/libuv/releases/tag/v1.48.0
Full Changelog: https://github.com/libuv/libuv/blob/v1.48.0/ChangeLog

[1]: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6

Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit bd2f99246c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 13:55:52 +01:00
Fabrice Fontaine 6191e91f59 package/libuv: needs gcc >= 4.9
libuv unconditionally uses stdatomic since
https://github.com/libuv/libuv/commit/2f33980a9141bd49cb2c34361854355b23b1e6fc
resulting in the following build failure with gcc < 4.9 since bump to
version 1.45.0 in commit 21764235cb:

In file included from src/fs-poll.c:23:0:
src/uv-common.h:41:24: fatal error: stdatomic.h: No such file or directory
 # include <stdatomic.h>
                        ^

Fixes:
 - http://autobuild.buildroot.org/results/6b9ce25ba7e5c5602313d533f460f8829f767f81

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 5724145b1e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 13:55:32 +01:00
Bernd Kuhls e00705b984 package/libuv: remove POST_PATCH_HOOK
Buildroot commit 1738b5582b, which
switched  _SOURCE to an upstream-provided tarball, forgot to remove the
POST_PATCH_HOOK which adds a file already present in the tarball.

Fixes:
http://autobuild.buildroot.net/results/e4d0c06e3babed6b290b6223a1cf7e4cce38064c/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 38b8f6aa05)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 13:55:16 +01:00
Bernd Kuhls 38e800efad package/{libuv, uvw}: bump to versions 1.46.0, 3.2.0_libuv_v1.46
Changelog: https://github.com/libuv/libuv/blob/v1.x/ChangeLog

Switched libuv to tarball provided by upstream. removed autoreconf.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 1738b5582b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 13:55:02 +01:00
Bernd Kuhls 3eaa657010 package/{libuv, uvw}: bump to versions 1.45.0, 3.1.0_libuv_v1.45
Updated license hashes due to upstream commits:
- various cleanups, parts of old license file was moved to LICENSE-extra
  https://github.com/libuv/libuv/commits/v1.x/LICENSE
- copyright year bump
  https://github.com/skypjack/uvw/commit/68803053f42bb3b0e139a984837a5539e5da7fe6

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 21764235cb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 13:54:54 +01:00
Bernd Kuhls 56fa026614 {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 05ca551c3b)
[Peter: drop 6.6.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 13:53:00 +01:00
Fabrice Fontaine 95a00b1fd0 package/zlib-ng: fix arm build
zlib-ng usage uses CMAKE_C_COMPILER_TARGET which is non-standard and
is not supposed to be used by the CMakeLists.txt machinery of a
particular package.

Indeed, [1] specifies that:

  Some compiler drivers are inherently cross-compilers, such as clang
  and QNX qcc. These compiler drivers support a command-line argument
  to specify the target to cross-compile for.

buildroot is not using clang nor QNX qcc.
[2] also refers to this variable only for clang [3] and QNX [4].

Therefore, zlib-ng's usage of this variable is a bit of a hack, and it's
actually why it works when passed as an argument, because they are in
fact not supposed to use this variable.

So set CMAKE_C_COMPILER_TARGET to BR2_ARCH to fix the following arm
build failure raised since bump to version 2.0.6 in commit
d2249821d3:

-- Detecting C compile features - done
-- Arch not recognized, falling back to cmake arch: 'l'
-- Basearch 'l' not recognized, defaulting to 'x86'.
-- Basearch of 'l' has been detected as: 'x86'

[...]

/home/buildroot/autobuild/instance-0/output-1/build/zlib-ng-2.1.3/arch/x86/x86_features.c:17:12: fatal error: cpuid.h: No such file or directory
   17 | #  include <cpuid.h>
      |            ^~~~~~~~~

[1] https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_TARGET.html
[2] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html
[3] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-using-clang
[4] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-qnx

Fixes: d2249821d3
 - http://autobuild.buildroot.org/results/1551aa69be19239a8d8e081f033e4027d679ab8f
 - http://autobuild.buildroot.org/results/075d704c0f11710353bac43478e4501addcd747d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 900bd80e9b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-17 12:20:16 +01:00
Yann E. MORIN b0c04a4c0d package/sudo: drop legacy, useless, and broken post-configure hook
Commit b9e89b340e (sudo: bump version) introduced the explicit build
of mksigname and mksiglist as host tools, as they were required to run
on the build machine, to generate C code then used to build the target
program.

This is now failing to build since the bump to sudo 1.9.15p5 in commit
c87746afef (package/sudo: security bump to version 1.9.15p5)
(lines manually wrapped and slightly elided for ease of reviewing):

    /usr/bin/cpp \
        -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \
        -I../../include \
        -I../.. \
        ./sys_signame.h \
    | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h
    In file included from /usr/include/features.h:394,
                     from /usr/include/sys/types.h:25,
                     from ./sys_signame.h:4:
    /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
       26 | #   error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
          |     ^~~~~
    /usr/bin/gcc -I../../include -I../.. -I. -I. \
        -D_PATH_SUDO_CONF=\"/etc/sudo.conf\"
        -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \
        -DDEFAULT_TEXT_DOMAIN=\"sudo\" \
        -O2 \
        -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \
        ./mksigname.c -o mksigname
    In file included from /usr/include/features.h:394,
                     from /usr/include/bits/libc-header-start.h:33,
                     from /usr/include/stdlib.h:26,
                     from ./mksigname.c:27:
    /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
       26 | #   error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
          |     ^~~~~
    make[2]: *** [Makefile:263: mksigname] Error 1

The core of the issue has not been really identified, but it turns out
that neither mksiglist nor mksignames is used during the build. This has
been tested with a minimal sudo with no option, and with a sudo with all
options enabled (linux-pam, zlib, opensldap, and openssl), with the
three types of C libraries (glibc, musl, and uClibc-ng).

Digging in the sudo buildsystem did not reveal an obvious reason when
those would be needed either.

Drop the hook now it seems it is no longer used and is atually breaking
the build.

Fixes: http://autobuild.buildroot.org/results/72f/72ff18fb9b41394a29006f881ee1fbea67a66a09/

Note that there is a second issue in there: the call to the host cpp
fails, but since it is on the LHS of a pipe, the error is lost, as the
RHS of the pipe (the sed call) succeeds; a fix for that will be sent
in a separate patch.

Reported-by: Christian Stewart <christian@aperture.us>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <peter@korsgaard.com>
Reviewed-by: Christian Stewart <christian@aperture.us>
(cherry picked from commit 5aade5ced5)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:32:43 +01:00
Peter Korsgaard ab991fac76 boot/shim: security bump to version 15.8
Fixes the following security issues:

CVE-2023-40546 mok: fix LogError() invocation
CVE-2023-40547 - avoid incorrectly trusting HTTP headers
CVE-2023-40548 Fix integer overflow on SBAT section size on 32-bit system
CVE-2023-40549 Authenticode: verify that the signature header is in bounds.
CVE-2023-40550 pe: Fix an out-of-bound read in verify_buffer_sbat()
CVE-2023-40551: pe-relocate: Fix bounds check for MZ binaries

https://github.com/rhboot/shim/tree/15.8

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit f42004a046)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:31:03 +01:00
Adrian Perez de Castro 34b8419717 package/wpewebkit: security bump to version 2.42.5
Fixes the following security issues:

https://wpewebkit.org/security/WSA-2024-0001.html

- CVE-2024-23222: Processing maliciously crafted web content may lead to
  arbitrary code execution. Apple is aware of a report that this issue
  may have been exploited. Description: A type confusion issue was
  addressed with improved checks.

- CVE-2024-23206: A maliciously crafted webpage may be able to
  fingerprint the user. Description: An access issue was addressed with
  improved access restrictions.

- CVE-2024-23213: Processing web content may lead to arbitrary code
  execution. Description: The issue was addressed with improved memory
  handling.

Add an upstream post-2.42.5 patch to fix an issue with an invalid
backport causing a build issue.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 5275e14125)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:28:35 +01:00
Frank Vanbever 98a1b886bd package/libmodsecurity: security bump to 3.0.12
The project has been transferred from Trustwave (SpiderLabs) to OWASP, hence the
change in URLs. The upstream CPE vendor ID will likely also change in the future
but the upstream is still working on this [1].

- Fixes:
  https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-1019

[1] https://github.com/owasp-modsecurity/ModSecurity/issues/3083

Signed-off-by: Frank Vanbever <frank.vanbever@mind.be>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit d4b065e35c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:27:20 +01:00
Frank Vanbever 05c92a568f package/libmodsecurity: bump to version 3.0.11
Signed-off-by: Frank Vanbever <frank.vanbever@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit cec73bb5f8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:27:12 +01:00
Romain Naour 9a53601ae0 support/testing: TestCheckPackage: update expected strings
Commit dfed5acb56 ("utils/check-package: use https for the manual URL")
replaced the default url to the Buildroot manual while it was used
by TestCheckPackage test.

Update TestCheckPackage with https url.

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243484

Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit a9990552eb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:26:29 +01:00
Marcus Hoffmann 30652bd1d5 package/c-ares: bump to version 1.26.0
Changelog: https://c-ares.org/changelog.html#1_26_0

Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 43ae599c9e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:24:31 +01:00
Fabrice Fontaine 13ffa65376 package/c-ares: bump to version 1.20.1
Update hash of license file (modern MIT license text used since
https://github.com/c-ares/c-ares/commit/6d077838f7e3f1899ba93da9d301b7fe49b311ce)

https://c-ares.org/changelog.html#1_20_1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit c26939ea3f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:24:14 +01:00
Bernd Kuhls 044f444b58 package/bind: security bump version to 9.16.48
Changelog: https://ftp.isc.org/isc/bind9/9.16.48/CHANGES

Version 9.16.46 fixes
- CVE-2023-4408
- CVE-2023-5517
- CVE-2023-5679
- CVE-2023-6516

Version 9.16.47 fixes CVE-2023-50387.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 7ca60941b7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:21:15 +01:00
Bernd Kuhls 6e5fd94c63 package/unbound: security bump version to 1.19.1
Release notes:
https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/

Fixes CVE-2023-50387 & CVE-2023-50868.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 9175bf2649)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:20:26 +01:00
Bernd Kuhls c91e3dac71 DEVELOPERS: add Bernd Kuhls to dnsmasq
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 0dab037e14)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:19:34 +01:00
Bernd Kuhls 112b3d4df2 package/dnsmasq: security bump version to 2.90
Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG

Release notes:
https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html

Fixes CVE 2023-50387 and CVE 2023-50868.

Removed patch which is included in this release.
Switched _SITE to https.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 213cfb3435)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 23:19:27 +01:00
Marcus Hoffmann ef58952a07 package/systemd: needs sulogin for emergency target support
systemd invokes util-linux' sulogin via systemd-sulogin-shell[1] via
emergency.service/emergency.target[2].

[1] https://github.com/systemd/systemd/blob/main/src/sulogin-shell/sulogin-shell.c
[2] https://github.com/systemd/systemd/blob/main/units/emergency.service.in#L23

Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
[yann.morin.1998@free.fr: drop superfluous dependency comment]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 613c817aef)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 22:25:02 +01:00
Nuno Gonçalves 386ee165c1 package/google-breakpad: fix tools option identation in menuconfig
Move comment in Config.in to end of file so that
BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS is properly idented.

Signed-off-by: Nuno Gonçalves <nunog@fr24.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 2c6dc1fed3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 22:21:05 +01:00
Yann E. MORIN 5f687db366 package/sudo: fix build with uClibc
uClibc lacks process_vm_readv(), and sudo fails to build since commit
c87746afef (package/sudo: security bump to version 1.9.15p5), with
errors such as:

    ./exec_ptrace.c: In function ‘ptrace_write_vec’:
    ./exec_ptrace.c:895:9: error: ‘nwritten’ undeclared (first use in this function); did you mean ‘pwrite’?
      895 |         nwritten = ptrace_write_string(pid, strtab, vec[i]);
          |         ^~~~~~~~
          |         pwrite

Backport an upstream commit to fix the issue.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 0f0117ad94)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 22:20:35 +01:00
Fabrice Fontaine e1291e7dd7 package/sudo: security bump to version 1.9.15p5
- Drop patch (already in version) and so also drop autoreconf
- The sudoers plugin has been modified to make it more resilient to
  ROWHAMMER attacks on authentication and policy matching. This
  addresses CVE-2023-42465.

https://www.sudo.ws/releases/stable/#1.9.15p5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit c87746afef)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 22:20:31 +01:00
Fabrice Fontaine 996f86ef99 package/rsync: fix openssl static build
Fix the following openssl static build raised since commit
80fa5672da:

/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/aarch64_be-buildroot-linux-uclibc/12.3.0/../../../../aarch64_be-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/aarch64_be-buildroot-linux-uclibc/sysroot/lib/../lib64/libcrypto.a(libcrypto-lib-c_zlib.o): in function `zlib_oneshot_expand_block':
c_zlib.c:(.text+0xaec): undefined reference to `uncompress'

Commit b9a062b354 can also be reverted as
pkg-config will also retrieve -latomic to avoid the following build
failure:

/home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-1/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(threads_pthread.o): in function `CRYPTO_atomic_add':
threads_pthread.c:(.text+0x208): undefined reference to `__atomic_is_lock_free'

RSYNC_POST_CONFIGURE_HOOKS must be added to call reconfigure and avoid
the following build failure after autoreconf:

autoconf -o configure.sh
autoheader && touch config.h.in
configure.sh has CHANGED.
config.h.in is unchanged.
You may need to run:
  make reconfigure

Fixes:
 - http://autobuild.buildroot.org/results/6c1636f7556e7370a4c9f6d02c63cf3e20dc985c
 - http://autobuild.buildroot.org/results/49abbaa1eab94b248bff434b40728065d687e278

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit e889a1c9e9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 22:08:21 +01:00
Fabrice Fontaine 0f3d4a834b package/botan: disable neon with arm soft float
Disable neon with soft float to fix the following build failure raised
at least since version 2.19.1:

In file included from build/include/botan/internal/simd_32.h:27,
                 from src/lib/block/aes/aes_vperm/aes_vperm.cpp:15:
/home/thomas/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/10.4.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI.  Please use -mfloat-abi=softfp or -mfloat-abi=hard"
   31 | #error "NEON intrinsics not available with the soft-float ABI.  Please use -mfloat-abi=softfp or -mfloat-abi=hard"
      |  ^~~~~

Fixes:
 - http://autobuild.buildroot.org/results/6b311e97484db2b0f8adbda140320d696713b1e0
 - http://autobuild.buildroot.org/results/c309940ea6db0845d8221fb51611d0254222c644

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 48c5053576)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 22:06:59 +01:00
Francois Perrad 3acb4c83fb package/lua-http: fix CVE-2023-4540
see https://nvd.nist.gov/vuln/detail/CVE-2023-4540
  & https://cert.pl/en/posts/2023/09/CVE-2023-4540

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 431c021740)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 22:06:07 +01:00
Julien Olivain da8de1ec37 package/ghostscript: security bump to version 10.02.1
For release note, see:
https://ghostscript.readthedocs.io/en/gs10.02.1/News.html

For detailed history, see:
https://git.ghostscript.com/?p=ghostpdl.git;a=shortlog;h=refs/tags/ghostpdl-10.02.1

Fixes:
- CVE-2023-46751:
  https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-46751

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit c456fefb91)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 21:55:48 +01:00
Fabrice Fontaine 25376141ad package/exim: fix libressl build
Fix the following libressl build failure raised since bump to version
4.97 in commit faec3ca30e and
https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8:

In file included from tls.c:473:
tls-openssl.c: In function 'tls_client_stapling_cb':
tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'}
 2652 |         bs->certs
      |           ^~

Fixes: faec3ca30e
 - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit dc59cbe467)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-16 21:14:53 +01:00
Bernd Kuhls 7048ad3266 {linux, linux-headers}: bump 6.{1, 6}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 6e5229c252)
[Peter: drop 6.6.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-10 23:26:03 +01:00
Bernd Kuhls 7eb3a961ac package/clamav: security bump version to 1.0.5
Release notes:
https://blog.clamav.net/2023/11/clamav-130-122-105-released.html

Fixes CVE-2024-20290 & CVE-2024-20328.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit e6e54416ad)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-10 22:59:03 +01:00
Bernd Kuhls ad964a3fdf package/clamav: security bump version to 1.0.4
Release notes:
https://blog.clamav.net/2023/10/clamav-121-113-104-010311-patch.html

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit ce7d054878)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-10 22:58:52 +01:00
Bernd Kuhls ca6a07d9d0 package/clamav: security bump version to 1.0.3
Release notes:
https://blog.clamav.net/2023/08/clamav-120-feature-version-and-111-102.html

Fixes CVE-2023-40477:
"Upgrade the bundled UnRAR library (libclamunrar) to version 6.2.10."

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 387d66dc4f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-10 22:58:44 +01:00
Bernd Kuhls 75bb896ec3 package/clamav: security bump version to 1.0.2
Release notes: https://blog.clamav.net/2023/07/2023-08-16-releases.html

Fixes CVE-2023-20197 & CVE-2023-20212.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit c78799639b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-10 22:58:34 +01:00
Bernd Kuhls ff1371f643 package/clamav: fix build on mips64el
Fixes:
http://autobuild.buildroot.net/results/b64/b640937f35b11ddb9f1e29f0e44040eda8850f26/
'Could not find specification for target "mips64el-unknown-linux-gnu".'

This patch changes
    -DRUST_COMPILER_TARGET=mips64el-unknown-linux-gnu
to
    -DRUST_COMPILER_TARGET=mips64el-unknown-linux-gnuabi64

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 9a560d6aff)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-10 22:58:28 +01:00
Bernd Kuhls b28d522e4e package/clamav: bump version to 1.0.1
Removed patch which was applied upstream.
License files were moved to COPYING/

Updated license hash of COPYING.lzma due to upstream commit
https://github.com/Cisco-Talos/clamav/commit/6b3b8b2e9ddcfd61c88a4b61e0d4e10fcb996ce6#diff-216b7167897f75c13c7fcfa08956f8f9269af0927024c7e14201683b94ebad8f
which made no changes to the license text.

Switched build system to cmake, reworked various dependencies.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 203725a46b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-10 22:58:04 +01:00
James Hilliard 5d99b844a1 package/gst1-python: disable tests
We don't need tests enabled which can also cause build issues.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ae8cb9b2bf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-10 22:38:09 +01:00
Yann E. MORIN 7fd91f10ab doc/manual: indent the CVE example the same as the CVE list item
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 949c1a51b7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-09 14:37:34 +01:00
Yann E. MORIN 0a4d96a5a6 doc/manual: fixup ordered lists
With recent asiidoc versions (at least 10.2.0 is known to report that),
rendering the manual yields a few warnings related to ordered lists:

    asciidoc: WARNING: customize-quick-guide.adoc: line 13: list item index: expected 2 got 1
    asciidoc: WARNING: customize-quick-guide.adoc: line 15: list item index: expected 3 got 1
    [...]
    asciidoc: WARNING: customize-quick-guide.adoc: line 65: list item index: expected 13 got 1
    asciidoc: WARNING: customize-quick-guide.adoc: line 66: list item index: expected 14 got 1
    asciidoc: WARNING: adding-packages-gettext.adoc: line 30: list item index: expected 2 got 1
    asciidoc: WARNING: adding-packages-gettext.adoc: line 41: list item index: expected 3 got 1

The reason is that we use the same index to tell asciidoc to
automatically number items.

However, the official way to provide an automatic index is to write no
index:

    https://docs.asciidoctor.org/asciidoc/latest/lists/ordered/

    [...] since the numbering is obvious, the AsciiDoc processor will
    insert the numbers for you if you omit them:
    [...]
    If you number the ordered list explicitly, you have to manually keep
    the list numerals sequential. Otherwise, you will get a warning.

So, abide by the documentation, and drop the repeating indices to
ordered lists where we want automatic numbering.

Note that there is another ordered list, in adding-packages-directory.adoc,
but it does use explicit, sequential numbering. For consistency within
the whole document, we also convert it.

To avoid extra useless churn, the indentation of the items is not
changed to match the elided indices.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 1c24d83cc8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-09 14:36:53 +01:00
Yann E. MORIN fdd561b1c2 utils/check-package: use https for the manual URL
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit dfed5acb56)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-09 14:35:48 +01:00
Fabrice Fontaine d3f3a1864c package/libcurl: fix libpsl static build
Fix the following static build failure with libpsl raised since bump to
version 8.6.0 in commit 5cee6b6be6:

configure:28830: /home/autobuild/autobuild/instance-6/output-1/host/bin/aarch64_be-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -static -Werror-implicit-function-declaration -Wno-system-headers -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -I/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include  -static -L/home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib  -L/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/lib conftest.c -lpsl  -lmbedtls -lmbedx509 -lmbedcrypto -lz  -latomic >&5
/home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/aarch64_be-buildroot-linux-musl/11.4.0/../../../../aarch64_be-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib/libpsl.a(psl.c.o): in function `is_public_suffix':
psl.c:(.text+0x2a8): undefined reference to `idn2_lookup_u8'

[...]

checking for library containing psl_builtin... no
configure: error: libpsl was not found

Fixes: 5cee6b6be6
 - http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit bedcd1cd39)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 18:53:59 +01:00
Bernd Kuhls 1f5b7fb783 package/libcurl: bump version to 8.6.0
Changelog: https://curl.se/changes.html#8_6_0

Removed patch which was included in upstream release.

Updated license hash due to copyright year bump:
https://github.com/curl/curl/commit/57cc70e559aa065426021e22e2af8166af6084f6

Added configure options for optional libpsl support due to upstream
commit which throws an error during configure when libpsl is missing and
--without-libpsl was not used:
https://github.com/curl/curl/commit/2998874bb61ac6ef3b72d6a61467cd2aaf6e53ea

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 5cee6b6be6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 18:53:56 +01:00
Sen Hastings f9b38b93c1 DEVELOPERS: update Sen Hastings email
phobosdpl is an old work email I don't really use anymore, so I'm
changing it to my personal email.

Signed-off-by: Sen Hastings <sen@phobosdpl.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 622fec1bb3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 15:43:16 +01:00
Peter Korsgaard c020b922b3 package/python-django: security bump to version 4.2.10
Fixes the following security issue:

- CVE-2024-24680: Potential denial-of-service in intcomma template filter

  The intcomma template filter was subject to a potential denial-of-service
  attack when used with very long strings.

https://www.djangoproject.com/weblog/2024/feb/06/security-releases/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 65878ea1a9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 15:39:32 +01:00
Adam Duskett 1cf69e2b5b package/python-django: security bump to 4.2.7
- Fixed a regression in Django 4.2 that caused a crash of QuerySet.aggregate()
   with aggregates referencing expressions containing subqueries (#34798).

 - Restored, following a regression in Django 4.2, creating
   varchar/text_pattern_ops indexes on CharField and TextField with
   deterministic collations on PostgreSQL (#34932).

Tested on Fedora 39 with:
./support/testing/run-tests tests.package.test_python_django

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit be4347c088)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 15:39:12 +01:00
Adam Duskett bc3b3b46ca package/python-django: bump version to 4.2.6
Tested with tests.package.test_python_django.TestPythonPy3Django.test_run in
Fedora 38 and Debian 11

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit bc8d214e98)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 15:38:45 +01:00
Peter Korsgaard d947e87a91 package/webkitgtk: security bump to version 2.42.5
Fixes the following security issues:

https://webkitgtk.org/security/WSA-2024-0001.html

- CVE-2024-23222: Processing maliciously crafted web content may lead to
  arbitrary code execution.  Apple is aware of a report that this issue may
  have been exploited.  Description: A type confusion issue was addressed
  with improved checks.

- CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint
  the user.  Description: An access issue was addressed with improved access
  restrictions.

- CVE-2024-23213: Processing web content may lead to arbitrary code execution.
  Description: The issue was addressed with improved memory handling.

- CVE-2023-40414: Processing web content may lead to arbitrary code
  execution.  Description: A use-after-free issue was addressed with
  improved memory management.

- CVE-2023-42833: Processing web content may lead to arbitrary code execution.
  Description: A correctness issue was addressed with improved checks.

- CVE-2014-1745: Processing a file may lead to a denial-of-service or
  potentially disclose memory contents.  Description: The issue was
  addressed with improved checks.

https://webkitgtk.org/security/WSA-2023-0012.html

- CVE-2023-42883: Processing a SVG image may lead to a denial-of-service.
  Description: The issue was addressed with improved memory handling.

- CVE-2023-42890: Processing web content may lead to arbitrary code
  execution.  Description: The issue was addressed with improved memory
  handling.

https://webkitgtk.org/security/WSA-2023-0011.html

- CVE-2023-42916: Processing web content may disclose sensitive information.
  Apple is aware of a report that this issue may have been actively
  exploited.  Description: An out-of-bounds read was addressed with improved
  input validation.

- CVE-2023-42917: Processing web content may lead to arbitrary code
  execution.  Apple is aware of a report that this issue may have been
  actively exploited.  Description: A memory corruption vulnerability was
  addressed with improved locking.

Add an upstream post-2.42.5 patch to fix an issue with an invalid backport
causing a build issue.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Acked-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit de3684f57d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 14:45:02 +01:00
Yann E. MORIN 8294399b94 package/v4l2loopback: drop _CPE_ID_VENDOR
Commit 1edb9d691d (package/v4l2loopback: add
V4L2LOOPBACK_CPE_ID_VENDOR) added that variable, but set to its default
value.

This is however not required to define a valid CPE ID, as it also
defines a non-default CPE_ID_PREFIX.

Drop V4L2LOOPBACK_CPE_ID_VENDOR now.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 74682e07df)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 12:30:58 +01:00
Julien Olivain 0f77312f94 support/testing: gnupg2: increase a timeout
The symmetric encryption test can sometimes take longer than the default
timeout. This commit increase the timeout to 10 seconds for that
command.

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit f44c0807c6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 12:30:03 +01:00
Julien Olivain 4240702548 package/gnupg2: security bump to version 2.4.4
See release announce:
https://lists.gnupg.org/pipermail/gnupg-announce/2024q1/000481.html

For the details about the security advisory for GnuPG created
smartcard keys, see:
https://gnupg.org/blog/20240125-smartcard-backup-key.html

This commit also drops the package patch, which is now included in
this new version.

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit bdcd5adf39)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 12:29:15 +01:00
Bernd Kuhls 7066c799b4 package/gnupg2: fix build without ldap
Buildroot commit 8f1418b5dd bumped the
version of gnupg2 on the next branch causing a build error:

server.c:(.text+0xbf8): undefined reference to `ks_ldap_help_variables'

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 06702c81d3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 12:29:06 +01:00
Julien Olivain dba962a7cb package/gnupg2: bump to version 2.4.3
See release announce:
https://lists.gnupg.org/pipermail/gnupg-announce/2023q3/000480.html

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 8f1418b5dd)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-03-08 12:28:49 +01:00
153 changed files with 1247 additions and 732 deletions
-1
View File
@@ -139,7 +139,6 @@ package/owfs/S55owserver Shellcheck Variables
package/owfs/S60owfs Shellcheck Variables
package/pigpio/S50pigpio Shellcheck Variables
package/pkgconf/pkg-config.in Shellcheck
package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob
package/postgresql/S50postgresql Variables
package/procps-ng/S02sysctl Variables
package/proftpd/S50proftpd Indent Shellcheck Variables
+23
View File
@@ -1,3 +1,26 @@
2023.02.11, released March 26th, 2024
Important / security related fixes.
Defconfigs: Starfive visionfive2: Use correct genimage
configuration.
Updated/fixed packages: bind, bitcoin, botan, c-ares, clamav,
cvs, dash, dnsmasq, ell, exim, expat, freetype, ghostscript,
gnupg2, google-breakpad, gst1-python, gst1-vaapi, iwd,
libcoap, libcurl, libgit2, libkrb5, libmodsecurity, libunwind,
libuv, libxml2, lua-http, luvi, nginx-naxsi, nodejs, openssh,
openvmtools, parted, php, poco, postgresql, privoxy,
pure-ftpd, putty, python-cheroot, python-configshell-fb,
python-django, python-rtslib-fb, python3, rsync, sdl2, shim,
spice, squid, strace, strongswan, sudo, systemd, targetcli-fb,
unbound, uvw, v4l2loopback, vim, webkitgtk, wpewebkit, xvisor,
zlib-ng
Issues resolved (http://bugs.uclibc.org):
#15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail
2023.02.10, released March 1st, 2024
Important / security related fixes.
+10
View File
@@ -146,6 +146,16 @@ endif
comment "Legacy options removed in 2023.02"
config BR2_PACKAGE_STRONGSWAN_SCEP
bool "strongswan SCEP client tool removed"
select BR2_LEGACY
help
"ipsec scepclient" tool has been removed and replaced by the
pki subcommands "pki --scep" and "pki --scepca" which
implement the new SCEP RFC 8894 standard that was released in
September 2020 and which supports trusted "certificate
renewal" based on the existing client certificate.
config BR2_PACKAGE_PUGIXML_HEADER_ONLY
bool "pugixml header-only removed"
select BR2_LEGACY
+2 -1
View File
@@ -324,6 +324,7 @@ F: package/bitcoin/
F: package/clamav/
F: package/dav1d/
F: package/dht/
F: package/dnsmasq/
F: package/dovecot/
F: package/dovecot-pigeonhole/
F: package/dtv-scan-tables/
@@ -2567,7 +2568,7 @@ F: package/libbson/
F: package/lua-resty-http/
F: package/mpir/
N: Sen Hastings <sen@phobosdpl.com>
N: Sen Hastings <sen@hastings.org>
F: package/systemd
F: support/scripts/pkg-stats
+2 -2
View File
@@ -90,9 +90,9 @@ all:
.PHONY: all
# Set and export the version string
export BR2_VERSION := 2023.02.10
export BR2_VERSION := 2023.02.11
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1709311000
BR2_VERSION_EPOCH = 1711484000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
+1 -1
View File
@@ -1,3 +1,3 @@
# locally computed hash
sha256 eab91644a3efe91a666399f5d8eb3eed0e04d04f79d4b6c0b278ef7747a239a5 shim-15.6.tar.bz2
sha256 a79f0a9b89f3681ab384865b1a46ab3f79d88b11b4ca59aa040ab03fffae80a9 shim-15.8.tar.bz2
sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT
+11 -2
View File
@@ -4,7 +4,7 @@
#
################################################################################
SHIM_VERSION = 15.6
SHIM_VERSION = 15.8
SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION)
SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2
SHIM_LICENSE = BSD-2-Clause
@@ -13,10 +13,19 @@ SHIM_CPE_ID_VENDOR = redhat
SHIM_INSTALL_TARGET = NO
SHIM_INSTALL_IMAGES = YES
SHIM_CFLAGS = $(TARGET_CFLAGS)
SHIM_MAKE_OPTS = \
ARCH="$(GNU_EFI_PLATFORM)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
DASHJ="-j$(PARALLEL_JOBS)"
DASHJ="-j$(PARALLEL_JOBS)" \
OPTIMIZATIONS="$(SHIM_CFLAGS)"
# shim has some assembly function that is not present in Thumb mode:
# Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode
# so, we desactivate Thumb mode
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
SHIM_CFLAGS += -marm
endif
define SHIM_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS)
+1 -1
View File
@@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
BR2_SYSTEM_DHCP="eth0"
BR2_ROOTFS_OVERLAY="board/visionfive2/overlay"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b)/linux-7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b.tar.gz"
+7 -7
View File
@@ -44,13 +44,13 @@ project after an empty line.
As a convention specific to Buildroot, the ordering of the attributes
is as follows:
1. The type of option: +bool+, +string+... with the prompt
2. If needed, the +default+ value(s)
3. Any dependencies on the target in +depends on+ form
4. Any dependencies on the toolchain in +depends on+ form
5. Any dependencies on other packages in +depends on+ form
6. Any dependency of the +select+ form
7. The help keyword and help text.
. The type of option: +bool+, +string+... with the prompt
. If needed, the +default+ value(s)
. Any dependencies on the target in +depends on+ form
. Any dependencies on the toolchain in +depends on+ form
. Any dependencies on other packages in +depends on+ form
. Any dependency of the +select+ form
. The help keyword and help text.
You can add other sub-options into a +if BR2_PACKAGE_LIBFOO...endif+
statement to configure particular things in your software. You can look at
+1 -1
View File
@@ -499,7 +499,7 @@ not and can not work as people would expect it should:
the package, or when the CVE for some reason does not affect the
Buildroot package. A Makefile comment must always precede the
addition of a CVE to this variable. Example:
+
----------------------
# 0001-fix-cve-2020-12345.patch
LIBFOO_IGNORE_CVES += CVE-2020-12345
+3 -3
View File
@@ -23,11 +23,11 @@ Due to this, and in order to make sure that Native Language Support is
properly handled, packages in Buildroot that can use NLS support
should:
1. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This
. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This
is done automatically for 'autotools' packages and therefore should
only be done for packages using other package infrastructures.
1. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package
. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package
+<pkg>_DEPENDENCIES+ variable. This addition should be done
unconditionally: the value of this variable is automatically
adjusted by the core infrastructure to contain the relevant list of
@@ -38,7 +38,7 @@ should:
also contains +gettext+ in order to get the full-blown 'gettext'
implementation.
1. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that
. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that
the package gets linked with +libintl+. This is generally not
needed with 'autotools' packages as they usually detect
automatically that they should link with +libintl+. However,
+14 -14
View File
@@ -9,11 +9,11 @@ now summarize all this by providing step-by-step instructions to storing your
project-specific customizations. Clearly, the steps that are not relevant to
your project can be skipped.
1. +make menuconfig+ to configure toolchain, packages and kernel.
1. +make linux-menuconfig+ to update the kernel config, similar for
. +make menuconfig+ to configure toolchain, packages and kernel.
. +make linux-menuconfig+ to update the kernel config, similar for
other configuration like busybox, uclibc, ...
1. +mkdir -p board/<manufacturer>/<boardname>+
1. Set the following options to +board/<manufacturer>/<boardname>/<package>.config+
. +mkdir -p board/<manufacturer>/<boardname>+
. Set the following options to +board/<manufacturer>/<boardname>/<package>.config+
(as far as they are relevant):
* +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+
* +BR2_PACKAGE_BUSYBOX_CONFIG+
@@ -21,7 +21,7 @@ your project can be skipped.
* +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+
* +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+
* +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE+
1. Write the configuration files:
. Write the configuration files:
* +make linux-update-defconfig+
* +make busybox-update-config+
* +make uclibc-update-config+
@@ -29,38 +29,38 @@ your project can be skipped.
board/<manufacturer>/<boardname>/at91bootstrap3.config+
* +make barebox-update-defconfig+
* +make uboot-update-defconfig+
1. Create +board/<manufacturer>/<boardname>/rootfs-overlay/+ and fill it
. Create +board/<manufacturer>/<boardname>/rootfs-overlay/+ and fill it
with additional files you need on your rootfs, e.g.
+board/<manufacturer>/<boardname>/rootfs-overlay/etc/inittab+.
Set +BR2_ROOTFS_OVERLAY+
to +board/<manufacturer>/<boardname>/rootfs-overlay+.
1. Create a post-build script
. Create a post-build script
+board/<manufacturer>/<boardname>/post_build.sh+. Set
+BR2_ROOTFS_POST_BUILD_SCRIPT+ to
+board/<manufacturer>/<boardname>/post_build.sh+
1. If additional setuid permissions have to be set or device nodes have
. If additional setuid permissions have to be set or device nodes have
to be created, create +board/<manufacturer>/<boardname>/device_table.txt+
and add that path to +BR2_ROOTFS_DEVICE_TABLE+.
1. If additional user accounts have to be created, create
. If additional user accounts have to be created, create
+board/<manufacturer>/<boardname>/users_table.txt+ and add that path
to +BR2_ROOTFS_USERS_TABLES+.
1. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+
. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+
to +board/<manufacturer>/<boardname>/patches/+ and add your patches
for each package in a subdirectory named after the package. Each
patch should be called +<packagename>-<num>-<description>.patch+.
1. Specifically for the Linux kernel, there also exists the option
. Specifically for the Linux kernel, there also exists the option
+BR2_LINUX_KERNEL_PATCH+ with as main advantage that it can also
download patches from a URL. If you do not need this,
+BR2_GLOBAL_PATCH_DIR+ is preferred. U-Boot, Barebox, at91bootstrap
and at91bootstrap3 also have separate options, but these do not
provide any advantage over +BR2_GLOBAL_PATCH_DIR+ and will likely be
removed in the future.
1. If you need to add project-specific packages, create
. If you need to add project-specific packages, create
+package/<manufacturer>/+ and place your packages in that
directory. Create an overall +<manufacturer>.mk+ file that
includes the +.mk+ files of all your packages. Create an overall
+Config.in+ file that sources the +Config.in+ files of all your
packages. Include this +Config.in+ file from Buildroot's
+package/Config.in+ file.
1. +make savedefconfig+ to save the buildroot configuration.
1. +cp defconfig configs/<boardname>_defconfig+
. +make savedefconfig+ to save the buildroot configuration.
. +cp defconfig configs/<boardname>_defconfig+
+1 -1
View File
@@ -128,7 +128,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "6.1.76" if BR2_LINUX_KERNEL_LATEST_VERSION
default "6.1.82" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
+5 -5
View File
@@ -1,11 +1,11 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz
sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz
sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz
sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz
sha256 f0805225f4a5b24d0bba9302c2c2f261c04f737ac5dd931da9b112e9f3e4a47e linux-5.15.152.tar.xz
sha256 84cf30223239ec3333a5f7b2a7fba2042bba70d1582a139f7543956af871ad80 linux-5.10.213.tar.xz
sha256 3599d5959a403e64be407d7f05e56cb270d6ddd154e89a596609919ab1e2e366 linux-5.4.272.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz
sha256 95ec94c4ab8f46d8a54430893f9bd653c46b0f1587d216818aa8f52fd313de69 linux-4.19.310.tar.xz
sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz
# Locally computed
sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz
+4 -2
View File
@@ -4,6 +4,7 @@ config BR2_PACKAGE_BIND
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
depends on !BR2_STATIC_LIBS # libuv
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv
select BR2_PACKAGE_LIBUV
select BR2_PACKAGE_OPENSSL
help
@@ -43,7 +44,8 @@ config BR2_PACKAGE_BIND_TOOLS
endif
comment "bind needs a toolchain w/ NPTL, dynamic library"
comment "bind needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+2 -2
View File
@@ -1,4 +1,4 @@
# Verified from https://ftp.isc.org/isc/bind9/9.16.44/bind-9.16.44.tar.xz.asc
# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc
# with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD
sha256 cfaa953c36d5ca42d9584fcf9653d07c85527b59687e7c4d4cb8071272db6754 bind-9.16.44.tar.xz
sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz
sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
BIND_VERSION = 9.16.44
BIND_VERSION = 9.16.48
BIND_SOURCE= bind-$(BIND_VERSION).tar.xz
BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
# bind does not support parallel builds.
@@ -1,48 +0,0 @@
From 330cb33985d0ce97c20f4a0f0bbda0fbffe098d4 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 9 Nov 2020 21:18:40 +0100
Subject: [PATCH] src/randomenv.cpp: fix build on uclibc
Check for HAVE_STRONG_GETAUXVAL or HAVE_WEAK_GETAUXVAL before using
getauxval to avoid a build failure on uclibc
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/bitcoin/bitcoin/pull/20358]
---
src/randomenv.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/randomenv.cpp b/src/randomenv.cpp
index 07122b7f6..5e07c3db4 100644
--- a/src/randomenv.cpp
+++ b/src/randomenv.cpp
@@ -53,7 +53,7 @@
#include <sys/vmmeter.h>
#endif
#endif
-#ifdef __linux__
+#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL)
#include <sys/auxv.h>
#endif
@@ -326,7 +326,7 @@ void RandAddStaticEnv(CSHA512& hasher)
// Bitcoin client version
hasher << CLIENT_VERSION;
-#ifdef __linux__
+#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL)
// Information available through getauxval()
# ifdef AT_HWCAP
hasher << getauxval(AT_HWCAP);
@@ -346,7 +346,7 @@ void RandAddStaticEnv(CSHA512& hasher)
const char* exec_str = (const char*)getauxval(AT_EXECFN);
if (exec_str) hasher.Write((const unsigned char*)exec_str, strlen(exec_str) + 1);
# endif
-#endif // __linux__
+#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL
#ifdef HAVE_GETCPUID
AddAllCPUID(hasher);
--
2.28.0
+4 -7
View File
@@ -11,8 +11,8 @@ config BR2_PACKAGE_BITCOIN
bool "bitcoin"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread, boost-filesystem
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9
depends on BR2_TOOLCHAIN_HAS_THREADS # boost
depends on BR2_USE_WCHAR
select BR2_PACKAGE_BOOST
@@ -36,12 +36,9 @@ config BR2_PACKAGE_BITCOIN
https://bitcoincore.org
comment "bitcoin needs a toolchain w/ C++, threads, wchar"
comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9"
depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
comment "bitcoin needs a toolchain not affected by GCC bug 64735"
depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_9
+5 -3
View File
@@ -1,5 +1,7 @@
# From https://bitcoincore.org/bin/bitcoin-core-0.21.2/SHA256SUMS.asc
sha256 4146f751fc5691bdcf911cbdb8d32d8d25c297d29d58173227ae1ae6438edb9e bitcoin-0.21.2.tar.gz
# Hash from: https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS
# After checking pgp signature from:
# https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS.asc
sha256 ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1 bitcoin-26.0.tar.gz
# Hash for license file
sha256 96fe807030b21f88305adc32af62f9aa19915f2783509fd6f52aea02cf83f644 COPYING
sha256 a6331cd1f889397adfc0c3b0535682a20950c6cf8e5c712e9997a15ce98324e1 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
BITCOIN_VERSION = 0.21.2
BITCOIN_VERSION = 26.0
BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION)
BITCOIN_AUTORECONF = YES
BITCOIN_LICENSE = MIT
+4
View File
@@ -90,6 +90,10 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),)
BOTAN_CONF_OPTS += --disable-neon
endif
ifeq ($(BR2_SOFT_FLOAT),y)
BOTAN_CONF_OPTS += --disable-neon
endif
define BOTAN_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) ./configure.py $(BOTAN_CONF_OPTS))
endef
+2 -2
View File
@@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
sha256 321700399b72ed0e037d0074c629e7741f6b2ec2dda92956abe3e9671d3e268e c-ares-1.19.1.tar.gz
sha256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b c-ares-1.27.0.tar.gz
# Hash for license file
sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md
sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
C_ARES_VERSION = 1.19.1
C_ARES_VERSION = 1.27.0
C_ARES_SITE = http://c-ares.haxx.se/download
C_ARES_INSTALL_STAGING = YES
C_ARES_CONF_OPTS = --with-random=/dev/urandom
@@ -1,36 +0,0 @@
From 053bac34b9f0f947c58fcdf80ac03d5a6b05aa12 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 7 May 2018 23:15:58 +0200
Subject: [PATCH] mbox: do not use backtrace if using uClibc without backtrace
support
Since uClibc can be configured without support for backtrace, disable
the backtrace if we are building with a uClibc that was built without
backtrace.
This is a bit hacky, and would greatly benefit from a test in ./configure
instead, but does nicely as a quick fix for now.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Bernd: rebased for 0.103.0]
---
libclamav/mbox.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libclamav/mbox.c b/libclamav/mbox.c
index 71f540c0a..4851297a9 100644
--- a/libclamav/mbox.c
+++ b/libclamav/mbox.c
@@ -91,7 +91,7 @@
#include <features.h>
#endif
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__) || defined(__UCLIBC_HAS_BACKTRACE__)
#define HAVE_BACKTRACE
#endif
#endif
--
2.14.3
+7
View File
@@ -1,14 +1,20 @@
config BR2_PACKAGE_CLAMAV
bool "clamav"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS # dlopen
depends on BR2_USE_WCHAR
select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_HOST_RUSTC
select BR2_PACKAGE_JSON_C
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBMSPACK
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_PCRE2
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
help
@@ -20,4 +26,5 @@ config BR2_PACKAGE_CLAMAV
comment "clamav needs a toolchain w/ C++, dynamic library, threads, wchar"
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
depends on BR2_USE_MMU
+13 -13
View File
@@ -1,14 +1,14 @@
# Locally calculated
sha256 61d7ebda7c9c36f50425a3726ae293db36adeae7f71b1fe488902b73c70b7e11 clamav-0.103.11.tar.gz
sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING
sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2
sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file
sha256 6dce638b76399e7521ad8e182d3e33e4496c85b3b69b6ff434b53017101e82ad COPYING.getopt
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LGPL
sha256 e3a9b913515a42f8ff3ef1551c3a2cdba383c39ed959729e0e2911219496ad74 COPYING.llvm
sha256 d96d71b66aa32c4a2d1619b9ca3347dafa9460bcf0fb5ac2408916067ad31dfc COPYING.lzma
sha256 accdcf2455c07b99abea59016b3663eaef926a92092d103bfaa25fed27cf6b24 COPYING.pcre
sha256 e2c1395a3d9fea6d5d25847c9d783db6e2cc8b085b4025861f459139c5dfd90b COPYING.regex
sha256 1faccc6b5c7b958fb807a3f573d5be9bf7889fe898f7e0617c544b05a81bfd00 COPYING.unrar
sha256 a20d6317c5384e8d4c05f9c31097878675d9429ec46090656166039cc10bc957 COPYING.YARA
sha256 c2f77553f8d870c5635b0dace0519253233f172b33ce1fdf6578610706294eee COPYING.zlib
sha256 aa67ee9679f747af3c492353d768464c27d614b3fed62eb7f988b6776d4aedbb clamav-1.0.5.tar.gz
sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt
sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2
sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file
sha256 6dce638b76399e7521ad8e182d3e33e4496c85b3b69b6ff434b53017101e82ad COPYING/COPYING.getopt
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING/COPYING.LGPL
sha256 e3a9b913515a42f8ff3ef1551c3a2cdba383c39ed959729e0e2911219496ad74 COPYING/COPYING.llvm
sha256 c7cbcf00b59dc61165b655b45bf6c21bb685d593861e7abbc78460c499167b42 COPYING/COPYING.lzma
sha256 accdcf2455c07b99abea59016b3663eaef926a92092d103bfaa25fed27cf6b24 COPYING/COPYING.pcre
sha256 e2c1395a3d9fea6d5d25847c9d783db6e2cc8b085b4025861f459139c5dfd90b COPYING/COPYING.regex
sha256 1faccc6b5c7b958fb807a3f573d5be9bf7889fe898f7e0617c544b05a81bfd00 COPYING/COPYING.unrar
sha256 a20d6317c5384e8d4c05f9c31097878675d9429ec46090656166039cc10bc957 COPYING/COPYING.YARA
sha256 c2f77553f8d870c5635b0dace0519253233f172b33ce1fdf6578610706294eee COPYING/COPYING.zlib
+36 -67
View File
@@ -4,30 +4,38 @@
#
################################################################################
CLAMAV_VERSION = 0.103.11
CLAMAV_VERSION = 1.0.5
CLAMAV_SITE = https://www.clamav.net/downloads/production
CLAMAV_LICENSE = GPL-2.0
CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex \
COPYING.unrar COPYING.zlib
CLAMAV_LICENSE_FILES = \
COPYING.txt \
COPYING/COPYING.bzip2 \
COPYING/COPYING.file \
COPYING/COPYING.getopt \
COPYING/COPYING.LGPL \
COPYING/COPYING.llvm \
COPYING/COPYING.lzma \
COPYING/COPYING.pcre \
COPYING/COPYING.regex \
COPYING/COPYING.unrar \
COPYING/COPYING.zlib
CLAMAV_CPE_ID_VENDOR = clamav
CLAMAV_SELINUX_MODULES = clamav
# affects only Cisco devices
CLAMAV_IGNORE_CVES += CVE-2016-1405
CLAMAV_DEPENDENCIES = \
bzip2 \
host-pkgconf \
host-rustc \
json-c \
libcurl \
libmspack \
libxml2 \
openssl \
pcre2 \
zlib \
$(TARGET_NLS_DEPENDENCIES)
# mmap cannot be detected when cross-compiling, needed for mempool support
CLAMAV_CONF_ENV = \
ac_cv_c_mmap_private=yes \
have_cv_ipv6=yes \
OBJC=$(TARGET_CC)
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
CLAMAV_LIBS += -latomic
endif
@@ -40,66 +48,27 @@ endif
CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)"
CLAMAV_CONF_OPTS = \
--with-dbdir=/var/lib/clamav \
--with-libcurl=$(STAGING_DIR)/usr \
--with-openssl=$(STAGING_DIR)/usr \
--with-system-libmspack=$(STAGING_DIR)/usr \
--with-zlib=$(STAGING_DIR)/usr \
--disable-zlib-vcheck \
--disable-rpath \
--disable-clamav \
--disable-milter \
--disable-llvm \
--disable-clamdtop \
--enable-mempool
ifeq ($(BR2_PACKAGE_BZIP2),y)
CLAMAV_DEPENDENCIES += bzip2
# autodetection gets confused if host has bzip2, so force it
CLAMAV_CONF_ENV += \
ac_cv_libbz2_libs=-lbz2 \
ac_cv_libbz2_ltlibs=-lbz2
else
CLAMAV_CONF_OPTS += --disable-bzip2
endif
ifeq ($(BR2_PACKAGE_JSON_C),y)
CLAMAV_CONF_OPTS += --with-libjson=$(STAGING_DIR)/usr
CLAMAV_DEPENDENCIES += json-c
else
CLAMAV_CONF_OPTS += --without-libjson
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
CLAMAV_CONF_ENV += ac_cv_path_xmlconfig=$(STAGING_DIR)/usr/bin/xml2-config
CLAMAV_CONF_OPTS += --with-xml=$(STAGING_DIR)/usr
CLAMAV_DEPENDENCIES += libxml2
else
CLAMAV_CONF_OPTS += --disable-xml
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
CLAMAV_CONF_OPTS += --with-iconv
CLAMAV_DEPENDENCIES += libiconv
else
CLAMAV_CONF_OPTS += --without-iconv
endif
ifeq ($(BR2_PACKAGE_PCRE2),y)
CLAMAV_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr
CLAMAV_DEPENDENCIES += pcre2
else ifeq ($(BR2_PACKAGE_PCRE),y)
CLAMAV_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr
CLAMAV_DEPENDENCIES += pcre
else
CLAMAV_CONF_OPTS += --without-pcre
endif
-DCMAKE_SKIP_INSTALL_RPATH=ON \
-DENABLE_JSON_SHARED=ON \
-DENABLE_MAN_PAGES=OFF \
-DENABLE_MILTER=OFF \
-DENABLE_TESTS=OFF \
-DHAVE_SYSTEM_LFS_FTS=ON \
-DRUST_COMPILER_TARGET=$(RUSTC_TARGET_NAME) \
-Dtest_run_result=ON \
-Dtest_run_result__TRYRUN_OUTPUT=ON
ifeq ($(BR2_PACKAGE_NCURSES),y)
CLAMAV_CONF_OPTS += -DENABLE_APP=ON
CLAMAV_DEPENDENCIES += ncurses
ifeq ($(BR2_INIT_SYSTEMD),y)
CLAMAV_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
CLAMAV_CONF_OPTS += -DENABLE_SYSTEMD=ON
CLAMAV_DEPENDENCIES += systemd
else
CLAMAV_CONF_OPTS += --with-systemdsystemunitdir=no
CLAMAV_CONF_OPTS += -DENABLE_SYSTEMD=OFF
endif
else
CLAMAV_CONF_OPTS += -DENABLE_APP=OFF -DENABLE_SYSTEMD=OFF
endif
$(eval $(autotools-package))
$(eval $(cmake-package))
+3 -3
View File
@@ -14,7 +14,7 @@ config BR2_PACKAGE_CMAKE
config BR2_PACKAGE_CMAKE_CTEST
bool "ctest"
depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # jsoncpp, libuv
depends on BR2_USE_WCHAR # libarchive
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_STATIC_LIBS
@@ -40,10 +40,10 @@ config BR2_PACKAGE_CMAKE_CTEST
http://www.cmake.org/
comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL"
comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.9, NPTL"
depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL
+6 -6
View File
@@ -18,18 +18,18 @@ CVS_CONF_ENV = \
ac_cv_func_working_mktime=yes \
cvs_cv_func_printf_ptr=yes
CVS_CONFIGURE_ARGS = --disable-old-info-format-support
CVS_CONF_OPTS = \
--disable-old-info-format-support \
--with-editor=/bin/vi
ifeq ($(BR2_PACKAGE_CVS_SERVER),y)
CVS_CONFIGURE_ARGS += --enable-server
CVS_CONF_OPTS += --enable-server
else
CVS_CONFIGURE_ARGS += --disable-server
CVS_CONF_OPTS += --disable-server
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
CVS_CONFIGURE_ARGS += --with-external-zlib
CVS_CONF_OPTS += --with-external-zlib
endif
CVS_CONF_OPTS = $(CVS_CONFIGURE_ARGS)
define CVS_BZIP_UNPACK
$(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2
@@ -0,0 +1,45 @@
From 7d07f683b83ef9fbdf258ce61b022b32f06f253a Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 16 Feb 2024 17:26:28 +0100
Subject: [PATCH] configure.ac: drop -Wl,--fatal-warnings
Drop -Wl,--fatal-warnings with --enable-static to avoid the following
static build failure:
configure:4778: checking for strtod
configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5
/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions
collect2: error: ld returned 1 exit status
[...]
In file included from arith_yylex.c:44:
system.h:74:22: error: static declaration of 'strtod' follows non-static declaration
static inline double strtod(const char *nptr, char **endptr)
^~~~~~
Fixes:
- http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Upstream: https://lore.kernel.org/dash/20240216163319.860768-1-fontaine.fabrice@gmail.com
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 5524650..6993364 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ fi
AC_ARG_ENABLE(static, AS_HELP_STRING(--enable-static, \
[Build statical linked program]))
if test "$enable_static" = "yes"; then
- export LDFLAGS="-static -Wl,--fatal-warnings"
+ export LDFLAGS="-static"
fi
AC_ARG_ENABLE(fnmatch, AS_HELP_STRING(--disable-fnmatch, \
--
2.43.0
+2
View File
@@ -8,6 +8,8 @@ DASH_VERSION = 0.5.11.5
DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
DASH_LICENSE_FILES = COPYING
# We're patching configure.ac
DASH_AUTORECONF = YES
# dash does not build in parallel
DASH_MAKE = $(MAKE1)
@@ -1,64 +0,0 @@
From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Tue, 7 Mar 2023 22:07:46 +0000
Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232.
Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5
http://www.dnsflagday.net/2020/ refers.
Thanks to Xiang Li for the prompt.
[dalang@gmx.at: backport from upstream]
Signed-off-by: Daniel Lang <dalang@gmx.at>
---
CHANGELOG | 9 ++++++++
man/dnsmasq.8 | 3 ++-
src/config.h | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 3af20cf..52d8678 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@ version 2.90
+version 2.90
+ Set the default maximum DNS UDP packet sice to 1232. This
+ has been the recommended value since 2020 because it's the
+ largest value that avoid fragmentation, and fragmentation
+ is just not reliable on the modern internet, especially
+ for IPv6. It's still possible to override this with
+ --edns-packet-max for special circumstances.
+
+
version 2.89
Fix bug introduced in 2.88 (commit fe91134b) which can result
in corruption of the DNS cache internal data structures and
diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
index 41e2e04..5acb935 100644
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP.
.TP
.B \-P, --edns-packet-max=<size>
Specify the largest EDNS.0 UDP packet which is supported by the DNS
-forwarder. Defaults to 4096, which is the RFC5625-recommended size.
+forwarder. Defaults to 1232, which is the recommended size following the
+DNS flag day in 2020. Only increase if you know what you are doing.
.TP
.B \-Q, --query-port=<query_port>
Send outbound DNS queries from, and listen for their replies on, the
diff --git a/src/config.h b/src/config.h
index 1e7b30f..37b374e 100644
--- a/src/config.h
+++ b/src/config.h
@@ -19,7 +19,7 @@
#define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */
#define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */
#define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */
-#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */
+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */
#define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */
#define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */
#define DNSSEC_WORK 50 /* Max number of queries to validate one question */
--
2.20.1
+2 -2
View File
@@ -1,6 +1,6 @@
# Locally calculated after checking pgp signature
# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc
sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz
# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc
sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz
# Locally calculated
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3
+2 -2
View File
@@ -4,9 +4,9 @@
#
################################################################################
DNSMASQ_VERSION = 2.89
DNSMASQ_VERSION = 2.90
DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq
DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \
+1 -1
View File
@@ -1,5 +1,5 @@
# From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc
sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz
sha256 7397c76996d7646b9917ebf016cd67586b10166295af2e0e18cdb5b8f6659965 ell-0.63.tar.xz
# License files
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
ELL_VERSION = 0.56
ELL_VERSION = 0.63
ELL_SOURCE = ell-$(ELL_VERSION).tar.xz
ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell
ELL_LICENSE = LGPL-2.1+
+58
View File
@@ -0,0 +1,58 @@
From caf57fe7eb5018b8df196e6d9f99586232798eb3 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 8 Nov 2023 14:22:37 +0000
Subject: [PATCH] typoes
Upstream: https://git.exim.org/exim.git/commit/caf57fe7eb5018b8df196e6d9f99586232798eb3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/src/tls-openssl.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/tls-openssl.c b/src/tls-openssl.c
index 851ac77c5..237303ba9 100644
--- a/src/tls-openssl.c
+++ b/src/tls-openssl.c
@@ -77,9 +77,9 @@ change this guard and punt the issue for a while longer. */
# define EXIM_HAVE_OPENSSL_KEYLOG
# define EXIM_HAVE_OPENSSL_CIPHER_GET_ID
# define EXIM_HAVE_SESSION_TICKET
-# define EXIM_HAVE_OPESSL_TRACE
-# define EXIM_HAVE_OPESSL_GET0_SERIAL
-# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS
+# define EXIM_HAVE_OPENSSL_TRACE
+# define EXIM_HAVE_OPENSSL_GET0_SERIAL
+# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS
# define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN
# ifndef DISABLE_OCSP
# define EXIM_HAVE_OCSP
@@ -1756,7 +1756,7 @@ level. */
DEBUG(D_tls)
{
SSL_CTX_set_info_callback(ctx, info_callback);
-#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE)
+#if defined(EXIM_HAVE_OPENSSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE)
/* this needs a debug build of OpenSSL */
SSL_CTX_set_msg_callback(ctx, SSL_trace);
#endif
@@ -2442,7 +2442,7 @@ tls_in.ocsp = OCSP_NOT_RESP;
if (!olist)
return SSL_TLSEXT_ERR_NOACK;
-#ifdef EXIM_HAVE_OPESSL_GET0_SERIAL
+#ifdef EXIM_HAVE_OPENSSL_GET0_SERIAL
{
const X509 * cert_sent = SSL_get_certificate(s);
const ASN1_INTEGER * cert_serial = X509_get0_serialNumber(cert_sent);
@@ -2646,7 +2646,7 @@ if (!(bs = OCSP_response_get1_basic(rsp)))
debug_printf("certs contained in basicresp:\n");
x509_stack_dump_cert_s_names(
-#ifdef EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS
+#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS
OCSP_resp_get0_certs(bs)
#else
bs->certs
--
2.30.2
@@ -0,0 +1,43 @@
From 88f45502272a9a674948204e460ebe90202827d4 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 11 Feb 2024 21:45:42 +0100
Subject: [PATCH] src/src/tls-openssl.c: fix build with libressl >= 3.5.0
OCSP_BASICRESP is an opaque structure since libressl 3.5.0 and
https://github.com/libressl/openbsd/commit/57442b0028fb09287793f279ee57ebb38e9ab954
resulting in the following build failure since version 4.97 and
https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8:
In file included from tls.c:473:
tls-openssl.c: In function 'tls_client_stapling_cb':
tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'}
2652 | bs->certs
| ^~
Fixes:
- http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Upstream: https://bugs.exim.org/show_bug.cgi?id=3074
---
src/src/tls-openssl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/tls-openssl.c b/src/tls-openssl.c
index 237303ba9..c7f94c160 100644
--- a/src/tls-openssl.c
+++ b/src/tls-openssl.c
@@ -98,6 +98,10 @@ change this guard and punt the issue for a while longer. */
# define EXIM_HAVE_OPENSSL_CIPHER_GET_ID
#endif
+#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL
+# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS
+#endif
+
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x030000000L)
# define EXIM_HAVE_EXPORT_CHNL_BNGNG
# define EXIM_HAVE_OPENSSL_X509_STORE_GET1_ALL_CERTS
--
2.43.0
+4 -4
View File
@@ -1,7 +1,7 @@
# From https://sourceforge.net/projects/expat/files/expat/2.6.0/
md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz
sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz
# From https://sourceforge.net/projects/expat/files/expat/2.6.2/
md5 0cb75c8feb842c0794ba89666b762a2d expat-2.6.1.tar.xz
sha1 d9e5f953dcacda3c9e69b4886382c3d8847b81bd expat-2.6.1.tar.xz
# Locally calculated
sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz
sha256 ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz
sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
EXPAT_VERSION = 2.6.0
EXPAT_VERSION = 2.6.2
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
EXPAT_INSTALL_STAGING = YES
+1 -1
View File
@@ -9,7 +9,7 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz
FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype
FREETYPE_INSTALL_STAGING = YES
FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)"
FREETYPE_LICENSE = Dual FTL/GPL-2.0+
FREETYPE_LICENSE = FTL or GPL-2.0+
FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
FREETYPE_CPE_ID_VENDOR = freetype
FREETYPE_DEPENDENCIES = host-pkgconf
+2 -2
View File
@@ -1,5 +1,5 @@
# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10020/SHA512SUMS
sha512 c49344151063e915add55a0a842c2a645d8362a5cbca663bd07638f4bd3699a08cade37a9efe905ad5a41e014353e5e1b1268b7925e43128ad30d5b031396b71 ghostscript-10.02.0.tar.xz
# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10021/SHA512SUMS
sha512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11 ghostscript-10.02.1.tar.xz
# Hash for license file:
sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
GHOSTSCRIPT_VERSION = 10.02.0
GHOSTSCRIPT_VERSION = 10.02.1
GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz
GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION))
GHOSTSCRIPT_LICENSE = AGPL-3.0
+2 -2
View File
@@ -1,5 +1,5 @@
# From https://www.gnupg.org/download/integrity_check.html
sha1 3efd495a94dc81fd0ea8788bef6c69d1f13cedd7 gnupg-2.4.2.tar.bz2
sha256 97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49 gnupg-2.4.2.tar.bz2
sha1 228b3984325fdeebc5e3f2d165c6419a5ebc28de gnupg-2.4.4.tar.bz2
sha256 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 gnupg-2.4.4.tar.bz2
# Locally calculated
sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
GNUPG2_VERSION = 2.4.2
GNUPG2_VERSION = 2.4.4
GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
GNUPG2_LICENSE = GPL-3.0+
+8 -8
View File
@@ -34,14 +34,6 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD
https://chromium.googlesource.com/breakpad/breakpad
comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8"
depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_USES_GLIBC || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
if BR2_PACKAGE_GOOGLE_BREAKPAD
config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS
@@ -51,3 +43,11 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS
minidump_stackwalk and microdump_stackwalk.
endif
comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8"
depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_USES_GLIBC || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
@@ -34,6 +34,7 @@ GST1_PYTHON_CONF_ENV += \
# the correct .so file, and the resulting compiled library has the appropriate
# path of /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so
GST1_PYTHON_CONF_OPTS += \
-Dlibpython-dir=/usr/lib/
-Dlibpython-dir=/usr/lib/ \
-Dtests=disabled
$(eval $(meson-package))
+1
View File
@@ -8,6 +8,7 @@ config BR2_PACKAGE_GST1_VAAPI
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_GST1_PLUGINS_BASE
select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers
select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7
help
@@ -39,6 +39,7 @@ endif
ifeq ($(BR2_PACKAGE_WAYLAND),y)
GST1_VAAPI_CONF_OPTS += -Dwayland=enabled
GST1_VAAPI_DEPENDENCIES += wayland wayland-protocols
else
GST1_VAAPI_CONF_OPTS += -Dwayland=disabled
endif
+1 -1
View File
@@ -1,5 +1,5 @@
# From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc
sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz
sha256 c1a82032e994861e794cf3b5a16d07ae1aa03a6674f716c73408ffeae2a233ba iwd-2.16.tar.xz
# License files
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
IWD_VERSION = 2.3
IWD_VERSION = 2.16
IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz
IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless
IWD_LICENSE = LGPL-2.1+
+9 -6
View File
@@ -29,12 +29,13 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO
config BR2_PACKAGE_LIBBLOCKDEV_FS
bool "filesystem"
depends on BR2_ENABLE_LOCALE # parted
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
select BR2_PACKAGE_PARTED
comment "filesystem plugin needs a toolchain w/ locale"
depends on !BR2_ENABLE_LOCALE
comment "filesystem plugin needs a toolchain w/ locale, gcc >= 5"
depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
config BR2_PACKAGE_LIBBLOCKDEV_LOOP
bool "loop"
@@ -42,11 +43,12 @@ config BR2_PACKAGE_LIBBLOCKDEV_LOOP
config BR2_PACKAGE_LIBBLOCKDEV_LVM2
bool "lvm2"
depends on BR2_ENABLE_LOCALE # parted
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted
select BR2_PACKAGE_PARTED
select BR2_PACKAGE_LVM2
comment "lvm2 support needs a toolchain w/ locale"
depends on !BR2_ENABLE_LOCALE
comment "lvm2 support needs a toolchain w/ locale, gcc >= 5"
depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
config BR2_PACKAGE_LIBBLOCKDEV_MDRAID
bool "mdraid"
@@ -55,10 +57,11 @@ config BR2_PACKAGE_LIBBLOCKDEV_MDRAID
config BR2_PACKAGE_LIBBLOCKDEV_PART
bool "part"
depends on BR2_ENABLE_LOCALE # parted
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted
select BR2_PACKAGE_PARTED
comment "part plugin needs a toolchain w/ locale"
depends on !BR2_ENABLE_LOCALE
comment "part plugin needs a toolchain w/ locale, gcc >= 5"
depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
config BR2_PACKAGE_LIBBLOCKDEV_SWAP
bool "swap"
@@ -1,59 +0,0 @@
From c63ecbdc6b38cc7e571a72964fe9ca63834dcc89 Mon Sep 17 00:00:00 2001
From: Jon Shallow <supjps-libcoap@jpshallow.com>
Date: Wed, 6 Sep 2023 21:38:13 +0200
Subject: [PATCH] Backport fix for CVE-2023-30362
Upstream: https://github.com/obgm/libcoap/issues/1063#issuecomment-1626962307
Signed-off-by: Daniel Lang <dalang@gmx.at>
---
src/net.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/net.c b/src/net.c
index 98859443..e259ab00 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1305,19 +1305,27 @@ coap_send_internal(coap_session_t *session, coap_pdu_t *pdu) {
/* Need to check that we are not seeing this proxy in the return loop */
if (pdu->data && opt == NULL) {
- if (pdu->used_size + 1 <= pdu->max_size) {
- char *a_match;
- size_t data_len = pdu->used_size - (pdu->data - pdu->token);
- pdu->data[data_len] = '\000';
- a_match = strstr((char*)pdu->data, cp);
- if (a_match && (a_match == (char*)pdu->data || a_match[-1] == ' ') &&
- ((size_t)(a_match - (char*)pdu->data + len) == data_len ||
- a_match[len] == ' ')) {
- coap_log(LOG_WARNING, "Proxy loop detected '%s'\n",
- (char*)pdu->data);
- coap_delete_pdu(pdu);
- return (coap_mid_t)COAP_DROPPED_RESPONSE;
- }
+ char *a_match;
+ size_t data_len;
+
+ if (pdu->used_size + 1 > pdu->max_size) {
+ /* No space */
+ return (coap_mid_t)COAP_DROPPED_RESPONSE;
+ }
+ if (!coap_pdu_resize(pdu, pdu->used_size + 1)) {
+ /* Internal error */
+ return (coap_mid_t)COAP_DROPPED_RESPONSE;
+ }
+ data_len = pdu->used_size - (pdu->data - pdu->token);
+ pdu->data[data_len] = '\000';
+ a_match = strstr((char*)pdu->data, cp);
+ if (a_match && (a_match == (char*)pdu->data || a_match[-1] == ' ') &&
+ ((size_t)(a_match - (char*)pdu->data + len) == data_len ||
+ a_match[len] == ' ')) {
+ coap_log(LOG_WARNING, "Proxy loop detected '%s'\n",
+ (char*)pdu->data);
+ coap_delete_pdu(pdu);
+ return (coap_mid_t)COAP_DROPPED_RESPONSE;
}
}
if (pdu->used_size + len + 1 <= pdu->max_size) {
--
2.42.0
@@ -0,0 +1,38 @@
From 2b28d8b0e9607e71a145345b4fe49517e052b7d9 Mon Sep 17 00:00:00 2001
From: Jon Shallow <supjps-libcoap@jpshallow.com>
Date: Thu, 25 Jan 2024 18:03:17 +0000
Subject: [PATCH] coap_oscore.c: Fix parsing OSCORE configuration information
Upstream: https://github.com/obgm/libcoap/commit/2b28d8b0e9607e71a145345b4fe49517e052b7d9
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/coap_oscore.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/coap_oscore.c b/src/coap_oscore.c
index 83f785c92..e0fb22947 100644
--- a/src/coap_oscore.c
+++ b/src/coap_oscore.c
@@ -1678,11 +1678,12 @@ get_split_entry(const char **start,
oscore_value_t *value) {
const char *begin = *start;
const char *end;
+ const char *kend;
const char *split;
size_t i;
retry:
- end = memchr(begin, '\n', size);
+ kend = end = memchr(begin, '\n', size);
if (end == NULL)
return 0;
@@ -1693,7 +1694,7 @@ get_split_entry(const char **start,
if (begin[0] == '#' || (end - begin) == 0) {
/* Skip comment / blank line */
- size -= end - begin + 1;
+ size -= kend - begin + 1;
begin = *start;
goto retry;
}
+2 -2
View File
@@ -1,4 +1,4 @@
# Locally calculated
sha256 074a71deca01e06d3acb00a1416d0fbeb87d130f40a3c0f6fda3a5c711855dca libcoap-4.3.1.tar.gz
sha256 ae61a48c21f7b40e1442c9e1da9aab9e6f2cf0deccb02f3fed4de232a0b0522e libcoap-4.3.4.tar.gz
sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING
sha256 5711e8bf7e94b59fcf0681d0f73752111bc196563b60f8568f19dacd0213192b LICENSE
sha256 bdd94ddd8e75010aebd045ead1c951110788003395c708811d6960248acb3891 LICENSE
+4 -5
View File
@@ -4,7 +4,7 @@
#
################################################################################
LIBCOAP_VERSION = 4.3.1
LIBCOAP_VERSION = 4.3.4
LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION))
LIBCOAP_INSTALL_STAGING = YES
LIBCOAP_LICENSE = BSD-2-Clause
@@ -14,10 +14,9 @@ LIBCOAP_DEPENDENCIES = host-pkgconf
LIBCOAP_CONF_OPTS = \
--disable-examples --disable-examples-source --without-tinydtls
LIBCOAP_AUTORECONF = YES
# 0001-Backport-fix-for-CVE-2023-30362.patch
LIBCOAP_IGNORE_CVES += CVE-2023-30362
# Doesn't affect 4.3.1, see https://github.com/obgm/libcoap/issues/1117
LIBCOAP_IGNORE_CVES += CVE-2023-35862
# 0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch
LIBCOAP_IGNORE_CVES += CVE-2024-0962
ifeq ($(BR2_PACKAGE_GNUTLS),y)
LIBCOAP_DEPENDENCIES += gnutls
@@ -0,0 +1,109 @@
From 9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 15 Feb 2024 20:59:25 +0100
Subject: [PATCH] configure.ac: find libpsl with pkg-config
Find libpsl with pkg-config to avoid static build failures.
Ref: http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Closes #12947
Upstream: https://github.com/curl/curl/commit/9b3f67e267d1fa8d7867655d133bdbf8830a0ab3
---
configure.ac | 79 ++++++++++++++++++++++++++++++++++++++++++++--------
docs/TODO | 7 -----
2 files changed, 67 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index cd0e2d07d8d164..09d5364f4de575 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2075,19 +2075,74 @@ dnl **********************************************************************
dnl Check for libpsl
dnl **********************************************************************
-AC_ARG_WITH(libpsl,
- AS_HELP_STRING([--without-libpsl],
- [disable support for libpsl]),
- with_libpsl=$withval,
- with_libpsl=yes)
-curl_psl_msg="no (libpsl disabled)"
-if test $with_libpsl != "no"; then
- AC_SEARCH_LIBS(psl_builtin, psl,
- [curl_psl_msg="enabled";
- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled])
- ],
- [AC_MSG_ERROR([libpsl was not found]) ]
+dnl Default to compiler & linker defaults for LIBPSL files & libraries.
+OPT_LIBPSL=off
+AC_ARG_WITH(libpsl,dnl
+AS_HELP_STRING([--with-libpsl=PATH],[Where to look for libpsl, PATH points to the LIBPSL installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option])
+AS_HELP_STRING([--without-libpsl], [disable LIBPSL]),
+ OPT_LIBPSL=$withval)
+
+if test X"$OPT_LIBPSL" != Xno; then
+ dnl backup the pre-libpsl variables
+ CLEANLDFLAGS="$LDFLAGS"
+ CLEANCPPFLAGS="$CPPFLAGS"
+ CLEANLIBS="$LIBS"
+
+ case "$OPT_LIBPSL" in
+ yes)
+ dnl --with-libpsl (without path) used
+ CURL_CHECK_PKGCONFIG(libpsl)
+
+ if test "$PKGCONFIG" != "no" ; then
+ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl`
+ LD_PSL=`$PKGCONFIG --libs-only-L libpsl`
+ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl`
+ else
+ dnl no libpsl pkg-config found
+ LIB_PSL="-lpsl"
+ fi
+
+ ;;
+ off)
+ dnl no --with-libpsl option given, just check default places
+ LIB_PSL="-lpsl"
+ ;;
+ *)
+ dnl use the given --with-libpsl spot
+ LIB_PSL="-lpsl"
+ PREFIX_PSL=$OPT_LIBPSL
+ ;;
+ esac
+
+ dnl if given with a prefix, we set -L and -I based on that
+ if test -n "$PREFIX_PSL"; then
+ LD_PSL=-L${PREFIX_PSL}/lib$libsuff
+ CPP_PSL=-I${PREFIX_PSL}/include
+ fi
+
+ LDFLAGS="$LDFLAGS $LD_PSL"
+ CPPFLAGS="$CPPFLAGS $CPP_PSL"
+ LIBS="$LIB_PSL $LIBS"
+
+ AC_CHECK_LIB(psl, psl_builtin,
+ [
+ AC_CHECK_HEADERS(libpsl.h,
+ curl_psl_msg="enabled"
+ LIBPSL_ENABLED=1
+ AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use])
+ AC_SUBST(USE_LIBPSL, [1])
+ )
+ ],
+ dnl not found, revert back to clean variables
+ LDFLAGS=$CLEANLDFLAGS
+ CPPFLAGS=$CLEANCPPFLAGS
+ LIBS=$CLEANLIBS
)
+
+ if test X"$OPT_LIBPSL" != Xoff &&
+ test "$LIBPSL_ENABLED" != "1"; then
+ AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!])
+ fi
fi
AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"])
@@ -1,60 +0,0 @@
From 0d9f9c5ea8c15c70eb420242b60179d9083c70b7 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 11 Dec 2023 20:45:01 +0200
Subject: [PATCH] gnutls: fix build with --disable-verbose
infof() parameters must be defined event with --disable-verbose since
commit dac293cfb702 ("lib: apache style infof and trace
macros/functions").
Move also 'ptr' definition under !CURL_DISABLE_VERBOSE_STRINGS.
Fixes the following build failure:
In file included from ../lib/sendf.h:29,
from vtls/gtls.c:44:
vtls/gtls.c: In function 'Curl_gtls_verifyserver':
vtls/gtls.c:841:34: error: 'version' undeclared (first use in this function); did you mean 'session'?
841 | gnutls_protocol_get_name(version), ptr);
| ^~~~~~~
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Upstream: https://github.com/curl/curl/commit/af520ac9fec7d88e942f05fdcd90704adb9fa566
---
lib/vtls/gtls.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index f42b6d6691de..b95c5be3c5e5 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -818,16 +818,17 @@ Curl_gtls_verifyserver(struct Curl_easy *data,
char certname[65] = ""; /* limited to 64 chars by ASN.1 */
size_t size;
time_t certclock;
- const char *ptr;
int rc;
CURLcode result = CURLE_OK;
#ifndef CURL_DISABLE_VERBOSE_STRINGS
+ const char *ptr;
unsigned int algo;
unsigned int bits;
gnutls_protocol_t version = gnutls_protocol_get_version(session);
#endif
long * const certverifyresult = &ssl_config->certverifyresult;
+#ifndef CURL_DISABLE_VERBOSE_STRINGS
/* the name of the cipher suite used, e.g. ECDHE_RSA_AES_256_GCM_SHA384. */
ptr = gnutls_cipher_suite_get_name(gnutls_kx_get(session),
gnutls_cipher_get(session),
@@ -835,6 +836,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data,
infof(data, "SSL connection using %s / %s",
gnutls_protocol_get_name(version), ptr);
+#endif
/* This function will return the peer's raw certificate (chain) as sent by
the peer. These certificates are in raw format (DER encoded for
--
2.43.0
+3 -3
View File
@@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
# https://curl.se/download/curl-8.5.0.tar.xz.asc
# https://curl.se/download/curl-8.6.0.tar.xz.asc
# signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
sha256 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb curl-8.5.0.tar.xz
sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING
sha256 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 curl-8.6.0.tar.xz
sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING
+10 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
LIBCURL_VERSION = 8.5.0
LIBCURL_VERSION = 8.6.0
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
LIBCURL_SITE = https://curl.se/download
LIBCURL_DEPENDENCIES = host-pkgconf \
@@ -14,6 +14,8 @@ LIBCURL_LICENSE = curl
LIBCURL_LICENSE_FILES = COPYING
LIBCURL_CPE_ID_VENDOR = haxx
LIBCURL_INSTALL_STAGING = YES
# 0001-configure.ac-find-libpsl-with-pkg-config.patch
LIBCURL_AUTORECONF = YES
# We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb')
# support because it uses fork(), which doesn't work on non-MMU platforms.
@@ -112,6 +114,13 @@ else
LIBCURL_CONF_OPTS += --without-libidn2
endif
ifeq ($(BR2_PACKAGE_LIBPSL),y)
LIBCURL_DEPENDENCIES += libpsl
LIBCURL_CONF_OPTS += --with-libpsl
else
LIBCURL_CONF_OPTS += --without-libpsl
endif
# Configure curl to support libssh2
ifeq ($(BR2_PACKAGE_LIBSSH2),y)
LIBCURL_DEPENDENCIES += libssh2
+2 -2
View File
@@ -1,3 +1,3 @@
# Locally calculated
sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz
sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING
sha256 0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75 libgit2-1.6.5.tar.gz
sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING
+5 -2
View File
@@ -4,14 +4,15 @@
#
################################################################################
LIBGIT2_VERSION = 1.5.1
LIBGIT2_VERSION = 1.6.5
LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION))
LIBGIT2_LICENSE = \
GPL-2.0 with linking exception, \
MIT (sha1), \
BSD-3-Clause (sha256), \
wildmatch license (wildmatch), \
CC0-1.0 (xoroshiro256)
CC0-1.0 (xoroshiro256), \
BSD-2-Clause (basename_r)
LIBGIT2_LICENSE_FILES = COPYING
LIBGIT2_CPE_ID_VENDOR = libgit2_project
LIBGIT2_INSTALL_STAGING = YES
@@ -24,6 +25,8 @@ LIBGIT2_CONF_OPTS = \
-DUSE_NTLMCLIENT=OFF \
-DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF)
LIBGIT2_SUPPORTS_IN_SOURCE_BUILD = NO
LIBGIT2_DEPENDENCIES = zlib libhttpparser
# If libiconv is available (for !locale toolchains), then we can use
+7
View File
@@ -34,6 +34,13 @@ LIBKRB5_CONF_OPTS = \
--without-tcl \
--disable-rpath
# libkrb5 has some assembly function that is not present in Thumb mode:
# Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode
# so, we desactivate Thumb mode
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
LIBKRB5_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm"
endif
# Enabling static and shared at the same time is not supported
ifeq ($(BR2_SHARED_STATIC_LIBS),y)
LIBKRB5_CONF_OPTS += --disable-static
+1 -1
View File
@@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBMODSECURITY
SecRules format and apply them to HTTP content
provided by your application via Connectors.
https://github.com/SpiderLabs/ModSecurity
https://github.com/owasp-modsecurity/ModSecurity
comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library"
depends on !BR2_INSTALL_LIBSTDCPP || \
+3 -2
View File
@@ -1,4 +1,5 @@
# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.10/modsecurity-v3.0.10.tar.gz.sha256
sha256 d5d459f7c2e57a69a405f3222d8e285de419a594b0ea8829058709962227ead0 modsecurity-v3.0.10.tar.gz
# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256
sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz
# Localy calculated
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE
+2 -2
View File
@@ -4,9 +4,9 @@
#
################################################################################
LIBMODSECURITY_VERSION = 3.0.10
LIBMODSECURITY_VERSION = 3.0.12
LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz
LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION)
LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION)
LIBMODSECURITY_INSTALL_STAGING = YES
LIBMODSECURITY_LICENSE = Apache-2.0
LIBMODSECURITY_LICENSE_FILES = LICENSE
-1
View File
@@ -10,7 +10,6 @@ LIBUNWIND_INSTALL_STAGING = YES
LIBUNWIND_LICENSE_FILES = COPYING
LIBUNWIND_LICENSE = MIT
LIBUNWIND_CPE_ID_VENDOR = libunwind_project
LIBUNWIND_AUTORECONF = YES
LIBUNWIND_CONF_OPTS = \
--disable-tests \
+4 -2
View File
@@ -4,13 +4,15 @@ config BR2_PACKAGE_LIBUV
depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h
help
libuv is a multi-platform support library with a focus
on asynchronous I/O.
https://github.com/libuv/libuv
comment "libuv needs a toolchain w/ NPTL, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
comment "libuv needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
+3 -2
View File
@@ -1,3 +1,4 @@
# Locally calculated
sha256 e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da libuv-1.44.2.tar.gz
sha256 95b8b163c60d17cfce3cef61a2d8a9cf70137502c8fb5f3d93cd2fc529fa98c8 LICENSE
sha256 c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b libuv-v1.48.0-dist.tar.gz
sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE
sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra
+4 -16
View File
@@ -6,25 +6,13 @@
# When bumping libuv, check if a new version of uvw is available
# and bump it too.
LIBUV_VERSION = 1.44.2
LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION))
LIBUV_VERSION = 1.48.0
LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz
LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION)
LIBUV_DEPENDENCIES = host-pkgconf
LIBUV_INSTALL_STAGING = YES
LIBUV_AUTORECONF = YES
LIBUV_LICENSE = BSD-2-Clause, BSD-3-Clause, ISC, MIT
LIBUV_LICENSE_FILES = LICENSE
LIBUV_LICENSE_FILES = LICENSE LICENSE-extra
LIBUV_CPE_ID_VENDOR = libuv
# Upstream needs tests to be run sequentially. This is the default in
# automake 1.11 and before, but not starting in 1.12. To maintain
# sequentiality in 1.12 and later, the automake option 'serial-tests'
# must be used, Unfortunately, it is not recognised by 1.11 and
# before. So upstream only adds it conditionally. We use automake
# 1.14, so we need it.
define LIBUV_FIXUP_AUTOGEN
echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
>$(@D)/m4/libuv-extra-automake-flags.m4
endef
LIBUV_POST_PATCH_HOOKS += LIBUV_FIXUP_AUTOGEN
$(eval $(autotools-package))
+2 -2
View File
@@ -1,4 +1,4 @@
# From https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.6.sha256sum
sha256 c90eee7506764abbe07bb616b82da452529609815aefef423d66ef080eb0c300 libxml2-2.11.6.tar.xz
# From https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.7.sha256sum
sha256 fb27720e25eaf457f94fd3d7189bcf2626c6dccf4201553bc8874d50e3560162 libxml2-2.11.7.tar.xz
# License files, locally calculated
sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright
+1 -1
View File
@@ -5,7 +5,7 @@
################################################################################
LIBXML2_VERSION_MAJOR = 2.11
LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).6
LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).7
LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz
LIBXML2_SITE = \
https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR)
+5 -5
View File
@@ -385,11 +385,11 @@ endchoice
config BR2_DEFAULT_KERNEL_HEADERS
string
default "4.14.336" if BR2_KERNEL_HEADERS_4_14
default "4.19.306" if BR2_KERNEL_HEADERS_4_19
default "5.4.268" if BR2_KERNEL_HEADERS_5_4
default "5.10.209" if BR2_KERNEL_HEADERS_5_10
default "5.15.148" if BR2_KERNEL_HEADERS_5_15
default "6.1.76" if BR2_KERNEL_HEADERS_6_1
default "4.19.310" if BR2_KERNEL_HEADERS_4_19
default "5.4.272" if BR2_KERNEL_HEADERS_5_4
default "5.10.213" if BR2_KERNEL_HEADERS_5_10
default "5.15.152" if BR2_KERNEL_HEADERS_5_15
default "6.1.82" if BR2_KERNEL_HEADERS_6_1
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
@@ -0,0 +1,71 @@
From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 22 Aug 2023 23:30:20 +1000
Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length`
If a client closes the connection before sending the expected number of bytes
then return `EPIPE`.
This fixes a potential infinite draining loop when trying to trying to
`:shutdown()` a stream.
Upstream: https://github.com/daurnimator/lua-http/commit/ddab2835c583d45dec62680ca8d3cbde55e0bae6
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
http/h1_stream.lua | 2 ++
spec/h1_stream_spec.lua | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/lua-http-0.4/http/h1_stream.lua b/lua-http-0.4/http/h1_stream.lua
index b2469a1..b0ca821 100644
--- a/lua-http-0.4/http/h1_stream.lua
+++ b/lua-http-0.4/http/h1_stream.lua
@@ -861,6 +861,8 @@ function stream_methods:read_next_chunk(timeout)
if chunk ~= nil then
self.body_read_left = length_n - #chunk
end_stream = (self.body_read_left == 0)
+ elseif err == nil then
+ return nil, ce.strerror(ce.EPIPE), ce.EPIPE
end
elseif length_n == 0 then
chunk = ""
diff --git a/lua-http-0.4/spec/h1_stream_spec.lua b/lua-http-0.4/spec/h1_stream_spec.lua
index f9cfea9..1303f94 100644
--- a/lua-http-0.4/spec/h1_stream_spec.lua
+++ b/lua-http-0.4/spec/h1_stream_spec.lua
@@ -295,6 +295,33 @@ describe("http1 stream", function()
server:close()
client:close()
end)
+ it("Doesn't hang when a content-length delimited stream is closed", function()
+ local server, client = new_pair(1.1)
+ local cq = cqueues.new()
+ cq:wrap(function()
+ local stream = client:new_stream()
+ local headers = new_headers()
+ headers:append(":method", "GET")
+ headers:append(":scheme", "http")
+ headers:append(":authority", "myauthority")
+ headers:append(":path", "/a")
+ assert(stream:write_headers(headers, true))
+ end)
+ cq:wrap(function()
+ local stream = server:get_next_incoming_stream()
+ assert(stream:get_headers())
+ local res_headers = new_headers()
+ res_headers:append(":status", "200")
+ res_headers:append("content-length", "100")
+ assert(stream:write_headers(res_headers, false))
+ assert(stream:write_chunk("foo", false))
+ assert(stream:shutdown())
+ end)
+ assert_loop(cq, TEST_TIMEOUT)
+ assert.truthy(cq:empty())
+ server:close()
+ client:close()
+ end)
it("allows pipelining", function()
local server, client = new_pair(1.1)
local cq = cqueues.new()
--
2.40.1
+3
View File
@@ -13,4 +13,7 @@ LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md
LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM)
LUA_HTTP_CPE_ID_VENDOR = daurnimator
# 0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch
LUA_HTTP_IGNORE_CVES += CVE-2023-4540
$(eval $(luarocks-package))
+4 -2
View File
@@ -4,13 +4,15 @@ config BR2_PACKAGE_LUV
depends on BR2_USE_MMU # libuv
depends on !BR2_STATIC_LIBS # libuv
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv
select BR2_PACKAGE_LIBUV
help
libuv bindings for LuaJIT and Lua.
https://github.com/luvit/luv
comment "luv needs a toolchain w/ NPTL, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
comment "luv needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
+4 -2
View File
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LUVI
depends on !BR2_STATIC_LIBS # libuv
depends on BR2_PACKAGE_LUAJIT
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv
select BR2_PACKAGE_LIBUV
select BR2_PACKAGE_LUV
select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL
@@ -25,8 +26,9 @@ config BR2_PACKAGE_LUVI
https://github.com/luvit/luvi
comment "luvi needs a toolchain w/ NPTL, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
comment "luvi needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
+2
View File
@@ -22,6 +22,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y)
LUVI_TARGET_ARCH = arm
else ifeq ($(BR2_aarch64),y)
LUVI_TARGET_ARCH = arm64
else ifeq ($(BR2_aarch64_be),y)
LUVI_TARGET_ARCH = arm64be
else ifeq ($(BR2_mips),y)
LUVI_TARGET_ARCH = mips
else ifeq ($(BR2_mipsel),y)
+4 -2
View File
@@ -5,6 +5,7 @@ config BR2_PACKAGE_MOARVM
depends on BR2_USE_MMU # libuv
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # libatomic_ops
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv
select BR2_PACKAGE_LIBUV
select BR2_PACKAGE_LIBTOMMATH
select BR2_PACKAGE_LIBATOMIC_OPS
@@ -18,8 +19,9 @@ config BR2_PACKAGE_MOARVM
http://moarvm.com
comment "moarvm needs a toolchain w/ NPTL, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
comment "moarvm needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_USE_MMU
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4
+4 -2
View File
@@ -4,6 +4,7 @@ config BR2_PACKAGE_NETDATA
depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS # libuv
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv
select BR2_PACKAGE_LIBUV
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -35,7 +36,8 @@ comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8"
endif
comment "netdata needs a toolchain w/ NPTL, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
comment "netdata needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
+2 -2
View File
@@ -1,8 +1,8 @@
config BR2_PACKAGE_NGINX_NAXSI
bool "nginx-naxsi"
depends on BR2_PACKAGE_NGINX_HTTP
# uses pcre, so nginx needs to be built with pcre support
select BR2_PACKAGE_PCRE
# uses pcre2, so nginx needs to be built with pcre2 support
select BR2_PACKAGE_PCRE2
help
NAXSI means Nginx Anti XSS & SQL Injection.
+2 -2
View File
@@ -1,5 +1,5 @@
# From https://nodejs.org/dist/v16.20.0/SHASUMS256.txt
sha256 e0990f992234e40a51fe11f92c3816c93a77e1b081145d3dd762cd1026345349 node-v16.20.0.tar.xz
# From https://nodejs.org/dist/v16.20.2/SHASUMS256.txt
sha256 576f1a03c455e491a8d132b587eb6b3b84651fc8974bb3638433dd44d22c8f49 node-v16.20.2.tar.xz
# Hash for license file
sha256 ba325815d3df8819bebaf37cad67d6e1f82271e1e4a1189b53abd28e261977d6 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
NODEJS_VERSION = 16.20.0
NODEJS_VERSION = 16.20.2
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
NODEJS_DEPENDENCIES = \
-1
View File
@@ -1,7 +1,6 @@
config BR2_PACKAGE_OPENSSH
bool "openssh"
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_ZLIB
help
+5 -8
View File
@@ -11,6 +11,7 @@ config BR2_PACKAGE_OPENVMTOOLS
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_ENABLE_LOCALE
depends on !BR2_STATIC_LIBS
depends on !BR2_TOOLCHAIN_USES_UCLIBC
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBDNET
@@ -30,16 +31,12 @@ if BR2_PACKAGE_OPENVMTOOLS
config BR2_PACKAGE_OPENVMTOOLS_PAM
bool "PAM support"
# linux-pam needs locale and wchar, but we already have this
# dependency on the main symbol, above.
depends on !BR2_STATIC_LIBS
# linux-pam needs locale, dynamic library and wchar, but we
# already have these dependencies on the main symbol, above.
select BR2_PACKAGE_LINUX_PAM
help
Support for PAM in openvmtools
comment "PAM support needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
config BR2_PACKAGE_OPENVMTOOLS_RESOLUTIONKMS
bool "resolutionkms support"
depends on BR2_PACKAGE_HAS_UDEV
@@ -56,9 +53,9 @@ comment "resolutionkms needs udev, a toolchain w/ threads"
endif
comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale"
comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale, dynamic library"
depends on BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_ENABLE_LOCALE || \
!BR2_ENABLE_LOCALE || BR2_STATIC_LIBS || \
BR2_TOOLCHAIN_USES_UCLIBC
+4 -2
View File
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PARTED
bool "parted"
depends on BR2_ENABLE_LOCALE
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help
@@ -9,5 +10,6 @@ config BR2_PACKAGE_PARTED
http://www.gnu.org/software/parted/
comment "parted needs a toolchain w/ locale, wchar"
depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
comment "parted needs a toolchain w/ locale, wchar, gcc >=5"
depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_5
+2 -2
View File
@@ -1,5 +1,5 @@
# From https://www.php.net/downloads.php
sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz
sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz
# License file
sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE
sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
PHP_VERSION = 8.2.15
PHP_VERSION = 8.2.16
PHP_SITE = https://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
@@ -1,45 +0,0 @@
From 3884c734c261231c34f59e56cde7ae02945b4dae Mon Sep 17 00:00:00 2001
From: Hernan Martinez <hernan.c.martinez@gmail.com>
Date: Tue, 16 Aug 2022 23:07:25 -0500
Subject: [PATCH] Fix optional JSON support for MySQL (#3753)
* Fix optional JSON support for MySQL
* Fix optional JSON support for MySQLTest
---
Data/MySQL/src/ResultMetadata.cpp | 2 ++
Data/MySQL/testsuite/src/MySQLTest.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp
index 61b49dd54..adb5dae84 100644
--- a/Data/MySQL/src/ResultMetadata.cpp
+++ b/Data/MySQL/src/ResultMetadata.cpp
@@ -133,8 +133,10 @@ namespace
case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_BLOB:
return Poco::Data::MetaColumn::FDT_BLOB;
+#ifdef POCO_MYSQL_JSON
case MYSQL_TYPE_JSON:
return Poco::Data::MetaColumn::FDT_JSON;
+#endif
default:
return Poco::Data::MetaColumn::FDT_UNKNOWN;
}
diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp
index 80a3683b1..2a286d35e 100644
--- a/Data/MySQL/testsuite/src/MySQLTest.cpp
+++ b/Data/MySQL/testsuite/src/MySQLTest.cpp
@@ -976,7 +976,9 @@ CppUnit::Test* MySQLTest::suite()
CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt);
CppUnit_addTest(pSuite, MySQLTest, testLongBLOB);
CppUnit_addTest(pSuite, MySQLTest, testLongTEXT);
+#ifdef POCO_MYSQL_JSON
CppUnit_addTest(pSuite, MySQLTest, testJSON);
+#endif
CppUnit_addTest(pSuite, MySQLTest, testUnsignedInts);
CppUnit_addTest(pSuite, MySQLTest, testFloat);
CppUnit_addTest(pSuite, MySQLTest, testDouble);
--
2.37.2
+3 -3
View File
@@ -12,7 +12,7 @@ config BR2_PACKAGE_POCO
bool "poco"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17
# pthread_condattr_setclock
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_STATIC_LIBS # dlopen()
@@ -116,8 +116,8 @@ config BR2_PACKAGE_POCO_ZIP
endif # BR2_PACKAGE_POCO
comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14"
comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 8"
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_5
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_8
depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS
+1 -1
View File
@@ -1,3 +1,3 @@
# Locally computed
sha256 30442ccb097a0074133f699213a59d6f8c77db5b2c98a7c1ad9c5eeb3a2b06f3 poco-1.12.2.tar.gz
sha256 c01221870aa9bccedf1de39890279699207848fe61a0cfb6aeec7c5942c4627f poco-1.13.2.tar.gz
sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE
+1 -8
View File
@@ -4,7 +4,7 @@
#
################################################################################
POCO_VERSION = 1.12.2
POCO_VERSION = 1.13.2
POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release)
POCO_LICENSE = BSL-1.0
POCO_LICENSE_FILES = LICENSE
@@ -57,13 +57,7 @@ ifeq ($(BR2_SOFT_FLOAT),y)
POCO_CONF_OPTS += --no-fpenvironment
endif
ifeq ($(BR2_STATIC_LIBS),y)
POCO_MAKE_TARGET = static_release
else ifeq ($(BR2_SHARED_LIBS),y)
POCO_MAKE_TARGET = shared_release
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
POCO_MAKE_TARGET = all_release
endif
POCO_LDFLAGS=$(TARGET_LDFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
@@ -74,7 +68,6 @@ define POCO_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) ./configure \
--config=Linux \
--prefix=/usr \
--cflags=-std=c++14 \
--ldflags="$(POCO_LDFLAGS)" \
--omit="$(POCO_OMIT)" \
$(POCO_CONF_OPTS) \
+3 -3
View File
@@ -1,4 +1,4 @@
# From https://ftp.postgresql.org/pub/source/v15.4/postgresql-15.5.tar.bz2.sha256
sha256 8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6 postgresql-15.5.tar.bz2
# From https://ftp.postgresql.org/pub/source/v15.6/postgresql-15.6.tar.bz2.sha256
sha256 8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb postgresql-15.6.tar.bz2
# License file, Locally calculated
sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT
sha256 9bf20ee493926a7e17a74bc7f05089fbc014269667b1540bc35a6b194a40c9de COPYRIGHT
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
POSTGRESQL_VERSION = 15.5
POSTGRESQL_VERSION = 15.6
POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
POSTGRESQL_LICENSE = PostgreSQL
@@ -0,0 +1,30 @@
From 4b3b267db159dc23314de3062859481b7c397e32 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 17 Mar 2024 12:36:31 +0100
Subject: [PATCH] GNUmakefile.in: Don't exit if configuration files are
installed as root
... as this can be considered acceptable when cross-compiling
Privoxy inside an autobuilder with only a root user.
Upstream: https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=4b3b267db159dc23314de3062859481b7c397e32
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
GNUmakefile.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 04cceb15..cf79aae1 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -927,7 +927,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
$(ECHO) " and to install the config files as that user and/or group!" ;\
$(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\
$(ECHO) "*******************************************************************" ;\
- exit 1 ;\
fi ;\
else \
GROUP_T=$(GROUP) ;\
--
2.39.2
-1
View File
@@ -10,7 +10,6 @@ PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2
PURE_FTPD_LICENSE = ISC
PURE_FTPD_LICENSE_FILES = COPYING
PURE_FTPD_CPE_ID_VENDOR = pureftpd
PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
PURE_FTPD_CONF_OPTS = \
--with-altlog \
@@ -0,0 +1,41 @@
From 2631c745f986b356fbe5e1d418cff63b46134df6 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 19 Mar 2024 20:37:33 +0100
Subject: [PATCH] unix/utils/arm_arch_queries.h: fix uclibc build
Build on uclibc is broken since version 0.75 and commit
65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used
even if <sys/auxv.h> is not available:
/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c: In function 'platform_aes_neon_available':
/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c:18:22: error: 'AT_HWCAP2' undeclared (first use in this function)
18 | return getauxval(AT_HWCAP2) & HWCAP2_AES;
| ^~~~~~~~~
To fix this build failure, include <elf.h>
Fixes:
- http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f
Upstream: Rejected after sending to Simon Tatham <anakin@pobox.com>
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
unix/utils/arm_arch_queries.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/unix/utils/arm_arch_queries.h b/unix/utils/arm_arch_queries.h
index fa46c622..5cce7f31 100644
--- a/unix/utils/arm_arch_queries.h
+++ b/unix/utils/arm_arch_queries.h
@@ -18,6 +18,8 @@
#if defined __arm__ || defined __aarch64__
+#include <elf.h>
+
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
--
2.43.0
@@ -0,0 +1,101 @@
From f0c51af263e20f332c6f675aa90ec6705ae4f5d1 Mon Sep 17 00:00:00 2001
From: Serhii Abarovskyi <aserhii@protonmail.com>
Date: Tue, 9 May 2023 18:33:54 +0300
Subject: [PATCH] Use setuptools-scm v7+ for building the dists
Since version 7, setuptools-scm has native support for git archive,
so the setuptools-scm-git-archive project is obsolete
and this patch removes it from the build dependencies.
Close #515
Upstream: https://github.com/cherrypy/cheroot/commit/f0c51af263e20f332c6f675aa90ec6705ae4f5d1
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.git_archival.txt | 3 +++
pyproject.toml | 3 +--
requirements/dist-build-constraints.in | 3 +--
requirements/dist-build-constraints.txt | 16 +++++++---------
setup.cfg | 3 +--
5 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/.git_archival.txt b/.git_archival.txt
index 95cb3eea4e..3994ec0a83 100644
--- a/.git_archival.txt
+++ b/.git_archival.txt
@@ -1 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true)$
ref-names: $Format:%D$
diff --git a/pyproject.toml b/pyproject.toml
index b1e5f60a80..88df57dcc1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,8 +6,7 @@ requires = [
"setuptools>=34.4",
# Plugins
- "setuptools_scm[toml]>=3.5",
- "setuptools_scm_git_archive>=1.1",
+ "setuptools-scm >= 7.0.0",
]
build-backend = "setuptools.build_meta"
diff --git a/requirements/dist-build-constraints.in b/requirements/dist-build-constraints.in
index 26b57228a9..a37baef1a9 100644
--- a/requirements/dist-build-constraints.in
+++ b/requirements/dist-build-constraints.in
@@ -5,8 +5,7 @@
setuptools >= 34.4
# Plugins
-setuptools_scm[toml] >= 3.5
-setuptools_scm_git_archive >= 1.1
+setuptools-scm[toml] >= 7.0.0
# Dynamic (coming from setuptools' PEP 517 build backend)
wheel
diff --git a/requirements/dist-build-constraints.txt b/requirements/dist-build-constraints.txt
index 525f2be30f..8bd4343ff6 100644
--- a/requirements/dist-build-constraints.txt
+++ b/requirements/dist-build-constraints.txt
@@ -1,18 +1,16 @@
#
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/dist-build-constraints.txt --strip-extras requirements/dist-build-constraints.in
#
-packaging==21.3
+packaging==23.1
# via setuptools-scm
-pyparsing==3.0.6
- # via packaging
-setuptools-scm==6.3.2
+setuptools-scm==7.1.0
# via -r requirements/dist-build-constraints.in
-setuptools-scm-git-archive==1.1
- # via -r requirements/dist-build-constraints.in
-tomli==2.0.0
+tomli==2.0.1
+ # via setuptools-scm
+typing-extensions==4.6.3
# via setuptools-scm
wheel==0.37.1
# via -r requirements/dist-build-constraints.in
diff --git a/setup.cfg b/setup.cfg
index 1f2b08f4c3..900c7b4feb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -64,8 +64,7 @@ include_package_data = True
packages = find:
include_package_data = True
setup_requires =
- setuptools_scm>=1.15.0
- setuptools_scm_git_archive>=1.0
+ setuptools_scm >= 7.0.0
install_requires =
importlib_metadata; python_version < '3.8'
more_itertools >= 2.6
+1 -1
View File
@@ -10,6 +10,6 @@ PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/8c/e7/8e6387d59a35
PYTHON_CHEROOT_LICENSE = BSD-3-Clause
PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md
PYTHON_CHEROOT_SETUP_TYPE = setuptools
PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm host-python-setuptools-scm-git-archive
PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm
$(eval $(python-package))

Some files were not shown because too many files have changed in this diff Show More