Compare commits

..
80 Commits
Author SHA1 Message Date
Peter Korsgaard 71a2706320 Update for 2022.02.11
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-19 11:20:22 +01:00
Fabrice Fontaine 499947acac package/libmodsecurity: security bump to version 3.0.8
https://github.com/SpiderLabs/ModSecurity/releases/tag/v3.0.8
https://coreruleset.org/20220919/crs-version-3-3-3-and-3-2-2-covering-several-cves/

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 1b20c52a5b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-18 10:31:16 +01:00
Fabrice Fontaine 7225efefa5 package/libmodsecurity: select pcre2
Commit ea746f3128 forgot to select pcre2
resulting in the following build failure:

Makefile:575: *** pcre2 is in the dependency chain of libmodsecurity that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in.  Stop.

Fixes:
 - http://autobuild.buildroot.org/results/6528d2611bd1a45c1e94bc6b866de9c33dd90a7b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit f5e1cec700)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-18 10:31:04 +01:00
Fabrice Fontaine 24f0af804e package/libmodsecurity: bump to version 3.0.7
Switch to pcre2 as pcre is deprecated

https://github.com/SpiderLabs/ModSecurity/releases/tag/v3.0.7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ea746f3128)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-18 10:29:04 +01:00
Peter Seiderer 0399011fa8 package/uqmi: update patch for fix compile error (gcc false error reporting)
Update the patch to to avoid gcc false error reporting (apply pragma ignored
only for gcc >= 12.x (as the warning '-Wdangling-pointer' was introduced
with gcc-12.x).

Fixes:

  - http://autobuild.buildroot.net/results/df380f921b74527b77290a658de0c57680083afa

  .../build/uqmi-0a19b5b77140465c29e2afa7d611fe93abc9672f/dev.c:213:32: error: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]
    213 | #pragma GCC diagnostic ignored "-Wdangling-pointer"
        |                                ^~~~~~~~~~~~~~~~~~~~

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 6219046db6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-17 09:35:23 +01:00
Peter Seiderer 91059234f4 package/uqmi: fix compile error (gcc false error reporting)
Add upstream suggested patch ([1]) to avoid gcc false error reporting.

Fixes:

  - http://autobuild.buildroot.net/results/ce9e2074bb8486d1ee25232b985d47475faefd63

  dev.c:217:23: error: storing the address of local variable 'complete' in '*req.complete' [-Werror=dangling-pointer=]
    217 |         req->complete = &complete;
        |         ~~~~~~~~~~~~~~^~~~~~~~~~~

[1] http://lists.openwrt.org/pipermail/openwrt-devel/2023-March/040633.html

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit b3cf07d8db)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-17 09:35:14 +01:00
Bernd Kuhls bef793ae12 package/rsync: link with -latomic if needed
Fixes:
http://autobuild.buildroot.net/results/9eb9a92871622472b8f9eb3797aadd3651fc78a4/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit b9a062b354)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-17 09:33:50 +01:00
Fabrice Fontaine d9a6f6a6e8 support/dependencies/dependencies.sh: require FileHandle perl package for ace
ace needs FileHandle module:

Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/ace-7.0.6/MPC/prj_install.pl line 17.
BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/ace-7.0.6/MPC/prj_install.pl line 17.

Fixes:
 - http://autobuild.buildroot.org/results/9dee7c09fd7b41d276df0285a0f3dcae1a71f041

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 1c89f36821)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-17 09:30:12 +01:00
Bernd Kuhls aa9f2eae45 package/znc: Fix build with LibreSSL
Fixes:
http://autobuild.buildroot.net/results/3fe/3fec5c3a21af47b5f4e8adcaf4ce1fff5070e00a/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit dfc3b05c05)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-17 09:26:26 +01:00
Bernd Kuhls 875ea2df17 package/x11r7/xdriver_xf86-video-qxl: Update broken URL in Config.in helptext
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 562045056b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-17 09:21:20 +01:00
Fabrice Fontaine afb90502da package/libgcrypt: fix Thumb mode workaround
Fix the following build failure:

/tmp/ccRqWxnA.s:98: Error: instruction not supported in Thumb16 mode -- `adds ip,fp,r0'

Fixes:
 - http://autobuild.buildroot.org/results/4b96f4e41724e5c9c806a6c7df397a58d1ae1b1e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit cda8dabfeb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-17 09:18:19 +01:00
Fabrice Fontaine 160828f443 package/libev: force arm mode instead of Thumb mode
Fix the following build failure:

/tmp/ccHc3Awn.s:825: Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode

Fixes:
 - http://autobuild.buildroot.org/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 964254bfd9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-16 22:32:48 +01:00
Fabrice Fontaine d407399dd7 package/audit: force arm mode instead of Thumb mode
Fix the following build failure:

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

Fixes:
 - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 53d70dbe40)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-16 22:32:37 +01:00
Fabrice Fontaine b54aa2be67 package/libmad: force arm mode instead of Thumb mode
Fix the following build failure:

/tmp/ccv8mDeW.s:93: Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode

Fixes:
 - http://autobuild.buildroot.org/results/92a3f19b4fa12a7724f9e3d99284da4ad2beecb2

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 0aaadd525f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-16 22:32:33 +01:00
Julien Olivain 3c3e3e64c7 package/bridge-utils: update project URL in Config.in help text
The old URL no longer works and shows "No repositories found".
Replace it with:
https://wiki.linuxfoundation.org/networking/bridge

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit e8ad4f2d07)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 18:17:22 +01:00
Heiko Thiery 57c17cdf99 DEVELOPERS: add Heiko Thiery for package/rauc
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 6bec878102)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 18:17:14 +01:00
Bernd Kuhls 4e4539b2ae package/apache: security bump version to 2.4.56
Release notes:
https://lists.apache.org/thread/89vkczkfkdyz65d5q59pcyzrn5ts60s6

Changelog: https://dlcdn.apache.org/httpd/CHANGES_2.4.56

Fixes CVE-2023-25690 & CVE-2023-27522:
https://httpd.apache.org/security/vulnerabilities_24.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 5256ec9ca8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 16:05:43 +01:00
Fabrice Fontaine a6c6ad9dbd package/mender: force libopenssl
mender raises the following build failure with libressl since at least
version 3.1.0 (and probably since the addition of the package):

vendor/github.com/mendersoftware/openssl/conn.go:103:61: could not determine kind of name for C.X509_V_ERR_DANE_NO_MATCH

Fixes:
 - http://autobuild.buildroot.org/results/2b032d2a4e7cfbb20444c13821003120a4d00abd
 - http://autobuild.buildroot.org/results/621c057c0b8b627c8140456a2b0af4f95d239dcc

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 46abbffc97)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 16:04:38 +01:00
Fabrice Fontaine d0564f0282 package/mpv: needs NPTL
mpv unconditionally uses pthread_getcpuclockid since version 0.33.0 and
https://github.com/mpv-player/mpv/commit/fd3caa264ea0848e7e30db94390063c87e247003
resulting in the following build failure without NPTL since commit
e3cf26dda3:

../common/stats.c: In function 'get_thread_cpu_time_ns':
../common/stats.c:75:9: error: implicit declaration of function 'pthread_getcpuclockid'; did you mean 'pthread_getspecific'? [-Werror=implicit-function-declaration]
   75 |     if (pthread_getcpuclockid(thread, &id) == 0 &&
      |         ^~~~~~~~~~~~~~~~~~~~~
      |         pthread_getspecific

Fixes:
 - http://autobuild.buildroot.org/results/98cde5cbb0844c6ef483a75cf9a6f3fd3a46c693

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 720a68e33b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 16:03:48 +01:00
Nicola Di Lieto 395e3414a2 package/uacme: security bump to version 1.7.4
Includes https://github.com/ndilieto/uacme/commit/fe91f46b620f8c58805fcf48cb4f4a793c8a47a4
Fixes https://github.com/ndilieto/uacme/issues/64

Signed-off-by: Nicola Di Lieto <nicola.dilieto@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit d97fe11e59)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 15:41:19 +01:00
Fabrice Fontaine 0a23e43132 package/opus: force arm mode instead of Thumb mode
Fix the following build failure:

/tmp/cckXvlOO.s:352: Error: selected processor does not support `smull r6,ip,r5,r0' in Thumb mode

Fixes:
 - http://autobuild.buildroot.org/results/fdedcc8f68651ec34417d609b40effbac456c80d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Peter: tweak comment]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 90e1a64cb0)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 15:08:11 +01:00
Sebastian Weyer f953a186d1 package/bash: fix naming of target-finalize-hook
When the target-finalize-hook for bash was added in commit
311c9eebc4 in order to write bash into
/etc/shells, it was done at the same time as for package/mksh and it was
incorrectly copied and MKSH still appeared in the name of the hook.

The hook is now correctly named BASH_ADD_BASH_TO_SHELLS

Signed-off-by: Sebastian Weyer <sebastian.weyer@smile.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 7f96255f4a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 14:06:25 +01:00
Fabrice Fontaine c59348420f package/f2fs-tools: add F2FS_TOOLS_CPE_ID_VENDOR
cpe:2.3:a:f2fs-tools_project:f2fs-tools is a valid CPE identifier for
this package:

  https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Af2fs-tools_project%3Af2fs-tools

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 7af75b36aa)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 14:05:54 +01:00
Fabrice Fontaine cb2d0c50e6 package/exfat-utils: security bump to version 1.4.0
Fix CVE-2022-29973: relan exFAT 1.3.0 allows local users to obtain
sensitive information (data from deleted files in the filesystem) in
certain situations involving offsets beyond ValidDataLength.

https://github.com/relan/exfat/releases/tag/v1.4.0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit d7085ab3ea)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 14:03:28 +01:00
Fabrice Fontaine f0e9d63690 package/exfat: security bump to version 1.4.0
- Fix CVE-2022-29973: relan exFAT 1.3.0 allows local users to obtain
  sensitive information (data from deleted files in the filesystem) in
  certain situations involving offsets beyond ValidDataLength.
- libfuse3 is supported since
  https://github.com/relan/exfat/commit/7cbc1544a4f68d8b4d33b187a053fc554405c56e

https://github.com/relan/exfat/releases/tag/v1.4.0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 0c29b4281d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 14:03:03 +01:00
Fabrice Fontaine 8b8137852a package/libolm: add CPE variables
cpe:2.3:a:matrix:olm is a valid CPE identifier for this package:

  https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Amatrix%3Aolm

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit d5c6ff24dc)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 08:11:53 +01:00
Fabrice Fontaine 61425d7a6c package/quazip: add QUAZIP_CPE_ID_VENDOR
cpe:2.3:a:quazip_project:quazip is a valid CPE identifier for this
package:

  https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aquazip_project%3Aquazip

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 25c6741716)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 08:11:19 +01:00
Fabrice Fontaine b88eb874cf package/quickjs: add QUICKJS_CPE_ID_VENDOR
cpe:2.3:a:quickjs_project:quickjs is a valid CPE identifier for this
package:

  https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aquickjs_project%3Aquickjs

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit f820a978f8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 08:11:13 +01:00
Peter Seiderer ee9fa0876d package/apr: security bump version to 1.7.2
- remove 0001-cross-compile.patch
  (superseded by upstream commit [1])

- rename 0002-sys-param-h.patch to 0001-sys-param-h.patch

- remove 0003-Merge-r1887279-from-trunk.patch
  (from upstream [2])

- remove 0004-apr-1.7.0-CVE-2021-35940.patch
  (superseded by upstream commit [3], remove APR_IGNORE_CVES accordingly)

- set new configure option '--disable-sctp' (no libsctp provided by buildroot)

- set new 'ac_cv_strerror_r_rc_int' explicitly to no (default for
  cross compile)

- set new 'ac_cv_mmap__dev_zero' explicitly to yes

- revert two upstream commits ([4], [5]) to fix apr-util build, fails
  otherwise because of some path mismatch where to find apr_rules.mk copied
  to apr-util-1.6.3/build/rules.mk, fixes:

    Makefile:50: .../build/apr-util-1.6.3/build/rules.mk: No such file or directory

For details see [6].

[1] https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a
[2] https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8
[3] https://github.com/apache/apr/commit/e0be630b681fac7b8b5e2f2e402a8e18a147f966
[4] https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1
[5] https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c
[6] https://downloads.apache.org/apr/CHANGES-APR-1.7

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 783cd8d90d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 08:10:19 +01:00
Fabrice Fontaine e1fb4a6e8e package/libpjsip: fix CVE-2022-235{3, 4}7
https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w
https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 26344644ee)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-15 07:17:58 +01:00
Lang Daniel ff075f8dd5 package/paho-mqtt-c: security bump to version 1.3.12
Contains a fix for a possible race condition that can lead to use after
free:
https://github.com/eclipse/paho.mqtt.c/commit/911488a9f0fdad31c85ec86712be52587afdbbb8

https://github.com/eclipse/paho.mqtt.c/milestone/19?closed=1

https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.12

Signed-off-by: Daniel Lang <d.lang@abatec.at>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit cc9acffa8a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 22:56:05 +01:00
Peter Korsgaard a1b396770e package/libcurl: bump version to 7.88.1
Bugfix release fixing a number of issues introduced in 7.88.0:

https://curl.se/changes.html#7_88_1
https://daniel.haxx.se/blog/2023/02/20/7-88-1-the-second-final-one/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit eb566be8dc)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 22:55:10 +01:00
Fabrice Fontaine 17eec67924 boot/mxs-bootlets: fix build without any bootstream
Fix the following build failure raised since the addition of the package
in commit 2a636d1521:

sed -i 's,[^ *]power_prep.*;,\tpower_prep="/home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/power_prep/power_prep";,' /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/
sed: couldn't edit /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/: not a regular file

Fixes:
 - http://autobuild.buildroot.org/results/b4b26f6b02fd1991f46eba5db240e5050b96d333

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 8c44351907)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 22:53:54 +01:00
Fabrice Fontaine dbf4bfff67 package/pcm-tools: needs NPTL
pcm-tools needs NPTL since its addition in commit
60eb2cec80:

cpucounters.cpp: In constructor 'pcm::TemporalThreadAffinity::TemporalThreadAffinity(pcm::uint32, bool)':
cpucounters.cpp:252:9: error: 'pthread_getaffinity_np' was not declared in this scope; did you mean 'sched_getaffinity'?
  252 |         pthread_getaffinity_np(pthread_self(), set_size, old_affinity);
      |         ^~~~~~~~~~~~~~~~~~~~~~
      |         sched_getaffinity

Fixes:
 - http://autobuild.buildroot.org/results/8bbf9c36af332bbf5e7c1abcbb594a0b231ef97e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 9d74f85c97)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 15:01:46 +01:00
Lang Daniel bd6c387ddb {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series
Signed-off-by: Daniel Lang <d.lang@abatec.at>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 159df6a531)
[Peter: drop 6.1.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 15:00:57 +01:00
Fabrice Fontaine 43562c0f2e package/proxychains-ng: set -fPIC
Set -fPIC to avoid the following build failure with some architectures
such as mips or aarch64 raised since bump to version 4.14 in commit
35953d1e61 and
https://github.com/rofl0r/proxychains-ng/commit/35a674bdbc294730429a1007c9e7ce01e65b49b5:

checking what's the option to use in linker to set library name ...
cannot find an option to set library name

Fixes:
 - http://autobuild.buildroot.org/results/8ed1481e29321ed3da40251f700cb3bd66f62c94
 - http://autobuild.buildroot.org/results/fd01df6eb9a37257894740d44a33eece9123355a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 441b859a1e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 12:39:23 +01:00
Fabrice Fontaine 8efb071095 package/tiff: fix CVE-2022-48281
processCropSelections in tools/tiffcrop.c in LibTIFF through 4.5.0 has a
heap-based buffer overflow (e.g., "WRITE of size 307203") via a crafted
TIFF image.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit d7ae47f0c6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 12:14:30 +01:00
Peter Korsgaard 4521f37f39 package/haproxy: security bump to version 2.4.22
Fix CVE-2023-25725

https://www.mail-archive.com/haproxy@formilux.org/msg43229.html
https://www.mail-archive.com/haproxy@formilux.org/msg43226.html

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 11:43:24 +01:00
Fabrice Fontaine 8c100b4d64 package/python-m2crypto: fix CVE-2020-25657
A flaw was found in all released versions of m2crypto, where they are
vulnerable to Bleichenbacher timing attacks in the RSA decryption API
via the timed processing of valid PKCS#1 v1.5 Ciphertext. The highest
threat from this vulnerability is to confidentiality.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit a86d44a3eb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 10:51:14 +01:00
Fabrice Fontaine 40bfe7d715 package/bind: security bump to version 9.16.38
- Fix CVE-2022-3094, CVE-2022-3736 and CVE-2022-3924
- Update hash of COPYRIGHT (year updated with
  https://gitlab.isc.org/isc-projects/bind9/-/commit/1a5d707f52282117c9912a27dcc89f2ec412577a)

https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 7abc9a0554)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 09:50:22 +01:00
Fabrice Fontaine 44f5d8aff7 package/python-werkzeug: security bump to version 2.2.3
Fix CVE-2023-23934 and CVE-2023-25577

https://github.com/pallets/werkzeug/security/advisories/GHSA-px8h-6qxv-m22q
https://github.com/pallets/werkzeug/security/advisories/GHSA-xg9f-g7g7-2323
https://werkzeug.palletsprojects.com/en/2.2.x/changes/#version-2-2-3

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit da5d2adf57)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 09:49:33 +01:00
James Hilliard 51281f21d6 package/python-werkzeug: bump to version 2.2.2
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit d6f194c513)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 09:49:29 +01:00
James Hilliard 26f52b75e5 package/python-werkzeug: bump to version 2.1.2
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit bd447bb88c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-14 09:49:22 +01:00
Fabrice Fontaine d464408908 package/lttng-babeltrace: fix popt static build with libiconv
Fix the following popt static build failure with libiconv:

configure:18149: checking for poptGetContext in -lpopt
configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os -g0  -static  -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -static conftest.c -lpopt  -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid    >&5
/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf':
poptint.c:(.text+0x28a): undefined reference to `libiconv_open'

[...]

checking for poptGetContext in -lpopt... no
configure: error: Cannot find popt.

Fixes:
 - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 34625d54c9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-13 19:51:41 +01:00
Fabrice Fontaine 85417fe3ad support/dependencies/dependencies.sh: require MD5 perl package for netsurf
Fix the following build failure:

Can't locate object method "hexhash" via package "MD5" at utils/git-testament.pl line 47

Fixes:
 - http://autobuild.buildroot.org/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit b83a9675cb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-13 19:47:14 +01:00
Fabrice Fontaine ffce626f33 package/libblockdev: needs locale
locale_t is unconditionally used since version 1.5 and
https://github.com/storaged-project/libblockdev/commit/4ed6f0b3a46fc77554dab661c22150829aa75966
resulting in the following build failure since the addition of the
package in commit 0c52826291:

module.c:33:37: error: unknown type name 'locale_t'
   33 | static char *strerror_l(int errnum, locale_t locale UNUSED)
      |                                     ^~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit a6b4217312)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-13 18:07:47 +01:00
Fabrice Fontaine 1292fef706 package/asterisk: fix build with libressl
Fix the following build failure with libressl by using SSL_is_server
which is available since version 2.7.0 and
https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7:

iostream.c: In function 'ast_iostream_close':
iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'}
  559 |                         if (!stream->ssl->server) {
      |                                         ^~

Fixes:
 - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit c8985cf50c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-12 20:04:36 +01:00
Fabrice Fontaine 6f4a6c053a package/intel-gmmlib: needs threads
threads are mandatory since version 19.1.1 and
https://github.com/intel/gmmlib/commit/9e4aa143fb7e7e87332fcb7c9871040ff4a1a1da
resulting in the following build failure since commit
cd206d9b80:

CMake Error at /home/thomas/autobuild/instance-2/output-1/host/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:230 (message):
  Could NOT find Threads (missing: Threads_FOUND)

Fixes:
 - http://autobuild.buildroot.org/results/c1120932e8c212820b239ee8cd4a057623a73376

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit b5d310772d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-12 19:47:30 +01:00
Fabrice Fontaine eccd359f9c package/gcc: fix GCC_DL_DIR
GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the
following (silent) error is raised when BR2_CCACHE is set:

/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n'  --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@  --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile  | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/
 gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper
sha256sum: /gcc-11.3.0.tar.xz: No such file or directory

This patch replaces GCC_DL_DIR by $($(PKG)_DL_DIR) as suggested by
Arnout Vandecappelle.

Fixes:
 - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 6455558f62)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 18:36:39 +01:00
Fabrice Fontaine b9686e8ba2 package/gcc/gcc-initial: fix typo
Fix typo: am internal step -> an internal step

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 51793e0d56)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 18:26:08 +01:00
Fabrice Fontaine 9b1f944948 package/sudo: fix openssl static build
Fix the following build failure with sparc raised since bump to version
1.9.11p2 in commit 9b7f8da96b and
https://github.com/sudo-project/sudo/commit/9fbbca7b7a4cc60a8aa27d73de54278004a704c0:

hecking for X509_STORE_CTX_get0_cert
configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os -g0  -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST  -static conftest.c   -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5
/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref':
x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4'

[...]

In file included from ./hostcheck.c:38:
../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data'
  342 | #  define ASN1_STRING_get0_data(x)      ASN1_STRING_data(x)
      |                                         ^~~~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 4655d84ff5)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 18:24:05 +01:00
Fabrice Fontaine 8c0a59f6fe boot/opensbi: fix build with empty OPENSBI_PLAT
Fix the following build failure when OPENSBI_PLAT is empty raised since
commit 9b5b7165de:

/usr/bin/install -m 0644 -D /nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin /nvmedata/autobuild/instance-4/output-1/images/fw_jump.bin
/usr/bin/install: cannot stat '/nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin': No such file or directory

Fixes:
 - http://autobuild.buildroot.org/results/8033327f090e4a3d84a7fce1f62b14fdf89dbd89

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit bd061466f9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 18:23:24 +01:00
Fabrice Fontaine 9f019825b8 boot/at91dataflashboot: disable stack-protector
Disable stack-protector to avoid the following build failure:

/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T elf32-littlearm.lds -Ttext 0 -n -o DataflashBoot-1.05.out objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o objs/div0.o objs/init.o objs/main.o objs/stdio.o objs/asm_isr.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o objs/led.o
/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: objs/main.o: in function `main':
main.c:(.text.startup+0x834): undefined reference to `__stack_chk_guard'

Fixes:
 - http://autobuild.buildroot.org/results/502c54be4978e628724d72ee2a75d4c5e0a6ace8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit d868d09d3a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 18:21:52 +01:00
Fabrice Fontaine 05e97cdf85 package/mutt: fix build failure when host provides an old gpgrt-config
As already done for gnupg2 in commit
d7f2d8403e, apply the same fix to mutt to
avoid the following build failure:

/home/thomas/autobuild/instance-2/output-1/host/bin/i686-buildroot-linux-uclibc-gcc -DPKGDATADIR=\"/usr/share/mutt\" -DSYSCONFDIR=\"/etc\" -DBINDIR=\"/usr/bin\" -DMUTTLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H=1 -I.  -I. -I.   -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Wall -pedantic -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -O3 -g0  -c -o txt2c.o txt2c.c
i686-buildroot-linux-uclibc-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include'

Fixes:
 - http://autobuild.buildroot.org/results/98010be4ef70e58819ea2d17315bdac66a619b23

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit a39e328bb2)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 18:18:44 +01:00
Fabrice Fontaine 2a3d06fee6 package/libmodsecurity: needs dynamic library
Commit 9fc652a373 was incomplete as
mbedtls can be pulled in libcurl through libssh2 resulting in the
following build failure:

/home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init':
md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here

Fixes:
 - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 97bdc0616c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 18:12:51 +01:00
Adrian Perez de Castro 4759ae93c6 package/wpebackend-fdo: bump to version 1.12.1
This minor release fixes a crash. Release notes:

  https://wpewebkit.org/release/wpebackend-fdo-1.12.1.html

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 30c1aa539b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 15:20:48 +01:00
Fabrice Fontaine c66588bd31 support/dependencies/dependencies.sh: require FileHandle perl package for syslinux
syslinux needs FileHandle module:

Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8.
BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8.
/home/buildroot/autobuild/instance-0/output-1/host/bin/i586-buildroot-linux-gnu-gcc -Wp,-MT,errlist.o,-MD,./.errlist.o.d -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-labels=0 -ffast-math -fomit-frame-pointer -std=gnu99 -m32 -mpreferred-stack-boundary=2 -fno-stack-protector -fwrapv -freg-struct-return -fPIC -fno-exceptions -fno-asynchronous-unwind-tables -fno-strict-aliasing -falign-functions=0 -falign-jumps=0 -falign-labels=0 -falign-loops=0 -g -D__COM32__ -D__FIRMWARE_BIOS__ -nostdinc -iwithprefix include -I. -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/../include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/include/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/core/include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/ -I/home/buildroot/autobuild/instance-0/output-1/bu
 ild/syslinux-6.03/com32/lib/sys/module -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/bios/com32/lib//../.. -W -Wall -Wstrict-prototypes  -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline -DDYNAMIC_CRC_TABLE -DPNG_NO_CONSOLE_IO -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_MNG_FEATURES -DPNG_NO_READ_tIME -DPNG_NO_WRITE_tIME -mregparm=3 -DREGPARM=3 -c -o errlist.o errlist.c
cc1: fatal error: errlist.c: No such file or directory

Fixes:
 - http://autobuild.buildroot.org/results/de88089888b2ca354b28af3550abf846560da7d5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 474196d6bb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 11:24:56 +01:00
Thomas Devoogdt 73a1b21d9e package/webkitgtk: security bump to version 2.38.5
Bugfix release, with many security fixes, including (but not limited to)
a patch for CVE-2023-23529.

Release notes:

  https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html

Accompanying security advisory:

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

Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4.
Similar to commit ec1ff802df,
we do check on >= GCC 8, because we can't check on >= GCC 8.3.

  https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
Acked-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 4c7fcbbe75)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 11:21:34 +01:00
Fabrice Fontaine cb17a7337f package/rockchip-mali: needs C++
rockchip-mali pre-built libraries needs C++ since the addition of the
package in commit 97c74a73e5:

readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.0]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [librt.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdrm.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [libm.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libstdc++.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libgcc_s.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]

While at it, add a comment when dependencies are not met

Fixes:
 - No autobuilder failures (yet), found when debugging an issue with
   rockchip-mali and glslsandbox-player

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 5f1858e859)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 11:21:09 +01:00
Fabrice Fontaine 4af566b5ad package/glslsandbox-player: add wayland-protocols optional dependency
wayland-protocols is an optional dependency which is enabled by default
resulting in the following wayland build failure since the addition of
the package in commit f201ca9d0d:

checking for wayland_client... yes
checking for wayland_egl... yes
configure: Wayland EGL support enabled
checking for wayland_protocols... no
configure: error: Package requirements (wayland-protocols >= 1.12) were not met:

Package 'wayland-protocols', required by 'virtual:world', not found

Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.

Alternatively, you may set the environment variables wayland_protocols_CFLAGS
and wayland_protocols_LIBS to avoid the need to call pkg-config.

Fixes:
 - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit ee13e3fb41)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-05 11:20:23 +01:00
Peter Korsgaard ebd36288db package/python-django: security bump to version 4.0.10
Fix CVE-2023-23969 and CVE-2023-24580

https://docs.djangoproject.com/en/dev/releases/4.0.9
https://docs.djangoproject.com/en/dev/releases/4.0.10

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 20:49:01 +01:00
Adrian Perez de Castro f57b602927 package/wpewebkit: security bump to version 2.38.5
Bugfix release, fixes zero-day CVE-2023-23529 and includes a few build
and behaviour patches as well.

Release notes:

  https://wpewebkit.org/release/wpewebkit-2.38.5.html

Accompanying security advisory:

  https://wpewebkit.org/security/WSA-2023-0002.html

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 7852618c23)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 20:39:57 +01:00
Bernd Kuhls d73c2fb759 package/libcurl: bump version to 7.88.0
Changelog: https://curl.se/changes.html#7_88_0

Updated license hash due to copyright year bump:
https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 14ca6b5fdb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 20:39:39 +01:00
Fabrice Fontaine d72f336b21 package/less: fix CVE-2022-46663
In GNU Less before 609, crafted data can result in "less -R" not
filtering ANSI escape sequences sent to the terminal.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 924ca9414f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 20:38:43 +01:00
Thomas Petazzoni 80adf1f7b3 DEVELOPERS: remove Shyam Saini
Shyam's email address at Savoir Faire Linux is bouncing, so drop it
from the DEVELOPERS file.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit bd351c4e93)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 20:37:48 +01:00
Fabrice Fontaine 755cdb0fe4 package/ipmiutil: fix uclibc build without wchar
For an unknown reason, wchar_t is incorrectly detected with uclibc
resulting in the following build failure:

In file included from igetevent.c:136:
imb_api.h:150:5: error: unknown type name 'wchar_t'
  150 |     wchar_t *Buffer;
      |     ^~~~~~~

The build failure can be reproduced even when reverting bump to version
3.1.8.

Fixes:
 - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 7b4937a170)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 20:35:46 +01:00
Peter Korsgaard b4ec1573e1 package/git: security bump to version 2.31.7
Fixes the following security issues:

 * CVE-2023-22490:

   Using a specially-crafted repository, Git can be tricked into using
   its local clone optimization even when using a non-local transport.
   Though Git will abort local clones whose source $GIT_DIR/objects
   directory contains symbolic links (c.f., CVE-2022-39253), the objects
   directory itself may still be a symbolic link.

   These two may be combined to include arbitrary files based on known
   paths on the victim's filesystem within the malicious repository's
   working copy, allowing for data exfiltration in a similar manner as
   CVE-2022-39253.

 * CVE-2023-23946:

   By feeding a crafted input to "git apply", a path outside the
   working tree can be overwritten as the user who is running "git
   apply".

For more details, see the announcement:
https://lore.kernel.org/git/xmqqr0us5dio.fsf@gitster.g/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 20:24:16 +01:00
Bernd Kuhls de8798a3b9 package/clamav: security bump version to 0.103.8
Release notes:
https://blog.clamav.net/2023/02/clamav-01038-01052-and-101-patch.html

Fixes CVE-2023-20032 & CVE-2023-20052.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 9fc69996bc)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 18:37:33 +01:00
Peter Korsgaard f3ae7903ca package/php: security bump to version 8.0.28
Changelog: https://www.php.net/ChangeLog-8.php#8.0.28

Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 15:20:26 +01:00
Yann E. MORIN c74234c392 package/dmalloc: don't use SSP
dmalloc directly calls into $(LD) to generate a shared library our of
the static one.

To detect what command it should run, ./configure tries various
incantations of ld with various command line options until one does not
fail. One of those is (basically):
    $(LD) --whole-archive -o contest.o.t contest.a

This makes ./configure conclude what the command to link a shared
library in the Makefile should be, and thus stores that in a variable:
    shlinkargs='$(LD) --whole-archive -o $@'

... which is then AC_SUBST()ed into Makefile.in with a rule like:

    $(SHLIB): $(LIBRARY)
        @shlinkargs@ $(LIRARY)

which once substiuted, gives:

    $(SHLIB): $(LIBRARY)
        $(LD) --whole-archive -o $@ $(LIRARY)

However, when SSP is enabled, the __stack_chk_fail_local and co symbols
are provided by additional libraries or object files, and that is the
responsibility of gcc to pass those when linking. But as dmalloc
directly calls ld, it misses those.

Changing dmalloc to use $(CC) is not trivial, however.

First, we can't pass LD=$(TARGET_CC), otherwise the whole package
explodes [0]: indeed --whole-archive is unknown to gcc, so it must be
passed as -Wl,--whole archive instead. So we'd need to add a new test
that uses $(CC), like so:
    $(CC) -Wl,--whole-archive -o contest.o.t contest.a

However, in that case, gcc does pass additional libs/objs (like, for
eample, the SSP ones) to the linker. But then those are also included
in the whole-archive section. This causes the linker to add all the
symbols form those libs/objs, even those not needed for SSP; on some
archs, like PPC, that may require floating point symbols (__muldiv3 et
al.) which are in another library, and thus the linker can't find them.

The proper solution wouild be to add -Wl,--no-whole-archive, but that
would have to be added _after_ the library we want to link, i.e.e we
should be able to evntually run:

    $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive

That would require that we introduce a new variable that is added
_after_ the $(LIBRARY), e.g. @shlinkargs_post@ or so...

This is a bigger endeavour than we want to pursue...

Since dmalloc is a debugging utility, it is not supposed to go into
production builds, and during debugging, it would not be surprising that
it needs to poke around arrays to debug them.

So, we go the easier route: disable SSP altogether.

[0] with lots of nice colors, but that's not the point, is it?

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 3481674ee3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 14:40:48 +01:00
Yann E. MORIN e53a5aaa1f package/dmalloc: use actual patches rather than sed-ing
Our dmalloc packaging is very old and carries historical baggage and
idiosyncracies that we have long stopped doing in the rest ofthe code
base.

Drop our post-patch hooks that seds the configure and Makefile.in files,
and add patches (that could be upstreamed one day).

We provide the results in the environment, like would be done with
actual autoconf cache variables (ac_cv_*).

Note: those are the result of cleaning up for further patches that did
not manifest because it was too complex to add proper SSP support to
dmalloc (instead, we're going to forcibly disable it in the following
commit).

Note-2: those patches have not been submitted upstream, as it's mostly
dead: even though there's been some commit activities recently-ish, there
has been no review or comments or the many PR pending for many years
now.

Note-3: we patch both configure and configure.ac, rather than
autoreconf, for two reasons: 1. the both are in the upstream git tree,
so submitting these patches would require patching both, and 2. dmalloc
does not autoreconf nicely out of the box, and it was deemed too much
hassle to fix that in addition.

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 b259dac22a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 14:40:37 +01:00
Yann E. MORIN 9e83ef7250 package/dmalloc: convert existing patch to git format
We're going to add more patches, so let's cleanup our historical
baggage...

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 a7bd0fdb88)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 14:40:32 +01:00
Arnout Vandecappelle 58d46a4373 docs/manual: add 'menuconfig' to out-of-tree examples
If the examples given for launching an out-of-tree build are executed
as-is, this will result in the error message

    Please configure Buildroot first (e.g. "make menuconfig")

Even if "make menuconfig" was run before, it's still not going to work
because the out-of-tree build doesn't use the in-tree .config.

Therefore, the example really should start with some config option.
Since "make menuconfig" is used in most other examples of creating a
config, use that here as well. Extend both examples with "menuconfig".

Reported-by: AndreiCherniaev <dungeonlords789@yandex.ru>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit c77e31e0b3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 13:57:35 +01:00
Stefan Agner 500cc1f46f package/pkg-golang: disable version control information
By default go tries to include version control (VCS) information in
binaries. Since Buildroot separates version control from the build
process it is sensible to disable this behavior.

This avoids build errors when building with a git repository higher
up in the tree owned by root. In this case the go build system
calls `git status --porcelain` which returns with an error:
fatal: detected dubious ownership in repository at '/build'

Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Christian Stewart <christian@paral.in>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit c3a1f0fe1b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 12:27:49 +01:00
Romain Naour 81d754698d toolchain/toolchain-external/toolchain-external-codescape-mti-mips: remove wrong MIPS32r5 and MIPS64r5 support
This toolchain doesn't support MIPS32r5 and MIPS64r5 and the toolchain
infrastructure fail to import the sysroot to staging.

Fixes: c4a62fa627
Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 8eee178355)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 12:26:31 +01:00
Matthew Weber 99147ae8b8 DEVELOPERS: drop Matt Weber
I regret that my work situation doesn't sustain me contributing.

Signed-off-by: Matthew Weber <matthew.weber@collins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 0b5b92019b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 12:00:45 +01:00
Peter Korsgaard 262ffb09e8 package/go: version bump to 1.18.10
go1.18.10 (released 2023-01-10) includes fixes to cgo, the compiler, the
linker, and the crypto/x509, net/http, and syscall packages.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 11:44:14 +01:00
Леонид Юрьев (Leonid Yuriev) c22b063351 package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa"
This is stable bugfix release of libmdbx,
in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday.

It is reasonable to backport this patch to all applicable releases/branches of Buildroot,
at least this release fixes build for sh4 arch.

Release notes for v0.11.14
--------------------------

Fixes:

 - backport: Refined the `__cold`/`__hot` macros to avoid the
   `error: inlining failed in call to ‘always_inline FOO(...)’: target specific option mismatch`
   issue during build using GCC >10.x for SH4 arch.
   Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))`
   used in conjunction with the `__attribute__((__cold__))`.

 - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where
   errors occur when reopening by `mdbx_env_open()` of a previously used
   environment.

 - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb
   contains a single key with multiple values (aka duplicates), which are replaced
   with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags.
   In this case, the database becomes completely empty, without any pages.
   However exactly this condition was not considered and thus wasn't handled correctly.
   See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information.

 - backport: Fixed extra assertion inside `override_meta()`, which could
   lead to false-positive failing of the assertion in a debug builds during
   DB recovery and/or auto-rollback.

Minors:

 - backport: Fixed typos.
 - backport: Refined `const` and `noexcept` for few C++ API methods.
 - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x
   while build for SH4 arch.
 - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition.

The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md

Signed-off-by: Леонид Юрьев (Leonid Yuriev) <leo@yuriev.ru>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit efdcc850be)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 10:05:29 +01:00
Fabrice Fontaine d05d79bef0 package/apr-util: security bump to version 1.6.3
*) SECURITY: CVE-2022-25147 (cve.mitre.org)
   Integer Overflow or Wraparound vulnerability in apr_base64 functions
   of Apache Portable Runtime Utility (APR-util) allows an attacker to
   write beyond bounds of a buffer.

https://downloads.apache.org/apr/Announcement-aprutil-1.x.html
https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 4231054b05)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 10:03:22 +01:00
Peter Korsgaard 69f879876d {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series
4.9.x / 6.0.x is now EOL.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 36a8be4770)
[Peter: drop 6.1.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-03-04 10:01:16 +01:00
119 changed files with 1423 additions and 482 deletions
+21
View File
@@ -1,3 +1,24 @@
2022.02.11, released March 19th, 2023
Important / security related fixes.
Updated/fixed packages: apache, apr, apr-util, asterisk,
at91dataflashboot, audit, bash, bind, bridge-utils, clamav,
dmalloc, exfat, exfat-utils, f2fs-tools, gcc, git,
glslsandbox-player, go, haproxy, intel-gmmlib, ipmiutil, less,
libblockdev, libcurl, libev, libgcrypt, libmad, libmdbx,
libmodsecurity, libolm, libpjsip, lttng-babeltrace, mender,
mpv, mutt, mxs-bootlets, opensbi, opus, paho-mqtt-c,
pcm-tools, php, proxychains-ng, python-django,
python-m2crypto, python-werkzeug, quazip, quickjs,
rockchip-mali, rsync, sudo, tiff, uacme, uqmi, webkitgtk,
wpebackend-fdo, wpewebkit, xdriver_xf86-video-qxl, znc
Issues resolved (http://bugs.uclibc.org):
#15306: glibc build fails in Docker container
#15361: Buildroot linking error on Apple Silicon
2022.02.10, released March 1st, 2023
Important / security related fixes.
+1 -105
View File
@@ -1185,6 +1185,7 @@ F: package/libnetconf2/
F: package/libyang/
F: package/linuxptp/
F: package/netopeer2/
F: package/rauc/
F: package/sysrepo/
N: Hervé Codina <herve.codina@bootlin.com>
@@ -1846,108 +1847,6 @@ F: board/technologic/ts4900/
F: configs/ts4900_defconfig
F: package/ts4900-fpga/
N: Matt Weber <matthew.weber@collins.com>
F: board/freescale/p*
F: board/freescale/t*
F: board/qemu/ppc64-e5500/
F: configs/freescale_p*
F: configs/freescale_t*
F: configs/qemu_ppc64_e5500_defconfig
F: package/ace/
F: package/argp-standalone/
F: package/aufs/
F: package/aufs-util/
F: package/bc/
F: package/bridge-utils/
F: package/checkpolicy/
F: package/checksec/
F: package/cgroupfs-mount/
F: package/crda/
F: package/cunit/
F: package/dacapo/
F: package/davici/
F: package/dnsmasq/
F: package/dosfstools/
F: package/eigen/
F: package/ethtool/
F: package/flashbench/
F: package/fmc/
F: package/fmlib/
F: package/git/
F: package/gnutls/
F: package/hostapd/
F: package/i2c-tools/
F: package/ifplugd/
F: package/igmpproxy/
F: package/iperf/
F: package/iperf3/
F: package/iputils/
F: package/iw/
F: package/jitterentropy-library/
F: package/kvm-unit-tests/
F: package/kvmtool/
F: package/libcsv/
F: package/libcurl/
F: package/libeastl/
F: package/libfcgi/
F: package/libopenssl/
F: package/libselinux/
F: package/libsemanage/
F: package/libsepol/
F: package/libssh2/
F: package/libtalloc/
F: package/libqmi/
F: package/lighttpd/
F: package/logrotate/
F: package/makedevs/
F: package/memtester/
F: package/mii-diag/
F: package/mrouted/
F: package/mtd/
F: package/mtools/
F: package/nginx-upload/
F: package/omniorb/
F: package/openresolv/
F: package/paxtest/
F: package/picocom/
F: package/policycoreutils/
F: package/proftpd/
F: package/protobuf-c/
F: package/protobuf/
F: package/python-bunch/
F: package/python-colorama/
F: package/python-filelock/
F: package/python-flask-cors/
F: package/python-iptables/
F: package/python-ipy/
F: package/python-iwlib/
F: package/python-posix-ipc/
F: package/python-pycairo/
F: package/python-pysftp/
F: package/python-tinyrpc/
F: package/python-txdbus/
F: package/qoriq-rcw/
F: package/raptor/
F: package/rng-tools/
F: package/rsyslog/
F: package/setools/
F: package/sloci-image/
F: package/smcroute/
F: package/tclap/
F: package/tini/
F: package/uboot-tools/
F: package/unionfs/
F: package/valijson/
F: package/wpa_supplicant/
F: package/wireless_tools/
F: package/xen/
F: package/xml-security-c/
F: support/testing/tests/fs/test_oci.py
F: support/testing/tests/package/br2-external/openjdk/
F: support/testing/tests/package/test_openjdk.py
F: support/testing/tests/package/test_opkg/
F: support/testing/tests/package/test_opkg.py
N: Mauro Condarelli <mc5686@mclink.it>
F: package/mc/
F: package/python-autobahn/
@@ -2519,9 +2418,6 @@ F: package/tunctl/
F: package/ubus/
F: package/wolfssl/
N: Shyam Saini <shyam.saini@savoirfairelinux.com>
F: package/cukinia/
N: Simon Dawson <spdawson@gmail.com>
F: boot/at91bootstrap3/
F: package/cppzmq/
+2 -2
View File
@@ -92,9 +92,9 @@ all:
.PHONY: all
# Set and export the version string
export BR2_VERSION := 2022.02.10
export BR2_VERSION := 2022.02.11
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1677703000
BR2_VERSION_EPOCH = 1679221000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
+2 -1
View File
@@ -12,7 +12,8 @@ AT91DATAFLASHBOOT_INSTALL_TARGET = NO
AT91DATAFLASHBOOT_INSTALL_IMAGES = YES
define AT91DATAFLASHBOOT_BUILD_CMDS
make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS)
make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \
CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector"
endef
define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS
+2
View File
@@ -1,6 +1,8 @@
config BR2_TARGET_MXS_BOOTLETS
bool "mxs-bootlets"
depends on BR2_arm
depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \
BR2_TARGET_UBOOT
help
Stage1 bootloaders for Freescale iMX23/iMX28 SoCs
+2
View File
@@ -70,6 +70,7 @@ OPENSBI_INSTALL_IMAGES = YES
OPENSBI_FW_IMAGES += payload
endif
ifneq ($(OPENSBI_PLAT),)
define OPENSBI_INSTALL_IMAGES_CMDS
$(foreach f,$(OPENSBI_FW_IMAGES),\
$(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).bin \
@@ -78,6 +79,7 @@ define OPENSBI_INSTALL_IMAGES_CMDS
$(BINARIES_DIR)/fw_$(f).elf
)
endef
endif
# libsbi.a is not a library meant to be linked in user-space code, but
# with bare metal code, which is why we don't install it in
+2 -2
View File
@@ -30,13 +30,13 @@ the Linux kernel. To use it, add +O=<directory>+ to the make command
line:
--------------------
$ make O=/tmp/build
$ make O=/tmp/build menuconfig
--------------------
Or:
--------------------
$ cd /tmp/build; make O=$PWD -C path/to/buildroot
$ cd /tmp/build; make O=$PWD -C path/to/buildroot menuconfig
--------------------
All the output files will be located under +/tmp/build+. If the +O+
+1 -1
View File
@@ -128,7 +128,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "5.15.91" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.15.96" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.10.115-cip7" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "5.10.109-cip5-rt4" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
+5 -5
View File
@@ -1,13 +1,13 @@
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 d8060dc88f862baaae66b42a2dbc12298ed667c698eb5c55617a7786ee47bf25 linux-5.16.20.tar.xz
sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz
sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz
sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz
sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz
sha256 a2b51876befb8cc35724ed62820845f2b387d471a6cf46e8eedd0b6cb595825f linux-5.10.170.tar.xz
sha256 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 linux-5.4.233.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz
sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz
sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz
sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz
sha256 4e1c1555c306874e0477d1af282d04a4efb285121456ab3f79519c92e406b701 linux-4.14.307.tar.xz
sha256 64a265a193c9e3e14d1397278e2348386ef6d6043af76d693c0fbbafed345ca8 linux-4.19.274.tar.xz
# Locally computed
sha256 f3559be277be9200897022282be18cfc0278d1d8baec8058305b04b9cd72002a linux-cip-5.10.115-cip7.tar.gz
sha256 71fba4ed5cb48fa7869e9fe271b68b77fed26775ce5cf2f50891aa8f71c388b3 linux-cip-5.10.109-cip5-rt4.tar.gz
+3 -3
View File
@@ -1,5 +1,5 @@
# From https://downloads.apache.org/httpd/httpd-2.4.54.tar.bz2.{sha256,sha512}
sha256 11d6ba19e36c0b93ca62e47e6ffc2d2f2884942694bce0f23f39c71bdc5f69ac httpd-2.4.55.tar.bz2
sha512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb httpd-2.4.55.tar.bz2
# From https://downloads.apache.org/httpd/httpd-2.4.56.tar.bz2.{sha256,sha512}
sha256 d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c httpd-2.4.56.tar.bz2
sha512 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12 httpd-2.4.56.tar.bz2
# Locally computed
sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
APACHE_VERSION = 2.4.55
APACHE_VERSION = 2.4.56
APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
APACHE_SITE = https://downloads.apache.org/httpd
APACHE_LICENSE = Apache-2.0
+2 -2
View File
@@ -1,4 +1,4 @@
# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256
sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2
# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256
sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2
# Locally calculated
sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
APR_UTIL_VERSION = 1.6.1
APR_UTIL_VERSION = 1.6.3
APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2
APR_UTIL_SITE = https://archive.apache.org/dist/apr
APR_UTIL_LICENSE = Apache-2.0
-58
View File
@@ -1,58 +0,0 @@
Fix cross-compilation
Patch was backported from Apache httpd:
http://svn.apache.org/viewvc?view=revision&revision=1327907
http://svn.apache.org/viewvc?view=revision&revision=1328390
http://svn.apache.org/viewvc?view=revision&revision=1328714
Patch submitted upstream:
https://issues.apache.org/bugzilla/show_bug.cgi?id=57058
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
diff -uNr apr-1.5.1.org/configure.in apr-1.5.1/configure.in
--- apr-1.5.1.org/configure.in 2014-01-25 16:17:29.000000000 +0100
+++ apr-1.5.1/configure.in 2014-10-05 11:20:40.080746760 +0200
@@ -118,6 +118,16 @@
echo "Configuring APR library"
echo "Platform: $host"
+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless
+dnl we got already CC_FOR_BUILD from environment.
+if test "x${build_alias}" != "x${host_alias}"; then
+ if test "x${CC_FOR_BUILD}" = "x"; then
+ CC_FOR_BUILD=cc
+ fi
+fi
+AC_SUBST(CC_FOR_BUILD)
+AC_SUBST(CFLAGS_FOR_BUILD)
+
dnl Some initial steps for configuration. We setup the default directory
dnl and which files are to be configured.
diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in
--- apr-1.5.1.org/Makefile.in 2014-03-17 16:10:26.000000000 +0100
+++ apr-1.5.1/Makefile.in 2014-10-05 11:22:53.031070519 +0200
@@ -8,6 +8,8 @@
# APR (Apache Portable Runtime) library Makefile.
#
CPP = @CPP@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
# get substituted into some targets
APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
@@ -134,8 +134,13 @@
$(APR_MKDIR) tools
$(LT_COMPILE)
+ifdef CC_FOR_BUILD
+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS)
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $<
+else
tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+endif
include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
$(APR_MKDIR) include/private
@@ -0,0 +1,30 @@
From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001
From: Graham Leggett <minfrin@apache.org>
Date: Wed, 1 Jan 2020 10:43:39 +0000
Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when
cross compiling.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872165 13f79535-47bb-0310-9956-ffa450edef68
[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
apr-config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apr-config.in b/apr-config.in
index bed47ca..4873fc0 100644
--- a/apr-config.in
+++ b/apr-config.in
@@ -246,7 +246,7 @@ while test $# -gt 0; do
if test "$location" = "installed"; then
echo "${installbuilddir}/libtool"
elif test "$location" = "crosscompile"; then
- echo "$APR_TARGET_DIR/${installbuilddir}/libtool"
+ echo "$APR_TARGET_DIR/${installbuilddir}/build"
else
echo "$APR_BUILD_DIR/libtool"
fi
--
2.39.2
@@ -1,69 +0,0 @@
From a15958a37a06f71c42c690278f9c958b93b7ee20 Mon Sep 17 00:00:00 2001
From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 11 Mar 2021 14:10:21 +0000
Subject: [PATCH] Merge r1887279 from trunk:
build/apr_common.m4: avoid explicit inclusion of "confdefs.h"
The failure is observed on `autoconf-2.69d` (soon to be released
as `autoconf-2.70`). There `int64_t` detection fails as:
$ autoreconf && ./configure
checking whether int64_t and int use fmt %d... no
checking whether int64_t and long use fmt %ld... no
checking whether int64_t and long long use fmt %lld... no
configure: error: could not determine the string function for int64_t
```
This happens because `./configure` always stumbles on warning:
configure:3350: gcc -c -g -O2 -Werror conftest.c >&5
In file included from conftest.c:31:
confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror]
22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
|
It's triggered by double inclusion of `"confdefs.h"` contents:
explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly
via `AC_LANG_SOURCE` use.
To fix it and avoid having to define `main()` declaration the change
uses `AC_LANG_PROGRAM` instead.
Tested on both `autoconf-2.69` and `autoconf-2.69d`.
Github: closes #25
Submitted by: Sergei Trofimovich <slyfox gentoo.org>
Reviewed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1887485 13f79535-47bb-0310-9956-ffa450edef68
[Retrieved from:
https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
build/apr_common.m4 | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/build/apr_common.m4 b/build/apr_common.m4
index 297dd32cf75..b67a8608abe 100644
--- a/build/apr_common.m4
+++ b/build/apr_common.m4
@@ -467,13 +467,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
CFLAGS="$CFLAGS -Werror"
fi
AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE(
- [#include "confdefs.h"
- ]
- [[$1]]
- [int main(int argc, const char *const *argv) {]
+ [AC_LANG_PROGRAM(
+ [[$1]],
[[$2]]
- [ return 0; }]
)], [CFLAGS=$apr_save_CFLAGS
$3], [CFLAGS=$apr_save_CFLAGS
$4])
@@ -0,0 +1,112 @@
From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001
From: Graham Leggett <minfrin@apache.org>
Date: Tue, 31 Dec 2019 21:26:02 +0000
Subject: [PATCH] Revert: Add the ability to cross compile APR.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f79535-47bb-0310-9956-ffa450edef68
[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
CHANGES | 2 --
apr-config.in | 22 ----------------------
2 files changed, 24 deletions(-)
diff --git a/CHANGES b/CHANGES
index 71b2f0e..e751c90 100644
--- a/CHANGES
+++ b/CHANGES
@@ -56,8 +56,6 @@ Changes for APR 1.7.1
*) Don't try to use PROC_PTHREAD by default when cross compiling.
[Yann Ylavic]
- *) Add the ability to cross compile APR. [Graham Leggett]
-
*) While cross-compiling, the tools/gen_test_char could not
be executed at build time, use AX_PROG_CC_FOR_BUILD to
build native tools/gen_test_char
diff --git a/apr-config.in b/apr-config.in
index 4873fc0..84b4073 100644
--- a/apr-config.in
+++ b/apr-config.in
@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@"
# NOTE: the following line is modified during 'make install': alter with care!
location=@APR_CONFIG_LOCATION@
-# absolute path, but not installed path - we're cross compiling
-case "$0" in
- "${bindir}/"*) ;;
- "/"*) location=crosscompile;
- APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;;
- *) ;;
-esac
-
show_usage()
{
cat << EOF
@@ -101,8 +93,6 @@ fi
if test "$location" = "installed"; then
LA_FILE="$libdir/lib${APR_LIBNAME}.la"
-elif test "$location" = "crosscompile"; then
- LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la"
else
LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la"
fi
@@ -132,8 +122,6 @@ while test $# -gt 0; do
--includedir)
if test "$location" = "installed"; then
flags="$includedir"
- elif test "$location" = "crosscompile"; then
- flags="$APR_TARGET_DIR/$includedir"
elif test "$location" = "source"; then
flags="$APR_SOURCE_DIR/include"
else
@@ -166,8 +154,6 @@ while test $# -gt 0; do
--includes)
if test "$location" = "installed"; then
flags="$flags -I$includedir $EXTRA_INCLUDES"
- elif test "$location" = "crosscompile"; then
- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES"
elif test "$location" = "source"; then
flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
else
@@ -182,8 +168,6 @@ while test $# -gt 0; do
--installbuilddir)
if test "$location" = "installed"; then
echo "${installbuilddir}"
- elif test "$location" = "crosscompile"; then
- echo "$APR_TARGET_DIR/${installbuilddir}"
elif test "$location" = "source"; then
echo "$APR_SOURCE_DIR/build"
else
@@ -200,8 +184,6 @@ while test $# -gt 0; do
if test "$location" = "installed"; then
### avoid using -L if libdir is a "standard" location like /usr/lib
flags="$flags -L$libdir -l${APR_LIBNAME}"
- elif test "$location" = "crosscompile"; then
- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
else
### this surely can't work since the library is in .libs?
flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
@@ -219,8 +201,6 @@ while test $# -gt 0; do
# Since the user is specifying they are linking with libtool, we
# *know* that -R will be recognized by libtool.
flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
- elif test "$location" = "crosscompile"; then
- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}"
else
flags="$flags $LA_FILE"
fi
@@ -245,8 +225,6 @@ while test $# -gt 0; do
--apr-libtool)
if test "$location" = "installed"; then
echo "${installbuilddir}/libtool"
- elif test "$location" = "crosscompile"; then
- echo "$APR_TARGET_DIR/${installbuilddir}/build"
else
echo "$APR_BUILD_DIR/libtool"
fi
--
2.39.2
@@ -1,57 +0,0 @@
SECURITY: CVE-2021-35940 (cve.mitre.org)
Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though
was addressed in 1.6.x in 1.6.3 and later via r1807976.
The fix was merged back to 1.7.x in r1891198.
Since this was a regression in 1.7.0, a new CVE name has been assigned
to track this, CVE-2021-35940.
Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue.
https://svn.apache.org/viewvc?view=revision&revision=1891198
[Retrieved from:
https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Index: ./time/unix/time.c
===================================================================
--- ./time/unix/time.c (revision 1891197)
+++ ./time/unix/time.c (revision 1891198)
@@ -142,6 +142,9 @@
static const int dayoffset[12] =
{306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
+ if (xt->tm_mon < 0 || xt->tm_mon >= 12)
+ return APR_EBADDATE;
+
/* shift new year to 1st March in order to make leap year calc easy */
if (xt->tm_mon < 2)
Index: ./time/win32/time.c
===================================================================
--- ./time/win32/time.c (revision 1891197)
+++ ./time/win32/time.c (revision 1891198)
@@ -54,6 +54,9 @@
static const int dayoffset[12] =
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
+ if (tm->wMonth < 1 || tm->wMonth > 12)
+ return APR_EBADDATE;
+
/* Note; the caller is responsible for filling in detailed tm_usec,
* tm_gmtoff and tm_isdst data when applicable.
*/
@@ -228,6 +231,9 @@
static const int dayoffset[12] =
{306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
+ if (xt->tm_mon < 0 || xt->tm_mon >= 12)
+ return APR_EBADDATE;
+
/* shift new year to 1st March in order to make leap year calc easy */
if (xt->tm_mon < 2)
+2 -2
View File
@@ -1,4 +1,4 @@
# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256
sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea apr-1.7.0.tar.bz2
# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256
sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2
# Locally calculated
sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE
+4 -3
View File
@@ -4,7 +4,7 @@
#
################################################################################
APR_VERSION = 1.7.0
APR_VERSION = 1.7.2
APR_SOURCE = apr-$(APR_VERSION).tar.bz2
APR_SITE = https://archive.apache.org/dist/apr
APR_LICENSE = Apache-2.0
@@ -16,8 +16,7 @@ APR_INSTALL_STAGING = YES
# so we need to autoreconf:
APR_AUTORECONF = YES
# 0004-apr-1.7.0-CVE-2021-35940.patch
APR_IGNORE_CVES += CVE-2021-35940
APR_CONF_OPTS = --disable-sctp
# avoid apr_hints.m4 by setting apr_preload_done=yes and set
# the needed CFLAGS on our own (avoids '-D_REENTRANT' in case
@@ -32,6 +31,7 @@ APR_CONF_ENV = \
CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
CFLAGS="$(APR_CFLAGS)" \
ac_cv_file__dev_zero=yes \
ac_cv_mmap__dev_zero=yes \
ac_cv_func_setpgrp_void=yes \
apr_cv_process_shared_works=yes \
apr_cv_mutex_robust_shared=no \
@@ -39,6 +39,7 @@ APR_CONF_ENV = \
ac_cv_sizeof_struct_iovec=8 \
ac_cv_sizeof_pid_t=4 \
ac_cv_struct_rlimit=yes \
ac_cv_strerror_r_rc_int=no \
ac_cv_o_nonblock_inherited=no \
apr_cv_mutex_recursive=yes \
apr_cv_epoll=yes \
@@ -0,0 +1,38 @@
From 9569fa20fec49f530170a3042afb99556cf66a2e Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 17 Apr 2022 10:52:42 +0200
Subject: [PATCH] main/iostream.c: fix build with libressl
Fix the following build failure with libressl by using SSL_is_server
which is available since version 2.7.0 and
https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7:
iostream.c: In function 'ast_iostream_close':
iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'}
559 | if (!stream->ssl->server) {
| ^~
Fixes:
- http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
main/iostream.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/iostream.c b/main/iostream.c
index d060b6d6d4..b8ab80ec91 100644
--- a/main/iostream.c
+++ b/main/iostream.c
@@ -553,7 +553,7 @@ int ast_iostream_close(struct ast_iostream *stream)
ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res));
}
-#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+#if !(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000L)) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
if (!SSL_is_server(stream->ssl)) {
#else
if (!stream->ssl->server) {
--
2.35.1
+7
View File
@@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES
AUDIT_CONF_OPTS = --without-python --without-python3 --disable-zos-remote
# src/libev has some assembly function that is not present in Thumb mode:
# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode
# so, we desactivate Thumb mode
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm"
endif
ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
AUDIT_DEPENDENCIES += libcap-ng
AUDIT_CONF_OPTS += --with-libcap-ng=yes
+2 -2
View File
@@ -62,10 +62,10 @@ endif
# Add /bin/bash to /etc/shells otherwise some login tools like dropbear
# can reject the user connection. See man shells.
define BASH_ADD_MKSH_TO_SHELLS
define BASH_ADD_BASH_TO_SHELLS
grep -qsE '^/bin/bash$$' $(TARGET_DIR)/etc/shells \
|| echo "/bin/bash" >> $(TARGET_DIR)/etc/shells
endef
BASH_TARGET_FINALIZE_HOOKS += BASH_ADD_MKSH_TO_SHELLS
BASH_TARGET_FINALIZE_HOOKS += BASH_ADD_BASH_TO_SHELLS
$(eval $(autotools-package))
+3 -3
View File
@@ -1,4 +1,4 @@
# Verified from https://ftp.isc.org/isc/bind9/9.16.33/bind-9.16.33.tar.xz.asc
# Verified from https://ftp.isc.org/isc/bind9/9.16.38/bind-9.16.38.tar.xz.asc
# with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD
sha256 ec4fbea4b2e368d1824971509e33fa159224ad14b436034c6bcd46104c328d91 bind-9.16.33.tar.xz
sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT
sha256 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f bind-9.16.38.tar.xz
sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
BIND_VERSION = 9.16.33
BIND_VERSION = 9.16.38
BIND_SOURCE= bind-$(BIND_VERSION).tar.xz
BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
# bind does not support parallel builds.
+1 -1
View File
@@ -8,4 +8,4 @@ config BR2_PACKAGE_BRIDGE_UTILS
added. Instead use the bridge command from the iproute2
package which supports more features.
https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/
https://wiki.linuxfoundation.org/networking/bridge
+1 -1
View File
@@ -1,5 +1,5 @@
# Locally calculated
sha256 1e34c31f600cb3b5bd1bf76690590cdeebe9409b330959b1c0f77d421bb17e50 clamav-0.103.7.tar.gz
sha256 6f49da6ee927936de13d359e559d3944248e3a257d40b80b6c99ebe6fe8c8c3f clamav-0.103.8.tar.gz
sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING
sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2
sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
CLAMAV_VERSION = 0.103.7
CLAMAV_VERSION = 0.103.8
CLAMAV_SITE = https://www.clamav.net/downloads/production
CLAMAV_LICENSE = GPL-2.0
CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
@@ -0,0 +1,90 @@
From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 8 Feb 2023 12:30:10 +0100
Subject: [PATCH] configure: fix build on mips
This patch is a historical baggage that Buildroot has carried for ages
(since 2006), and the reason for it are notentirely clear.
Since dmalloc is pretty tricky, and as this patch has not been
identified as causing issues, we keep it; we just add the configure.ac
patchlet to match the one in configure.
As for the title, the original patch was named dmalloc-mips.patch, so
presumably it fixes some mips issue; let's title the commit that way.
[Fabrice: Updated for 5.6.5]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: make it a git-formatted patch]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
configure | 4 ++--
configure.ac | 2 +-
return.h | 16 +++-------------
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/configure b/configure
index d52a1e8..c18dfb2 100755
--- a/configure
+++ b/configure
@@ -5413,8 +5413,8 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5
$as_echo_n "checking return.h macros work... " >&6; }
if test "$cross_compiling" = yes; then :
- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5
$as_echo "no" >&6; }
else
diff --git a/configure.ac b/configure.ac
index a5295f1..9740fdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -705,7 +705,7 @@ int main()
])],
[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ],
[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ],
-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ]
+[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ]
)
##############################################################################
diff --git a/return.h b/return.h
index 9d3f5f1..d916c7a 100644
--- a/return.h
+++ b/return.h
@@ -117,26 +117,16 @@
/*************************************/
/*
- * For DEC Mips machines running Ultrix
+ * For Mips machines running Linux
*/
#if __mips
-/*
- * I have no idea how to get inline assembly with the default cc.
- * Anyone know how?
- */
-
-#if 0
-
/*
* NOTE: we assume here that file is global.
*
- * $31 is the frame pointer. $2 looks to be the return address but maybe
- * not consistently.
+ * $31 is the return address.
*/
-#define GET_RET_ADDR(file) asm("sw $2, file")
-
-#endif
+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file))
#endif /* __mips */
--
2.25.1
-45
View File
@@ -1,45 +0,0 @@
[Fabrice: Updated for 5.6.5]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
--- a/configure
+++ b/configure
@@ -7107,7 +7107,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5
$as_echo_n "checking return.h macros work... " >&6; }
if test "$cross_compiling" = yes; then :
- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h
+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
--- a/return.h
+++ b/return.h
@@ -106,26 +106,16 @@
/*************************************/
/*
- * For DEC Mips machines running Ultrix
+ * For Mips machines running Linux
*/
#if __mips
/*
- * I have no idea how to get inline assembly with the default cc.
- * Anyone know how?
- */
-
-#if 0
-
-/*
* NOTE: we assume here that file is global.
*
- * $31 is the frame pointer. $2 looks to be the return address but maybe
- * not consistently.
+ * $31 is the return address.
*/
-#define GET_RET_ADDR(file) asm("sw $2, file")
-
-#endif
+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file))
#endif /* __mips */
@@ -0,0 +1,80 @@
From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 8 Feb 2023 13:26:56 +0100
Subject: [PATCH] configure: allow overriding some tests
Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation.
Allow the user to provide these results from the environment.
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
configure | 6 +++---
configure.ac | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index c18dfb2..d165962 100755
--- a/configure
+++ b/configure
@@ -4540,7 +4540,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5
$as_echo_n "checking strdup macro... " >&6; }
if test "$cross_compiling" = yes; then :
- ac_cv_strdup_macro=no
+ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5
$as_echo_n "checking strndup macro... " >&6; }
if test "$cross_compiling" = yes; then :
- ac_cv_strndup_macro=no
+ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4753,7 +4753,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5
$as_echo_n "checking basic-block size... " >&6; }
-ac_cv_page_size=0
+ac_cv_page_size="${ac_cv_page_size-0}"
if test $ac_cv_page_size = 0; then
if test "$cross_compiling" = yes; then :
ac_cv_page_size=0
diff --git a/configure.ac b/configure.ac
index 9740fdc..51bdf4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,7 +292,7 @@ int main() { return 1; }
]])],
[ac_cv_strdup_macro=yes],
[ac_cv_strdup_macro=no],
-[ac_cv_strdup_macro=no]
+[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"]
)
AC_MSG_RESULT([$ac_cv_strdup_macro])
@@ -316,7 +316,7 @@ int main() { return 1; }
]])],
[ac_cv_strndup_macro=yes],
[ac_cv_strndup_macro=no],
-[ac_cv_strndup_macro=no]
+[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"]
)
AC_MSG_RESULT([$ac_cv_strndup_macro])
@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap])
#
AC_CHECK_FUNCS(getpagesize)
AC_MSG_CHECKING([basic-block size])
-ac_cv_page_size=0
+ac_cv_page_size="${ac_cv_page_size-0}"
if test $ac_cv_page_size = 0; then
AC_RUN_IFELSE([AC_LANG_SOURCE([
#if HAVE_UNISTD_H
--
2.25.1
@@ -0,0 +1,50 @@
From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 8 Feb 2023 13:43:55 +0100
Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar
program
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
Makefile.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 86d3cca..089ac99 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY)
mv $@.t $@
$(LIBRARY) : $(OBJS) $(NORMAL_OBJS)
- ar cr $@ $?
+ $(AR) cr $@ $?
@RANLIB@ $@
$(LIB_TH) : $(OBJS) $(THREAD_OBJS)
- ar cr $@ $?
+ $(AR) cr $@ $?
@RANLIB@ $@
$(LIB_TH_SL) : $(LIB_TH)
@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH)
mv $@.t $@
$(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
- ar cr $@ $?
+ $(AR) cr $@ $?
@RANLIB@ $@
$(LIB_CXX_SL) : $(LIB_CXX)
@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX)
mv $@.t $@
$(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
- ar cr $@ $?
+ $(AR) cr $@ $?
@RANLIB@ $@
$(LIB_TH_CXX_SL) : $(LIB_TH_CXX)
--
2.25.1
@@ -0,0 +1,67 @@
From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 8 Feb 2023 13:52:05 +0100
Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld'
When doing cross-compilation, we do not want to use the native tools to
test, but the target tools.
Note that the weird quoting is inherited from a legacy patch in
Buildroot, which dates back ages (at least 2006), and as it has not been
identified as breaking things, we keep it as-is... Meh...
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
configure | 12 ++++++------
configure.ac | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index 810636e..30a7ea3 100755
--- a/configure
+++ b/configure
@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_shared_link_args='# Could not configure shlib linking'
enable_shlib=no
fi
- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then
- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t'
- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then
- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all'
- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then
- ac_cv_shared_link_args='ld -G -o $@.t'
+ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then
+ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t'
+ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then
+ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all'
+ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then
+ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t'
else
# oh well, toss an error
ac_cv_shared_link_args='# Could not configure shlib linking'
diff --git a/configure.ac b/configure.ac
index 51bdf4d..0d80a78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[
ac_cv_shared_link_args='# Could not configure shlib linking'
enable_shlib=no
fi
- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then
- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t'
- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then
- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all'
- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then
- ac_cv_shared_link_args='ld -G -o $@.t'
+ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then
+ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t'
+ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then
+ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all'
+ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then
+ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t'
else
# oh well, toss an error
ac_cv_shared_link_args='# Could not configure shlib linking'
--
2.25.1
+12 -12
View File
@@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt
DMALLOC_INSTALL_STAGING = YES
DMALLOC_CFLAGS = $(TARGET_CFLAGS)
# dmalloc uses $(LD) to link, and thus misses the object files or libs that
# are needed to provide the __stack_chk_fail_local and co. symbols. Changing
# to use $(CC) is really more complex that we'd like. Since dmalloc is
# involved in debugging memory allocation, it is not expected to be a
# production library, so we do not care that much that it has SSP.
DMALLOC_CFLAGS += -fno-stack-protector
ifeq ($(BR2_STATIC_LIBS),y)
DMALLOC_CONF_OPTS += --disable-shlib
else
@@ -44,18 +51,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y)
DMALLOC_CFLAGS += -O0
endif
DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)"
define DMALLOC_POST_PATCH
$(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure
$(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure
$(SED) 's/ac_cv_strndup_macro=no$$/ac_cv_strndup_macro=yes/' $(@D)/configure
$(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure
$(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure
$(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in
endef
DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH
DMALLOC_CONF_ENV = \
CFLAGS="$(DMALLOC_CFLAGS)" \
ac_cv_page_size=12 \
ac_cv_strdup_macro=yes \
ac_cv_strndup_macro=yes
# both DESTDIR and PREFIX are ignored..
define DMALLOC_INSTALL_STAGING_CMDS
+1 -1
View File
@@ -1,3 +1,3 @@
# Locally calculated
sha256 dfebd07a7b907e2d603d3a9626e6440bd43ec6c4e8c07ccfc57ce9502b724835 exfat-utils-1.3.0.tar.gz
sha256 241575fa93104406a47e79e53e4d907bae69886f11621f70a45276c62b75bf69 exfat-utils-1.4.0.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
EXFAT_UTILS_VERSION = 1.3.0
EXFAT_UTILS_VERSION = 1.4.0
EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION)
EXFAT_UTILS_LICENSE = GPL-2.0+
EXFAT_UTILS_LICENSE_FILES = COPYING
+1 -1
View File
@@ -4,7 +4,7 @@ config BR2_PACKAGE_EXFAT
depends on BR2_USE_MMU # libfuse
depends on BR2_USE_WCHAR
depends on !BR2_STATIC_LIBS # libfuse
select BR2_PACKAGE_LIBFUSE
select BR2_PACKAGE_LIBFUSE3 if !BR2_PACKAGE_LIBFUSE
help
A full-featured exFAT file system implementation for GNU/Linux
and other Unix-like systems as a FUSE module.
+1 -1
View File
@@ -1,3 +1,3 @@
# Locally calculated
sha256 07652136064da5e4d32df5555f88c138ffa4835a23b88a5bae2015f21006e0d3 fuse-exfat-1.3.0.tar.gz
sha256 a1cfedc55e0e7a12c184605aa0f0bf44b24a3fb272449b20b2c8bbe6edb3001e fuse-exfat-1.4.0.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+4 -2
View File
@@ -4,10 +4,12 @@
#
################################################################################
EXFAT_VERSION = 1.3.0
EXFAT_VERSION = 1.4.0
EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION)
EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz
EXFAT_DEPENDENCIES = libfuse host-pkgconf
EXFAT_DEPENDENCIES = \
$(if $(BR2_PACKAGE_LIBFUSE3),libfuse3,libfuse) \
host-pkgconf
EXFAT_LICENSE = GPL-2.0+
EXFAT_LICENSE_FILES = COPYING
EXFAT_CPE_ID_VENDOR = exfat_project
+1
View File
@@ -14,6 +14,7 @@ F2FS_TOOLS_AUTORECONF = YES
F2FS_TOOLS_INSTALL_STAGING = YES
F2FS_TOOLS_LICENSE = GPL-2.0
F2FS_TOOLS_LICENSE_FILES = COPYING
F2FS_TOOLS_CPE_ID_VENDOR = f2fs-tools_project
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
F2FS_TOOLS_CONF_OPTS += --with-selinux
+1 -1
View File
@@ -9,7 +9,7 @@ GCC_INITIAL_SITE = $(GCC_SITE)
GCC_INITIAL_SOURCE = $(GCC_SOURCE)
# We do not have a 'gcc' package per-se; we only have two incarnations,
# gcc-initial and gcc-final. gcc-initial is just am internal step that
# gcc-initial and gcc-final. gcc-initial is just an internal step that
# users should not care about, while gcc-final is the one they shall see.
HOST_GCC_INITIAL_DL_SUBDIR = gcc
+1 -1
View File
@@ -269,7 +269,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \
gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
ifeq ($(BR2_CCACHE),y)
HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE)
HOST_GCC_COMMON_CCACHE_HASH_FILES += $($(PKG)_DL_DIR)/$(GCC_SOURCE)
# Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned
# and unversioned patches unconditionally. Moreover, to facilitate the
+1 -1
View File
@@ -1,5 +1,5 @@
# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
sha256 e0fa851e4ccb990c57793a3cfcbf7c8981fbacab175025ea15db9ecd57434cee git-2.31.6.tar.xz
sha256 30674629605a12d3ef4f9c752d5561862f04a48952b1799b9815f9884e4e0f6d git-2.31.7.tar.xz
# Locally calculated
sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING
sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
GIT_VERSION = 2.31.6
GIT_VERSION = 2.31.7
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
GIT_LICENSE = GPL-2.0, LGPL-2.1+
+4 -1
View File
@@ -111,8 +111,11 @@ endchoice
if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL
config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI
bool "Wayland IVI shell support"
endif
config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG
bool "Wayland XDG shell support"
select BR2_PACKAGE_WAYLAND_PROTOCOLS
endif
endif
comment "glslsandbox-player needs openGL ES and EGL driver"
@@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi
else
GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi
endif
ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y)
GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols
GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg
else
GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg
endif
else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y)
GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11
GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11
+1 -1
View File
@@ -1,3 +1,3 @@
# From https://go.dev/dl
sha256 fbe7f09b96aca3db6faeaf180da8bb632868ec049731e355ff61695197c0e3ea go1.18.9.src.tar.gz
sha256 9cedcca58845df0c9474ae00274c44a95c9dfaefb132fc59921c28c7c106f8e6 go1.18.10.src.tar.gz
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
GO_VERSION = 1.18.9
GO_VERSION = 1.18.10
GO_SITE = https://storage.googleapis.com/golang
GO_SOURCE = go$(GO_VERSION).src.tar.gz
+2 -2
View File
@@ -1,5 +1,5 @@
# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.15.tar.gz.sha256
sha256 3958b17b7ee80eb79712aaf24f0d83e753683104b36e282a8b3dcd2418e30082 haproxy-2.4.15.tar.gz
# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.22.tar.gz.sha256
sha256 0895340b36b704a1dbb25fea3bbaee5ff606399d6943486ebd7f256fee846d3a haproxy-2.4.22.tar.gz
# Locally computed:
sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt
+1 -1
View File
@@ -5,7 +5,7 @@
################################################################################
HAPROXY_VERSION_MAJOR = 2.4
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).15
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).22
HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src
HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions
HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt
+4 -2
View File
@@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_GMMLIB
depends on BR2_x86_64
depends on !BR2_STATIC_LIBS
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
help
The Intel(R) Graphics Memory Management Library provides
device specific and buffer management for the Intel(R)
@@ -11,5 +12,6 @@ config BR2_PACKAGE_INTEL_GMMLIB
https://github.com/intel/gmmlib
comment "intel-gmmlib needs a toolchain w/ dynamic library, C++"
depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP
comment "intel-gmmlib needs a toolchain w/ dynamic library, C++, threads"
depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS
+1 -1
View File
@@ -4,7 +4,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER
depends on !BR2_STATIC_LIBS # mesa3d, libva
depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d
depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d
depends on BR2_TOOLCHAIN_HAS_THREADS # libva
depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d
select BR2_PACKAGE_INTEL_GMMLIB
select BR2_PACKAGE_LIBPCIACCESS
+1
View File
@@ -10,6 +10,7 @@ IPMIUTIL_LICENSE = BSD-3-Clause
IPMIUTIL_LICENSE_FILES = COPYING
IPMIUTIL_MAKE = $(MAKE1)
IPMIUTIL_CONF_ENV = ac_cv_type_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
# aclocal.m4 is newer than config.h.in. Touch the latter to avoid autoreconf
define IPMIUTIL_TOUCH_CONFIG_H_IN
@@ -0,0 +1,27 @@
From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001
From: Mark Nudelman <markn@greenwoodsoftware.com>
Date: Fri, 7 Oct 2022 19:25:46 -0700
Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence.
[Retrieved from:
https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
line.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/line.c b/line.c
index 236c49ae..cba7bdd1 100644
--- a/line.c
+++ b/line.c
@@ -633,8 +633,8 @@ ansi_step(pansi, ch)
/* Hyperlink ends with \7 or ESC-backslash. */
if (ch == '\7')
return ANSI_END;
- if (pansi->prev_esc && ch == '\\')
- return ANSI_END;
+ if (pansi->prev_esc)
+ return (ch == '\\') ? ANSI_END : ANSI_ERR;
pansi->prev_esc = (ch == ESC);
return ANSI_MID;
}
+3
View File
@@ -11,6 +11,9 @@ LESS_LICENSE_FILES = COPYING
LESS_CPE_ID_VENDOR = gnu
LESS_DEPENDENCIES = ncurses
# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch
LESS_IGNORE_CVES += CVE-2022-46663
define LESS_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less
endef
+4 -2
View File
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBBLOCKDEV
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2
depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_ENABLE_LOCALE
select BR2_PACKAGE_KMOD
select BR2_PACKAGE_LIBGLIB2
help
@@ -66,7 +67,8 @@ config BR2_PACKAGE_LIBBLOCKDEV_SWAP
endif
comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library"
comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library, locale"
depends on BR2_USE_MMU
depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \
!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_ENABLE_LOCALE
+3 -3
View File
@@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
# https://curl.se/download/curl-7.87.0.tar.xz.asc
# https://curl.se/download/curl-7.88.1.tar.xz.asc
# signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz
sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING
sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz
sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
LIBCURL_VERSION = 7.87.0
LIBCURL_VERSION = 7.88.1
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
LIBCURL_SITE = https://curl.se/download
LIBCURL_DEPENDENCIES = host-pkgconf \
+7
View File
@@ -10,6 +10,13 @@ LIBEV_INSTALL_STAGING = YES
LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+
LIBEV_LICENSE_FILES = LICENSE
# libev has some assembly function that is not present in Thumb mode:
# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode
# so, we desactivate Thumb mode
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm"
endif
# The 'compatibility' event.h header conflicts with libevent
# It's completely unnecessary for BR packages so remove it
define LIBEV_DISABLE_EVENT_H_INSTALL
+2 -2
View File
@@ -26,8 +26,8 @@ LIBGCRYPT_CONF_OPTS += --disable-asm
endif
# Code doesn't build in thumb mode
ifeq ($(BR2_arm),y)
LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))"
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
LIBGCRYPT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm"
endif
$(eval $(autotools-package))
+7
View File
@@ -31,6 +31,13 @@ LIBMAD_IGNORE_CVES += CVE-2017-8374
# is able to properly behave in the face of a missing C++ compiler.
LIBMAD_AUTORECONF = YES
# libmad has some assembly function that is not present in Thumb mode:
# Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode
# so, we desactivate Thumb mode
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
LIBMAD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm"
endif
define LIBMAD_INSTALL_STAGING_PC
$(INSTALL) -D package/libmad/mad.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/mad.pc
+1 -1
View File
@@ -1,5 +1,5 @@
# Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS
sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz
sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz
# Locally calculated
sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
LIBMDBX_VERSION = 0.11.13
LIBMDBX_VERSION = 0.11.14
LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz
LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release
LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO
@@ -0,0 +1,29 @@
From af96f4fe916adc7dc6d649a07c10b45c978d31a1 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 27 Jul 2022 14:17:20 +0200
Subject: [PATCH] build/pcre.m4: fix build without pcre
Don't raise an error if pcre is disabled now that pcre2 is supported
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: not sent (no feedback on
https://github.com/SpiderLabs/ModSecurity/pull/2596)]
---
build/pcre.m4 | 1 -
1 file changed, 1 deletion(-)
diff --git a/build/pcre.m4 b/build/pcre.m4
index f6c9ae18..3e40f5c9 100644
--- a/build/pcre.m4
+++ b/build/pcre.m4
@@ -99,7 +99,6 @@ AC_SUBST(PCRE_LD_PATH)
if test -z "${PCRE_VERSION}"; then
AC_MSG_NOTICE([*** pcre library not found.])
- ifelse([$2], , AC_MSG_ERROR([pcre library is required]), $2)
else
AC_MSG_NOTICE([using pcre v${PCRE_VERSION}])
ifelse([$1], , , $1)
--
2.35.1
+8 -8
View File
@@ -2,9 +2,11 @@ config BR2_PACKAGE_LIBMODSECURITY
bool "libmodsecurity"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
# libmodsecurity embeds several mbedtls source files
depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS)
select BR2_PACKAGE_PCRE
# libmodsecurity embeds several mbedtls source files, causing
# various issues when static linking and other dependencies of
# libmodsecurity in turn use mbedtls
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_PCRE2
help
Libmodsecurity is one component of the ModSecurity
v3 project. The library codebase serves as an
@@ -17,8 +19,6 @@ config BR2_PACKAGE_LIBMODSECURITY
https://github.com/SpiderLabs/ModSecurity
comment "libmodsecurity needs a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
comment "libmodsecurity needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS
comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library"
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+2 -2
View File
@@ -1,4 +1,4 @@
# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.6/modsecurity-v3.0.6.tar.gz.sha256
sha256 06315d9a32fc830997178f30a69e933c9c2364b263a2f036959bebc4dde59a08 modsecurity-v3.0.6.tar.gz
# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecurity-v3.0.8.tar.gz.sha256
sha256 e241c89b3cd7e58a863d0d0d6b9b8ba4d33ffb0f51171044c258c62e3e7956c7 modsecurity-v3.0.8.tar.gz
# Localy calculated
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE
+5 -4
View File
@@ -4,7 +4,7 @@
#
################################################################################
LIBMODSECURITY_VERSION = 3.0.6
LIBMODSECURITY_VERSION = 3.0.8
LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz
LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION)
LIBMODSECURITY_INSTALL_STAGING = YES
@@ -12,12 +12,13 @@ LIBMODSECURITY_LICENSE = Apache-2.0
LIBMODSECURITY_LICENSE_FILES = LICENSE
LIBMODSECURITY_CPE_ID_VENDOR = trustwave
LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity
# We're patching build/libmaxmind.m4
# We're patching build/libmaxmind.m4 and build/pcre.m4
LIBMODSECURITY_AUTORECONF = YES
LIBMODSECURITY_DEPENDENCIES = pcre
LIBMODSECURITY_DEPENDENCIES = pcre2
LIBMODSECURITY_CONF_OPTS = \
--with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \
--without-pcre \
--with-pcre2="$(STAGING_DIR)/usr" \
--disable-examples \
--without-lmdb \
--without-ssdeep \
+2
View File
@@ -9,6 +9,8 @@ LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz
LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION)
LIBOLM_LICENSE = Apache-2.0
LIBOLM_LICENSE_FILES = LICENSE
LIBOLM_CPE_ID_VENDOR = matrix
LIBOLM_CPE_ID_PRODUCT = olm
LIBOLM_INSTALL_STAGING = YES
LIBOLM_CONF_OPTS = -DOLM_TESTS=OFF
@@ -0,0 +1,99 @@
From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001
From: Nanang Izzuddin <nanang@teluu.com>
Date: Tue, 20 Dec 2022 11:39:12 +0700
Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w
* Fix buffer overread in STUN message decoder
* Updates based on comments
[Retrieved from:
https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
pjnath/include/pjnath/stun_msg.h | 4 ++++
pjnath/src/pjnath/stun_msg.c | 14 +++++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h
index b52f95c586..e49f096f3a 100644
--- a/pjnath/include/pjnath/stun_msg.h
+++ b/pjnath/include/pjnath/stun_msg.h
@@ -442,6 +442,7 @@ typedef enum pj_stun_status
\endverbatim
*/
+#pragma pack(1)
typedef struct pj_stun_msg_hdr
{
/**
@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr
pj_uint8_t tsx_id[12];
} pj_stun_msg_hdr;
+#pragma pack()
/**
@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr
\endverbatim
*/
+#pragma pack(1)
typedef struct pj_stun_attr_hdr
{
/**
@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr
pj_uint16_t length;
} pj_stun_attr_hdr;
+#pragma pack()
/**
diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c
index 3def6b3eac..e904a0ba47 100644
--- a/pjnath/src/pjnath/stun_msg.c
+++ b/pjnath/src/pjnath/stun_msg.c
@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr)
#define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \
(a)->hdr.length=(pj_uint16_t)(l)
-#define ATTR_HDR_LEN 4
+#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr)
static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos)
{
@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
status = pj_stun_msg_check(pdu, pdu_len, options);
if (status != PJ_SUCCESS)
return status;
+ } else {
+ /* For safety, verify packet length at least */
+ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20;
+ if (msg_len > pdu_len ||
+ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len))
+ {
+ return PJNATH_EINSTUNMSGLEN;
+ }
}
/* Create the message, copy the header, and convert to host byte order */
@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
p_response = NULL;
/* Parse attributes */
- while (pdu_len >= 4) {
+ while (pdu_len >= ATTR_HDR_LEN) {
unsigned attr_type, attr_val_len;
const struct attr_desc *adesc;
@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
attr_val_len = (attr_val_len + 3) & (~3);
/* Check length */
- if (pdu_len < attr_val_len) {
+ if (pdu_len < attr_val_len + ATTR_HDR_LEN) {
pj_str_t err_msg;
char err_msg_buf[80];
@@ -0,0 +1,54 @@
From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001
From: sauwming <ming@teluu.com>
Date: Fri, 23 Dec 2022 15:05:28 +0800
Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr
* Fixed heap buffer overflow when parsing STUN errcode attribute
* Also fixed uint parsing
[Retrieved from:
https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
pjnath/src/pjnath/stun_msg.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c
index c6b0bdd284..b55d29849a 100644
--- a/pjnath/src/pjnath/stun_msg.c
+++ b/pjnath/src/pjnath/stun_msg.c
@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool,
attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr);
GETATTRHDR(buf, &attr->hdr);
- attr->value = GETVAL32H(buf, 4);
-
/* Check that the attribute length is valid */
if (attr->hdr.length != 4)
return PJNATH_ESTUNINATTRLEN;
+ attr->value = GETVAL32H(buf, 4);
+
/* Done */
*p_attr = attr;
@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool,
attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr);
GETATTRHDR(buf, &attr->hdr);
+ /* Check that the attribute length is valid */
+ if (attr->hdr.length < 4)
+ return PJNATH_ESTUNINATTRLEN;
+
attr->err_code = buf[6] * 100 + buf[7];
/* Get pointer to the string in the message */
value.ptr = ((char*)buf + ATTR_HDR_LEN + 4);
value.slen = attr->hdr.length - 4;
- /* Make sure the length is never negative */
- if (value.slen < 0)
- value.slen = 0;
/* Copy the string to the attribute */
pj_strdup(pool, &attr->reason, &value);
+6
View File
@@ -15,6 +15,12 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip
LIBPJSIP_INSTALL_STAGING = YES
LIBPJSIP_MAKE = $(MAKE1)
# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch
LIBPJSIP_IGNORE_CVES += CVE-2022-23537
# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch
LIBPJSIP_IGNORE_CVES += CVE-2022-23547
LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1
# relocation truncated to fit: R_68K_GOT16O
+5 -5
View File
@@ -380,11 +380,11 @@ config BR2_DEFAULT_KERNEL_HEADERS
string
default "4.4.302" if BR2_KERNEL_HEADERS_4_4
default "4.9.337" if BR2_KERNEL_HEADERS_4_9
default "4.14.304" if BR2_KERNEL_HEADERS_4_14
default "4.19.271" if BR2_KERNEL_HEADERS_4_19
default "5.4.230" if BR2_KERNEL_HEADERS_5_4
default "5.10.166" if BR2_KERNEL_HEADERS_5_10
default "5.15.91" if BR2_KERNEL_HEADERS_5_15
default "4.14.307" if BR2_KERNEL_HEADERS_4_14
default "4.19.274" if BR2_KERNEL_HEADERS_4_19
default "5.4.233" if BR2_KERNEL_HEADERS_5_4
default "5.10.170" if BR2_KERNEL_HEADERS_5_10
default "5.15.96" if BR2_KERNEL_HEADERS_5_15
default "5.16.20" if BR2_KERNEL_HEADERS_5_16
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
@@ -0,0 +1,48 @@
From 35076fd4592ca23136ff5eacdf8eaebc926e0224 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 23 Feb 2023 13:04:08 +0100
Subject: [PATCH] configure.ac: fix popt static build
Fix the following popt static build failure:
configure:18149: checking for poptGetContext in -lpopt
configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5
/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf':
poptint.c:(.text+0x28a): undefined reference to `libiconv_open'
[...]
checking for poptGetContext in -lpopt... no
configure: error: Cannot find popt.
Fixes:
- http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: not upstreamable as popt has been removed with
https://github.com/efficios/babeltrace/commit/916d0d910ad5407bc7826505aa05b277f5739a34]
---
configure.ac | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index a17c23c3..8f700d3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,8 +223,11 @@ AC_CHECK_LIB([c], [faccessat],
]
)
-AC_CHECK_LIB([popt], [poptGetContext], [],
- [AC_MSG_ERROR([Cannot find popt.])]
+PKG_CHECK_MODULES([POPT], [popt], [LIBS="${POPT_LIBS} ${LIBS}"],
+[
+ AC_CHECK_LIB([popt], [poptGetContext], [],
+ [AC_MSG_ERROR([Cannot find popt.])])
+]
)
# For Python
--
2.39.1
+3 -2
View File
@@ -4,8 +4,9 @@ config BR2_PACKAGE_MENDER
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4
select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160
help
Mender is an open source over-the-air (OTA) software updater
for embedded Linux devices. Mender comprises a client
+3 -3
View File
@@ -8,7 +8,7 @@ config BR2_PACKAGE_MPV
bool "mpv"
depends on BR2_INSTALL_LIBSTDCPP # libass
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h
depends on BR2_TOOLCHAIN_HAS_ATOMIC
@@ -32,10 +32,10 @@ config BR2_PACKAGE_MPV
https://mpv.io/
comment "mpv needs a toolchain w/ C++, threads, gcc >= 4.9"
comment "mpv needs a toolchain w/ C++, NPTL, gcc >= 4.9"
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
!BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+4
View File
@@ -37,6 +37,10 @@ MUTT_DEPENDENCIES += libgpgme
MUTT_CONF_OPTS += \
--enable-gpgme \
--with-gpgme-prefix=$(STAGING_DIR)/usr
# Force the path to "gpgrt-config" (from the libgpg-error package) to
# avoid using the one on host, if present.
MUTT_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config
else
MUTT_CONF_OPTS += --disable-gpgme
endif
+4 -7
View File
@@ -3,7 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY
depends on BR2_PACKAGE_NGINX_HTTP
depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity
depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity
depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity
depends on !BR2_STATIC_LIBS # libmodsecurity
select BR2_PACKAGE_LIBMODSECURITY
help
The ModSecurity-nginx connector is the connection
@@ -12,10 +12,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY
https://github.com/SpiderLabs/ModSecurity-nginx
comment "nginx-modsecurity needs a toolchain w/ C++, threads"
comment "nginx-modsecurity needs a toolchain w/ C++, threads, dynamic library"
depends on BR2_PACKAGE_NGINX_HTTP
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
comment "nginx-modsecurity needs a toolchain w/ dynamic library"
depends on BR2_PACKAGE_NGINX_HTTP
depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+7
View File
@@ -12,6 +12,13 @@ OPUS_INSTALL_STAGING = YES
OPUS_CFLAGS = $(TARGET_CFLAGS)
# opus has ARM assembly optimizations not compatible with thumb1:
# Error: selected processor does not support `smull r6,ip,r5,r0' in Thumb mode
# so force ARM mode
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
OPUS_CFLAGS += -marm
endif
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
OPUS_CFLAGS += -O0
endif
+1 -1
View File
@@ -1,5 +1,5 @@
# Locally computed:
sha256 d7bba3f8b8978802e11e2b1f28e96e6b7f4ed5d8a268af52a4d3b1bcbd1db16b paho-mqtt-c-1.3.11.tar.gz
sha256 6a70a664ed3bbcc1eafdc45a5dc11f3ad70c9bac12a54c2f8cef15c0e7d0a93b paho-mqtt-c-1.3.12.tar.gz
sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10
sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20
sha256 bc0f3f447097eb82a29ad6c2f4929572bb548b6bd4c9e38fde1bf131a771b7a0 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
PAHO_MQTT_C_VERSION = 1.3.11
PAHO_MQTT_C_VERSION = 1.3.12
PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION))
PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause
PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE
+4 -2
View File
@@ -1,11 +1,13 @@
comment "pcm-tools needs a toolchain w/ C++"
comment "pcm-tools needs a toolchain w/ C++, NPTL"
depends on BR2_i386 || BR2_x86_64
depends on !BR2_INSTALL_LIBSTDCPP
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL
config BR2_PACKAGE_PCM_TOOLS
bool "pcm-tools"
depends on BR2_i386 || BR2_x86_64
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
select BR2_PACKAGE_HWDATA
select BR2_PACKAGE_HWDATA_PCI_IDS
help
+1 -1
View File
@@ -1,5 +1,5 @@
# From https://www.php.net/downloads.php
sha256 f942cbfe2f7bacbb8039fb79bbec41c76ea779ac5c8157f21e1e0c1b28a5fc3a php-8.0.27.tar.xz
sha256 5e07278a1f315a67d36a676c01343ca2d4da5ec5bdb15d018e4248b3012bc0cd php-8.0.28.tar.xz
# License file
sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
PHP_VERSION = 8.0.27
PHP_VERSION = 8.0.28
PHP_SITE = https://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
+2 -1
View File
@@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \
-modcacherw \
-tags "$$($(2)_TAGS)" \
-trimpath \
-p $$(PARALLEL_JOBS)
-p $$(PARALLEL_JOBS) \
-buildvcs=false
# Target packages need the Go compiler on the host at download time (for
# vendoring), and at build and install time.
+2 -1
View File
@@ -13,7 +13,8 @@ PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project
define PROXYCHAINS_NG_CONFIGURE_CMDS
cd $(@D) && \
$(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr --sysconfdir=/etc
$(TARGET_CONFIGURE_OPTS) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \
./configure --prefix=/usr --sysconfdir=/etc
endef
define PROXYCHAINS_NG_BUILD_CMDS
+2 -2
View File
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/django/json
md5 75ec07b3e00c79fd6e67fbee53786b7a Django-4.0.8.tar.gz
sha256 07e6433f263c3839939cfabeb6d7557841e0419e47759a7b7d37f6d44d40adcb Django-4.0.8.tar.gz
md5 1ff999292535f0c9fd729e60e3365c49 Django-4.0.10.tar.gz
sha256 2c2f73c16b11cb272c6d5e3b063f0d1be06f378d8dc6005fbe8542565db659cc Django-4.0.10.tar.gz
# Locally computed sha256 checksums
sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE
+2 -2
View File
@@ -4,10 +4,10 @@
#
################################################################################
PYTHON_DJANGO_VERSION = 4.0.8
PYTHON_DJANGO_VERSION = 4.0.10
PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz
# The official Django site has an unpractical URL
PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/1a/de/08d8a349ed0e3e1999eb86ae0347cc9eaf634cd65f1eb80b9387ac1dbe3c
PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/44/92/b0ceee230f9252460abf8c0a3bcc003a914af85ad63006596c3fb3669fbf
PYTHON_DJANGO_LICENSE = BSD-3-Clause
PYTHON_DJANGO_LICENSE_FILES = LICENSE
@@ -0,0 +1,174 @@
From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
Date: Tue, 28 Jun 2022 21:17:01 +0200
Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA
decryption API (CVE-2020-25657)
Fixes #282
[Retrieved from:
https://gitlab.com/m2crypto/m2crypto/-/commit/84c53958def0f510e92119fca14d74f94215827a]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/SWIG/_m2crypto_wrap.c | 20 ++++++++++++--------
src/SWIG/_rsa.i | 20 ++++++++++++--------
tests/test_rsa.py | 15 +++++++--------
3 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c
index aba9eb6d..a9f30da9 100644
--- a/src/SWIG/_m2crypto_wrap.c
+++ b/src/SWIG/_m2crypto_wrap.c
@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) {
tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf,
(unsigned char *)tbuf, rsa, padding);
if (tlen == -1) {
- m2_PyErr_Msg(_rsa_err);
+ ERR_clear_error();
+ PyErr_Clear();
PyMem_Free(tbuf);
- return NULL;
+ Py_RETURN_NONE;
}
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) {
tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf,
(unsigned char *)tbuf, rsa, padding);
if (tlen == -1) {
- m2_PyErr_Msg(_rsa_err);
+ ERR_clear_error();
+ PyErr_Clear();
PyMem_Free(tbuf);
- return NULL;
+ Py_RETURN_NONE;
}
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) {
tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf,
(unsigned char *)tbuf, rsa, padding);
if (tlen == -1) {
- m2_PyErr_Msg(_rsa_err);
+ ERR_clear_error();
+ PyErr_Clear();
PyMem_Free(tbuf);
- return NULL;
+ Py_RETURN_NONE;
}
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) {
tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf,
(unsigned char *)tbuf, rsa, padding);
if (tlen == -1) {
- m2_PyErr_Msg(_rsa_err);
+ ERR_clear_error();
+ PyErr_Clear();
PyMem_Free(tbuf);
- return NULL;
+ Py_RETURN_NONE;
}
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i
index bc714e01..1377b8be 100644
--- a/src/SWIG/_rsa.i
+++ b/src/SWIG/_rsa.i
@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) {
tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf,
(unsigned char *)tbuf, rsa, padding);
if (tlen == -1) {
- m2_PyErr_Msg(_rsa_err);
+ ERR_clear_error();
+ PyErr_Clear();
PyMem_Free(tbuf);
- return NULL;
+ Py_RETURN_NONE;
}
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) {
tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf,
(unsigned char *)tbuf, rsa, padding);
if (tlen == -1) {
- m2_PyErr_Msg(_rsa_err);
+ ERR_clear_error();
+ PyErr_Clear();
PyMem_Free(tbuf);
- return NULL;
+ Py_RETURN_NONE;
}
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) {
tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf,
(unsigned char *)tbuf, rsa, padding);
if (tlen == -1) {
- m2_PyErr_Msg(_rsa_err);
+ ERR_clear_error();
+ PyErr_Clear();
PyMem_Free(tbuf);
- return NULL;
+ Py_RETURN_NONE;
}
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
@@ -323,9 +326,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) {
tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf,
(unsigned char *)tbuf, rsa, padding);
if (tlen == -1) {
- m2_PyErr_Msg(_rsa_err);
+ ERR_clear_error();
+ PyErr_Clear();
PyMem_Free(tbuf);
- return NULL;
+ Py_RETURN_NONE;
}
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
diff --git a/tests/test_rsa.py b/tests/test_rsa.py
index 7bb3af75..5e75d681 100644
--- a/tests/test_rsa.py
+++ b/tests/test_rsa.py
@@ -109,8 +109,9 @@ class RSATestCase(unittest.TestCase):
# The other paddings.
for padding in self.s_padding_nok:
p = getattr(RSA, padding)
- with self.assertRaises(RSA.RSAError):
- priv.private_encrypt(self.data, p)
+ # Exception disabled as a part of mitigation against CVE-2020-25657
+ # with self.assertRaises(RSA.RSAError):
+ priv.private_encrypt(self.data, p)
# Type-check the data to be encrypted.
with self.assertRaises(TypeError):
priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding)
@@ -127,10 +128,12 @@ class RSATestCase(unittest.TestCase):
self.assertEqual(ptxt, self.data)
# no_padding
- with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
- priv.public_encrypt(self.data, RSA.no_padding)
+ # Exception disabled as a part of mitigation against CVE-2020-25657
+ # with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
+ priv.public_encrypt(self.data, RSA.no_padding)
# Type-check the data to be encrypted.
+ # Exception disabled as a part of mitigation against CVE-2020-25657
with self.assertRaises(TypeError):
priv.public_encrypt(self.gen_callback, RSA.pkcs1_padding)
@@ -146,10 +149,6 @@ class RSATestCase(unittest.TestCase):
b'\000\000\000\003\001\000\001') # aka 65537 aka 0xf4
with self.assertRaises(RSA.RSAError):
setattr(rsa, 'e', '\000\000\000\003\001\000\001')
- with self.assertRaises(RSA.RSAError):
- rsa.private_encrypt(1)
- with self.assertRaises(RSA.RSAError):
- rsa.private_decrypt(1)
assert rsa.check_key()
def test_loadpub_bad(self):
--
GitLab
@@ -15,4 +15,7 @@ PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto
PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig
PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr
# 0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch
PYTHON_M2CRYPTO_IGNORE_CVES += CVE-2020-25657
$(eval $(python-package))
+2 -2
View File
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/werkzeug/json
md5 5d499cfdd30de5d9c946994783772efd Werkzeug-1.0.1.tar.gz
sha256 6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c Werkzeug-1.0.1.tar.gz
md5 28c3ec6a4b1ce8f06c85612c1dfa351a Werkzeug-2.2.3.tar.gz
sha256 2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe Werkzeug-2.2.3.tar.gz
# Locally computed sha256 checksums
sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst
+2 -2
View File
@@ -4,9 +4,9 @@
#
################################################################################
PYTHON_WERKZEUG_VERSION = 1.0.1
PYTHON_WERKZEUG_VERSION = 2.2.3
PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz
PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/10/27/a33329150147594eff0ea4c33c2036c0eadd933141055be0ff911f7f8d04
PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/02/3c/baaebf3235c87d61d6593467056d5a8fba7c75ac838b8d100a5e64eba7a0
PYTHON_WERKZEUG_SETUP_TYPE = setuptools
PYTHON_WERKZEUG_LICENSE = BSD-3-Clause
PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst
+1
View File
@@ -12,5 +12,6 @@ QUAZIP_DEPENDENCIES = \
qt5base
QUAZIP_LICENSE = LGPL-2.1
QUAZIP_LICENSE_FILES = COPYING
QUAZIP_CPE_ID_VENDOR = quazip_project
$(eval $(cmake-package))
+1
View File
@@ -9,6 +9,7 @@ QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz
QUICKJS_SITE = https://bellard.org/quickjs
QUICKJS_LICENSE = MIT
QUICKJS_LICENSE_FILES = LICENSE
QUICKJS_CPE_ID_VENDOR = quickjs_project
QUICKJS_INSTALL_STAGING = YES
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+6
View File
@@ -1,5 +1,6 @@
config BR2_PACKAGE_ROCKCHIP_MALI
bool "rockchip-mali"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_USES_GLIBC
depends on BR2_ARM_EABIHF || BR2_aarch64
# lidbrm. This would normally need a Config.in comment, but
@@ -30,3 +31,8 @@ config BR2_PACKAGE_PROVIDES_LIBGBM
default "rockchip-mali"
endif
comment "rockchip-mali needs a glibc toolchain w/ C++, threads"
depends on BR2_ARM_EABIHF || BR2_aarch64
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS
+4
View File
@@ -24,6 +24,10 @@ RSYNC_CONF_OPTS = \
--disable-lz4 \
--disable-md5-asm
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
RSYNC_CONF_ENV += LIBS=-latomic
endif
ifeq ($(BR2_PACKAGE_ACL),y)
RSYNC_DEPENDENCIES += acl
else
@@ -0,0 +1,49 @@
From 5cfc7e277d0b262a1d12e867c47a36301fb7edb7 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 22 Feb 2023 10:01:25 +0100
Subject: [PATCH] configure.ac: fix openssl static build
Do not use AX_APPEND_FLAG as it will break static builds by removing
duplicates such as -lz or -latomic which are needed by -lssl and
-lcrypto. This will fix the following build failure with sparc which
needs -latomic:
Checking for X509_STORE_CTX_get0_cert
configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5
/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref':
x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4'
[...]
In file included from ./hostcheck.c:38:
../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data'
342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x)
| ^~~~~~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/sudo-project/sudo/pull/244]
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 8eccad7e4..523d8e56b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3082,7 +3082,9 @@ if test "${enable_openssl-no}" != no; then
SUDO_APPEND_LIBPATH([LIBTLS], [$f])
;;
*)
- AX_APPEND_FLAG([$f], [LIBTLS])
+ # Do not use AX_APPEND_FLAG as it will break static builds by removing
+ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto
+ LIBTLS="$LIBTLS $f"
;;
esac
done
--
2.39.0
+2
View File
@@ -13,6 +13,8 @@ SUDO_LICENSE_FILES = LICENSE.md
SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR)
SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR)
SUDO_SELINUX_MODULES = sudo
# We're patching configure.ac
SUDO_AUTORECONF = YES
# This is to avoid sudo's make install from chown()ing files which fails
SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install
SUDO_CONF_OPTS = \
@@ -0,0 +1,28 @@
From 97d65859bc29ee334012e9c73022d8a8e55ed586 Mon Sep 17 00:00:00 2001
From: Su Laus <sulau@freenet.de>
Date: Sat, 21 Jan 2023 15:58:10 +0000
Subject: [PATCH] tiffcrop: Correct simple copy paste error. Fix #488.
[Retrieved from:
https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
tools/tiffcrop.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
index 14fa18da..7db69883 100644
--- a/tools/tiffcrop.c
+++ b/tools/tiffcrop.c
@@ -8591,7 +8591,7 @@ static int processCropSelections(struct image_data *image,
cropsize + NUM_BUFF_OVERSIZE_BYTES);
else
{
- prev_cropsize = seg_buffs[0].size;
+ prev_cropsize = seg_buffs[i].size;
if (prev_cropsize < cropsize)
{
next_buff = _TIFFrealloc(
--
GitLab
+3
View File
@@ -12,6 +12,9 @@ TIFF_CPE_ID_VENDOR = libtiff
TIFF_CPE_ID_PRODUCT = libtiff
TIFF_INSTALL_STAGING = YES
# 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch
TIFF_IGNORE_CVES += CVE-2022-48281
# webp has a (optional) dependency on tiff, so we can't have webp
# support in tiff, or that would create a circular dependency.
TIFF_CONF_OPTS = \

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