Compare commits

..
47 Commits
Author SHA1 Message Date
Peter Korsgaard e6252e5b6d Update for 2023.02.8
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-04 14:53:52 +01:00
Fabrice Fontaine c602cf3d11 package/mariadb: security bump to version 10.11.6
This bump will fix the following build failure raised since bump of fmt
to version 10.1.0 in commit 619b5585d9
thanks to
https://github.com/MariaDB/server/commit/f4cec369a392c8a6056207012992ad4a5639965a:

-- Performing Test HAVE_SYSTEM_LIBFMT
-- Performing Test HAVE_SYSTEM_LIBFMT - Failed

[...]

-- Downloading...
   dst='/home/buildroot/autobuild/instance-3/output-1/build/mariadb-10.11.4/extra/libfmt/src/8.0.1.zip'
   timeout='none'
   inactivity timeout='none'
-- Using src='https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip'
CMake Error at libfmt-stamp/download-libfmt.cmake:170 (message):
  Each download failed!

    error: downloading 'https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip' failed
          status_code: 1
          status_string: "Unsupported protocol"
          log:
          --- LOG BEGIN ---
          Protocol "https" not supported or disabled in libcurl

This bump will also fix CVE-2023-22084

https://mariadb.com/kb/en/mariadb-10-11-5-release-notes/
https://mariadb.com/kb/en/mariadb-10-11-6-release-notes/

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit d20329ed76)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 23:21:53 +01:00
Danny Wood 11c1a1c5bc package/mariadb: add optional systemd dependency
If systemd is used we should enable support in mariadb and enable
"Type=notify" in the mysqld.service unit file

"Type=notify" stops systemd from starting services which depend on mariadb
until it has notified systemd that it has finished starting up, this helps
avoid startup race conditions

Signed-off-by: Danny Wood <danny@rotronics.co.uk>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 1a9ad16ed8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 23:21:40 +01:00
Bernd Kuhls 1586407ab7 package/mariadb: needs pcre2
Upstream added the possibility to build with system-provided pcre2 back
in 2014:
    https://github.com/MariaDB/server/commit/016bd4fc5fff311dc4091b3b7329cd980dbaa14b

The policy in Buildroot is to use system-provided libraries rather than
bundled ones, but we missed that opportunity when we introduced mariadb
back in 2016, with commit 2cd86cdbfc (mariadb: new package).

Fix that now.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 15cc8d1e45)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 23:21:23 +01:00
Bernd Kuhls c60ef11685 package/mariadb: needs fmt
Buildroot commit 88c7359f65 bumped mariadb
from version 10.3.36 to 10.11.4.

Upstream added fmt as dependency in version 10.7.1 with commit
https://github.com/MariaDB/server/commit/e214e60201216b2e6330f86a84fec8ae14aa2887

Fixes:
http://autobuild.buildroot.net/results/ce1/ce140a3923bc2f85b176fafcc38c6f68b177d33a/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 821f9dee81)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 23:19:58 +01:00
Danny Wood 21bef8d855 package/mariadb: update to version 10.11.4
Remove 0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch as it
is now upstream. Update README.md hash for minor formatting changes.

Release notes: https://mariadb.com/kb/en/mariadb-10-11-4-release-notes/
Changelog: https://mariadb.com/kb/en/mariadb-10-11-4-changelog/

Signed-off-by: Danny Wood <danny@rotronics.co.uk>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 88c7359f65)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 23:19:52 +01:00
Peter Korsgaard 2eadf9f9b2 toradex_apalis_imx6_defconfig: add download hashes for linux/uboot
The defconfig fetches Linux and U-Boot from a git repo using the
unauthenticated git:// protocol, so add download hashes for them to ensure
we get the right sources by adding a global patch dir and running
utils/add-custom-hashes.

The defconfig uses the Linux sources for the kernel headers, so make
linux-headers/linux-headers.hash a symlink to linux/linux.hash so the same
hash file is used.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit cdc9b8a3a7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 23:10:30 +01:00
Fabrice Fontaine d17a2dd7bc package/xenomai: fix build with gcc >= 12
Fix the following build failure with gcc >= 12:

task.c: In function 't_start':
task.c:398:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized]
  398 |         return ret;
      |                ^~~
task.c:364:13: note: 'ret' was declared here
  364 |         int ret;
      |             ^~~
task.c: In function 't_resume':
task.c:444:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized]
  444 |         return ret;
      |                ^~~
task.c:428:13: note: 'ret' was declared here
  428 |         int ret;
      |             ^~~

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit a3db1dd1b7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 23:05:23 +01:00
Fabrice Fontaine c72ad6fefa package/speechd: fix NLS build
Fix the following NLS build failure raised since the addition of the
package in commit 9f4f8c5f89:

/home/buildroot/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/12.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: ../../src/common/.libs/libcommon.a(libcommon_la-i18n.o): undefined reference to symbol 'libintl_bindtextdomain'

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit f6a7050d71)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 22:44:27 +01:00
Francois Perrad b0734aa57e package/perl: security bump to version 5.36.3
fix CVE-2023-47038 - Write past buffer end via illegal user-defined Unicode property

note: 5.36.2 was a broken release
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit bc7b0e1002)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 22:22:37 +01:00
Fabrice Fontaine 5cdd40da3b package/libpjsip: security bump to version 2.14
Fix CVE-2023-38703: PJSIP is a free and open source multimedia
communication library written in C with high level API in C, C++, Java,
C#, and Python languages. SRTP is a higher level media transport which
is stacked upon a lower level media transport such as UDP and ICE.
Currently a higher level transport is not synchronized with its lower
level transport that may introduce use-after-free issue. This
vulnerability affects applications that have SRTP capability
(`PJMEDIA_HAS_SRTP` is set) and use underlying media transport other
than UDP. This vulnerability’s impact may range from unexpected
application termination to control flow hijack/memory corruption. The
patch is available as a commit in the master branch.

https://github.com/pjsip/pjproject/security/advisories/GHSA-f76w-fh7c-pc66
https://github.com/pjsip/pjproject/releases/tag/2.14

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 38c4aa2826)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-03 22:05:29 +01:00
Bernd Kuhls bf03703aaa package/samba4: security bump version to 4.18.9
Fixes CVE-2018-14628:
https://www.samba.org/samba/security/CVE-2018-14628.html

Release notes:
https://www.samba.org/samba/history/samba-4.18.9.html

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-01 22:18:28 +01:00
Fabrice Fontaine fa11b1cc5b package/rtty: fix wolfssl build
Fix the following wolfssl build failure raised at least since bump to
version 7.4.0 in commit 6b5907bf65:

/home/autobuild/autobuild/instance-4/output-1/build/rtty-8.1.0/src/ssl/openssl.c: In function 'ssl_last_error_string':
/home/autobuild/autobuild/instance-4/output-1/build/rtty-8.1.0/src/ssl/openssl.c:143:24: error: implicit declaration of function 'ERR_peek_error_line_data'; did you mean 'wolfSSL_ERR_get_error_line_data'? [-Werror=implicit-function-declaration]
  143 |         ssl_err_code = ERR_peek_error_line_data(&file, &line, &data, &flags);
      |                        ^~~~~~~~~~~~~~~~~~~~~~~~
      |                        wolfSSL_ERR_get_error_line_data

Fixes:
 - http://autobuild.buildroot.org/results/9db9f1dcc6760de4b78771bb79f109c4efd06c36
 - http://autobuild.buildroot.org/results/16422af9469de114e552124542508c3b18ea8f19

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: don't force wolfssl-all]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 67cb7d8d09)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-01 21:11:35 +01:00
José Luis Salvador Rufo a6067ffa34 package/zfs: bump version to 2.2.2
This release contains an important fix for a data corruption
bug. Full details are in the issue [1] and bug fix [2].

1. https://github.com/openzfs/zfs/issues/15526
2. https://github.com/openzfs/zfs/pull/15571

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit c068fc4fa0)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-01 21:10:37 +01:00
José Luis Salvador Rufo edac24ca2b package/zfs: bump version to 2.2.0
Removed backported patch:
- https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch

Updated ZFS test to pass this new version; drop the explicit /pool
mountpoint option to rely on the default location (which happens to be
/pool already).

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
[yann.morin.1998@free.fr:
  - needed on master to further bump to a data-corruption fix
]
(cherry picked from commit d153e58d13)
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit a44d1a1252)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-01 21:10:07 +01:00
Fabrice Fontaine a7f33ddaa6 package/xtables-addons: drop unrecognized option
--with-xtables is an unrecognized option since the addition of the
package in commit 490917387a:
https://github.com/nawawi/xtables-addons/blob/a576f4d43e80f9f91705c9e6a86f2d58c283df14/configure.ac

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit e81dc9df53)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-01 21:06:58 +01:00
Fabrice Fontaine f8071bd784 package/imagemagick: security bump to version 7.1.1-21
Fix CVE-2023-1289, CVE-2023-2157, CVE-2023-34151, CVE-2023-34152,
CVE-2023-34153, CVE-2023-3428, CVE-2023-34474 and CVE-2023-34475

https://github.com/ImageMagick/Website/blob/main/ChangeLog.md

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 758d79faec)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-01 21:05:53 +01:00
Francois Perrad a914f7ff04 package/perl: security bump to 5.36.2
fix CVE-2023-47038 - Write past buffer end via illegal user-defined Unicode property

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 127986f3ed)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-01 00:03:26 +01:00
Francois Perrad 249f90cf25 package/perl: bump to version 5.36.1
diff README:
-Perl is Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022
-by Larry Wall and others.
+Perl is Copyright (C) 1993 - 2023 by Larry Wall and others.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
[yann.morin.1998@free.fr: fix spaces in hash file]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 8a289667f5)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-01 00:03:10 +01:00
Bernd Kuhls 12a55aba95 {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 5, 6}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit c9222fe0fc)
[Peter: drop 6.5.x / 6.6.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-12-01 00:00:37 +01:00
Fabrice Fontaine 515f4a1c1d package/libxml2: security bump to version 2.11.6
Fix CVE-2023-45322: libxml2 through 2.11.5 has a use-after-free that can
only occur after a certain memory allocation fails. This occurs in
xmlUnlinkNode in tree.c. NOTE: the vendor's position is "I don't think
these issues are critical enough to warrant a CVE ID ... because an
attacker typically can't control when memory allocations fail."

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit e5af07dce9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:53:12 +01:00
Bernd Kuhls a29a42e11e package/libxml2: bump version to 2.11.5
Release notes:
https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.5.news

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 622698d784)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:53:05 +01:00
Bernd Kuhls ced7a59bb0 package/libxml2: bump version to 2.11.4
Release notes:
https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.0.news
https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.1.news
https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.2.news
https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.3.news
https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.4.news

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit dfe1ca7872)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:52:18 +01:00
Fabrice Fontaine 72ec404bde package/vim: security bump to version 9.0.2136
Fix CVE-2023-46246, CVE-2023-48231, CVE-2023-48232, CVE-2023-48233,
CVE-2023-48234, CVE-2023-48235, CVE-2023-48236 and CVE-2023-48237

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 6bd302c631)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:50:38 +01:00
Fabrice Fontaine d8feeaa047 package/squid: security bump to version 6.5
Fix CVE-2023-5824, CVE-2023-46724, CVE-2023-46846, CVE-2023-46847 and
CVE-2023-46848

https://github.com/squid-cache/squid/security/advisories/GHSA-543m-w2m2-g255
https://github.com/squid-cache/squid/security/advisories/GHSA-j83v-w3p4-5cqh
https://github.com/squid-cache/squid/security/advisories/GHSA-73m6-jm96-c6r3
https://github.com/squid-cache/squid/security/advisories/GHSA-phqj-m8gv-cq4g
https://github.com/squid-cache/squid/security/advisories/GHSA-2g3c-pg7q-g59w

https://github.com/squid-cache/squid/blob/SQUID_6_5/ChangeLog

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 7fb3c96a7b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:50:21 +01:00
Waldemar Brodkorb dbf8a45bb3 package/squid: bump version to 6.3
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 0e15854fbc)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:50:17 +01:00
Waldemar Brodkorb 48428b07ad package/squid: update to 6.2
See the release notes for Squid 6 for any news:
http://www.squid-cache.org/Versions/v6/RELEASENOTES.html

Tested with qemu_aarch64_virt_defconfig.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 2a7c6816f0)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:50:10 +01:00
Fabrice Fontaine cfaac7f0a0 package/memcached: security bump to version 1.6.22
Fix CVE-2023-46852: In Memcached before 1.6.22, a buffer overflow exists
when processing multiget requests in proxy mode, if there are many
spaces after the "get" substring.

Fix CVE-2023-46853: In Memcached before 1.6.22, an off-by-one error
exists when processing proxy requests in proxy mode, if \n is used
instead of \r\n.

https://github.com/memcached/memcached/wiki/ReleaseNotes1622

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit bc96e9da0d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:45:47 +01:00
Fabrice Fontaine 566bad2b39 package/memcached: fix uclibc-ng build
Fix the following uclibc-ng build failure raised since bump to version
1.6.21 in commit 6ce55ab0ed and
https://github.com/memcached/memcached/commit/875371a75cbf1f92350de2d1fa0fae4a35ed572b:

/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: memcached-thread.o: in function `thread_setname':
thread.c:(.text+0xea2): undefined reference to `pthread_setname_np'

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit bfa3cd74d0)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:45:40 +01:00
Fabrice Fontaine 37f6c072dd package/memcached: bump to version 1.6.21
- Send first patch upstream
- Drop second and third patches (already in version) and so drop
  autoreconf

https://github.com/memcached/memcached/wiki/ReleaseNotes1618
https://github.com/memcached/memcached/wiki/ReleaseNotes1619
https://github.com/memcached/memcached/wiki/ReleaseNotes1620
https://github.com/memcached/memcached/wiki/ReleaseNotes1621

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 6ce55ab0ed)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:45:24 +01:00
Fabrice Fontaine f108d50df1 package/vlc: security bump to version 3.0.20
Fix CVE-2023-47359: Videolan VLC prior to version 3.0.20 contains an
incorrect offset read that leads to a Heap-Based Buffer Overflow in
function GetPacket() and results in a memory corruption.

Fix CVE-2023-47360: Videolan VLC prior to version 3.0.20 contains an
Integer underflow that leads to an incorrect packet length.

https://code.videolan.org/videolan/vlc/-/blob/3.0.20/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit d675873f4f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:43:22 +01:00
Bernd Kuhls e169bc91a4 package/vlc: bump version to 3.0.19
Rebased patch 0006 due to upstream commit
https://code.videolan.org/videolan/vlc/-/commit/3f9fc44176cc5505132977885799fa988c5e7701

Release notes: https://code.videolan.org/videolan/vlc/-/blob/3.0.19/NEWS

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit f45fa3b405)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:43:17 +01:00
Brandon Maier be0ceaef56 docs/website: fix favicon
When the favicon image was added in f26e61319f (docs/website: add
favicon.png), it was added to a different directory then where the header's
icon link points. This causes the favicon to fail to load with 404.

While we are here, remove the "shortcut" rel attribute as it is non-standard
and it's recommended not to use it[1].

[1] https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel#sect4

Signed-off-by: Brandon Maier <brandon.maier@collins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 8ad1a2eaa5)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:41:50 +01:00
Fabrice Fontaine 178f44b18f package/motion: fix webp build
Fix the following build failure raised since bump of webp to version
1.3.2 in commit c88c1d3319:

/home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/aarch64_be-buildroot-linux-uclibc/13.2.0/../../../../aarch64_be-buildroot-linux-uclibc/bin/ld: picture.o: undefined reference to symbol 'WebPMemoryWriterClear'
/home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/aarch64_be-buildroot-linux-uclibc/13.2.0/../../../../aarch64_be-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-9/output-1/host/aarch64_be-buildroot-linux-uclibc/sysroot/usr/lib64/libwebp.so.7: error adding symbols: DSO missing from command line

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 1267a234ff)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:40:30 +01:00
Fabrice Fontaine 9119cd3d62 package/exfatprogs: security bump to version 1.2.2
Fix CVE-2023-45897: exfatprogs before 1.2.2 allows out-of-bounds memory
access, such as in read_file_dentry_set.

https://github.com/exfatprogs/exfatprogs/blob/1.2.2/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 07dad085fa)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:38:12 +01:00
Peter Seiderer 672fdd3d01 board/raspberrypi/config_4_64bit.txt: remove testing dtoverlay entries (vc4-kms-v3d-pi4, imx219)
Remove private/testing dtoverlay entries (vc4-kms-v3d-pi4, imx219 and
commented out ov5647) wrongly introduced by commit 689b9ac439
("package/rpi-firmware: rework boot/config file handling") [1].

[1] https://git.buildroot.net/buildroot/commit/?id=689b9ac439ab7b507c8982b6102bddf59d03efbf

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit fbf0a6ea42)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 23:36:19 +01:00
Gaël PORTAY eb03f05a44 board/raspberrypi: fix autoprobing of bluetooth driver
The commit 689b9ac439 (package/rpi-firmware: rework boot/config file
handling) has split in two the property:

	dtoverlay=miniuart-bt,krnbt=on

Into:

	dtoverlay=miniuart-bt
	dtoverlay=krnbt=on

The initial property contained the dtbo file miniuart-bt[1] and its
parameter krnbt=on[2][3].

The first syntax is correct while the second is not. The krnbt=on is not
a dtoverlay[4] but a dtparam[5]. Therefore the property dtparam must be
used instead.

This fixes:

	# cat /sys/firmware/devicetree/base/chosen/user-warnings
	Failed to load overlay 'krnbt=on'

[1]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
[2]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts#L91
[3]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/README#L213-L215
[4]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtoverlay
[5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtparam

Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 5be42d8da3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:30:12 +01:00
Fabrice Fontaine 133d7a004b package/exfatprogs: add EXFATPROGS_CPE_ID_VENDOR
cpe:2.3:a:namjaejeon:exfatprogs is a valid CPE identifier for this
package:

  https://nvd.nist.gov/products/cpe/detail/F174A846-F275-4AD8-A0E3-6D0CEFDFF308

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 3da62675d7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:28:14 +01:00
Maxim Kochetkov 85c2b406c3 package/postgresql: security bump version to 15.5
Release notes:
https://www.postgresql.org/about/news/postgresql-161-155-1410-1313-1217-and-1122-released-2749/

Fixes CVE-2023-5868, CVE-2023-5869, CVE-2023-5870.

Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 4d549c071d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:25:52 +01:00
Thomas Petazzoni 3f5b8cf4d7 package/netsnmp: revert back to 5.9.3, backport security fix
In commit 13fc9dcb34, netsnmp was bumped
from 5.9.3 to 5.9.4 to fix two CVEs.

However, even though it's a minor version bump, there are actually 163
commits upstream between those two minor releases, and some of them
are breaking existing use-cases. In particular upstream
a2cb167514ac0c7e1b04e8f151e0b015501362e0 now requires that config_()
macros in MIB files are terminated with a semicolon, causing a build
breakage with existing MIB files that were totally valid with 5.9.3.

This commit therefore proposes to revert back to 5.9.3, by reverting
those two commits:

56caafceab package/netsnmp: fix musl build
13fc9dcb34 package/netsnmp: security bump to version 5.9.4

and instead backport the one upstream commit that fixes both CVEs.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[yann.morin.1998@free.fr: fix typo as reported by Baruch]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 44243b4c80)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:19:52 +01:00
Gaël PORTAY 30f8dd83e6 board/raspberrypi/readme.txt: fix typos
Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit acd833c8c7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:17:48 +01:00
José Luis Salvador Rufo 819a4ba019 package/zfs: fix zfs autotools cross-compilation
This commit addresses a long-standing bug encountered during ZFS
compilation in cross-platform environments. The issue arises because ZFS
autoconf triggers a `make modules` to detect if the kernel can compile
modules [1]. The problem occurs when autoconf uses the host environment
instead of the cross-platform environment.

To fix this, we export necessary environment variables to ensure that ZFS
autoconf utilizes the cross-platform environment correctly.

This patch resolves ZFS cross-platform compilations:
- http://autobuild.buildroot.net/results/ebeab256101bcba38c35fd55075c414e62f92caa/
- http://autobuild.buildroot.net/results/03b9f12a106bf100eec695a92b83bf09b22c68b0/
- http://autobuild.buildroot.net/results/c2da90337463607c2fadfeac7ad72e5c3899a61f/
- http://autobuild.buildroot.net/results/465a249f92d2f5db7ac4b61b4111e6cbaaa15688/
- http://autobuild.buildroot.net/results/7e2d3277e26fa5b0c8073a0e8b9e82f47ade9697/
- http://autobuild.buildroot.net/results/a8fb87336b09fef8787a7889dfcccf14fe1215b9/
- https://gitlab.com/kubu93/buildroot/-/jobs/1522848483

And fix a few emails:
- alpine.DEB.2.22.394.2108181630280.2028262@ridzo [build zfs into buildroot for raspberry pi 4]
- https://lists.buildroot.org/pipermail/buildroot/2021-August/621696.html
- https://lists.buildroot.org/pipermail/buildroot/2021-August/621345.html
- https://lists.buildroot.org/pipermail/buildroot/2022-July/646379.html
- https://lists.buildroot.org/pipermail/buildroot/2023-June/668467.html

[1] This is the full callback, you can just check the last link:
- https://github.com/openzfs/zfs/blob/zfs-2.1.12/config/kernel-declare-event-class.m4#L7C11-L7C11
- https://github.com/openzfs/zfs/blob/zfs-2.1.12/config/kernel.m4#L883
- https://github.com/openzfs/zfs/blob/zfs-2.1.12/config/kernel.m4#L868
- https://github.com/openzfs/zfs/blob/zfs-2.1.12/config/kernel.m4#L668

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 7fe685c510)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:17:04 +01:00
Yann E. MORIN 6af0375dd6 package/zfs: don't download patch generated from github
Git-generated patches embed the short-hash of the objects in the
repository. The length of those short hashes are subject to change
in at least three cases:

  - the number of objects in the repository increases, so git increases
    the length of short hashes to get a good change there is no
    collision;

  - the git configuration changes, see core.abbrev in git-config;

  - the heuristic to compute the length changes in a newer git version.

Since the bump to zfs 2.1.4 in commit 68dfd09708, the patch generated
by github has changed, causing download failures:

    wget --passive-ftp -nd -t 3 -O '/home/ymorin/dev/buildroot/O/master/build/.bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch.uoFq9e/output' 'https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch'
    --2023-11-26 16:53:25--
    https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch
    Resolving github.com (github.com)... 140.82.121.3
    Connecting to github.com (github.com)|140.82.121.3|:443...  connected.
    HTTP request sent, awaiting response... 200 OK
    Length: 2976 (2.9K) [text/plain]
    Saving to: ‘/home/ymorin/dev/buildroot/O/master/build/.bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch.uoFq9e/output’

    /home/ymorin/dev/buildroot/O/ 100%[================================================>]   2.91K --.-KB/s in 0s

    2023-11-26 16:53:25 (15.0 MB/s) - ‘/home/ymorin/dev/buildroot/O/master/build/.bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch.uoFq9e/output’ saved [2976/2976]

    ERROR: while checking hashes from package/zfs//zfs.hash
    ERROR: bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch has wrong sha256 hash:
    ERROR: expected: 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a
    ERROR: got     : 246c80f66abca5a7e0c41cc7c56eec0b4cb7f16b142262480401142bbc2f999f
    ERROR: Incomplete download, or man-in-the-middle (MITM) attack

And indeed, the length of short hashes has increased by one since then.

Fix that by bundling the patch, with the short hashes that were known
then, so that it matches the sha256 we had for it.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 2c3946fcb4)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:13:27 +01:00
José Luis Salvador Rufo 3a0aa2a0a6 package/zfs: not using kernel-module infra
zfs already builds the kernel module from the autotools infrastructure.

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 41493cae71)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:12:23 +01:00
José Luis Salvador Rufo 5e8804218d package/zfs: bump version to 2.1.12
Removed backported patch:
- 0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit cfff4e120f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:12:15 +01:00
Nicolas Cavallari b8e0734ebf package/gcc: fix disabling the documentation
gcc.mk attempts to disable building the documentation by setting
MAKEINFO=missing, but it is not working.  If makeinfo is installed
and recent enough, gcc still uses it.  This can be checked easily:

grep BUILD_INFO='info' host-gcc-initial-*/build/gcc/config.log

It happens because the root ./configure script will check
$MAKEINFO --version (aka 'missing --version') and will overwrite it with
MAKEINFO='missing makeinfo' because the version does not match.

Having MAKEINFO='missing makeinfo' is a problem because
'missing makeinfo' will actually attempt to run 'makeinfo' before
failing with an error message.  If makeinfo is installed on the host,
then 'missing makeinfo' will successfully run makeinfo anyway.

Many gcc subprojects will check $MAKEINFO --version and enable building
the documentation if it is recent enough.  This patch overrides these
checks by forcing gcc_cv_prog_makeinfo_modern=no.

Building the GCC documentation can fail with the wrong makeinfo version.
It happened at least when building GCC 11.3.0 with makeinfo 7.1.

Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit f7b9d3ad2b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 09:04:26 +01:00
Peter Korsgaard 2f93db49d4 package/intel-microcode: security bump to version 20231114
Includes fixes for INTEL-SA-00950:
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00950.html
https://lock.cmpxchg8b.com/reptar.html
https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20231114

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit c54407541c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-11-30 08:58:33 +01:00
67 changed files with 383 additions and 432 deletions
+17
View File
@@ -1,3 +1,20 @@
2023.02.8, released December 4th, 2023
Important / security related fixes.
Defconfigs: Raspberrypi: Fix DT overlay for autoproving of
bluetooth driver, Toradex apalis i.mx6: Add download hashes
for Linux and U-Boot.
Updated/fixed packages: exfatprogs, gcc, imagemagick,
intel-microcode, libpjsip, libxml2, mariadb, memcached,
motion, netsnmp, perl, postgresql, rtty, samba4, speech,
squid, vim, vlc, xenomai, xtables-addons, zfs
Issues resolved (http://bugs.uclibc.org):
#15856: Using BR2_CONFIG= on a different file-system...
2023.02.7, released November 14th, 2023
Important / security related fixes.
+2 -2
View File
@@ -90,9 +90,9 @@ all:
.PHONY: all
# Set and export the version string
export BR2_VERSION := 2023.02.7
export BR2_VERSION := 2023.02.8
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1699991000
BR2_VERSION_EPOCH = 1701698000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
+1 -1
View File
@@ -26,4 +26,4 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt
# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on
+1 -1
View File
@@ -26,4 +26,4 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt
# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on
+1 -1
View File
@@ -26,7 +26,7 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt
# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on
# enable 64bits support
arm_64bit=1
+1 -1
View File
@@ -26,4 +26,4 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt
# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on
+1 -5
View File
@@ -26,11 +26,7 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt
# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtoverlay=vc4-kms-v3d-pi4
dtoverlay=imx219
#dtoverlay=ov5647
dtparam=krnbt=on
# enable 64bits support
arm_64bit=1
+1 -1
View File
@@ -26,4 +26,4 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt
# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on
+3 -3
View File
@@ -17,8 +17,8 @@ How to build it
Configure Buildroot
-------------------
There are two RaspberryPi defconfig files in Buildroot, one for each
major variant, which you should base your work on:
There are several Raspberry Pi defconfig files in Buildroot, one for
each major variant, which you should base your work on:
For models A, B, A+ or B+:
@@ -133,7 +133,7 @@ How to write to CM4 eMMC memory
===============================
For CM4 modules without eMMC memory see above for booting from SD card,
for CM4 moduels with eMMC memory proceed as following:
for CM4 modules with eMMC memory proceed as following:
- fit jumper on IO Board header J2 to disable eMMC boot
- connect IO Board micro USB port (J11 USB slave) to your host linux system
@@ -0,0 +1 @@
../linux/linux.hash
@@ -0,0 +1,2 @@
# Locally calculated
sha256 9c69a1c283db6ee8042cc6f013a159473f257e71751887312c7dd2902f01bec8 linux-d899927728beca8357a5b4120b690cb3c1d80844-br1.tar.gz
@@ -0,0 +1,2 @@
# Locally calculated
sha256 9a540b08ccb7e8a0252f86d0bad5d676d0964725a7f2a06d798225c2a3024878 uboot-30a1208727729dae22cb42f9ba9ba17efe5e6f77-br1.tar.gz
+1
View File
@@ -1,6 +1,7 @@
BR2_arm=y
BR2_cortex_a9=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
BR2_GLOBAL_PATCH_DIR="board/toradex/apalis-imx6/patches"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/toradex/apalis-imx6/post-image.sh"
BR2_LINUX_KERNEL=y
+1 -1
View File
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="Buildroot" content="">
<meta name="angelo.compagnucci@gmail.com" content="">
<link rel="shortcut icon" href="images/favicon.png">
<link rel="icon" href="favicon.png">
<title>Buildroot - Making Embedded Linux Easy</title>
+1 -1
View File
@@ -128,7 +128,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "6.1.62" if BR2_LINUX_KERNEL_LATEST_VERSION
default "6.1.64" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
+6 -6
View File
@@ -1,12 +1,12 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 b9fd616facd6becfceef88b9be718d0f16625cab3fe81d11384802a7091e85ec linux-6.1.62.tar.xz
sha256 629daa38f3ea67f29610bfbd53f9f38f46834d3654451e9474100490c66dc7e7 linux-6.1.64.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 af84e54164e1c01f59764ba528448ed36b377d22aafbd81b4b0cf47792ef4aaa linux-5.15.138.tar.xz
sha256 9d2d961fbf87486e48b0087326ee35cb0af4dec03c770737b098652457205104 linux-5.10.200.tar.xz
sha256 9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfe linux-5.4.260.tar.xz
sha256 be2bee8b346f3ccb35879f16c80a323edda571e36190403805c14a9ea24e4a47 linux-5.15.140.tar.xz
sha256 3212e0299d699dd6089505b1428bcb00643fbf19af69806e37fad22bfe12fa8b linux-5.10.202.tar.xz
sha256 7d3eaa0744456ab4b062e6da8764f776b6939b89a1dfccbe11fbeef9c6e864dc linux-5.4.262.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 9da816bce896024c96b6c846be8f3e6315dd6ae82925698f534153d6a0c10f56 linux-4.19.298.tar.xz
sha256 de36689d713ed17f8bc1286fe4b9afcdb9a3de3b6f1d6aff52569f055c276bb7 linux-4.14.329.tar.xz
sha256 a8419582886120407f57d39280ef8a9b22aab9725c83c4fe25ecca4712d59346 linux-4.19.300.tar.xz
sha256 39dcdceecad2ca7347e2b2e7e30a189558c0a1700f793822389bb1fd9a40530f linux-4.14.331.tar.xz
# Locally computed
sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz
sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz
+2 -2
View File
@@ -1,5 +1,5 @@
# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.0/exfatprogs-1.2.0.tar.xz.sha256
sha256 56d9a49465deafc367d428afc71c8098705a30ee19a3cdf3c5320650b8880742 exfatprogs-1.2.0.tar.xz
# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.2/exfatprogs-1.2.2.tar.xz.sha256
sha256 61d517231f8ec177eeb5955fd6edb89748d3f88ba412c48bcb32741b430e359a exfatprogs-1.2.2.tar.xz
# Hash for license file
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+2 -1
View File
@@ -4,11 +4,12 @@
#
################################################################################
EXFATPROGS_VERSION = 1.2.0
EXFATPROGS_VERSION = 1.2.2
EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz
EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION)
EXFATPROGS_LICENSE = GPL-2.0+
EXFATPROGS_LICENSE_FILES = COPYING
EXFATPROGS_CPE_ID_VENDOR = namjaejeon
$(eval $(autotools-package))
$(eval $(host-autotools-package))
+5 -2
View File
@@ -88,9 +88,12 @@ HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot
endif
# Don't build documentation. It takes up extra space / build time,
# and sometimes needs specific makeinfo versions to work
# and sometimes needs specific makeinfo versions to work. Override the check
# for a modern makeinfo otherwise the configure scripts will still enable it.
HOST_GCC_COMMON_CONF_ENV = \
MAKEINFO=missing
HOST_GCC_COMMON_MAKE_OPTS = \
gcc_cv_prog_makeinfo_modern=no
GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS)
GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS)
@@ -295,7 +298,7 @@ HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"'
# For gcc-final, the gcc logic to detect whether SSP support is
# available or not in the C library is not working properly for
# uClibc, so let's be explicit as well.
HOST_GCC_COMMON_MAKE_OPTS = \
HOST_GCC_COMMON_MAKE_OPTS += \
gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
ifeq ($(BR2_CCACHE),y)
+1 -1
View File
@@ -1,3 +1,3 @@
# Locally computed
sha256 4333ef2fe63f2510988af82b726f5b1919ebd54037ea6674566c69fcceb67e11 imagemagick-7.1.0-51.tar.gz
sha256 09402e5f17c6575ef9f010bb2e21ae1710f1f3426f115ad4317ee9129c32608e imagemagick-7.1.1-21.tar.gz
sha256 8cceeb67d4e783cb63075c7311fdb990fa0369ee80fbd0f481064cd02386ca2d LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
IMAGEMAGICK_VERSION = 7.1.0-51
IMAGEMAGICK_VERSION = 7.1.1-21
IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION))
IMAGEMAGICK_LICENSE = Apache-2.0
IMAGEMAGICK_LICENSE_FILES = LICENSE
+1 -1
View File
@@ -1,3 +1,3 @@
# Locally computed
sha256 fe49bb719441f20335ed6004090ab38cdc374134d36d4f5d30be7ed93b820313 intel-microcode-20230808.tar.gz
sha256 cee26f311f7e2c039dd48cd30f995183bde9b98fb4c3039800e2ddaf5c090e55 intel-microcode-20231114.tar.gz
sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
INTEL_MICROCODE_VERSION = 20230808
INTEL_MICROCODE_VERSION = 20231114
INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION))
INTEL_MICROCODE_LICENSE = PROPRIETARY
INTEL_MICROCODE_LICENSE_FILES = license
+1 -1
View File
@@ -1,3 +1,3 @@
# Locally computed
sha256 32a5ab5bfbb9752cb6a46627e4c410e61939c8dbbd833ac858473cfbd9fb9d7d pjproject-2.13.1.tar.gz
sha256 5805c1171acab4af9684d7ad096dcb92f71fc42809852144e97e1413468c9981 pjproject-2.14.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
LIBPJSIP_VERSION = 2.13.1
LIBPJSIP_VERSION = 2.14
LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz
LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION))
+2 -2
View File
@@ -1,4 +1,4 @@
# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.4.sha256sum
sha256 ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45 libxml2-2.10.4.tar.xz
# From https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.6.sha256sum
sha256 c90eee7506764abbe07bb616b82da452529609815aefef423d66ef080eb0c300 libxml2-2.11.6.tar.xz
# License files, locally calculated
sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright
+2 -2
View File
@@ -4,8 +4,8 @@
#
################################################################################
LIBXML2_VERSION_MAJOR = 2.10
LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).4
LIBXML2_VERSION_MAJOR = 2.11
LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).6
LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz
LIBXML2_SITE = \
https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR)
+6 -6
View File
@@ -384,12 +384,12 @@ endchoice
config BR2_DEFAULT_KERNEL_HEADERS
string
default "4.14.329" if BR2_KERNEL_HEADERS_4_14
default "4.19.298" if BR2_KERNEL_HEADERS_4_19
default "5.4.260" if BR2_KERNEL_HEADERS_5_4
default "5.10.200" if BR2_KERNEL_HEADERS_5_10
default "5.15.138" if BR2_KERNEL_HEADERS_5_15
default "6.1.62" if BR2_KERNEL_HEADERS_6_1
default "4.14.331" if BR2_KERNEL_HEADERS_4_14
default "4.19.300" if BR2_KERNEL_HEADERS_4_19
default "5.4.262" if BR2_KERNEL_HEADERS_5_4
default "5.10.202" if BR2_KERNEL_HEADERS_5_10
default "5.15.140" if BR2_KERNEL_HEADERS_5_15
default "6.1.64" if BR2_KERNEL_HEADERS_6_1
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
@@ -1,39 +0,0 @@
From 79ed770a37c8669390a58a4485dd8f5565fe2497 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 15 Jan 2023 19:12:05 +0100
Subject: [PATCH] include/ssl_compat.h: fix build with libressl >= 3.5.0
Fix the following build failure with libressl >= 3.5.0:
In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18:
/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048':
/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'}
68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G))
| ^~
Fixes:
- http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/MariaDB/server/pull/2435]
---
include/ssl_compat.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/ssl_compat.h b/include/ssl_compat.h
index 664f3aac87c..3678e5fa084 100644
--- a/include/ssl_compat.h
+++ b/include/ssl_compat.h
@@ -19,7 +19,8 @@
/* OpenSSL version specific definitions */
#if defined(OPENSSL_VERSION_NUMBER)
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
#define HAVE_OPENSSL11 1
#define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
#define ERR_remove_state(X) ERR_clear_error()
--
2.39.0
+3 -3
View File
@@ -1,6 +1,6 @@
# From https://downloads.mariadb.org/mariadb/10.3.36
sha512 321b4c48fcea4413eb239c4904c806306de660f2844edfa1d2a2a15213db287070d0f923db976588dfe329559d565bd98bddef3aaf8f14502f8c3db2ee27757a mariadb-10.3.36.tar.gz
# From https://downloads.mariadb.org/mariadb/10.11.6
sha512 3d77f7be4a26d5a36af56150a5f8ed5e21adeed9bc8ea1bd694e47a25a571bd73468eada7c96e0dfe5a6c81bef625abf71a56d228cf43a738e555e3c0d824a6a mariadb-10.11.6.tar.gz
# Hash for license files
sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md
sha256 2b278a3a2f20696113a7c57c4f3e6a5cdb9a25f2a827e72e0c089a2f805ff91a README.md
sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING
+14 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
MARIADB_VERSION = 10.3.36
MARIADB_VERSION = 10.11.6
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
# Tarball no longer contains LGPL license text
@@ -18,12 +18,18 @@ MARIADB_CONFIG_SCRIPTS = mysql_config
MARIADB_DEPENDENCIES = \
host-mariadb \
fmt \
ncurses \
openssl \
pcre2 \
zlib \
libaio \
libxml2
MARIADB_CONF_OPTS += \
-DWITH_FMT=system \
-DWITH_PCRE=system
# use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+
MARIADB_CONF_OPTS += -DWITH_READLINE=ON
@@ -66,6 +72,13 @@ MARIADB_CONF_OPTS += \
-DLIBRESSL_RESULT__TRYRUN_OUTPUT="LibreSSL $(LIBRESSL_VERSION)"
endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
MARIADB_DEPENDENCIES += systemd
MARIADB_CONF_OPTS += -DWITH_SYSTEMD=yes
else
MARIADB_CONF_OPTS += -DWITH_SYSTEMD=no
endif
ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y)
ifeq ($(BR2_PACKAGE_MARIADB_SERVER_EMBEDDED),y)
MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON
+2
View File
@@ -9,6 +9,8 @@ Restart=always
User=mysql
RuntimeDirectory=mysql
RuntimeDirectoryMode=0755
Type=notify
NotifyAccess=all
[Install]
WantedBy=multi-user.target
@@ -23,7 +23,7 @@ Fixes:
- http://autobuild.buildroot.org/results/7a46ac38d10b1859034017e0294961daa8f48dd2
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: not sent yet]
Upstream: https://github.com/memcached/memcached/pull/1077
---
logger.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
@@ -1,50 +0,0 @@
From 58b6de2135c10b64918f25c48f69f144d08a9c0d Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 3 Jun 2022 19:10:15 +0200
Subject: [PATCH] check for sys/auxv.h
Check for sys/auxv.h to avoid the following uclibc build failure on
aarch64:
crc32c.c:277:10: fatal error: sys/auxv.h: No such file or directory
277 | #include <sys/auxv.h>
| ^~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/08591fbf9677ff126492c50c15170c641bcab56a
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: not sent yet]
---
configure.ac | 1 +
crc32c.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 0985f07..3337fe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -516,6 +516,7 @@ AH_BOTTOM([#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
])
+AC_CHECK_HEADERS([sys/auxv.h])
dnl **********************************************************************
dnl Figure out if this system has the stupid sasl_callback_ft
diff --git a/crc32c.c b/crc32c.c
index 26df879..05e61ff 100644
--- a/crc32c.c
+++ b/crc32c.c
@@ -273,7 +273,7 @@ void crc32c_init(void) {
}
#elif defined(__aarch64__) && (defined(__linux__) || defined(__APPLE__))
-#if defined(__linux__)
+#if defined(__linux__) && defined(HAVE_SYS_AUX_H)
#include <sys/auxv.h>
#elif defined(__APPLE__)
#include <sys/sysctl.h>
--
2.35.1
@@ -0,0 +1,64 @@
From c84e5e55e0e9e793849f721d30979242ed6a6ee3 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 1 Oct 2023 14:12:38 +0200
Subject: [PATCH] fix build on uclibc-ng
Fix the following build failure with uclibc-ng raised since version
1.6.18 and
https://github.com/memcached/memcached/commit/875371a75cbf1f92350de2d1fa0fae4a35ed572b:
/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: memcached-thread.o: in function `thread_setname':
thread.c:(.text+0xea2): undefined reference to `pthread_setname_np'
Fixes:
- http://autobuild.buildroot.org/results/e856d381f5ec7d2727f21c8bd46dacb456984416
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Upstream: unsent yet (waiting feedback on first patch)
---
configure.ac | 1 +
extstore.c | 2 +-
thread.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index d94f6fb..5ec5088 100644
--- a/configure.ac
+++ b/configure.ac
@@ -686,6 +686,7 @@ AC_CHECK_FUNCS(clock_gettime)
AC_CHECK_FUNCS(preadv)
AC_CHECK_FUNCS(pread)
AC_CHECK_FUNCS(eventfd)
+AC_CHECK_FUNCS([pthread_setname_np],[AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [Define to 1 if support pthread_setname_np])])
AC_CHECK_FUNCS([accept4], [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if support accept4])])
AC_CHECK_FUNCS([getopt_long], [AC_DEFINE(HAVE_GETOPT_LONG, 1, [Define to 1 if support getopt_long])])
diff --git a/extstore.c b/extstore.c
index b079465..f6a6180 100644
--- a/extstore.c
+++ b/extstore.c
@@ -119,7 +119,7 @@ struct store_engine {
#define THR_NAME_MAXLEN 16
static void thread_setname(pthread_t thread, const char *name) {
assert(strlen(name) < THR_NAME_MAXLEN);
-#if defined(__linux__)
+#if defined(__linux__) && defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(thread, name);
#endif
}
diff --git a/thread.c b/thread.c
index ee120fa..76651c2 100644
--- a/thread.c
+++ b/thread.c
@@ -635,7 +635,7 @@ static void thread_libevent_process(evutil_socket_t fd, short which, void *arg)
#define THR_NAME_MAXLEN 16
void thread_setname(pthread_t thread, const char *name) {
assert(strlen(name) < THR_NAME_MAXLEN);
-#if defined(__linux__)
+#if defined(__linux__) && defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(thread, name);
#endif
}
--
2.40.1
@@ -1,65 +0,0 @@
From 8497f7ed38146378a988bc22800b3a5eba38b0fd Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 13 Jun 2022 16:29:38 +0200
Subject: [PATCH] configure.ac: add --disable-werror
Allow the user to disable -Werror to avoid the following build failure:
In file included from hash.c:7:
xxhash.h:2667:5: error: #warning is a GCC extension [-Werror]
2667 | # warning "XXH3 is highly inefficient without ARM or Thumb-2."
| ^~~~~~~
xxhash.h:2667:5: error: #warning "XXH3 is highly inefficient without ARM or Thumb-2." [-Werror=cpp]
Fixes:
- http://autobuild.buildroot.org/results/3124bae73c207f1a118e57e41e222ef464ccb297
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/memcached/memcached/pull/926]
---
configure.ac | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3337fe7..7683b8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,9 @@ AC_ARG_ENABLE(static,
AC_ARG_ENABLE(unix_socket,
[AS_HELP_STRING([--disable-unix-socket], [Disable unix domain socket])])
+AC_ARG_ENABLE(werror,
+ [AS_HELP_STRING([--disable-werror], [Disable -Werror])])
+
dnl **********************************************************************
dnl DETECT_SASL_CB_GETCONF
dnl
@@ -783,6 +786,10 @@ AM_CONDITIONAL([BUILD_SPECIFICATIONS],
[test "x$enable_docs" != "xno" -a "x$XML2RFC" != "xno" -a "x$XSLTPROC" != "xno"])
+if test "x$enable_werror" != "xno"; then
+ CFLAGS="$CFLAGS -Werror"
+fi
+
dnl Let the compiler be a bit more picky. Please note that you cannot
dnl specify these flags to the compiler before AC_CHECK_FUNCS, because
dnl the test program will generate a compilation warning and hence fail
@@ -790,12 +797,12 @@ dnl to detect the function ;-)
if test "$ICC" = "yes"
then
dnl ICC trying to be gcc.
- CFLAGS="$CFLAGS -diag-disable 187 -Wall -Werror"
+ CFLAGS="$CFLAGS -diag-disable 187 -Wall"
AC_DEFINE([_GNU_SOURCE],[1],[make sure IOV_MAX is defined])
elif test "$GCC" = "yes"
then
GCC_VERSION=`$CC -dumpversion`
- CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
+ CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
if test "x$enable_asan" = "xyes"; then
CFLAGS="$CFLAGS -fsanitize=address"
fi
--
2.35.1
+3 -3
View File
@@ -1,6 +1,6 @@
# From http://www.memcached.org/files/memcached-1.6.17.tar.gz.sha1
sha1 e25639473e15f1bd9516b915fb7e03ab8209030f memcached-1.6.17.tar.gz
# From http://www.memcached.org/files/memcached-1.6.22.tar.gz.sha1
sha1 7a691f390d59616dbebfc9e2e4942d499c39a338 memcached-1.6.22.tar.gz
# Locally computed
sha256 2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224 memcached-1.6.17.tar.gz
sha256 34783a90a4ccf74c4107085fd92b688749d23b276cfdad9f04e4f725a05d1ca7 memcached-1.6.22.tar.gz
sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
MEMCACHED_VERSION = 1.6.17
MEMCACHED_VERSION = 1.6.22
MEMCACHED_SITE = http://www.memcached.org/files
MEMCACHED_DEPENDENCIES = libevent
MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
@@ -0,0 +1,26 @@
From 40ecd71ff361442f1579089481619dd7cae90ffd Mon Sep 17 00:00:00 2001
From: Piotr Mionskowski <piotr.mionskowski@gmail.com>
Date: Sun, 9 Jul 2023 01:44:49 +0200
Subject: [PATCH] Include libwebp when WEBP is enabled
Upstream: https://github.com/Motion-Project/motion/commit/40ecd71ff361442f1579089481619dd7cae90ffd
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index ce588f65..ee45ac37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,8 +191,8 @@ AS_IF([test "${WEBP}" = "yes" ], [
AS_IF([pkg-config libwebpmux ], [
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_WEBP], [1], [Define to 1 if WEBP is around])
- TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux`
- TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux`
+ TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux libwebp`
+ TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux libwebp`
],[
AC_MSG_RESULT(no)
]
+7 -2
View File
@@ -16,12 +16,16 @@ choice
config BR2_PACKAGE_MARIADB
bool "mariadb"
depends on BR2_INSTALL_LIBSTDCPP # fmt
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
depends on BR2_USE_WCHAR # fmt
select BR2_PACKAGE_LIBAIO
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_FMT
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_PCRE2
select BR2_PACKAGE_HAS_MYSQL
help
MariaDB is one of the most popular database servers in the
@@ -30,8 +34,9 @@ config BR2_PACKAGE_MARIADB
http://www.mariadb.org/
comment "mariadb needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
comment "mariadb needs a toolchain w/ dynamic library, C++, wchar"
depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \
|| !BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
config BR2_PACKAGE_ORACLE_MYSQL
@@ -1,38 +0,0 @@
From a62169f1fa358be8f330ea8519ade0610fac525b Mon Sep 17 00:00:00 2001
From: Adam Gajda <adgajda@users.noreply.github.com>
Date: Mon, 2 Oct 2023 16:40:31 +0200
Subject: [PATCH] Fix configuration of NETSNMP_FD_MASK_TYPE
Upstream: https://github.com/net-snmp/net-snmp/commit/a62169f1fa358be8f330ea8519ade0610fac525b
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
configure | 2 +-
configure.d/config_project_types | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 9f0a173d8a..945a27c663 100755
--- a/configure
+++ b/configure
@@ -30871,7 +30871,7 @@ CFLAGS="$CFLAGS -Werror"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5
printf %s "checking for the type of fd_set::fds_bits... " >&6; }
-for type in __fd_mask __int32_t unknown; do
+for type in __fd_mask __int32_t long\ int unknown; do
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
diff --git a/configure.d/config_project_types b/configure.d/config_project_types
index 1b4c66b95e..a78e8ebb06 100644
--- a/configure.d/config_project_types
+++ b/configure.d/config_project_types
@@ -66,7 +66,7 @@ netsnmp_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror"
AC_MSG_CHECKING([for the type of fd_set::fds_bits])
-for type in __fd_mask __int32_t unknown; do
+for type in __fd_mask __int32_t long\ int unknown; do
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <sys/select.h>
#include <stddef.h>
@@ -0,0 +1,72 @@
From b07627fa67c686b07d1eab123cf3e4887a2a93aa Mon Sep 17 00:00:00 2001
From: Bill Fenner <fenner@gmail.com>
Date: Fri, 25 Nov 2022 08:41:24 -0800
Subject: [PATCH] snmp_agent: disallow SET with NULL varbind
Upstream: https://github.com/net-snmp/net-snmp/commit/4589352dac3ae111c7621298cf231742209efd9b
[Thomas: this commit was merged as part of
https://github.com/net-snmp/net-snmp/pull/490/commits, which fixes
https://github.com/net-snmp/net-snmp/issues/474 (CVE-2022-44792) and
https://github.com/net-snmp/net-snmp/issues/475 (CVE-2022-44793). The
other two commits merged as part of this pull request are related to
adding a non-regression test for this, which is not relevant for the
security fix itself.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
agent/snmp_agent.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/agent/snmp_agent.c b/agent/snmp_agent.c
index 867d0c166f..3f678fe2df 100644
--- a/agent/snmp_agent.c
+++ b/agent/snmp_agent.c
@@ -3719,12 +3719,44 @@ netsnmp_handle_request(netsnmp_agent_session *asp, int status)
return 1;
}
+static int
+check_set_pdu_for_null_varbind(netsnmp_agent_session *asp)
+{
+ int i;
+ netsnmp_variable_list *v = NULL;
+
+ for (i = 1, v = asp->pdu->variables; v != NULL; i++, v = v->next_variable) {
+ if (v->type == ASN_NULL) {
+ /*
+ * Protect SET implementations that do not protect themselves
+ * against wrong type.
+ */
+ DEBUGMSGTL(("snmp_agent", "disallowing SET with NULL var for varbind %d\n", i));
+ asp->index = i;
+ return SNMP_ERR_WRONGTYPE;
+ }
+ }
+ return SNMP_ERR_NOERROR;
+}
+
int
handle_pdu(netsnmp_agent_session *asp)
{
int status, inclusives = 0;
netsnmp_variable_list *v = NULL;
+#ifndef NETSNMP_NO_WRITE_SUPPORT
+ /*
+ * Check for ASN_NULL in SET request
+ */
+ if (asp->pdu->command == SNMP_MSG_SET) {
+ status = check_set_pdu_for_null_varbind(asp);
+ if (status != SNMP_ERR_NOERROR) {
+ return status;
+ }
+ }
+#endif /* NETSNMP_NO_WRITE_SUPPORT */
+
/*
* for illegal requests, mark all nodes as ASN_NULL
*/
--
2.41.0
+3 -3
View File
@@ -1,7 +1,7 @@
# Locally calculated after checking pgp signature at
# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.4/net-snmp-5.9.4.tar.gz.asc
# using key 6E6718AEF1EB5C65C32D1B2A356BC0B552D53CAB
sha256 8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544 net-snmp-5.9.4.tar.gz
# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.3/net-snmp-5.9.3.tar.gz.asc
# using key D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6
sha256 2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a net-snmp-5.9.3.tar.gz
# Hash for license file
sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING
+5 -1
View File
@@ -4,13 +4,17 @@
#
################################################################################
NETSNMP_VERSION = 5.9.4
NETSNMP_VERSION = 5.9.3
NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION)
NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
NETSNMP_LICENSE = Various BSD-like
NETSNMP_LICENSE_FILES = COPYING
NETSNMP_CPE_ID_VENDOR = net-snmp
NETSNMP_CPE_ID_PRODUCT = $(NETSNMP_CPE_ID_VENDOR)
# 0001-snmp_agent-disallow-SET-with-NULL-varbind.patch
NETSNMP_IGNORE_CVES = \
CVE-2022-44792 \
CVE-2022-44793
NETSNMP_SELINUX_MODULES = snmp
NETSNMP_INSTALL_STAGING = YES
NETSNMP_CONF_ENV = \
+7 -7
View File
@@ -1,12 +1,12 @@
# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.0.tar.xz.{md5,sha1,sha256}.txt
md5 826e42da130011699172fd655e49cfa2 perl-5.36.0.tar.xz
sha1 938c56a77ae094eb7f5019318a5e4efb2d9c74fa perl-5.36.0.tar.xz
sha256 0f386dccbee8e26286404b2cca144e1005be65477979beb9b1ba272d4819bcf0 perl-5.36.0.tar.xz
# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz.{md5,sha1,sha256}.txt
md5 17946060e6279cf32d08edc92c40efc3 perl-5.36.3.tar.xz
sha1 9949e79c92171b39f4fb2b19ffd4ea293b8dd589 perl-5.36.3.tar.xz
sha256 45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd perl-5.36.3.tar.xz
# Hash from: https://github.com/arsv/perl-cross/releases/download/1.4/perl-cross-1.4.hash
sha256 be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91 perl-cross-1.4.tar.gz
# Hash from: https://github.com/arsv/perl-cross/releases/download/1.5.2/perl-cross-1.5.2.hash
sha256 584dc54c48dca25e032b676a15bef377c1fed9de318b4fc140292a5dbf326e90 perl-cross-1.5.2.tar.gz
# Locally calculated
sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic
sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying
sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README
sha256 810c97bea10842d2e47bc79e51acdfa1628cfee34fa0d89330f4eb3a44e3def9 README
+2 -2
View File
@@ -6,7 +6,7 @@
# When updating the version here, also update utils/scancpan
PERL_VERSION_MAJOR = 36
PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0
PERL_VERSION = 5.$(PERL_VERSION_MAJOR).3
PERL_SITE = https://www.cpan.org/src/5.0
PERL_SOURCE = perl-$(PERL_VERSION).tar.xz
PERL_LICENSE = Artistic or GPL-1.0+
@@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl
PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
PERL_INSTALL_STAGING = YES
PERL_CROSS_VERSION = 1.4
PERL_CROSS_VERSION = 1.5.2
# DO NOT refactor with the github helper (the result is not the same)
PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION)
PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz
+2 -2
View File
@@ -1,4 +1,4 @@
# From https://ftp.postgresql.org/pub/source/v15.4/postgresql-15.4.tar.bz2.sha256
sha256 baec5a4bdc4437336653b6cb5d9ed89be5bd5c0c58b94e0becee0a999e63c8f9 postgresql-15.4.tar.bz2
# From https://ftp.postgresql.org/pub/source/v15.4/postgresql-15.5.tar.bz2.sha256
sha256 8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6 postgresql-15.5.tar.bz2
# License file, Locally calculated
sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
POSTGRESQL_VERSION = 15.4
POSTGRESQL_VERSION = 15.5
POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
POSTGRESQL_LICENSE = PostgreSQL
+1 -1
View File
@@ -24,7 +24,7 @@ RTTY_CONF_OPTS += \
-DUSE_MBEDTLS=OFF \
-DUSE_OPENSSL=ON \
-DUSE_WOLFSSL=OFF
else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y)
RTTY_DEPENDENCIES += wolfssl
RTTY_CONF_OPTS += \
-DSSL_SUPPORT=ON \
+2 -2
View File
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature
# https://download.samba.org/pub/samba/stable/samba-4.18.8.tar.asc
sha256 4fb87bceaeb01d832a59046c197a044b7e8e8000581548b5d577a6cda03344d1 samba-4.18.8.tar.gz
# https://download.samba.org/pub/samba/stable/samba-4.18.9.tar.asc
sha256 f455c1d6351ed3a36fc2cb6e8ab1bfd0effe54a56686ffd495d64ab52d50f245 samba-4.18.9.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
SAMBA4_VERSION = 4.18.8
SAMBA4_VERSION = 4.18.9
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
SAMBA4_INSTALL_STAGING = YES
+5 -2
View File
@@ -12,8 +12,11 @@ SPEECHD_INSTALL_STAGING = YES
# speechd source code is released without configure script
SPEECHD_AUTORECONF = YES
SPEECHD_GETTEXTIZE = YES
SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile
SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN=""
SPEECHD_DEPENDENCIES = \
host-pkgconf dotconf libglib2 libsndfile $(TARGET_NLS_DEPENDENCIES)
SPEECHD_CONF_ENV = \
ac_cv_prog_HELP2MAN="" \
LIBS=$(TARGET_NLS_LIBS)
SPEECHD_CONF_OPTS = \
--disable-python \
--without-espeak \
+4 -4
View File
@@ -1,6 +1,6 @@
# From http://www.squid-cache.org/Versions/v5/squid-5.7.tar.xz.asc
md5 7a3764a3c5833631a779d7827901cda7 squid-5.7.tar.xz
sha1 141e8007d6b1cfee34654127a9ca025125b37b58 squid-5.7.tar.xz
# From http://www.squid-cache.org/Versions/v6/squid-6.5.tar.xz.asc
md5 da2797d899cf538fab7f504fdf3c18bf squid-6.5.tar.xz
sha1 07a08394625948750264778c82e19cf24ea7cb1f squid-6.5.tar.xz
# Locally calculated
sha256 6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81 squid-5.7.tar.xz
sha256 5070f8a3ae6666870c8fc716326befb0a1abe8b5ff3a6f3932cbc5543d7c8549 squid-6.5.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+2 -2
View File
@@ -4,9 +4,9 @@
#
################################################################################
SQUID_VERSION = 5.7
SQUID_VERSION = 6.5
SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
SQUID_SITE = http://www.squid-cache.org/Versions/v5
SQUID_SITE = http://www.squid-cache.org/Versions/v6
SQUID_LICENSE = GPL-2.0+
SQUID_LICENSE_FILES = COPYING
SQUID_CPE_ID_VENDOR = squid-cache
+1 -1
View File
@@ -1,4 +1,4 @@
# Locally computed
sha256 29d0e5212daedbff1b781edba1b66f549b1a226020271f20aa9884abfdf39fc7 vim-9.0.2053.tar.gz
sha256 d826682fb839c0b99f80b9189af549d46dc087ef2cfc617ce161609ba5da4dc7 vim-9.0.2136.tar.gz
sha256 0b3f1f330cb1b179bb17c7c687d4cec601e0aa3462bc7f890ad4c3888d37d720 LICENSE
sha256 b475d5d3f8c855dc1a84813bbe45c44054d7f7aee20c800950bf89d5958873de README.txt
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
VIM_VERSION = 9.0.2053
VIM_VERSION = 9.0.2136
VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION))
VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES)
VIM_SUBDIR = src
@@ -23,6 +23,7 @@ posix/thread.c: In function ‘vlc_clock_setup_once’:
posix/thread.c:88:18: error: lvalue required as left operand of assignment
vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC;
[Bernd: rebased for 3.0.19]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
src/posix/thread.c | 96 +++++++-----------------------------------------------
@@ -93,7 +94,7 @@ index dab8b71f97..8878941913 100644
-# warning Monotonic clock not available. Expect timing issues.
-#endif /* _POSIX_TIMERS */
-
static struct timespec mtime_to_ts (mtime_t date)
static struct timespec mtime_to_ts (vlc_tick_t date)
{
lldiv_t d = lldiv (date, CLOCK_FREQ);
@@ -233,14 +187,11 @@ void vlc_cond_init (vlc_cond_t *p_condvar)
@@ -117,7 +118,7 @@ index dab8b71f97..8878941913 100644
@@ -625,44 +576,27 @@ void vlc_control_cancel (int cmd, ...)
mtime_t mdate (void)
vlc_tick_t mdate (void)
{
-#if (_POSIX_TIMERS > 0)
struct timespec ts;
@@ -140,7 +141,7 @@ index dab8b71f97..8878941913 100644
}
#undef mwait
void mwait (mtime_t deadline)
void mwait (vlc_tick_t deadline)
{
-#if (_POSIX_CLOCK_SELECTION > 0)
- vlc_clock_setup ();
@@ -165,7 +166,7 @@ index dab8b71f97..8878941913 100644
}
#undef msleep
@@ -670,15 +604,7 @@ void msleep (mtime_t delay)
@@ -670,15 +604,7 @@ void msleep (vlc_tick_t delay)
{
struct timespec ts = mtime_to_ts (delay);
+4 -4
View File
@@ -1,7 +1,7 @@
# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha256
sha256 57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec vlc-3.0.18.tar.xz
# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha1
sha1 b11ccaa0f5ee15a550564817d60458eb0946f80e vlc-3.0.18.tar.xz
# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha256
sha256 adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5 vlc-3.0.20.tar.xz
# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha1
sha1 b834516ab701bf6311980ed5d67b77c834fdebe7 vlc-3.0.20.tar.xz
# Locally computed
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
VLC_VERSION = 3.0.18
VLC_VERSION = 3.0.20
VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION)
VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
VLC_LICENSE = GPL-2.0+, LGPL-2.1+
@@ -0,0 +1,56 @@
From 6c6da9e6d75ccfaa83c1efe14211f080c14181c6 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 3 Dec 2023 15:28:50 +0100
Subject: [PATCH] lib/psos/task.c: fix build with gcc >= 12
Fix the following build failure with gcc >= 12:
task.c: In function 't_start':
task.c:398:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized]
398 | return ret;
| ^~~
task.c:364:13: note: 'ret' was declared here
364 | int ret;
| ^~~
task.c: In function 't_resume':
task.c:444:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized]
444 | return ret;
| ^~~
task.c:428:13: note: 'ret' was declared here
428 | int ret;
| ^~~
Fixes:
- http://autobuild.buildroot.org/results/bc1b40de22e563b704ad7f20b6bf4d1f73a6ed8a
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Upstream: https://lore.kernel.org/xenomai/20231203144307.1940139-1-fontaine.fabrice@gmail.com/T/#u
---
lib/psos/task.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/psos/task.c b/lib/psos/task.c
index f678be61d..27bcc28a9 100644
--- a/lib/psos/task.c
+++ b/lib/psos/task.c
@@ -362,7 +362,7 @@ u_long t_start(u_long tid,
{
struct psos_task *task;
struct service svc;
- int ret;
+ int ret = SUCCESS;
CANCEL_DEFER(svc);
@@ -426,7 +426,7 @@ u_long t_resume(u_long tid)
{
struct psos_task *task;
struct service svc;
- int ret;
+ int ret = SUCCESS;
CANCEL_DEFER(svc);
--
2.42.0
-1
View File
@@ -13,7 +13,6 @@ XTABLES_ADDONS_LICENSE_FILES = LICENSE
XTABLES_ADDONS_CONF_OPTS = \
--with-kbuild="$(LINUX_DIR)" \
--with-xtables="$(STAGING_DIR)/usr" \
--with-xtlibdir="/usr/lib/xtables"
define XTABLES_ADDONS_BUILD_CMDS
@@ -1,134 +0,0 @@
From ad2c8e13e42bc2f396cce117d17a227dadedd476 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Thu, 5 Jan 2023 11:04:24 -0800
Subject: [PATCH] removal of LegacyVersion broke ax_python_dev.m4
The 22.0 release of the python `packaging` package removed the
`LegacyVersion` trait, causing ZFS to no longer compile.
This commit replaces the sections of `ax_python_dev.m4` that rely on
`LegacyVersion` with updated implementations from the upstream
`autoconf-archive`.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #14297
Upstream: https://github.com/openzfs/zfs/commit/b72efb751147ab57afd1588a15910f547cb22600
[Romain: backport to 2.1.7]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
config/ax_python_devel.m4 | 71 +++++++++++++++++++--------------------
1 file changed, 35 insertions(+), 36 deletions(-)
diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4
index 7adcf01a0..9eef45065 100644
--- a/config/ax_python_devel.m4
+++ b/config/ax_python_devel.m4
@@ -97,23 +97,13 @@ AC_DEFUN([AX_PYTHON_DEVEL],[
# Check for a version of Python >= 2.1.0
#
AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
- ac_supports_python_ver=`cat<<EOD | $PYTHON -
-from __future__ import print_function;
-import sys;
-try:
- from packaging import version;
-except ImportError:
- from distlib import version;
-ver = sys.version.split ()[[0]];
-(tst_cmp, tst_ver) = ">= '2.1.0'".split ();
-tst_ver = tst_ver.strip ("'");
-eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))")
-EOD`
+ ac_supports_python_ver=`$PYTHON -c "import sys; \
+ ver = sys.version.split ()[[0]]; \
+ print (ver >= '2.1.0')"`
if test "$ac_supports_python_ver" != "True"; then
if test -z "$PYTHON_NOVERSIONCHECK"; then
AC_MSG_RESULT([no])
- m4_ifvaln([$2],[$2],[
- AC_MSG_FAILURE([
+ AC_MSG_FAILURE([
This version of the AC@&t@_PYTHON_DEVEL macro
doesn't work properly with versions of Python before
2.1.0. You may need to re-run configure, setting the
@@ -122,7 +112,6 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
to something else than an empty string.
])
- ])
else
AC_MSG_RESULT([skip at user request])
fi
@@ -131,37 +120,47 @@ to something else than an empty string.
fi
#
- # if the macro parameter ``version'' is set, honour it
+ # If the macro parameter ``version'' is set, honour it.
+ # A Python shim class, VPy, is used to implement correct version comparisons via
+ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for
+ # Python 2.7.10 (the ".1" being evaluated as less than ".3").
#
if test -n "$1"; then
AC_MSG_CHECKING([for a version of Python $1])
- # Why the strip ()? Because if we don't, version.parse
- # will, for example, report 3.10.0 >= '3.11.0'
- ac_supports_python_ver=`cat<<EOD | $PYTHON -
-
-from __future__ import print_function;
-import sys;
-try:
- from packaging import version;
-except ImportError:
- from distlib import version;
-ver = sys.version.split ()[[0]];
-(tst_cmp, tst_ver) = "$1".split ();
-tst_ver = tst_ver.strip ("'");
-eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))")
-EOD`
+ cat << EOF > ax_python_devel_vpy.py
+class VPy:
+ def vtup(self, s):
+ return tuple(map(int, s.strip().replace("rc", ".").split(".")))
+ def __init__(self):
+ import sys
+ self.vpy = tuple(sys.version_info)
+ def __eq__(self, s):
+ return self.vpy == self.vtup(s)
+ def __ne__(self, s):
+ return self.vpy != self.vtup(s)
+ def __lt__(self, s):
+ return self.vpy < self.vtup(s)
+ def __gt__(self, s):
+ return self.vpy > self.vtup(s)
+ def __le__(self, s):
+ return self.vpy <= self.vtup(s)
+ def __ge__(self, s):
+ return self.vpy >= self.vtup(s)
+EOF
+ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \
+ ver = ax_python_devel_vpy.VPy(); \
+ print (ver $1)"`
+ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py*
if test "$ac_supports_python_ver" = "True"; then
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
- m4_ifvaln([$2],[$2],[
- AC_MSG_ERROR([this package requires Python $1.
+ AC_MSG_ERROR([this package requires Python $1.
If you have it installed, but it isn't the default Python
interpreter in your system path, please pass the PYTHON_VERSION
variable to configure. See ``configure --help'' for reference.
])
- PYTHON_VERSION=""
- ])
+ PYTHON_VERSION=""
fi
fi
--
2.34.3
+1
View File
@@ -11,6 +11,7 @@ config BR2_PACKAGE_ZFS
depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_USE_MMU # util-linux (libblkid)
depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc
select BR2_LINUX_NEEDS_MODULES
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+2 -3
View File
@@ -1,6 +1,5 @@
# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.sha256.asc
sha256 6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b zfs-2.1.7.tar.gz
sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch
# From https://github.com/openzfs/zfs/releases/download/zfs-2.2.2/zfs-2.2.2.sha256.asc
sha256 76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9 zfs-2.2.2.tar.gz
# Hash for license files:
sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE
+14 -5
View File
@@ -4,18 +4,17 @@
#
################################################################################
ZFS_VERSION = 2.1.7
ZFS_VERSION = 2.2.2
ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION)
ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch
ZFS_LICENSE = CDDL
ZFS_LICENSE_FILES = LICENSE COPYRIGHT
ZFS_CPE_ID_VENDOR = openzfs
ZFS_CPE_ID_PRODUCT = openzfs
# 0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch
# 0001-config-user-check-for-aio.h.patch
ZFS_AUTORECONF = YES
ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl
ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux
# sysvinit installs only a commented-out modules-load.d/ config file
ZFS_CONF_OPTS = \
@@ -58,6 +57,14 @@ else
ZFS_CONF_OPTS += --disable-pam
endif
# Sets the environment for the `make` that will be run ZFS autotools checks.
ZFS_CONF_ENV += \
ARCH=$(KERNEL_ARCH) \
CROSS_COMPILE="$(TARGET_CROSS)"
ZFS_MAKE_ENV += \
ARCH=$(KERNEL_ARCH) \
CROSS_COMPILE="$(TARGET_CROSS)"
# ZFS userland tools are unfunctional without the Linux kernel modules.
ZFS_MODULE_SUBDIRS = \
module/avl \
@@ -79,5 +86,7 @@ define ZFS_LINUX_CONFIG_FIXUPS
$(call KCONFIG_ENABLE_OPT,CONFIG_ZLIB_INFLATE)
endef
$(eval $(kernel-module))
# Even though zfs builds a kernel module, it gets built directly by
# the autotools logic, so we don't use the kernel-module
# infrastructure.
$(eval $(autotools-package))
+1 -1
View File
@@ -5,7 +5,7 @@
################################################################################
# Buildroot version to use
RELEASE='2023.02.7'
RELEASE='2023.02.8'
### Change here for more memory/cores ###
VM_MEMORY=2048
+2 -2
View File
@@ -40,11 +40,11 @@ class TestZfsBase(infra.basetest.BRTest):
cmds = [
# Init
"modprobe zfs",
"modprobe zfs && sleep 2",
"mount -o remount,size=132M /tmp",
"fallocate -l 64M /tmp/container1.raw",
"fallocate -l 64M /tmp/container2.raw",
"zpool create -m /pool pool raidz /tmp/container1.raw /tmp/container2.raw",
"zpool create pool raidz /tmp/container1.raw /tmp/container2.raw",
"dd if=/dev/urandom bs=1M count=8 of=/pool/urandom",
"sha256sum /pool/urandom > /tmp/urandom.sha256",
# Check ZFS