diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2023-01-28 01:10:19 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2023-01-28 01:19:05 +0300 |
| commit | c5535c91408e2c3f8231c10f6b00eaaee7c88717 (patch) | |
| tree | 9ec42908f2cb40cc01d8a1b17487da2b106e6946 /meta-openembedded | |
| parent | ea144b037776e892b9e05c4d22be842901e2138c (diff) | |
| download | openbmc-c5535c91408e2c3f8231c10f6b00eaaee7c88717.tar.xz | |
subtree updates:openembedded:poky: Jan 27 2023
poky: 0ce159991d..5e249ec855:
Alex Kiernan (2):
rust: Upgrade 1.66.0 -> 1.66.1
rust: Remove CARGO_VERSION
Alexander Kanavin (7):
selftest/virgl: use pkg-config from the host
ethtool: upgrade 6.0 -> 6.1
man-pages: upgrade 6.01 -> 6.02
mesa: update 22.2.3 -> 22.3.3
webkitgtk: submit a patch upstream
python3-sphinxcontrib-applehelp: update 1.0.2 -> 1.0.3
vulkan-samples: branch rename master -> main
Benoît Mauduit (1):
lib/oe/reproducible: Use git log without gpg signature
Bruce Ashfield (6):
linux-yocto/6.1: edgerouter: Replace OCTEON_USB with USB_OCTEON_HCD
linux-yocto/6.1: qemuriscv32: Enable CONFIG_NONPORTABLE
linux-yocto/6.1: update to v6.1.5
linux-yocto/5.15: update to v5.15.87
conf/qemu: bump preferred kernel version to 6.1
poky/poky-tiny: bump preferred version to 6.1
Changqing Li (1):
cmake-native: use internal cmcurl library
Chen Qi (2):
file: export MAGIC in SDK
rpm: do not export MAGIC in SDK
Chuck Wolber (1):
scripts/oe-setup-layers: Make efficiently idempotent
Fabio Estevam (2):
u-boot: Upgrade to 2023.01
u-boot: Update Upstream-Status
He Zhe (1):
lttng-modules: update 2.13.7 -> 2.13.8
Jan Luebbe (1):
p11-kit: add native to BBCLASSEXTEND
Jermain Horsman (1):
cve-check: write the cve manifest to IMGDEPLOYDIR
Kevin Hao (1):
meta-yocto-bsp: Update the default kernel to 6.1
Khem Raj (31):
createrepo-c: Include missing rpm/rpmstring.h
libglu: Remove deprecated register in C++17
cpio: Do not use _Noreturn in gnulib
groff: Drop use of `register` storage class
vulkan-samples: Update to the tip of trunk
unfs3: Fix implicit function declarations of fix_dir_times()
gperf: Make the code C++17 compliant
libxcb: Fixed c2x standard undefined behaviour
dbus: Use Alignof when using C11 or newer standard
m4: Define alignof_slot using _Alignof when using C11 or newer
opkg: Define alignof using _Alignof when using C11 or newer
cpio: Fix gnulib alignof implementation on clang
python3-numpy: Define _ALIGN using _Alignof when using C11 or newer
vulkan-samples: Drop using u8string_view
musl-obstack: Update to 1.2.3
mdadm: Define alignof using _Alignof when using C11 or newer
lttng-tools: Switch to alternative upstream submitted patch
libtirpc: Check if file exists before operating on it
ruby: Use C11 _Alignof to define ALIGN_OF when possible
libusb1: Link with latomic only if compiler has no atomic builtins
libusb1: Strip trailing whitespaces
elfutils: Fix build with libcurl >= 7.87
stress-ng: Robustify test-float test
harfbuzz: Add missing <cstdio> and <cstdlib> includes
apt: add missing <cstdint> for uint16_t
vulkan-samples: Include missing header cstdint for uint32_t
ruby: Update the patch status
systemd: Add another fix for using XSI strerror_r
elfutils: Remove funcretval test from run-native-test.sh for now
binutils: Upgrade to 2.40 release
binutils: Package libsframe
Lee Chee Yang (1):
migration-guides: add release-notes for 4.1.2
Luca Boccassi (1):
systemd: add PACKAGECONFIG to select default compression format
Luca Ceresoli (1):
manuals: fix typo in the MLPREFIX description
Markus Volk (3):
gptfdisk: add follow-up patch to fix with current popt
gtk+3: add PACKAGECONFIG for libcloudservice and tracker; fix cups backend
gtk4: add PACKAGECONFIG for cloudproviders
Martin Jansa (1):
mesa: update submitted patch with backported version
Michael Opdenacker (3):
rust-bin.bbclass: remove unused class
meta/classes-global: remove package_tar.bbclass
ref-manual: initial documentation for go and go-mod classes
Mikko Rapeli (1):
kmod: enable openssl support by default
Niko Mauno (1):
Fix missing leading whitespace with ':append'
Ovidiu Panait (1):
webkitgtk: fix perl-native dependency
Paulo Neves (1):
bitbake: bitbake-getvar: Add a quiet command line argument
Pavel Zhukov (3):
bitbake: fetch2: kill parameters in uri_find_decoded
bitbake: fetch2/tests: Add test for Mercurial
bitbake: fetch2/tests: Add parameter to recipe_uri
Pawel Zalewski (1):
classes/fs-uuid: Fix command output decoding issue
Peter Kjellerstedt (2):
librsvg: Only enable the Vala bindings if GObject Introspection is enabled
cargo-update-recipe-crates.bbclass: Mark the update_crates task as nostamp
Peter Marko (1):
iproute2: separate routel and add python dependency
Quentin Schulz (1):
packagegroup-core-boot: make init-ifupdown package a recommendation
Randy MacLeod (1):
vim: upgrade 9.0.0947 -> 9.0.1211
Richard Purdie (23):
bitbake: server/process: Improve lockfile handling at exit
pseudo: Update to pull in linux-libc-headers race fix
pseudo: Switch back to the master branch
insane: Improve patch warning/error handling
poky: Set INIT_MANAGER by a separate variable
bitbake: server/process: Fix lockfile contents check bug
bitbake: cooker: Fix siggen recipe cache race issue
bitbake: cache: Only write files if we have data
bitbake: cooker: Fix parsing race around cache handling
bitbake: data: Add support for new BB_HASH_CODEPARSER_VALS for cache optimisation
bitbake: data_smart: Small optimisation to _findVar()
native: Drop special variable handling
bitbake.conf: Add BB_HASH_CODEPARSER_VALS
pseudo: Update to include logic fix
bitbake.conf: Add METADATA_REVISION to BB_HASH_CODEPARSER_VALS
native: Implement BBCLASSEXTEND PACKAGES_DYNAMIC handling
conf/sdk/x86-64: Set march specifically
bitbake: cache/codeparser: Switch to a new BB_CACHEDIR variable for cache location
oeqa/selftest/devtool: Fix for linux 6.1 versions onwards
wic/efi-bootdisk.wks: Fix for 6.1 kernel versions
kernel/linux-kernel-base: Fix kernel build artefact determinism issues
build-appliance-image: Update to master head revision
build-appliance: Fix merge error
Ross Burton (12):
python3-pyproject-hooks: add new recipe
python3-build: add 0.10.0
python_pep517: use python3-build, not picobuild
python3-picobuild: remove
cve-update-db-native: show IP on failure
quilt: rewrite ptest glue
quilt: fix intermittent failure in faildiff.test
spirv-headers/spirv-tools: set correct branch name
quilt: use upstreamed faildiff.test fix
ppp: backport fix for CVE-2022-4603
bitbake: bb/utils: include SSL certificate paths in export_proxies
buildtools-tarball: set pkg-config search path
Thomas Roos (1):
devtool: fix devtool finish when gitmodules file is empty
Tim Orling (3):
bitbake: bitbake: fix deprecated threading.Thread.setDaemon
python3-cryptography{-vectors}: 38.0.4 -> 39.0.0
bitbake: toaster: update fixtures
Tom Hochstein (1):
gstreamer1.0-plugins-good: Fix libsoup runtime dependency
Vincent Davis Jr (1):
mesa: allow mesa (gbm) to compile without backend
Wang Mingyu (20):
btrfs-tools: upgrade 6.1 -> 6.1.2
libpcap: upgrade 1.10.2 -> 1.10.3
libwebp: upgrade 1.2.4 -> 1.3.0
man-db: upgrade 2.11.1 -> 2.11.2
dpkg: upgrade 1.21.17 -> 1.21.18
ed: upgrade 1.18 -> 1.19
gi-docgen: upgrade 2022.2 -> 2023.1
python3-alabaster: upgrade 0.7.12 -> 0.7.13
python3-setuptools: upgrade 65.6.3 -> 65.7.0
patchelf: upgrade 0.17.0 -> 0.17.2
python3-cython: upgrade 0.29.32 -> 0.29.33
python3-dbusmock: upgrade 0.28.6 -> 0.28.7
python3-hatchling: upgrade 1.12.1 -> 1.12.2
python3-hypothesis: upgrade 6.61.0 -> 6.62.0
python3-importlib-metadata: upgrade 5.2.0 -> 6.0.0
python3-packaging: upgrade 22.0 -> 23.0
python3-pbr: upgrade 5.11.0 -> 5.11.1
python3-pygments: upgrade 2.13.0 -> 2.14.0
stress-ng: upgrade 0.15.01 -> 0.15.02
xz: upgrade 5.4.0 -> 5.4.1
Xiangyu Chen (4):
numactl: skip test case when target platform doesn't have 2 CPU node
qemuboot.bbclass: add QB_NFSROOTFS_EXTRA_OPT for nfs rootfs extra option
runqemu: add process of option QB_NFSROOTFS_EXTRA_OPT
qemuppc64: set the qemuppc64 nfs r/wsize mount options to 524288
Yoann Congal (2):
bitbake: persist_data: Handle sqlite error when cachefile path is too long
sanity: Fix small typos
meta-openembedded: cd13881611..2ab113e8be:
Alejandro Enedino Hernandez Samaniego (1):
weechat: Update 3.4.1 -> 3.8
Alex Kiernan (4):
dnsmasq: Merge .inc into .bb
dnsmasq: Expand configuration options
ntpsec: Upgrade 1.2.1 -> 1.2.2
keyutils: Upgrade 1.6.1 -> 1.6.3
Archana Polampalli (1):
Nodejs: Upgrade to 18.12.1
Bartosz Golaszewski (1):
libgpiod: fix python bindings build
Chee Yang Lee (5):
opencv: fix reproducible builds
xerces-c: upgrade to 3.2.4
zsh: Fix CVE-2021-45444
redis: Upgrade to 7.0.8
redis: Upgrade to 6.2.9
Dmitry Baryshkov (1):
edid-decode: an utility to parse EDID information
Etienne Cordonnier (1):
uutils-coreutils: upgrade 0.0.16 -> 0.0.17
Fabio Estevam (1):
lvgl-demo-fb: Add recipe
Gianfranco Costamagna (1):
boinc-client: Update boinc from 7.20.4 to 7.20.5
Hermes Zhang (1):
kernel_add_regdb: Change the task order
Jan Luebbe (3):
pcsc-lite: fix native build
pcsc-lite: fix homepage URL
opensc: fix homepage URL
Kai Kang (2):
mozjs: fix compile error for arm
crda: 3.18 -> 4.15
Khem Raj (65):
packagegroup-meta-oe: Remove boost-url from comments
trace-cmd: Update to upstream submitted patches
packagegroup-meta-oe: Update to reflect latest recipes
freeglut: Add packageconfigs for x11/wayland/gles
xdg-desktop-portal-wlr: Add wayland to REQUIRED_DISTRO_FEATURES
ipmitool: Remove unneeded patch
dibbler: Fix build with c++17 and newer std
libtevent: Package cmocka tests into ptest package
netkit-telnet: Drop using register storage class keyword
libxml-libxml-perl: Fix function pointer types
fatcat: Fix build with std=c++17
ncmpc: Upgrade to 0.47
python3-matplotlib: Upgrade to 3.6.3
python3-matplotlib: Fix build with c++17
python3-greenlet: Drop using register keyword
libmodplug: Fix build with c++17
xmlrpc-c: Upgrade to 1.54.06
satyr: Fix build with musl
p8platform: Fix build with c++17 clang
freerdp: Fix incompatible function pointer type
libtorrent: Update to tip of trunk
gnuchess: Fix build with c++17
ippool: Use unsigned int type for 1-bit integer bitfield
audiofile: Stick to c++14 std
ssiapi: Use c++14 standard
log4cpp: Keep using std=c++14
gengetopt: Use std=c++14
libmimetic: Pin to using -std=c++14
ace: Upgrade to 6.5.19
pipewire-media-session: Use PW_ENABLE_DEPRECATED
rtorrent: Update to latest tip of trunk
nspr: Fix build with clang16
net-snmp: Fix build with clang16
xmlstarlet: Fix build with clang16
libol: Drop recipe
hplip: Update to 3.22.10
espeak: Drop using 'register' keyword for storage classifier
uw-imap: Fix build with clang 16
xmlsec1: Include xmlsec/parser.h for xmlSecParserSetDefaultOptions()
exiv2: Upgrade to 0.27.6
packagegroup-meta-oe: Remove mongodb for upsupported arches
rtorrent: Add missing dependency on autoconf-archive
thrift: Fix c++ and system header include order problem
libcereal: Use -idirafter instead of -isystem
poppler: cmake: Do not use -isystem
uftreace: Fix a build race
sdbus-c++: Disable ccache
libcamera: Fix build with gcc-13
mariadb: Fix build with gcc-13
vulkan-cts,opengl-es-cts: Fix build with gcc-13
rocksdb: Fix build with gcc13
rocksdb: Upgrade to 7.9.2
redis-plus-plus: Upgrade to 1.3.7
redis-plus-plus: Fix build with gcc13
rdfind: Upgrade to 1.5.0 release
rdfind: Fix build with gcc13
libiodbc: Fix SRC_URI to not use gitlab archives
opensaf: Fix build with gcc13
crossguid: Fix build with gcc13
dbus-cxx: Fix build with gcc13
dbus-cxx: Upgrade to 2.3.1
msktutil: Upgrade to 1.2.1
hiredis: Enable SSL/TLS support by default
redis-plus-plus: Enable SSL/TLS by default
rocksdb: Fix build with clang compiler
Lei Maohui (2):
biodbc: Added a new recipe.
trace-cmd: Fix QA Issue of do_package when enable multilib:
Leon Anavi (14):
python3-traitlets: Upgrade 5.8.0 -> 5.8.1
python3-prettytable: Upgrade 3.4.1 -> 3.6.0
python3-cantools: Upgrade 38.0.0 -> 38.0.1
python3-imageio: Upgrade 2.23.0 -> 2.24.0
python3-astroid: Upgrade 2.12.13 -> 2.13.2
python3-alembic: Upgrade 1.9.1 -> 1.9.2
python3-autobahn: Upgrade 22.12.1 -> 23.1.1
python3-eventlet: Upgrade 0.33.2 -> 0.33.3
python3-configobj: Upgrade 5.0.6 -> 5.0.8
python3-nocaselist: Upgrade 1.0.6 -> 1.1.0
python3-nocasedict: Upgrade 1.0.4 -> 1.1.0
python3-email-validator: Upgrade 1.3.0 -> 1.3.1
python3-imageio: Upgrade 2.24.0 -> 2.25.0
python3-cachetools: Upgrade 5.2.1 -> 5.3.0
Markus Volk (8):
webp-pixbuf-loader: add recipe
freerdp: build the rdp server
nv-codec-headers: add recipe
gnome-chess: import recipe
gnome-shell: update 43.1 -> 43.2
pipewire: update 0.3.63 -> 0.3.64
cups-filters: build with dbus support
cups-pk-helper: add recipe
Martin Jansa (3):
s-nail: fix Upstream-Status format
smartmontools: fix Upstream-Status format
htop: fix Upstream-Status format
Niko Mauno (2):
Fix missing leading whitespace with ':append'
nftables: Fix missing leading whitespace with ':append'
Peter Bašista (1):
Make tvheadend recipe compatible with the latest tvheadend version
Quentin Schulz (1):
python3-reedsolo: Add recipe
Randy MacLeod (2):
librelp: update to 1.11.0
rsyslog: update to 8.2212.0
Richard Hughes (1):
fwupd: Upgrade to 1.8.9
Robert Yang (1):
tftpy: Add it for python tftp server and client
Ross Burton (3):
khronos-cts: fix build when python3-build-native is present
python3-pytest-forked: update for move from picobuild to build
mbedtls: add option to use PSA for X.509/TLS operations
Stefan Ghinea (1):
mbedtls: upgrade to 2.28.2 to fix CVE-2022-46392, CVE-2022-46393
Trevor Woerner (1):
psqlodbc: fix HOMEPAGE
Wang Mingyu (62):
ctags: upgrade 6.0.20230101.0 -> 6.0.20230108.0
flatbuffers: upgrade 22.12.06 -> 23.1.4
libadwaita: upgrade 1.2.0 -> 1.2.1
hwdata: upgrade 0.365 -> 0.366
libmoo-perl: upgrade 2.005004 -> 2.005005
evolution-data-server-native: upgrade 3.46.2 -> 3.46.3
cli11: upgrade 2.3.1 -> 2.3.2
imapfilter: upgrade 2.7.6 -> 2.8.1
libcgi-perl: upgrade 4.54 -> 4.55
hidapi: upgrade 0.12.0 -> 0.13.0
python3-lazy-object-proxy: upgrade 1.8.0 -> 1.9.0
xfsprogs: upgrade 6.0.0 -> 6.1.0
tbb: upgrade 2021.7.0 -> 2021.8.0
python3-networkx: upgrade 2.8.8 -> 3.0
python3-sqlalchemy: upgrade 1.4.45 -> 1.4.46
python3-aiohue: upgrade 4.5.0 -> 4.6.1
python3-cachetools: upgrade 5.2.0 -> 5.2.1
python3-google-api-python-client: upgrade 2.70.0 -> 2.71.0
python3-flask-migrate: upgrade 4.0.0 -> 4.0.1
python3-coverage: upgrade 7.0.3 -> 7.0.4
python3-googleapis-common-protos: upgrade 1.57.0 -> 1.58.0
python3-ipython: upgrade 8.7.0 -> 8.8.0
python3-redis: upgrade 4.4.0 -> 4.4.1
python3-robotframework: upgrade 6.0.1 -> 6.0.2
python3-uefi-firmware: upgrade 1.9 -> 1.10
python3-ujson: upgrade 5.6.0 -> 5.7.0
python3-xlsxwriter: upgrade 3.0.5 -> 3.0.6
xfsprogs: upgrade 6.1.0 -> 6.1.1
xfstests: upgrade 2022.12.18 -> 2023.01.01
eog: upgrade 43.1 -> 43.2
gvfs: upgrade 1.50.2 -> 1.50.3
libnma: upgrade 1.10.4 -> 1.10.6
nautilus: upgrade 43.1 -> 43.2
nbdkit: upgrade 1.33.4 -> 1.33.7
networkmanager: upgrade 1.40.0 -> 1.40.10
tcpdump: upgrade 4.99.2 -> 4.99.3
unbound: upgrade 1.17.0 -> 1.17.1
ctags: upgrade 6.0.20230108.0 -> 6.0.20230115.0
dnfdragora: upgrade 2.1.3 -> 2.1.4
gensio: upgrade 2.6.1 -> 2.6.2
hidapi: upgrade 0.13.0 -> 0.13.1
librelp: upgrade 1.10.0 -> 1.11.0
libtraceevent: upgrade 1.7.0 -> 1.7.1
libtracefs: upgrade 1.6.3 -> 1.6.4
uftrace: upgrade 0.12 -> 0.13
xterm: upgrade 377 -> 378
python3-absl: upgrade 1.3.0 -> 1.4.0
python3-coverage: upgrade 7.0.4 -> 7.0.5
python3-dateparser: upgrade 1.1.5 -> 1.1.6
python3-decouple: upgrade 3.6 -> 3.7
python3-dnspython: upgrade 2.2.1 -> 2.3.0
python3-flask-wtf: upgrade 1.0.1 -> 1.1.0
python3-future: upgrade 0.18.2 -> 0.18.3
python3-google-api-python-client: upgrade 2.71.0 -> 2.72.0
python3-google-auth: upgrade 2.15.0 -> 2.16.0
python3-mock: upgrade 5.0.0 -> 5.0.1
python3-pymodbus: upgrade 3.0.2 -> 3.1.0
python3-pyzmq: upgrade 24.0.1 -> 25.0.0
python3-redis: upgrade 4.4.1 -> 4.4.2
python3-sentry-sdk: upgrade 1.12.1 -> 1.13.0
python3-txaio: upgrade 22.2.1 -> 23.1.1
python3-xlsxwriter: upgrade 3.0.6 -> 3.0.7
Yi Zhao (2):
freeradius: upgrade 3.0.21 -> 3.0.26
strongswan: upgrade 5.9.8 -> 5.9.9
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I625cfaa0bd5052cd72a121f010db3ecd2f274caf
Diffstat (limited to 'meta-openembedded')
286 files changed, 5369 insertions, 1948 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Replace-std-ptr_fun-for-c-17.patch b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Replace-std-ptr_fun-for-c-17.patch new file mode 100644 index 0000000000..277a368b67 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Replace-std-ptr_fun-for-c-17.patch @@ -0,0 +1,48 @@ +From 455001cb0112f7324ab50f555aa5ed5eae1bb93b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Jan 2023 19:23:18 -0800 +Subject: [PATCH] Replace std::ptr_fun for c++17 + +std::ptr_fun was deprecated in C++11, and removed completely in C++17. +Similarly, std::not1 is deprecated since C++17. + +Modern compilers like clang >= 16 have started to notice it + +src/FatUtils.h:41:46: error: use of undeclared identifier 'ptr_fun' +| s.erase(find_if(s.rbegin(), s.rend(), not1(ptr_fun<int, int>(isspace))).base(), s.end()); + +Therefore replace ptr_fun with lambda + +Also use 'unsigned char' parameter to std::isspace, for reason see [1] + +[1] https://en.cppreference.com/w/cpp/string/byte/isspace#Notes + +Upstream-Status: Submitted [https://github.com/Gregwar/fatcat/pull/36] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/FatUtils.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/FatUtils.h b/src/FatUtils.h +index 5080f2a..a8d69ee 100644 +--- a/src/FatUtils.h ++++ b/src/FatUtils.h +@@ -32,13 +32,13 @@ using namespace std; + + // trim from start + static inline string ltrim(string s) { +- s.erase(s.begin(), find_if(s.begin(), s.end(), not1(ptr_fun<int, int>(isspace)))); ++ s.erase(s.begin(), find_if(s.begin(), s.end(), [](unsigned char c) {return !isspace(c);})); + return s; + } + + // trim from end + static inline string rtrim(string s) { +- s.erase(find_if(s.rbegin(), s.rend(), not1(ptr_fun<int, int>(isspace))).base(), s.end()); ++ s.erase(find_if(s.rbegin(), s.rend(), [](unsigned char c) {return !isspace(c);}).base(), s.end()); + return s; + } + +-- +2.39.0 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb index 982a52d62f..214b3f914c 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=57fbbfebd0dd1d6ff21b8cecb552a03f" SRC_URI = "git://github.com/Gregwar/fatcat.git;branch=master;protocol=https \ file://0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch \ file://0002-Enable-64bit-off_t.patch \ + file://0001-Replace-std-ptr_fun-for-c-17.patch \ " SRCREV = "99cb99fc86eb1601ac7ae27f5bba23add04d2543" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch index e10364a20e..731c001e14 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch @@ -1,4 +1,4 @@ -From 1ff0d95604c406ddfc764c97ed2cb147d155f608 Mon Sep 17 00:00:00 2001 +From f260099fc45f0653aa4758d1d581e07f5b9c6a54 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 21 Dec 2022 17:43:07 -0800 Subject: [PATCH] Replace off64_t/stat64 with off_t/stat @@ -11,6 +11,7 @@ needed Upstream-Status: Submitted [https://lore.kernel.org/linux-xfs/20221222015327.939932-1-raj.khem@gmail.com/T/#t] Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- copy/xfs_copy.c | 2 +- fsr/xfs_fsr.c | 2 +- @@ -41,7 +42,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 26 files changed, 74 insertions(+), 74 deletions(-) diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c -index 79f65946..854fd7f4 100644 +index 79f6594..854fd7f 100644 --- a/copy/xfs_copy.c +++ b/copy/xfs_copy.c @@ -888,7 +888,7 @@ main(int argc, char **argv) @@ -54,7 +55,7 @@ index 79f65946..854fd7f4 100644 /* ensure device files are sufficiently large */ diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c -index ba02506d..12fffbd8 100644 +index ba02506..12fffbd 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd, @@ -67,7 +68,7 @@ index ba02506d..12fffbd8 100644 int ct, wc, wc_b4; char ffname[SMBUFSZ]; diff --git a/io/bmap.c b/io/bmap.c -index 27383ca6..0b14bb7b 100644 +index 27383ca..0b14bb7 100644 --- a/io/bmap.c +++ b/io/bmap.c @@ -257,7 +257,7 @@ bmap_f( @@ -91,7 +92,7 @@ index 27383ca6..0b14bb7b 100644 swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE; } diff --git a/io/copy_file_range.c b/io/copy_file_range.c -index d154fa76..422e691a 100644 +index d154fa7..422e691 100644 --- a/io/copy_file_range.c +++ b/io/copy_file_range.c @@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len) @@ -113,7 +114,7 @@ index d154fa76..422e691a 100644 sz = copy_src_filesize(fd); if (sz < 0 || (unsigned long long)sz > SIZE_MAX) { diff --git a/io/cowextsize.c b/io/cowextsize.c -index f6b134df..00e40c6f 100644 +index f6b134d..00e40c6 100644 --- a/io/cowextsize.c +++ b/io/cowextsize.c @@ -50,10 +50,10 @@ static int @@ -131,7 +132,7 @@ index f6b134df..00e40c6f 100644 return 0; } diff --git a/io/fadvise.c b/io/fadvise.c -index 60cc0f08..0966c41b 100644 +index 60cc0f0..0966c41 100644 --- a/io/fadvise.c +++ b/io/fadvise.c @@ -39,7 +39,7 @@ fadvise_f( @@ -144,7 +145,7 @@ index 60cc0f08..0966c41b 100644 while ((c = getopt(argc, argv, "dnrsw")) != EOF) { diff --git a/io/fiemap.c b/io/fiemap.c -index f0c74dfe..b41f71bf 100644 +index f0c74df..b41f71b 100644 --- a/io/fiemap.c +++ b/io/fiemap.c @@ -234,9 +234,9 @@ fiemap_f( @@ -161,7 +162,7 @@ index f0c74dfe..b41f71bf 100644 struct stat st; diff --git a/io/fsmap.c b/io/fsmap.c -index 9dd19cc0..dfdaa1b4 100644 +index 7db5184..bf11963 100644 --- a/io/fsmap.c +++ b/io/fsmap.c @@ -170,7 +170,7 @@ dump_map_verbose( @@ -185,7 +186,7 @@ index 9dd19cc0..dfdaa1b4 100644 swidth = (fsgeo->swidth * fsgeo->blocksize); diff --git a/io/io.h b/io/io.h -index 64b7a663..5f423016 100644 +index 64b7a66..5f42301 100644 --- a/io/io.h +++ b/io/io.h @@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv); @@ -226,7 +227,7 @@ index 64b7a663..5f423016 100644 extern void attr_init(void); extern void bmap_init(void); diff --git a/io/madvise.c b/io/madvise.c -index bde31539..6e9c5b12 100644 +index bde3153..6e9c5b1 100644 --- a/io/madvise.c +++ b/io/madvise.c @@ -39,7 +39,7 @@ madvise_f( @@ -239,7 +240,7 @@ index bde31539..6e9c5b12 100644 void *start; int advise = MADV_NORMAL, c; diff --git a/io/mincore.c b/io/mincore.c -index 67f1d6c4..24147ac2 100644 +index 67f1d6c..24147ac 100644 --- a/io/mincore.c +++ b/io/mincore.c @@ -17,7 +17,7 @@ mincore_f( @@ -252,7 +253,7 @@ index 67f1d6c4..24147ac2 100644 size_t blocksize, sectsize; void *start; diff --git a/io/mmap.c b/io/mmap.c -index 7114404b..128a2c06 100644 +index 7114404..128a2c0 100644 --- a/io/mmap.c +++ b/io/mmap.c @@ -64,11 +64,11 @@ print_mapping( @@ -306,11 +307,11 @@ index 7114404b..128a2c06 100644 void *start; char *sp; diff --git a/io/pread.c b/io/pread.c -index 458a78b8..89fab81d 100644 +index 0f1d8b9..79990c6 100644 --- a/io/pread.c +++ b/io/pread.c @@ -116,7 +116,7 @@ alloc_buffer( - void + static void __dump_buffer( void *buf, - off64_t offset, @@ -404,7 +405,7 @@ index 458a78b8..89fab81d 100644 long long count, total, tmp; size_t fsblocksize, fssectsize; diff --git a/io/pwrite.c b/io/pwrite.c -index 467bfa9f..8d134c56 100644 +index 467bfa9..8d134c5 100644 --- a/io/pwrite.c +++ b/io/pwrite.c @@ -54,7 +54,7 @@ pwrite_help(void) @@ -489,7 +490,7 @@ index 467bfa9f..8d134c56 100644 unsigned int zeed = 0, seed = 0xcdcdcdcd; size_t fsblocksize, fssectsize; diff --git a/io/reflink.c b/io/reflink.c -index 8e4f3899..b6a3c05a 100644 +index 8e4f389..b6a3c05 100644 --- a/io/reflink.c +++ b/io/reflink.c @@ -98,7 +98,7 @@ dedupe_f( @@ -511,7 +512,7 @@ index 8e4f3899..b6a3c05a 100644 char *infile = NULL; int condensed, quiet_flag; diff --git a/io/seek.c b/io/seek.c -index 6734ecb5..ffe7439c 100644 +index 6734ecb..ffe7439 100644 --- a/io/seek.c +++ b/io/seek.c @@ -63,8 +63,8 @@ static void @@ -535,7 +536,7 @@ index 6734ecb5..ffe7439c 100644 int c; int current; /* specify data or hole */ diff --git a/io/sendfile.c b/io/sendfile.c -index a003bb55..2ce569c2 100644 +index a003bb5..2ce569c 100644 --- a/io/sendfile.c +++ b/io/sendfile.c @@ -34,12 +34,12 @@ sendfile_help(void) @@ -563,7 +564,7 @@ index a003bb55..2ce569c2 100644 size_t blocksize, sectsize; struct timeval t1, t2; diff --git a/io/stat.c b/io/stat.c -index b57f9eef..e8f68dc3 100644 +index b57f9ee..e8f68dc 100644 --- a/io/stat.c +++ b/io/stat.c @@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd; @@ -576,7 +577,7 @@ index b57f9eef..e8f68dc3 100644 { struct stat st; diff --git a/io/sync_file_range.c b/io/sync_file_range.c -index 94285c22..2375a060 100644 +index 94285c2..2375a06 100644 --- a/io/sync_file_range.c +++ b/io/sync_file_range.c @@ -30,7 +30,7 @@ sync_range_f( @@ -589,7 +590,7 @@ index 94285c22..2375a060 100644 size_t blocksize, sectsize; diff --git a/io/truncate.c b/io/truncate.c -index 1d049194..a74b6131 100644 +index 1d04919..a74b613 100644 --- a/io/truncate.c +++ b/io/truncate.c @@ -16,7 +16,7 @@ truncate_f( @@ -602,10 +603,10 @@ index 1d049194..a74b6131 100644 init_cvtnum(&blocksize, §size); diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c -index 20e0793c..0e67b7b0 100644 +index d5aad3e..0faa05b 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c -@@ -568,7 +568,7 @@ libxfs_balloc( +@@ -576,7 +576,7 @@ libxfs_balloc( static int @@ -614,7 +615,7 @@ index 20e0793c..0e67b7b0 100644 { int sts; -@@ -631,7 +631,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags) +@@ -639,7 +639,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags) fd = libxfs_device_to_fd(btp->bt_bdev); buf = bp->b_addr; for (i = 0; i < bp->b_nmaps; i++) { @@ -623,7 +624,7 @@ index 20e0793c..0e67b7b0 100644 int len = BBTOB(bp->b_maps[i].bm_len); error = __read_buf(fd, buf, len, offset, flags); -@@ -790,7 +790,7 @@ err: +@@ -798,7 +798,7 @@ err: } static int @@ -632,7 +633,7 @@ index 20e0793c..0e67b7b0 100644 { int sts; -@@ -856,7 +856,7 @@ libxfs_bwrite( +@@ -864,7 +864,7 @@ libxfs_bwrite( void *buf = bp->b_addr; for (i = 0; i < bp->b_nmaps; i++) { @@ -642,7 +643,7 @@ index 20e0793c..0e67b7b0 100644 bp->b_error = __write_buf(fd, buf, len, offset, diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c -index 7c1a66c4..bb54e382 100644 +index 7c1a66c..bb54e38 100644 --- a/mdrestore/xfs_mdrestore.c +++ b/mdrestore/xfs_mdrestore.c @@ -116,7 +116,7 @@ perform_restore( @@ -655,7 +656,7 @@ index 7c1a66c4..bb54e382 100644 off = sb.sb_dblocks * sb.sb_blocksize - sizeof(lb); if (pwrite(dst_fd, lb, sizeof(lb), off) < 0) diff --git a/repair/prefetch.c b/repair/prefetch.c -index 017750e9..35b50134 100644 +index 017750e..35b5013 100644 --- a/repair/prefetch.c +++ b/repair/prefetch.c @@ -475,7 +475,7 @@ pf_batch_read( @@ -668,7 +669,7 @@ index 017750e9..35b50134 100644 int i; int inode_bufs; diff --git a/scrub/spacemap.c b/scrub/spacemap.c -index 03440d3a..00bee179 100644 +index 03440d3..00bee17 100644 --- a/scrub/spacemap.c +++ b/scrub/spacemap.c @@ -97,11 +97,11 @@ scan_ag_rmaps( @@ -687,7 +688,7 @@ index 03440d3a..00bee179 100644 memset(keys, 0, sizeof(struct fsmap) * 2); keys->fmr_device = ctx->fsinfo.fs_datadev; diff --git a/spaceman/freesp.c b/spaceman/freesp.c -index 423568a4..df878ce8 100644 +index 423568a..df878ce 100644 --- a/spaceman/freesp.c +++ b/spaceman/freesp.c @@ -62,7 +62,7 @@ static void @@ -709,7 +710,7 @@ index 423568a4..df878ce8 100644 unsigned long long freeblks = 0; unsigned long long freeexts = 0; diff --git a/spaceman/trim.c b/spaceman/trim.c -index e9ed47e4..727dd818 100644 +index e9ed47e..727dd81 100644 --- a/spaceman/trim.c +++ b/spaceman/trim.c @@ -26,7 +26,7 @@ trim_f( diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.0.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.1.1.bb index bb8c55d9d5..6267fd9a18 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.0.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.1.1.bb @@ -13,7 +13,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://0004-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch \ file://0005-Replace-off64_t-stat64-with-off_t-stat.patch \ " -SRC_URI[sha256sum] = "b77cec2364aab0b8ae8d8c67daac7fdb3801e0979f1d8328d9c3469e57ca9ca0" +SRC_URI[sha256sum] = "05e8a137870db1d6182df72dda98ab7a7100deb376947e854b9d59c914c2c7bb" inherit autotools-brokensep pkgconfig PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2022.12.18.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.01.01.bb index b1cb9d0521..defa11c929 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2022.12.18.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.01.01.bb @@ -10,7 +10,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master;na file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ " -SRCREV_xfstests = "e263104046712af5fb5dcc7d289ac3fa5f14b764" +SRCREV_xfstests = "fbd489798b31e32f0eaefcd754326a06aa5b166f" SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb index 6adb7ec295..bff9a3360f 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb @@ -10,7 +10,7 @@ inherit gnomebase gobject-introspection gtk-doc gettext vala features_check REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)} opengl" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "79e730dda19f9b34886f4064aa170f1a2326b08329d655d80b67e906c7f78b7c" +SRC_URI[archive.sha256sum] = "53a6fb2b190ad37c5986caed3e98bede7c3c602399ee4f93c8fc054303d76dab" PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_43.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_43.2.bb index 24701bcb3c..7dbc0ecf2a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_43.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_43.2.bb @@ -21,7 +21,7 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea REQUIRED_DISTRO_FEATURES = "opengl" -SRC_URI[archive.sha256sum] = "fed79ff3ca19bac62f27155c9bdd69eef875870b971e6dcb0aa38c093d131971" +SRC_URI[archive.sha256sum] = "9dcfdce5585a90e2bb1cf57e377cb1eb12d41bd9bcb9bbacdf506bc1b1354ef9" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 86f01ab377..2b74b2e605 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0" -PV = "3.46.2" +SRC_URI[archive.sha256sum] = "0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee" +PV = "3.46.3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_43.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_43.1.bb new file mode 100644 index 0000000000..643e6befeb --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_43.1.bb @@ -0,0 +1,35 @@ +SUMMARY = "GNOME Chess is a 2D chess game, where games can be played between a combination of human and computer players." +HOMEPAGE = "https://wiki.gnome.org/Apps/Chess" +LICENSE = "GPL-3.0-only" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" + +GTKIC_VERSION = "4" + +DEPENDS = " \ + appstream-glib-native \ + cairo \ + desktop-file-utils-native \ + glib-2.0 \ + glib-2.0 \ + gtk4 \ + libadwaita \ + librsvg \ + pango \ +" + +RRECOMMENDS:${PN} = "gnuchess" + +SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;nobranch=1" + +inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check mime-xdg gsettings + +GIR_MESON_OPTION = "" + +S = "${WORKDIR}/git" +PV = "43.1" +SRCREV = "95c7fb91daf36014fc1c2a7ec20b7400a21cd316" + +FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch new file mode 100644 index 0000000000..69237fd57a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch @@ -0,0 +1,149 @@ +From 321eb9b1ca1b230063259dc43be8a2ab2f3bfee9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Jan 2023 22:16:36 -0800 +Subject: [PATCH] Remove 'register' storage class classifier + +This is gone with c++17 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/frontend/atak.cc | 4 ++-- + src/frontend/lexpgn.cc | 34 +++++++++++++++++----------------- + src/frontend/util.cc | 2 +- + 3 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/src/frontend/atak.cc b/src/frontend/atak.cc +index ef19d87..640e150 100644 +--- a/src/frontend/atak.cc ++++ b/src/frontend/atak.cc +@@ -37,7 +37,7 @@ short SqAtakd (short sq, short side) + * + **************************************************************************/ + { +- register BitBoard *a, b, *c, d, blocker; ++ BitBoard *a, b, *c, d, blocker; + int t; + + a = board.b[side]; +@@ -89,7 +89,7 @@ BitBoard AttackTo (int sq, int side) + * + ***************************************************************************/ + { +- register BitBoard *a, b, *c, e, blocker; ++ BitBoard *a, b, *c, e, blocker; + int t; + + a = board.b[side]; +diff --git a/src/frontend/lexpgn.cc b/src/frontend/lexpgn.cc +index 475899d..971aa13 100644 +--- a/src/frontend/lexpgn.cc ++++ b/src/frontend/lexpgn.cc +@@ -2431,9 +2431,9 @@ extern int yylex (void); + */ + YY_DECL + { +- register yy_state_type yy_current_state; +- register char *yy_cp, *yy_bp; +- register int yy_act; ++ yy_state_type yy_current_state; ++ char *yy_cp, *yy_bp; ++ int yy_act; + + #line 153 "lexpgn.ll" + +@@ -3118,9 +3118,9 @@ case YY_STATE_EOF(RAV): + */ + static int yy_get_next_buffer (void) + { +- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; +- register char *source = (yytext_ptr); +- register int number_to_move, i; ++ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; ++ char *source = (yytext_ptr); ++ int number_to_move, i; + int ret_val; + + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) +@@ -3252,8 +3252,8 @@ static int yy_get_next_buffer (void) + + static yy_state_type yy_get_previous_state (void) + { +- register yy_state_type yy_current_state; +- register char *yy_cp; ++ yy_state_type yy_current_state; ++ char *yy_cp; + + yy_current_state = (yy_start); + yy_current_state += YY_AT_BOL(); +@@ -3278,8 +3278,8 @@ static int yy_get_next_buffer (void) + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) + { +- register int yy_is_jam; +- register char *yy_cp = (yy_c_buf_p); ++ int yy_is_jam; ++ char *yy_cp = (yy_c_buf_p); + + yy_current_state = yy_nxt[yy_current_state][1]; + yy_is_jam = (yy_current_state <= 0); +@@ -3296,9 +3296,9 @@ static int yy_get_next_buffer (void) + return yy_is_jam ? 0 : yy_current_state; + } + +- static void yyunput (int c, register char * yy_bp ) ++ static void yyunput (int c, char * yy_bp ) + { +- register char *yy_cp; ++ char *yy_cp; + + yy_cp = (yy_c_buf_p); + +@@ -3308,10 +3308,10 @@ static int yy_get_next_buffer (void) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ +- register yy_size_t number_to_move = (yy_n_chars) + 2; +- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ ++ yy_size_t number_to_move = (yy_n_chars) + 2; ++ char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; +- register char *source = ++ char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) +@@ -3925,7 +3925,7 @@ int yylex_destroy (void) + #ifndef yytext_ptr + static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) + { +- register int i; ++ int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +@@ -3934,7 +3934,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) + #ifdef YY_NEED_STRLEN + static int yy_flex_strlen (yyconst char * s ) + { +- register int n; ++ int n; + for ( n = 0; s[n]; ++n ) + ; + +diff --git a/src/frontend/util.cc b/src/frontend/util.cc +index 5d3efe2..f7f7f1d 100644 +--- a/src/frontend/util.cc ++++ b/src/frontend/util.cc +@@ -75,7 +75,7 @@ void UpdateFriends (void) + * + ***************************************************************************/ + { +- register BitBoard *w, *b; ++ BitBoard *w, *b; + + w = board.b[white]; + b = board.b[black]; +-- +2.39.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb new file mode 100644 index 0000000000..78606b8a2a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb @@ -0,0 +1,20 @@ +SUMMARY = "GNU Chess is a chess-playing program." +HOMEPAGE = "http://www.gnu.org/software/chess/" +LICENSE = "GPL-3.0-only" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "https://git.savannah.gnu.org/cgit/chess.git/snapshot/chess-${PV}.tar.gz \ + file://0001-Remove-register-storage-class-classifier.patch" +SRC_URI[sha256sum] = "03f9e844ccdd48d20ee49314174404f8b643d83bb8ce9ec9d2e6a21f1b6fb9f5" + +S = "${WORKDIR}/chess-${PV}" + +inherit autotools gettext + +do_configure:prepend() { + touch ${S}/ABOUT-NLS + touch ${S}/man/gnuchess.1 +} + +FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.2.bb index 14163a1866..d3bd357d5e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.2.bb @@ -32,7 +32,7 @@ GIR_MESON_OPTION = "" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc" +SRC_URI[archive.sha256sum] = "e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch deleted file mode 100644 index 011858e80c..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8327383e262e1e7f32750a8a2d3dd708195b0f53 Mon Sep 17 00:00:00 2001 -From: Alex Stewart <alex.stewart@ni.com> -Date: Wed, 14 Dec 2022 03:05:45 -0600 -Subject: [PATCH] daemon: PATH-expand the sftp backend ssh client - -Meson is currently configured to search the gvfs builder's PATH for an -ssh client, and hardcode its fullpath as the canonical ssh client for -the gvfs sftp backend. - -This setup breaks in cases where the builder has a different ssh client -from the final runtime root, or where the client's pathes differ. -Builders using OpenEmbedded or buildroot workspaces are particularly -affected. - -Instead, set SSH_PROGRAM to `ssh` so that it gets PATH-expanded at -runtime. - -Closes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/465 -Signed-off-by: Alex Stewart <alex.stewart@ni.com> - -Upstream-Status: Accepted -* https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/157 - * Expect upstream merge in GNOME 44 - ---- - daemon/meson.build | 2 +- - meson.build | 4 ---- - 2 files changed, 1 insertion(+), 5 deletions(-) - -diff --git a/daemon/meson.build b/daemon/meson.build -index e20ada29..72a16890 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -256,7 +256,7 @@ if enable_sftp - '-DDEFAULT_BACKEND_TYPE=sftp', - '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,', - '-DMAX_JOB_THREADS=1', -- '-DSSH_PROGRAM="@0@"'.format(ssh.full_path()), -+ '-DSSH_PROGRAM="ssh"', - ] - - programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}} -diff --git a/meson.build b/meson.build -index 7fd67427..a84c0104 100644 ---- a/meson.build -+++ b/meson.build -@@ -457,10 +457,6 @@ endif - - # *** SFTP backend *** - enable_sftp = get_option('sftp') --if enable_sftp -- ssh = find_program('ssh', required: false) -- assert(ssh.found(), 'SFTP backend requested but a ssh client is required') --endif - - # *** Enable development utils *** - enable_devel_utils = get_option('devel_utils') --- -2.38.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.3.bb index 6ea8727539..073c05af28 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.3.bb @@ -18,12 +18,9 @@ DEPENDS += "\ RDEPENDS:${PN} += "gsettings-desktop-schemas" -SRC_URI = "\ - https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive \ - file://0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch \ -" +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.sha256sum] = "03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e" +SRC_URI[archive.sha256sum] = "6897119e97bb16029d2778e1a5a54a6a6592631f8b2f3a2a1dea4ef2b01803fd" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.1.bb index a518f251b8..3a95766348 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.1.bb @@ -10,7 +10,7 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gtk-doc vala features_check -SRC_URI[archive.sha256sum] = "322f3e1be39ba67981d9fe7228a85818eccaa2ed0aa42bcafe263af881c6460c" +SRC_URI[archive.sha256sum] = "326f142a4f0f3de5a63f0d5e7a9de66ea85348a4726cbfd13930dcf666d22779" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_43.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_43.2.bb index a567e5fe76..4b54d6a676 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_43.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_43.2.bb @@ -26,7 +26,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf" +SRC_URI[archive.sha256sum] = "a86a9aa7a455511b029ce49a1d8b4659c3c355b5d81d7360bb4d0de637afede0" REQUIRED_DISTRO_FEATURES = "x11 opengl" diff --git a/meta-openembedded/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.7.bb b/meta-openembedded/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.7.bb new file mode 100644 index 0000000000..17a3436741 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.7.bb @@ -0,0 +1,23 @@ +SUMMARY = "WebP GDK Pixbuf Loader library" +HOMEPAGE = "https://github.com/aruiz/webp-pixbuf-loader" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL-2;md5=0d90e6d44bcf69014bfae649c75aa6ca" + +DEPENDS = " \ + gdk-pixbuf \ + libwebp \ +" + +inherit meson pkgconfig + +EXTRA_OEMESON = "-Dupdate_cache=true" + +SRC_URI = "git://github.com/aruiz/webp-pixbuf-loader.git;protocol=https;nobranch=1" + +S = "${WORKDIR}/git" +SRCREV = "f91f79c05ff90b41774eda613dc10a2a0d996bc8" + +FILES:${PN} = " \ + ${datadir}/thumbnailers/webp-pixbuf.thumbnailer \ + ${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-webp.so \ +" diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch index ff2e789e32..c6e20b75e8 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch @@ -33,12 +33,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> } --- a/src/epggrab/module/psip.c +++ b/src/epggrab/module/psip.c -@@ -383,14 +383,14 @@ _psip_eit_callback_channel +@@ -223,14 +223,14 @@ _psip_eit_callback_channel - tvhtrace(LS_PSIP, " %03d: [%s] eventid 0x%04x at %"PRItime_t", duration %d, title: '%s' (%d bytes)", + tvhtrace(LS_PSIP, " %03d: [%s] eventid 0x%04x at %"PRItime_t", duration %d, etmlocation %x, title: '%s' (%d bytes)", i, ch ? channel_get_name(ch, channel_blank_name) : "(null)", -- eventid, start, length, -+ eventid, (intmax_t)start, length, +- eventid, start, length, etmlocation, ++ eventid, (intmax_t)start, length, etmlocation, lang_str_get(title, NULL), titlelen); save2 = changes2 = 0; diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index b3d9d6bf7d..b3e5e78c7c 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/tvheadend/tvheadend.git;branch=master;protocol=https file://0001-adjust-for-64bit-time_t.patch \ " -SRCREV = "9a51cea492e4a5579ca3ddf9233fecfa419de078" +SRCREV = "cc602833684953fc3e6f1c89d4f08f6dfef179e3" PV = "4.3+git${SRCPV}" PKGV = "4.3+git${GITPKGV}" @@ -30,4 +30,3 @@ EXTRA_OECONF:append:libc-musl = " --disable-execinfo" EXTRA_OEMAKE = "CFLAGS_NO_WERROR=yes" CLEANBROKEN = "1" - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch new file mode 100644 index 0000000000..5aa6ee8d3c --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch @@ -0,0 +1,46 @@ +From 0e97896e6a09957f27125957d00b5150ec90b2e9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 24 Jan 2023 01:18:25 -0800 +Subject: [PATCH] file_sink.cpp: Avoid dangling-reference + +Fixes following errors with gcc-13 + +../git/src/cam/file_sink.cpp:92:45: error: possibly dangling reference to a temporary [-Werror=dangling-reference] + 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; + | ^~~~ +../git/src/cam/file_sink.cpp:92:81: note: the temporary was destroyed at the end of the full expression '(& buffer->libcamera::FrameBuffer::metadata())->libcamera::FrameMetadata::planes().libcamera::Span<const libcamera::FrameMetadata::Plane>::operator[](i)' + 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; + | ^ +cc1plus: all warnings being treated as errors + +Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2023-January/036575.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cam/file_sink.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/cam/file_sink.cpp b/src/cam/file_sink.cpp +index 45213d4a..897c4b37 100644 +--- a/src/cam/file_sink.cpp ++++ b/src/cam/file_sink.cpp +@@ -89,13 +89,13 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer) + Image *image = mappedBuffers_[buffer].get(); + + for (unsigned int i = 0; i < buffer->planes().size(); ++i) { +- const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; ++ unsigned int bytesused = buffer->metadata().planes()[i].bytesused; + + Span<uint8_t> data = image->data(i); +- unsigned int length = std::min<unsigned int>(meta.bytesused, data.size()); ++ unsigned int length = std::min<unsigned int>(bytesused, data.size()); + +- if (meta.bytesused > data.size()) +- std::cerr << "payload size " << meta.bytesused ++ if (bytesused > data.size()) ++ std::cerr << "payload size " << bytesused + << " larger than plane size " << data.size() + << std::endl; + +-- +2.39.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.1.bb index 483fe1507e..46f058f2ea 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.1.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ + file://0001-file_sink.cpp-Avoid-dangling-reference.patch \ " SRCREV = "a83aed77df1258e469c0eb42d9cb4f1938db53f2" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch new file mode 100644 index 0000000000..92094af1f2 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch @@ -0,0 +1,37 @@ +From 2e8dc2c28c0938dbbb85ebbac2b9a60be9ccd9f3 Mon Sep 17 00:00:00 2001 +From: Max Kellermann <max@musicpd.org> +Date: Wed, 23 Nov 2022 12:25:50 +0100 +Subject: [PATCH] SearchPage: use regular integer to fix -Wenum-constexpr-conversion + +Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/ncmpc/commit/ddd1757907f0376b5843f707bf182b7827ff6591] +--- + src/SearchPage.cxx | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/SearchPage.cxx b/src/SearchPage.cxx +index 2fa5edbc..3f91c4fe 100644 +--- a/src/SearchPage.cxx ++++ b/src/SearchPage.cxx +@@ -81,7 +81,7 @@ search_get_tag_id(const char *name) + } + + struct SearchMode { +- enum mpd_tag_type table; ++ int table; + const char *label; + }; + +@@ -89,8 +89,8 @@ static constexpr SearchMode mode[] = { + { MPD_TAG_TITLE, N_("Title") }, + { MPD_TAG_ARTIST, N_("Artist") }, + { MPD_TAG_ALBUM, N_("Album") }, +- { (enum mpd_tag_type)SEARCH_URI, N_("Filename") }, +- { (enum mpd_tag_type)SEARCH_ARTIST_TITLE, N_("Artist + Title") }, ++ { SEARCH_URI, N_("Filename") }, ++ { SEARCH_ARTIST_TITLE, N_("Artist + Title") }, + { MPD_TAG_COUNT, nullptr } + }; + +-- +2.39.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.46.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb index a77d4f9783..44046912ed 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.46.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb @@ -34,6 +34,7 @@ PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" SRC_URI = " \ git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https \ + file://0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch \ " -SRCREV = "b9b5e11e10d8f66cd672ffb51728aa447f78ecd4" +SRCREV = "fc8de01c71acdf10ad07c7aae756dc522b848124" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_11.1.5.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_11.1.5.2.bb new file mode 100644 index 0000000000..c1d8073353 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_11.1.5.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "FFmpeg nvidia headers" +HOMEPAGE = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/include/ffnvcodec/dynlink_cuda.h;beginline=1;endline=26;md5=bb54a418154445b0aa99e15f640eacf4" + +SRC_URI = "git://git.videolan.org/git/ffmpeg/nv-codec-headers.git;branch=master;protocol=https" +SRCREV = "f8ae7a49bfef2f99d2c931a791dc3863fda67bf3" +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${includedir}/ffnvcodec ${D}${libdir}/pkgconfig + for file in include/ffnvcodec/*.h; do + install -m 644 "$file" ${D}${includedir}/ffnvcodec + done + install -m 644 ffnvcodec.pc.in ${D}${libdir}/pkgconfig/ffnvcodec.pc + sed -i "s|@@PREFIX@@|${prefix}|" ${D}${libdir}/pkgconfig/ffnvcodec.pc +} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb index 9fdb60380b..da8d1d7ad6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb @@ -16,7 +16,8 @@ S = "${WORKDIR}/git" SRCREV = "e5d5cf2404786af8bcc40bdb8a2962bef4ec18b6" inherit meson pkgconfig - +# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2952 +CFLAGS += "-DPW_ENABLE_DEPRECATED" FILES:${PN} += " \ ${systemd_user_unitdir}/pipewire-media-session.service \ ${datadir}/pipewire/media-session.d/* \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.63.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.64.bb index f7acb8db42..91945ca7d2 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.63.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.64.bb @@ -13,12 +13,12 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "5ff00f40b9d3ecfc38305edc27e9c2b01629802c" +SRCREV = "bba452695eb673461c5cf626eec57728991eadf7" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" S = "${WORKDIR}/git" -inherit meson pkgconfig systemd gettext useradd +inherit gsettings meson pkgconfig systemd gettext useradd USERADD_PACKAGES = "${PN}" @@ -88,7 +88,7 @@ PACKAGECONFIG:class-target ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio gtk', 'gsettings', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ ${PIPEWIRE_SESSION_MANAGER} \ - ${FFMPEG_AVAILABLE} avahi flatpak gstreamer jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling \ + ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera \ " # "jack" and "pipewire-jack" packageconfigs cannot be both enabled, diff --git a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..a12eba8ebf --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch @@ -0,0 +1,31 @@ +From 1eb9bea38c320b2b588635cffceaaa2a8d434780 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 22:09:26 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively +included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/graeme-hill/crossguid/pull/67] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/crossguid/guid.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp +index 61e0f17..70966f2 100644 +--- a/include/crossguid/guid.hpp ++++ b/include/crossguid/guid.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include <jni.h> + #endif + ++#include <cstdint> + #include <functional> + #include <iostream> + #include <array> +-- +2.39.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb index b496531ab1..58b049bb4f 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1373274bc8d8001edc54933919f36f68" DEPENDS += "util-linux" SRCREV = "ca1bf4b810e2d188d04cb6286f957008ee1b7681" -SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master" +SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master \ + file://0001-include-missing-cstdint.patch" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.6.0.bb index 7e1b7b9d26..a72116154c 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.6.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.6.0.bb @@ -14,7 +14,7 @@ DEPENDS = " \ " inherit meson pkgconfig features_check -REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES = "opengl wayland" SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;nobranch=1" diff --git a/meta-openembedded/meta-networking/classes/kernel_wireless_regdb.bbclass b/meta-openembedded/meta-networking/classes/kernel_wireless_regdb.bbclass index 1238172bd4..9ad566c837 100644 --- a/meta-openembedded/meta-networking/classes/kernel_wireless_regdb.bbclass +++ b/meta-openembedded/meta-networking/classes/kernel_wireless_regdb.bbclass @@ -17,4 +17,4 @@ do_kernel_add_regdb() { cp ${STAGING_LIBDIR_NATIVE}/crda/db.txt ${S}/net/wireless/db.txt } do_kernel_add_regdb[dirs] = "${S}" -addtask kernel_add_regdb before do_build after do_configure +addtask kernel_add_regdb before do_compile after do_configure diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch index 16800d5066..d61ea8069e 100644 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch @@ -7,20 +7,24 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> + +Rebase for crda 4.15. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 2879896..1650db8 100644 +index 528a14e..31f1b5e 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - $(LIBREG): regdb.h reglib.h reglib.c + $(LIBREG): reglib.c regdb.h reglib.h $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS) -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDFLAGS) $(LIBREGLDLIBS) +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS) ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LDFLAGS) $(LIBREGLDLIBS) install-libreg-headers: $(NQ) ' INSTALL libreg-headers' diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch index 9125d0ab97..6c209dc375 100644 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch @@ -3,6 +3,15 @@ https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c50acec16bc7c33d6dc122c007 Signed-off-by: Khem Raj <raj.khem@gmail.com> +Rebase for crda 4.15. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + + utils/key2pub.py | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +diff --git a/utils/key2pub.py b/utils/key2pub.py +index 22fda55..2a4980b 100755 --- a/utils/key2pub.py +++ b/utils/key2pub.py @@ -1,22 +1,22 @@ @@ -77,7 +86,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> idx = 0 @@ -118,7 +118,7 @@ struct key_params { - static const struct key_params keys[] __attribute__((unused))= { + static const struct key_params __attribute__ ((unused)) keys[] = { ''') - for n in xrange(n + 1): + for n in range(n + 1): diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch index 3ef35ee549..b5bce40a9c 100644 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch @@ -7,12 +7,21 @@ Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126028 Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> +Rebase patch for crda 4.15. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 6ca26f3..528a14e 100644 --- a/Makefile +++ b/Makefile -@@ -132,7 +132,9 @@ install-libreg: +@@ -127,7 +127,9 @@ install-libreg: $(NQ) ' INSTALL libreg' $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ + $(Q)$(INSTALL) -m 644 $(LIBREG) $(DESTDIR)/$(LIBDIR)/ +ifndef DESTDIR $(Q)ldconfig +endif diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch deleted file mode 100644 index 747804d345..0000000000 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- crda-3.18/utils/key2pub.py.orig 2016-06-18 09:54:23.671326113 -0400 -+++ crda-3.18/utils/key2pub.py 2016-06-18 09:54:34.387326300 -0400 -@@ -115,7 +115,7 @@ - .n = _n, .len_n = sizeof(_n), \ - } - --static const struct key_params keys[] = { -+static const struct key_params keys[] __attribute__((unused))= { - ''') - for n in xrange(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch index 812e983798..a7fb22a727 100644 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch @@ -15,7 +15,7 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index a3ead30..da2dcc3 100644 +index 528a14e..acd818b 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic @@ -45,10 +45,10 @@ index a3ead30..da2dcc3 100644 @@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - $(LIBREG): regdb.h reglib.h reglib.c + $(LIBREG): reglib.c regdb.h reglib.h $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS) +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS) install-libreg-headers: $(NQ) ' INSTALL libreg-headers' diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/make.patch b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/make.patch deleted file mode 100644 index 0b737852c2..0000000000 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/make.patch +++ /dev/null @@ -1,25 +0,0 @@ -These headers are not related to any Make rule but they do appear in -compiling of libreg.so, specifying .h files in compiler cmdline is flagged -as error by clang - -| clang-4.0: error: cannot specify -o when generating multiple output files -| make: *** [libreg.so] Error 1 - -This is how we see headers in cmdline --O2 -fpic -std=gnu -99 -Wall -Werror -pedantic -Wall -g -DUSE_GCRYPT -DCONFIG_LIBNL30 `pkg-config --cflags libnl-3.0` -o libreg.so -shared -Wl,-soname,libreg.so -regdb.h reglib.h reglib.c keys-gcrypt.c -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -L ./ -lm -lgcrypt - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/Makefile.kk 2016-11-15 04:54:53.338670000 +0000 -+++ a/Makefile 2016-11-15 04:55:07.718670000 +0000 -@@ -114,7 +114,7 @@ keys-%.c: utils/key2pub.py $(wildcard $( - $(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem) - $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ - --$(LIBREG): regdb.h reglib.h reglib.c -+$(LIBREG): reglib.c - $(NQ) ' CC ' $@ - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDFLAGS) $(LIBREGLDLIBS) - diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb index 2f4d4dac99..dd2df32225 100644 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb @@ -6,20 +6,19 @@ LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabe DEPENDS = "python3-m2crypto-native libnl libgcrypt" -SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git;branch=master \ file://do-not-run-ldconfig-if-destdir-is-set.patch \ file://fix-linking-of-libraries-used-by-reglib.patch \ - file://fix-gcc-6-unused-variables.patch \ file://0001-Makefile-respect-LDFLAGS-for-libreg.patch \ - file://make.patch \ file://use-target-word-size-instead-of-host-s.patch \ file://fix-issues-when-USE_OPENSSL-1.patch \ file://crda-4.14-python-3.patch \ file://0001-Make-alpha2-to-be-3-characters-long.patch \ file://0001-reglib-Remove-unused-variables.patch \ " -SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" -SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" +SRCREV = "6aeea99ceeec85dd7a9202ee39c7f3b2a8f5195d" + +S = "${WORKDIR}/git" inherit pkgconfig python3-dir python3native siteinfo diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch new file mode 100644 index 0000000000..d48d7265d4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch @@ -0,0 +1,125 @@ +From 9e9d94566d39eef3e4606f806aa418bf5534fab9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Jan 2023 22:04:31 -0800 +Subject: [PATCH 1/2] Define alignof using _Alignof when using C11 or newer + +WG14 N2350 made very clear that it is an UB having type definitions +within "offsetof" [1]. This patch enhances the implementation of macro +alignof to use builtin "_Alignof" to avoid undefined behavior on +when using std=c11 or newer + +clang 16+ has started to flag this [2] + +Fixes build when using -std >= gnu11 and using clang16+ + +Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it +may support C11, exclude those compilers too + +[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm +[2] https://reviews.llvm.org/D133574 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Misc/md5-coreutils.c | 12 +++++++++++- + Misc/sha1.c | 12 +++++++++++- + Misc/sha256.c | 12 +++++++++++- + Misc/sha512.c | 12 +++++++++++- + 4 files changed, 44 insertions(+), 4 deletions(-) + +diff --git a/Misc/md5-coreutils.c b/Misc/md5-coreutils.c +index d6503e02..2ffb6050 100644 +--- a/Misc/md5-coreutils.c ++++ b/Misc/md5-coreutils.c +@@ -154,7 +154,17 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned +-# define alignof(type) offsetof (struct { char c; type x; }, x) ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) ++# define alignof(type) offsetof (struct { char c; type x; }, x) ++# else ++# define alignof(type) _Alignof(type) ++# endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) + if (UNALIGNED_P (buffer)) + while (len > 64) +diff --git a/Misc/sha1.c b/Misc/sha1.c +index 18ceb845..a170efe3 100644 +--- a/Misc/sha1.c ++++ b/Misc/sha1.c +@@ -149,7 +149,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned +-# define alignof(type) offsetof (struct { char c; type x; }, x) ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) ++# define alignof(type) offsetof (struct { char c; type x; }, x) ++# else ++# define alignof(type) _Alignof(type) ++# endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) + if (UNALIGNED_P (buffer)) + while (len > 64) +diff --git a/Misc/sha256.c b/Misc/sha256.c +index 68292326..da59e81d 100644 +--- a/Misc/sha256.c ++++ b/Misc/sha256.c +@@ -372,7 +372,17 @@ sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned +-# define alignof(type) offsetof (struct { char c; type x; }, x) ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) ++# define alignof(type) offsetof (struct { char c; type x; }, x) ++# else ++# define alignof(type) _Alignof(type) ++# endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) + if (UNALIGNED_P (buffer)) + while (len > 64) +diff --git a/Misc/sha512.c b/Misc/sha512.c +index db86c659..38e162fc 100644 +--- a/Misc/sha512.c ++++ b/Misc/sha512.c +@@ -190,7 +190,17 @@ sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx) + if (len >= 128) + { + #if !_STRING_ARCH_unaligned +-# define alignof(type) offsetof (struct { char c; type x; }, x) ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) ++# define alignof(type) offsetof (struct { char c; type x; }, x) ++# else ++# define alignof(type) _Alignof(type) ++# endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (uint64_t) != 0) + if (UNALIGNED_P (buffer)) + while (len > 128) +-- +2.39.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0002-make-Do-not-enforce-c99.patch b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0002-make-Do-not-enforce-c99.patch new file mode 100644 index 0000000000..8889130a3b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0002-make-Do-not-enforce-c99.patch @@ -0,0 +1,50 @@ +From e826206c58bbaa1c256f55b103d5eb7b0182f152 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Jan 2023 22:05:53 -0800 +Subject: [PATCH 2/2] make: Do not enforce c99 + +Latest gcc/clang from OE defaults to c11 or newer and stickly to c99 +means we can not use _AlignOf + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Misc/Makefile.am | 4 +--- + Port-linux/Makefile.am | 1 - + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/Misc/Makefile.am b/Misc/Makefile.am +index d881525a..8d71d2d4 100644 +--- a/Misc/Makefile.am ++++ b/Misc/Makefile.am +@@ -6,8 +6,6 @@ endif + + noinst_LIBRARIES = libMisc.a + +-libMisc_a_CFLAGS = -std=c99 +- + libMisc_a_CPPFLAGS = -I$(top_srcdir) + + libMisc_a_SOURCES = addrpack.c +@@ -27,4 +25,4 @@ libMisc_a_SOURCES += lowlevel-posix.c + + libMisc_a_SOURCES += hmac-sha-md5.h hmac-sha-md5.c + libMisc_a_SOURCES += md5-coreutils.c md5.h +-libMisc_a_SOURCES += sha1.c sha1.h sha256.c sha256.h sha512.c sha512.h +\ No newline at end of file ++libMisc_a_SOURCES += sha1.c sha1.h sha256.c sha256.h sha512.c sha512.h +diff --git a/Port-linux/Makefile.am b/Port-linux/Makefile.am +index 72b0a5e3..635998ea 100644 +--- a/Port-linux/Makefile.am ++++ b/Port-linux/Makefile.am +@@ -1,6 +1,5 @@ + noinst_LIBRARIES = libLowLevel.a + +-libLowLevel_a_CFLAGS = -std=c99 + libLowLevel_a_CPPFLAGS = -I$(top_srcdir)/Misc + + libLowLevel_a_SOURCES = daemon.cpp daemon.h ethtool-kernel.h ethtool-local.h interface.c interface.h ip_common.h iproute.c libnetlink.c libnetlink.h ll_map.c ll_map.h ll_types.c lowlevel-linux.c lowlevel-linux-link-state.c lowlevel-options-linux.c rtm_map.h rt_names.h utils.c utils.h +-- +2.39.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index f57767e9b8..34f8a7e3e5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -10,6 +10,8 @@ SRCREV = "a7c6cf58a88a510cb00841351e75030ce78d36bf" SRC_URI = "git://github.com/tomaszmrugalski/dibbler;branch=master;protocol=https \ file://dibbler_fix_getSize_crash.patch \ file://0001-port-linux-Re-order-header-includes.patch \ + file://0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ + file://0002-make-Do-not-enforce-c99.patch \ " PV = "1.0.1+1.0.2RC1+git${SRCREV}" @@ -30,7 +32,7 @@ inherit autotools DEPENDS += "flex-native" -CFLAGS += "-D_GNU_SOURCE" +CPPFLAGS += "-D_GNU_SOURCE -Dregister=''" LDFLAGS += "-pthread" PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch new file mode 100644 index 0000000000..e1228c2ebe --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch @@ -0,0 +1,46 @@ +From 3be3b9a1345942d1578ec73efa9b2e3c41bd67c5 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Fri, 21 Jan 2022 13:22:24 +0800 +Subject: [PATCH] Add autogen.sh + +The autogen.sh has been removed since 3.0.22[1]. But we still need it in +do_configure. Add it back. + +[1] https://github.com/FreeRADIUS/freeradius-server/commit/2e9b6227efd19e2b0926541aa26874908e7b7314 + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + autogen.sh | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + create mode 100755 autogen.sh + +diff --git a/autogen.sh b/autogen.sh +new file mode 100755 +index 0000000000..959182b39e +--- /dev/null ++++ b/autogen.sh +@@ -0,0 +1,19 @@ ++#!/bin/sh -e ++ ++parentdir=`dirname $0` ++ ++cd $parentdir ++parentdir=`pwd` ++m4include="-I$parentdir -I$parentdir/m4 -Im4" ++ ++autoreconf -Wcross --verbose --install --force ++ ++mysubdirs="$mysubdirs `find src/modules/ -name configure -print | sed 's%/configure%%'`" ++mysubdirs=`echo $mysubdirs` ++ ++for F in $mysubdirs ++do ++ echo "Configuring in $F..." ++ (cd $F && grep "^AC_CONFIG_HEADER" configure.ac > /dev/null || exit 0; autoheader $m4include) ++ (cd $F && autoconf $m4include) ++done +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-enble-user-in-conf.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch index 4a62bf1fa2..c57ee93c33 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-enble-user-in-conf.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch @@ -1,4 +1,8 @@ -Enable and change user and group of freeradius server to radiusd +From 2a74c10836c0d2d19248ca40d113936f4a56b039 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Sun, 8 Jan 2023 22:47:11 +0800 +Subject: [PATCH] Enable and change user and group of freeradius server to + radiusd Upstream-Status: Inappropriate [configuration] @@ -9,10 +13,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in -index c62f4ff..0b4a84e 100644 +index 154b50d610..4594d6d2d2 100644 --- a/raddb/radiusd.conf.in +++ b/raddb/radiusd.conf.in -@@ -436,8 +436,8 @@ security { +@@ -557,8 +557,8 @@ security { # member. This can allow for some finer-grained access # controls. # @@ -24,5 +28,5 @@ index c62f4ff..0b4a84e 100644 # Core dumps are a bad thing. This should only be set to # 'yes' if you're debugging a problem with the server. -- -1.9.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch index 38e7c36227..e5442360b3 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch @@ -1,4 +1,4 @@ -From 0780b7053fb0d33d721aa70ab2ecd75299e5ba31 Mon Sep 17 00:00:00 2001 +From ba1390a80662ff2ab7bfda978cde7df9a871f6ae Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 24 Jul 2018 15:03:39 +0800 Subject: [PATCH] configure.ac: allow cross-compilation @@ -7,7 +7,7 @@ The checking OpenSSL library and header version consistency will always fail in cross compiling, skip the check and give a warning instead for cross compiling. -Upstream-Status: Inappropriate[embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> @@ -19,10 +19,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac -index efc9f29..98a97e4 100644 +index a0f510cfb3..d2f3eca03e 100644 --- a/src/modules/rlm_krb5/configure.ac +++ b/src/modules/rlm_krb5/configure.ac -@@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then +@@ -140,7 +140,8 @@ if test x$with_[]modname != xno; then FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])], @@ -33,5 +33,5 @@ index efc9f29..98a97e4 100644 else krb5threadsafe="" -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch index 4265f9d0de..479e1ba76f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch @@ -1,9 +1,7 @@ -From bfe4d7ed72edc9d4ae1a0f0d2dd84367d6214886 Mon Sep 17 00:00:00 2001 +From 5ba3d140842268cbbdd983266efecb1fba5bdd59 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 22 Aug 2019 10:45:46 +0800 -Subject: [PATCH 1/2] Fix libtool detection - -Upstream-Status: pending +Subject: [PATCH] Fix libtool detection Use LT_INIT instead of the deprecated AC_PROG_LIBTOOL to detect libtool, so it can work with our libtoolize and libtool. @@ -12,37 +10,20 @@ Simplify the detection of ltdl. It will find the ltdl from the sysroot; the switch --with-system-libltdl is no longer needed. The code is copied from pulseaudio configure.ac, together with the comment paragraph. -Also patch autogen.sh so it uses autoreconf, which handles libtoolize better. +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - autogen.sh | 5 +---- configure.ac | 36 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 37 insertions(+), 4 deletions(-) + 1 file changed, 36 insertions(+) -diff --git a/autogen.sh b/autogen.sh -index a1d08a6..959182b 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -6,10 +6,7 @@ cd $parentdir - parentdir=`pwd` - m4include="-I$parentdir -I$parentdir/m4 -Im4" - --libtoolize -f -c --#aclocal --autoheader --autoconf -+autoreconf -Wcross --verbose --install --force - - mysubdirs="$mysubdirs `find src/modules/ -name configure -print | sed 's%/configure%%'`" - mysubdirs=`echo $mysubdirs` diff --git a/configure.ac b/configure.ac -index a7abf00..65db61e 100644 +index ad8bc8cdda..ef8fced680 100644 --- a/configure.ac +++ b/configure.ac -@@ -220,6 +220,42 @@ dnl # See if we have Git. +@@ -321,6 +321,42 @@ dnl # See if we have Git. dnl # AC_CHECK_PROG(GIT, git, yes, no) @@ -86,5 +67,5 @@ index a7abf00..65db61e 100644 dnl AC_ARG_WITH(disablemodulefoo, dnl [ --without-rlm_foo Disables module compilation. Module list:] -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch index 4719358722..8ef3c4bdf9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch @@ -1,7 +1,7 @@ -From 98a9eff357959d1113e33a615c2178751d5b2054 Mon Sep 17 00:00:00 2001 +From 9548dc5e1a6c835cd4f387ba384d8f3f14c3fc8b Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 22 Aug 2019 10:50:21 +0800 -Subject: [PATCH 2/2] configure.ac: add option for libcap +Subject: [PATCH] configure.ac: add option for libcap Upstream-Status: Pending @@ -12,10 +12,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index 65db61e..6486aac 100644 +index ef8fced680..263098f7fd 100644 --- a/configure.ac +++ b/configure.ac -@@ -977,6 +977,22 @@ fi +@@ -1161,6 +1161,22 @@ fi dnl Set by FR_SMART_CHECKLIB LIBS="${old_LIBS}" @@ -38,7 +38,7 @@ index 65db61e..6486aac 100644 dnl Check for cap dnl extra argument: --with-cap-lib-dir=DIR cap_lib_dir= -@@ -1010,15 +1026,17 @@ AC_ARG_WITH(cap-include-dir, +@@ -1194,15 +1210,17 @@ AC_ARG_WITH(cap-include-dir, ;; esac]) @@ -66,5 +66,5 @@ index 65db61e..6486aac 100644 dnl # -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch index 9c997661fc..8fd0dca443 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch @@ -1,14 +1,15 @@ -From dc41591d5ceb18900ec85894f8f7b7bb44bb3bd9 Mon Sep 17 00:00:00 2001 +From 8fe25b30b6fbb3170705f4468eb4c92eef3a968f Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Mon, 4 Jan 2016 01:44:04 -0500 -Subject: [PATCH] avoid searching host dirs +Subject: [PATCH] Avoid searching host dirs Don't search the hardcoded host dirs to avoid host contamination. -Upstream-Status: Inappropriate [cross-compile specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- acinclude.m4 | 4 ++-- src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- @@ -21,19 +22,19 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 -index da48acc..b513ae1 100644 +index a953d0e1b6..ede143d3c2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -178,7 +178,7 @@ if test "x$smart_lib" = "x"; then - FR_LOCATE_DIR(smart_lib_dir,[lib$1${libltdl_cv_shlibext}]) - FR_LOCATE_DIR(smart_lib_dir,[lib$1.a]) - -- for try in $smart_lib_dir /usr/local/lib /opt/lib; do +@@ -115,7 +115,7 @@ dnl # + dnl # Try to guess possible locations. + dnl # + if test "x$smart_lib" = "x"; then +- for try in /usr/local/lib /opt/lib; do + for try in $smart_lib_dir; do AC_MSG_CHECKING([for $2 in -l$1 in $try]) LIBS="-l$1 $old_LIBS" CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" -@@ -218,7 +218,7 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` +@@ -155,7 +155,7 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` old_CPPFLAGS="$CPPFLAGS" smart_include= dnl # The default directories we search in (in addition to the compilers search path) @@ -43,10 +44,10 @@ index da48acc..b513ae1 100644 dnl # Our local versions _smart_try_dir= diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac -index 75c851a..a262d71 100644 +index 44f84aa27e..23a1899591 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac -@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then +@@ -61,14 +61,14 @@ if test x$with_[]modname != xno; then esac]) dnl Check for SQLConnect in -ldb2 @@ -64,10 +65,10 @@ index 75c851a..a262d71 100644 if test "x$ac_cv_header_sqlcli_h" != xyes; then fail="$fail sqlcli.h" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac -index 4da57b3..752b043 100644 +index 4c2fd7ba9e..10c864def5 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac -@@ -56,14 +56,14 @@ if test x$with_[]modname != xno; then +@@ -60,14 +60,14 @@ if test x$with_[]modname != xno; then esac]) dnl Check for isc_attach_database in -lfbclient @@ -85,10 +86,10 @@ index 4da57b3..752b043 100644 if test "x$ac_cv_header_ibase_h" != xyes; then fail="$fail ibase.h" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac -index ba6304f..3393557 100644 +index d26ac9c431..6e4500e948 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac -@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then +@@ -61,14 +61,14 @@ if test x$with_[]modname != xno; then esac]) dnl Check for SQLConnect in -liodbc @@ -106,10 +107,10 @@ index ba6304f..3393557 100644 if test "x$ac_cv_header_isql_h" != xyes; then fail="$fail isql.h" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac -index 1401677..2e7db44 100644 +index df36da77bf..31359041c7 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac -@@ -136,7 +136,7 @@ if test x$with_[]modname != xno; then +@@ -140,7 +140,7 @@ if test x$with_[]modname != xno; then dnl # Check for libmysqlclient_r if test "x$have_a_libmysqlclient" != "xyes"; then @@ -118,7 +119,7 @@ index 1401677..2e7db44 100644 FR_SMART_CHECK_LIB(mysqlclient_r, mysql_init) if test "x$ac_cv_lib_mysqlclient_r_mysql_init" = "xyes"; then have_a_libmysqlclient='yes' -@@ -145,7 +145,7 @@ if test x$with_[]modname != xno; then +@@ -149,7 +149,7 @@ if test x$with_[]modname != xno; then dnl # Check for libmysqlclient if test "x$have_a_libmysqlclient" != "xyes"; then @@ -127,7 +128,7 @@ index 1401677..2e7db44 100644 FR_SMART_CHECK_LIB(mysqlclient, mysql_init) if test "x$ac_cv_lib_mysqlclient_mysql_init" = "xyes"; then have_a_libmysqlclient='yes' -@@ -189,7 +189,7 @@ if test x$with_[]modname != xno; then +@@ -243,7 +243,7 @@ if test x$with_[]modname != xno; then fi if test "x$have_mysql_h" != "xyes"; then @@ -137,10 +138,10 @@ index 1401677..2e7db44 100644 if test "x$ac_cv_header_mysql_mysql_h" = "xyes"; then AC_DEFINE(HAVE_MYSQL_MYSQL_H, [], [Define if you have <mysql/mysql.h>]) diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac -index 3178462..5cbc8c2 100644 +index 3b45da582a..03e6607d2b 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac -@@ -63,7 +63,7 @@ if test x$with_[]modname != xno; then +@@ -68,7 +68,7 @@ if test x$with_[]modname != xno; then dnl # Check for header files dnl ############################################################ @@ -150,10 +151,10 @@ index 3178462..5cbc8c2 100644 if test "x$ORACLE_HOME" != "x"; then smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac -index 4f9a890..e1cf811 100644 +index 8ac1022e89..d46c0f66bf 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac -@@ -41,7 +41,7 @@ if test x$with_[]modname != xno; then +@@ -45,7 +45,7 @@ if test x$with_[]modname != xno; then esac ] ) @@ -162,7 +163,7 @@ index 4f9a890..e1cf811 100644 FR_SMART_CHECK_INCLUDE(libpq-fe.h) if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then fail="$fail libpq-fe.h" -@@ -76,7 +76,7 @@ if test x$with_[]modname != xno; then +@@ -94,7 +94,7 @@ if test x$with_[]modname != xno; then ]) fi @@ -172,10 +173,10 @@ index 4f9a890..e1cf811 100644 if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then fail="$fail libpq" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac -index 3545387..c543ed4 100644 +index f10279fe1f..0081a338c8 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac -@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then +@@ -61,14 +61,14 @@ if test x$with_[]modname != xno; then esac]) dnl Check for SQLConnect in -lodbc @@ -193,5 +194,5 @@ index 3545387..c543ed4 100644 if test "x$ac_cv_header_sql_h" != xyes; then fail="$fail sql.h" -- -1.9.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-rlm_python-add-PY_INC_DIR.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch index 675940dd6c..cb71fb1373 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-rlm_python-add-PY_INC_DIR.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch @@ -1,14 +1,14 @@ -From a0bf65e04d2bbd3271cab94bd5ac93f8e877bfc5 Mon Sep 17 00:00:00 2001 +From e4ff7a2a9834e2589bc7bdda4b74f5bc962b15e6 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 27 Jan 2016 05:07:19 -0500 Subject: [PATCH] rlm_python: add PY_INC_DIR in search dir -Upstream-Status: Pending - configure option --with-rlm-python-include-dir is used to set PY_INC_DIR which is never used and it fails to find Python.h, so add it into search dir to fix it. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- @@ -16,10 +16,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/rlm_python/configure.ac b/src/modules/rlm_python/configure.ac -index 831a33a..c3792d8 100644 +index 08ecb62518..d5c0944ff1 100644 --- a/src/modules/rlm_python/configure.ac +++ b/src/modules/rlm_python/configure.ac -@@ -93,7 +93,7 @@ if test x$with_[]modname != xno; then +@@ -98,7 +98,7 @@ if test x$with_[]modname != xno; then old_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $PY_CFLAGS" @@ -29,5 +29,5 @@ index 831a33a..c3792d8 100644 CFLAGS=$old_CFLAGS -- -2.10.2 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-do-not-use-jlibtool.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch index 1954586b2b..559b857b63 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-do-not-use-jlibtool.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch @@ -1,4 +1,4 @@ -From 16bf899447fc1524ffc3c79e1d35380e5285a552 Mon Sep 17 00:00:00 2001 +From d0fa5b259c2dc942d0a43a9cf1bfc32f40c184f9 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Thu, 7 Jan 2016 22:37:30 -0800 Subject: [PATCH] libtool: do not use jlibtool @@ -7,7 +7,7 @@ jlibtool is hardcoded to be used but we need to use our libtool, so fix the makfiles to make it compatible with our libtool. -Upstream-Status: Inappropriate [oe specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> @@ -19,7 +19,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Make.inc.in b/Make.inc.in -index 7a77625..fd8aa3e 100644 +index 05f82776ff..e78f3fe9dc 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -57,7 +57,7 @@ CPPFLAGS = @CPPFLAGS@ @@ -31,7 +31,7 @@ index 7a77625..fd8aa3e 100644 ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ -@@ -163,7 +163,7 @@ ANALYZE.c := @clang_path@ +@@ -168,7 +168,7 @@ ANALYZE.c := @clang_path@ # ifeq "$(USE_SHARED_LIBS)" "yes" TESTBINDIR = ./$(BUILD_DIR)/bin/local @@ -41,10 +41,10 @@ index 7a77625..fd8aa3e 100644 TESTBINDIR = ./$(BUILD_DIR)/bin TESTBIN = ./$(BUILD_DIR)/bin diff --git a/scripts/boiler.mk b/scripts/boiler.mk -index bccec5e..926a13e 100644 +index 2ce0c18f34..567cc0f22f 100644 --- a/scripts/boiler.mk +++ b/scripts/boiler.mk -@@ -266,6 +266,7 @@ define COMPILE_C_CMDS +@@ -272,6 +272,7 @@ define COMPILE_C_CMDS $(Q)$(ECHO) CC $< $(Q)$(strip ${COMPILE.c} -o $@ -c -MD ${CPPFLAGS} ${CFLAGS} ${SRC_CFLAGS} ${INCDIRS} \ $(addprefix -I, ${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} $<) @@ -52,7 +52,7 @@ index bccec5e..926a13e 100644 endef else # -@@ -281,6 +282,7 @@ define COMPILE_C_CMDS +@@ -287,6 +288,7 @@ define COMPILE_C_CMDS $(Q)cppcheck --enable=style -q ${CHECKFLAGS} $(filter -isystem%,${SRC_CFLAGS}) \ $(filter -I%,${SRC_CFLAGS}) $(filter -D%,${SRC_CFLAGS}) ${INCDIRS} \ $(addprefix -I,${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} --suppress=variableScope --suppress=invalidscanf $< @@ -61,7 +61,7 @@ index bccec5e..926a13e 100644 endif diff --git a/scripts/install.mk b/scripts/install.mk -index 9164115..e38c1ed 100644 +index 916411563b..e38c1ed697 100644 --- a/scripts/install.mk +++ b/scripts/install.mk @@ -46,7 +46,7 @@ define ADD_INSTALL_RULE.exe @@ -116,10 +116,10 @@ index 9164115..e38c1ed 100644 diff --git a/scripts/libtool.mk b/scripts/libtool.mk -index 57915e1..2cb2f7d 100644 +index 381127ec2d..e83d7e6ad7 100644 --- a/scripts/libtool.mk +++ b/scripts/libtool.mk -@@ -55,7 +55,9 @@ ifeq "${LIBTOOL}" "JLIBTOOL" +@@ -60,7 +60,9 @@ ifeq "${LIBTOOL}" "JLIBTOOL" # Tell GNU Make to use this value, rather than anything specified # on the command line. override LIBTOOL := ${JLIBTOOL} @@ -130,7 +130,7 @@ index 57915e1..2cb2f7d 100644 # When using libtool, it produces a '.libs' directory. Ensure that it # is removed on "make clean", too. -@@ -69,11 +71,19 @@ clean: .libs_clean +@@ -74,11 +76,19 @@ clean: .libs_clean # Re-define compilers and linkers # OBJ_EXT = lo @@ -156,5 +156,5 @@ index 57915e1..2cb2f7d 100644 # LIBTOOL_ENDINGS - Given a library ending in ".a" or ".so", replace that -- -2.10.2 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-quoting-for-BUILT_WITH.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch index b0929c4b07..9386675e46 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-quoting-for-BUILT_WITH.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch @@ -1,4 +1,7 @@ -Fix quoting for BUILD_WITH +From 3e701d6274924adaed568e22af2362aa5af1f055 Mon Sep 17 00:00:00 2001 +From: Peter Seebach <peter.seebach@windriver.com> +Date: Sun, 8 Jan 2023 23:01:28 +0800 +Subject: [PATCH] Fix quoting for BUILD_WITH The escaped quotes are to make the -D values produce strings which can be used to display these values. However, if the values are more @@ -16,7 +19,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/libfreeradius-server.mk b/src/main/libfreeradius-server.mk -index 4495f72..07c28f1 100644 +index 4495f72481..07c28f1968 100644 --- a/src/main/libfreeradius-server.mk +++ b/src/main/libfreeradius-server.mk @@ -18,5 +18,5 @@ SOURCES := conffile.c \ @@ -27,7 +30,7 @@ index 4495f72..07c28f1 100644 +SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\"" endif diff --git a/src/main/unittest.mk b/src/main/unittest.mk -index 09f3938..ed33952 100644 +index edd4f133a7..b5b44d5e11 100644 --- a/src/main/unittest.mk +++ b/src/main/unittest.mk @@ -21,5 +21,5 @@ TGT_PREREQS += libfreeradius-eap.a @@ -38,7 +41,7 @@ index 09f3938..ed33952 100644 +SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\"" endif diff --git a/src/modules/rlm_eap/radeapclient.mk b/src/modules/rlm_eap/radeapclient.mk -index 6068f54..7d3c556 100644 +index 6068f54813..7d3c55625b 100644 --- a/src/modules/rlm_eap/radeapclient.mk +++ b/src/modules/rlm_eap/radeapclient.mk @@ -23,7 +23,7 @@ SRC_CFLAGS += -DWITH_EAPCLIENT @@ -51,5 +54,5 @@ index 6068f54..7d3c556 100644 endif -- -2.10.2 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-error-for-expansion-of-macro.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch index af1bff051f..051b66af8f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-error-for-expansion-of-macro.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch @@ -1,4 +1,4 @@ -From 5b6d8b14f2696fcf1dca119212f9d0a0fa04defd Mon Sep 17 00:00:00 2001 +From 30ce5ccd62446349d432ff65d3fe8d46872423c8 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 18 Jan 2017 14:59:39 +0800 Subject: [PATCH] fix error for expansion of macro in thread.h @@ -22,7 +22,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/include/threads.h b/src/include/threads.h -index e36d81d..2bcb6aa 100644 +index e36d81dac0..2bcb6aadcb 100644 --- a/src/include/threads.h +++ b/src/include/threads.h @@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ @@ -57,5 +57,5 @@ index e36d81d..2bcb6aa 100644 #endif #endif -- -2.10.2 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch index db8caab12e..69125eb3cb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch @@ -1,4 +1,4 @@ -From 66e8bcdcca8971b5c43c31755d56d7f675d8b5ff Mon Sep 17 00:00:00 2001 +From f0e764826e3a85488047f7f4e94ebf91460d2c12 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 16 Jun 2017 20:10:49 -0700 Subject: [PATCH] rlm_mschap: Use includedir instead of hardcoding /usr/include @@ -13,12 +13,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src/modules/rlm_mschap/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: freeradius-server-3.0.14/src/modules/rlm_mschap/configure.ac -=================================================================== ---- freeradius-server-3.0.14.orig/src/modules/rlm_mschap/configure.ac -+++ freeradius-server-3.0.14/src/modules/rlm_mschap/configure.ac -@@ -72,7 +72,7 @@ if test x$with_[]modname != xno; then - mod_ldflags="-framework DirectoryService" +diff --git a/src/modules/rlm_mschap/configure.ac b/src/modules/rlm_mschap/configure.ac +index 0fd105d7e6..6ab15509e5 100644 +--- a/src/modules/rlm_mschap/configure.ac ++++ b/src/modules/rlm_mschap/configure.ac +@@ -75,7 +75,7 @@ if test x$with_[]modname != xno; then + mod_ldflags="-F /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks -framework DirectoryService" fi - smart_try_dir="$winbind_include_dir /usr/include/samba-4.0" @@ -26,3 +26,6 @@ Index: freeradius-server-3.0.14/src/modules/rlm_mschap/configure.ac FR_SMART_CHECK_INCLUDE(wbclient.h, [#include <stdint.h> #include <stdbool.h>]) if test "x$ac_cv_header_wbclient_h" != "xyes"; then +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch index 669f363e72..cbac989284 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch @@ -1,4 +1,4 @@ -From 084f5467672f2ae37003b77e8f8706772f3da3ec Mon Sep 17 00:00:00 2001 +From 0f9f18fc330fe88080be13e43f300fbf7ba4a85a Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Mon, 13 Jul 2020 07:01:45 +0000 Subject: [PATCH] raddb/certs/Makefile: fix the existed certificate error @@ -29,13 +29,13 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile -index 5cbfd467ce..77eec9baa1 100644 +index c9fbc9e864..d064fe252d 100644 --- a/raddb/certs/Makefile +++ b/raddb/certs/Makefile @@ -92,7 +92,7 @@ server.csr server.key: server.cnf chmod g+r server.key - server.crt: server.csr ca.key ca.pem + server.crt: ca.key ca.pem server.csr - $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf + @[ -f server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf @@ -44,12 +44,12 @@ index 5cbfd467ce..77eec9baa1 100644 @@ -117,7 +117,7 @@ client.csr client.key: client.cnf chmod g+r client.key - client.crt: client.csr ca.pem ca.key + client.crt: ca.key ca.pem client.csr - $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf + @[ -f client.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf client.p12: client.crt $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) -- -2.26.2 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-occasional-verification.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch index dce0427e1a..287e47adcc 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-occasional-verification.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch @@ -1,4 +1,4 @@ -From 3eda5d35fbaf66ed6bdc86ada4320a0a18681b7e Mon Sep 17 00:00:00 2001 +From bb1cb2ffc7a31c0a2bb2de51ef82d304b0a107c3 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Wed, 5 Aug 2020 07:23:11 +0000 Subject: [PATCH] raddb/certs/Makefile: fix the occasional verification failure @@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile -index 77eec9baa1..3dcb63fe71 100644 +index d064fe252d..86f4547804 100644 --- a/raddb/certs/Makefile +++ b/raddb/certs/Makefile @@ -59,7 +59,7 @@ passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf @@ -71,7 +71,7 @@ index 77eec9baa1..3dcb63fe71 100644 + @[ -f server.csr ] || $(OPENSSL) req -new -out server.csr -keyout server.key -config ./server.cnf chmod g+r server.key - server.crt: server.csr ca.key ca.pem + server.crt: ca.key ca.pem server.csr @[ -f server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf server.p12: server.crt @@ -85,7 +85,7 @@ index 77eec9baa1..3dcb63fe71 100644 chmod g+r server.pem .PHONY: server.vrfy -@@ -113,18 +113,18 @@ server.vrfy: ca.pem +@@ -113,19 +113,19 @@ server.vrfy: ca.pem # ###################################################################### client.csr client.key: client.cnf @@ -93,13 +93,14 @@ index 77eec9baa1..3dcb63fe71 100644 + @[ -f client.csr ] || $(OPENSSL) req -new -out client.csr -keyout client.key -config ./client.cnf chmod g+r client.key - client.crt: client.csr ca.pem ca.key + client.crt: ca.key ca.pem client.csr @[ -f client.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf client.p12: client.crt - $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) + @[ -f client.p12 ] || $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) chmod g+r client.p12 + cp client.p12 $(USER_NAME).p12 client.pem: client.p12 - $(OPENSSL) pkcs12 -in client.p12 -out client.pem -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) @@ -107,7 +108,7 @@ index 77eec9baa1..3dcb63fe71 100644 chmod g+r client.pem cp client.pem $(USER_NAME).pem -@@ -139,18 +139,18 @@ client.vrfy: ca.pem client.pem +@@ -140,18 +140,18 @@ client.vrfy: ca.pem client.pem # ###################################################################### inner-server.csr inner-server.key: inner-server.cnf @@ -115,7 +116,7 @@ index 77eec9baa1..3dcb63fe71 100644 + @[ -f inner-server.csr] || $(OPENSSL) req -new -out inner-server.csr -keyout inner-server.key -config ./inner-server.cnf chmod g+r inner-server.key - inner-server.crt: inner-server.csr ca.key ca.pem + inner-server.crt: ca.key ca.pem inner-server.csr - $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in inner-server.csr -key $(PASSWORD_CA) -out inner-server.crt -extensions xpserver_ext -extfile xpextensions -config ./inner-server.cnf + @[ -f inner-server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in inner-server.csr -key $(PASSWORD_CA) -out inner-server.crt -extensions xpserver_ext -extfile xpextensions -config ./inner-server.cnf @@ -131,5 +132,5 @@ index 77eec9baa1..3dcb63fe71 100644 .PHONY: inner-server.vrfy -- -2.26.2 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-workaround-error-with-autoconf-2.7.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch index 80c571df98..17eadc7e59 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-workaround-error-with-autoconf-2.7.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch @@ -1,7 +1,7 @@ -From 3b4ba29c7c5800df87eecd65214244619e01162b Mon Sep 17 00:00:00 2001 +From c591da4a361496eec93625cf8c4f89bddfedaca7 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sun, 7 Feb 2021 16:02:36 +0800 -Subject: [PATCH] workaround error with autoconf 2.7 +Subject: [PATCH] Workaround error with autoconf 2.7 While using autoconf 2.7, the AM_MISSING_PROG caused unexpected error: ... @@ -11,7 +11,7 @@ configure.ac: error: required file 'missing' not found Since these tools were explicitly added by autotools bbclass, remove the testing to workaround the error with autoconf 2.7 -Upstream-Status: Inappropriate [oe specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- @@ -19,10 +19,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac -index 609efb104b..2d761cf62c 100644 +index 263098f7fd..fc296832d8 100644 --- a/configure.ac +++ b/configure.ac -@@ -693,14 +693,6 @@ fi +@@ -878,14 +878,6 @@ fi AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers) @@ -34,9 +34,9 @@ index 609efb104b..2d761cf62c 100644 -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) - - AC_PATH_PROG(LOCATE,locate) AC_PATH_PROG(DIRNAME,dirname) AC_PATH_PROG(GREP,grep) + -- -2.27.0 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch index fcadae93a0..d1d0111607 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch @@ -1,4 +1,7 @@ -bootstrap: check commands of openssl exist +From 78494ea005bd38324953b05176d6eb2c3f55af2c Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Sun, 8 Jan 2023 23:21:24 +0800 +Subject: [PATCH] bootstrap: check commands of openssl exist It calls openssl commands dhparam and pkcs12 in script bootstrap. These commands are configurable based on configure options 'no-dh' and @@ -18,7 +21,7 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 1 file changed, 8 insertions(+) diff --git a/raddb/certs/bootstrap b/raddb/certs/bootstrap -index 0f719aafd4..17feddbeeb 100755 +index 57de8cf0d7..4641c71700 100755 --- a/raddb/certs/bootstrap +++ b/raddb/certs/bootstrap @@ -13,6 +13,14 @@ @@ -36,3 +39,6 @@ index 0f719aafd4..17feddbeeb 100755 make -h > /dev/null 2>&1 # +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch index 697205efe0..2d67fdef05 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch @@ -1,11 +1,11 @@ -From cbc64dcf6aa2a1be63f45ea6dd7d2c49b70a0bee Mon Sep 17 00:00:00 2001 +From cbbb62ddda5c189c225f96bf6b599b3b3e8c8252 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Wed, 3 Aug 2022 16:44:29 +0800 Subject: [PATCH] version.c: don't print build flags Don't print the build flags to avoid collecting the build environment info. -Upstream-Status: Inappropriate [oe specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- @@ -13,7 +13,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 13 deletions(-) diff --git a/src/main/version.c b/src/main/version.c -index 62972d9f53..cf81de72c9 100644 +index f1f1e87810..3ffcbb25a0 100644 --- a/src/main/version.c +++ b/src/main/version.c @@ -589,19 +589,6 @@ void version_print(void) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0017-add-python.m4-for-detecting-python-3.10.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0017-add-python.m4-for-detecting-python-3.10.patch new file mode 100644 index 0000000000..62a4869c95 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0017-add-python.m4-for-detecting-python-3.10.patch @@ -0,0 +1,427 @@ +From f1418e1b46cb1cbd130935b76f5c78c577d1ad28 Mon Sep 17 00:00:00 2001 +From: Matthew Newton <matthew-git@newtoncomputing.co.uk> +Date: Wed, 28 Sep 2022 23:49:32 +0100 +Subject: [PATCH] add python.m4 for detecting python > 3.10 + +Upstream-Status: Backport +[https://github.com/FreeRADIUS/freeradius-server/commit/86584d2753829756cc73aadce5d48f703af472b1] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + src/modules/rlm_python3/configure.ac | 4 + + src/modules/rlm_python3/m4/python.m4 | 363 +++++++++++++++++++++++++++ + src/modules/rlm_python3/m4/runlog.m4 | 17 ++ + 3 files changed, 384 insertions(+) + create mode 100644 src/modules/rlm_python3/m4/python.m4 + create mode 100644 src/modules/rlm_python3/m4/runlog.m4 + +diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac +index bc0e97f9ba..90f2116e73 100644 +--- a/src/modules/rlm_python3/configure.ac ++++ b/src/modules/rlm_python3/configure.ac +@@ -3,6 +3,10 @@ AC_INIT(rlm_python3.c) + AC_REVISION($Revision$) + AC_DEFUN(modname,[rlm_python3]) + ++m4_include([ax_compare_version.m4]) ++m4_include([runlog.m4]) ++m4_include([python.m4]) ++ + AC_ARG_WITH([]modname, + [ --with-[]modname build []modname. (default=yes)]) + +diff --git a/src/modules/rlm_python3/m4/python.m4 b/src/modules/rlm_python3/m4/python.m4 +new file mode 100644 +index 0000000000..78ca7635ab +--- /dev/null ++++ b/src/modules/rlm_python3/m4/python.m4 +@@ -0,0 +1,363 @@ ++## ------------------------ -*- Autoconf -*- ++## Python file handling ++## From Andrew Dalke ++## Updated by James Henstridge and other contributors. ++## ------------------------ ++# Copyright (C) 1999-2021 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++ ++# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# --------------------------------------------------------------------------- ++# Adds support for distributing Python modules and packages. To ++# install modules, copy them to $(pythondir), using the python_PYTHON ++# automake variable. To install a package with the same name as the ++# automake package, install to $(pkgpythondir), or use the ++# pkgpython_PYTHON automake variable. ++# ++# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as ++# locations to install python extension modules (shared libraries). ++# Another macro is required to find the appropriate flags to compile ++# extension modules. ++# ++# If your package is configured with a different prefix to python, ++# users will have to add the install directory to the PYTHONPATH ++# environment variable, or create a .pth file (see the python ++# documentation for details). ++# ++# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will ++# cause an error if the version of python installed on the system ++# doesn't meet the requirement. MINIMUM-VERSION should consist of ++# numbers and dots only. ++AC_DEFUN([AM_PATH_PYTHON], ++ [ ++ dnl Find a Python interpreter. Python versions prior to 2.0 are not ++ dnl supported. (2.0 was released on October 16, 2000). ++ m4_define_default([_AM_PYTHON_INTERPRETER_LIST], ++[python python2 python3 dnl ++ python3.11 python3.10 dnl ++ python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl ++ python3.2 python3.1 python3.0 dnl ++ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl ++ python2.0]) ++ ++ AC_ARG_VAR([PYTHON], [the Python interpreter]) ++ ++ m4_if([$1],[],[ ++ dnl No version check is needed. ++ # Find any Python interpreter. ++ if test -z "$PYTHON"; then ++ AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) ++ fi ++ am_display_PYTHON=python ++ ], [ ++ dnl A version check is needed. ++ if test -n "$PYTHON"; then ++ # If the user set $PYTHON, use it and don't search something else. ++ AC_MSG_CHECKING([whether $PYTHON version is >= $1]) ++ AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([Python interpreter is too old])]) ++ am_display_PYTHON=$PYTHON ++ else ++ # Otherwise, try each interpreter until we find one that satisfies ++ # VERSION. ++ AC_CACHE_CHECK([for a Python interpreter with version >= $1], ++ [am_cv_pathless_PYTHON],[ ++ for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do ++ test "$am_cv_pathless_PYTHON" = none && break ++ AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) ++ done]) ++ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. ++ if test "$am_cv_pathless_PYTHON" = none; then ++ PYTHON=: ++ else ++ AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) ++ fi ++ am_display_PYTHON=$am_cv_pathless_PYTHON ++ fi ++ ]) ++ ++ if test "$PYTHON" = :; then ++ dnl Run any user-specified action, or abort. ++ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) ++ else ++ ++ dnl Query Python for its version number. Although site.py simply uses ++ dnl sys.version[:3], printing that failed with Python 3.10, since the ++ dnl trailing zero was eliminated. So now we output just the major ++ dnl and minor version numbers, as numbers. Apparently the tertiary ++ dnl version is not of interest. ++ dnl ++ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], ++ [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`]) ++ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) ++ ++ dnl At times, e.g., when building shared libraries, you may want ++ dnl to know which OS platform Python thinks this is. ++ dnl ++ AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], ++ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) ++ AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) ++ ++ dnl emacs-page ++ dnl If --with-python-sys-prefix is given, use the values of sys.prefix ++ dnl and sys.exec_prefix for the corresponding values of PYTHON_PREFIX ++ dnl and PYTHON_EXEC_PREFIX. Otherwise, use the GNU ${prefix} and ++ dnl ${exec_prefix} variables. ++ dnl ++ dnl The two are made distinct variables so they can be overridden if ++ dnl need be, although general consensus is that you shouldn't need ++ dnl this separation. ++ dnl ++ dnl Also allow directly setting the prefixes via configure options, ++ dnl overriding any default. ++ dnl ++ if test "x$prefix" = xNONE; then ++ am__usable_prefix=$ac_default_prefix ++ else ++ am__usable_prefix=$prefix ++ fi ++ ++ # Allow user to request using sys.* values from Python, ++ # instead of the GNU $prefix values. ++ AC_ARG_WITH([python-sys-prefix], ++ [AS_HELP_STRING([--with-python-sys-prefix], ++ [use Python's sys.prefix and sys.exec_prefix values])], ++ [am_use_python_sys=:], ++ [am_use_python_sys=false]) ++ ++ # Allow user to override whatever the default Python prefix is. ++ AC_ARG_WITH([python_prefix], ++ [AS_HELP_STRING([--with-python_prefix], ++ [override the default PYTHON_PREFIX])], ++ [am_python_prefix_subst=$withval ++ am_cv_python_prefix=$withval ++ AC_MSG_CHECKING([for explicit $am_display_PYTHON prefix]) ++ AC_MSG_RESULT([$am_cv_python_prefix])], ++ [ ++ if $am_use_python_sys; then ++ # using python sys.prefix value, not GNU ++ AC_CACHE_CHECK([for python default $am_display_PYTHON prefix], ++ [am_cv_python_prefix], ++ [am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`]) ++ ++ dnl If sys.prefix is a subdir of $prefix, replace the literal value of ++ dnl $prefix with a variable reference so it can be overridden. ++ case $am_cv_python_prefix in ++ $am__usable_prefix*) ++ am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'` ++ am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"` ++ ;; ++ *) ++ am_python_prefix_subst=$am_cv_python_prefix ++ ;; ++ esac ++ else # using GNU prefix value, not python sys.prefix ++ am_python_prefix_subst='${prefix}' ++ am_python_prefix=$am_python_prefix_subst ++ AC_MSG_CHECKING([for GNU default $am_display_PYTHON prefix]) ++ AC_MSG_RESULT([$am_python_prefix]) ++ fi]) ++ # Substituting python_prefix_subst value. ++ AC_SUBST([PYTHON_PREFIX], [$am_python_prefix_subst]) ++ ++ # emacs-page Now do it all over again for Python exec_prefix, but with yet ++ # another conditional: fall back to regular prefix if that was specified. ++ AC_ARG_WITH([python_exec_prefix], ++ [AS_HELP_STRING([--with-python_exec_prefix], ++ [override the default PYTHON_EXEC_PREFIX])], ++ [am_python_exec_prefix_subst=$withval ++ am_cv_python_exec_prefix=$withval ++ AC_MSG_CHECKING([for explicit $am_display_PYTHON exec_prefix]) ++ AC_MSG_RESULT([$am_cv_python_exec_prefix])], ++ [ ++ # no explicit --with-python_exec_prefix, but if ++ # --with-python_prefix was given, use its value for python_exec_prefix too. ++ AS_IF([test -n "$with_python_prefix"], ++ [am_python_exec_prefix_subst=$with_python_prefix ++ am_cv_python_exec_prefix=$with_python_prefix ++ AC_MSG_CHECKING([for python_prefix-given $am_display_PYTHON exec_prefix]) ++ AC_MSG_RESULT([$am_cv_python_exec_prefix])], ++ [ ++ # Set am__usable_exec_prefix whether using GNU or Python values, ++ # since we use that variable for pyexecdir. ++ if test "x$exec_prefix" = xNONE; then ++ am__usable_exec_prefix=$am__usable_prefix ++ else ++ am__usable_exec_prefix=$exec_prefix ++ fi ++ # ++ if $am_use_python_sys; then # using python sys.exec_prefix, not GNU ++ AC_CACHE_CHECK([for python default $am_display_PYTHON exec_prefix], ++ [am_cv_python_exec_prefix], ++ [am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`]) ++ dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the ++ dnl literal value of $exec_prefix with a variable reference so it can ++ dnl be overridden. ++ case $am_cv_python_exec_prefix in ++ $am__usable_exec_prefix*) ++ am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'` ++ am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"` ++ ;; ++ *) ++ am_python_exec_prefix_subst=$am_cv_python_exec_prefix ++ ;; ++ esac ++ else # using GNU $exec_prefix, not python sys.exec_prefix ++ am_python_exec_prefix_subst='${exec_prefix}' ++ am_python_exec_prefix=$am_python_exec_prefix_subst ++ AC_MSG_CHECKING([for GNU default $am_display_PYTHON exec_prefix]) ++ AC_MSG_RESULT([$am_python_exec_prefix]) ++ fi])]) ++ # Substituting python_exec_prefix_subst. ++ AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst]) ++ ++ # Factor out some code duplication into this shell variable. ++ am_python_setup_sysconfig="\ ++import sys ++# Prefer sysconfig over distutils.sysconfig, for better compatibility ++# with python 3.x. See automake bug#10227. ++try: ++ import sysconfig ++except ImportError: ++ can_use_sysconfig = 0 ++else: ++ can_use_sysconfig = 1 ++# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: ++# <https://github.com/pypa/virtualenv/issues/118> ++try: ++ from platform import python_implementation ++ if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7': ++ can_use_sysconfig = 0 ++except ImportError: ++ pass" ++ ++ dnl emacs-page Set up 4 directories: ++ ++ dnl 1. pythondir: where to install python scripts. This is the ++ dnl site-packages directory, not the python standard library ++ dnl directory like in previous automake betas. This behavior ++ dnl is more consistent with lispdir.m4 for example. ++ dnl Query distutils for this directory. ++ dnl ++ AC_CACHE_CHECK([for $am_display_PYTHON script directory (pythondir)], ++ [am_cv_python_pythondir], ++ [if test "x$am_cv_python_prefix" = x; then ++ am_py_prefix=$am__usable_prefix ++ else ++ am_py_prefix=$am_cv_python_prefix ++ fi ++ am_cv_python_pythondir=`$PYTHON -c " ++$am_python_setup_sysconfig ++if can_use_sysconfig: ++ if hasattr(sysconfig, 'get_default_scheme'): ++ scheme = sysconfig.get_default_scheme() ++ else: ++ scheme = sysconfig._get_default_scheme() ++ if scheme == 'posix_local': ++ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ ++ scheme = 'posix_prefix' ++ sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'}) ++else: ++ from distutils import sysconfig ++ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') ++sys.stdout.write(sitedir)"` ++ # ++ case $am_cv_python_pythondir in ++ $am_py_prefix*) ++ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` ++ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"` ++ ;; ++ *) ++ case $am_py_prefix in ++ /usr|/System*) ;; ++ *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages" ++ ;; ++ esac ++ ;; ++ esac ++ ]) ++ AC_SUBST([pythondir], [$am_cv_python_pythondir]) ++ ++ dnl 2. pkgpythondir: $PACKAGE directory under pythondir. Was ++ dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is ++ dnl more consistent with the rest of automake. ++ dnl ++ AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) ++ ++ dnl 3. pyexecdir: directory for installing python extension modules ++ dnl (shared libraries). ++ dnl Query distutils for this directory. ++ dnl ++ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory (pyexecdir)], ++ [am_cv_python_pyexecdir], ++ [if test "x$am_cv_python_exec_prefix" = x; then ++ am_py_exec_prefix=$am__usable_exec_prefix ++ else ++ am_py_exec_prefix=$am_cv_python_exec_prefix ++ fi ++ am_cv_python_pyexecdir=`$PYTHON -c " ++$am_python_setup_sysconfig ++if can_use_sysconfig: ++ if hasattr(sysconfig, 'get_default_scheme'): ++ scheme = sysconfig.get_default_scheme() ++ else: ++ scheme = sysconfig._get_default_scheme() ++ if scheme == 'posix_local': ++ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ ++ scheme = 'posix_prefix' ++ sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'}) ++else: ++ from distutils import sysconfig ++ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix') ++sys.stdout.write(sitedir)"` ++ # ++ case $am_cv_python_pyexecdir in ++ $am_py_exec_prefix*) ++ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` ++ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"` ++ ;; ++ *) ++ case $am_py_exec_prefix in ++ /usr|/System*) ;; ++ *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages" ++ ;; ++ esac ++ ;; ++ esac ++ ]) ++ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) ++ ++ dnl 4. pkgpyexecdir: $(pyexecdir)/$(PACKAGE) ++ dnl ++ AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) ++ ++ dnl Run any user-specified action. ++ $2 ++ fi ++]) ++ ++ ++# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) ++# --------------------------------------------------------------------------- ++# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. ++# Run ACTION-IF-FALSE otherwise. ++# This test uses sys.hexversion instead of the string equivalent (first ++# word of sys.version), in order to cope with versions such as 2.2c1. ++# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). ++AC_DEFUN([AM_PYTHON_CHECK_VERSION], ++ [prog="import sys ++# split strings by '.' and convert to numeric. Append some zeros ++# because we need at least 4 digits for the hex conversion. ++# map returns an iterator in Python 3.0 and a list in 2.x ++minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] ++minverhex = 0 ++# xrange is not present in Python 3.0 and range returns an iterator ++for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] ++sys.exit(sys.hexversion < minverhex)" ++ AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) +diff --git a/src/modules/rlm_python3/m4/runlog.m4 b/src/modules/rlm_python3/m4/runlog.m4 +new file mode 100644 +index 0000000000..690efc3258 +--- /dev/null ++++ b/src/modules/rlm_python3/m4/runlog.m4 +@@ -0,0 +1,17 @@ ++## -*- Autoconf -*- ++# Copyright (C) 2001-2018 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_RUN_LOG(COMMAND) ++# ------------------- ++# Run COMMAND, save the exit status in ac_status, and log it. ++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) ++AC_DEFUN([AM_RUN_LOG], ++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ (exit $ac_status); }]) +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb index b459412e04..4a23c9d906 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb @@ -16,28 +16,30 @@ DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0;;protocol=https \ file://freeradius \ file://volatiles.58_radiusd \ - file://freeradius-enble-user-in-conf.patch \ - file://freeradius-configure.ac-allow-cross-compilation.patch \ - file://freeradius-libtool-detection.patch \ - file://freeradius-configure.ac-add-option-for-libcap.patch \ - file://freeradius-avoid-searching-host-dirs.patch \ - file://freeradius-rlm_python-add-PY_INC_DIR.patch \ - file://freeradius-libtool-do-not-use-jlibtool.patch \ - file://freeradius-fix-quoting-for-BUILT_WITH.patch \ - file://freeradius-fix-error-for-expansion-of-macro.patch \ - file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ - file://0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ - file://0001-raddb-certs-Makefile-fix-the-occasional-verification.patch \ - file://0001-workaround-error-with-autoconf-2.7.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ - file://check-openssl-cmds-in-script-bootstrap.patch \ - file://0001-version.c-don-t-print-build-flags.patch \ + file://0001-Add-autogen.sh.patch \ + file://0002-Enable-and-change-user-and-group-of-freeradius-serve.patch \ + file://0003-configure.ac-allow-cross-compilation.patch \ + file://0004-Fix-libtool-detection.patch \ + file://0005-configure.ac-add-option-for-libcap.patch \ + file://0006-Avoid-searching-host-dirs.patch \ + file://0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch \ + file://0008-libtool-do-not-use-jlibtool.patch \ + file://0009-Fix-quoting-for-BUILD_WITH.patch \ + file://0010-fix-error-for-expansion-of-macro-in-thread.h.patch \ + file://0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ + file://0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ + file://0013-raddb-certs-Makefile-fix-the-occasional-verification.patch \ + file://0014-Workaround-error-with-autoconf-2.7.patch \ + file://0015-bootstrap-check-commands-of-openssl-exist.patch \ + file://0016-version.c-don-t-print-build-flags.patch \ + file://0017-add-python.m4-for-detecting-python-3.10.patch \ " -raddbdir="${sysconfdir}/${MLPREFIX}raddb" +raddbdir = "${sysconfdir}/${MLPREFIX}raddb" -SRCREV = "af428abda249b2279ba0582180985a9f6f4a144a" +SRCREV = "d956f683d37ea40e7977cc5907361f3e6988a439" CVE_CHECK_IGNORE = "\ CVE-2002-0318 \ @@ -118,7 +120,7 @@ inherit cpan-base python3-dir # The modules subdirs also need to be processed by autoreconf. Use autogen.sh # in order to handle the subdirs correctly. -do_configure () { +do_configure() { ./autogen.sh # the configure of rlm_perl needs this to get correct @@ -142,11 +144,9 @@ USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false --user-group do_install() { rm -rf ${D} - mkdir -p ${D}/${sysconfdir}/logrotate.d - mkdir -p ${D}/${sysconfdir}/pam.d - mkdir -p ${D}/${sysconfdir}/init.d - mkdir -p ${D}/${localstatedir}/lib/radiusd - mkdir -p ${D}${sysconfdir}/default/volatiles + install -d ${D}/${sysconfdir}/logrotate.d + install -d ${D}/${sysconfdir}/pam.d + install -d ${D}/${localstatedir}/lib/radiusd export LD_LIBRARY_PATH=${D}/${libdir} oe_runmake install R=${D} INSTALLSTRIP="" @@ -157,16 +157,21 @@ do_install() { # remove scripts that required Perl(DBI) rm -rf ${D}/${bindir}/radsqlrelay - cp -f ${WORKDIR}/freeradius ${D}/etc/init.d/radiusd rm -f ${D}/${sbindir}/rc.radiusd - chmod +x ${D}/${sysconfdir}/init.d/radiusd rm -rf ${D}/${localstatedir}/run/ rm -rf ${D}/${localstatedir}/log/ - install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd chown -R radiusd:radiusd ${D}/${raddbdir} chown -R radiusd:radiusd ${D}/${localstatedir}/lib/radiusd + # For sysvinit + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default/volatiles + install -m 0755 ${WORKDIR}/freeradius ${D}/etc/init.d/radiusd + install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd + fi + # For systemd if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system @@ -180,7 +185,8 @@ do_install() { install -d ${D}${sysconfdir}/tmpfiles.d/ install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf fi - oe_multilib_header freeradius/autoconf.h + + oe_multilib_header freeradius/autoconf.h oe_multilib_header freeradius/missing.h oe_multilib_header freeradius/radpaths.h } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb index 742414dd8a..3c52fe13b0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "dd79db10014d85b26d11fe57218431f2e5ede6f2" +SRCREV = "89f040a5c938985c5f30728baed21e49d0846a53" SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=mbedtls-2.28" inherit cmake @@ -32,9 +32,15 @@ PACKAGECONFIG ??= "shared-libs programs" PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF" +# Make X.509 and TLS calls use PSA +# https://github.com/Mbed-TLS/mbedtls/blob/development/docs/use-psa-crypto.md +PACKAGECONFIG[psa] = "" EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" +# For now the only way to enable PSA is to explicitly pass a -D via CFLAGS +CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'psa', ' -DMBEDTLS_USE_PSA_CRYPTO', '', d)}" + PROVIDES += "polarssl" RPROVIDES:${PN} = "polarssl" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.10.bb index 801739170b..0463bd487d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.10.bb @@ -30,7 +30,7 @@ SRC_URI = " \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ " -SRC_URI[sha256sum] = "aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03" +SRC_URI[sha256sum] = "fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7" S = "${WORKDIR}/NetworkManager-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch new file mode 100644 index 0000000000..0533616722 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch @@ -0,0 +1,42 @@ +From 4788ce6ec602f6441970e1095572c4ff0e90c7c5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Jan 2023 22:33:52 -0800 +Subject: [PATCH] Use unsigned int type for 1-bit integer bitfield + +In C++, signed integers are represented in two's complement. This also applies to signed bitfields. +A signed bitfield composed of one bit can therefore store a value in the range -1 to 0. +Assigning a value of 1 to such a bitfield should produce a warning since it is out of range of representable values. +Therefore fix this case by using unsigned int instead of signed int + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + usl/usl_signal.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/usl/usl_signal.c b/usl/usl_signal.c +index 45ddd94..8c1d4d0 100644 +--- a/usl/usl_signal.c ++++ b/usl/usl_signal.c +@@ -39,12 +39,12 @@ struct usl_notifier { + }; + + typedef struct { +- volatile int sighup:1; +- volatile int sigterm:1; +- volatile int sigchld:1; +- volatile int sigusr1:1; +- volatile int sigusr2:1; +- volatile int running:1; ++ volatile unsigned int sighup:1; ++ volatile unsigned int sigterm:1; ++ volatile unsigned int sigchld:1; ++ volatile unsigned int sigusr1:1; ++ volatile unsigned int sigusr2:1; ++ volatile unsigned int running:1; + sig_atomic_t waiting; + sigjmp_buf sigjmp; + } usl_signal_data_t; +-- +2.39.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 984acac76e..26b03814d6 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -29,6 +29,7 @@ SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-$ file://strncpy-truncation.patch \ file://0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch \ file://0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch \ + file://0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=4c59283b82fc2b166455e0fc23c71c6f" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch new file mode 100644 index 0000000000..e36d4e0cdc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch @@ -0,0 +1,43 @@ +From 225891675b80beaa9d74ce56809e52c4451df72c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 21:46:22 -0800 +Subject: [PATCH 1/2] include cstdint for uintXX_t types + +GCC-13 needs it [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/imm/immnd/ImmModel.h | 1 + + src/osaf/consensus/consensus_env.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/imm/immnd/ImmModel.h b/src/imm/immnd/ImmModel.h +index 44da470..0660431 100644 +--- a/src/imm/immnd/ImmModel.h ++++ b/src/imm/immnd/ImmModel.h +@@ -22,6 +22,7 @@ + #include <saImmOm.h> + #include <cstdarg> + #include <sys/types.h> ++#include <cstdint> + #include <string> + #include <vector> + #include <map> +diff --git a/src/osaf/consensus/consensus_env.h b/src/osaf/consensus/consensus_env.h +index df4f93a..89ccf46 100644 +--- a/src/osaf/consensus/consensus_env.h ++++ b/src/osaf/consensus/consensus_env.h +@@ -15,6 +15,7 @@ + #ifndef OSAF_CONSENSUS_CONSENSUS_ENV_H_ + #define OSAF_CONSENSUS_CONSENSUS_ENV_H_ + ++#include <cstdint> + #include <string> + #include "base/mutex.h" + +-- +2.39.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch new file mode 100644 index 0000000000..e3288431eb --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch @@ -0,0 +1,59 @@ +From 5e5686de677c884d5d785254412ced3c9d2d1b08 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 21:47:45 -0800 +Subject: [PATCH 2/2] Fix -Werror=enum-int-mismatch with gcc13 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/evt/agent/eda_hdl.h | 5 +++-- + src/evt/evtd/eds_mds.h | 3 +-- + src/smf/smfnd/smfnd.h | 8 ++++---- + 3 files changed, 8 insertions(+), 8 deletions(-) + +--- a/src/evt/agent/eda_hdl.h ++++ b/src/evt/agent/eda_hdl.h +@@ -31,6 +31,7 @@ + #define EVT_AGENT_EDA_HDL_H_ + + #include "evt/agent/eda.h" ++#include "ais/include/saAis.h" + + uint32_t eda_hdl_cbk_dispatch(EDA_CB *, EDA_CLIENT_HDL_REC *, SaDispatchFlagsT); + +@@ -68,11 +69,11 @@ EDA_CHANNEL_HDL_REC *eda_find_chan_hdl_r + + void eda_msg_destroy(EDSV_MSG *msg); + +-uint32_t eda_extract_pattern_from_event( ++SaAisErrorT eda_extract_pattern_from_event( + SaEvtEventPatternArrayT *from_pattern_array, + SaEvtEventPatternArrayT **to_pattern_array); + +-uint32_t eda_allocate_and_extract_pattern_from_event( ++SaAisErrorT eda_allocate_and_extract_pattern_from_event( + SaEvtEventPatternArrayT *from_pattern_array, + SaEvtEventPatternArrayT **to_pattern_array); + +--- a/src/evt/evtd/eds_mds.h ++++ b/src/evt/evtd/eds_mds.h +@@ -49,8 +49,7 @@ uint32_t eds_mds_msg_send(EDS_CB *cb, ED + MDS_SEND_PRIORITY_TYPE prio); + + uint32_t eds_mds_ack_send(EDS_CB *cb, EDSV_MSG *msg, MDS_DEST dest, +- SaTimeT timeout, MDS_SEND_PRIORITY_TYPE prio); +- ++ SaTimeT timeout, uint32_t prio); + uint32_t eds_dec_subscribe_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); + + uint32_t eds_dec_publish_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); +--- a/src/smf/smfnd/smfnd.h ++++ b/src/smf/smfnd/smfnd.h +@@ -76,7 +76,7 @@ extern "C" { + #endif + + /* smfnd_amf.c */ +-extern uint32_t smfnd_amf_init(smfnd_cb_t *cb); ++extern SaAisErrorT smfnd_amf_init(smfnd_cb_t *cb); + + /* smfnd_mds.c */ + extern uint32_t smfnd_mds_init(smfnd_cb_t *cb); diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb index 930755d624..3dd950c720 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb @@ -30,6 +30,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ file://0001-include-missing-array-header.patch \ file://0002-configure-Disable-selected-warnings.patch \ + file://0001-include-cstdint-for-uintXX_t-types.patch \ + file://0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch \ " SRC_URI[sha256sum] = "f008d53c83087ce2014c6089bc4ef08e14c1b4091298b943f4ceade1aa6bf61e" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb index fb9c6e7d62..f43a223ac9 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb @@ -37,7 +37,7 @@ RDEPENDS:${PN}-ptest += " ${PN}-python bash make iproute2 iputils-ping procps py TESTDIR = "tests" -PRIVATE_LIBS:${PN}-ptest:append = "libnftables.so.1" +PRIVATE_LIBS:${PN}-ptest:append = " libnftables.so.1" do_install:append() { # Avoid "contains reference to TMPDIR" warning diff --git a/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.1.bb b/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.8.bb index 64cd1079bd..8c770938af 100644 --- a/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.1.bb +++ b/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.8.bb @@ -4,13 +4,13 @@ SECTION = "net" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell" +DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell zstd" SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \ file://0001-use-pkg-config-for-gcrypt-instead.patch \ " -SRC_URI[sha256sum] = "7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7" +SRC_URI[sha256sum] = "f7cb65c200f8c090c56f2cf98c0b184051e516e5f7099a4308cacf86f174bf28" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-Drop-using-register-keyword.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-Drop-using-register-keyword.patch new file mode 100644 index 0000000000..f508711d34 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-Drop-using-register-keyword.patch @@ -0,0 +1,457 @@ +From af89f36fbeb5f6a078b349eed8fc4ad6fbfdf5d1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Jan 2023 15:26:12 -0800 +Subject: [PATCH] Drop using register keyword + +Its gone since c++17 + +Fixes +error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] +| register char c; +| ^~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + telnet/commands.cc | 14 +++++++------- + telnet/defines.h | 1 + + telnet/sys_bsd.cc | 2 +- + telnet/telnet.cc | 18 +++++++++--------- + telnet/terminal.cc | 4 ++-- + telnet/tn3270.cc | 4 ++-- + telnet/tn3270.o | Bin 4008 -> 4008 bytes + telnet/utilities.cc | 6 +++--- + telnetd/setproctitle.c | 6 +++--- + telnetd/slc.c | 4 ++-- + telnetd/state.c | 12 ++++++------ + telnetd/sys_term.c | 4 ++-- + telnetd/telnetd.c | 4 ++-- + telnetd/termstat.c | 4 ++-- + telnetd/utility.c | 16 ++++++++-------- + 15 files changed, 50 insertions(+), 49 deletions(-) + +--- a/telnet/commands.cc ++++ b/telnet/commands.cc +@@ -192,8 +192,8 @@ static int margc; + static const char *margv[20]; + + static void makeargv(void) { +- register char *cp, *cp2, c; +- register const char **argp = margv; ++ char *cp, *cp2, c; ++ const char **argp = margv; + + margc = 0; + cp = line; +@@ -204,7 +204,7 @@ static void makeargv(void) { + cp++; + } + while ((c = *cp)!=0) { +- register int inquote = 0; ++ int inquote = 0; + while (isspace(c)) + c = *++cp; + if (c == '\0') +@@ -281,7 +281,7 @@ static const char *control(cc_t c) + * was to assign "c" to an unsigned int variable... + * Arggg.... + */ +- register unsigned int uic = (unsigned int)c; ++ unsigned int uic = (unsigned int)c; + + if (uic == 0x7f) + return ("^?"); +@@ -479,7 +479,7 @@ int send_tncmd(int (*func)(int, int), co + long opt; + + if (isprefix(name, "help") || isprefix(name, "?")) { +- register int col, len; ++ int col, len; + + printf("Usage: send %s <option>\n", cmd); + printf("Valid options are:\n\t"); +@@ -2212,8 +2212,8 @@ static unsigned long sourceroute(char *a + static char lsr[44]; + char *cp, *cp2, *lsrp, *lsrep; + struct in_addr sin_addr; +- register struct hostent *host = 0; +- register char c; ++ struct hostent *host = 0; ++ char c; + + /* + * Verify the arguments, and make sure we have +--- a/telnet/defines.h ++++ b/telnet/defines.h +@@ -52,3 +52,4 @@ + #define CONTROL(x) ((x)&0x1f) /* CTRL(x) is not portable */ + + #define MODE_OUT8 0x8000 /* binary mode sans -opost */ ++ +--- a/telnet/sys_bsd.cc ++++ b/telnet/sys_bsd.cc +@@ -285,7 +285,7 @@ void sys_telnet_init(void) { + int process_rings(int netin, int netout, int netex, int ttyin, int ttyout, + int poll /* If 0, then block until something to do */) + { +- register int c, maxfd; ++ int c, maxfd; + /* One wants to be a bit careful about setting returnValue + * to one, since a one implies we did some useful work, + * and therefore probably won't be called to block next +--- a/telnet/telnet.cc ++++ b/telnet/telnet.cc +@@ -864,7 +864,7 @@ struct spc { + static int slc_mode = SLC_EXPORT; + + void slc_init(void) { +- register struct spc *spcp; ++ struct spc *spcp; + + localchars = 1; + for (spcp = spc_data; spcp < &spc_data[NSLC+1]; spcp++) { +@@ -944,7 +944,7 @@ void slc_import(int def) { + } + + void slc_export(void) { +- register struct spc *spcp; ++ struct spc *spcp; + + TerminalDefaultChars(); + +@@ -966,8 +966,8 @@ void slc_export(void) { + } + + void slc(unsigned char *cp, int len) { +- register struct spc *spcp; +- register int func,level; ++ struct spc *spcp; ++ int func,level; + + slc_start_reply(); + +@@ -1032,7 +1032,7 @@ void slc(unsigned char *cp, int len) { + } + + void slc_check(void) { +- register struct spc *spcp; ++ struct spc *spcp; + + slc_start_reply(); + for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) { +@@ -1080,7 +1080,7 @@ void slc_add_reply(int func, int flags, + } + + void slc_end_reply(void) { +- register int len; ++ int len; + + *slc_replyp++ = IAC; + *slc_replyp++ = SE; +@@ -1200,7 +1200,7 @@ void env_opt_add(const char *ep) { + tp = opt_replyp + (vp ? strlen(vp) * 2 : 0) + strlen(ep) * 2 + 6; + if (tp > opt_replyend) + { +- register int len; ++ int len; + len = ((tp - opt_reply) + OPT_REPLY_SIZE - 1) & ~(OPT_REPLY_SIZE - 1); + opt_replyend = opt_reply + len; + opt_reply = (unsigned char *)realloc(opt_reply, len); +@@ -1236,7 +1236,7 @@ void env_opt_add(const char *ep) { + } + + void env_opt_end(int emptyok) { +- register int len; ++ int len; + + len = opt_replyp - opt_reply + 2; + if (emptyok || len > 6) { +@@ -1874,7 +1874,7 @@ static unsigned char *nextitem(unsigned + + static void netclear(void) { + #if 0 /* XXX */ +- register char *thisitem, *next; ++ char *thisitem, *next; + char *good; + #define wewant(p) ((nfrontp > p) && (*p == IAC) && \ + (p[1] != EC) && (p[1] != EL)) +--- a/telnet/terminal.cc ++++ b/telnet/terminal.cc +@@ -569,8 +569,8 @@ struct termspeeds { + }; + + void TerminalSpeeds(long *ispeed, long *ospeed) { +- register struct termspeeds *tp; +- register long in, out; ++ struct termspeeds *tp; ++ long in, out; + + out = cfgetospeed(&old_tc); + in = cfgetispeed(&old_tc); +--- a/telnet/tn3270.cc ++++ b/telnet/tn3270.cc +@@ -103,7 +103,7 @@ void init_3270(void) { + * done: is this the last of a logical block + */ + int DataToNetwork(char *buffer, int count, int done) { +- register int loop, c; ++ int loop, c; + int origCount; + + origCount = count; +@@ -179,7 +179,7 @@ void outputPurge(void) { + * count: how much to send + */ + int DataToTerminal(char *buffer, int count) { +- register int c; ++ int c; + int origCount; + + origCount = count; +--- a/telnet/utilities.cc ++++ b/telnet/utilities.cc +@@ -252,7 +252,7 @@ void optionstatus(void) { + /* pointer: where suboption data sits */ + /* length: length of suboption data */ + void printsub(int direction, unsigned char *pointer, int length) { +- register int i = 0; ++ int i = 0; + + extern int want_status_response; + +@@ -262,7 +262,7 @@ void printsub(int direction, unsigned ch + fprintf(NetTrace, "%s IAC SB ", + (direction == '<')? "RCVD":"SENT"); + if (length >= 3) { +- register int j; ++ int j; + + i = pointer[length-2]; + j = pointer[length-1]; +@@ -577,7 +577,7 @@ void printsub(int direction, unsigned ch + fprintf(NetTrace, "INFO "); + env_common: + { +- register int noquote = 2; ++ int noquote = 2; + for (i = 2; i < length; i++ ) { + switch (pointer[i]) { + case ENV_VAR: +--- a/telnetd/setproctitle.c ++++ b/telnetd/setproctitle.c +@@ -76,7 +76,7 @@ static char Argv0[128]; /* program nam + void + initsetproctitle(int argc, char **argv, char **envp) + { +- register int i; ++ int i; + char *tmp; + + /* +@@ -111,8 +111,8 @@ initsetproctitle(int argc, char **argv, + void + setproctitle(const char *fmt, ...) + { +- register char *p; +- register int i=0; ++ char *p; ++ int i=0; + static char buf[2048]; + va_list ap; + +--- a/telnetd/slc.c ++++ b/telnetd/slc.c +@@ -196,7 +196,7 @@ int end_slc(unsigned char **bufp) { + * Figure out what to do about the client's slc + */ + void process_slc(unsigned char func, unsigned char flag, cc_t val) { +- register int hislevel, mylevel, ack; ++ int hislevel, mylevel, ack; + + /* + * Ensure that we know something about this function +@@ -260,7 +260,7 @@ void process_slc(unsigned char func, uns + * Compare client's request with what we are capable of supporting. + */ + void change_slc(char func, char flag, cc_t val) { +- register int hislevel, mylevel; ++ int hislevel, mylevel; + + hislevel = flag & SLC_LEVELBITS; + mylevel = slctab[func].defset.flag & SLC_LEVELBITS; +--- a/telnetd/state.c ++++ b/telnetd/state.c +@@ -79,7 +79,7 @@ unsigned char subbuffer[512], *subpointe + #define TS_DONT 8 /* dont " */ + + void telrcv(void) { +- register int c; ++ int c; + static int state = TS_DATA; + + while (ncc > 0) { +@@ -1081,7 +1081,7 @@ void suboption(void) { + + #ifdef LINEMODE + case TELOPT_LINEMODE: { +- register int request; ++ int request; + + if (his_state_is_wont(TELOPT_LINEMODE)) /* Ignore if option disabled */ + break; +@@ -1158,8 +1158,8 @@ void suboption(void) { + } /* end of case TELOPT_XDISPLOC */ + + case TELOPT_ENVIRON: { +- register int c; +- register char *cp, *varp, *valp; ++ int c; ++ char *cp, *varp, *valp; + + if (SB_EOF()) + return; +@@ -1299,8 +1299,8 @@ static void doclientstat(void) { + + void send_status(void) { + unsigned char statusbuf[256]; +- register unsigned char *ncp; +- register unsigned char i; ++ unsigned char *ncp; ++ unsigned char i; + + ncp = statusbuf; + +--- a/telnetd/sys_term.c ++++ b/telnetd/sys_term.c +@@ -413,7 +413,7 @@ extern int def_tspeed, def_rspeed; + + static int getptyslave(void) { + #if 0 +- register int t = -1; ++ int t = -1; + + # ifdef LINEMODE + int waslm; +@@ -505,7 +505,7 @@ static int getptyslave(void) { + * making sure that we have a clean tty. + */ + static int cleanopen(char *lyne) { +- register int t; ++ int t; + + /* + * Make sure that other people can't open the +--- a/telnetd/telnetd.c ++++ b/telnetd/telnetd.c +@@ -93,7 +93,7 @@ main(int argc, char *argv[], char *env[] + struct sockaddr_in from; + int on = 1; + socklen_t fromlen; +- register int ch; ++ int ch; + + #if defined(HAS_IPPROTO_IP) && defined(IP_TOS) + int tos = -1; +@@ -837,7 +837,7 @@ void telnet(int f, int p) + + #ifdef TIOCNOTTY + { +- register int t; ++ int t; + t = open(_PATH_TTY, O_RDWR); + if (t >= 0) { + (void) ioctl(t, TIOCNOTTY, (char *)0); +--- a/telnetd/termstat.c ++++ b/telnetd/termstat.c +@@ -347,7 +347,7 @@ done: + * at a time, and if using kludge linemode, then only linemode may be + * affected. + */ +-void clientstat(register int code, register int parm1, register int parm2) ++void clientstat(int code, register int parm1, register int parm2) + { + /* + * Get a copy of terminal characteristics. +@@ -419,7 +419,7 @@ void clientstat(register int code, regis + + case LM_MODE: + { +- register int ack, changed; ++ int ack, changed; + + /* + * Client has sent along a mode mask. If it agrees with +--- a/telnetd/utility.c ++++ b/telnetd/utility.c +@@ -189,7 +189,7 @@ nextitem(char *current, const char *endp + return current+3 <= endp ? current+3 : NULL; + case SB: /* loop forever looking for the SE */ + { +- register char *look = current+2; ++ char *look = current+2; + + while (look < endp) { + if ((*look++&0xff) == IAC) { +@@ -224,7 +224,7 @@ nextitem(char *current, const char *endp + */ + void netclear(void) + { +- register char *thisitem, *next; ++ char *thisitem, *next; + char *good; + #define wewant(p) ((nfrontp > p) && ((*p&0xff) == IAC) && \ + (nfrontp > p+1 && (((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL)))) +@@ -354,7 +354,7 @@ netflush(void) + * ptr - A pointer to a character string to write + * len - How many bytes to write + */ +-void writenet(register unsigned char *ptr, register int len) ++void writenet(unsigned char *ptr, register int len) + { + /* flush buffer if no room for new data) */ + if ((&netobuf[BUFSIZ] - nfrontp) < len) { +@@ -589,7 +589,7 @@ printoption(const char *fmt, int option) + void + printsub(char direction, unsigned char *pointer, int length) + { +- register int i = -1; ++ int i = -1; + #ifdef AUTHENTICATE + char buf[512]; + #endif +@@ -601,7 +601,7 @@ printsub(char direction, unsigned char * + netoprintf("td: %s suboption ", + direction == '<' ? "recv" : "send"); + if (length >= 3) { +- register int j; ++ int j; + + i = pointer[length-2]; + j = pointer[length-1]; +@@ -817,7 +817,7 @@ printsub(char direction, unsigned char * + + case TELOPT_STATUS: { + const char *cp; +- register int j, k; ++ int j, k; + + netoprintf("STATUS"); + +@@ -914,7 +914,7 @@ printsub(char direction, unsigned char * + netoprintf("INFO "); + env_common: + { +- register int noquote = 2; ++ int noquote = 2; + for (i = 2; i < length; i++ ) { + switch (pointer[i]) { + case ENV_VAR: +@@ -1125,7 +1125,7 @@ printsub(char direction, unsigned char * + void + printdata(const char *tag, const char *ptr, int cnt) + { +- register int i; ++ int i; + char xbuf[30]; + + while (cnt) { diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb index 6d60c6fbbe..e28eeae491 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb @@ -15,6 +15,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-telnet/netkit-telnet_${PV}.orig.tar.gz file://CVE-2020-10188.patch \ file://0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch \ file://0001-utility-Include-time.h-form-time-and-strftime-protot.patch \ + file://0001-Drop-using-register-keyword.patch \ " UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netkit-telnet/" diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch new file mode 100644 index 0000000000..6fbace75a5 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch @@ -0,0 +1,32 @@ +From 5719f40db65a72624a0b0f08e546d12bf823bd1e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 14:38:44 -0800 +Subject: [PATCH] Add noreturn attribute to netsnmp_pci_error() + +Fixes build with clang16 +| mibgroup/if-mib/data_access/interface_linux.c:152:23: error: incompatible function pointer types assigning to 'void (*)(char *, ...) __attribute__((noreturn))' from 'void (char *, ...)' [-Wincompatible-function-pointer-types] +| pci_access->error = netsnmp_pci_error; +| ^ ~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + agent/mibgroup/if-mib/data_access/interface_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agent/mibgroup/if-mib/data_access/interface_linux.c b/agent/mibgroup/if-mib/data_access/interface_linux.c +index c6cc54e..12eb865 100644 +--- a/agent/mibgroup/if-mib/data_access/interface_linux.c ++++ b/agent/mibgroup/if-mib/data_access/interface_linux.c +@@ -31,7 +31,7 @@ static struct pci_access *pci_access; + /* Avoid letting libpci call exit(1) when no PCI bus is available. */ + static int do_longjmp =0; + static jmp_buf err_buf; +-static void ++__attribute__((noreturn)) static void + netsnmp_pci_error(char *msg, ...) + { + va_list args; +-- +2.39.1 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb index 7af5147566..78d711fbfd 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb @@ -26,6 +26,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://net-snmp-fix-for-disable-des.patch \ file://reproducibility-have-printcap.patch \ file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ + file://0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch \ " SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc deleted file mode 100644 index a8ff21a125..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ /dev/null @@ -1,87 +0,0 @@ -SUMMARY = "Lightweight, easy to configure DNS forwarder and DHCP server" -HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html" -SECTION = "net" -# GPLv3 was added in version 2.41 as license option -LICENSE = "GPL-2.0-only | GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504 \ - " - -#at least versions 2.69 and prior are moved to the archive folder on the server -SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ - file://init \ - file://dnsmasq.conf \ - file://dnsmasq-resolvconf.service \ - file://dnsmasq-noresolvconf.service \ - file://dnsmasq-resolved.conf \ -" - -inherit pkgconfig update-rc.d systemd - -INITSCRIPT_NAME = "dnsmasq" -INITSCRIPT_PARAMS = "defaults" - -PACKAGECONFIG ?= "" -PACKAGECONFIG[dbus] = ",,dbus" -PACKAGECONFIG[idn] = ",,libidn" -PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack" -PACKAGECONFIG[lua] = ",,lua" -PACKAGECONFIG[resolvconf] = ",,,resolvconf" -EXTRA_OEMAKE = "\ - 'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ - 'CFLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ -" - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'file://dnsmasq.resolvconf file://99_dnsmasq file://dnsmasq-resolvconf-helper', '', d)}" - -do_compile:append() { - # build dhcp_release - cd ${S}/contrib/lease-tools - oe_runmake -} - -do_install () { - oe_runmake "PREFIX=${D}${prefix}" \ - "BINDIR=${D}${bindir}" \ - "MANDIR=${D}${mandir}" \ - install - install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d - install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq - - install -d ${D}${systemd_unitdir}/system - - if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then - install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service - else - install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service - fi - install -d ${D}${sysconfdir}/systemd/resolved.conf.d/ - install -m 0644 ${WORKDIR}/dnsmasq-resolved.conf ${D}${sysconfdir}/systemd/resolved.conf.d/ - - install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} - - if [ "${@bb.utils.filter('PACKAGECONFIG', 'dbus', d)}" ]; then - install -d ${D}${sysconfdir}/dbus-1/system.d - install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ - fi - if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then - install -d ${D}${sysconfdir}/resolvconf/update.d/ - install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/dnsmasq-resolvconf-helper ${D}${bindir} - fi -} - -CONFFILES:${PN} = "${sysconfdir}/dnsmasq.conf" - -RPROVIDES:${PN} += "${PN}-systemd" -RREPLACES:${PN} += "${PN}-systemd" -RCONFLICTS:${PN} += "${PN}-systemd" -SYSTEMD_SERVICE:${PN} = "dnsmasq.service" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.88.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.88.bb index 52ee9aa96e..4bf1dd8954 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.88.bb +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.88.bb @@ -1,7 +1,130 @@ -require dnsmasq.inc +SUMMARY = "Lightweight, easy to configure DNS forwarder and DHCP server" +HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html" +SECTION = "net" +# GPLv3 was added in version 2.41 as license option +LICENSE = "GPL-2.0-only | GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504 \ + " -SRC_URI[dnsmasq-2.88.sha256sum] = "da9d26aa3f3fc15f3b58b94edbb9ddf744cbce487194ea480bd8e7381b3ca028" -SRC_URI += "\ - file://lua.patch \ +DEPENDS += "gettext-native" + +#at least versions 2.69 and prior are moved to the archive folder on the server +SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \ + file://lua.patch \ + file://init \ + file://dnsmasq.conf \ + file://dnsmasq-resolvconf.service \ + file://dnsmasq-noresolvconf.service \ + file://dnsmasq-resolved.conf \ " +SRC_URI[sha256sum] = "da9d26aa3f3fc15f3b58b94edbb9ddf744cbce487194ea480bd8e7381b3ca028" + +inherit pkgconfig update-rc.d systemd + +INITSCRIPT_NAME = "dnsmasq" +INITSCRIPT_PARAMS = "defaults" + +# dnsmasq defaults +PACKAGECONFIG ?= "auth dhcp dhcp6 dumpfile inotify ipset loop script tftp" + +PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH" +PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC," +PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack" +PACKAGECONFIG[dbus] = "-DHAVE_DBUS,,dbus" +PACKAGECONFIG[dhcp] = "-DHAVE_DHCP,-DNO_DHCP" +PACKAGECONFIG[dhcp6] = "-DHAVE_DHCP6,-DNO_DHCP6" +PACKAGECONFIG[dnssec] = "-DHAVE_DNSSEC,,nettle" +PACKAGECONFIG[dumpfile] = "-DHAVE_DUMPFILE,-DNO_DUMPFILE" +PACKAGECONFIG[idn] = "-DHAVE_LIBIDN,,libidn,,,idn2" +PACKAGECONFIG[idn2] = "-DHAVE_LIBIDN2,,libidn2,,,idn" +PACKAGECONFIG[inotify] = "-DHAVE_INOTIFY,-DNO_INOTIFY" +PACKAGECONFIG[ipset] = "-DHAVE_IPSET,-DNO_IPSET" +PACKAGECONFIG[loop] = "-DHAVE_LOOP,-DNO_LOOP" +PACKAGECONFIG[lua] = "-DHAVE_LUASCRIPT -DHAVE_SCRIPT,,lua" +PACKAGECONFIG[nftset] = "-DHAVE_NFTSET,,nftables" +PACKAGECONFIG[no-gmp] = "-DNO_GMP," +PACKAGECONFIG[no-id] = "-DNO_ID," +PACKAGECONFIG[resolvconf] = ",,,resolvconf" +PACKAGECONFIG[script] = "-DHAVE_SCRIPT,-DNO_SCRIPT" +PACKAGECONFIG[tftp] = "-DHAVE_TFTP,-DNO_TFTP" +PACKAGECONFIG[ubus] = "-DHAVE_UBUS,,ubus" + +DNSMASQ_LEASEFILE ?= "${localstatedir}/lib/misc/dnsmasq.leases" +DNSMASQ_CONFFILE ?= "${sysconfdir}/dnsmasq.conf" +DNSMASQ_RESOLVFILE ?= "${sysconfdir}/resolv.conf" + +COPTS = "${PACKAGECONFIG_CONFARGS} \ + -DLEASEFILE=\"${DNSMASQ_LEASEFILE}\" \ + -DCONFFILE=\"${DNSMASQ_CONFFILE}\" \ + -DRESOLVFILE=\"${DNSMASQ_RESOLVFILE}\" \ + -DLOCALEDIR=\"${localedir}\"" + +EXTRA_OEMAKE = "\ + 'COPTS=${COPTS}' \ + 'CFLAGS=${CFLAGS}' \ + 'LDFLAGS=${LDFLAGS}' \ +" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'file://dnsmasq.resolvconf file://99_dnsmasq file://dnsmasq-resolvconf-helper', '', d)}" + +do_compile () { + oe_runmake all-i18n + if ${@bb.utils.contains_any('PACKAGECONFIG', ['dhcp', 'dhcp6'], 'true', 'false', d)}; then + # build dhcp_release + oe_runmake -C ${S}/contrib/lease-tools + fi +} + +do_install () { + oe_runmake "PREFIX=${D}${prefix}" \ + "BINDIR=${D}${bindir}" \ + "MANDIR=${D}${mandir}" \ + install-i18n + install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d + install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq + + install -d ${D}${systemd_unitdir}/system + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then + install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service + else + install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service + fi + + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${sysconfdir}/systemd/resolved.conf.d/ + install -m 0644 ${WORKDIR}/dnsmasq-resolved.conf ${D}${sysconfdir}/systemd/resolved.conf.d/ + fi + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'dhcp', d)}" ]; then + install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} + install -m 0755 ${S}/contrib/lease-tools/dhcp_lease_time ${D}${bindir} + fi + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'dhcp6', d)}" ]; then + install -m 0755 ${S}/contrib/lease-tools/dhcp_release6 ${D}${bindir} + fi + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'dbus', d)}" ]; then + install -d ${D}${sysconfdir}/dbus-1/system.d + install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ + fi + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then + install -d ${D}${sysconfdir}/resolvconf/update.d/ + install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles + install -m 0755 ${WORKDIR}/dnsmasq-resolvconf-helper ${D}${bindir} + fi +} + +CONFFILES:${PN} = "${sysconfdir}/dnsmasq.conf" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "dnsmasq.service" diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb index b3ae63c489..0d898be82e 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb @@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341 SRC_URI[md5sum] = "9f413f3184f79a4deecd9444242a5dca" SRC_URI[sha256sum] = "b9437a917fa55344361beb64ec9e0042e99cae8879882a62dd38f6abe2371d0c" -inherit pkgconfig waf-samba +inherit pkgconfig ptest waf-samba PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ @@ -49,11 +49,21 @@ EXTRA_OECONF += "--disable-rpath \ --without-gettext \ " +do_install:append() { + install -Dm 0755 ${B}/bin/test_tevent_trace ${D}${bindir}/test_tevent_trace + install -Dm 0755 ${B}/bin/test_tevent_tag ${D}${bindir}/test_tevent_tag + install -Dm 0755 ${B}/bin/replace_testsuite ${D}${bindir}/replace_testsuite +} + PACKAGES += "python3-tevent" RPROVIDES:${PN}-dbg += "python3-tevent-dbg" FILES:${PN} += "${libdir}/tevent/*" +FILES:${PN}-ptest += "${bindir}/replace_testsuite \ + ${bindir}/test_tevent_tag \ + ${bindir}/test_tevent_trace \ + ${libdir}/libcmocka-tevent.so" FILES:python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.33.4.bb b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.33.7.bb index bc28eb84fe..2af649cb45 100644 --- a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.33.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.33.7.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0" SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \ " -SRCREV = "eaca70ec362dcf745fc81188f6008528d1b17961" +SRCREV = "a5f804180240aea7031470cb8ed294f904268f0a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-Update-to-OpenSSL-3.0.0-alpha15.patch b/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-Update-to-OpenSSL-3.0.0-alpha15.patch deleted file mode 100644 index 825f6c93c3..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-Update-to-OpenSSL-3.0.0-alpha15.patch +++ /dev/null @@ -1,111 +0,0 @@ -From ba368822d0a197cb84c46c911d40d0c52cf9c391 Mon Sep 17 00:00:00 2001 -From: Hal Murray <hmurray@megapathdsl.net> -Date: Sun, 2 May 2021 22:24:26 -0700 -Subject: [PATCH] Update to OpenSSL 3.0.0-alpha15 - -Upstream-Status: Backport [https://gitlab.com/NTPsec/ntpsec/-/commit/ba368822d0a197cb84c46c911d40d0c52cf9c391] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Signed-off-by: Alex Kiernan <alexk@zuma.ai> ---- - attic/cmac-timing.c | 37 ++++++++++++++----------------------- - 1 file changed, 14 insertions(+), 23 deletions(-) - -diff --git a/attic/cmac-timing.c b/attic/cmac-timing.c -index c2088db63a4c..464daa76b9e6 100644 ---- a/attic/cmac-timing.c -+++ b/attic/cmac-timing.c -@@ -225,28 +225,14 @@ static void DoPKEY( - #if OPENSSL_VERSION_NUMBER > 0x20000000L - static size_t One_EVP_MAC( - EVP_MAC_CTX *ctx, /* context */ -- char *cipher, - uint8_t *key, /* key pointer */ - int keylength, /* key length */ - uint8_t *pkt, /* packet pointer */ - int pktlength /* packet length */ - ) { -- OSSL_PARAM params[3]; - size_t len = EVP_MAX_MD_SIZE; - -- params[0] = -- OSSL_PARAM_construct_utf8_string("cipher", cipher, 0); -- params[1] = -- OSSL_PARAM_construct_octet_string("key", key, keylength); -- params[2] = OSSL_PARAM_construct_end(); -- if (0 == EVP_MAC_CTX_set_params(ctx, params)) { -- unsigned long err = ERR_get_error(); -- char * str = ERR_error_string(err, NULL); -- printf("## Oops, EVP_MAC_CTX_set_params() failed: %s.\n", str); -- return 0; -- } -- -- if (0 == EVP_MAC_init(ctx)) { -+ if (0 == EVP_MAC_init(ctx, key, keylength, NULL)) { - unsigned long err = ERR_get_error(); - char * str = ERR_error_string(err, NULL); - printf("## Oops, EVP_MAC_init() failed: %s.\n", str); -@@ -255,13 +241,13 @@ static size_t One_EVP_MAC( - if (0 == EVP_MAC_update(ctx, pkt, pktlength)) { - unsigned long err = ERR_get_error(); - char * str = ERR_error_string(err, NULL); -- printf("## Oops, EVP_MAC_init() failed: %s.\n", str); -+ printf("## Oops, EVP_MAC_update() failed: %s.\n", str); - return 0; - } - if (0 == EVP_MAC_final(ctx, answer, &len, sizeof(answer))) { - unsigned long err = ERR_get_error(); - char * str = ERR_error_string(err, NULL); -- printf("## Oops, EVP_MAC_init() failed: %s.\n", str); -+ printf("## Oops, EVP_MAC_final() failed: %s.\n", str); - return 0; - } - return len; -@@ -290,7 +276,7 @@ static void Do_EVP_MAC( - - clock_gettime(CLOCK_MONOTONIC, &start); - for (int i = 0; i < SAMPLESIZE; i++) { -- digestlength = One_EVP_MAC(evp, cbc, key, keylength, pkt, pktlength); -+ digestlength = One_EVP_MAC(evp, key, keylength, pkt, pktlength); - if (0 == digestlength) break; - } - clock_gettime(CLOCK_MONOTONIC, &stop); -@@ -305,26 +291,31 @@ static size_t One_EVP_MAC2( - uint8_t *pkt, /* packet pointer */ - int pktlength /* packet length */ - ) { -+ EVP_MAC_CTX *dup; - size_t len = EVP_MAX_MD_SIZE; - -- if (0 == EVP_MAC_init(ctx)) { -+ // dup = ctx; -+ dup = EVP_MAC_CTX_dup(ctx); -+ -+ if (0 == EVP_MAC_init(dup, NULL, 0, NULL)) { - unsigned long err = ERR_get_error(); - char * str = ERR_error_string(err, NULL); - printf("## Oops, EVP_MAC_init() failed: %s.\n", str); - return 0; - } -- if (0 == EVP_MAC_update(ctx, pkt, pktlength)) { -+ if (0 == EVP_MAC_update(dup, pkt, pktlength)) { - unsigned long err = ERR_get_error(); - char * str = ERR_error_string(err, NULL); -- printf("## Oops, EVP_MAC_init() failed: %s.\n", str); -+ printf("## Oops, EVP_MAC_update() failed: %s.\n", str); - return 0; - } -- if (0 == EVP_MAC_final(ctx, answer, &len, sizeof(answer))) { -+ if (0 == EVP_MAC_final(dup, answer, &len, sizeof(answer))) { - unsigned long err = ERR_get_error(); - char * str = ERR_error_string(err, NULL); -- printf("## Oops, EVP_MAC_init() failed: %s.\n", str); -+ printf("## Oops, EVP_MAC_final() failed: %s.\n", str); - return 0; - } -+ EVP_MAC_CTX_free(dup); - return len; - } - --- -2.33.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-ntpd-ntp_sandbox.c-allow-clone3-for-glibc-2.34-in-se.patch b/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-ntpd-ntp_sandbox.c-allow-clone3-for-glibc-2.34-in-se.patch deleted file mode 100644 index 112aaa2a07..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-ntpd-ntp_sandbox.c-allow-clone3-for-glibc-2.34-in-se.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d474682bb30b93d04b7b01c2dd09832e483265ed Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 14 Nov 2021 08:54:58 +0000 -Subject: [PATCH] ntpd/ntp_sandbox.c: allow clone3 for glibc-2.34 in seccomp - filter - -Bug: https://bugs.gentoo.org/823692 -Fixes: https://gitlab.com/NTPsec/ntpsec/-/issues/713 -Signed-off-by: Sam James <sam@gentoo.org> -Upstream-Status: Backport [https://gitlab.com/NTPsec/ntpsec/-/commit/d474682bb30b93d04b7b01c2dd09832e483265ed] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Signed-off-by: Alex Kiernan <alexk@zuma.ai> ---- - ntpd/ntp_sandbox.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c -index e66faaa8cbb0..3d6bccdfcf77 100644 ---- a/ntpd/ntp_sandbox.c -+++ b/ntpd/ntp_sandbox.c -@@ -401,6 +401,7 @@ int scmp_sc[] = { - * rather than generate a trap. - */ - SCMP_SYS(clone), /* threads */ -+ SCMP_SYS(clone3), - SCMP_SYS(kill), /* generate signal */ - SCMP_SYS(madvise), - SCMP_SYS(mprotect), --- -2.34.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-ntpd-ntp_sandbox.c-allow-newfstatat-on-all-archs-for.patch b/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-ntpd-ntp_sandbox.c-allow-newfstatat-on-all-archs-for.patch deleted file mode 100644 index 3bec2cea77..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-ntpd-ntp_sandbox.c-allow-newfstatat-on-all-archs-for.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a6c0847582305aaab122d54b635954829812922f Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alexk@zuma.ai> -Date: Thu, 30 Dec 2021 09:32:26 +0000 -Subject: [PATCH 1/2] ntpd/ntp_sandbox.c: allow newfstatat on all archs for - glibc-2.34 in seccomp filter - -On Yocto Poky, newfstatat is used on (at least) arm64, x86_64 and -riscv64: - - 2021-12-30T09:32:04 ntpd[341]: ERR: SIGSYS: got a trap. - 2021-12-30T09:32:04 ntpd[341]: ERR: SIGSYS/seccomp bad syscall 262/0xc000003e - -Upstream-Status: Backport [https://gitlab.com/NTPsec/ntpsec/-/commit/a6c0847582305aaab122d54b635954829812922f] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Signed-off-by: Alex Kiernan <alexk@zuma.ai> ---- - ntpd/ntp_sandbox.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c -index 3d6bccdfcf77..1ae82a671344 100644 ---- a/ntpd/ntp_sandbox.c -+++ b/ntpd/ntp_sandbox.c -@@ -349,6 +349,7 @@ int scmp_sc[] = { - SCMP_SYS(lseek), - SCMP_SYS(membarrier), /* Needed on Alpine 3.11.3 */ - SCMP_SYS(munmap), -+ SCMP_SYS(newfstatat), - SCMP_SYS(open), - #ifdef __NR_openat - SCMP_SYS(openat), /* SUSE */ -@@ -452,7 +453,6 @@ int scmp_sc[] = { - #endif - #if defined(__aarch64__) - SCMP_SYS(faccessat), -- SCMP_SYS(newfstatat), - SCMP_SYS(renameat), - SCMP_SYS(linkat), - SCMP_SYS(unlinkat), --- -2.34.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch b/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch new file mode 100644 index 0000000000..2e3730df47 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch @@ -0,0 +1,29 @@ +From 792cb4f9d13450251c6344eed2b35f382c98df0d Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alexk@zuma.ai> +Date: Thu, 19 Jan 2023 13:00:45 +0000 +Subject: [PATCH] wscript: Add BISONFLAGS support + +--- + wscript | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/wscript b/wscript +index 7329d6e46889..de51f1e9cdd9 100644 +--- a/wscript ++++ b/wscript +@@ -140,6 +140,7 @@ def configure(ctx): + # Ensure m4 is present, or bison will fail with SIGPIPE + ctx.find_program('m4') + ctx.load('bison') ++ ctx.add_os_flags('BISONFLAGS') + + for opt in opt_map: + ctx.env[opt] = opt_map[opt] +@@ -911,6 +912,7 @@ int main(int argc, char **argv) { + msg_setting("CFLAGS", " ".join(ctx.env.CFLAGS)) + msg_setting("LDFLAGS", " ".join(ctx.env.LDFLAGS)) + msg_setting("LINKFLAGS_NTPD", " ".join(ctx.env.LINKFLAGS_NTPD)) ++ msg_setting("BISONFLAGS", ctx.env.BISONFLAGS) + msg_setting("PREFIX", ctx.env.PREFIX) + msg_setting("LIBDIR", ctx.env.LIBDIR) + msg_setting("Droproot Support", droproot_type) diff --git a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Widen-the-search-for-tags.patch b/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Widen-the-search-for-tags.patch deleted file mode 100644 index 98c62eed49..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Widen-the-search-for-tags.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9a7dead72f41e79979625c9bdef2fb638427d3d6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 22 Aug 2022 20:54:17 -0700 -Subject: [PATCH] wscript: Widen the search for tags - -Default is to look for annotated tags, howveer when using devtool we -create our own git tree from release tarballs which will have tags but -they are not annotated, therefore broaden the search to include all tags - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index 879ded1..dff835d 100644 ---- a/wscript -+++ b/wscript -@@ -177,7 +177,7 @@ def configure(ctx): - if build_desc: - build_desc = ' ' + build_desc - if ctx.env.BIN_GIT: -- cmd = ctx.env.BIN_GIT + shlex.split("describe --dirty") -+ cmd = ctx.env.BIN_GIT + shlex.split("describe --tags --dirty") - git_short_hash = ctx.cmd_and_log(cmd).strip() - git_short_hash = '-'.join(git_short_hash.split('-')[1:]) - diff --git a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0002-ntpd-ntp_sandbox.c-match-riscv-to-aarch-in-seccomp-f.patch b/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0002-ntpd-ntp_sandbox.c-match-riscv-to-aarch-in-seccomp-f.patch deleted file mode 100644 index 705a87bdfa..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec/0002-ntpd-ntp_sandbox.c-match-riscv-to-aarch-in-seccomp-f.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0f94870b84e68448f16b1304058bde4628dafde5 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alexk@zuma.ai> -Date: Thu, 30 Dec 2021 10:41:20 +0000 -Subject: [PATCH 2/2] ntpd/ntp_sandbox.c: match riscv to aarch in seccomp - filter - -On Yocto Poky, faccessat (et al) are also used on riscv64: - - 2018-03-09T12:35:32 ntpd[341]: ERR: SIGSYS: got a trap. - 2018-03-09T12:35:32 ntpd[341]: ERR: SIGSYS/seccomp bad syscall 48/0xc00000f3 - -Upstream-Status: Backport [https://gitlab.com/NTPsec/ntpsec/-/commit/0f94870b84e68448f16b1304058bde4628dafde5] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Signed-off-by: Alex Kiernan <alexk@zuma.ai> ---- - ntpd/ntp_sandbox.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c -index 1ae82a671344..4a14ae224dc6 100644 ---- a/ntpd/ntp_sandbox.c -+++ b/ntpd/ntp_sandbox.c -@@ -451,7 +451,7 @@ int scmp_sc[] = { - /* gentoo 64-bit and 32-bit, Intel and Arm use mmap */ - SCMP_SYS(mmap), - #endif --#if defined(__aarch64__) -+#if defined(__aarch64__) || defined(__riscv) - SCMP_SYS(faccessat), - SCMP_SYS(renameat), - SCMP_SYS(linkat), --- -2.34.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb b/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2.bb index e975f903f9..d11ada67ee 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2.bb @@ -2,25 +2,22 @@ SUMMARY = "The Network Time Protocol suite, refactored" HOMEPAGE = "https://www.ntpsec.org/" LICENSE = "CC-BY-4.0 & BSD-2-Clause & NTP & BSD-3-Clause & MIT" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0520591566b6ed3a9ced8b15b4d4abf9 \ - file://libjsmn/LICENSE;md5=38118982429881235de8adf478a8e75d \ - file://docs/copyright.adoc;md5=9a1e3fce4b630078cb67ba2b619d2b13 \ - file://libaes_siv/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = "file://LICENSES/BSD-2;md5=653830da7b770a32f6f50f6107e0b186 \ + file://LICENSES/BSD-3;md5=55e9dcf6a625a2dcfcda4ef6a647fbfd \ + file://LICENSES/CC-BY-4.0;md5=2ab724713fdaf49e4523c4503bfd068d \ + file://LICENSES/MIT;md5=5a9dfc801af3eb49df2055c9b07918b2 \ + file://LICENSES/NTP;md5=cb56b7747f86157c78ca81f224806694" DEPENDS += "bison-native \ openssl \ python3" SRC_URI = "https://ftp.ntpsec.org/pub/releases/ntpsec-${PV}.tar.gz \ - file://0001-Update-to-OpenSSL-3.0.0-alpha15.patch \ - file://0001-ntpd-ntp_sandbox.c-allow-clone3-for-glibc-2.34-in-se.patch \ - file://0001-ntpd-ntp_sandbox.c-allow-newfstatat-on-all-archs-for.patch \ - file://0002-ntpd-ntp_sandbox.c-match-riscv-to-aarch-in-seccomp-f.patch \ file://volatiles.ntpsec \ - file://0001-wscript-Widen-the-search-for-tags.patch \ + file://0001-wscript-Add-BISONFLAGS-support.patch \ " -SRC_URI[sha256sum] = "f2684835116c80b8f21782a5959a805ba3c44e3a681dd6c17c7cb00cc242c27a" +SRC_URI[sha256sum] = "2f2848760b915dfe185b9217f777738b36ceeb78a7fc208b7e74e039dec22df5" UPSTREAM_CHECK_URI = "ftp://ftp.ntpsec.org/pub/releases/" @@ -66,7 +63,6 @@ EXTRA_OECONF = "--cross-compiler='${CC}' \ --pyshebang=${bindir}/python3 \ --pythondir=${PYTHON_SITEPACKAGES_DIR} \ --pythonarchdir=${PYTHON_SITEPACKAGES_DIR} \ - --enable-debug \ --enable-debug-gdb \ --enable-early-droproot" @@ -74,6 +70,12 @@ EXTRA_OEWAF_BUILD ?= "-v" NTP_USER_HOME ?= "/var/lib/ntp" +BISONFLAGS = "--file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" + +do_configure:prepend() { + export BISONFLAGS="${BISONFLAGS}" +} + do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 755 ${S}/etc/rc/ntpd ${D}${sysconfdir}/init.d diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.8.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.9.bb index 266d43aa6f..a11cd5a6cc 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.9.bb @@ -11,7 +11,7 @@ DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ " -SRC_URI[sha256sum] = "d3303a43c0bd7b75a12b64855e8edcb53696f06190364f26d1533bde1f2e453c" +SRC_URI[sha256sum] = "5e16580998834658c17cebfb31dd637e728669cf2fdd325460234a4643b8d81d" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.2.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.3.bb index 0a541acfea..03f1b76f97 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.3.bb @@ -26,7 +26,7 @@ SRC_URI = " \ file://run-ptest \ " -SRC_URI[sha256sum] = "f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5" +SRC_URI[sha256sum] = "ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3" UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.17.0.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.17.1.bb index 0dd0ce8822..caa1bb3396 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.17.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.17.1.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master;protocol=https \ file://0001-contrib-add-yocto-compatible-init-script.patch \ " -SRCREV = "d25e0cd9b0545ff13120430c94326ceaf14b074f" +SRCREV = "90831af981221bbce1cd7b15055562336760e484" inherit autotools pkgconfig systemd update-rc.d diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index ae4d38085a..51197c27f3 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1,9 +1,12 @@ RDEPENDS:packagegroup-meta-oe-devtools += "\ python3-distutils-extra \ rwmem \ - speedtest-cli \ mongodb \ " +packagegroup-meta-oe-devtools:remove:riscv64 = "mongodb" +packagegroup-meta-oe-devtools:remove:riscv32 = "mongodb" +packagegroup-meta-oe-devtools:remove:mipsarch = "mongodb" +packagegroup-meta-oe-devtools:remove:powerpc = "mongodb" RDEPENDS:packagegroup-meta-oe-connectivity += "\ lirc \ @@ -11,7 +14,7 @@ RDEPENDS:packagegroup-meta-oe-connectivity += "\ RDEPENDS:packagegroup-meta-oe-extended += "\ lcdproc \ - mozjs \ + mozjs-102 \ " RDEPENDS:packagegroup-meta-oe-support += "\ nvmetcli \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch deleted file mode 100644 index 947c764030..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c54ae9c524998e449b822feb465a0c90317cd735 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 20 Sep 2022 15:10:26 +0100 -Subject: [PATCH] trivial: Fix compile when using python 3.7 or older - -Upstream-Status: Backport [https://github.com/fwupd/fwupd/pull/5051] -Signed-off-by: Richard Hughes <richard@hughsie.com> ---- - contrib/generate-gresource-xml.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/contrib/generate-gresource-xml.py b/contrib/generate-gresource-xml.py -index 235a770020..569c804937 100755 ---- a/contrib/generate-gresource-xml.py -+++ b/contrib/generate-gresource-xml.py -@@ -23,6 +23,9 @@ - n_file.set("preprocess", "xml-stripblanks") - n_file.set("alias", os.path.basename(fn)) - with open(sys.argv[1], "wb") as f: -- f.write(ET.tostring(root, "utf-8", xml_declaration=True)) -+ try: -+ f.write(ET.tostring(root, "utf-8", xml_declaration=True)) -+ except TypeError: -+ f.write(ET.tostring(root, "utf-8")) - - sys.exit(0) diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb index 99077923dc..0f889ca8fc 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb @@ -5,9 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://c54ae9c524998e449b822feb465a0c90317cd735.patch \ file://run-ptest" -SRC_URI[sha256sum] = "adfa07434cdc29ec41c40fef460e8d970963fe0c7e849dec7f3932adb161f886" +SRC_URI[sha256sum] = "719a791ac4ba5988aeb93ec42778bd65d33cb075d0c093b5c04e5e1682be528a" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" @@ -18,7 +17,7 @@ inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-do GIDOCGEN_MESON_OPTION = 'docs' GIDOCGEN_MESON_ENABLE_FLAG = 'docgen' -GIDOCGEN_MESON_DISABLE_FLAG = 'none' +GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' PACKAGECONFIG ??= "curl gnutls gudev gusb \ ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ @@ -26,23 +25,25 @@ PACKAGECONFIG ??= "curl gnutls gudev gusb \ ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \ hsi \ + plugin_android_boot \ plugin_acpi_phat \ - plugin_amt \ plugin_bcm57xx \ plugin_emmc \ plugin_ep963x \ plugin_fastboot \ plugin_flashrom \ plugin_gpio \ + plugin_igsc \ + plugin_intel_me \ plugin_intel_spi \ plugin_logitech_bulkcontroller \ + plugin_logitech_scribe \ plugin_modem_manager \ plugin_msr \ plugin_nitrokey \ plugin_nvme \ plugin_parade_lspcon \ plugin_pixart_rf \ - plugin_platform_integrity \ plugin_realtek_mst \ plugin_redfish \ plugin_synaptics_mst \ @@ -74,7 +75,7 @@ PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" # TODO plugins-all meta-option that expands to all plugin_*? PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false" -PACKAGECONFIG[plugin_amt] = "-Dplugin_amt=true,-Dplugin_amt=false" +PACKAGECONFIG[plugin_android_boot] = "-Dplugin_android_boot=enabled,-Dplugin_android_boot=disabled" PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=true,-Dplugin_bcm57xx=false" PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=true,-Dplugin_cfu=false" PACKAGECONFIG[plugin_dell] = "-Dplugin_dell=true,-Dplugin_dell=false,libsmbios" @@ -84,15 +85,17 @@ PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=true,-Dplugin_ep963x=false" PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=true,-Dplugin_fastboot=false" PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=true,-Dplugin_flashrom=false,flashrom" PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=true,-Dplugin_gpio=false" +PACKAGECONFIG[plugin_igsc] = "-Dplugin_igsc=enabled,-Dplugin_igsc=disabled" +PACKAGECONFIG[plugin_intel_me] = "-Dplugin_intel_me=enabled,-Dplugin_intel_me=disabled" PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=true,-Dplugin_intel_spi=false -Dlzma=false,xz" PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=true,-Dplugin_logitech_bulkcontroller=false,protobuf-c-native protobuf-c" +PACKAGECONFIG[plugin_logitech_scribe] = "-Dplugin_logitech_scribe=enabled,-Dplugin_logitech_scribe=disabled" PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=true,-Dplugin_modem_manager=false,libqmi modemmanager" PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=true,-Dplugin_msr=false,cpuid" PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=true,-Dplugin_nitrokey=false" PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=true,-Dplugin_nvme=false" PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=true,-Dplugin_parade_lspcon=false" PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=true,-Dplugin_pixart_rf=false" -PACKAGECONFIG[plugin_platform_integrity] = "-Dplugin_platform_integrity=true,-Dplugin_platform_integrity=false" PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=true,-Dplugin_powerd=false" PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=true,-Dplugin_realtek_mst=false" PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false" @@ -107,12 +110,13 @@ PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=true,-Dplugin_uf2=false" PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false" # Always disable these plugins on non-x86 platforms as they don't compile or are useless -DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr" +DISABLE_NON_X86 = "plugin_intel_me plugin_intel_spi plugin_msr" DISABLE_NON_X86:x86 = "" DISABLE_NON_X86:x86-64 = "" PACKAGECONFIG:remove = "${DISABLE_NON_X86}" FILES:${PN} += "${libdir}/fwupd-plugins-* \ + ${libdir}/fwupd-${PV} \ ${systemd_unitdir} \ ${datadir}/fish \ ${datadir}/metainfo \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb index 6c68aede03..af4f2c54bb 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb @@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" DEPENDS += "openssl gperf-native" -SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_19/ACE-${PV}.tar.bz2 \ file://ace_config.patch \ file://no_sysctl.patch \ " - -SRC_URI[sha256sum] = "ccd94fa45df1e8bb1c901d02c0a64c1626497e5eeda2f057fcf0a1578dae2148" +SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41" COMPATIBLE_HOST:libc-musl = "null" @@ -23,7 +22,7 @@ export ACE_ROOT="${WORKDIR}/ACE_wrappers" inherit pkgconfig CXXFLAGS:append = " -fpermissive -Wnodeprecated-declarations" -CXX:append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " +CXX:append = " -std=gnu++14 -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.2.bb index 91450e2c77..4aca6fee5f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ " -SRCREV = "d512218c4fa5667d4fe15977d3f15f05591f1f1a" +SRCREV = "c1e878f5710bafb17aca5ece7d9079e73a78c554" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch deleted file mode 100644 index 8d8867aea7..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch +++ /dev/null @@ -1,28 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package for -cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: git/scripts/common.m4 -=================================================================== ---- git.orig/scripts/common.m4 -+++ git/scripts/common.m4 -@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses t - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <execinfo.h> - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <inttypes.h> - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 28a3e1e77a..50096cfdbc 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -1,36 +1,32 @@ DESCRIPTION = "libTorrent is a BitTorrent library written in C++ for *nix, \ with a focus on high performance and good code." HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "zlib libsigc++-2.0 openssl cppunit" -SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https \ - file://don-t-run-code-while-configuring-package.patch \ - " -SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1" +SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https" +SRCREV = "e60f222241319aaae482789517ad00ae9344bd13" CVE_CHECK_IGNORE += "\ CVE-2009-1760 \ " -PV = "0.13.8" +PV = "0.13.8+git${SRCPV}" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "instrumentation" + +PACKAGECONFIG ??= "instrumentation aligned" PACKAGECONFIG:remove:mipsarch = "instrumentation" PACKAGECONFIG:remove:powerpc = "instrumentation" PACKAGECONFIG:remove:riscv32 = "instrumentation" PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation," +PACKAGECONFIG[aligned] = "--enable-aligned,--disable-aligned," inherit autotools pkgconfig EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}" - -do_configure:prepend() { - (cd ${S}; ./autogen.sh; cd -) -} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch deleted file mode 100644 index 7d09f4382f..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch +++ /dev/null @@ -1,104 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package - for cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Update for 0.9.8. -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - scripts/checks.m4 | 34 ---------------------------------- - scripts/common.m4 | 28 ---------------------------- - 2 files changed, 62 deletions(-) - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 83be846..1af80f5 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -95,40 +95,6 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include <fcntl.h> -- #include <stdlib.h> -- #include <unistd.h> -- #include <sys/event.h> -- #include <sys/time.h> -- int main() { -- struct kevent ev@<:@2@:>@, ev_out@<:@2@:>@; -- struct timespec ts = { 0, 0 }; -- int pfd@<:@2@:>@, pty@<:@2@:>@, kfd, n; -- char buffer@<:@9001@:>@; -- if (pipe(pfd) == -1) return 1; -- if (fcntl(pfd@<:@1@:>@, F_SETFL, O_NONBLOCK) == -1) return 2; -- while ((n = write(pfd@<:@1@:>@, buffer, sizeof(buffer))) == sizeof(buffer)); -- if ((pty@<:@0@:>@=posix_openpt(O_RDWR | O_NOCTTY)) == -1) return 3; -- if ((pty@<:@1@:>@=grantpt(pty@<:@0@:>@)) == -1) return 4; -- EV_SET(ev+0, pfd@<:@1@:>@, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, NULL); -- EV_SET(ev+1, pty@<:@1@:>@, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, NULL); -- if ((kfd = kqueue()) == -1) return 5; -- if ((n = kevent(kfd, ev, 2, NULL, 0, NULL)) == -1) return 6; -- if (ev_out@<:@0@:>@.flags & EV_ERROR) return 7; -- if (ev_out@<:@1@:>@.flags & EV_ERROR) return 8; -- read(pfd@<:@0@:>@, buffer, sizeof(buffer)); -- if ((n = kevent(kfd, NULL, 0, ev_out, 2, &ts)) < 1) return 9; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(yes) -- ], [ -- AC_DEFINE(KQUEUE_SOCKET_ONLY, 1, kqueue only supports sockets.) -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_WITH_KQUEUE], [ -diff --git a/scripts/common.m4 b/scripts/common.m4 -index aaf005e..42fb016 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -152,38 +152,10 @@ dnl Need to fix this so that it uses the stuff defined by the system. - - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) -- -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -- #include <execinfo.h> -- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} -- ])], -- [ -- AC_MSG_RESULT(yes) -- AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h) -- ], [ -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include <inttypes.h> -- int main() { -- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; -- int i; -- for (i = 1; i < 4; ++i) -- if (*(uint32_t*)(buf + i) == 0) return -1; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(none needed) -- ], [ -- AC_DEFINE(USE_ALIGNED, 1, Require byte alignment) -- AC_MSG_RESULT(required) -- ]) - ]) - - --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 7879324cc6..d5411b19b2 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -1,17 +1,14 @@ SUMMARY = "Torrent client" HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" +DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses" -SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https \ - file://don-t-run-code-while-configuring-package.patch \ -" -# v0.9.8 -SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947" +SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https" +SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550" -PV = "0.9.8" +PV = "0.9.8+git${SRCPV}" S = "${WORKDIR}/git" @@ -21,6 +18,6 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," inherit autotools pkgconfig -do_configure:prepend() { - (cd ${S}; ./autogen.sh; cd -) -} +EXTRA_AUTORECONF += "--exclude=aclocal" + +CXXFLAGS += "-std=gnu++14" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch new file mode 100644 index 0000000000..fd995153b3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch @@ -0,0 +1,180 @@ +From 0b9c6c4286a33961016839826e709a0e7394b28b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 00:00:04 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + build/cmake/BoostMacros.cmake | 2 +- + lib/c_glib/CMakeLists.txt | 4 ++-- + lib/c_glib/test/CMakeLists.txt | 2 +- + lib/cpp/CMakeLists.txt | 7 +++---- + lib/cpp/test/CMakeLists.txt | 2 +- + test/c_glib/CMakeLists.txt | 6 +++--- + test/cpp/CMakeLists.txt | 6 +++--- + 7 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/build/cmake/BoostMacros.cmake b/build/cmake/BoostMacros.cmake +index ffb85af..9f9d2dd 100644 +--- a/build/cmake/BoostMacros.cmake ++++ b/build/cmake/BoostMacros.cmake +@@ -26,7 +26,7 @@ macro(REQUIRE_BOOST_HEADERS) + endif() + if (DEFINED Boost_INCLUDE_DIRS) + # pre-boost 1.70.0 aware cmake, otherwise it is using targets +- include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + endif() + endmacro() + +diff --git a/lib/c_glib/CMakeLists.txt b/lib/c_glib/CMakeLists.txt +index 218f7dd..d7a6161 100644 +--- a/lib/c_glib/CMakeLists.txt ++++ b/lib/c_glib/CMakeLists.txt +@@ -83,7 +83,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) + list(APPEND SYSLIBS OpenSSL::Crypto) + endif() + else() +- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + endif() + endif() +@@ -97,7 +97,7 @@ target_link_libraries(thrift_c_glib PUBLIC ${SYSLIBS}) + + # If Zlib is not found just ignore the Zlib stuff + if(WITH_ZLIB) +- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + ADD_LIBRARY_THRIFT(thrift_c_glib_zlib ${thrift_c_glib_zlib_SOURCES}) + target_link_libraries(thrift_c_glib_zlib ${SYSLIBS} ${ZLIB_LIBRARIES}) + target_link_libraries(thrift_c_glib_zlib thrift_c_glib) +diff --git a/lib/c_glib/test/CMakeLists.txt b/lib/c_glib/test/CMakeLists.txt +index 85c6dd0..0c8d3d2 100644 +--- a/lib/c_glib/test/CMakeLists.txt ++++ b/lib/c_glib/test/CMakeLists.txt +@@ -129,7 +129,7 @@ target_link_libraries(testthriftmemorybufferreadcheck testgenc) + add_test(NAME testthriftmemorybufferreadcheck COMMAND testthriftmemorybufferreadcheck) + + if(WITH_ZLIB) +- include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + add_executable(testzlibtransport testzlibtransport.c) + target_link_libraries(testzlibtransport testgenc ${ZLIB_LIBRARIES}) + target_link_libraries(testzlibtransport thrift_c_glib_zlib) +diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt +index 13b41c5..96bea53 100644 +--- a/lib/cpp/CMakeLists.txt ++++ b/lib/cpp/CMakeLists.txt +@@ -111,7 +111,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) + list(APPEND SYSLIBS OpenSSL::Crypto) + endif() + else() +- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + endif() + endif() +@@ -167,8 +167,7 @@ ADD_PKGCONFIG_THRIFT(thrift) + + if(WITH_LIBEVENT) + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream +- include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) +- ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") + ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES}) + target_link_libraries(thriftnb PUBLIC thrift) + if(TARGET libevent::core AND TARGET libevent::extra) +@@ -182,7 +181,7 @@ endif() + + if(WITH_ZLIB) + find_package(ZLIB REQUIRED) +- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + + ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES}) + target_link_libraries(thriftz PUBLIC thrift) +diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt +index 19854e1..1b36b47 100644 +--- a/lib/cpp/test/CMakeLists.txt ++++ b/lib/cpp/test/CMakeLists.txt +@@ -127,7 +127,7 @@ endif () + add_test(NAME TServerIntegrationTest COMMAND TServerIntegrationTest) + + if(WITH_ZLIB) +-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + add_executable(TransportTest TransportTest.cpp) + target_link_libraries(TransportTest + testgencpp +diff --git a/test/c_glib/CMakeLists.txt b/test/c_glib/CMakeLists.txt +index 410774d..cbda860 100644 +--- a/test/c_glib/CMakeLists.txt ++++ b/test/c_glib/CMakeLists.txt +@@ -21,14 +21,14 @@ + include(ThriftMacros) + + find_package(GLIB REQUIRED COMPONENTS gobject) +-include_directories(SYSTEM "${GLIB_INCLUDE_DIR}") +-include_directories(SYSTEM "${GLIBCONFIG_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIB_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIBCONFIG_INCLUDE_DIR}") + + #Make sure gen-c_glib files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") + include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-c_glib") + include_directories("${PROJECT_SOURCE_DIR}/lib/c_glib/src") +-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + + set(crosstestgencglib_SOURCES + gen-c_glib/t_test_second_service.c +diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt +index a6c1fd5..160c67b 100644 +--- a/test/cpp/CMakeLists.txt ++++ b/test/cpp/CMakeLists.txt +@@ -27,13 +27,13 @@ REQUIRE_BOOST_LIBRARIES(BOOST_COMPONENTS) + include(ThriftMacros) + + find_package(OpenSSL REQUIRED) +-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream +-include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") + + find_package(ZLIB REQUIRED) +-include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + + #Make sure gen-cpp files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb index 24d07b8e52..216af02c42 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb @@ -10,6 +10,7 @@ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ " SRC_URI[sha256sum] = "b272c1788bb165d99521a2599b31b97fa69e5931d099015d91ae107a0b0cc58f" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb index c8dabc5ead..7af62b7418 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb @@ -2,15 +2,12 @@ SUMMARY = "D-Bus wrapper in C++ for dbus" HOMEPAGE = "https://dbus-cxx.github.io/" BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" SECTION = "base" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" +LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ - file://0001-Include-typeinfo-for-typeid.patch \ - file://0001-include-utility-header.patch \ -" -SRC_URI:append:libc-musl = "file://fix_build_musl.patch" -SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264" + file://0001-Include-missing-cstdint.patch" +SRCREV = "898f6ea8f7ffe454e81a9337002df555728d4199" DEPENDS = "\ dbus \ diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch new file mode 100644 index 0000000000..4ad69eab42 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch @@ -0,0 +1,30 @@ +From 56e2cce87445d514c9992ecc19d03bb2115c82d6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 22:17:31 -0800 +Subject: [PATCH] Include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/111] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dbus-cxx/enums.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dbus-cxx/enums.h b/dbus-cxx/enums.h +index 8253a4b..c793fad 100644 +--- a/dbus-cxx/enums.h ++++ b/dbus-cxx/enums.h +@@ -5,6 +5,7 @@ + * * + * This file is part of the dbus-cxx library. * + ***************************************************************************/ ++#include <cstdint> + #include <ostream> + + #ifndef DBUSCXX_ENUMS_H +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch deleted file mode 100644 index 9117877403..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e262b6e7cc6271d71405f10c4817b9b3b2b95f05 Mon Sep 17 00:00:00 2001 -From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> -Date: Mon, 13 Dec 2021 02:00:48 +0100 -Subject: [PATCH] Include typeinfo for typeid() - -Otherwise fails with: - error: must '#include <typeinfo>' before using 'typeid' - -Upstream-Status: Submitted -[https://github.com/dbus-cxx/dbus-cxx/pull/83] ---- - dbus-cxx/demangle.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h -index b71bcb9..9a4e99b 100644 ---- a/dbus-cxx/demangle.h -+++ b/dbus-cxx/demangle.h -@@ -21,6 +21,7 @@ - #define DBUSCXX_DEMANGLE_H - - #include <string> -+#include <typeinfo> - #include <dbus-cxx/dbus-cxx-config.h> - - #if DBUS_CXX_HAS_CXXABI_H --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch deleted file mode 100644 index 0c8262af75..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 63170cfcfbf483716ce2599e165db80713fc2706 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Apr 2022 06:47:19 -0700 -Subject: [PATCH] include utility header - -Needed for exchange from std namespace - -Fixes -dbus-cxx/variant.cpp:135:25: error: 'exchange' is not a member of 'std' - -Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/98] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - dbus-cxx/variant.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/variant.cpp b/dbus-cxx/variant.cpp -index bcf2684..97b622c 100644 ---- a/dbus-cxx/variant.cpp -+++ b/dbus-cxx/variant.cpp -@@ -11,6 +11,7 @@ - #include <dbus-cxx/dbus-cxx-private.h> - #include <dbus-cxx/signatureiterator.h> - #include <stdint.h> -+#include <utility> - #include "enums.h" - #include "path.h" - #include "signature.h" --- -2.35.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch deleted file mode 100644 index e55d987e43..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp -index e8a6060..7a76af6 100644 ---- a/dbus-cxx/sasl.cpp -+++ b/dbus-cxx/sasl.cpp -@@ -70,7 +70,7 @@ std::tuple<bool, bool, std::vector<uint8_t>> SASL::authenticate() { - bool success = false; - bool negotiatedFD = false; - std::vector<uint8_t> serverGUID; -- __uid_t uid = getuid(); -+ uid_t uid = getuid(); - std::string line; - std::smatch regex_match; diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 65eaf6a88f..34689fb48b 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -189,7 +189,6 @@ RDEPENDS:packagegroup-meta-oe-core = "\ distro-feed-configs \ mm-common \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "ndctl", "", d)} \ - opencl-icd-loader \ pim435 \ proxy-libintl \ safec \ @@ -304,7 +303,6 @@ RDEPENDS:packagegroup-meta-oe-devtools ="\ rapidjson \ squashfs-tools-ng \ uftrace \ - unifex \ valijson \ libxerces-c \ xerces-c-samples \ @@ -829,7 +827,6 @@ RDEPENDS:packagegroup-meta-oe-support ="\ liblinebreak \ mailcap \ liboauth \ - libol \ mg \ monit \ mscgen \ @@ -1003,7 +1000,7 @@ RDEPENDS:packagegroup-meta-oe-fortran-packages = "\ # They wont be built as part of images but might be interesting to include # with dev-pkgs images # -# opencl-headers sdbus-c++-libsystemd boost-url nlohmann-fifo sqlite-orm +# opencl-headers sdbus-c++-libsystemd nlohmann-fifo sqlite-orm # nlohmann-json exprtk liblightmodbus p8platform gnome-doc-utils-stub # glm ttf-mplus xbitmaps ceres-solver cli11 fftw gnulib libeigen ade # spdlog span-lite uthash websocketpp catch2 properties-cpp cpp-netlib diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb index 75cd815535..2fb975ced6 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb @@ -42,3 +42,6 @@ do_install:append() { PTEST_PATH = "${libdir}/${BPN}/tests" FILES:${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/" FILES:${PN}-dev += "${bindir}/sdbus-c++-xml2cpp" + +# It adds -isystem which is spurious, no idea where it gets it from +CCACHE_DISABLE = "1" diff --git a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.16.bb b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.17.bb index 4b4f5f5102..61d7c8c063 100644 --- a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.16.bb +++ b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.17.bb @@ -6,9 +6,9 @@ inherit cargo # DEFAULT_PREFERENCE = "-1" # how to get coreutils could be as easy as but default to a git checkout: -# SRC_URI += "crate://crates.io/coreutils/0.0.16" +# SRC_URI += "crate://crates.io/coreutils/0.0.17" SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;nobranch=1" -SRCREV = "af13472223a1b6b6b4111a06faa8f561f04c3e59" +SRCREV = "7e127005afbd6c3632d74ad8082340ccb8329d67" S = "${WORKDIR}/git" CARGO_SRC_DIR = "" @@ -22,33 +22,34 @@ SRC_URI += " \ crate://crates.io/aho-corasick/0.7.19 \ crate://crates.io/aliasable/0.1.3 \ crate://crates.io/android_system_properties/0.1.5 \ - crate://crates.io/ansi_term/0.12.1 \ crate://crates.io/arrayref/0.3.6 \ crate://crates.io/arrayvec/0.7.2 \ crate://crates.io/atty/0.2.14 \ crate://crates.io/autocfg/1.1.0 \ crate://crates.io/bigdecimal/0.3.0 \ - crate://crates.io/binary-heap-plus/0.4.1 \ - crate://crates.io/bindgen/0.60.1 \ + crate://crates.io/binary-heap-plus/0.5.0 \ + crate://crates.io/bindgen/0.62.0 \ crate://crates.io/bitflags/1.3.2 \ crate://crates.io/blake2b_simd/1.0.0 \ - crate://crates.io/blake3/1.3.1 \ + crate://crates.io/blake3/1.3.2 \ crate://crates.io/block-buffer/0.10.3 \ - crate://crates.io/bstr/0.2.17 \ - crate://crates.io/bumpalo/3.11.0 \ - crate://crates.io/byte-unit/4.0.14 \ + crate://crates.io/bstr/1.0.1 \ + crate://crates.io/bumpalo/3.11.1 \ crate://crates.io/bytecount/0.6.3 \ crate://crates.io/byteorder/1.4.3 \ - crate://crates.io/cc/1.0.73 \ + crate://crates.io/cc/1.0.77 \ crate://crates.io/cexpr/0.6.0 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.22 \ - crate://crates.io/clang-sys/1.3.3 \ - crate://crates.io/clap/3.2.22 \ - crate://crates.io/clap_complete/3.2.5 \ - crate://crates.io/clap_lex/0.2.4 \ + crate://crates.io/chrono/0.4.23 \ + crate://crates.io/clang-sys/1.4.0 \ + crate://crates.io/clap/4.0.26 \ + crate://crates.io/clap_complete/4.0.6 \ + crate://crates.io/clap_lex/0.3.0 \ + crate://crates.io/codespan-reporting/0.11.1 \ crate://crates.io/compare/0.1.0 \ + crate://crates.io/console/0.15.2 \ crate://crates.io/constant_time_eq/0.1.5 \ + crate://crates.io/constant_time_eq/0.2.4 \ crate://crates.io/conv/0.3.3 \ crate://crates.io/core-foundation-sys/0.8.3 \ crate://crates.io/coz/0.1.3 \ @@ -60,40 +61,54 @@ SRC_URI += " \ crate://crates.io/crc32fast/1.3.2 \ crate://crates.io/crossbeam-channel/0.5.6 \ crate://crates.io/crossbeam-deque/0.8.2 \ - crate://crates.io/crossbeam-epoch/0.9.10 \ - crate://crates.io/crossbeam-utils/0.8.11 \ + crate://crates.io/crossbeam-epoch/0.9.12 \ + crate://crates.io/crossbeam-utils/0.8.13 \ crate://crates.io/crossterm/0.25.0 \ crate://crates.io/crossterm_winapi/0.9.0 \ crate://crates.io/crunchy/0.2.2 \ crate://crates.io/crypto-common/0.1.6 \ - crate://crates.io/ctor/0.1.23 \ + crate://crates.io/ctor/0.1.26 \ crate://crates.io/ctrlc/3.2.3 \ crate://crates.io/custom_derive/0.1.7 \ + crate://crates.io/cxx-build/1.0.82 \ + crate://crates.io/cxx/1.0.82 \ + crate://crates.io/cxxbridge-flags/1.0.82 \ + crate://crates.io/cxxbridge-macro/1.0.82 \ crate://crates.io/data-encoding-macro-internal/0.1.10 \ crate://crates.io/data-encoding-macro/0.1.12 \ crate://crates.io/data-encoding/2.3.2 \ crate://crates.io/diff/0.1.13 \ - crate://crates.io/digest/0.10.5 \ + crate://crates.io/digest/0.10.6 \ crate://crates.io/dlv-list/0.3.0 \ crate://crates.io/dns-lookup/1.0.8 \ - crate://crates.io/dunce/1.0.2 \ + crate://crates.io/dunce/1.0.3 \ crate://crates.io/either/1.8.0 \ + crate://crates.io/encode_unicode/0.3.6 \ crate://crates.io/env_logger/0.8.4 \ - crate://crates.io/env_logger/0.9.0 \ crate://crates.io/errno-dragonfly/0.1.2 \ crate://crates.io/errno/0.2.8 \ crate://crates.io/exacl/0.9.0 \ crate://crates.io/fastrand/1.8.0 \ crate://crates.io/file_diff/1.0.0 \ - crate://crates.io/filetime/0.2.17 \ + crate://crates.io/filetime/0.2.18 \ crate://crates.io/flate2/1.0.24 \ crate://crates.io/fnv/1.0.7 \ crate://crates.io/fs_extra/1.2.0 \ crate://crates.io/fsevent-sys/4.1.0 \ - crate://crates.io/fts-sys/0.2.2 \ + crate://crates.io/fts-sys/0.2.3 \ + crate://crates.io/futures-channel/0.3.25 \ + crate://crates.io/futures-core/0.3.25 \ + crate://crates.io/futures-executor/0.3.25 \ + crate://crates.io/futures-io/0.3.25 \ + crate://crates.io/futures-macro/0.3.25 \ + crate://crates.io/futures-sink/0.3.25 \ + crate://crates.io/futures-task/0.3.25 \ + crate://crates.io/futures-timer/3.0.2 \ + crate://crates.io/futures-util/0.3.25 \ + crate://crates.io/futures/0.3.25 \ crate://crates.io/gcd/2.1.0 \ crate://crates.io/generic-array/0.14.6 \ - crate://crates.io/getrandom/0.2.7 \ + crate://crates.io/getrandom/0.2.8 \ crate://crates.io/glob/0.3.0 \ crate://crates.io/half/2.1.0 \ crate://crates.io/hashbrown/0.12.3 \ @@ -102,69 +117,75 @@ SRC_URI += " \ crate://crates.io/hex-literal/0.3.4 \ crate://crates.io/hex/0.4.3 \ crate://crates.io/hostname/0.3.1 \ - crate://crates.io/humantime/2.1.0 \ - crate://crates.io/iana-time-zone/0.1.48 \ - crate://crates.io/indexmap/1.9.1 \ + crate://crates.io/iana-time-zone-haiku/0.1.1 \ + crate://crates.io/iana-time-zone/0.1.53 \ + crate://crates.io/indicatif/0.17.2 \ crate://crates.io/inotify-sys/0.1.5 \ crate://crates.io/inotify/0.9.6 \ crate://crates.io/instant/0.1.12 \ - crate://crates.io/io-lifetimes/0.7.3 \ - crate://crates.io/itertools/0.10.4 \ - crate://crates.io/itoa/1.0.3 \ + crate://crates.io/io-lifetimes/0.7.5 \ + crate://crates.io/itertools/0.10.5 \ + crate://crates.io/itoa/1.0.4 \ crate://crates.io/js-sys/0.3.60 \ - crate://crates.io/keccak/0.1.2 \ + crate://crates.io/keccak/0.1.3 \ crate://crates.io/kqueue-sys/1.0.3 \ - crate://crates.io/kqueue/1.0.6 \ + crate://crates.io/kqueue/1.0.7 \ crate://crates.io/lazy_static/1.4.0 \ crate://crates.io/lazycell/1.3.0 \ - crate://crates.io/libc/0.2.132 \ - crate://crates.io/libloading/0.7.3 \ + crate://crates.io/libc/0.2.137 \ + crate://crates.io/libloading/0.7.4 \ + crate://crates.io/link-cplusplus/1.0.7 \ crate://crates.io/linux-raw-sys/0.0.46 \ - crate://crates.io/lock_api/0.4.8 \ + crate://crates.io/lock_api/0.4.9 \ crate://crates.io/log/0.4.17 \ - crate://crates.io/lscolors/0.12.0 \ + crate://crates.io/lscolors/0.13.0 \ crate://crates.io/match_cfg/0.1.0 \ crate://crates.io/md-5/0.10.5 \ crate://crates.io/memchr/2.5.0 \ - crate://crates.io/memmap2/0.5.7 \ + crate://crates.io/memmap2/0.5.8 \ crate://crates.io/memoffset/0.6.5 \ + crate://crates.io/memoffset/0.7.1 \ crate://crates.io/minimal-lexical/0.2.1 \ crate://crates.io/miniz_oxide/0.5.4 \ - crate://crates.io/mio/0.8.4 \ + crate://crates.io/mio/0.8.5 \ crate://crates.io/nix/0.25.0 \ crate://crates.io/nom/7.1.1 \ crate://crates.io/notify/5.0.0 \ + crate://crates.io/nu-ansi-term/0.46.0 \ crate://crates.io/num-bigint/0.4.3 \ crate://crates.io/num-integer/0.1.45 \ crate://crates.io/num-traits/0.2.15 \ - crate://crates.io/num_cpus/1.13.1 \ + crate://crates.io/num_cpus/1.14.0 \ crate://crates.io/num_threads/0.1.6 \ crate://crates.io/number_prefix/0.4.0 \ - crate://crates.io/once_cell/1.14.0 \ + crate://crates.io/once_cell/1.16.0 \ crate://crates.io/onig/6.4.0 \ crate://crates.io/onig_sys/69.8.1 \ crate://crates.io/ordered-multimap/0.4.3 \ crate://crates.io/os_display/0.1.3 \ - crate://crates.io/os_str_bytes/6.3.0 \ + crate://crates.io/os_str_bytes/6.4.1 \ crate://crates.io/ouroboros/0.15.5 \ crate://crates.io/ouroboros_macro/0.15.5 \ crate://crates.io/output_vt100/0.1.3 \ + crate://crates.io/overload/0.1.1 \ crate://crates.io/parking_lot/0.12.1 \ - crate://crates.io/parking_lot_core/0.9.3 \ + crate://crates.io/parking_lot_core/0.9.4 \ crate://crates.io/paste/1.0.9 \ crate://crates.io/peeking_take_while/0.1.2 \ - crate://crates.io/phf/0.10.1 \ - crate://crates.io/phf_codegen/0.10.0 \ - crate://crates.io/phf_generator/0.10.0 \ - crate://crates.io/phf_shared/0.10.0 \ + crate://crates.io/phf/0.11.1 \ + crate://crates.io/phf_codegen/0.11.1 \ + crate://crates.io/phf_generator/0.11.1 \ + crate://crates.io/phf_shared/0.11.1 \ + crate://crates.io/pin-project-lite/0.2.9 \ crate://crates.io/pin-utils/0.1.0 \ - crate://crates.io/pkg-config/0.3.25 \ - crate://crates.io/platform-info/1.0.0 \ - crate://crates.io/ppv-lite86/0.2.16 \ + crate://crates.io/pkg-config/0.3.26 \ + crate://crates.io/platform-info/1.0.2 \ + crate://crates.io/portable-atomic/0.3.15 \ + crate://crates.io/ppv-lite86/0.2.17 \ crate://crates.io/pretty_assertions/1.3.0 \ crate://crates.io/proc-macro-error-attr/1.0.4 \ crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro2/1.0.43 \ + crate://crates.io/proc-macro2/1.0.47 \ crate://crates.io/procfs/0.14.1 \ crate://crates.io/quick-error/2.0.1 \ crate://crates.io/quickcheck/1.0.3 \ @@ -172,61 +193,70 @@ SRC_URI += " \ crate://crates.io/rand/0.8.5 \ crate://crates.io/rand_chacha/0.3.1 \ crate://crates.io/rand_core/0.6.4 \ - crate://crates.io/rayon-core/1.9.3 \ - crate://crates.io/rayon/1.5.3 \ + crate://crates.io/rand_pcg/0.3.1 \ + crate://crates.io/rayon-core/1.10.1 \ + crate://crates.io/rayon/1.6.0 \ crate://crates.io/redox_syscall/0.2.16 \ crate://crates.io/reference-counted-singleton/0.1.2 \ crate://crates.io/regex-automata/0.1.10 \ - crate://crates.io/regex-syntax/0.6.27 \ - crate://crates.io/regex/1.6.0 \ + crate://crates.io/regex-syntax/0.6.28 \ + crate://crates.io/regex/1.7.0 \ crate://crates.io/remove_dir_all/0.5.3 \ crate://crates.io/remove_dir_all/0.7.0 \ crate://crates.io/retain_mut/0.1.7 \ crate://crates.io/rlimit/0.8.3 \ + crate://crates.io/rstest/0.16.0 \ + crate://crates.io/rstest_macros/0.16.0 \ crate://crates.io/rust-ini/0.18.0 \ crate://crates.io/rustc-hash/1.1.0 \ - crate://crates.io/rustix/0.35.9 \ + crate://crates.io/rustc_version/0.4.0 \ + crate://crates.io/rustix/0.35.13 \ crate://crates.io/rustversion/1.0.9 \ crate://crates.io/same-file/1.0.6 \ crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/selinux-sys/0.5.3 \ - crate://crates.io/selinux/0.3.0 \ + crate://crates.io/scratch/1.0.2 \ + crate://crates.io/selinux-sys/0.6.1 \ + crate://crates.io/selinux/0.3.1 \ + crate://crates.io/semver/1.0.14 \ + crate://crates.io/serde/1.0.147 \ crate://crates.io/sha1/0.10.5 \ crate://crates.io/sha2/0.10.6 \ - crate://crates.io/sha3/0.10.5 \ + crate://crates.io/sha3/0.10.6 \ crate://crates.io/shlex/1.1.0 \ crate://crates.io/signal-hook-mio/0.2.3 \ crate://crates.io/signal-hook-registry/1.4.0 \ crate://crates.io/signal-hook/0.3.14 \ crate://crates.io/siphasher/0.3.10 \ - crate://crates.io/smallvec/1.9.0 \ + crate://crates.io/slab/0.4.7 \ + crate://crates.io/smallvec/1.10.0 \ crate://crates.io/smawk/0.3.1 \ crate://crates.io/socket2/0.4.7 \ crate://crates.io/strsim/0.10.0 \ crate://crates.io/strum/0.24.1 \ crate://crates.io/strum_macros/0.24.3 \ crate://crates.io/subtle/2.4.1 \ - crate://crates.io/syn/1.0.99 \ + crate://crates.io/syn/1.0.103 \ crate://crates.io/tempfile/3.3.0 \ crate://crates.io/term_grid/0.1.7 \ crate://crates.io/termcolor/1.1.3 \ - crate://crates.io/terminal_size/0.2.1 \ - crate://crates.io/textwrap/0.15.1 \ - crate://crates.io/thiserror-impl/1.0.36 \ - crate://crates.io/thiserror/1.0.36 \ - crate://crates.io/time-macros/0.2.4 \ - crate://crates.io/time/0.3.14 \ + crate://crates.io/terminal_size/0.1.17 \ + crate://crates.io/terminal_size/0.2.2 \ + crate://crates.io/textwrap/0.16.0 \ + crate://crates.io/thiserror-impl/1.0.37 \ + crate://crates.io/thiserror/1.0.37 \ + crate://crates.io/time-core/0.1.0 \ + crate://crates.io/time-macros/0.2.6 \ + crate://crates.io/time/0.3.17 \ crate://crates.io/typenum/1.15.0 \ - crate://crates.io/unicode-ident/1.0.4 \ - crate://crates.io/unicode-linebreak/0.1.2 \ + crate://crates.io/unicode-ident/1.0.5 \ + crate://crates.io/unicode-linebreak/0.1.4 \ crate://crates.io/unicode-segmentation/1.10.0 \ crate://crates.io/unicode-width/0.1.10 \ crate://crates.io/unicode-xid/0.2.4 \ crate://crates.io/unindent/0.1.10 \ crate://crates.io/users/0.11.0 \ crate://crates.io/utf-8/0.7.6 \ - crate://crates.io/utf8-width/0.1.6 \ - crate://crates.io/uuid/1.1.2 \ + crate://crates.io/uuid/1.2.2 \ crate://crates.io/version_check/0.9.4 \ crate://crates.io/walkdir/2.3.2 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ @@ -241,16 +271,18 @@ SRC_URI += " \ crate://crates.io/winapi-util/0.1.5 \ crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ crate://crates.io/winapi/0.3.9 \ - crate://crates.io/windows-sys/0.36.1 \ - crate://crates.io/windows_aarch64_msvc/0.36.1 \ - crate://crates.io/windows_i686_gnu/0.36.1 \ - crate://crates.io/windows_i686_msvc/0.36.1 \ - crate://crates.io/windows_x86_64_gnu/0.36.1 \ - crate://crates.io/windows_x86_64_msvc/0.36.1 \ + crate://crates.io/windows-sys/0.42.0 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.0 \ + crate://crates.io/windows_aarch64_msvc/0.42.0 \ + crate://crates.io/windows_i686_gnu/0.42.0 \ + crate://crates.io/windows_i686_msvc/0.42.0 \ + crate://crates.io/windows_x86_64_gnu/0.42.0 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.0 \ + crate://crates.io/windows_x86_64_msvc/0.42.0 \ crate://crates.io/xattr/0.2.3 \ crate://crates.io/yansi/0.5.1 \ crate://crates.io/z85/3.0.5 \ - crate://crates.io/zip/0.6.2 \ + crate://crates.io/zip/0.6.3 \ " diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb index c95a5b2d32..1c2c6e21e0 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" DEPENDS = "openssl" -EXTRA_OEMAKE:append = "PREFIX=${prefix} LIBDIR=${libdir} USE_SHARED_LIB=1" +EXTRA_OEMAKE:append = " PREFIX=${prefix} LIBDIR=${libdir} USE_SHARED_LIB=1" # We want to statically link the binary to libfsverity on native Windows EXTRA_OEMAKE:remove:mingw32:class-nativesdk = "USE_SHARED_LIB=1" EXTRA_OEMAKE:remove:mingw32:class-native = "USE_SHARED_LIB=1" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 4e285aea7e..1a47d91105 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -22,6 +22,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://cross-compiling.patch \ file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://lfs64.patch \ + file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" SRC_URI[sha256sum] = "ffacf84e74daf249ad64b9573d79a4e882f66b004614f8b33bfcb14a8e25da1d" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch new file mode 100644 index 0000000000..7c37fef493 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -0,0 +1,95 @@ +From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 24 Jan 2023 21:40:43 -0800 +Subject: [PATCH] Add missing includes <cstdint> and <cstdio> + +This is needed with GCC 13 and newer [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + + storage/rocksdb/rocksdb/util/slice.cc | 1 + + storage/rocksdb/rocksdb/util/string_util.h | 1 + + tpool/aio_linux.cc | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h +index 963c1d8eb49..73487edd96d 100644 +--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h ++++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include <cstdint> + #include "rocksdb/rocksdb_namespace.h" + + struct CompactionIterationStats { +diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +index c7f93b4cfcd..3c2ab80535a 100644 +--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h ++++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +@@ -8,6 +8,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include <cstdint> + #include <string> + #include <vector> + #include "rocksdb/status.h" +diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h +index f356395f329..3215221755d 100644 +--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h ++++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc +index 6db11cc947a..c26b6a21a57 100644 +--- a/storage/rocksdb/rocksdb/util/slice.cc ++++ b/storage/rocksdb/rocksdb/util/slice.cc +@@ -8,6 +8,7 @@ + // found in the LICENSE file. See the AUTHORS file for names of contributors. + + #include <algorithm> ++#include <cstdint> + #include "rocksdb/slice_transform.h" + #include "rocksdb/slice.h" + #include "util/string_util.h" +diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h +index a761be66c52..064d059f08f 100644 +--- a/storage/rocksdb/rocksdb/util/string_util.h ++++ b/storage/rocksdb/rocksdb/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include <cstdint> + #include <sstream> + #include <string> + #include <unordered_map> +diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc +index 10234e0e46a..a6adf1af257 100644 +--- a/tpool/aio_linux.cc ++++ b/tpool/aio_linux.cc +@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ + + # include <thread> + # include <atomic> ++# include <cstdio> + # include <libaio.h> + # include <sys/syscall.h> + +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb index 299abee000..57ade6162b 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb @@ -14,7 +14,7 @@ DESCRIPTION = "\ software to accept ODBC clients. \ " SECTION = "libs" -HOMEPAGE = "http://psqlodbc.projects.postgresql.org/" +HOMEPAGE = "https://odbc.postgresql.org/" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch new file mode 100644 index 0000000000..a177ce28b9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -0,0 +1,70 @@ +From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 24 Jan 2023 21:40:43 -0800 +Subject: [PATCH] Add missing includes <cstdint> and <cstdio> + +This is needed with GCC 13 and newer [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + + storage/rocksdb/rocksdb/util/slice.cc | 1 + + storage/rocksdb/rocksdb/util/string_util.h | 1 + + tpool/aio_linux.cc | 1 + + 6 files changed, 6 insertions(+) + +--- a/db/compaction/compaction_iteration_stats.h ++++ b/db/compaction/compaction_iteration_stats.h +@@ -7,6 +7,7 @@ + + #include <cstdint> + ++#include <cstdint> + #include "rocksdb/rocksdb_namespace.h" + + namespace ROCKSDB_NAMESPACE { +--- a/include/rocksdb/utilities/checkpoint.h ++++ b/include/rocksdb/utilities/checkpoint.h +@@ -8,6 +8,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include <cstdint> + #include <string> + #include <vector> + +--- a/table/block_based/data_block_hash_index.h ++++ b/table/block_based/data_block_hash_index.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include <cstdint> + #include <string> + #include <vector> + +--- a/util/slice.cc ++++ b/util/slice.cc +@@ -12,6 +12,7 @@ + #include <stdio.h> + + #include <algorithm> ++#include <cstdint> + + #include "rocksdb/convenience.h" + #include "rocksdb/slice_transform.h" +--- a/util/string_util.h ++++ b/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include <cstdint> + #include <sstream> + #include <string> + #include <unordered_map> diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch index 2906100dee..0fe9c12766 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch @@ -27,7 +27,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1000,7 +1000,12 @@ option(ROCKSDB_BUILD_SHARED "Build share +@@ -1057,7 +1057,12 @@ set(ROCKSDB_SHARED_LIB rocksdb-shared${A if(WIN32) set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib) else() diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch new file mode 100644 index 0000000000..e521854439 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch @@ -0,0 +1,33 @@ +From cedc84a8db468d0b6652e78a8a6667e655586b53 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 13:00:43 -0800 +Subject: [PATCH] cmake: Do not add -msse4.2 -mpclmul on clang + +When testcase is compiled with clang and -msse4.2 -mpclmul is added to +cxxflags then clang -m32 still ends up compiling the test case which is +not correct for i386, therefore depend on yocto to pass the right flags +from environemnt via cflags rather than manufecture them here + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dbef059028..981545a4e0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -290,7 +290,7 @@ endif() + + include(CheckCXXSourceCompiles) + set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) +-if(NOT MSVC) ++if(NOT MSVC AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul") + endif() + +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch index 139312a298..706e0868e5 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch @@ -13,7 +13,7 @@ Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541] --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -153,12 +153,7 @@ else() +@@ -154,12 +154,7 @@ else() if(WITH_BZ2) find_package(BZip2 REQUIRED) add_definitions(-DBZIP2) diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch index 45deef338c..211c1c720b 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> @@ -131,8 +131,12 @@ static inline tokutime_t toku_time_now(v uint64_t result; - __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result)); + __asm __volatile__("mrs %[rt], cntvct_el0" : [rt] "=r"(result)); return result; -#elif defined(__powerpc__) +#elif defined(__powerpc__) && defined(__GLIBC__) diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb index d4f0346ee1..8faaee40f6 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb @@ -6,12 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "540d5aae516265170564ec27b3e67a54a11b7045" -SRCBRANCH = "7.5.fb" +SRCREV = "444b3f4845dd01b0d127c4b420fdd3b50ad56682" +SRCBRANCH = "7.9.fb" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ + file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ + file://0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch \ file://ppc64.patch \ file://mips.patch \ file://arm.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230101.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230115.0.bb index faeca6ce8b..adae876649 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230101.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230115.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "c89b92d5622221be2e02e71092dcdbc72733b08a" +SRCREV = "c39ff7a753a286d9bd7460a1a1e092746d592fbd" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc index c87a449f0c..a85c74c128 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc @@ -1,3 +1,3 @@ -PV = "22.12.06" -SRCREV = "acf39ff056df8c9e5bfa32cf6f7b5e6b87a90544" +PV = "23.1.4" +SRCREV = "af9ceabeef1a10c1004e2741f8c0c090ca59e5af" SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-16.18/oe-npm-cache b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.12/oe-npm-cache index f596207648..f596207648 100755 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-16.18/oe-npm-cache +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.12/oe-npm-cache diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_16.18.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.12.bb index a61dd5018f..a61dd5018f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_16.18.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.12.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch index 445aaf8398..feafe38fdb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch @@ -5,32 +5,24 @@ Subject: [PATCH] Using native binaries Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> --- - node.gyp | 2 ++ + node.gyp | 1 + tools/v8_gypfiles/v8.gyp | 5 +++++ - 2 files changed, 7 insertions(+) + 2 files changed, 6 insertions(+) diff --git a/node.gyp b/node.gyp -index 24505da7ba..7d41bd52db 100644 +index e8e1d9f9..e60ccc10 100644 --- a/node.gyp +++ b/node.gyp -@@ -319,6 +319,7 @@ - 'action_name': 'run_mkcodecache', - 'process_outputs_as_sources': 1, - 'inputs': [ -+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', - '<(mkcodecache_exec)', - ], - 'outputs': [ -@@ -366,6 +367,7 @@ +@@ -320,6 +320,7 @@ 'action_name': 'node_mksnapshot', 'process_outputs_as_sources': 1, 'inputs': [ + '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', '<(node_mksnapshot_exec)', + '<(node_snapshot_main)', ], - 'outputs': [ diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp -index ed042f8829..371b8e02c2 100644 +index 42e26cd9..bc721991 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -68,6 +68,7 @@ @@ -57,7 +49,7 @@ index ed042f8829..371b8e02c2 100644 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)bytecode_builtins_list_generator<(EXECUTABLE_SUFFIX)', ], 'outputs': [ -@@ -395,6 +398,7 @@ +@@ -400,6 +403,7 @@ ], }, 'inputs': [ @@ -65,7 +57,7 @@ index ed042f8829..371b8e02c2 100644 '<(mksnapshot_exec)', ], 'outputs': [ -@@ -1513,6 +1517,7 @@ +@@ -1539,6 +1543,7 @@ { 'action_name': 'run_gen-regexp-special-case_action', 'inputs': [ diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch index d7005ae972..c9a522d2e2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch @@ -9,14 +9,20 @@ Fixes builds on mips where clang reports an error ^~~~ Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/v8/v8/+/3235674] -Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> --- - src/wasm/baseline/liftoff-assembler.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + deps/v8/src/wasm/baseline/liftoff-assembler.h | 6 +++--- + deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | 2 +- + deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | 2 +- + .../src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) +diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h +index 22c7f73a..db4cb168 100644 --- a/deps/v8/src/wasm/baseline/liftoff-assembler.h +++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h -@@ -613,7 +613,7 @@ class LiftoffAssembler : public TurboAss +@@ -646,7 +646,7 @@ class LiftoffAssembler : public TurboAssembler { void FinishCall(const ValueKindSig*, compiler::CallDescriptor*); // Move {src} into {dst}. {src} and {dst} must be different. @@ -25,7 +31,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> // Parallel register move: For a list of tuples <dst, src, kind>, move the // {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore -@@ -759,8 +759,8 @@ class LiftoffAssembler : public TurboAss +@@ -795,8 +795,8 @@ class LiftoffAssembler : public TurboAssembler { inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset, ValueKind); @@ -36,10 +42,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> inline void Spill(int offset, LiftoffRegister, ValueKind); inline void Spill(int offset, WasmValue); +diff --git a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h +index c76fd2f4..0fffe231 100644 --- a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h +++ b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h -@@ -658,7 +658,7 @@ void LiftoffAssembler::Store(Register ds - pinned = pinned | LiftoffRegList::ForRegs(dst_op.rm(), src); +@@ -661,7 +661,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, + pinned = pinned | LiftoffRegList{dst_op.rm(), src}; LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. - Move(tmp, src, type.value_type()); @@ -47,9 +55,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src = tmp; pinned.set(tmp); +diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h +index 36413545..48207337 100644 --- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h +++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h -@@ -596,7 +596,7 @@ void LiftoffAssembler::Store(Register ds +@@ -593,7 +593,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, pinned.set(dst_op.rm()); LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. @@ -58,9 +68,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src = tmp; pinned.set(tmp); +diff --git a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h +index 642a7d2a..56ffcc2a 100644 --- a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h +++ b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h -@@ -580,7 +580,7 @@ void LiftoffAssembler::Store(Register ds +@@ -589,7 +589,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, pinned.set(dst_op.rm()); LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. @@ -69,3 +81,5 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src = tmp; pinned.set(tmp); +-- +2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.18.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb index a67948320d..e96913e563 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.18.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb @@ -1,13 +1,13 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6e54852cd826c41e80c6d80f6db00a85" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dfd7ae796baf5326016a3865ee1dc632" DEPENDS = "openssl" DEPENDS:append:class-target = " qemu-native" DEPENDS:append:class-native = " c-ares-native" -inherit pkgconfig python3native qemu +inherit pkgconfig python3native qemu ptest COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" @@ -26,6 +26,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-liftoff-Correct-function-signatures.patch \ file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \ " + SRC_URI:append:class-target = " \ file://0001-Using-native-binaries.patch \ " @@ -35,7 +36,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "1f8051a88f86f42064f4415fe7a980e59b0a502ecc8def583f6303bc4d445238" +SRC_URI[sha256sum] = "4fa406451bc52659a290e52cfdb2162a760bd549da4b8bbebe6a29f296d938df" S = "${WORKDIR}/node-v${PV}" @@ -151,6 +152,7 @@ do_configure () { do_compile () { export LD="${CXX}" + install -D ${RECIPE_SYSROOT_NATIVE}/etc/ssl/openssl.cnf ${B}/deps/openssl/nodejs-openssl.cnf install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh oe_runmake BUILDTYPE=Release } @@ -159,10 +161,15 @@ do_install () { oe_runmake install DESTDIR=${D} } +do_install_ptest () { + cp -r ${B}/out/Release/cctest ${D}${PTEST_PATH}/ + cp -r ${B}/test ${D}${PTEST_PATH} + chown -R root:root ${D}${PTEST_PATH} +} + BINARIES = " \ bytecode_builtins_list_generator \ ${@bb.utils.contains('PACKAGECONFIG', 'icu', 'gen-regexp-special-case', '', d)} \ - mkcodecache \ node_mksnapshot \ torque \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch new file mode 100644 index 0000000000..2cb4f26fbd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch @@ -0,0 +1,38 @@ +From 1fa61d77fa7173744dd6dc9d3c4bb0aa783f5222 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 10:35:46 -0800 +Subject: [PATCH] build: Fix a build race related to utils/mermaid.html.cstr + +Sometimes build fails like below + +| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c: In function 'dump_mermaid_footer': +| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c:1347:10: fatal error: utils/mermaid.html.cstr: No such file or directory +| 1347 | #include "utils/mermaid.html.cstr" /* This file is a converted of mermaid.html to one string literal in build-time */ +| | ^~~~~~~~~~~~~~~~~~~~~~~~~ +| compilation terminated. +| make[1]: *** [Makefile:310: /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/build/cmds/dump.o] Error 1 + +Create a dependency on c-str-conversion for dump.o + +Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/1622] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 70dc12f0..bb2ac669 100644 +--- a/Makefile ++++ b/Makefile +@@ -304,6 +304,8 @@ $(objdir)/misc/dbginfo.o: $(srcdir)/misc/dbginfo.c $(objdir)/version.h $(COMMON_ + $(objdir)/misc/bench.o: $(srcdir)/misc/bench.c + $(QUIET_CC)$(CC) $(BENCH_CFLAGS) -c -o $@ $< + ++$(objdir)/cmds/dump.o: c-str-conversion ++ + $(UFTRACE_OBJS_VERSION): $(objdir)/version.h + + $(filter-out $(objdir)/uftrace.o, $(UFTRACE_OBJS)): $(objdir)/%.o: $(srcdir)/%.c $(COMMON_DEPS) +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.12.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb index 111e948669..1302420983 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.12.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb @@ -10,8 +10,9 @@ DEPENDS:append:libc-musl = " argp-standalone" inherit autotools -SRCREV = "46d536709451609e5e99099216d9dcf567ceeaca" +SRCREV = "53ec12d40701cf73ddcf5db8cff63b54736d0eda" SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \ + file://0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Fix-Wincompatible-function-pointer-types.patch new file mode 100644 index 0000000000..428ee91031 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Fix-Wincompatible-function-pointer-types.patch @@ -0,0 +1,178 @@ +From 3170b245aba99694390c3c87d326639b6685d4dd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 19 Jan 2023 14:34:05 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes new found errors with clang 16 + +news.c:370:36: error: incompatible function pointer types passing 'int (struct dirent *)' to parameter of type 'int (*)(const struct dirent *)' [-Wincompatible-function-pointer-types] + if ((nmsgs = scandir (tmp,&names,news_select,news_numsort)) >= 0) { + ^~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/uw-imap/2007f-r0/recipe-sysroot/usr/include/dirent.h:259:13: note: passing argument to parameter '__selector' here + int (*__selector) (const struct dirent *), + ^ +news.c:370:48: error: incompatible function pointer types passing 'int (const void *, const void *)' to parameter of type 'int (*)(const struct dirent **, const struct dirent **)' [-Wincompatible-function-pointer-types] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/osdep/unix/mh.c | 8 ++++---- + src/osdep/unix/mix.c | 12 ++++++------ + src/osdep/unix/mx.c | 8 ++++---- + src/osdep/unix/news.c | 8 ++++---- + 4 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/src/osdep/unix/mh.c b/src/osdep/unix/mh.c +index 0226b7a..9264624 100644 +--- a/src/osdep/unix/mh.c ++++ b/src/osdep/unix/mh.c +@@ -103,8 +103,8 @@ long mh_copy (MAILSTREAM *stream,char *sequence,char *mailbox, + long options); + long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data); + +-int mh_select (struct direct *name); +-int mh_numsort (const void *d1,const void *d2); ++int mh_select (const struct direct *name); ++int mh_numsort (const struct dirent **d1,const struct dirent **d2); + char *mh_file (char *dst,char *name); + long mh_canonicalize (char *pattern,char *ref,char *pat); + void mh_setdate (char *file,MESSAGECACHE *elt); +@@ -1194,7 +1194,7 @@ long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) + * Returns: T to use file name, NIL to skip it + */ + +-int mh_select (struct direct *name) ++int mh_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1209,7 +1209,7 @@ int mh_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mh_numsort (const void *d1,const void *d2) ++int mh_numsort (const struct dirent **d1,const struct dirent **d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +diff --git a/src/osdep/unix/mix.c b/src/osdep/unix/mix.c +index fbf4a02..c2207f6 100644 +--- a/src/osdep/unix/mix.c ++++ b/src/osdep/unix/mix.c +@@ -125,7 +125,7 @@ long mix_unsubscribe (MAILSTREAM *stream,char *mailbox); + long mix_create (MAILSTREAM *stream,char *mailbox); + long mix_delete (MAILSTREAM *stream,char *mailbox); + long mix_rename (MAILSTREAM *stream,char *old,char *newname); +-int mix_rselect (struct direct *name); ++int mix_rselect (const struct direct *name); + MAILSTREAM *mix_open (MAILSTREAM *stream); + void mix_close (MAILSTREAM *stream,long options); + void mix_abort (MAILSTREAM *stream); +@@ -140,8 +140,8 @@ THREADNODE *mix_thread (MAILSTREAM *stream,char *type,char *charset, + long mix_ping (MAILSTREAM *stream); + void mix_check (MAILSTREAM *stream); + long mix_expunge (MAILSTREAM *stream,char *sequence,long options); +-int mix_select (struct direct *name); +-int mix_msgfsort (const void *d1,const void *d2); ++int mix_select (const struct direct *name); ++int mix_msgfsort (const struct dirent **d1,const struct dirent **d2); + long mix_addset (SEARCHSET **set,unsigned long start,unsigned long size); + long mix_burp (MAILSTREAM *stream,MIXBURP *burp,unsigned long *reclaimed); + long mix_burp_check (SEARCHSET *set,size_t size,char *file); +@@ -587,7 +587,7 @@ long mix_rename (MAILSTREAM *stream,char *old,char *newname) + * Returns: T if mix file name, NIL otherwise + */ + +-int mix_rselect (struct direct *name) ++int mix_rselect (const struct direct *name) + { + return mix_dirfmttest (name->d_name); + } +@@ -1146,7 +1146,7 @@ long mix_expunge (MAILSTREAM *stream,char *sequence,long options) + * ".mix" with no suffix was used by experimental versions + */ + +-int mix_select (struct direct *name) ++int mix_select (const struct direct *name) + { + char c,*s; + /* make sure name has prefix */ +@@ -1165,7 +1165,7 @@ int mix_select (struct direct *name) + * Returns: -1 if d1 < d2, 0 if d1 == d2, 1 d1 > d2 + */ + +-int mix_msgfsort (const void *d1,const void *d2) ++int mix_msgfsort (const struct dirent **d1,const struct dirent **d2) + { + char *n1 = (*(struct direct **) d1)->d_name + sizeof (MIXNAME) - 1; + char *n2 = (*(struct direct **) d2)->d_name + sizeof (MIXNAME) - 1; +diff --git a/src/osdep/unix/mx.c b/src/osdep/unix/mx.c +index 4549527..b5c5adf 100644 +--- a/src/osdep/unix/mx.c ++++ b/src/osdep/unix/mx.c +@@ -98,8 +98,8 @@ long mx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data); + long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt, + STRING *st,SEARCHSET *set); + +-int mx_select (struct direct *name); +-int mx_numsort (const void *d1,const void *d2); ++int mx_select (const struct direct *name); ++int mx_numsort (const struct dirent **d1,const struct dirent **d2); + char *mx_file (char *dst,char *name); + long mx_lockindex (MAILSTREAM *stream); + void mx_unlockindex (MAILSTREAM *stream); +@@ -1110,7 +1110,7 @@ long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt, + * Returns: T to use file name, NIL to skip it + */ + +-int mx_select (struct direct *name) ++int mx_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1125,7 +1125,7 @@ int mx_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mx_numsort (const void *d1,const void *d2) ++int mx_numsort (const struct dirent **d1,const struct dirent **d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +diff --git a/src/osdep/unix/news.c b/src/osdep/unix/news.c +index 4cf5bb7..3da5207 100644 +--- a/src/osdep/unix/news.c ++++ b/src/osdep/unix/news.c +@@ -76,8 +76,8 @@ long news_create (MAILSTREAM *stream,char *mailbox); + long news_delete (MAILSTREAM *stream,char *mailbox); + long news_rename (MAILSTREAM *stream,char *old,char *newname); + MAILSTREAM *news_open (MAILSTREAM *stream); +-int news_select (struct direct *name); +-int news_numsort (const void *d1,const void *d2); ++int news_select (const struct direct *name); ++int news_numsort (const struct dirent ** d1,const struct dirent ** d2); + void news_close (MAILSTREAM *stream,long options); + void news_fast (MAILSTREAM *stream,char *sequence,long flags); + void news_flags (MAILSTREAM *stream,char *sequence,long flags); +@@ -402,7 +402,7 @@ MAILSTREAM *news_open (MAILSTREAM *stream) + * Returns: T to use file name, NIL to skip it + */ + +-int news_select (struct direct *name) ++int news_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -417,7 +417,7 @@ int news_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int news_numsort (const void *d1,const void *d2) ++int news_numsort (const struct dirent ** d1,const struct dirent ** d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 29c4b20878..2f4261b00d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -14,6 +14,7 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \ file://0001-Define-prototype-for-safe_flock.patch \ file://0001-Do-not-build-mtest.patch \ file://0002-tmail-Include-ctype.h-for-isdigit.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ " SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" diff --git a/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.4.bb index 22fd94b093..582c29379a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.4.bb @@ -10,8 +10,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2" -SRC_URI[md5sum] = "d04ae9d8b2dee2157c6db95fa908abfd" -SRC_URI[sha256sum] = "9408f12c1628ecf80730bedbe8b2caad810edd01bb4c66f77b60c873e8cc6891" +SRC_URI[sha256sum] = "74aa626fc71e729ee227602870dd29a5a01cd8c9c1c7330837a51da2eb5722cc" inherit autotools @@ -20,7 +19,7 @@ PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu" do_install:prepend () { - sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc + sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc } PACKAGES = "libxerces-c \ @@ -32,7 +31,7 @@ PACKAGES = "libxerces-c \ RPROVIDES:${PN}-dbg += "libxerces-c-dbg xerces-c-samples-dbg" -FILES:libxerces-c = "${libdir}/libxerces-c-3.1.so" +FILES:libxerces-c = "${libdir}/libxerces-c-3.2.so" FILES:libxerces-c-dev = "${libdir}/lib*.la \ ${libdir}/libxerces-c.so \ ${libdir}/pkgconfig/xerces-c.pc \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0003-src-Makefile-Fix-Makefile-macro-error.patch b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0003-src-Makefile-Fix-Makefile-macro-error.patch deleted file mode 100644 index 3d861fc625..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0003-src-Makefile-Fix-Makefile-macro-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ea4ca50ca9cab755f3722096158a46deec0e663a Mon Sep 17 00:00:00 2001 -From: Arthur She <arthur.she@linaro.org> -Date: Tue, 25 Aug 2020 09:51:26 -0700 -Subject: [PATCH] src/Makefile: Fix Makefile macro error - -This error caused the curl library wouldn't be linked correctly. - -Upstream-Status: Pending -Signed-off-by: Arthur She <arthur.she@linaro.org> ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 1cdf8b0..acd04dd 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -57,7 +57,7 @@ ifeq ($(MUST_BUILD_CURL_CLIENT),yes) - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti -- TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs) -+ TRANSPORT_LIBDEP += $(shell $(CURL_CONFIG) --libs) - TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport - endif - ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.06.bb index 36205009a4..0a7ad33c64 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.06.bb @@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \ file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ file://0002-fix-formatting-issues.patch \ - file://0003-src-Makefile-Fix-Makefile-macro-error.patch \ " - -#Release 1.54.02 -SRCREV = "86405c7e1bd4f70287204a28d242a1054daab520" +#Release 1.54.06 +SRCREV = "00870af80021aa0a66cc72c9aeb00587cbfde560" S = "${WORKDIR}/git/stable" diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb index a16117b993..4e35283dd2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb @@ -29,7 +29,7 @@ DEPENDS = "curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+3 wxwidgets libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " -SRCREV = "1eca0c7931d0409d65a1254dc5d5c46abe058daa" +SRCREV = "4774e1cbe0ad13cb9a6f7fffbb626a417316f61d" BRANCH = "client_release/7/7.20" SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb index 2ff4946883..3a8c9481fc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://github.com/redis/hiredis" SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" -DEPENDS = "redis" +DEPENDS = "redis openssl" SRC_URI = "git://github.com/redis/hiredis;protocol=https;branch=master" SRCREV = "b731283245f3183af527237166261ad0768ba7d4" @@ -11,3 +11,7 @@ SRCREV = "b731283245f3183af527237166261ad0768ba7d4" S = "${WORKDIR}/git" inherit cmake + +EXTRA_OECMAKE += "-DENABLE_SSL=ON" + +FILES:${PN}-dev += "${datadir}/hiredis_ssl" diff --git a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch new file mode 100644 index 0000000000..237374d74b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch @@ -0,0 +1,309 @@ +From c36f0af7ba75c133edc46f052b291188351b6c20 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 15:49:16 -0800 +Subject: [PATCH] Drop using register storage classifier + +Its beeing dropped from latest standards beginning C++17 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ip/xjpg_dct.c | 4 +-- + ip/xjpg_dct.h | 4 +-- + prnt/hpcups/Mode9.cpp | 2 +- + prnt/hpcups/ModeDeltaPlus.cpp | 4 +-- + prnt/hpcups/jccolor.c | 46 +++++++++++++++++------------------ + prnt/hpijs/compression.cpp | 2 +- + prnt/hpijs/jccolor.c | 44 ++++++++++++++++----------------- + prnt/hpijs/ljfastraster.cpp | 4 +-- + prnt/hpps/psutil.c | 6 ++--- + 9 files changed, 58 insertions(+), 58 deletions(-) + +diff --git a/ip/xjpg_dct.c b/ip/xjpg_dct.c +index 63f021b..1986923 100644 +--- a/ip/xjpg_dct.c ++++ b/ip/xjpg_dct.c +@@ -103,7 +103,7 @@ + | for the Winograd DCT. | + |____________________________________________________________________________| + */ +-void dct_forward (register int *block_p) ++void dct_forward (int *block_p) + { + #define CONST_FRAC_BITS 14 /* bits of frac in CONST_1-CONST_5 below */ + +@@ -257,7 +257,7 @@ void dct_forward (register int *block_p) + | and level-shifting, you must clamp these values to 0..255. | + |____________________________________________________________________________| + */ +-void dct_inverse (register int *block_p) ++void dct_inverse (int *block_p) + { + #define CONST_FRAC_BITS 13 /* bits of frac in CONST_1-CONST_5 below */ + +diff --git a/ip/xjpg_dct.h b/ip/xjpg_dct.h +index 7dc90f3..149d66f 100644 +--- a/ip/xjpg_dct.h ++++ b/ip/xjpg_dct.h +@@ -43,8 +43,8 @@ + |____________________________________________________________________________| + */ + +-void dct_forward (register int *block_p); ++void dct_forward (int *block_p); + +-void dct_inverse (register int *block_p); ++void dct_inverse (int *block_p); + + /* End of File */ +diff --git a/prnt/hpcups/Mode9.cpp b/prnt/hpcups/Mode9.cpp +index 94ff571..6cc210a 100644 +--- a/prnt/hpcups/Mode9.cpp ++++ b/prnt/hpcups/Mode9.cpp +@@ -203,7 +203,7 @@ bool Mode9::Process(RASTERDATA* input) + unsigned int offset,byte_count,rem_count; + Mode9_comtype command; + char* dest= (char*) compressBuf; +- register char *dptr=dest; ++ char *dptr=dest; + + while ( size > 0 ) + { +diff --git a/prnt/hpcups/ModeDeltaPlus.cpp b/prnt/hpcups/ModeDeltaPlus.cpp +index 4552f4a..6a5837f 100644 +--- a/prnt/hpcups/ModeDeltaPlus.cpp ++++ b/prnt/hpcups/ModeDeltaPlus.cpp +@@ -241,8 +241,8 @@ bool ModeDeltaPlus::compress (BYTE *outmem, + const uint32_t inheight, + uint32_t horz_ht_dist) + { +- register BYTE *outptr = outmem; +- register uint32_t col; ++ BYTE *outptr = outmem; ++ uint32_t col; + const BYTE *seedrow; + uint32_t seedrow_count = 0; + uint32_t location = 0; +diff --git a/prnt/hpcups/jccolor.c b/prnt/hpcups/jccolor.c +index 7cc8906..6794575 100644 +--- a/prnt/hpcups/jccolor.c ++++ b/prnt/hpcups/jccolor.c +@@ -73,7 +73,7 @@ typedef my_color_converter * my_cconvert_ptr; + + /* We allocate one big table and divide it up into eight parts, instead of + * doing eight alloc_small requests. This lets us use a single table base +- * address, which can be held in a register in the inner loops on many ++ * address, which can be held in a in the inner loops on many + * machines (more than can hold all eight addresses, anyway). + */ + +@@ -205,11 +205,11 @@ rgb_ycc_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -261,11 +261,11 @@ rgb_gray_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -300,11 +300,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2, outptr3; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2, outptr3; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -354,9 +354,9 @@ grayscale_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + int instride = cinfo->input_components; + +@@ -383,10 +383,10 @@ null_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; +- register int ci; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; ++ int ci; + int nc = cinfo->num_components; + JDIMENSION num_cols = cinfo->image_width; + +diff --git a/prnt/hpijs/compression.cpp b/prnt/hpijs/compression.cpp +index fcac793..10194ca 100644 +--- a/prnt/hpijs/compression.cpp ++++ b/prnt/hpijs/compression.cpp +@@ -266,7 +266,7 @@ BOOL Mode9::Process(RASTERDATA* input) + unsigned int offset,byte_count,rem_count; + Mode9_comtype command; + char* dest= (char*) compressBuf; +- register char *dptr=dest; ++ char *dptr=dest; + + while ( size > 0 ) + { +diff --git a/prnt/hpijs/jccolor.c b/prnt/hpijs/jccolor.c +index a6b2333..8486b65 100644 +--- a/prnt/hpijs/jccolor.c ++++ b/prnt/hpijs/jccolor.c +@@ -206,11 +206,11 @@ rgb_ycc_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows)
+ {
+ my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+- register int r, g, b;
+- register INT32 * ctab = cconvert->rgb_ycc_tab;
+- register JSAMPROW inptr;
+- register JSAMPROW outptr0, outptr1, outptr2;
+- register JDIMENSION col;
++ int r, g, b;
++ INT32 * ctab = cconvert->rgb_ycc_tab;
++ JSAMPROW inptr;
++ JSAMPROW outptr0, outptr1, outptr2;
++ JDIMENSION col;
+ JDIMENSION num_cols = cinfo->image_width;
+
+ while (--num_rows >= 0) {
+@@ -262,11 +262,11 @@ rgb_gray_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows)
+ {
+ my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+- register int r, g, b;
+- register INT32 * ctab = cconvert->rgb_ycc_tab;
+- register JSAMPROW inptr;
+- register JSAMPROW outptr;
+- register JDIMENSION col;
++ int r, g, b;
++ INT32 * ctab = cconvert->rgb_ycc_tab;
++ JSAMPROW inptr;
++ JSAMPROW outptr;
++ JDIMENSION col;
+ JDIMENSION num_cols = cinfo->image_width;
+
+ while (--num_rows >= 0) {
+@@ -301,11 +301,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows)
+ {
+ my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+- register int r, g, b;
+- register INT32 * ctab = cconvert->rgb_ycc_tab;
+- register JSAMPROW inptr;
+- register JSAMPROW outptr0, outptr1, outptr2, outptr3;
+- register JDIMENSION col;
++ int r, g, b;
++ INT32 * ctab = cconvert->rgb_ycc_tab;
++ JSAMPROW inptr;
++ JSAMPROW outptr0, outptr1, outptr2, outptr3;
++ JDIMENSION col;
+ JDIMENSION num_cols = cinfo->image_width;
+
+ while (--num_rows >= 0) {
+@@ -355,9 +355,9 @@ grayscale_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+ JDIMENSION output_row, int num_rows)
+ {
+- register JSAMPROW inptr;
+- register JSAMPROW outptr;
+- register JDIMENSION col;
++ JSAMPROW inptr;
++ JSAMPROW outptr;
++ JDIMENSION col;
+ JDIMENSION num_cols = cinfo->image_width;
+ int instride = cinfo->input_components;
+
+@@ -384,10 +384,10 @@ null_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+ JDIMENSION output_row, int num_rows)
+ {
+- register JSAMPROW inptr;
+- register JSAMPROW outptr;
+- register JDIMENSION col;
+- register int ci;
++ JSAMPROW inptr;
++ JSAMPROW outptr;
++ JDIMENSION col;
++ int ci;
+ int nc = cinfo->num_components;
+ JDIMENSION num_cols = cinfo->image_width;
+
+diff --git a/prnt/hpijs/ljfastraster.cpp b/prnt/hpijs/ljfastraster.cpp +index 8c7073a..7e82fac 100644 +--- a/prnt/hpijs/ljfastraster.cpp ++++ b/prnt/hpijs/ljfastraster.cpp +@@ -919,8 +919,8 @@ BOOL ModeDeltaPlus::Compress (HPUInt8 *outmem, + const uint32_t inheight, + uint32_t horz_ht_dist) + { +- register HPUInt8 *outptr = outmem; +- register uint32_t col; ++ HPUInt8 *outptr = outmem; ++ uint32_t col; + const HPUInt8 *seedrow; + uint32_t seedrow_count = 0; + uint32_t location = 0; +diff --git a/prnt/hpps/psutil.c b/prnt/hpps/psutil.c +index 7282dc2..87fba4f 100644 +--- a/prnt/hpps/psutil.c ++++ b/prnt/hpps/psutil.c +@@ -148,9 +148,9 @@ static int fcopy(long upto) + /* build array of pointers to start/end of pages */ + void scanpages(void) + { +- register char *comment = buffer+2; +- register int nesting = 0; +- register long int record; ++ char *comment = buffer+2; ++ int nesting = 0; ++ long int record; + + if ((pageptr = (long *)malloc(sizeof(long)*maxpages)) == NULL) + message(FATAL, "out of memory\n"); +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/configure.patch b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/configure.patch index 571d5fe308..a6e61a47ca 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/configure.patch +++ b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/configure.patch @@ -1,7 +1,7 @@ --- a/configure.in +++ b/configure.in @@ -30,7 +30,7 @@ - AC_INIT([HP Linux Imaging and Printing], [3.22.6], [3.22.6], [hplip]) + AC_INIT([HP Linux Imaging and Printing], [3.22.10], [3.22.10], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) -AM_INIT_AUTOMAKE diff --git a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.6.bb b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb index b746006c20..e054553d85 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb @@ -15,8 +15,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0004-Define-missing-prototype-for-functions.patch \ file://0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch \ file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \ -" -SRC_URI[sha256sum] = "27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4" + file://0001-Drop-using-register-storage-classifier.patch" +SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" DEPENDS += "cups python3 libusb" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch new file mode 100644 index 0000000000..02f5e5c7e1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch @@ -0,0 +1,25 @@ +Backport patch from firefox bugzilla to fix compile error for qemuarm with +some armv7ve tunes such as 'armv7vethf' and 'armv7vet-vfpv3d16': + +| /path/to/build/tmp/work/armv7vet2hf-vfp-poky-linux-gnueabi/mozjs-102/102.5.0-r0/build/js/src/jit/AtomicOperationsGenerated.h:240:17: + error: 'asm' operand has impossible constraints +| 240 | asm volatile ( +| | ^~~ + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1761665] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py +index d8a38a0..65f91ab 100644 +--- a/js/src/jit/GenerateAtomicOperations.py ++++ b/js/src/jit/GenerateAtomicOperations.py +@@ -856,7 +856,7 @@ def generate_atomics_header(c_out): + + # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE. + # See bug 1756347. +- if is_gcc and cpu_arch == "x86": ++ if is_gcc and cpu_arch in ("x86", "arm"): + contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline") + else: + contents = contents.replace("INLINE_ATTR", "inline") diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb index d38ae10b87..5e884b6f64 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb @@ -15,6 +15,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0001-rewrite-cargo-host-linker-in-python3.patch \ file://py-3.11.patch \ file://musl-disable-stackwalk.patch \ + file://0001-add-arm-to-list-of-mozinline.patch \ " SRC_URI[sha256sum] = "017dd44b1285913f477074802707a4c76ed1a28270ec5a327bbb76574cc057d8" diff --git a/meta-openembedded/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch b/meta-openembedded/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch deleted file mode 100644 index 9ff85b12a3..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2650bb3bd3644784359be373252b0436873ca8cb Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@siemens.com> -Date: Fri, 28 Sep 2018 16:44:37 +0200 -Subject: [PATCH] Make resulting cmake config relocatable - -This change avoids hardcoded install prefix in the p8-platform-config.cmake. -Especially important when doing cross compilation with Yocto for example. - -Upstream-Status: Submitted [https://github.com/Pulse-Eight/platform/pull/38] - ---- - CMakeLists.txt | 4 ---- - p8-platform-config.cmake.in | 13 +++++++++---- - 2 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7144b0b..f2db66e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,10 +22,6 @@ if(WIN32) - src/windows/os-threads.cpp) - endif() - --set(p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform") --IF(WIN32) -- LIST(APPEND p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform/windows") --ENDIF(WIN32) - set(p8-platform_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - - if(NOT ${CORE_SYSTEM_NAME} STREQUAL "") -diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in -index 47f30f1..b08e96c 100644 ---- a/p8-platform-config.cmake.in -+++ b/p8-platform-config.cmake.in -@@ -9,17 +9,22 @@ - # p8-platform_LIBRARY_DIRS - directories in which the libraries are situated - # - # propagate these properties from one build system to the other -+get_filename_component(_p8-platform_rootdir ${CMAKE_CURRENT_LIST_DIR}/../ ABSOLUTE) -+ - set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") --set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) --set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") -+set (p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include" "${_p8-platform_rootdir}/include/p8-platform") -+if(WIN32) -+ list(APPEND p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include/p8-platform/windows") -+endif(WIN32) -+set (p8-platform_LIBRARY_DIRS "${_p8-platform_rootdir}") - set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") - set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") - - # libraries come from the build tree where this file was generated - if(WIN32) -- set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") -+ set (p8-platform_LIBRARY "${_p8-platform_rootdir}/p8-platform.lib") - else(WIN32) -- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") -+ set (p8-platform_LIBRARY "-L${_p8-platform_rootdir} -lp8-platform") - endif(WIN32) - set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") - mark_as_advanced (p8-platform_LIBRARY) --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb index 1307f6dc4a..bb9574feb2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -4,11 +4,10 @@ HOMEPAGE = "http://libcec.pulse-eight.com/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" -PV = "2.1.0.1" +PV = "2.1.0.1+git${SRCPV}" -SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https \ - file://0001-Make-resulting-cmake-config-relocatable.patch" -SRCREV = "2d90f98620e25f47702c9e848380c0d93f29462b" +SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https" +SRCREV = "a7cd0d5780ed80a4e70480d1650749f29e8a1fb2" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch new file mode 100644 index 0000000000..bfe2412b5d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch @@ -0,0 +1,37 @@ +From e74bb5a7ef87e697571181280e6108b89104c02d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 20:40:56 -0800 +Subject: [PATCH] include <cstdint> + +gcc 13 libstdc++ moved some includes around and as a result <cstdint> +is no longer transitively included [1]. Explicitly include it for uintXX_t. + +Fixes + +../git/src/sw/redis++/utils.h:187:1: error: 'uint16_t' does not name a type + 187 | uint16_t crc16(const char *buf, int len); + | ^~~~~~~~ + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/449] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/sw/redis++/utils.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sw/redis++/utils.h b/src/sw/redis++/utils.h +index f77f796..ff38f2d 100644 +--- a/src/sw/redis++/utils.h ++++ b/src/sw/redis++/utils.h +@@ -17,6 +17,7 @@ + #ifndef SEWENEW_REDISPLUSPLUS_UTILS_H + #define SEWENEW_REDISPLUSPLUS_UTILS_H + ++#include <cstdint> + #include <cstring> + #include <string> + #include <type_traits> +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb index de19dca387..8e906a4483 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb @@ -4,14 +4,17 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" -SRCREV = "58084931ed1a056d91fe96da7b9ea81fa023560a" +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ + file://0001-include-cstdint.patch" +SRCREV = "f3b19a8a1f609d1a1b79002802e5cf8c336dc262" S = "${WORKDIR}/git" inherit cmake -DEPENDS += "hiredis" +EXTRA_OECMAKE += "-DREDIS_PLUS_PLUS_USE_TLS=ON" + +DEPENDS += "hiredis openssl" RDEPENDS:${PN} += "hiredis" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.8.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.9.bb index 02ee19fb7d..100c2a2a5d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.9.bb @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "f91ab24bcb42673cb853292eb5d43c2017d11d659854808ed6a529c97297fdfe" +SRC_URI[sha256sum] = "9661b2c6b1cc9bf2999471b37a4d759fa5e747d408142c18af8792ebd8384a2a" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.8.bb index 58055166cc..fe1db9f986 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.8.bb @@ -19,7 +19,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE-7.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "8d327d7e887d1bb308fc37aaf717a0bf79f58129e3739069aaeeae88955ac586" +SRC_URI[sha256sum] = "06a339e491306783dcf55b97f15a5dbcbdc01ccbde6dc23027c475cab735e914" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.10.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb index acdbbb7d1b..da3e9a1377 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb @@ -9,10 +9,8 @@ DEPENDS = "gmp nettle libidn zlib gnutls openssl" SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \ " -SRCREV = "9e749453d51d602d8159717f8a7c27971dcb4c6c" +SRCREV = "b421f56d9ee31a966058d23bd23c966221c91396" S = "${WORKDIR}/git" inherit autotools pkgconfig - -CPPFLAGS += "-Wno-error" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2208.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2212.0.bb index 5b30ecabbd..ed65bed0da 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2208.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2212.0.bb @@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[sha256sum] = "14de68e7b8e5ab0c5d734f82e2dc9fff22cd7f4710ad690727eb10a7b9b3df5e" +SRC_URI[sha256sum] = "53b59a872e3dc7384cdc149abe9744916776f7057d905f3df6722d2eb1b04f35" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-make.rc-set-VAL_MTA.patch b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-make.rc-set-VAL_MTA.patch index f4decda141..9007bdbd41 100644 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-make.rc-set-VAL_MTA.patch +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-make.rc-set-VAL_MTA.patch @@ -16,7 +16,7 @@ Fixes: # which sendmail /usr/sbin/sendmail -Upstream-Status: Inappropriate[oe-specific] +Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch index 2afaaac016..41f98281f8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch @@ -4,7 +4,7 @@ Date: Thu, 9 Jun 2022 18:26:38 +0800 Subject: [PATCH] su_INLINE: eh no; give up, share detection with clang but for a thing -Upstream-Status: Backport[https://git.sdaoden.eu/browse/s-nail.git/commit/?id=de2a44c393a39d80ddf12154aec94cace84b19c1] +Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=de2a44c393a39d80ddf12154aec94cace84b19c1] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch index e011f5c712..37ecb0c1ff 100644 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch @@ -3,7 +3,7 @@ From: Steffen Nurpmeso <steffen@sdaoden.eu> Date: Thu, 9 Jun 2022 18:06:04 +0800 Subject: [PATCH] su_INLINE: gcc: only GNU specifics after -Og -Upstream-Status: Backport[https://git.sdaoden.eu/browse/s-nail.git/commit/?id=c5544b66c3b4b2e161166562349908a07e324b38] +Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=c5544b66c3b4b2e161166562349908a07e324b38] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch index 23d0666173..a6b03db72f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch @@ -6,7 +6,7 @@ Subject: [PATCH] smartmontools: Improve reproducibility Backport changes added to master smartmontools. https://github.com/smartmontools/smartmontools/commit/24838916b4c0e91f5c897d44fcdeedb22848f684 -Upstream-Status: Backported +Upstream-Status: Backport Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> --- diff --git a/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.3.bb b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.4.bb index 3a306ad951..25b16121e8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.4.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=master;protocol=http file://0001-To-fix-error-when-do_package.patch \ " -SRCREV = "5b0f4c38efb92c9dac1d39fade5b9a3c30f20ec4" +SRCREV = "e38e1127e56f5c7cc38e22c6dd4c2728fc4f0b3c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb index 627ce23544..86b94149bc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb @@ -6,14 +6,24 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb" SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz" SRC_URI[sha256sum] = "3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec" -inherit cmake features_check +inherit cmake features_check pkgconfig -# depends on virtual/libx11, virtual/libgl -REQUIRED_DISTRO_FEATURES = "x11 opengl" +# depends on virtual/libgl +REQUIRED_DISTRO_FEATURES = "opengl" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" +PACKAGECONFIG[gles] = "-DFREEGLUT_GLES=ON,-DFREEGLUT_GLES=OFF," +PACKAGECONFIG[wayland] = "-DFREEGLUT_WAYLAND=ON,-DFREEGLUT_WAYLAND=OFF,libxkbcommon" +PACKAGECONFIG[demos] = "-DFREEGLUT_BUILD_DEMOS=ON,-DFREEGLUT_BUILD_DEMOS=OFF," +PACKAGECONFIG[x11] = ",,virtual/libx11 libice libxmu libglu libxrandr libxext" # Do not use -fno-common, check back when upgrading to new version it might not be needed CFLAGS += "-fcommon" PROVIDES += "mesa-glut" -DEPENDS = "virtual/libx11 libxmu libxi virtual/libgl libglu libxrandr" +DEPENDS = "virtual/libgl libxi" + +do_install:append() { + # Remove buildpaths + sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/FreeGLUT/FreeGLUTTargets.cmake +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb.bb new file mode 100644 index 0000000000..3430c2491c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb.bb @@ -0,0 +1,17 @@ +SUMMARY = "LVGL Demo Application for Framebuffer" +HOMEPAGE = "https://github.com/lvgl/lv_port_linux_frame_buffer" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \ + file://lv_drivers/LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2 \ + file://lvgl/LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" + +SRC_URI = "gitsm://github.com/lvgl/lv_port_linux_frame_buffer.git;branch=master;protocol=https" +SRCREV = "dd010430b959f40b8f25a51c76bc920cbc2550cc" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "DESTDIR=${D}" + +do_install() { + oe_runmake install +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch new file mode 100644 index 0000000000..0dd59713a1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch @@ -0,0 +1,34 @@ +From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 19:19:34 -0800 +Subject: [PATCH] Include missing <cstdint> + +This error is seen with gcc-13 where include headers are not implicitly +included [1] + +Fixes errors e.g. +error: 'uint32_t' does not name a type + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + framework/common/tcuDefs.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp +index ad3d0736d..6dfac10fb 100644 +--- a/framework/common/tcuDefs.hpp ++++ b/framework/common/tcuDefs.hpp +@@ -26,6 +26,7 @@ + #include "deDefs.hpp" + #include "qpTestLog.h" + ++#include <cstdint> + #include <string> + #include <stdexcept> + +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..47d9fc748a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch @@ -0,0 +1,61 @@ +From 74cf53d89529902ecdef5b230421bc4d30fd089b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 15:36:14 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc-13 exposed errors like below due to it removing indirect includes of +these headers in libstdc++ [1] + +../git/external/amber/src/include/amber/shader_info.h:60:15: error: 'uint32_t' was not declared in this scope + 60 | std::vector<uint32_t> shader_data; + | ^~~~~~~~ + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Submitted [https://github.com/google/amber/pull/1016] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/amber/recipe.h | 1 + + include/amber/shader_info.h | 1 + + src/descriptor_set_and_binding_parser.h | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/include/amber/recipe.h b/include/amber/recipe.h +index 310a86a..1b83213 100644 +--- a/include/amber/recipe.h ++++ b/include/amber/recipe.h +@@ -15,6 +15,7 @@ + #ifndef AMBER_RECIPE_H_ + #define AMBER_RECIPE_H_ + ++#include <cstdint> + #include <string> + #include <utility> + #include <vector> +diff --git a/include/amber/shader_info.h b/include/amber/shader_info.h +index 6c9126a..b5ce751 100644 +--- a/include/amber/shader_info.h ++++ b/include/amber/shader_info.h +@@ -15,6 +15,7 @@ + #ifndef AMBER_SHADER_INFO_H_ + #define AMBER_SHADER_INFO_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/src/descriptor_set_and_binding_parser.h b/src/descriptor_set_and_binding_parser.h +index 145aa42..4b0d774 100644 +--- a/src/descriptor_set_and_binding_parser.h ++++ b/src/descriptor_set_and_binding_parser.h +@@ -15,6 +15,7 @@ + #ifndef SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_ + #define SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_ + ++#include <cstdint> + #include <string> + + #include "amber/result.h" +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch new file mode 100644 index 0000000000..40aea8f203 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch @@ -0,0 +1,32 @@ +From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 31 May 2021 17:31:33 -0700 +Subject: [PATCH] vulkancts: Include missing <cstdint> + +Fixes build with gcc-13 + +../git/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp:2798:102: error: 'uintptr_t' in namespace 'std' does not name a type + 2798 | BufferDataType type = static_cast<BufferDataType>(reinterpret_cast<std::uintptr_t>(expectedOutputs[resultIndex].getUserData())); + | ^~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +index ab02be1dc..3d3ee4829 100644 +--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp ++++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +@@ -33,6 +33,7 @@ + #include "deFloat16.h" + #include "vkQueryUtil.hpp" + #include "vkRefUtil.hpp" ++#include <cstdint> + #include <cstring> + #include <vector> + #include <limits> +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch deleted file mode 100644 index 2fd1d7123a..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 273df2423d9226093310cbcaa8b924bb6b5d6586 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 31 May 2021 17:31:33 -0700 -Subject: [PATCH] vulkancts: - -O_TRUNC value in OperationId enum collides with the macro O_TRUNC -defined in the POSIX header fnctl.h. To avoid the collision undefine -O_TRUNC in this particular sourcefile before its is used in enums -down below. - -This is fixed upstream differently -https://github.com/KhronosGroup/VK-GL-CTS/commit/564c6062f72fe7ecd92b4aea1558c441e651c76b - -But until we get this module uprev'ed to that, lets use a simpler -workaround - -Upstream-Status: Inappropriate [Fixed Differently] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -index 22e6c75fa..db7f4b54a 100644 ---- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -@@ -38,6 +38,10 @@ - #include <limits> - #include <fenv.h> - -+#ifdef O_TRUNC -+#undef O_TRUNC -+#endif -+ - namespace vkt - { - namespace SpirVAssembly --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch new file mode 100644 index 0000000000..8a8d8d2c32 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch @@ -0,0 +1,20 @@ +Prepend instead of append to the module search path, as this script needs to use +the local module build, not the host module build. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py +index 83c5329ce..10e720910 100755 +--- a/external/vulkancts/scripts/gen_framework.py ++++ b/external/vulkancts/scripts/gen_framework.py +@@ -33 +33 @@ from collections import OrderedDict +-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) ++sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) +diff --git a/external/vulkancts/scripts/gen_framework_c.py b/external/vulkancts/scripts/gen_framework_c.py +index 95587e642..84b878cb2 100644 +--- a/external/vulkancts/scripts/gen_framework_c.py ++++ b/external/vulkancts/scripts/gen_framework_c.py +@@ -28 +28 @@ import re +-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) ++sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index f9074556f1..01f4a572f8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -10,6 +10,7 @@ SRC_URI = "\ git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master \ git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \ https://raw.githubusercontent.com/baldurk/renderdoc/fcdea67879fa1991e56cf7734ce0ce27866b665f/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ + file://gen-framework-path.patch \ " S = "${WORKDIR}/git" @@ -25,7 +26,7 @@ ANY_OF_DISTRO_FEATURES += "opengl wayland" DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" SRC_URI += " \ - file://0001-vulkancts.patch \ + file://0001-vulkancts-Include-missing-cstdint.patch \ file://0001-use-library-sonames-for-linking.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb index 024a1719d0..edfeda2bef 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb @@ -12,7 +12,8 @@ SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "d70e01c0be7b8a7d20b186b30b29a75b18bba75d" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src" +SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src \ + file://0001-include-missing-cstdint.patch;patchdir=external/amber/src" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb index c996eb1f76..862963dd0d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb @@ -11,7 +11,10 @@ SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "9b5562187a8ad72c171410b036ceedbc450153ba" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch" +SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ + file://0001-Include-missing-cstdint.patch \ + file://0001-include-missing-cstdint.patch;patchdir=external/amber/src \ +" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_377.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_378.bb index e96c014ab2..c82042b215 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_377.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_378.bb @@ -2,13 +2,13 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=5ec6748ed90e588caa9318b780a0d498" +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=9c96124b492c0c02356850c243aaeca2" SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://0001-Add-configure-time-check-for-setsid.patch \ " -SRC_URI[sha256sum] = "db108fe7a45d8ed97e604721b58443b473649e61e263631bf8759f8618a990b2" +SRC_URI[sha256sum] = "649dfbfd5edd0ed9e47cf8e4d953b4b0d3c30bc280166dfc4ffd14973fec3e92" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch deleted file mode 100644 index 704bbdb5c7..0000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e5bbf96edf776821f29ab67baed22a690bf8ab10 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Sep 2022 07:30:10 -0700 -Subject: [PATCH] ipmi_fru.c: Provide missing function declarations - -Fixes build with clang-15+ - -Upstream-Status: Submitted [https://github.com/ipmitool/ipmitool/pull/360] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/ipmi_fru.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c -index 3d1d8a1..5c5661c 100644 ---- a/lib/ipmi_fru.c -+++ b/lib/ipmi_fru.c -@@ -60,6 +60,13 @@ static const char *section_id[4] = { - "Board Section", - "Product Section" - }; -+/* From lib/ipmi_hpmfwupg.c: */ -+uint16_t -+ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf); -+ -+/* From src/plugins/ipmi_intf.c: */ -+uint16_t -+ipmi_intf_get_max_response_data_size(struct ipmi_intf * intf); - - static const char * combined_voltage_desc[] = { - "12 V", --- -2.37.3 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb index a8d203e599..0340901c22 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb @@ -24,7 +24,6 @@ DEPENDS = "openssl readline ncurses" SRCREV = "19d78782d795d0cf4ceefe655f616210c9143e62" SRC_URI = "git://github.com/ipmitool/ipmitool;protocol=https;branch=master \ ${IANA_ENTERPRISE_NUMBERS} \ - file://0001-ipmi_fru.c-Provide-missing-function-declarations.patch \ file://0001-configure-Remove-the-logic-to-download-IANA-PEN-data.patch \ " IANA_ENTERPRISE_NUMBERS ?= "" diff --git a/meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.1.bb index cff86722e4..f876f7534f 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" SECTION = "libs" -SRCREV = "826b06bb2484a53fdae196e12ec507a67ec87055" +SRCREV = "4e51588b1f4d6617df7e39a38acc0d0daa3d8a3f" SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch" diff --git a/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.3.bb b/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.4.bb index fbb6b76d10..73620f37a6 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 SECTION = "libs" DEPENDS = "libtraceevent bison-native flex-native" -SRCREV = "3395d484eadfd8ab38311032f28e7f79c4f0e33b" +SRCREV = "af49d832f46631597e0aabb2302bd0f56a9cad29" SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \ file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch index 830f1d96e1..1e5415ef6a 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch @@ -1,18 +1,18 @@ -From c6190920d405a5a6df3797153be93905d98a65f5 Mon Sep 17 00:00:00 2001 +From 9c3213a3b64e049c1aa065300b01ee751699b01f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 6 Jan 2023 16:53:06 -0800 -Subject: [PATCH] Replace LFS64 interfaces off64_t and lseek64 +Subject: [PATCH 1/2] Replace LFS64 interfaces off64_t and lseek64 Musl does not define these interfaces unless -D_LARGEFILE64_SOURCE is -defined and that too it is transitional until apps switch to using 64bit -off_t. We pass -D_LARGEFILE64_SOURCE in makefiles already therefore +defined and that too it is transitional until apps switch to using 64-bit +off_t. We pass -D_FILE_OFFSET_BITS=64 in makefiles already therefore original lseek and off_t are already 64bit This fixes build with latest musl which has dropped LFS64 interfaces [1] [1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4i -Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230107010245.1290391-1-raj.khem@gmail.com/] +Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230109225315.1284538-1-raj.khem@gmail.com/] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../include/private/trace-cmd-private.h | 12 +- @@ -27,7 +27,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 9 files changed, 142 insertions(+), 142 deletions(-) diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h -index 271f0541..ac2d02c3 100644 +index 05c084ce..f2cf8dc8 100644 --- a/lib/trace-cmd/include/private/trace-cmd-private.h +++ b/lib/trace-cmd/include/private/trace-cmd-private.h @@ -106,7 +106,7 @@ const char *tracecmd_get_trace_clock(struct tracecmd_input *handle); @@ -48,7 +48,7 @@ index 271f0541..ac2d02c3 100644 int tracecmd_write_options(struct tracecmd_output *handle); int tracecmd_write_meta_strings(struct tracecmd_output *handle); int tracecmd_append_options(struct tracecmd_output *handle); -@@ -393,7 +393,7 @@ struct tracecmd_msg_handle { +@@ -394,7 +394,7 @@ struct tracecmd_msg_handle { short cpu_count; short version; /* Current protocol version */ unsigned long flags; @@ -57,7 +57,7 @@ index 271f0541..ac2d02c3 100644 bool done; bool cache; int cfd; -@@ -542,8 +542,8 @@ int tracecmd_write_guest_time_shift(struct tracecmd_output *handle, +@@ -543,8 +543,8 @@ int tracecmd_write_guest_time_shift(struct tracecmd_output *handle, struct tracecmd_compress_chunk { unsigned int size; unsigned int zsize; @@ -68,7 +68,7 @@ index 271f0541..ac2d02c3 100644 }; struct tracecmd_compression; struct tracecmd_compression_proto { -@@ -569,7 +569,7 @@ int tracecmd_compress_buffer_read(struct tracecmd_compression *handle, char *dst +@@ -570,7 +570,7 @@ int tracecmd_compress_buffer_read(struct tracecmd_compression *handle, char *dst int tracecmd_compress_pread(struct tracecmd_compression *handle, char *dst, int len, off_t offset); int tracecmd_compress_buffer_write(struct tracecmd_compression *handle, const void *data, unsigned long long size); @@ -682,7 +682,7 @@ index 0b2de710..3a555c36 100644 close(fd); diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c -index bdec75d6..37bb3ec0 100644 +index 1c0f7b77..ad740d65 100644 --- a/lib/trace-cmd/trace-output.c +++ b/lib/trace-cmd/trace-output.c @@ -112,7 +112,7 @@ do_write_check(struct tracecmd_output *handle, const void *data, long long size) @@ -703,7 +703,7 @@ index bdec75d6..37bb3ec0 100644 } static inline int do_preed(struct tracecmd_output *handle, void *dst, int len, off_t offset) -@@ -518,12 +518,12 @@ out_write_section_header(struct tracecmd_output *handle, unsigned short header_i +@@ -526,12 +526,12 @@ out_write_section_header(struct tracecmd_output *handle, unsigned short header_i /* Section ID */ endian2 = convert_endian_2(handle, header_id); if (do_write_check(handle, &endian2, 2)) @@ -718,7 +718,7 @@ index bdec75d6..37bb3ec0 100644 /* Section description */ if (description) -@@ -532,13 +532,13 @@ out_write_section_header(struct tracecmd_output *handle, unsigned short header_i +@@ -540,13 +540,13 @@ out_write_section_header(struct tracecmd_output *handle, unsigned short header_i desc = -1; endian4 = convert_endian_4(handle, desc); if (do_write_check(handle, &endian4, 4)) @@ -734,7 +734,7 @@ index bdec75d6..37bb3ec0 100644 return offset; } -@@ -559,13 +559,13 @@ __hidden int out_update_section_header(struct tracecmd_output *handle, tsize_t o +@@ -567,13 +567,13 @@ __hidden int out_update_section_header(struct tracecmd_output *handle, tsize_t o if (size < 8) return -1; size -= 8; @@ -750,7 +750,7 @@ index bdec75d6..37bb3ec0 100644 return -1; return 0; } -@@ -587,7 +587,7 @@ static int save_string_section(struct tracecmd_output *handle, bool compress) +@@ -595,7 +595,7 @@ static int save_string_section(struct tracecmd_output *handle, bool compress) if (compress) flags |= TRACECMD_SEC_FL_COMPRESS; offset = out_write_section_header(handle, TRACECMD_OPTION_STRINGS, "strings", flags, false); @@ -759,7 +759,7 @@ index bdec75d6..37bb3ec0 100644 return -1; out_compression_start(handle, compress); -@@ -637,7 +637,7 @@ static int read_header_files(struct tracecmd_output *handle, bool compress) +@@ -645,7 +645,7 @@ static int read_header_files(struct tracecmd_output *handle, bool compress) flags |= TRACECMD_SEC_FL_COMPRESS; offset = out_write_section_header(handle, TRACECMD_OPTION_HEADER_INFO, "headers", flags, true); @@ -768,7 +768,7 @@ index bdec75d6..37bb3ec0 100644 return -1; out_compression_start(handle, compress); -@@ -965,7 +965,7 @@ static int read_ftrace_files(struct tracecmd_output *handle, bool compress) +@@ -973,7 +973,7 @@ static int read_ftrace_files(struct tracecmd_output *handle, bool compress) flags |= TRACECMD_SEC_FL_COMPRESS; offset = out_write_section_header(handle, TRACECMD_OPTION_FTRACE_EVENTS, "ftrace events", flags, true); @@ -777,7 +777,7 @@ index bdec75d6..37bb3ec0 100644 return -1; create_event_list_item(handle, &systems, &list); -@@ -1024,7 +1024,7 @@ static int read_event_files(struct tracecmd_output *handle, +@@ -1032,7 +1032,7 @@ static int read_event_files(struct tracecmd_output *handle, flags |= TRACECMD_SEC_FL_COMPRESS; offset = out_write_section_header(handle, TRACECMD_OPTION_EVENT_FORMATS, "events format", flags, true); @@ -786,7 +786,7 @@ index bdec75d6..37bb3ec0 100644 return -1; /* * If any of the list is the special keyword "all" then -@@ -1138,7 +1138,7 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress) +@@ -1146,7 +1146,7 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress) flags |= TRACECMD_SEC_FL_COMPRESS; offset = out_write_section_header(handle, TRACECMD_OPTION_KALLSYMS, "kallsyms", flags, true); @@ -795,7 +795,7 @@ index bdec75d6..37bb3ec0 100644 return -1; out_compression_start(handle, compress); -@@ -1202,7 +1202,7 @@ static int read_ftrace_printk(struct tracecmd_output *handle, bool compress) +@@ -1210,7 +1210,7 @@ static int read_ftrace_printk(struct tracecmd_output *handle, bool compress) if (compress) flags |= TRACECMD_SEC_FL_COMPRESS; offset = out_write_section_header(handle, TRACECMD_OPTION_PRINTK, "printk", flags, true); @@ -804,7 +804,7 @@ index bdec75d6..37bb3ec0 100644 return -1; out_compression_start(handle, compress); -@@ -1247,8 +1247,8 @@ static int save_tracing_file_data(struct tracecmd_output *handle, +@@ -1255,8 +1255,8 @@ static int save_tracing_file_data(struct tracecmd_output *handle, unsigned long long endian8; char *file = NULL; struct stat st; @@ -815,7 +815,7 @@ index bdec75d6..37bb3ec0 100644 int ret = -1; file = get_tracing_file(handle, filename); -@@ -1842,9 +1842,9 @@ static int write_options_v6(struct tracecmd_output *handle) +@@ -1850,9 +1850,9 @@ static int write_options_v6(struct tracecmd_output *handle) return 0; } @@ -827,7 +827,7 @@ index bdec75d6..37bb3ec0 100644 return -1; offset = convert_endian_8(handle, offset); if (do_write_check(handle, &offset, 8)) -@@ -1867,7 +1867,7 @@ static int update_options_start(struct tracecmd_output *handle, off64_t offset) +@@ -1875,7 +1875,7 @@ static int update_options_start(struct tracecmd_output *handle, off64_t offset) * * Returns zero on success and -1 on error. */ @@ -836,7 +836,7 @@ index bdec75d6..37bb3ec0 100644 { tsize_t curr; int ret; -@@ -1887,7 +1887,7 @@ int tracecmd_prepare_options(struct tracecmd_output *handle, off64_t offset, int +@@ -1895,7 +1895,7 @@ int tracecmd_prepare_options(struct tracecmd_output *handle, off64_t offset, int break; case SEEK_END: offset = do_lseek(handle, offset, SEEK_END); @@ -845,7 +845,7 @@ index bdec75d6..37bb3ec0 100644 return -1; break; } -@@ -2059,7 +2059,7 @@ __hidden void *trace_get_options(struct tracecmd_output *handle, size_t *len) +@@ -2067,7 +2067,7 @@ __hidden void *trace_get_options(struct tracecmd_output *handle, size_t *len) if (!buf) goto out; @@ -854,7 +854,7 @@ index bdec75d6..37bb3ec0 100644 goto out; *len = read(msg_handle.cfd, buf, offset); if (*len != offset) { -@@ -2270,7 +2270,7 @@ int tracecmd_write_cmdlines(struct tracecmd_output *handle) +@@ -2278,7 +2278,7 @@ int tracecmd_write_cmdlines(struct tracecmd_output *handle) flags |= TRACECMD_SEC_FL_COMPRESS; offset = out_write_section_header(handle, TRACECMD_OPTION_CMDLINES, "command lines", flags, true); @@ -863,7 +863,7 @@ index bdec75d6..37bb3ec0 100644 return -1; out_compression_start(handle, compress); -@@ -2519,7 +2519,7 @@ static int update_buffer_cpu_offset_v6(struct tracecmd_output *handle, +@@ -2527,7 +2527,7 @@ static int update_buffer_cpu_offset_v6(struct tracecmd_output *handle, current = do_lseek(handle, 0, SEEK_CUR); /* Go to the option data, where will write the offest */ @@ -872,7 +872,7 @@ index bdec75d6..37bb3ec0 100644 tracecmd_warning("could not seek to %lld", b_offset); return -1; } -@@ -2528,7 +2528,7 @@ static int update_buffer_cpu_offset_v6(struct tracecmd_output *handle, +@@ -2536,7 +2536,7 @@ static int update_buffer_cpu_offset_v6(struct tracecmd_output *handle, return -1; /* Go back to end of file */ @@ -881,7 +881,7 @@ index bdec75d6..37bb3ec0 100644 tracecmd_warning("could not seek to %lld", offset); return -1; } -@@ -2652,7 +2652,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle, +@@ -2660,7 +2660,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle, data_files[i].data_offset &= ~(page_size - 1); ret = do_lseek(handle, data_files[i].data_offset, SEEK_SET); @@ -890,7 +890,7 @@ index bdec75d6..37bb3ec0 100644 goto out_free; if (!tracecmd_get_quiet(handle)) -@@ -2660,7 +2660,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle, +@@ -2668,7 +2668,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle, i, (unsigned long long)data_files[i].data_offset); if (data[i].size) { @@ -899,7 +899,7 @@ index bdec75d6..37bb3ec0 100644 goto out_free; read_size = out_copy_fd_compress(handle, data[i].fd, data[i].size, &data_files[i].write_size, -@@ -2678,19 +2678,19 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle, +@@ -2686,19 +2686,19 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle, if (!HAS_SECTIONS(handle)) { /* Write the real CPU data offset in the file */ @@ -922,7 +922,7 @@ index bdec75d6..37bb3ec0 100644 goto out_free; } if (!tracecmd_get_quiet(handle)) { -@@ -2709,7 +2709,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle, +@@ -2717,7 +2717,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle, goto out_free; free(data_files); @@ -931,7 +931,7 @@ index bdec75d6..37bb3ec0 100644 return -1; if (out_update_section_header(handle, offset)) -@@ -2978,7 +2978,7 @@ __hidden int out_save_options_offset(struct tracecmd_output *handle, unsigned lo +@@ -2986,7 +2986,7 @@ __hidden int out_save_options_offset(struct tracecmd_output *handle, unsigned lo return -1; new = do_lseek(handle, 0, SEEK_CUR); @@ -940,7 +940,7 @@ index bdec75d6..37bb3ec0 100644 return -1; en8 = convert_endian_8(handle, start); -@@ -2986,7 +2986,7 @@ __hidden int out_save_options_offset(struct tracecmd_output *handle, unsigned lo +@@ -2994,7 +2994,7 @@ __hidden int out_save_options_offset(struct tracecmd_output *handle, unsigned lo return -1; handle->options_start = new; @@ -950,7 +950,7 @@ index bdec75d6..37bb3ec0 100644 } else { handle->options_start = start; diff --git a/lib/trace-cmd/trace-recorder.c b/lib/trace-cmd/trace-recorder.c -index f387091f..a5ac8be3 100644 +index 23499f30..c172ad64 100644 --- a/lib/trace-cmd/trace-recorder.c +++ b/lib/trace-cmd/trace-recorder.c @@ -51,7 +51,7 @@ static int append_file(int size, int dst, int src) diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0002-Drop-using-_LARGEFILE64_SOURCE.patch b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0002-Drop-using-_LARGEFILE64_SOURCE.patch new file mode 100644 index 0000000000..7b2ea79eb3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0002-Drop-using-_LARGEFILE64_SOURCE.patch @@ -0,0 +1,145 @@ +From 47005e155c291ee6a2460cbf9eee604997e87063 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 9 Jan 2023 14:48:49 -0800 +Subject: [PATCH 2/2] Drop using _LARGEFILE64_SOURCE + +Its no longer needed since we have dropped using LF64 interfaces + +Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230109225315.1284538-2-raj.khem@gmail.com/T/#u] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/trace-cmd/trace-input.c | 1 - + lib/trace-cmd/trace-output.c | 1 - + lib/trace-cmd/trace-recorder.c | 1 - + tracecmd/trace-hist.c | 1 - + tracecmd/trace-listen.c | 1 - + tracecmd/trace-mem.c | 1 - + tracecmd/trace-profile.c | 1 - + tracecmd/trace-read.c | 1 - + tracecmd/trace-restore.c | 1 - + tracecmd/trace-split.c | 1 - + 10 files changed, 10 deletions(-) + +diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c +index 9b128403..3dd13ce4 100644 +--- a/lib/trace-cmd/trace-input.c ++++ b/lib/trace-cmd/trace-input.c +@@ -3,7 +3,6 @@ + * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> + * + */ +-#define _LARGEFILE64_SOURCE + #include <stdbool.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c +index ad740d65..eee847e3 100644 +--- a/lib/trace-cmd/trace-output.c ++++ b/lib/trace-cmd/trace-output.c +@@ -3,7 +3,6 @@ + * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> + * + */ +-#define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/lib/trace-cmd/trace-recorder.c b/lib/trace-cmd/trace-recorder.c +index c172ad64..70ce52e2 100644 +--- a/lib/trace-cmd/trace-recorder.c ++++ b/lib/trace-cmd/trace-recorder.c +@@ -3,7 +3,6 @@ + * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> + * + */ +-#define _LARGEFILE64_SOURCE + #include <stdio.h> + #include <stdlib.h> + #include <fcntl.h> +diff --git a/tracecmd/trace-hist.c b/tracecmd/trace-hist.c +index efb790ac..62fe4f9b 100644 +--- a/tracecmd/trace-hist.c ++++ b/tracecmd/trace-hist.c +@@ -5,7 +5,6 @@ + * Several of the ideas in this file came from Arnaldo Carvalho de Melo's + * work on the perf ui. + */ +-#define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/tracecmd/trace-listen.c b/tracecmd/trace-listen.c +index 86d2b9e9..e95c5711 100644 +--- a/tracecmd/trace-listen.c ++++ b/tracecmd/trace-listen.c +@@ -3,7 +3,6 @@ + * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> + * + */ +-#define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/tracecmd/trace-mem.c b/tracecmd/trace-mem.c +index 25eb0861..3e1ac9f3 100644 +--- a/tracecmd/trace-mem.c ++++ b/tracecmd/trace-mem.c +@@ -11,7 +11,6 @@ + * was written for the newer version. I decided to do some of it here + * in C. + */ +-#define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/tracecmd/trace-profile.c b/tracecmd/trace-profile.c +index 6a2cc3d0..d12a0e5e 100644 +--- a/tracecmd/trace-profile.c ++++ b/tracecmd/trace-profile.c +@@ -5,7 +5,6 @@ + */ + + /** FIXME: Convert numbers based on machine and file */ +-#define _LARGEFILE64_SOURCE + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff --git a/tracecmd/trace-read.c b/tracecmd/trace-read.c +index c094ad6a..52ba818e 100644 +--- a/tracecmd/trace-read.c ++++ b/tracecmd/trace-read.c +@@ -3,7 +3,6 @@ + * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> + * + */ +-#define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/tracecmd/trace-restore.c b/tracecmd/trace-restore.c +index 5bf29c52..e9ca3225 100644 +--- a/tracecmd/trace-restore.c ++++ b/tracecmd/trace-restore.c +@@ -3,7 +3,6 @@ + * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> + * + */ +-#define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c +index 851ec94e..1daa847d 100644 +--- a/tracecmd/trace-split.c ++++ b/tracecmd/trace-split.c +@@ -3,7 +3,6 @@ + * Copyright (C) 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> + * + */ +-#define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> +-- +2.39.0 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb index 50d73df03a..11c4037b23 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=master \ file://0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch \ + file://0002-Drop-using-_LARGEFILE64_SOURCE.patch \ file://0001-Do-not-emit-useless-rpath.patch" SRCREV = "18233e4c32857cb7ddd4960beeec8360ed834fc5" @@ -25,7 +26,7 @@ do_compile() { } do_install() { - oe_runmake libdir_relative=${BASELIB} etcdir=${sysconfdir} pkgconfig_dir=${libdir}/pkgconfig DESTDIR=${D} install install_libs + oe_runmake libdir_relative=${baselib} etcdir=${sysconfdir} pkgconfig_dir=${libdir}/pkgconfig DESTDIR=${D} install install_libs # Because makefile uses cp instead of install we need to change owner of files chown -R root:root ${D}${libdir} } diff --git a/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb b/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb index e91c81d703..a09f84381e 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb @@ -19,6 +19,8 @@ SRC_URI[sha256sum] = "ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8c inherit autotools lib_package pkgconfig +CXXFLAGS += "-std=c++14" + DEPENDS = " \ asciidoc-native \ alsa-lib \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch b/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch new file mode 100644 index 0000000000..dfdaf810d8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch @@ -0,0 +1,38 @@ +From 7a25d5def379db387de9237f0b03605b3ae277b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Jan 2023 11:32:59 -0800 +Subject: [PATCH] fastmix: Drop 'register' storage class keyword + +It has been dropped from laters C/C++ standards ( c++17 and newer ) + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/fastmix.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/fastmix.cpp b/src/fastmix.cpp +index d693d20..aa51c4a 100644 +--- a/src/fastmix.cpp ++++ b/src/fastmix.cpp +@@ -288,7 +288,7 @@ CzWINDOWEDFIR sfir; + // MIXING MACROS + // ---------------------------------------------------------------------------- + #define SNDMIX_BEGINSAMPLELOOP8\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +@@ -296,7 +296,7 @@ CzWINDOWEDFIR sfir; + do { + + #define SNDMIX_BEGINSAMPLELOOP16\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +-- +2.39.0 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb index 144c737e76..e04e763776 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb @@ -4,8 +4,9 @@ HOMEPAGE = "http://modplug-xmms.sf.net" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685" -SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" -SRC_URI[md5sum] = "5ba16981e6515975e9a68a58d5ba69d1" +SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz \ + file://0001-fastmix-Drop-register-storage-class-keyword.patch" + SRC_URI[sha256sum] = "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters.inc b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters.inc index 5952b5a2a6..f0f915e946 100644 --- a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters.inc +++ b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters.inc @@ -34,10 +34,10 @@ PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" PACKAGECONFIG[png] = "--with-png,--without-png,libpng" PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" +PACKAGECONFIG ??= "dbus ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,,dbus" DIRFILES = "1" diff --git a/meta-openembedded/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch b/meta-openembedded/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch new file mode 100644 index 0000000000..86c09c9f84 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch @@ -0,0 +1,24 @@ +--- a/src/meson.build 2023-01-24 09:22:59.874074134 +0100 ++++ b/src/meson.build 2023-01-24 09:27:00.494627305 +0100 +@@ -73,12 +73,12 @@ + + + # Translate and install policy file +-i18n.merge_file ( +- input: 'org.opensuse.cupspkhelper.mechanism.policy.in', +- output: 'org.opensuse.cupspkhelper.mechanism.policy', +- type: 'xml', +- data_dirs: join_paths (meson.source_root (), 'src'), +- po_dir: join_paths (meson.source_root (), 'po'), +- install: true, +- install_dir: join_paths (prefix, datadir, 'polkit-1', 'actions') +-) ++#i18n.merge_file ( ++# input: 'org.opensuse.cupspkhelper.mechanism.policy.in', ++# output: 'org.opensuse.cupspkhelper.mechanism.policy', ++# type: 'xml', ++# data_dirs: join_paths (meson.source_root (), 'src'), ++# po_dir: join_paths (meson.source_root (), 'po'), ++# install: true, ++# install_dir: join_paths (prefix, datadir, 'polkit-1', 'actions') ++#) diff --git a/meta-openembedded/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb b/meta-openembedded/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb new file mode 100644 index 0000000000..4bf62006f4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "CUPS polkit helper" +HOMEPAGE = "https://www.freedesktop.org/software/cups-pk-helper/releases/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "cups polkit glib-2.0" + +inherit meson pkgconfig gettext features_check + +REQUIRED_DISTRO_FEATURES ="polkit" + +SRC_URI = " \ + https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${PV}.tar.xz \ + file://dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch \ +" +SRC_URI[sha256sum] = "66070ddb448fe9fcee76aa26be2ede5a80f85563e3a4afd59d2bfd79fbe2e831" + +do_install:append() { + install -d ${D}${datadir}/polkit-1/actions + install -m 644 ${S}/src/org.opensuse.cupspkhelper.mechanism.policy.in ${D}${datadir}/polkit-1/actions/org.opensuse.cupspkhelper.mechanism.policy +} + +FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch new file mode 100644 index 0000000000..8984e6502f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch @@ -0,0 +1,30 @@ +From 3f7f70c746277e1a89978166533374a8b9bd5407 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Wed, 25 Jan 2023 17:05:25 +0000 +Subject: [PATCH] Adhere to the SOURCE_DATE_EPOCH standard + +Adhere to the SOURCE_DATE_EPOCH standard and use it's date when set +otherwise fall back to the default behaviour. + +Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 599b1452a05a..7776b0f0d63d 100644 +--- a/Makefile ++++ b/Makefile +@@ -109,7 +109,7 @@ all: keyctl request-key key.dns_resolver cxx + ############################################################################### + #RPATH = -Wl,-rpath,$(LIBDIR) + +-VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\"" ++VCPPFLAGS := -DPKGBUILD="\"$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%F)\"" + VCPPFLAGS += -DPKGVERSION="\"keyutils-$(VERSION)\"" + VCPPFLAGS += -DAPIVERSION="\"libkeyutils-$(APIVERSION)\"" + +-- +2.39.0 + diff --git a/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-builtin_trusted-Failure-command-is-failed.patch b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-builtin_trusted-Failure-command-is-failed.patch new file mode 100644 index 0000000000..b78d7f7f28 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-builtin_trusted-Failure-command-is-failed.patch @@ -0,0 +1,27 @@ +From 714542f009860e1652bc06d05ab939290374a114 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 26 Jan 2023 08:27:12 +0000 +Subject: [PATCH 1/2] tests: builtin_trusted: Failure command is `failed` + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + tests/features/builtin_trusted/runtest.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/features/builtin_trusted/runtest.sh b/tests/features/builtin_trusted/runtest.sh +index 27910b5fa8e7..437f5ad1d6b2 100644 +--- a/tests/features/builtin_trusted/runtest.sh ++++ b/tests/features/builtin_trusted/runtest.sh +@@ -24,7 +24,7 @@ id_key --to=blk %:.blacklist + # There should be at least one built-in trusted key for module signing. + list_keyring $btk + expect_keyring_rlist bkeys +-if [ `echo $bkeys | wc -w` = 0 ]; then fail; fi ++if [ `echo $bkeys | wc -w` = 0 ]; then failed; fi + + # Check we can't add random keys to those keyrings + marker "TRY ADDING USER KEYS" +-- +2.39.0 + diff --git a/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch index 728f464331..769118e422 100644 --- a/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch +++ b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch @@ -1,4 +1,4 @@ -From 935a31dd6f14bd1aff735495f0fdbae4ca05c695 Mon Sep 17 00:00:00 2001 +From b84ecc2e3e56a25a3efd56c8942ad6bab3ff9ba1 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Fri, 2 Dec 2022 15:35:40 +0800 Subject: [PATCH] tests/toolbox.inc.sh: update regex for getting endian @@ -14,22 +14,22 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh -index 1964450..e827e20 100644 +index 8bf0db6f6d87..7ea2f253ba7d 100644 --- a/tests/toolbox.inc.sh +++ b/tests/toolbox.inc.sh @@ -13,10 +13,10 @@ echo === $OUTPUTFILE === endian=`file -L /proc/$$/exe` --if expr "$endian" : '.* MSB \+\(executable\|shared object\).*' >&/dev/null -+if expr "$endian" : '.* MSB .*\(executable\|shared object\).*' >&/dev/null +-if expr "$endian" : '.* MSB \+\(pie executable\|executable\|shared object\).*' >&/dev/null ++if expr "$endian" : '.* MSB .*\(pie executable\|executable\|shared object\).*' >&/dev/null then endian=BE --elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null -+elif expr "$endian" : '.* LSB .*\(executable\|shared object\).*' >&/dev/null +-elif expr "$endian" : '.* LSB \+\(pie executable\|executable\|shared object\).*' >&/dev/null ++elif expr "$endian" : '.* LSB .*\(pie executable\|executable\|shared object\).*' >&/dev/null then endian=LE else -- -2.25.1 +2.39.0 diff --git a/meta-openembedded/meta-oe/recipes-security/keyutils/files/0002-tests-Use-head-n1-for-busybox-compatibility.patch b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0002-tests-Use-head-n1-for-busybox-compatibility.patch new file mode 100644 index 0000000000..900f2f0ec9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0002-tests-Use-head-n1-for-busybox-compatibility.patch @@ -0,0 +1,64 @@ +From 5e660f246bb04560692ac9fc144574732c7e19e7 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 26 Jan 2023 08:28:16 +0000 +Subject: [PATCH 2/2] tests: Use `head -n1` for busybox compatibility + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + tests/keyctl/session/valid/runtest.sh | 4 ++-- + tests/keyctl/show/noargs/runtest.sh | 2 +- + tests/toolbox.inc.sh | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/keyctl/session/valid/runtest.sh b/tests/keyctl/session/valid/runtest.sh +index 4c831314c0b0..456e9f32de23 100644 +--- a/tests/keyctl/session/valid/runtest.sh ++++ b/tests/keyctl/session/valid/runtest.sh +@@ -17,7 +17,7 @@ then + expect_key_rdesc rdesc "keyring@.*@.*@.*@_ses[^@]*\$" + + # check the session keyring ID is shown +- seskeyring="`tail -2 $OUTPUTFILE | head -1`" ++ seskeyring="`tail -2 $OUTPUTFILE | head -n1`" + if ! expr "$seskeyring" : "Joined session keyring: [0-9]*" >&/dev/null + then + failed +@@ -30,7 +30,7 @@ new_session qwerty keyctl rdescribe @s "@" + expect_key_rdesc rdesc "keyring@.*@.*@.*@qwerty" + + # check the session keyring ID is shown +-seskeyring="`tail -2 $OUTPUTFILE | head -1`" ++seskeyring="`tail -2 $OUTPUTFILE | head -n1`" + if ! expr "$seskeyring" : "Joined session keyring: [0-9]*" >&/dev/null + then + failed +diff --git a/tests/keyctl/show/noargs/runtest.sh b/tests/keyctl/show/noargs/runtest.sh +index d5072716c76a..a6d8b6b585c4 100644 +--- a/tests/keyctl/show/noargs/runtest.sh ++++ b/tests/keyctl/show/noargs/runtest.sh +@@ -31,7 +31,7 @@ then + fi + + # the first key listed (line 2) should be a keying (the session keyring) ... +-keyring1="`grep -n keyring $OUTPUTFILE | cut -d: -f1 | head -1`" ++keyring1="`grep -n keyring $OUTPUTFILE | cut -d: -f1 | head -n1`" + if [ "$keyring1" != "4" ] + then + failed +diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh +index 7ea2f253ba7d..a461a73daaa3 100644 +--- a/tests/toolbox.inc.sh ++++ b/tests/toolbox.inc.sh +@@ -229,7 +229,7 @@ function check_notify () + if [ "$1" = "-2" ] + then + shift +- my_logline="`tail -2 $watch_log | head -1`" ++ my_logline="`tail -2 $watch_log | head -n1`" + else + my_logline="`tail -1 $watch_log`" + fi +-- +2.39.0 + diff --git a/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb b/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb index 019118f38b..6cdfef9d11 100644 --- a/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb @@ -12,18 +12,24 @@ LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" -inherit siteinfo autotools-brokensep ptest +inherit manpages ptest -SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \ +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;protocol=https;branch=master \ file://keyutils-test-fix-output-format.patch \ file://keyutils-fix-error-report-by-adding-default-message.patch \ file://run-ptest \ file://fix_library_install_path.patch \ file://0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch \ + file://0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch \ + file://0001-tests-builtin_trusted-Failure-command-is-failed.patch \ + file://0002-tests-Use-head-n1-for-busybox-compatibility.patch \ " +SRCREV = "cb3bb194cca88211cbfcdde2f10c0f43c3fb8ec3" -SRC_URI[md5sum] = "919af7f33576816b423d537f8a8692e8" -SRC_URI[sha256sum] = "c8b15722ae51d95b9ad76cc6d49a4c2cc19b0c60f72f61fb9bf43eea7cbd64ce" +S = "${WORKDIR}/git" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[manpages] = "" EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ NO_ARLIB=1 \ @@ -40,7 +46,6 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ " do_install () { - install -d ${D}/${libdir}/pkgconfig oe_runmake DESTDIR=${D} install } @@ -50,7 +55,7 @@ do_install_ptest () { } -RDEPENDS:${PN}-ptest += "lsb-release" +RDEPENDS:${PN}-ptest += "bash lsb-release make" RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils" RDEPENDS:${PN}-ptest:append:libc-musl = " musl-utils" diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch new file mode 100644 index 0000000000..fb8fa3427f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch @@ -0,0 +1,60 @@ +Origin: commit c187154f47697cdbf822c2f9d714d570ed4a0fd1 +From: Oliver Kiddle <opk@zsh.org> +Date: Wed, 15 Dec 2021 01:56:40 +0100 +Subject: [PATCH 1/9] security/41: Don't perform PROMPT_SUBST evaluation on + %F/%K arguments + +Mitigates CVE-2021-45444 + +https://salsa.debian.org/debian/zsh/-/raw/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_1.patch?inline=false +Upstream-Status: Backport +CVE: CVE-2021-45444 +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> +--- + ChangeLog | 5 +++++ + Src/prompt.c | 10 ++++++++++ + 2 files changed, 15 insertions(+) + +diff --git a/ChangeLog b/ChangeLog +index 8d7dfc169..eb248ec06 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2022-01-27 dana <dana@dana.is> ++ ++ * Oliver Kiddle: security/41: Src/prompt.c: Prevent recursive ++ PROMPT_SUBST ++ + 2020-02-14 dana <dana@dana.is> + + * unposted: Config/version.mk: Update for 5.8 +diff --git a/Src/prompt.c b/Src/prompt.c +index b65bfb86b..91e21c8e9 100644 +--- a/Src/prompt.c ++++ b/Src/prompt.c +@@ -244,6 +244,12 @@ parsecolorchar(zattr arg, int is_fg) + bv->fm += 2; /* skip over F{ */ + if ((ep = strchr(bv->fm, '}'))) { + char oc = *ep, *col, *coll; ++ int ops = opts[PROMPTSUBST], opb = opts[PROMPTBANG]; ++ int opp = opts[PROMPTPERCENT]; ++ ++ opts[PROMPTPERCENT] = 1; ++ opts[PROMPTSUBST] = opts[PROMPTBANG] = 0; ++ + *ep = '\0'; + /* expand the contents of the argument so you can use + * %v for example */ +@@ -252,6 +258,10 @@ parsecolorchar(zattr arg, int is_fg) + arg = match_colour((const char **)&coll, is_fg, 0); + free(col); + bv->fm = ep; ++ ++ opts[PROMPTSUBST] = ops; ++ opts[PROMPTBANG] = opb; ++ opts[PROMPTPERCENT] = opp; + } else { + arg = match_colour((const char **)&bv->fm, is_fg, 0); + if (*bv->fm != '}') +-- +2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch new file mode 100644 index 0000000000..e5b6d7cdc9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch @@ -0,0 +1,140 @@ +From 8a4d65ef6d0023ab9b238529410afb433553d2fa Mon Sep 17 00:00:00 2001 +From: Marc Cornellà <hello@mcornella.com> +Date: Mon, 24 Jan 2022 09:43:28 +0100 +Subject: [PATCH 2/9] security/89: Add patch which can optionally be used to + work around CVE-2021-45444 in VCS_Info +Comment: Updated to use the same file name without blanks as actually + used in the final 5.8.1 release. + + +https://salsa.debian.org/debian/zsh/-/blob/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_2.patch +Upstream-Status: Backport +CVE: CVE-2021-45444 +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> +--- + ChangeLog | 5 + + Etc/CVE-2021-45444-VCS_Info-workaround.patch | 98 ++++++++++++++++++++ + 2 files changed, 103 insertions(+) + create mode 100644 Etc/CVE-2021-45444-VCS_Info-workaround.patch + +diff --git a/ChangeLog b/ChangeLog +index eb248ec06..9a05a09e1 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,10 @@ + 2022-01-27 dana <dana@dana.is> + ++ * Marc Cornellà: security/89: ++ Etc/CVE-2021-45444-VCS_Info-workaround.patch: Add patch which ++ can optionally be used to work around recursive PROMPT_SUBST ++ issue in VCS_Info ++ + * Oliver Kiddle: security/41: Src/prompt.c: Prevent recursive + PROMPT_SUBST + +diff --git a/Etc/CVE-2021-45444-VCS_Info-workaround.patch b/Etc/CVE-2021-45444-VCS_Info-workaround.patch +new file mode 100644 +index 000000000..13e54be77 +--- /dev/null ++++ b/Etc/CVE-2021-45444-VCS_Info-workaround.patch +@@ -0,0 +1,98 @@ ++From 972887bbe5eb6a00e5f0e73781d6d73bfdcafb93 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com> ++Date: Mon, 24 Jan 2022 09:43:28 +0100 ++Subject: [PATCH] security/89: Partially work around CVE-2021-45444 in VCS_Info ++MIME-Version: 1.0 ++Content-Type: text/plain; charset=UTF-8 ++Content-Transfer-Encoding: 8bit ++ ++This patch is a partial, VCS_Info-specific work-around for CVE-2021-45444, ++which is mitigated in the shell itself in 5.8.1 and later versions. It is ++offered for users who are concerned about an exploit but are unable to update ++their binaries to receive the complete fix. ++ ++The patch works around the vulnerability by pre-escaping values substituted ++into format strings in VCS_Info. Please note that this may break some user ++configurations that rely on those values being un-escaped (which is why it was ++not included directly in 5.8.1). It may be possible to limit this breakage by ++adjusting exactly which ones are pre-escaped, but of course this may leave ++them vulnerable again. ++ ++If applying the patch to the file system is inconvenient or not possible, the ++following script can be used to idempotently patch the relevant function ++running in memory (and thus must be re-run when the shell is restarted): ++ ++ ++# Impacted versions go from v5.0.3 to v5.8 (v5.8.1 is the first patched version) ++autoload -Uz is-at-least ++if is-at-least 5.8.1 || ! is-at-least 5.0.3; then ++ return ++fi ++ ++# Quote necessary $hook_com[<field>] items just before they are used ++# in the line "VCS_INFO_hook 'post-backend'" of the VCS_INFO_formats ++# function, where <field> is: ++# ++# base: the full path of the repository's root directory. ++# base-name: the name of the repository's root directory. ++# branch: the name of the currently checked out branch. ++# revision: an identifier of the currently checked out revision. ++# subdir: the path of the current directory relative to the ++# repository's root directory. ++# misc: a string that may contain anything the vcs_info backend wants. ++# ++# This patch %-quotes these fields previous to their use in vcs_info hooks and ++# the zformat call and, eventually, when they get expanded in the prompt. ++# It's important to quote these here, and not later after hooks have modified the ++# fields, because then we could be quoting % characters from valid prompt sequences, ++# like %F{color}, %B, etc. ++# ++# 32 │ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})" ++# 33 │ hook_com[subdir_orig]="${hook_com[subdir]}" ++# 34 │ ++# 35 + │ for tmp in base base-name branch misc revision subdir; do ++# 36 + │ hook_com[$tmp]="${hook_com[$tmp]//\%/%%}" ++# 37 + │ done ++# 38 + │ ++# 39 │ VCS_INFO_hook 'post-backend' ++# ++# This is especially important so that no command substitution is performed ++# due to malicious input as a consequence of CVE-2021-45444, which affects ++# zsh versions from 5.0.3 to 5.8. ++# ++autoload -Uz +X regexp-replace VCS_INFO_formats ++ ++# We use $tmp here because it's already a local variable in VCS_INFO_formats ++typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"' ++# Unique string to avoid reapplying the patch if this code gets called twice ++typeset PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b ++# Only patch the VCS_INFO_formats function if not already patched ++if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then ++ regexp-replace 'functions[VCS_INFO_formats]' \ ++ "VCS_INFO_hook 'post-backend'" \ ++ ': ${PATCH_ID}; ${PATCH}; ${MATCH}' ++fi ++unset PATCH PATCH_ID ++ ++ ++--- ++ Functions/VCS_Info/VCS_INFO_formats | 4 ++++ ++ 1 file changed, 4 insertions(+) ++ ++diff --git a/Functions/VCS_Info/VCS_INFO_formats b/Functions/VCS_Info/VCS_INFO_formats ++index e0e1dc738..4d88e28b6 100644 ++--- a/Functions/VCS_Info/VCS_INFO_formats +++++ b/Functions/VCS_Info/VCS_INFO_formats ++@@ -32,6 +32,10 @@ hook_com[base-name_orig]="${hook_com[base_name]}" ++ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})" ++ hook_com[subdir_orig]="${hook_com[subdir]}" ++ +++for tmp in base base-name branch misc revision subdir; do +++ hook_com[$tmp]="${hook_com[$tmp]//\%/%%}" +++done +++ ++ VCS_INFO_hook 'post-backend' ++ ++ ## description (for backend authors): ++-- ++2.34.1 +-- +2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch new file mode 100644 index 0000000000..adfc00ae57 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch @@ -0,0 +1,77 @@ +From 4abf2fc193fc2f3e680deecbf81289a7b02e245b Mon Sep 17 00:00:00 2001 +From: dana <dana@dana.is> +Date: Tue, 21 Dec 2021 13:13:33 -0600 +Subject: [PATCH 3/9] CVE-2021-45444: Update NEWS/README + +https://salsa.debian.org/debian/zsh/-/blob/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_3.patch +Upstream-Status: Backport +CVE: CVE-2021-45444 +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> +--- + ChangeLog | 2 ++ + NEWS | 20 ++++++++++++++++++++ + README | 6 ++++++ + 3 files changed, 28 insertions(+) + +diff --git a/ChangeLog b/ChangeLog +index 9a05a09e1..93b0bc337 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,7 @@ + 2022-01-27 dana <dana@dana.is> + ++ * CVE-2021-45444: NEWS, README: Document preceding two changes ++ + * Marc Cornellà: security/89: + Etc/CVE-2021-45444-VCS_Info-workaround.patch: Add patch which + can optionally be used to work around recursive PROMPT_SUBST +diff --git a/NEWS b/NEWS +index 964e1633f..d34b3f79e 100644 +--- a/NEWS ++++ b/NEWS +@@ -4,6 +4,26 @@ CHANGES FROM PREVIOUS VERSIONS OF ZSH + + Note also the list of incompatibilities in the README file. + ++Changes since 5.8 ++----------------- ++ ++CVE-2021-45444: Some prompt expansion sequences, such as %F, support ++'arguments' which are themselves expanded in case they contain colour ++values, etc. This additional expansion would trigger PROMPT_SUBST ++evaluation, if enabled. This could be abused to execute code the user ++didn't expect. e.g., given a certain prompt configuration, an attacker ++could trick a user into executing arbitrary code by having them check ++out a Git branch with a specially crafted name. ++ ++This is fixed in the shell itself by no longer performing PROMPT_SUBST ++evaluation on these prompt-expansion arguments. ++ ++Users who are concerned about an exploit but unable to update their ++binaries may apply the partial work-around described in the file ++'Etc/CVE-2021-45444 VCS_Info workaround.patch' included with the shell ++source. [ Reported by RyotaK <security@ryotak.me>. Additional thanks to ++Marc Cornellà <hello@mcornella.com>. ] ++ + Changes since 5.7.1-test-3 + -------------------------- + +diff --git a/README b/README +index 7f1dd5f92..c9e994ab3 100644 +--- a/README ++++ b/README +@@ -31,6 +31,12 @@ Zsh is a shell with lots of features. For a list of some of these, see the + file FEATURES, and for the latest changes see NEWS. For more + details, see the documentation. + ++Incompatibilities since 5.8 ++--------------------------- ++ ++PROMPT_SUBST expansion is no longer performed on arguments to prompt- ++expansion sequences such as %F. ++ + Incompatibilities since 5.7.1 + ----------------------------- + +-- +2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb index 0429cb9cc7..b023e8d297 100644 --- a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb +++ b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb @@ -10,7 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=1a4c4cda3e8096d2fd483ff2f4514fec" DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/5.8/${BP}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/5.8/${BP}.tar.xz \ + file://CVE-2021-45444_1.patch \ + file://CVE-2021-45444_2.patch \ + file://CVE-2021-45444_3.patch \ + " SRC_URI[sha256sum] = "dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27" inherit autotools-brokensep gettext update-alternatives manpages diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_2.3.1.bb b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_2.3.2.bb index cdba31e704..313973326d 100644 --- a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_2.3.2.bb @@ -2,8 +2,8 @@ SUMMARY = "C++11 command line parser" DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." HOMEPAGE = "https://github.com/CLIUtils/CLI11" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9ad746b5f49c0fd53c08ca1faff1922c" -SRCREV = "c2ea58c7f9bb2a1da2d3d7f5b462121ac6a07f16" +LIC_FILES_CHKSUM = "file://LICENSE;md5=afb20fe5f67e21074b10b864d9563c11" +SRCREV = "291c58789c031208f08f4f261a858b5b7083e8e2" PV .= "+git${SRCPV}" SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \ diff --git a/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb new file mode 100644 index 0000000000..91570b6f35 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "Decode EDID data in human-readable format" +DESCRIPTION = "edid-decode decodes EDID monitor description data in human-readable format." +AUTHOR = "Hans Verkuil <hverkuil-cisco@xs4all.nl>" +HOMEPAGE = "https://hverkuil.home.xs4all.nl/edid-decode/edid-decode.html" + +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" + +SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" +SRCREV = "e052f5f9fdf74ca11aa1a8edfa62eff8d0aa3d0d" +PV = "0.0+git${SRCPV}" +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} diff --git a/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb b/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb index 0dc61c1c30..147a8069fa 100644 --- a/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb +++ b/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c" SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \ file://0001-Fix-build-of-shared-library-on-architectures-needing.patch \ file://0002-tr_languages-cast-string_ordinal-init-values.patch \ + file://0001-Drop-using-register-keyword-for-storage-classifier.patch \ " SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" diff --git a/meta-openembedded/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch b/meta-openembedded/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch new file mode 100644 index 0000000000..d9c0d08ec9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch @@ -0,0 +1,38 @@ +From bad6131463275bd8013a82c28fb0b27e882bc801 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 16:07:35 -0800 +Subject: [PATCH] Drop using 'register' keyword for storage classifier + +Its gone from C++17 and newer + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/klatt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/klatt.cpp b/src/klatt.cpp +index b15f77c..9c51bc5 100755 +--- a/src/klatt.cpp ++++ b/src/klatt.cpp +@@ -167,7 +167,7 @@ Output = (rnz.a * input) + (rnz.b * oldin1) + (rnz.c * oldin2) + #ifdef deleted + static double antiresonator(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + return (double)x; +@@ -176,7 +176,7 @@ static double antiresonator(resonator_ptr r, double input) + + static double antiresonator2(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch deleted file mode 100644 index 96146a1957..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 04d5f4805a86302a0e135a28d58a6c1ff6a68d52 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Thu, 30 Jul 2020 23:03:51 +0200 -Subject: [PATCH] Use compiler -fcf-protection only if compiler/arch supports - it -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There have been some PRs they were either rejected or some general suggestion -for more flags suggested. So - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - cmake/compilerFlags.cmake | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake -index 12caf42..455525e 100644 ---- a/cmake/compilerFlags.cmake -+++ b/cmake/compilerFlags.cmake -@@ -26,7 +26,12 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN - # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 - if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) - if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) -- add_compile_options(-fstack-clash-protection -fcf-protection) -+ # Gcc does support -fcf-protection on few arches only -+ CHECK_CXX_COMPILER_FLAG(-fcf-protection COMPILER_SUPPORTS_FCF_PROTECTION) -+ if (COMPILER_SUPPORTS_FCF_PROTECTION) -+ add_compile_options(-fcf-protection) -+ endif() -+ add_compile_options(-fstack-clash-protection) - endif() - - if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 --- -2.21.3 - diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch deleted file mode 100644 index e5d069487c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 13e5a3e02339b746abcaee6408893ca2fd8e289d Mon Sep 17 00:00:00 2001 -From: Pydera <pydera@mailbox.org> -Date: Thu, 8 Apr 2021 17:36:16 +0200 -Subject: [PATCH] Fix out of buffer access in #1529 - ---- - src/jp2image.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index 88ab9b2d6..12025f966 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -776,9 +776,10 @@ static void boxes_check(size_t b,size_t m) - #endif - box.length = (uint32_t) (io_->size() - io_->tell() + 8); - } -- if (box.length == 1) -+ if (box.length < 8) - { -- // FIXME. Special case. the real box size is given in another place. -+ // box is broken, so there is nothing we can do here -+ throw Error(kerCorruptedMetadata); - } - - // Read whole box : Box header + Box data (not fixed size - can be null). diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch deleted file mode 100644 index 285f6fe4ce..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9b7a19f957af53304655ed1efe32253a1b11a8d0 Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <kevinbackhouse@github.com> -Date: Fri, 9 Apr 2021 13:37:48 +0100 -Subject: [PATCH] Fix integer overflow. ---- - src/crwimage_int.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp -index aefaf22..2e3e507 100644 ---- a/src/crwimage_int.cpp -+++ b/src/crwimage_int.cpp -@@ -559,7 +559,7 @@ namespace Exiv2 { - void CiffComponent::setValue(DataBuf buf) - { - if (isAllocated_) { -- delete pData_; -+ delete[] pData_; - pData_ = 0; - size_ = 0; - } -@@ -1167,7 +1167,11 @@ namespace Exiv2 { - pCrwMapping->crwDir_); - if (edX != edEnd || edY != edEnd || edO != edEnd) { - uint32_t size = 28; -- if (cc && cc->size() > size) size = cc->size(); -+ if (cc) { -+ if (cc->size() < size) -+ throw Error(kerCorruptedMetadata); -+ size = cc->size(); -+ } - DataBuf buf(size); - std::memset(buf.pData_, 0x0, buf.size_); - if (cc) std::memcpy(buf.pData_ + 8, cc->pData() + 8, cc->size() - 8); --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch deleted file mode 100644 index 5ab64a7d3e..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 783b3a6ff15ed6f82a8f8e6c8a6f3b84a9b04d4b Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <kevinbackhouse@github.com> -Date: Mon, 19 Apr 2021 18:06:00 +0100 -Subject: [PATCH] Improve bound checking in WebPImage::doWriteMetadata() - ---- - src/webpimage.cpp | 41 ++++++++++++++++++++++++++++++----------- - 1 file changed, 30 insertions(+), 11 deletions(-) - -diff --git a/src/webpimage.cpp b/src/webpimage.cpp -index 4ddec544c..fee110bca 100644 ---- a/src/webpimage.cpp -+++ b/src/webpimage.cpp -@@ -145,7 +145,7 @@ namespace Exiv2 { - DataBuf chunkId(WEBP_TAG_SIZE+1); - chunkId.pData_ [WEBP_TAG_SIZE] = '\0'; - -- io_->read(data, WEBP_TAG_SIZE * 3); -+ readOrThrow(*io_, data, WEBP_TAG_SIZE * 3, Exiv2::kerCorruptedMetadata); - uint64_t filesize = Exiv2::getULong(data + WEBP_TAG_SIZE, littleEndian); - - /* Set up header */ -@@ -185,13 +185,20 @@ namespace Exiv2 { - case we have any exif or xmp data, also check - for any chunks with alpha frame/layer set */ - while ( !io_->eof() && (uint64_t) io_->tell() < filesize) { -- io_->read(chunkId.pData_, WEBP_TAG_SIZE); -- io_->read(size_buff, WEBP_TAG_SIZE); -- long size = Exiv2::getULong(size_buff, littleEndian); -+ readOrThrow(*io_, chunkId.pData_, WEBP_TAG_SIZE, Exiv2::kerCorruptedMetadata); -+ readOrThrow(*io_, size_buff, WEBP_TAG_SIZE, Exiv2::kerCorruptedMetadata); -+ const uint32_t size_u32 = Exiv2::getULong(size_buff, littleEndian); -+ -+ // Check that `size_u32` is safe to cast to `long`. -+ enforce(size_u32 <= static_cast<size_t>(std::numeric_limits<unsigned int>::max()), -+ Exiv2::kerCorruptedMetadata); -+ const long size = static_cast<long>(size_u32); - DataBuf payload(size); -- io_->read(payload.pData_, payload.size_); -- byte c; -- if ( payload.size_ % 2 ) io_->read(&c,1); -+ readOrThrow(*io_, payload.pData_, payload.size_, Exiv2::kerCorruptedMetadata); -+ if ( payload.size_ % 2 ) { -+ byte c; -+ readOrThrow(*io_, &c, 1, Exiv2::kerCorruptedMetadata); -+ } - - /* Chunk with information about features - used in the file. */ -@@ -199,6 +206,7 @@ namespace Exiv2 { - has_vp8x = true; - } - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8X) && !has_size) { -+ enforce(size >= 10, Exiv2::kerCorruptedMetadata); - has_size = true; - byte size_buf[WEBP_TAG_SIZE]; - -@@ -227,6 +235,7 @@ namespace Exiv2 { - } - #endif - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8) && !has_size) { -+ enforce(size >= 10, Exiv2::kerCorruptedMetadata); - has_size = true; - byte size_buf[2]; - -@@ -244,11 +253,13 @@ namespace Exiv2 { - - /* Chunk with with lossless image data. */ - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8L) && !has_alpha) { -+ enforce(size >= 5, Exiv2::kerCorruptedMetadata); - if ((payload.pData_[4] & WEBP_VP8X_ALPHA_BIT) == WEBP_VP8X_ALPHA_BIT) { - has_alpha = true; - } - } - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8L) && !has_size) { -+ enforce(size >= 5, Exiv2::kerCorruptedMetadata); - has_size = true; - byte size_buf_w[2]; - byte size_buf_h[3]; -@@ -276,11 +287,13 @@ namespace Exiv2 { - - /* Chunk with animation frame. */ - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_alpha) { -+ enforce(size >= 6, Exiv2::kerCorruptedMetadata); - if ((payload.pData_[5] & 0x2) == 0x2) { - has_alpha = true; - } - } - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_size) { -+ enforce(size >= 12, Exiv2::kerCorruptedMetadata); - has_size = true; - byte size_buf[WEBP_TAG_SIZE]; - -@@ -309,16 +322,22 @@ namespace Exiv2 { - - io_->seek(12, BasicIo::beg); - while ( !io_->eof() && (uint64_t) io_->tell() < filesize) { -- io_->read(chunkId.pData_, 4); -- io_->read(size_buff, 4); -+ readOrThrow(*io_, chunkId.pData_, 4, Exiv2::kerCorruptedMetadata); -+ readOrThrow(*io_, size_buff, 4, Exiv2::kerCorruptedMetadata); -+ -+ const uint32_t size_u32 = Exiv2::getULong(size_buff, littleEndian); - -- long size = Exiv2::getULong(size_buff, littleEndian); -+ // Check that `size_u32` is safe to cast to `long`. -+ enforce(size_u32 <= static_cast<size_t>(std::numeric_limits<unsigned int>::max()), -+ Exiv2::kerCorruptedMetadata); -+ const long size = static_cast<long>(size_u32); - - DataBuf payload(size); -- io_->read(payload.pData_, size); -+ readOrThrow(*io_, payload.pData_, size, Exiv2::kerCorruptedMetadata); - if ( io_->tell() % 2 ) io_->seek(+1,BasicIo::cur); // skip pad - - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8X)) { -+ enforce(size >= 1, Exiv2::kerCorruptedMetadata); - if (has_icc){ - payload.pData_[0] |= WEBP_VP8X_ICC_BIT; - } else { diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch deleted file mode 100644 index f0c482450c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 61734d8842cb9cc59437463e3bac54d6231d9487 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@fujitsu.com> -Date: Tue, 18 May 2021 10:52:54 +0900 -Subject: [PATCH] modify - -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> ---- - src/jp2image.cpp | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index 52723a4..0ac4f50 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -643,11 +643,11 @@ static void boxes_check(size_t b,size_t m) - void Jp2Image::encodeJp2Header(const DataBuf& boxBuf,DataBuf& outBuf) - { - DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space -- int outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? -- int inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? -+ long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? -+ long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? - Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; -- int32_t length = getLong((byte*)&pBox->length, bigEndian); -- int32_t count = sizeof (Jp2BoxHeader); -+ uint32_t length = getLong((byte*)&pBox->length, bigEndian); -+ uint32_t count = sizeof (Jp2BoxHeader); - char* p = (char*) boxBuf.pData_; - bool bWroteColor = false ; - -@@ -664,6 +664,7 @@ static void boxes_check(size_t b,size_t m) - #ifdef EXIV2_DEBUG_MESSAGES - std::cout << "Jp2Image::encodeJp2Header subbox: "<< toAscii(subBox.type) << " length = " << subBox.length << std::endl; - #endif -+ enforce(subBox.length <= length - count, Exiv2::kerCorruptedMetadata); - count += subBox.length; - newBox.type = subBox.type; - } else { -@@ -672,12 +673,13 @@ static void boxes_check(size_t b,size_t m) - count = length; - } - -- int32_t newlen = subBox.length; -+ uint32_t newlen = subBox.length; - if ( newBox.type == kJp2BoxTypeColorHeader ) { - bWroteColor = true ; - if ( ! iccProfileDefined() ) { - const char* pad = "\x01\x00\x00\x00\x00\x00\x10\x00\x00\x05\x1cuuid"; - uint32_t psize = 15; -+ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); - ul2Data((byte*)&newBox.length,psize ,bigEndian); - ul2Data((byte*)&newBox.type ,newBox.type,bigEndian); - ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox)); -@@ -686,6 +688,7 @@ static void boxes_check(size_t b,size_t m) - } else { - const char* pad = "\0x02\x00\x00"; - uint32_t psize = 3; -+ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); - ul2Data((byte*)&newBox.length,psize+iccProfile_.size_,bigEndian); - ul2Data((byte*)&newBox.type,newBox.type,bigEndian); - ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox) ); -@@ -694,6 +697,7 @@ static void boxes_check(size_t b,size_t m) - newlen = psize + iccProfile_.size_; - } - } else { -+ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); - ::memcpy(output.pData_+outlen,boxBuf.pData_+inlen,subBox.length); - } - --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch deleted file mode 100644 index eedf9d79aa..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6628a69c036df2aa036290e6cd71767c159c79ed Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <kevinbackhouse@github.com> -Date: Wed, 21 Apr 2021 12:06:04 +0100 -Subject: [PATCH] Add more bounds checks in Jp2Image::encodeJp2Header ---- - src/jp2image.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index b424225..349a9f0 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -645,13 +645,16 @@ static void boxes_check(size_t b,size_t m) - DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space - long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? - long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? -+ enforce(sizeof(Jp2BoxHeader) <= static_cast<size_t>(output.size_), Exiv2::kerCorruptedMetadata); - Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; - uint32_t length = getLong((byte*)&pBox->length, bigEndian); -+ enforce(length <= static_cast<size_t>(output.size_), Exiv2::kerCorruptedMetadata); - uint32_t count = sizeof (Jp2BoxHeader); - char* p = (char*) boxBuf.pData_; - bool bWroteColor = false ; - - while ( count < length || !bWroteColor ) { -+ enforce(sizeof(Jp2BoxHeader) <= length - count, Exiv2::kerCorruptedMetadata); - Jp2BoxHeader* pSubBox = (Jp2BoxHeader*) (p+count) ; - - // copy data. pointer could be into a memory mapped file which we will decode! --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch deleted file mode 100644 index 4afedf8e59..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch +++ /dev/null @@ -1,21 +0,0 @@ -From e6a0982f7cd9282052b6e3485a458d60629ffa0b Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <kevinbackhouse@github.com> -Date: Fri, 23 Apr 2021 11:44:44 +0100 -Subject: [PATCH] Add bounds check in Jp2Image::doWriteMetadata(). - ---- - src/jp2image.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index 1694fed27..ca8c9ddbb 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -908,6 +908,7 @@ static void boxes_check(size_t b,size_t m) - - case kJp2BoxTypeUuid: - { -+ enforce(boxBuf.size_ >= 24, Exiv2::kerCorruptedMetadata); - if(memcmp(boxBuf.pData_ + 8, kJp2UuidExif, 16) == 0) - { - #ifdef EXIV2_DEBUG_MESSAGES diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch deleted file mode 100644 index e7c5e1b656..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 22ea582c6b74ada30bec3a6b15de3c3e52f2b4da Mon Sep 17 00:00:00 2001 -From: Robin Mills <robin@clanmills.com> -Date: Mon, 5 Apr 2021 20:33:25 +0100 -Subject: [PATCH] fix_1522_jp2image_exif_asan - ---- - src/jp2image.cpp | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index eb31cea4a..88ab9b2d6 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -28,6 +28,7 @@ - #include "image.hpp" - #include "image_int.hpp" - #include "basicio.hpp" -+#include "enforce.hpp" - #include "error.hpp" - #include "futils.hpp" - #include "types.hpp" -@@ -353,7 +354,7 @@ static void boxes_check(size_t b,size_t m) - if (io_->error()) throw Error(kerFailedToReadImageData); - if (bufRead != rawData.size_) throw Error(kerInputDataReadFailed); - -- if (rawData.size_ > 0) -+ if (rawData.size_ > 8) // "II*\0long" - { - // Find the position of Exif header in bytes array. - long pos = ( (rawData.pData_[0] == rawData.pData_[1]) -@@ -497,6 +498,7 @@ static void boxes_check(size_t b,size_t m) - position = io_->tell(); - box.length = getLong((byte*)&box.length, bigEndian); - box.type = getLong((byte*)&box.type, bigEndian); -+ enforce(box.length <= io_->size()-io_->tell() , Exiv2::kerCorruptedMetadata); - - if (bPrint) { - out << Internal::stringFormat("%8ld | %8ld | ", (size_t)(position - sizeof(box)), -@@ -581,12 +583,13 @@ static void boxes_check(size_t b,size_t m) - throw Error(kerInputDataReadFailed); - - if (bPrint) { -- out << Internal::binaryToString(makeSlice(rawData, 0, 40)); -+ out << Internal::binaryToString( -+ makeSlice(rawData, 0, rawData.size_>40?40:rawData.size_)); - out.flush(); - } - lf(out, bLF); - -- if (bIsExif && bRecursive && rawData.size_ > 0) { -+ if (bIsExif && bRecursive && rawData.size_ > 8) { // "II*\0long" - if ((rawData.pData_[0] == rawData.pData_[1]) && - (rawData.pData_[0] == 'I' || rawData.pData_[0] == 'M')) { - BasicIo::AutoPtr p = BasicIo::AutoPtr(new MemIo(rawData.pData_, rawData.size_)); diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb deleted file mode 100644 index 1380638ba7..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -DEPENDS = "zlib expat" - -SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" -SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778" - -# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either -inherit dos2unix -SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch \ - file://CVE-2021-29457.patch \ - file://CVE-2021-29458.patch \ - file://CVE-2021-29463.patch \ - file://CVE-2021-29464.patch \ - file://CVE-2021-29470.patch \ - file://CVE-2021-29473.patch \ - file://CVE-2021-3482.patch" - -S = "${WORKDIR}/${BPN}-${PV}-Source" - -inherit cmake gettext - -do_install:append:class-target() { - # reproducibility: remove build host path - sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ - -e 's:${STAGING_DIR_HOST}::g' -} - diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb new file mode 100644 index 0000000000..6ccd9fb266 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb @@ -0,0 +1,19 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat" + +SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz" +SRC_URI[sha256sum] = "4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6" +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +# inherit dos2unix +S = "${WORKDIR}/${BP}-Source" + +inherit cmake gettext + +do_install:append:class-target() { + # reproducibility: remove build host path + sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ + -e 's:${STAGING_DIR_HOST}::g' +} diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch new file mode 100644 index 0000000000..ce230dbf22 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch @@ -0,0 +1,32 @@ +From 9c785ca0535d9c24e6699ee1243b427c1407acb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Jan 2023 19:31:17 -0800 +Subject: [PATCH] Fix incompatible function pointer types + +clang 16+ is flagging the function pointer prototype mismatches, +therefore fix it. + +Fixes Issue #8487 + +Upstream-Status: Submitted [https://github.com/FreeRDP/FreeRDP/pull/8622] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + client/X11/xf_disp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/X11/xf_disp.c b/client/X11/xf_disp.c +index 32ddb626c..ef0cb93ff 100644 +--- a/client/X11/xf_disp.c ++++ b/client/X11/xf_disp.c +@@ -248,7 +248,7 @@ static void xf_disp_OnTimer(void* context, TimerEventArgs* e) + xf_disp_sendResize(xfDisp); + } + +-static void xf_disp_OnWindowStateChange(void* context, const WindowStateChangeEventArgs* e) ++static void xf_disp_OnWindowStateChange(void* context, WindowStateChangeEventArgs* e) + { + xfContext* xfc; + xfDispContext* xfDisp; +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb index cd7b2165b2..3b8fee0f5f 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb @@ -16,6 +16,7 @@ PKGV = "${GITPKGVTAG}" SRCREV = "fa8e1b1c765a4466030ac52240f052c0b440a4d1" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ + file://0001-Fix-incompatible-function-pointer-types.patch \ " S = "${WORKDIR}/git" @@ -32,7 +33,7 @@ EXTRA_OECMAKE += " \ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ - gstreamer cups pcsc \ + gstreamer cups pcsc server \ " X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" @@ -44,6 +45,7 @@ PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" +PACKAGECONFIG[server] = "-DWITH_SERVER=ON,-DWITH_SERVER=OFF" PACKAGES =+ "libfreerdp" diff --git a/meta-openembedded/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb b/meta-openembedded/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb index 52c1016335..4d97b1a419 100644 --- a/meta-openembedded/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb +++ b/meta-openembedded/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb @@ -13,4 +13,6 @@ SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab80 inherit autotools texinfo +CXXFLAGS += "-std=c++14" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_0.13.1.bb index 4aa58ec7f9..2e62612e37 100644 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_0.13.1.bb @@ -12,6 +12,5 @@ RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" inherit autotools pkgconfig SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master" -PV = "0.12.0" -SRCREV = "76108294092c023a4ece99eb3219559cea0d5066" +SRCREV = "4ebce6b5059b086d05ca7e091ce04a5fd08ac3ac" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch index 2760162acf..d85aa15637 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -9,8 +9,7 @@ ncurses*-config applications. Signed-off-by: Paul Barker <pbarker@toganlabs.com> Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> -Upstream-status: Inappropriate - (`ncurses*-config` can be used outside of OpenEmbedded) +Upstream-Status: Inappropriate [`ncurses*-config` can be used outside of OpenEmbedded] --- configure.ac | 12 ++++++------ diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.365.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.366.bb index d37b73af28..4cab9b0fbe 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.365.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.366.bb @@ -5,7 +5,7 @@ SECTION = "System/Base" LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -SRCREV = "803068db92b8bb249014f1c947b91b452f539f5f" +SRCREV = "2fa514ff86da425726dea8629bcf4ceac9d8e7ff" SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.6.bb b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.1.bb index eb23816e8a..878d28f137 100644 --- a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.1.bb @@ -1,9 +1,9 @@ SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c11d4fd926d3ce7aac13b0ed1e9b3a63" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525" # v2.7.6 -SRCREV = "b39d0430f29d7c953581186955c11b461e6c824f" +SRCREV = "e6372b88e09a4d1c573b57270de6b40846825a8b" SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master \ file://ldflags.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch b/meta-openembedded/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch new file mode 100644 index 0000000000..fc30f0ad7c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch @@ -0,0 +1,52 @@ +From ac70933783a70d5387a2bb2849c568e33ba52558 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 01:41:32 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/recipe-sysroot/usr/include/c++/v1/cwchar:113:5: error: <cwchar> tried including <wchar.h> but didn't find libc++'s <wcha +r.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard + Library, and you are probably using compiler flags that make that not be the case. | # error <cwchar> tried including <wchar.h> but didn't find libc++'s <wchar.h> header. \ +| ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/777] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unittests/boost/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/boost/CMakeLists.txt b/unittests/boost/CMakeLists.txt +index 1d733bc7..08e6a169 100644 +--- a/unittests/boost/CMakeLists.txt ++++ b/unittests/boost/CMakeLists.txt +@@ -1,6 +1,6 @@ + file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) + +-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + + # Build all of the non-special tests + foreach(TEST_SOURCE ${TESTS}) +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index a40d2bc2e6..f15927554b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -20,6 +20,7 @@ PV .= "+git${SRCPV}" SRCREV = "ebef1e929807629befafbb2918ea1a08c7194554" SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch new file mode 100644 index 0000000000..a3dc381882 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch @@ -0,0 +1,37 @@ +From 3c461786feb1d5aa1ed2a911942a5f9fbc8b8086 Mon Sep 17 00:00:00 2001 +From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> +Date: Tue, 24 Jan 2023 17:38:43 +0100 +Subject: [libgpiod v1.6.x][PATCH] build: don't expect automake to set $PYTHON + +It seems that the implementation of AM_PATH_PYTHON() changed in automake +recently and no longer sets $PYTHON variable which breaks the build on +some systems. + +We know we use python3 so use python3-config explicitly. + +Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> +--- +Upstream-Status: Accepted + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3149384..0460810 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,9 +204,9 @@ then + AC_MSG_ERROR([python3-config not found - needed for python bindings]) + fi + AS_IF([test -z "$PYTHON_CPPFLAGS"], +- [AC_SUBST(PYTHON_CPPFLAGS, [`$PYTHON-config --includes`])]) ++ [AC_SUBST(PYTHON_CPPFLAGS, [`python3-config --includes`])]) + AS_IF([test -z "$PYTHON_LIBS"], +- [AC_SUBST(PYTHON_LIBS, [`$PYTHON-config --libs`])]) ++ [AC_SUBST(PYTHON_LIBS, [`python3-config --libs`])]) + fi + + AC_CHECK_PROG([has_doxygen], [doxygen], [true], [false]) +-- +2.37.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb index 3e6e5d567d..5164e7e021 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" SRC_URI = " \ https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ file://run-ptest \ + file://0001-build-don-t-expect-automake-to-set-PYTHON.patch \ " SRC_URI[md5sum] = "28e79f6f70fee1da9079558d8b7b3736" diff --git a/meta-openembedded/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb b/meta-openembedded/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb new file mode 100644 index 0000000000..bc4bd5344c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb @@ -0,0 +1,26 @@ +SUMMARY = "iODBC driver manager maintained by OpenLink Software." + +DESCRIPTION = "This kit will provide you with everything you need to \ +develop ODBC-compliant applications under Unix without having to pay \ +royalties to other parties. \ +" + +HOMEPAGE = "http://www.iodbc.org/" + +LICENSE = "LGPL-2.0-only | BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ + file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \ + " + +SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "c74541e3327fc9a1c7ccf103645471c67bc014542d70f572476eb07c0b2dd43c" + +inherit autotools + +EXTRA_OECONF += " --prefix=/usr/local \ + --with-iodbc-inidir=/etc \ + --enable-odbc3 \ + --enable-pthreads \ + --disable-libodbc \ + --disable-static \ + " diff --git a/meta-openembedded/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-openembedded/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb index fc0b1ee495..06536ca70f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -19,6 +19,6 @@ UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" -CXXFLAGS += "-Wno-narrowing" +CXXFLAGS += "-Wno-narrowing -std=c++14" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/libol/libol/configure.patch b/meta-openembedded/meta-oe/recipes-support/libol/libol/configure.patch deleted file mode 100644 index 87695fb06d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libol/libol/configure.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libol-0.3.18/configure.in -=================================================================== ---- libol-0.3.18.orig/configure.in 2006-03-27 14:44:52.000000000 +0000 -+++ libol-0.3.18/configure.in 2014-07-18 07:05:56.029481372 +0000 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(src/abstract_io.c) -+AC_INIT(libol, "0.3.18") - --AM_INIT_AUTOMAKE(libol, "0.3.18", 1) -+AM_INIT_AUTOMAKE([foreign]) - if test -n "$SNAPSHOT_VERSION"; then - VERSION=$VERSION+$SNAPSHOT_VERSION - fi diff --git a/meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb b/meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb deleted file mode 100644 index 21a56264e4..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A tiny C support library" -HOMEPAGE = "https://my.balabit.com/downloads/libol" -SECTION = "libs" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" - -SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${BP}.tar.gz \ - file://configure.patch" -SRC_URI[md5sum] = "cbadf4b7ea276dfa85acc38a1cc5ff17" -SRC_URI[sha256sum] = "9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7" - -inherit autotools binconfig - -do_compile:prepend() { - install ${S}/utils/make_class.in ${B}/utils -} - -do_install:append() { - rm -fr ${D}${bindir} -} diff --git a/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb b/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb index d9a55dd761..8e6d455174 100644 --- a/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb @@ -19,3 +19,5 @@ EXTRA_OECONF = "\ --enable-html-docs=no \ --enable-latex-docs=no \ " + +CXXFLAGS += "-std=c++14" diff --git a/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch b/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch new file mode 100644 index 0000000000..1643c08566 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch @@ -0,0 +1,31 @@ +From bf9795ffbda7bb241b708ff261976016efb943b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 23:12:19 -0800 +Subject: [PATCH] configure.ac: Remove native include path + +On OE com_err.h is found in /usr/include too, therefore adding new path +to include search path is not needed. Moreover it fixed QA checks where +it warns about using build system paths. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index eaac16f..d23d0b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,7 +134,6 @@ fi + # Fedora, RHEL, Centos has com_err.h in /usr/include/et + AC_CHECK_HEADERS([et/com_err.h]) + if test "$ac_cv_header_et_com_err_h" = "yes"; then +- CPPFLAGS="-I/usr/include/et $CPPFLAGS" + AC_DEFINE(HAVE_COM_ERR_H, 1) + fi + +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil_1.2.bb b/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb index 1b9a04ef29..b4f4651e37 100644 --- a/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb @@ -7,8 +7,9 @@ DESCRIPTION = "Msktutil creates user or computer accounts in Active Directory, \ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" -SRC_URI = "https://github.com/msktutil/msktutil/releases/download/v${PV}/msktutil-${PV}.tar.bz2" -SRC_URI[sha256sum] = "27dc078cbac3186540d8ea845fc0ced6b1d9f844e586ccd9eaa2d9f4650c2ce6" +SRC_URI = "https://github.com/msktutil/msktutil/releases/download/${PV}/${BP}.tar.bz2 \ + file://0001-configure.ac-Remove-native-include-path.patch" +SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" DEPENDS += "krb5 cyrus-sasl openldap" diff --git a/meta-openembedded/meta-oe/recipes-support/neon/neon_0.32.4.bb b/meta-openembedded/meta-oe/recipes-support/neon/neon_0.32.4.bb index c16a2c10a7..d281bfde62 100644 --- a/meta-openembedded/meta-oe/recipes-support/neon/neon_0.32.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/neon/neon_0.32.4.bb @@ -33,7 +33,7 @@ PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" EXTRA_OECONF += "--enable-shared --enable-threadsafe-ssl=posix" # Do not install into /usr/local -EXTRA_OEMAKE:append:class-native = "prefix=${prefix_native}" +EXTRA_OEMAKE:append:class-native = " prefix=${prefix_native}" do_configure:prepend() { echo "${PV}" > ${S}/.version diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-openembedded/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch new file mode 100644 index 0000000000..8515075fe0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch @@ -0,0 +1,39 @@ +From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 13:04:56 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes warnings with clang16 +testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pr/tests/testfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c +index 79d8a05..42aa6a7 100644 +--- a/pr/tests/testfile.c ++++ b/pr/tests/testfile.c +@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type, + if (native_thread) { + #if defined(_PR_PTHREADS) + pthread_t tid; +- if (!pthread_create(&tid, NULL, start, arg)) { ++ if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) { + return((PRThread *) tid); + } + else { +@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void) + + thrarg.done= 0; + t = create_new_thread(PR_USER_THREAD, +- DirTest, &thrarg, ++ (void (*)(void *))DirTest, &thrarg, + PR_PRIORITY_NORMAL, + PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.35.bb b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.35.bb index c8cb618bc9..f8d329398b 100644 --- a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.35.bb +++ b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.35.bb @@ -12,6 +12,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://0001-md-Fix-build-with-musl.patch \ file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ file://nspr.pc.in \ " diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch new file mode 100644 index 0000000000..8fda857080 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch @@ -0,0 +1,138 @@ +From: Victor Westerhuis <victor@westerhu.is> +Date: Sat, 19 Nov 2022 21:45:39 +0100 +Subject: Do not embed build directory in binaries + +This makes the opencv core module build reproducibly. + +https://salsa.debian.org/science-team/opencv/-/raw/master/debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch +Upstream-Status: Backport +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> +--- + modules/core/CMakeLists.txt | 10 ------ + modules/core/include/opencv2/core/private.hpp | 4 +-- + modules/core/include/opencv2/core/utility.hpp | 4 +-- + modules/core/src/utils/datafile.cpp | 48 +-------------------------- + 4 files changed, 5 insertions(+), 61 deletions(-) + +diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt +index b78bb98..d96b669 100644 +--- a/modules/core/CMakeLists.txt ++++ b/modules/core/CMakeLists.txt +@@ -188,16 +188,6 @@ if(OPENCV_OTHER_INSTALL_PATH) + ") + endif() + +-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR} +-#define OPENCV_BUILD_DIR \"${CMAKE_BINARY_DIR}\" +-") +- +-file(RELATIVE_PATH SOURCE_DIR_RELATIVE ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}) +-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR} +-#define OPENCV_DATA_BUILD_DIR_SEARCH_PATHS \\ +- \"${SOURCE_DIR_RELATIVE}/\" +-") +- + if(WIN32) + file(RELATIVE_PATH INSTALL_DATA_DIR_RELATIVE "${CMAKE_INSTALL_PREFIX}/${OPENCV_BIN_INSTALL_PATH}" "${CMAKE_INSTALL_PREFIX}/${OPENCV_OTHER_INSTALL_PATH}") + else() +diff --git a/modules/core/include/opencv2/core/private.hpp b/modules/core/include/opencv2/core/private.hpp +index 146d37f..dd675bc 100644 +--- a/modules/core/include/opencv2/core/private.hpp ++++ b/modules/core/include/opencv2/core/private.hpp +@@ -818,10 +818,10 @@ Search directories: + 2. Check path specified by configuration parameter with "_HINT" suffix (name of environment variable). + 3. Check path specified by configuration parameter (name of environment variable). + If parameter value is not empty and nothing is found then stop searching. +-4. Detects build/install path based on: ++4. Detects install path based on: + a. current working directory (CWD) + b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage) +-5. Scan `<source>/{,data}` directories if build directory is detected or the current directory is in source tree. ++5. Scan `<source>/{,data}` directories if the current directory is in source tree. + 6. Scan `<install>/share/OpenCV` directory if install directory is detected. + + @param relative_path Relative path to data file +diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp +index 108c0d9..f15d9ea 100644 +--- a/modules/core/include/opencv2/core/utility.hpp ++++ b/modules/core/include/opencv2/core/utility.hpp +@@ -1163,10 +1163,10 @@ Search directories: + 2. OPENCV_SAMPLES_DATA_PATH_HINT environment variable + 3. OPENCV_SAMPLES_DATA_PATH environment variable + If parameter value is not empty and nothing is found then stop searching. +-4. Detects build/install path based on: ++4. Detects install path based on: + a. current working directory (CWD) + b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage) +-5. Scan `<source>/{,data,samples/data}` directories if build directory is detected or the current directory is in source tree. ++5. Scan `<source>/{,data,samples/data}` directories if the current directory is in source tree. + 6. Scan `<install>/share/OpenCV` directory if install directory is detected. + + @see cv::utils::findDataFile +diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp +index 3af83a5..6bda857 100644 +--- a/modules/core/src/utils/datafile.cpp ++++ b/modules/core/src/utils/datafile.cpp +@@ -280,32 +280,8 @@ cv::String findDataFile(const cv::String& relative_path, + + + // Steps: 4, 5, 6 +- cv::String cwd = utils::fs::getcwd(); +- cv::String build_dir(OPENCV_BUILD_DIR); +- bool has_tested_build_directory = false; +- if (isSubDirectory(build_dir, cwd) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(cwd))) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): the current directory is build sub-directory: " << cwd); +- const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS }; +- for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]); +- cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]); +- if (utils::fs::isDirectory(datapath)) +- { +- for(size_t i = search_subdir.size(); i > 0; i--) +- { +- const cv::String& subdir = search_subdir[i - 1]; +- cv::String prefix = utils::fs::join(datapath, subdir); +- TRY_FILE_WITH_PREFIX(prefix); +- } +- } +- } +- has_tested_build_directory = true; +- } +- + cv::String source_dir; +- cv::String try_source_dir = cwd; ++ cv::String try_source_dir = utils::fs::getcwd(); + for (int levels = 0; levels < 3; ++levels) + { + if (utils::fs::exists(utils::fs::join(try_source_dir, "modules/core/include/opencv2/core/version.hpp"))) +@@ -341,28 +317,6 @@ cv::String findDataFile(const cv::String& relative_path, + CV_LOG_INFO(NULL, "Can't detect module binaries location"); + } + +- if (!has_tested_build_directory && +- (isSubDirectory(build_dir, module_path) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(module_path))) +- ) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): the binary module directory is build sub-directory: " << module_path); +- const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS }; +- for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]); +- cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]); +- if (utils::fs::isDirectory(datapath)) +- { +- for(size_t i = search_subdir.size(); i > 0; i--) +- { +- const cv::String& subdir = search_subdir[i - 1]; +- cv::String prefix = utils::fs::join(datapath, subdir); +- TRY_FILE_WITH_PREFIX(prefix); +- } +- } +- } +- } +- + #if defined OPENCV_INSTALL_DATA_DIR_RELATIVE + if (!module_path.empty()) // require module path + { diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.6.0.bb index a90baddc26..fcbafd78a9 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.6.0.bb @@ -52,6 +52,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol file://download.patch \ file://0001-Make-ts-module-external.patch \ file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \ + file://0008-Do-not-embed-build-directory-in-binaries.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.23.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.23.0.bb index 078e4e6868..b0f147c798 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.23.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.23.0.bb @@ -6,7 +6,7 @@ keys on the smart card is possible with PKCS\ such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ eID cards have also been confirmed to work." -HOMEPAGE = "http://www.opensc-project.org/opensc/" +HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki" SECTION = "System Environment/Libraries" LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.9.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.9.bb index fd232c1b63..c84c94dd5b 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.9.bb @@ -1,5 +1,5 @@ SUMMARY = "PC/SC Lite smart card framework and applications" -HOMEPAGE = "http://pcsclite.alioth.debian.org/" +HOMEPAGE = "https://pcsclite.apdu.fr/" LICENSE = "BSD-3-Clause & GPL-3.0-or-later" LICENSE:${PN} = "BSD-3-Clause" LICENSE:${PN}-lib = "BSD-3-Clause" @@ -9,7 +9,7 @@ LICENSE:${PN}-dbg = "BSD-3-Clause & GPL-3.0-or-later" LICENSE:${PN}-spy = "GPL-3.0-or-later" LICENSE:${PN}-spy-dev = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" -DEPENDS = "autoconf-archive-native" +DEPENDS = "autoconf-archive-native flex-native" SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" SRC_URI[sha256sum] = "cbcc3b34c61f53291cecc0d831423c94d437b188eb2b97b7febc08de1c914e8a" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch new file mode 100644 index 0000000000..44a22963af --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch @@ -0,0 +1,192 @@ +From 51a2a1e4d8ca4040a6a7eac398cb704da35f39e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 03:09:08 -0800 +Subject: [PATCH] cmake: Do not use -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 4 ++-- + glib/CMakeLists.txt | 4 ++-- + qt5/src/CMakeLists.txt | 4 ++-- + qt6/src/CMakeLists.txt | 4 ++-- + test/CMakeLists.txt | 6 +++--- + utils/CMakeLists.txt | 10 +++++----- + 6 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4768ac8..cdc014d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) + if (OpenJPEG_FOUND) + # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed + # target openjp2 may lack interface include directories +- target_include_directories(poppler SYSTEM PRIVATE ${OPENJPEG_INCLUDE_DIRS}) ++ target_include_directories(poppler PRIVATE ${OPENJPEG_INCLUDE_DIRS}) + endif() + if(USE_CMS) +- target_include_directories(poppler SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") + set_target_properties(poppler PROPERTIES VERSION 126.0.0 SOVERSION 126) +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 52e8687..08ab39a 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -4,7 +4,7 @@ include_directories( + ) + + include_directories( +- SYSTEM ++ + ${GLIB2_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ) +@@ -96,7 +96,7 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler-glib poppler PkgConfig::GLIB2 ${CAIRO_LIBRARIES} Freetype::Freetype) +-target_include_directories(poppler-glib SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) + install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install(FILES +diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt +index 5db3a6c..f242d29 100644 +--- a/qt5/src/CMakeLists.txt ++++ b/qt5/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt5 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt5 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt5 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt +index cd91975..6c42e12 100644 +--- a/qt6/src/CMakeLists.txt ++++ b/qt6/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt6 poppler Qt6::Core Qt6::Gui Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt6 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt6 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt6 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index afa1352..9bd3b9a 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -23,7 +23,7 @@ if (GTK_FOUND) + ) + poppler_add_test(gtk-test BUILD_GTK_TESTS ${gtk_splash_test_SRCS}) + target_link_libraries(gtk-test ${CAIRO_LIBRARIES} poppler-glib PkgConfig::GTK3) +- target_include_directories(gtk-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(gtk-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + + if (HAVE_CAIRO) + +@@ -35,7 +35,7 @@ if (GTK_FOUND) + ) + poppler_add_test(pdf-inspector BUILD_GTK_TESTS ${pdf_inspector_SRCS}) + target_link_libraries(pdf-inspector ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs} PkgConfig::GTK3 poppler) +- target_include_directories(pdf-inspector SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdf-inspector PRIVATE ${CAIRO_INCLUDE_DIRS}) + target_compile_definitions(pdf-inspector PRIVATE -DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + endif () + +@@ -59,7 +59,7 @@ if (HAVE_CAIRO) + ) + add_executable(cairo-thread-test ${cairo_thread_test_SRCS}) + target_link_libraries(cairo-thread-test ${CAIRO_LIBRARIES} Freetype::Freetype Threads::Threads poppler) +- target_include_directories(cairo-thread-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(cairo-thread-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + endif () + endif () + +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index 1c3ebcb..bc1840a 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -16,7 +16,7 @@ add_executable(pdftoppm ${pdftoppm_SOURCES}) + target_link_libraries(pdftoppm ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) +- target_include_directories(pdftoppm SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftoppm PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftoppm DESTINATION bin) + install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -37,10 +37,10 @@ if (HAVE_CAIRO) + add_definitions(${CAIRO_CFLAGS}) + add_executable(pdftocairo ${pdftocairo_SOURCES}) + target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdftocairo PRIVATE ${CAIRO_INCLUDE_DIRS}) + if(LCMS2_FOUND) + target_link_libraries(pdftocairo ${LCMS2_LIBRARIES}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftocairo PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftocairo DESTINATION bin) + install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -99,7 +99,7 @@ if (ENABLE_NSS3) + pdfsig.cc + ) + add_executable(pdfsig ${pdfsig_SOURCES}) +- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) + target_link_libraries(pdfsig ${common_libs}) + install(TARGETS pdfsig DESTINATION bin) + install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -114,7 +114,7 @@ add_executable(pdftops ${pdftops_SOURCES}) + target_link_libraries(pdftops ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftops ${LCMS2_LIBRARIES}) +- target_include_directories(pdftops SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftops PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftops DESTINATION bin) + install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.01.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.01.0.bb index 849c35812d..4d1a089d7b 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.01.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.01.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ + file://0001-cmake-Do-not-use-isystem.patch \ " SRC_URI[sha256sum] = "fae9b88d3d5033117d38477b79220cfd0d8e252c278ec870ab1832501741fd94" diff --git a/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch b/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch index af69c02173..a65d8cb77b 100644 --- a/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch +++ b/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ AC_CHECK_HEADER(nettle/sha.h,,[AC_MSG_ER - On Debian-ish systems, use \"apt-get install nettle-dev\" to get a system + On Debian-ish systems, use "apt-get install nettle-dev" to get a system wide nettle install. ])]) -AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([ diff --git a/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch b/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch new file mode 100644 index 0000000000..bd59b74412 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch @@ -0,0 +1,54 @@ +From 8c317f0fd5fde95a9aae2319053a196a166aec88 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 21:12:47 -0800 +Subject: [PATCH] include standard headers <limits> and <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer +transitively included [1]. Explicitly include it for uint64_t. + +Fixes errors like below + +../rdfind-1.5.0/rdfind.cc:225:30: error: 'numeric_limits' is not a member of 'std' + 225 | o.maximumfilesize = std::numeric_limits<decltype(o.maximumfilesize)>::max(); + | ^~~~~~~~~~~~~~ + +... + +| ../rdfind-1.5.0/Fileinfo.hh:70:20: error: 'std::int64_t' has not been declared + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/pauldreik/rdfind/pull/129] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Fileinfo.hh | 1 + + rdfind.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Fileinfo.hh b/Fileinfo.hh +index 3ffb837..23ed54e 100644 +--- a/Fileinfo.hh ++++ b/Fileinfo.hh +@@ -8,6 +8,7 @@ + #define Fileinfo_hh + + #include <array> ++#include <cstdint> + #include <string> + + // os specific headers +diff --git a/rdfind.cc b/rdfind.cc +index fbd6cb8..64dd8f6 100644 +--- a/rdfind.cc ++++ b/rdfind.cc +@@ -9,6 +9,7 @@ + // std + #include <algorithm> + #include <iostream> ++#include <limits> + #include <string> + #include <vector> + +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb b/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb index f8eb5d38d4..8f2c5e8852 100644 --- a/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb @@ -7,10 +7,10 @@ DEPENDS = "nettle autoconf-archive" SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ file://0001-configure-Fix-check-for-AC_CHECK_LIB.patch \ + file://0001-include-standard-headers-limits-and-cstdint.patch \ " -SRC_URI[md5sum] = "180418c863b861d1df221bc486a07ce7" -SRC_URI[sha256sum] = "30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c" +SRC_URI[sha256sum] = "4150ed1256f7b12b928c65113c485761552b9496c433778aac3f9afc3e767080" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch b/meta-openembedded/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch index b6c32c4bd5..24efc13560 100644 --- a/meta-openembedded/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch +++ b/meta-openembedded/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch @@ -10,19 +10,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> lib/rpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/rpm.c b/lib/rpm.c -index 920e145..58140bf 100644 --- a/lib/rpm.c +++ b/lib/rpm.c -@@ -191,7 +191,7 @@ sr_rpm_package_sort(struct sr_rpm_package *packages) - } +@@ -34,6 +34,11 @@ + #include <assert.h> + #include <string.h> - /* Sort the array. */ -- qsort(array, count, sizeof(struct sr_rpm_package*), (comparison_fn_t)cmp_nevra_qsort_wrapper); -+ qsort(array, count, sizeof(struct sr_rpm_package*), cmp_nevra_qsort_wrapper); - - /* Create a linked list from the sorted array. */ - for (size_t loop = 0; loop < count; ++loop) --- -2.8.1 - ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + struct sr_rpm_package * + sr_rpm_package_new() + { diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb index 13ed7570b1..bf9de31f84 100644 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb @@ -29,6 +29,8 @@ S ="${WORKDIR}/${BPN}.${PV}" inherit autotools +CXXFLAGS += "-std=gnu++14" + do_configure:prepend(){ ${S}/autogen.sh } diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.7.0.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.8.0.bb index 8c72b349dc..5606d38dae 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.8.0.bb @@ -12,7 +12,7 @@ DEPENDS:append:libc-musl = " libucontext" PE = "1" BRANCH = "onetbb_2021" -SRCREV = "7673da272f7e1592876b42cfe98b9f4cadf6ae41" +SRCREV = "c9497714821c3d443ee44c732609eb6850195ffb" SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch new file mode 100644 index 0000000000..4347e925a3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch @@ -0,0 +1,43 @@ +From 30e1afe60820c18c89cd10e9dcb7208ad5676d1d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 19 Jan 2023 15:06:35 -0800 +Subject: [PATCH] xmldsigverify: Include xmlsec/parser.h + +this ensures that xmlSecParserSetDefaultOptions definition is made +available + +Fixes +| xmldsigverify.c:275:5: error: call to undeclared function 'xmlSecParserSetDefaultOptions'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +| xmlSecParserSetDefaultOptions(XML_PARSE_NOENT | XML_PARSE_NOCDATA | +| ^ + +Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/463] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/xmldsigverify.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/examples/xmldsigverify.c b/examples/xmldsigverify.c +index ed538c70..ff68120e 100644 +--- a/examples/xmldsigverify.c ++++ b/examples/xmldsigverify.c +@@ -25,6 +25,7 @@ + #include <xmlsec/xmldsig.h> + #include <xmlsec/crypto.h> + ++#include <xmlsec/parser.h> + /* #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/etc/httpd/conf/ssl.crt" */ + #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/var/www/cgi-bin/keys-certs.def" + #define XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER "/var/www/cgi-bin/keys-certs" +@@ -36,7 +37,7 @@ int verify_request(xmlSecKeysMngrPtr mngr); + int url_decode(char *buf, size_t size); + + int +-main(int , char **) { ++main() { + xmlSecKeysMngrPtr mngr; + #ifndef XMLSEC_NO_XSLT + xsltSecurityPrefsPtr xsltSecPrefs = NULL; +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb index bd9c584dfd..a3da770943 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://0001-nss-nspr-fix-for-multilib.patch \ file://run-ptest \ file://ensure-search-path-non-host.patch \ + file://0001-xmldsigverify-Include-xmlsec-parser.h.patch \ " SRC_URI[sha256sum] = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch new file mode 100644 index 0000000000..2a766dbb87 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch @@ -0,0 +1,33 @@ +From 64cb138aaaafc87c8462885d502c9323be86a003 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 14:50:08 -0800 +Subject: [PATCH] Fix hash_key_put() signature + +Fixes + +../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(uniq, hash_key_put, &lines); + ^~~~~~~~~~~~ + +Upstream-Status: Submitted [https://sourceforge.net/p/xmlstar/code/merge-requests/6/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/xml_elem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb index e28fd61a03..930fbdd6c7 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -14,8 +14,8 @@ DEPENDS = "libxml2 libxslt" SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ file://configure.ac.patch \ - file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" -SRC_URI[md5sum] = "f3c5dfa3b1a2ee06cd57c255cc8b70a0" + file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ + file://0001-Fix-hash_key_put-signature.patch" SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" inherit autotools diff --git a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.54.bb b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.55.bb index 4c9864094d..2278d14f6c 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.54.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.55.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb" SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" -SRC_URI[sha256sum] = "9608a044ae2e87cefae8e69b113e3828552ddaba0d596a02f9954c6ac17fa294" +SRC_URI[sha256sum] = "67895e94b13fdf46a3893c9a17c2d0d4c3d4cd2550e1f41e26696c10cb8c64b2" S = "${WORKDIR}/CGI-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.005004.bb b/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.005005.bb index 5480b9069f..e92d793d9c 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.005004.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.005005.bb @@ -7,10 +7,10 @@ SECTION = "libs" HOMEPAGE = "http://metapan.org/release/Moo/" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=742;endline=787;md5=0e7ee44f5ce5e9b84619cd198caad1d6" +LIC_FILES_CHKSUM = "file://README;beginline=742;endline=787;md5=74f4de483dce5aa45ed6da875f11258a" SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Moo-${PV}.tar.gz" -SRC_URI[sha256sum] = "e3030b80bd554a66f6b3c27fd53b1b5909d12af05c4c11ece9a58f8d1e478928" +SRC_URI[sha256sum] = "fb5a2952649faed07373f220b78004a9c6aba387739133740c1770e9b1f4b108" S = "${WORKDIR}/Moo-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/0001-libxml-mm-Fix-function-prototypes-in-function-pointe.patch b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/0001-libxml-mm-Fix-function-prototypes-in-function-pointe.patch new file mode 100644 index 0000000000..7ff61c5709 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/0001-libxml-mm-Fix-function-prototypes-in-function-pointe.patch @@ -0,0 +1,51 @@ +From 25451c0a56ef8d3b32fd23847bef516486bd8ed4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Jan 2023 18:50:10 -0800 +Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers + +This is now detected with latest clang16+ + +Fixes +error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(r, PmmRegistryDumpHashScanner, NULL); + +Upstream-Status: Submitted [https://github.com/shlomif/perl-XML-LibXML/pull/75] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + perl-libxml-mm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c +index a3e78a2..ec2b5ea 100644 +--- a/perl-libxml-mm.c ++++ b/perl-libxml-mm.c +@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table) + extern SV* PROXY_NODE_REGISTRY_MUTEX; + + /* Utility method used by PmmDumpRegistry */ +-void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name) ++void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name) + { + LocalProxyNodePtr lp = (LocalProxyNodePtr) payload; + ProxyNodePtr node = (ProxyNodePtr) lp->proxy; +@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy) + /* PP: originally this was static inline void, but on AIX the compiler + did not chew it, so I'm removing the inline */ + static void +-PmmRegistryHashDeallocator(void *payload, xmlChar *name) ++PmmRegistryHashDeallocator(void *payload, const xmlChar *name) + { + Safefree((LocalProxyNodePtr) payload); + } +@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy) + * internal, used by PmmCloneProxyNodes + */ + void * +-PmmRegistryHashCopier(void *payload, xmlChar *name) ++PmmRegistryHashCopier(void *payload, const xmlChar *name) + { + ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy; + LocalProxyNodePtr lp; +-- +2.39.0 + diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb index c2ea47ae5b..f184b89e59 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb @@ -26,6 +26,7 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-LibXML-${PV}. file://disable-libxml2-check.patch \ file://fix-CATALOG-conditional-compile.patch \ file://using-DOCB-conditional.patch \ + file://0001-libxml-mm-Fix-function-prototypes-in-function-pointe.patch \ " LIC_FILES_CHKSUM = "file://debian/copyright;md5=64eda1bc135f0ece1d1187f2a8ac82c1 \ file://LICENSE;md5=97871bde150daeb5e61ad95137ff2446 \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.4.0.bb index b376278165..bbea9cacb2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.4.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "463c38a08d2e4cef6c498b76ba5bd4858e4c6ef51da1a5a1f27139a022e20248" +SRC_URI[sha256sum] = "d2c244d01048ba476e7c080bd2c6df5e141d211de80223460d5b3b8a2a58433d" PYPI_PACKAGE = "absl-py" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.6.1.bb index 7507b8ffd0..7e915fd3d2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.6.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" -SRC_URI[sha256sum] = "9a5aaf2fa97a889746142093e74143d5e3e02209fae428d1e2dbcc34a5c36efd" +SRC_URI[sha256sum] = "afe44307ff2453e20323009cb315de3896d551afd0635b57381a278bb2119d48" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.9.2.bb index 03a38d5ff3..0d83f86c41 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.9.2.bb @@ -1,10 +1,10 @@ DESCRIPTION = "A database migration tool for SQLAlchemy" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f5a8522010db1a393833988dbe2c7f0b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3023b042cb6002cb398344b51c67093" inherit pypi setuptools3 -SRC_URI[sha256sum] = "f9f76e41061f5ebe27d4fe92600df9dd612521a7683f904dab328ba02cffa5a2" +SRC_URI[sha256sum] = "6880dec4f28dd7bd999d2ed13fbe7c9d4337700a44d11a524c0ce0c59aaf0dbd" PYPI_PACKAGE = "alembic" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid/0001-pyproject.toml-Replace-with.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid/0001-pyproject.toml-Replace-with.patch new file mode 100644 index 0000000000..3e1a17be92 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid/0001-pyproject.toml-Replace-with.patch @@ -0,0 +1,27 @@ +From 517f361ba4a6ae430acfe3b83986d32b4f811b58 Mon Sep 17 00:00:00 2001 +From: Leon Anavi <leon.anavi@konsulko.com> +Date: Wed, 11 Jan 2023 13:56:24 +0200 +Subject: [PATCH] pyproject.toml: Replace ~= with >= + +Replace ~= with >= to avoid errors if the version is not exactly +the same. + +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 537bca9a..a01e0d45 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["setuptools~=62.6", "wheel~=0.37.1"] ++requires = ["setuptools>=62.6", "wheel>=0.37.1"] + build-backend = "setuptools.build_meta" + + [project] +-- +2.30.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.12.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.13.2.bb index ca87ff013d..fa22080d36 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.12.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.13.2.bb @@ -4,11 +4,18 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "1493fe8bd3dfd73dc35bd53c9d5b6e49ead98497c47b2307662556a5692d29d7" +SRC_URI[sha256sum] = "3bc7834720e1a24ca797fd785d77efb14f7a28ee8e635ef040b6e2d80ccb3303" -inherit pypi setuptools3 +SRC_URI += " \ + file://0001-pyproject.toml-Replace-with.patch \ +" + +inherit pypi python_setuptools_build_meta -DEPENDS += "${PYTHON_PN}-pytest-runner-native" +DEPENDS += "\ + ${PYTHON_PN}-pytest-runner-native \ + ${PYTHON_PN}-wheel-native \ +" PACKAGES =+ "${PN}-tests" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.1.1.bb index 54f42fdc3a..b67e900685 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.12.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.1.1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" HOMEPAGE = "http://crossbar.io/autobahn" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3e2c2c2cc2915edc5321b0e6b1d3f5f8" -SRC_URI[sha256sum] = "43b4e8b1aeaeb20a0cc0a81572e613dc958057c0ab248a7d6b41b2763270f925" +SRC_URI[sha256sum] = "a88882ab4700ee9eee46c69c38e2b625f6fda48ab1ce61cf7b58b23cf2fadcb8" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.0.bb index 35b338ca8f..21bb518719 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.0.bb @@ -27,6 +27,6 @@ do_install_ptest() { cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } -SRC_URI[sha256sum] = "6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757" +SRC_URI[sha256sum] = "13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_38.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_38.0.1.bb index 96e193d4f3..c116063510 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_38.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_38.0.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "b7d5465aba357ce4c103a7d38c9e01a6f12d8265090b4147b3cc1fa4c3adb993" +SRC_URI[sha256sum] = "be391520a43c8041ba99839a00a0a61b7afa929387def6c6348a9626b99f24d7" PYPI_PACKAGE = "cantools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj/0001-Switch-from-using-distutils-to-setuptools.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj/0001-Switch-from-using-distutils-to-setuptools.patch deleted file mode 100644 index ed6ceca8e1..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj/0001-Switch-from-using-distutils-to-setuptools.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ad9024e50a9df4a2b8a1a019e07bb133c3df31bf Mon Sep 17 00:00:00 2001 -From: Daniel Watkins <daniel@daniel-watkins.co.uk> -Date: Thu, 28 Aug 2014 18:49:04 +0200 -Subject: [PATCH] Switch from using distutils to setuptools. - -Upstream-Status: Backport - -Signed-off-by: Tim Orling <tim.orling@konsulko.com> ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index c6d57a6..6755ab4 100644 ---- a/setup.py -+++ b/setup.py -@@ -12,7 +12,7 @@ - # http://opensource.org/licenses/BSD-3-Clause - import os - import sys --from distutils.core import setup -+from setuptools import setup - # a simple import wouldn't work if we moved towards a package with __init__ - from _version import __version__ - --- -2.30.2 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.6.bb deleted file mode 100644 index 1125a6389d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Config file reading, writing and validation." -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://configobj.py;md5=a7c3968dd866dfd23e91e125b669ab21" - -PYPI_PACKAGE = "configobj" -SRC_URI[sha256sum] = "a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902" - -SRC_URI += "file://0001-Switch-from-using-distutils-to-setuptools.patch" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb new file mode 100644 index 0000000000..b8b5e6f897 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb @@ -0,0 +1,13 @@ +SUMMARY = "Config file reading, writing and validation." +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6f99b84d9a94610c62e48fa2e59e72" + +PYPI_PACKAGE = "configobj" +SRC_URI[sha256sum] = "6f704434a07dc4f4dc7c9a745172c1cad449feb548febd9f7fe362629c627a97" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.0.5.bb index 7e9b262d11..98f0f191c6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.0.5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://coverage.readthedocs.io" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "d5be4e93acce64f516bf4fd239c0e6118fc913c93fa1a3f52d15bdcc60d97b2d" +SRC_URI[sha256sum] = "051afcbd6d2ac39298d62d340f94dbb6a1f31de06dfaf6fcef7b759dd3860c45" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.1.6.bb index d61189bfdf..80869d0163 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.1.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.1.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/scrapinghub/dateparser" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d3ed25571191e7aa3f55d0a6efe0051" -SRC_URI[sha256sum] = "107f3cc87a60770e10d111349adc1504224a6b60753a47a64b0ec842ab85b5a9" +SRC_URI[sha256sum] = "e703db1815270c020552f4b3e3a981937b48b2cbcfcef5347071b74788dd9214" PYPI_PACKAGE = "dateparser" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-decouple_3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-decouple_3.7.bb index 772ee7faf9..5238431bcb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-decouple_3.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-decouple_3.7.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a46375b26bb7d7603565d829a2a51782" -SRC_URI[sha256sum] = "2838cdf77a5cf127d7e8b339ce14c25bceb3af3e674e039d4901ba16359968c7" +SRC_URI[sha256sum] = "e88a8d6bdf3b07d471a854099e455e20a6fa7a4d6ecf8631b250e3db654336e6" PYPI_PACKAGE = "python-decouple" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.3.0.bb index 67158fbdad..3d1dc8d3ad 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.3.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.dnspython.org/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" -SRC_URI[sha256sum] = "0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e" +SRC_URI[sha256sum] = "224e32b03eb46be70e12ef6d64e0be123a64e621ab4c0822ff6d450d52a540b9" inherit pypi python_poetry_core ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.3.1.bb index 76dfdd6018..2350c4d758 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.3.1.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032" -SRC_URI[sha256sum] = "553a66f8be2ec2dea641ae1d3f29017ab89e9d603d4a25cdaac39eefa283d769" +SRC_URI[sha256sum] = "d178c5c6fa6c6824e9b04f199cf23e79ac15756786573c190d2ad13089411ad2" PYPI_PACKAGE = "email_validator" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.33.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb index 6348e9b76d..c1256661b4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.33.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778" -SRC_URI[sha256sum] = "82c382c2a2c712f1a8320378a9120ac9589d9f1131c36a63780f0b8504afa5bc" +SRC_URI[sha256sum] = "722803e7eadff295347539da363d68ae155b8b26ae6a634474d0a920be73cfda" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.1.bb index 3656a6ebd1..7d3ac9e32c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" -SRC_URI[sha256sum] = "2a301c3040af6844f29d9149abe428a0f08ebc8fa149e72113bbb36fa341920a" +SRC_URI[sha256sum] = "f62b51f9cd2c4f444deac111726a2335d0b846dcf51909a97e261d2098b816f7" PYPI_PACKAGE = "Flask-Migrate" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.0.bb index 678588265d..92d78674e9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple integration of Flask and WTForms." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=d98d089889e14b227732d45dac3aacc4" -SRC_URI[sha256sum] = "34fe5c6fee0f69b50e30f81a3b7ea16aa1492a771fe9ad0974d164610c09a6c9" +SRC_URI[sha256sum] = "10fd267a41b6dee4f433ec8d6507d4cce4f1d71700280cf654a7cdbae6408d47" PYPI_PACKAGE = "Flask-WTF" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.3.bb index 90d1661d40..e4a4b5c197 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.3.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://python-future.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a253924061f8ecc41ad7a2ba1560e8e7" -SRC_URI[md5sum] = "e4579c836b9c025872efe230f6270349" -SRC_URI[sha256sum] = "b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d" +SRC_URI[sha256sum] = "34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307" PYPI_PACKAGE_HASH = "99abde815842bc6e97d5a7806ad51236630da14ca2f3b1fce94c0bb94d3d" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.70.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.72.0.bb index 0e0a14ad06..d0e94d8fbb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.70.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.72.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "262de094d5a30d337f59e66581019fed45b698c078397ac48dd323c0968236e7" +SRC_URI[sha256sum] = "0ddf4a44256d4516635578b93a9ac0dfba7d8bd357cd896e68ef9c549a840b2f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.16.0.bb index 315d0aa8a0..07dc8d045d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.15.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.16.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 -SRC_URI[sha256sum] = "72f12a6cfc968d754d7bdab369c5c5c16032106e52d32c6dfd8484e4c01a6d1f" +SRC_URI[sha256sum] = "ed7057a101af1146f0554a769930ac9de506aeca4fd5af6543ebe791851a9fbd" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.57.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.58.0.bb index 2a233ad18c..27c3b9b227 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.57.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.58.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca inherit pypi setuptools3 -SRC_URI[sha256sum] = "27a849d6205838fb6cc3c1c21cb9800707a661bb21c6ce7fb13e99eb1f8a0c46" +SRC_URI[sha256sum] = "c727251ec025947d545184ba17e3578840fc3a24a0516a020479edab660457df" RDEPENDS:${PN} += "\ ${PYTHON_PN}-grpcio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch new file mode 100644 index 0000000000..5abe59279f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch @@ -0,0 +1,31 @@ +From aa505359a3bb5a954fe3c7fbd853c75802bf3533 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Jan 2023 21:37:26 -0800 +Subject: [PATCH] greenlet: Drop using 'register' storage class keyword + +This has been dropped in c++17 and newer + +Upstream-Status: Submitted [https://github.com/python-greenlet/greenlet/pull/336] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/greenlet/platform/switch_riscv_unix.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/greenlet/platform/switch_riscv_unix.h b/src/greenlet/platform/switch_riscv_unix.h +index 5b5ea98..24df9db 100644 +--- a/src/greenlet/platform/switch_riscv_unix.h ++++ b/src/greenlet/platform/switch_riscv_unix.h +@@ -11,8 +11,8 @@ + static int + slp_switch(void) + { +- register int ret; +- register long *stackref, stsizediff; ++ int ret; ++ long *stackref, stsizediff; + __asm__ volatile ("" : : : REGS_TO_SAVE); + __asm__ volatile ("mv %0, sp" : "=r" (stackref) : ); + { +-- +2.39.0 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb index 629d9d359f..4a50a24184 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb @@ -4,6 +4,8 @@ LICENSE = "MIT & PSF-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" +SRC_URI += "file://0001-greenlet-Drop-using-register-storage-class-keyword.patch" + SRC_URI[sha256sum] = "42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.23.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.25.0.bb index 99579398bd..4edd166fde 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.23.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.25.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" -SRC_URI[sha256sum] = "cb635709765e527c94890b4fbb6870e59213fe182a1c8086d167eb3626073cbd" +SRC_URI[sha256sum] = "b80796a1f8c38c697a940a2ad7397ee28900d5c4e51061b9a67d16aca867f33e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.8.0.bb index b5bb99b1bd..5b3d85db04 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.8.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "882899fe78d5417a0aa07f995db298fa28b58faeba2112d2e3a4c95fe14bb738" +SRC_URI[sha256sum] = "f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b" RDEPENDS:${PN} = "\ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.9.0.bb index 46ef296262..74c5e9b520 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.9.0.bb @@ -2,10 +2,10 @@ SUMMARY = "A fast and thorough lazy object proxy" HOMEPAGE = "https://python-lazy-object-proxy.readthedocs.io/" LICENSE = "BSD-2-Clause" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c7d2e9d24c2b5bad57ca894da972e22e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d606e94f56c21c8e0cdde0b622dcdf57" DEPENDS += "${PYTHON_PN}-setuptools-scm-native ${PYTHON_PN}-pip-native" -SRC_URI[sha256sum] = "c219a00245af0f6fa4e95901ed28044544f50152840c5b6a3e7b2568db34d156" +SRC_URI[sha256sum] = "659fb5809fa4629b8a1ac5106f669cfc7bef26fbb389dda53b3e010d1ac4ebae" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch new file mode 100644 index 0000000000..1f9b8cdeaf --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch @@ -0,0 +1,59 @@ +From 3eb9987b02cc10b93e09219ddc86aa6be5f10177 Mon Sep 17 00:00:00 2001 +From: tybeller <ty.c.beller@gmail.com> +Date: Fri, 30 Sep 2022 16:13:41 -0400 +Subject: [PATCH] removed RandomNumberGenerator class, included <random>, + replaced random_shuffle with shuffle and used mersenne twister engine to + generate uniform random bit generator for the shuffle. + +Upstream-Status: Backport [https://github.com/matplotlib/matplotlib/commit/601d92a8850] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/tri/_tri.cpp | 20 ++++---------------- + 1 file changed, 4 insertions(+), 16 deletions(-) + +diff --git a/src/tri/_tri.cpp b/src/tri/_tri.cpp +index b7a87783de..6e639eea44 100644 +--- a/src/tri/_tri.cpp ++++ b/src/tri/_tri.cpp +@@ -12,6 +12,7 @@ + + #include <algorithm> + #include <set> ++#include <random> + + + TriEdge::TriEdge() +@@ -1465,8 +1466,8 @@ TrapezoidMapTriFinder::initialize() + _tree->assert_valid(false); + + // Randomly shuffle all edges other than first 2. +- RandomNumberGenerator rng(1234); +- std::random_shuffle(_edges.begin()+2, _edges.end(), rng); ++ std::mt19937 rng(1234); ++ std::shuffle(_edges.begin()+2, _edges.end(), rng); + + // Add edges, one at a time, to tree. + size_t nedges = _edges.size(); +@@ -2055,17 +2056,4 @@ TrapezoidMapTriFinder::Trapezoid::set_upper_right(Trapezoid* upper_right_) + upper_right = upper_right_; + if (upper_right != 0) + upper_right->upper_left = this; +-} +- +- +- +-RandomNumberGenerator::RandomNumberGenerator(unsigned long seed) +- : _m(21870), _a(1291), _c(4621), _seed(seed % _m) +-{} +- +-unsigned long +-RandomNumberGenerator::operator()(unsigned long max_value) +-{ +- _seed = (_seed*_a + _c) % _m; +- return (_seed*max_value) / _m; +-} ++} +\ No newline at end of file +-- +2.39.0 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch index 25c49afb97..899cac624a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch @@ -6,18 +6,32 @@ Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> --- a/setup.py +++ b/setup.py -@@ -316,8 +316,6 @@ setup( # Finally, pass this all along t +@@ -303,7 +303,6 @@ setup( # Finally, pass this all along t setup_requires=[ "certifi>=2020.06.20", - "numpy>=1.17", -- "setuptools_scm>=4,<7", -- "setuptools_scm_git_archive", + "numpy>=1.19", +- "setuptools_scm>=7", ], install_requires=[ - "cycler>=0.10", + "contourpy>=1.0.1", +@@ -315,13 +314,7 @@ setup( # Finally, pass this all along t + "pillow>=6.2.0", + "pyparsing>=2.2.1", + "python-dateutil>=2.7", +- ] + ( +- # Installing from a git checkout that is not producing a wheel. +- ["setuptools_scm>=7"] if ( +- Path(__file__).with_name(".git").exists() and +- os.environ.get("CIBUILDWHEEL", "0") != "1" +- ) else [] +- ), ++ ], + use_scm_version={ + "version_scheme": "release-branch-semver", + "local_scheme": "node-and-date", --- a/setupext.py +++ b/setupext.py -@@ -64,40 +64,7 @@ def get_from_cache_or_download(url, sha) +@@ -65,40 +65,7 @@ def get_from_cache_or_download(url, sha) BytesIO The file loaded into memory. """ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.6.3.bb index 1a0b93b030..fa0a78d6a9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.5.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.6.3.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/matplotlib/matplotlib" SECTION = "devel/python" LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "\ - file://setup.py;beginline=296;endline=296;md5=20e7ab4d2b2b1395a0e4ab800181eb96 \ + file://setup.py;beginline=283;endline=283;md5=20e7ab4d2b2b1395a0e4ab800181eb96 \ file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \ " @@ -21,13 +21,14 @@ DEPENDS = "\ python3-certifi-native \ python3-setuptools-scm-native \ " -SRC_URI[sha256sum] = "339cac48b80ddbc8bfd05daae0a3a73414651a8596904c2a881cfd1edb65f26c" +SRC_URI[sha256sum] = "1f4d69707b1677560cd952544ee4962f68ff07952fb9069ff8c12b56353cb8c9" inherit pypi setuptools3 pkgconfig # Stop the component from attempting to download when it detects a missing # dependency -SRC_URI += "file://matplotlib-disable-download.patch" +SRC_URI += "file://matplotlib-disable-download.patch \ + file://0001-removed-RandomNumberGenerator-class-included-random-.patch" # This python module requires a full copy of freetype-2.6.1 SRC_URI += "https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz;name=freetype;subdir=matplotlib-${PV}/build" @@ -40,6 +41,8 @@ SRC_URI[qhull.sha256sum] = "b5c2d7eb833278881b952c8a52d20179eab87766b00b86500046 # LTO with clang needs lld LDFLAGS:append:toolchain-clang = " -fuse-ld=lld" LDFLAGS:remove:toolchain-clang:mips = "-fuse-ld=lld" +LDFLAGS:remove:toolchain-clang:riscv64 = "-fuse-ld=lld" +LDFLAGS:remove:toolchain-clang:riscv32 = "-fuse-ld=lld" RDEPENDS:${PN} = "\ freetype \ libpng \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.0.1.bb index dcc57c22b4..b916a7b4e7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.0.1.bb @@ -13,4 +13,4 @@ RDEPENDS:${PN} += "${PYTHON_PN}-prettytable \ ${PYTHON_PN}-pep8 \ ${PYTHON_PN}-pyflakes" -SRC_URI[sha256sum] = "fd552787228eb2ab8352f270470fa93c9ad8b9cbc565c5558ee3faed8edb3853" +SRC_URI[sha256sum] = "e3ea505c03babf7977fd21674a69ad328053d414f05e6433c30d8fa14a534a6b" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.8.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_3.0.bb index 92883f3198..c83771b1e6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.8.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_3.0.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Python package for creating and manipulating graphs and networks" HOMEPAGE = "http://networkx.github.io/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44614b6df7cf3c19be69d0a945e29904" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4266362445d56549f7b8973d02e5f22a" -SRC_URI[sha256sum] = "230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e" +SRC_URI[sha256sum] = "9a9992345353618ae98339c2b63d8201c381c2944f38a2ab49cb45a4c667e412" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.1.0.bb index 006799c8bf..319598e3b2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pywbem/nocasedict" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" -SRC_URI[sha256sum] = "7c111da4cefd244433cb63377aff081a40f84bddae9e6f376c67f086c0f806da" +SRC_URI[sha256sum] = "ac551de692be6aea5b43ac3f2c33780df940013ac6dd0718fb552c8b560ba661" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.1.0.bb index 9e6842961d..4b93ca98fa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.1.0.bb @@ -3,6 +3,10 @@ HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "48f067f8cb841245f34d03120bc1ba9900f13b19cb51bcc6c7bee017f7c874da" +SRC_URI[sha256sum] = "a99384abc700c409e9def7143763e18dfad332fdff7e30fae1f6d1a30b372772" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.6.0.bb index c8b50f0b2d..0c0692b144 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.6.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://code.google.com/p/prettytable" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c9a6829fcd174d9535b46211917c7671" -SRC_URI[sha256sum] = "7d7dd84d0b206f2daac4471a72f299d6907f34516064feb2838e333a4e2567bd" +SRC_URI[sha256sum] = "2e0026af955b4ea67b22122f310b90eae890738c08cb0458693a49b6221530ac" do_install:append() { perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"` @@ -16,13 +16,15 @@ UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PrettyTable/" UPSTREAM_CHECK_REGEX = "/PrettyTable/(?P<pver>(\d+[\.\-_]*)+)" BBCLASSEXTEND = "native nativesdk" -inherit pypi ptest setuptools3 +inherit pypi ptest python_hatchling SRC_URI += " \ file://run-ptest \ " -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "\ + ${PYTHON_PN}-hatch-vcs-native \ +" RDEPENDS:${PN} += " \ ${PYTHON_PN}-math \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.1.0.bb index 95cc3e3510..b58c62218a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.1.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c2223d66c7e674b40527b5a4c35bd76" DEPENDS += "python3-six-native" -SRC_URI[sha256sum] = "704cb7fb90631c45f9c3a70b89d0c990fe0e208ac56f14a5c449e21bebd1e201" +SRC_URI[sha256sum] = "eeba02c86b13b1f885c0acc50adf4611df24ab85066ff54daa37c2d883c32525" S = "${WORKDIR}/pymodbus-${PV}" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb index 34dd9c407e..2e6a32a248 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb @@ -7,7 +7,7 @@ SRC_URI[sha256sum] = "8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422 inherit pypi python_setuptools_build_meta -PEP517_PICOBUILD_OPTS = "--loose-depends" +PEP517_BUILD_OPTS = "--skip-dependency-check" DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_24.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.0.0.bb index b3b0aefe1f..39a7614fc5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_24.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.0.0.bb @@ -13,7 +13,7 @@ SRC_URI:append = " \ file://club-rpath-out.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77" +SRC_URI[sha256sum] = "f330a1a2c7f89fd4b0aa4dcb7bf50243bf1c8da9a2f1efc31daf57a2046b31f2" inherit pypi pkgconfig python_setuptools_build_meta ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.4.2.bb index a9ff015c54..37c64b11ff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.4.2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://github.com/andymccurdy/redis-py" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1db1f331d351900707368237cc4880cf" -SRC_URI[sha256sum] = "7b8c87d19c45d3f1271b124858d2a5c13160c4e74d4835e28273400fa34d5228" +SRC_URI[sha256sum] = "a010f6cb7378065040a02839c3f75c7e0fb37a87116fb4a95be82a95552776c7" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_6.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_6.0.2.bb index 5f58a2ae5f..19c7652757 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_6.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_6.0.2.bb @@ -13,7 +13,7 @@ inherit pypi setuptools3 PYPI_PACKAGE_EXT = "zip" -SRC_URI[sha256sum] = "b2d9a82912dfd27aae7afaad64771c58f5d948ca9d64e3ae72b16721b5e022ea" +SRC_URI[sha256sum] = "6a9c06deb220099990f190c6e4e772675f625e4d5d84640fca6f0ad46ff538d0" RDEPENDS:${PN} += " \ ${PYTHON_PN}-shell \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.13.0.bb index 00b14ed1aa..001ff6082c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.12.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.13.0.bb @@ -15,7 +15,7 @@ RDEPENDS:${PN} += "\ ${PYTHON_PN}-datetime \ " -SRC_URI[sha256sum] = "5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c" +SRC_URI[sha256sum] = "72da0766c3069a3941eadbdfa0996f83f5a33e55902a19ba399557cfee1dddcc" PYPI_PACKAGE = "sentry-sdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.45.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.46.bb index d5f7b30642..be9c5b7bd2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.45.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.46.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ application developers the full power and flexibility of SQL" HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f4001d1ca15b69d096fa1b4fd1bdce79" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b707d50badb798e1d897f2c8f649382d" -SRC_URI[sha256sum] = "fd69850860093a3f69fefe0ab56d041edfdfe18510b53d9a2eaecba2f15fa795" +SRC_URI[sha256sum] = "6913b8247d8a292ef8315162a51931e2b40ce91681f1b6f18f697045200c4a30" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.8.1.bb index d7a78254ed..3f75df6f19 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.8.1.bb @@ -4,7 +4,7 @@ AUTHOR = "IPython Development Team <ipython-dev@scipy.org>" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.md;md5=f17a3ba4cd59794dd6e005c8e150aef0" -SRC_URI[sha256sum] = "6cc57d6dc28c85d5365961726ffd19b538739347749e13ebe34e03323a0e8f84" +SRC_URI[sha256sum] = "32500888f5ff7bbf3b9267ea31748fa657aaf34d56d85e60f91dda7dc7f5785b" inherit pypi python_hatchling diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_22.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb index e2102695ec..7559accf41 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_22.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Compatibility API between asyncio/Twisted/Trollius" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3e2c2c2cc2915edc5321b0e6b1d3f5f8" -SRC_URI[sha256sum] = "2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01" +SRC_URI[sha256sum] = "f9a9216e976e5e3246dfd112ad7ad55ca915606b60b84a757ac769bd404ff704" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-uefi-firmware_1.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb index 3837a17437..49955c97e6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-uefi-firmware_1.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://setup.py;md5=90fa5bae1547550f1c1993f651eda955" SRC_URI = "git://github.com/theopolis/uefi-firmware-parser;protocol=https;branch=master" -SRCREV = "502f1bada1ed11fdd1792646fda0bfafb8fa57fb" +SRCREV = "dfb15b068960b771e2e1536d34790dac9b5bfe32" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.7.0.bb index ee12deffb5..5c431fa003 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.7.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pu LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e0039a83d8a99726b5418f0b03302d0a" -SRC_URI[sha256sum] = "f881e2d8a022e9285aa2eab6ba8674358dbcb2b57fa68618d88d62937ac3ff04" +SRC_URI[sha256sum] = "e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23" inherit pypi ptest setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.7.bb index e64463edca..e73e579e37 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.7.bb @@ -16,6 +16,6 @@ RDEPENDS:${PN} += " \ python3-io \ " -SRC_URI[sha256sum] = "fe2b1e2dec38ef8952e9a41a0290861a052e6771a9f43f5e3d56dc63b7112348" +SRC_URI[sha256sum] = "1239958b12da12be6abf05b32f64ff162eb75fff0fdf00d901ca0f46dc0557cf" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/tftpy_0.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/tftpy_0.8.2.bb new file mode 100644 index 0000000000..c1b3234f72 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/tftpy_0.8.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Tftpy is a TFTP library for the Python programming language. It includes client and server classes, with sample implementations." +DESCRIPTION = "Tftpy is a TFTP library for the Python programming language. It \ +includes client and server classes, with sample implementations. Hooks are \ +included for easy inclusion in a UI for populating progress indicators. It \ +supports RFCs 1350, 2347, 2348 and the tsize option from RFC 2349." + +HOMEPAGE = "https://github.com/msoulier/tftpy" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=22770e72ae03c61f5bcc4e333b61368d" + +SRC_URI[sha256sum] = "e1d1a680efd88eba176b351175844253067392a9b0f8b81588e3ff2b9e7bbb5b" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.6.1.bb new file mode 100644 index 0000000000..51651f3bcf --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.6.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Pure-Python Reed Solomon encoder/decoder" +HOMEPAGE = "https://github.com/tomerfiliba/reedsolomon" +LICENSE = "MIT-0 | Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ffde61aeb8917e70e0257e0a4b6d103c" + +SRC_URI[sha256sum] = "a7ce6b0efad8df491a70b87b6ab3543e751f7700dc4ac0b12081a456ef634f5d" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-core" |