diff options
826 files changed, 11367 insertions, 22233 deletions
| @@ -2,6 +2,6 @@ Collection of layers for the OE-core universe | |||
| 2 | 2 | ||
| 3 | Main layer maintainer: Khem Raj <raj.khem@gmail.com> | 3 | Main layer maintainer: Khem Raj <raj.khem@gmail.com> |
| 4 | 4 | ||
| 5 | This repository is a collection of layers to suppliment OE-Core | 5 | This repository is a collection of layers to supplement OE-Core |
| 6 | with additional packages, Each layer have designated maintainer | 6 | with additional packages, Each layer have designated maintainer |
| 7 | Please see the respective READMEs in the layer subdirectories | 7 | Please see the respective READMEs in the layer subdirectories |
diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf index f3525365e7..dd4cb81272 100644 --- a/meta-filesystems/conf/layer.conf +++ b/meta-filesystems/conf/layer.conf | |||
| @@ -15,7 +15,7 @@ LAYERVERSION_filesystems-layer = "1" | |||
| 15 | 15 | ||
| 16 | LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer" | 16 | LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer" |
| 17 | 17 | ||
| 18 | LAYERSERIES_COMPAT_filesystems-layer = "walnascar whinlatter" | 18 | LAYERSERIES_COMPAT_filesystems-layer = "whinlatter wrynose" |
| 19 | 19 | ||
| 20 | BBFILES_DYNAMIC += " \ | 20 | BBFILES_DYNAMIC += " \ |
| 21 | meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ | 21 | meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ |
diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in index a9cf5e4075..cba731c9fd 100644 --- a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in +++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in | |||
| @@ -40,7 +40,7 @@ do_start() | |||
| 40 | mkdir -p $MOUNTPOINT | 40 | mkdir -p $MOUNTPOINT |
| 41 | fi | 41 | fi |
| 42 | 42 | ||
| 43 | $PROG $MOUNTPOINT -o nonempty -o allow_other -o default_permissions -o entry_timeout=0 -f | logger -i $NAME & | 43 | $PROG $MOUNTPOINT -o nonempty -o allow_other -o default_permissions -o entry_timeout=0 -o attr_timeout=0 -f | logger -i $NAME & |
| 44 | echo "done" | 44 | echo "done" |
| 45 | } | 45 | } |
| 46 | 46 | ||
diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in index 313523268c..5f8c4f4834 100644 --- a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in +++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in | |||
| @@ -7,7 +7,7 @@ Description=User-space, libgpiod-based compatibility layer for linux GPIO sysfs | |||
| 7 | [Service] | 7 | [Service] |
| 8 | RuntimeDirectory=gpio | 8 | RuntimeDirectory=gpio |
| 9 | Type=simple | 9 | Type=simple |
| 10 | ExecStart=/usr/bin/gpiod-sysfs-proxy @mountpoint@ -f -o nonempty -o allow_other -o default_permissions -o entry_timeout=0 | 10 | ExecStart=/usr/bin/gpiod-sysfs-proxy @mountpoint@ -f -o nonempty -o allow_other -o default_permissions -o entry_timeout=0 -o attr_timeout=0 |
| 11 | ExecStop=/bin/umount @mountpoint@ | 11 | ExecStop=/bin/umount @mountpoint@ |
| 12 | Restart=always | 12 | Restart=always |
| 13 | 13 | ||
diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.2.bb b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.4.bb index 3e68a52b09..52b73f3ff4 100644 --- a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.2.bb +++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.4.bb | |||
| @@ -15,7 +15,7 @@ SRC_URI += " \ | |||
| 15 | file://run-ptest.in \ | 15 | file://run-ptest.in \ |
| 16 | " | 16 | " |
| 17 | 17 | ||
| 18 | SRC_URI[sha256sum] = "4bdd4b8a7042f63a40507ae0f16b360011e67cbb2f0276289636487a54849530" | 18 | SRC_URI[sha256sum] = "bb38e31e4046a7aa0101c53c9e7e2cf319c0cd9620b9ba1641e962fce44a1f3a" |
| 19 | 19 | ||
| 20 | # For full backward compatibility with the kernel sysfs interface, this option | 20 | # For full backward compatibility with the kernel sysfs interface, this option |
| 21 | # must be selected. However, we don't make it the default as - with kernel sysfs | 21 | # must be selected. However, we don't make it the default as - with kernel sysfs |
| @@ -66,7 +66,7 @@ RDEPENDS:${PN} += " \ | |||
| 66 | python __anonymous() { | 66 | python __anonymous() { |
| 67 | if d.getVar("PTEST_ENABLED") == "1": | 67 | if d.getVar("PTEST_ENABLED") == "1": |
| 68 | d.appendVar("SRC_URI", "git://github.com/brgl/gpio-sysfs-compat-tests;protocol=https;branch=main;destsuffix=tests;name=tests") | 68 | d.appendVar("SRC_URI", "git://github.com/brgl/gpio-sysfs-compat-tests;protocol=https;branch=main;destsuffix=tests;name=tests") |
| 69 | d.setVar("SRCREV_tests", "a3c9daa4650dd1e8d7fd8972db68d9c2c204263d") | 69 | d.setVar("SRCREV_tests", "2882af358480afcf7eed85584cddd560d6673637") |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | do_install_ptest() { | 72 | do_install_ptest() { |
| @@ -81,5 +81,5 @@ USERADD_PACKAGES = "${PN}-ptest" | |||
| 81 | GROUPADD_PARAM:${PN}-ptest = "--system gpio-test" | 81 | GROUPADD_PARAM:${PN}-ptest = "--system gpio-test" |
| 82 | USERADD_PARAM:${PN}-ptest = "--system -M -s /bin/nologin -g gpio-test gpio-test" | 82 | USERADD_PARAM:${PN}-ptest = "--system -M -s /bin/nologin -g gpio-test gpio-test" |
| 83 | 83 | ||
| 84 | RDEPENDS:${PN}-ptest += "kmod" | 84 | RDEPENDS:${PN}-ptest += "kmod python3-multiprocess" |
| 85 | RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs" | 85 | RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs" |
diff --git a/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb b/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.2.0.bb index 5fbeab53d8..daeb5b9be2 100644 --- a/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb +++ b/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.2.0.bb | |||
| @@ -3,11 +3,12 @@ LICENSE = "LGPL-2.1-only" | |||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" |
| 4 | HOMEPAGE = "http://www.libimobiledevice.org/" | 4 | HOMEPAGE = "http://www.libimobiledevice.org/" |
| 5 | 5 | ||
| 6 | DEPENDS = "fuse libimobiledevice" | 6 | DEPENDS = "fuse3 libimobiledevice" |
| 7 | 7 | ||
| 8 | SRC_URI = "https://github.com/libimobiledevice/ifuse/releases/download/${PV}/ifuse-${PV}.tar.bz2" | 8 | SRC_URI = "https://github.com/libimobiledevice/ifuse/releases/download/${PV}/ifuse-${PV}.tar.bz2" |
| 9 | 9 | ||
| 10 | SRC_URI[md5sum] = "cd31fbd0ea945b2ff1e39eac8d198fdd" | 10 | SRC_URI[sha256sum] = "5c584ae999ed52b386b0d2d1af8f8dcba451cddf31d7cd24367b18db0a9a5a9e" |
| 11 | SRC_URI[sha256sum] = "3550702ef94b2f5f16c7db91c6b3282b2aed1340665834a03e47458e09d98d87" | ||
| 12 | 11 | ||
| 13 | inherit autotools pkgconfig | 12 | inherit autotools pkgconfig |
| 13 | |||
| 14 | EXTRA_OECONF = "PACKAGE_VERSION=${PV}" | ||
diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb index 7cfafcad39..3a7dd783b9 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb | |||
| @@ -6,15 +6,13 @@ LICENSE = "GPL-2.0-only & LGPL-2.0-only" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ |
| 7 | file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" | 7 | file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ | 9 | SRC_URI = "git://github.com/tuxera/ntfs-3g;protocol=https;branch=edge;tag=${PV} \ |
| 10 | file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ | 10 | file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ |
| 11 | file://0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch \ | 11 | file://0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch \ |
| 12 | " | 12 | " |
| 13 | S = "${UNPACKDIR}/ntfs-3g_ntfsprogs-${PV}" | 13 | SRCREV = "78414d93613532fd82f3a82aba5d4a1c32898781" |
| 14 | SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c" | ||
| 15 | 14 | ||
| 16 | UPSTREAM_CHECK_URI = "https://github.com/tuxera/ntfs-3g/releases" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
| 17 | UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)" | ||
| 18 | 16 | ||
| 19 | inherit autotools pkgconfig | 17 | inherit autotools pkgconfig |
| 20 | 18 | ||
diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch index 870d0ef056..229c58f1d0 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch +++ b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch | |||
| @@ -17,11 +17,11 @@ diff --git a/Makefile.am b/Makefile.am | |||
| 17 | index e0c4ad6..0449321 100644 | 17 | index e0c4ad6..0449321 100644 |
| 18 | --- a/Makefile.am | 18 | --- a/Makefile.am |
| 19 | +++ b/Makefile.am | 19 | +++ b/Makefile.am |
| 20 | @@ -35,3 +35,4 @@ rpmcvs: preparerpm | 20 | @@ -30,3 +30,5 @@ rpm: preparerpm |
| 21 | rpmcvs: preparerpm | ||
| 21 | @LN_S@ -f `pwd`/@PACKAGE@-@VERSION@.tar.gz ${RPMDIR}/SOURCES/@PACKAGE@-@VERSION@_cvs_`date +"%Y%m%d"`.tar.gz | 22 | @LN_S@ -f `pwd`/@PACKAGE@-@VERSION@.tar.gz ${RPMDIR}/SOURCES/@PACKAGE@-@VERSION@_cvs_`date +"%Y%m%d"`.tar.gz |
| 22 | cd ${RPMDIR}/SPECS && @RPMBUILD@ -ba @PACKAGE@.spec --define 'cvs 1' | 23 | cd ${RPMDIR}/SPECS && @RPMBUILD@ -ba @PACKAGE@.spec --define 'cvs 1' |
| 23 | 24 | + | |
| 24 | +README: README.md | 25 | +README: README.md |
| 25 | -- | 26 | -- |
| 26 | 2.7.4 | 27 | 2.7.4 |
| 27 | |||
diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch deleted file mode 100644 index 6426ecb247..0000000000 --- a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | From a812202d22a2861318b8e39f1cd74cd222f8e76f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> | ||
| 3 | Date: Tue, 9 Jun 2020 11:30:38 +0300 | ||
| 4 | Subject: [PATCH] Fix compilation with GCC10 | ||
| 5 | |||
| 6 | Fixed compilation with -fno-common, which enabled in GCC 10 by default. | ||
| 7 | See https://bugs.gentoo.org/707438. | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://github.com/owfs/owfs/pull/62] | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | module/owserver/src/c/owserver.c | 2 ++ | ||
| 13 | module/owserver/src/include/owserver.h | 2 +- | ||
| 14 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/module/owserver/src/c/owserver.c b/module/owserver/src/c/owserver.c | ||
| 17 | index db29988e..2ed29161 100644 | ||
| 18 | --- a/module/owserver/src/c/owserver.c | ||
| 19 | +++ b/module/owserver/src/c/owserver.c | ||
| 20 | @@ -36,6 +36,8 @@ | ||
| 21 | |||
| 22 | #include "owserver.h" | ||
| 23 | |||
| 24 | +pthread_mutex_t persistence_mutex ; | ||
| 25 | + | ||
| 26 | /* --- Prototypes ------------ */ | ||
| 27 | static void SetupAntiloop(int argc, char **argv); | ||
| 28 | |||
| 29 | diff --git a/module/owserver/src/include/owserver.h b/module/owserver/src/include/owserver.h | ||
| 30 | index 8be582f0..a257ed02 100644 | ||
| 31 | --- a/module/owserver/src/include/owserver.h | ||
| 32 | +++ b/module/owserver/src/include/owserver.h | ||
| 33 | @@ -18,7 +18,7 @@ | ||
| 34 | #include "ow.h" | ||
| 35 | #include "ow_connection.h" | ||
| 36 | |||
| 37 | -pthread_mutex_t persistence_mutex ; | ||
| 38 | +extern pthread_mutex_t persistence_mutex ; | ||
| 39 | #define PERSISTENCELOCK _MUTEX_LOCK( persistence_mutex ) ; | ||
| 40 | #define PERSISTENCEUNLOCK _MUTEX_UNLOCK( persistence_mutex ) ; | ||
| 41 | |||
| 42 | -- | ||
| 43 | 2.28.0 | ||
| 44 | |||
diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p4.bb index 890c8aecc0..94379939de 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb +++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p4.bb | |||
| @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=628b867016631792781a8735a04760e5 \ | |||
| 8 | file://COPYING.LIB;md5=9021b7435efdd9fb22beef8291134099" | 8 | file://COPYING.LIB;md5=9021b7435efdd9fb22beef8291134099" |
| 9 | 9 | ||
| 10 | DEPENDS = "fuse virtual/libusb0" | 10 | DEPENDS = "fuse virtual/libusb0" |
| 11 | # v3.2p3 | 11 | |
| 12 | SRCREV = "3744375dfaa350e31c9b360eb1e1a517bbeb5c47" | 12 | SRCREV = "c68deb1fc6d30fcc5eabe0a0d9c9dc2ca54e455a" |
| 13 | SRC_URI = "git://github.com/owfs/owfs;branch=master;protocol=https \ | 13 | SRC_URI = "git://github.com/owfs/owfs;branch=master;protocol=https;tag=v${PV} \ |
| 14 | file://0001-Add-build-rule-for-README.patch \ | 14 | file://0001-Add-build-rule-for-README.patch \ |
| 15 | file://0001-Fix-compilation-with-GCC10.patch \ | ||
| 16 | file://owhttpd \ | 15 | file://owhttpd \ |
| 17 | file://owserver \ | 16 | file://owserver \ |
| 18 | " | 17 | " |
diff --git a/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb b/meta-filesystems/recipes-filesystems/packagegroups/packagegroup-meta-filesystems.bb index 3a4b87a206..3a4b87a206 100644 --- a/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb +++ b/meta-filesystems/recipes-filesystems/packagegroups/packagegroup-meta-filesystems.bb | |||
diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.8.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.4.1.bb index 1fc1457b19..5c02d58242 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.8.bb +++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.4.1.bb | |||
| @@ -4,8 +4,8 @@ LICENSE = "CDDL-1.0" | |||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" |
| 5 | HOMEPAGE = "https://github.com/openzfs/zfs" | 5 | HOMEPAGE = "https://github.com/openzfs/zfs" |
| 6 | 6 | ||
| 7 | SRCREV = "3e4a3e161c00273303cd9fa9e0dc09ead3499a8a" | 7 | SRCREV = "1c702dda346a59e05cfd3029569bbb1d5d91c54b" |
| 8 | SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \ | 8 | SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.4-release;tag=${BP} \ |
| 9 | file://0001-Define-strndupa-if-it-does-not-exist.patch \ | 9 | file://0001-Define-strndupa-if-it-does-not-exist.patch \ |
| 10 | file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ | 10 | file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ |
| 11 | file://0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch \ | 11 | file://0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch \ |
diff --git a/meta-filesystems/recipes-utils/binfs/bindfs_1.18.3.bb b/meta-filesystems/recipes-utils/binfs/bindfs_1.18.4.bb index 1c32f443ca..a61997f703 100644 --- a/meta-filesystems/recipes-utils/binfs/bindfs_1.18.3.bb +++ b/meta-filesystems/recipes-utils/binfs/bindfs_1.18.4.bb | |||
| @@ -8,7 +8,7 @@ DEPENDS = "fuse" | |||
| 8 | RDEPENDS:${PN} = "fuse" | 8 | RDEPENDS:${PN} = "fuse" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/mpartel/bindfs;protocol=https;branch=master;tag=${PV}" | 10 | SRC_URI = "git://github.com/mpartel/bindfs;protocol=https;branch=master;tag=${PV}" |
| 11 | SRCREV = "91fbfa48427c67f59c24e84f3855507531ba972c" | 11 | SRCREV = "8cda89a91a836e106ad275b840f44485194bec91" |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | inherit autotools pkgconfig gettext | 14 | inherit autotools pkgconfig gettext |
diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb index 645e38ca49..6722b63c10 100644 --- a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb +++ b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb | |||
| @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" | |||
| 9 | 9 | ||
| 10 | SECTION = "base" | 10 | SECTION = "base" |
| 11 | 11 | ||
| 12 | SRC_URI = "git://github.com/kdave/${BPN};branch=master;protocol=https \ | 12 | SRC_URI = "git://github.com/kdave/${BPN};branch=master;protocol=https;tag=v${PV} \ |
| 13 | file://0001-change-sysconfig-path-to-etc-default.patch \ | 13 | file://0001-change-sysconfig-path-to-etc-default.patch \ |
| 14 | file://0002-add-WantedBy-directive-to-btrfsmaintenance-refresh.s.patch \ | 14 | file://0002-add-WantedBy-directive-to-btrfsmaintenance-refresh.s.patch \ |
| 15 | " | 15 | " |
| 16 | SRCREV = "be42cb6267055d125994abd6927cf3a26deab74c" | 16 | SRCREV = "beb9e2d166cbd856297fe8d28e89e8b36961a723" |
| 17 | 17 | ||
| 18 | UPSTREAM_CHECK_URI = "https://github.com/kdave/${BPN}/tags" | 18 | UPSTREAM_CHECK_URI = "https://github.com/kdave/${BPN}/tags" |
| 19 | UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" | 19 | UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" |
diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch b/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch index d425206f0e..b064adcc86 100644 --- a/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch +++ b/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | From b49dbe17e0d9ae463e5a34e6991aa2d3c70d2fb1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Claudius Heine <ch@denx.de> | ||
| 3 | Date: Wed, 11 May 2022 14:33:13 +0200 | ||
| 4 | Subject: [PATCH] change sysconfig path to /etc/default | 1 | Subject: [PATCH] change sysconfig path to /etc/default |
| 5 | 2 | ||
| 6 | OE uses /etc/default for service configuration, not /etc/sysconfig which | 3 | OE uses /etc/default for service configuration, not /etc/sysconfig which |
| @@ -11,6 +8,9 @@ Change the files accordingly | |||
| 11 | Upstream-Status: Inappropriate [OE specific] | 8 | Upstream-Status: Inappropriate [OE specific] |
| 12 | 9 | ||
| 13 | Signed-off-by: Claudius Heine <ch@denx.de> | 10 | Signed-off-by: Claudius Heine <ch@denx.de> |
| 11 | |||
| 12 | Update for 0.5.2 | ||
| 13 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 14 | --- | 14 | --- |
| 15 | btrfsmaintenance-refresh.path | 4 ++-- | 15 | btrfsmaintenance-refresh.path | 4 ++-- |
| 16 | btrfsmaintenance-refresh.service | 2 +- | 16 | btrfsmaintenance-refresh.service | 2 +- |
| @@ -32,16 +32,16 @@ index d56ad11..f0b4132 100644 | |||
| 32 | [Install] | 32 | [Install] |
| 33 | WantedBy=multi-user.target | 33 | WantedBy=multi-user.target |
| 34 | diff --git a/btrfsmaintenance-refresh.service b/btrfsmaintenance-refresh.service | 34 | diff --git a/btrfsmaintenance-refresh.service b/btrfsmaintenance-refresh.service |
| 35 | index 4ed1eb4..d6225a6 100644 | 35 | index 19e51c0..223fca9 100644 |
| 36 | --- a/btrfsmaintenance-refresh.service | 36 | --- a/btrfsmaintenance-refresh.service |
| 37 | +++ b/btrfsmaintenance-refresh.service | 37 | +++ b/btrfsmaintenance-refresh.service |
| 38 | @@ -1,5 +1,5 @@ | 38 | @@ -1,5 +1,5 @@ |
| 39 | [Unit] | 39 | [Unit] |
| 40 | -Description=Update cron periods from /etc/sysconfig/btrfsmaintenance | 40 | -Description=Configure systemd timer schedule according to /etc/sysconfig/btrfsmaintenance |
| 41 | +Description=Update cron periods from /etc/default/btrfsmaintenance | 41 | +Description=Configure systemd timer schedule according to /etc/default/btrfsmaintenance |
| 42 | Documentation="file:/usr/share/doc/btrfsmaintenance/README.man" | ||
| 43 | Documentation="file:/usr/share/doc/packages/btrfsmaintenance/README.man" | ||
| 42 | 44 | ||
| 43 | [Service] | ||
| 44 | ExecStart=/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer | ||
| 45 | -- | 45 | -- |
| 46 | 2.33.3 | 46 | 2.43.0 |
| 47 | 47 | ||
diff --git a/meta-gnome/README.md b/meta-gnome/README.md index 5513276dc0..6c23b4e671 100644 --- a/meta-gnome/README.md +++ b/meta-gnome/README.md | |||
| @@ -10,7 +10,7 @@ branch: master | |||
| 10 | 10 | ||
| 11 | Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' | 11 | Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' |
| 12 | 12 | ||
| 13 | When sending single patches, please using something like: | 13 | When sending single patches, please use something like: |
| 14 | git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH' | 14 | git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH' |
| 15 | 15 | ||
| 16 | Layer maintainer: Khem Raj <raj.khem@gmail.com> | 16 | Layer maintainer: Khem Raj <raj.khem@gmail.com> |
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index faacba478e..4094e5194e 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf | |||
| @@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1" | |||
| 17 | 17 | ||
| 18 | LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" | 18 | LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" |
| 19 | 19 | ||
| 20 | LAYERSERIES_COMPAT_gnome-layer = "walnascar whinlatter" | 20 | LAYERSERIES_COMPAT_gnome-layer = "whinlatter wrynose" |
| 21 | 21 | ||
| 22 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ | 22 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ |
| 23 | faenza-icon-theme->gdk-pixbuf \ | 23 | faenza-icon-theme->gdk-pixbuf \ |
diff --git a/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb b/meta-gnome/recipes-connectivity/folks/folks_0.15.12.bb index 0c6a39d492..527e031837 100644 --- a/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb +++ b/meta-gnome/recipes-connectivity/folks/folks_0.15.12.bb | |||
| @@ -25,4 +25,4 @@ PACKAGECONFIG ??= "" | |||
| 25 | 25 | ||
| 26 | inherit pkgconfig gnomebase gettext gobject-introspection vala features_check | 26 | inherit pkgconfig gnomebase gettext gobject-introspection vala features_check |
| 27 | 27 | ||
| 28 | SRC_URI[archive.sha256sum] = "2311b37355c351f33f163fdc394874a22a0a0682c319493d6d8a6e420711415f" | 28 | SRC_URI[archive.sha256sum] = "21f44e2bdabb1ee7f8e41bb996d10ac7daf35c78c498177db0c00f580a20a914" |
diff --git a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb index e9cb53c97c..0c095f8be3 100644 --- a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb +++ b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb | |||
| @@ -12,7 +12,7 @@ DEPENDS = " \ | |||
| 12 | zlib \ | 12 | zlib \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" | 15 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" |
| 16 | GIR_MESON_OPTION = "" | 16 | GIR_MESON_OPTION = "" |
| 17 | VALA_MESON_OPTION = "with-vala" | 17 | VALA_MESON_OPTION = "with-vala" |
| 18 | VALA_MESON_ENABLE_FLAG ?= 'enabled' | 18 | VALA_MESON_ENABLE_FLAG ?= 'enabled' |
diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb index 9a4dad35d1..502dfb5ce2 100644 --- a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb +++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb | |||
| @@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 gtk+3 gtk4 networkmanager" | |||
| 6 | 6 | ||
| 7 | inherit gnomebase gobject-introspection gtk-doc gettext vala features_check | 7 | inherit gnomebase gobject-introspection gtk-doc gettext vala features_check |
| 8 | 8 | ||
| 9 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)} opengl" | 9 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 10 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 10 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 11 | 11 | ||
| 12 | SRC_URI[archive.sha256sum] = "53a6fb2b190ad37c5986caed3e98bede7c3c602399ee4f93c8fc054303d76dab" | 12 | SRC_URI[archive.sha256sum] = "53a6fb2b190ad37c5986caed3e98bede7c3c602399ee4f93c8fc054303d76dab" |
diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.7.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.8.0.bb index ec221a140f..dec9ea01ae 100644 --- a/meta-gnome/recipes-extended/gparted/gparted_1.7.0.bb +++ b/meta-gnome/recipes-extended/gparted/gparted_1.8.0.bb | |||
| @@ -11,7 +11,7 @@ SRC_URI = " \ | |||
| 11 | ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ | 11 | ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ |
| 12 | ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'file://0001-Install-polkit-action-unconditionally-executable-pke.patch', '', d)} \ | 12 | ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'file://0001-Install-polkit-action-unconditionally-executable-pke.patch', '', d)} \ |
| 13 | " | 13 | " |
| 14 | SRC_URI[sha256sum] = "84ae3b9973e443a2175f07aa0dc2aceeadb1501e0f8953cec83b0ec3347b7d52" | 14 | SRC_URI[sha256sum] = "f584ed4be7fd09c2cf6a784778a8540970d985f0ac8e5a7bd0628528a3ab5609" |
| 15 | 15 | ||
| 16 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" | 16 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" |
| 17 | UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" | 17 | UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" |
diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.118.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.122.bb index b120208fad..c623e0d4ac 100644 --- a/meta-gnome/recipes-gimp/babl/babl_0.1.118.bb +++ b/meta-gnome/recipes-gimp/babl/babl_0.1.122.bb | |||
| @@ -10,7 +10,7 @@ inherit setuptools3 gnomebase gobject-introspection vala | |||
| 10 | DEPENDS += "lcms" | 10 | DEPENDS += "lcms" |
| 11 | 11 | ||
| 12 | SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" | 12 | SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" |
| 13 | SRC_URI[sha256sum] = "c3febe923e225c2a58f952689a89bb1db956788bfecb18a7eff6fc94da9e2469" | 13 | SRC_URI[sha256sum] = "6851f705cda38f2df08a4ba8618279ce30d0a46f957fe6aa325b7b7de297bed2" |
| 14 | 14 | ||
| 15 | FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" | 15 | FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" |
| 16 | 16 | ||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch deleted file mode 100644 index 380e425f25..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | From a7e40e19d17404cf5ec4135fc1becd5a90f5e1e1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Wed, 25 Dec 2024 07:27:04 +0100 | ||
| 4 | Subject: [PATCH] gimp: cross-compile fix for bz2 | ||
| 5 | |||
| 6 | autotools bzip2 build does not create pkgconfig files so looking for the dependency fails. | ||
| 7 | |||
| 8 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 9 | |||
| 10 | Upstream-Status: Inappropriate [can probably be removed once bzip2 is built with meson or cmake] | ||
| 11 | --- | ||
| 12 | meson.build | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/meson.build b/meson.build | ||
| 16 | index 4e48f8c64c..d5dce47015 100644 | ||
| 17 | --- a/meson.build | ||
| 18 | +++ b/meson.build | ||
| 19 | @@ -777,7 +777,7 @@ zlib = dependency('zlib') | ||
| 20 | zlib = dependency('zlib') | ||
| 21 | |||
| 22 | # Compiler-provided headers can't be found in crossroads environment | ||
| 23 | -if not meson.is_cross_build() | ||
| 24 | +if true | ||
| 25 | bz2 = cc.find_library('bz2') | ||
| 26 | else | ||
| 27 | bz2 = dependency('bzip2') | ||
| 28 | -- | ||
| 29 | 2.47.1 | ||
| 30 | |||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch deleted file mode 100644 index ffb8ef29df..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 8ccd12d6ec3330e9646ae9db6fd491226d516dc3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Fri, 28 Mar 2025 01:33:00 +0100 | ||
| 4 | Subject: [PATCH] meson.build: require iso-codes-native | ||
| 5 | |||
| 6 | This fixes: | ||
| 7 | FAILED: app/widgets/gimplanguagestore-data.h | ||
| 8 | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/gimp/3.0.2/build/tools/gen-languages | ||
| 9 | gimp_language_store_parser_init: 0.006277 seconds | ||
| 10 | ERROR: parse_iso_codes: error parsing '/usr/share/xml/iso-codes/iso_639_3.xml': No such file or directory | ||
| 11 | |||
| 12 | Upstream-Status: Denied [https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2185] | ||
| 13 | Upstream argues that iso-codes locale (.mo files) are required on the target | ||
| 14 | |||
| 15 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 16 | --- | ||
| 17 | meson.build | 2 +- | ||
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/meson.build b/meson.build | ||
| 21 | index efbc2d8175..fd050f4d3c 100644 | ||
| 22 | --- a/meson.build | ||
| 23 | +++ b/meson.build | ||
| 24 | @@ -1135,7 +1135,7 @@ endif | ||
| 25 | ################################################################################ | ||
| 26 | # ISO codes | ||
| 27 | |||
| 28 | -isocodes = dependency('iso-codes', required: false) | ||
| 29 | +isocodes = dependency('iso-codes', required: false, native: true) | ||
| 30 | if isocodes.found() | ||
| 31 | isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix') | ||
| 32 | isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes' | ||
| 33 | -- | ||
| 34 | 2.49.0 | ||
| 35 | |||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch b/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch new file mode 100644 index 0000000000..826d3394ad --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | From 8ccd12d6ec3330e9646ae9db6fd491226d516dc3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Fri, 28 Mar 2025 01:33:00 +0100 | ||
| 4 | Subject: [PATCH] meson.build: use relative path for ISO_CODES_LOCATION | ||
| 5 | |||
| 6 | If the host system does not provide iso-codes, the build fails with the following message: | ||
| 7 | FAILED: app/widgets/gimplanguagestore-data.h | ||
| 8 | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/gimp/3.0.2/build/tools/gen-languages | ||
| 9 | gimp_language_store_parser_init: 0.006277 seconds | ||
| 10 | ERROR: parse_iso_codes: Error parsing ‘/usr/share/xml/iso-codes/iso_639_3.xml’: No such file or directory | ||
| 11 | |||
| 12 | So far, we have worked around the problem by using the “iso-codes-native” dependency, but the path | ||
| 13 | for 'isocodes_prefix' is then generated from the native pkgconfig entry, resulting in a hard-coded path to | ||
| 14 | ${STAGING_DATADIR_NATIVE}, which then leaks into the binaries of gimp and gimp-console. | ||
| 15 | |||
| 16 | Instead, use iso-codes for the target and adjust the path stored in ISO_CODES_LOCATION | ||
| 17 | (which is used in tools/gen-languages.c) to a relative path so that the build system can find it. | ||
| 18 | |||
| 19 | This allows us to depend on iso-codes for the target system, while still working on host systems that | ||
| 20 | do not provide iso-codes. | ||
| 21 | |||
| 22 | It also fixes a reproducibility issue: | ||
| 23 | ERROR: gimp-3.2.0-r0 do_package_qa: QA Issue: File /usr/bin/gimp-console-3.2 in package gimp contains reference to TMPDIR [buildpaths] | ||
| 24 | ERROR: gimp-3.2.0-r0 do_package_qa: QA Issue: File /usr/bin/gimp-3.2 in package gimp contains reference to TMPDIR [buildpaths] | ||
| 25 | ERROR: gimp-3.2.0-r0 do_package_qa: Fatal QA errors were found, failing task. | ||
| 26 | ERROR: Logfile of failure stored in: /home/flk/bitbake-builds/poky/build/tmp/work/corei7-64-oe-linux/gimp/3.2.0/temp/log.do_package_qa.597065 | ||
| 27 | ERROR: Task (/home/flk/bitbake-builds/poky/layers/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb:do_package_qa) failed with exit code '1' | ||
| 28 | |||
| 29 | Upstream-Status: Inappropriate [oe-specific] | ||
| 30 | |||
| 31 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 32 | --- | ||
| 33 | meson.build | 2 +- | ||
| 34 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 35 | |||
| 36 | diff --git a/meson.build b/meson.build | ||
| 37 | index efbc2d8175..fd050f4d3c 100644 | ||
| 38 | --- a/meson.build | ||
| 39 | +++ b/meson.build | ||
| 40 | @@ -1184,7 +1184,7 @@ | ||
| 41 | isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix') | ||
| 42 | isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes' | ||
| 43 | isocodes_localedir= isocodes_prefix / 'share' / 'locale' | ||
| 44 | - conf.set_quoted('ISO_CODES_LOCATION', isocodes_location) | ||
| 45 | + conf.set_quoted('ISO_CODES_LOCATION', '..' / 'recipe-sysroot' / 'usr' / 'share' / 'xml' / 'iso-codes') | ||
| 46 | conf.set_quoted('ISO_CODES_LOCALEDIR', isocodes_localedir) | ||
| 47 | endif | ||
| 48 | conf.set('HAVE_ISO_CODES', isocodes.found()) | ||
| 49 | -- | ||
| 50 | 2.49.0 | ||
| 51 | |||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch b/meta-gnome/recipes-gimp/gimp/gimp/0003-meson.build-reproducibility-fix.patch index 532715d588..532715d588 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch +++ b/meta-gnome/recipes-gimp/gimp/gimp/0003-meson.build-reproducibility-fix.patch | |||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14422.patch b/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14422.patch deleted file mode 100644 index 420e013916..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14422.patch +++ /dev/null | |||
| @@ -1,66 +0,0 @@ | |||
| 1 | From 0a941cab81396d65a8ab547847f8c542039e214f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sun, 23 Nov 2025 16:43:51 +0000 | ||
| 4 | Subject: [PATCH] plug-ins: Fix ZDI-CAN-28273 | ||
| 5 | |||
| 6 | From: Alx Sa <cmyk.student@gmail.com> | ||
| 7 | |||
| 8 | Resolves #15286 | ||
| 9 | Adds a check to the memory allocation | ||
| 10 | in pnm_load_raw () with g_size_checked_mul () | ||
| 11 | to see if the size would go out of bounds. | ||
| 12 | If so, we don't try to allocate and load the | ||
| 13 | image. | ||
| 14 | |||
| 15 | CVE: CVE-2025-14422 | ||
| 16 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/4ff2d773d58064e6130495de498e440f4a6d5edb] | ||
| 17 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 18 | --- | ||
| 19 | plug-ins/common/file-pnm.c | 13 +++++++++++-- | ||
| 20 | 1 file changed, 11 insertions(+), 2 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c | ||
| 23 | index 32a33a4..9d349e9 100644 | ||
| 24 | --- a/plug-ins/common/file-pnm.c | ||
| 25 | +++ b/plug-ins/common/file-pnm.c | ||
| 26 | @@ -674,7 +674,7 @@ load_image (GFile *file, | ||
| 27 | GError **error) | ||
| 28 | { | ||
| 29 | GInputStream *input; | ||
| 30 | - GeglBuffer *buffer; | ||
| 31 | + GeglBuffer *buffer = NULL; | ||
| 32 | GimpImage * volatile image = NULL; | ||
| 33 | GimpLayer *layer; | ||
| 34 | char buf[BUFLEN + 4]; /* buffer for random things like scanning */ | ||
| 35 | @@ -708,6 +708,9 @@ load_image (GFile *file, | ||
| 36 | g_object_unref (input); | ||
| 37 | g_free (pnminfo); | ||
| 38 | |||
| 39 | + if (buffer) | ||
| 40 | + g_object_unref (buffer); | ||
| 41 | + | ||
| 42 | if (image) | ||
| 43 | gimp_image_delete (image); | ||
| 44 | |||
| 45 | @@ -1060,6 +1063,7 @@ pnm_load_raw (PNMScanner *scan, | ||
| 46 | const Babl *format = NULL; | ||
| 47 | gint bpc; | ||
| 48 | guchar *data, *d; | ||
| 49 | + gsize data_size; | ||
| 50 | gushort *s; | ||
| 51 | gint x, y, i; | ||
| 52 | gint start, end, scanlines; | ||
| 53 | @@ -1070,7 +1074,12 @@ pnm_load_raw (PNMScanner *scan, | ||
| 54 | bpc = 1; | ||
| 55 | |||
| 56 | /* No overflow as long as gimp_tile_height() < 1365 = 2^(31 - 18) / 6 */ | ||
| 57 | - data = g_new (guchar, gimp_tile_height () * info->xres * info->np * bpc); | ||
| 58 | + if (! g_size_checked_mul (&data_size, gimp_tile_height (), info->xres) || | ||
| 59 | + ! g_size_checked_mul (&data_size, data_size, info->np) || | ||
| 60 | + ! g_size_checked_mul (&data_size, data_size, bpc)) | ||
| 61 | + CHECK_FOR_ERROR (FALSE, info->jmpbuf, _("Unsupported maximum value.")); | ||
| 62 | + | ||
| 63 | + data = g_new (guchar, data_size); | ||
| 64 | |||
| 65 | input = pnmscanner_input (scan); | ||
| 66 | |||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14423.patch b/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14423.patch deleted file mode 100644 index 50a0adfe89..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14423.patch +++ /dev/null | |||
| @@ -1,106 +0,0 @@ | |||
| 1 | From a83e8c4ad8ffbce40aa9f9a0f49880e802ef7da1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sun, 23 Nov 2025 04:22:49 +0000 | ||
| 4 | Subject: [PATCH] plug-ins: Fix ZDI-CAN-28311 | ||
| 5 | |||
| 6 | From: Alx Sa <cmyk.student@gmail.com> | ||
| 7 | |||
| 8 | Resolves #15292 | ||
| 9 | The IFF specification states that EHB format images | ||
| 10 | have exactly 32 colors in their palette. However, it | ||
| 11 | is possible for images in the wild to place an incorrect | ||
| 12 | palette size. This patch checks for this, and either limits | ||
| 13 | the palette size or breaks accordingly. | ||
| 14 | |||
| 15 | CVE: CVE-2025-14423 | ||
| 16 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/481cdbbb97746be1145ec3a633c567a68633c521] | ||
| 17 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 18 | --- | ||
| 19 | plug-ins/common/file-iff.c | 32 ++++++++++++++++++++++---------- | ||
| 20 | 1 file changed, 22 insertions(+), 10 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/plug-ins/common/file-iff.c b/plug-ins/common/file-iff.c | ||
| 23 | index d144a96..f087947 100644 | ||
| 24 | --- a/plug-ins/common/file-iff.c | ||
| 25 | +++ b/plug-ins/common/file-iff.c | ||
| 26 | @@ -337,7 +337,7 @@ load_image (GFile *file, | ||
| 27 | width = bitMapHeader->w; | ||
| 28 | height = bitMapHeader->h; | ||
| 29 | nPlanes = bitMapHeader->nPlanes; | ||
| 30 | - row_length = (width + 15) / 16; | ||
| 31 | + row_length = ((width + 15) / 16) * 2; | ||
| 32 | pixel_size = nPlanes / 8; | ||
| 33 | aspect_x = bitMapHeader->xAspect; | ||
| 34 | aspect_y = bitMapHeader->yAspect; | ||
| 35 | @@ -375,6 +375,18 @@ load_image (GFile *file, | ||
| 36 | { | ||
| 37 | /* EHB mode adds 32 more colors. Each are half the RGB values | ||
| 38 | * of the first 32 colors */ | ||
| 39 | + if (palette_size < 32) | ||
| 40 | + { | ||
| 41 | + g_set_error (error, G_FILE_ERROR, | ||
| 42 | + g_file_error_from_errno (errno), | ||
| 43 | + _("Invalid ILBM colormap size")); | ||
| 44 | + return NULL; | ||
| 45 | + } | ||
| 46 | + else if (palette_size > 32) | ||
| 47 | + { | ||
| 48 | + palette_size = 32; | ||
| 49 | + } | ||
| 50 | + | ||
| 51 | for (gint j = 0; j < palette_size * 2; j++) | ||
| 52 | { | ||
| 53 | gint offset_index = j + 32; | ||
| 54 | @@ -386,7 +398,7 @@ load_image (GFile *file, | ||
| 55 | gimp_cmap[offset_index * 3 + 2] = | ||
| 56 | colorMap->colorRegister[j].blue / 2; | ||
| 57 | } | ||
| 58 | - /* EHB mode always has 64 colors */ | ||
| 59 | + /* EHB mode always has 64 colors in total */ | ||
| 60 | palette_size = 64; | ||
| 61 | } | ||
| 62 | } | ||
| 63 | @@ -447,7 +459,7 @@ load_image (GFile *file, | ||
| 64 | { | ||
| 65 | guchar *pixel_row; | ||
| 66 | |||
| 67 | - pixel_row = g_malloc (width * pixel_size * sizeof (guchar)); | ||
| 68 | + pixel_row = g_malloc0 (width * pixel_size); | ||
| 69 | |||
| 70 | /* PBM uses one byte per pixel index */ | ||
| 71 | if (ILBM_imageIsPBM (true_image)) | ||
| 72 | @@ -459,7 +471,7 @@ load_image (GFile *file, | ||
| 73 | else | ||
| 74 | deleave_rgb_row (bitplanes, pixel_row, width, nPlanes, pixel_size); | ||
| 75 | |||
| 76 | - bitplanes += (row_length * 2 * nPlanes); | ||
| 77 | + bitplanes += (row_length * nPlanes); | ||
| 78 | |||
| 79 | gegl_buffer_set (buffer, GEGL_RECTANGLE (0, y_height, width, 1), 0, | ||
| 80 | NULL, pixel_row, GEGL_AUTO_ROWSTRIDE); | ||
| 81 | @@ -528,7 +540,7 @@ deleave_ham_row (const guchar *gimp_cmap, | ||
| 82 | /* Deleave rows */ | ||
| 83 | for (gint i = 0; i < row_length; i++) | ||
| 84 | { | ||
| 85 | - for (gint j = 0; j < 8; j++) | ||
| 86 | + for (gint j = 0; j < nPlanes; j++) | ||
| 87 | { | ||
| 88 | guint8 bitmask = (1 << (8 - j)) - (1 << (7 - j)); | ||
| 89 | guint8 control = 0; | ||
| 90 | @@ -590,11 +602,11 @@ deleave_ham_row (const guchar *gimp_cmap, | ||
| 91 | } | ||
| 92 | |||
| 93 | static void | ||
| 94 | -deleave_rgb_row (IFF_UByte *bitplanes, | ||
| 95 | - guchar *pixel_row, | ||
| 96 | - gint width, | ||
| 97 | - gint nPlanes, | ||
| 98 | - gint pixel_size) | ||
| 99 | +deleave_rgb_row (IFF_UByte *bitplanes, | ||
| 100 | + guchar *pixel_row, | ||
| 101 | + gint width, | ||
| 102 | + gint nPlanes, | ||
| 103 | + gint pixel_size) | ||
| 104 | { | ||
| 105 | gint row_length = ((width + 15) / 16) * 2; | ||
| 106 | gint current_pixel = 0; | ||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14424.patch b/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14424.patch deleted file mode 100644 index e7821d3109..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14424.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From d30875b606085316b1cb7ac1da0d26e5bac0cf2c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Thu, 13 Nov 2025 18:26:51 -0500 | ||
| 4 | Subject: [PATCH] app: fix #15288 crash when loading malformed xcf | ||
| 5 | |||
| 6 | From: Jacob Boerema <jgboerema@gmail.com> | ||
| 7 | |||
| 8 | ZDI-CAN-28376 vulnerability | ||
| 9 | |||
| 10 | Add extra tests to not crash on a NULL g_class. | ||
| 11 | |||
| 12 | CVE: CVE-2025-14424 | ||
| 13 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/5cc55d078b7fba995cef77d195fac325ee288ddd] | ||
| 14 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 15 | --- | ||
| 16 | app/core/gimpitemlist.c | 5 ++++- | ||
| 17 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/app/core/gimpitemlist.c b/app/core/gimpitemlist.c | ||
| 20 | index 6473938..a431519 100644 | ||
| 21 | --- a/app/core/gimpitemlist.c | ||
| 22 | +++ b/app/core/gimpitemlist.c | ||
| 23 | @@ -345,7 +345,10 @@ gimp_item_list_named_new (GimpImage *image, | ||
| 24 | g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); | ||
| 25 | |||
| 26 | for (iter = items; iter; iter = iter->next) | ||
| 27 | - g_return_val_if_fail (g_type_is_a (G_OBJECT_TYPE (iter->data), item_type), NULL); | ||
| 28 | + { | ||
| 29 | + g_return_val_if_fail (iter->data && ((GTypeInstance*) (iter->data))->g_class, NULL); | ||
| 30 | + g_return_val_if_fail (g_type_is_a (G_OBJECT_TYPE (iter->data), item_type), NULL); | ||
| 31 | + } | ||
| 32 | |||
| 33 | if (! items) | ||
| 34 | { | ||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14425.patch b/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14425.patch deleted file mode 100644 index 44e9587570..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/CVE-2025-14425.patch +++ /dev/null | |||
| @@ -1,79 +0,0 @@ | |||
| 1 | From 042e27792026460badbe49664c02fe181e95cb2b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Wed, 12 Nov 2025 13:25:44 +0000 | ||
| 4 | Subject: [PATCH] plug-ins: Mitigate ZDI-CAN-28248 for JP2 images | ||
| 5 | |||
| 6 | From: Alx Sa <cmyk.student@gmail.com> | ||
| 7 | |||
| 8 | Resolves #15285 | ||
| 9 | Per the report, it's possible to exceed the size of the pixel buffer | ||
| 10 | with a high precision_scaled value, as we size it to the width * bpp. | ||
| 11 | This patch includes precision_scaled in the allocation calculation. | ||
| 12 | It also adds a g_size_checked_mul () check to ensure there's no | ||
| 13 | overflow, and moves the pixel and buffer memory freeing to occur | ||
| 14 | in the out section so that it always runs even on failure. | ||
| 15 | |||
| 16 | CVE: CVE-2025-14425 | ||
| 17 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/cd1c88a0364ad1444c06536731972a99bd8643fd] | ||
| 18 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 19 | --- | ||
| 20 | plug-ins/common/file-jp2-load.c | 23 ++++++++++++++++------- | ||
| 21 | 1 file changed, 16 insertions(+), 7 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/plug-ins/common/file-jp2-load.c b/plug-ins/common/file-jp2-load.c | ||
| 24 | index 064b616..604313a 100644 | ||
| 25 | --- a/plug-ins/common/file-jp2-load.c | ||
| 26 | +++ b/plug-ins/common/file-jp2-load.c | ||
| 27 | @@ -1045,14 +1045,15 @@ load_image (GimpProcedure *procedure, | ||
| 28 | GimpColorProfile *profile = NULL; | ||
| 29 | GimpImage *gimp_image = NULL; | ||
| 30 | GimpLayer *layer; | ||
| 31 | + GeglBuffer *buffer = NULL; | ||
| 32 | + guchar *pixels = NULL; | ||
| 33 | + gsize pixels_size; | ||
| 34 | GimpImageType image_type; | ||
| 35 | GimpImageBaseType base_type; | ||
| 36 | gint width; | ||
| 37 | gint height; | ||
| 38 | gint num_components; | ||
| 39 | - GeglBuffer *buffer; | ||
| 40 | gint i, j, k, it; | ||
| 41 | - guchar *pixels; | ||
| 42 | const Babl *file_format; | ||
| 43 | gint bpp; | ||
| 44 | GimpPrecision image_precision; | ||
| 45 | @@ -1318,7 +1319,15 @@ load_image (GimpProcedure *procedure, | ||
| 46 | bpp = babl_format_get_bytes_per_pixel (file_format); | ||
| 47 | |||
| 48 | buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)); | ||
| 49 | - pixels = g_new0 (guchar, width * bpp); | ||
| 50 | + | ||
| 51 | + if (! g_size_checked_mul (&pixels_size, width, (bpp * (precision_scaled / 8)))) | ||
| 52 | + { | ||
| 53 | + g_set_error (error, GIMP_PLUG_IN_ERROR, 0, | ||
| 54 | + _("Defined row size is too large in JP2 image '%s'."), | ||
| 55 | + gimp_file_get_utf8_name (file)); | ||
| 56 | + goto out; | ||
| 57 | + } | ||
| 58 | + pixels = g_new0 (guchar, pixels_size); | ||
| 59 | |||
| 60 | for (i = 0; i < height; i++) | ||
| 61 | { | ||
| 62 | @@ -1344,13 +1353,13 @@ load_image (GimpProcedure *procedure, | ||
| 63 | gegl_buffer_set (buffer, GEGL_RECTANGLE (0, i, width, 1), 0, | ||
| 64 | file_format, pixels, GEGL_AUTO_ROWSTRIDE); | ||
| 65 | } | ||
| 66 | - | ||
| 67 | - g_free (pixels); | ||
| 68 | - | ||
| 69 | - g_object_unref (buffer); | ||
| 70 | gimp_progress_update (1.0); | ||
| 71 | |||
| 72 | out: | ||
| 73 | + if (pixels) | ||
| 74 | + g_free (pixels); | ||
| 75 | + if (buffer) | ||
| 76 | + g_object_unref (buffer); | ||
| 77 | if (profile) | ||
| 78 | g_object_unref (profile); | ||
| 79 | if (image) | ||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.0.6.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb index fa192555bc..d6928498ac 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_3.0.6.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb | |||
| @@ -20,7 +20,7 @@ DEPENDS = " \ | |||
| 20 | glib-2.0-native \ | 20 | glib-2.0-native \ |
| 21 | gtk+3 \ | 21 | gtk+3 \ |
| 22 | harfbuzz \ | 22 | harfbuzz \ |
| 23 | iso-codes-native \ | 23 | iso-codes \ |
| 24 | jpeg \ | 24 | jpeg \ |
| 25 | json-glib \ | 25 | json-glib \ |
| 26 | lcms \ | 26 | lcms \ |
| @@ -32,7 +32,7 @@ DEPENDS = " \ | |||
| 32 | librsvg-native \ | 32 | librsvg-native \ |
| 33 | libxmu \ | 33 | libxmu \ |
| 34 | libxslt-native \ | 34 | libxslt-native \ |
| 35 | mypaint-brushes-1.0 \ | 35 | mypaint-brushes \ |
| 36 | pango \ | 36 | pango \ |
| 37 | poppler \ | 37 | poppler \ |
| 38 | poppler-data \ | 38 | poppler-data \ |
| @@ -46,7 +46,9 @@ DEPENDS:append:libc-musl = " libexecinfo" | |||
| 46 | 46 | ||
| 47 | LDFLAGS:append:libc-musl = " -lexecinfo" | 47 | LDFLAGS:append:libc-musl = " -lexecinfo" |
| 48 | 48 | ||
| 49 | inherit meson gtk-icon-cache mime-xdg pkgconfig gettext gobject-introspection vala | 49 | inherit meson gtk-icon-cache mime-xdg pkgconfig gettext gobject-introspection vala bash-completion |
| 50 | |||
| 51 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 50 | 52 | ||
| 51 | GIR_MESON_OPTION = 'can-crosscompile-gir' | 53 | GIR_MESON_OPTION = 'can-crosscompile-gir' |
| 52 | VALA_MESON_OPTION = "vala" | 54 | VALA_MESON_OPTION = "vala" |
| @@ -56,17 +58,12 @@ GIDOCGEN_MESON_OPTION = "gi-docgen" | |||
| 56 | GIDOCGEN_MESON_ENABLE_FLAG = "enabled" | 58 | GIDOCGEN_MESON_ENABLE_FLAG = "enabled" |
| 57 | GIDOCGEN_MESON_DISABLE_FLAG = "disabled" | 59 | GIDOCGEN_MESON_DISABLE_FLAG = "disabled" |
| 58 | 60 | ||
| 59 | SRC_URI = "https://download.gimp.org/gimp/v3.0/${BP}.tar.xz \ | 61 | SRC_URI = "https://download.gimp.org/gimp/v3.2/${BP}.tar.xz \ |
| 60 | file://0001-gimp-cross-compile-fix-for-bz2.patch \ | ||
| 61 | file://0002-meson.build-reproducibility-fix.patch \ | ||
| 62 | file://0001-meson.build-dont-check-for-lgi.patch \ | 62 | file://0001-meson.build-dont-check-for-lgi.patch \ |
| 63 | file://0001-meson.build-require-iso-codes-native.patch \ | 63 | file://0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch \ |
| 64 | file://CVE-2025-14422.patch \ | 64 | file://0003-meson.build-reproducibility-fix.patch \ |
| 65 | file://CVE-2025-14423.patch \ | 65 | " |
| 66 | file://CVE-2025-14424.patch \ | 66 | SRC_URI[sha256sum] = "2618391416e51be3c693df9ef90e3860ed72ab3d36363ea1f196e30b75b2e083" |
| 67 | file://CVE-2025-14425.patch \ | ||
| 68 | " | ||
| 69 | SRC_URI[sha256sum] = "246c225383c72ef9f0dc7703b7d707084bbf177bd2900e94ce466a62862e296b" | ||
| 70 | 67 | ||
| 71 | PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" | 68 | PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" |
| 72 | PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" | 69 | PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" |
| @@ -139,3 +136,7 @@ RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking python3-pygobject" | |||
| 139 | 136 | ||
| 140 | CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux" | 137 | CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux" |
| 141 | CVE_STATUS[CVE-2025-8672] = "not-applicable-config: the vulnerability only affects MacOS" | 138 | CVE_STATUS[CVE-2025-8672] = "not-applicable-config: the vulnerability only affects MacOS" |
| 139 | |||
| 140 | CVE_STATUS_GROUPS += "CVE_STATUS_FIXED_ALREADY" | ||
| 141 | CVE_STATUS_FIXED_ALREADY[status] = "fixed-version: The issue is fixed since v3.0.8" | ||
| 142 | CVE_STATUS_FIXED_ALREADY = "CVE-2025-15059 CVE-2026-0797 CVE-2026-2044 CVE-2026-2045 CVE-2026-2047 CVE-2026-2048" | ||
diff --git a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb new file mode 100644 index 0000000000..4e444938b1 --- /dev/null +++ b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | SUMMARY = "MyPaint brushes" | ||
| 2 | LICENSE = "CC0-1.0" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=65d3616852dbf7b1a6d4b53b00626032" | ||
| 4 | |||
| 5 | inherit autotools allarch | ||
| 6 | |||
| 7 | SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=master;tag=v${PV}" | ||
| 8 | SRCREV = "0df6d130152a94c3bd67709941978074a1303cc5" | ||
| 9 | |||
| 10 | FILES:${PN} += "${datadir}/mypaint-data" | ||
diff --git a/meta-gnome/recipes-gnome/blueprint-compiler/blueprint-compiler_0.19.0.bb b/meta-gnome/recipes-gnome/blueprint-compiler/blueprint-compiler_0.19.0.bb deleted file mode 100644 index 71f9c2b52d..0000000000 --- a/meta-gnome/recipes-gnome/blueprint-compiler/blueprint-compiler_0.19.0.bb +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | SUMMARY = "A markup language for GTK user interface files." | ||
| 2 | HOMEPAGE = "https://gitlab.gnome.org/GNOME/blueprint-compiler" | ||
| 3 | LICENSE = "LGPL-3.0-only" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" | ||
| 5 | |||
| 6 | SRC_URI = "git://gitlab.gnome.org/GNOME/blueprint-compiler;protocol=https;branch=main" | ||
| 7 | SRCREV = "de8e15f7791bd6243279cef1efc27edf4cb93674" | ||
| 8 | |||
| 9 | inherit meson pkgconfig | ||
| 10 | |||
| 11 | PACKAGES += "${PN}-python" | ||
| 12 | |||
| 13 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" | ||
| 14 | RDEPENDS:${PN}-python = "python3-pygobject" | ||
| 15 | |||
| 16 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-gnome/recipes-gnome/evince/evince_48.0.bb b/meta-gnome/recipes-gnome/evince/evince_48.1.bb index 31345542f2..9cf048f14b 100644 --- a/meta-gnome/recipes-gnome/evince/evince_48.0.bb +++ b/meta-gnome/recipes-gnome/evince/evince_48.1.bb | |||
| @@ -33,7 +33,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'open | |||
| 33 | def gnome_verdir(v): | 33 | def gnome_verdir(v): |
| 34 | return oe.utils.trim_version(v, 1) | 34 | return oe.utils.trim_version(v, 1) |
| 35 | 35 | ||
| 36 | SRC_URI[archive.sha256sum] = "cd2f658355fa9075fdf9e5b44aa0af3a7e0928c55614eb1042b36176cf451126" | 36 | SRC_URI[archive.sha256sum] = "7d8b9a6fa3a05d3f5b9048859027688c73a788ff6e923bc3945126884943fa10" |
| 37 | 37 | ||
| 38 | GTKDOC_MESON_OPTION = "gtk_doc" | 38 | GTKDOC_MESON_OPTION = "gtk_doc" |
| 39 | 39 | ||
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb index e1f3c488a8..94e256e4f2 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb | |||
| @@ -79,3 +79,6 @@ FILES:${PN} += " \ | |||
| 79 | " | 79 | " |
| 80 | 80 | ||
| 81 | RDEPENDS:${PN} += "${PN}-base" | 81 | RDEPENDS:${PN} += "${PN}-base" |
| 82 | # gdm relies on dbus-run-session provided by dbus | ||
| 83 | RCONFLICTS:${PN} += "dbus-broker" | ||
| 84 | RDEPENDS:${PN} += "dbus" | ||
diff --git a/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch b/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch deleted file mode 100644 index 40fd93b984..0000000000 --- a/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 2 | Upstream-Status: Inappropriate [https://gitlab.gnome.org/GNOME/gedit/-/issues/588] | ||
| 3 | |||
| 4 | Temporary workaround to fix build: | ||
| 5 | ../plugins/quickhighlight/gedit-quick-highlight-plugin.c: In function ‘gedit_quick_highlight_plugin_load_style’: | ||
| 6 | ../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:47: error: implicit declaration of function ‘gtk_source_style_copy’; did you mean ‘gtk_source_style_apply’? [-Wimplicit-function-declaration] | ||
| 7 | |||
| 8 | 96 | plugin->priv->style = gtk_source_style_copy (style); | ||
| 9 | | ^~~~~~~~~~~~~~~~~~~~~ | ||
| 10 | | gtk_source_style_apply | ||
| 11 | ../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:47: warning: nested extern declaration of ‘gtk_source_style_copy’ [-Wnested-externs] | ||
| 12 | ../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:45: error: assignment to ‘GtkSourceStyle *’ {aka ‘struct _GtkSourceStyle *’} from ‘int’ makes pointer from integer without a cast [-Wint-conversion] | ||
| 13 | 96 | plugin->priv->style = gtk_source_style_copy (style); | ||
| 14 | | ^ | ||
| 15 | |||
| 16 | --- a/plugins/quickhighlight/gedit-quick-highlight-plugin.c 2024-02-20 08:11:47.925749255 +0100 | ||
| 17 | +++ b/plugins/quickhighlight/gedit-quick-highlight-plugin.c 2024-02-20 08:12:16.218594067 +0100 | ||
| 18 | @@ -90,11 +90,12 @@ | ||
| 19 | if (style_scheme != NULL) | ||
| 20 | { | ||
| 21 | style = gtk_source_style_scheme_get_style (style_scheme, "quick-highlight-match"); | ||
| 22 | - | ||
| 23 | +#if 0 | ||
| 24 | if (style != NULL) | ||
| 25 | { | ||
| 26 | plugin->priv->style = gtk_source_style_copy (style); | ||
| 27 | } | ||
| 28 | +#endif | ||
| 29 | } | ||
| 30 | } | ||
| 31 | |||
| 32 | |||
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_49.0.bb index 91b2221d7a..15b14b2c90 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_49.0.bb | |||
| @@ -23,8 +23,8 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc get | |||
| 23 | def gnome_verdir(v): | 23 | def gnome_verdir(v): |
| 24 | return oe.utils.trim_version(v, 1) | 24 | return oe.utils.trim_version(v, 1) |
| 25 | 25 | ||
| 26 | SRC_URI += "file://0001-fix-for-clang-18.patch" | 26 | SRC_URI = "git://gitlab.gnome.org/World/gedit/gedit.git;protocol=https;branch=master;tag=${PV}" |
| 27 | SRC_URI[archive.sha256sum] = "c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef" | 27 | SRCREV = "684abd8299139e1a3b87446da501ad034e78c840" |
| 28 | 28 | ||
| 29 | # gobject-introspection is mandatory and cannot be configured | 29 | # gobject-introspection is mandatory and cannot be configured |
| 30 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" | 30 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" |
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.9.0.bb index c2e7dd67e9..fc0356c14d 100644 --- a/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb +++ b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.9.0.bb | |||
| @@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d | |||
| 5 | 5 | ||
| 6 | DEPENDS = "glib-2.0 gtk+3" | 6 | DEPENDS = "glib-2.0 gtk+3" |
| 7 | 7 | ||
| 8 | inherit meson pkgconfig gobject-introspection features_check gtk-doc | 8 | inherit gobject-introspection features_check gtk-doc gnomebase |
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/gedit-technology/libgedit-amtk.git;protocol=https;branch=main" | 10 | SRC_URI[archive.sha256sum] = "7fc3348bef242e08967bdbb9a6698cf39f7810f95051fd8132910f36ed2d6d15" |
| 11 | SRCREV = "f6fbfd1c57de3d97cab2056a5c3088b0da49e8a4" | ||
| 12 | 11 | ||
| 13 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 12 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 14 | 13 | ||
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.3.1.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.3.1.bb new file mode 100644 index 0000000000..8b64661733 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.3.1.bb | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | SUMMARY = "Gedit Technology - File loading and saving" | ||
| 2 | SECTION = "gnome" | ||
| 3 | LICENSE = "LGPL-3.0-or-later" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" | ||
| 5 | |||
| 6 | DEPENDS = "glib-2.0 gtk+3" | ||
| 7 | |||
| 8 | inherit gobject-introspection features_check gtk-doc gnomebase | ||
| 9 | |||
| 10 | SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-gfls.git;branch=main;protocol=https" | ||
| 11 | SRCREV = "0a0c8dd29ae2f9f4a99cbaaf1628d2352953e0bc" | ||
| 12 | |||
| 13 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
| 14 | |||
| 15 | GIR_MESON_OPTION = "gobject_introspection" | ||
| 16 | GTKDOC_MESON_OPTION = "gtk_doc" | ||
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb deleted file mode 100644 index 4f21c3e569..0000000000 --- a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | SUMMARY = "Gedit Technology - Source code editing widget" | ||
| 2 | SECTION = "gnome" | ||
| 3 | LICENSE = "LGPL-2.1-only" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | ||
| 5 | |||
| 6 | DEPENDS = "glib-2.0 gtk+3 libxml2" | ||
| 7 | |||
| 8 | inherit meson pkgconfig gobject-introspection features_check gtk-doc | ||
| 9 | |||
| 10 | SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main" | ||
| 11 | SRCREV = "eaafc892d033713c7c823d8ad602061e456b3c88" | ||
| 12 | |||
| 13 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
| 14 | |||
| 15 | GIR_MESON_OPTION = "gobject_introspection" | ||
| 16 | GTKDOC_MESON_OPTION = "gtk_doc" | ||
| 17 | |||
| 18 | do_install:prepend() { | ||
| 19 | sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.c | ||
| 20 | sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.h | ||
| 21 | } | ||
| 22 | |||
| 23 | FILES:${PN} += "${datadir}" | ||
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb new file mode 100644 index 0000000000..119a75b2bb --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | SUMMARY = "Gedit Technology - Source code editing widget" | ||
| 2 | SECTION = "gnome" | ||
| 3 | LICENSE = "LGPL-2.1-only" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1-or-later.txt;md5=310c7c93cf5181c6b0cc8229a1f3c6f6" | ||
| 5 | |||
| 6 | DEPENDS = "glib-2.0 gtk+3 libxml2" | ||
| 7 | |||
| 8 | inherit gobject-introspection features_check gtk-doc gnomebase | ||
| 9 | |||
| 10 | SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-gtksourceview.git;protocol=https;branch=main" | ||
| 11 | SRCREV = "a7bdc39f9fbc10c49ea7468ac1e5bf77385da0c0" | ||
| 12 | |||
| 13 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
| 14 | |||
| 15 | GIR_MESON_OPTION = "gobject_introspection" | ||
| 16 | GTKDOC_MESON_OPTION = "gtk_doc" | ||
| 17 | |||
| 18 | do_install:prepend() { | ||
| 19 | sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.c | ||
| 20 | sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.h | ||
| 21 | } | ||
| 22 | |||
| 23 | FILES:${PN} += "${datadir}" | ||
| 24 | |||
| 25 | # Most gnome projects have a verison like x.y.z, and they are stored in a folder called x.y | ||
| 26 | # Not this one. This has x.y.z version, but stored in folder called x. | ||
| 27 | # The original of this function is in gnomebase.bbclass. | ||
| 28 | def gnome_verdir(v): | ||
| 29 | return v.split(".")[0] | ||
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_47.1.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_47.1.bb index e363db309d..791e5752e8 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_47.1.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_47.1.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 5 | file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | 5 | file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ |
| 6 | " | 6 | " |
| 7 | 7 | ||
| 8 | SECTION = "x11/gnome" | 8 | SECTION = "gnome" |
| 9 | 9 | ||
| 10 | DEPENDS = " \ | 10 | DEPENDS = " \ |
| 11 | udev \ | 11 | udev \ |
| @@ -23,7 +23,7 @@ GTKIC_VERSION = "4" | |||
| 23 | 23 | ||
| 24 | inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection | 24 | inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection |
| 25 | 25 | ||
| 26 | REQUIRED_DISTRO_FEATURES = "x11 opengl" | 26 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 27 | 27 | ||
| 28 | SRC_URI[archive.sha256sum] = "03e3e7403a15108ffc1496210a1da5c2961b2834a5c07eccc7a3f493195daba3" | 28 | SRC_URI[archive.sha256sum] = "03e3e7403a15108ffc1496210a1da5c2961b2834a5c07eccc7a3f493195daba3" |
| 29 | 29 | ||
diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch deleted file mode 100644 index 8f6920c2cc..0000000000 --- a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From dc3aa0ff5a41114b17816f1f36f6bb5631c6ab5c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 7 Mar 2024 17:17:29 -0800 | ||
| 4 | Subject: [PATCH] Build fix needed with taglib 2.0 | ||
| 5 | |||
| 6 | Fixes | ||
| 7 | | ../gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc:153:29: error: no member named 'sampleWidth' in 'TagLib::FLAC::Properties' | ||
| 8 | | 153 | if (flacProperties->sampleWidth()) | ||
| 9 | | | ~~~~~~~~~~~~~~ ^ | ||
| 10 | | ../gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc:154:67: error: no member named 'sampleWidth' in 'TagLib::FLAC::Properties' | ||
| 11 | | 154 | cout << "Audio.FLAC.SampleWidth " << flacProperties->sampleWidth()<< endl; | ||
| 12 | | | ~~~~~~~~~~~~~~ ^ | ||
| 13 | |||
| 14 | Upstream-Status: Pending | ||
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 16 | --- | ||
| 17 | src/tags/gnome-cmd-tags-taglib.cc | 4 ++-- | ||
| 18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/src/tags/gnome-cmd-tags-taglib.cc b/src/tags/gnome-cmd-tags-taglib.cc | ||
| 21 | index 9e65836..573f5eb 100644 | ||
| 22 | --- a/src/tags/gnome-cmd-tags-taglib.cc | ||
| 23 | +++ b/src/tags/gnome-cmd-tags-taglib.cc | ||
| 24 | @@ -150,8 +150,8 @@ bool getAudioProperties(GnomeCmdFileMetadata &metadata, const TagLib::AudioPrope | ||
| 25 | if (flacProperties) | ||
| 26 | { | ||
| 27 | metadata.add(TAG_AUDIO_CODEC,"FLAC"); | ||
| 28 | - if (flacProperties->sampleWidth()) | ||
| 29 | - cout << "Audio.FLAC.SampleWidth " << flacProperties->sampleWidth()<< endl; | ||
| 30 | + if (flacProperties->bitsPerSample()) | ||
| 31 | + cout << "Audio.FLAC.BitsPerSample " << flacProperties->bitsPerSample()<< endl; | ||
| 32 | |||
| 33 | return true; | ||
| 34 | } | ||
| 35 | -- | ||
| 36 | 2.44.0 | ||
| 37 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.2.bb index d96371de3c..012f50d85e 100644 --- a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb +++ b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.2.bb | |||
| @@ -16,8 +16,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | |||
| 16 | GIR_MESON_ENABLE_FLAG = 'enabled' | 16 | GIR_MESON_ENABLE_FLAG = 'enabled' |
| 17 | GIR_MESON_DISABLE_FLAG = 'disabled' | 17 | GIR_MESON_DISABLE_FLAG = 'disabled' |
| 18 | 18 | ||
| 19 | SRC_URI += "file://0001-Build-fix-needed-with-taglib-2.0.patch" | 19 | SRC_URI[archive.sha256sum] = "7cf5d56c77a95d828f25407294312abaae20dc6b556ceafd9424dbfe209e5ed3" |
| 20 | SRC_URI[archive.sha256sum] = "3f1d00c4a650fe7902167648286b32c9ca4ef86e31a5d8ccca0139f12d10d0b3" | ||
| 21 | 20 | ||
| 22 | PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" | 21 | PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" |
| 23 | PACKAGECONFIG[exiv2] = "-Dexiv2=enabled,-Dexiv2=disabled,exiv2" | 22 | PACKAGECONFIG[exiv2] = "-Dexiv2=enabled,-Dexiv2=disabled,exiv2" |
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_49.2.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_49.2.2.bb index 9bb0228d50..38b2c53c82 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_49.2.2.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_49.2.2.bb | |||
| @@ -37,7 +37,7 @@ DEPENDS = " \ | |||
| 37 | 37 | ||
| 38 | inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext gi-docgen upstream-version-is-even bash-completion features_check | 38 | inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext gi-docgen upstream-version-is-even bash-completion features_check |
| 39 | 39 | ||
| 40 | REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" | 40 | REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd" |
| 41 | 41 | ||
| 42 | SRC_URI = "https://download.gnome.org/sources/gnome-control-center/${@oe.utils.trim_version('${PV}', 1)}/gnome-control-center-${PV}.tar.xz" | 42 | SRC_URI = "https://download.gnome.org/sources/gnome-control-center/${@oe.utils.trim_version('${PV}', 1)}/gnome-control-center-${PV}.tar.xz" |
| 43 | SRC_URI[sha256sum] = "c23ae220d6c1237d285925de7801e0e36338b9cc1a8bb51c2e37e715e6b503ad" | 43 | SRC_URI[sha256sum] = "c23ae220d6c1237d285925de7801e0e36338b9cc1a8bb51c2e37e715e6b503ad" |
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.4.bb index 629fe929a1..2fe66b9e52 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.4.bb | |||
| @@ -14,7 +14,7 @@ GIR_MESON_OPTION = "" | |||
| 14 | 14 | ||
| 15 | SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ | 15 | SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ |
| 16 | file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch" | 16 | file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch" |
| 17 | SRC_URI[archive.sha256sum] = "ae7ca55dc9e08914999741523a17d29ce223915626bd2462a120bf96f47a79ab" | 17 | SRC_URI[archive.sha256sum] = "1d8cb9c6a328eb689b0c1269cf53834cc84d851d7e71970cdabba82706b44984" |
| 18 | 18 | ||
| 19 | DEPENDS += " \ | 19 | DEPENDS += " \ |
| 20 | fontconfig \ | 20 | fontconfig \ |
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb index 2125bd91fe..a9b5aceb1d 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb | |||
| @@ -18,28 +18,28 @@ DEPENDS = " \ | |||
| 18 | upower \ | 18 | upower \ |
| 19 | libwacom \ | 19 | libwacom \ |
| 20 | networkmanager \ | 20 | networkmanager \ |
| 21 | alsa-lib \ | ||
| 21 | " | 22 | " |
| 22 | 23 | ||
| 23 | # all these are mandatory | 24 | # all these are mandatory |
| 24 | REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" | 25 | REQUIRED_DISTRO_FEATURES = "alsa polkit pulseaudio systemd gobject-introspection-data" |
| 25 | GIR_MESON_OPTION = "" | 26 | GIR_MESON_OPTION = "" |
| 26 | 27 | ||
| 27 | SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch" | 28 | SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch" |
| 28 | SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1" | 29 | SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1" |
| 29 | 30 | ||
| 30 | PACKAGECONFIG ??= " \ | 31 | PACKAGECONFIG ??= " \ |
| 31 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11 alsa', d)} \ | 32 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ |
| 33 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \ | ||
| 32 | gudev \ | 34 | gudev \ |
| 33 | smartcard \ | 35 | smartcard \ |
| 34 | xwayland \ | ||
| 35 | cups \ | 36 | cups \ |
| 36 | " | 37 | " |
| 37 | PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib" | ||
| 38 | PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" | 38 | PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" |
| 39 | PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" | 39 | PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" |
| 40 | PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" | 40 | PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" |
| 41 | PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" | 41 | PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" |
| 42 | PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=true" | 42 | PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" |
| 43 | PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,libx11 libxfixes" | 43 | PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,libx11 libxfixes" |
| 44 | 44 | ||
| 45 | def gnome_verdir(v): | 45 | def gnome_verdir(v): |
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch new file mode 100644 index 0000000000..e9cee8e91a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From 2ae299419ec7b15a59e2b2b8a5b266b9f29df5a4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Thu, 22 Jan 2026 12:52:34 +0100 | ||
| 4 | Subject: [PATCH] shell-app-usage.c: only include x11 headers if HAVE_X11 | ||
| 5 | |||
| 6 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | --- | ||
| 10 | src/shell-app-usage.c | 2 ++ | ||
| 11 | 1 file changed, 2 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/src/shell-app-usage.c b/src/shell-app-usage.c | ||
| 14 | index 9e57a91b2..77adcf6a2 100644 | ||
| 15 | --- a/src/shell-app-usage.c | ||
| 16 | +++ b/src/shell-app-usage.c | ||
| 17 | @@ -5,8 +5,10 @@ | ||
| 18 | #include <string.h> | ||
| 19 | #include <stdlib.h> | ||
| 20 | |||
| 21 | +#ifdef HAVE_X11 | ||
| 22 | #include <X11/Xlib.h> | ||
| 23 | #include <X11/Xatom.h> | ||
| 24 | +#endif | ||
| 25 | #include <glib.h> | ||
| 26 | #include <gio/gio.h> | ||
| 27 | #include <meta/display.h> | ||
| 28 | -- | ||
| 29 | 2.52.0 | ||
| 30 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.3.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.7.bb index 33ba5eaa39..3f668fe410 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.3.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.7.bb | |||
| @@ -24,7 +24,7 @@ DEPENDS = " \ | |||
| 24 | 24 | ||
| 25 | inherit gnomebase gsettings gettext gobject-introspection gtk-icon-cache features_check bash-completion | 25 | inherit gnomebase gsettings gettext gobject-introspection gtk-icon-cache features_check bash-completion |
| 26 | 26 | ||
| 27 | REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" | 27 | REQUIRED_DISTRO_FEATURES = "polkit systemd pam" |
| 28 | 28 | ||
| 29 | GTKIC_VERSION = "4" | 29 | GTKIC_VERSION = "4" |
| 30 | GTKDOC_MESON_OPTION = "gtk_doc" | 30 | GTKDOC_MESON_OPTION = "gtk_doc" |
| @@ -33,7 +33,8 @@ GIR_MESON_OPTION = "" | |||
| 33 | # gobject-introspection is mandatory and cannot be configured | 33 | # gobject-introspection is mandatory and cannot be configured |
| 34 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" | 34 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" |
| 35 | 35 | ||
| 36 | SRC_URI[archive.sha256sum] = "fb0203fc748593f14e51732618e1f042525fd719764a0fdb0ee3f6fe413a9b2b" | 36 | SRC_URI += "file://0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch" |
| 37 | SRC_URI[archive.sha256sum] = "2dff328d5f7e29f8c897bc21caac7d2d443be3c63ae84d7623dec800f23493c3" | ||
| 37 | 38 | ||
| 38 | PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 39 | PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
| 39 | PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" | 40 | PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" |
| @@ -75,7 +76,7 @@ RDEPENDS:${PN} += " \ | |||
| 75 | accountsservice \ | 76 | accountsservice \ |
| 76 | adwaita-icon-theme \ | 77 | adwaita-icon-theme \ |
| 77 | adwaita-icon-theme-cursors \ | 78 | adwaita-icon-theme-cursors \ |
| 78 | gdm-base \ | 79 | gdm \ |
| 79 | gnome-control-center \ | 80 | gnome-control-center \ |
| 80 | gnome-backgrounds \ | 81 | gnome-backgrounds \ |
| 81 | gnome-bluetooth \ | 82 | gnome-bluetooth \ |
| @@ -91,3 +92,4 @@ PACKAGES =+ "${PN}-tools ${PN}-gsettings" | |||
| 91 | FILES:${PN}-tools = "${bindir}/*-tool" | 92 | FILES:${PN}-tools = "${bindir}/*-tool" |
| 92 | RDEPENDS:${PN}-tools = "python3-core" | 93 | RDEPENDS:${PN}-tools = "python3-core" |
| 93 | 94 | ||
| 95 | CVE_STATUS[CVE-2021-3982] = "not-applicable-config: OE doesn't set CAP_SYS_NICE capability" | ||
diff --git a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_48.3.bb b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_49.1.bb index d1ad219f10..a8dd3d5cab 100644 --- a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_48.3.bb +++ b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_49.1.bb | |||
| @@ -18,7 +18,7 @@ inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check | |||
| 18 | 18 | ||
| 19 | REQUIRED_DISTRO_FEATURES = "opengl" | 19 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 20 | 20 | ||
| 21 | SRC_URI[archive.sha256sum] = "3f9e9722394edb4d2145c06d69210b3d3fca5cd2b90d632643be750843d556ba" | 21 | SRC_URI[archive.sha256sum] = "f0448f247bb5979a50c60222c44c4511880ad474e25495765e5ed2246e54dbb1" |
| 22 | 22 | ||
| 23 | FILES:${PN} += " \ | 23 | FILES:${PN} += " \ |
| 24 | ${datadir}/metainfo \ | 24 | ${datadir}/metainfo \ |
diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch deleted file mode 100644 index d921ff3308..0000000000 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mae Dartmann <hello@maedartmann.name> | ||
| 3 | Date: Wed, 16 Feb 2022 06:08:41 +0000 | ||
| 4 | Subject: [PATCH] meson: fix invalid positional argument | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] | ||
| 7 | --- | ||
| 8 | data/meson.build | 4 ++-- | ||
| 9 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/data/meson.build b/data/meson.build | ||
| 12 | index fd6d5da..74f7e82 100644 | ||
| 13 | --- a/data/meson.build | ||
| 14 | +++ b/data/meson.build | ||
| 15 | @@ -1,5 +1,5 @@ | ||
| 16 | appdata_file = 'org.gnome.tweaks.appdata.xml' | ||
| 17 | -i18n.merge_file(appdata_file, | ||
| 18 | +i18n.merge_file( | ||
| 19 | input: appdata_file + '.in', | ||
| 20 | output: appdata_file, | ||
| 21 | po_dir: '../po', | ||
| 22 | @@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, | ||
| 23 | ) | ||
| 24 | |||
| 25 | desktop_file = 'org.gnome.tweaks.desktop' | ||
| 26 | -i18n.merge_file(desktop_file, | ||
| 27 | +i18n.merge_file( | ||
| 28 | input: desktop_file + '.in', | ||
| 29 | output: desktop_file, | ||
| 30 | po_dir: '../po', | ||
| 31 | -- | ||
| 32 | GitLab | ||
| 33 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.10.bb index 498d392e89..d0f00a85e6 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.10.bb | |||
| @@ -17,10 +17,9 @@ REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" | |||
| 17 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" | 17 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" |
| 18 | GIR_MESON_OPTION = "" | 18 | GIR_MESON_OPTION = "" |
| 19 | 19 | ||
| 20 | SRC_URI[archive.sha256sum] = "f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a" | 20 | SRC_URI[archive.sha256sum] = "cffd3b33a399577fbb4491ce8fbd02f54c5924f1056f30114e8d420290ef23fc" |
| 21 | SRC_URI += " \ | 21 | SRC_URI += " \ |
| 22 | file://0001-Make-python-path-configurable.patch \ | 22 | file://0001-Make-python-path-configurable.patch \ |
| 23 | file://0002-meson-fix-invalid-positional-argument.patch \ | ||
| 24 | " | 23 | " |
| 25 | 24 | ||
| 26 | EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" | 25 | EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" |
diff --git a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo_0.3.19.bb index 7862748184..c3d6294d06 100644 --- a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb +++ b/meta-gnome/recipes-gnome/grilo/grilo_0.3.19.bb | |||
| @@ -9,7 +9,7 @@ DEPENDS = " \ | |||
| 9 | 9 | ||
| 10 | inherit gnomebase gobject-introspection gtk-doc gettext vala | 10 | inherit gnomebase gobject-introspection gtk-doc gettext vala |
| 11 | 11 | ||
| 12 | SRC_URI[archive.sha256sum] = "884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96" | 12 | SRC_URI[archive.sha256sum] = "0869c81d19ab139c667d79567c14ddcb6cb5cbfc0108d04cade287eb29536706" |
| 13 | 13 | ||
| 14 | GIR_MESON_OPTION = "enable-introspection" | 14 | GIR_MESON_OPTION = "enable-introspection" |
| 15 | GTKDOC_MESON_OPTION = "enable-gtk-doc" | 15 | GTKDOC_MESON_OPTION = "enable-gtk-doc" |
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.18.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.19.0.bb index 75010a67b8..075fb754ec 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.18.0.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.19.0.bb | |||
| @@ -20,7 +20,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" | |||
| 20 | 20 | ||
| 21 | GNOMEBN = "gtksourceview" | 21 | GNOMEBN = "gtksourceview" |
| 22 | 22 | ||
| 23 | SRC_URI[archive.sha256sum] = "051a78fe38f793328047e5bcd6d855c6425c0b480c20d9432179e356742c6ac0" | 23 | SRC_URI[archive.sha256sum] = "242bf2c3dc51c44402294b584141399afe7cf87bfacf2b958685cece964301c5" |
| 24 | S = "${UNPACKDIR}/gtksourceview-${PV}" | 24 | S = "${UNPACKDIR}/gtksourceview-${PV}" |
| 25 | 25 | ||
| 26 | GIR_MESON_ENABLE_FLAG = 'enabled' | 26 | GIR_MESON_ENABLE_FLAG = 'enabled' |
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.0.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.2.bb index d0dbd55f1b..e3b90950d6 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.0.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.2.bb | |||
| @@ -18,7 +18,7 @@ DEPENDS += "\ | |||
| 18 | RDEPENDS:${PN} += "gsettings-desktop-schemas" | 18 | RDEPENDS:${PN} += "gsettings-desktop-schemas" |
| 19 | 19 | ||
| 20 | SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" | 20 | SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" |
| 21 | SRC_URI[archive.sha256sum] = "dd9be36873d0fcb309eb89a8d274770ce576287628a2cf111bd387e1c34f182f" | 21 | SRC_URI[archive.sha256sum] = "ad9d5bf0b45caf232520df0adee51eb650200b0370680f80a350ead9d1d61ddf" |
| 22 | 22 | ||
| 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 24 | 24 | ||
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.54.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.55.bb index 8973b3e656..77d621ec12 100644 --- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.54.bb +++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.55.bb | |||
| @@ -9,7 +9,7 @@ DEPENDS = "libxml2 bzip2 glib-2.0 zlib" | |||
| 9 | GNOMEBASEBUILDCLASS = "autotools" | 9 | GNOMEBASEBUILDCLASS = "autotools" |
| 10 | inherit gnomebase gobject-introspection gettext gtk-doc | 10 | inherit gnomebase gobject-introspection gettext gtk-doc |
| 11 | 11 | ||
| 12 | SRC_URI[archive.sha256sum] = "d18869264a2513cfb071712486d115dada064ff8a040265b49936bca06f17623" | 12 | SRC_URI[archive.sha256sum] = "74d60abba15bd3ea5ad17da5b924d8e36f649a25c3dc77adbabd2a3628a02131" |
| 13 | SRC_URI += " file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" | 13 | SRC_URI += " file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" |
| 14 | 14 | ||
| 15 | PACKAGECONFIG ??= "" | 15 | PACKAGECONFIG ??= "" |
diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb index e7b61a7b20..7131078994 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb | |||
| @@ -11,4 +11,7 @@ SRC_URI[archive.sha256sum] = "775676df958e2ea2452f7568f28b2ea581063d312773dd5c0b | |||
| 11 | 11 | ||
| 12 | UPSTREAM_CHECK_REGEX = "libgtop-(?P<pver>\d+(\.\d+)+).tar" | 12 | UPSTREAM_CHECK_REGEX = "libgtop-(?P<pver>\d+(\.\d+)+).tar" |
| 13 | 13 | ||
| 14 | DEPENDS = "glib-2.0 libxau" | 14 | DEPENDS = "glib-2.0" |
| 15 | |||
| 16 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES','x11','xauth','',d)}" | ||
| 17 | PACKAGECONFIG[xauth] = ",,libxau" | ||
diff --git a/meta-gnome/recipes-gnome/libpanel/libpanel_1.10.3.bb b/meta-gnome/recipes-gnome/libpanel/libpanel_1.10.4.bb index 3fc58a9593..68cff85f9e 100644 --- a/meta-gnome/recipes-gnome/libpanel/libpanel_1.10.3.bb +++ b/meta-gnome/recipes-gnome/libpanel/libpanel_1.10.4.bb | |||
| @@ -11,7 +11,7 @@ DEPENDS += " \ | |||
| 11 | libadwaita \ | 11 | libadwaita \ |
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRC_URI[archive.sha256sum] = "42a01baf8b94440f194ea8342b244bd6992dfb024ca3160c9477ff498ec3a2b6" | 14 | SRC_URI[archive.sha256sum] = "593888a7691f0af8aaa6e193c9e14afa86a810c0c2f27515c6d813f18733b1cd" |
| 15 | 15 | ||
| 16 | PACKAGECONFIG ?= "" | 16 | PACKAGECONFIG ?= "" |
| 17 | #EXTRA_OEMESON += "-Ddocs=disabled" | 17 | #EXTRA_OEMESON += "-Ddocs=disabled" |
diff --git a/meta-gnome/recipes-gnome/libspelling/libspelling_0.4.9.bb b/meta-gnome/recipes-gnome/libspelling/libspelling_0.4.10.bb index a378cc87e3..c906c8097d 100644 --- a/meta-gnome/recipes-gnome/libspelling/libspelling_0.4.9.bb +++ b/meta-gnome/recipes-gnome/libspelling/libspelling_0.4.10.bb | |||
| @@ -16,4 +16,4 @@ GIDOCGEN_MESON_OPTION = 'docs' | |||
| 16 | PACKAGECONFIG ?= "" | 16 | PACKAGECONFIG ?= "" |
| 17 | PACKAGECONFIG[sysprof] = "-Dsysprof=true,-Dsysprof=false,sysprof" | 17 | PACKAGECONFIG[sysprof] = "-Dsysprof=true,-Dsysprof=false,sysprof" |
| 18 | 18 | ||
| 19 | SRC_URI[archive.sha256sum] = "d093fd35ae0f1c98fb58876505287fc0a885e47da9d2411d6d7cd595f34d4ebf" | 19 | SRC_URI[archive.sha256sum] = "56e3f01a3a18b575beea4c34349f99cdaba316e1f7c271b1231f7bcf5d9af73b" |
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb index 4342325f11..13923a3e17 100644 --- a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb +++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Window navigation construction toolkit" | |||
| 2 | LICENSE = "LGPL-2.0-only" | 2 | LICENSE = "LGPL-2.0-only" |
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" |
| 4 | 4 | ||
| 5 | BPN = "libwnck" | 5 | GNOMEBN = "libwnck" |
| 6 | 6 | ||
| 7 | SECTION = "x11/libs" | 7 | SECTION = "x11/libs" |
| 8 | DEPENDS = "cairo glib-2.0 gtk+3" | 8 | DEPENDS = "cairo glib-2.0 gtk+3" |
| @@ -23,6 +23,4 @@ SRC_URI += "file://ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch;patch=1 \ | |||
| 23 | file://0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch;patch=1" | 23 | file://0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch;patch=1" |
| 24 | SRC_URI[archive.sha256sum] = "55a7444ec1fbb95c086d40967388f231b5c0bbc8cffaa086bf9290ae449e51d5" | 24 | SRC_URI[archive.sha256sum] = "55a7444ec1fbb95c086d40967388f231b5c0bbc8cffaa086bf9290ae449e51d5" |
| 25 | 25 | ||
| 26 | # gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. | 26 | REQUIRED_DISTRO_FEATURES = "x11" |
| 27 | # cairo would at least needed to be built with xlib. | ||
| 28 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
diff --git a/meta-gnome/recipes-gnome/msgraph/msgraph_0.3.3.bb b/meta-gnome/recipes-gnome/msgraph/msgraph_0.3.4.bb index fe4faff356..1c2c3b9c41 100644 --- a/meta-gnome/recipes-gnome/msgraph/msgraph_0.3.3.bb +++ b/meta-gnome/recipes-gnome/msgraph/msgraph_0.3.4.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" | |||
| 5 | inherit gnomebase gobject-introspection gi-docgen features_check | 5 | inherit gnomebase gobject-introspection gi-docgen features_check |
| 6 | REQUIRED_DISTRO_FEATURES = "opengl" | 6 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 7 | 7 | ||
| 8 | SRC_URI[archive.sha256sum] = "37d7e12f2a990490aea21184f0b27e0b915ebb4e5096f4d6632c62051c054012" | 8 | SRC_URI[archive.sha256sum] = "0731ece6b02b32eeffbbbd98efdc77bc03ddd20651eeae3a4343f0879b04d6c7" |
| 9 | 9 | ||
| 10 | GTKDOC_MESON_OPTION = "gtk_doc" | 10 | GTKDOC_MESON_OPTION = "gtk_doc" |
| 11 | 11 | ||
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_48.5.bb b/meta-gnome/recipes-gnome/mutter/mutter_48.7.bb index ce7f44947e..bc1fe52b3b 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_48.5.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_48.7.bb | |||
| @@ -3,8 +3,6 @@ LICENSE = "GPL-2.0-only" | |||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 4 | 4 | ||
| 5 | DEPENDS = " \ | 5 | DEPENDS = " \ |
| 6 | wayland-native \ | ||
| 7 | virtual/libx11 \ | ||
| 8 | colord \ | 6 | colord \ |
| 9 | graphene \ | 7 | graphene \ |
| 10 | gtk4 \ | 8 | gtk4 \ |
| @@ -15,24 +13,24 @@ DEPENDS = " \ | |||
| 15 | json-glib \ | 13 | json-glib \ |
| 16 | libdisplay-info \ | 14 | libdisplay-info \ |
| 17 | libei \ | 15 | libei \ |
| 18 | libxcvt-native \ | ||
| 19 | libxtst \ | ||
| 20 | libxkbfile \ | ||
| 21 | python3-argcomplete-native \ | 16 | python3-argcomplete-native \ |
| 22 | python3-docutils-native \ | 17 | python3-docutils-native \ |
| 23 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \ | 18 | virtual/egl \ |
| 24 | xwayland \ | 19 | virtual/libgles2 \ |
| 25 | " | 20 | wayland \ |
| 21 | wayland-native \ | ||
| 22 | wayland-protocols \ | ||
| 23 | libxcvt-native \ | ||
| 24 | " | ||
| 26 | 25 | ||
| 27 | 26 | ||
| 28 | inherit gnomebase gsettings gobject-introspection gettext features_check | 27 | inherit gnomebase gsettings gobject-introspection gettext features_check |
| 29 | 28 | ||
| 30 | SRC_URI[archive.sha256sum] = "02ed0ab4194fc537540f9ee92acbf5af8209971a404df319c1cb7763294ae58b" | ||
| 31 | |||
| 32 | SRC_URI += "file://0001-Dont-use-system-sysprof-dbus-folder.patch" | 29 | SRC_URI += "file://0001-Dont-use-system-sysprof-dbus-folder.patch" |
| 30 | SRC_URI[archive.sha256sum] = "ec102aa3cbb0e39001206627aca3055314555f70609de5e6c2b7efcd1fa90f20" | ||
| 33 | 31 | ||
| 34 | # x11 is still manadatory - see meson.build | 32 | REQUIRED_DISTRO_FEATURES = "wayland polkit" |
| 35 | REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" | 33 | ANY_OF_DISTRO_FEATURES = "opengl vulkan" |
| 36 | 34 | ||
| 37 | # systemd can be replaced by libelogind (not available atow - make systemd | 35 | # systemd can be replaced by libelogind (not available atow - make systemd |
| 38 | # mandatory distro feature) | 36 | # mandatory distro feature) |
| @@ -42,29 +40,33 @@ REQUIRED_DISTRO_FEATURES += "systemd" | |||
| 42 | # profiler requires sysprof 3.34 which is not willing to build atow | 40 | # profiler requires sysprof 3.34 which is not willing to build atow |
| 43 | PACKAGECONFIG ??= " \ | 41 | PACKAGECONFIG ??= " \ |
| 44 | native-backend \ | 42 | native-backend \ |
| 45 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl glx', '', d)} \ | 43 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 opengl glx sm xwayland startup-notification', '', d)} \ |
| 46 | sm \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'logind udev', '', d)} \ |
| 47 | startup-notification \ | ||
| 48 | gnome-desktop \ | 45 | gnome-desktop \ |
| 46 | egl \ | ||
| 49 | " | 47 | " |
| 50 | 48 | ||
| 51 | EXTRA_OEMESON += " \ | 49 | EXTRA_OEMESON += " \ |
| 52 | -Dtests=disabled \ | 50 | -Dtests=disabled \ |
| 53 | -Dxwayland_path=${bindir}/Xwayland \ | ||
| 54 | " | 51 | " |
| 55 | 52 | ||
| 56 | # combi-config - see meson_options.txt for more details | 53 | # combi-config - see meson_options.txt for more details |
| 57 | PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_backend=false -Dudev=false, libdrm virtual/libgbm libinput ${LOGIND} virtual/egl virtual/libgles2 udev" | 54 | PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_backend=false -Dudev=false, libdrm virtual/libgbm libinput ${LOGIND} virtual/egl virtual/libgles2 udev" |
| 58 | PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false, virtual/libgl" | ||
| 59 | PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" | 55 | PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" |
| 56 | PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false,virtual/libgl" | ||
| 57 | PACKAGECONFIG[egl] = "-Degl=true,-Degl=false,virtual/egl" | ||
| 60 | PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" | 58 | PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" |
| 61 | # Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+ | 59 | # Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+ |
| 62 | PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" | 60 | PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" |
| 63 | PACKAGECONFIG[gnome-desktop] = "-Dlibgnome_desktop=true, -Dlibgnome_desktop=false, gnome-desktop gnome-settings-daemon" | 61 | PACKAGECONFIG[gnome-desktop] = "-Dlibgnome_desktop=true, -Dlibgnome_desktop=false, gnome-desktop gnome-settings-daemon" |
| 64 | PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" | 62 | PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" |
| 63 | PACKAGECONFIG[udev] = "-Dudev=true, -Dudev=false" | ||
| 64 | PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" | ||
| 65 | PACKAGECONFIG[sound-player] = "-Dsound_player=true, -Dsound_player=false, libcanberra" | 65 | PACKAGECONFIG[sound-player] = "-Dsound_player=true, -Dsound_player=false, libcanberra" |
| 66 | PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" | 66 | PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" |
| 67 | PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" | 67 | PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" |
| 68 | PACKAGECONFIG[x11] = "-Dx11=true, -Dx11=false, virtual/libx11" | ||
| 69 | PACKAGECONFIG[xwayland] = "-Dxwayland=true, -Dxwayland=false, libxcb libxi xcomposite libxcursor xdamage xext libxkbfile libxfixes xkeyboard-config virtual/libx11 xinerama xau xwayland" | ||
| 68 | 70 | ||
| 69 | MUTTER_API_NAME = "mutter-16" | 71 | MUTTER_API_NAME = "mutter-16" |
| 70 | 72 | ||
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_49.3.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_49.4.bb index b6c13dedb0..9befe945df 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_49.3.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_49.4.bb | |||
| @@ -24,7 +24,7 @@ DEPENDS = " \ | |||
| 24 | 24 | ||
| 25 | inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache | 25 | inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache |
| 26 | 26 | ||
| 27 | SRC_URI[archive.sha256sum] = "aa6bf376f08992362805eae01890b1bf5ad148f356aa7ccfe1f664eda88d413e" | 27 | SRC_URI[archive.sha256sum] = "1476d9459a63c85f0ebc18f237b32d12b008ad786002376424919725f50e76a8" |
| 28 | 28 | ||
| 29 | REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" | 29 | REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" |
| 30 | 30 | ||
diff --git a/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_6.14.0.bb index f4d027ebf7..b6ba7e1a2a 100644 --- a/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb +++ b/meta-gnome/recipes-gnome/tepl/tepl_6.14.0.bb | |||
| @@ -7,7 +7,9 @@ DEPENDS = " \ | |||
| 7 | glib-2.0 \ | 7 | glib-2.0 \ |
| 8 | gtk+3 \ | 8 | gtk+3 \ |
| 9 | libgedit-amtk \ | 9 | libgedit-amtk \ |
| 10 | libgedit-gfls \ | ||
| 10 | libgedit-gtksourceview \ | 11 | libgedit-gtksourceview \ |
| 12 | libhandy \ | ||
| 11 | libxml2 \ | 13 | libxml2 \ |
| 12 | uchardet \ | 14 | uchardet \ |
| 13 | gtk-doc-native \ | 15 | gtk-doc-native \ |
| @@ -20,9 +22,8 @@ inherit meson gobject-introspection gettext features_check pkgconfig | |||
| 20 | 22 | ||
| 21 | 23 | ||
| 22 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 24 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 23 | SRC_URI = "git://gitlab.gnome.org/swilmet/tepl;protocol=https;branch=main" | 25 | SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-tepl.git;protocol=https;branch=main" |
| 24 | SRCREV = "16ab2567257a053bd957699f89080fafd0999035" | 26 | SRCREV = "d60f7ded17b52ea42091c073ea81090e91f38620" |
| 25 | |||
| 26 | # gobject-introspection is mandatory and cannot be configured | 27 | # gobject-introspection is mandatory and cannot be configured |
| 27 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" | 28 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" |
| 28 | GIR_MESON_OPTION = "" | 29 | GIR_MESON_OPTION = "" |
diff --git a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb index 14986f2650..e1c9324940 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb | |||
| @@ -7,7 +7,8 @@ GNOMEBASEBUILDCLASS = "autotools" | |||
| 7 | inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features_check mime-xdg | 7 | inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features_check mime-xdg |
| 8 | 8 | ||
| 9 | # for webkitgtk | 9 | # for webkitgtk |
| 10 | REQUIRED_DISTRO_FEATURES = "x11" | 10 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 11 | ANY_OF_DISTRO_FEATURES = "wayland x11" | ||
| 11 | 12 | ||
| 12 | SRC_URI[archive.sha256sum] = "a2c5fd0787a9089c722cc66bd0f85cdf7088d870e7b6cc85799f8e5bff9eac4b" | 13 | SRC_URI[archive.sha256sum] = "a2c5fd0787a9089c722cc66bd0f85cdf7088d870e7b6cc85799f8e5bff9eac4b" |
| 13 | 14 | ||
diff --git a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch new file mode 100644 index 0000000000..9fb2cd6814 --- /dev/null +++ b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | From 71804c06c7179333f44b57e04ba268f37fe54f62 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 13 Jul 2017 09:01:04 -0700 | ||
| 4 | Subject: [PATCH] pypredict/lm: Define error API if platform does not have it | ||
| 5 | |||
| 6 | error() API is not implemented across all libcs on linux | ||
| 7 | e.g. musl does not provide it. | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | Onboard/pypredict/lm/lm.cpp | 1 - | ||
| 14 | Onboard/pypredict/lm/lm.h | 13 +++++++++++++ | ||
| 15 | Onboard/pypredict/lm/lm_dynamic.cpp | 2 -- | ||
| 16 | 3 files changed, 13 insertions(+), 3 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp | ||
| 19 | index 2e642965..37ae241e 100644 | ||
| 20 | --- a/Onboard/pypredict/lm/lm.cpp | ||
| 21 | +++ b/Onboard/pypredict/lm/lm.cpp | ||
| 22 | @@ -19,7 +19,6 @@ | ||
| 23 | |||
| 24 | #include <stdlib.h> | ||
| 25 | #include <stdio.h> | ||
| 26 | -#include <error.h> | ||
| 27 | #include <algorithm> | ||
| 28 | #include <cmath> | ||
| 29 | #include <string> | ||
| 30 | diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h | ||
| 31 | index ed4164a4..b8b63ee8 100644 | ||
| 32 | --- a/Onboard/pypredict/lm/lm.h | ||
| 33 | +++ b/Onboard/pypredict/lm/lm.h | ||
| 34 | @@ -32,6 +32,19 @@ | ||
| 35 | #include <algorithm> | ||
| 36 | #include <string> | ||
| 37 | |||
| 38 | +#if defined(HAVE_ERROR_H) | ||
| 39 | +#include <error.h> | ||
| 40 | +#else | ||
| 41 | +#include <err.h> | ||
| 42 | +#define _onboard_error(S, E, F, ...) do { \ | ||
| 43 | + if (E) \ | ||
| 44 | + err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ | ||
| 45 | + else \ | ||
| 46 | + err(S, F, ##__VA_ARGS__); \ | ||
| 47 | +} while(0) | ||
| 48 | + | ||
| 49 | +#define error _onboard_error | ||
| 50 | +#endif | ||
| 51 | |||
| 52 | // break into debugger | ||
| 53 | // step twice to come back out of the raise() call into known code | ||
| 54 | diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp | ||
| 55 | index 7c628240..e7c7f40e 100644 | ||
| 56 | --- a/Onboard/pypredict/lm/lm_dynamic.cpp | ||
| 57 | +++ b/Onboard/pypredict/lm/lm_dynamic.cpp | ||
| 58 | @@ -17,8 +17,6 @@ | ||
| 59 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 60 | */ | ||
| 61 | |||
| 62 | -#include <error.h> | ||
| 63 | - | ||
| 64 | #include "lm_dynamic.h" | ||
| 65 | |||
| 66 | using namespace std; | ||
| 67 | -- | ||
| 68 | 2.34.1 | ||
| 69 | |||
diff --git a/meta-gnome/recipes-support/onboard/onboard/0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch b/meta-gnome/recipes-support/onboard/onboard/0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch new file mode 100644 index 0000000000..b4bbe7c023 --- /dev/null +++ b/meta-gnome/recipes-support/onboard/onboard/0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From d68300ca8c7c518abd404873a8201b71988e492d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Fri, 23 Jan 2026 09:28:56 +0800 | ||
| 4 | Subject: [PATCH] toggle-onboard-hoverclick: use /bin/sh default shell | ||
| 5 | interpreter | ||
| 6 | |||
| 7 | checkbashism reports no issues, therefore using /bin/sh instead of | ||
| 8 | /bin/bash should be safe. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 13 | --- | ||
| 14 | scripts/toggle-onboard-hoverclick | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/scripts/toggle-onboard-hoverclick b/scripts/toggle-onboard-hoverclick | ||
| 18 | index 7ee3b024..48636225 100755 | ||
| 19 | --- a/scripts/toggle-onboard-hoverclick | ||
| 20 | +++ b/scripts/toggle-onboard-hoverclick | ||
| 21 | @@ -1,4 +1,4 @@ | ||
| 22 | -#!/bin/bash | ||
| 23 | +#!/bin/sh | ||
| 24 | STATUS=$(gsettings get org.gnome.desktop.a11y.mouse dwell-click-enabled) | ||
| 25 | case $STATUS in | ||
| 26 | true ) | ||
| 27 | -- | ||
| 28 | 2.34.1 | ||
| 29 | |||
diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb new file mode 100644 index 0000000000..d544f169f8 --- /dev/null +++ b/meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | SUMMARY = "An onscreen keyboard" | ||
| 2 | HOMEPAGE = "https://github.com/onboard-osk/onboard" | ||
| 3 | DESCRIPTION = "Onboard is an onscreen keyboard useful for everybody \ | ||
| 4 | that cannot use a hardware keyboard. It has been designed with simplicity \ | ||
| 5 | in mind and can be used right away without the need of any configuration, \ | ||
| 6 | as it can read the keyboard layout from the X server." | ||
| 7 | |||
| 8 | LICENSE = "GPL-3.0-or-later & BSD-3-Clause" | ||
| 9 | LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e \ | ||
| 10 | file://COPYING.BSD3;md5=f56403ae5b2d6b82ad136d753c05a82e \ | ||
| 11 | " | ||
| 12 | |||
| 13 | SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main \ | ||
| 14 | file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \ | ||
| 15 | file://0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch \ | ||
| 16 | " | ||
| 17 | SRCREV = "350f7643576bc8c5f2cff9c6ddce0e1e7cff995d" | ||
| 18 | |||
| 19 | inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg | ||
| 20 | |||
| 21 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 22 | |||
| 23 | DEPENDS = "gtk+3 hunspell libcanberra libxkbfile dconf hicolor-icon-theme python3-distutils-extra-native intltool-native glib-2.0-native" | ||
| 24 | |||
| 25 | FILES:${PN} += " \ | ||
| 26 | ${datadir}/dbus-1 \ | ||
| 27 | ${datadir}/icons \ | ||
| 28 | ${datadir}/gnome-shell \ | ||
| 29 | ${datadir}/help \ | ||
| 30 | " | ||
| 31 | |||
| 32 | RDEPENDS:${PN} += " \ | ||
| 33 | ncurses \ | ||
| 34 | librsvg-gtk \ | ||
| 35 | python3-dbus \ | ||
| 36 | python3-pycairo \ | ||
| 37 | python3-pygobject \ | ||
| 38 | python3-image \ | ||
| 39 | " | ||
diff --git a/meta-initramfs/README.md b/meta-initramfs/README.md index 119293a741..e074142be7 100644 --- a/meta-initramfs/README.md +++ b/meta-initramfs/README.md | |||
| @@ -21,10 +21,10 @@ Maintenance | |||
| 21 | Send patches / pull requests to openembedded-devel@lists.openembedded.org | 21 | Send patches / pull requests to openembedded-devel@lists.openembedded.org |
| 22 | with '[meta-initramfs]' in the subject. | 22 | with '[meta-initramfs]' in the subject. |
| 23 | 23 | ||
| 24 | When sending single patches, please using something like: | 24 | When sending single patches, please use something like: |
| 25 | git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][PATCH' | 25 | git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][PATCH' |
| 26 | 26 | ||
| 27 | Interm layer maintainer: Khem Raj <raj.khem@gmail.com> | 27 | Interim layer maintainer: Khem Raj <raj.khem@gmail.com> |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | License | 30 | License |
diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf index 6d495a6fb3..b52f3fde80 100644 --- a/meta-initramfs/conf/layer.conf +++ b/meta-initramfs/conf/layer.conf | |||
| @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" | |||
| 16 | BBFILE_PRIORITY_meta-initramfs = "5" | 16 | BBFILE_PRIORITY_meta-initramfs = "5" |
| 17 | LAYERDEPENDS_meta-initramfs = "core" | 17 | LAYERDEPENDS_meta-initramfs = "core" |
| 18 | 18 | ||
| 19 | LAYERSERIES_COMPAT_meta-initramfs = "walnascar whinlatter" | 19 | LAYERSERIES_COMPAT_meta-initramfs = "whinlatter wrynose" |
| 20 | 20 | ||
| 21 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | 21 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ |
| 22 | dracut->virtual/kernel \ | 22 | dracut->virtual/kernel \ |
diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf index a01984888d..c96fbcb27c 100644 --- a/meta-multimedia/conf/layer.conf +++ b/meta-multimedia/conf/layer.conf | |||
| @@ -31,7 +31,7 @@ LAYERVERSION_multimedia-layer = "1" | |||
| 31 | 31 | ||
| 32 | LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" | 32 | LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" |
| 33 | 33 | ||
| 34 | LAYERSERIES_COMPAT_multimedia-layer = "walnascar whinlatter" | 34 | LAYERSERIES_COMPAT_multimedia-layer = "whinlatter wrynose" |
| 35 | 35 | ||
| 36 | # List of known non-reproducible package of the meta-multimedia layer | 36 | # List of known non-reproducible package of the meta-multimedia layer |
| 37 | # Please keep this list sorted | 37 | # Please keep this list sorted |
diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_45.0.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_45.0.bb index 97948d896f..60a79f5fb3 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_45.0.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_45.0.bb | |||
| @@ -18,7 +18,7 @@ RRECOMMENDS:${PN} = "rygel-plugin-media-export" | |||
| 18 | inherit gnomebase features_check vala gobject-introspection gettext systemd | 18 | inherit gnomebase features_check vala gobject-introspection gettext systemd |
| 19 | 19 | ||
| 20 | # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured | 20 | # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured |
| 21 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" | 21 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" |
| 22 | 22 | ||
| 23 | SRC_URI[archive.sha256sum] = "82667b902fc0672e64cf91eb727a70137a8fdfe7a3d9a4c158b0f4b1fc700882" | 23 | SRC_URI[archive.sha256sum] = "82667b902fc0672e64cf91eb727a70137a8fdfe7a3d9a4c158b0f4b1fc700882" |
| 24 | 24 | ||
diff --git a/meta-multimedia/recipes-multimedia/aom/aom_3.13.1.bb b/meta-multimedia/recipes-multimedia/aom/aom_3.13.1.bb index 141b02306d..b157dc79ec 100644 --- a/meta-multimedia/recipes-multimedia/aom/aom_3.13.1.bb +++ b/meta-multimedia/recipes-multimedia/aom/aom_3.13.1.bb | |||
| @@ -25,3 +25,5 @@ EXTRA_OECMAKE:append:riscv32 = " -DENABLE_RVV=OFF" | |||
| 25 | do_generate_toolchain_file:append() { | 25 | do_generate_toolchain_file:append() { |
| 26 | echo "set(AOM_AS_FLAGS --debug-prefix-map ${S}=${TARGET_DBGSRC_DIR})" >> ${WORKDIR}/toolchain.cmake | 26 | echo "set(AOM_AS_FLAGS --debug-prefix-map ${S}=${TARGET_DBGSRC_DIR})" >> ${WORKDIR}/toolchain.cmake |
| 27 | } | 27 | } |
| 28 | |||
| 29 | SYSROOT_DIRS += "${bindir}" | ||
diff --git a/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb index 162a51284e..4f15465371 100644 --- a/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb +++ b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb | |||
| @@ -58,6 +58,7 @@ EXTRA_OECONF = "\ | |||
| 58 | PACKAGE_BEFORE_PN = "${PN}-aplay" | 58 | PACKAGE_BEFORE_PN = "${PN}-aplay" |
| 59 | 59 | ||
| 60 | FILES:${PN}-aplay += "${bindir}/bluealsa-aplay" | 60 | FILES:${PN}-aplay += "${bindir}/bluealsa-aplay" |
| 61 | FILES:${PN}-staticdev += "${libdir}/alsa-lib/*.a" | ||
| 61 | FILES:${PN} += "${libdir}/alsa-lib/* ${datadir}/dbus-1/system.d" | 62 | FILES:${PN} += "${libdir}/alsa-lib/* ${datadir}/dbus-1/system.d" |
| 62 | 63 | ||
| 63 | RRECOMMENDS:${PN} = "${PN}-aplay" | 64 | RRECOMMENDS:${PN} = "${PN}-aplay" |
diff --git a/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.5.2.bb b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.5.3.bb index e8f4126a9a..6c092c1649 100644 --- a/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.5.2.bb +++ b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.5.3.bb | |||
| @@ -7,7 +7,7 @@ LICENSE = "BSD-2-Clause" | |||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=48d9210a87a24f62609b5a4f777d8dfe" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=48d9210a87a24f62609b5a4f777d8dfe" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;nobranch=1" | 9 | SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;nobranch=1" |
| 10 | SRCREV = "c720f4d3556a01916324aea155555d3efba842e8" | 10 | SRCREV = "b546257f770768b2c88258c533da38b91a06f737" |
| 11 | 11 | ||
| 12 | DEPENDS:append:x86 = " nasm-native" | 12 | DEPENDS:append:x86 = " nasm-native" |
| 13 | DEPENDS:append:x86-64 = " nasm-native" | 13 | DEPENDS:append:x86-64 = " nasm-native" |
diff --git a/meta-multimedia/recipes-multimedia/fswebcam/fswebcam_20200725.bb b/meta-multimedia/recipes-multimedia/fswebcam/fswebcam_20200725.bb new file mode 100644 index 0000000000..bdda35df40 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/fswebcam/fswebcam_20200725.bb | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | SUMMARY = "Webcam image grabber and manipulation application" | ||
| 2 | DESCRIPTION = "\ | ||
| 3 | fswebcam captures images from a V4L1/V4L2 compatible device or file, \ | ||
| 4 | averages them to reduce noise and draws a caption using the GD Graphics \ | ||
| 5 | Library which also handles compressing the image to PNG or JPEG. The \ | ||
| 6 | resulting image is saved to a file or sent to stdio where it can be piped \ | ||
| 7 | to something like ncftpput or scp. \ | ||
| 8 | " | ||
| 9 | HOMEPAGE = "http://www.sanslogic.co.uk/fswebcam/" | ||
| 10 | BUGTRACKER = "https://codeberg.org/fsphil/fswebcam/issues" | ||
| 11 | SECTION = "graphics" | ||
| 12 | |||
| 13 | LICENSE = "GPL-2.0-only" | ||
| 14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" | ||
| 15 | |||
| 16 | DEPENDS = "gd" | ||
| 17 | |||
| 18 | SRC_URI = "git://github.com/fsphil/fswebcam.git;protocol=https;branch=master;tag=${PV}" | ||
| 19 | SRCREV = "db35d4bbd336885a44f017ff142bc9523dbdce3c" | ||
| 20 | |||
| 21 | inherit autotools-brokensep | ||
diff --git a/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.15.bb b/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.17.bb index f432888fad..cbf883910b 100644 --- a/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.15.bb +++ b/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.17.bb | |||
| @@ -8,16 +8,18 @@ LICENSE = "LGPL-3.0-only & MIT" | |||
| 8 | LICENSE_FLAGS = "commercial" | 8 | LICENSE_FLAGS = "commercial" |
| 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=695b556799abb2435c97a113cdca512f" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=695b556799abb2435c97a113cdca512f" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/strukturag/libde265.git;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/strukturag/libde265.git;branch=master;protocol=https;tag=v${PV}" |
| 12 | SRCREV = "17bb8d9fcea62db8cdeb0fc7ef8d15dbd19a22e4" | 12 | SRCREV = "f3d916c8e63e510bda1f9cf5e8710259c22afece" |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | inherit cmake pkgconfig | 15 | inherit cmake pkgconfig |
| 16 | 16 | ||
| 17 | EXTRA_OECMAKE = "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" | 17 | EXTRA_OECMAKE = "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" |
| 18 | 18 | ||
| 19 | PACKAGECONFIG ?= "libsdl" | 19 | PACKAGECONFIG ?= "" |
| 20 | PACKAGECONFIG[libsdl] = "-DENABLE_SDL=ON,-DENABLE_SDL=OFF,virtual/libsdl2" | 20 | PACKAGECONFIG[libsdl] = "-DENABLE_SDL=ON,-DENABLE_SDL=OFF,virtual/libsdl2" |
| 21 | 21 | ||
| 22 | FILES:${PN} += "${libdir}/libde265.so" | 22 | FILES:${PN} += "${libdir}/libde265.so" |
| 23 | FILES:${PN}-dev = "${includedir} ${libdir}/cmake ${libdir}/pkgconfig" | 23 | FILES:${PN}-dev = "${includedir} ${libdir}/cmake ${libdir}/pkgconfig" |
| 24 | INSANE_SKIP:${PN} = "dev-so" | ||
| 25 | |||
diff --git a/meta-multimedia/recipes-multimedia/libfreeaptx/libfreeaptx_0.2.2.bb b/meta-multimedia/recipes-multimedia/libfreeaptx/libfreeaptx_0.2.2.bb new file mode 100644 index 0000000000..aa083efd37 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/libfreeaptx/libfreeaptx_0.2.2.bb | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | SUMMARY = "Free aptX / aptX-HD audio codec library (LGPL fork of openaptx 0.2.0)" | ||
| 2 | HOMEPAGE = "https://github.com/regularhunter/libfreeaptx" | ||
| 3 | LICENSE = "LGPL-2.1-or-later" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
| 5 | |||
| 6 | PV = "0.2.2" | ||
| 7 | |||
| 8 | SRC_URI = "git://github.com/regularhunter/libfreeaptx.git;protocol=https;branch=master" | ||
| 9 | SRCREV = "6dee419f934ec781e531f885f7e8e740752e67d1" | ||
| 10 | |||
| 11 | inherit pkgconfig | ||
| 12 | |||
| 13 | EXTRA_OEMAKE = "\ | ||
| 14 | LIBDIR=${baselib} \ | ||
| 15 | CFLAGS='${CFLAGS}' \ | ||
| 16 | CPPFLAGS='${CPPFLAGS}' \ | ||
| 17 | LDFLAGS='${LDFLAGS}' \ | ||
| 18 | CP='cp -a --no-preserve=ownership' \ | ||
| 19 | " | ||
| 20 | |||
| 21 | do_compile() { | ||
| 22 | oe_runmake | ||
| 23 | } | ||
| 24 | |||
| 25 | do_install() { | ||
| 26 | oe_runmake DESTDIR=${D} PREFIX=${prefix} install | ||
| 27 | } | ||
| 28 | |||
| 29 | PACKAGES =+ "${PN}-utils" | ||
| 30 | |||
| 31 | FILES:${PN} += "${libdir}/libfreeaptx.so.*" | ||
| 32 | FILES:${PN}-dev += "${includedir}/freeaptx.h ${libdir}/libfreeaptx.so ${libdir}/pkgconfig/libfreeaptx.pc" | ||
| 33 | FILES:${PN}-utils += "${bindir}/freeaptxenc ${bindir}/freeaptxdec" | ||
diff --git a/meta-multimedia/recipes-multimedia/libheif/libheif/CVE-2026-3949.patch b/meta-multimedia/recipes-multimedia/libheif/libheif/CVE-2026-3949.patch new file mode 100644 index 0000000000..ef5d9c1ee4 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/libheif/libheif/CVE-2026-3949.patch | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | From cba59e7671a36a78e31c0490efe74ec226918580 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dirk Farin <dirk.farin@gmail.com> | ||
| 3 | Date: Tue, 24 Feb 2026 00:32:48 +0100 | ||
| 4 | Subject: [PATCH] vvdec: check that NAL size does not exceed data size (#1712) | ||
| 5 | |||
| 6 | CVE: CVE-2026-3949 | ||
| 7 | Upstream-Status: Backport [https://github.com/strukturag/libheif/commit/b97c8b5f198b27f375127cd597a35f2113544d03] | ||
| 8 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 9 | --- | ||
| 10 | libheif/plugins/decoder_vvdec.cc | 17 +++++++++++++++++ | ||
| 11 | 1 file changed, 17 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/libheif/plugins/decoder_vvdec.cc b/libheif/plugins/decoder_vvdec.cc | ||
| 14 | index 09515720..14b3e9fd 100644 | ||
| 15 | --- a/libheif/plugins/decoder_vvdec.cc | ||
| 16 | +++ b/libheif/plugins/decoder_vvdec.cc | ||
| 17 | @@ -55,6 +55,7 @@ struct vvdec_decoder | ||
| 18 | std::string error_message; | ||
| 19 | }; | ||
| 20 | |||
| 21 | +static const char kEmptyString[] = ""; | ||
| 22 | static const char kSuccess[] = "Success"; | ||
| 23 | |||
| 24 | static const int VVDEC_PLUGIN_PRIORITY = 100; | ||
| 25 | @@ -179,9 +180,25 @@ heif_error vvdec_push_data2(void* decoder_raw, const void* frame_data, size_t fr | ||
| 26 | |||
| 27 | const auto* data = (const uint8_t*) frame_data; | ||
| 28 | |||
| 29 | + if (frame_size < 4) { | ||
| 30 | + return { | ||
| 31 | + heif_error_Decoder_plugin_error, | ||
| 32 | + heif_suberror_End_of_data, | ||
| 33 | + kEmptyString | ||
| 34 | + }; | ||
| 35 | + } | ||
| 36 | + | ||
| 37 | for (;;) { | ||
| 38 | uint32_t size = four_bytes_to_uint32(data[0], data[1], data[2], data[3]); | ||
| 39 | |||
| 40 | + if (frame_size < 4 + size) { | ||
| 41 | + return { | ||
| 42 | + heif_error_Decoder_plugin_error, | ||
| 43 | + heif_suberror_End_of_data, | ||
| 44 | + kEmptyString | ||
| 45 | + }; | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | data += 4; | ||
| 49 | |||
| 50 | std::vector<uint8_t> nalu; | ||
diff --git a/meta-multimedia/recipes-multimedia/libheif/libheif_1.20.2.bb b/meta-multimedia/recipes-multimedia/libheif/libheif_1.21.2.bb index b268b37d8e..ab29fa3b02 100644 --- a/meta-multimedia/recipes-multimedia/libheif/libheif_1.20.2.bb +++ b/meta-multimedia/recipes-multimedia/libheif/libheif_1.21.2.bb | |||
| @@ -6,9 +6,11 @@ LICENSE_FLAGS = "commercial" | |||
| 6 | 6 | ||
| 7 | COMPATIBLE_MACHINE:powerpc64le = "null" | 7 | COMPATIBLE_MACHINE:powerpc64le = "null" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/strukturag/libheif.git;protocol=https;branch=v1.20.x-releases" | 9 | SRC_URI = "git://github.com/strukturag/libheif.git;protocol=https;branch=master;tag=v${PV} \ |
| 10 | file://CVE-2026-3949.patch \ | ||
| 11 | " | ||
| 10 | 12 | ||
| 11 | SRCREV = "35dad50a9145332a7bfdf1ff6aef6801fb613d68" | 13 | SRCREV = "62f1b8c76ed4d8305071fdacbe74ef9717bacac5" |
| 12 | 14 | ||
| 13 | inherit cmake pkgconfig | 15 | inherit cmake pkgconfig |
| 14 | 16 | ||
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index cb2a1865e8..0dd297098c 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc | |||
| @@ -43,3 +43,4 @@ SYSTEMD_SERVICE:${PN} = "minidlna.service" | |||
| 43 | INITSCRIPT_NAME = "minidlna" | 43 | INITSCRIPT_NAME = "minidlna" |
| 44 | INITSCRIPT_PARAMS = "defaults 90" | 44 | INITSCRIPT_PARAMS = "defaults 90" |
| 45 | 45 | ||
| 46 | CVE_STATUS[CVE-2024-51442] = "not-applicable-config: vulnerability requires root access" | ||
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch new file mode 100644 index 0000000000..6ded1c15f8 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From c847b8162959c29b783585e0dcadbfb096e7cb73 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ripley Tom <discofan420@protonmail.com> | ||
| 3 | Date: Sat, 21 Feb 2026 19:33:11 +0100 | ||
| 4 | Subject: [PATCH] spa/plugins/alsa/acp/compat.h: Fix missed | ||
| 5 | -Wdiscarded-qualifiers warning | ||
| 6 | |||
| 7 | Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c847b8162959c29b783585e0dcadbfb096e7cb73] | ||
| 8 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
| 9 | --- | ||
| 10 | spa/plugins/alsa/acp/compat.h | 4 ++-- | ||
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/spa/plugins/alsa/acp/compat.h b/spa/plugins/alsa/acp/compat.h | ||
| 14 | index f7592e1a6..0f7b959df 100644 | ||
| 15 | --- a/spa/plugins/alsa/acp/compat.h | ||
| 16 | +++ b/spa/plugins/alsa/acp/compat.h | ||
| 17 | @@ -429,9 +429,9 @@ static PA_PRINTF_FUNC(1,0) inline char *pa_vsprintf_malloc(const char *fmt, va_l | ||
| 18 | |||
| 19 | #define pa_fopen_cloexec(f,m) fopen(f,m"e") | ||
| 20 | |||
| 21 | -static inline char *pa_path_get_filename(const char *p) | ||
| 22 | +static inline const char *pa_path_get_filename(const char *p) | ||
| 23 | { | ||
| 24 | - char *fn; | ||
| 25 | + const char *fn; | ||
| 26 | if (!p) | ||
| 27 | return NULL; | ||
| 28 | if ((fn = strrchr(p, PA_PATH_SEP_CHAR))) | ||
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire/0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch new file mode 100644 index 0000000000..d6fc5866ec --- /dev/null +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | From 1a37f445a20e67976c83360ab5830887fffe37e2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rudi Heitbaum <rudi@heitbaum.com> | ||
| 3 | Date: Tue, 17 Mar 2026 03:17:15 +1100 | ||
| 4 | Subject: [PATCH] spa/plugins/alsa/acp/compat.h: p is already const do not | ||
| 5 | recast | ||
| 6 | |||
| 7 | Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1a37f445a20e67976c83360ab5830887fffe37e2] | ||
| 8 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
| 9 | --- | ||
| 10 | spa/plugins/alsa/acp/compat.h | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/spa/plugins/alsa/acp/compat.h b/spa/plugins/alsa/acp/compat.h | ||
| 14 | index 0f7b959df..87151d197 100644 | ||
| 15 | --- a/spa/plugins/alsa/acp/compat.h | ||
| 16 | +++ b/spa/plugins/alsa/acp/compat.h | ||
| 17 | @@ -436,7 +436,7 @@ static inline const char *pa_path_get_filename(const char *p) | ||
| 18 | return NULL; | ||
| 19 | if ((fn = strrchr(p, PA_PATH_SEP_CHAR))) | ||
| 20 | return fn+1; | ||
| 21 | - return (char*) p; | ||
| 22 | + return p; | ||
| 23 | } | ||
| 24 | |||
| 25 | static inline bool pa_is_path_absolute(const char *fn) | ||
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.9.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.2.bb index 683d5f3ce0..6914a4a0ad 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.9.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.2.bb | |||
| @@ -12,10 +12,11 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | 12 | ||
| 13 | DEPENDS = "dbus ncurses" | 13 | DEPENDS = "dbus ncurses" |
| 14 | 14 | ||
| 15 | SRCREV = "fd60e04525f3a04d90bf50085222e0cc9139b4a4" | 15 | SRCREV = "95da54a482b68475958bbc3fa572a9c20df0df74" |
| 16 | BRANCH = "${@oe.utils.trim_version('${PV}', 2)}" | 16 | BRANCH = "${@oe.utils.trim_version('${PV}', 2)}" |
| 17 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https;tag=${PV}" | 17 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https;tag=${PV}" |
| 18 | 18 | SRC_URI += "file://0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch" | |
| 19 | SRC_URI += "file://0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch" | ||
| 19 | 20 | ||
| 20 | inherit meson pkgconfig systemd gettext useradd | 21 | inherit meson pkgconfig systemd gettext useradd |
| 21 | 22 | ||
| @@ -48,6 +49,9 @@ SYSTEMD_PACKAGES = "${PN}" | |||
| 48 | # AptX and LDAC are not available in OE. Currently, neither | 49 | # AptX and LDAC are not available in OE. Currently, neither |
| 49 | # are lv2, ROC, and libmysofa. | 50 | # are lv2, ROC, and libmysofa. |
| 50 | # | 51 | # |
| 52 | # AptX support is only available via freeaptx (libfreeaptx) | ||
| 53 | # for Bluetooth audio (A2DP). | ||
| 54 | # | ||
| 51 | # The RTKit module is deprecated in favor of the newer RT module. | 55 | # The RTKit module is deprecated in favor of the newer RT module. |
| 52 | # It still exists for legacy setups that still include it in | 56 | # It still exists for legacy setups that still include it in |
| 53 | # their PipeWire configuration files. | 57 | # their PipeWire configuration files. |
| @@ -61,7 +65,6 @@ EXTRA_OEMESON += " \ | |||
| 61 | -Dsession-managers='[]' \ | 65 | -Dsession-managers='[]' \ |
| 62 | -Dlv2=disabled \ | 66 | -Dlv2=disabled \ |
| 63 | -Droc=disabled \ | 67 | -Droc=disabled \ |
| 64 | -Dbluez5-codec-aptx=disabled \ | ||
| 65 | -Dbluez5-codec-ldac=disabled \ | 68 | -Dbluez5-codec-ldac=disabled \ |
| 66 | -Dlegacy-rtkit=false \ | 69 | -Dlegacy-rtkit=false \ |
| 67 | -Dlibmysofa=disabled \ | 70 | -Dlibmysofa=disabled \ |
| @@ -85,7 +88,7 @@ BLUETOOTH_AAC = "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'b | |||
| 85 | 88 | ||
| 86 | PACKAGECONFIG:class-target ??= " \ | 89 | PACKAGECONFIG:class-target ??= " \ |
| 87 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 90 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
| 88 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez bluez-opus ${BLUETOOTH_AAC}', '', d)} \ | 91 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez bluez-opus ${BLUETOOTH_AAC} bluez-aptx', '', d)} \ |
| 89 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \ | 92 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \ |
| 90 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ | 93 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ |
| 91 | ${PIPEWIRE_SESSION_MANAGER} \ | 94 | ${PIPEWIRE_SESSION_MANAGER} \ |
| @@ -97,12 +100,14 @@ PACKAGECONFIG:class-target ??= " \ | |||
| 97 | # libjack.so* files, thus colliding with the libpack package. This | 100 | # libjack.so* files, thus colliding with the libpack package. This |
| 98 | # is why these two are marked in their respective packageconfigs | 101 | # is why these two are marked in their respective packageconfigs |
| 99 | # as being in conflict. | 102 | # as being in conflict. |
| 100 | PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev,,pipewire-alsa pipewire-alsa-card-profile" | 103 | PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev,,${MLPREFIX}pipewire-alsa ${MLPREFIX}pipewire-alsa-card-profile" |
| 101 | PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" | 104 | PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" |
| 102 | PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc glib-2.0-native" | 105 | PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc glib-2.0-native" |
| 103 | PACKAGECONFIG[bluez-aac] = "-Dbluez5-codec-aac=enabled,-Dbluez5-codec-aac=disabled,fdk-aac" | 106 | PACKAGECONFIG[bluez-aac] = "-Dbluez5-codec-aac=enabled,-Dbluez5-codec-aac=disabled,fdk-aac" |
| 104 | PACKAGECONFIG[bluez-opus] = "-Dbluez5-codec-opus=enabled,-Dbluez5-codec-opus=disabled,libopus" | 107 | PACKAGECONFIG[bluez-opus] = "-Dbluez5-codec-opus=enabled,-Dbluez5-codec-opus=disabled,libopus" |
| 105 | PACKAGECONFIG[bluez-lc3] = "-Dbluez5-codec-lc3=enabled,-Dbluez5-codec-lc3=disabled,liblc3" | 108 | PACKAGECONFIG[bluez-lc3] = "-Dbluez5-codec-lc3=enabled,-Dbluez5-codec-lc3=disabled,liblc3" |
| 109 | # Eneble libfreeaptx to support bluetooth audio codec | ||
| 110 | PACKAGECONFIG[bluez-aptx] = "-Dbluez5-codec-aptx=enabled,-Dbluez5-codec-aptx=disabled,libfreeaptx" | ||
| 106 | # From the pipewire git log: | 111 | # From the pipewire git log: |
| 107 | # "Some Linux phones doesn't use oFono but ModemManager to control the modem." | 112 | # "Some Linux phones doesn't use oFono but ModemManager to control the modem." |
| 108 | # This packageconfig enables modemmanager specific code in the BlueZ backend. | 113 | # This packageconfig enables modemmanager specific code in the BlueZ backend. |
| @@ -111,15 +116,15 @@ PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native graphviz-na | |||
| 111 | PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" | 116 | PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" |
| 112 | PACKAGECONFIG[flatpak] = "-Dflatpak=enabled,-Dflatpak=disabled,glib-2.0" | 117 | PACKAGECONFIG[flatpak] = "-Dflatpak=enabled,-Dflatpak=disabled,glib-2.0" |
| 113 | PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0" | 118 | PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0" |
| 114 | PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base,,gstreamer1.0-pipewire" | 119 | PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base,,${MLPREFIX}gstreamer1.0-pipewire" |
| 115 | PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack" | 120 | PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack" |
| 116 | PACKAGECONFIG[libcamera] = "-Dlibcamera=enabled,-Dlibcamera=disabled,libcamera libdrm" | 121 | PACKAGECONFIG[libcamera] = "-Dlibcamera=enabled,-Dlibcamera=disabled,libcamera libdrm" |
| 117 | PACKAGECONFIG[libcanberra] = "-Dlibcanberra=enabled,-Dlibcanberra=disabled,libcanberra" | 122 | PACKAGECONFIG[libcanberra] = "-Dlibcanberra=enabled,-Dlibcanberra=disabled,libcanberra" |
| 118 | PACKAGECONFIG[libusb] = "-Dlibusb=enabled,-Dlibusb=disabled,libusb" | 123 | PACKAGECONFIG[libusb] = "-Dlibusb=enabled,-Dlibusb=disabled,libusb" |
| 119 | PACKAGECONFIG[media-session] = ",,,pipewire-media-session,,wireplumber" | 124 | PACKAGECONFIG[media-session] = ",,,pipewire-media-session,,wireplumber" |
| 120 | PACKAGECONFIG[pulseaudio] = "-Dlibpulse=enabled,-Dlibpulse=disabled,pulseaudio,,pipewire-pulse" | 125 | PACKAGECONFIG[pulseaudio] = "-Dlibpulse=enabled,-Dlibpulse=disabled,pulseaudio,,${MLPREFIX}pipewire-pulse" |
| 121 | PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib" | 126 | PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib" |
| 122 | PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,pipewire-jack,jack" | 127 | PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,${MLPREFIX}pipewire-jack,jack" |
| 123 | PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled" | 128 | PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled" |
| 124 | PACKAGECONFIG[raop] = "-Draop=enabled,-Draop=disabled,openssl" | 129 | PACKAGECONFIG[raop] = "-Draop=enabled,-Draop=disabled,openssl" |
| 125 | # Starting with version 0.3.60, readline usage can be turned off in pw-cli. | 130 | # Starting with version 0.3.60, readline usage can be turned off in pw-cli. |
| @@ -127,7 +132,7 @@ PACKAGECONFIG[raop] = "-Draop=enabled,-Draop=disabled,openssl" | |||
| 127 | PACKAGECONFIG[readline] = "-Dreadline=enabled,-Dreadline=disabled,readline" | 132 | PACKAGECONFIG[readline] = "-Dreadline=enabled,-Dreadline=disabled,readline" |
| 128 | PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" | 133 | PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" |
| 129 | PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" | 134 | PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" |
| 130 | PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" | 135 | PACKAGECONFIG[systemd] = "-Dlibsystemd=enabled,-Dlibsystemd=disabled,systemd" |
| 131 | PACKAGECONFIG[systemd-system-service] = "-Dsystemd-system-service=enabled,-Dsystemd-system-service=disabled,systemd" | 136 | PACKAGECONFIG[systemd-system-service] = "-Dsystemd-system-service=enabled,-Dsystemd-system-service=disabled,systemd" |
| 132 | # "systemd-user-service" packageconfig will only install service | 137 | # "systemd-user-service" packageconfig will only install service |
| 133 | # files to rootfs but not enable them as systemd.bbclass | 138 | # files to rootfs but not enable them as systemd.bbclass |
| @@ -312,6 +317,8 @@ FILES:${PN}-tools = " \ | |||
| 312 | ${bindir}/pw-link \ | 317 | ${bindir}/pw-link \ |
| 313 | ${bindir}/pw-loopback \ | 318 | ${bindir}/pw-loopback \ |
| 314 | ${bindir}/pw-metadata \ | 319 | ${bindir}/pw-metadata \ |
| 320 | ${bindir}/pw-midi2play \ | ||
| 321 | ${bindir}/pw-midi2record \ | ||
| 315 | ${bindir}/pw-mididump \ | 322 | ${bindir}/pw-mididump \ |
| 316 | ${bindir}/pw-midiplay \ | 323 | ${bindir}/pw-midiplay \ |
| 317 | ${bindir}/pw-midirecord \ | 324 | ${bindir}/pw-midirecord \ |
| @@ -320,6 +327,7 @@ FILES:${PN}-tools = " \ | |||
| 320 | ${bindir}/pw-profiler \ | 327 | ${bindir}/pw-profiler \ |
| 321 | ${bindir}/pw-record \ | 328 | ${bindir}/pw-record \ |
| 322 | ${bindir}/pw-reserve \ | 329 | ${bindir}/pw-reserve \ |
| 330 | ${bindir}/pw-sysex \ | ||
| 323 | ${bindir}/pw-top \ | 331 | ${bindir}/pw-top \ |
| 324 | " | 332 | " |
| 325 | 333 | ||
diff --git a/meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb b/meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb index a176874bba..f90b252d40 100644 --- a/meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb +++ b/meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb | |||
| @@ -4,7 +4,7 @@ DESCRIPTION = "\ | |||
| 4 | demodulates signals commonly used in telephony, such as the \"noise\" \ | 4 | demodulates signals commonly used in telephony, such as the \"noise\" \ |
| 5 | generated by a fax modem or DTMF touchpad. \ | 5 | generated by a fax modem or DTMF touchpad. \ |
| 6 | " | 6 | " |
| 7 | HOMEPAGE = "https://www.soft-switch.org/" | 7 | HOMEPAGE = "https://github.com/freeswitch/spandsp" |
| 8 | BUGTRACKER = "https://github.com/freeswitch/spandsp/issues" | 8 | BUGTRACKER = "https://github.com/freeswitch/spandsp/issues" |
| 9 | SECTION = "libs" | 9 | SECTION = "libs" |
| 10 | LICENSE = "LGPL-2.1-only" | 10 | LICENSE = "LGPL-2.1-only" |
| @@ -23,9 +23,6 @@ SRC_URI = "\ | |||
| 23 | file://0001-configure-Replace-manual-search-for-libxml-by-AC_CHE.patch \ | 23 | file://0001-configure-Replace-manual-search-for-libxml-by-AC_CHE.patch \ |
| 24 | file://0002-configure-Use-AX_PROG_CC_FOR_BUILD-for-cross-compili.patch \ | 24 | file://0002-configure-Use-AX_PROG_CC_FOR_BUILD-for-cross-compili.patch \ |
| 25 | " | 25 | " |
| 26 | # Fails to build with Clang since 5394b2cae6c482ccb835335b769469977e6802ae | ||
| 27 | # https://github.com/freeswitch/spandsp/issues/67 | ||
| 28 | # https://lists.openembedded.org/g/openembedded-devel/message/109325 | ||
| 29 | SRCREV = "797760168945c96e91af55bde9d4edaea2e654f9" | 26 | SRCREV = "797760168945c96e91af55bde9d4edaea2e654f9" |
| 30 | 27 | ||
| 31 | inherit autotools | 28 | inherit autotools |
diff --git a/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb index 6014326826..1600d9d3ef 100644 --- a/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb +++ b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb | |||
| @@ -30,3 +30,5 @@ EXTRA_OECONF += "\ | |||
| 30 | 30 | ||
| 31 | # the included argv library needs this | 31 | # the included argv library needs this |
| 32 | CPPFLAGS:append = " -DANSI_PROTOTYPES" | 32 | CPPFLAGS:append = " -DANSI_PROTOTYPES" |
| 33 | |||
| 34 | CVE_STATUS[CVE-2020-37065] = "cpe-incorrect: the vulnerability is about a Windows frontend, not the CLI" | ||
diff --git a/meta-multimedia/recipes-multimedia/tinycompress/tinycompress/0001-include-install-compress_ops.h-as-public-header.patch b/meta-multimedia/recipes-multimedia/tinycompress/tinycompress/0001-include-install-compress_ops.h-as-public-header.patch new file mode 100644 index 0000000000..0bd70fa4d5 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/tinycompress/tinycompress/0001-include-install-compress_ops.h-as-public-header.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From 2db4ee4ed5e12a48b1d195dab0f57b7106ff37c4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Pratyush Meduri <mpratyus@qti.qualcomm.com> | ||
| 3 | Date: Tue, 20 Jan 2026 14:47:27 +0530 | ||
| 4 | Subject: [PATCH] include: install compress_ops.h as public header | ||
| 5 | |||
| 6 | Move tinycompress/compress_ops.h from noinst_HEADERS to | ||
| 7 | nobase_include_HEADERS so it gets installed for users. | ||
| 8 | |||
| 9 | Signed-off-by: Pratyush Meduri <mpratyus@qti.qualcomm.com> | ||
| 10 | Upstream-Status: Submitted [https://github.com/alsa-project/tinycompress/pull/30] | ||
| 11 | --- | ||
| 12 | include/Makefile.am | 4 ++-- | ||
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/include/Makefile.am b/include/Makefile.am | ||
| 16 | index b12c2c5..15058a9 100644 | ||
| 17 | --- a/include/Makefile.am | ||
| 18 | +++ b/include/Makefile.am | ||
| 19 | @@ -1,8 +1,8 @@ | ||
| 20 | -nobase_include_HEADERS = tinycompress/tinycompress.h | ||
| 21 | +nobase_include_HEADERS = tinycompress/tinycompress.h \ | ||
| 22 | + tinycompress/compress_ops.h | ||
| 23 | |||
| 24 | noinst_HEADERS = sound/compress_offload.h \ | ||
| 25 | sound/compress_params.h \ | ||
| 26 | tinycompress/version.h \ | ||
| 27 | - tinycompress/compress_ops.h \ | ||
| 28 | tinycompress/tinymp3.h \ | ||
| 29 | tinycompress/tinywave.h | ||
| 30 | -- | ||
| 31 | 2.34.1 | ||
| 32 | |||
diff --git a/meta-multimedia/recipes-multimedia/tinycompress/tinycompress_1.2.13.bb b/meta-multimedia/recipes-multimedia/tinycompress/tinycompress_1.2.13.bb index 0dee6cba1f..ae34624ebf 100644 --- a/meta-multimedia/recipes-multimedia/tinycompress/tinycompress_1.2.13.bb +++ b/meta-multimedia/recipes-multimedia/tinycompress/tinycompress_1.2.13.bb | |||
| @@ -6,6 +6,7 @@ LICENSE = "LGPL-2.1-only | BSD-3-Clause" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0" |
| 7 | 7 | ||
| 8 | SRCREV = "ea5c7245beb0b6aec1565cfae0454d6ba374dfdd" | 8 | SRCREV = "ea5c7245beb0b6aec1565cfae0454d6ba374dfdd" |
| 9 | SRC_URI = "git://github.com/alsa-project/tinycompress.git;branch=master;protocol=https;tag=v${PV}" | 9 | SRC_URI = "git://github.com/alsa-project/tinycompress.git;branch=master;protocol=https;tag=v${PV} \ |
| 10 | file://0001-include-install-compress_ops.h-as-public-header.patch" | ||
| 10 | 11 | ||
| 11 | inherit autotools pkgconfig | 12 | inherit autotools pkgconfig |
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-taglib-Fix-build-on-x86-32-bit.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-taglib-Fix-build-on-x86-32-bit.patch deleted file mode 100644 index 2dff9b63ce..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-taglib-Fix-build-on-x86-32-bit.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | From 5b921009b0db2c5c15aef7ce241d3c81f9c272c9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 9 Mar 2024 12:26:39 -0800 | ||
| 4 | Subject: [PATCH] taglib: Fix build on x86 32-bit | ||
| 5 | |||
| 6 | While compiling with clang, there are errors seen such as | ||
| 7 | on function override signature mismatches | ||
| 8 | |||
| 9 | meta_engine/taglib.cpp:240:10: error: virtual function 'tell' has a different return type ('long') than the function it overrides (which has return type 'offset_t' (aka 'long long')) | ||
| 10 | 240 | long tell() const | ||
| 11 | | ~~~~ ^ | ||
| 12 | /mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/vlc/3.0.20/recipe-sysroot/usr/include/taglib/tiostream.h:156:22: note: overridden virtual function is here | ||
| 13 | 156 | virtual offset_t tell() const = 0; | ||
| 14 | | ~~~~~~~~ ^ | ||
| 15 | meta_engine/taglib.cpp:245:10: error: virtual function 'length' has a different return type ('long') than the function it overrides (which has return type 'offset_t' (aka 'long long')) | ||
| 16 | 245 | long length() | ||
| 17 | | ~~~~ ^ | ||
| 18 | /mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/vlc/3.0.20/recipe-sysroot/usr/include/taglib/tiostream.h:161:22: note: overridden virtual function is here | ||
| 19 | 161 | virtual offset_t length() = 0; | ||
| 20 | | ~~~~~~~~ ^ | ||
| 21 | |||
| 22 | Upstream-Status: Submitted [https://mailman.videolan.org/pipermail/vlc-devel/2024-March/143639.html] | ||
| 23 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 24 | --- | ||
| 25 | modules/meta_engine/taglib.cpp | 6 +++--- | ||
| 26 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 27 | |||
| 28 | diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp | ||
| 29 | index f371485008..129fdf55f1 100644 | ||
| 30 | --- a/modules/meta_engine/taglib.cpp | ||
| 31 | +++ b/modules/meta_engine/taglib.cpp | ||
| 32 | @@ -237,12 +237,12 @@ public: | ||
| 33 | return; | ||
| 34 | } | ||
| 35 | |||
| 36 | - long tell() const | ||
| 37 | + offset_t tell() const | ||
| 38 | { | ||
| 39 | - return m_previousPos; | ||
| 40 | + return (offset_t)m_previousPos; | ||
| 41 | } | ||
| 42 | |||
| 43 | - long length() | ||
| 44 | + offset_t length() | ||
| 45 | { | ||
| 46 | uint64_t i_size; | ||
| 47 | if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS) | ||
| 48 | -- | ||
| 49 | 2.44.0 | ||
| 50 | |||
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/taglib-2.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/taglib-2.patch deleted file mode 100644 index f238ff4244..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/taglib-2.patch +++ /dev/null | |||
| @@ -1,67 +0,0 @@ | |||
| 1 | Fix build with taglib 2.0 | ||
| 2 | |||
| 3 | Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/blob/main/taglib-2.patch?ref_type=heads | ||
| 4 | Upstream-Status: Pending | ||
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 6 | |||
| 7 | --- a/modules/meta_engine/taglib.cpp | ||
| 8 | +++ b/modules/meta_engine/taglib.cpp | ||
| 9 | @@ -185,7 +185,7 @@ public: | ||
| 10 | ByteVector res(length, 0); | ||
| 11 | ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length); | ||
| 12 | if (i_read < 0) | ||
| 13 | - return ByteVector::null; | ||
| 14 | + return ByteVector(); | ||
| 15 | else if ((size_t)i_read != length) | ||
| 16 | res.resize(i_read); | ||
| 17 | return res; | ||
| 18 | @@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* t | ||
| 19 | static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest) | ||
| 20 | { | ||
| 21 | #define SET( accessor, meta ) \ | ||
| 22 | - if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \ | ||
| 23 | + if( !tag->accessor().isEmpty() ) \ | ||
| 24 | vlc_meta_Set##meta( dest, tag->accessor().toCString(true) ) | ||
| 25 | #define SETINT( accessor, meta ) \ | ||
| 26 | if( tag->accessor() ) \ | ||
| 27 | @@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* t | ||
| 28 | { | ||
| 29 | MP4::Item list; | ||
| 30 | #define SET( keyName, metaName ) \ | ||
| 31 | - if( tag->itemListMap().contains(keyName) ) \ | ||
| 32 | + if( tag->itemMap().contains(keyName) ) \ | ||
| 33 | { \ | ||
| 34 | - list = tag->itemListMap()[keyName]; \ | ||
| 35 | + list = tag->itemMap()[keyName]; \ | ||
| 36 | vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \ | ||
| 37 | } | ||
| 38 | #define SET_EXTRA( keyName, metaName ) \ | ||
| 39 | - if( tag->itemListMap().contains(keyName) ) \ | ||
| 40 | + if( tag->itemMap().contains(keyName) ) \ | ||
| 41 | { \ | ||
| 42 | - list = tag->itemListMap()[keyName]; \ | ||
| 43 | + list = tag->itemMap()[keyName]; \ | ||
| 44 | vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \ | ||
| 45 | } | ||
| 46 | |||
| 47 | @@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* t | ||
| 48 | #undef SET | ||
| 49 | #undef SET_EXTRA | ||
| 50 | |||
| 51 | - if( tag->itemListMap().contains("covr") ) | ||
| 52 | + if( tag->itemMap().contains("covr") ) | ||
| 53 | { | ||
| 54 | - MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList(); | ||
| 55 | + MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList(); | ||
| 56 | const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg"; | ||
| 57 | |||
| 58 | msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes", | ||
| 59 | @@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_th | ||
| 60 | if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) ) | ||
| 61 | WriteMetaToId3v2( riff_aiff->tag(), p_item ); | ||
| 62 | else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) ) | ||
| 63 | - WriteMetaToId3v2( riff_wav->tag(), p_item ); | ||
| 64 | + WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item ); | ||
| 65 | } | ||
| 66 | else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) ) | ||
| 67 | { | ||
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.23.bb index 2d2ecc63b9..8f728226c6 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.23.bb | |||
| @@ -23,10 +23,8 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \ | |||
| 23 | file://0004-Use-packageconfig-to-detect-mmal-support.patch \ | 23 | file://0004-Use-packageconfig-to-detect-mmal-support.patch \ |
| 24 | file://0005-ioctl-does-not-have-same-signature-between-glibc-and.patch \ | 24 | file://0005-ioctl-does-not-have-same-signature-between-glibc-and.patch \ |
| 25 | file://0006-configure-Disable-incompatible-function-pointer-type.patch \ | 25 | file://0006-configure-Disable-incompatible-function-pointer-type.patch \ |
| 26 | file://taglib-2.patch \ | ||
| 27 | file://0001-taglib-Fix-build-on-x86-32-bit.patch \ | ||
| 28 | " | 26 | " |
| 29 | SRC_URI[sha256sum] = "24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0" | 27 | SRC_URI[sha256sum] = "e891cae6aa3ccda69bf94173d5105cbc55c7a7d9b1d21b9b21666e69eff3e7e0" |
| 30 | inherit autotools-brokensep features_check gettext pkgconfig mime-xdg | 28 | inherit autotools-brokensep features_check gettext pkgconfig mime-xdg |
| 31 | 29 | ||
| 32 | REQUIRED_DISTRO_FEATURES = "x11" | 30 | REQUIRED_DISTRO_FEATURES = "x11" |
| @@ -44,8 +42,9 @@ EXTRA_OECONF = "\ | |||
| 44 | --without-contrib \ | 42 | --without-contrib \ |
| 45 | --without-kde-solid \ | 43 | --without-kde-solid \ |
| 46 | --enable-realrtsp \ | 44 | --enable-realrtsp \ |
| 47 | --disable-libtar \ | ||
| 48 | --enable-avcodec \ | 45 | --enable-avcodec \ |
| 46 | --disable-opencv \ | ||
| 47 | --disable-freerdp \ | ||
| 49 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ | 48 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ |
| 50 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ | 49 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ |
| 51 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ | 50 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ |
| @@ -69,12 +68,10 @@ PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${p | |||
| 69 | PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" | 68 | PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" |
| 70 | PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" | 69 | PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" |
| 71 | PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" | 70 | PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" |
| 72 | PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" | ||
| 73 | PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" | 71 | PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" |
| 74 | PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" | 72 | PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" |
| 75 | PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" | 73 | PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" |
| 76 | PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" | 74 | PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" |
| 77 | PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" | ||
| 78 | PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" | 75 | PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" |
| 79 | PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" | 76 | PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" |
| 80 | PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" | 77 | PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" |
| @@ -94,7 +91,12 @@ PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" | |||
| 94 | PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" | 91 | PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" |
| 95 | PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" | 92 | PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" |
| 96 | PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" | 93 | PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" |
| 97 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" | 94 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native wayland-protocols" |
| 95 | |||
| 96 | do_configure:prepend() { | ||
| 97 | # use wayland-scanner from native sysroot instead of build host | ||
| 98 | sed -i 's,\(WAYLAND_SCANNER=\).*,\1${STAGING_BINDIR_NATIVE}/wayland-scanner,' configure.ac | ||
| 99 | } | ||
| 98 | 100 | ||
| 99 | do_configure:append() { | 101 | do_configure:append() { |
| 100 | # moc needs support: precreate build paths | 102 | # moc needs support: precreate build paths |
| @@ -117,7 +119,7 @@ FILES:${PN} += "\ | |||
| 117 | ${datadir}/applications \ | 119 | ${datadir}/applications \ |
| 118 | ${datadir}/vlc/ \ | 120 | ${datadir}/vlc/ \ |
| 119 | ${datadir}/icons \ | 121 | ${datadir}/icons \ |
| 120 | ${datadir}/metainfo/vlc.appdata.xml \ | 122 | ${datadir}/metainfo/org.videolan.vlc.appdata.xml \ |
| 121 | " | 123 | " |
| 122 | 124 | ||
| 123 | FILES:${PN}-dbg += "\ | 125 | FILES:${PN}-dbg += "\ |
| @@ -133,4 +135,5 @@ INSANE_SKIP:${PN} = "dev-so" | |||
| 133 | 135 | ||
| 134 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" | 136 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" |
| 135 | 137 | ||
| 136 | SKIP_RECIPE[vlc] = "requires porting to ffmpeg >= 7 as of ffmpeg >= 5 it requires extensive changes disabling VAAPI (only supported with vlc >= 4)" | 138 | CVE_STATUS[CVE-2026-26227] = "not-applicable-platform: the vulnerability is Android-specific" |
| 139 | CVE_STATUS[CVE-2026-26228] = "not-applicable-platform: the vulnerability is Android-specific" | ||
diff --git a/meta-networking/README.md b/meta-networking/README.md index ab2640618f..f8337b0c5b 100644 --- a/meta-networking/README.md +++ b/meta-networking/README.md | |||
| @@ -3,7 +3,7 @@ meta-networking | |||
| 3 | 3 | ||
| 4 | This layer is intended to be a central point for networking-related | 4 | This layer is intended to be a central point for networking-related |
| 5 | packages and configuration. It should be useful directly on top of | 5 | packages and configuration. It should be useful directly on top of |
| 6 | oe-core and compliments meta-openembedded. It should be primarily useful | 6 | oe-core and complements meta-openembedded. It should be primarily useful |
| 7 | to the following groups: | 7 | to the following groups: |
| 8 | 8 | ||
| 9 | - Anyone building a small networking device (eg. a home router / | 9 | - Anyone building a small networking device (eg. a home router / |
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index 58126a575f..18256167a3 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf | |||
| @@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1" | |||
| 15 | 15 | ||
| 16 | LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" | 16 | LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" |
| 17 | 17 | ||
| 18 | LAYERSERIES_COMPAT_networking-layer = "walnascar whinlatter" | 18 | LAYERSERIES_COMPAT_networking-layer = "whinlatter wrynose" |
| 19 | 19 | ||
| 20 | LICENSE_PATH += "${LAYERDIR}/licenses" | 20 | LICENSE_PATH += "${LAYERDIR}/licenses" |
| 21 | 21 | ||
diff --git a/meta-networking/recipes-connectivity/daq/libdaq_3.0.23.bb b/meta-networking/recipes-connectivity/daq/libdaq_3.0.25.bb index 8e1d707174..b999f385a6 100644 --- a/meta-networking/recipes-connectivity/daq/libdaq_3.0.23.bb +++ b/meta-networking/recipes-connectivity/daq/libdaq_3.0.25.bb | |||
| @@ -12,7 +12,7 @@ inherit autotools pkgconfig | |||
| 12 | SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master;tag=v${PV} \ | 12 | SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master;tag=v${PV} \ |
| 13 | file://0001-example-Use-lm-for-the-fst-module.patch" | 13 | file://0001-example-Use-lm-for-the-fst-module.patch" |
| 14 | 14 | ||
| 15 | SRCREV = "f14981a2f83a57c86d125ad926b9c7788737f52d" | 15 | SRCREV = "7baba902b3fee7a81be663bfb71418402411c24a" |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | FILES:${PN} += "${libdir}/daq/*.so" | 18 | FILES:${PN} += "${libdir}/daq/*.so" |
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb index 42ecf9bac4..7a392b2c23 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb +++ b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb | |||
| @@ -10,8 +10,15 @@ SRC_URI = "http://sourceforge.net/projects/ez-ipupdate/files/${BPN}/${PV}/${BPN} | |||
| 10 | file://conf_file.c.patch \ | 10 | file://conf_file.c.patch \ |
| 11 | file://wformat.patch \ | 11 | file://wformat.patch \ |
| 12 | file://0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch \ | 12 | file://0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch \ |
| 13 | file://CVE-2003-0887.patch \ | ||
| 13 | " | 14 | " |
| 14 | SRC_URI[md5sum] = "525be4550b4461fdf105aed8e753b020" | 15 | SRC_URI[md5sum] = "525be4550b4461fdf105aed8e753b020" |
| 15 | SRC_URI[sha256sum] = "a15ec0dc0b78ec7578360987c68e43a67bc8d3591cbf528a323588830ae22c20" | 16 | SRC_URI[sha256sum] = "a15ec0dc0b78ec7578360987c68e43a67bc8d3591cbf528a323588830ae22c20" |
| 16 | 17 | ||
| 17 | inherit autotools pkgconfig | 18 | inherit autotools pkgconfig |
| 19 | |||
| 20 | do_install:append(){ | ||
| 21 | install -m 0744 -d ${D}${localstatedir}/lib/ez-ipupdate | ||
| 22 | } | ||
| 23 | |||
| 24 | FILES:${PN} += "${localstatedir}/lib/ez-ipupdate" | ||
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch new file mode 100644 index 0000000000..53aa355008 --- /dev/null +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch | |||
| @@ -0,0 +1,158 @@ | |||
| 1 | From cd8fa738b0ed3b5fb89ac00068fdc2e20c1b6169 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Mon, 2 Feb 2026 14:03:01 +0100 | ||
| 4 | Subject: [PATCH] CVE-2003-0887 | ||
| 5 | |||
| 6 | The vulnerability is about exmaple config files placing cache files | ||
| 7 | into a world-writable directory (/tmp) instead of something more | ||
| 8 | secure. | ||
| 9 | |||
| 10 | This patch changes this path to /var/lib/ez-ipupdate, which is | ||
| 11 | not world-writable by default. | ||
| 12 | |||
| 13 | CVE: CVE-2003-0887 | ||
| 14 | Upstream-Status: Inactive-Upstream [lastcommit: 2002] | ||
| 15 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 16 | --- | ||
| 17 | example-dhs.conf | 2 +- | ||
| 18 | example-dyndns.conf | 2 +- | ||
| 19 | example-dyns.conf | 2 +- | ||
| 20 | example-easydns.conf | 2 +- | ||
| 21 | example-gnudip.conf | 2 +- | ||
| 22 | example-heipv6tb.conf | 2 +- | ||
| 23 | example-justlinux.conf | 2 +- | ||
| 24 | example-ods.conf | 2 +- | ||
| 25 | example-pgpow.conf | 2 +- | ||
| 26 | example-tzo.conf | 2 +- | ||
| 27 | 10 files changed, 10 insertions(+), 10 deletions(-) | ||
| 28 | |||
| 29 | diff --git a/example-dhs.conf b/example-dhs.conf | ||
| 30 | index 3fe9a04..f976ae5 100755 | ||
| 31 | --- a/example-dhs.conf | ||
| 32 | +++ b/example-dhs.conf | ||
| 33 | @@ -11,7 +11,7 @@ host=mydomain.whatever.com | ||
| 34 | interface=eth1 | ||
| 35 | |||
| 36 | # if you use run-as ensure the user has permission to write this file | ||
| 37 | -cache-file=/tmp/ez-ipupdate.cache | ||
| 38 | +cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 39 | |||
| 40 | # uncomment this once you have everything working how you want and you are | ||
| 41 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
| 42 | diff --git a/example-dyndns.conf b/example-dyndns.conf | ||
| 43 | index f539dec..84b4807 100755 | ||
| 44 | --- a/example-dyndns.conf | ||
| 45 | +++ b/example-dyndns.conf | ||
| 46 | @@ -19,7 +19,7 @@ max-interval=2073600 | ||
| 47 | #cache-file=/etc/ez-ipupdate.cache.eth1 | ||
| 48 | |||
| 49 | # for the mean time we'll just use a cache file in the temp directory | ||
| 50 | -cache-file=/tmp/ez-ipupdate.cache | ||
| 51 | +cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 52 | |||
| 53 | # uncomment this once you have everything working how you want and you are | ||
| 54 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
| 55 | diff --git a/example-dyns.conf b/example-dyns.conf | ||
| 56 | index 868768d..856a4d7 100644 | ||
| 57 | --- a/example-dyns.conf | ||
| 58 | +++ b/example-dyns.conf | ||
| 59 | @@ -11,7 +11,7 @@ host=myhost | ||
| 60 | #interface=eth1 | ||
| 61 | |||
| 62 | # if you use run-as ensure the user has permission to write this file | ||
| 63 | -#cache-file=/tmp/ez-ipupdate.cache | ||
| 64 | +#cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 65 | |||
| 66 | # uncomment this once you have everything working how you want and you are | ||
| 67 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
| 68 | diff --git a/example-easydns.conf b/example-easydns.conf | ||
| 69 | index 0ff20da..15d9b78 100755 | ||
| 70 | --- a/example-easydns.conf | ||
| 71 | +++ b/example-easydns.conf | ||
| 72 | @@ -11,7 +11,7 @@ host=mydomain.whatever.com | ||
| 73 | interface=eth1 | ||
| 74 | |||
| 75 | # if you use run-as ensure the user has permission to write this file | ||
| 76 | -cache-file=/tmp/ez-ipupdate.cache | ||
| 77 | +cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 78 | |||
| 79 | # uncomment this once you have everything working how you want and you are | ||
| 80 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
| 81 | diff --git a/example-gnudip.conf b/example-gnudip.conf | ||
| 82 | index 3b2fb63..d09df1f 100755 | ||
| 83 | --- a/example-gnudip.conf | ||
| 84 | +++ b/example-gnudip.conf | ||
| 85 | @@ -15,7 +15,7 @@ max-interval=2073600 | ||
| 86 | #address=0.0.0.0 | ||
| 87 | |||
| 88 | # if you use run-as ensure the user has permission to write this file | ||
| 89 | -cache-file=/tmp/ez-ipupdate.cache | ||
| 90 | +cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 91 | |||
| 92 | # uncomment this once you have everything working how you want and you are | ||
| 93 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
| 94 | diff --git a/example-heipv6tb.conf b/example-heipv6tb.conf | ||
| 95 | index e31aa9c..3ebc822 100644 | ||
| 96 | --- a/example-heipv6tb.conf | ||
| 97 | +++ b/example-heipv6tb.conf | ||
| 98 | @@ -18,7 +18,7 @@ max-interval=2073600 | ||
| 99 | #cache-file=/etc/ez-ipupdate.cache.eth1 | ||
| 100 | |||
| 101 | # for the mean time we'll just use a cache file in the temp directory | ||
| 102 | -cache-file=/tmp/ez-ipupdate.cache | ||
| 103 | +cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 104 | |||
| 105 | # uncomment this once you have everything working how you want and you are | ||
| 106 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
| 107 | diff --git a/example-justlinux.conf b/example-justlinux.conf | ||
| 108 | index 0afeb2c..28b3327 100755 | ||
| 109 | --- a/example-justlinux.conf | ||
| 110 | +++ b/example-justlinux.conf | ||
| 111 | @@ -11,7 +11,7 @@ host=mydomain.penguinpowered.com | ||
| 112 | interface=eth1 | ||
| 113 | |||
| 114 | # if you use run-as ensure the user has permission to write this file | ||
| 115 | -cache-file=/tmp/ez-ipupdate.cache | ||
| 116 | +cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 117 | |||
| 118 | # uncomment this once you have everything working how you want and you are | ||
| 119 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
| 120 | diff --git a/example-ods.conf b/example-ods.conf | ||
| 121 | index d0ff889..7b16f2c 100755 | ||
| 122 | --- a/example-ods.conf | ||
| 123 | +++ b/example-ods.conf | ||
| 124 | @@ -11,7 +11,7 @@ host=mydomain.ods.org | ||
| 125 | interface=eth1 | ||
| 126 | |||
| 127 | # if you use run-as ensure the user has permission to write this file | ||
| 128 | -cache-file=/tmp/ez-ipupdate.cache | ||
| 129 | +cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 130 | |||
| 131 | # uncomment this once you have everything working how you want and you are | ||
| 132 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
| 133 | diff --git a/example-pgpow.conf b/example-pgpow.conf | ||
| 134 | index 29a92d6..81e351b 100755 | ||
| 135 | --- a/example-pgpow.conf | ||
| 136 | +++ b/example-pgpow.conf | ||
| 137 | @@ -11,7 +11,7 @@ host=mydomain.penguinpowered.com | ||
| 138 | interface=eth1 | ||
| 139 | |||
| 140 | # if you use run-as ensure the user has permission to write this file | ||
| 141 | -cache-file=/tmp/ez-ipupdate.cache | ||
| 142 | +cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 143 | |||
| 144 | # uncomment this once you have everything working how you want and you are | ||
| 145 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
| 146 | diff --git a/example-tzo.conf b/example-tzo.conf | ||
| 147 | index 2a71db3..10b8dc4 100755 | ||
| 148 | --- a/example-tzo.conf | ||
| 149 | +++ b/example-tzo.conf | ||
| 150 | @@ -15,7 +15,7 @@ max-interval=2073600 | ||
| 151 | interface=eth1 | ||
| 152 | |||
| 153 | # if you use run-as ensure the user has permission to write this file | ||
| 154 | -cache-file=/tmp/ez-ipupdate.cache | ||
| 155 | +cache-file=/var/lib/ez-ipupdate/ez-ipupdate.cache | ||
| 156 | |||
| 157 | # uncomment this once you have everything working how you want and you are | ||
| 158 | # ready to have ez-ipupdate running in the background all the time. to stop it | ||
diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.0.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.2.bb index f79121b142..41745adbde 100644 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.0.bb +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.2.bb | |||
| @@ -4,9 +4,9 @@ SECTION = "libs" | |||
| 4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/ofalk/libdnet.git;nobranch=1;protocol=https" | 7 | SRC_URI = "git://github.com/ofalk/libdnet.git;nobranch=1;protocol=https;tag=${BPN}-${PV}" |
| 8 | 8 | ||
| 9 | SRCREV = "3dfbe889b1f65077efe579da34fc1d6819fcb7f3" | 9 | SRCREV = "024ab07d88a2f70ab161cfc0a41f460cb046133f" |
| 10 | 10 | ||
| 11 | UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" | 11 | UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" |
| 12 | 12 | ||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-meson-fix-cross-compilation-issues.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-meson-fix-cross-compilation-issues.patch new file mode 100644 index 0000000000..617c614958 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-meson-fix-cross-compilation-issues.patch | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | From 49cc7ebaf3ed86b693ac80c76a28ba0db7406374 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andrej Kozemcak <andrej.kozemcak@siemens.com> | ||
| 3 | Date: Mon, 9 Mar 2026 15:50:26 +0100 | ||
| 4 | Subject: [PATCH] meson: fix cross-compilation issues | ||
| 5 | |||
| 6 | Strip newline from GI_TYPELIB_PATH and LD_LIBRARY_PATH | ||
| 7 | run_command().stdout() returns the raw shell output including a trailing | ||
| 8 | newline. When the value is used to build a colon-separated path, the newline | ||
| 9 | gets embedded at the end of the last path component, making the directory | ||
| 10 | invalid and causing GObject Introspection to fail with: | ||
| 11 | |||
| 12 | ImportError: Typelib file for namespace 'Gio', version '2.0' not found | ||
| 13 | |||
| 14 | Use .strip() to remove leading/trailing whitespace from both env variable | ||
| 15 | reads. | ||
| 16 | |||
| 17 | Fix jansson SONAME detection for cross-compilation | ||
| 18 | When cross-compiling, jansson's pkg-config 'libdir' variable returns a | ||
| 19 | path relative to the sysroot (e.g., /usr/lib) without the actual sysroot | ||
| 20 | prefix. The host readelf binary cannot find the library at that path. | ||
| 21 | |||
| 22 | Fix this by using meson.get_external_property('sys_root', '') to obtain | ||
| 23 | the sysroot path set by the cross-compilation environment and prepend it | ||
| 24 | to the library path before calling readelf. | ||
| 25 | |||
| 26 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2380] | ||
| 27 | Signed-off-by: Andrej Kozemcak <andrej.kozemcak@siemens.com> | ||
| 28 | --- | ||
| 29 | meson.build | 3 ++- | ||
| 30 | src/libnm-client-impl/meson.build | 4 ++-- | ||
| 31 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
| 32 | |||
| 33 | diff --git a/meson.build b/meson.build | ||
| 34 | index 8b0334240d..75f6871dd2 100644 | ||
| 35 | --- a/meson.build | ||
| 36 | +++ b/meson.build | ||
| 37 | @@ -296,7 +296,8 @@ config_h.set10('WITH_JANSSON', jansson_dep.found()) | ||
| 38 | jansson_msg = 'no' | ||
| 39 | if jansson_dep.found() | ||
| 40 | jansson_libdir = jansson_dep.get_variable(pkgconfig: 'libdir') | ||
| 41 | - res = run_command(find_program('eu-readelf', 'readelf'), '-d', join_paths(jansson_libdir, 'libjansson.so'), check: false) | ||
| 42 | + jansson_sysroot = meson.is_cross_build() ? meson.get_external_property('sys_root', '') : '' | ||
| 43 | + res = run_command(find_program('eu-readelf', 'readelf'), '-d', jansson_sysroot + join_paths(jansson_libdir, 'libjansson.so'), check: false) | ||
| 44 | jansson_soname = '' | ||
| 45 | foreach line: res.stdout().split('\n') | ||
| 46 | if line.strip().contains('SONAME') | ||
| 47 | diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build | ||
| 48 | index 3352ebfee0..329078ab46 100644 | ||
| 49 | --- a/src/libnm-client-impl/meson.build | ||
| 50 | +++ b/src/libnm-client-impl/meson.build | ||
| 51 | @@ -167,13 +167,13 @@ if enable_introspection | ||
| 52 | install: true, | ||
| 53 | ) | ||
| 54 | |||
| 55 | - gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH', check: false).stdout() | ||
| 56 | + gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH', check: false).stdout().strip() | ||
| 57 | if gi_typelib_path != '' | ||
| 58 | gi_typelib_path = ':' + gi_typelib_path | ||
| 59 | endif | ||
| 60 | gi_typelib_path = meson.current_build_dir() + gi_typelib_path | ||
| 61 | |||
| 62 | - ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH', check: false).stdout() | ||
| 63 | + ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH', check: false).stdout().strip() | ||
| 64 | if ld_library_path != '' | ||
| 65 | ld_library_path = ':' + ld_library_path | ||
| 66 | endif | ||
| 67 | -- | ||
| 68 | 2.47.3 | ||
| 69 | |||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb index cafc6ce3f2..de163fe00e 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.2.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb | |||
| @@ -38,14 +38,15 @@ DEPENDS:append:class-target = " bash-completion" | |||
| 38 | inherit meson gettext update-rc.d systemd gobject-introspection update-alternatives upstream-version-is-even pkgconfig | 38 | inherit meson gettext update-rc.d systemd gobject-introspection update-alternatives upstream-version-is-even pkgconfig |
| 39 | 39 | ||
| 40 | SRC_URI = " \ | 40 | SRC_URI = " \ |
| 41 | git://github.com/NetworkManager/NetworkManager.git;protocol=https;branch=nm-1-52;tag=${PV} \ | 41 | git://github.com/NetworkManager/NetworkManager.git;protocol=https;branch=nm-1-56;tag=${PV} \ |
| 42 | file://${BPN}.initd \ | 42 | file://${BPN}.initd \ |
| 43 | file://enable-dhcpcd.conf \ | 43 | file://enable-dhcpcd.conf \ |
| 44 | file://enable-iwd.conf \ | 44 | file://enable-iwd.conf \ |
| 45 | file://0002-meson-fix-cross-compilation-issues.patch \ | ||
| 45 | " | 46 | " |
| 46 | SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" | 47 | SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" |
| 47 | 48 | ||
| 48 | SRCREV = "57a409441bef013f636ac8e72836c19ecb27c1b9" | 49 | SRCREV = "56b51b98fbb8627c4c09a483702e18fd8aee7ce1" |
| 49 | 50 | ||
| 50 | 51 | ||
| 51 | # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] | 52 | # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] |
| @@ -68,6 +69,7 @@ EXTRA_OEMESON = "\ | |||
| 68 | -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ | 69 | -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ |
| 69 | -Diptables=${sbindir}/iptables \ | 70 | -Diptables=${sbindir}/iptables \ |
| 70 | -Dnft=${sbindir}/nft \ | 71 | -Dnft=${sbindir}/nft \ |
| 72 | -Dman=false \ | ||
| 71 | " | 73 | " |
| 72 | 74 | ||
| 73 | # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template | 75 | # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template |
| @@ -80,7 +82,7 @@ CFLAGS:append:libc-musl = " \ | |||
| 80 | # networkmanager-1.52.0/src/nmcli/agent.c:88:29: error: incompatible function pointer types assigning to 'rl_hook_func_t *' (aka 'int (*)(void)') from 'int (const char *, int)' [-Wincompatible-function-pointer-types] | 82 | # networkmanager-1.52.0/src/nmcli/agent.c:88:29: error: incompatible function pointer types assigning to 'rl_hook_func_t *' (aka 'int (*)(void)') from 'int (const char *, int)' [-Wincompatible-function-pointer-types] |
| 81 | # 88 | rl_startup_hook = set_deftext; | 83 | # 88 | rl_startup_hook = set_deftext; |
| 82 | # | ^ ~~~~~~~~~~~ | 84 | # | ^ ~~~~~~~~~~~ |
| 83 | 85 | ||
| 84 | CFLAGS:append:toolchain-clang = " -Wno-error=incompatible-function-pointer-types" | 86 | CFLAGS:append:toolchain-clang = " -Wno-error=incompatible-function-pointer-types" |
| 85 | 87 | ||
| 86 | PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \ | 88 | PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \ |
| @@ -111,13 +113,13 @@ PACKAGECONFIG[crypto-null] = "-Dcrypto=null" | |||
| 111 | PACKAGECONFIG[wifi] = "-Dwext=true -Dwifi=true,-Dwext=false -Dwifi=false" | 113 | PACKAGECONFIG[wifi] = "-Dwext=true -Dwifi=true,-Dwext=false -Dwifi=false" |
| 112 | PACKAGECONFIG[iwd] = "-Diwd=true,-Diwd=false" | 114 | PACKAGECONFIG[iwd] = "-Diwd=true,-Diwd=false" |
| 113 | PACKAGECONFIG[ifupdown] = "-Difupdown=true,-Difupdown=false" | 115 | PACKAGECONFIG[ifupdown] = "-Difupdown=true,-Difupdown=false" |
| 114 | PACKAGECONFIG[cloud-setup] = "-Dnm_cloud_setup=true,-Dnm_cloud_setup=false" | 116 | PACKAGECONFIG[cloud-setup] = "-Dnm_cloud_setup=true,-Dnm_cloud_setup=false,jansson" |
| 115 | PACKAGECONFIG[nmcli] = "-Dnmcli=true,-Dnmcli=false" | 117 | PACKAGECONFIG[nmcli] = "-Dnmcli=true,-Dnmcli=false" |
| 116 | PACKAGECONFIG[nmtui] = "-Dnmtui=true,-Dnmtui=false,libnewt" | 118 | PACKAGECONFIG[nmtui] = "-Dnmtui=true,-Dnmtui=false,libnewt" |
| 117 | PACKAGECONFIG[readline] = "-Dreadline=libreadline,,readline" | 119 | PACKAGECONFIG[readline] = "-Dreadline=libreadline,,readline" |
| 118 | PACKAGECONFIG[libedit] = "-Dreadline=libedit,,libedit" | 120 | PACKAGECONFIG[libedit] = "-Dreadline=libedit,,libedit" |
| 119 | PACKAGECONFIG[ovs] = "-Dovs=true,-Dovs=false,jansson" | 121 | PACKAGECONFIG[ovs] = "-Dovs=true,-Dovs=false,jansson" |
| 120 | PACKAGECONFIG[audit] = "-Dlibaudit=yes,-Dlibaudit=no" | 122 | PACKAGECONFIG[audit] = "-Dlibaudit=yes,-Dlibaudit=no,audit" |
| 121 | PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux" | 123 | PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux" |
| 122 | PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" | 124 | PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" |
| 123 | PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=${base_sbindir}/dhcpcd,-Ddhcpcd=no,,dhcpcd" | 125 | PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=${base_sbindir}/dhcpcd,-Ddhcpcd=no,,dhcpcd" |
| @@ -127,6 +129,7 @@ PACKAGECONFIG[adsl] = ",," | |||
| 127 | PACKAGECONFIG[wwan] = ",," | 129 | PACKAGECONFIG[wwan] = ",," |
| 128 | # The following PACKAGECONFIG is used to determine whether NM is managing /etc/resolv.conf itself or not | 130 | # The following PACKAGECONFIG is used to determine whether NM is managing /etc/resolv.conf itself or not |
| 129 | PACKAGECONFIG[man-resolv-conf] = ",," | 131 | PACKAGECONFIG[man-resolv-conf] = ",," |
| 132 | PACKAGECONFIG[nbft] = "-Dnbft=true,-Dnbft=false" | ||
| 130 | 133 | ||
| 131 | 134 | ||
| 132 | PACKAGES =+ " \ | 135 | PACKAGES =+ " \ |
diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch index a498348c20..afa1154827 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch | |||
| @@ -9,25 +9,14 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> | |||
| 9 | 9 | ||
| 10 | Rebase to 4.14.4 | 10 | Rebase to 4.14.4 |
| 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 12 | |||
| 13 | Rebase to 4.23.5 | ||
| 14 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 12 | --- | 15 | --- |
| 13 | lib/ldb/wscript | 2 +- | ||
| 14 | lib/talloc/wscript | 2 +- | 16 | lib/talloc/wscript | 2 +- |
| 15 | lib/tdb/wscript | 2 +- | 17 | lib/tdb/wscript | 2 +- |
| 16 | 3 files changed, 3 insertions(+), 3 deletions(-) | 18 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 17 | 19 | ||
| 18 | diff --git a/lib/ldb/wscript b/lib/ldb/wscript | ||
| 19 | index ed5d45f..de3c648 100644 | ||
| 20 | --- a/lib/ldb/wscript | ||
| 21 | +++ b/lib/ldb/wscript | ||
| 22 | @@ -144,7 +144,7 @@ def configure(conf): | ||
| 23 | conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) | ||
| 24 | |||
| 25 | if conf.env.standalone_ldb: | ||
| 26 | - conf.CHECK_XSLTPROC_MANPAGES() | ||
| 27 | + #conf.CHECK_XSLTPROC_MANPAGES() | ||
| 28 | |||
| 29 | # we need this for the ldap backend | ||
| 30 | if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): | ||
| 31 | diff --git a/lib/talloc/wscript b/lib/talloc/wscript | 20 | diff --git a/lib/talloc/wscript b/lib/talloc/wscript |
| 32 | index 075f1ec..9bd9f73 100644 | 21 | index 075f1ec..9bd9f73 100644 |
| 33 | --- a/lib/talloc/wscript | 22 | --- a/lib/talloc/wscript |
diff --git a/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch index 2c9d29c9fe..70e7f28cc7 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch | |||
| @@ -37,10 +37,10 @@ diff --git a/wscript b/wscript | |||
| 37 | index 95ddd9e..6d9577a 100644 | 37 | index 95ddd9e..6d9577a 100644 |
| 38 | --- a/wscript | 38 | --- a/wscript |
| 39 | +++ b/wscript | 39 | +++ b/wscript |
| 40 | @@ -123,6 +123,13 @@ def options(opt): | 40 | @@ -131,6 +131,13 @@ |
| 41 | help=('Disable kernely keyring support for credential storage'), | 41 | help=('Disable kernely keyring support for credential storage'), |
| 42 | action='store_false', dest='enable_keyring') | 42 | action='store_false', dest='enable_keyring') |
| 43 | 43 | ||
| 44 | + opt.add_option('--with-valgrind', | 44 | + opt.add_option('--with-valgrind', |
| 45 | + help=("Enable use of valgrind"), | 45 | + help=("Enable use of valgrind"), |
| 46 | + action="store_true", dest='enable_valgrind') | 46 | + action="store_true", dest='enable_valgrind') |
| @@ -48,9 +48,6 @@ index 95ddd9e..6d9577a 100644 | |||
| 48 | + help=("Disable use of valgrind"), | 48 | + help=("Disable use of valgrind"), |
| 49 | + action="store_false", dest='enable_valgrind', default=False) | 49 | + action="store_false", dest='enable_valgrind', default=False) |
| 50 | + | 50 | + |
| 51 | gr = opt.option_group('developer options') | 51 | opt.samba_add_onoff_option('ldap') |
| 52 | |||
| 53 | opt.load('python') # options for disabling pyc or pyo compilation | ||
| 54 | -- | ||
| 55 | 2.25.1 | ||
| 56 | 52 | ||
| 53 | opt.option_group('developer options') | ||
diff --git a/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch b/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch index a96cd062cd..74ea1a7ab4 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch | |||
| @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 15 | 15 | ||
| 16 | --- a/lib/replace/replace.h | 16 | --- a/lib/replace/replace.h |
| 17 | +++ b/lib/replace/replace.h | 17 | +++ b/lib/replace/replace.h |
| 18 | @@ -815,50 +815,50 @@ typedef unsigned long long ptrdiff_t ; | 18 | @@ -811,50 +811,50 @@ typedef unsigned long long ptrdiff_t ; |
| 19 | /** | 19 | /** |
| 20 | * Zero a structure. | 20 | * Zero a structure. |
| 21 | */ | 21 | */ |
| @@ -74,7 +74,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 74 | 74 | ||
| 75 | /** | 75 | /** |
| 76 | * Explicitly zero data in string. This is guaranteed to be not optimized | 76 | * Explicitly zero data in string. This is guaranteed to be not optimized |
| 77 | @@ -867,7 +867,7 @@ typedef unsigned long long ptrdiff_t ; | 77 | @@ -863,7 +863,7 @@ typedef unsigned long long ptrdiff_t ; |
| 78 | #define BURN_STR(x) do { \ | 78 | #define BURN_STR(x) do { \ |
| 79 | if ((x) != NULL) { \ | 79 | if ((x) != NULL) { \ |
| 80 | size_t s = strlen(x); \ | 80 | size_t s = strlen(x); \ |
| @@ -193,116 +193,3 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 193 | 193 | ||
| 194 | talloc_free(mem_ctx); | 194 | talloc_free(mem_ctx); |
| 195 | } | 195 | } |
| 196 | --- a/lib/cmdline/cmdline.c | ||
| 197 | +++ b/lib/cmdline/cmdline.c | ||
| 198 | @@ -358,7 +358,7 @@ bool samba_cmdline_burn(int argc, char * | ||
| 199 | p += ulen; | ||
| 200 | } | ||
| 201 | |||
| 202 | - memset_s(p, strlen(p), '\0', strlen(p)); | ||
| 203 | + memset_explicit(p, '\0', strlen(p)); | ||
| 204 | burnt = true; | ||
| 205 | } | ||
| 206 | } | ||
| 207 | --- a/lib/util/data_blob.c | ||
| 208 | +++ b/lib/util/data_blob.c | ||
| 209 | @@ -1,19 +1,19 @@ | ||
| 210 | -/* | ||
| 211 | +/* | ||
| 212 | Unix SMB/CIFS implementation. | ||
| 213 | Easy management of byte-length data | ||
| 214 | Copyright (C) Andrew Tridgell 2001 | ||
| 215 | Copyright (C) Andrew Bartlett 2001 | ||
| 216 | - | ||
| 217 | + | ||
| 218 | This program is free software; you can redistribute it and/or modify | ||
| 219 | it under the terms of the GNU General Public License as published by | ||
| 220 | the Free Software Foundation; either version 3 of the License, or | ||
| 221 | (at your option) any later version. | ||
| 222 | - | ||
| 223 | + | ||
| 224 | This program is distributed in the hope that it will be useful, | ||
| 225 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 226 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 227 | GNU General Public License for more details. | ||
| 228 | - | ||
| 229 | + | ||
| 230 | You should have received a copy of the GNU General Public License | ||
| 231 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 232 | */ | ||
| 233 | @@ -67,7 +67,7 @@ _PUBLIC_ DATA_BLOB data_blob_talloc_name | ||
| 234 | } | ||
| 235 | |||
| 236 | /** | ||
| 237 | - construct a zero data blob, using supplied TALLOC_CTX. | ||
| 238 | + construct a zero data blob, using supplied TALLOC_CTX. | ||
| 239 | use this sparingly as it initialises data - better to initialise | ||
| 240 | yourself if you want specific data in the blob | ||
| 241 | **/ | ||
| 242 | @@ -95,7 +95,7 @@ clear a DATA_BLOB's contents | ||
| 243 | _PUBLIC_ void data_blob_clear(DATA_BLOB *d) | ||
| 244 | { | ||
| 245 | if (d->data) { | ||
| 246 | - memset_s(d->data, d->length, 0, d->length); | ||
| 247 | + memset_explicit(d->data, 0, d->length); | ||
| 248 | } | ||
| 249 | } | ||
| 250 | |||
| 251 | @@ -219,7 +219,7 @@ _PUBLIC_ DATA_BLOB data_blob_string_cons | ||
| 252 | } | ||
| 253 | |||
| 254 | /** | ||
| 255 | - * Create a new data blob from const data | ||
| 256 | + * Create a new data blob from const data | ||
| 257 | */ | ||
| 258 | |||
| 259 | _PUBLIC_ DATA_BLOB data_blob_const(const void *p, size_t length) | ||
| 260 | @@ -266,7 +266,7 @@ _PUBLIC_ bool data_blob_append(TALLOC_CT | ||
| 261 | if ((const uint8_t *)p + length < (const uint8_t *)p) { | ||
| 262 | return false; | ||
| 263 | } | ||
| 264 | - | ||
| 265 | + | ||
| 266 | if (!data_blob_realloc(mem_ctx, blob, new_len)) { | ||
| 267 | return false; | ||
| 268 | } | ||
| 269 | --- a/lib/util/talloc_keep_secret.c | ||
| 270 | +++ b/lib/util/talloc_keep_secret.c | ||
| 271 | @@ -22,27 +22,13 @@ | ||
| 272 | |||
| 273 | static int talloc_keep_secret_destructor(void *ptr) | ||
| 274 | { | ||
| 275 | - int ret; | ||
| 276 | size_t size = talloc_get_size(ptr); | ||
| 277 | |||
| 278 | if (unlikely(size == 0)) { | ||
| 279 | return 0; | ||
| 280 | } | ||
| 281 | |||
| 282 | - ret = memset_s(ptr, size, 0, size); | ||
| 283 | - if (unlikely(ret != 0)) { | ||
| 284 | - char *msg = NULL; | ||
| 285 | - int ret2; | ||
| 286 | - ret2 = asprintf(&msg, | ||
| 287 | - "talloc_keep_secret_destructor: memset_s() failed: %s", | ||
| 288 | - strerror(ret)); | ||
| 289 | - if (ret2 != -1) { | ||
| 290 | - smb_panic(msg); | ||
| 291 | - } else { | ||
| 292 | - smb_panic("talloc_keep_secret_destructor: memset_s() failed"); | ||
| 293 | - } | ||
| 294 | - } | ||
| 295 | - | ||
| 296 | + memset_explicit(ptr, 0, size); | ||
| 297 | return 0; | ||
| 298 | } | ||
| 299 | |||
| 300 | --- a/librpc/ndr/util.c | ||
| 301 | +++ b/librpc/ndr/util.c | ||
| 302 | @@ -32,5 +32,5 @@ _PUBLIC_ void ndr_print_sockaddr_storage | ||
| 303 | |||
| 304 | _PUBLIC_ void ndr_zero_memory(void *ptr, size_t len) | ||
| 305 | { | ||
| 306 | - memset_s(ptr, len, 0, len); | ||
| 307 | + memset_explicit(ptr, 0, len); | ||
| 308 | } | ||
diff --git a/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch index c72bd133ee..88acfeef07 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch | |||
| @@ -19,7 +19,7 @@ diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript | |||
| 19 | index 30cb366..d167551 100644 | 19 | index 30cb366..d167551 100644 |
| 20 | --- a/buildtools/wafsamba/wscript | 20 | --- a/buildtools/wafsamba/wscript |
| 21 | +++ b/buildtools/wafsamba/wscript | 21 | +++ b/buildtools/wafsamba/wscript |
| 22 | @@ -145,6 +145,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''), | 22 | @@ -155,6 +155,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''), |
| 23 | help=("Disable use of gettext"), | 23 | help=("Disable use of gettext"), |
| 24 | action="store_true", dest='disable_gettext', default=False) | 24 | action="store_true", dest='disable_gettext', default=False) |
| 25 | 25 | ||
| @@ -37,40 +37,60 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript | |||
| 37 | index 9dd9b48..a22ae59 100644 | 37 | index 9dd9b48..a22ae59 100644 |
| 38 | --- a/lib/replace/wscript | 38 | --- a/lib/replace/wscript |
| 39 | +++ b/lib/replace/wscript | 39 | +++ b/lib/replace/wscript |
| 40 | @@ -444,20 +444,21 @@ def configure(conf): | 40 | @@ -444,31 +444,32 @@ |
| 41 | 41 | ||
| 42 | strlcpy_in_bsd = False | 42 | strlcpy_in_bsd = False |
| 43 | 43 | ||
| 44 | - # libbsd on some platforms provides strlcpy and strlcat | 44 | - # libbsd on some platforms provides strlcpy and strlcat |
| 45 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): | 45 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): |
| 46 | - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | 46 | - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', |
| 47 | - checklibc=True): | 47 | - checklibc=True): |
| 48 | - strlcpy_in_bsd = True | 48 | - strlcpy_in_bsd = True |
| 49 | - if not conf.CHECK_FUNCS('getpeereid'): | 49 | - elif conf.env.enable_fuzzing: |
| 50 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 50 | - # Just to complicate it more, some versions of Honggfuzz have |
| 51 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 51 | - # got strlcpy and strlcat in libc, but not in <string.h> |
| 52 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | 52 | - # (unless it is there coincidentally, on a BSD). Therefore we |
| 53 | - if not conf.CHECK_FUNCS('setproctitle_init'): | 53 | - # can't use CHECK_FUNCS alone to decide whether to add the |
| 54 | - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | 54 | - # headers to replace.h. |
| 55 | - | 55 | - # |
| 56 | - if not conf.CHECK_FUNCS('closefrom'): | 56 | - # As this is only known to happen on a fuzzing compiler, we'll |
| 57 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 57 | - # skip the check when not in fuzzing mode. |
| 58 | - conf.CHECK_HEADERS('bsd/string.h') | ||
| 58 | + if Options.options.enable_libbsd: | 59 | + if Options.options.enable_libbsd: |
| 59 | + # libbsd on some platforms provides strlcpy and strlcat | 60 | + # libbsd on some platforms provides strlcpy and strlcat |
| 60 | + if not conf.CHECK_FUNCS('strlcpy strlcat'): | 61 | + if not conf.CHECK_FUNCS('strlcpy strlcat'): |
| 61 | + if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | 62 | + if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', |
| 62 | + checklibc=True): | 63 | + checklibc=True): |
| 63 | + strlcpy_in_bsd = True | 64 | + strlcpy_in_bsd = True |
| 65 | + elif conf.env.enable_fuzzing: | ||
| 66 | + # Just to complicate it more, some versions of Honggfuzz have | ||
| 67 | + # got strlcpy and strlcat in libc, but not in <string.h> | ||
| 68 | + # (unless it is there coincidentally, on a BSD). Therefore we | ||
| 69 | + # can't use CHECK_FUNCS alone to decide whether to add the | ||
| 70 | + # headers to replace.h. | ||
| 71 | + # | ||
| 72 | + # As this is only known to happen on a fuzzing compiler, we'll | ||
| 73 | + # skip the check when not in fuzzing mode. | ||
| 74 | + conf.CHECK_HEADERS('bsd/string.h') | ||
| 75 | |||
| 76 | - if not conf.CHECK_FUNCS('getpeereid'): | ||
| 77 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
| 78 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | ||
| 79 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
| 80 | - if not conf.CHECK_FUNCS('setproctitle_init'): | ||
| 81 | - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
| 64 | + if not conf.CHECK_FUNCS('getpeereid'): | 82 | + if not conf.CHECK_FUNCS('getpeereid'): |
| 65 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 83 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') |
| 66 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 84 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): |
| 67 | + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | 85 | + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') |
| 68 | + if not conf.CHECK_FUNCS('setproctitle_init'): | 86 | + if not conf.CHECK_FUNCS('setproctitle_init'): |
| 69 | + conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | 87 | + conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') |
| 70 | + | 88 | |
| 89 | - if not conf.CHECK_FUNCS('closefrom'): | ||
| 90 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | ||
| 71 | + if not conf.CHECK_FUNCS('closefrom'): | 91 | + if not conf.CHECK_FUNCS('closefrom'): |
| 72 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 92 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') |
| 73 | 93 | ||
| 74 | conf.CHECK_CODE(''' | 94 | conf.CHECK_CODE(''' |
| 75 | struct ucred cred; | 95 | struct ucred cred; |
| 76 | diff --git a/lib/texpect/wscript b/lib/texpect/wscript | 96 | diff --git a/lib/texpect/wscript b/lib/texpect/wscript |
diff --git a/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch b/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch index 409c36da7c..6e01ae35e7 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch | |||
| @@ -24,7 +24,7 @@ diff --git a/lib/replace/README b/lib/replace/README | |||
| 24 | index bb9d008..d8431e7 100644 | 24 | index bb9d008..d8431e7 100644 |
| 25 | --- a/lib/replace/README | 25 | --- a/lib/replace/README |
| 26 | +++ b/lib/replace/README | 26 | +++ b/lib/replace/README |
| 27 | @@ -74,7 +74,6 @@ realpath | 27 | @@ -73,7 +73,6 @@ realpath |
| 28 | poll | 28 | poll |
| 29 | setproctitle | 29 | setproctitle |
| 30 | memset_explicit | 30 | memset_explicit |
| @@ -36,219 +36,10 @@ diff --git a/lib/replace/replace.c b/lib/replace/replace.c | |||
| 36 | index 8615899..a419837 100644 | 36 | index 8615899..a419837 100644 |
| 37 | --- a/lib/replace/replace.c | 37 | --- a/lib/replace/replace.c |
| 38 | +++ b/lib/replace/replace.c | 38 | +++ b/lib/replace/replace.c |
| 39 | @@ -1,4 +1,4 @@ | 39 | @@ -965,37 +965,6 @@ |
| 40 | -/* | ||
| 41 | +/* | ||
| 42 | Unix SMB/CIFS implementation. | ||
| 43 | replacement routines for broken systems | ||
| 44 | Copyright (C) Andrew Tridgell 1992-1998 | ||
| 45 | @@ -8,7 +8,7 @@ | ||
| 46 | ** NOTE! The following LGPL license applies to the replace | ||
| 47 | ** library. This does NOT imply that all of Samba is released | ||
| 48 | ** under the LGPL | ||
| 49 | - | ||
| 50 | + | ||
| 51 | This library is free software; you can redistribute it and/or | ||
| 52 | modify it under the terms of the GNU Lesser General Public | ||
| 53 | License as published by the Free Software Foundation; either | ||
| 54 | @@ -91,7 +91,7 @@ size_t rep_strlcpy(char *d, const char *s, size_t bufsize) | ||
| 55 | #endif | ||
| 56 | |||
| 57 | #ifndef HAVE_STRLCAT | ||
| 58 | -/* like strncat but does not 0 fill the buffer and always null | ||
| 59 | +/* like strncat but does not 0 fill the buffer and always null | ||
| 60 | terminates. bufsize is the length of the buffer, which should | ||
| 61 | be one more than the maximum resulting string length */ | ||
| 62 | size_t rep_strlcat(char *d, const char *s, size_t bufsize) | ||
| 63 | @@ -116,7 +116,7 @@ size_t rep_strlcat(char *d, const char *s, size_t bufsize) | ||
| 64 | |||
| 65 | #ifndef HAVE_MKTIME | ||
| 66 | /******************************************************************* | ||
| 67 | -a mktime() replacement for those who don't have it - contributed by | ||
| 68 | +a mktime() replacement for those who don't have it - contributed by | ||
| 69 | C.A. Lademann <cal@zls.com> | ||
| 70 | Corrections by richard.kettlewell@kewill.com | ||
| 71 | ********************************************************************/ | ||
| 72 | @@ -137,7 +137,7 @@ time_t rep_mktime(struct tm *t) | ||
| 73 | return((time_t)-1); | ||
| 74 | |||
| 75 | n = t->tm_year + 1900 - 1; | ||
| 76 | - epoch = (t->tm_year - 70) * YEAR + | ||
| 77 | + epoch = (t->tm_year - 70) * YEAR + | ||
| 78 | ((n / 4 - n / 100 + n / 400) - (1969 / 4 - 1969 / 100 + 1969 / 400)) * DAY; | ||
| 79 | |||
| 80 | y = t->tm_year + 1900; | ||
| 81 | @@ -147,7 +147,7 @@ time_t rep_mktime(struct tm *t) | ||
| 82 | epoch += mon [m] * DAY; | ||
| 83 | if(m == 1 && y % 4 == 0 && (y % 100 != 0 || y % 400 == 0)) | ||
| 84 | epoch += DAY; | ||
| 85 | - | ||
| 86 | + | ||
| 87 | if(++m > 11) { | ||
| 88 | m = 0; | ||
| 89 | y++; | ||
| 90 | @@ -156,7 +156,7 @@ time_t rep_mktime(struct tm *t) | ||
| 91 | |||
| 92 | epoch += (t->tm_mday - 1) * DAY; | ||
| 93 | epoch += t->tm_hour * HOUR + t->tm_min * MINUTE + t->tm_sec; | ||
| 94 | - | ||
| 95 | + | ||
| 96 | if((u = localtime(&epoch)) != NULL) { | ||
| 97 | t->tm_sec = u->tm_sec; | ||
| 98 | t->tm_min = u->tm_min; | ||
| 99 | @@ -176,7 +176,7 @@ time_t rep_mktime(struct tm *t) | ||
| 100 | |||
| 101 | #ifndef HAVE_INITGROUPS | ||
| 102 | /**************************************************************************** | ||
| 103 | - some systems don't have an initgroups call | ||
| 104 | + some systems don't have an initgroups call | ||
| 105 | ****************************************************************************/ | ||
| 106 | int rep_initgroups(char *name, gid_t id) | ||
| 107 | { | ||
| 108 | @@ -194,7 +194,7 @@ int rep_initgroups(char *name, gid_t id) | ||
| 109 | int i,j; | ||
| 110 | struct group *g; | ||
| 111 | char *gr; | ||
| 112 | - | ||
| 113 | + | ||
| 114 | if((grouplst = malloc(sizeof(gid_t) * max_gr)) == NULL) { | ||
| 115 | errno = ENOMEM; | ||
| 116 | return -1; | ||
| 117 | @@ -250,9 +250,9 @@ void *rep_memmove(void *dest,const void *src,int size) | ||
| 118 | |||
| 119 | if (d < s) { | ||
| 120 | /* we can forward copy */ | ||
| 121 | - if (s-d >= sizeof(int) && | ||
| 122 | - !(s%sizeof(int)) && | ||
| 123 | - !(d%sizeof(int)) && | ||
| 124 | + if (s-d >= sizeof(int) && | ||
| 125 | + !(s%sizeof(int)) && | ||
| 126 | + !(d%sizeof(int)) && | ||
| 127 | !(size%sizeof(int))) { | ||
| 128 | /* do it all as words */ | ||
| 129 | int *idest = (int *)dest; | ||
| 130 | @@ -267,9 +267,9 @@ void *rep_memmove(void *dest,const void *src,int size) | ||
| 131 | } | ||
| 132 | } else { | ||
| 133 | /* must backward copy */ | ||
| 134 | - if (d-s >= sizeof(int) && | ||
| 135 | - !(s%sizeof(int)) && | ||
| 136 | - !(d%sizeof(int)) && | ||
| 137 | + if (d-s >= sizeof(int) && | ||
| 138 | + !(s%sizeof(int)) && | ||
| 139 | + !(d%sizeof(int)) && | ||
| 140 | !(size%sizeof(int))) { | ||
| 141 | /* do it all as words */ | ||
| 142 | int *idest = (int *)dest; | ||
| 143 | @@ -281,7 +281,7 @@ void *rep_memmove(void *dest,const void *src,int size) | ||
| 144 | char *cdest = (char *)dest; | ||
| 145 | char *csrc = (char *)src; | ||
| 146 | for (i=size-1;i>=0;i--) cdest[i] = csrc[i]; | ||
| 147 | - } | ||
| 148 | + } | ||
| 149 | } | ||
| 150 | return(dest); | ||
| 151 | } | ||
| 152 | @@ -334,16 +334,16 @@ void rep_vsyslog (int facility_priority, const char *format, va_list arglist) | ||
| 153 | size_t rep_strnlen(const char *s, size_t max) | ||
| 154 | { | ||
| 155 | size_t len; | ||
| 156 | - | ||
| 157 | + | ||
| 158 | for (len = 0; len < max; len++) { | ||
| 159 | if (s[len] == '\0') { | ||
| 160 | break; | ||
| 161 | } | ||
| 162 | } | ||
| 163 | - return len; | ||
| 164 | + return len; | ||
| 165 | } | 40 | } |
| 166 | #endif | 41 | #endif |
| 167 | - | 42 | |
| 168 | + | ||
| 169 | #ifndef HAVE_STRNDUP | ||
| 170 | /** | ||
| 171 | Some platforms don't have strndup. | ||
| 172 | @@ -351,7 +351,7 @@ void rep_vsyslog (int facility_priority, const char *format, va_list arglist) | ||
| 173 | char *rep_strndup(const char *s, size_t n) | ||
| 174 | { | ||
| 175 | char *ret; | ||
| 176 | - | ||
| 177 | + | ||
| 178 | n = strnlen(s, n); | ||
| 179 | ret = malloc(n+1); | ||
| 180 | if (!ret) | ||
| 181 | @@ -407,7 +407,7 @@ int rep_chroot(const char *dname) | ||
| 182 | |||
| 183 | /***************************************************************** | ||
| 184 | Possibly replace mkstemp if it is broken. | ||
| 185 | -*****************************************************************/ | ||
| 186 | +*****************************************************************/ | ||
| 187 | |||
| 188 | #ifndef HAVE_SECURE_MKSTEMP | ||
| 189 | int rep_mkstemp(char *template) | ||
| 190 | @@ -425,7 +425,7 @@ int rep_mkstemp(char *template) | ||
| 191 | char *rep_mkdtemp(char *template) | ||
| 192 | { | ||
| 193 | char *dname; | ||
| 194 | - | ||
| 195 | + | ||
| 196 | if ((dname = mktemp(template))) { | ||
| 197 | if (mkdir(dname, 0700) >= 0) { | ||
| 198 | return dname; | ||
| 199 | @@ -532,7 +532,7 @@ long long int rep_strtoll(const char *str, char **endptr, int base) | ||
| 200 | { | ||
| 201 | #ifdef HAVE_STRTOQ | ||
| 202 | return strtoq(str, endptr, base); | ||
| 203 | -#elif defined(HAVE___STRTOLL) | ||
| 204 | +#elif defined(HAVE___STRTOLL) | ||
| 205 | return __strtoll(str, endptr, base); | ||
| 206 | #elif SIZEOF_LONG == SIZEOF_LONG_LONG | ||
| 207 | return (long long int) strtol(str, endptr, base); | ||
| 208 | @@ -568,7 +568,7 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base) | ||
| 209 | { | ||
| 210 | #ifdef HAVE_STRTOUQ | ||
| 211 | return strtouq(str, endptr, base); | ||
| 212 | -#elif defined(HAVE___STRTOULL) | ||
| 213 | +#elif defined(HAVE___STRTOULL) | ||
| 214 | return __strtoull(str, endptr, base); | ||
| 215 | #elif SIZEOF_LONG == SIZEOF_LONG_LONG | ||
| 216 | return (unsigned long long int) strtoul(str, endptr, base); | ||
| 217 | @@ -599,7 +599,7 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base) | ||
| 218 | #endif /* HAVE_STRTOULL */ | ||
| 219 | |||
| 220 | #ifndef HAVE_SETENV | ||
| 221 | -int rep_setenv(const char *name, const char *value, int overwrite) | ||
| 222 | +int rep_setenv(const char *name, const char *value, int overwrite) | ||
| 223 | { | ||
| 224 | char *p; | ||
| 225 | size_t l1, l2; | ||
| 226 | @@ -644,10 +644,10 @@ int rep_unsetenv(const char *name) | ||
| 227 | for (i=0;environ[i];i++) /* noop */ ; | ||
| 228 | |||
| 229 | count=i; | ||
| 230 | - | ||
| 231 | + | ||
| 232 | for (i=0;i<count;) { | ||
| 233 | if (strncmp(environ[i], name, len) == 0 && environ[i][len] == '=') { | ||
| 234 | - /* note: we do _not_ free the old variable here. It is unsafe to | ||
| 235 | + /* note: we do _not_ free the old variable here. It is unsafe to | ||
| 236 | do so, as the pointer may not have come from malloc */ | ||
| 237 | memmove(&environ[i], &environ[i+1], (count-i)*sizeof(char *)); | ||
| 238 | count--; | ||
| 239 | @@ -688,7 +688,7 @@ int rep_utimes(const char *filename, const struct timeval tv[2]) | ||
| 240 | #endif | ||
| 241 | |||
| 242 | #ifndef HAVE_DUP2 | ||
| 243 | -int rep_dup2(int oldfd, int newfd) | ||
| 244 | +int rep_dup2(int oldfd, int newfd) | ||
| 245 | { | ||
| 246 | errno = ENOSYS; | ||
| 247 | return -1; | ||
| 248 | @@ -965,37 +965,6 @@ void *rep_memset_explicit(void *block, int c, size_t size) | ||
| 249 | } | ||
| 250 | #endif | ||
| 251 | |||
| 252 | -#ifndef HAVE_MEMSET_S | 43 | -#ifndef HAVE_MEMSET_S |
| 253 | -# ifndef RSIZE_MAX | 44 | -# ifndef RSIZE_MAX |
| 254 | -# define RSIZE_MAX (SIZE_MAX >> 1) | 45 | -# define RSIZE_MAX (SIZE_MAX >> 1) |
| @@ -267,7 +58,7 @@ index 8615899..a419837 100644 | |||
| 267 | - } | 58 | - } |
| 268 | - | 59 | - |
| 269 | -#if defined(HAVE_MEMSET_EXPLICIT) | 60 | -#if defined(HAVE_MEMSET_EXPLICIT) |
| 270 | - memset_explicit(dest, destsz, ch, count); | 61 | - memset_explicit(dest, ch, count); |
| 271 | -#else /* HAVE_MEMSET_EXPLICIT */ | 62 | -#else /* HAVE_MEMSET_EXPLICIT */ |
| 272 | - memset(dest, ch, count); | 63 | - memset(dest, ch, count); |
| 273 | -# if defined(HAVE_GCC_VOLATILE_MEMORY_PROTECTION) | 64 | -# if defined(HAVE_GCC_VOLATILE_MEMORY_PROTECTION) |
diff --git a/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch b/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch deleted file mode 100644 index e07e86e887..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | From 9aa5c43315d83c19514251a11c4fba5a137f2821 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andreas Schneider <asn@samba.org> | ||
| 3 | Date: Tue, 21 Jan 2025 17:59:27 +0100 | ||
| 4 | Subject: [PATCH] lib:replace: Don't use deprecated readline CPPFunction cast | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | HAVE_RL_COMPLETION_FUNC_T was unused and not checking for the right | ||
| 10 | function. | ||
| 11 | |||
| 12 | libcli/smbreadline/smbreadline.c: In function ‘smb_readline’: | ||
| 13 | libcli/smbreadline/smbreadline.c:139:17: warning: ‘CPPFunction’ is deprecated [-Wdeprecated-declarations] | ||
| 14 | 139 | rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn; | ||
| 15 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 16 | libcli/smbreadline/smbreadline.c:139:50: error: assignment to ‘char ** (*)(const char *, int, int)’ from incompatible pointer type ‘char ** (*)(void)’ [-Wincompatible-pointer-types] | ||
| 17 | 139 | rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn; | ||
| 18 | | ^ | ||
| 19 | |||
| 20 | BUG: https://bugzilla.samba.org/show_bug.cgi?id=15788 | ||
| 21 | |||
| 22 | Signed-off-by: Andreas Schneider <asn@samba.org> | ||
| 23 | Reviewed-by: Alexander Bokovoy <ab@samba.org> | ||
| 24 | |||
| 25 | Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> | ||
| 26 | Autobuild-Date(master): Tue Jan 21 19:38:37 UTC 2025 on atb-devel-224 | ||
| 27 | |||
| 28 | Upstream-Status: Backport [https://github.com/samba-team/samba/commit/9aa5c43315d83c19514251a11c4fba5a137f2821] | ||
| 29 | |||
| 30 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 31 | --- | ||
| 32 | lib/replace/system/readline.h | 4 +++- | ||
| 33 | libcli/smbreadline/wscript_configure | 8 +++++--- | ||
| 34 | 2 files changed, 8 insertions(+), 4 deletions(-) | ||
| 35 | |||
| 36 | diff --git a/lib/replace/system/readline.h b/lib/replace/system/readline.h | ||
| 37 | index 9a9af266ca6d..ac3604fc12e0 100644 | ||
| 38 | --- a/lib/replace/system/readline.h | ||
| 39 | +++ b/lib/replace/system/readline.h | ||
| 40 | @@ -46,7 +46,9 @@ | ||
| 41 | #endif | ||
| 42 | |||
| 43 | #ifdef HAVE_NEW_LIBREADLINE | ||
| 44 | -#ifdef HAVE_CPPFUNCTION | ||
| 45 | +#if defined(HAVE_RL_COMPLETION_FUNC_T) | ||
| 46 | +# define RL_COMPLETION_CAST (rl_completion_func_t *) | ||
| 47 | +#elif defined(HAVE_CPPFUNCTION) | ||
| 48 | # define RL_COMPLETION_CAST (CPPFunction *) | ||
| 49 | #elif defined(HAVE_RL_COMPLETION_T) | ||
| 50 | # define RL_COMPLETION_CAST (rl_completion_t *) | ||
| 51 | diff --git a/libcli/smbreadline/wscript_configure b/libcli/smbreadline/wscript_configure | ||
| 52 | index 912ff53a150d..f5a401ebae00 100644 | ||
| 53 | --- a/libcli/smbreadline/wscript_configure | ||
| 54 | +++ b/libcli/smbreadline/wscript_configure | ||
| 55 | @@ -51,10 +51,12 @@ conf.CHECK_CODE(''' | ||
| 56 | # endif | ||
| 57 | # endif | ||
| 58 | #endif | ||
| 59 | -int main(void) {rl_completion_t f; return 0;} | ||
| 60 | +int main(void) {rl_completion_func_t f; return 0;} | ||
| 61 | ''', | ||
| 62 | -'HAVE_RL_COMPLETION_FUNC_T', execute=False, addmain=False, | ||
| 63 | -msg='Checking for rl_completion_t') | ||
| 64 | + 'HAVE_RL_COMPLETION_FUNC_T', | ||
| 65 | + execute=False, | ||
| 66 | + addmain=False, | ||
| 67 | + msg='Checking for rl_completion_func_t') | ||
| 68 | |||
| 69 | conf.CHECK_CODE(''' | ||
| 70 | #ifdef HAVE_READLINE_READLINE_H | ||
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.9.bb b/meta-networking/recipes-connectivity/samba/samba_4.23.5.bb index 3ed1d46754..ec3149562a 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.19.9.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.23.5.bb | |||
| @@ -14,6 +14,10 @@ ${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ | |||
| 14 | 14 | ||
| 15 | export PYTHONHASHSEED = "1" | 15 | export PYTHONHASHSEED = "1" |
| 16 | 16 | ||
| 17 | # If XML_CATALOG_FILES env var is not defined, waf defaults | ||
| 18 | # to build host folders looking for catalogs. | ||
| 19 | export XML_CATALOG_FILES = "" | ||
| 20 | |||
| 17 | SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ | 21 | SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ |
| 18 | file://smb.conf \ | 22 | file://smb.conf \ |
| 19 | file://volatiles.03_samba \ | 23 | file://volatiles.03_samba \ |
| @@ -24,7 +28,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ | |||
| 24 | file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \ | 28 | file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \ |
| 25 | file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \ | 29 | file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \ |
| 26 | file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ | 30 | file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ |
| 27 | file://9aa5c43315d83c19514251a11c4fba5a137f2821.patch \ | ||
| 28 | file://0001-lib-replace-Implement-memset_explicit.patch \ | 31 | file://0001-lib-replace-Implement-memset_explicit.patch \ |
| 29 | file://0002-lib-replace-Add-test-for-memset_explicit.patch \ | 32 | file://0002-lib-replace-Add-test-for-memset_explicit.patch \ |
| 30 | file://0003-Replace-memset_s-with-memset_explicit.patch \ | 33 | file://0003-Replace-memset_s-with-memset_explicit.patch \ |
| @@ -36,7 +39,7 @@ SRC_URI:append:libc-musl = " \ | |||
| 36 | file://samba-4.3.9-remove-getpwent_r.patch \ | 39 | file://samba-4.3.9-remove-getpwent_r.patch \ |
| 37 | " | 40 | " |
| 38 | 41 | ||
| 39 | SRC_URI[sha256sum] = "71ed406444714c90bb9d36c576d807b67af15449f297e91106d42b3ca2fa5549" | 42 | SRC_URI[sha256sum] = "593a43ddd0d57902237dfa76888f7b02cb7fc7747111369cb31e126db4836b9f" |
| 40 | 43 | ||
| 41 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" | 44 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" |
| 42 | 45 | ||
| @@ -47,7 +50,7 @@ CVE_STATUS[CVE-2011-2411] = "not-applicable-platform: vulnerable only on HP NonS | |||
| 47 | # remove default added RDEPENDS on perl | 50 | # remove default added RDEPENDS on perl |
| 48 | RDEPENDS:${PN}:remove = "perl" | 51 | RDEPENDS:${PN}:remove = "perl" |
| 49 | 52 | ||
| 50 | DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka" | 53 | DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka ngtcp2 bison-native" |
| 51 | 54 | ||
| 52 | inherit features_check | 55 | inherit features_check |
| 53 | REQUIRED_DISTRO_FEATURES = "pam" | 56 | REQUIRED_DISTRO_FEATURES = "pam" |
| @@ -62,7 +65,7 @@ INITSCRIPT_NAME = "samba" | |||
| 62 | INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." | 65 | INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." |
| 63 | 66 | ||
| 64 | SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind ctdb" | 67 | SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind ctdb" |
| 65 | SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service" | 68 | SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service samba-bgqd.service" |
| 66 | SYSTEMD_SERVICE:${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" | 69 | SYSTEMD_SERVICE:${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" |
| 67 | SYSTEMD_SERVICE:winbind = "winbind.service" | 70 | SYSTEMD_SERVICE:winbind = "winbind.service" |
| 68 | SYSTEMD_SERVICE:ctdb = "ctdb.service" | 71 | SYSTEMD_SERVICE:ctdb = "ctdb.service" |
| @@ -109,7 +112,7 @@ SAMBA4_MODULES = "${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MO | |||
| 109 | # .so files so there will not be a conflict. This is not done consistantly, so be very careful | 112 | # .so files so there will not be a conflict. This is not done consistantly, so be very careful |
| 110 | # when adding to this list. | 113 | # when adding to this list. |
| 111 | # | 114 | # |
| 112 | SAMBA4_LIBS = "heimdal,NONE" | 115 | SAMBA4_LIBS = "heimdal,libquic,NONE" |
| 113 | 116 | ||
| 114 | EXTRA_OECONF += "--enable-fhs \ | 117 | EXTRA_OECONF += "--enable-fhs \ |
| 115 | --with-piddir=/run \ | 118 | --with-piddir=/run \ |
| @@ -132,6 +135,19 @@ EXTRA_OECONF += "--enable-fhs \ | |||
| 132 | 135 | ||
| 133 | LDFLAGS += "-Wl,-z,relro,-z,now" | 136 | LDFLAGS += "-Wl,-z,relro,-z,now" |
| 134 | 137 | ||
| 138 | do_configure:prepend() { | ||
| 139 | # The xsltproc tool is actually a wrapper script in OE, which exports its own XML_CATALOG_FILES env var | ||
| 140 | # However samba does that too. So here I'm trying to concatenate the variables. | ||
| 141 | # The original looks like this in the wrapper: | ||
| 142 | # export XML_CATALOG_FILES=oe-core-specific-thing | ||
| 143 | # and this sed prepends the value with $XML_CATALOG_FILES, and encloses it in quotes. So the end value is | ||
| 144 | # export XML_CATALOG_FILES="$XML_CATALOG FILES oe-core-specific-thing" | ||
| 145 | # The first grep just checks if it was already done, so it is not prepended multiple times. | ||
| 146 | |||
| 147 | grep \$XML_CATALOG_FILES ${STAGING_BINDIR_NATIVE}/xsltproc || \ | ||
| 148 | sed -i 's,\(XML_CATALOG_FILES\)=\(.*\),\1="\$XML_CATALOG_FILES \2",' ${STAGING_BINDIR_NATIVE}/xsltproc | ||
| 149 | } | ||
| 150 | |||
| 135 | do_configure:append() { | 151 | do_configure:append() { |
| 136 | cd ${S}/pidl/ | 152 | cd ${S}/pidl/ |
| 137 | perl Makefile.PL PREFIX=${prefix} | 153 | perl Makefile.PL PREFIX=${prefix} |
| @@ -213,6 +229,9 @@ do_install:append() { | |||
| 213 | find ${D}${libdir}/perl5/ -type f -name "perllocal.pod" -delete | 229 | find ${D}${libdir}/perl5/ -type f -name "perllocal.pod" -delete |
| 214 | find ${D}${libdir}/perl5/ -type f -name ".packlist" -delete | 230 | find ${D}${libdir}/perl5/ -type f -name ".packlist" -delete |
| 215 | sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl | 231 | sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl |
| 232 | |||
| 233 | sed -i 's,${UNPACKDIR},,g' ${S}/bin/default/libcli/wsp/wsp_aqs_lexer.c | ||
| 234 | sed -i 's,${UNPACKDIR},,g' ${S}/bin/default/libcli/wsp/wsp_aqs_lexer.h | ||
| 216 | } | 235 | } |
| 217 | 236 | ||
| 218 | PACKAGES =+ "${PN}-python3 ${PN}-pidl \ | 237 | PACKAGES =+ "${PN}-python3 ${PN}-pidl \ |
| @@ -245,7 +264,7 @@ PACKAGESPLITFUNCS:prepend = "samba_populate_packages " | |||
| 245 | PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" | 264 | PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" |
| 246 | 265 | ||
| 247 | RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" | 266 | RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" |
| 248 | RDEPENDS:${PN}-python3 += "pytalloc python3-tdb pyldb" | 267 | RDEPENDS:${PN}-python3 += "pytalloc python3-tdb" |
| 249 | 268 | ||
| 250 | FILES:${PN}-base = "${sbindir}/nmbd \ | 269 | FILES:${PN}-base = "${sbindir}/nmbd \ |
| 251 | ${sbindir}/smbd \ | 270 | ${sbindir}/smbd \ |
diff --git a/meta-networking/recipes-connectivity/wowlan-udev/files/99-wowlan.rules b/meta-networking/recipes-connectivity/wowlan-udev/files/99-wowlan.rules new file mode 100644 index 0000000000..ba41eef896 --- /dev/null +++ b/meta-networking/recipes-connectivity/wowlan-udev/files/99-wowlan.rules | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | # Enable WoWLAN when Wi-Fi PHY is registered | ||
| 2 | ACTION=="add", SUBSYSTEM=="ieee80211", KERNEL=="phy*", \ | ||
| 3 | RUN+="/usr/sbin/iw %k wowlan enable magic-packet" | ||
| 4 | |||
diff --git a/meta-networking/recipes-connectivity/wowlan-udev/wowlan-udev.bb b/meta-networking/recipes-connectivity/wowlan-udev/wowlan-udev.bb new file mode 100644 index 0000000000..61cba47e33 --- /dev/null +++ b/meta-networking/recipes-connectivity/wowlan-udev/wowlan-udev.bb | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | SUMMARY = "Enable WoWLAN via udev on Wi-Fi PHY registration" | ||
| 2 | LICENSE = "MIT" | ||
| 3 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
| 4 | |||
| 5 | SRC_URI = "file://99-wowlan.rules" | ||
| 6 | |||
| 7 | S = "${UNPACKDIR}" | ||
| 8 | |||
| 9 | do_install() { | ||
| 10 | install -d ${D}${sysconfdir}/udev/rules.d | ||
| 11 | install -m 0644 ${UNPACKDIR}/99-wowlan.rules \ | ||
| 12 | ${D}${sysconfdir}/udev/rules.d/ | ||
| 13 | } | ||
| 14 | |||
| 15 | INHIBIT_DEFAULT_DEPS = "1" | ||
| 16 | RDEPENDS:${PN} = "iw udev" | ||
diff --git a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb index e7db8a948b..aa7c9b8736 100644 --- a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb +++ b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb | |||
| @@ -2,20 +2,20 @@ SUMMARY = "Dispatcher service for systemd-networkd connection status changes" | |||
| 2 | DESCRIPTION = "This daemon is similar to NetworkManager-dispatcher, but is much \ | 2 | DESCRIPTION = "This daemon is similar to NetworkManager-dispatcher, but is much \ |
| 3 | more limited in the types of events it supports due to the limited nature of \ | 3 | more limited in the types of events it supports due to the limited nature of \ |
| 4 | systemd-networkd(8)." | 4 | systemd-networkd(8)." |
| 5 | HOMEPAGE = "https://gitlab.com/craftyguy/networkd-dispatcher" | ||
| 6 | BUGTRACKER = "https://gitlab.com/craftyguy/networkd-dispatcher/-/issues" | ||
| 7 | SECTION = "network" | ||
| 5 | 8 | ||
| 6 | LICENSE = "GPL-3.0-only" | 9 | LICENSE = "GPL-3.0-only" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" |
| 8 | 11 | ||
| 9 | inherit features_check systemd | 12 | inherit allarch features_check systemd |
| 10 | 13 | ||
| 11 | RDEPENDS:${PN} = "python3-pygobject python3-dbus python3-json" | ||
| 12 | REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" | 14 | REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" |
| 13 | 15 | ||
| 16 | SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1;tag=${PV}" | ||
| 14 | SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" | 17 | SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" |
| 15 | SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1" | ||
| 16 | 18 | ||
| 17 | |||
| 18 | SYSTEMD_PACKAGES = "${PN}" | ||
| 19 | SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" | 19 | SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" |
| 20 | SYSTEMD_AUTO_ENABLE = "disable" | 20 | SYSTEMD_AUTO_ENABLE = "disable" |
| 21 | 21 | ||
| @@ -28,3 +28,5 @@ do_install() { | |||
| 28 | install -D -m 0644 ${S}/networkd-dispatcher.service ${D}/${systemd_system_unitdir}/networkd-dispatcher.service | 28 | install -D -m 0644 ${S}/networkd-dispatcher.service ${D}/${systemd_system_unitdir}/networkd-dispatcher.service |
| 29 | install -D -m 0644 ${S}/networkd-dispatcher.conf ${D}/${sysconfdir}/conf.d/networkd-dispatcher.conf | 29 | install -D -m 0644 ${S}/networkd-dispatcher.conf ${D}/${sysconfdir}/conf.d/networkd-dispatcher.conf |
| 30 | } | 30 | } |
| 31 | |||
| 32 | RDEPENDS:${PN} = "python3-dbus python3-json python3-pygobject" | ||
diff --git a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index d1e08cd073..95994c0467 100644 --- a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb | |||
| @@ -61,7 +61,7 @@ INSANE_SKIP:${PN}-libs = "dev-so" | |||
| 61 | RDEPENDS:${PN} += "${PN}-libs" | 61 | RDEPENDS:${PN} += "${PN}-libs" |
| 62 | RDEPENDS:${PN}-ptest += "packagegroup-core-buildessential" | 62 | RDEPENDS:${PN}-ptest += "packagegroup-core-buildessential" |
| 63 | 63 | ||
| 64 | PACKAGECONFIG ??= "libgcrypt non32bit snmp-bc" | 64 | PACKAGECONFIG ??= "libgcrypt non32bit" |
| 65 | PACKAGECONFIG[sysfs] = "--enable-sysfs,--disable-sysfs,sysfsutils," | 65 | PACKAGECONFIG[sysfs] = "--enable-sysfs,--disable-sysfs,sysfsutils," |
| 66 | PACKAGECONFIG[libgcrypt] = "--enable-encryption,--disable-encryption,libgcrypt," | 66 | PACKAGECONFIG[libgcrypt] = "--enable-encryption,--disable-encryption,libgcrypt," |
| 67 | PACKAGECONFIG[non32bit] = "--enable-non32bit-int,--disable-non32bit-int,," | 67 | PACKAGECONFIG[non32bit] = "--enable-non32bit-int,--disable-non32bit-int,," |
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch deleted file mode 100644 index b581c571bb..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch +++ /dev/null | |||
| @@ -1,311 +0,0 @@ | |||
| 1 | From 9a46462f08535e946d97fd40c79229a7ee8b7336 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 17 Aug 2020 00:00:00 -0700 | ||
| 4 | Subject: [PATCH] Fix build with -fno-common | ||
| 5 | |||
| 6 | Mark the declarations with extern where needed in header files | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | src/ckpt/agent/cpa_cb.h | 2 +- | ||
| 13 | src/ckpt/ckptd/cpd_init.h | 2 +- | ||
| 14 | src/evt/agent/eda.h | 2 +- | ||
| 15 | src/evt/evtd/eds.h | 2 +- | ||
| 16 | src/evt/evtd/eds_amf.c | 2 ++ | ||
| 17 | src/evt/evtd/eds_amf.h | 2 +- | ||
| 18 | src/evt/evtd/eds_cb.h | 2 +- | ||
| 19 | src/imm/immd/immd.h | 2 +- | ||
| 20 | src/lck/lckd/gld_dl_api.h | 4 ++-- | ||
| 21 | src/lck/lcknd/glnd_cb.h | 4 ++-- | ||
| 22 | src/mds/mds_core.h | 34 +++++++++++++++++++--------------- | ||
| 23 | src/mds/mds_dt_tcp.c | 2 ++ | ||
| 24 | src/mds/mds_dt_tcp.h | 2 +- | ||
| 25 | src/mds/mds_main.c | 2 +- | ||
| 26 | src/msg/msgnd/mqnd_db.h | 2 +- | ||
| 27 | 15 files changed, 37 insertions(+), 29 deletions(-) | ||
| 28 | |||
| 29 | diff --git a/src/ckpt/agent/cpa_cb.h b/src/ckpt/agent/cpa_cb.h | ||
| 30 | index ac48c6c..d633583 100644 | ||
| 31 | --- a/src/ckpt/agent/cpa_cb.h | ||
| 32 | +++ b/src/ckpt/agent/cpa_cb.h | ||
| 33 | @@ -119,7 +119,7 @@ typedef struct cpa_cb { | ||
| 34 | |||
| 35 | } CPA_CB; | ||
| 36 | |||
| 37 | -uint32_t gl_cpa_hdl; | ||
| 38 | +extern uint32_t gl_cpa_hdl; | ||
| 39 | |||
| 40 | typedef struct cpa_prcess_evt_sync { | ||
| 41 | NCS_QELEM qelem; | ||
| 42 | diff --git a/src/ckpt/ckptd/cpd_init.h b/src/ckpt/ckptd/cpd_init.h | ||
| 43 | index 0c02642..cf3466b 100644 | ||
| 44 | --- a/src/ckpt/ckptd/cpd_init.h | ||
| 45 | +++ b/src/ckpt/ckptd/cpd_init.h | ||
| 46 | @@ -33,7 +33,7 @@ | ||
| 47 | #include <saAmf.h> | ||
| 48 | #include "cpd_cb.h" | ||
| 49 | |||
| 50 | -uint32_t gl_cpd_cb_hdl; | ||
| 51 | +extern uint32_t gl_cpd_cb_hdl; | ||
| 52 | |||
| 53 | /* Macro to get the component name for the component type */ | ||
| 54 | #define m_CPD_TASKNAME "CPD" | ||
| 55 | diff --git a/src/evt/agent/eda.h b/src/evt/agent/eda.h | ||
| 56 | index 4d1991c..138c910 100644 | ||
| 57 | --- a/src/evt/agent/eda.h | ||
| 58 | +++ b/src/evt/agent/eda.h | ||
| 59 | @@ -39,7 +39,7 @@ | ||
| 60 | #include "base/logtrace.h" | ||
| 61 | |||
| 62 | /* EDA CB global handle declaration */ | ||
| 63 | -uint32_t gl_eda_hdl; | ||
| 64 | +extern uint32_t gl_eda_hdl; | ||
| 65 | |||
| 66 | /* EDA Default MDS timeout value */ | ||
| 67 | #define EDA_MDS_DEF_TIMEOUT 100 | ||
| 68 | diff --git a/src/evt/evtd/eds.h b/src/evt/evtd/eds.h | ||
| 69 | index bc9c429..3545d77 100644 | ||
| 70 | --- a/src/evt/evtd/eds.h | ||
| 71 | +++ b/src/evt/evtd/eds.h | ||
| 72 | @@ -72,6 +72,6 @@ | ||
| 73 | #include "base/daemon.h" | ||
| 74 | |||
| 75 | /* EDS CB global handle declaration */ | ||
| 76 | -uint32_t gl_eds_hdl; | ||
| 77 | +extern uint32_t gl_eds_hdl; | ||
| 78 | |||
| 79 | #endif // EVT_EVTD_EDS_H_ | ||
| 80 | diff --git a/src/evt/evtd/eds_amf.c b/src/evt/evtd/eds_amf.c | ||
| 81 | index 97b71a5..adebf0c 100644 | ||
| 82 | --- a/src/evt/evtd/eds_amf.c | ||
| 83 | +++ b/src/evt/evtd/eds_amf.c | ||
| 84 | @@ -30,6 +30,8 @@ stuff. | ||
| 85 | #include "eds.h" | ||
| 86 | #include "eds_dl_api.h" | ||
| 87 | |||
| 88 | +struct next_HAState nextStateInfo; | ||
| 89 | + | ||
| 90 | /* HA AMF statemachine & State handler definitions */ | ||
| 91 | |||
| 92 | /**************************************************************************** | ||
| 93 | diff --git a/src/evt/evtd/eds_amf.h b/src/evt/evtd/eds_amf.h | ||
| 94 | index e9aeaa6..f9803b4 100644 | ||
| 95 | --- a/src/evt/evtd/eds_amf.h | ||
| 96 | +++ b/src/evt/evtd/eds_amf.h | ||
| 97 | @@ -49,7 +49,7 @@ uint32_t eds_quiesced_state_handler(EDS_CB *cb, SaInvocationT invocation); | ||
| 98 | struct next_HAState { | ||
| 99 | uint8_t nextState1; | ||
| 100 | uint8_t nextState2; | ||
| 101 | -} nextStateInfo; /* AMF HA state can transit to a maximum of the two defined | ||
| 102 | +}; /* AMF HA state can transit to a maximum of the two defined | ||
| 103 | states */ | ||
| 104 | |||
| 105 | #define VALIDATE_STATE(curr, next) \ | ||
| 106 | diff --git a/src/evt/evtd/eds_cb.h b/src/evt/evtd/eds_cb.h | ||
| 107 | index c127ead..19c48cd 100644 | ||
| 108 | --- a/src/evt/evtd/eds_cb.h | ||
| 109 | +++ b/src/evt/evtd/eds_cb.h | ||
| 110 | @@ -40,7 +40,7 @@ | ||
| 111 | #include "base/ncssysf_tmr.h" | ||
| 112 | |||
| 113 | /* global variables */ | ||
| 114 | -uint32_t gl_eds_hdl; | ||
| 115 | +extern uint32_t gl_eds_hdl; | ||
| 116 | |||
| 117 | struct eda_reg_list_tag; | ||
| 118 | |||
| 119 | diff --git a/src/imm/immd/immd.h b/src/imm/immd/immd.h | ||
| 120 | index 7dc1da6..bab3945 100644 | ||
| 121 | --- a/src/imm/immd/immd.h | ||
| 122 | +++ b/src/imm/immd/immd.h | ||
| 123 | @@ -42,7 +42,7 @@ | ||
| 124 | #include "immd_sbedu.h" | ||
| 125 | #include "base/ncs_mda_pvt.h" | ||
| 126 | |||
| 127 | -IMMD_CB *immd_cb; | ||
| 128 | +extern IMMD_CB *immd_cb; | ||
| 129 | |||
| 130 | extern uint32_t initialize_for_assignment(IMMD_CB *cb, SaAmfHAStateT ha_state); | ||
| 131 | |||
| 132 | diff --git a/src/lck/lckd/gld_dl_api.h b/src/lck/lckd/gld_dl_api.h | ||
| 133 | index 6476a71..3a67fd1 100644 | ||
| 134 | --- a/src/lck/lckd/gld_dl_api.h | ||
| 135 | +++ b/src/lck/lckd/gld_dl_api.h | ||
| 136 | @@ -33,7 +33,7 @@ | ||
| 137 | #include "base/ncsgl_defs.h" | ||
| 138 | #include "base/ncs_lib.h" | ||
| 139 | |||
| 140 | -uint32_t gl_gld_hdl; | ||
| 141 | -uint32_t gld_lib_req(NCS_LIB_REQ_INFO *req_info); | ||
| 142 | +extern uint32_t gl_gld_hdl; | ||
| 143 | +extern uint32_t gld_lib_req(NCS_LIB_REQ_INFO *req_info); | ||
| 144 | |||
| 145 | #endif // LCK_LCKD_GLD_DL_API_H_ | ||
| 146 | diff --git a/src/lck/lcknd/glnd_cb.h b/src/lck/lcknd/glnd_cb.h | ||
| 147 | index 3b82f60..77a1f88 100644 | ||
| 148 | --- a/src/lck/lcknd/glnd_cb.h | ||
| 149 | +++ b/src/lck/lcknd/glnd_cb.h | ||
| 150 | @@ -28,8 +28,8 @@ extern "C" { | ||
| 151 | #endif | ||
| 152 | |||
| 153 | /* global variables */ | ||
| 154 | -uint32_t gl_glnd_hdl; | ||
| 155 | -NCSCONTEXT gl_glnd_task_hdl; | ||
| 156 | +extern uint32_t gl_glnd_hdl; | ||
| 157 | +extern NCSCONTEXT gl_glnd_task_hdl; | ||
| 158 | |||
| 159 | /* macros for the global varibales */ | ||
| 160 | #define m_GLND_RETRIEVE_GLND_CB_HDL gl_glnd_hdl | ||
| 161 | diff --git a/src/mds/mds_core.h b/src/mds/mds_core.h | ||
| 162 | index dad62cd..ed69d3a 100644 | ||
| 163 | --- a/src/mds/mds_core.h | ||
| 164 | +++ b/src/mds/mds_core.h | ||
| 165 | @@ -26,6 +26,10 @@ | ||
| 166 | #ifndef MDS_MDS_CORE_H_ | ||
| 167 | #define MDS_MDS_CORE_H_ | ||
| 168 | |||
| 169 | +#ifndef EXTERN | ||
| 170 | +#define EXTERN extern | ||
| 171 | +#endif | ||
| 172 | + | ||
| 173 | #include <pthread.h> | ||
| 174 | #include "base/ncsgl_defs.h" | ||
| 175 | #include "mds/mds_papi.h" | ||
| 176 | @@ -600,65 +604,65 @@ extern "C" { | ||
| 177 | /* ******************************************** */ | ||
| 178 | |||
| 179 | /* Initialization of MDTM Module */ | ||
| 180 | -uint32_t (*mds_mdtm_init)(NODE_ID node_id, uint32_t *mds_tipc_ref); | ||
| 181 | +EXTERN uint32_t (*mds_mdtm_init)(NODE_ID node_id, uint32_t *mds_tipc_ref); | ||
| 182 | |||
| 183 | /* Destroying the MDTM Module*/ | ||
| 184 | -uint32_t (*mds_mdtm_destroy)(void); | ||
| 185 | +EXTERN uint32_t (*mds_mdtm_destroy)(void); | ||
| 186 | |||
| 187 | -uint32_t (*mds_mdtm_send)(MDTM_SEND_REQ *req); | ||
| 188 | +EXTERN uint32_t (*mds_mdtm_send)(MDTM_SEND_REQ *req); | ||
| 189 | |||
| 190 | /* SVC Install */ | ||
| 191 | -uint32_t (*mds_mdtm_svc_install)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 192 | +EXTERN uint32_t (*mds_mdtm_svc_install)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 193 | NCSMDS_SCOPE_TYPE install_scope, | ||
| 194 | V_DEST_RL role, MDS_VDEST_ID vdest_id, | ||
| 195 | NCS_VDEST_TYPE vdest_policy, | ||
| 196 | MDS_SVC_PVT_SUB_PART_VER mds_svc_pvt_ver); | ||
| 197 | |||
| 198 | /* SVC Uninstall */ | ||
| 199 | -uint32_t (*mds_mdtm_svc_uninstall)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 200 | +EXTERN uint32_t (*mds_mdtm_svc_uninstall)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 201 | NCSMDS_SCOPE_TYPE install_scope, | ||
| 202 | V_DEST_RL role, MDS_VDEST_ID vdest_id, | ||
| 203 | NCS_VDEST_TYPE vdest_policy, | ||
| 204 | MDS_SVC_PVT_SUB_PART_VER mds_svc_pvt_ver); | ||
| 205 | |||
| 206 | /* SVC Subscribe */ | ||
| 207 | -uint32_t (*mds_mdtm_svc_subscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 208 | +EXTERN uint32_t (*mds_mdtm_svc_subscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 209 | NCSMDS_SCOPE_TYPE subscribe_scope, | ||
| 210 | MDS_SVC_HDL local_svc_hdl, | ||
| 211 | MDS_SUBTN_REF_VAL *subtn_ref_val); | ||
| 212 | |||
| 213 | /* added svc_hdl */ | ||
| 214 | /* SVC Unsubscribe */ | ||
| 215 | -uint32_t (*mds_mdtm_svc_unsubscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 216 | +EXTERN uint32_t (*mds_mdtm_svc_unsubscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 217 | NCSMDS_SCOPE_TYPE subscribe_scope, | ||
| 218 | MDS_SUBTN_REF_VAL subtn_ref_val); | ||
| 219 | |||
| 220 | /* VDEST Install */ | ||
| 221 | -uint32_t (*mds_mdtm_vdest_install)(MDS_VDEST_ID vdest_id); | ||
| 222 | +EXTERN uint32_t (*mds_mdtm_vdest_install)(MDS_VDEST_ID vdest_id); | ||
| 223 | |||
| 224 | /* VDEST Uninstall */ | ||
| 225 | -uint32_t (*mds_mdtm_vdest_uninstall)(MDS_VDEST_ID vdest_id); | ||
| 226 | +EXTERN uint32_t (*mds_mdtm_vdest_uninstall)(MDS_VDEST_ID vdest_id); | ||
| 227 | |||
| 228 | /* VDEST Subscribe */ | ||
| 229 | -uint32_t (*mds_mdtm_vdest_subscribe)(MDS_VDEST_ID vdest_id, | ||
| 230 | +EXTERN uint32_t (*mds_mdtm_vdest_subscribe)(MDS_VDEST_ID vdest_id, | ||
| 231 | MDS_SUBTN_REF_VAL *subtn_ref_val); | ||
| 232 | |||
| 233 | /* VDEST Unsubscribe */ | ||
| 234 | -uint32_t (*mds_mdtm_vdest_unsubscribe)(MDS_VDEST_ID vdest_id, | ||
| 235 | +EXTERN uint32_t (*mds_mdtm_vdest_unsubscribe)(MDS_VDEST_ID vdest_id, | ||
| 236 | MDS_SUBTN_REF_VAL subtn_ref_val); | ||
| 237 | |||
| 238 | /* Tx Register (For incrementing the use count) */ | ||
| 239 | -uint32_t (*mds_mdtm_tx_hdl_register)(MDS_DEST adest); | ||
| 240 | +EXTERN uint32_t (*mds_mdtm_tx_hdl_register)(MDS_DEST adest); | ||
| 241 | |||
| 242 | /* Tx Unregister (For decrementing the use count) */ | ||
| 243 | -uint32_t (*mds_mdtm_tx_hdl_unregister)(MDS_DEST adest); | ||
| 244 | +EXTERN uint32_t (*mds_mdtm_tx_hdl_unregister)(MDS_DEST adest); | ||
| 245 | |||
| 246 | /* Node subscription */ | ||
| 247 | -uint32_t (*mds_mdtm_node_subscribe)(MDS_SVC_HDL svc_hdl, | ||
| 248 | +EXTERN uint32_t (*mds_mdtm_node_subscribe)(MDS_SVC_HDL svc_hdl, | ||
| 249 | MDS_SUBTN_REF_VAL *subtn_ref_val); | ||
| 250 | |||
| 251 | /* Node unsubscription */ | ||
| 252 | -uint32_t (*mds_mdtm_node_unsubscribe)(MDS_SUBTN_REF_VAL subtn_ref_val); | ||
| 253 | +EXTERN uint32_t (*mds_mdtm_node_unsubscribe)(MDS_SUBTN_REF_VAL subtn_ref_val); | ||
| 254 | |||
| 255 | #ifdef __cplusplus | ||
| 256 | } | ||
| 257 | diff --git a/src/mds/mds_dt_tcp.c b/src/mds/mds_dt_tcp.c | ||
| 258 | index 4a37246..e73cef4 100644 | ||
| 259 | --- a/src/mds/mds_dt_tcp.c | ||
| 260 | +++ b/src/mds/mds_dt_tcp.c | ||
| 261 | @@ -70,6 +70,8 @@ NCS_PATRICIA_TREE mdtm_reassembly_list; | ||
| 262 | |||
| 263 | /* Get the pid of the process */ | ||
| 264 | pid_t mdtm_pid; | ||
| 265 | + | ||
| 266 | +MDTM_TCP_CB *tcp_cb; | ||
| 267 | |||
| 268 | static void mds_mdtm_enc_init(MDS_MDTM_DTM_MSG *init, uint8_t *buff); | ||
| 269 | static uint32_t mdtm_create_rcv_task(void); | ||
| 270 | diff --git a/src/mds/mds_dt_tcp.h b/src/mds/mds_dt_tcp.h | ||
| 271 | index 1065464..350d534 100644 | ||
| 272 | --- a/src/mds/mds_dt_tcp.h | ||
| 273 | +++ b/src/mds/mds_dt_tcp.h | ||
| 274 | @@ -50,7 +50,7 @@ typedef struct mdtm_tcp_cb { | ||
| 275 | |||
| 276 | } MDTM_TCP_CB; | ||
| 277 | |||
| 278 | -MDTM_TCP_CB *tcp_cb; | ||
| 279 | +extern MDTM_TCP_CB *tcp_cb; | ||
| 280 | |||
| 281 | typedef enum mds_mdtm_dtm_msg_types { | ||
| 282 | MDS_MDTM_DTM_PID_TYPE = 1, | ||
| 283 | diff --git a/src/mds/mds_main.c b/src/mds/mds_main.c | ||
| 284 | index 0bcb2f9..5671ed3 100644 | ||
| 285 | --- a/src/mds/mds_main.c | ||
| 286 | +++ b/src/mds/mds_main.c | ||
| 287 | @@ -20,7 +20,7 @@ | ||
| 288 | #endif | ||
| 289 | |||
| 290 | #include "osaf/configmake.h" | ||
| 291 | - | ||
| 292 | +#define EXTERN | ||
| 293 | /***************************************************************************** | ||
| 294 | .............................................................................. | ||
| 295 | |||
| 296 | diff --git a/src/msg/msgnd/mqnd_db.h b/src/msg/msgnd/mqnd_db.h | ||
| 297 | index b78024e..fee43e5 100644 | ||
| 298 | --- a/src/msg/msgnd/mqnd_db.h | ||
| 299 | +++ b/src/msg/msgnd/mqnd_db.h | ||
| 300 | @@ -33,7 +33,7 @@ | ||
| 301 | #include <saClm.h> | ||
| 302 | #include <saImmOi.h> | ||
| 303 | /* Decleration for global variable */ | ||
| 304 | -uint32_t gl_mqnd_cb_hdl; | ||
| 305 | +extern uint32_t gl_mqnd_cb_hdl; | ||
| 306 | |||
| 307 | /* Macros for reading global database */ | ||
| 308 | #define m_MQND_STORE_HDL(hdl) (gl_mqnd_cb_hdl = (hdl)) | ||
| 309 | -- | ||
| 310 | 2.28.0 | ||
| 311 | |||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-To-fix-Werror-discarded-qualifiers-error.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-To-fix-Werror-discarded-qualifiers-error.patch new file mode 100644 index 0000000000..d27c783cde --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-To-fix-Werror-discarded-qualifiers-error.patch | |||
| @@ -0,0 +1,81 @@ | |||
| 1 | From ac79c1da91f51b10059a266bf4db068a01963b01 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 3 | Date: Wed, 18 Mar 2026 03:35:16 +0000 | ||
| 4 | Subject: [PATCH] To fix [-Werror=discarded-qualifiers] error to build with glibc 2.43 | ||
| 5 | |||
| 6 | | ../sources/opensaf-5.22.01/src/osaf/immutil/immutil.c:339:12: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] | ||
| 7 | | 339 | cp = strstr(buffer, key); | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 12 | --- | ||
| 13 | src/amf/common/util.c | 8 ++++---- | ||
| 14 | src/ckpt/ckptd/cpd_imm.c | 4 ++-- | ||
| 15 | src/osaf/immutil/immutil.c | 2 +- | ||
| 16 | 3 files changed, 7 insertions(+), 7 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/src/amf/common/util.c b/src/amf/common/util.c | ||
| 19 | index d17b766..56c1a50 100644 | ||
| 20 | --- a/src/amf/common/util.c | ||
| 21 | +++ b/src/amf/common/util.c | ||
| 22 | @@ -252,8 +252,8 @@ void avsv_sanamet_init_from_association_dn(const SaNameT *haystack, SaNameT *dn, | ||
| 23 | const char *needle, | ||
| 24 | const char *parent) | ||
| 25 | { | ||
| 26 | - char *p; | ||
| 27 | - char *pp; | ||
| 28 | + const char *p; | ||
| 29 | + const char *pp; | ||
| 30 | int i = 0; | ||
| 31 | |||
| 32 | osaf_extended_name_clear(dn); | ||
| 33 | @@ -270,8 +270,8 @@ void avsv_sanamet_init_from_association_dn(const SaNameT *haystack, SaNameT *dn, | ||
| 34 | |||
| 35 | /* copy the value upto parent but skip escape chars */ | ||
| 36 | int size = 0; | ||
| 37 | - char *p1 = p; | ||
| 38 | - char *pp1 = pp; | ||
| 39 | + const char *p1 = p; | ||
| 40 | + const char *pp1 = pp; | ||
| 41 | while (p != pp) { | ||
| 42 | if (*p != '\\') | ||
| 43 | size++; | ||
| 44 | diff --git a/src/ckpt/ckptd/cpd_imm.c b/src/ckpt/ckptd/cpd_imm.c | ||
| 45 | index e2dee0c..7c25d02 100644 | ||
| 46 | --- a/src/ckpt/ckptd/cpd_imm.c | ||
| 47 | +++ b/src/ckpt/ckptd/cpd_imm.c | ||
| 48 | @@ -117,7 +117,7 @@ cpd_saImmOiRtAttrUpdateCallback(SaImmOiHandleT immOiHandle, | ||
| 49 | /* Extract ckpt_name and node_name */ | ||
| 50 | if (strncmp(object_name, "safReplica=", 11) == 0) { | ||
| 51 | /* Extract ckpt_name */ | ||
| 52 | - char *p_char = strchr(object_name, ','); | ||
| 53 | + const char *p_char = strchr(object_name, ','); | ||
| 54 | if (p_char) { | ||
| 55 | p_char++; /* escaping first ',' of the associated class | ||
| 56 | DN name */ | ||
| 57 | @@ -657,7 +657,7 @@ SaAisErrorT create_runtime_ckpt_object(CPD_CKPT_INFO_NODE *ckpt_node, | ||
| 58 | SaNameT parentName; | ||
| 59 | SaAisErrorT rc = SA_AIS_OK; | ||
| 60 | char *dndup = strdup(ckpt_node->ckpt_name); | ||
| 61 | - char *parent_name = strchr(ckpt_node->ckpt_name, ','); | ||
| 62 | + const char *parent_name = strchr(ckpt_node->ckpt_name, ','); | ||
| 63 | char *rdnstr; | ||
| 64 | const SaImmAttrValuesT_2 *attrValues[7]; | ||
| 65 | SaImmAttrValueT dn[1], create_time[1], creat_flags[1], max_sections[1], | ||
| 66 | diff --git a/src/osaf/immutil/immutil.c b/src/osaf/immutil/immutil.c | ||
| 67 | index 1ca1fbb..d3a5b63 100644 | ||
| 68 | --- a/src/osaf/immutil/immutil.c | ||
| 69 | +++ b/src/osaf/immutil/immutil.c | ||
| 70 | @@ -336,7 +336,7 @@ char const *immutil_getStringValue(char const *key, SaNameT const *name) | ||
| 71 | klen = strlen(key); | ||
| 72 | assert(klen > 1 || key[klen - 1] == '='); | ||
| 73 | |||
| 74 | - cp = strstr(buffer, key); | ||
| 75 | + cp = (char*)strstr(buffer, key); | ||
| 76 | while (cp != NULL) { | ||
| 77 | if (cp == buffer || cp[-1] == ',') { | ||
| 78 | char *value = cp + klen; | ||
| 79 | -- | ||
| 80 | 2.43.0 | ||
| 81 | |||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch deleted file mode 100644 index e36d4e0cdc..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From 225891675b80beaa9d74ce56809e52c4451df72c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 25 Jan 2023 21:46:22 -0800 | ||
| 4 | Subject: [PATCH 1/2] include cstdint for uintXX_t types | ||
| 5 | |||
| 6 | GCC-13 needs it [1] | ||
| 7 | |||
| 8 | [1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | src/imm/immnd/ImmModel.h | 1 + | ||
| 14 | src/osaf/consensus/consensus_env.h | 1 + | ||
| 15 | 2 files changed, 2 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/src/imm/immnd/ImmModel.h b/src/imm/immnd/ImmModel.h | ||
| 18 | index 44da470..0660431 100644 | ||
| 19 | --- a/src/imm/immnd/ImmModel.h | ||
| 20 | +++ b/src/imm/immnd/ImmModel.h | ||
| 21 | @@ -22,6 +22,7 @@ | ||
| 22 | #include <saImmOm.h> | ||
| 23 | #include <cstdarg> | ||
| 24 | #include <sys/types.h> | ||
| 25 | +#include <cstdint> | ||
| 26 | #include <string> | ||
| 27 | #include <vector> | ||
| 28 | #include <map> | ||
| 29 | diff --git a/src/osaf/consensus/consensus_env.h b/src/osaf/consensus/consensus_env.h | ||
| 30 | index df4f93a..89ccf46 100644 | ||
| 31 | --- a/src/osaf/consensus/consensus_env.h | ||
| 32 | +++ b/src/osaf/consensus/consensus_env.h | ||
| 33 | @@ -15,6 +15,7 @@ | ||
| 34 | #ifndef OSAF_CONSENSUS_CONSENSUS_ENV_H_ | ||
| 35 | #define OSAF_CONSENSUS_CONSENSUS_ENV_H_ | ||
| 36 | |||
| 37 | +#include <cstdint> | ||
| 38 | #include <string> | ||
| 39 | #include "base/mutex.h" | ||
| 40 | |||
| 41 | -- | ||
| 42 | 2.39.1 | ||
| 43 | |||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch deleted file mode 100644 index e735d432a7..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 6168d43ddd353b92ad8bcd5c49dc68f18caa8a00 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 12 Apr 2022 17:07:49 -0700 | ||
| 4 | Subject: [PATCH 1/2] include missing <array> header | ||
| 5 | |||
| 6 | Fixes | ||
| 7 | src/osaf/consensus/key_value.cc:25:30: error: aggregate 'std::array<char, 128> buffer' has incomplete type and cannot be defined | ||
| 8 | 25 | std::array<char, buf_size> buffer; | ||
| 9 | | ^~~~~~ | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | src/osaf/consensus/key_value.cc | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/src/osaf/consensus/key_value.cc b/src/osaf/consensus/key_value.cc | ||
| 18 | index 692dd3f..6e16cbf 100644 | ||
| 19 | --- a/src/osaf/consensus/key_value.cc | ||
| 20 | +++ b/src/osaf/consensus/key_value.cc | ||
| 21 | @@ -18,7 +18,7 @@ | ||
| 22 | #include "base/getenv.h" | ||
| 23 | #include "base/logtrace.h" | ||
| 24 | #include "osaf/consensus/consensus.h" | ||
| 25 | - | ||
| 26 | +#include <array> | ||
| 27 | int KeyValue::Execute(const std::string& command, std::string& output) { | ||
| 28 | TRACE_ENTER(); | ||
| 29 | constexpr size_t buf_size = 128; | ||
| 30 | -- | ||
| 31 | 2.35.1 | ||
| 32 | |||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch deleted file mode 100644 index a6aa2c3d07..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | From 5e5686de677c884d5d785254412ced3c9d2d1b08 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 25 Jan 2023 21:47:45 -0800 | ||
| 4 | Subject: [PATCH 2/2] Fix -Werror=enum-int-mismatch with gcc13 | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | --- | ||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | src/evt/agent/eda_hdl.h | 5 +++-- | ||
| 11 | src/evt/evtd/eds_mds.h | 3 +-- | ||
| 12 | src/smf/smfnd/smfnd.h | 8 ++++---- | ||
| 13 | 3 files changed, 8 insertions(+), 8 deletions(-) | ||
| 14 | |||
| 15 | --- a/src/evt/agent/eda_hdl.h | ||
| 16 | +++ b/src/evt/agent/eda_hdl.h | ||
| 17 | @@ -31,6 +31,7 @@ | ||
| 18 | #define EVT_AGENT_EDA_HDL_H_ | ||
| 19 | |||
| 20 | #include "evt/agent/eda.h" | ||
| 21 | +#include "ais/include/saAis.h" | ||
| 22 | |||
| 23 | uint32_t eda_hdl_cbk_dispatch(EDA_CB *, EDA_CLIENT_HDL_REC *, SaDispatchFlagsT); | ||
| 24 | |||
| 25 | @@ -68,11 +69,11 @@ EDA_CHANNEL_HDL_REC *eda_find_chan_hdl_r | ||
| 26 | |||
| 27 | void eda_msg_destroy(EDSV_MSG *msg); | ||
| 28 | |||
| 29 | -uint32_t eda_extract_pattern_from_event( | ||
| 30 | +SaAisErrorT eda_extract_pattern_from_event( | ||
| 31 | SaEvtEventPatternArrayT *from_pattern_array, | ||
| 32 | SaEvtEventPatternArrayT **to_pattern_array); | ||
| 33 | |||
| 34 | -uint32_t eda_allocate_and_extract_pattern_from_event( | ||
| 35 | +SaAisErrorT eda_allocate_and_extract_pattern_from_event( | ||
| 36 | SaEvtEventPatternArrayT *from_pattern_array, | ||
| 37 | SaEvtEventPatternArrayT **to_pattern_array); | ||
| 38 | |||
| 39 | --- a/src/evt/evtd/eds_mds.h | ||
| 40 | +++ b/src/evt/evtd/eds_mds.h | ||
| 41 | @@ -49,8 +49,7 @@ uint32_t eds_mds_msg_send(EDS_CB *cb, ED | ||
| 42 | MDS_SEND_PRIORITY_TYPE prio); | ||
| 43 | |||
| 44 | uint32_t eds_mds_ack_send(EDS_CB *cb, EDSV_MSG *msg, MDS_DEST dest, | ||
| 45 | - SaTimeT timeout, MDS_SEND_PRIORITY_TYPE prio); | ||
| 46 | - | ||
| 47 | + SaTimeT timeout, uint32_t prio); | ||
| 48 | uint32_t eds_dec_subscribe_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); | ||
| 49 | |||
| 50 | uint32_t eds_dec_publish_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); | ||
| 51 | --- a/src/smf/smfnd/smfnd.h | ||
| 52 | +++ b/src/smf/smfnd/smfnd.h | ||
| 53 | @@ -76,7 +76,7 @@ extern "C" { | ||
| 54 | #endif | ||
| 55 | |||
| 56 | /* smfnd_amf.c */ | ||
| 57 | -extern uint32_t smfnd_amf_init(smfnd_cb_t *cb); | ||
| 58 | +extern SaAisErrorT smfnd_amf_init(smfnd_cb_t *cb); | ||
| 59 | |||
| 60 | /* smfnd_mds.c */ | ||
| 61 | extern uint32_t smfnd_mds_init(smfnd_cb_t *cb); | ||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.26.02.bb index 3dd950c720..eede11515b 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.26.02.bb | |||
| @@ -26,14 +26,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ | |||
| 26 | file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ | 26 | file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ |
| 27 | file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ | 27 | file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ |
| 28 | file://0001-immom_python-convert-to-python3.patch \ | 28 | file://0001-immom_python-convert-to-python3.patch \ |
| 29 | file://0001-Fix-build-with-fno-common.patch \ | ||
| 30 | file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ | 29 | file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ |
| 31 | file://0001-include-missing-array-header.patch \ | ||
| 32 | file://0002-configure-Disable-selected-warnings.patch \ | 30 | file://0002-configure-Disable-selected-warnings.patch \ |
| 33 | file://0001-include-cstdint-for-uintXX_t-types.patch \ | 31 | file://0001-To-fix-Werror-discarded-qualifiers-error.patch \ |
| 34 | file://0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch \ | ||
| 35 | " | 32 | " |
| 36 | SRC_URI[sha256sum] = "f008d53c83087ce2014c6089bc4ef08e14c1b4091298b943f4ceade1aa6bf61e" | 33 | SRC_URI[sha256sum] = "c51603bc486ce6db271a7023a75963bfc6f277f4d4486df2fe004a51c81cfdee" |
| 37 | 34 | ||
| 38 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" | 35 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" |
| 39 | 36 | ||
diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.10.6.bb b/meta-networking/recipes-daemons/postfix/postfix_3.10.8.bb index 647680bf25..2423e17169 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.10.6.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.10.8.bb | |||
| @@ -28,7 +28,7 @@ SRC_URI = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P | |||
| 28 | file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ | 28 | file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ |
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | SRC_URI[sha256sum] = "71b383f57d4cb363201be8a301bcbafe304aadbe7f38ebde41cd5b952248465b" | 31 | SRC_URI[sha256sum] = "31d4b3eb8093d823b5a151f571719ff7c0462571bc95e6440d87ca525bfb096c" |
| 32 | 32 | ||
| 33 | UPSTREAM_CHECK_URI = "https://www.postfix.org/announcements.html" | 33 | UPSTREAM_CHECK_URI = "https://www.postfix.org/announcements.html" |
| 34 | UPSTREAM_CHECK_REGEX = "postfix-(?P<pver>\d+(\.\d+)+)" | 34 | UPSTREAM_CHECK_REGEX = "postfix-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb index 65dd2f9561..d64e0a0495 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb | |||
| @@ -25,6 +25,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+\w?))" | |||
| 25 | CVE_VERSION_SUFFIX = "alphabetical" | 25 | CVE_VERSION_SUFFIX = "alphabetical" |
| 26 | 26 | ||
| 27 | CVE_STATUS[CVE-2001-0027] = "fixed-version: version 1.2.0rc3 removed affected module" | 27 | CVE_STATUS[CVE-2001-0027] = "fixed-version: version 1.2.0rc3 removed affected module" |
| 28 | CVE_STATUS[CVE-2021-47865] = "upstream-wontfix: it is not a vulnerability but inproper configuration" | ||
| 28 | 29 | ||
| 29 | EXTRA_OECONF += "--enable-largefile INSTALL=install" | 30 | EXTRA_OECONF += "--enable-largefile INSTALL=install" |
| 30 | 31 | ||
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.52.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.53.bb index c5c9c87c7f..02a10f8e84 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.52.bb +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.53.bb | |||
| @@ -3,7 +3,7 @@ DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and | |||
| 3 | HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" | 3 | HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" |
| 4 | SECTION = "net" | 4 | SECTION = "net" |
| 5 | LICENSE = "0BSD" | 5 | LICENSE = "0BSD" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=5138d4a8a877b32de6a78cf7e9e99c25" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=384872cb5bfd3a52956dc3743ed9fd48" |
| 7 | 7 | ||
| 8 | DEPENDS = "libcap virtual/crypt" | 8 | DEPENDS = "libcap virtual/crypt" |
| 9 | 9 | ||
| @@ -11,7 +11,7 @@ SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.t | |||
| 11 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ | 11 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ |
| 12 | file://nostrip.patch \ | 12 | file://nostrip.patch \ |
| 13 | " | 13 | " |
| 14 | SRC_URI[sha256sum] = "1126f3a95856d08889ff89703cb1aa9ec9924d939d154e96904c920f05dc3c74" | 14 | SRC_URI[sha256sum] = "b3f2b0194223b1e88bf8b0df9e91ffb5d1b9812356e9dd465f2f97b72b21265f" |
| 15 | 15 | ||
| 16 | inherit autotools | 16 | inherit autotools |
| 17 | 17 | ||
diff --git a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index 3aa08f84da..39392e1cc7 100644 --- a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch | |||
| @@ -12,31 +12,9 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> | |||
| 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 13 | 13 | ||
| 14 | --- | 14 | --- |
| 15 | acinclude/krb5.m4 | 10 +++++++++- | ||
| 16 | acinclude/lib-checks.m4 | 8 ++++++-- | 15 | acinclude/lib-checks.m4 | 8 ++++++-- |
| 17 | 2 files changed, 15 insertions(+), 3 deletions(-) | 16 | 2 files changed, 15 insertions(+), 3 deletions(-) |
| 18 | 17 | ||
| 19 | diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 | ||
| 20 | index e0286fa..b3e4bc7 100644 | ||
| 21 | --- a/acinclude/krb5.m4 | ||
| 22 | +++ b/acinclude/krb5.m4 | ||
| 23 | @@ -98,7 +98,15 @@ main(void) | ||
| 24 | krb5_init_context(&context); | ||
| 25 | return 0; | ||
| 26 | } | ||
| 27 | -]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ]) | ||
| 28 | +]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ], | ||
| 29 | +[ | ||
| 30 | + dnl Can't test in cross compiled env - so assume good | ||
| 31 | + squid_cv_broken_heimdal_krb5_h=no | ||
| 32 | +]) | ||
| 33 | + ], | ||
| 34 | + [ | ||
| 35 | + dnl Can't test in cross compiled env - so assume good | ||
| 36 | + squid_cv_broken_heimdal_krb5_h=no | ||
| 37 | ]) | ||
| 38 | SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test) | ||
| 39 | ]) | ||
| 40 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 | 18 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 |
| 41 | index 9793b9a..4f2dc83 100644 | 19 | index 9793b9a..4f2dc83 100644 |
| 42 | --- a/acinclude/lib-checks.m4 | 20 | --- a/acinclude/lib-checks.m4 |
diff --git a/meta-networking/recipes-daemons/squid/squid_7.3.bb b/meta-networking/recipes-daemons/squid/squid_7.5.bb index 8d1d84c04e..3364c1f746 100644 --- a/meta-networking/recipes-daemons/squid/squid_7.3.bb +++ b/meta-networking/recipes-daemons/squid/squid_7.5.bb | |||
| @@ -22,14 +22,14 @@ SRC_URI = "https://github.com/squid-cache/${BPN}/releases/download/SQUID_${PV_U} | |||
| 22 | file://squid.nm \ | 22 | file://squid.nm \ |
| 23 | " | 23 | " |
| 24 | 24 | ||
| 25 | SRC_URI[sha256sum] = "dadc2a9a3926ce1b3babeaa7a7d7b21cbb089025876daa3f5c19e7eb6391ddcd" | 25 | SRC_URI[sha256sum] = "f6058907db0150d2f5d228482b5a9e5678920cf368ae0ccbcecceb2ff4c35106" |
| 26 | 26 | ||
| 27 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 27 | LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \ |
| 28 | file://errors/COPYRIGHT;md5=c2a0e15750d3a9743af9109fecc05622 \ | 28 | file://errors/COPYRIGHT;md5=41d117978dbffedc893e8eeca12537d0 \ |
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | UPSTREAM_CHECK_URI = "https://github.com/squid-cache/${BPN}/releases/" | 31 | UPSTREAM_CHECK_URI = "https://github.com/squid-cache/${BPN}/releases/" |
| 32 | UPSTREAM_CHECK_REGEX = "v?(?P<pver>\d+(\.\d+)+)" | 32 | UPSTREAM_CHECK_REGEX = "SQUID_(?P<pver>\d+(_\d+)+)" |
| 33 | 33 | ||
| 34 | DEPENDS = "libtool" | 34 | DEPENDS = "libtool" |
| 35 | 35 | ||
diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.31.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.33.bb index d95bb81278..fa802d02bd 100644 --- a/meta-networking/recipes-extended/kronosnet/kronosnet_1.31.bb +++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.33.bb | |||
| @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa88 | |||
| 11 | SECTION = "libs" | 11 | SECTION = "libs" |
| 12 | DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" | 12 | DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" |
| 13 | 13 | ||
| 14 | SRCREV = "da73f2a1e0ffe2aee15d4f705edf90ee8445e2d4" | 14 | SRCREV = "176bc1064a8e85f95eda2cb1e53b1ce5d471d857" |
| 15 | SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1;tag=v${PV}" | 15 | SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1;tag=v${PV}" |
| 16 | 16 | ||
| 17 | BB_GIT_SHALLOW_EXTRA_REFS = "refs/tags/v${PV}" | 17 | BB_GIT_SHALLOW_EXTRA_REFS = "refs/tags/v${PV}" |
diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.9.bb index 524718d56c..798939863d 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.9.bb | |||
| @@ -13,7 +13,7 @@ SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-too | |||
| 13 | file://init \ | 13 | file://init \ |
| 14 | file://conntrackd.service \ | 14 | file://conntrackd.service \ |
| 15 | " | 15 | " |
| 16 | SRC_URI[sha256sum] = "067677f4c5f6564819e78ed3a9d4a8980935ea9273f3abb22a420ea30ab5ded6" | 16 | SRC_URI[sha256sum] = "c15afe488a8d408c9d6d61e97dbd19f3c591942f62c13df6453a961ca4231cae" |
| 17 | 17 | ||
| 18 | inherit autotools update-rc.d pkgconfig systemd | 18 | inherit autotools update-rc.d pkgconfig systemd |
| 19 | 19 | ||
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.1.bb index 08d3ab691c..e397034504 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.1.bb | |||
| @@ -9,7 +9,7 @@ DEPENDS = "libnfnetlink libmnl" | |||
| 9 | SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.xz \ | 9 | SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.xz \ |
| 10 | " | 10 | " |
| 11 | 11 | ||
| 12 | SRC_URI[sha256sum] = "67edcb4eb826c2f8dc98af08dabff68f3b3d0fe6fb7d9d0ac1ee7ecce0fe694e" | 12 | SRC_URI[sha256sum] = "769d3eaf57fa4fbdb05dd12873b6cb9a5be7844d8937e222b647381d44284820" |
| 13 | 13 | ||
| 14 | S = "${UNPACKDIR}/libnetfilter_conntrack-${PV}" | 14 | S = "${UNPACKDIR}/libnetfilter_conntrack-${PV}" |
| 15 | 15 | ||
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb index 505dfc12d0..d27e60a18d 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb | |||
| @@ -16,7 +16,7 @@ SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ | |||
| 16 | " | 16 | " |
| 17 | SRC_URI[sha256sum] = "372931bda8556b310636a2f9020adc710f9bab66f47efe0ce90bff800ac2530c" | 17 | SRC_URI[sha256sum] = "372931bda8556b310636a2f9020adc710f9bab66f47efe0ce90bff800ac2530c" |
| 18 | 18 | ||
| 19 | inherit autotools manpages pkgconfig ptest | 19 | inherit autotools manpages pkgconfig ptest python3native |
| 20 | 20 | ||
| 21 | PACKAGECONFIG ?= "python readline json" | 21 | PACKAGECONFIG ?= "python readline json" |
| 22 | PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" | 22 | PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" |
diff --git a/meta-networking/recipes-irc/weechat/weechat_4.6.0.bb b/meta-networking/recipes-irc/weechat/weechat_4.8.2.bb index da79c59ba5..458a8a317d 100644 --- a/meta-networking/recipes-irc/weechat/weechat_4.6.0.bb +++ b/meta-networking/recipes-irc/weechat/weechat_4.8.2.bb | |||
| @@ -8,7 +8,7 @@ DEPENDS = "zlib libgcrypt gnutls curl aspell zstd cjson gettext-native" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz" | 9 | SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz" |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "2681fc662996fead9d66a26d81740088e4284cf4e6dfe6b834f3b98fc703597f" | 11 | SRC_URI[sha256sum] = "7e2f619d4dcd28d9d86864763581a1b453499f8dd0652af863b54045a8964d6c" |
| 12 | 12 | ||
| 13 | inherit cmake pkgconfig | 13 | inherit cmake pkgconfig |
| 14 | 14 | ||
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20250521.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20260223.bb index 8fb86bc31e..50449b8c9b 100644 --- a/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20250521.bb +++ b/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20260223.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | require wireguard.inc | 1 | require wireguard.inc |
| 2 | 2 | ||
| 3 | SRCREV = "e2ecaaa739144997ccff89d6ad6ec81698ea6ced" | 3 | SRCREV = "49ce333da02056ae7b22ee2aeb6afe8aaed79b19" |
| 4 | SRC_URI = "git://github.com/WireGuard/wireguard-tools.git;branch=master;protocol=https" | 4 | SRC_URI = "git://github.com/WireGuard/wireguard-tools.git;branch=master;protocol=https;tag=v${PV}" |
| 5 | 5 | ||
| 6 | inherit bash-completion systemd pkgconfig | 6 | inherit bash-completion systemd pkgconfig |
| 7 | 7 | ||
diff --git a/meta-networking/recipes-protocols/frr/frr_10.5.1.bb b/meta-networking/recipes-protocols/frr/frr_10.5.2.bb index c125709bf4..710bdf4a5d 100644 --- a/meta-networking/recipes-protocols/frr/frr_10.5.1.bb +++ b/meta-networking/recipes-protocols/frr/frr_10.5.2.bb | |||
| @@ -16,7 +16,7 @@ SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.5; | |||
| 16 | file://CVE-2025-61099-61107-2.patch \ | 16 | file://CVE-2025-61099-61107-2.patch \ |
| 17 | file://CVE-2025-61099-61107-3.patch \ | 17 | file://CVE-2025-61099-61107-3.patch \ |
| 18 | " | 18 | " |
| 19 | SRCREV = "d17791ee7ee76a0407d3fdbebf81bd242840741b" | 19 | SRCREV = "fa68c0ca04f95125cb993b5cacb64fc1495348eb" |
| 20 | 20 | ||
| 21 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" | 21 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" |
| 22 | 22 | ||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.5.2.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.5.2.bb index b7c9607b3b..d5e2931969 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.5.2.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.5.2.bb | |||
| @@ -41,7 +41,7 @@ PARALLEL_MAKE = "" | |||
| 41 | CCACHE = "" | 41 | CCACHE = "" |
| 42 | CLEANBROKEN = "1" | 42 | CLEANBROKEN = "1" |
| 43 | 43 | ||
| 44 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} des smux" | 44 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} smux" |
| 45 | PACKAGECONFIG[des] = "--enable-des, --disable-des" | 45 | PACKAGECONFIG[des] = "--enable-des, --disable-des" |
| 46 | PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" | 46 | PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" |
| 47 | PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" | 47 | PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" |
| @@ -49,6 +49,7 @@ PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" | |||
| 49 | PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no, perl" | 49 | PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no, perl" |
| 50 | PACKAGECONFIG[smux] = "" | 50 | PACKAGECONFIG[smux] = "" |
| 51 | PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd" | 51 | PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd" |
| 52 | PACKAGECONFIG[aes] = "--enable-blumenthal-aes," | ||
| 52 | 53 | ||
| 53 | SYSCONTACT_DISTRO ?= "no-contact-set@example.com" | 54 | SYSCONTACT_DISTRO ?= "no-contact-set@example.com" |
| 54 | 55 | ||
diff --git a/meta-networking/recipes-protocols/nghttp3/nghttp3_1.15.0.bb b/meta-networking/recipes-protocols/nghttp3/nghttp3_1.15.0.bb new file mode 100644 index 0000000000..2539939bb1 --- /dev/null +++ b/meta-networking/recipes-protocols/nghttp3/nghttp3_1.15.0.bb | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | SUMMARY = "HTTP/3 library written in C" | ||
| 2 | HOMEPAGE = "https://nghttp2.org/nghttp3" | ||
| 3 | BUGTRACKER = "https://github.com/ngtcp2/nghttp3/issues" | ||
| 4 | LICENSE = "MIT" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=2005b8c7595329cc8ab211085467600a" | ||
| 6 | |||
| 7 | SRC_URI = "git://github.com/ngtcp2/nghttp3;protocol=https;branch=main;tag=v${PV};name=nghttp3 \ | ||
| 8 | git://github.com/ngtcp2/munit;protocol=https;branch=main;name=munit;subdir=${S}/tests/munit \ | ||
| 9 | git://github.com/ngtcp2/sfparse;protocol=https;branch=main;name=sfparse;subdir=${S}/lib/sfparse \ | ||
| 10 | " | ||
| 11 | |||
| 12 | SRCREV_nghttp3 = "d326f4c1eb3f6a780d77793b30e16756c498f913" | ||
| 13 | SRCREV_munit = "11e8e3466b2d6a8bdfd4b05a3d1ee7805c5d3442" | ||
| 14 | SRCREV_sfparse = "ff7f230e7df2844afef7dc49631cda03a30455f3" | ||
| 15 | |||
| 16 | SRCREV_FORMAT = "nghttp3" | ||
| 17 | |||
| 18 | inherit cmake | ||
| 19 | |||
| 20 | PACKAGECONFIG ?= "shared" | ||
| 21 | |||
| 22 | PACKAGECONFIG[static] = "-DENABLE_STATIC=ON, -DENABLE_STATIC=OFF" | ||
| 23 | PACKAGECONFIG[shared] = "-DENABLE_SHARED=ON, -DENABLE_SHARED=OFF" | ||
| 24 | PACKAGECONFIG[build-lib-only] = "-DENABLE_LIB_ONLY=ON, -DENABLE_LIB_ONLY=OFF" | ||
diff --git a/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.21.0.bb b/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.21.0.bb new file mode 100644 index 0000000000..f71de5aa07 --- /dev/null +++ b/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.21.0.bb | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | SUMMARY = "ngtcp2 project is an effort to implement IETF QUIC protocol" | ||
| 2 | HOMEPAGE = "https://nghttp2.org/ngtcp2" | ||
| 3 | BUGTRACKER = "https://github.com/ngtcp2/ngtcp2/issues" | ||
| 4 | LICENSE = "MIT" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=de0966c8ff4f62661a3da92967a75434" | ||
| 6 | |||
| 7 | SRC_URI = "gitsm://github.com/ngtcp2/ngtcp2;protocol=https;branch=main;tag=v${PV};name=ngtcp2" | ||
| 8 | SRCREV = "9e32add590fc74707b62f61aa5e0aa5c6f8a2c60" | ||
| 9 | |||
| 10 | DEPENDS = "brotli libev nghttp3" | ||
| 11 | |||
| 12 | inherit cmake | ||
| 13 | |||
| 14 | PACKAGECONFIG ?= "shared gnutls" | ||
| 15 | |||
| 16 | PACKAGECONFIG[static] = "-DENABLE_STATIC_LIB=ON, -DENABLE_STATIC_LIB=OFF" | ||
| 17 | PACKAGECONFIG[shared] = "-DENABLE_SHARED_LIB=ON, -DENABLE_SHARED_LIB=OFF" | ||
| 18 | PACKAGECONFIG[build-lib-only] = "-DENABLE_LIB_ONLY=ON, -DENABLE_LIB_ONLY=OFF" | ||
| 19 | PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON, -DENABLE_OPENSSL=OFF, openssl" | ||
| 20 | PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON, -DENABLE_GNUTLS=OFF, gnutls" | ||
diff --git a/meta-networking/recipes-protocols/nopoll/nopoll_0.4.7.b429.bb b/meta-networking/recipes-protocols/nopoll/nopoll_0.4.9.b462.bb index b4f8605136..dbe8407443 100644 --- a/meta-networking/recipes-protocols/nopoll/nopoll_0.4.7.b429.bb +++ b/meta-networking/recipes-protocols/nopoll/nopoll_0.4.9.b462.bb | |||
| @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f0504124678c1b3158146e0630229298 \ | |||
| 13 | DEPENDS = "openssl" | 13 | DEPENDS = "openssl" |
| 14 | SRC_URI = "http://www.aspl.es/nopoll/downloads/nopoll-${PV}.tar.gz \ | 14 | SRC_URI = "http://www.aspl.es/nopoll/downloads/nopoll-${PV}.tar.gz \ |
| 15 | " | 15 | " |
| 16 | SRC_URI[sha256sum] = "d5c020fec25e3fa486c308249833d06bed0d76bde9a72fd5d73cfb057c320366" | 16 | SRC_URI[sha256sum] = "80bfa3e0228e88e290dd23eb94d9bb1f4d726fb117c11cfb048cbdd1d71d379a" |
| 17 | 17 | ||
| 18 | inherit autotools pkgconfig | 18 | inherit autotools pkgconfig |
| 19 | 19 | ||
diff --git a/meta-networking/recipes-protocols/opcua/open62541/a725a263124ae8c87fe6af34a9b3a7981b7f116d.patch b/meta-networking/recipes-protocols/opcua/open62541/a725a263124ae8c87fe6af34a9b3a7981b7f116d.patch deleted file mode 100644 index 6d038d4cba..0000000000 --- a/meta-networking/recipes-protocols/opcua/open62541/a725a263124ae8c87fe6af34a9b3a7981b7f116d.patch +++ /dev/null | |||
| @@ -1,114 +0,0 @@ | |||
| 1 | From a725a263124ae8c87fe6af34a9b3a7981b7f116d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Johannes Kauffmann <johanneskauffmann@hotmail.com> | ||
| 3 | Date: Wed, 10 Dec 2025 09:36:55 +0100 | ||
| 4 | Subject: [PATCH] fix(build): List private dependencies in .pc file | ||
| 5 | |||
| 6 | In the "normal" case of linking to open62541.so, only -lopen62541 is | ||
| 7 | needed in `Libs` because open62541's dependencies are not exposed via | ||
| 8 | its public header files. | ||
| 9 | |||
| 10 | All the other dependencies (`Requires.private` and `Libs.private`) only | ||
| 11 | matter using open62541.a (linking statically via `pkg-config --static`). | ||
| 12 | The crypto libraries and TMP2 library provide .pc files themselves, so | ||
| 13 | we can list them in `Requires.private`. The other (direct) open62541 | ||
| 14 | dependencies are listed in `Libs.private`. | ||
| 15 | |||
| 16 | Also reorder the .pc file (`Libs` comes last and `Requires(.private) | ||
| 17 | comes` before `Cflags`). | ||
| 18 | |||
| 19 | Fixes: #7574 | ||
| 20 | |||
| 21 | Upstream-Status: Submitted [https://github.com/open62541/open62541/pull/7588] | ||
| 22 | --- | ||
| 23 | CMakeLists.txt | 22 +++++++++++----------- | ||
| 24 | tools/open62541.pc.in | 4 +++- | ||
| 25 | 2 files changed, 14 insertions(+), 12 deletions(-) | ||
| 26 | |||
| 27 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 28 | index 91bf382fd71..6ef54a67847 100644 | ||
| 29 | --- a/CMakeLists.txt | ||
| 30 | +++ b/CMakeLists.txt | ||
| 31 | @@ -493,13 +493,18 @@ endif() | ||
| 32 | |||
| 33 | set(open62541_LIBRARIES "") | ||
| 34 | set(open62541_PUBLIC_LIBRARIES "") | ||
| 35 | +set(pkgcfg_libsprivate "") | ||
| 36 | +set(pkgcfg_requiresprivate "") | ||
| 37 | if("${UA_ARCHITECTURE}" STREQUAL "posix") | ||
| 38 | list(APPEND open62541_LIBRARIES "m") | ||
| 39 | + list(APPEND pkgcfg_libsprivate "-lm") | ||
| 40 | if(UA_MULTITHREADING GREATER_EQUAL 100 OR UA_BUILD_UNIT_TESTS) | ||
| 41 | list(APPEND open62541_PUBLIC_LIBRARIES "pthread") | ||
| 42 | + list(APPEND pkgcfg_libsprivate "-lpthread") | ||
| 43 | endif() | ||
| 44 | if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")) | ||
| 45 | list(APPEND open62541_LIBRARIES "rt") | ||
| 46 | + list(APPEND pkgcfg_libsprivate "-lrt") | ||
| 47 | endif() | ||
| 48 | elseif("${UA_ARCHITECTURE}" STREQUAL "win32") | ||
| 49 | list(APPEND open62541_LIBRARIES "ws2_32") | ||
| 50 | @@ -511,6 +516,7 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL) | ||
| 51 | # https://cmake.org/cmake/help/v3.13/module/FindOpenSSL.html | ||
| 52 | find_package(OpenSSL REQUIRED) | ||
| 53 | list(APPEND open62541_LIBRARIES "${OPENSSL_LIBRARIES}") | ||
| 54 | + list(APPEND pkgcfg_requiresprivate "openssl") | ||
| 55 | if(WIN32) | ||
| 56 | # Add bestcrypt for windows systems | ||
| 57 | list(APPEND open62541_LIBRARIES bcrypt) | ||
| 58 | @@ -521,6 +527,7 @@ if(UA_ENABLE_ENCRYPTION_LIBRESSL) | ||
| 59 | # See https://github.com/libressl-portable/portable/blob/master/FindLibreSSL.cmake | ||
| 60 | find_package(LibreSSL REQUIRED) | ||
| 61 | list(APPEND open62541_LIBRARIES ${LIBRESSL_LIBRARIES}) | ||
| 62 | + list(APPEND pkgcfg_requiresprivate "openssl") | ||
| 63 | if(WIN32) | ||
| 64 | # Add bestcrypt for random generator and ws2_32 for crypto | ||
| 65 | list(APPEND open62541_LIBRARIES ws2_32 bcrypt) | ||
| 66 | @@ -533,6 +540,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_PUBSUB_ENCRYPTION) | ||
| 67 | # defined in /tools/cmake/FindMbedTLS.cmake. | ||
| 68 | find_package(MbedTLS REQUIRED) | ||
| 69 | list(APPEND open62541_LIBRARIES ${MBEDTLS_LIBRARIES}) | ||
| 70 | + list(APPEND pkgcfg_requiresprivate "mbedtls") | ||
| 71 | if(WIN32) | ||
| 72 | # Add bestcrypt for windows systems | ||
| 73 | list(APPEND open62541_LIBRARIES bcrypt) | ||
| 74 | @@ -541,6 +549,7 @@ endif() | ||
| 75 | |||
| 76 | if(UA_ENABLE_TPM2_SECURITY) | ||
| 77 | list(APPEND open62541_LIBRARIES ${TPM2_LIB}) | ||
| 78 | + list(APPEND pkgcfg_requiresprivate "tpm2-pkcs11") | ||
| 79 | endif() | ||
| 80 | |||
| 81 | if(MINGW) | ||
| 82 | @@ -1531,17 +1540,8 @@ if(UA_ENABLE_AMALGAMATION) | ||
| 83 | set(PC_EXTRA_CFLAGS "-DUA_ENABLE_AMALGAMATION") | ||
| 84 | endif() | ||
| 85 | |||
| 86 | -set(pkgcfgpubliclibs "") | ||
| 87 | -foreach(lib ${open62541_PUBLIC_LIBRARIES}) | ||
| 88 | - set(pkgcfgpubliclibs "${pkgcfgpubliclibs}-l${lib} ") | ||
| 89 | -endforeach() | ||
| 90 | - | ||
| 91 | -if(BUILD_SHARED_LIBS) | ||
| 92 | - foreach(lib ${open62541_LIBRARIES}) | ||
| 93 | - set(pkgcfgpubliclibs "${pkgcfgpubliclibs}-l${lib} ") | ||
| 94 | - endforeach() | ||
| 95 | -endif() | ||
| 96 | - | ||
| 97 | +string(REPLACE ";" " " pkgcfg_requiresprivate "${pkgcfg_requiresprivate}") | ||
| 98 | +string(REPLACE ";" " " pkgcfg_libsprivate "${pkgcfg_libsprivate}") | ||
| 99 | configure_file(tools/open62541.pc.in ${PROJECT_BINARY_DIR}/src_generated/open62541.pc @ONLY) | ||
| 100 | |||
| 101 | if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | ||
| 102 | diff --git a/tools/open62541.pc.in b/tools/open62541.pc.in | ||
| 103 | index 50abf00af4e..a5986013c8e 100644 | ||
| 104 | --- a/tools/open62541.pc.in | ||
| 105 | +++ b/tools/open62541.pc.in | ||
| 106 | @@ -5,5 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ | ||
| 107 | Name: open62541 | ||
| 108 | Description: open62541 is an open source C (C99) implementation of OPC UA | ||
| 109 | Version: @OPEN62541_VER_MAJOR@.@OPEN62541_VER_MINOR@.@OPEN62541_VER_PATCH@@OPEN62541_VER_LABEL@ | ||
| 110 | -Libs: -L${libdir} -lopen62541 @pkgcfgpubliclibs@ | ||
| 111 | +Requires.private: @pkgcfg_requiresprivate@ | ||
| 112 | Cflags: -I${includedir} @PC_EXTRA_CFLAGS@ | ||
| 113 | +Libs: -L${libdir} -lopen62541 | ||
| 114 | +Libs.private: @pkgcfg_libsprivate@ | ||
diff --git a/meta-networking/recipes-protocols/opcua/open62541_1.4.14.bb b/meta-networking/recipes-protocols/opcua/open62541_1.4.16.bb index 07efeac0ec..32f7148f4b 100644 --- a/meta-networking/recipes-protocols/opcua/open62541_1.4.14.bb +++ b/meta-networking/recipes-protocols/opcua/open62541_1.4.16.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "\ | |||
| 8 | " | 8 | " |
| 9 | 9 | ||
| 10 | SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c" | 10 | SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c" |
| 11 | SRCREV_opcua = "95dc4c1e9c8c4d3619f90b9c3fc3af194acb8b30" | 11 | SRCREV_opcua = "f63e2a819aff6e468242dc2e54ccbd5b75d63654" |
| 12 | SRCREV_mdnsd = "488d24fb9d427aec77df180268f0291eeee7fb8b" | 12 | SRCREV_mdnsd = "488d24fb9d427aec77df180268f0291eeee7fb8b" |
| 13 | SRCREV_ua-nodeset = "d1bb6a22125bd7cd986272b1ee98a18a91d76fff" | 13 | SRCREV_ua-nodeset = "d1bb6a22125bd7cd986272b1ee98a18a91d76fff" |
| 14 | SRCREV_mqtt-c = "0f4c34c8cc00b16cfee094745d68b8cdbaecd8e0" | 14 | SRCREV_mqtt-c = "0f4c34c8cc00b16cfee094745d68b8cdbaecd8e0" |
| @@ -18,7 +18,6 @@ SRC_URI = " \ | |||
| 18 | git://github.com/Pro/mdnsd.git;name=mdnsd;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mdnsd \ | 18 | git://github.com/Pro/mdnsd.git;name=mdnsd;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mdnsd \ |
| 19 | git://github.com/OPCFoundation/UA-Nodeset;name=ua-nodeset;protocol=https;branch=latest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/ua-nodeset \ | 19 | git://github.com/OPCFoundation/UA-Nodeset;name=ua-nodeset;protocol=https;branch=latest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/ua-nodeset \ |
| 20 | git://github.com/LiamBindle/MQTT-C.git;name=mqtt-c;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mqtt-c \ | 20 | git://github.com/LiamBindle/MQTT-C.git;name=mqtt-c;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mqtt-c \ |
| 21 | file://a725a263124ae8c87fe6af34a9b3a7981b7f116d.patch \ | ||
| 22 | " | 21 | " |
| 23 | 22 | ||
| 24 | 23 | ||
| @@ -36,9 +35,10 @@ FILES:${PN} = "${libdir}/lib*${SOLIBS}" | |||
| 36 | PACKAGES += "${PN}-tools" | 35 | PACKAGES += "${PN}-tools" |
| 37 | FILES:${PN}-tools = "${datadir}/${BPN}/*" | 36 | FILES:${PN}-tools = "${datadir}/${BPN}/*" |
| 38 | 37 | ||
| 39 | PACKAGECONFIG ?= "encryption-mbedtls pubsub pubsub-eth pubsub-informationmodel subscriptions subscriptions-events namespace-full" | 38 | PACKAGECONFIG ?= "encryption-mbedtls historizing pubsub pubsub-eth pubsub-informationmodel subscriptions subscriptions-events namespace-full" |
| 40 | PACKAGECONFIG[encryption-mbedtls] = "-DUA_ENABLE_ENCRYPTION=MBEDTLS, , mbedtls, , , encryption-openssl" | 39 | PACKAGECONFIG[encryption-mbedtls] = "-DUA_ENABLE_ENCRYPTION=MBEDTLS, , mbedtls, , , encryption-openssl" |
| 41 | PACKAGECONFIG[encryption-openssl] = "-DUA_ENABLE_ENCRYPTION=OPENSSL, , openssl, , , encryption-mbedtls" | 40 | PACKAGECONFIG[encryption-openssl] = "-DUA_ENABLE_ENCRYPTION=OPENSSL, , openssl, , , encryption-mbedtls" |
| 41 | PACKAGECONFIG[historizing] = "-DUA_ENABLE_HISTORIZING=ON, -DUA_ENABLE_HISTORIZING=OFF" | ||
| 42 | PACKAGECONFIG[multithreading] = "-DUA_MULTITHREADING=100, -DUA_MULTITHREADING=0" | 42 | PACKAGECONFIG[multithreading] = "-DUA_MULTITHREADING=100, -DUA_MULTITHREADING=0" |
| 43 | PACKAGECONFIG[namespace-full] = "-DUA_NAMESPACE_ZERO=FULL, , , , , namespace-reduced" | 43 | PACKAGECONFIG[namespace-full] = "-DUA_NAMESPACE_ZERO=FULL, , , , , namespace-reduced" |
| 44 | PACKAGECONFIG[namespace-reduced] = "-DUA_NAMESPACE_ZERO=REDUCED, , , , , namespace-full" | 44 | PACKAGECONFIG[namespace-reduced] = "-DUA_NAMESPACE_ZERO=REDUCED, , , , , namespace-full" |
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 4e5b45891d..1d11d374fc 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb | |||
| @@ -96,4 +96,5 @@ do_install_ptest () { | |||
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | RDEPENDS:${PN} = "ppp ppp-l2tp bash" | 98 | RDEPENDS:${PN} = "ppp ppp-l2tp bash" |
| 99 | RDEPENDS:${PN}-ptest += "rpcbind kernel-module-l2tp-ppp procps-ps tcl" | 99 | RDEPENDS:${PN}-ptest += "rpcbind procps-ps tcl" |
| 100 | RRECOMMENDS:${PN}-ptest = "kernel-module-l2tp-ppp" | ||
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb index be2cfb0816..201e9e16b4 100644 --- a/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | SUMMARY = "Administration tool for arp packet filtering" | 1 | SUMMARY = "Administration tool for arp packet filtering" |
| 2 | SECTION = "net" | 2 | SECTION = "net" |
| 3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" |
| 5 | SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" | 5 | SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" |
| 6 | PV = "0.0.5+git" | 6 | PV = "0.0.5+git" |
| 7 | 7 | ||
| @@ -11,8 +11,6 @@ SRC_URI = " \ | |||
| 11 | file://arptables-arpt-get-target-fix.patch \ | 11 | file://arptables-arpt-get-target-fix.patch \ |
| 12 | file://arptables.service \ | 12 | file://arptables.service \ |
| 13 | " | 13 | " |
| 14 | SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" | ||
| 15 | SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" | ||
| 16 | 14 | ||
| 17 | SYSTEMD_SERVICE:${PN} = "arptables.service" | 15 | SYSTEMD_SERVICE:${PN} = "arptables.service" |
| 18 | 16 | ||
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb index 59e3dbae5f..ddb243105a 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | SUMMARY = "Tools for ethernet bridging" | 1 | SUMMARY = "Tools for ethernet bridging" |
| 2 | HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" | 2 | HOMEPAGE = "https://wiki.linuxfoundation.org/networking/bridge" |
| 3 | SECTION = "net" | 3 | SECTION = "net" |
| 4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
| 5 | 5 | ||
diff --git a/meta-networking/recipes-support/chrony/chrony_4.8.bb b/meta-networking/recipes-support/chrony/chrony_4.8.bb index f50576c272..a7fc73e081 100644 --- a/meta-networking/recipes-support/chrony/chrony_4.8.bb +++ b/meta-networking/recipes-support/chrony/chrony_4.8.bb | |||
| @@ -48,6 +48,7 @@ inherit update-rc.d systemd pkgconfig | |||
| 48 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} | 48 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} |
| 49 | USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" | 49 | USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" |
| 50 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /sbin/nologin chronyd;', '', d)}" | 50 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /sbin/nologin chronyd;', '', d)}" |
| 51 | GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system chronyd', '', d)}" | ||
| 51 | 52 | ||
| 52 | # Configuration options: | 53 | # Configuration options: |
| 53 | # - Security-related: | 54 | # - Security-related: |
| @@ -113,10 +114,18 @@ do_install() { | |||
| 113 | 114 | ||
| 114 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 115 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
| 115 | install -d ${D}${sysconfdir}/tmpfiles.d | 116 | install -d ${D}${sysconfdir}/tmpfiles.d |
| 116 | echo "d /var/lib/chrony 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/chronyd.conf | 117 | if ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'true', 'false', d)}; then |
| 118 | echo "d /var/lib/chrony 0755 chronyd chronyd -" > ${D}${sysconfdir}/tmpfiles.d/chronyd.conf | ||
| 119 | else | ||
| 120 | echo "d /var/lib/chrony 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/chronyd.conf | ||
| 121 | fi | ||
| 117 | else | 122 | else |
| 118 | install -d ${D}${sysconfdir}/default/volatiles | 123 | install -d ${D}${sysconfdir}/default/volatiles |
| 119 | echo "d root root 0755 /var/lib/chrony none" > "${D}${sysconfdir}/default/volatiles/00_runtime_chrony_dirs" | 124 | if ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'true', 'false', d)}; then |
| 125 | echo "d chronyd chronyd 0755 /var/lib/chrony none" > "${D}${sysconfdir}/default/volatiles/00_runtime_chrony_dirs" | ||
| 126 | else | ||
| 127 | echo "d root root 0755 /var/lib/chrony none" > "${D}${sysconfdir}/default/volatiles/00_runtime_chrony_dirs" | ||
| 128 | fi | ||
| 120 | fi | 129 | fi |
| 121 | 130 | ||
| 122 | } | 131 | } |
diff --git a/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch b/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch deleted file mode 100644 index 1712a53462..0000000000 --- a/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From ebe9144fdfdc8154661b93322cec4a1c43aa75ff Mon Sep 17 00:00:00 2001 | ||
| 2 | From: alperak <alperyasinak1@gmail.com> | ||
| 3 | Date: Tue, 1 Oct 2024 19:45:38 +0300 | ||
| 4 | Subject: [PATCH] Fix invalid conversion from int to CURLoption | ||
| 5 | |||
| 6 | Options.hpp:281:74: error: invalid conversion from 'int' to 'CURLoption' [-fpermissive] | ||
| 7 | 281 | typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; | ||
| 8 | | ^ | ||
| 9 | | | | ||
| 10 | | int | ||
| 11 | |||
| 12 | Fix invalid conversion by adding explicit cast to CURLoption | ||
| 13 | |||
| 14 | Upstream-Status: Pending | ||
| 15 | |||
| 16 | Signed-off-by: alperak <alperyasinak1@gmail.com> | ||
| 17 | --- | ||
| 18 | include/curlpp/Options.hpp | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp | ||
| 22 | index c705c9d..7c9a501 100644 | ||
| 23 | --- a/include/curlpp/Options.hpp | ||
| 24 | +++ b/include/curlpp/Options.hpp | ||
| 25 | @@ -278,7 +278,7 @@ namespace options | ||
| 26 | typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_LIMIT> LowSpeedLimit; | ||
| 27 | typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_TIME> LowSpeedTime; | ||
| 28 | typedef curlpp::OptionTrait<long, CURLOPT_MAXCONNECTS> MaxConnects; | ||
| 29 | - typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; | ||
| 30 | + typedef curlpp::OptionTrait<curl_closepolicy, (CURLoption)CURLOPT_CLOSEPOLICY> ClosePolicy; | ||
| 31 | typedef curlpp::OptionTrait<bool, CURLOPT_FRESH_CONNECT> FreshConnect; | ||
| 32 | typedef curlpp::OptionTrait<bool, CURLOPT_FORBID_REUSE> ForbidReuse; | ||
| 33 | typedef curlpp::OptionTrait<long, CURLOPT_CONNECTTIMEOUT> ConnectTimeout; | ||
| 34 | -- | ||
| 35 | 2.25.1 | ||
| 36 | |||
diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb index 25ea1fdefb..2f9f406b86 100644 --- a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb +++ b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb | |||
| @@ -9,10 +9,11 @@ DEPENDS:class-native = "curl-native" | |||
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ | 10 | SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ |
| 11 | file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \ | 11 | file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \ |
| 12 | file://0002-fix-invalid-conversion-from-int-to-CURLoption.patch" | 12 | " |
| 13 | 13 | ||
| 14 | SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" | 14 | SRCREV = "ec1b66e699557cd9d608d322c013a1ebda16bd08" |
| 15 | 15 | ||
| 16 | PV .= "+git" | ||
| 16 | 17 | ||
| 17 | inherit cmake pkgconfig binconfig | 18 | inherit cmake pkgconfig binconfig |
| 18 | 19 | ||
| @@ -23,4 +24,6 @@ do_install:append() { | |||
| 23 | -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ | 24 | -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ |
| 24 | -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ | 25 | -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ |
| 25 | -i ${D}${libdir}/pkgconfig/*.pc | 26 | -i ${D}${libdir}/pkgconfig/*.pc |
| 27 | |||
| 28 | sed -i 's@${RECIPE_SYSROOT}@${CMAKE_SYSROOT}@' ${D}${libdir}/cmake/curlpp/curlppTargets.cmake | ||
| 26 | } | 29 | } |
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.91.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.92.bb index 25f2d4c09a..59509ecba2 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.91.bb +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.92.bb | |||
| @@ -16,7 +16,7 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV | |||
| 16 | file://dnsmasq-noresolvconf.service \ | 16 | file://dnsmasq-noresolvconf.service \ |
| 17 | file://dnsmasq-resolved.conf \ | 17 | file://dnsmasq-resolved.conf \ |
| 18 | " | 18 | " |
| 19 | SRC_URI[sha256sum] = "2d26a048df452b3cfa7ba05efbbcdb19b12fe7a0388761eb5d00938624bd76c8" | 19 | SRC_URI[sha256sum] = "fd908e79ff37f73234afcb6d3363f78353e768703d92abd8e3220ade6819b1e1" |
| 20 | 20 | ||
| 21 | inherit pkgconfig update-rc.d systemd | 21 | inherit pkgconfig update-rc.d systemd |
| 22 | 22 | ||
diff --git a/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.5.bb index badeed8e82..03eaef24fd 100644 --- a/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb +++ b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.5.bb | |||
| @@ -8,10 +8,10 @@ SECTION = "net/misc" | |||
| 8 | LICENSE = "GPL-2.0-or-later" | 8 | LICENSE = "GPL-2.0-or-later" |
| 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/nhorman/dropwatch.git;protocol=https;nobranch=1 \ | 11 | SRC_URI = "git://github.com/nhorman/dropwatch.git;protocol=https;branch=master;tag=v${PV} \ |
| 12 | file://0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch \ | 12 | file://0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch \ |
| 13 | " | 13 | " |
| 14 | SRCREV = "1e7e487a019a7c02f1f429c4d3a4647fa3787a13" | 14 | SRCREV = "10ec0adb9758b86a647b2972932aaa98a7d002a5" |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | DEPENDS = "binutils libnl libpcap readline" | 17 | DEPENDS = "binutils libnl libpcap readline" |
diff --git a/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch b/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch deleted file mode 100644 index 592ea52f2e..0000000000 --- a/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 23 Mar 2023 10:23:14 -0700 | ||
| 4 | Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider | ||
| 5 | version 8+ | ||
| 6 | |||
| 7 | Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is | ||
| 8 | reset to 0, current check assumes major version to be 7 at max and hence | ||
| 9 | on systems with libcurl 8+ this check breaks and build fails | ||
| 10 | |||
| 11 | Fixes | ||
| 12 | |||
| 13 | TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/ettercap/0.8.3.1-r0/git/plug-ins/sslstrip/sslstrip.c:57:2: error: libcurl 7.26.0 or up is needed | ||
| 14 | ^ | ||
| 15 | 1 error generated. | ||
| 16 | |||
| 17 | Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/40534662043b7d831d1f6c70448afa9d374a9b63] | ||
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 19 | --- | ||
| 20 | plug-ins/sslstrip/sslstrip.c | 2 +- | ||
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 22 | |||
| 23 | diff --git a/plug-ins/sslstrip/sslstrip.c b/plug-ins/sslstrip/sslstrip.c | ||
| 24 | index 327bf58a..d9b67c8b 100644 | ||
| 25 | --- a/plug-ins/sslstrip/sslstrip.c | ||
| 26 | +++ b/plug-ins/sslstrip/sslstrip.c | ||
| 27 | @@ -51,7 +51,7 @@ | ||
| 28 | |||
| 29 | #include <curl/curl.h> | ||
| 30 | |||
| 31 | -#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26) | ||
| 32 | +#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26) | ||
| 33 | #error libcurl 7.26.0 or up is needed | ||
| 34 | #endif | ||
| 35 | |||
| 36 | -- | ||
| 37 | 2.40.0 | ||
| 38 | |||
diff --git a/meta-networking/recipes-support/ettercap/ettercap/0002-allow-build-with-cmake-4.patch b/meta-networking/recipes-support/ettercap/ettercap/0002-allow-build-with-cmake-4.patch deleted file mode 100644 index 70e48f7d9e..0000000000 --- a/meta-networking/recipes-support/ettercap/ettercap/0002-allow-build-with-cmake-4.patch +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | From 337e790d4fc8fed00a4f62047de1bc702f06105e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
| 3 | Date: Wed, 9 Jul 2025 14:15:32 +0300 | ||
| 4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
| 5 | compatibility | ||
| 6 | |||
| 7 | Fix: | ||
| 8 | |||
| 9 | | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
| 10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
| 11 | | | ||
| 12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
| 13 | | to tell CMake that the project requires at least <min> but has been updated | ||
| 14 | | to work with policies introduced by <max> or earlier. | ||
| 15 | | | ||
| 16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
| 17 | | | ||
| 18 | | | ||
| 19 | | -- Configuring incomplete, errors occurred! | ||
| 20 | |||
| 21 | Upstream-Status: Submitted [https://github.com/Ettercap/ettercap/pull/1279] | ||
| 22 | |||
| 23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
| 24 | --- | ||
| 25 | CMakeLists.txt | 2 +- | ||
| 26 | cmake/Modules/FindGTK3.cmake | 2 +- | ||
| 27 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 28 | |||
| 29 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 30 | index 1c08875a..600bd9f4 100644 | ||
| 31 | --- a/CMakeLists.txt | ||
| 32 | +++ b/CMakeLists.txt | ||
| 33 | @@ -1,4 +1,4 @@ | ||
| 34 | -cmake_minimum_required(VERSION 2.8) | ||
| 35 | +cmake_minimum_required(VERSION 3.5) | ||
| 36 | project(ettercap C) | ||
| 37 | |||
| 38 | set(VERSION "0.8.3.1") | ||
| 39 | diff --git a/cmake/Modules/FindGTK3.cmake b/cmake/Modules/FindGTK3.cmake | ||
| 40 | index e07a4e90..f37fee1c 100644 | ||
| 41 | --- a/cmake/Modules/FindGTK3.cmake | ||
| 42 | +++ b/cmake/Modules/FindGTK3.cmake | ||
| 43 | @@ -351,7 +351,7 @@ endif() | ||
| 44 | # | ||
| 45 | if(GTK3_FIND_VERSION) | ||
| 46 | if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION) | ||
| 47 | - cmake_minimum_required(VERSION 2.6.2) | ||
| 48 | + cmake_minimum_required(VERSION 3.5) | ||
| 49 | endif() | ||
| 50 | set(GTK3_FAILED_VERSION_CHECK true) | ||
| 51 | if(GTK3_DEBUG) | ||
| 52 | -- | ||
| 53 | 2.43.0 | ||
| 54 | |||
diff --git a/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch b/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch new file mode 100644 index 0000000000..e1b19ea05b --- /dev/null +++ b/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | From a7347f49b928f47fc37805c9f3a70a9487d45a65 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Koeppe <alexander@koeppe.rocks> | ||
| 3 | Date: Sun, 8 Mar 2026 17:57:39 +0100 | ||
| 4 | Subject: [PATCH] Fix heap-out-of-bounds read issue in etterfilter | ||
| 5 | (CVE-2026-3606) | ||
| 6 | |||
| 7 | CVE: CVE-2026-3603 | ||
| 8 | Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/41c312d4be6f6067968a275bf66b2abd2a0ba385] | ||
| 9 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 10 | --- | ||
| 11 | include/ec.h | 6 ++++++ | ||
| 12 | utils/etterfilter/ef_output.c | 4 ++-- | ||
| 13 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/include/ec.h b/include/ec.h | ||
| 16 | index d69de613..80c7eaba 100644 | ||
| 17 | --- a/include/ec.h | ||
| 18 | +++ b/include/ec.h | ||
| 19 | @@ -94,6 +94,12 @@ | ||
| 20 | ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 21 | } while(0) | ||
| 22 | |||
| 23 | +#define SAFE_RECALLOC(x, s) do { \ | ||
| 24 | + x = realloc(x, s); \ | ||
| 25 | + ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 26 | + memset(x, 0, s); \ | ||
| 27 | +} while(0) | ||
| 28 | + | ||
| 29 | #define SAFE_STRDUP(x, s) do{ \ | ||
| 30 | x = strdup(s); \ | ||
| 31 | ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 32 | diff --git a/utils/etterfilter/ef_output.c b/utils/etterfilter/ef_output.c | ||
| 33 | index 2530e599..2f49177e 100644 | ||
| 34 | --- a/utils/etterfilter/ef_output.c | ||
| 35 | +++ b/utils/etterfilter/ef_output.c | ||
| 36 | @@ -150,10 +150,10 @@ static size_t create_data_segment(u_char** data, struct filter_header *fh, struc | ||
| 37 | static size_t add_data_segment(u_char **data, size_t base, u_char **string, size_t slen) | ||
| 38 | { | ||
| 39 | /* make room for the new string */ | ||
| 40 | - SAFE_REALLOC(*data, base + slen + 1); | ||
| 41 | + SAFE_RECALLOC(*data, base + slen + 1); | ||
| 42 | |||
| 43 | /* copy the string, NULL separated */ | ||
| 44 | - memcpy(*data + base, *string, slen + 1); | ||
| 45 | + memcpy(*data + base, *string, slen); | ||
| 46 | |||
| 47 | /* | ||
| 48 | * change the pointer to the new string location | ||
diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb index 027b6dd190..6fac3a0b84 100644 --- a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb +++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb | |||
| @@ -7,6 +7,7 @@ inherit cmake | |||
| 7 | 7 | ||
| 8 | DEPENDS += "ethtool \ | 8 | DEPENDS += "ethtool \ |
| 9 | geoip \ | 9 | geoip \ |
| 10 | libmaxminddb \ | ||
| 10 | librepo \ | 11 | librepo \ |
| 11 | libnet \ | 12 | libnet \ |
| 12 | libpcap \ | 13 | libpcap \ |
| @@ -20,11 +21,11 @@ DEPENDS += "ethtool \ | |||
| 20 | 21 | ||
| 21 | RDEPENDS:${PN} += "bash ethtool libgcc" | 22 | RDEPENDS:${PN} += "bash ethtool libgcc" |
| 22 | 23 | ||
| 23 | SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https \ | 24 | SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV} \ |
| 24 | file://0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch \ | 25 | file://CVE-2026-3606.patch \ |
| 25 | file://0002-allow-build-with-cmake-4.patch" | 26 | " |
| 26 | 27 | ||
| 27 | SRCREV = "7281fbddb7da7478beb1d21e3cb105fff3778b31" | 28 | SRCREV = "41da65f4026a9e4cea928e61941b976d9279f508" |
| 28 | 29 | ||
| 29 | EXTRA_OECMAKE = " \ | 30 | EXTRA_OECMAKE = " \ |
| 30 | -DCMAKE_SKIP_RPATH=TRUE \ | 31 | -DCMAKE_SKIP_RPATH=TRUE \ |
diff --git a/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb b/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb index bc0975ecc1..c902af91e7 100644 --- a/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb +++ b/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | SUMMARY = "Configure network interfaces for parallel routing" | 1 | SUMMARY = "Configure network interfaces for parallel routing" |
| 2 | HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bonding" | 2 | HOMEPAGE = "https://wiki.linuxfoundation.org/networking/bonding" |
| 3 | SECTION = "net" | 3 | SECTION = "net" |
| 4 | 4 | ||
| 5 | LICENSE = "GPL-3.0-only" | 5 | LICENSE = "GPL-3.0-only" |
diff --git a/meta-networking/recipes-support/libcpr/libcpr_1.13.0.bb b/meta-networking/recipes-support/libcpr/libcpr_1.14.2.bb index 04dda31770..bdbd244e33 100644 --- a/meta-networking/recipes-support/libcpr/libcpr_1.13.0.bb +++ b/meta-networking/recipes-support/libcpr/libcpr_1.14.2.bb | |||
| @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=08beaae5deae1c43c065592da8f38095" | |||
| 8 | 8 | ||
| 9 | DEPENDS = "curl openssl" | 9 | DEPENDS = "curl openssl" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/libcpr/cpr.git;protocol=https;branch=master;tag=${PV}" | 11 | SRC_URI = "git://github.com/libcpr/cpr.git;protocol=https;nobranch=1;tag=${PV}" |
| 12 | SRCREV = "516cb3e5f4e38bede088f69fcf122c6089e38f00" | 12 | SRCREV = "f091b2c061b307ee89b164c39976fc9202a1c79d" |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | inherit cmake | 15 | inherit cmake |
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.3.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.4.bb index 254d94064f..41f1714184 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.3.bb +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.4.bb | |||
| @@ -14,7 +14,7 @@ SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ | |||
| 14 | file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ | 14 | file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ |
| 15 | file://run-ptest \ | 15 | file://run-ptest \ |
| 16 | " | 16 | " |
| 17 | SRC_URI[sha256sum] = "dc46c40b9f46bb34dd97fe41f548b0e8b247b77a918576733c528e83abd854dd" | 17 | SRC_URI[sha256sum] = "55e47994018c13743485544e7206780ffbb3c8495e704a99636503e6e77abf59" |
| 18 | 18 | ||
| 19 | inherit waf-samba pkgconfig ptest | 19 | inherit waf-samba pkgconfig ptest |
| 20 | 20 | ||
diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.14.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.15.bb index a7c88a4573..976932ae39 100644 --- a/meta-networking/recipes-support/libtdb/libtdb_1.4.14.bb +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.15.bb | |||
| @@ -15,7 +15,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ | |||
| 15 | file://run-ptest \ | 15 | file://run-ptest \ |
| 16 | " | 16 | " |
| 17 | 17 | ||
| 18 | SRC_URI[sha256sum] = "144f407d42ed7a0ec1470a40ef17ad41133fe910bce865dd9fe084d49c907526" | 18 | SRC_URI[sha256sum] = "fba09d8df1f1b9072aeae8e78b2bd43c5afef20b2f6deefa633aa14a377a8dd2" |
| 19 | 19 | ||
| 20 | PACKAGECONFIG ??= "\ | 20 | PACKAGECONFIG ??= "\ |
| 21 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ | 21 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ |
diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 3d679d7dc7..b43900a94d 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.0-only" | |||
| 5 | 5 | ||
| 6 | DEPENDS = "flex flex-native" | 6 | DEPENDS = "flex flex-native" |
| 7 | 7 | ||
| 8 | SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ | 8 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}.tar.gz \ |
| 9 | file://link-with-ldflags.patch \ | 9 | file://link-with-ldflags.patch \ |
| 10 | file://install-from-buildir.patch \ | 10 | file://install-from-buildir.patch \ |
| 11 | file://0001-fix-compile-error-with-linux-kernel-v4.8.patch \ | 11 | file://0001-fix-compile-error-with-linux-kernel-v4.8.patch \ |
diff --git a/meta-networking/recipes-support/mctp/mctp_2.4.bb b/meta-networking/recipes-support/mctp/mctp_2.5.bb index 27750d4bfd..a8787d3f2b 100644 --- a/meta-networking/recipes-support/mctp/mctp_2.4.bb +++ b/meta-networking/recipes-support/mctp/mctp_2.5.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" | |||
| 5 | 5 | ||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21" |
| 7 | 7 | ||
| 8 | SRCREV = "8b019a3e4d335c7d31099762762dfee2e4705d37" | 8 | SRCREV = "07c7a5d526f686da89bc9ae9cad917e46652b272" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https;tag=v${PV}" | 10 | SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https;tag=v${PV}" |
| 11 | 11 | ||
diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.40.bb b/meta-networking/recipes-support/memcached/memcached_1.6.41.bb index fedc693cca..9d759069ba 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.6.40.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.6.41.bb | |||
| @@ -22,7 +22,7 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ | |||
| 22 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ | 22 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ |
| 23 | file://memcached-add-hugetlbfs-check.patch \ | 23 | file://memcached-add-hugetlbfs-check.patch \ |
| 24 | " | 24 | " |
| 25 | SRC_URI[sha256sum] = "a3d360e9da2221a49bf9aae4e6880f2d44da6b2a2fae39b1911b9ca76488fbfd" | 25 | SRC_URI[sha256sum] = "e097073c156eeff9e12655b054f446d57374cfba5c132dcdbe7fac64e728286a" |
| 26 | 26 | ||
| 27 | CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly" | 27 | CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly" |
| 28 | 28 | ||
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.47.1.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.47.5.bb index 61390ebde6..5ec440fc18 100644 --- a/meta-networking/recipes-support/nbdkit/nbdkit_1.47.1.bb +++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.47.5.bb | |||
| @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=26250adec854bc317493f6fb98efe049" | |||
| 12 | SRC_URI = "git://gitlab.com/nbdkit/nbdkit.git;protocol=https;branch=master;tag=v${PV} \ | 12 | SRC_URI = "git://gitlab.com/nbdkit/nbdkit.git;protocol=https;branch=master;tag=v${PV} \ |
| 13 | file://0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch \ | 13 | file://0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch \ |
| 14 | " | 14 | " |
| 15 | SRCREV = "1f9447313193723a626ba39e7b54d1c7c1a1ffd8" | 15 | SRCREV = "131372494a384a2ee21b97ec9375b7a55636a417" |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | DEPENDS = "curl xz e2fsprogs zlib" | 18 | DEPENDS = "curl xz e2fsprogs zlib" |
diff --git a/meta-networking/recipes-support/netperf/files/0001-Fix-multiple-definitions-with-enable-intervals.patch b/meta-networking/recipes-support/netperf/files/0001-Fix-multiple-definitions-with-enable-intervals.patch new file mode 100644 index 0000000000..f1a4139386 --- /dev/null +++ b/meta-networking/recipes-support/netperf/files/0001-Fix-multiple-definitions-with-enable-intervals.patch | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | From 3659ce248a62d98ac950ab68d8a5b4488136c85d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ryan Eatmon <reatmon@ti.com> | ||
| 3 | Date: Fri, 6 Feb 2026 11:52:31 -0600 | ||
| 4 | Subject: [PATCH] Fix multiple definitions with --enable-intervals | ||
| 5 | |||
| 6 | There are multiple definitions of two variables when enabling intervals. | ||
| 7 | |||
| 8 | | <snip>/ld: nettest_omni.o:<snip>/src/nettest_omni.c:233: multiple definition of `signal_set'; nettest_bsd.o:<snip>/src/nettest_bsd.c:302: first defined here | ||
| 9 | | <snip>/ld: nettest_omni.o:<snip>/src/nettest_omni.c:191: multiple definition of `interval_count'; nettest_bsd.o:<snip>/src/nettest_bsd.c:289: first defined here | ||
| 10 | | <snip>/ld: nettest_omni.o:<snip>/src/nettest_omni.c:233: multiple definition of `signal_set'; nettest_bsd.o:<snip>/src/nettest_bsd.c:302: first defined here | ||
| 11 | | <snip>/ld: nettest_omni.o:<snip>/src/nettest_omni.c:191: multiple definition of `interval_count'; nettest_bsd.o:<snip>/src/nettest_bsd.c:289: first defined here | ||
| 12 | |||
| 13 | Make them static for each file. | ||
| 14 | |||
| 15 | Upstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/94] | ||
| 16 | |||
| 17 | Signed-off-by: Ryan Eatmon <reatmon@ti.com> | ||
| 18 | --- | ||
| 19 | src/nettest_bsd.c | 4 ++-- | ||
| 20 | src/nettest_omni.c | 4 ++-- | ||
| 21 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/src/nettest_bsd.c b/src/nettest_bsd.c | ||
| 24 | index 36f5810..4bbc4fa 100644 | ||
| 25 | --- a/src/nettest_bsd.c | ||
| 26 | +++ b/src/nettest_bsd.c | ||
| 27 | @@ -286,7 +286,7 @@ static HIST time_hist; | ||
| 28 | #endif /* WANT_HISTOGRAM */ | ||
| 29 | |||
| 30 | #ifdef WANT_INTERVALS | ||
| 31 | -int interval_count; | ||
| 32 | +static int interval_count; | ||
| 33 | #ifndef WANT_SPIN | ||
| 34 | #ifdef WIN32 | ||
| 35 | #define INTERVALS_INIT() \ | ||
| 36 | @@ -299,7 +299,7 @@ int interval_count; | ||
| 37 | } \ | ||
| 38 | interval_count = interval_burst; | ||
| 39 | #else | ||
| 40 | -sigset_t signal_set; | ||
| 41 | +static sigset_t signal_set; | ||
| 42 | #define INTERVALS_INIT() \ | ||
| 43 | if (interval_burst) { \ | ||
| 44 | /* zero means that we never pause, so we never should need the \ | ||
| 45 | diff --git a/src/nettest_omni.c b/src/nettest_omni.c | ||
| 46 | index 5d63f02..2ba5604 100644 | ||
| 47 | --- a/src/nettest_omni.c | ||
| 48 | +++ b/src/nettest_omni.c | ||
| 49 | @@ -188,7 +188,7 @@ static HIST time_hist; | ||
| 50 | |||
| 51 | |||
| 52 | #ifdef WANT_INTERVALS | ||
| 53 | -int interval_count; | ||
| 54 | +static int interval_count; | ||
| 55 | unsigned int interval_wait_microseconds; | ||
| 56 | |||
| 57 | /* hoist the timestamps up here so we can use them to factor-out the | ||
| 58 | @@ -230,7 +230,7 @@ static struct timeval *temp_intvl_ptr = &intvl_one; | ||
| 59 | interval_count = interval_burst; \ | ||
| 60 | interval_wait_microseconds = 0; | ||
| 61 | #else | ||
| 62 | -sigset_t signal_set; | ||
| 63 | +static sigset_t signal_set; | ||
| 64 | #define INTERVALS_INIT() \ | ||
| 65 | if (interval_burst) { \ | ||
| 66 | /* zero means that we never pause, so we never should need the \ | ||
| 67 | -- | ||
| 68 | 2.43.0 | ||
| 69 | |||
diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb index 4043da5621..d5a717b0f6 100644 --- a/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-networking/recipes-support/netperf/netperf_git.bb | |||
| @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git;branch=master;protocol=ht | |||
| 17 | file://netserver_permissions.patch \ | 17 | file://netserver_permissions.patch \ |
| 18 | file://0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch \ | 18 | file://0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch \ |
| 19 | file://0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch \ | 19 | file://0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch \ |
| 20 | file://0001-Fix-multiple-definitions-with-enable-intervals.patch \ | ||
| 20 | " | 21 | " |
| 21 | 22 | ||
| 22 | SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4" | 23 | SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4" |
diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch deleted file mode 100644 index d5c7f5f1cc..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From d482bcc8fca90afc95ac3cbe848a3c9d7ad81ddc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Wed, 4 Nov 2020 23:37:44 -0800 | ||
| 4 | Subject: [PATCH] autogen.sh: not generate configure | ||
| 5 | |||
| 6 | Only use autogen.sh to generate configure.ac. | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [embedded specific] | ||
| 9 | |||
| 10 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 11 | |||
| 12 | refresh patch to 4.0 | ||
| 13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 14 | --- | ||
| 15 | autogen.sh | 7 ------- | ||
| 16 | 1 file changed, 7 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/autogen.sh b/autogen.sh | ||
| 19 | index 0aa7507..36e0423 100755 | ||
| 20 | --- a/autogen.sh | ||
| 21 | +++ b/autogen.sh | ||
| 22 | @@ -33,10 +33,3 @@ if test -z $PKG_CONFIG; then | ||
| 23 | echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again" | ||
| 24 | exit | ||
| 25 | fi | ||
| 26 | - | ||
| 27 | -autoreconf -ivf | ||
| 28 | - | ||
| 29 | -echo "./configure $@" | ||
| 30 | -chmod +x configure | ||
| 31 | -./configure $@ | ||
| 32 | - | ||
| 33 | -- | ||
| 34 | 2.25.1 | ||
| 35 | |||
diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb index f0175167a4..dc31672548 100644 --- a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb +++ b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb | |||
| @@ -8,11 +8,8 @@ RDEPENDS:${PN} += " libpcap" | |||
| 8 | LICENSE = "LGPL-3.0-only" | 8 | LICENSE = "LGPL-3.0-only" |
| 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" |
| 10 | 10 | ||
| 11 | SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46" | 11 | SRCREV = "375f99ef9fb4999d778b57bbeece171b3fa9fba6" |
| 12 | SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \ | 12 | SRC_URI = "git://github.com/ntop/nDPI.git;branch=5.0-stable;protocol=https;tag=${PV}" |
| 13 | file://0001-autogen.sh-not-generate-configure.patch \ | ||
| 14 | " | ||
| 15 | |||
| 16 | 13 | ||
| 17 | inherit autotools-brokensep pkgconfig | 14 | inherit autotools-brokensep pkgconfig |
| 18 | 15 | ||
diff --git a/meta-networking/recipes-support/ntp/ntp/0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch b/meta-networking/recipes-support/ntp/ntp/0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch new file mode 100644 index 0000000000..89797b3aa8 --- /dev/null +++ b/meta-networking/recipes-support/ntp/ntp/0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From c7d76559dada2a6c0c9c18e8343a69b1eabc031e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Marko <peter.marko@siemens.com> | ||
| 3 | Date: Fri, 13 Mar 2026 13:20:20 +0100 | ||
| 4 | Subject: [PATCH] include: fix build failure with glibc 2.38+ _Generic memchr | ||
| 5 | macro | ||
| 6 | |||
| 7 | Newer glibc defines memchr as a _Generic macro in <string.h>. | ||
| 8 | When sntp's config.h lacks a HAVE_MEMCHR definition, the #ifndef guard | ||
| 9 | in l_stdlib.h passes and the extern declaration of memchr is emitted. | ||
| 10 | The preprocessor expands the memchr token into _Generic(...), producing: | ||
| 11 | |||
| 12 | l_stdlib.h:225:14: error: expected identifier or '(' before '_Generic' | ||
| 13 | |||
| 14 | Guard the fallback declarations of memchr and strnlen with an additional | ||
| 15 | !defined(memchr) / !defined(strnlen) check so they are skipped when the | ||
| 16 | symbols are already provided as macros by the C library headers. | ||
| 17 | |||
| 18 | Upstream-Status: Pending | ||
| 19 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 20 | --- | ||
| 21 | include/l_stdlib.h | 4 ++-- | ||
| 22 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 23 | |||
| 24 | diff --git a/include/l_stdlib.h b/include/l_stdlib.h | ||
| 25 | index fbf57c5..195dc41 100644 | ||
| 26 | --- a/include/l_stdlib.h | ||
| 27 | +++ b/include/l_stdlib.h | ||
| 28 | @@ -221,11 +221,11 @@ extern int errno; | ||
| 29 | extern int h_errno; | ||
| 30 | #endif | ||
| 31 | |||
| 32 | -#ifndef HAVE_MEMCHR | ||
| 33 | +#if !defined(HAVE_MEMCHR) && !defined(memchr) | ||
| 34 | extern void *memchr(const void *s, int c, size_t n); | ||
| 35 | #endif | ||
| 36 | |||
| 37 | -#ifndef HAVE_STRNLEN | ||
| 38 | +#if !defined(HAVE_STRNLEN) && !defined(strnlen) | ||
| 39 | extern size_t strnlen(const char *s, size_t n); | ||
| 40 | #endif | ||
| 41 | |||
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb index a5a6048f8a..e59725e3e9 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb | |||
| @@ -16,6 +16,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g | |||
| 16 | file://0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch \ | 16 | file://0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch \ |
| 17 | file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \ | 17 | file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \ |
| 18 | file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \ | 18 | file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \ |
| 19 | file://0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch \ | ||
| 19 | file://ntpd \ | 20 | file://ntpd \ |
| 20 | file://ntp.conf \ | 21 | file://ntp.conf \ |
| 21 | file://ntpd.service \ | 22 | file://ntpd.service \ |
diff --git a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.4.bb index 872d1ce4f7..9704e2d15e 100644 --- a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb +++ b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.4.bb | |||
| @@ -2,12 +2,12 @@ SUMMARY = "The Network Time Protocol suite, refactored" | |||
| 2 | HOMEPAGE = "https://www.ntpsec.org/" | 2 | HOMEPAGE = "https://www.ntpsec.org/" |
| 3 | 3 | ||
| 4 | LICENSE = "CC-BY-4.0 & BSD-2-Clause & NTP & BSD-3-Clause & MIT" | 4 | LICENSE = "CC-BY-4.0 & BSD-2-Clause & NTP & BSD-3-Clause & MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSES/BSD-2;md5=653830da7b770a32f6f50f6107e0b186 \ | 5 | LIC_FILES_CHKSUM = "file://LICENSES/BSD-2-Clause.txt;md5=653830da7b770a32f6f50f6107e0b186 \ |
| 6 | file://LICENSES/BSD-3;md5=55e9dcf6a625a2dcfcda4ef6a647fbfd \ | 6 | file://LICENSES/BSD-3-Clause.txt;md5=55e9dcf6a625a2dcfcda4ef6a647fbfd \ |
| 7 | file://LICENSES/CC-BY-4.0;md5=2ab724713fdaf49e4523c4503bfd068d \ | 7 | file://LICENSES/CC-BY-4.0.txt;md5=2ab724713fdaf49e4523c4503bfd068d \ |
| 8 | file://LICENSES/MIT;md5=5a9dfc801af3eb49df2055c9b07918b2 \ | 8 | file://LICENSES/MIT.txt;md5=5a9dfc801af3eb49df2055c9b07918b2 \ |
| 9 | file://LICENSES/NTP;md5=cb56b7747f86157c78ca81f224806694" | 9 | file://LICENSES/NTP.txt;md5=cb56b7747f86157c78ca81f224806694" |
| 10 | 10 | ||
| 11 | DEPENDS += "bison-native \ | 11 | DEPENDS += "bison-native \ |
| 12 | openssl \ | 12 | openssl \ |
| 13 | python3" | 13 | python3" |
| @@ -17,7 +17,7 @@ SRC_URI = "https://ftp.ntpsec.org/pub/releases/ntpsec-${PV}.tar.gz \ | |||
| 17 | file://0001-wscript-Add-BISONFLAGS-support.patch \ | 17 | file://0001-wscript-Add-BISONFLAGS-support.patch \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRC_URI[sha256sum] = "e0ce93af222a0a9860e6f5a51aadba9bb5ca601d80b2aea118a62f0a3226950e" | 20 | SRC_URI[sha256sum] = "443e54a6149d1b0bf08677d17b18fced9028b101fc2ffd2c81e0834f87eebc7d" |
| 21 | 21 | ||
| 22 | UPSTREAM_CHECK_URI = "ftp://ftp.ntpsec.org/pub/releases/" | 22 | UPSTREAM_CHECK_URI = "ftp://ftp.ntpsec.org/pub/releases/" |
| 23 | 23 | ||
| @@ -63,7 +63,6 @@ EXTRA_OECONF = "--cross-compiler='${CC}' \ | |||
| 63 | --pyshebang=${bindir}/python3 \ | 63 | --pyshebang=${bindir}/python3 \ |
| 64 | --pythondir=${PYTHON_SITEPACKAGES_DIR} \ | 64 | --pythondir=${PYTHON_SITEPACKAGES_DIR} \ |
| 65 | --pythonarchdir=${PYTHON_SITEPACKAGES_DIR} \ | 65 | --pythonarchdir=${PYTHON_SITEPACKAGES_DIR} \ |
| 66 | --enable-debug-gdb \ | ||
| 67 | --enable-early-droproot" | 66 | --enable-early-droproot" |
| 68 | 67 | ||
| 69 | EXTRA_OEWAF_BUILD ?= "-v" | 68 | EXTRA_OEWAF_BUILD ?= "-v" |
| @@ -89,6 +88,11 @@ do_install:append() { | |||
| 89 | else | 88 | else |
| 90 | install -D -m 0644 ${T}/volatiles.ntpsec ${D}${sysconfdir}/default/volatiles/99_${BPN} | 89 | install -D -m 0644 ${T}/volatiles.ntpsec ${D}${sysconfdir}/default/volatiles/99_${BPN} |
| 91 | fi | 90 | fi |
| 91 | |||
| 92 | if [ -d ${D}/usr/lib64 ]; then | ||
| 93 | mv ${D}/usr/lib64/* ${D}${libdir}/ | ||
| 94 | rmdir ${D}/usr/lib64 | ||
| 95 | fi | ||
| 92 | } | 96 | } |
| 93 | 97 | ||
| 94 | PACKAGE_BEFORE_PN = "${PN}-python ${PN}-utils ${PN}-viz" | 98 | PACKAGE_BEFORE_PN = "${PN}-python ${PN}-utils ${PN}-viz" |
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-fix-initialization-discards-const-qualifier-from-poi.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-fix-initialization-discards-const-qualifier-from-poi.patch new file mode 100644 index 0000000000..c06a88f27e --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-fix-initialization-discards-const-qualifier-from-poi.patch | |||
| @@ -0,0 +1,144 @@ | |||
| 1 | From 070500fd0e97abb07585882ae448ac35b1c4396c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rudi Heitbaum <rudi@heitbaum.com> | ||
| 3 | Date: Mon, 26 Jan 2026 11:55:03 +0000 | ||
| 4 | Subject: [PATCH] fix initialization discards 'const' qualifier from pointer | ||
| 5 | target type | ||
| 6 | |||
| 7 | Since glibc-2.43: | ||
| 8 | |||
| 9 | For ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr, | ||
| 10 | strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return | ||
| 11 | pointers into their input arrays now have definitions as macros that | ||
| 12 | return a pointer to a const-qualified type when the input argument is | ||
| 13 | a pointer to a const-qualified type. | ||
| 14 | |||
| 15 | https://lists.gnu.org/archive/html/info-gnu/2026-01/msg00005.html | ||
| 16 | |||
| 17 | Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> | ||
| 18 | |||
| 19 | Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/783] | ||
| 20 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 21 | --- | ||
| 22 | open-vm-tools/lib/hgfs/hgfsEscape.c | 6 +++--- | ||
| 23 | open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 2 +- | ||
| 24 | open-vm-tools/lib/misc/strutil.c | 7 ++++--- | ||
| 25 | open-vm-tools/lib/nicInfo/nicInfoPosix.c | 2 +- | ||
| 26 | open-vm-tools/libvmtools/i18n.c | 2 +- | ||
| 27 | open-vm-tools/services/plugins/vix/vixTools.c | 2 +- | ||
| 28 | 6 files changed, 11 insertions(+), 10 deletions(-) | ||
| 29 | |||
| 30 | diff --git a/open-vm-tools/lib/hgfs/hgfsEscape.c b/open-vm-tools/lib/hgfs/hgfsEscape.c | ||
| 31 | index c4d39b12d..212ea1c79 100644 | ||
| 32 | --- a/open-vm-tools/lib/hgfs/hgfsEscape.c | ||
| 33 | +++ b/open-vm-tools/lib/hgfs/hgfsEscape.c | ||
| 34 | @@ -175,7 +175,7 @@ HgfsAddEscapeCharacter(char const * bufIn, // IN: input name | ||
| 35 | HgfsEscapeContext *escapeContext = (HgfsEscapeContext *)context; | ||
| 36 | uint32 charactersToCopy; | ||
| 37 | uint32 outputSpace; | ||
| 38 | - char* illegal; | ||
| 39 | + const char* illegal; | ||
| 40 | Bool result = TRUE; | ||
| 41 | |||
| 42 | ASSERT(offset >= escapeContext->processedOffset); // Scanning forward | ||
| 43 | @@ -573,7 +573,7 @@ HgfsIsEscapeSequence(char const *bufIn, // IN: input name | ||
| 44 | uint32 length) // IN: length of the name in characters | ||
| 45 | { | ||
| 46 | if (bufIn[offset] == HGFS_ESCAPE_CHAR && offset > 0) { | ||
| 47 | - char *substitute; | ||
| 48 | + const char *substitute; | ||
| 49 | if (bufIn[offset - 1] == HGFS_ESCAPE_SUBSTITUE_CHAR && offset > 1) { | ||
| 50 | /* | ||
| 51 | * Possibly a valid sequence, check it must be preceded with a substitute | ||
| 52 | @@ -887,7 +887,7 @@ HgfsEscapeUndoComponent(char *bufIn, // IN: Characters to be unesc | ||
| 53 | size_t offset = escapePointer - bufIn; | ||
| 54 | |||
| 55 | if (HgfsIsEscapeSequence(bufIn, offset, sizeIn)) { | ||
| 56 | - char* substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]); | ||
| 57 | + const char* substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]); | ||
| 58 | if (substitute != NULL) { | ||
| 59 | bufIn[offset - 1] = HGFS_ILLEGAL_CHARS[substitute - HGFS_SUBSTITUTE_CHARS]; | ||
| 60 | } else if (bufIn[offset - 1] == HGFS_ESCAPE_SUBSTITUE_CHAR) { | ||
| 61 | diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | ||
| 62 | index 445a53881..eeabcadd4 100644 | ||
| 63 | --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | ||
| 64 | +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | ||
| 65 | @@ -1366,7 +1366,7 @@ static void | ||
| 66 | HgfsGetHiddenAttr(char const *fileName, // IN: Input filename | ||
| 67 | HgfsFileAttrInfo *attr) // OUT: Struct to copy into | ||
| 68 | { | ||
| 69 | - char *baseName; | ||
| 70 | + const char *baseName; | ||
| 71 | |||
| 72 | ASSERT(fileName); | ||
| 73 | ASSERT(attr); | ||
| 74 | diff --git a/open-vm-tools/lib/misc/strutil.c b/open-vm-tools/lib/misc/strutil.c | ||
| 75 | index 4fc6502e4..4be63b7b8 100644 | ||
| 76 | --- a/open-vm-tools/lib/misc/strutil.c | ||
| 77 | +++ b/open-vm-tools/lib/misc/strutil.c | ||
| 78 | @@ -1454,6 +1454,7 @@ StrUtil_ReplaceAll(const char *orig, // IN | ||
| 79 | char *result; | ||
| 80 | const char *current; | ||
| 81 | char *tmp; | ||
| 82 | + const char *tmp2; | ||
| 83 | size_t lenWhat; | ||
| 84 | size_t lenWith; | ||
| 85 | size_t occurrences = 0; | ||
| 86 | @@ -1467,8 +1468,8 @@ StrUtil_ReplaceAll(const char *orig, // IN | ||
| 87 | lenWith = strlen(with); | ||
| 88 | |||
| 89 | current = orig; | ||
| 90 | - while ((tmp = strstr(current, what)) != NULL) { | ||
| 91 | - current = tmp + lenWhat; | ||
| 92 | + while ((tmp2 = strstr(current, what)) != NULL) { | ||
| 93 | + current = tmp2 + lenWhat; | ||
| 94 | ++occurrences; | ||
| 95 | } | ||
| 96 | |||
| 97 | @@ -1695,7 +1696,7 @@ StrUtilHasListItem(char const *list, // IN: | ||
| 98 | char const *item, // IN: | ||
| 99 | int (*ncmp)(char const *, char const*, size_t)) // IN: | ||
| 100 | { | ||
| 101 | - char *foundDelim; | ||
| 102 | + const char *foundDelim; | ||
| 103 | int itemLen = strlen(item); | ||
| 104 | |||
| 105 | if (list == NULL) { | ||
| 106 | diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c | ||
| 107 | index 6f20547b2..a387e377b 100644 | ||
| 108 | --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c | ||
| 109 | +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c | ||
| 110 | @@ -267,7 +267,7 @@ static Bool | ||
| 111 | IpEntryMatchesDevice(const char *devName, | ||
| 112 | const char *label) | ||
| 113 | { | ||
| 114 | - char *p; | ||
| 115 | + const char *p; | ||
| 116 | size_t n; | ||
| 117 | |||
| 118 | if ((p = strchr(label, ':')) != NULL) { | ||
| 119 | diff --git a/open-vm-tools/libvmtools/i18n.c b/open-vm-tools/libvmtools/i18n.c | ||
| 120 | index 3085f72d7..f61406d14 100644 | ||
| 121 | --- a/open-vm-tools/libvmtools/i18n.c | ||
| 122 | +++ b/open-vm-tools/libvmtools/i18n.c | ||
| 123 | @@ -698,7 +698,7 @@ VMTools_BindTextDomain(const char *domain, | ||
| 124 | * If we couldn't find the catalog file for the user's language, see if | ||
| 125 | * we can find a more generic language (e.g., for "en_US", also try "en"). | ||
| 126 | */ | ||
| 127 | - char *sep = Str_Strrchr(lang, '_'); | ||
| 128 | + const char *sep = Str_Strrchr(lang, '_'); | ||
| 129 | if (sep != NULL) { | ||
| 130 | if (usrlang == NULL) { | ||
| 131 | usrlang = Util_SafeStrdup(lang); | ||
| 132 | diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c | ||
| 133 | index b2079a10d..6a8498ffb 100644 | ||
| 134 | --- a/open-vm-tools/services/plugins/vix/vixTools.c | ||
| 135 | +++ b/open-vm-tools/services/plugins/vix/vixTools.c | ||
| 136 | @@ -925,7 +925,7 @@ VixToolsBuildUserEnvironmentTable(const char * const *envp) // IN: optional | ||
| 137 | for (; NULL != *envp; envp++) { | ||
| 138 | char *name; | ||
| 139 | char *value; | ||
| 140 | - char *whereToSplit; | ||
| 141 | + const char *whereToSplit; | ||
| 142 | size_t nameLen; | ||
| 143 | |||
| 144 | whereToSplit = strchr(*envp, '='); | ||
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.10.bb index ac641e0327..a48d1ce88d 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.5.bb +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.10.bb | |||
| @@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" | |||
| 25 | LICENSE:modules/linux = "GPL-2.0-only" | 25 | LICENSE:modules/linux = "GPL-2.0-only" |
| 26 | LICENSE:modules/solaris = "CDDL-1.0" | 26 | LICENSE:modules/solaris = "CDDL-1.0" |
| 27 | 27 | ||
| 28 | SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-13.0.x \ | 28 | SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=master;tag=stable-${PV} \ |
| 29 | file://tools.conf \ | 29 | file://tools.conf \ |
| 30 | file://vmtoolsd.service \ | 30 | file://vmtoolsd.service \ |
| 31 | file://vmtoolsd.init \ | 31 | file://vmtoolsd.init \ |
| @@ -44,6 +44,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl | |||
| 44 | file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ | 44 | file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ |
| 45 | file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ | 45 | file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ |
| 46 | file://0001-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch;patchdir=.. \ | 46 | file://0001-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch;patchdir=.. \ |
| 47 | file://0001-fix-initialization-discards-const-qualifier-from-poi.patch;patchdir=.. \ | ||
| 47 | " | 48 | " |
| 48 | 49 | ||
| 49 | UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" | 50 | UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" |
| @@ -51,7 +52,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" | |||
| 51 | SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ | 52 | SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ |
| 52 | " | 53 | " |
| 53 | 54 | ||
| 54 | SRCREV = "fbc80ffbd226b4a61bb8ea1c9a682b5c7614e3fd" | 55 | SRCREV = "f8fbcd0bf3b5869e2822542c398a51ddf7bd5f7a" |
| 55 | 56 | ||
| 56 | S = "${UNPACKDIR}/${BP}/open-vm-tools" | 57 | S = "${UNPACKDIR}/${BP}/open-vm-tools" |
| 57 | 58 | ||
| @@ -120,6 +121,6 @@ python() { | |||
| 120 | raise bb.parse.SkipRecipe('Requires meta-filesystems to be present to provide fuse.') | 121 | raise bb.parse.SkipRecipe('Requires meta-filesystems to be present to provide fuse.') |
| 121 | } | 122 | } |
| 122 | 123 | ||
| 123 | CVE_PRODUCT = "open-vm-tools vmware:tools" | 124 | CVE_PRODUCT = "open-vm-tools vmware:tools vmware:open_vm_tools" |
| 124 | CVE_STATUS[CVE-2014-4199] = "fixed-version: No action required. The current version (12.3.5) is not affected by the CVE which affects version 10.0.3" | 125 | CVE_STATUS[CVE-2014-4199] = "fixed-version: No action required. The current version (12.3.5) is not affected by the CVE which affects version 10.0.3" |
| 125 | CVE_STATUS[CVE-2014-4200] = "fixed-version: No action required. The current version (12.3.5) is not affected by the CVE which affects version 10.0.3" | 126 | CVE_STATUS[CVE-2014-4200] = "fixed-version: No action required. The current version (12.3.5) is not affected by the CVE which affects version 10.0.3" |
diff --git a/meta-networking/recipes-support/phytool/phytool.bb b/meta-networking/recipes-support/phytool/phytool_git.bb index 6471f46c28..35d11f8516 100644 --- a/meta-networking/recipes-support/phytool/phytool.bb +++ b/meta-networking/recipes-support/phytool/phytool_git.bb | |||
| @@ -1,11 +1,15 @@ | |||
| 1 | SUMMARY = "PHY interface tool for Linux" | 1 | SUMMARY = "PHY interface tool for Linux" |
| 2 | DESCRIPTION = "A tool to read and write PHY registers on Linux." | ||
| 3 | HOMEPAGE = "https://github.com/wkz/phytool" | ||
| 4 | BUGTRACKER = "https://github.com/wkz/phytool/issues" | ||
| 5 | SECTION = "console/network" | ||
| 6 | |||
| 2 | LICENSE = "GPL-2.0-only" | 7 | LICENSE = "GPL-2.0-only" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" |
| 4 | 9 | ||
| 5 | PV = "2+git" | 10 | PV = "2+git" |
| 6 | SRCREV = "8882328c08ba2efb13c049812098f1d0cb8adf0c" | ||
| 7 | SRC_URI = "git://github.com/wkz/phytool.git;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/wkz/phytool.git;branch=master;protocol=https" |
| 8 | 12 | SRCREV = "bcf23b0261aa9f352ee4b944e30e3482158640a4" | |
| 9 | 13 | ||
| 10 | # The Makefile has "$PREFIX/bin" hardcoded into it, hence not using $bindir here | 14 | # The Makefile has "$PREFIX/bin" hardcoded into it, hence not using $bindir here |
| 11 | do_install() { | 15 | do_install() { |
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch index e181ee2872..d6c641d90b 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch | |||
| @@ -17,8 +17,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt | |||
| 17 | index 98985e7ee..001efb800 100644 | 17 | index 98985e7ee..001efb800 100644 |
| 18 | --- a/CMakeLists.txt | 18 | --- a/CMakeLists.txt |
| 19 | +++ b/CMakeLists.txt | 19 | +++ b/CMakeLists.txt |
| 20 | @@ -237,7 +237,10 @@ else() | 20 | @@ -256,7 +256,10 @@ else() |
| 21 | endif() | 21 | message(WARNING "pyverbs build requested but python development files not found") |
| 22 | endif() | 22 | endif() |
| 23 | 23 | ||
| 24 | -find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") | 24 | -find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") |
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch deleted file mode 100644 index a093e47048..0000000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch +++ /dev/null | |||
| @@ -1,58 +0,0 @@ | |||
| 1 | From ae6adc4c748e67919fdf8ae1d44c619ee104c271 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 25 Mar 2024 11:37:41 -0700 | ||
| 4 | Subject: [PATCH] include libgen.h for basename | ||
| 5 | |||
| 6 | basename prototype has been removed from string.h from latest musl [1] | ||
| 7 | compilers e.g. clang-18 flags the absense of prototype as error. therefore | ||
| 8 | include libgen.h for providing it. | ||
| 9 | |||
| 10 | [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1443] | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | kernel-boot/rdma_rename.c | 1 + | ||
| 16 | librdmacm/examples/rping.c | 1 + | ||
| 17 | providers/mlx5/mlx5_vfio.c | 1 + | ||
| 18 | 3 files changed, 3 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/kernel-boot/rdma_rename.c b/kernel-boot/rdma_rename.c | ||
| 21 | index 4af9e4a39..5193ac411 100644 | ||
| 22 | --- a/kernel-boot/rdma_rename.c | ||
| 23 | +++ b/kernel-boot/rdma_rename.c | ||
| 24 | @@ -2,6 +2,7 @@ | ||
| 25 | /* Copyright (c) 2019, Mellanox Technologies. All rights reserved. See COPYING file */ | ||
| 26 | |||
| 27 | #define _GNU_SOURCE | ||
| 28 | +#include <libgen.h> | ||
| 29 | #include <stdio.h> | ||
| 30 | #include <stdlib.h> | ||
| 31 | #include <string.h> | ||
| 32 | diff --git a/librdmacm/examples/rping.c b/librdmacm/examples/rping.c | ||
| 33 | index cc16ad910..0f1321458 100644 | ||
| 34 | --- a/librdmacm/examples/rping.c | ||
| 35 | +++ b/librdmacm/examples/rping.c | ||
| 36 | @@ -33,6 +33,7 @@ | ||
| 37 | #define _GNU_SOURCE | ||
| 38 | #include <endian.h> | ||
| 39 | #include <getopt.h> | ||
| 40 | +#include <libgen.h> | ||
| 41 | #include <stdlib.h> | ||
| 42 | #include <string.h> | ||
| 43 | #include <stdio.h> | ||
| 44 | diff --git a/providers/mlx5/mlx5_vfio.c b/providers/mlx5/mlx5_vfio.c | ||
| 45 | index cd0c41462..4d064b1fc 100644 | ||
| 46 | --- a/providers/mlx5/mlx5_vfio.c | ||
| 47 | +++ b/providers/mlx5/mlx5_vfio.c | ||
| 48 | @@ -6,6 +6,7 @@ | ||
| 49 | #define _GNU_SOURCE | ||
| 50 | #include <config.h> | ||
| 51 | |||
| 52 | +#include <libgen.h> | ||
| 53 | #include <stdio.h> | ||
| 54 | #include <stdlib.h> | ||
| 55 | #include <unistd.h> | ||
| 56 | -- | ||
| 57 | 2.44.0 | ||
| 58 | |||
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch deleted file mode 100644 index 092f4431bf..0000000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From c7de6834f0cd92b7341ab17a5c6996f3fbd40140 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 21 Jun 2024 22:16:47 -0700 | ||
| 4 | Subject: [PATCH] librdmacm: Use overloadable function attribute with clang | ||
| 5 | |||
| 6 | This is to fix build warnings seen with upcoming clang19 and | ||
| 7 | glibc 2.40, since glibc 2.40 has improved fortyfying this | ||
| 8 | function with clang, it ends up with build errors like below | ||
| 9 | |||
| 10 | librdmacm/preload.c:796:9: error: at most one overload for a given name may lack the 'overloadable' attribute | ||
| 11 | | 796 | ssize_t recvfrom(int socket, void *buf, size_t len, int flags, | ||
| 12 | | | ^ | ||
| 13 | | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/rdma-core/51.0/recipe-sysroot/usr/include/sys/socket.h:163:16: note: previous unmarked overload of function is here | ||
| 14 | | 163 | extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n, | ||
| 15 | | | ^ | ||
| 16 | |||
| 17 | Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1475] | ||
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 19 | --- | ||
| 20 | librdmacm/preload.c | 7 +++++-- | ||
| 21 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
| 22 | |||
| 23 | --- a/librdmacm/preload.c | ||
| 24 | +++ b/librdmacm/preload.c | ||
| 25 | @@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size | ||
| 26 | return (fd_fork_get(socket, &fd) == fd_rsocket) ? | ||
| 27 | rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); | ||
| 28 | } | ||
| 29 | - | ||
| 30 | -ssize_t recvfrom(int socket, void *buf, size_t len, int flags, | ||
| 31 | +ssize_t | ||
| 32 | +#if defined(__clang__) && defined(__GLIBC__) | ||
| 33 | +__attribute__((overloadable)) | ||
| 34 | +#endif | ||
| 35 | +recvfrom(int socket, void *buf, size_t len, int flags, | ||
| 36 | struct sockaddr *src_addr, socklen_t *addrlen) | ||
| 37 | { | ||
| 38 | int fd; | ||
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_62.0.bb index 2555c43a85..5a8640ad02 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_62.0.bb | |||
| @@ -5,12 +5,10 @@ SECTION = "libs" | |||
| 5 | DEPENDS = "libnl" | 5 | DEPENDS = "libnl" |
| 6 | RDEPENDS:${PN} = "bash perl" | 6 | RDEPENDS:${PN} = "bash perl" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ | 8 | SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https;tag=v${PV} \ |
| 9 | file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ | 9 | file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ |
| 10 | file://0001-include-libgen.h-for-basename.patch \ | ||
| 11 | file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \ | ||
| 12 | " | 10 | " |
| 13 | SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" | 11 | SRCREV = "31af04ec84378724cb6256814d4ffde359a7123b" |
| 14 | 12 | ||
| 15 | #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md | 13 | #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md |
| 16 | LICENSE = "BSD-2-Clause | GPL-2.0-only" | 14 | LICENSE = "BSD-2-Clause | GPL-2.0-only" |
diff --git a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb b/meta-networking/recipes-support/spice/libcacard_2.8.2.bb index 1a2d9dc9c4..f956f06814 100644 --- a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb +++ b/meta-networking/recipes-support/spice/libcacard_2.8.2.bb | |||
| @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=79ffa0ec772fa86740948cb7327a0cc7" | |||
| 4 | 4 | ||
| 5 | DEPENDS = "glib-2.0 pcsc-lite nss" | 5 | DEPENDS = "glib-2.0 pcsc-lite nss" |
| 6 | 6 | ||
| 7 | SRCREV = "7b07684ea6698d4885ff2062350ad8798a04de42" | 7 | SRCREV = "df2d3c05a250741632184c2cc66df247039a70d7" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master" | 9 | SRC_URI = "git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master;tag=v${PV}" |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | inherit meson pkgconfig | 12 | inherit meson pkgconfig |
diff --git a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb index 3588d674f7..127738a429 100644 --- a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb +++ b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb | |||
| @@ -22,7 +22,6 @@ DEPENDS = " \ | |||
| 22 | cyrus-sasl \ | 22 | cyrus-sasl \ |
| 23 | gstreamer1.0 \ | 23 | gstreamer1.0 \ |
| 24 | gstreamer1.0-plugins-base \ | 24 | gstreamer1.0-plugins-base \ |
| 25 | gstreamer1.0-vaapi \ | ||
| 26 | gtk+3 \ | 25 | gtk+3 \ |
| 27 | jpeg \ | 26 | jpeg \ |
| 28 | json-glib \ | 27 | json-glib \ |
| @@ -30,6 +29,7 @@ DEPENDS = " \ | |||
| 30 | libepoxy \ | 29 | libepoxy \ |
| 31 | libopus \ | 30 | libopus \ |
| 32 | libusb1 \ | 31 | libusb1 \ |
| 32 | libva \ | ||
| 33 | lz4 \ | 33 | lz4 \ |
| 34 | pixman \ | 34 | pixman \ |
| 35 | python3-pyparsing-native \ | 35 | python3-pyparsing-native \ |
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.76.bb b/meta-networking/recipes-support/stunnel/stunnel_5.77.bb index dcd3d8cdf1..954fa896ba 100644 --- a/meta-networking/recipes-support/stunnel/stunnel_5.76.bb +++ b/meta-networking/recipes-support/stunnel/stunnel_5.77.bb | |||
| @@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ | |||
| 11 | file://fix-openssl-no-des.patch \ | 11 | file://fix-openssl-no-des.patch \ |
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRC_URI[sha256sum] = "cda37eb4d0fb1e129718ed27ad77b5735e899394ce040bb2be28bbb937fd79e1" | 14 | SRC_URI[sha256sum] = "ec026f4fae4e0d25b940cc7a9451d925e359e7fd59e9edad20baea66ce45f263" |
| 15 | 15 | ||
| 16 | inherit autotools bash-completion pkgconfig | 16 | inherit autotools bash-completion pkgconfig |
| 17 | 17 | ||
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch deleted file mode 100644 index faefd1d4ea..0000000000 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | From b71eb384522b5ce4629dee6e8be257fb4880fef3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Benjamin Gaignard <benjamin.gaignard@linaro.org> | ||
| 3 | Date: Thu, 20 Apr 2017 14:25:18 +0200 | ||
| 4 | |||
| 5 | --- | ||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Makefile.am | 1 - | ||
| 9 | configure.ac | 17 ----------------- | ||
| 10 | 2 files changed, 18 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/Makefile.am b/Makefile.am | ||
| 13 | index 4a3ead6..a12cb98 100644 | ||
| 14 | --- a/Makefile.am | ||
| 15 | +++ b/Makefile.am | ||
| 16 | @@ -2,7 +2,6 @@ SUBDIRS = \ | ||
| 17 | src \ | ||
| 18 | data \ | ||
| 19 | etc \ | ||
| 20 | - docs \ | ||
| 21 | m4macros \ | ||
| 22 | tests \ | ||
| 23 | scripts | ||
| 24 | diff --git a/configure.ac b/configure.ac | ||
| 25 | index 3849383..9f3a633 100644 | ||
| 26 | --- a/configure.ac | ||
| 27 | +++ b/configure.ac | ||
| 28 | @@ -179,18 +179,6 @@ AC_SUBST(CPPFLAGS) | ||
| 29 | AC_SUBST(LIBS) | ||
| 30 | AC_SUBST(ADDITIONAL_OBJECTS) | ||
| 31 | |||
| 32 | -if test x"$manpage_support_enabled" = x"yes"; then | ||
| 33 | -AC_PATH_PROG(POD2MAN, pod2man, no) | ||
| 34 | - | ||
| 35 | -if test "x$POD2MAN" = "xno" && \ | ||
| 36 | - ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then | ||
| 37 | -AC_MSG_ERROR([ | ||
| 38 | - manpage generation requested, but neither pod2man | ||
| 39 | - nor pre-generated manpages found. | ||
| 40 | - Use --disable-manpage-support if you want to compile anyway.]) | ||
| 41 | -fi | ||
| 42 | -fi #manpage_support_enabled | ||
| 43 | - | ||
| 44 | AM_CONDITIONAL(HAVE_POD2MAN, test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno") | ||
| 45 | |||
| 46 | AC_PATH_PROG(GPERF, gperf, no) | ||
| 47 | @@ -216,11 +204,6 @@ src/Makefile | ||
| 48 | data/Makefile | ||
| 49 | data/templates/Makefile | ||
| 50 | etc/Makefile | ||
| 51 | -docs/Makefile | ||
| 52 | -docs/man5/Makefile | ||
| 53 | -docs/man5/tinyproxy.conf.txt | ||
| 54 | -docs/man8/Makefile | ||
| 55 | -docs/man8/tinyproxy.txt | ||
| 56 | m4macros/Makefile | ||
| 57 | tests/Makefile | ||
| 58 | tests/scripts/Makefile | ||
| 59 | -- | ||
| 60 | 2.25.1 | ||
| 61 | |||
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb index 222cc8d7c6..8558291c18 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb | |||
| @@ -4,7 +4,6 @@ LICENSE = "GPL-2.0-only" | |||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
| 5 | 5 | ||
| 6 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \ | 6 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \ |
| 7 | file://disable-documentation.patch \ | ||
| 8 | file://tinyproxy.service \ | 7 | file://tinyproxy.service \ |
| 9 | file://tinyproxy.conf \ | 8 | file://tinyproxy.conf \ |
| 10 | file://run-ptest \ | 9 | file://run-ptest \ |
| @@ -21,6 +20,7 @@ EXTRA_OECONF += " \ | |||
| 21 | --enable-reverse \ | 20 | --enable-reverse \ |
| 22 | --enable-upstream \ | 21 | --enable-upstream \ |
| 23 | --enable-xtinyproxy \ | 22 | --enable-xtinyproxy \ |
| 23 | --enable-manpage_support=no \ | ||
| 24 | " | 24 | " |
| 25 | 25 | ||
| 26 | inherit autotools systemd useradd ptest | 26 | inherit autotools systemd useradd ptest |
diff --git a/meta-networking/recipes-support/tnftp/tnftp_20230507.bb b/meta-networking/recipes-support/tnftp/tnftp_20260211.bb index 4ab694fbba..70123eaa86 100644 --- a/meta-networking/recipes-support/tnftp/tnftp_20230507.bb +++ b/meta-networking/recipes-support/tnftp/tnftp_20260211.bb | |||
| @@ -8,6 +8,7 @@ IPv6 support, modification time preservation, paging of local and \ | |||
| 8 | remote files, passive mode support (with fallback to active mode), \ | 8 | remote files, passive mode support (with fallback to active mode), \ |
| 9 | SOCKS support, TIS FWTK gate-ftp server support, and transfer rate \ | 9 | SOCKS support, TIS FWTK gate-ftp server support, and transfer rate \ |
| 10 | throttling." | 10 | throttling." |
| 11 | HOMEPAGE = "https://en.wikipedia.org/wiki/Tnftp" | ||
| 11 | 12 | ||
| 12 | SECTION = "net" | 13 | SECTION = "net" |
| 13 | LICENSE = "BSD-2-Clause" | 14 | LICENSE = "BSD-2-Clause" |
| @@ -30,8 +31,8 @@ ALTERNATIVE_TARGET[ftp] = "${bindir}/tnftp" | |||
| 30 | 31 | ||
| 31 | FILES:${PN} = "${bindir}/tnftp" | 32 | FILES:${PN} = "${bindir}/tnftp" |
| 32 | 33 | ||
| 33 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbbb944979c7466ed5509b4bbc6c328b" | 34 | LIC_FILES_CHKSUM = "file://COPYING;md5=a78330785e3081e1679266f0ba58c555" |
| 34 | SRC_URI[sha256sum] = "be0134394bd7d418a3b34892b0709eeb848557e86474e1786f0d1a887d3a6580" | 35 | SRC_URI[sha256sum] = "101cda6927e5de4338ad9d4b264304d7d15d6a78b435968a7b95093e0a2efe03" |
| 35 | 36 | ||
| 36 | PACKAGECONFIG ?= "openssl \ | 37 | PACKAGECONFIG ?= "openssl \ |
| 37 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ | 38 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ |
diff --git a/meta-networking/recipes-support/tunctl/tunctl.inc b/meta-networking/recipes-support/tunctl/tunctl.inc index 5b759d32b6..1e7bc5a9fc 100644 --- a/meta-networking/recipes-support/tunctl/tunctl.inc +++ b/meta-networking/recipes-support/tunctl/tunctl.inc | |||
| @@ -9,6 +9,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz \ | |||
| 9 | 9 | ||
| 10 | inherit sourceforge-releases | 10 | inherit sourceforge-releases |
| 11 | 11 | ||
| 12 | TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}" | ||
| 13 | |||
| 12 | do_compile() { | 14 | do_compile() { |
| 13 | oe_runmake tunctl | 15 | oe_runmake tunctl |
| 14 | } | 16 | } |
diff --git a/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch b/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch index c96f538d2d..45fbb68b70 100644 --- a/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch +++ b/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch | |||
| @@ -1,14 +1,21 @@ | |||
| 1 | Add LDFLAGS variable to Makefile, make sure the extra linker flags can be passed. | 1 | Add LDFLAGS variable to Makefile, make sure the extra linker flags can be passed. |
| 2 | 2 | ||
| 3 | Upstream-Status: Pending | 3 | Upstream-Status: Inactive-Upstream [last change: 2013-03-22] |
| 4 | 4 | ||
| 5 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 5 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 6 | 6 | ||
| 7 | diff --git a/Makefile b/Makefile | ||
| 8 | index a0aa7f6..d6ce2c7 100644 | ||
| 9 | --- a/Makefile | 7 | --- a/Makefile |
| 10 | +++ b/Makefile | 8 | +++ b/Makefile |
| 11 | @@ -14,7 +14,7 @@ MAN_DIR ?= /usr/share/man/man$(MANS) | 9 | @@ -6,7 +6,7 @@ MAN = $(PACKAGE).$(MANS) |
| 10 | |||
| 11 | DIST = Makefile $(PACKAGE).spec $(PACKAGE).c $(PACKAGE).sgml ChangeLog | ||
| 12 | |||
| 13 | -CFLAGS = -g -Wall | ||
| 14 | +CFLAGS ?= -g -Wall | ||
| 15 | |||
| 16 | BIN_DIR ?= /usr/sbin | ||
| 17 | MAN_DIR ?= /usr/share/man/man$(MANS) | ||
| 18 | @@ -14,12 +14,12 @@ MAN_DIR ?= /usr/share/man/man$(MANS) | ||
| 12 | all : $(BIN) $(MAN) | 19 | all : $(BIN) $(MAN) |
| 13 | 20 | ||
| 14 | $(BIN) : $(BIN).c | 21 | $(BIN) : $(BIN).c |
| @@ -17,3 +24,9 @@ index a0aa7f6..d6ce2c7 100644 | |||
| 17 | 24 | ||
| 18 | $(MAN) : $(PACKAGE).sgml | 25 | $(MAN) : $(PACKAGE).sgml |
| 19 | docbook2man $(PACKAGE).sgml | 26 | docbook2man $(PACKAGE).sgml |
| 27 | |||
| 28 | -clean : | ||
| 29 | +clean : | ||
| 30 | rm -f $(BIN) $(OBJS) $(MAN) *~ manpage.* | ||
| 31 | |||
| 32 | install : $(BIN) $(MAN) | ||
diff --git a/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch index 3255a3fad0..244c6f5922 100644 --- a/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch +++ b/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch | |||
| @@ -5,7 +5,7 @@ Subject: [PATCH 1/1] include stddef.h for ptrdiff_t | |||
| 5 | 5 | ||
| 6 | This fixes compilation with musl. | 6 | This fixes compilation with musl. |
| 7 | 7 | ||
| 8 | Upstream-Status: Pending | 8 | Upstream-Status: Submitted [https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/2WTDPJNR6WGDO3PGCEC2J7RSJWETDCXW/] |
| 9 | 9 | ||
| 10 | Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelinux.com> | 10 | Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelinux.com> |
| 11 | --- | 11 | --- |
diff --git a/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb b/meta-networking/recipes-support/wavemon/wavemon_0.9.7.bb index 4857c0af4f..e9786207f5 100644 --- a/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb +++ b/meta-networking/recipes-support/wavemon/wavemon_0.9.7.bb | |||
| @@ -13,8 +13,8 @@ PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" | |||
| 13 | 13 | ||
| 14 | DEPENDS = "libnl ncurses" | 14 | DEPENDS = "libnl ncurses" |
| 15 | 15 | ||
| 16 | SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https" | 16 | SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https;tag=v${PV}" |
| 17 | SRCREV = "8ba6604027c0aa5131070e3fafdcda323d58a7ad" | 17 | SRCREV = "fb158b047c39af62b6627fc7e6c16e5017681d8f" |
| 18 | 18 | ||
| 19 | # Needs some help to find libnl3 headers. | 19 | # Needs some help to find libnl3 headers. |
| 20 | # Reorder -pthread flag on the command line. | 20 | # Reorder -pthread flag on the command line. |
diff --git a/meta-networking/recipes-support/wireshark/README b/meta-networking/recipes-support/wireshark/README deleted file mode 100644 index f5e4d04777..0000000000 --- a/meta-networking/recipes-support/wireshark/README +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | # | ||
| 2 | Wireshark - Notes | ||
| 3 | |||
| 4 | URL: http://www.wireshark.org/ | ||
| 5 | User Guide: http://www.wireshark.org/docs/wsug_html_chunked/ | ||
| 6 | Secruity advisories: http://www.wireshark.org/security/ | ||
| 7 | |||
| 8 | Wireshark is slowly moving away from gtk and towards QT as their graphical stack. | ||
| 9 | Currently gtk is supported with this release and I plan on integrating QT. | ||
| 10 | |||
| 11 | |||
| 12 | |||
| 13 | Adding the wireshark to your build | ||
| 14 | ======================================== | ||
| 15 | |||
| 16 | via local.conf | ||
| 17 | IMAGE_INSTALL:append = " wireshark" | ||
| 18 | |||
| 19 | Adding the wireshark to your graphical build | ||
| 20 | ======================================== | ||
| 21 | via local.conf | ||
| 22 | IMAGE_INSTALL:append = " wireshark" | ||
| 23 | |||
| 24 | and one of: | ||
| 25 | |||
| 26 | EXTRA_IMAGE_FEATURES += "x11-base" | ||
| 27 | |||
| 28 | or use the "core-image-x11" | ||
| 29 | |||
| 30 | |||
| 31 | Maintenance | ||
| 32 | ----------- | ||
| 33 | |||
| 34 | Send patches, comments or questions to openembedded-devel@lists.openembedded.org | ||
| 35 | |||
| 36 | When sending single patches, please use something like: | ||
| 37 | |||
| 38 | git send-email -1 -M \ | ||
| 39 | --to openembedded-devel@lists.openembedded.org \ | ||
| 40 | --cc akuster@mvista.com \ | ||
| 41 | --subject-prefix=meta-networking][PATCH | ||
| 42 | |||
| 43 | Maintainer: Armin Kuster <akuster@mvista.com> | ||
| 44 | |||
| 45 | |||
diff --git a/meta-networking/recipes-support/wireshark/files/0001-don-t-look-for-iconv.h-for-native-build.patch b/meta-networking/recipes-support/wireshark/files/0001-don-t-look-for-iconv.h-for-native-build.patch new file mode 100644 index 0000000000..5cc16459ce --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/0001-don-t-look-for-iconv.h-for-native-build.patch | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | From 9a9d99fb57caa38c4bc045f544429ec919ec6158 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Mon, 26 Jan 2026 21:26:49 +0100 | ||
| 4 | Subject: [PATCH] don't look for iconv.h for native build | ||
| 5 | |||
| 6 | iconv.h is not installed in the sysroot for native builds, and cmake | ||
| 7 | only searches for it in the sysroot. | ||
| 8 | |||
| 9 | It seems to be only required for zlib-ng support (based on the | ||
| 10 | commit[1] that introduced this dependency), which is currently not | ||
| 11 | enabled in the recipe. | ||
| 12 | |||
| 13 | To avoid build failure due to not finding this header during configuration, | ||
| 14 | remove this dependency from native builds | ||
| 15 | |||
| 16 | Upstream-Status: Inappropriate [OE specific] | ||
| 17 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 18 | --- | ||
| 19 | cmake/modules/FindLibXml2.cmake | 7 +------ | ||
| 20 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/cmake/modules/FindLibXml2.cmake b/cmake/modules/FindLibXml2.cmake | ||
| 23 | index d36b390..f3e4762 100644 | ||
| 24 | --- a/cmake/modules/FindLibXml2.cmake | ||
| 25 | +++ b/cmake/modules/FindLibXml2.cmake | ||
| 26 | @@ -66,11 +66,6 @@ find_path(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h | ||
| 27 | PATH_SUFFIXES libxml2 | ||
| 28 | ) | ||
| 29 | |||
| 30 | -find_path(ICONV_INCLUDE_DIR NAMES iconv.h | ||
| 31 | - HINTS | ||
| 32 | - ${LIBXML2_HINTS}/include | ||
| 33 | - ) | ||
| 34 | - | ||
| 35 | # CMake 3.9 and below used 'LIBXML2_LIBRARIES' as the name of | ||
| 36 | # the cache entry storing the find_library result. Use the | ||
| 37 | # value if it was set by the project or user. | ||
| 38 | @@ -103,7 +98,7 @@ elseif(LIBXML2_INCLUDE_DIR AND EXISTS "${LIBXML2_INCLUDE_DIR}/libxml/xmlversion. | ||
| 39 | unset(libxml2_version_str) | ||
| 40 | endif() | ||
| 41 | |||
| 42 | -set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR} ${PC_LIBXML_INCLUDE_DIRS} ${ICONV_INCLUDE_DIR}) | ||
| 43 | +set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR} ${PC_LIBXML_INCLUDE_DIRS}) | ||
| 44 | set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY}) | ||
| 45 | |||
| 46 | include(FindPackageHandleStandardArgs) | ||
diff --git a/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch index 0e6249c939..c6f5909cc9 100644 --- a/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch +++ b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch | |||
| @@ -23,19 +23,19 @@ index 20caa09..174f452 100644 | |||
| 23 | 23 | ||
| 24 | - ADD_CUSTOM_COMMAND( | 24 | - ADD_CUSTOM_COMMAND( |
| 25 | - OUTPUT ${_outc} ${_outh} | 25 | - OUTPUT ${_outc} ${_outh} |
| 26 | - COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in} | 26 | - COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> --outfile=${_outc} --header-file=${_outh} ${_in} |
| 27 | - DEPENDS ${_in} | 27 | - DEPENDS ${_in} |
| 28 | - ) | 28 | - ) |
| 29 | + IF (DEFINED ENV{SOURCE_DATE_EPOCH}) | 29 | + IF (DEFINED ENV{SOURCE_DATE_EPOCH}) |
| 30 | + ADD_CUSTOM_COMMAND( | 30 | + ADD_CUSTOM_COMMAND( |
| 31 | + OUTPUT ${_outc} ${_outh} | 31 | + OUTPUT ${_outc} ${_outh} |
| 32 | + COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> --noline -o${_outc} --header-file=${_outh} ${_in} | 32 | + COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> --noline --outfile=${_outc} --header-file=${_outh} ${_in} |
| 33 | + DEPENDS ${_in} | 33 | + DEPENDS ${_in} |
| 34 | + ) | 34 | + ) |
| 35 | + ELSE () | 35 | + ELSE () |
| 36 | + ADD_CUSTOM_COMMAND( | 36 | + ADD_CUSTOM_COMMAND( |
| 37 | + OUTPUT ${_outc} ${_outh} | 37 | + OUTPUT ${_outc} ${_outh} |
| 38 | + COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in} | 38 | + COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> --ooutfile=${_outc} --header-file=${_outh} ${_in} |
| 39 | + DEPENDS ${_in} | 39 | + DEPENDS ${_in} |
| 40 | + ) | 40 | + ) |
| 41 | + ENDIF () | 41 | + ENDIF () |
diff --git a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch index 1a6fe8d39e..5b4d5aaa82 100644 --- a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch +++ b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch | |||
| @@ -17,7 +17,7 @@ diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake | |||
| 17 | index e419de1..fa4034e 100644 | 17 | index e419de1..fa4034e 100644 |
| 18 | --- a/cmake/modules/UseLemon.cmake | 18 | --- a/cmake/modules/UseLemon.cmake |
| 19 | +++ b/cmake/modules/UseLemon.cmake | 19 | +++ b/cmake/modules/UseLemon.cmake |
| 20 | @@ -12,6 +12,7 @@ if(LEMON_EXECUTABLE) | 20 | @@ -17,6 +17,7 @@ if(LEMON_EXECUTABLE) |
| 21 | ${_out}.h | 21 | ${_out}.h |
| 22 | ${_out}.out | 22 | ${_out}.out |
| 23 | COMMAND ${LEMON_EXECUTABLE} | 23 | COMMAND ${LEMON_EXECUTABLE} |
| @@ -25,11 +25,11 @@ index e419de1..fa4034e 100644 | |||
| 25 | -T/usr/share/lemon/lempar.c | 25 | -T/usr/share/lemon/lempar.c |
| 26 | -d. | 26 | -d. |
| 27 | ${_in} | 27 | ${_in} |
| 28 | @@ -30,6 +31,7 @@ else() | 28 | @@ -35,6 +36,7 @@ else() |
| 29 | ${_out}.h | 29 | ${_out}.h |
| 30 | ${_out}.out | 30 | ${_out}.out |
| 31 | COMMAND $<TARGET_FILE:lemon> | 31 | COMMAND $<TARGET_FILE:lemon> |
| 32 | + -l | 32 | + -l |
| 33 | -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c | 33 | -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c |
| 34 | -d. | 34 | -d. |
| 35 | ${_in} | 35 | -- |
diff --git a/meta-networking/recipes-support/wireshark/files/CVE-2025-9817.patch b/meta-networking/recipes-support/wireshark/files/CVE-2025-9817.patch deleted file mode 100644 index 034c51778e..0000000000 --- a/meta-networking/recipes-support/wireshark/files/CVE-2025-9817.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 39daba5e247ea495f88b0be82f0b7ebbdbf50fba Mon Sep 17 00:00:00 2001 | ||
| 2 | From: John Thacker <johnthacker@gmail.com> | ||
| 3 | Date: Sat, 26 Jul 2025 07:10:28 -0400 | ||
| 4 | Subject: [PATCH] ssh: Add a null check | ||
| 5 | |||
| 6 | Fix #20642 | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://gitlab.com/wireshark/wireshark/-/commit/39daba5e247ea495f88b0be82f0b7ebbdbf50fba] | ||
| 9 | CVE: CVE-2025-9817 | ||
| 10 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
| 11 | --- | ||
| 12 | epan/dissectors/packet-ssh.c | 4 ++++ | ||
| 13 | 1 file changed, 4 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c | ||
| 16 | index 4f2b0ff..9b3b904 100644 | ||
| 17 | --- a/epan/dissectors/packet-ssh.c | ||
| 18 | +++ b/epan/dissectors/packet-ssh.c | ||
| 19 | @@ -2359,6 +2359,10 @@ ssh_kex_shared_secret(gint kex_type, ssh_bignum *pub, ssh_bignum *priv, ssh_bign | ||
| 20 | } | ||
| 21 | |||
| 22 | if(kex_type==SSH_KEX_DH_GEX){ | ||
| 23 | + if (modulo == NULL) { | ||
| 24 | + ws_debug("Missing group modulo"); | ||
| 25 | + return NULL; | ||
| 26 | + } | ||
| 27 | gcry_mpi_t b = NULL; | ||
| 28 | gcry_mpi_scan(&b, GCRYMPI_FMT_USG, pub->data, pub->length, NULL); | ||
| 29 | gcry_mpi_t d = NULL, e = NULL, m = NULL; | ||
| 30 | -- | ||
| 31 | 2.43.0 | ||
| 32 | |||
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.14.bb b/meta-networking/recipes-support/wireshark/wireshark_4.6.4.bb index bd014055a9..7ecad4eda8 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.2.14.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.6.4.bb | |||
| @@ -4,7 +4,19 @@ SECTION = "net" | |||
| 4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce" |
| 6 | 6 | ||
| 7 | DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares speexdsp" | 7 | DEPENDS = "\ |
| 8 | bison-native \ | ||
| 9 | c-ares \ | ||
| 10 | expat \ | ||
| 11 | glib-2.0 \ | ||
| 12 | glib-2.0-native \ | ||
| 13 | libgcrypt libgpg-error \ | ||
| 14 | libxml2 \ | ||
| 15 | pcre2 \ | ||
| 16 | speexdsp \ | ||
| 17 | virtual/libiconv \ | ||
| 18 | xxhash \ | ||
| 19 | " | ||
| 8 | 20 | ||
| 9 | DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " | 21 | DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " |
| 10 | 22 | ||
| @@ -13,12 +25,13 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz | |||
| 13 | file://0002-flex-Remove-line-directives.patch \ | 25 | file://0002-flex-Remove-line-directives.patch \ |
| 14 | file://0004-lemon-Remove-line-directives.patch \ | 26 | file://0004-lemon-Remove-line-directives.patch \ |
| 15 | file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \ | 27 | file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \ |
| 16 | file://CVE-2025-9817.patch \ | ||
| 17 | " | 28 | " |
| 18 | 29 | ||
| 30 | SRC_URI:append:class-native = " file://0001-don-t-look-for-iconv.h-for-native-build.patch" | ||
| 31 | |||
| 19 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions" | 32 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions" |
| 20 | 33 | ||
| 21 | SRC_URI[sha256sum] = "098177f021951638f5bdca5b01f284c14fcc3f6c804f7aa2ca00fdcb99c7a166" | 34 | SRC_URI[sha256sum] = "fbeab3d85c6c8a5763c8d9b7fe20b5c69ca9f9e7f2b824bedc73135bdca332e2" |
| 22 | 35 | ||
| 23 | PE = "1" | 36 | PE = "1" |
| 24 | 37 | ||
| @@ -59,16 +72,20 @@ EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ | |||
| 59 | -DM_INCLUDE_DIR=${includedir} \ | 72 | -DM_INCLUDE_DIR=${includedir} \ |
| 60 | -DM_LIBRARY=${libdir} \ | 73 | -DM_LIBRARY=${libdir} \ |
| 61 | " | 74 | " |
| 75 | |||
| 76 | # use lemon from ${PN}-native, instead of cross-compiled or host versions | ||
| 77 | EXTRA_OECMAKE:append:class-target = " -DLEMON_EXECUTABLE=${STAGING_BINDIR_NATIVE}/lemon" | ||
| 62 | CFLAGS:append = " -lm" | 78 | CFLAGS:append = " -lm" |
| 63 | 79 | ||
| 64 | do_compile:append:class-target() { | 80 | do_compile:append:class-target() { |
| 65 | # Fix TMPDIR, these are in the comments section | 81 | # Fix TMPDIR, these are in the comments section |
| 66 | sed -i -e "s:** source file.*::g" ${B}/wiretap/ascend_parser.c | 82 | sed -i -e "s:** source file.*::g" ${B}/wiretap/ascend_parser.c |
| 67 | sed -i -e "s:** source file.*::g" ${B}/wiretap/candump_parser.c | ||
| 68 | sed -i -e "s:** source file.*::g" ${B}/wiretap/busmaster_parser.c | 83 | sed -i -e "s:** source file.*::g" ${B}/wiretap/busmaster_parser.c |
| 69 | sed -i -e "s:** source file.*::g" ${B}/epan/protobuf_lang_parser.c | 84 | sed -i -e "s:** source file.*::g" ${B}/epan/protobuf_lang_parser.c |
| 70 | sed -i -e "s:** source file.*::g" ${B}/epan/dtd_grammar.c | ||
| 71 | sed -i -e "s:** source file.*::g" ${B}/epan/dfilter/grammar.c | 85 | sed -i -e "s:** source file.*::g" ${B}/epan/dfilter/grammar.c |
| 86 | if [ -f "${B}/plugins/epan/mate/mate_grammar.c" ]; then | ||
| 87 | sed -i -e 's:** source file.*::g' "${B}/plugins/epan/mate/mate_grammar.c" | ||
| 88 | fi | ||
| 72 | } | 89 | } |
| 73 | 90 | ||
| 74 | do_install:append:class-native() { | 91 | do_install:append:class-native() { |
diff --git a/meta-oe/classes/signing.bbclass b/meta-oe/classes/signing.bbclass index b35184398a..a9f657feb6 100644 --- a/meta-oe/classes/signing.bbclass +++ b/meta-oe/classes/signing.bbclass | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | # build system level, this class takes the approach of always using PKCS #11 at | 19 | # build system level, this class takes the approach of always using PKCS #11 at |
| 20 | # the recipe level. For cases where the keys are available as files (i.e. test | 20 | # the recipe level. For cases where the keys are available as files (i.e. test |
| 21 | # keys in CI), they are imported into SoftHSM (a HSM emulation library). | 21 | # keys in CI), they are imported into SoftHSM (a HSM emulation library). |
| 22 | # | 22 | # |
| 23 | # Recipes access the available keys via a specific role. So, depending on | 23 | # Recipes access the available keys via a specific role. So, depending on |
| 24 | # whether we're building during development or for release, a given role can | 24 | # whether we're building during development or for release, a given role can |
| 25 | # refer to different keys. | 25 | # refer to different keys. |
| @@ -33,7 +33,7 @@ | |||
| 33 | # SIGNING_PKCS11_MODULE[fit] = "/usr/lib/x86_64-linux-gnu/opensc-pkcs11.so" | 33 | # SIGNING_PKCS11_MODULE[fit] = "/usr/lib/x86_64-linux-gnu/opensc-pkcs11.so" |
| 34 | # | 34 | # |
| 35 | # Examples for defining roles and importing keys: | 35 | # Examples for defining roles and importing keys: |
| 36 | # | 36 | # |
| 37 | # meta-code-signing/recipes-security/signing-keys/dummy-rsa-key-native.bb | 37 | # meta-code-signing/recipes-security/signing-keys/dummy-rsa-key-native.bb |
| 38 | # meta-code-signing-demo/recipes-security/ptx-dev-keys/ptx-dev-keys-native_git.bb | 38 | # meta-code-signing-demo/recipes-security/ptx-dev-keys/ptx-dev-keys-native_git.bb |
| 39 | # | 39 | # |
| @@ -54,7 +54,7 @@ | |||
| 54 | SIGNING_PKCS11_URI ?= "" | 54 | SIGNING_PKCS11_URI ?= "" |
| 55 | SIGNING_PKCS11_MODULE ?= "" | 55 | SIGNING_PKCS11_MODULE ?= "" |
| 56 | 56 | ||
| 57 | DEPENDS += "softhsm-native libp11-native opensc-native openssl-native extract-cert-native" | 57 | DEPENDS += "softhsm-native pkcs11-provider-native libp11-native opensc-native openssl-native extract-cert-native" |
| 58 | 58 | ||
| 59 | def signing_class_prepare(d): | 59 | def signing_class_prepare(d): |
| 60 | import os.path | 60 | import os.path |
| @@ -338,16 +338,10 @@ signing_import_install() { | |||
| 338 | signing_prepare() { | 338 | signing_prepare() { |
| 339 | export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" | 339 | export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" |
| 340 | export OPENSSL_ENGINES="${STAGING_LIBDIR_NATIVE}/engines-3" | 340 | export OPENSSL_ENGINES="${STAGING_LIBDIR_NATIVE}/engines-3" |
| 341 | export OPENSSL_CONF="${STAGING_LIBDIR_NATIVE}/ssl-3/openssl.cnf" | 341 | export OPENSSL_CONF="${STAGING_LIBDIR_NATIVE}/openssl-provider-signing.cnf" |
| 342 | export SSL_CERT_DIR="${STAGING_LIBDIR_NATIVE}/ssl-3/certs" | 342 | export SSL_CERT_DIR="${STAGING_LIBDIR_NATIVE}/ssl-3/certs" |
| 343 | export SSL_CERT_FILE="${STAGING_LIBDIR_NATIVE}/ssl-3/cert.pem" | 343 | export SSL_CERT_FILE="${STAGING_LIBDIR_NATIVE}/ssl-3/cert.pem" |
| 344 | 344 | ||
| 345 | if [ -f ${OPENSSL_CONF} ]; then | ||
| 346 | echo "Using '${OPENSSL_CONF}' for OpenSSL configuration" | ||
| 347 | else | ||
| 348 | echo "Missing 'openssl.cnf' at '${STAGING_ETCDIR_NATIVE}/ssl'" | ||
| 349 | return 1 | ||
| 350 | fi | ||
| 351 | if [ -d ${OPENSSL_MODULES} ]; then | 345 | if [ -d ${OPENSSL_MODULES} ]; then |
| 352 | echo "Using '${OPENSSL_MODULES}' for OpenSSL run-time modules" | 346 | echo "Using '${OPENSSL_MODULES}' for OpenSSL run-time modules" |
| 353 | else | 347 | else |
| @@ -367,6 +361,26 @@ signing_prepare() { | |||
| 367 | echo "directories.tokendir = $SOFTHSM2_DIR" > "$SOFTHSM2_CONF" | 361 | echo "directories.tokendir = $SOFTHSM2_DIR" > "$SOFTHSM2_CONF" |
| 368 | echo "objectstore.backend = db" >> "$SOFTHSM2_CONF" | 362 | echo "objectstore.backend = db" >> "$SOFTHSM2_CONF" |
| 369 | 363 | ||
| 364 | cat > "${OPENSSL_CONF}" <<EOF | ||
| 365 | openssl_conf = openssl_init | ||
| 366 | |||
| 367 | [openssl_init] | ||
| 368 | providers = provider_sect | ||
| 369 | |||
| 370 | [provider_sect] | ||
| 371 | default = default_sect | ||
| 372 | pkcs11 = pkcs11_sect | ||
| 373 | |||
| 374 | [default_sect] | ||
| 375 | activate = 1 | ||
| 376 | |||
| 377 | [pkcs11_sect] | ||
| 378 | pkcs11-module-quirks = no-operation-state no-deinit | ||
| 379 | pkcs11-module-cache-keys = false | ||
| 380 | pkcs11-module-encode-provider-uri-to-pem = true | ||
| 381 | activate = 1 | ||
| 382 | EOF | ||
| 383 | |||
| 370 | for env in $(ls "${STAGING_DIR_NATIVE}/var/lib/meta-signing.env.d"); do | 384 | for env in $(ls "${STAGING_DIR_NATIVE}/var/lib/meta-signing.env.d"); do |
| 371 | . "${STAGING_DIR_NATIVE}/var/lib/meta-signing.env.d/$env" | 385 | . "${STAGING_DIR_NATIVE}/var/lib/meta-signing.env.d/$env" |
| 372 | done | 386 | done |
| @@ -378,6 +392,8 @@ signing_use_role() { | |||
| 378 | local role="${1}" | 392 | local role="${1}" |
| 379 | 393 | ||
| 380 | export PKCS11_MODULE_PATH="$(signing_get_module $role)" | 394 | export PKCS11_MODULE_PATH="$(signing_get_module $role)" |
| 395 | export PKCS11_PROVIDER_MODULE="$PKCS11_MODULE_PATH" | ||
| 396 | # export PKCS11_PROVIDER_DEBUG="file:/dev/stderr" | ||
| 381 | export PKCS11_URI="$(signing_get_uri $role)" | 397 | export PKCS11_URI="$(signing_get_uri $role)" |
| 382 | 398 | ||
| 383 | if [ -z "$PKCS11_MODULE_PATH" ]; then | 399 | if [ -z "$PKCS11_MODULE_PATH" ]; then |
| @@ -447,6 +463,40 @@ signing_extract_cert_pem() { | |||
| 447 | rm "${output}.tmp-der" | 463 | rm "${output}.tmp-der" |
| 448 | } | 464 | } |
| 449 | 465 | ||
| 466 | # signing_create_uri_pem <role> <pem> | ||
| 467 | # | ||
| 468 | # Wrap the role's pkcs11: URI in a PEM file. | ||
| 469 | # The resulting file can be used instead of the URI returned by | ||
| 470 | # 'signing_get_uri $role' with applications which do not yet support the | ||
| 471 | # OSSL_STORE for native access to the PKCS#11 provider. | ||
| 472 | signing_create_uri_pem() { | ||
| 473 | local role="${1}" | ||
| 474 | local output="${2}" | ||
| 475 | local conf="${output}.cnf" | ||
| 476 | local der="${output}.der" | ||
| 477 | |||
| 478 | local uri="$(signing_get_uri $role)" | ||
| 479 | |||
| 480 | echo "Wrapping PKCS#11 URI for role '$role' as '${output}'" | ||
| 481 | |||
| 482 | # The \# escape prevents OpenSSL's config parser treating # as a comment. | ||
| 483 | cat > "${conf}" <<EOF | ||
| 484 | asn1=SEQUENCE:pkcs11_uri_seq | ||
| 485 | |||
| 486 | [pkcs11_uri_seq] | ||
| 487 | version=VISIBLESTRING:PKCS\#11 Provider URI v1.0 | ||
| 488 | uri=UTF8:${uri} | ||
| 489 | EOF | ||
| 490 | |||
| 491 | openssl asn1parse -genconf "${conf}" -noout -out "${der}" | ||
| 492 | |||
| 493 | { | ||
| 494 | echo "-----BEGIN PKCS#11 PROVIDER URI-----" | ||
| 495 | openssl base64 -in "${der}" | ||
| 496 | echo "-----END PKCS#11 PROVIDER URI-----" | ||
| 497 | } > "${output}" | ||
| 498 | } | ||
| 499 | |||
| 450 | python () { | 500 | python () { |
| 451 | signing_class_prepare(d) | 501 | signing_class_prepare(d) |
| 452 | } | 502 | } |
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index f8d9ee6f9b..e88e50b59c 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc | |||
| @@ -13,6 +13,7 @@ PTESTS_FAST_META_OE = "\ | |||
| 13 | cjson \ | 13 | cjson \ |
| 14 | cli11 \ | 14 | cli11 \ |
| 15 | cmocka \ | 15 | cmocka \ |
| 16 | conserver \ | ||
| 16 | cunit \ | 17 | cunit \ |
| 17 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'dbus-broker', '', d)} \ | 18 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'dbus-broker', '', d)} \ |
| 18 | duktape \ | 19 | duktape \ |
| @@ -72,6 +73,7 @@ PTESTS_FAST_META_OE:remove:riscv32 = "botan nodejs oprofile" | |||
| 72 | 73 | ||
| 73 | PTESTS_SLOW_META_OE = "\ | 74 | PTESTS_SLOW_META_OE = "\ |
| 74 | c-ares \ | 75 | c-ares \ |
| 76 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'freerdp', '', d)} \ | ||
| 75 | fftw \ | 77 | fftw \ |
| 76 | libusb-compat \ | 78 | libusb-compat \ |
| 77 | mariadb \ | 79 | mariadb \ |
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 186ff9a488..c6974f6dfe 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf | |||
| @@ -48,7 +48,7 @@ LAYERVERSION_openembedded-layer = "1" | |||
| 48 | 48 | ||
| 49 | LAYERDEPENDS_openembedded-layer = "core" | 49 | LAYERDEPENDS_openembedded-layer = "core" |
| 50 | 50 | ||
| 51 | LAYERSERIES_COMPAT_openembedded-layer = "walnascar whinlatter" | 51 | LAYERSERIES_COMPAT_openembedded-layer = "whinlatter wrynose" |
| 52 | 52 | ||
| 53 | LICENSE_PATH += "${LAYERDIR}/licenses" | 53 | LICENSE_PATH += "${LAYERDIR}/licenses" |
| 54 | 54 | ||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.8.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.8.2.bb index 3398ad9361..1b619120f3 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.8.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.8.2.bb | |||
| @@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" | |||
| 7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
| 8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" | 8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" |
| 9 | 9 | ||
| 10 | SRCREV = "4215a302c649f8fe3739814e365b0d6af722b66b" | 10 | SRCREV = "d3d58c848a53403e5468e1a55ff03c44e7c70a39" |
| 11 | PYPI_SRC_URI = "git://github.com/thingsboard/${BPN};protocol=https;branch=master;tag=${PV}" | 11 | PYPI_SRC_URI = "git://github.com/thingsboard/${BPN};protocol=https;branch=master;tag=${PV}" |
| 12 | PYPI_PACKAGE = "thingsboard-gateway" | 12 | PYPI_PACKAGE = "thingsboard-gateway" |
| 13 | 13 | ||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-Add-ARM64-syscall-prefix-detection-in-C-API.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-Add-ARM64-syscall-prefix-detection-in-C-API.patch new file mode 100644 index 0000000000..d6b52438c4 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-Add-ARM64-syscall-prefix-detection-in-C-API.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From b901fb0088a7605eec00af7b644e25987995d693 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
| 3 | Date: Sat, 7 Mar 2026 07:18:43 -0800 | ||
| 4 | Subject: [PATCH] Add ARM64 syscall prefix detection in C++ API | ||
| 5 | |||
| 6 | Fixes issue where bpf.get_syscall_fnname() on ARM64 returns bare | ||
| 7 | syscall name instead of the prefixed __arm64_sys_ variant, causing | ||
| 8 | kprobe attachment failures. Now detects ARM64 prefix alongside x64 | ||
| 9 | (__x64_sys_) and generic (sys_) prefixes. | ||
| 10 | |||
| 11 | Fixes: #5350 | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/iovisor/bcc/pull/5489] | ||
| 14 | |||
| 15 | Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
| 16 | --- | ||
| 17 | src/cc/api/BPF.cc | 2 ++ | ||
| 18 | 1 file changed, 2 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/src/cc/api/BPF.cc b/src/cc/api/BPF.cc | ||
| 21 | index 2a77c2c9..11c6c542 100644 | ||
| 22 | --- a/src/cc/api/BPF.cc | ||
| 23 | +++ b/src/cc/api/BPF.cc | ||
| 24 | @@ -780,6 +780,8 @@ std::string BPF::get_syscall_fnname(const std::string& name) { | ||
| 25 | syscall_prefix_.reset(new std::string("sys_")); | ||
| 26 | else if (ksym.resolve_name(nullptr, "__x64_sys_bpf", &addr)) | ||
| 27 | syscall_prefix_.reset(new std::string("__x64_sys_")); | ||
| 28 | + else if (ksym.resolve_name(nullptr, "__arm64_sys_bpf", &addr)) | ||
| 29 | + syscall_prefix_.reset(new std::string("__arm64_sys_")); | ||
| 30 | else | ||
| 31 | syscall_prefix_.reset(new std::string()); | ||
| 32 | } | ||
| 33 | -- | ||
| 34 | 2.49.0 | ||
| 35 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0002-Add-riscv-syscall-prefix-detection-in-C-API.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0002-Add-riscv-syscall-prefix-detection-in-C-API.patch new file mode 100644 index 0000000000..78bf1df7c3 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0002-Add-riscv-syscall-prefix-detection-in-C-API.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From da01655f0f335584867b3427005b95384499a020 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
| 3 | Date: Sat, 7 Mar 2026 20:20:04 -0800 | ||
| 4 | Subject: [PATCH 2/2] Add riscv syscall prefix detection in C++ API | ||
| 5 | |||
| 6 | Fixes issue where bpf.get_syscall_fnname() on riscv64 returns bare syscall | ||
| 7 | name instead of the prefixed _riscv_sys variant, causing kprobe | ||
| 8 | attachment failures. | ||
| 9 | |||
| 10 | Upstream-Status: Submitted [https://github.com/iovisor/bcc/pull/5490] | ||
| 11 | |||
| 12 | Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
| 13 | --- | ||
| 14 | src/cc/api/BPF.cc | 2 ++ | ||
| 15 | 1 file changed, 2 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/src/cc/api/BPF.cc b/src/cc/api/BPF.cc | ||
| 18 | index 11c6c542..e1df8208 100644 | ||
| 19 | --- a/src/cc/api/BPF.cc | ||
| 20 | +++ b/src/cc/api/BPF.cc | ||
| 21 | @@ -782,6 +782,8 @@ std::string BPF::get_syscall_fnname(const std::string& name) { | ||
| 22 | syscall_prefix_.reset(new std::string("__x64_sys_")); | ||
| 23 | else if (ksym.resolve_name(nullptr, "__arm64_sys_bpf", &addr)) | ||
| 24 | syscall_prefix_.reset(new std::string("__arm64_sys_")); | ||
| 25 | + else if (ksym.resolve_name(nullptr, "__riscv_sys_bpf", &addr)) | ||
| 26 | + syscall_prefix_.reset(new std::string("__riscv_sys_")); | ||
| 27 | else | ||
| 28 | syscall_prefix_.reset(new std::string()); | ||
| 29 | } | ||
| 30 | -- | ||
| 31 | 2.49.0 | ||
| 32 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0003-folly-tracing-Remove-x86-specific-naming-from-tracin.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0003-folly-tracing-Remove-x86-specific-naming-from-tracin.patch new file mode 100644 index 0000000000..2c1ff2dd73 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0003-folly-tracing-Remove-x86-specific-naming-from-tracin.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | From c2bd977c6c885d5cdca94ef5ac31bfcd9c4347ea Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
| 3 | Date: Sat, 7 Mar 2026 21:44:41 +0000 | ||
| 4 | Subject: [PATCH 1/2] folly/tracing: Remove x86-specific naming from tracing | ||
| 5 | header | ||
| 6 | |||
| 7 | Rename StaticTracepoint-ELFx86.h to StaticTracepoint-ELF.h so the header | ||
| 8 | name is no longer tied to a specific architecture, enabling future | ||
| 9 | support for additional architectures. | ||
| 10 | |||
| 11 | Upstream-Status: Submitted [https://github.com/iovisor/bcc/pull/5491] | ||
| 12 | |||
| 13 | Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
| 14 | --- | ||
| 15 | .../tracing/{StaticTracepoint-ELFx86.h => StaticTracepoint-ELF.h} | 0 | ||
| 16 | 1 file changed, 0 insertions(+), 0 deletions(-) | ||
| 17 | rename tests/python/include/folly/tracing/{StaticTracepoint-ELFx86.h => StaticTracepoint-ELF.h} (100%) | ||
| 18 | |||
| 19 | diff --git a/tests/python/include/folly/tracing/StaticTracepoint-ELFx86.h b/tests/python/include/folly/tracing/StaticTracepoint-ELF.h | ||
| 20 | similarity index 100% | ||
| 21 | rename from tests/python/include/folly/tracing/StaticTracepoint-ELFx86.h | ||
| 22 | rename to tests/python/include/folly/tracing/StaticTracepoint-ELF.h | ||
| 23 | -- | ||
| 24 | 2.49.1 | ||
| 25 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0004-folly-tracing-Add-ARM-and-AArch64-support-to-static-.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0004-folly-tracing-Add-ARM-and-AArch64-support-to-static-.patch new file mode 100644 index 0000000000..2b97242753 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0004-folly-tracing-Add-ARM-and-AArch64-support-to-static-.patch | |||
| @@ -0,0 +1,67 @@ | |||
| 1 | From f290f9df0556735041bfee8e67fcad55edb4c70b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
| 3 | Date: Sat, 7 Mar 2026 22:02:07 +0000 | ||
| 4 | Subject: [PATCH 2/2] folly/tracing: Add ARM and AArch64 support to static | ||
| 5 | tracepoints | ||
| 6 | |||
| 7 | Extend the static tracepoint (SDT) macros to work on ARM and AArch64 | ||
| 8 | by: | ||
| 9 | |||
| 10 | - Defining FOLLY_SDT_NOP as "nop" (the same mnemonic works for both | ||
| 11 | ARM and AArch64) | ||
| 12 | - Adding `defined(__aarch64__) || defined(__arm__)` to the preprocessor | ||
| 13 | guard in StaticTracepoint.h | ||
| 14 | |||
| 15 | This resolves USDT probe test failures on ARM64 platforms. | ||
| 16 | Without these changes, the .note.stapsdt section containing probe | ||
| 17 | information was missing entirely on ARM64, causing test failures when | ||
| 18 | attempting to find and attach to USDT probes in the BCC test suite. | ||
| 19 | |||
| 20 | Fixes: #5354 | ||
| 21 | |||
| 22 | Upstream-Status: Submitted [https://github.com/iovisor/bcc/pull/5491] | ||
| 23 | |||
| 24 | Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
| 25 | --- | ||
| 26 | tests/python/include/folly/tracing/StaticTracepoint-ELF.h | 6 ++++++ | ||
| 27 | tests/python/include/folly/tracing/StaticTracepoint.h | 4 ++-- | ||
| 28 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
| 29 | |||
| 30 | diff --git a/tests/python/include/folly/tracing/StaticTracepoint-ELF.h b/tests/python/include/folly/tracing/StaticTracepoint-ELF.h | ||
| 31 | index 033809cb..47828309 100644 | ||
| 32 | --- a/tests/python/include/folly/tracing/StaticTracepoint-ELF.h | ||
| 33 | +++ b/tests/python/include/folly/tracing/StaticTracepoint-ELF.h | ||
| 34 | @@ -25,7 +25,13 @@ | ||
| 35 | #endif | ||
| 36 | |||
| 37 | // Instruction to emit for the probe. | ||
| 38 | +#if defined(__x86_64__) || defined(__i386__) | ||
| 39 | #define FOLLY_SDT_NOP nop | ||
| 40 | +#elif defined(__aarch64__) || defined(__arm__) | ||
| 41 | +#define FOLLY_SDT_NOP nop | ||
| 42 | +#else | ||
| 43 | +#error "Unsupported architecture" | ||
| 44 | +#endif | ||
| 45 | |||
| 46 | // Note section properties. | ||
| 47 | #define FOLLY_SDT_NOTE_NAME "stapsdt" | ||
| 48 | diff --git a/tests/python/include/folly/tracing/StaticTracepoint.h b/tests/python/include/folly/tracing/StaticTracepoint.h | ||
| 49 | index 858b7dbc..86f8e40c 100644 | ||
| 50 | --- a/tests/python/include/folly/tracing/StaticTracepoint.h | ||
| 51 | +++ b/tests/python/include/folly/tracing/StaticTracepoint.h | ||
| 52 | @@ -16,10 +16,10 @@ | ||
| 53 | |||
| 54 | #pragma once | ||
| 55 | |||
| 56 | -#if defined(__ELF__) && (defined(__x86_64__) || defined(__i386__)) && \ | ||
| 57 | +#if defined(__ELF__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__) || defined(__arm__)) && \ | ||
| 58 | !FOLLY_DISABLE_SDT | ||
| 59 | |||
| 60 | -#include <folly/tracing/StaticTracepoint-ELFx86.h> | ||
| 61 | +#include <folly/tracing/StaticTracepoint-ELF.h> | ||
| 62 | |||
| 63 | #define FOLLY_SDT(provider, name, ...) \ | ||
| 64 | FOLLY_SDT_PROBE_N( \ | ||
| 65 | -- | ||
| 66 | 2.49.0 | ||
| 67 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.35.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.35.0.bb index 8c6e44edbc..6e821cca7a 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.35.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.35.0.bb | |||
| @@ -13,6 +13,7 @@ DEPENDS += "bison-native \ | |||
| 13 | clang \ | 13 | clang \ |
| 14 | libbpf \ | 14 | libbpf \ |
| 15 | python3-setuptools-native \ | 15 | python3-setuptools-native \ |
| 16 | xz \ | ||
| 16 | " | 17 | " |
| 17 | 18 | ||
| 18 | RDEPENDS:${PN} += "bash python3 python3-core python3-setuptools xz" | 19 | RDEPENDS:${PN} += "bash python3 python3-core python3-setuptools xz" |
| @@ -22,6 +23,10 @@ SRC_URI = "gitsm://github.com/iovisor/bcc;branch=master;protocol=https;tag=v${PV | |||
| 22 | file://0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch \ | 23 | file://0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch \ |
| 23 | file://0001-Vendor-just-enough-extra-headers-to-allow-libbpf-to-.patch \ | 24 | file://0001-Vendor-just-enough-extra-headers-to-allow-libbpf-to-.patch \ |
| 24 | file://0001-Fix-a-build-failure-with-clang21-5369.patch \ | 25 | file://0001-Fix-a-build-failure-with-clang21-5369.patch \ |
| 26 | file://0001-Add-ARM64-syscall-prefix-detection-in-C-API.patch \ | ||
| 27 | file://0002-Add-riscv-syscall-prefix-detection-in-C-API.patch \ | ||
| 28 | file://0003-folly-tracing-Remove-x86-specific-naming-from-tracin.patch \ | ||
| 29 | file://0004-folly-tracing-Add-ARM-and-AArch64-support-to-static-.patch \ | ||
| 25 | file://run-ptest \ | 30 | file://run-ptest \ |
| 26 | file://ptest_wrapper.sh \ | 31 | file://ptest_wrapper.sh \ |
| 27 | file://fix_for_memleak.patch \ | 32 | file://fix_for_memleak.patch \ |
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.1.bb index add2ff01a8..33de2f4054 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.1.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.1.bb | |||
| @@ -15,9 +15,6 @@ DEPENDS += "bison-native \ | |||
| 15 | " | 15 | " |
| 16 | DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'pahole-native llvm-native', '', d)}" | 16 | DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'pahole-native llvm-native', '', d)}" |
| 17 | 17 | ||
| 18 | RDEPENDS:${PN} += "bash python3 xz" | ||
| 19 | RDEPENDS:${PN}-ptest += "bpftool" | ||
| 20 | |||
| 21 | SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.24.x;protocol=https;tag=v${PV} \ | 18 | SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.24.x;protocol=https;tag=v${PV} \ |
| 22 | file://run-ptest \ | 19 | file://run-ptest \ |
| 23 | file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \ | 20 | file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \ |
| @@ -41,9 +38,9 @@ do_install_ptest() { | |||
| 41 | cp -rf ${B}/tests/test* ${D}${PTEST_PATH}/tests | 38 | cp -rf ${B}/tests/test* ${D}${PTEST_PATH}/tests |
| 42 | fi | 39 | fi |
| 43 | for f in testlibs/cmake_install.cmake \ | 40 | for f in testlibs/cmake_install.cmake \ |
| 44 | testprogs/cmake_install.cmake \ | 41 | testprogs/cmake_install.cmake \ |
| 45 | testlibs/CTestTestfile.cmake \ | 42 | testlibs/CTestTestfile.cmake \ |
| 46 | testprogs/CTestTestfile.cmake | 43 | testprogs/CTestTestfile.cmake |
| 47 | do | 44 | do |
| 48 | sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||' ${D}${libdir}/bpftrace/ptest/tests/$f | 45 | sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||' ${D}${libdir}/bpftrace/ptest/tests/$f |
| 49 | sed -i -e 's|${S}/||' ${D}${libdir}/bpftrace/ptest/tests/$f | 46 | sed -i -e 's|${S}/||' ${D}${libdir}/bpftrace/ptest/tests/$f |
| @@ -59,6 +56,8 @@ EXTRA_OECMAKE = " \ | |||
| 59 | -DBISON_FLAGS='--file-prefix-map=${WORKDIR}=' \ | 56 | -DBISON_FLAGS='--file-prefix-map=${WORKDIR}=' \ |
| 60 | " | 57 | " |
| 61 | 58 | ||
| 59 | RDEPENDS:${PN}-ptest += "bash bpftool python3" | ||
| 60 | |||
| 62 | COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*|riscv64.*)-linux" | 61 | COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*|riscv64.*)-linux" |
| 63 | 62 | ||
| 64 | INHIBIT_PACKAGE_STRIP_FILES += "\ | 63 | INHIBIT_PACKAGE_STRIP_FILES += "\ |
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf deleted file mode 100644 index ddf155a907..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | [Service] | ||
| 2 | ExecStartPre=/usr/bin/android-gadget-setup | ||
| 3 | ExecStartPost=/usr/bin/android-gadget-start | ||
| 4 | ExecStopPost=/usr/bin/android-gadget-cleanup | ||
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup deleted file mode 100644 index 517227d4a6..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | [ -d /sys/kernel/config/usb_gadget ] || exit 0 | ||
| 4 | |||
| 5 | cd /sys/kernel/config/usb_gadget | ||
| 6 | |||
| 7 | cd adb | ||
| 8 | |||
| 9 | echo "" > UDC || true | ||
| 10 | |||
| 11 | killall adbd || true | ||
| 12 | |||
| 13 | umount /dev/usb-ffs/adb | ||
| 14 | |||
| 15 | rm configs/c.1/ffs.usb0 | ||
| 16 | |||
| 17 | rmdir configs/c.1/strings/0x409 | ||
| 18 | rmdir configs/c.1 | ||
| 19 | |||
| 20 | rmdir functions/ffs.usb0 | ||
| 21 | rmdir strings/0x409 | ||
| 22 | |||
| 23 | cd .. | ||
| 24 | rmdir adb | ||
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup deleted file mode 100644 index e44d1bacbe..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | set -e | ||
| 4 | |||
| 5 | manufacturer=RPB | ||
| 6 | model="Android device" | ||
| 7 | serial=0123456789ABCDEF | ||
| 8 | |||
| 9 | if [ -r /etc/android-gadget-setup.machine ] ; then | ||
| 10 | . /etc/android-gadget-setup.machine | ||
| 11 | fi | ||
| 12 | |||
| 13 | [ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite | ||
| 14 | |||
| 15 | cd /sys/kernel/config/usb_gadget | ||
| 16 | |||
| 17 | [ -d adb ] && /usr/bin/android-gadget-cleanup || true | ||
| 18 | |||
| 19 | mkdir adb | ||
| 20 | cd adb | ||
| 21 | |||
| 22 | mkdir configs/c.1 | ||
| 23 | mkdir functions/ffs.usb0 | ||
| 24 | mkdir strings/0x409 | ||
| 25 | mkdir configs/c.1/strings/0x409 | ||
| 26 | echo 0x18d1 > idVendor | ||
| 27 | echo 0xd002 > idProduct | ||
| 28 | echo "$serial" > strings/0x409/serialnumber | ||
| 29 | echo "$manufacturer" > strings/0x409/manufacturer | ||
| 30 | echo "$model" > strings/0x409/product | ||
| 31 | echo "Conf 1" > configs/c.1/strings/0x409/configuration | ||
| 32 | ln -s functions/ffs.usb0 configs/c.1 | ||
| 33 | |||
| 34 | mkdir -p /dev/usb-ffs/adb | ||
| 35 | mount -t functionfs usb0 /dev/usb-ffs/adb | ||
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start deleted file mode 100644 index ca6c3df275..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | set -e | ||
| 4 | |||
| 5 | sleep 3 | ||
| 6 | |||
| 7 | ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC | ||
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb deleted file mode 100644 index 4d30327372..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | DESCRIPTION = "Various utilities from Android - corresponding configuration files for using ConfigFS" | ||
| 2 | SECTION = "console/utils" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
| 5 | |||
| 6 | S = "${UNPACKDIR}" | ||
| 7 | |||
| 8 | SRC_URI = " \ | ||
| 9 | file://android-gadget-setup \ | ||
| 10 | file://android-gadget-start \ | ||
| 11 | file://android-gadget-cleanup \ | ||
| 12 | file://10-adbd-configfs.conf \ | ||
| 13 | " | ||
| 14 | |||
| 15 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
| 16 | |||
| 17 | do_install() { | ||
| 18 | install -d ${D}${bindir} | ||
| 19 | install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} | ||
| 20 | install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir} | ||
| 21 | install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir} | ||
| 22 | |||
| 23 | if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then | ||
| 24 | install -d ${D}${sysconfdir} | ||
| 25 | install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir} | ||
| 26 | fi | ||
| 27 | |||
| 28 | install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d | ||
| 29 | install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d | ||
| 30 | } | ||
| 31 | |||
| 32 | FILES:${PN} += " \ | ||
| 33 | ${systemd_unitdir}/system/ \ | ||
| 34 | " | ||
| 35 | |||
| 36 | PROVIDES += "android-tools-conf" | ||
| 37 | RPROVIDES:${PN} = "android-tools-conf" | ||
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch new file mode 100644 index 0000000000..4da65ea285 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From d91f5324f809c3a5b0343927716e4b99bc31db53 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com> | ||
| 3 | Date: Fri, 13 Mar 2026 18:57:36 +0530 | ||
| 4 | Subject: [PATCH] libunwind: fix strchr() conformance to ISO C23 | ||
| 5 | |||
| 6 | Fix uses of strchr() to conform to ISO C23, supported since glibc-2.43 | ||
| 7 | |||
| 8 | Signed-off-by: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com> | ||
| 9 | Upstream-Status: Pending | ||
| 10 | --- | ||
| 11 | external/libunwind/src/dwarf/Gfind_proc_info-lsb.c | 3 ++- | ||
| 12 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c b/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c | ||
| 15 | index 77ed3d09..37eadf52 100644 | ||
| 16 | --- a/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c | ||
| 17 | +++ b/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c | ||
| 18 | @@ -248,7 +248,8 @@ load_debug_frame (const char *file, char **buf, size_t *bufsize, | ||
| 19 | |||
| 20 | if (*buf == NULL && linkbuf != NULL && memchr (linkbuf, 0, linksize) != NULL) | ||
| 21 | { | ||
| 22 | - char *newname, *basedir, *p; | ||
| 23 | + char *newname, *basedir; | ||
| 24 | + const char *p; | ||
| 25 | static const char *debugdir = "/usr/lib/debug"; | ||
| 26 | int ret; | ||
| 27 | |||
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb index 74928ed171..3d4e95b496 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb | |||
| @@ -22,6 +22,7 @@ SRC_URI += " \ | |||
| 22 | file://debian/external/libunwind/legacy_built-in_sync_functions.patch \ | 22 | file://debian/external/libunwind/legacy_built-in_sync_functions.patch \ |
| 23 | file://debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch \ | 23 | file://debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch \ |
| 24 | file://debian/external/libunwind/libunwind-guard-unreachable-macro-to-avoid-redefinit.patch \ | 24 | file://debian/external/libunwind/libunwind-guard-unreachable-macro-to-avoid-redefinit.patch \ |
| 25 | file://debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch \ | ||
| 25 | \ | 26 | \ |
| 26 | file://debian/system/core/move-log-file-to-proper-dir.patch \ | 27 | file://debian/system/core/move-log-file-to-proper-dir.patch \ |
| 27 | file://debian/system/core/Added-missing-headers.patch \ | 28 | file://debian/system/core/Added-missing-headers.patch \ |
diff --git a/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted/0001-Added-sepolicy-for-adb-service.patch b/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted/0001-Added-sepolicy-for-adb-service.patch new file mode 100644 index 0000000000..f766bc3123 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted/0001-Added-sepolicy-for-adb-service.patch | |||
| @@ -0,0 +1,76 @@ | |||
| 1 | From c110d893be565ade574ee2933c6e89197f833006 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gargi Misra <gmisra@qti.qualcomm.com> | ||
| 3 | Date: Thu, 5 Mar 2026 12:39:42 +0530 | ||
| 4 | Subject: [PATCH] refpolicy-targeted: Added sepolicy for adb service | ||
| 5 | |||
| 6 | - Labeled adb binary | ||
| 7 | - Moved adb shell from initrc_t to unconfined_t | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [meta-oe Specific] | ||
| 10 | |||
| 11 | Signed-off-by: Gargi Misra <gmisra@qti.qualcomm.com> | ||
| 12 | --- | ||
| 13 | policy/modules/services/adbd.fc | 5 +++++ | ||
| 14 | policy/modules/services/adbd.if | 5 +++++ | ||
| 15 | policy/modules/services/adbd.te | 25 +++++++++++++++++++++++++ | ||
| 16 | 3 files changed, 35 insertions(+) | ||
| 17 | create mode 100644 policy/modules/services/adbd.fc | ||
| 18 | create mode 100644 policy/modules/services/adbd.if | ||
| 19 | create mode 100644 policy/modules/services/adbd.te | ||
| 20 | |||
| 21 | diff --git a/policy/modules/services/adbd.fc b/policy/modules/services/adbd.fc | ||
| 22 | new file mode 100644 | ||
| 23 | index 000000000..6f5bb9269 | ||
| 24 | --- /dev/null | ||
| 25 | +++ b/policy/modules/services/adbd.fc | ||
| 26 | @@ -0,0 +1,5 @@ | ||
| 27 | +/usr/bin/adbd -- gen_context(system_u:object_r:adbd_exec_t,s0) | ||
| 28 | + | ||
| 29 | + | ||
| 30 | + | ||
| 31 | + | ||
| 32 | diff --git a/policy/modules/services/adbd.if b/policy/modules/services/adbd.if | ||
| 33 | new file mode 100644 | ||
| 34 | index 000000000..612fc0106 | ||
| 35 | --- /dev/null | ||
| 36 | +++ b/policy/modules/services/adbd.if | ||
| 37 | @@ -0,0 +1,5 @@ | ||
| 38 | +## <summary>adb service.</summary> | ||
| 39 | + | ||
| 40 | + | ||
| 41 | + | ||
| 42 | + | ||
| 43 | diff --git a/policy/modules/services/adbd.te b/policy/modules/services/adbd.te | ||
| 44 | new file mode 100644 | ||
| 45 | index 000000000..f7e8ac7d0 | ||
| 46 | --- /dev/null | ||
| 47 | +++ b/policy/modules/services/adbd.te | ||
| 48 | @@ -0,0 +1,25 @@ | ||
| 49 | +policy_module(adbd) | ||
| 50 | + | ||
| 51 | +######################################## | ||
| 52 | +# | ||
| 53 | +# Declarations | ||
| 54 | +# | ||
| 55 | + | ||
| 56 | +type adbd_t; | ||
| 57 | +type adbd_exec_t; | ||
| 58 | + | ||
| 59 | +init_daemon_domain(adbd_t, adbd_exec_t) | ||
| 60 | + | ||
| 61 | +# Move adb from system_r:initrc_t to unconfined_r:unconfined_t | ||
| 62 | +unconfined_shell_domtrans(adbd_t) | ||
| 63 | + | ||
| 64 | +# Minimal Rules Required for adbd service | ||
| 65 | +allow adbd_t self:capability sys_resource; | ||
| 66 | + | ||
| 67 | +dev_rw_usbfs(adbd_t) | ||
| 68 | +files_read_etc_files(adbd_t) | ||
| 69 | +term_use_ptmx(adbd_t) | ||
| 70 | +term_use_generic_ptys(adbd_t) | ||
| 71 | + | ||
| 72 | + | ||
| 73 | + | ||
| 74 | -- | ||
| 75 | 2.43.0 | ||
| 76 | |||
diff --git a/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted_git.bbappend b/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted_git.bbappend new file mode 100644 index 0000000000..429b3ea9b5 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted_git.bbappend | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" | ||
| 2 | |||
| 3 | SRC_URI:append = " \ | ||
| 4 | file://0001-Added-sepolicy-for-adb-service.patch \ | ||
| 5 | " | ||
diff --git a/meta-oe/licenses/RSAL-2 b/meta-oe/licenses/RSAL-2 new file mode 100644 index 0000000000..4a37cf4136 --- /dev/null +++ b/meta-oe/licenses/RSAL-2 | |||
| @@ -0,0 +1,163 @@ | |||
| 1 | 1. Redis Source Available License 2.0 (RSALv2) Agreement | ||
| 2 | ======================================================== | ||
| 3 | |||
| 4 | Last Update: December 30, 2023 | ||
| 5 | |||
| 6 | Acceptance | ||
| 7 | ---------- | ||
| 8 | |||
| 9 | This Agreement sets forth the terms and conditions on which the Licensor | ||
| 10 | makes available the Software. By installing, downloading, accessing, | ||
| 11 | Using, or distributing any of the Software, You agree to all of the | ||
| 12 | terms and conditions of this Agreement. | ||
| 13 | |||
| 14 | If You are receiving the Software on behalf of Your Company, You | ||
| 15 | represent and warrant that You have the authority to agree to this | ||
| 16 | Agreement on behalf of such entity. | ||
| 17 | |||
| 18 | The Licensor reserves the right to update this Agreement from time to | ||
| 19 | time. | ||
| 20 | |||
| 21 | The terms below have the meanings set forth below for purposes of this | ||
| 22 | Agreement: | ||
| 23 | |||
| 24 | Definitions | ||
| 25 | ----------- | ||
| 26 | |||
| 27 | Agreement: this Redis Source Available License 2.0 Agreement. | ||
| 28 | |||
| 29 | Control: ownership, directly or indirectly, of substantially all the | ||
| 30 | assets of an entity, or the power to direct its management and policies | ||
| 31 | by vote, contract, or otherwise. | ||
| 32 | |||
| 33 | License: the License as described in the License paragraph below. | ||
| 34 | |||
| 35 | Licensor: the entity offering these terms, which includes Redis Ltd. on | ||
| 36 | behalf of itself and its subsidiaries and affiliates worldwide. | ||
| 37 | |||
| 38 | Modify, Modified, or Modification: copy from or adapt all or part of the | ||
| 39 | work in a fashion requiring copyright permission other than making an | ||
| 40 | exact copy. The resulting work is called a Modified version of the | ||
| 41 | earlier work. | ||
| 42 | |||
| 43 | Redis: the Redis software as described in redis.com redis.io. | ||
| 44 | |||
| 45 | Software: certain Software components designed to work with Redis and | ||
| 46 | provided to You under this Agreement. | ||
| 47 | |||
| 48 | Trademark: the trademarks, service marks, and any other similar rights. | ||
| 49 | |||
| 50 | Use: anything You do with the Software requiring one of Your Licenses. | ||
| 51 | |||
| 52 | You: the recipient of the Software, the individual or entity on whose | ||
| 53 | behalf You are agreeing to this Agreement. | ||
| 54 | |||
| 55 | Your Company: any legal entity, sole proprietorship, or other kind of | ||
| 56 | organization that You work for, plus all organizations that have control | ||
| 57 | over, are under the control of, or are under common control with that | ||
| 58 | organization. | ||
| 59 | |||
| 60 | Your Licenses: means all the Licenses granted to You for the Software | ||
| 61 | under this Agreement. | ||
| 62 | |||
| 63 | License | ||
| 64 | ------- | ||
| 65 | |||
| 66 | The Licensor grants You a non-exclusive, royalty-free, worldwide, | ||
| 67 | non-sublicensable, non-transferable license to use, copy, distribute, | ||
| 68 | make available, and prepare derivative works of the Software, in each | ||
| 69 | case subject to the limitations and conditions below. | ||
| 70 | |||
| 71 | Limitations | ||
| 72 | ----------- | ||
| 73 | |||
| 74 | You may not make the functionality of the Software or a Modified version | ||
| 75 | available to third parties as a service or distribute the Software or a | ||
| 76 | Modified version in a manner that makes the functionality of the | ||
| 77 | Software available to third parties. | ||
| 78 | |||
| 79 | Making the functionality of the Software or Modified version available | ||
| 80 | to third parties includes, without limitation, enabling third parties to | ||
| 81 | interact with the functionality of the Software or Modified version in | ||
| 82 | distributed form or remotely through a computer network, offering a | ||
| 83 | product or service, the value of which entirely or primarily derives | ||
| 84 | from the value of the Software or Modified version, or offering a | ||
| 85 | product or service that accomplishes for users the primary purpose of | ||
| 86 | the Software or Modified version. | ||
| 87 | |||
| 88 | You may not alter, remove, or obscure any licensing, copyright, or other | ||
| 89 | notices of the Licensor in the Software. Any use of the Licensor's | ||
| 90 | Trademarks is subject to applicable law. | ||
| 91 | |||
| 92 | Patents | ||
| 93 | ------- | ||
| 94 | |||
| 95 | The Licensor grants You a License, under any patent claims the Licensor | ||
| 96 | can License, or becomes able to License, to make, have made, use, sell, | ||
| 97 | offer for sale, import and have imported the Software, in each case | ||
| 98 | subject to the limitations and conditions in this License. This License | ||
| 99 | does not cover any patent claims that You cause to be infringed by | ||
| 100 | Modifications or additions to the Software. If You or Your Company make | ||
| 101 | any written claim that the Software infringes or contributes to | ||
| 102 | infringement of any patent, your patent License for the Software granted | ||
| 103 | under this Agreement ends immediately. If Your Company makes such a | ||
| 104 | claim, your patent License ends immediately for work on behalf of Your | ||
| 105 | Company. | ||
| 106 | |||
| 107 | Notices | ||
| 108 | ------- | ||
| 109 | |||
| 110 | You must ensure that anyone who gets a copy of any part of the Software | ||
| 111 | from You also gets a copy of the terms and conditions in this Agreement. | ||
| 112 | |||
| 113 | If You modify the Software, You must include in any Modified copies of | ||
| 114 | the Software prominent notices stating that You have Modified the | ||
| 115 | Software. | ||
| 116 | |||
| 117 | No Other Rights | ||
| 118 | --------------- | ||
| 119 | |||
| 120 | The terms and conditions of this Agreement do not imply any Licenses | ||
| 121 | other than those expressly granted in this Agreement. | ||
| 122 | |||
| 123 | Termination | ||
| 124 | ----------- | ||
| 125 | |||
| 126 | If You Use the Software in violation of this Agreement, such Use is not | ||
| 127 | Licensed, and Your Licenses will automatically terminate. If the | ||
| 128 | Licensor provides You with a notice of your violation, and You cease all | ||
| 129 | violations of this License no later than 30 days after You receive that | ||
| 130 | notice, Your Licenses will be reinstated retroactively. However, if You | ||
| 131 | violate this Agreement after such reinstatement, any additional | ||
| 132 | violation of this Agreement will cause your Licenses to terminate | ||
| 133 | automatically and permanently. | ||
| 134 | |||
| 135 | No Liability | ||
| 136 | ------------ | ||
| 137 | |||
| 138 | As far as the law allows, the Software comes as is, without any | ||
| 139 | warranty or condition, and the Licensor will not be liable to You for | ||
| 140 | any damages arising out of this Agreement or the Use or nature of the | ||
| 141 | Software, under any kind of legal claim. | ||
| 142 | |||
| 143 | Governing Law and Jurisdiction | ||
| 144 | ------------------------------ | ||
| 145 | |||
| 146 | If You are located in Asia, Pacific, Americas, or other jurisdictions | ||
| 147 | not listed below, the Agreement will be construed and enforced in all | ||
| 148 | respects in accordance with the laws of the State of California, U.S.A., | ||
| 149 | without reference to its choice of law rules. The courts located in the | ||
| 150 | County of Santa Clara, California, have exclusive jurisdiction for all | ||
| 151 | purposes relating to this Agreement. | ||
| 152 | |||
| 153 | If You are located in Israel, the Agreement will be construed and | ||
| 154 | enforced in all respects in accordance with the laws of the State of | ||
| 155 | Israel without reference to its choice of law rules. The courts located | ||
| 156 | in the Central District of the State of Israel have exclusive | ||
| 157 | jurisdiction for all purposes relating to this Agreement. | ||
| 158 | |||
| 159 | If You are located in Europe, United Kingdom, Middle East or Africa, the | ||
| 160 | Agreement will be construed and enforced in all respects in accordance | ||
| 161 | with the laws of England and Wales without reference to its choice of | ||
| 162 | law rules. The competent courts located in London, England, have | ||
| 163 | exclusive jurisdiction for all purposes relating to this Agreement. | ||
diff --git a/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch b/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch new file mode 100644 index 0000000000..6c0d69d6e8 --- /dev/null +++ b/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From ccce76d2850d6e52da3d7986c950af068fbfe0fd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Arthur Gautier <arthur.gautier@arista.com> | ||
| 3 | Date: Sat, 13 Dec 2025 20:07:11 -0800 | ||
| 4 | Subject: [PATCH] fix musl builds | ||
| 5 | |||
| 6 | This commit fixes the build on musl which fails with the following | ||
| 7 | error: | ||
| 8 | ``` | ||
| 9 | oslib/linux-blkzoned.c: In function 'blkzoned_move_zone_wp': | ||
| 10 | oslib/linux-blkzoned.c:389:37: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) | ||
| 11 | 389 | ret = fallocate(fd, FALLOC_FL_ZERO_RANGE, z->wp, length); | ||
| 12 | | ^~~~~~~~~~~~~~~~~~~~ | ||
| 13 | oslib/linux-blkzoned.c:389:37: note: each undeclared identifier is reported only once for each function it appears in | ||
| 14 | make: *** [Makefile:501: oslib/linux-blkzoned.o] Error 1 | ||
| 15 | make: *** Waiting for unfinished jobs.... | ||
| 16 | ``` | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://github.com/axboe/fio/commit/ccce76d2850d6e52da3d7986c950af068fbfe0fd] | ||
| 19 | Signed-off-by: Arthur Gautier <arthur.gautier@arista.com> | ||
| 20 | --- | ||
| 21 | oslib/linux-blkzoned.c | 1 + | ||
| 22 | 1 file changed, 1 insertion(+) | ||
| 23 | |||
| 24 | diff --git a/oslib/linux-blkzoned.c b/oslib/linux-blkzoned.c | ||
| 25 | index 78e25fca..c45ef623 100644 | ||
| 26 | --- a/oslib/linux-blkzoned.c | ||
| 27 | +++ b/oslib/linux-blkzoned.c | ||
| 28 | @@ -25,6 +25,7 @@ | ||
| 29 | #ifndef BLKFINISHZONE | ||
| 30 | #define BLKFINISHZONE _IOW(0x12, 136, struct blk_zone_range) | ||
| 31 | #endif | ||
| 32 | +#include <linux/falloc.h> | ||
| 33 | |||
| 34 | /* | ||
| 35 | * If the uapi headers installed on the system lacks zone capacity support, | ||
| 36 | -- | ||
| 37 | 2.51.0 | ||
| 38 | |||
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.39.bb b/meta-oe/recipes-benchmark/fio/fio_3.41.bb index 2ca52aaecf..3f03c41f22 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.39.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.41.bb | |||
| @@ -22,8 +22,11 @@ PACKAGECONFIG_NUMA:armeb = "" | |||
| 22 | PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" | 22 | PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" |
| 23 | PACKAGECONFIG[numa] = ",--disable-numa,numactl" | 23 | PACKAGECONFIG[numa] = ",--disable-numa,numactl" |
| 24 | 24 | ||
| 25 | SRC_URI = "git://git.kernel.dk/fio.git;branch=master" | 25 | SRC_URI = " \ |
| 26 | SRCREV = "a6e474c9e896e4ba1eb40066a03402afb040710a" | 26 | git://git.kernel.dk/fio.git;branch=master;tag=${BP} \ |
| 27 | file://0001-fix-musl-builds.patch \ | ||
| 28 | " | ||
| 29 | SRCREV = "ed675d3477a70a42d2e757b713f6c7125a27cdca" | ||
| 27 | 30 | ||
| 28 | SRC_URI += "file://CVE-2025-10823.patch" | 31 | SRC_URI += "file://CVE-2025-10823.patch" |
| 29 | 32 | ||
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_507.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_508.bb index 725b0af209..31cc72af53 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_507.bb +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_508.bb | |||
| @@ -9,7 +9,7 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ | |||
| 9 | file://parallelism.patch \ | 9 | file://parallelism.patch \ |
| 10 | file://copyright.txt \ | 10 | file://copyright.txt \ |
| 11 | " | 11 | " |
| 12 | SRC_URI[sha256sum] = "1e8087ada056f5d8018ee0bc76686d416fc2251ed03038055dbd0af78d1e5ce3" | 12 | SRC_URI[sha256sum] = "ee55af310a65ec97e1db214aebd75ee87f458b529cea3da37081a63974e8ace3" |
| 13 | 13 | ||
| 14 | UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar" | 14 | UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar" |
| 15 | 15 | ||
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb index d31f4ed634..cc7a1561df 100644 --- a/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb +++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb | |||
| @@ -19,7 +19,7 @@ EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" | |||
| 19 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 19 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" |
| 20 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 20 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
| 21 | 21 | ||
| 22 | CVE_PRODUCT = "iperf_project:iperf" | 22 | CVE_PRODUCT:append = " iperf_project:iperf" |
| 23 | CVE_STATUS[CVE-2025-54349] = "cpe-incorrect: the vulnerability is in iperf3, which is a different project" | 23 | CVE_STATUS[CVE-2025-54349] = "cpe-incorrect: the vulnerability is in iperf3, which is a different project" |
| 24 | CVE_STATUS[CVE-2025-54350] = "cpe-incorrect: the vulnerability is in iperf3, which is a different project" | 24 | CVE_STATUS[CVE-2025-54350] = "cpe-incorrect: the vulnerability is in iperf3, which is a different project" |
| 25 | CVE_STATUS[CVE-2025-54351] = "cpe-incorrect: the vulnerability is in iperf3, which is a different project" | 25 | CVE_STATUS[CVE-2025-54351] = "cpe-incorrect: the vulnerability is in iperf3, which is a different project" |
diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-Fix-sysinfo-generation-in-parallel-build.patch b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-Fix-sysinfo-generation-in-parallel-build.patch new file mode 100644 index 0000000000..b5f60b1c87 --- /dev/null +++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-Fix-sysinfo-generation-in-parallel-build.patch | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | From 26e13ce45ffeb2f233d1dd7e4321cb65ab10b0fb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Daniel Klauer <daniel.klauer@gin.de> | ||
| 3 | Date: Fri, 6 Feb 2026 17:13:49 +0100 | ||
| 4 | Subject: [PATCH] Makefile: Fix sysinfo generation in parallel build | ||
| 5 | |||
| 6 | sysinfo.sh non-atomically overwrites both sysinfo.c and sysinfoc.c, | ||
| 7 | so it should only be invoked once, not twice in parallel. | ||
| 8 | |||
| 9 | Requires at least GNU make 4.3, for Grouped Targets support [1]. | ||
| 10 | |||
| 11 | Should fix random build failures like this one: | ||
| 12 | |||
| 13 | | NOTE: make -j 20 -e MAKEFLAGS= | ||
| 14 | [...] | ||
| 15 | | ./sysinfo.sh x86_64-gin-linux-gcc [...] | ||
| 16 | | ./sysinfo.sh x86_64-gin-linux-gcc [...] | ||
| 17 | [...] | ||
| 18 | | x86_64-gin-linux-gcc [...] \ | ||
| 19 | | -c nbench0.c | ||
| 20 | | In file included from nbench0.c:219: | ||
| 21 | | sysinfo.c: In function 'main': | ||
| 22 | | sysinfo.c:11:1: error: 'fer' undeclared (first use in this function) | ||
| 23 | | 11 | fer); | ||
| 24 | | | ^~~ | ||
| 25 | | sysinfo.c:11:1: note: each undeclared identifier is reported only once for each function it appears in | ||
| 26 | | sysinfo.c:11:4: error: expected ';' before ')' token | ||
| 27 | | 11 | fer); | ||
| 28 | | | ^ | ||
| 29 | | | ; | ||
| 30 | | sysinfo.c:11:4: error: expected statement before ')' token | ||
| 31 | | In file included from nbench0.c:317: | ||
| 32 | | sysinfoc.c:5:4: error: expected ';' before ')' token | ||
| 33 | | 5 | fer); | ||
| 34 | | | ^ | ||
| 35 | | | ; | ||
| 36 | | sysinfoc.c:5:4: error: expected statement before ')' token | ||
| 37 | | make: *** [Makefile:115: nbench0.o] Error 1 | ||
| 38 | | make: *** Waiting for unfinished jobs.... | ||
| 39 | | ERROR: oe_runmake failed | ||
| 40 | | WARNING: exit code 1 from a shell command. | ||
| 41 | NOTE: recipe nbench-byte-2.2.3-r0: task do_compile: Failed | ||
| 42 | |||
| 43 | [1] https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html | ||
| 44 | Upstream-Status: Inactive-Upstream [lastrelease 2003, no vcs] | ||
| 45 | Signed-off-by: Daniel Klauer <daniel.klauer@gin.de> | ||
| 46 | --- | ||
| 47 | Makefile | 6 ++---- | ||
| 48 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
| 49 | |||
| 50 | diff --git a/Makefile b/Makefile | ||
| 51 | index edd9ea2..66b2ddc 100644 | ||
| 52 | --- a/Makefile | ||
| 53 | +++ b/Makefile | ||
| 54 | @@ -95,10 +95,8 @@ DEFINES= -DLINUX $(NO_UNAME) | ||
| 55 | |||
| 56 | ########################################################################## | ||
| 57 | # For LINUX-like systems with gcc | ||
| 58 | -sysinfoc.c: Makefile | ||
| 59 | - ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) | ||
| 60 | - | ||
| 61 | -sysinfo.c: Makefile | ||
| 62 | +# sysinfo.sh generates both sysinfo.c and sysinfoc.c | ||
| 63 | +sysinfo.c sysinfoc.c &: Makefile | ||
| 64 | ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) | ||
| 65 | |||
| 66 | ########################################################################## | ||
| 67 | -- | ||
| 68 | 2.43.0 | ||
| 69 | |||
diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/sysinfo.sh-Fix-typo-in-rm-command.patch b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/sysinfo.sh-Fix-typo-in-rm-command.patch new file mode 100644 index 0000000000..c6a37c3e56 --- /dev/null +++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/sysinfo.sh-Fix-typo-in-rm-command.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From 0019af6eb5188f5111a0f2008c0002b545382b67 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Daniel Klauer <daniel.klauer@gin.de> | ||
| 3 | Date: Fri, 6 Feb 2026 17:14:53 +0100 | ||
| 4 | Subject: [PATCH] sysinfo.sh: Fix typo in rm command | ||
| 5 | |||
| 6 | Upstream-Status: Inactive-Upstream [lastrelease 2003, no vcs] | ||
| 7 | Signed-off-by: Daniel Klauer <daniel.klauer@gin.de> | ||
| 8 | --- | ||
| 9 | sysinfo.sh | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/sysinfo.sh b/sysinfo.sh | ||
| 13 | index 57754fe..1373699 100755 | ||
| 14 | --- a/sysinfo.sh | ||
| 15 | +++ b/sysinfo.sh | ||
| 16 | @@ -61,7 +61,7 @@ if ($* hello.c -o hello) >/dev/null 2>&1; then | ||
| 17 | fi | ||
| 18 | fi | ||
| 19 | |||
| 20 | -rm -f sysinfo.crm sysinfoc.c hello | ||
| 21 | +rm -f sysinfo.c sysinfoc.c hello | ||
| 22 | |||
| 23 | # this bombs out on Ultrix which expect "cut -d" | ||
| 24 | |||
| 25 | -- | ||
| 26 | 2.43.0 | ||
| 27 | |||
diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb index da03ebb291..538ff24c0a 100644 --- a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb +++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb | |||
| @@ -10,7 +10,9 @@ SECTION = "console/utils" | |||
| 10 | SRC_URI = "https://fossies.org/linux/misc/old/${BP}.tar.gz \ | 10 | SRC_URI = "https://fossies.org/linux/misc/old/${BP}.tar.gz \ |
| 11 | file://nbench_32bits.patch \ | 11 | file://nbench_32bits.patch \ |
| 12 | file://Makefile-add-more-dependencies-to-pointer.h.patch \ | 12 | file://Makefile-add-more-dependencies-to-pointer.h.patch \ |
| 13 | file://0001-Fix-build-error-with-gcc-15.patch" | 13 | file://0001-Fix-build-error-with-gcc-15.patch \ |
| 14 | file://Makefile-Fix-sysinfo-generation-in-parallel-build.patch \ | ||
| 15 | file://sysinfo.sh-Fix-typo-in-rm-command.patch" | ||
| 14 | 16 | ||
| 15 | SRC_URI[sha256sum] = "723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac" | 17 | SRC_URI[sha256sum] = "723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac" |
| 16 | 18 | ||
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch deleted file mode 100644 index fbc0f5a18e..0000000000 --- a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | Author: Maciej Pijanowski <maciej.pijanowski@3mdeb.com> | ||
| 2 | Date: Fri Jul 5 16:39:13 2024 +0200 | ||
| 3 | Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/86] | ||
| 4 | |||
| 5 | Makefile: allow overriding CC | ||
| 6 | |||
| 7 | Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com> | ||
| 8 | |||
| 9 | diff --git a/Makefile b/Makefile | ||
| 10 | index 139e5c0c3c3c..226303a6921e 100644 | ||
| 11 | --- a/Makefile | ||
| 12 | +++ b/Makefile | ||
| 13 | @@ -12,7 +12,7 @@ endif | ||
| 14 | endif | ||
| 15 | |||
| 16 | PROGRAM = dpcmd | ||
| 17 | -CC = gcc | ||
| 18 | +CC ?= gcc | ||
| 19 | PREFIX ?= /usr/local | ||
| 20 | |||
| 21 | PKG_CONFIG ?= pkg-config | ||
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch deleted file mode 100644 index 0fc8ac5bd2..0000000000 --- a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From dac9d0ea5c419049c9ab0a5ba90d15d77a3271b0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> | ||
| 3 | Date: Mon, 22 Jul 2024 13:02:59 +0000 | ||
| 4 | Subject: [PATCH] Makefile: add conditional stripping | ||
| 5 | Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/88] | ||
| 6 | |||
| 7 | This patch introduces a `NOSTRIP` conditional flag to the `install` | ||
| 8 | target in the Makefile. The purpose of this flag is to allow the | ||
| 9 | disabling of binary stripping during installation. This is | ||
| 10 | particularly useful in development environments, such as BitBake, | ||
| 11 | which handle stripping internally. | ||
| 12 | |||
| 13 | When `NOSTRIP` is set to `1`, the `strip` command will be skipped | ||
| 14 | during the installation process, preventing potential conflicts or | ||
| 15 | redundant operations. | ||
| 16 | |||
| 17 | Signed-off-by: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> | ||
| 18 | |||
| 19 | --- | ||
| 20 | Makefile | 2 ++ | ||
| 21 | 1 file changed, 2 insertions(+) | ||
| 22 | |||
| 23 | diff --git a/Makefile b/Makefile | ||
| 24 | index 139e5c0..8b33320 100644 | ||
| 25 | --- a/Makefile | ||
| 26 | +++ b/Makefile | ||
| 27 | @@ -58,7 +58,9 @@ install: $(PROGRAM) | ||
| 28 | [ $(shell id -u) -eq 0 ] || (echo "Error: install needs root privileges" && false) | ||
| 29 | install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/DediProg | ||
| 30 | echo -n "install: " && install -v -o 0 -g 0 -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) | ||
| 31 | +ifneq ($(NOSTRIP),1) | ||
| 32 | strip $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) | ||
| 33 | +endif | ||
| 34 | install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/share/DediProg | ||
| 35 | echo -n "install: " && install -v -o 0 -g 0 -m 0644 ChipInfoDb.dedicfg $(DESTDIR)$(PREFIX)/share/DediProg/ChipInfoDb.dedicfg | ||
| 36 | install -v -o 0 -g 0 -m 755 -d $(DESTDIR)/etc/udev/rules.d | ||
| 37 | -- | ||
| 38 | 2.30.2 | ||
| 39 | |||
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.21.bb index e0041b58e6..9f00d00ec3 100644 --- a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb +++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.21.bb | |||
| @@ -5,18 +5,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb" | |||
| 5 | 5 | ||
| 6 | DEPENDS = "libusb" | 6 | DEPENDS = "libusb" |
| 7 | 7 | ||
| 8 | SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf" | 8 | SRCREV = "42edbcc60217f3fb39d5c6e5a68bedaa32844482" |
| 9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
| 10 | git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master \ | 10 | git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master;tag=V${PV},x \ |
| 11 | file://0001-add-support-for-cross-compilation.patch \ | ||
| 12 | file://0002-Makefile-add-conditional-stripping.patch \ | ||
| 13 | " | 11 | " |
| 14 | 12 | ||
| 15 | EXTRA_OEMAKE = "NOSTRIP=1 DESTDIR=${D} PREFIX=${prefix}" | 13 | EXTRA_OEMAKE = "NOSTRIP=1 DESTDIR=${D} PREFIX=${prefix}" |
| 16 | 14 | ||
| 17 | PV = "1.0+${SRCPV}" | ||
| 18 | |||
| 19 | |||
| 20 | do_install() { | 15 | do_install() { |
| 21 | oe_runmake install | 16 | oe_runmake install |
| 22 | } | 17 | } |
diff --git a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 0d8f3c8a6b..9ea4d719e3 100644 --- a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb | |||
| @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
| 10 | 10 | ||
| 11 | DEPENDS = " sysfsutils" | 11 | DEPENDS = " sysfsutils" |
| 12 | 12 | ||
| 13 | SRCREV = "1c57818ecee186aa47af0342149577df5302c022" | 13 | SRCREV = "8fdc1d40e30f65737fef6c3ddcd1d2cd769f6277" |
| 14 | PV = "0.18+git" | 14 | PV = "0.18+git" |
| 15 | 15 | ||
| 16 | 16 | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.7.bb b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.8.bb index d6ace116e7..8682d97c06 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.7.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.8.bb | |||
| @@ -2,9 +2,9 @@ SUMMARY = "EFI executable for fwupd" | |||
| 2 | LICENSE = "LGPL-2.1-or-later" | 2 | LICENSE = "LGPL-2.1-or-later" |
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
| 4 | 4 | ||
| 5 | SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main" | 5 | SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main;tag=${PV}" |
| 6 | 6 | ||
| 7 | SRCREV = "cfd0be286a9b050c1aa4bfa3f0820256903a264a" | 7 | SRCREV = "8572a93e81e7110b88445d1907fdd73982557347" |
| 8 | 8 | ||
| 9 | DEPENDS = "gnu-efi python3-pefile-native" | 9 | DEPENDS = "gnu-efi python3-pefile-native" |
| 10 | 10 | ||
| @@ -29,9 +29,3 @@ EXTRA_OEMESON += "\ | |||
| 29 | 29 | ||
| 30 | # The compile assumes GCC at present | 30 | # The compile assumes GCC at present |
| 31 | TOOLCHAIN = "gcc" | 31 | TOOLCHAIN = "gcc" |
| 32 | |||
| 33 | # Multiple errors like below with gcc14 | ||
| 34 | #| ../git/efi/fwupdate.c:611:20: error: passing argument 5 of 'fwup_log' from incompatible pointer type [-Wincompatible-pointer-types] | ||
| 35 | #| 611 | fwup_debug(L"n_updates: %d", n_updates); | ||
| 36 | #| | ^~~~~~~~~~~~~~~~ | ||
| 37 | TOOLCHAIN_OPTIONS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.16.bb b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.19.bb index 31b17486cb..586f7ad1f9 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.16.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.19.bb | |||
| @@ -19,7 +19,7 @@ SRC_URI = "\ | |||
| 19 | https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ | 19 | https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ |
| 20 | file://run-ptest \ | 20 | file://run-ptest \ |
| 21 | " | 21 | " |
| 22 | SRC_URI[sha256sum] = "79cce6b61d9ea531de0ef3b13e7f2682c699901b11f410b2ed91192618e1620e" | 22 | SRC_URI[sha256sum] = "3bb7a4a1e2d00f0ab513e4c667d7bf5a3ff34a9802757849d3fedf07dd40ddbb" |
| 23 | 23 | ||
| 24 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 24 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
| 25 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 25 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.16.bb index eae49b04ea..3fbe52020e 100644 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.16.bb | |||
| @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ | |||
| 6 | file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ | 6 | file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ |
| 7 | file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" | 7 | file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" |
| 8 | DEPENDS = "json-c libnvme" | 8 | DEPENDS = "json-c libnvme" |
| 9 | SRCREV = "71fa5d9310d6b41a69e844593423ac91b1453472" | 9 | SRCREV = "faf7326a2997dea91687fd3daa17fc405910a4c1" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https;tag=v${PV}" |
| 12 | 12 | ||
| 13 | inherit bash-completion meson pkgconfig systemd | 13 | inherit bash-completion meson pkgconfig systemd |
| 14 | 14 | ||
diff --git a/meta-oe/recipes-bsp/thermald/thermald/0001-Refactor-Intel-specific-logic-into-separate-files.patch b/meta-oe/recipes-bsp/thermald/thermald/0001-Refactor-Intel-specific-logic-into-separate-files.patch new file mode 100644 index 0000000000..86f6874daf --- /dev/null +++ b/meta-oe/recipes-bsp/thermald/thermald/0001-Refactor-Intel-specific-logic-into-separate-files.patch | |||
| @@ -0,0 +1,829 @@ | |||
| 1 | From 4cf42fc89ccdbcecdcd30b32a7ca8040be55c253 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Priyansh Jain <priyansh.jain@oss.qualcomm.com> | ||
| 3 | Date: Tue, 27 Jan 2026 14:58:05 +0530 | ||
| 4 | Subject: [PATCH 1/3] Refactor Intel-specific logic into separate files | ||
| 5 | |||
| 6 | Thermald currently only supports x86 platforms but is a very useful tool for | ||
| 7 | controlling user-space thermal policy on a wide range of systems. As more | ||
| 8 | SoCs and architectures adopt user-space driven thermal management models, | ||
| 9 | the limitation to x86-only backends prevents thermald from being used on | ||
| 10 | non-x86 platforms. | ||
| 11 | |||
| 12 | This series adds support for non-x86 platforms by first refactoring all | ||
| 13 | x86-specific logic into a dedicated backend. This separation enables a clean | ||
| 14 | and modular structure where additional platform backends can be introduced | ||
| 15 | without impacting the existing Intel implementation. Once the backend | ||
| 16 | abstraction is in place, subsequent patches add support for ARM backends | ||
| 17 | and integrate them into the new platform detection logic. | ||
| 18 | |||
| 19 | Suggested-by: Amit Kucheria <amit.kucheria@oss.qualcomm.com> | ||
| 20 | Signed-off-by: Priyansh Jain <priyansh.jain@oss.qualcomm.com> | ||
| 21 | |||
| 22 | Upstream-Status: Backport [from commit 4cf42fc89ccdbcecdcd30b32a7ca8040be55c253] | ||
| 23 | --- | ||
| 24 | Android.mk | 4 +- | ||
| 25 | Makefile.am | 5 +- | ||
| 26 | src/thd_engine.cpp | 125 +++---------------- | ||
| 27 | src/thd_engine.h | 6 - | ||
| 28 | src/thd_engine_default.cpp | 79 ++---------- | ||
| 29 | src/thd_platform.cpp | 109 +++++++++++++++++ | ||
| 30 | src/thd_platform.h | 58 +++++++++ | ||
| 31 | src/thd_platform_intel.cpp | 238 +++++++++++++++++++++++++++++++++++++ | ||
| 32 | src/thd_platform_intel.h | 38 ++++++ | ||
| 33 | 9 files changed, 476 insertions(+), 186 deletions(-) | ||
| 34 | create mode 100644 src/thd_platform.cpp | ||
| 35 | create mode 100644 src/thd_platform.h | ||
| 36 | create mode 100644 src/thd_platform_intel.cpp | ||
| 37 | create mode 100644 src/thd_platform_intel.h | ||
| 38 | |||
| 39 | diff --git a/Android.mk b/Android.mk | ||
| 40 | index 0b279f4..c14fa4a 100644 | ||
| 41 | --- a/Android.mk | ||
| 42 | +++ b/Android.mk | ||
| 43 | @@ -43,7 +43,9 @@ LOCAL_SRC_FILES := \ | ||
| 44 | src/thd_engine_adaptive.cpp \ | ||
| 45 | src/thd_lzma_dec.cpp \ | ||
| 46 | src/LzmaDec.c \ | ||
| 47 | - src/thd_gddv.cpp | ||
| 48 | + src/thd_gddv.cpp \ | ||
| 49 | + src/thd_platform.cpp \ | ||
| 50 | + src/thd_platform_intel.cpp | ||
| 51 | |||
| 52 | LOCAL_C_INCLUDES += external/libxml2/include | ||
| 53 | |||
| 54 | diff --git a/Makefile.am b/Makefile.am | ||
| 55 | index dbf86db..2e76187 100644 | ||
| 56 | --- a/Makefile.am | ||
| 57 | +++ b/Makefile.am | ||
| 58 | @@ -75,8 +75,9 @@ thermald_SOURCES = \ | ||
| 59 | src/thd_gddv.cpp \ | ||
| 60 | thermald-resource.c \ | ||
| 61 | src/thd_lzma_dec.cpp \ | ||
| 62 | - src/LzmaDec.c | ||
| 63 | - | ||
| 64 | + src/LzmaDec.c \ | ||
| 65 | + src/thd_platform.cpp \ | ||
| 66 | + src/thd_platform_intel.cpp | ||
| 67 | |||
| 68 | man5_MANS = man/thermal-conf.xml.5 | ||
| 69 | man8_MANS = man/thermald.8 | ||
| 70 | diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp | ||
| 71 | index d2028c6..319f50b 100644 | ||
| 72 | --- a/src/thd_engine.cpp | ||
| 73 | +++ b/src/thd_engine.cpp | ||
| 74 | @@ -35,7 +35,6 @@ | ||
| 75 | #include <errno.h> | ||
| 76 | #include <sys/types.h> | ||
| 77 | #include <sys/utsname.h> | ||
| 78 | -#include <cpuid.h> | ||
| 79 | #include <locale> | ||
| 80 | #include <memory> | ||
| 81 | #include "thd_engine.h" | ||
| 82 | @@ -44,6 +43,8 @@ | ||
| 83 | #include "thd_zone_dynamic.h" | ||
| 84 | #include "thd_cdev_gen_sysfs.h" | ||
| 85 | #include "thd_int3400.h" | ||
| 86 | +#include "thd_platform.h" | ||
| 87 | +#include "thd_platform_intel.h" | ||
| 88 | |||
| 89 | static void *cthd_engine_thread(void *arg); | ||
| 90 | |||
| 91 | @@ -53,11 +54,10 @@ cthd_engine::cthd_engine(std::string _uuid) : | ||
| 92 | false), adaptive_mode(false), poll_timeout_msec(-1), wakeup_fd( | ||
| 93 | -1), uevent_fd(-1), control_mode(COMPLEMENTRY), write_pipe_fd( | ||
| 94 | 0), preference(0), status(true), thz_last_uevent_time(0), thz_last_temp_ind_time( | ||
| 95 | - 0), thz_last_update_event_time(0), terminate(false), genuine_intel( | ||
| 96 | - 0), has_invariant_tsc(0), has_aperf(0), proc_list_matched( | ||
| 97 | - false), poll_interval_sec(0), poll_sensor_mask(0), fast_poll_sensor_mask( | ||
| 98 | - 0), saved_poll_interval(0), poll_fd_cnt(0), rt_kernel(false), parser_init_done( | ||
| 99 | - false) { | ||
| 100 | + 0), thz_last_update_event_time(0), terminate(false), has_invariant_tsc(0), | ||
| 101 | + has_aperf(0), proc_list_matched(false), poll_interval_sec(0), poll_sensor_mask(0), | ||
| 102 | + fast_poll_sensor_mask(0), saved_poll_interval(0), poll_fd_cnt(0), rt_kernel(false), | ||
| 103 | + parser_init_done(false) { | ||
| 104 | thd_engine = pthread_t(); | ||
| 105 | thd_attr = pthread_attr_t(); | ||
| 106 | |||
| 107 | @@ -742,112 +742,23 @@ void cthd_engine::thd_engine_reload_zones() { | ||
| 108 | } | ||
| 109 | } | ||
| 110 | |||
| 111 | -// Add any tested platform ids in this table | ||
| 112 | -#ifndef ANDROID | ||
| 113 | -static const supported_ids_t id_table[] = { | ||
| 114 | - { 6, 0x2a }, // Sandybridge | ||
| 115 | - { 6, 0x3a }, // IvyBridge | ||
| 116 | - { 6, 0x3c }, // Haswell | ||
| 117 | - { 6, 0x45 }, // Haswell ULT | ||
| 118 | - { 6, 0x46 }, // Haswell ULT | ||
| 119 | - { 6, 0x3d }, // Broadwell | ||
| 120 | - { 6, 0x47 }, // Broadwell-GT3E | ||
| 121 | - { 6, 0x37 }, // Valleyview BYT | ||
| 122 | - { 6, 0x4c }, // Brasewell | ||
| 123 | - { 6, 0x4e }, // skylake | ||
| 124 | - { 6, 0x5e }, // skylake | ||
| 125 | - { 6, 0x5c }, // Broxton | ||
| 126 | - { 6, 0x7a }, // Gemini Lake | ||
| 127 | - { 6, 0x8e }, // kabylake | ||
| 128 | - { 6, 0x9e }, // kabylake | ||
| 129 | - { 6, 0x66 }, // Cannonlake | ||
| 130 | - { 6, 0x7e }, // Icelake | ||
| 131 | - { 6, 0x8c }, // Tigerlake_L | ||
| 132 | - { 6, 0x8d }, // Tigerlake | ||
| 133 | - { 6, 0xa5 }, // Cometlake | ||
| 134 | - { 6, 0xa6 }, // Cometlake_L | ||
| 135 | - { 6, 0xa7 }, // Rocketlake | ||
| 136 | - { 6, 0x9c }, // Jasper Lake | ||
| 137 | - { 6, 0x97 }, // Alderlake | ||
| 138 | - { 6, 0x9a }, // Alderlake | ||
| 139 | - { 6, 0xb7 }, // Raptorlake | ||
| 140 | - { 6, 0xba }, // Raptorlake | ||
| 141 | - { 6, 0xbe }, // Alderlake N | ||
| 142 | - { 6, 0xbf }, // Raptorlake S | ||
| 143 | - { 6, 0xaa }, // Mateor Lake L | ||
| 144 | - { 6, 0xbd }, // Lunar Lake M | ||
| 145 | - { 6, 0xc6 }, // Arrow Lake | ||
| 146 | - { 6, 0xc5 }, // Arrow Lake H | ||
| 147 | - { 6, 0xb5 }, // Arrow Lake U | ||
| 148 | - { 6, 0xcc }, // Panther Lake L | ||
| 149 | - { 6, 0xd5 }, // Wildcat Lake L | ||
| 150 | - { 0, 0 } // Last Invalid entry | ||
| 151 | -}; | ||
| 152 | - | ||
| 153 | -const char * const blocklist_paths[] { | ||
| 154 | - /* Some Lenovo machines have in-firmware thermal management, | ||
| 155 | - * avoid having two entities trying to manage things. | ||
| 156 | - * We may want to change this to dytc_perfmode once that is | ||
| 157 | - * widely available. */ | ||
| 158 | - "/sys/devices/platform/thinkpad_acpi/dytc_lapmode", | ||
| 159 | -}; | ||
| 160 | -#endif | ||
| 161 | - | ||
| 162 | int cthd_engine::check_cpu_id() { | ||
| 163 | -#ifndef ANDROID | ||
| 164 | - // Copied from turbostat program | ||
| 165 | - unsigned int ebx, ecx, edx, max_level; | ||
| 166 | - unsigned int fms, family, model, stepping; | ||
| 167 | - genuine_intel = 0; | ||
| 168 | - int i = 0; | ||
| 169 | - bool valid = false; | ||
| 170 | - | ||
| 171 | - proc_list_matched = false; | ||
| 172 | - ebx = ecx = edx = 0; | ||
| 173 | - | ||
| 174 | - __cpuid(0, max_level, ebx, ecx, edx); | ||
| 175 | - if (ebx == 0x756e6547 && edx == 0x49656e69 && ecx == 0x6c65746e) | ||
| 176 | - genuine_intel = 1; | ||
| 177 | - if (genuine_intel == 0) { | ||
| 178 | - // Simply return without further capability check | ||
| 179 | - return THD_SUCCESS; | ||
| 180 | - } | ||
| 181 | - __cpuid(1, fms, ebx, ecx, edx); | ||
| 182 | - family = (fms >> 8) & 0xf; | ||
| 183 | - model = (fms >> 4) & 0xf; | ||
| 184 | - stepping = fms & 0xf; | ||
| 185 | - if (family == 6 || family == 0xf) | ||
| 186 | - model += ((fms >> 16) & 0xf) << 4; | ||
| 187 | - | ||
| 188 | - thd_log_msg( | ||
| 189 | - "%u CPUID levels; family:model:stepping 0x%x:%x:%x (%u:%u:%u)\n", | ||
| 190 | - max_level, family, model, stepping, family, model, stepping); | ||
| 191 | - | ||
| 192 | - while (id_table[i].family) { | ||
| 193 | - if (id_table[i].family == family && id_table[i].model == model) { | ||
| 194 | - proc_list_matched = true; | ||
| 195 | - valid = true; | ||
| 196 | - break; | ||
| 197 | - } | ||
| 198 | - i++; | ||
| 199 | - } | ||
| 200 | - if (!valid) { | ||
| 201 | - thd_log_msg(" Need Linux PowerCap sysfs\n"); | ||
| 202 | + // Create platform instance using factory method | ||
| 203 | + cthd_platform *platform = cthd_platform::create_platform(); | ||
| 204 | + if (!platform) { | ||
| 205 | + thd_log_error("Failed to create platform instance\n"); | ||
| 206 | + proc_list_matched = false; | ||
| 207 | + return THD_ERROR; | ||
| 208 | } | ||
| 209 | |||
| 210 | + // Dump platform information | ||
| 211 | + platform->dump_platform_info(); | ||
| 212 | |||
| 213 | - for (const char *path : blocklist_paths) { | ||
| 214 | - struct stat s; | ||
| 215 | + // Call platform-specific CPU ID check | ||
| 216 | + int ret = platform->check_cpu_id(proc_list_matched); | ||
| 217 | |||
| 218 | - if (!stat(path, &s)) { | ||
| 219 | - proc_list_matched = false; | ||
| 220 | - thd_log_warn("[%s] present: Thermald can't run on this platform\n", path); | ||
| 221 | - break; | ||
| 222 | - } | ||
| 223 | - } | ||
| 224 | - | ||
| 225 | -#endif | ||
| 226 | - return THD_SUCCESS; | ||
| 227 | + delete platform; | ||
| 228 | + return ret; | ||
| 229 | } | ||
| 230 | |||
| 231 | void cthd_engine::thd_read_default_thermal_sensors() { | ||
| 232 | diff --git a/src/thd_engine.h b/src/thd_engine.h | ||
| 233 | index f6c9edf..2e024ca 100644 | ||
| 234 | --- a/src/thd_engine.h | ||
| 235 | +++ b/src/thd_engine.h | ||
| 236 | @@ -67,11 +67,6 @@ typedef struct { | ||
| 237 | unsigned long msg[MAX_MSG_SIZE]; | ||
| 238 | } message_capsul_t; | ||
| 239 | |||
| 240 | -typedef struct { | ||
| 241 | - unsigned int family; | ||
| 242 | - unsigned int model; | ||
| 243 | -} supported_ids_t; | ||
| 244 | - | ||
| 245 | class cthd_engine { | ||
| 246 | |||
| 247 | protected: | ||
| 248 | @@ -100,7 +95,6 @@ private: | ||
| 249 | time_t thz_last_temp_ind_time; | ||
| 250 | time_t thz_last_update_event_time; | ||
| 251 | bool terminate; | ||
| 252 | - int genuine_intel; | ||
| 253 | int has_invariant_tsc; | ||
| 254 | int has_aperf; | ||
| 255 | bool proc_list_matched; | ||
| 256 | diff --git a/src/thd_engine_default.cpp b/src/thd_engine_default.cpp | ||
| 257 | index 0e2a35c..62c2e67 100644 | ||
| 258 | --- a/src/thd_engine_default.cpp | ||
| 259 | +++ b/src/thd_engine_default.cpp | ||
| 260 | @@ -40,6 +40,8 @@ | ||
| 261 | #include "thd_int3400.h" | ||
| 262 | #include "thd_sensor_rapl_power.h" | ||
| 263 | #include "thd_zone_rapl_power.h" | ||
| 264 | +#include "thd_platform.h" | ||
| 265 | +#include "thd_platform_intel.h" | ||
| 266 | |||
| 267 | |||
| 268 | // Default CPU cooling devices, which are not part of thermal sysfs | ||
| 269 | @@ -795,7 +797,13 @@ void cthd_engine_default::workarounds() | ||
| 270 | { | ||
| 271 | // Every 30 seconds repeat | ||
| 272 | if (!disable_active_power && !workaround_interval) { | ||
| 273 | - workaround_rapl_mmio_power(); | ||
| 274 | + // Create platform instance and call workaround | ||
| 275 | + cthd_platform *platform = cthd_platform::create_platform(); | ||
| 276 | + if (platform) { | ||
| 277 | + platform->workaround_rapl_mmio_power(); | ||
| 278 | + delete platform; | ||
| 279 | + } | ||
| 280 | + | ||
| 281 | workaround_tcc_offset(); | ||
| 282 | workaround_interval = 7; | ||
| 283 | } else { | ||
| 284 | @@ -803,75 +811,6 @@ void cthd_engine_default::workarounds() | ||
| 285 | } | ||
| 286 | } | ||
| 287 | |||
| 288 | -#ifndef ANDROID | ||
| 289 | -#include <cpuid.h> | ||
| 290 | -#include <sys/mman.h> | ||
| 291 | -#define BIT_ULL(nr) (1ULL << (nr)) | ||
| 292 | -#endif | ||
| 293 | - | ||
| 294 | -void cthd_engine_default::workaround_rapl_mmio_power(void) | ||
| 295 | -{ | ||
| 296 | - if (!workaround_enabled) | ||
| 297 | - return; | ||
| 298 | - | ||
| 299 | - cthd_cdev *cdev = search_cdev("rapl_controller_mmio"); | ||
| 300 | - if (cdev) { | ||
| 301 | - /* RAPL MMIO is enabled and getting used. No need to disable */ | ||
| 302 | - return; | ||
| 303 | - } else { | ||
| 304 | - csys_fs _sysfs("/sys/devices/virtual/powercap/intel-rapl-mmio/intel-rapl-mmio:0/"); | ||
| 305 | - | ||
| 306 | - if (_sysfs.exists()) { | ||
| 307 | - std::ostringstream temp_str; | ||
| 308 | - | ||
| 309 | - temp_str << "enabled"; | ||
| 310 | - if (_sysfs.write(temp_str.str(), 0) > 0) | ||
| 311 | - return; | ||
| 312 | - | ||
| 313 | - thd_log_debug("Failed to write to RAPL MMIO\n"); | ||
| 314 | - } | ||
| 315 | - } | ||
| 316 | - | ||
| 317 | -#ifndef ANDROID | ||
| 318 | - int map_fd; | ||
| 319 | - void *rapl_mem; | ||
| 320 | - unsigned char *rapl_pkg_pwr_addr; | ||
| 321 | - unsigned long long pkg_power_limit; | ||
| 322 | - | ||
| 323 | - unsigned int ebx, ecx, edx; | ||
| 324 | - unsigned int fms, family, model; | ||
| 325 | - | ||
| 326 | - ecx = edx = 0; | ||
| 327 | - __cpuid(1, fms, ebx, ecx, edx); | ||
| 328 | - family = (fms >> 8) & 0xf; | ||
| 329 | - model = (fms >> 4) & 0xf; | ||
| 330 | - if (family == 6 || family == 0xf) | ||
| 331 | - model += ((fms >> 16) & 0xf) << 4; | ||
| 332 | - | ||
| 333 | - // Apply for KabyLake only | ||
| 334 | - if (model != 0x8e && model != 0x9e) | ||
| 335 | - return; | ||
| 336 | - | ||
| 337 | - map_fd = open("/dev/mem", O_RDWR, 0); | ||
| 338 | - if (map_fd < 0) | ||
| 339 | - return; | ||
| 340 | - | ||
| 341 | - rapl_mem = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, | ||
| 342 | - 0xfed15000); | ||
| 343 | - if (!rapl_mem || rapl_mem == MAP_FAILED) { | ||
| 344 | - close(map_fd); | ||
| 345 | - return; | ||
| 346 | - } | ||
| 347 | - | ||
| 348 | - rapl_pkg_pwr_addr = ((unsigned char *)rapl_mem + 0x9a0); | ||
| 349 | - pkg_power_limit = *(unsigned long long *)rapl_pkg_pwr_addr; | ||
| 350 | - *(unsigned long long *)rapl_pkg_pwr_addr = pkg_power_limit | ||
| 351 | - & ~BIT_ULL(15); | ||
| 352 | - | ||
| 353 | - munmap(rapl_mem, 4096); | ||
| 354 | - close(map_fd); | ||
| 355 | -#endif | ||
| 356 | -} | ||
| 357 | |||
| 358 | void cthd_engine_default::workaround_tcc_offset(void) | ||
| 359 | { | ||
| 360 | diff --git a/src/thd_platform.cpp b/src/thd_platform.cpp | ||
| 361 | new file mode 100644 | ||
| 362 | index 0000000..25ce094 | ||
| 363 | --- /dev/null | ||
| 364 | +++ b/src/thd_platform.cpp | ||
| 365 | @@ -0,0 +1,109 @@ | ||
| 366 | +/* | ||
| 367 | + * thd_platform.cpp: Platform detection and abstraction layer implementation | ||
| 368 | + * | ||
| 369 | + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved. | ||
| 370 | + * | ||
| 371 | + * This program is free software; you can redistribute it and/or | ||
| 372 | + * modify it under the terms of the GNU General Public License version | ||
| 373 | + * 2 or later as published by the Free Software Foundation. | ||
| 374 | + * | ||
| 375 | + * This program is distributed in the hope that it will be useful, | ||
| 376 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 377 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 378 | + * GNU General Public License for more details. | ||
| 379 | + * | ||
| 380 | + * You should have received a copy of the GNU General Public License | ||
| 381 | + * along with this program; if not, write to the Free Software | ||
| 382 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
| 383 | + * 02110-1301, USA. | ||
| 384 | + * | ||
| 385 | + * Author Name <priyansh.jain@oss.qualcomm.com> | ||
| 386 | + */ | ||
| 387 | + | ||
| 388 | +#include "thd_platform.h" | ||
| 389 | +#include "thd_platform_intel.h" | ||
| 390 | +#include "thd_common.h" | ||
| 391 | +#include <cstring> | ||
| 392 | +#include <iostream> | ||
| 393 | + | ||
| 394 | +cthd_platform::cthd_platform() : detected_platform(PLATFORM_UNKNOWN), machine_type("") { | ||
| 395 | +} | ||
| 396 | + | ||
| 397 | +cthd_platform::~cthd_platform() { | ||
| 398 | +} | ||
| 399 | + | ||
| 400 | +void cthd_platform::detect_platform() { | ||
| 401 | + struct utsname sysinfo; | ||
| 402 | + if (uname(&sysinfo) != 0) { | ||
| 403 | + thd_log_error("Failed to get system information\n"); | ||
| 404 | + detected_platform = PLATFORM_UNKNOWN; | ||
| 405 | + return; | ||
| 406 | + } | ||
| 407 | + | ||
| 408 | + machine_type = std::string(sysinfo.machine); | ||
| 409 | + thd_log_info("Detected machine architecture: %s\n", machine_type.c_str()); | ||
| 410 | + | ||
| 411 | + if (strcmp(sysinfo.machine, "x86_64") == 0) { | ||
| 412 | + detected_platform = PLATFORM_INTEL_X86; | ||
| 413 | + } else { | ||
| 414 | + detected_platform = PLATFORM_OTHER; | ||
| 415 | + } | ||
| 416 | +} | ||
| 417 | + | ||
| 418 | +platform_type_t cthd_platform::get_platform() { | ||
| 419 | + return detected_platform; | ||
| 420 | +} | ||
| 421 | + | ||
| 422 | +std::string cthd_platform::get_machine_type() { | ||
| 423 | + return machine_type; | ||
| 424 | +} | ||
| 425 | + | ||
| 426 | +int cthd_platform::check_cpu_id(bool &proc_list_matched) { | ||
| 427 | + // Base implementation - to be overridden by derived classes | ||
| 428 | + proc_list_matched = false; | ||
| 429 | + return THD_SUCCESS; | ||
| 430 | +} | ||
| 431 | + | ||
| 432 | +void cthd_platform::workaround_rapl_mmio_power() { | ||
| 433 | + // Base implementation - to be overridden by derived classes | ||
| 434 | + // No workaround needed for generic platform | ||
| 435 | +} | ||
| 436 | + | ||
| 437 | +void cthd_platform::dump_platform_info() { | ||
| 438 | + platform_type_t platform = get_platform(); | ||
| 439 | + | ||
| 440 | + thd_log_info("=== Platform Information ===\n"); | ||
| 441 | + thd_log_info("Machine Type: %s\n", get_machine_type().c_str()); | ||
| 442 | + | ||
| 443 | + switch (platform) { | ||
| 444 | + case PLATFORM_INTEL_X86: | ||
| 445 | + thd_log_info("Platform: Intel x86/x86_64\n"); | ||
| 446 | + break; | ||
| 447 | + case PLATFORM_OTHER: | ||
| 448 | + thd_log_info("Platform: Other (%s)\n", get_machine_type().c_str()); | ||
| 449 | + break; | ||
| 450 | + case PLATFORM_UNKNOWN: | ||
| 451 | + default: | ||
| 452 | + thd_log_info("Platform: Unknown\n"); | ||
| 453 | + break; | ||
| 454 | + } | ||
| 455 | + thd_log_info("============================\n"); | ||
| 456 | +} | ||
| 457 | + | ||
| 458 | +cthd_platform* cthd_platform::create_platform() { | ||
| 459 | + // Detect platform architecture using uname | ||
| 460 | + struct utsname sysinfo; | ||
| 461 | + if (uname(&sysinfo) != 0) { | ||
| 462 | + thd_log_error("Failed to get system information\n"); | ||
| 463 | + return new cthd_platform(); | ||
| 464 | + } | ||
| 465 | + | ||
| 466 | + // Create appropriate platform instance based on architecture | ||
| 467 | + if (strcmp(sysinfo.machine, "x86_64") == 0) { | ||
| 468 | + thd_log_info("Creating Intel platform instance\n"); | ||
| 469 | + return new intel_platform(); | ||
| 470 | + } else { | ||
| 471 | + thd_log_info("Creating generic platform instance for %s\n", sysinfo.machine); | ||
| 472 | + return new cthd_platform(); | ||
| 473 | + } | ||
| 474 | +} | ||
| 475 | diff --git a/src/thd_platform.h b/src/thd_platform.h | ||
| 476 | new file mode 100644 | ||
| 477 | index 0000000..25746c3 | ||
| 478 | --- /dev/null | ||
| 479 | +++ b/src/thd_platform.h | ||
| 480 | @@ -0,0 +1,58 @@ | ||
| 481 | +/* | ||
| 482 | + * thd_platform.h: Platform detection and abstraction layer | ||
| 483 | + * | ||
| 484 | + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved. | ||
| 485 | + * | ||
| 486 | + * This program is free software; you can redistribute it and/or | ||
| 487 | + * modify it under the terms of the GNU General Public License version | ||
| 488 | + * 2 or later as published by the Free Software Foundation. | ||
| 489 | + * | ||
| 490 | + * This program is distributed in the hope that it will be useful, | ||
| 491 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 492 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 493 | + * GNU General Public License for more details. | ||
| 494 | + * | ||
| 495 | + * You should have received a copy of the GNU General Public License | ||
| 496 | + * along with this program; if not, write to the Free Software | ||
| 497 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
| 498 | + * 02110-1301, USA. | ||
| 499 | + * | ||
| 500 | + * Author Name <priyansh.jain@oss.qualcomm.com> | ||
| 501 | + */ | ||
| 502 | + | ||
| 503 | +#ifndef THD_PLATFORM_H_ | ||
| 504 | +#define THD_PLATFORM_H_ | ||
| 505 | + | ||
| 506 | +#include <string> | ||
| 507 | +#include <sys/utsname.h> | ||
| 508 | + | ||
| 509 | +typedef enum { | ||
| 510 | + PLATFORM_UNKNOWN = 0, | ||
| 511 | + PLATFORM_INTEL_X86, | ||
| 512 | + PLATFORM_OTHER | ||
| 513 | +} platform_type_t; | ||
| 514 | + | ||
| 515 | +class cthd_platform { | ||
| 516 | +protected: | ||
| 517 | + platform_type_t detected_platform; | ||
| 518 | + std::string machine_type; | ||
| 519 | + | ||
| 520 | +public: | ||
| 521 | + cthd_platform(); | ||
| 522 | + virtual ~cthd_platform(); | ||
| 523 | + | ||
| 524 | + // Virtual methods to be overridden by derived classes | ||
| 525 | + virtual void detect_platform(); | ||
| 526 | + virtual int check_cpu_id(bool &proc_list_matched); | ||
| 527 | + virtual void workaround_rapl_mmio_power(); | ||
| 528 | + virtual void dump_platform_info(); | ||
| 529 | + | ||
| 530 | + // Common methods | ||
| 531 | + platform_type_t get_platform(); | ||
| 532 | + std::string get_machine_type(); | ||
| 533 | + | ||
| 534 | + // Factory method to create appropriate platform instance | ||
| 535 | + static cthd_platform* create_platform(); | ||
| 536 | +}; | ||
| 537 | + | ||
| 538 | +#endif /* THD_PLATFORM_H_ */ | ||
| 539 | diff --git a/src/thd_platform_intel.cpp b/src/thd_platform_intel.cpp | ||
| 540 | new file mode 100644 | ||
| 541 | index 0000000..622a9ad | ||
| 542 | --- /dev/null | ||
| 543 | +++ b/src/thd_platform_intel.cpp | ||
| 544 | @@ -0,0 +1,238 @@ | ||
| 545 | +/* | ||
| 546 | + * thd_platform_intel.cpp: Intel platform-specific functionality implementation | ||
| 547 | + * | ||
| 548 | + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved. | ||
| 549 | + * | ||
| 550 | + * This program is free software; you can redistribute it and/or | ||
| 551 | + * modify it under the terms of the GNU General Public License version | ||
| 552 | + * 2 or later as published by the Free Software Foundation. | ||
| 553 | + * | ||
| 554 | + * This program is distributed in the hope that it will be useful, | ||
| 555 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 556 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 557 | + * GNU General Public License for more details. | ||
| 558 | + * | ||
| 559 | + * You should have received a copy of the GNU General Public License | ||
| 560 | + * along with this program; if not, write to the Free Software | ||
| 561 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
| 562 | + * 02110-1301, USA. | ||
| 563 | + * | ||
| 564 | + */ | ||
| 565 | + | ||
| 566 | +#include "thd_platform_intel.h" | ||
| 567 | +#include "thd_common.h" | ||
| 568 | +#include "thd_engine.h" | ||
| 569 | +#include <vector> | ||
| 570 | +#include <string> | ||
| 571 | +#include <fstream> | ||
| 572 | +#include <algorithm> | ||
| 573 | + | ||
| 574 | +#ifndef ANDROID | ||
| 575 | +#ifdef __x86_64__ | ||
| 576 | +#include <cpuid.h> | ||
| 577 | +#include <sys/mman.h> | ||
| 578 | +#endif | ||
| 579 | +#include <sys/stat.h> | ||
| 580 | +#endif | ||
| 581 | + | ||
| 582 | +#define BIT_ULL(nr) (1ULL << (nr)) | ||
| 583 | + | ||
| 584 | +#ifndef ANDROID | ||
| 585 | +#ifdef __x86_64__ | ||
| 586 | +typedef struct { | ||
| 587 | + unsigned int family; | ||
| 588 | + unsigned int model; | ||
| 589 | +} supported_ids_t; | ||
| 590 | + | ||
| 591 | +static supported_ids_t intel_id_table[] = { | ||
| 592 | + { 6, 0x2a }, // Sandybridge | ||
| 593 | + { 6, 0x3a }, // IvyBridge | ||
| 594 | + { 6, 0x3c }, // Haswell | ||
| 595 | + { 6, 0x45 }, // Haswell ULT | ||
| 596 | + { 6, 0x46 }, // Haswell ULT | ||
| 597 | + { 6, 0x3d }, // Broadwell | ||
| 598 | + { 6, 0x47 }, // Broadwell-GT3E | ||
| 599 | + { 6, 0x37 }, // Valleyview BYT | ||
| 600 | + { 6, 0x4c }, // Brasewell | ||
| 601 | + { 6, 0x4e }, // skylake | ||
| 602 | + { 6, 0x5e }, // skylake | ||
| 603 | + { 6, 0x5c }, // Broxton | ||
| 604 | + { 6, 0x7a }, // Gemini Lake | ||
| 605 | + { 6, 0x8e }, // kabylake | ||
| 606 | + { 6, 0x9e }, // kabylake | ||
| 607 | + { 6, 0x66 }, // Cannonlake | ||
| 608 | + { 6, 0x7e }, // Icelake | ||
| 609 | + { 6, 0x8c }, // Tigerlake_L | ||
| 610 | + { 6, 0x8d }, // Tigerlake | ||
| 611 | + { 6, 0xa5 }, // Cometlake | ||
| 612 | + { 6, 0xa6 }, // Cometlake_L | ||
| 613 | + { 6, 0xa7 }, // Rocketlake | ||
| 614 | + { 6, 0x9c }, // Jasper Lake | ||
| 615 | + { 6, 0x97 }, // Alderlake | ||
| 616 | + { 6, 0x9a }, // Alderlake | ||
| 617 | + { 6, 0xb7 }, // Raptorlake | ||
| 618 | + { 6, 0xba }, // Raptorlake | ||
| 619 | + { 6, 0xbe }, // Alderlake N | ||
| 620 | + { 6, 0xbf }, // Raptorlake S | ||
| 621 | + { 6, 0xaa }, // Mateor Lake L | ||
| 622 | + { 6, 0xbd }, // Lunar Lake M | ||
| 623 | + { 6, 0xc6 }, // Arrow Lake | ||
| 624 | + { 6, 0xc5 }, // Arrow Lake H | ||
| 625 | + { 6, 0xb5 }, // Arrow Lake U | ||
| 626 | + { 6, 0xcc }, // Panther Lake L | ||
| 627 | + { 0, 0 } // Last Invalid entry | ||
| 628 | +}; | ||
| 629 | + | ||
| 630 | +std::vector<std::string> blocklist_paths { | ||
| 631 | + /* Some Lenovo machines have in-firmware thermal management, | ||
| 632 | + * avoid having two entities trying to manage things. | ||
| 633 | + * We may want to change this to dytc_perfmode once that is | ||
| 634 | + * widely available. */ | ||
| 635 | + "/sys/devices/platform/thinkpad_acpi/dytc_lapmode", | ||
| 636 | +}; | ||
| 637 | +#endif // __x86_64__ | ||
| 638 | +#endif | ||
| 639 | + | ||
| 640 | +intel_platform::intel_platform() : cthd_platform() { | ||
| 641 | + // Intel platform specific initialization | ||
| 642 | + detect_platform(); | ||
| 643 | +} | ||
| 644 | + | ||
| 645 | +intel_platform::~intel_platform() { | ||
| 646 | +} | ||
| 647 | + | ||
| 648 | +void intel_platform::detect_platform() { | ||
| 649 | + // Call base class detection first | ||
| 650 | + cthd_platform::detect_platform(); | ||
| 651 | + | ||
| 652 | + thd_log_info("Intel platform detected\n"); | ||
| 653 | +} | ||
| 654 | + | ||
| 655 | +int intel_platform::check_cpu_id(bool &proc_list_matched) { | ||
| 656 | +#ifndef ANDROID | ||
| 657 | +#ifdef __x86_64__ | ||
| 658 | + unsigned int ebx, ecx, edx, max_level; | ||
| 659 | + unsigned int fms, family, model, stepping; | ||
| 660 | + unsigned int genuine_intel = 0; | ||
| 661 | + int i = 0; | ||
| 662 | + bool valid = false; | ||
| 663 | + | ||
| 664 | + proc_list_matched = false; | ||
| 665 | + ebx = ecx = edx = 0; | ||
| 666 | + | ||
| 667 | + __cpuid(0, max_level, ebx, ecx, edx); | ||
| 668 | + if (ebx == 0x756e6547 && edx == 0x49656e69 && ecx == 0x6c65746e) | ||
| 669 | + genuine_intel = 1; | ||
| 670 | + if (genuine_intel == 0) { | ||
| 671 | + // Simply return without further capability check | ||
| 672 | + return THD_SUCCESS; | ||
| 673 | + } | ||
| 674 | + __cpuid(1, fms, ebx, ecx, edx); | ||
| 675 | + family = (fms >> 8) & 0xf; | ||
| 676 | + model = (fms >> 4) & 0xf; | ||
| 677 | + stepping = fms & 0xf; | ||
| 678 | + if (family == 6 || family == 0xf) | ||
| 679 | + model += ((fms >> 16) & 0xf) << 4; | ||
| 680 | + | ||
| 681 | + thd_log_msg( | ||
| 682 | + "%u CPUID levels; family:model:stepping 0x%x:%x:%x (%u:%u:%u)\n", | ||
| 683 | + max_level, family, model, stepping, family, model, stepping); | ||
| 684 | + | ||
| 685 | + while (intel_id_table[i].family) { | ||
| 686 | + if (intel_id_table[i].family == family && intel_id_table[i].model == model) { | ||
| 687 | + proc_list_matched = true; | ||
| 688 | + valid = true; | ||
| 689 | + break; | ||
| 690 | + } | ||
| 691 | + i++; | ||
| 692 | + } | ||
| 693 | + if (!valid) { | ||
| 694 | + thd_log_msg(" Need Linux PowerCap sysfs\n"); | ||
| 695 | + } | ||
| 696 | + | ||
| 697 | + for (std::string path : blocklist_paths) { | ||
| 698 | + struct stat s; | ||
| 699 | + | ||
| 700 | + if (!stat(path.c_str(), &s)) { | ||
| 701 | + proc_list_matched = false; | ||
| 702 | + thd_log_warn("[%s] present: Thermald can't run on this platform\n", path.c_str()); | ||
| 703 | + break; | ||
| 704 | + } | ||
| 705 | + } | ||
| 706 | +#else | ||
| 707 | + thd_log_info("Non-x86_64 platform detected in Intel check - skipping CPUID\n"); | ||
| 708 | +#endif // __x86_64__ | ||
| 709 | +#endif // ANDROID | ||
| 710 | + return THD_SUCCESS; | ||
| 711 | +} | ||
| 712 | + | ||
| 713 | +void intel_platform::workaround_rapl_mmio_power(void) { | ||
| 714 | + // First check if workaround is enabled and needed | ||
| 715 | + extern bool workaround_enabled; | ||
| 716 | + if (!workaround_enabled) | ||
| 717 | + return; | ||
| 718 | + | ||
| 719 | + // Check if RAPL MMIO controller is already being used | ||
| 720 | + extern cthd_engine *thd_engine; | ||
| 721 | + if (thd_engine) { | ||
| 722 | + cthd_cdev *cdev = thd_engine->search_cdev("rapl_controller_mmio"); | ||
| 723 | + if (cdev) { | ||
| 724 | + /* RAPL MMIO is enabled and getting used. No need to disable */ | ||
| 725 | + return; | ||
| 726 | + } else { | ||
| 727 | + csys_fs _sysfs("/sys/devices/virtual/powercap/intel-rapl-mmio/intel-rapl-mmio:0/"); | ||
| 728 | + | ||
| 729 | + if (_sysfs.exists()) { | ||
| 730 | + std::stringstream temp_str; | ||
| 731 | + | ||
| 732 | + temp_str << "enabled"; | ||
| 733 | + if (_sysfs.write(temp_str.str(), 0) > 0) | ||
| 734 | + return; | ||
| 735 | + | ||
| 736 | + thd_log_debug("Failed to write to RAPL MMIO\n"); | ||
| 737 | + } | ||
| 738 | + } | ||
| 739 | + } | ||
| 740 | + | ||
| 741 | +#ifndef ANDROID | ||
| 742 | +#ifdef __x86_64__ | ||
| 743 | + int map_fd; | ||
| 744 | + void *rapl_mem; | ||
| 745 | + unsigned char *rapl_pkg_pwr_addr; | ||
| 746 | + unsigned long long pkg_power_limit; | ||
| 747 | + | ||
| 748 | + unsigned int ebx, ecx, edx; | ||
| 749 | + unsigned int fms, family, model; | ||
| 750 | + | ||
| 751 | + ecx = edx = 0; | ||
| 752 | + __cpuid(1, fms, ebx, ecx, edx); | ||
| 753 | + family = (fms >> 8) & 0xf; | ||
| 754 | + model = (fms >> 4) & 0xf; | ||
| 755 | + if (family == 6 || family == 0xf) | ||
| 756 | + model += ((fms >> 16) & 0xf) << 4; | ||
| 757 | + | ||
| 758 | + // Apply for KabyLake only | ||
| 759 | + if (model != 0x8e && model != 0x9e) | ||
| 760 | + return; | ||
| 761 | + | ||
| 762 | + map_fd = open("/dev/mem", O_RDWR, 0); | ||
| 763 | + if (map_fd < 0) | ||
| 764 | + return; | ||
| 765 | + | ||
| 766 | + rapl_mem = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, | ||
| 767 | + 0xfed15000); | ||
| 768 | + if (!rapl_mem || rapl_mem == MAP_FAILED) { | ||
| 769 | + close(map_fd); | ||
| 770 | + return; | ||
| 771 | + } | ||
| 772 | + | ||
| 773 | + rapl_pkg_pwr_addr = ((unsigned char *)rapl_mem + 0x9a0); | ||
| 774 | + pkg_power_limit = *(unsigned long long *)rapl_pkg_pwr_addr; | ||
| 775 | + *(unsigned long long *)rapl_pkg_pwr_addr = pkg_power_limit | ||
| 776 | + & ~BIT_ULL(15); | ||
| 777 | + | ||
| 778 | + munmap(rapl_mem, 4096); | ||
| 779 | + close(map_fd); | ||
| 780 | +#endif // __x86_64__ | ||
| 781 | +#endif // ANDROID | ||
| 782 | +} | ||
| 783 | diff --git a/src/thd_platform_intel.h b/src/thd_platform_intel.h | ||
| 784 | new file mode 100644 | ||
| 785 | index 0000000..5753afe | ||
| 786 | --- /dev/null | ||
| 787 | +++ b/src/thd_platform_intel.h | ||
| 788 | @@ -0,0 +1,38 @@ | ||
| 789 | +/* | ||
| 790 | + * thd_platform_intel.h: Intel platform-specific functionality | ||
| 791 | + * | ||
| 792 | + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved. | ||
| 793 | + * | ||
| 794 | + * This program is free software; you can redistribute it and/or | ||
| 795 | + * modify it under the terms of the GNU General Public License version | ||
| 796 | + * 2 or later as published by the Free Software Foundation. | ||
| 797 | + * | ||
| 798 | + * This program is distributed in the hope that it will be useful, | ||
| 799 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 800 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 801 | + * GNU General Public License for more details. | ||
| 802 | + * | ||
| 803 | + * You should have received a copy of the GNU General Public License | ||
| 804 | + * along with this program; if not, write to the Free Software | ||
| 805 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
| 806 | + * 02110-1301, USA. | ||
| 807 | + * | ||
| 808 | + */ | ||
| 809 | + | ||
| 810 | +#ifndef THD_PLATFORM_INTEL_H_ | ||
| 811 | +#define THD_PLATFORM_INTEL_H_ | ||
| 812 | + | ||
| 813 | +#include "thd_platform.h" | ||
| 814 | + | ||
| 815 | +class intel_platform : public cthd_platform { | ||
| 816 | +public: | ||
| 817 | + intel_platform(); | ||
| 818 | + virtual ~intel_platform(); | ||
| 819 | + | ||
| 820 | + // Override virtual methods from base class | ||
| 821 | + void detect_platform() override; | ||
| 822 | + int check_cpu_id(bool &proc_list_matched) override; | ||
| 823 | + void workaround_rapl_mmio_power() override; | ||
| 824 | +}; | ||
| 825 | + | ||
| 826 | +#endif /* THD_PLATFORM_INTEL_H_ */ | ||
| 827 | -- | ||
| 828 | 2.25.1 | ||
| 829 | |||
diff --git a/meta-oe/recipes-bsp/thermald/thermald/0002-Invoke-parser_init-before-platform_match.patch b/meta-oe/recipes-bsp/thermald/thermald/0002-Invoke-parser_init-before-platform_match.patch new file mode 100644 index 0000000000..6f72d0cc01 --- /dev/null +++ b/meta-oe/recipes-bsp/thermald/thermald/0002-Invoke-parser_init-before-platform_match.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From 857fbdf3e9079cec04bfa5fe7a93a432485b5cab Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Priyansh Jain <priyansh.jain@oss.qualcomm.com> | ||
| 3 | Date: Tue, 27 Jan 2026 15:26:24 +0530 | ||
| 4 | Subject: [PATCH 2/3] Invoke parser_init before platform_match | ||
| 5 | |||
| 6 | The initialization flow currently invokes platform_match without | ||
| 7 | calling parser_init first. As a result, the platform matching | ||
| 8 | logic runs with no parsed configuration data available. This | ||
| 9 | can cause incorrect platform detection, or failure to load | ||
| 10 | the expected thermal configurations. | ||
| 11 | |||
| 12 | This patch adds the missing parser_init() call before | ||
| 13 | platform_match(), ensuring that configuration files are properly | ||
| 14 | parsed and populated before any platform-specific matching occurs. | ||
| 15 | This makes initialization reliable and aligns with the intended | ||
| 16 | dependency order. | ||
| 17 | |||
| 18 | Suggested-by: Amit Kucheria <amit.kucheria@oss.qualcomm.com> | ||
| 19 | Signed-off-by: Priyansh Jain <priyansh.jain@oss.qualcomm.com> | ||
| 20 | |||
| 21 | Upstream-Status: Backport [from commit 857fbdf3e9079cec04bfa5fe7a93a432485b5cab] | ||
| 22 | --- | ||
| 23 | src/thd_engine.cpp | 2 +- | ||
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 25 | |||
| 26 | diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp | ||
| 27 | index 319f50b..da52a5b 100644 | ||
| 28 | --- a/src/thd_engine.cpp | ||
| 29 | +++ b/src/thd_engine.cpp | ||
| 30 | @@ -318,7 +318,7 @@ int cthd_engine::thd_engine_start() { | ||
| 31 | poll_timeout_msec = poll_interval_sec * 1000; | ||
| 32 | } | ||
| 33 | |||
| 34 | - if (parser.platform_matched()) { | ||
| 35 | + if (!parser_init() && parser.platform_matched()) { | ||
| 36 | parser.set_default_preference(); | ||
| 37 | int poll_secs = parser.get_polling_interval(); | ||
| 38 | if (poll_secs) { | ||
| 39 | -- | ||
| 40 | 2.25.1 | ||
| 41 | |||
diff --git a/meta-oe/recipes-bsp/thermald/thermald/0003-Add-ARM-backend-and-enable-ARM-platform-detection.patch b/meta-oe/recipes-bsp/thermald/thermald/0003-Add-ARM-backend-and-enable-ARM-platform-detection.patch new file mode 100644 index 0000000000..a444c585ab --- /dev/null +++ b/meta-oe/recipes-bsp/thermald/thermald/0003-Add-ARM-backend-and-enable-ARM-platform-detection.patch | |||
| @@ -0,0 +1,234 @@ | |||
| 1 | From 1931a12e7e44b6b85a02a5d8158829eff4b9cc92 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Priyansh Jain <priyansh.jain@oss.qualcomm.com> | ||
| 3 | Date: Mon, 9 Feb 2026 16:11:31 +0530 | ||
| 4 | Subject: [PATCH 3/3] Add ARM backend and enable ARM platform detection | ||
| 5 | |||
| 6 | thermald historically supported only Intel platforms. As the | ||
| 7 | codebase is being refactored to allow multi-platform support, | ||
| 8 | ARM platforms require their own backend implementation to | ||
| 9 | handle platform-specific thermal controls, capabilities, and | ||
| 10 | configuration rules. | ||
| 11 | |||
| 12 | This patch adds the initial ARM-specific backend files and | ||
| 13 | integrates ARM selection into the newly introduced platform | ||
| 14 | detection mechanism. With this change, thermald can correctly | ||
| 15 | identify ARM systems and route thermal management operations | ||
| 16 | to the appropriate backend. This establishes the foundation | ||
| 17 | needed for future ARM thermal features and expands thermald's | ||
| 18 | usefulness beyond Intel-based platforms. | ||
| 19 | |||
| 20 | Suggested-by: Amit Kucheria <amit.kucheria@oss.qualcomm.com> | ||
| 21 | Signed-off-by: Priyansh Jain <priyansh.jain@oss.qualcomm.com> | ||
| 22 | |||
| 23 | Upstream-Status: Backport [from commit 1931a12e7e44b6b85a02a5d8158829eff4b9cc92] | ||
| 24 | --- | ||
| 25 | Android.mk | 3 ++- | ||
| 26 | Makefile.am | 3 ++- | ||
| 27 | src/thd_engine.cpp | 1 + | ||
| 28 | src/thd_platform.cpp | 14 ++++++++++++ | ||
| 29 | src/thd_platform.h | 2 ++ | ||
| 30 | src/thd_platform_arm.cpp | 47 ++++++++++++++++++++++++++++++++++++++++ | ||
| 31 | src/thd_platform_arm.h | 38 ++++++++++++++++++++++++++++++++ | ||
| 32 | 7 files changed, 106 insertions(+), 2 deletions(-) | ||
| 33 | create mode 100644 src/thd_platform_arm.cpp | ||
| 34 | create mode 100644 src/thd_platform_arm.h | ||
| 35 | |||
| 36 | diff --git a/Android.mk b/Android.mk | ||
| 37 | index c14fa4a..5d38c35 100644 | ||
| 38 | --- a/Android.mk | ||
| 39 | +++ b/Android.mk | ||
| 40 | @@ -45,7 +45,8 @@ LOCAL_SRC_FILES := \ | ||
| 41 | src/LzmaDec.c \ | ||
| 42 | src/thd_gddv.cpp \ | ||
| 43 | src/thd_platform.cpp \ | ||
| 44 | - src/thd_platform_intel.cpp | ||
| 45 | + src/thd_platform_intel.cpp \ | ||
| 46 | + src/thd_platform_arm.cpp | ||
| 47 | |||
| 48 | LOCAL_C_INCLUDES += external/libxml2/include | ||
| 49 | |||
| 50 | diff --git a/Makefile.am b/Makefile.am | ||
| 51 | index 2e76187..61741ba 100644 | ||
| 52 | --- a/Makefile.am | ||
| 53 | +++ b/Makefile.am | ||
| 54 | @@ -77,7 +77,8 @@ thermald_SOURCES = \ | ||
| 55 | src/thd_lzma_dec.cpp \ | ||
| 56 | src/LzmaDec.c \ | ||
| 57 | src/thd_platform.cpp \ | ||
| 58 | - src/thd_platform_intel.cpp | ||
| 59 | + src/thd_platform_intel.cpp \ | ||
| 60 | + src/thd_platform_arm.cpp | ||
| 61 | |||
| 62 | man5_MANS = man/thermal-conf.xml.5 | ||
| 63 | man8_MANS = man/thermald.8 | ||
| 64 | diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp | ||
| 65 | index da52a5b..9024650 100644 | ||
| 66 | --- a/src/thd_engine.cpp | ||
| 67 | +++ b/src/thd_engine.cpp | ||
| 68 | @@ -45,6 +45,7 @@ | ||
| 69 | #include "thd_int3400.h" | ||
| 70 | #include "thd_platform.h" | ||
| 71 | #include "thd_platform_intel.h" | ||
| 72 | +#include "thd_platform_arm.h" | ||
| 73 | |||
| 74 | static void *cthd_engine_thread(void *arg); | ||
| 75 | |||
| 76 | diff --git a/src/thd_platform.cpp b/src/thd_platform.cpp | ||
| 77 | index 25ce094..647b079 100644 | ||
| 78 | --- a/src/thd_platform.cpp | ||
| 79 | +++ b/src/thd_platform.cpp | ||
| 80 | @@ -22,6 +22,7 @@ | ||
| 81 | |||
| 82 | #include "thd_platform.h" | ||
| 83 | #include "thd_platform_intel.h" | ||
| 84 | +#include "thd_platform_arm.h" | ||
| 85 | #include "thd_common.h" | ||
| 86 | #include <cstring> | ||
| 87 | #include <iostream> | ||
| 88 | @@ -45,6 +46,10 @@ void cthd_platform::detect_platform() { | ||
| 89 | |||
| 90 | if (strcmp(sysinfo.machine, "x86_64") == 0) { | ||
| 91 | detected_platform = PLATFORM_INTEL_X86; | ||
| 92 | + } else if (strcmp(sysinfo.machine, "aarch64") == 0) { | ||
| 93 | + detected_platform = PLATFORM_ARM64; | ||
| 94 | + } else if (strcmp(sysinfo.machine, "arm") == 0) { | ||
| 95 | + detected_platform = PLATFORM_ARM32; | ||
| 96 | } else { | ||
| 97 | detected_platform = PLATFORM_OTHER; | ||
| 98 | } | ||
| 99 | @@ -79,6 +84,12 @@ void cthd_platform::dump_platform_info() { | ||
| 100 | case PLATFORM_INTEL_X86: | ||
| 101 | thd_log_info("Platform: Intel x86/x86_64\n"); | ||
| 102 | break; | ||
| 103 | + case PLATFORM_ARM64: | ||
| 104 | + thd_log_info("Platform: ARM64 (aarch64)\n"); | ||
| 105 | + break; | ||
| 106 | + case PLATFORM_ARM32: | ||
| 107 | + thd_log_info("Platform: ARM32\n"); | ||
| 108 | + break; | ||
| 109 | case PLATFORM_OTHER: | ||
| 110 | thd_log_info("Platform: Other (%s)\n", get_machine_type().c_str()); | ||
| 111 | break; | ||
| 112 | @@ -102,6 +113,9 @@ cthd_platform* cthd_platform::create_platform() { | ||
| 113 | if (strcmp(sysinfo.machine, "x86_64") == 0) { | ||
| 114 | thd_log_info("Creating Intel platform instance\n"); | ||
| 115 | return new intel_platform(); | ||
| 116 | + } else if (strcmp(sysinfo.machine, "aarch64") == 0 || strcmp(sysinfo.machine, "arm") == 0) { | ||
| 117 | + thd_log_info("Creating ARM platform instance\n"); | ||
| 118 | + return new arm_platform(); | ||
| 119 | } else { | ||
| 120 | thd_log_info("Creating generic platform instance for %s\n", sysinfo.machine); | ||
| 121 | return new cthd_platform(); | ||
| 122 | diff --git a/src/thd_platform.h b/src/thd_platform.h | ||
| 123 | index 25746c3..096a55e 100644 | ||
| 124 | --- a/src/thd_platform.h | ||
| 125 | +++ b/src/thd_platform.h | ||
| 126 | @@ -29,6 +29,8 @@ | ||
| 127 | typedef enum { | ||
| 128 | PLATFORM_UNKNOWN = 0, | ||
| 129 | PLATFORM_INTEL_X86, | ||
| 130 | + PLATFORM_ARM64, | ||
| 131 | + PLATFORM_ARM32, | ||
| 132 | PLATFORM_OTHER | ||
| 133 | } platform_type_t; | ||
| 134 | |||
| 135 | diff --git a/src/thd_platform_arm.cpp b/src/thd_platform_arm.cpp | ||
| 136 | new file mode 100644 | ||
| 137 | index 0000000..a43ef9f | ||
| 138 | --- /dev/null | ||
| 139 | +++ b/src/thd_platform_arm.cpp | ||
| 140 | @@ -0,0 +1,47 @@ | ||
| 141 | +/* | ||
| 142 | + * thd_platform_arm.cpp: ARM platform-specific functionality implementation | ||
| 143 | + * | ||
| 144 | + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved. | ||
| 145 | + * | ||
| 146 | + * This program is free software; you can redistribute it and/or | ||
| 147 | + * modify it under the terms of the GNU General Public License version | ||
| 148 | + * 2 or later as published by the Free Software Foundation. | ||
| 149 | + * | ||
| 150 | + * This program is distributed in the hope that it will be useful, | ||
| 151 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 152 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 153 | + * GNU General Public License for more details. | ||
| 154 | + * | ||
| 155 | + * You should have received a copy of the GNU General Public License | ||
| 156 | + * along with this program; if not, write to the Free Software | ||
| 157 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
| 158 | + * 02110-1301, USA. | ||
| 159 | + * | ||
| 160 | + * Author Name <priyansh.jain@oss.qualcomm.com> | ||
| 161 | + */ | ||
| 162 | + | ||
| 163 | +#include "thd_platform_arm.h" | ||
| 164 | +#include "thd_common.h" | ||
| 165 | + | ||
| 166 | +arm_platform::arm_platform() : cthd_platform() { | ||
| 167 | + // ARM platform specific initialization | ||
| 168 | + detect_platform(); | ||
| 169 | +} | ||
| 170 | + | ||
| 171 | +arm_platform::~arm_platform() { | ||
| 172 | +} | ||
| 173 | + | ||
| 174 | +void arm_platform::detect_platform() { | ||
| 175 | + // Call base class detection first | ||
| 176 | + cthd_platform::detect_platform(); | ||
| 177 | + | ||
| 178 | + // ARM-specific platform detection can be added here if needed | ||
| 179 | + thd_log_info("ARM platform detected\n"); | ||
| 180 | +} | ||
| 181 | + | ||
| 182 | +int arm_platform::check_cpu_id(bool &proc_list_matched) { | ||
| 183 | + // For ARM, we assume the platform is supported | ||
| 184 | + proc_list_matched = true; | ||
| 185 | + | ||
| 186 | + return THD_SUCCESS; | ||
| 187 | +} | ||
| 188 | diff --git a/src/thd_platform_arm.h b/src/thd_platform_arm.h | ||
| 189 | new file mode 100644 | ||
| 190 | index 0000000..e970803 | ||
| 191 | --- /dev/null | ||
| 192 | +++ b/src/thd_platform_arm.h | ||
| 193 | @@ -0,0 +1,38 @@ | ||
| 194 | +/* | ||
| 195 | + * thd_platform_arm.h: ARM platform-specific functionality | ||
| 196 | + * | ||
| 197 | + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved. | ||
| 198 | + * | ||
| 199 | + * This program is free software; you can redistribute it and/or | ||
| 200 | + * modify it under the terms of the GNU General Public License version | ||
| 201 | + * 2 or later as published by the Free Software Foundation. | ||
| 202 | + * | ||
| 203 | + * This program is distributed in the hope that it will be useful, | ||
| 204 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 205 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 206 | + * GNU General Public License for more details. | ||
| 207 | + * | ||
| 208 | + * You should have received a copy of the GNU General Public License | ||
| 209 | + * along with this program; if not, write to the Free Software | ||
| 210 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
| 211 | + * 02110-1301, USA. | ||
| 212 | + * | ||
| 213 | + * Author Name <priyansh.jain@oss.qualcomm.com> | ||
| 214 | + */ | ||
| 215 | + | ||
| 216 | +#ifndef THD_PLATFORM_ARM_H_ | ||
| 217 | +#define THD_PLATFORM_ARM_H_ | ||
| 218 | + | ||
| 219 | +#include "thd_platform.h" | ||
| 220 | + | ||
| 221 | +class arm_platform : public cthd_platform { | ||
| 222 | +public: | ||
| 223 | + arm_platform(); | ||
| 224 | + virtual ~arm_platform(); | ||
| 225 | + | ||
| 226 | + // Override virtual methods from base class | ||
| 227 | + void detect_platform() override; | ||
| 228 | + int check_cpu_id(bool &proc_list_matched) override; | ||
| 229 | +}; | ||
| 230 | + | ||
| 231 | +#endif /* THD_PLATFORM_ARM_H_ */ | ||
| 232 | -- | ||
| 233 | 2.25.1 | ||
| 234 | |||
diff --git a/meta-oe/recipes-bsp/thermald/thermald_2.5.11.bb b/meta-oe/recipes-bsp/thermald/thermald_2.5.11.bb new file mode 100644 index 0000000000..0425d1c575 --- /dev/null +++ b/meta-oe/recipes-bsp/thermald/thermald_2.5.11.bb | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | SUMMARY = "Linux thermal daemon" | ||
| 2 | |||
| 3 | DESCRIPTION = "Thermal Daemon is a Linux daemon used to prevent the \ | ||
| 4 | overheating of platforms. This daemon monitors temperature and applies \ | ||
| 5 | compensation using available cooling methods." | ||
| 6 | |||
| 7 | HOMEPAGE = "https://github.com/intel/thermal_daemon" | ||
| 8 | |||
| 9 | DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev" | ||
| 10 | DEPENDS += "autoconf-archive-native" | ||
| 11 | |||
| 12 | LICENSE = "GPL-2.0-only" | ||
| 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" | ||
| 14 | |||
| 15 | SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \ | ||
| 16 | file://0001-Refactor-Intel-specific-logic-into-separate-files.patch \ | ||
| 17 | file://0002-Invoke-parser_init-before-platform_match.patch \ | ||
| 18 | file://0003-Add-ARM-backend-and-enable-ARM-platform-detection.patch \ | ||
| 19 | " | ||
| 20 | |||
| 21 | SRCREV = "5269afcf3e021e4e1b672b4640a0358f4ae5821b" | ||
| 22 | |||
| 23 | inherit pkgconfig autotools systemd gtk-doc | ||
| 24 | |||
| 25 | # gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails | ||
| 26 | # to copy becuase there is no m4 dir yet. | ||
| 27 | do_configure:prepend () { | ||
| 28 | mkdir -p ${S}/m4 | ||
| 29 | } | ||
| 30 | |||
| 31 | EXTRA_OECONF = " \ | ||
| 32 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ | ||
| 33 | " | ||
| 34 | |||
| 35 | FILES:${PN} += "${datadir}/dbus-1" | ||
| 36 | |||
| 37 | SYSTEMD_SERVICE:${PN} = "thermald.service" | ||
| 38 | |||
| 39 | COMPATIBLE_HOST = '(i.86|x86_64|aarch64|arm).*-linux' | ||
| 40 | |||
| 41 | CONFFILES:${PN} = " \ | ||
| 42 | ${sysconfdir}/thermald/thermal-conf.xml \ | ||
| 43 | ${sysconfdir}/thermald/thermal-cpu-cdev-order.xml \ | ||
| 44 | " | ||
| 45 | |||
| 46 | UPSTREAM_CHECK_URI = "https://github.com/intel/thermal_daemon/releases/" | ||
| 47 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!2\.15\.10$)\d+(\.\d+)+)" | ||
diff --git a/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.2.6.bb b/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.3.0.bb index 47de7a7344..0e1e155356 100644 --- a/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.2.6.bb +++ b/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.3.0.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c" | |||
| 7 | CVE_PRODUCT = "async_mqtt" | 7 | CVE_PRODUCT = "async_mqtt" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/redboltz/async_mqtt;protocol=http;branch=main;protocol=https;tag=${PV}" | 9 | SRC_URI = "git://github.com/redboltz/async_mqtt;protocol=http;branch=main;protocol=https;tag=${PV}" |
| 10 | SRCREV = "cb3d37dc3432b9c03fe631eeba2d548de7457bf9" | 10 | SRCREV = "7129d72c1b9adf159bc506206df3fb422bb9fb84" |
| 11 | 11 | ||
| 12 | DEPENDS = "openssl boost" | 12 | DEPENDS = "openssl boost" |
| 13 | 13 | ||
diff --git a/meta-oe/recipes-connectivity/conserver/conserver/conserver.service b/meta-oe/recipes-connectivity/conserver/conserver/conserver.service new file mode 100644 index 0000000000..8649896487 --- /dev/null +++ b/meta-oe/recipes-connectivity/conserver/conserver/conserver.service | |||
| @@ -0,0 +1,58 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=Console server | ||
| 3 | Documentation=man:conserver(8) | ||
| 4 | Documentation=https://www.conserver.com/ | ||
| 5 | After=network.target | ||
| 6 | ConditionPathExists=/etc/conserver.cf | ||
| 7 | |||
| 8 | [Service] | ||
| 9 | Type=exec | ||
| 10 | ExecStart=/usr/sbin/conserver -C /etc/conserver.cf | ||
| 11 | ExecReload=+kill -HUP $MAINPID | ||
| 12 | User=conserver | ||
| 13 | # /run/conserver for Unix domain socket | ||
| 14 | RuntimeDirectory=conserver | ||
| 15 | |||
| 16 | CapabilityBoundingSet= | ||
| 17 | |||
| 18 | LockPersonality=true | ||
| 19 | MemoryDenyWriteExecute=true | ||
| 20 | NoNewPrivileges=true | ||
| 21 | |||
| 22 | # No access to /dev/... | ||
| 23 | PrivateDevices=true | ||
| 24 | PrivateTmp=true | ||
| 25 | ProtectClock=true | ||
| 26 | ProtectControlGroups=true | ||
| 27 | ProtectHostname=true | ||
| 28 | ProtectKernelLogs=true | ||
| 29 | ProtectKernelModules=true | ||
| 30 | ProtectKernelTunables=true | ||
| 31 | |||
| 32 | # strict: mounts the whole system read-only | ||
| 33 | # full: mount only /var as read-write | ||
| 34 | # true: mount /var and /etc as read-write | ||
| 35 | ProtectSystem=full | ||
| 36 | # Make some paths writable | ||
| 37 | #ReadWritePaths=/… | ||
| 38 | ProtectHome=true | ||
| 39 | |||
| 40 | # Make sure that the process can only see PIDs and process details of itself, | ||
| 41 | # and the second option disables seeing details of things like system load and | ||
| 42 | # I/O etc | ||
| 43 | ProtectProc=invisible | ||
| 44 | ProcSubset=pid | ||
| 45 | |||
| 46 | RemoveIPC=true | ||
| 47 | RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 | ||
| 48 | RestrictNamespaces=true | ||
| 49 | RestrictRealtime=true | ||
| 50 | RestrictSUIDSGID=true | ||
| 51 | |||
| 52 | SystemCallArchitectures=native | ||
| 53 | SystemCallFilter=@system-service | ||
| 54 | SystemCallFilter=~@privileged @resources @obsolete | ||
| 55 | |||
| 56 | |||
| 57 | [Install] | ||
| 58 | WantedBy=multi-user.target | ||
diff --git a/meta-oe/recipes-connectivity/conserver/conserver/run-ptest b/meta-oe/recipes-connectivity/conserver/conserver/run-ptest new file mode 100644 index 0000000000..51eb0ffbcf --- /dev/null +++ b/meta-oe/recipes-connectivity/conserver/conserver/run-ptest | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | set -e -u -C | ||
| 4 | |||
| 5 | cd test | ||
| 6 | |||
| 7 | ./dotest |sed \ | ||
| 8 | -e 's,^executing test \(#[0-9]*\)...succeeded$,PASS: conserver \1,' \ | ||
| 9 | -e 's,^executing test \(#[0-9]*\)...failed\(.*\)$,FAIL: conserver \1 \2,' | ||
| 10 | |||
| 11 | for i in test*.diff conserver.log shell.log shell2.log | ||
| 12 | do | ||
| 13 | test "$i" != 'test*.diff' || exit 0 | ||
| 14 | test -e "$i" || continue | ||
| 15 | |||
| 16 | echo "----[ $i ]--------------------" | ||
| 17 | cat "$i" | ||
| 18 | echo "------------------------------------" | ||
| 19 | done | ||
| 20 | |||
| 21 | exit 1 | ||
diff --git a/meta-oe/recipes-connectivity/conserver/conserver_8.3.0.bb b/meta-oe/recipes-connectivity/conserver/conserver_8.3.0.bb new file mode 100644 index 0000000000..c32d6f9646 --- /dev/null +++ b/meta-oe/recipes-connectivity/conserver/conserver_8.3.0.bb | |||
| @@ -0,0 +1,111 @@ | |||
| 1 | SUMMARY = "Manages connections of multiple users to a serial console or TCP/unix sockets" | ||
| 2 | DESCRIPTION = "\ | ||
| 3 | Conserver allows multiple users to watch a serial console at the same \ | ||
| 4 | time. It can log the data, allows users to take write-access of a console \ | ||
| 5 | (one at a time), and has a variety of bells and whistles to accentuate \ | ||
| 6 | that basic functionality. The idea is that conserver will log all your \ | ||
| 7 | serial traffic so you can go back and review why something crashed, look \ | ||
| 8 | at changes (if done on the console), or tie the console logs into a \ | ||
| 9 | monitoring system (just watch the logfiles it creates). \ | ||
| 10 | " | ||
| 11 | HOMEPAGE = "https://www.conserver.com/" | ||
| 12 | BUGTRACKER = "https://github.com/bstansell/conserver/issues" | ||
| 13 | SECTION = "console/network" | ||
| 14 | |||
| 15 | LICENSE = "BSD-3-Clause" | ||
| 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b28513e7b696027d3d2b8dbf117f9fe5" | ||
| 17 | |||
| 18 | DEPENDS = "libxcrypt" | ||
| 19 | |||
| 20 | inherit autotools ptest systemd useradd | ||
| 21 | |||
| 22 | SRC_URI = "\ | ||
| 23 | git://github.com/bstansell/conserver;protocol=https;branch=master;tag=v${PV} \ | ||
| 24 | file://conserver.service \ | ||
| 25 | file://run-ptest \ | ||
| 26 | " | ||
| 27 | SRCREV = "fe9aac337554f95721dc9f3da721092a81092089" | ||
| 28 | |||
| 29 | # In 8.3.0, conserver fails to build with uds and ipv6 | ||
| 30 | # https://github.com/bstansell/conserver/issues/112 | ||
| 31 | PACKAGECONFIG ?= "\ | ||
| 32 | openssl \ | ||
| 33 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'ipv4 ipv6', '', 'uds trust-uds-cred', d)} \ | ||
| 34 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ | ||
| 35 | " | ||
| 36 | |||
| 37 | # Trust reverse DNS information | ||
| 38 | PACKAGECONFIG[trustrevdns] = "--with-trustrevdns,--without-trustrevdns" | ||
| 39 | # Produce extended messages | ||
| 40 | PACKAGECONFIG[extmsgs] = "--with-extmsgs,--without-extmsgs" | ||
| 41 | # Use Unix domain sockets for client/server communication [/tmp/conserver] | ||
| 42 | PACKAGECONFIG[uds] = "--with-uds=/run/${PN},--without-uds" | ||
| 43 | # Trust UDS credentials obtained via socket | ||
| 44 | PACKAGECONFIG[trust-uds-cred] = "--with-trust-uds-cred,--without-trust-uds-cred" | ||
| 45 | # Compile in libwrap (tcp_wrappers) support | ||
| 46 | PACKAGECONFIG[libwrap] = "--with-libwrap,--without-libwrap,tcp-wrappers" | ||
| 47 | # Compile in OpenSSL support | ||
| 48 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" | ||
| 49 | # Require server SSL certificate by client | ||
| 50 | PACKAGECONFIG[req-server-cert] = "--with-req-server-cert,--without-req-server-cert" | ||
| 51 | # Compile in GSS-API support | ||
| 52 | PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" | ||
| 53 | # retry username without @REALM with gss-api authentication | ||
| 54 | PACKAGECONFIG[striprealm] = "--with-striprealm,--without-striprealm" | ||
| 55 | # Compile in FreeIPMI support | ||
| 56 | PACKAGECONFIG[freeipmi] = "--with-freeipmi,--without-freeipmi,freeipmi" | ||
| 57 | # Compile in dmalloc support | ||
| 58 | PACKAGECONFIG[dmalloc] = "--with-dmalloc,--without-dmalloc,dmalloc" | ||
| 59 | # Enable PAM support | ||
| 60 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" | ||
| 61 | # (experimental) Use IPv6 for client/server communication | ||
| 62 | PACKAGECONFIG[ipv6] = "--with-ipv6,--without-ipv6" | ||
| 63 | |||
| 64 | EXTRA_OECONF += "\ | ||
| 65 | INSTALL_PROGRAM='install --strip-program=true' \ | ||
| 66 | --with-pidfile=/run/conserver/conserver.pid \ | ||
| 67 | --without-rpath \ | ||
| 68 | " | ||
| 69 | |||
| 70 | PACKAGE_BEFORE_PN += "${PN}-client" | ||
| 71 | SUMMARY:${PN}-client = "Client to connect to conserver" | ||
| 72 | FILES:${PN}-client += "${bindir}/console" | ||
| 73 | |||
| 74 | PACKAGE_BEFORE_PN += "${PN}-convert" | ||
| 75 | SUMMARY:${PN}-convert = "Converter for old config files of conserver" | ||
| 76 | FILES:${PN}-convert += "${libdir}/${PN}" | ||
| 77 | |||
| 78 | # tests fail with ash | ||
| 79 | RDEPENDS:${PN}-ptest += "bash" | ||
| 80 | |||
| 81 | SYSTEMD_SERVICE:${PN} = "${PN}.service" | ||
| 82 | |||
| 83 | USERADD_PACKAGES = "\ | ||
| 84 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${PN}', '', d)} \ | ||
| 85 | " | ||
| 86 | USERADD_PARAM:${PN} = "\ | ||
| 87 | -M -d /invalid -r -U -s ${sbindir}/nologin conserver; \ | ||
| 88 | " | ||
| 89 | |||
| 90 | do_install:append() { | ||
| 91 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} | ||
| 92 | then | ||
| 93 | rm ${D}${datadir}/examples/${PN}/conserver.rc | ||
| 94 | |||
| 95 | install -m 644 -D -t ${D}/${systemd_unitdir}/system ${UNPACKDIR}/conserver.service | ||
| 96 | else | ||
| 97 | install -d ${D}${sysconfdir}/init.d | ||
| 98 | mv ${D}${datadir}/examples/${PN}/conserver.rc ${D}${sysconfdir}/init.d/${PN} | ||
| 99 | fi | ||
| 100 | |||
| 101 | install -d ${D}${datadir}/doc/${PN}/examples | ||
| 102 | mv ${D}${datadir}/examples/${PN}/* ${D}${datadir}/doc/${PN}/examples | ||
| 103 | rmdir ${D}${datadir}/examples/${PN} ${D}${datadir}/examples | ||
| 104 | } | ||
| 105 | |||
| 106 | do_install_ptest() { | ||
| 107 | install -d ${D}${PTEST_PATH}/conserver ${D}${PTEST_PATH}/console | ||
| 108 | ln -s ${sbindir}/conserver ${D}${PTEST_PATH}/conserver | ||
| 109 | ln -s ${bindir}/console ${D}${PTEST_PATH}/console | ||
| 110 | cp -a ${S}/test ${D}${PTEST_PATH} | ||
| 111 | } | ||
diff --git a/meta-oe/recipes-connectivity/gensio/gensio_3.0.1.bb b/meta-oe/recipes-connectivity/gensio/gensio_3.0.2.bb index 3427ef3a30..da6b1961d3 100644 --- a/meta-oe/recipes-connectivity/gensio/gensio_3.0.1.bb +++ b/meta-oe/recipes-connectivity/gensio/gensio_3.0.2.bb | |||
| @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | |||
| 5 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 5 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 6 | " | 6 | " |
| 7 | 7 | ||
| 8 | SRCREV = "f15f54da21697c3656a6fb3ad65a8bec1687c772" | 8 | SRCREV = "57320144c7f3a3ba3d00435a966aa811e219e374" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=ipv6-fix;tag=v${PV}" | 10 | SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master;tag=v${PV}" |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | inherit autotools | 13 | inherit autotools |
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_3.10.bb b/meta-oe/recipes-connectivity/iwd/iwd_3.11.bb index f52472adf8..c4956fb22c 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_3.10.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_3.11.bb | |||
| @@ -9,7 +9,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ | |||
| 9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ | 9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ |
| 10 | file://iwd \ | 10 | file://iwd \ |
| 11 | " | 11 | " |
| 12 | SRC_URI[sha256sum] = "640bff22540e1714f71772a83123aff6f810b7eb9d7d6df1e10fb2695beb5115" | 12 | SRC_URI[sha256sum] = "85730e79de05978e26e44b958fd11e2ebb45424ca181f8db7a8daf25fc2226ea" |
| 13 | 13 | ||
| 14 | inherit autotools manpages pkgconfig python3native systemd update-rc.d | 14 | inherit autotools manpages pkgconfig python3native systemd update-rc.d |
| 15 | 15 | ||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-Eliminate-old-style-function-declarations.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-Eliminate-old-style-function-declarations.patch deleted file mode 100644 index 3f90ccc56f..0000000000 --- a/meta-oe/recipes-connectivity/krb5/krb5/0001-Eliminate-old-style-function-declarations.patch +++ /dev/null | |||
| @@ -1,10803 +0,0 @@ | |||
| 1 | From adf3daca40e5fb2a8c08fd36a5006e70fef4de0d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ken Hornstein <kenh@cmf.nrl.navy.mil> | ||
| 3 | Date: Fri, 9 Jun 2023 23:53:53 -0400 | ||
| 4 | Subject: [PATCH] Eliminate old-style function declarations | ||
| 5 | |||
| 6 | The C2x standard removes support for non-prototype function | ||
| 7 | declarations, and clang 15 issues warnings for them | ||
| 8 | (https://reviews.llvm.org/D122895). Add -Werror=strict-prototypes to | ||
| 9 | the build and fix all of the non-prototype declarations and | ||
| 10 | definitions. | ||
| 11 | |||
| 12 | For RPC code, try to be consistent with libtirpc and recent *BSD | ||
| 13 | versions of rpcgen. This includes casting each time a concrete | ||
| 14 | function is used as an xdrproc_t value, since each XDR per-type | ||
| 15 | function accepts a different object pointer type. A few invocations | ||
| 16 | of xdrproc_t values pass a third argument with value LASTUNSIGNED, | ||
| 17 | even though XDR per-type functions accept only two parameters. | ||
| 18 | libtirpc has removed these third arguments; do so here as well. | ||
| 19 | |||
| 20 | [ghudson@mit.edu: added -Werror=strict-prototypes and fixed | ||
| 21 | declarations it breaks under gcc and clang; added xdrproc_t changes; | ||
| 22 | rewrote commit message; style changes] | ||
| 23 | |||
| 24 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
| 25 | Upstream-Status: Backport [https://github.com/krb5/krb5/commit/4b9d7f7c107f01a61600fddcd8cde3812d0366a2] | ||
| 26 | |||
| 27 | --- | ||
| 28 | src/aclocal.m4 | 2 +- | ||
| 29 | src/appl/gss-sample/gss-client.c | 29 +--- | ||
| 30 | src/appl/gss-sample/gss-misc.c | 26 +-- | ||
| 31 | src/appl/gss-sample/gss-server.c | 2 +- | ||
| 32 | src/appl/user_user/server.c | 5 +- | ||
| 33 | src/clients/kdestroy/kdestroy.c | 2 +- | ||
| 34 | src/clients/kinit/kinit.c | 4 +- | ||
| 35 | src/clients/klist/klist.c | 2 +- | ||
| 36 | src/clients/ksu/authorization.c | 95 ++++------ | ||
| 37 | src/clients/ksu/ccache.c | 108 ++++-------- | ||
| 38 | src/clients/ksu/heuristic.c | 94 ++++------ | ||
| 39 | src/clients/ksu/krb_auth_su.c | 49 ++---- | ||
| 40 | src/clients/ksu/main.c | 40 ++--- | ||
| 41 | src/clients/kvno/kvno.c | 2 +- | ||
| 42 | src/include/gssrpc/auth_gssapi.h | 10 +- | ||
| 43 | src/include/gssrpc/xdr.h | 3 +- | ||
| 44 | src/include/k5-int.h | 2 +- | ||
| 45 | src/include/k5-plugin.h | 2 +- | ||
| 46 | src/include/net-server.h | 6 +- | ||
| 47 | src/kadmin/cli/getdate.y | 3 - | ||
| 48 | src/kadmin/cli/kadmin.c | 6 +- | ||
| 49 | src/kadmin/cli/keytab.c | 4 +- | ||
| 50 | src/kadmin/dbutil/kdb5_create.c | 16 +- | ||
| 51 | src/kadmin/dbutil/kdb5_destroy.c | 4 +- | ||
| 52 | src/kadmin/dbutil/kdb5_stash.c | 4 +- | ||
| 53 | src/kadmin/dbutil/kdb5_util.c | 24 +-- | ||
| 54 | src/kadmin/dbutil/ovload.c | 14 +- | ||
| 55 | src/kadmin/dbutil/strtok.c | 4 +- | ||
| 56 | src/kadmin/ktutil/ktutil.c | 45 ++--- | ||
| 57 | src/kadmin/ktutil/ktutil_funcs.c | 37 ++-- | ||
| 58 | src/kadmin/server/ipropd_svc.c | 24 +-- | ||
| 59 | src/kadmin/server/kadm_rpc_svc.c | 162 +++++++++--------- | ||
| 60 | src/kadmin/server/ovsec_kadmd.c | 4 +- | ||
| 61 | src/kdc/t_ndr.c | 2 +- | ||
| 62 | src/kdc/t_replay.c | 6 +- | ||
| 63 | src/kprop/kpropd.c | 2 +- | ||
| 64 | src/kprop/kproplog.c | 4 +- | ||
| 65 | src/lib/apputils/net-server.c | 7 +- | ||
| 66 | src/lib/crypto/builtin/aes/aes-gen.c | 18 +- | ||
| 67 | .../crypto/builtin/camellia/camellia-gen.c | 18 +- | ||
| 68 | src/lib/crypto/builtin/des/des_int.h | 3 - | ||
| 69 | src/lib/crypto/builtin/des/destest.c | 21 +-- | ||
| 70 | src/lib/crypto/builtin/des/t_verify.c | 15 +- | ||
| 71 | src/lib/crypto/builtin/sha1/t_shs.c | 7 +- | ||
| 72 | src/lib/crypto/builtin/sha1/t_shs3.c | 7 +- | ||
| 73 | src/lib/crypto/crypto_tests/aes-test.c | 8 +- | ||
| 74 | src/lib/crypto/crypto_tests/camellia-test.c | 8 +- | ||
| 75 | src/lib/crypto/crypto_tests/t_cf2.c | 4 +- | ||
| 76 | src/lib/crypto/crypto_tests/t_cts.c | 2 +- | ||
| 77 | src/lib/crypto/crypto_tests/t_encrypt.c | 2 +- | ||
| 78 | src/lib/crypto/crypto_tests/t_fork.c | 2 +- | ||
| 79 | src/lib/crypto/crypto_tests/t_hmac.c | 3 +- | ||
| 80 | src/lib/crypto/crypto_tests/t_mddriver.c | 25 ++- | ||
| 81 | src/lib/crypto/crypto_tests/t_nfold.c | 16 +- | ||
| 82 | src/lib/crypto/crypto_tests/t_prf.c | 2 +- | ||
| 83 | src/lib/crypto/crypto_tests/t_sha2.c | 2 +- | ||
| 84 | src/lib/gssapi/generic/t_seqstate.c | 2 +- | ||
| 85 | src/lib/gssapi/krb5/accept_sec_context.c | 76 +++----- | ||
| 86 | src/lib/gssapi/krb5/compare_name.c | 7 +- | ||
| 87 | src/lib/gssapi/krb5/context_time.c | 6 +- | ||
| 88 | src/lib/gssapi/krb5/delete_sec_context.c | 7 +- | ||
| 89 | src/lib/gssapi/krb5/disp_name.c | 9 +- | ||
| 90 | src/lib/gssapi/krb5/disp_status.c | 11 +- | ||
| 91 | src/lib/gssapi/krb5/export_sec_context.c | 7 +- | ||
| 92 | src/lib/gssapi/krb5/gssapi_krb5.c | 4 +- | ||
| 93 | src/lib/gssapi/krb5/import_name.c | 8 +- | ||
| 94 | src/lib/gssapi/krb5/import_sec_context.c | 10 +- | ||
| 95 | src/lib/gssapi/krb5/indicate_mechs.c | 4 +- | ||
| 96 | src/lib/gssapi/krb5/init_sec_context.c | 55 ++---- | ||
| 97 | src/lib/gssapi/krb5/inq_context.c | 17 +- | ||
| 98 | src/lib/gssapi/krb5/inq_cred.c | 26 +-- | ||
| 99 | src/lib/gssapi/krb5/inq_names.c | 6 +- | ||
| 100 | src/lib/gssapi/krb5/k5seal.c | 38 ++-- | ||
| 101 | src/lib/gssapi/krb5/k5unseal.c | 51 ++---- | ||
| 102 | src/lib/gssapi/krb5/process_context_token.c | 8 +- | ||
| 103 | src/lib/gssapi/krb5/rel_cred.c | 4 +- | ||
| 104 | src/lib/gssapi/krb5/rel_name.c | 4 +- | ||
| 105 | src/lib/gssapi/krb5/rel_oid.c | 8 +- | ||
| 106 | src/lib/gssapi/krb5/ser_sctx.c | 16 +- | ||
| 107 | src/lib/gssapi/krb5/util_cksum.c | 6 +- | ||
| 108 | src/lib/gssapi/krb5/util_seed.c | 5 +- | ||
| 109 | src/lib/gssapi/krb5/util_seqnum.c | 19 +- | ||
| 110 | src/lib/gssapi/krb5/val_cred.c | 4 +- | ||
| 111 | src/lib/gssapi/krb5/wrap_size_limit.c | 11 +- | ||
| 112 | .../gssapi/mechglue/g_accept_sec_context.c | 31 +--- | ||
| 113 | src/lib/gssapi/mechglue/g_acquire_cred.c | 95 +++------- | ||
| 114 | .../gssapi/mechglue/g_acquire_cred_with_pw.c | 56 ++---- | ||
| 115 | src/lib/gssapi/mechglue/g_canon_name.c | 10 +- | ||
| 116 | src/lib/gssapi/mechglue/g_compare_name.c | 12 +- | ||
| 117 | src/lib/gssapi/mechglue/g_context_time.c | 10 +- | ||
| 118 | .../gssapi/mechglue/g_delete_sec_context.c | 10 +- | ||
| 119 | src/lib/gssapi/mechglue/g_dsp_name.c | 12 +- | ||
| 120 | src/lib/gssapi/mechglue/g_dsp_status.c | 22 +-- | ||
| 121 | src/lib/gssapi/mechglue/g_dup_name.c | 8 +- | ||
| 122 | src/lib/gssapi/mechglue/g_exp_sec_context.c | 10 +- | ||
| 123 | src/lib/gssapi/mechglue/g_export_name.c | 8 +- | ||
| 124 | src/lib/gssapi/mechglue/g_glue.c | 75 +++----- | ||
| 125 | src/lib/gssapi/mechglue/g_imp_name.c | 18 +- | ||
| 126 | src/lib/gssapi/mechglue/g_imp_sec_context.c | 11 +- | ||
| 127 | src/lib/gssapi/mechglue/g_init_sec_context.c | 37 +--- | ||
| 128 | src/lib/gssapi/mechglue/g_initialize.c | 22 +-- | ||
| 129 | src/lib/gssapi/mechglue/g_inq_cred.c | 31 +--- | ||
| 130 | src/lib/gssapi/mechglue/g_inq_names.c | 8 +- | ||
| 131 | src/lib/gssapi/mechglue/g_mechname.c | 14 +- | ||
| 132 | src/lib/gssapi/mechglue/g_oid_ops.c | 27 +-- | ||
| 133 | src/lib/gssapi/mechglue/g_process_context.c | 10 +- | ||
| 134 | src/lib/gssapi/mechglue/g_rel_buffer.c | 6 +- | ||
| 135 | src/lib/gssapi/mechglue/g_rel_cred.c | 7 +- | ||
| 136 | src/lib/gssapi/mechglue/g_rel_name.c | 7 +- | ||
| 137 | src/lib/gssapi/mechglue/g_rel_oid_set.c | 6 +- | ||
| 138 | src/lib/gssapi/mechglue/g_sign.c | 29 +--- | ||
| 139 | src/lib/gssapi/mechglue/g_store_cred.c | 48 ++---- | ||
| 140 | src/lib/gssapi/mechglue/g_unseal.c | 35 +--- | ||
| 141 | src/lib/gssapi/mechglue/g_unwrap_aead.c | 19 +- | ||
| 142 | src/lib/gssapi/mechglue/g_unwrap_iov.c | 15 +- | ||
| 143 | src/lib/gssapi/mechglue/g_verify.c | 30 +--- | ||
| 144 | src/lib/gssapi/mechglue/g_wrap_aead.c | 39 ++--- | ||
| 145 | src/lib/gssapi/mechglue/g_wrap_iov.c | 43 +---- | ||
| 146 | src/lib/kadm5/clnt/client_rpc.c | 1 + | ||
| 147 | src/lib/kadm5/kadm_rpc.h | 45 ----- | ||
| 148 | src/lib/kadm5/kadm_rpc_xdr.c | 37 ++-- | ||
| 149 | src/lib/kadm5/misc_free.c | 5 +- | ||
| 150 | src/lib/kadm5/srv/adb_xdr.c | 6 +- | ||
| 151 | src/lib/kadm5/srv/svr_principal.c | 12 +- | ||
| 152 | src/lib/kadm5/str_conv.c | 18 +- | ||
| 153 | src/lib/kadm5/t_kadm5.c | 22 +-- | ||
| 154 | src/lib/kdb/kdb5.c | 8 +- | ||
| 155 | src/lib/kdb/kdb_cpw.c | 32 +--- | ||
| 156 | src/lib/kdb/keytab.c | 19 +- | ||
| 157 | src/lib/kdb/t_stringattr.c | 2 +- | ||
| 158 | src/lib/krad/packet.c | 2 +- | ||
| 159 | src/lib/krad/t_attr.c | 2 +- | ||
| 160 | src/lib/krad/t_attrset.c | 2 +- | ||
| 161 | src/lib/krad/t_code.c | 2 +- | ||
| 162 | src/lib/krb5/ccache/cc_keyring.c | 2 +- | ||
| 163 | src/lib/krb5/krb/plugin.c | 2 +- | ||
| 164 | src/lib/krb5/krb/t_authdata.c | 2 +- | ||
| 165 | src/lib/krb5/krb/t_response_items.c | 2 +- | ||
| 166 | src/lib/krb5/krb/t_ser.c | 8 +- | ||
| 167 | src/lib/krb5/krb/t_sname_match.c | 2 +- | ||
| 168 | src/lib/krb5/krb/t_valid_times.c | 2 +- | ||
| 169 | src/lib/krb5/rcache/t_memrcache.c | 2 +- | ||
| 170 | src/lib/rpc/auth_gss.c | 4 +- | ||
| 171 | src/lib/rpc/auth_gssapi.c | 14 +- | ||
| 172 | src/lib/rpc/auth_gssapi_misc.c | 4 +- | ||
| 173 | src/lib/rpc/authunix_prot.c | 3 +- | ||
| 174 | src/lib/rpc/clnt_perror.c | 1 - | ||
| 175 | src/lib/rpc/clnt_raw.c | 2 +- | ||
| 176 | src/lib/rpc/dyn.c | 85 ++++----- | ||
| 177 | src/lib/rpc/pmap_clnt.c | 9 +- | ||
| 178 | src/lib/rpc/pmap_getmaps.c | 5 +- | ||
| 179 | src/lib/rpc/pmap_getport.c | 6 +- | ||
| 180 | src/lib/rpc/pmap_prot2.c | 3 +- | ||
| 181 | src/lib/rpc/pmap_rmt.c | 7 +- | ||
| 182 | src/lib/rpc/rpc_prot.c | 4 +- | ||
| 183 | src/lib/rpc/svc.c | 4 +- | ||
| 184 | src/lib/rpc/svc_auth_gss.c | 10 +- | ||
| 185 | src/lib/rpc/svc_auth_gssapi.c | 28 +-- | ||
| 186 | src/lib/rpc/svc_simple.c | 4 +- | ||
| 187 | src/lib/rpc/unit-test/client.c | 18 +- | ||
| 188 | src/lib/rpc/unit-test/rpc_test_clnt.c | 4 +- | ||
| 189 | src/lib/rpc/unit-test/rpc_test_svc.c | 16 +- | ||
| 190 | src/lib/rpc/unit-test/server.c | 2 +- | ||
| 191 | src/lib/rpc/xdr.c | 4 +- | ||
| 192 | src/lib/rpc/xdr_array.c | 4 +- | ||
| 193 | src/lib/rpc/xdr_rec.c | 13 +- | ||
| 194 | src/lib/rpc/xdr_reference.c | 4 +- | ||
| 195 | src/lib/rpc/xdr_sizeof.c | 29 +--- | ||
| 196 | src/plugins/kdb/db2/db2_exp.c | 4 +- | ||
| 197 | src/plugins/kdb/db2/libdb2/btree/bt_close.c | 10 +- | ||
| 198 | src/plugins/kdb/db2/libdb2/btree/bt_conv.c | 13 +- | ||
| 199 | src/plugins/kdb/db2/libdb2/btree/bt_delete.c | 34 +--- | ||
| 200 | src/plugins/kdb/db2/libdb2/btree/bt_get.c | 6 +- | ||
| 201 | src/plugins/kdb/db2/libdb2/btree/bt_open.c | 12 +- | ||
| 202 | .../kdb/db2/libdb2/btree/bt_overflow.c | 16 +- | ||
| 203 | src/plugins/kdb/db2/libdb2/btree/bt_page.c | 8 +- | ||
| 204 | src/plugins/kdb/db2/libdb2/btree/bt_put.c | 11 +- | ||
| 205 | src/plugins/kdb/db2/libdb2/btree/bt_search.c | 17 +- | ||
| 206 | src/plugins/kdb/db2/libdb2/btree/bt_seq.c | 27 +-- | ||
| 207 | src/plugins/kdb/db2/libdb2/btree/bt_split.c | 42 +---- | ||
| 208 | src/plugins/kdb/db2/libdb2/btree/bt_utils.c | 18 +- | ||
| 209 | src/plugins/kdb/db2/libdb2/db/db.c | 26 ++- | ||
| 210 | src/plugins/kdb/db2/libdb2/hash/dbm.c | 50 ++---- | ||
| 211 | src/plugins/kdb/db2/libdb2/hash/hash.c | 94 +++------- | ||
| 212 | src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c | 35 +--- | ||
| 213 | src/plugins/kdb/db2/libdb2/hash/hash_func.c | 16 +- | ||
| 214 | src/plugins/kdb/db2/libdb2/hash/hash_log2.c | 3 +- | ||
| 215 | src/plugins/kdb/db2/libdb2/hash/hash_page.c | 121 ++++--------- | ||
| 216 | src/plugins/kdb/db2/libdb2/hash/hsearch.c | 9 +- | ||
| 217 | src/plugins/kdb/db2/libdb2/mpool/mpool.c | 54 ++---- | ||
| 218 | src/plugins/kdb/db2/libdb2/recno/rec_close.c | 7 +- | ||
| 219 | src/plugins/kdb/db2/libdb2/recno/rec_delete.c | 14 +- | ||
| 220 | src/plugins/kdb/db2/libdb2/recno/rec_get.c | 22 +-- | ||
| 221 | src/plugins/kdb/db2/libdb2/recno/rec_open.c | 9 +- | ||
| 222 | src/plugins/kdb/db2/libdb2/recno/rec_put.c | 12 +- | ||
| 223 | src/plugins/kdb/db2/libdb2/recno/rec_search.c | 5 +- | ||
| 224 | src/plugins/kdb/db2/libdb2/recno/rec_seq.c | 5 +- | ||
| 225 | src/plugins/kdb/db2/libdb2/recno/rec_utils.c | 6 +- | ||
| 226 | src/plugins/kdb/db2/libdb2/test/dbtest.c | 59 ++----- | ||
| 227 | src/plugins/kdb/db2/pol_xdr.c | 2 +- | ||
| 228 | .../kdb/ldap/ldap_util/kdb5_ldap_util.c | 4 +- | ||
| 229 | src/plugins/kdb/lmdb/kdb_lmdb.c | 4 +- | ||
| 230 | src/plugins/kdb/test/kdb_test.c | 4 +- | ||
| 231 | .../preauth/pkinit/pkinit_crypto_openssl.c | 4 +- | ||
| 232 | src/plugins/preauth/spake/t_vectors.c | 2 +- | ||
| 233 | src/tests/asn.1/krb5_decode_test.c | 5 +- | ||
| 234 | src/tests/asn.1/krb5_encode_test.c | 13 +- | ||
| 235 | src/tests/asn.1/t_trval.c | 14 +- | ||
| 236 | src/tests/asn.1/trval.c | 73 +++----- | ||
| 237 | src/tests/conccache.c | 4 +- | ||
| 238 | src/tests/create/kdb5_mkdums.c | 16 +- | ||
| 239 | src/tests/forward.c | 2 +- | ||
| 240 | src/tests/gss-threads/gss-client.c | 4 +- | ||
| 241 | src/tests/gss-threads/gss-server.c | 2 +- | ||
| 242 | src/tests/gssapi/reload.c | 2 +- | ||
| 243 | src/tests/gssapi/t_add_cred.c | 2 +- | ||
| 244 | src/tests/gssapi/t_enctypes.c | 2 +- | ||
| 245 | src/tests/gssapi/t_invalid.c | 2 +- | ||
| 246 | src/tests/gssapi/t_oid.c | 2 +- | ||
| 247 | src/tests/gssapi/t_spnego.c | 2 +- | ||
| 248 | src/tests/hammer/kdc5_hammer.c | 36 ++-- | ||
| 249 | src/tests/kdbtest.c | 2 +- | ||
| 250 | src/tests/misc/test_getpw.c | 2 +- | ||
| 251 | src/tests/plugorder.c | 2 +- | ||
| 252 | src/tests/shlib/t_loader.c | 2 +- | ||
| 253 | src/tests/softpkcs11/main.c | 2 +- | ||
| 254 | src/tests/t_inetd.c | 7 +- | ||
| 255 | src/tests/test1.c | 4 +- | ||
| 256 | src/tests/verify/kdb5_verify.c | 17 +- | ||
| 257 | src/util/et/error_message.c | 2 +- | ||
| 258 | src/util/et/test_et.c | 3 +- | ||
| 259 | src/util/profile/prof_init.c | 2 +- | ||
| 260 | src/util/profile/t_profile.c | 22 +-- | ||
| 261 | src/util/profile/test_load.c | 2 +- | ||
| 262 | src/util/profile/test_parse.c | 5 +- | ||
| 263 | src/util/profile/test_profile.c | 10 +- | ||
| 264 | src/util/profile/test_vtable.c | 3 +- | ||
| 265 | src/util/ss/error.c | 13 +- | ||
| 266 | src/util/ss/execute_cmd.c | 23 +-- | ||
| 267 | src/util/ss/help.c | 115 ++++++------- | ||
| 268 | src/util/ss/invocation.c | 13 +- | ||
| 269 | src/util/ss/list_rqs.c | 11 +- | ||
| 270 | src/util/ss/listen.c | 32 ++-- | ||
| 271 | src/util/ss/pager.c | 10 +- | ||
| 272 | src/util/ss/parse.c | 6 +- | ||
| 273 | src/util/ss/prompt.c | 7 +- | ||
| 274 | src/util/ss/request_tbl.c | 11 +- | ||
| 275 | src/util/ss/requests.c | 2 +- | ||
| 276 | src/util/ss/ss.h | 1 - | ||
| 277 | src/util/ss/ss_internal.h | 3 +- | ||
| 278 | src/util/support/plugins.c | 10 +- | ||
| 279 | src/util/support/t_hashtab.c | 6 +- | ||
| 280 | src/util/support/t_hex.c | 3 +- | ||
| 281 | src/util/support/t_json.c | 2 +- | ||
| 282 | src/util/support/t_k5buf.c | 16 +- | ||
| 283 | src/util/support/t_unal.c | 3 +- | ||
| 284 | 256 files changed, 1387 insertions(+), 2745 deletions(-) | ||
| 285 | |||
| 286 | diff --git a/src/aclocal.m4 b/src/aclocal.m4 | ||
| 287 | index 3d66a87..6457cdc 100644 | ||
| 288 | --- a/src/aclocal.m4 | ||
| 289 | +++ b/src/aclocal.m4 | ||
| 290 | @@ -545,7 +545,7 @@ if test "$GCC" = yes ; then | ||
| 291 | TRY_WARN_CC_FLAG(-Wno-format-zero-length) | ||
| 292 | # Other flags here may not be supported on some versions of | ||
| 293 | # gcc that people want to use. | ||
| 294 | - for flag in overflow strict-overflow missing-format-attribute missing-prototypes return-type missing-braces parentheses switch unused-function unused-label unused-variable unused-value unknown-pragmas sign-compare newline-eof error=uninitialized no-maybe-uninitialized error=pointer-arith error=int-conversion error=incompatible-pointer-types error=discarded-qualifiers error=implicit-int ; do | ||
| 295 | + for flag in overflow strict-overflow missing-format-attribute missing-prototypes return-type missing-braces parentheses switch unused-function unused-label unused-variable unused-value unknown-pragmas sign-compare newline-eof error=uninitialized no-maybe-uninitialized error=pointer-arith error=int-conversion error=incompatible-pointer-types error=discarded-qualifiers error=implicit-int error=strict-prototypes; do | ||
| 296 | TRY_WARN_CC_FLAG(-W$flag) | ||
| 297 | done | ||
| 298 | # old-style-definition? generates many, many warnings | ||
| 299 | diff --git a/src/appl/gss-sample/gss-client.c b/src/appl/gss-sample/gss-client.c | ||
| 300 | index 6e2aa33..0722ae1 100644 | ||
| 301 | --- a/src/appl/gss-sample/gss-client.c | ||
| 302 | +++ b/src/appl/gss-sample/gss-client.c | ||
| 303 | @@ -75,7 +75,7 @@ static gss_OID_desc gss_spnego_mechanism_oid_desc = | ||
| 304 | {6, (void *)"\x2b\x06\x01\x05\x05\x02"}; | ||
| 305 | |||
| 306 | static void | ||
| 307 | -usage() | ||
| 308 | +usage(void) | ||
| 309 | { | ||
| 310 | fprintf(stderr, "Usage: gss-client [-port port] [-mech mechanism] " | ||
| 311 | "[-spnego] [-d]\n"); | ||
| 312 | @@ -359,9 +359,7 @@ client_establish_context(int s, char *service_name, OM_uint32 gss_flags, | ||
| 313 | } | ||
| 314 | |||
| 315 | static void | ||
| 316 | -read_file(file_name, in_buf) | ||
| 317 | - char *file_name; | ||
| 318 | - gss_buffer_t in_buf; | ||
| 319 | +read_file(char *file_name, gss_buffer_t in_buf) | ||
| 320 | { | ||
| 321 | int fd, count; | ||
| 322 | struct stat stat_buf; | ||
| 323 | @@ -431,21 +429,10 @@ read_file(file_name, in_buf) | ||
| 324 | * verifies it with gss_verify. -1 is returned if any step fails, | ||
| 325 | * otherwise 0 is returned. */ | ||
| 326 | static int | ||
| 327 | -call_server(host, port, oid, service_name, gss_flags, auth_flag, | ||
| 328 | - wrap_flag, encrypt_flag, mic_flag, v1_format, msg, use_file, | ||
| 329 | - mcount, username, password) | ||
| 330 | - char *host; | ||
| 331 | - u_short port; | ||
| 332 | - gss_OID oid; | ||
| 333 | - char *service_name; | ||
| 334 | - OM_uint32 gss_flags; | ||
| 335 | - int auth_flag, wrap_flag, encrypt_flag, mic_flag; | ||
| 336 | - int v1_format; | ||
| 337 | - char *msg; | ||
| 338 | - int use_file; | ||
| 339 | - int mcount; | ||
| 340 | - char *username; | ||
| 341 | - char *password; | ||
| 342 | +call_server(char *host, u_short port, gss_OID oid, char *service_name, | ||
| 343 | + OM_uint32 gss_flags, int auth_flag, int wrap_flag, | ||
| 344 | + int encrypt_flag, int mic_flag, int v1_format, char *msg, | ||
| 345 | + int use_file, int mcount, char *username, char *password) | ||
| 346 | { | ||
| 347 | gss_ctx_id_t context = GSS_C_NO_CONTEXT; | ||
| 348 | gss_buffer_desc in_buf, out_buf; | ||
| 349 | @@ -774,9 +761,7 @@ worker_bee(void *unused) | ||
| 350 | } | ||
| 351 | |||
| 352 | int | ||
| 353 | -main(argc, argv) | ||
| 354 | - int argc; | ||
| 355 | - char **argv; | ||
| 356 | +main(int argc, char **argv) | ||
| 357 | { | ||
| 358 | int i; | ||
| 359 | |||
| 360 | diff --git a/src/appl/gss-sample/gss-misc.c b/src/appl/gss-sample/gss-misc.c | ||
| 361 | index 1d051ed..7eb4c79 100644 | ||
| 362 | --- a/src/appl/gss-sample/gss-misc.c | ||
| 363 | +++ b/src/appl/gss-sample/gss-misc.c | ||
| 364 | @@ -157,10 +157,7 @@ read_all(int fildes, void *data, unsigned int nbyte) | ||
| 365 | * if an error occurs or if it could not write all the data. | ||
| 366 | */ | ||
| 367 | int | ||
| 368 | -send_token(s, flags, tok) | ||
| 369 | - int s; | ||
| 370 | - int flags; | ||
| 371 | - gss_buffer_t tok; | ||
| 372 | +send_token(int s, int flags, gss_buffer_t tok) | ||
| 373 | { | ||
| 374 | int ret; | ||
| 375 | unsigned char char_flags = (unsigned char) flags; | ||
| 376 | @@ -230,10 +227,7 @@ send_token(s, flags, tok) | ||
| 377 | * and -1 if an error occurs or if it could not read all the data. | ||
| 378 | */ | ||
| 379 | int | ||
| 380 | -recv_token(s, flags, tok) | ||
| 381 | - int s; | ||
| 382 | - int *flags; | ||
| 383 | - gss_buffer_t tok; | ||
| 384 | +recv_token(int s, int *flags, gss_buffer_t tok) | ||
| 385 | { | ||
| 386 | int ret; | ||
| 387 | unsigned char char_flags; | ||
| 388 | @@ -303,10 +297,7 @@ recv_token(s, flags, tok) | ||
| 389 | } | ||
| 390 | |||
| 391 | static void | ||
| 392 | -display_status_1(m, code, type) | ||
| 393 | - char *m; | ||
| 394 | - OM_uint32 code; | ||
| 395 | - int type; | ||
| 396 | +display_status_1(char *m, OM_uint32 code, int type) | ||
| 397 | { | ||
| 398 | OM_uint32 min_stat; | ||
| 399 | gss_buffer_desc msg; | ||
| 400 | @@ -344,10 +335,7 @@ display_status_1(m, code, type) | ||
| 401 | * followed by a newline. | ||
| 402 | */ | ||
| 403 | void | ||
| 404 | -display_status(msg, maj_stat, min_stat) | ||
| 405 | - char *msg; | ||
| 406 | - OM_uint32 maj_stat; | ||
| 407 | - OM_uint32 min_stat; | ||
| 408 | +display_status(char *msg, OM_uint32 maj_stat, OM_uint32 min_stat) | ||
| 409 | { | ||
| 410 | display_status_1(msg, maj_stat, GSS_C_GSS_CODE); | ||
| 411 | display_status_1(msg, min_stat, GSS_C_MECH_CODE); | ||
| 412 | @@ -370,8 +358,7 @@ display_status(msg, maj_stat, min_stat) | ||
| 413 | */ | ||
| 414 | |||
| 415 | void | ||
| 416 | -display_ctx_flags(flags) | ||
| 417 | - OM_uint32 flags; | ||
| 418 | +display_ctx_flags(OM_uint32 flags) | ||
| 419 | { | ||
| 420 | if (flags & GSS_C_DELEG_FLAG) | ||
| 421 | fprintf(display_file, "context flag: GSS_C_DELEG_FLAG\n"); | ||
| 422 | @@ -388,8 +375,7 @@ display_ctx_flags(flags) | ||
| 423 | } | ||
| 424 | |||
| 425 | void | ||
| 426 | -print_token(tok) | ||
| 427 | - gss_buffer_t tok; | ||
| 428 | +print_token(gss_buffer_t tok) | ||
| 429 | { | ||
| 430 | unsigned int i; | ||
| 431 | unsigned char *p = tok->value; | ||
| 432 | diff --git a/src/appl/gss-sample/gss-server.c b/src/appl/gss-sample/gss-server.c | ||
| 433 | index 9b6ce9f..0e9c857 100644 | ||
| 434 | --- a/src/appl/gss-sample/gss-server.c | ||
| 435 | +++ b/src/appl/gss-sample/gss-server.c | ||
| 436 | @@ -73,7 +73,7 @@ static OM_uint32 | ||
| 437 | showLocalIdentity(OM_uint32 *minor, gss_name_t name); | ||
| 438 | |||
| 439 | static void | ||
| 440 | -usage() | ||
| 441 | +usage(void) | ||
| 442 | { | ||
| 443 | fprintf(stderr, "Usage: gss-server [-port port] [-verbose] [-once]"); | ||
| 444 | #ifdef _WIN32 | ||
| 445 | diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c | ||
| 446 | index f2b5b61..afb3d2b 100644 | ||
| 447 | --- a/src/appl/user_user/server.c | ||
| 448 | +++ b/src/appl/user_user/server.c | ||
| 449 | @@ -39,9 +39,8 @@ | ||
| 450 | |||
| 451 | /* fd 0 is a tcp socket used to talk to the client */ | ||
| 452 | |||
| 453 | -int main(argc, argv) | ||
| 454 | - int argc; | ||
| 455 | - char *argv[]; | ||
| 456 | +int | ||
| 457 | +main(int argc, char *argv[]) | ||
| 458 | { | ||
| 459 | krb5_data pname_data, tkt_data; | ||
| 460 | int sock = 0; | ||
| 461 | diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c | ||
| 462 | index 774b729..48f672a 100644 | ||
| 463 | --- a/src/clients/kdestroy/kdestroy.c | ||
| 464 | +++ b/src/clients/kdestroy/kdestroy.c | ||
| 465 | @@ -47,7 +47,7 @@ char *progname; | ||
| 466 | |||
| 467 | |||
| 468 | static void | ||
| 469 | -usage() | ||
| 470 | +usage(void) | ||
| 471 | { | ||
| 472 | fprintf(stderr, _("Usage: %s [-A] [-q] [-c cache_name] [-p princ_name]\n"), | ||
| 473 | progname); | ||
| 474 | diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c | ||
| 475 | index f4c7b2b..7a33ffa 100644 | ||
| 476 | --- a/src/clients/kinit/kinit.c | ||
| 477 | +++ b/src/clients/kinit/kinit.c | ||
| 478 | @@ -45,7 +45,7 @@ | ||
| 479 | #ifdef HAVE_PWD_H | ||
| 480 | #include <pwd.h> | ||
| 481 | static char * | ||
| 482 | -get_name_from_os() | ||
| 483 | +get_name_from_os(void) | ||
| 484 | { | ||
| 485 | struct passwd *pw; | ||
| 486 | |||
| 487 | @@ -137,7 +137,7 @@ const char *shopts = "r:fpFPn54aAVl:s:c:kit:T:RS:vX:CEI:"; | ||
| 488 | #define USAGE_BREAK "\n\t" | ||
| 489 | |||
| 490 | static void | ||
| 491 | -usage() | ||
| 492 | +usage(void) | ||
| 493 | { | ||
| 494 | fprintf(stderr, | ||
| 495 | _("Usage: %s [-V] [-l lifetime] [-s start_time] " | ||
| 496 | diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c | ||
| 497 | index dcdc5a2..c797b16 100644 | ||
| 498 | --- a/src/clients/klist/klist.c | ||
| 499 | +++ b/src/clients/klist/klist.c | ||
| 500 | @@ -80,7 +80,7 @@ static void fillit(FILE *, unsigned int, int); | ||
| 501 | #define KEYTAB 2 | ||
| 502 | |||
| 503 | static void | ||
| 504 | -usage() | ||
| 505 | +usage(void) | ||
| 506 | { | ||
| 507 | fprintf(stderr, _("Usage: %s [-e] [-V] [[-c] [-l] [-A] [-d] [-f] [-s] " | ||
| 508 | "[-a [-n]]] [-k [-i] [-t] [-K]] [-C] [name]\n"), | ||
| 509 | diff --git a/src/clients/ksu/authorization.c b/src/clients/ksu/authorization.c | ||
| 510 | index fb9d5d0..17a8a8f 100644 | ||
| 511 | --- a/src/clients/ksu/authorization.c | ||
| 512 | +++ b/src/clients/ksu/authorization.c | ||
| 513 | @@ -30,9 +30,8 @@ | ||
| 514 | |||
| 515 | static void auth_cleanup (FILE *, FILE *, char *); | ||
| 516 | |||
| 517 | -krb5_boolean fowner(fp, uid) | ||
| 518 | - FILE *fp; | ||
| 519 | - uid_t uid; | ||
| 520 | +krb5_boolean | ||
| 521 | +fowner(FILE *fp, uid_t uid) | ||
| 522 | { | ||
| 523 | struct stat sbuf; | ||
| 524 | |||
| 525 | @@ -59,16 +58,10 @@ krb5_boolean fowner(fp, uid) | ||
| 526 | * | ||
| 527 | */ | ||
| 528 | |||
| 529 | -krb5_error_code krb5_authorization(context, principal, luser, | ||
| 530 | - cmd, ok, out_fcmd) | ||
| 531 | -/* IN */ | ||
| 532 | - krb5_context context; | ||
| 533 | - krb5_principal principal; | ||
| 534 | - const char *luser; | ||
| 535 | - char *cmd; | ||
| 536 | - /* OUT */ | ||
| 537 | - krb5_boolean *ok; | ||
| 538 | - char **out_fcmd; | ||
| 539 | +krb5_error_code | ||
| 540 | +krb5_authorization(krb5_context context, krb5_principal principal, | ||
| 541 | + const char *luser, char *cmd, krb5_boolean *ok, | ||
| 542 | + char **out_fcmd) | ||
| 543 | { | ||
| 544 | struct passwd *pwd; | ||
| 545 | char *princname; | ||
| 546 | @@ -178,10 +171,8 @@ any tokens after the principal name FALSE is returned. | ||
| 547 | |||
| 548 | ***********************************************************/ | ||
| 549 | |||
| 550 | -krb5_error_code k5login_lookup (fp, princname, found) | ||
| 551 | - FILE *fp; | ||
| 552 | - char *princname; | ||
| 553 | - krb5_boolean *found; | ||
| 554 | +krb5_error_code | ||
| 555 | +k5login_lookup(FILE *fp, char *princname, krb5_boolean *found) | ||
| 556 | { | ||
| 557 | |||
| 558 | krb5_error_code retval; | ||
| 559 | @@ -240,12 +231,9 @@ if princname is found{ | ||
| 560 | |||
| 561 | |||
| 562 | ***********************************************************/ | ||
| 563 | -krb5_error_code k5users_lookup (fp, princname, cmd, found, out_fcmd) | ||
| 564 | - FILE *fp; | ||
| 565 | - char *princname; | ||
| 566 | - char *cmd; | ||
| 567 | - krb5_boolean *found; | ||
| 568 | - char **out_fcmd; | ||
| 569 | +krb5_error_code | ||
| 570 | +k5users_lookup(FILE *fp, char *princname, char *cmd, | ||
| 571 | + krb5_boolean *found, char **out_fcmd) | ||
| 572 | { | ||
| 573 | krb5_error_code retval; | ||
| 574 | char * line; | ||
| 575 | @@ -328,10 +316,8 @@ resolves it into a full path name. | ||
| 576 | |||
| 577 | ************************************************/ | ||
| 578 | |||
| 579 | -krb5_boolean fcmd_resolve(fcmd, out_fcmd, out_err) | ||
| 580 | - char *fcmd; | ||
| 581 | - char ***out_fcmd; | ||
| 582 | - char **out_err; | ||
| 583 | +krb5_boolean | ||
| 584 | +fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err) | ||
| 585 | { | ||
| 586 | char * err; | ||
| 587 | char ** tmp_fcmd; | ||
| 588 | @@ -407,8 +393,8 @@ cmd_single - checks if cmd consists of a path | ||
| 589 | |||
| 590 | ********************************************/ | ||
| 591 | |||
| 592 | -krb5_boolean cmd_single(cmd) | ||
| 593 | - char * cmd; | ||
| 594 | +krb5_boolean | ||
| 595 | +cmd_single(char *cmd) | ||
| 596 | { | ||
| 597 | |||
| 598 | if ( ( strrchr( cmd, '/')) == NULL){ | ||
| 599 | @@ -423,9 +409,8 @@ cmd_arr_cmp_postfix - compares a command with the postfix | ||
| 600 | of fcmd | ||
| 601 | ********************************************/ | ||
| 602 | |||
| 603 | -int cmd_arr_cmp_postfix(fcmd_arr, cmd) | ||
| 604 | - char **fcmd_arr; | ||
| 605 | - char *cmd; | ||
| 606 | +int | ||
| 607 | +cmd_arr_cmp_postfix(char **fcmd_arr, char *cmd) | ||
| 608 | { | ||
| 609 | char * temp_fcmd; | ||
| 610 | char *ptr; | ||
| 611 | @@ -457,9 +442,8 @@ cmd_arr_cmp - checks if cmd matches any | ||
| 612 | |||
| 613 | **********************************************/ | ||
| 614 | |||
| 615 | -int cmd_arr_cmp (fcmd_arr, cmd) | ||
| 616 | - char **fcmd_arr; | ||
| 617 | - char *cmd; | ||
| 618 | +int | ||
| 619 | +cmd_arr_cmp(char **fcmd_arr, char *cmd) | ||
| 620 | { | ||
| 621 | int result =1; | ||
| 622 | int i = 0; | ||
| 623 | @@ -475,10 +459,8 @@ int cmd_arr_cmp (fcmd_arr, cmd) | ||
| 624 | } | ||
| 625 | |||
| 626 | |||
| 627 | -krb5_boolean find_first_cmd_that_exists(fcmd_arr, cmd_out, err_out) | ||
| 628 | - char **fcmd_arr; | ||
| 629 | - char **cmd_out; | ||
| 630 | - char **err_out; | ||
| 631 | +krb5_boolean | ||
| 632 | +find_first_cmd_that_exists(char **fcmd_arr, char **cmd_out, char **err_out) | ||
| 633 | { | ||
| 634 | struct stat st_temp; | ||
| 635 | int i = 0; | ||
| 636 | @@ -517,12 +499,9 @@ returns 1 if there is an error, 0 if no error. | ||
| 637 | |||
| 638 | ***************************************************************/ | ||
| 639 | |||
| 640 | -int match_commands (fcmd, cmd, match, cmd_out, err_out) | ||
| 641 | - char *fcmd; | ||
| 642 | - char *cmd; | ||
| 643 | - krb5_boolean *match; | ||
| 644 | - char **cmd_out; | ||
| 645 | - char **err_out; | ||
| 646 | +int | ||
| 647 | +match_commands(char *fcmd, char *cmd, krb5_boolean *match, | ||
| 648 | + char **cmd_out, char **err_out) | ||
| 649 | { | ||
| 650 | char ** fcmd_arr; | ||
| 651 | char * err; | ||
| 652 | @@ -566,11 +545,8 @@ int match_commands (fcmd, cmd, match, cmd_out, err_out) | ||
| 653 | is set to null if eof. | ||
| 654 | *********************************************************/ | ||
| 655 | |||
| 656 | -krb5_error_code get_line (fp, out_line) | ||
| 657 | -/* IN */ | ||
| 658 | - FILE *fp; | ||
| 659 | - /* OUT */ | ||
| 660 | - char **out_line; | ||
| 661 | +krb5_error_code | ||
| 662 | +get_line(FILE *fp, char **out_line) | ||
| 663 | { | ||
| 664 | char * line, *r, *newline , *line_ptr; | ||
| 665 | int chunk_count = 1; | ||
| 666 | @@ -615,9 +591,8 @@ will be returned as part of the first token. | ||
| 667 | Note: this routine reuses the space pointed to by line | ||
| 668 | ******************************************************/ | ||
| 669 | |||
| 670 | -char * get_first_token (line, lnext) | ||
| 671 | - char *line; | ||
| 672 | - char **lnext; | ||
| 673 | +char * | ||
| 674 | +get_first_token(char *line, char **lnext) | ||
| 675 | { | ||
| 676 | |||
| 677 | char * lptr, * out_ptr; | ||
| 678 | @@ -651,8 +626,8 @@ Note: that this function modifies the stream | ||
| 679 | lnext to the next tocken. | ||
| 680 | **********************************************************/ | ||
| 681 | |||
| 682 | -char * get_next_token (lnext) | ||
| 683 | - char **lnext; | ||
| 684 | +char * | ||
| 685 | +get_next_token (char **lnext) | ||
| 686 | { | ||
| 687 | char * lptr, * out_ptr; | ||
| 688 | |||
| 689 | @@ -677,10 +652,8 @@ char * get_next_token (lnext) | ||
| 690 | return out_ptr; | ||
| 691 | } | ||
| 692 | |||
| 693 | -static void auth_cleanup(users_fp, login_fp, princname) | ||
| 694 | - FILE *users_fp; | ||
| 695 | - FILE *login_fp; | ||
| 696 | - char *princname; | ||
| 697 | +static void | ||
| 698 | +auth_cleanup(FILE *users_fp, FILE *login_fp, char *princname) | ||
| 699 | { | ||
| 700 | |||
| 701 | free (princname); | ||
| 702 | @@ -690,8 +663,8 @@ static void auth_cleanup(users_fp, login_fp, princname) | ||
| 703 | fclose(login_fp); | ||
| 704 | } | ||
| 705 | |||
| 706 | -void init_auth_names(pw_dir) | ||
| 707 | - char *pw_dir; | ||
| 708 | +void | ||
| 709 | +init_auth_names(char *pw_dir) | ||
| 710 | { | ||
| 711 | const char *sep; | ||
| 712 | int r1, r2; | ||
| 713 | diff --git a/src/clients/ksu/ccache.c b/src/clients/ksu/ccache.c | ||
| 714 | index cbb9aa2..cca9ce2 100644 | ||
| 715 | --- a/src/clients/ksu/ccache.c | ||
| 716 | +++ b/src/clients/ksu/ccache.c | ||
| 717 | @@ -40,24 +40,18 @@ copies the default cache into the secondary cache, | ||
| 718 | |||
| 719 | ************************************************************************/ | ||
| 720 | |||
| 721 | -void show_credential(); | ||
| 722 | +void show_credential(krb5_context, krb5_creds *, krb5_ccache); | ||
| 723 | |||
| 724 | /* modifies only the cc_other, the algorithm may look a bit funny, | ||
| 725 | but I had to do it this way, since remove function did not come | ||
| 726 | with k5 beta 3 release. | ||
| 727 | */ | ||
| 728 | |||
| 729 | -krb5_error_code krb5_ccache_copy(context, cc_def, target_principal, cc_target, | ||
| 730 | - restrict_creds, primary_principal, stored) | ||
| 731 | -/* IN */ | ||
| 732 | - krb5_context context; | ||
| 733 | - krb5_ccache cc_def; | ||
| 734 | - krb5_principal target_principal; | ||
| 735 | - krb5_ccache cc_target; | ||
| 736 | - krb5_boolean restrict_creds; | ||
| 737 | - krb5_principal primary_principal; | ||
| 738 | - /* OUT */ | ||
| 739 | - krb5_boolean *stored; | ||
| 740 | +krb5_error_code | ||
| 741 | +krb5_ccache_copy(krb5_context context, krb5_ccache cc_def, | ||
| 742 | + krb5_principal target_principal, krb5_ccache cc_target, | ||
| 743 | + krb5_boolean restrict_creds, krb5_principal primary_principal, | ||
| 744 | + krb5_boolean *stored) | ||
| 745 | { | ||
| 746 | int i=0; | ||
| 747 | krb5_error_code retval=0; | ||
| 748 | @@ -105,11 +99,9 @@ krb5_error_code krb5_ccache_copy(context, cc_def, target_principal, cc_target, | ||
| 749 | } | ||
| 750 | |||
| 751 | |||
| 752 | -krb5_error_code krb5_store_all_creds(context, cc, creds_def, creds_other) | ||
| 753 | - krb5_context context; | ||
| 754 | - krb5_ccache cc; | ||
| 755 | - krb5_creds **creds_def; | ||
| 756 | - krb5_creds **creds_other; | ||
| 757 | +krb5_error_code | ||
| 758 | +krb5_store_all_creds(krb5_context context, krb5_ccache cc, | ||
| 759 | + krb5_creds **creds_def, krb5_creds **creds_other) | ||
| 760 | { | ||
| 761 | |||
| 762 | int i = 0; | ||
| 763 | @@ -173,10 +165,8 @@ krb5_error_code krb5_store_all_creds(context, cc, creds_def, creds_other) | ||
| 764 | return 0; | ||
| 765 | } | ||
| 766 | |||
| 767 | -krb5_boolean compare_creds(context, cred1, cred2) | ||
| 768 | - krb5_context context; | ||
| 769 | - krb5_creds *cred1; | ||
| 770 | - krb5_creds *cred2; | ||
| 771 | +krb5_boolean | ||
| 772 | +compare_creds(krb5_context context, krb5_creds *cred1, krb5_creds *cred2) | ||
| 773 | { | ||
| 774 | krb5_boolean retval; | ||
| 775 | |||
| 776 | @@ -188,13 +178,9 @@ krb5_boolean compare_creds(context, cred1, cred2) | ||
| 777 | return retval; | ||
| 778 | } | ||
| 779 | |||
| 780 | - | ||
| 781 | - | ||
| 782 | - | ||
| 783 | -krb5_error_code krb5_get_nonexp_tkts(context, cc, creds_array) | ||
| 784 | - krb5_context context; | ||
| 785 | - krb5_ccache cc; | ||
| 786 | - krb5_creds ***creds_array; | ||
| 787 | +krb5_error_code | ||
| 788 | +krb5_get_nonexp_tkts(krb5_context context, krb5_ccache cc, | ||
| 789 | + krb5_creds ***creds_array) | ||
| 790 | { | ||
| 791 | |||
| 792 | krb5_creds creds, temp_tktq, temp_tkt; | ||
| 793 | @@ -262,10 +248,8 @@ krb5_error_code krb5_get_nonexp_tkts(context, cc, creds_array) | ||
| 794 | |||
| 795 | } | ||
| 796 | |||
| 797 | - | ||
| 798 | -krb5_error_code krb5_check_exp(context, tkt_time) | ||
| 799 | - krb5_context context; | ||
| 800 | - krb5_ticket_times tkt_time; | ||
| 801 | +krb5_error_code | ||
| 802 | +krb5_check_exp(krb5_context context, krb5_ticket_times tkt_time) | ||
| 803 | { | ||
| 804 | krb5_error_code retval =0; | ||
| 805 | krb5_timestamp currenttime; | ||
| 806 | @@ -290,9 +274,8 @@ krb5_error_code krb5_check_exp(context, tkt_time) | ||
| 807 | return 0; | ||
| 808 | } | ||
| 809 | |||
| 810 | - | ||
| 811 | -char *flags_string(cred) | ||
| 812 | - krb5_creds *cred; | ||
| 813 | +char * | ||
| 814 | +flags_string(krb5_creds *cred) | ||
| 815 | { | ||
| 816 | static char buf[32]; | ||
| 817 | int i = 0; | ||
| 818 | @@ -323,7 +306,8 @@ char *flags_string(cred) | ||
| 819 | return(buf); | ||
| 820 | } | ||
| 821 | |||
| 822 | -void printtime(krb5_timestamp ts) | ||
| 823 | +void | ||
| 824 | +printtime(krb5_timestamp ts) | ||
| 825 | { | ||
| 826 | char fmtbuf[18], fill = ' '; | ||
| 827 | |||
| 828 | @@ -333,9 +317,7 @@ void printtime(krb5_timestamp ts) | ||
| 829 | |||
| 830 | |||
| 831 | krb5_error_code | ||
| 832 | -krb5_get_login_princ(luser, princ_list) | ||
| 833 | - const char *luser; | ||
| 834 | - char ***princ_list; | ||
| 835 | +krb5_get_login_princ(const char *luser, char ***princ_list) | ||
| 836 | { | ||
| 837 | struct stat sbuf; | ||
| 838 | struct passwd *pwd; | ||
| 839 | @@ -420,13 +402,8 @@ krb5_get_login_princ(luser, princ_list) | ||
| 840 | return 0; | ||
| 841 | } | ||
| 842 | |||
| 843 | - | ||
| 844 | - | ||
| 845 | void | ||
| 846 | -show_credential(context, cred, cc) | ||
| 847 | - krb5_context context; | ||
| 848 | - krb5_creds *cred; | ||
| 849 | - krb5_ccache cc; | ||
| 850 | +show_credential(krb5_context context, krb5_creds *cred, krb5_ccache cc) | ||
| 851 | { | ||
| 852 | krb5_error_code retval; | ||
| 853 | char *name, *sname, *flags; | ||
| 854 | @@ -519,11 +496,9 @@ gen_sym(krb5_context context, char **sym_out) | ||
| 855 | return 0; | ||
| 856 | } | ||
| 857 | |||
| 858 | -krb5_error_code krb5_ccache_overwrite(context, ccs, cct, primary_principal) | ||
| 859 | - krb5_context context; | ||
| 860 | - krb5_ccache ccs; | ||
| 861 | - krb5_ccache cct; | ||
| 862 | - krb5_principal primary_principal; | ||
| 863 | +krb5_error_code | ||
| 864 | +krb5_ccache_overwrite(krb5_context context, krb5_ccache ccs, krb5_ccache cct, | ||
| 865 | + krb5_principal primary_principal) | ||
| 866 | { | ||
| 867 | krb5_error_code retval=0; | ||
| 868 | krb5_principal temp_principal; | ||
| 869 | @@ -560,14 +535,10 @@ krb5_error_code krb5_ccache_overwrite(context, ccs, cct, primary_principal) | ||
| 870 | return retval; | ||
| 871 | } | ||
| 872 | |||
| 873 | -krb5_error_code krb5_store_some_creds(context, cc, creds_def, creds_other, prst, | ||
| 874 | - stored) | ||
| 875 | - krb5_context context; | ||
| 876 | - krb5_ccache cc; | ||
| 877 | - krb5_creds **creds_def; | ||
| 878 | - krb5_creds **creds_other; | ||
| 879 | - krb5_principal prst; | ||
| 880 | - krb5_boolean *stored; | ||
| 881 | +krb5_error_code | ||
| 882 | +krb5_store_some_creds(krb5_context context, krb5_ccache cc, | ||
| 883 | + krb5_creds **creds_def, krb5_creds **creds_other, | ||
| 884 | + krb5_principal prst, krb5_boolean *stored) | ||
| 885 | { | ||
| 886 | |||
| 887 | int i = 0; | ||
| 888 | @@ -610,10 +581,8 @@ krb5_error_code krb5_store_some_creds(context, cc, creds_def, creds_other, prst, | ||
| 889 | return 0; | ||
| 890 | } | ||
| 891 | |||
| 892 | -krb5_error_code krb5_ccache_filter (context, cc, prst) | ||
| 893 | - krb5_context context; | ||
| 894 | - krb5_ccache cc; | ||
| 895 | - krb5_principal prst; | ||
| 896 | +krb5_error_code | ||
| 897 | +krb5_ccache_filter(krb5_context context, krb5_ccache cc, krb5_principal prst) | ||
| 898 | { | ||
| 899 | |||
| 900 | int i=0; | ||
| 901 | @@ -657,10 +626,9 @@ krb5_error_code krb5_ccache_filter (context, cc, prst) | ||
| 902 | return 0; | ||
| 903 | } | ||
| 904 | |||
| 905 | -krb5_boolean krb5_find_princ_in_cred_list (context, creds_list, princ) | ||
| 906 | - krb5_context context; | ||
| 907 | - krb5_creds **creds_list; | ||
| 908 | - krb5_principal princ; | ||
| 909 | +krb5_boolean | ||
| 910 | +krb5_find_princ_in_cred_list(krb5_context context, krb5_creds **creds_list, | ||
| 911 | + krb5_principal princ) | ||
| 912 | { | ||
| 913 | |||
| 914 | int i = 0; | ||
| 915 | @@ -682,11 +650,9 @@ krb5_boolean krb5_find_princ_in_cred_list (context, creds_list, princ) | ||
| 916 | return temp_stored; | ||
| 917 | } | ||
| 918 | |||
| 919 | -krb5_error_code krb5_find_princ_in_cache (context, cc, princ, found) | ||
| 920 | - krb5_context context; | ||
| 921 | - krb5_ccache cc; | ||
| 922 | - krb5_principal princ; | ||
| 923 | - krb5_boolean *found; | ||
| 924 | +krb5_error_code | ||
| 925 | +krb5_find_princ_in_cache(krb5_context context, krb5_ccache cc, | ||
| 926 | + krb5_principal princ, krb5_boolean *found) | ||
| 927 | { | ||
| 928 | krb5_error_code retval; | ||
| 929 | krb5_creds ** creds_list = NULL; | ||
| 930 | diff --git a/src/clients/ksu/heuristic.c b/src/clients/ksu/heuristic.c | ||
| 931 | index 4f7280f..e906de8 100644 | ||
| 932 | --- a/src/clients/ksu/heuristic.c | ||
| 933 | +++ b/src/clients/ksu/heuristic.c | ||
| 934 | @@ -41,9 +41,8 @@ get_all_princ_from_file - retrieves all principal names | ||
| 935 | static void close_time (int, FILE *, int, FILE *); | ||
| 936 | static krb5_boolean find_str_in_list (char **, char *); | ||
| 937 | |||
| 938 | -krb5_error_code get_all_princ_from_file (fp, plist) | ||
| 939 | - FILE *fp; | ||
| 940 | - char ***plist; | ||
| 941 | +krb5_error_code | ||
| 942 | +get_all_princ_from_file(FILE *fp, char ***plist) | ||
| 943 | { | ||
| 944 | |||
| 945 | krb5_error_code retval; | ||
| 946 | @@ -92,10 +91,8 @@ list_union - combines list1 and list2 into combined_list. | ||
| 947 | or used by combined_list. | ||
| 948 | **************************************************************/ | ||
| 949 | |||
| 950 | -krb5_error_code list_union(list1, list2, combined_list) | ||
| 951 | - char **list1; | ||
| 952 | - char **list2; | ||
| 953 | - char ***combined_list; | ||
| 954 | +krb5_error_code | ||
| 955 | +list_union(char **list1, char **list2, char ***combined_list) | ||
| 956 | { | ||
| 957 | |||
| 958 | unsigned int c1 =0, c2 = 0, i=0, j=0; | ||
| 959 | @@ -141,11 +138,7 @@ krb5_error_code list_union(list1, list2, combined_list) | ||
| 960 | } | ||
| 961 | |||
| 962 | krb5_error_code | ||
| 963 | -filter(fp, cmd, k5users_list, k5users_filt_list) | ||
| 964 | - FILE *fp; | ||
| 965 | - char *cmd; | ||
| 966 | - char **k5users_list; | ||
| 967 | - char ***k5users_filt_list; | ||
| 968 | +filter(FILE *fp, char *cmd, char **k5users_list, char ***k5users_filt_list) | ||
| 969 | { | ||
| 970 | |||
| 971 | krb5_error_code retval =0; | ||
| 972 | @@ -195,10 +188,7 @@ filter(fp, cmd, k5users_list, k5users_filt_list) | ||
| 973 | } | ||
| 974 | |||
| 975 | krb5_error_code | ||
| 976 | -get_authorized_princ_names(luser, cmd, princ_list) | ||
| 977 | - const char *luser; | ||
| 978 | - char *cmd; | ||
| 979 | - char ***princ_list; | ||
| 980 | +get_authorized_princ_names(const char *luser, char *cmd, char ***princ_list) | ||
| 981 | { | ||
| 982 | |||
| 983 | struct passwd *pwd; | ||
| 984 | @@ -272,11 +262,8 @@ get_authorized_princ_names(luser, cmd, princ_list) | ||
| 985 | return 0; | ||
| 986 | } | ||
| 987 | |||
| 988 | -static void close_time(k5users_flag, users_fp, k5login_flag, login_fp) | ||
| 989 | - int k5users_flag; | ||
| 990 | - FILE *users_fp; | ||
| 991 | - int k5login_flag; | ||
| 992 | - FILE *login_fp; | ||
| 993 | +static void | ||
| 994 | +close_time(int k5users_flag, FILE *users_fp, int k5login_flag, FILE *login_fp) | ||
| 995 | { | ||
| 996 | |||
| 997 | if (!k5users_flag) fclose(users_fp); | ||
| 998 | @@ -284,9 +271,8 @@ static void close_time(k5users_flag, users_fp, k5login_flag, login_fp) | ||
| 999 | |||
| 1000 | } | ||
| 1001 | |||
| 1002 | -static krb5_boolean find_str_in_list(list , elm) | ||
| 1003 | - char **list; | ||
| 1004 | - char *elm; | ||
| 1005 | +static krb5_boolean | ||
| 1006 | +find_str_in_list(char **list, char *elm) | ||
| 1007 | { | ||
| 1008 | |||
| 1009 | int i=0; | ||
| 1010 | @@ -313,12 +299,9 @@ A principal is picked that has the best chance of getting in. | ||
| 1011 | |||
| 1012 | **********************************************************************/ | ||
| 1013 | |||
| 1014 | - | ||
| 1015 | -krb5_error_code get_closest_principal(context, plist, client, found) | ||
| 1016 | - krb5_context context; | ||
| 1017 | - char **plist; | ||
| 1018 | - krb5_principal *client; | ||
| 1019 | - krb5_boolean *found; | ||
| 1020 | +krb5_error_code | ||
| 1021 | +get_closest_principal(krb5_context context, char **plist, | ||
| 1022 | + krb5_principal *client, krb5_boolean *found) | ||
| 1023 | { | ||
| 1024 | krb5_error_code retval =0; | ||
| 1025 | krb5_principal temp_client, best_client = NULL; | ||
| 1026 | @@ -385,12 +368,9 @@ find_either_ticket checks to see whether there is a ticket for the | ||
| 1027 | end server or tgt, if neither is there the return FALSE, | ||
| 1028 | *****************************************************************/ | ||
| 1029 | |||
| 1030 | -krb5_error_code find_either_ticket (context, cc, client, end_server, found) | ||
| 1031 | - krb5_context context; | ||
| 1032 | - krb5_ccache cc; | ||
| 1033 | - krb5_principal client; | ||
| 1034 | - krb5_principal end_server; | ||
| 1035 | - krb5_boolean *found; | ||
| 1036 | +krb5_error_code | ||
| 1037 | +find_either_ticket(krb5_context context, krb5_ccache cc, krb5_principal client, | ||
| 1038 | + krb5_principal end_server, krb5_boolean *found) | ||
| 1039 | { | ||
| 1040 | |||
| 1041 | krb5_principal kdc_server; | ||
| 1042 | @@ -424,13 +404,9 @@ krb5_error_code find_either_ticket (context, cc, client, end_server, found) | ||
| 1043 | return 0; | ||
| 1044 | } | ||
| 1045 | |||
| 1046 | - | ||
| 1047 | -krb5_error_code find_ticket (context, cc, client, server, found) | ||
| 1048 | - krb5_context context; | ||
| 1049 | - krb5_ccache cc; | ||
| 1050 | - krb5_principal client; | ||
| 1051 | - krb5_principal server; | ||
| 1052 | - krb5_boolean *found; | ||
| 1053 | +krb5_error_code | ||
| 1054 | +find_ticket(krb5_context context, krb5_ccache cc, krb5_principal client, | ||
| 1055 | + krb5_principal server, krb5_boolean *found) | ||
| 1056 | { | ||
| 1057 | |||
| 1058 | krb5_creds tgt, tgtq; | ||
| 1059 | @@ -470,13 +446,9 @@ krb5_error_code find_ticket (context, cc, client, server, found) | ||
| 1060 | return 0; | ||
| 1061 | } | ||
| 1062 | |||
| 1063 | - | ||
| 1064 | - | ||
| 1065 | -krb5_error_code find_princ_in_list (context, princ, plist, found) | ||
| 1066 | - krb5_context context; | ||
| 1067 | - krb5_principal princ; | ||
| 1068 | - char **plist; | ||
| 1069 | - krb5_boolean *found; | ||
| 1070 | +krb5_error_code | ||
| 1071 | +find_princ_in_list(krb5_context context, krb5_principal princ, char **plist, | ||
| 1072 | + krb5_boolean *found) | ||
| 1073 | { | ||
| 1074 | |||
| 1075 | int i=0; | ||
| 1076 | @@ -516,21 +488,13 @@ path_out gets set to ... | ||
| 1077 | |||
| 1078 | ***********************************************************************/ | ||
| 1079 | |||
| 1080 | -krb5_error_code get_best_princ_for_target(context, source_uid, target_uid, | ||
| 1081 | - source_user, target_user, | ||
| 1082 | - cc_source, options, cmd, | ||
| 1083 | - hostname, client, path_out) | ||
| 1084 | - krb5_context context; | ||
| 1085 | - uid_t source_uid; | ||
| 1086 | - uid_t target_uid; | ||
| 1087 | - char *source_user; | ||
| 1088 | - char *target_user; | ||
| 1089 | - krb5_ccache cc_source; | ||
| 1090 | - krb5_get_init_creds_opt *options; | ||
| 1091 | - char *cmd; | ||
| 1092 | - char *hostname; | ||
| 1093 | - krb5_principal *client; | ||
| 1094 | - int *path_out; | ||
| 1095 | +krb5_error_code | ||
| 1096 | +get_best_princ_for_target(krb5_context context, uid_t source_uid, | ||
| 1097 | + uid_t target_uid, char *source_user, | ||
| 1098 | + char *target_user, krb5_ccache cc_source, | ||
| 1099 | + krb5_get_init_creds_opt *options, char *cmd, | ||
| 1100 | + char *hostname, krb5_principal *client, | ||
| 1101 | + int *path_out) | ||
| 1102 | { | ||
| 1103 | |||
| 1104 | princ_info princ_trials[10]; | ||
| 1105 | diff --git a/src/clients/ksu/krb_auth_su.c b/src/clients/ksu/krb_auth_su.c | ||
| 1106 | index fb848dc..db10251 100644 | ||
| 1107 | --- a/src/clients/ksu/krb_auth_su.c | ||
| 1108 | +++ b/src/clients/ksu/krb_auth_su.c | ||
| 1109 | @@ -29,18 +29,13 @@ | ||
| 1110 | #include "ksu.h" | ||
| 1111 | |||
| 1112 | |||
| 1113 | -void plain_dump_principal (); | ||
| 1114 | - | ||
| 1115 | -krb5_boolean krb5_auth_check(context, client_pname, hostname, options, | ||
| 1116 | - target_user, cc, path_passwd, target_uid) | ||
| 1117 | - krb5_context context; | ||
| 1118 | - krb5_principal client_pname; | ||
| 1119 | - char *hostname; | ||
| 1120 | - krb5_get_init_creds_opt *options; | ||
| 1121 | - char *target_user; | ||
| 1122 | - uid_t target_uid; | ||
| 1123 | - krb5_ccache cc; | ||
| 1124 | - int *path_passwd; | ||
| 1125 | +void plain_dump_principal(krb5_context, krb5_principal); | ||
| 1126 | + | ||
| 1127 | +krb5_boolean | ||
| 1128 | +krb5_auth_check(krb5_context context, krb5_principal client_pname, | ||
| 1129 | + char *hostname, krb5_get_init_creds_opt *options, | ||
| 1130 | + char *target_user, krb5_ccache cc, int *path_passwd, | ||
| 1131 | + uid_t target_uid) | ||
| 1132 | { | ||
| 1133 | krb5_principal client; | ||
| 1134 | krb5_verify_init_creds_opt vfy_opts; | ||
| 1135 | @@ -137,13 +132,10 @@ krb5_boolean krb5_auth_check(context, client_pname, hostname, options, | ||
| 1136 | return (TRUE); | ||
| 1137 | } | ||
| 1138 | |||
| 1139 | -krb5_boolean ksu_get_tgt_via_passwd(context, client, options, zero_password, | ||
| 1140 | - creds_out) | ||
| 1141 | - krb5_context context; | ||
| 1142 | - krb5_principal client; | ||
| 1143 | - krb5_get_init_creds_opt *options; | ||
| 1144 | - krb5_boolean *zero_password; | ||
| 1145 | - krb5_creds *creds_out; | ||
| 1146 | +krb5_boolean | ||
| 1147 | +ksu_get_tgt_via_passwd(krb5_context context, krb5_principal client, | ||
| 1148 | + krb5_get_init_creds_opt *options, | ||
| 1149 | + krb5_boolean *zero_password, krb5_creds *creds_out) | ||
| 1150 | { | ||
| 1151 | krb5_error_code code; | ||
| 1152 | krb5_creds creds; | ||
| 1153 | @@ -212,11 +204,8 @@ krb5_boolean ksu_get_tgt_via_passwd(context, client, options, zero_password, | ||
| 1154 | return (TRUE); | ||
| 1155 | } | ||
| 1156 | |||
| 1157 | - | ||
| 1158 | -void dump_principal (context, str, p) | ||
| 1159 | - krb5_context context; | ||
| 1160 | - char *str; | ||
| 1161 | - krb5_principal p; | ||
| 1162 | +void | ||
| 1163 | +dump_principal(krb5_context context, char *str, krb5_principal p) | ||
| 1164 | { | ||
| 1165 | char * stname; | ||
| 1166 | krb5_error_code retval; | ||
| 1167 | @@ -228,9 +217,8 @@ void dump_principal (context, str, p) | ||
| 1168 | fprintf(stderr, " %s: %s\n", str, stname); | ||
| 1169 | } | ||
| 1170 | |||
| 1171 | -void plain_dump_principal (context, p) | ||
| 1172 | - krb5_context context; | ||
| 1173 | - krb5_principal p; | ||
| 1174 | +void | ||
| 1175 | +plain_dump_principal (krb5_context context, krb5_principal p) | ||
| 1176 | { | ||
| 1177 | char * stname; | ||
| 1178 | krb5_error_code retval; | ||
| 1179 | @@ -251,11 +239,8 @@ A principal is picked that has the best chance of getting in. | ||
| 1180 | |||
| 1181 | **********************************************************************/ | ||
| 1182 | |||
| 1183 | - | ||
| 1184 | -krb5_error_code get_best_principal(context, plist, client) | ||
| 1185 | - krb5_context context; | ||
| 1186 | - char **plist; | ||
| 1187 | - krb5_principal *client; | ||
| 1188 | +krb5_error_code | ||
| 1189 | +get_best_principal(krb5_context context, char **plist, krb5_principal *client) | ||
| 1190 | { | ||
| 1191 | krb5_error_code retval =0; | ||
| 1192 | krb5_principal temp_client, best_client = NULL; | ||
| 1193 | diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c | ||
| 1194 | index af12861..7298436 100644 | ||
| 1195 | --- a/src/clients/ksu/main.c | ||
| 1196 | +++ b/src/clients/ksu/main.c | ||
| 1197 | @@ -64,7 +64,9 @@ static krb5_error_code resolve_target_cache(krb5_context ksu_context, | ||
| 1198 | /* insure the proper specification of target user as well as catching | ||
| 1199 | ill specified arguments to commands */ | ||
| 1200 | |||
| 1201 | -void usage (){ | ||
| 1202 | +void | ||
| 1203 | +usage(void) | ||
| 1204 | +{ | ||
| 1205 | fprintf(stderr, | ||
| 1206 | _("Usage: %s [target user] [-n principal] [-c source cachename] " | ||
| 1207 | "[-k] [-r time] [-p|-P] [-f|-F] [-l lifetime] [-zZ] [-q] " | ||
| 1208 | @@ -80,9 +82,7 @@ void usage (){ | ||
| 1209 | static uid_t source_uid, target_uid; | ||
| 1210 | |||
| 1211 | int | ||
| 1212 | -main (argc, argv) | ||
| 1213 | - int argc; | ||
| 1214 | - char ** argv; | ||
| 1215 | +main(int argc, char ** argv) | ||
| 1216 | { | ||
| 1217 | int hp =0; | ||
| 1218 | int some_rest_copy = 0; | ||
| 1219 | @@ -114,7 +114,6 @@ main (argc, argv) | ||
| 1220 | char ** params; | ||
| 1221 | int keep_target_cache = 0; | ||
| 1222 | int child_pid, child_pgrp, ret_pid; | ||
| 1223 | - extern char * getpass(), *crypt(); | ||
| 1224 | int pargc; | ||
| 1225 | char ** pargv; | ||
| 1226 | krb5_boolean stored = FALSE, cc_reused = FALSE, given_princ = FALSE; | ||
| 1227 | @@ -965,11 +964,10 @@ cleanup: | ||
| 1228 | |||
| 1229 | #ifdef HAVE_GETUSERSHELL | ||
| 1230 | |||
| 1231 | -int standard_shell(sh) | ||
| 1232 | - char *sh; | ||
| 1233 | +int | ||
| 1234 | +standard_shell(char *sh) | ||
| 1235 | { | ||
| 1236 | char *cp; | ||
| 1237 | - char *getusershell(); | ||
| 1238 | |||
| 1239 | while ((cp = getusershell()) != NULL) | ||
| 1240 | if (!strcmp(cp, sh)) | ||
| 1241 | @@ -979,7 +977,8 @@ int standard_shell(sh) | ||
| 1242 | |||
| 1243 | #endif /* HAVE_GETUSERSHELL */ | ||
| 1244 | |||
| 1245 | -static char * ontty() | ||
| 1246 | +static char * | ||
| 1247 | +ontty(void) | ||
| 1248 | { | ||
| 1249 | char *p; | ||
| 1250 | static char buf[MAXPATHLEN + 5]; | ||
| 1251 | @@ -996,10 +995,8 @@ static char * ontty() | ||
| 1252 | return (buf); | ||
| 1253 | } | ||
| 1254 | |||
| 1255 | - | ||
| 1256 | -static int set_env_var(name, value) | ||
| 1257 | - char *name; | ||
| 1258 | - char *value; | ||
| 1259 | +static int | ||
| 1260 | +set_env_var(char *name, char *value) | ||
| 1261 | { | ||
| 1262 | char * env_var_buf; | ||
| 1263 | |||
| 1264 | @@ -1008,9 +1005,8 @@ static int set_env_var(name, value) | ||
| 1265 | |||
| 1266 | } | ||
| 1267 | |||
| 1268 | -static void sweep_up(context, cc) | ||
| 1269 | - krb5_context context; | ||
| 1270 | - krb5_ccache cc; | ||
| 1271 | +static void | ||
| 1272 | +sweep_up(krb5_context context, krb5_ccache cc) | ||
| 1273 | { | ||
| 1274 | krb5_error_code retval; | ||
| 1275 | |||
| 1276 | @@ -1038,11 +1034,7 @@ get_params is to be called for the -a option or -e option to | ||
| 1277 | *****************************************************************/ | ||
| 1278 | |||
| 1279 | krb5_error_code | ||
| 1280 | -get_params(optindex, pargc, pargv, params) | ||
| 1281 | - int *optindex; | ||
| 1282 | - int pargc; | ||
| 1283 | - char **pargv; | ||
| 1284 | - char ***params; | ||
| 1285 | +get_params(int *optindex, int pargc, char **pargv, char ***params) | ||
| 1286 | { | ||
| 1287 | |||
| 1288 | int i,j; | ||
| 1289 | @@ -1075,10 +1067,8 @@ void print_status(const char *fmt, ...) | ||
| 1290 | } | ||
| 1291 | |||
| 1292 | krb5_error_code | ||
| 1293 | -ksu_tgtname(context, server, client, tgtprinc) | ||
| 1294 | - krb5_context context; | ||
| 1295 | - const krb5_data *server, *client; | ||
| 1296 | - krb5_principal *tgtprinc; | ||
| 1297 | +ksu_tgtname(krb5_context context, const krb5_data *server, | ||
| 1298 | + const krb5_data *client, krb5_principal *tgtprinc) | ||
| 1299 | { | ||
| 1300 | return krb5_build_principal_ext(context, tgtprinc, client->length, client->data, | ||
| 1301 | KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME, | ||
| 1302 | diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c | ||
| 1303 | index 03f72f5..ac77a7d 100644 | ||
| 1304 | --- a/src/clients/kvno/kvno.c | ||
| 1305 | +++ b/src/clients/kvno/kvno.c | ||
| 1306 | @@ -39,7 +39,7 @@ static char *prog; | ||
| 1307 | static int quiet = 0; | ||
| 1308 | |||
| 1309 | static void | ||
| 1310 | -xusage() | ||
| 1311 | +xusage(void) | ||
| 1312 | { | ||
| 1313 | fprintf(stderr, _("usage: %s [-c ccache] [-e etype] [-k keytab] [-q] " | ||
| 1314 | "[-u | -S sname]\n" | ||
| 1315 | diff --git a/src/include/gssrpc/auth_gssapi.h b/src/include/gssrpc/auth_gssapi.h | ||
| 1316 | index 9d94853..63436a6 100644 | ||
| 1317 | --- a/src/include/gssrpc/auth_gssapi.h | ||
| 1318 | +++ b/src/include/gssrpc/auth_gssapi.h | ||
| 1319 | @@ -82,14 +82,12 @@ bool_t xdr_authgssapi_init_res(XDR *, auth_gssapi_init_res *); | ||
| 1320 | |||
| 1321 | bool_t auth_gssapi_wrap_data | ||
| 1322 | (OM_uint32 *major, OM_uint32 *minor, | ||
| 1323 | - gss_ctx_id_t context, uint32_t seq_num, XDR | ||
| 1324 | - *out_xdrs, bool_t (*xdr_func)(), caddr_t | ||
| 1325 | - xdr_ptr); | ||
| 1326 | + gss_ctx_id_t context, uint32_t seq_num, | ||
| 1327 | + XDR *out_xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr); | ||
| 1328 | bool_t auth_gssapi_unwrap_data | ||
| 1329 | (OM_uint32 *major, OM_uint32 *minor, | ||
| 1330 | - gss_ctx_id_t context, uint32_t seq_num, XDR | ||
| 1331 | - *in_xdrs, bool_t (*xdr_func)(), caddr_t | ||
| 1332 | - xdr_ptr); | ||
| 1333 | + gss_ctx_id_t context, uint32_t seq_num, | ||
| 1334 | + XDR *in_xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr); | ||
| 1335 | |||
| 1336 | AUTH *auth_gssapi_create | ||
| 1337 | (CLIENT *clnt, | ||
| 1338 | diff --git a/src/include/gssrpc/xdr.h b/src/include/gssrpc/xdr.h | ||
| 1339 | index da9e173..4e5c29b 100644 | ||
| 1340 | --- a/src/include/gssrpc/xdr.h | ||
| 1341 | +++ b/src/include/gssrpc/xdr.h | ||
| 1342 | @@ -102,7 +102,6 @@ enum xdr_op { | ||
| 1343 | * | ||
| 1344 | * XXX can't actually prototype it, because some take three args!!! | ||
| 1345 | */ | ||
| 1346 | -typedef bool_t (*xdrproc_t)(); | ||
| 1347 | |||
| 1348 | /* | ||
| 1349 | * The XDR handle. | ||
| 1350 | @@ -143,6 +142,8 @@ typedef struct XDR { | ||
| 1351 | int x_handy; /* extra private word */ | ||
| 1352 | } XDR; | ||
| 1353 | |||
| 1354 | +typedef bool_t (*xdrproc_t)(XDR *, void *); | ||
| 1355 | + | ||
| 1356 | /* | ||
| 1357 | * Operations defined on a XDR handle | ||
| 1358 | * | ||
| 1359 | diff --git a/src/include/k5-int.h b/src/include/k5-int.h | ||
| 1360 | index 2f7791b..ce74b5a 100644 | ||
| 1361 | --- a/src/include/k5-int.h | ||
| 1362 | +++ b/src/include/k5-int.h | ||
| 1363 | @@ -2239,7 +2239,7 @@ make_data(void *data, unsigned int len) | ||
| 1364 | } | ||
| 1365 | |||
| 1366 | static inline krb5_data | ||
| 1367 | -empty_data() | ||
| 1368 | +empty_data(void) | ||
| 1369 | { | ||
| 1370 | return make_data(NULL, 0); | ||
| 1371 | } | ||
| 1372 | diff --git a/src/include/k5-plugin.h b/src/include/k5-plugin.h | ||
| 1373 | index 90809e1..5c5af58 100644 | ||
| 1374 | --- a/src/include/k5-plugin.h | ||
| 1375 | +++ b/src/include/k5-plugin.h | ||
| 1376 | @@ -97,7 +97,7 @@ krb5int_get_plugin_data (struct plugin_file_handle *, const char *, void **, | ||
| 1377 | |||
| 1378 | long KRB5_CALLCONV | ||
| 1379 | krb5int_get_plugin_func (struct plugin_file_handle *, const char *, | ||
| 1380 | - void (**)(), struct errinfo *); | ||
| 1381 | + void (**)(void), struct errinfo *); | ||
| 1382 | |||
| 1383 | |||
| 1384 | long KRB5_CALLCONV | ||
| 1385 | diff --git a/src/include/net-server.h b/src/include/net-server.h | ||
| 1386 | index a30749d..29b235e 100644 | ||
| 1387 | --- a/src/include/net-server.h | ||
| 1388 | +++ b/src/include/net-server.h | ||
| 1389 | @@ -30,6 +30,7 @@ | ||
| 1390 | #define NET_SERVER_H | ||
| 1391 | |||
| 1392 | #include <verto.h> | ||
| 1393 | +#include <gssrpc/rpc.h> | ||
| 1394 | |||
| 1395 | /* The delimiter characters supported by the addresses string. */ | ||
| 1396 | #define ADDRESSES_DELIM ",; " | ||
| 1397 | @@ -64,13 +65,14 @@ krb5_error_code loop_add_udp_address(int default_port, const char *addresses); | ||
| 1398 | krb5_error_code loop_add_tcp_address(int default_port, const char *addresses); | ||
| 1399 | krb5_error_code loop_add_rpc_service(int default_port, const char *addresses, | ||
| 1400 | u_long prognum, u_long versnum, | ||
| 1401 | - void (*dispatchfn)()); | ||
| 1402 | + void (*dispatchfn)(struct svc_req *, | ||
| 1403 | + SVCXPRT *)); | ||
| 1404 | |||
| 1405 | krb5_error_code loop_setup_network(verto_ctx *ctx, void *handle, | ||
| 1406 | const char *progname, | ||
| 1407 | int tcp_listen_backlog); | ||
| 1408 | krb5_error_code loop_setup_signals(verto_ctx *ctx, void *handle, | ||
| 1409 | - void (*reset)()); | ||
| 1410 | + void (*reset)(void *)); | ||
| 1411 | void loop_free(verto_ctx *ctx); | ||
| 1412 | |||
| 1413 | /* to be supplied by the server application */ | ||
| 1414 | diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y | ||
| 1415 | index d14cf96..3d69f0b 100644 | ||
| 1416 | --- a/src/kadmin/cli/getdate.y | ||
| 1417 | +++ b/src/kadmin/cli/getdate.y | ||
| 1418 | @@ -100,9 +100,6 @@ struct my_timeb { | ||
| 1419 | #define bcopy(from, to, len) memcpy ((to), (from), (len)) | ||
| 1420 | #endif | ||
| 1421 | |||
| 1422 | -extern struct tm *gmtime(); | ||
| 1423 | -extern struct tm *localtime(); | ||
| 1424 | - | ||
| 1425 | #define yyparse getdate_yyparse | ||
| 1426 | #define yylex getdate_yylex | ||
| 1427 | #define yyerror getdate_yyerror | ||
| 1428 | diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c | ||
| 1429 | index f3ea6fa..23b64b0 100644 | ||
| 1430 | --- a/src/kadmin/cli/kadmin.c | ||
| 1431 | +++ b/src/kadmin/cli/kadmin.c | ||
| 1432 | @@ -98,7 +98,7 @@ error(const char *fmt, ...) | ||
| 1433 | } | ||
| 1434 | |||
| 1435 | static void | ||
| 1436 | -usage() | ||
| 1437 | +usage(void) | ||
| 1438 | { | ||
| 1439 | error(_("Usage: %s [-r realm] [-p principal] [-q query] " | ||
| 1440 | "[clnt|local args]\n" | ||
| 1441 | @@ -1130,7 +1130,7 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc, | ||
| 1442 | } | ||
| 1443 | |||
| 1444 | static void | ||
| 1445 | -kadmin_addprinc_usage() | ||
| 1446 | +kadmin_addprinc_usage(void) | ||
| 1447 | { | ||
| 1448 | error(_("usage: add_principal [options] principal\n")); | ||
| 1449 | error(_("\toptions are:\n")); | ||
| 1450 | @@ -1154,7 +1154,7 @@ kadmin_addprinc_usage() | ||
| 1451 | } | ||
| 1452 | |||
| 1453 | static void | ||
| 1454 | -kadmin_modprinc_usage() | ||
| 1455 | +kadmin_modprinc_usage(void) | ||
| 1456 | { | ||
| 1457 | error(_("usage: modify_principal [options] principal\n")); | ||
| 1458 | error(_("\toptions are:\n")); | ||
| 1459 | diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c | ||
| 1460 | index b0c8378..26f340a 100644 | ||
| 1461 | --- a/src/kadmin/cli/keytab.c | ||
| 1462 | +++ b/src/kadmin/cli/keytab.c | ||
| 1463 | @@ -50,14 +50,14 @@ static int quiet; | ||
| 1464 | static int norandkey; | ||
| 1465 | |||
| 1466 | static void | ||
| 1467 | -add_usage() | ||
| 1468 | +add_usage(void) | ||
| 1469 | { | ||
| 1470 | fprintf(stderr, _("Usage: ktadd [-k[eytab] keytab] [-q] [-e keysaltlist] " | ||
| 1471 | "[-norandkey] [principal | -glob princ-exp] [...]\n")); | ||
| 1472 | } | ||
| 1473 | |||
| 1474 | static void | ||
| 1475 | -rem_usage() | ||
| 1476 | +rem_usage(void) | ||
| 1477 | { | ||
| 1478 | fprintf(stderr, _("Usage: ktremove [-k[eytab] keytab] [-q] principal " | ||
| 1479 | "[kvno|\"all\"|\"old\"]\n")); | ||
| 1480 | diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c | ||
| 1481 | index 038a0b2..9178fca 100644 | ||
| 1482 | --- a/src/kadmin/dbutil/kdb5_create.c | ||
| 1483 | +++ b/src/kadmin/dbutil/kdb5_create.c | ||
| 1484 | @@ -139,9 +139,8 @@ extern int exit_status; | ||
| 1485 | extern kadm5_config_params global_params; | ||
| 1486 | extern krb5_context util_context; | ||
| 1487 | |||
| 1488 | -void kdb5_create(argc, argv) | ||
| 1489 | - int argc; | ||
| 1490 | - char *argv[]; | ||
| 1491 | +void | ||
| 1492 | +kdb5_create(int argc, char *argv[]) | ||
| 1493 | { | ||
| 1494 | int optchar; | ||
| 1495 | |||
| 1496 | @@ -337,9 +336,7 @@ void kdb5_create(argc, argv) | ||
| 1497 | } | ||
| 1498 | |||
| 1499 | static krb5_error_code | ||
| 1500 | -tgt_keysalt_iterate(ksent, ptr) | ||
| 1501 | - krb5_key_salt_tuple *ksent; | ||
| 1502 | - krb5_pointer ptr; | ||
| 1503 | +tgt_keysalt_iterate(krb5_key_salt_tuple *ksent, krb5_pointer ptr) | ||
| 1504 | { | ||
| 1505 | krb5_context context; | ||
| 1506 | krb5_error_code kret; | ||
| 1507 | @@ -378,11 +375,8 @@ tgt_keysalt_iterate(ksent, ptr) | ||
| 1508 | } | ||
| 1509 | |||
| 1510 | static krb5_error_code | ||
| 1511 | -add_principal(context, princ, op, pblock) | ||
| 1512 | - krb5_context context; | ||
| 1513 | - krb5_principal princ; | ||
| 1514 | - enum ap_op op; | ||
| 1515 | - struct realm_info *pblock; | ||
| 1516 | +add_principal(krb5_context context, krb5_principal princ, enum ap_op op, | ||
| 1517 | + struct realm_info *pblock) | ||
| 1518 | { | ||
| 1519 | krb5_error_code retval; | ||
| 1520 | krb5_db_entry *entry = NULL; | ||
| 1521 | diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c | ||
| 1522 | index fffce74..556cf0b 100644 | ||
| 1523 | --- a/src/kadmin/dbutil/kdb5_destroy.c | ||
| 1524 | +++ b/src/kadmin/dbutil/kdb5_destroy.c | ||
| 1525 | @@ -39,9 +39,7 @@ char *yes = "yes\n"; /* \n to compare against result of | ||
| 1526 | fgets */ | ||
| 1527 | |||
| 1528 | void | ||
| 1529 | -kdb5_destroy(argc, argv) | ||
| 1530 | - int argc; | ||
| 1531 | - char *argv[]; | ||
| 1532 | +kdb5_destroy(int argc, char *argv[]) | ||
| 1533 | { | ||
| 1534 | extern int optind; | ||
| 1535 | int optchar; | ||
| 1536 | diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c | ||
| 1537 | index e05944f..eaba6cd 100644 | ||
| 1538 | --- a/src/kadmin/dbutil/kdb5_stash.c | ||
| 1539 | +++ b/src/kadmin/dbutil/kdb5_stash.c | ||
| 1540 | @@ -63,9 +63,7 @@ extern int exit_status; | ||
| 1541 | extern int close_policy_db; | ||
| 1542 | |||
| 1543 | void | ||
| 1544 | -kdb5_stash(argc, argv) | ||
| 1545 | - int argc; | ||
| 1546 | - char *argv[]; | ||
| 1547 | +kdb5_stash(int argc, char *argv[]) | ||
| 1548 | { | ||
| 1549 | extern char *optarg; | ||
| 1550 | extern int optind; | ||
| 1551 | diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c | ||
| 1552 | index 19a5925..55d529f 100644 | ||
| 1553 | --- a/src/kadmin/dbutil/kdb5_util.c | ||
| 1554 | +++ b/src/kadmin/dbutil/kdb5_util.c | ||
| 1555 | @@ -143,8 +143,8 @@ struct _cmd_table { | ||
| 1556 | {NULL, NULL, 0}, | ||
| 1557 | }; | ||
| 1558 | |||
| 1559 | -static struct _cmd_table *cmd_lookup(name) | ||
| 1560 | - char *name; | ||
| 1561 | +static struct _cmd_table * | ||
| 1562 | +cmd_lookup(char *name) | ||
| 1563 | { | ||
| 1564 | struct _cmd_table *cmd = cmd_table; | ||
| 1565 | while (cmd->name) { | ||
| 1566 | @@ -162,8 +162,9 @@ static struct _cmd_table *cmd_lookup(name) | ||
| 1567 | char **db5util_db_args = NULL; | ||
| 1568 | int db5util_db_args_size = 0; | ||
| 1569 | |||
| 1570 | -static void extended_com_err_fn (const char *myprog, errcode_t code, | ||
| 1571 | - const char *fmt, va_list args) | ||
| 1572 | +static void | ||
| 1573 | +extended_com_err_fn(const char *myprog, errcode_t code, const char *fmt, | ||
| 1574 | + va_list args) | ||
| 1575 | { | ||
| 1576 | const char *emsg; | ||
| 1577 | if (code) { | ||
| 1578 | @@ -177,7 +178,8 @@ static void extended_com_err_fn (const char *myprog, errcode_t code, | ||
| 1579 | fprintf (stderr, "\n"); | ||
| 1580 | } | ||
| 1581 | |||
| 1582 | -int add_db_arg(char *arg) | ||
| 1583 | +int | ||
| 1584 | +add_db_arg(char *arg) | ||
| 1585 | { | ||
| 1586 | char **temp; | ||
| 1587 | db5util_db_args_size++; | ||
| 1588 | @@ -191,9 +193,8 @@ int add_db_arg(char *arg) | ||
| 1589 | return 1; | ||
| 1590 | } | ||
| 1591 | |||
| 1592 | -int main(argc, argv) | ||
| 1593 | - int argc; | ||
| 1594 | - char *argv[]; | ||
| 1595 | +int | ||
| 1596 | +main(int argc, char *argv[]) | ||
| 1597 | { | ||
| 1598 | struct _cmd_table *cmd = NULL; | ||
| 1599 | char *koptarg, **cmd_argv; | ||
| 1600 | @@ -365,7 +366,8 @@ int main(argc, argv) | ||
| 1601 | * cannot be fetched (the master key stash file may not exist when the | ||
| 1602 | * program is run). | ||
| 1603 | */ | ||
| 1604 | -static int open_db_and_mkey() | ||
| 1605 | +static int | ||
| 1606 | +open_db_and_mkey() | ||
| 1607 | { | ||
| 1608 | krb5_error_code retval; | ||
| 1609 | krb5_data scratch, pwd, seed; | ||
| 1610 | @@ -508,9 +510,7 @@ quit() | ||
| 1611 | } | ||
| 1612 | |||
| 1613 | static void | ||
| 1614 | -add_random_key(argc, argv) | ||
| 1615 | - int argc; | ||
| 1616 | - char **argv; | ||
| 1617 | +add_random_key(int argc, char **argv) | ||
| 1618 | { | ||
| 1619 | krb5_error_code ret; | ||
| 1620 | krb5_principal princ; | ||
| 1621 | diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c | ||
| 1622 | index 15a5ab3..b2e6c00 100644 | ||
| 1623 | --- a/src/kadmin/dbutil/ovload.c | ||
| 1624 | +++ b/src/kadmin/dbutil/ovload.c | ||
| 1625 | @@ -11,9 +11,8 @@ | ||
| 1626 | |||
| 1627 | #define LINESIZE 32768 /* XXX */ | ||
| 1628 | |||
| 1629 | -static int parse_pw_hist_ent(current, hist) | ||
| 1630 | - char *current; | ||
| 1631 | - osa_pw_hist_ent *hist; | ||
| 1632 | +static int | ||
| 1633 | +parse_pw_hist_ent(char *current, osa_pw_hist_ent *hist) | ||
| 1634 | { | ||
| 1635 | int tmp, i, j, ret; | ||
| 1636 | char *cp; | ||
| 1637 | @@ -90,12 +89,9 @@ done: | ||
| 1638 | * [modifies] | ||
| 1639 | * | ||
| 1640 | */ | ||
| 1641 | -int process_ov_principal(kcontext, fname, filep, verbose, linenop) | ||
| 1642 | - krb5_context kcontext; | ||
| 1643 | - const char *fname; | ||
| 1644 | - FILE *filep; | ||
| 1645 | - krb5_boolean verbose; | ||
| 1646 | - int *linenop; | ||
| 1647 | +int | ||
| 1648 | +process_ov_principal(krb5_context kcontext, const char *fname, FILE *filep, | ||
| 1649 | + krb5_boolean verbose, int *linenop) | ||
| 1650 | { | ||
| 1651 | XDR xdrs; | ||
| 1652 | osa_princ_ent_t rec; | ||
| 1653 | diff --git a/src/kadmin/dbutil/strtok.c b/src/kadmin/dbutil/strtok.c | ||
| 1654 | index dee466a..93f3e85 100644 | ||
| 1655 | --- a/src/kadmin/dbutil/strtok.c | ||
| 1656 | +++ b/src/kadmin/dbutil/strtok.c | ||
| 1657 | @@ -50,9 +50,7 @@ | ||
| 1658 | */ | ||
| 1659 | |||
| 1660 | char * | ||
| 1661 | -nstrtok(s, delim) | ||
| 1662 | - char *s; | ||
| 1663 | - const char *delim; | ||
| 1664 | +nstrtok(char *s, const char *delim) | ||
| 1665 | { | ||
| 1666 | const char *spanp; | ||
| 1667 | int c, sc; | ||
| 1668 | diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c | ||
| 1669 | index 92d7023..87a69ca 100644 | ||
| 1670 | --- a/src/kadmin/ktutil/ktutil.c | ||
| 1671 | +++ b/src/kadmin/ktutil/ktutil.c | ||
| 1672 | @@ -39,9 +39,8 @@ extern ss_request_table ktutil_cmds; | ||
| 1673 | krb5_context kcontext; | ||
| 1674 | krb5_kt_list ktlist = NULL; | ||
| 1675 | |||
| 1676 | -int main(argc, argv) | ||
| 1677 | - int argc; | ||
| 1678 | - char *argv[]; | ||
| 1679 | +int | ||
| 1680 | +main(int argc, char *argv[]) | ||
| 1681 | { | ||
| 1682 | krb5_error_code retval; | ||
| 1683 | int sci_idx; | ||
| 1684 | @@ -63,9 +62,8 @@ int main(argc, argv) | ||
| 1685 | exit(0); | ||
| 1686 | } | ||
| 1687 | |||
| 1688 | -void ktutil_clear_list(argc, argv) | ||
| 1689 | - int argc; | ||
| 1690 | - char *argv[]; | ||
| 1691 | +void | ||
| 1692 | +ktutil_clear_list(int argc, char *argv[]) | ||
| 1693 | { | ||
| 1694 | krb5_error_code retval; | ||
| 1695 | |||
| 1696 | @@ -79,9 +77,8 @@ void ktutil_clear_list(argc, argv) | ||
| 1697 | ktlist = NULL; | ||
| 1698 | } | ||
| 1699 | |||
| 1700 | -void ktutil_read_v5(argc, argv) | ||
| 1701 | - int argc; | ||
| 1702 | - char *argv[]; | ||
| 1703 | +void | ||
| 1704 | +ktutil_read_v5(int argc, char *argv[]) | ||
| 1705 | { | ||
| 1706 | krb5_error_code retval; | ||
| 1707 | |||
| 1708 | @@ -94,17 +91,15 @@ void ktutil_read_v5(argc, argv) | ||
| 1709 | com_err(argv[0], retval, _("while reading keytab \"%s\""), argv[1]); | ||
| 1710 | } | ||
| 1711 | |||
| 1712 | -void ktutil_read_v4(argc, argv) | ||
| 1713 | - int argc; | ||
| 1714 | - char *argv[]; | ||
| 1715 | +void | ||
| 1716 | +ktutil_read_v4(int argc, char *argv[]) | ||
| 1717 | { | ||
| 1718 | fprintf(stderr, _("%s: reading srvtabs is no longer supported\n"), | ||
| 1719 | argv[0]); | ||
| 1720 | } | ||
| 1721 | |||
| 1722 | -void ktutil_write_v5(argc, argv) | ||
| 1723 | - int argc; | ||
| 1724 | - char *argv[]; | ||
| 1725 | +void | ||
| 1726 | +ktutil_write_v5(int argc, char *argv[]) | ||
| 1727 | { | ||
| 1728 | krb5_error_code retval; | ||
| 1729 | |||
| 1730 | @@ -117,17 +112,15 @@ void ktutil_write_v5(argc, argv) | ||
| 1731 | com_err(argv[0], retval, _("while writing keytab \"%s\""), argv[1]); | ||
| 1732 | } | ||
| 1733 | |||
| 1734 | -void ktutil_write_v4(argc, argv) | ||
| 1735 | - int argc; | ||
| 1736 | - char *argv[]; | ||
| 1737 | +void | ||
| 1738 | +ktutil_write_v4(int argc, char *argv[]) | ||
| 1739 | { | ||
| 1740 | fprintf(stderr, _("%s: writing srvtabs is no longer supported\n"), | ||
| 1741 | argv[0]); | ||
| 1742 | } | ||
| 1743 | |||
| 1744 | -void ktutil_add_entry(argc, argv) | ||
| 1745 | - int argc; | ||
| 1746 | - char *argv[]; | ||
| 1747 | +void | ||
| 1748 | +ktutil_add_entry(int argc, char *argv[]) | ||
| 1749 | { | ||
| 1750 | krb5_error_code retval; | ||
| 1751 | char *princ = NULL; | ||
| 1752 | @@ -183,9 +176,8 @@ void ktutil_add_entry(argc, argv) | ||
| 1753 | com_err(argv[0], retval, _("while adding new entry")); | ||
| 1754 | } | ||
| 1755 | |||
| 1756 | -void ktutil_delete_entry(argc, argv) | ||
| 1757 | - int argc; | ||
| 1758 | - char *argv[]; | ||
| 1759 | +void | ||
| 1760 | +ktutil_delete_entry(int argc, char *argv[]) | ||
| 1761 | { | ||
| 1762 | krb5_error_code retval; | ||
| 1763 | |||
| 1764 | @@ -198,9 +190,8 @@ void ktutil_delete_entry(argc, argv) | ||
| 1765 | com_err(argv[0], retval, _("while deleting entry %d"), atoi(argv[1])); | ||
| 1766 | } | ||
| 1767 | |||
| 1768 | -void ktutil_list(argc, argv) | ||
| 1769 | - int argc; | ||
| 1770 | - char *argv[]; | ||
| 1771 | +void | ||
| 1772 | +ktutil_list(int argc, char *argv[]) | ||
| 1773 | { | ||
| 1774 | krb5_error_code retval; | ||
| 1775 | krb5_kt_list lp; | ||
| 1776 | diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c | ||
| 1777 | index 56bed1b..e489b5b 100644 | ||
| 1778 | --- a/src/kadmin/ktutil/ktutil_funcs.c | ||
| 1779 | +++ b/src/kadmin/ktutil/ktutil_funcs.c | ||
| 1780 | @@ -37,9 +37,8 @@ | ||
| 1781 | /* | ||
| 1782 | * Free a kt_list | ||
| 1783 | */ | ||
| 1784 | -krb5_error_code ktutil_free_kt_list(context, list) | ||
| 1785 | - krb5_context context; | ||
| 1786 | - krb5_kt_list list; | ||
| 1787 | +krb5_error_code | ||
| 1788 | +ktutil_free_kt_list(krb5_context context, krb5_kt_list list) | ||
| 1789 | { | ||
| 1790 | krb5_kt_list lp, prev; | ||
| 1791 | krb5_error_code retval = 0; | ||
| 1792 | @@ -60,10 +59,8 @@ krb5_error_code ktutil_free_kt_list(context, list) | ||
| 1793 | * Delete a numbered entry in a kt_list. Takes a pointer to a kt_list | ||
| 1794 | * in case head gets deleted. | ||
| 1795 | */ | ||
| 1796 | -krb5_error_code ktutil_delete(context, list, idx) | ||
| 1797 | - krb5_context context; | ||
| 1798 | - krb5_kt_list *list; | ||
| 1799 | - int idx; | ||
| 1800 | +krb5_error_code | ||
| 1801 | +ktutil_delete(krb5_context context, krb5_kt_list *list, int idx) | ||
| 1802 | { | ||
| 1803 | krb5_kt_list lp, prev; | ||
| 1804 | int i; | ||
| 1805 | @@ -138,16 +135,10 @@ get_etype_info(krb5_context context, krb5_principal princ, int fetch, | ||
| 1806 | * password or key. If the keytab list is NULL, allocate a new | ||
| 1807 | * one first. | ||
| 1808 | */ | ||
| 1809 | -krb5_error_code ktutil_add(context, list, princ_str, fetch, kvno, | ||
| 1810 | - enctype_str, use_pass, salt_str) | ||
| 1811 | - krb5_context context; | ||
| 1812 | - krb5_kt_list *list; | ||
| 1813 | - char *princ_str; | ||
| 1814 | - int fetch; | ||
| 1815 | - krb5_kvno kvno; | ||
| 1816 | - char *enctype_str; | ||
| 1817 | - int use_pass; | ||
| 1818 | - char *salt_str; | ||
| 1819 | +krb5_error_code | ||
| 1820 | +ktutil_add(krb5_context context, krb5_kt_list *list, char *princ_str, | ||
| 1821 | + int fetch, krb5_kvno kvno, char *enctype_str, int use_pass, | ||
| 1822 | + char *salt_str) | ||
| 1823 | { | ||
| 1824 | krb5_keytab_entry *entry = NULL; | ||
| 1825 | krb5_kt_list lp, *last; | ||
| 1826 | @@ -269,10 +260,8 @@ cleanup: | ||
| 1827 | * Read in a keytab and append it to list. If list starts as NULL, | ||
| 1828 | * allocate a new one if necessary. | ||
| 1829 | */ | ||
| 1830 | -krb5_error_code ktutil_read_keytab(context, name, list) | ||
| 1831 | - krb5_context context; | ||
| 1832 | - char *name; | ||
| 1833 | - krb5_kt_list *list; | ||
| 1834 | +krb5_error_code | ||
| 1835 | +ktutil_read_keytab(krb5_context context, char *name, krb5_kt_list *list) | ||
| 1836 | { | ||
| 1837 | krb5_kt_list lp = NULL, tail = NULL, back = NULL; | ||
| 1838 | krb5_keytab kt; | ||
| 1839 | @@ -344,10 +333,8 @@ close_kt: | ||
| 1840 | /* | ||
| 1841 | * Takes a kt_list and writes it to the named keytab. | ||
| 1842 | */ | ||
| 1843 | -krb5_error_code ktutil_write_keytab(context, list, name) | ||
| 1844 | - krb5_context context; | ||
| 1845 | - krb5_kt_list list; | ||
| 1846 | - char *name; | ||
| 1847 | +krb5_error_code | ||
| 1848 | +ktutil_write_keytab(krb5_context context, krb5_kt_list list, char *name) | ||
| 1849 | { | ||
| 1850 | krb5_kt_list lp; | ||
| 1851 | krb5_keytab kt; | ||
| 1852 | diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c | ||
| 1853 | index 56e9b90..e5dd233 100644 | ||
| 1854 | --- a/src/kadmin/server/ipropd_svc.c | ||
| 1855 | +++ b/src/kadmin/server/ipropd_svc.c | ||
| 1856 | @@ -535,8 +535,8 @@ krb5_iprop_prog_1(struct svc_req *rqstp, | ||
| 1857 | kdb_last_t iprop_get_updates_1_arg; | ||
| 1858 | } argument; | ||
| 1859 | void *result; | ||
| 1860 | - bool_t (*_xdr_argument)(), (*_xdr_result)(); | ||
| 1861 | - void *(*local)(/* union XXX *, struct svc_req * */); | ||
| 1862 | + xdrproc_t _xdr_argument, _xdr_result; | ||
| 1863 | + void *(*local)(char *, struct svc_req *); | ||
| 1864 | char *whoami = "krb5_iprop_prog_1"; | ||
| 1865 | |||
| 1866 | if (!check_iprop_rpcsec_auth(rqstp)) { | ||
| 1867 | @@ -555,21 +555,21 @@ krb5_iprop_prog_1(struct svc_req *rqstp, | ||
| 1868 | return; | ||
| 1869 | |||
| 1870 | case IPROP_GET_UPDATES: | ||
| 1871 | - _xdr_argument = xdr_kdb_last_t; | ||
| 1872 | - _xdr_result = xdr_kdb_incr_result_t; | ||
| 1873 | - local = (void *(*)()) iprop_get_updates_1_svc; | ||
| 1874 | + _xdr_argument = (xdrproc_t)xdr_kdb_last_t; | ||
| 1875 | + _xdr_result = (xdrproc_t)xdr_kdb_incr_result_t; | ||
| 1876 | + local = (void *(*)(char *, struct svc_req *))iprop_get_updates_1_svc; | ||
| 1877 | break; | ||
| 1878 | |||
| 1879 | case IPROP_FULL_RESYNC: | ||
| 1880 | - _xdr_argument = xdr_void; | ||
| 1881 | - _xdr_result = xdr_kdb_fullresync_result_t; | ||
| 1882 | - local = (void *(*)()) iprop_full_resync_1_svc; | ||
| 1883 | + _xdr_argument = (xdrproc_t)xdr_void; | ||
| 1884 | + _xdr_result = (xdrproc_t)xdr_kdb_fullresync_result_t; | ||
| 1885 | + local = (void *(*)(char *, struct svc_req *))iprop_full_resync_1_svc; | ||
| 1886 | break; | ||
| 1887 | |||
| 1888 | case IPROP_FULL_RESYNC_EXT: | ||
| 1889 | - _xdr_argument = xdr_u_int32; | ||
| 1890 | - _xdr_result = xdr_kdb_fullresync_result_t; | ||
| 1891 | - local = (void *(*)()) iprop_full_resync_ext_1_svc; | ||
| 1892 | + _xdr_argument = (xdrproc_t)xdr_u_int32; | ||
| 1893 | + _xdr_result = (xdrproc_t)xdr_kdb_fullresync_result_t; | ||
| 1894 | + local = (void *(*)(char *, struct svc_req *))iprop_full_resync_ext_1_svc; | ||
| 1895 | break; | ||
| 1896 | |||
| 1897 | default: | ||
| 1898 | @@ -587,7 +587,7 @@ krb5_iprop_prog_1(struct svc_req *rqstp, | ||
| 1899 | svcerr_decode(transp); | ||
| 1900 | return; | ||
| 1901 | } | ||
| 1902 | - result = (*local)(&argument, rqstp); | ||
| 1903 | + result = (*local)((char *)&argument, rqstp); | ||
| 1904 | |||
| 1905 | if (_xdr_result && result != NULL && | ||
| 1906 | !svc_sendreply(transp, _xdr_result, result)) { | ||
| 1907 | diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c | ||
| 1908 | index 8371fa7..f0e43d9 100644 | ||
| 1909 | --- a/src/kadmin/server/kadm_rpc_svc.c | ||
| 1910 | +++ b/src/kadmin/server/kadm_rpc_svc.c | ||
| 1911 | @@ -9,6 +9,7 @@ | ||
| 1912 | #include <gssapi/gssapi_krb5.h> /* for gss_nt_krb5_name */ | ||
| 1913 | #include <syslog.h> | ||
| 1914 | #include <kadm5/kadm_rpc.h> | ||
| 1915 | +#include <kadm5/admin_xdr.h> | ||
| 1916 | #include <krb5.h> | ||
| 1917 | #include <kadm5/admin.h> | ||
| 1918 | #include <adm_proto.h> | ||
| 1919 | @@ -36,9 +37,8 @@ static int check_rpcsec_auth(struct svc_req *); | ||
| 1920 | * Modifies: | ||
| 1921 | */ | ||
| 1922 | |||
| 1923 | -void kadm_1(rqstp, transp) | ||
| 1924 | - struct svc_req *rqstp; | ||
| 1925 | - SVCXPRT *transp; | ||
| 1926 | +void | ||
| 1927 | +kadm_1(struct svc_req *rqstp, SVCXPRT *transp) | ||
| 1928 | { | ||
| 1929 | union { | ||
| 1930 | cprinc_arg create_principal_2_arg; | ||
| 1931 | @@ -73,8 +73,8 @@ void kadm_1(rqstp, transp) | ||
| 1932 | getpkeys_ret get_principal_keys_ret; | ||
| 1933 | } result; | ||
| 1934 | bool_t retval; | ||
| 1935 | - bool_t (*xdr_argument)(), (*xdr_result)(); | ||
| 1936 | - bool_t (*local)(); | ||
| 1937 | + xdrproc_t xdr_argument, xdr_result; | ||
| 1938 | + bool_t (*local)(char *, void *, struct svc_req *); | ||
| 1939 | |||
| 1940 | if (rqstp->rq_cred.oa_flavor != AUTH_GSSAPI && | ||
| 1941 | !check_rpcsec_auth(rqstp)) { | ||
| 1942 | @@ -92,153 +92,153 @@ void kadm_1(rqstp, transp) | ||
| 1943 | return; | ||
| 1944 | |||
| 1945 | case CREATE_PRINCIPAL: | ||
| 1946 | - xdr_argument = xdr_cprinc_arg; | ||
| 1947 | - xdr_result = xdr_generic_ret; | ||
| 1948 | - local = (bool_t (*)()) create_principal_2_svc; | ||
| 1949 | + xdr_argument = (xdrproc_t)xdr_cprinc_arg; | ||
| 1950 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 1951 | + local = (bool_t (*)(char *, void *, struct svc_req *))create_principal_2_svc; | ||
| 1952 | break; | ||
| 1953 | |||
| 1954 | case DELETE_PRINCIPAL: | ||
| 1955 | - xdr_argument = xdr_dprinc_arg; | ||
| 1956 | - xdr_result = xdr_generic_ret; | ||
| 1957 | - local = (bool_t (*)()) delete_principal_2_svc; | ||
| 1958 | + xdr_argument = (xdrproc_t)xdr_dprinc_arg; | ||
| 1959 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 1960 | + local = (bool_t (*)(char *, void *, struct svc_req *))delete_principal_2_svc; | ||
| 1961 | break; | ||
| 1962 | |||
| 1963 | case MODIFY_PRINCIPAL: | ||
| 1964 | - xdr_argument = xdr_mprinc_arg; | ||
| 1965 | - xdr_result = xdr_generic_ret; | ||
| 1966 | - local = (bool_t (*)()) modify_principal_2_svc; | ||
| 1967 | + xdr_argument = (xdrproc_t)xdr_mprinc_arg; | ||
| 1968 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 1969 | + local = (bool_t (*)(char *, void *, struct svc_req *))modify_principal_2_svc; | ||
| 1970 | break; | ||
| 1971 | |||
| 1972 | case RENAME_PRINCIPAL: | ||
| 1973 | - xdr_argument = xdr_rprinc_arg; | ||
| 1974 | - xdr_result = xdr_generic_ret; | ||
| 1975 | - local = (bool_t (*)()) rename_principal_2_svc; | ||
| 1976 | + xdr_argument = (xdrproc_t)xdr_rprinc_arg; | ||
| 1977 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 1978 | + local = (bool_t (*)(char *, void *, struct svc_req *))rename_principal_2_svc; | ||
| 1979 | break; | ||
| 1980 | |||
| 1981 | case GET_PRINCIPAL: | ||
| 1982 | - xdr_argument = xdr_gprinc_arg; | ||
| 1983 | - xdr_result = xdr_gprinc_ret; | ||
| 1984 | - local = (bool_t (*)()) get_principal_2_svc; | ||
| 1985 | + xdr_argument = (xdrproc_t)xdr_gprinc_arg; | ||
| 1986 | + xdr_result = (xdrproc_t)xdr_gprinc_ret; | ||
| 1987 | + local = (bool_t (*)(char *, void *, struct svc_req *))get_principal_2_svc; | ||
| 1988 | break; | ||
| 1989 | |||
| 1990 | case GET_PRINCS: | ||
| 1991 | - xdr_argument = xdr_gprincs_arg; | ||
| 1992 | - xdr_result = xdr_gprincs_ret; | ||
| 1993 | - local = (bool_t (*)()) get_princs_2_svc; | ||
| 1994 | + xdr_argument = (xdrproc_t)xdr_gprincs_arg; | ||
| 1995 | + xdr_result = (xdrproc_t)xdr_gprincs_ret; | ||
| 1996 | + local = (bool_t (*)(char *, void *, struct svc_req *))get_princs_2_svc; | ||
| 1997 | break; | ||
| 1998 | |||
| 1999 | case CHPASS_PRINCIPAL: | ||
| 2000 | - xdr_argument = xdr_chpass_arg; | ||
| 2001 | - xdr_result = xdr_generic_ret; | ||
| 2002 | - local = (bool_t (*)()) chpass_principal_2_svc; | ||
| 2003 | + xdr_argument = (xdrproc_t)xdr_chpass_arg; | ||
| 2004 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2005 | + local = (bool_t (*)(char *, void *, struct svc_req *))chpass_principal_2_svc; | ||
| 2006 | break; | ||
| 2007 | |||
| 2008 | case SETKEY_PRINCIPAL: | ||
| 2009 | - xdr_argument = xdr_setkey_arg; | ||
| 2010 | - xdr_result = xdr_generic_ret; | ||
| 2011 | - local = (bool_t (*)()) setkey_principal_2_svc; | ||
| 2012 | + xdr_argument = (xdrproc_t)xdr_setkey_arg; | ||
| 2013 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2014 | + local = (bool_t (*)(char *, void *, struct svc_req *))setkey_principal_2_svc; | ||
| 2015 | break; | ||
| 2016 | |||
| 2017 | case CHRAND_PRINCIPAL: | ||
| 2018 | - xdr_argument = xdr_chrand_arg; | ||
| 2019 | - xdr_result = xdr_chrand_ret; | ||
| 2020 | - local = (bool_t (*)()) chrand_principal_2_svc; | ||
| 2021 | + xdr_argument = (xdrproc_t)xdr_chrand_arg; | ||
| 2022 | + xdr_result = (xdrproc_t)xdr_chrand_ret; | ||
| 2023 | + local = (bool_t (*)(char *, void *, struct svc_req *))chrand_principal_2_svc; | ||
| 2024 | break; | ||
| 2025 | |||
| 2026 | case CREATE_POLICY: | ||
| 2027 | - xdr_argument = xdr_cpol_arg; | ||
| 2028 | - xdr_result = xdr_generic_ret; | ||
| 2029 | - local = (bool_t (*)()) create_policy_2_svc; | ||
| 2030 | + xdr_argument = (xdrproc_t)xdr_cpol_arg; | ||
| 2031 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2032 | + local = (bool_t (*)(char *, void *, struct svc_req *))create_policy_2_svc; | ||
| 2033 | break; | ||
| 2034 | |||
| 2035 | case DELETE_POLICY: | ||
| 2036 | - xdr_argument = xdr_dpol_arg; | ||
| 2037 | - xdr_result = xdr_generic_ret; | ||
| 2038 | - local = (bool_t (*)()) delete_policy_2_svc; | ||
| 2039 | + xdr_argument = (xdrproc_t)xdr_dpol_arg; | ||
| 2040 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2041 | + local = (bool_t (*)(char *, void *, struct svc_req *))delete_policy_2_svc; | ||
| 2042 | break; | ||
| 2043 | |||
| 2044 | case MODIFY_POLICY: | ||
| 2045 | - xdr_argument = xdr_mpol_arg; | ||
| 2046 | - xdr_result = xdr_generic_ret; | ||
| 2047 | - local = (bool_t (*)()) modify_policy_2_svc; | ||
| 2048 | + xdr_argument = (xdrproc_t)xdr_mpol_arg; | ||
| 2049 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2050 | + local = (bool_t (*)(char *, void *, struct svc_req *))modify_policy_2_svc; | ||
| 2051 | break; | ||
| 2052 | |||
| 2053 | case GET_POLICY: | ||
| 2054 | - xdr_argument = xdr_gpol_arg; | ||
| 2055 | - xdr_result = xdr_gpol_ret; | ||
| 2056 | - local = (bool_t (*)()) get_policy_2_svc; | ||
| 2057 | + xdr_argument = (xdrproc_t)xdr_gpol_arg; | ||
| 2058 | + xdr_result = (xdrproc_t)xdr_gpol_ret; | ||
| 2059 | + local = (bool_t (*)(char *, void *, struct svc_req *))get_policy_2_svc; | ||
| 2060 | break; | ||
| 2061 | |||
| 2062 | case GET_POLS: | ||
| 2063 | - xdr_argument = xdr_gpols_arg; | ||
| 2064 | - xdr_result = xdr_gpols_ret; | ||
| 2065 | - local = (bool_t (*)()) get_pols_2_svc; | ||
| 2066 | + xdr_argument = (xdrproc_t)xdr_gpols_arg; | ||
| 2067 | + xdr_result = (xdrproc_t)xdr_gpols_ret; | ||
| 2068 | + local = (bool_t (*)(char *, void *, struct svc_req *))get_pols_2_svc; | ||
| 2069 | break; | ||
| 2070 | |||
| 2071 | case GET_PRIVS: | ||
| 2072 | - xdr_argument = xdr_u_int32; | ||
| 2073 | - xdr_result = xdr_getprivs_ret; | ||
| 2074 | - local = (bool_t (*)()) get_privs_2_svc; | ||
| 2075 | + xdr_argument = (xdrproc_t)xdr_u_int32; | ||
| 2076 | + xdr_result = (xdrproc_t)xdr_getprivs_ret; | ||
| 2077 | + local = (bool_t (*)(char *, void *, struct svc_req *))get_privs_2_svc; | ||
| 2078 | break; | ||
| 2079 | |||
| 2080 | case INIT: | ||
| 2081 | - xdr_argument = xdr_u_int32; | ||
| 2082 | - xdr_result = xdr_generic_ret; | ||
| 2083 | - local = (bool_t (*)()) init_2_svc; | ||
| 2084 | + xdr_argument = (xdrproc_t)xdr_u_int32; | ||
| 2085 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2086 | + local = (bool_t (*)(char *, void *, struct svc_req *))init_2_svc; | ||
| 2087 | break; | ||
| 2088 | |||
| 2089 | case CREATE_PRINCIPAL3: | ||
| 2090 | - xdr_argument = xdr_cprinc3_arg; | ||
| 2091 | - xdr_result = xdr_generic_ret; | ||
| 2092 | - local = (bool_t (*)()) create_principal3_2_svc; | ||
| 2093 | + xdr_argument = (xdrproc_t)xdr_cprinc3_arg; | ||
| 2094 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2095 | + local = (bool_t (*)(char *, void *, struct svc_req *))create_principal3_2_svc; | ||
| 2096 | break; | ||
| 2097 | |||
| 2098 | case CHPASS_PRINCIPAL3: | ||
| 2099 | - xdr_argument = xdr_chpass3_arg; | ||
| 2100 | - xdr_result = xdr_generic_ret; | ||
| 2101 | - local = (bool_t (*)()) chpass_principal3_2_svc; | ||
| 2102 | + xdr_argument = (xdrproc_t)xdr_chpass3_arg; | ||
| 2103 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2104 | + local = (bool_t (*)(char *, void *, struct svc_req *))chpass_principal3_2_svc; | ||
| 2105 | break; | ||
| 2106 | |||
| 2107 | case CHRAND_PRINCIPAL3: | ||
| 2108 | - xdr_argument = xdr_chrand3_arg; | ||
| 2109 | - xdr_result = xdr_chrand_ret; | ||
| 2110 | - local = (bool_t (*)()) chrand_principal3_2_svc; | ||
| 2111 | + xdr_argument = (xdrproc_t)xdr_chrand3_arg; | ||
| 2112 | + xdr_result = (xdrproc_t)xdr_chrand_ret; | ||
| 2113 | + local = (bool_t (*)(char *, void *, struct svc_req *))chrand_principal3_2_svc; | ||
| 2114 | break; | ||
| 2115 | |||
| 2116 | case SETKEY_PRINCIPAL3: | ||
| 2117 | - xdr_argument = xdr_setkey3_arg; | ||
| 2118 | - xdr_result = xdr_generic_ret; | ||
| 2119 | - local = (bool_t (*)()) setkey_principal3_2_svc; | ||
| 2120 | + xdr_argument = (xdrproc_t)xdr_setkey3_arg; | ||
| 2121 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2122 | + local = (bool_t (*)(char *, void *, struct svc_req *))setkey_principal3_2_svc; | ||
| 2123 | break; | ||
| 2124 | |||
| 2125 | case PURGEKEYS: | ||
| 2126 | - xdr_argument = xdr_purgekeys_arg; | ||
| 2127 | - xdr_result = xdr_generic_ret; | ||
| 2128 | - local = (bool_t (*)()) purgekeys_2_svc; | ||
| 2129 | + xdr_argument = (xdrproc_t)xdr_purgekeys_arg; | ||
| 2130 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2131 | + local = (bool_t (*)(char *, void *, struct svc_req *))purgekeys_2_svc; | ||
| 2132 | break; | ||
| 2133 | |||
| 2134 | case GET_STRINGS: | ||
| 2135 | - xdr_argument = xdr_gstrings_arg; | ||
| 2136 | - xdr_result = xdr_gstrings_ret; | ||
| 2137 | - local = (bool_t (*)()) get_strings_2_svc; | ||
| 2138 | + xdr_argument = (xdrproc_t)xdr_gstrings_arg; | ||
| 2139 | + xdr_result = (xdrproc_t)xdr_gstrings_ret; | ||
| 2140 | + local = (bool_t (*)(char *, void *, struct svc_req *))get_strings_2_svc; | ||
| 2141 | break; | ||
| 2142 | |||
| 2143 | case SET_STRING: | ||
| 2144 | - xdr_argument = xdr_sstring_arg; | ||
| 2145 | - xdr_result = xdr_generic_ret; | ||
| 2146 | - local = (bool_t (*)()) set_string_2_svc; | ||
| 2147 | + xdr_argument = (xdrproc_t)xdr_sstring_arg; | ||
| 2148 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2149 | + local = (bool_t (*)(char *, void *, struct svc_req *))set_string_2_svc; | ||
| 2150 | break; | ||
| 2151 | |||
| 2152 | case SETKEY_PRINCIPAL4: | ||
| 2153 | - xdr_argument = xdr_setkey4_arg; | ||
| 2154 | - xdr_result = xdr_generic_ret; | ||
| 2155 | - local = (bool_t (*)()) setkey_principal4_2_svc; | ||
| 2156 | + xdr_argument = (xdrproc_t)xdr_setkey4_arg; | ||
| 2157 | + xdr_result = (xdrproc_t)xdr_generic_ret; | ||
| 2158 | + local = (bool_t (*)(char *, void *, struct svc_req *))setkey_principal4_2_svc; | ||
| 2159 | break; | ||
| 2160 | |||
| 2161 | case EXTRACT_KEYS: | ||
| 2162 | - xdr_argument = xdr_getpkeys_arg; | ||
| 2163 | - xdr_result = xdr_getpkeys_ret; | ||
| 2164 | - local = (bool_t (*)()) get_principal_keys_2_svc; | ||
| 2165 | + xdr_argument = (xdrproc_t)xdr_getpkeys_arg; | ||
| 2166 | + xdr_result = (xdrproc_t)xdr_getpkeys_ret; | ||
| 2167 | + local = (bool_t (*)(char *, void *, struct svc_req *))get_principal_keys_2_svc; | ||
| 2168 | break; | ||
| 2169 | |||
| 2170 | default: | ||
| 2171 | @@ -253,7 +253,7 @@ void kadm_1(rqstp, transp) | ||
| 2172 | return; | ||
| 2173 | } | ||
| 2174 | memset(&result, 0, sizeof(result)); | ||
| 2175 | - retval = (*local)(&argument, &result, rqstp); | ||
| 2176 | + retval = (*local)((char *)&argument, &result, rqstp); | ||
| 2177 | if (retval && !svc_sendreply(transp, xdr_result, (void *)&result)) { | ||
| 2178 | krb5_klog_syslog(LOG_ERR, "WARNING! Unable to send function results, " | ||
| 2179 | "continuing."); | ||
| 2180 | diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c | ||
| 2181 | index b29a0f5..a9508af 100644 | ||
| 2182 | --- a/src/kadmin/server/ovsec_kadmd.c | ||
| 2183 | +++ b/src/kadmin/server/ovsec_kadmd.c | ||
| 2184 | @@ -77,7 +77,7 @@ static krb5_context context; | ||
| 2185 | static char *progname; | ||
| 2186 | |||
| 2187 | static void | ||
| 2188 | -usage() | ||
| 2189 | +usage(void) | ||
| 2190 | { | ||
| 2191 | fprintf(stderr, _("Usage: kadmind [-x db_args]* [-r realm] [-m] [-nofork] " | ||
| 2192 | "[-port port-number]\n" | ||
| 2193 | @@ -173,7 +173,7 @@ setup_loop(kadm5_config_params *params, int proponly, verto_ctx **ctx_out) | ||
| 2194 | |||
| 2195 | /* Point GSSAPI at the KDB keytab so we don't need an actual file keytab. */ | ||
| 2196 | static krb5_error_code | ||
| 2197 | -setup_kdb_keytab() | ||
| 2198 | +setup_kdb_keytab(void) | ||
| 2199 | { | ||
| 2200 | krb5_error_code ret; | ||
| 2201 | |||
| 2202 | diff --git a/src/kdc/t_ndr.c b/src/kdc/t_ndr.c | ||
| 2203 | index a3ac661..c2a2414 100644 | ||
| 2204 | --- a/src/kdc/t_ndr.c | ||
| 2205 | +++ b/src/kdc/t_ndr.c | ||
| 2206 | @@ -173,7 +173,7 @@ test_dec_enc(uint8_t *blob, size_t len, char *name, int fail) | ||
| 2207 | #define RUN_TEST_FAIL(blob) test_dec_enc(blob, sizeof(blob), #blob, 1) | ||
| 2208 | |||
| 2209 | int | ||
| 2210 | -main() | ||
| 2211 | +main(void) | ||
| 2212 | { | ||
| 2213 | printf("Running NDR tests...\n"); | ||
| 2214 | |||
| 2215 | diff --git a/src/kdc/t_replay.c b/src/kdc/t_replay.c | ||
| 2216 | index 57aad88..c9c9d65 100644 | ||
| 2217 | --- a/src/kdc/t_replay.c | ||
| 2218 | +++ b/src/kdc/t_replay.c | ||
| 2219 | @@ -570,7 +570,8 @@ test_kdc_insert_lookaside_cache_expire(void **state) | ||
| 2220 | assert_int_equal(total_size, e2_size); | ||
| 2221 | } | ||
| 2222 | |||
| 2223 | -int main() | ||
| 2224 | +int | ||
| 2225 | +main(void) | ||
| 2226 | { | ||
| 2227 | int ret; | ||
| 2228 | |||
| 2229 | @@ -611,7 +612,8 @@ int main() | ||
| 2230 | |||
| 2231 | #else /* NOCACHE */ | ||
| 2232 | |||
| 2233 | -int main() | ||
| 2234 | +int | ||
| 2235 | +main(void) | ||
| 2236 | { | ||
| 2237 | return 0; | ||
| 2238 | } | ||
| 2239 | diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c | ||
| 2240 | index aa3c81e..1b530fc 100644 | ||
| 2241 | --- a/src/kprop/kpropd.c | ||
| 2242 | +++ b/src/kprop/kpropd.c | ||
| 2243 | @@ -165,7 +165,7 @@ static kadm5_ret_t kadm5_get_kiprop_host_srv_name(krb5_context context, | ||
| 2244 | char **host_service_name); | ||
| 2245 | |||
| 2246 | static void | ||
| 2247 | -usage() | ||
| 2248 | +usage(void) | ||
| 2249 | { | ||
| 2250 | fprintf(stderr, | ||
| 2251 | _("\nUsage: %s [-r realm] [-s keytab] [-d] [-D] [-S]\n" | ||
| 2252 | diff --git a/src/kprop/kproplog.c b/src/kprop/kproplog.c | ||
| 2253 | index 06af2a1..1f10aa6 100644 | ||
| 2254 | --- a/src/kprop/kproplog.c | ||
| 2255 | +++ b/src/kprop/kproplog.c | ||
| 2256 | @@ -24,7 +24,7 @@ | ||
| 2257 | static char *progname; | ||
| 2258 | |||
| 2259 | static void | ||
| 2260 | -usage() | ||
| 2261 | +usage(void) | ||
| 2262 | { | ||
| 2263 | fprintf(stderr, _("\nUsage: %s [-h] [-v] [-v] [-e num]\n\t%s -R\n\n"), | ||
| 2264 | progname, progname); | ||
| 2265 | @@ -393,7 +393,7 @@ print_update(kdb_hlog_t *ulog, uint32_t entry, uint32_t ulogentries, | ||
| 2266 | print_attr(&upd.kdb_update.kdbe_t_val[j], verbose > 1 ? 1 : 0); | ||
| 2267 | } | ||
| 2268 | |||
| 2269 | - xdr_free(xdr_kdb_incr_update_t, (char *)&upd); | ||
| 2270 | + xdr_free((xdrproc_t)xdr_kdb_incr_update_t, (char *)&upd); | ||
| 2271 | free(dbprinc); | ||
| 2272 | } | ||
| 2273 | } | ||
| 2274 | diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c | ||
| 2275 | index 1bdc793..75372d8 100644 | ||
| 2276 | --- a/src/lib/apputils/net-server.c | ||
| 2277 | +++ b/src/lib/apputils/net-server.c | ||
| 2278 | @@ -203,7 +203,7 @@ struct connection { | ||
| 2279 | struct rpc_svc_data { | ||
| 2280 | u_long prognum; | ||
| 2281 | u_long versnum; | ||
| 2282 | - void (*dispatch)(); | ||
| 2283 | + void (*dispatch)(struct svc_req *, SVCXPRT *); | ||
| 2284 | }; | ||
| 2285 | |||
| 2286 | struct bind_address { | ||
| 2287 | @@ -255,7 +255,7 @@ free_sighup_context(verto_ctx *ctx, verto_ev *ev) | ||
| 2288 | } | ||
| 2289 | |||
| 2290 | krb5_error_code | ||
| 2291 | -loop_setup_signals(verto_ctx *ctx, void *handle, void (*reset)()) | ||
| 2292 | +loop_setup_signals(verto_ctx *ctx, void *handle, void (*reset)(void *)) | ||
| 2293 | { | ||
| 2294 | struct sighup_context *sc; | ||
| 2295 | verto_ev *ev; | ||
| 2296 | @@ -434,7 +434,8 @@ loop_add_tcp_address(int default_port, const char *addresses) | ||
| 2297 | |||
| 2298 | krb5_error_code | ||
| 2299 | loop_add_rpc_service(int default_port, const char *addresses, u_long prognum, | ||
| 2300 | - u_long versnum, void (*dispatchfn)()) | ||
| 2301 | + u_long versnum, | ||
| 2302 | + void (*dispatchfn)(struct svc_req *, SVCXPRT *)) | ||
| 2303 | { | ||
| 2304 | struct rpc_svc_data svc; | ||
| 2305 | |||
| 2306 | diff --git a/src/lib/crypto/builtin/aes/aes-gen.c b/src/lib/crypto/builtin/aes/aes-gen.c | ||
| 2307 | index b528d37..4d7a16e 100644 | ||
| 2308 | --- a/src/lib/crypto/builtin/aes/aes-gen.c | ||
| 2309 | +++ b/src/lib/crypto/builtin/aes/aes-gen.c | ||
| 2310 | @@ -54,7 +54,8 @@ uint8_t test_case[NTESTS][4 * B] = { | ||
| 2311 | aes_encrypt_ctx ctx; | ||
| 2312 | aes_decrypt_ctx dctx; | ||
| 2313 | |||
| 2314 | -static void init () | ||
| 2315 | +static void | ||
| 2316 | +init (void) | ||
| 2317 | { | ||
| 2318 | AES_RETURN r; | ||
| 2319 | |||
| 2320 | @@ -71,7 +72,8 @@ static void hexdump(const unsigned char *ptr, size_t len) | ||
| 2321 | printf ("%s%02X", (i % 16 == 0) ? "\n " : " ", ptr[i]); | ||
| 2322 | } | ||
| 2323 | |||
| 2324 | -static void fips_test () | ||
| 2325 | +static void | ||
| 2326 | +fips_test (void) | ||
| 2327 | { | ||
| 2328 | static const unsigned char fipskey[16] = { | ||
| 2329 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, | ||
| 2330 | @@ -254,7 +256,8 @@ cts_dec (unsigned char *out, unsigned char *in, unsigned char *iv, | ||
| 2331 | memcpy(out+B, pn, len-B); | ||
| 2332 | } | ||
| 2333 | |||
| 2334 | -static void ecb_test () | ||
| 2335 | +static void | ||
| 2336 | +ecb_test (void) | ||
| 2337 | { | ||
| 2338 | unsigned int testno; | ||
| 2339 | uint8_t output[4 * B], tmp[4 * B]; | ||
| 2340 | @@ -285,7 +288,8 @@ static void ecb_test () | ||
| 2341 | |||
| 2342 | unsigned char ivec[16] = { 0 }; | ||
| 2343 | |||
| 2344 | -static void cbc_test () | ||
| 2345 | +static void | ||
| 2346 | +cbc_test (void) | ||
| 2347 | { | ||
| 2348 | unsigned int testno; | ||
| 2349 | uint8_t output[4 * B], tmp[4 * B]; | ||
| 2350 | @@ -314,7 +318,8 @@ static void cbc_test () | ||
| 2351 | printf ("\n"); | ||
| 2352 | } | ||
| 2353 | |||
| 2354 | -static void cts_test () | ||
| 2355 | +static void | ||
| 2356 | +cts_test (void) | ||
| 2357 | { | ||
| 2358 | unsigned int testno; | ||
| 2359 | uint8_t output[4 * B], tmp[4 * B]; | ||
| 2360 | @@ -339,7 +344,8 @@ static void cts_test () | ||
| 2361 | printf ("\n"); | ||
| 2362 | } | ||
| 2363 | |||
| 2364 | -int main () | ||
| 2365 | +int | ||
| 2366 | +main (void) | ||
| 2367 | { | ||
| 2368 | init (); | ||
| 2369 | fips_test (); | ||
| 2370 | diff --git a/src/lib/crypto/builtin/camellia/camellia-gen.c b/src/lib/crypto/builtin/camellia/camellia-gen.c | ||
| 2371 | index 23b69c1..6eca0e0 100644 | ||
| 2372 | --- a/src/lib/crypto/builtin/camellia/camellia-gen.c | ||
| 2373 | +++ b/src/lib/crypto/builtin/camellia/camellia-gen.c | ||
| 2374 | @@ -19,7 +19,8 @@ struct { | ||
| 2375 | } test_case[NTESTS]; | ||
| 2376 | camellia_ctx ctx, dctx; | ||
| 2377 | |||
| 2378 | -static void init () | ||
| 2379 | +static void | ||
| 2380 | +init (void) | ||
| 2381 | { | ||
| 2382 | size_t i, j; | ||
| 2383 | cam_rval r; | ||
| 2384 | @@ -46,7 +47,8 @@ static void hexdump(const unsigned char *ptr, size_t len) | ||
| 2385 | printf ("%s%02X", (i % 16 == 0) ? "\n " : " ", ptr[i]); | ||
| 2386 | } | ||
| 2387 | |||
| 2388 | -static void fips_test () | ||
| 2389 | +static void | ||
| 2390 | +fips_test (void) | ||
| 2391 | { | ||
| 2392 | static const unsigned char fipskey[16] = { | ||
| 2393 | 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, | ||
| 2394 | @@ -234,7 +236,8 @@ cts_dec (unsigned char *out, unsigned char *in, unsigned char *iv, | ||
| 2395 | memcpy(out+B, pn, len-B); | ||
| 2396 | } | ||
| 2397 | |||
| 2398 | -static void ecb_test () | ||
| 2399 | +static void | ||
| 2400 | +ecb_test (void) | ||
| 2401 | { | ||
| 2402 | size_t testno; | ||
| 2403 | unsigned char tmp[4*B]; | ||
| 2404 | @@ -265,7 +268,8 @@ static void ecb_test () | ||
| 2405 | |||
| 2406 | unsigned char ivec[16] = { 0 }; | ||
| 2407 | |||
| 2408 | -static void cbc_test () | ||
| 2409 | +static void | ||
| 2410 | +cbc_test (void) | ||
| 2411 | { | ||
| 2412 | size_t testno; | ||
| 2413 | unsigned char tmp[4*B]; | ||
| 2414 | @@ -294,7 +298,8 @@ static void cbc_test () | ||
| 2415 | printf ("\n"); | ||
| 2416 | } | ||
| 2417 | |||
| 2418 | -static void cts_test () | ||
| 2419 | +static void | ||
| 2420 | +cts_test (void) | ||
| 2421 | { | ||
| 2422 | size_t testno; | ||
| 2423 | unsigned char tmp[4*B]; | ||
| 2424 | @@ -319,7 +324,8 @@ static void cts_test () | ||
| 2425 | printf ("\n"); | ||
| 2426 | } | ||
| 2427 | |||
| 2428 | -int main () | ||
| 2429 | +int | ||
| 2430 | +main (void) | ||
| 2431 | { | ||
| 2432 | init (); | ||
| 2433 | fips_test (); | ||
| 2434 | diff --git a/src/lib/crypto/builtin/des/des_int.h b/src/lib/crypto/builtin/des/des_int.h | ||
| 2435 | index f8dc6b2..46fed7d 100644 | ||
| 2436 | --- a/src/lib/crypto/builtin/des/des_int.h | ||
| 2437 | +++ b/src/lib/crypto/builtin/des/des_int.h | ||
| 2438 | @@ -203,9 +203,6 @@ krb5_error_code mit_des_combine_subkeys(const krb5_keyblock *, | ||
| 2439 | const krb5_keyblock *, | ||
| 2440 | krb5_keyblock **); | ||
| 2441 | |||
| 2442 | -/* f_pcbc.c */ | ||
| 2443 | -int mit_des_pcbc_encrypt(); | ||
| 2444 | - | ||
| 2445 | /* f_sched.c */ | ||
| 2446 | int mit_des_make_key_sched(mit_des_cblock, mit_des_key_schedule); | ||
| 2447 | |||
| 2448 | diff --git a/src/lib/crypto/builtin/des/destest.c b/src/lib/crypto/builtin/des/destest.c | ||
| 2449 | index 5211430..0a1a5be 100644 | ||
| 2450 | --- a/src/lib/crypto/builtin/des/destest.c | ||
| 2451 | +++ b/src/lib/crypto/builtin/des/destest.c | ||
| 2452 | @@ -62,9 +62,7 @@ void des_cblock_print_file (mit_des_cblock, FILE *); | ||
| 2453 | krb5_octet zeroblock[8] = {0,0,0,0,0,0,0,0}; | ||
| 2454 | |||
| 2455 | int | ||
| 2456 | -main(argc, argv) | ||
| 2457 | - int argc; | ||
| 2458 | - char *argv[]; | ||
| 2459 | +main(int argc, char *argv[]) | ||
| 2460 | { | ||
| 2461 | char block1[17], block2[17], block3[17]; | ||
| 2462 | /* Force tests of unaligned accesses. */ | ||
| 2463 | @@ -151,9 +149,7 @@ int value[128] = { | ||
| 2464 | }; | ||
| 2465 | |||
| 2466 | void | ||
| 2467 | -convert(text, cblock) | ||
| 2468 | - char *text; | ||
| 2469 | - unsigned char cblock[]; | ||
| 2470 | +convert(char *text, unsigned char cblock[]) | ||
| 2471 | { | ||
| 2472 | int i; | ||
| 2473 | for (i = 0; i < 8; i++) { | ||
| 2474 | @@ -173,16 +169,13 @@ convert(text, cblock) | ||
| 2475 | */ | ||
| 2476 | |||
| 2477 | int | ||
| 2478 | -mit_des_is_weak_key(key) | ||
| 2479 | - mit_des_cblock key; | ||
| 2480 | +mit_des_is_weak_key(mit_des_cblock key) | ||
| 2481 | { | ||
| 2482 | return 0; /* fake it out for testing */ | ||
| 2483 | } | ||
| 2484 | |||
| 2485 | void | ||
| 2486 | -des_cblock_print_file(x, fp) | ||
| 2487 | - mit_des_cblock x; | ||
| 2488 | - FILE *fp; | ||
| 2489 | +des_cblock_print_file(mit_des_cblock x, FILE *fp) | ||
| 2490 | { | ||
| 2491 | unsigned char *y = (unsigned char *) x; | ||
| 2492 | int i = 0; | ||
| 2493 | @@ -207,8 +200,7 @@ des_cblock_print_file(x, fp) | ||
| 2494 | * correct des parity. | ||
| 2495 | */ | ||
| 2496 | int | ||
| 2497 | -mit_des_check_key_parity(key) | ||
| 2498 | - mit_des_cblock key; | ||
| 2499 | +mit_des_check_key_parity(mit_des_cblock key) | ||
| 2500 | { | ||
| 2501 | unsigned int i; | ||
| 2502 | |||
| 2503 | @@ -226,8 +218,7 @@ mit_des_check_key_parity(key) | ||
| 2504 | } | ||
| 2505 | |||
| 2506 | void | ||
| 2507 | -mit_des_fixup_key_parity(key) | ||
| 2508 | - mit_des_cblock key; | ||
| 2509 | +mit_des_fixup_key_parity(mit_des_cblock key) | ||
| 2510 | { | ||
| 2511 | unsigned int i; | ||
| 2512 | for (i=0; i<sizeof(mit_des_cblock); i++) | ||
| 2513 | diff --git a/src/lib/crypto/builtin/des/t_verify.c b/src/lib/crypto/builtin/des/t_verify.c | ||
| 2514 | index 4a19933..11f1a40 100644 | ||
| 2515 | --- a/src/lib/crypto/builtin/des/t_verify.c | ||
| 2516 | +++ b/src/lib/crypto/builtin/des/t_verify.c | ||
| 2517 | @@ -128,9 +128,7 @@ unsigned char mresult[8] = { | ||
| 2518 | mit_des_key_schedule sched; | ||
| 2519 | |||
| 2520 | int | ||
| 2521 | -main(argc,argv) | ||
| 2522 | - int argc; | ||
| 2523 | - char *argv[]; | ||
| 2524 | +main(int argc, char *argv[]) | ||
| 2525 | { | ||
| 2526 | /* Local Declarations */ | ||
| 2527 | size_t in_length; | ||
| 2528 | @@ -335,9 +333,7 @@ main(argc,argv) | ||
| 2529 | } | ||
| 2530 | |||
| 2531 | static void | ||
| 2532 | -do_encrypt(in,out) | ||
| 2533 | - unsigned char *in; | ||
| 2534 | - unsigned char *out; | ||
| 2535 | +do_encrypt(unsigned char *in, unsigned char *out) | ||
| 2536 | { | ||
| 2537 | int i, j; | ||
| 2538 | for (i =1; i<=nflag; i++) { | ||
| 2539 | @@ -359,9 +355,7 @@ do_encrypt(in,out) | ||
| 2540 | } | ||
| 2541 | |||
| 2542 | static void | ||
| 2543 | -do_decrypt(in,out) | ||
| 2544 | - unsigned char *out; | ||
| 2545 | - unsigned char *in; | ||
| 2546 | +do_decrypt(unsigned char *in, unsigned char *out) | ||
| 2547 | /* try to invert it */ | ||
| 2548 | { | ||
| 2549 | int i, j; | ||
| 2550 | @@ -388,8 +382,7 @@ do_decrypt(in,out) | ||
| 2551 | */ | ||
| 2552 | |||
| 2553 | int | ||
| 2554 | -mit_des_is_weak_key(key) | ||
| 2555 | - mit_des_cblock key; | ||
| 2556 | +mit_des_is_weak_key(mit_des_cblock key) | ||
| 2557 | { | ||
| 2558 | return 0; /* fake it out for testing */ | ||
| 2559 | } | ||
| 2560 | diff --git a/src/lib/crypto/builtin/sha1/t_shs.c b/src/lib/crypto/builtin/sha1/t_shs.c | ||
| 2561 | index c1d18f5..a668cb0 100644 | ||
| 2562 | --- a/src/lib/crypto/builtin/sha1/t_shs.c | ||
| 2563 | +++ b/src/lib/crypto/builtin/sha1/t_shs.c | ||
| 2564 | @@ -29,9 +29,8 @@ static SHS_LONG shsTestResults[][ 5 ] = { | ||
| 2565 | }; | ||
| 2566 | #endif /* NEW_SHS */ | ||
| 2567 | |||
| 2568 | -static int compareSHSresults(shsInfo, shsTestLevel) | ||
| 2569 | - SHS_INFO *shsInfo; | ||
| 2570 | - int shsTestLevel; | ||
| 2571 | +static int | ||
| 2572 | +compareSHSresults(SHS_INFO *shsInfo, int shsTestLevel) | ||
| 2573 | { | ||
| 2574 | int i, fail = 0; | ||
| 2575 | |||
| 2576 | @@ -55,7 +54,7 @@ static int compareSHSresults(shsInfo, shsTestLevel) | ||
| 2577 | } | ||
| 2578 | |||
| 2579 | int | ||
| 2580 | -main() | ||
| 2581 | +main(int argc, char *argv[]) | ||
| 2582 | { | ||
| 2583 | SHS_INFO shsInfo; | ||
| 2584 | unsigned int i; | ||
| 2585 | diff --git a/src/lib/crypto/builtin/sha1/t_shs3.c b/src/lib/crypto/builtin/sha1/t_shs3.c | ||
| 2586 | index 7aa0bbd..87caf7f 100644 | ||
| 2587 | --- a/src/lib/crypto/builtin/sha1/t_shs3.c | ||
| 2588 | +++ b/src/lib/crypto/builtin/sha1/t_shs3.c | ||
| 2589 | @@ -55,9 +55,7 @@ int mode; | ||
| 2590 | int Dflag; | ||
| 2591 | |||
| 2592 | int | ||
| 2593 | -main(argc,argv) | ||
| 2594 | - int argc; | ||
| 2595 | - char **argv; | ||
| 2596 | +main(int argc, char **argv) | ||
| 2597 | { | ||
| 2598 | char *argp; | ||
| 2599 | |||
| 2600 | @@ -131,8 +129,7 @@ static void process(void) | ||
| 2601 | |||
| 2602 | #ifndef shsDigest | ||
| 2603 | static unsigned char * | ||
| 2604 | -shsDigest(si) | ||
| 2605 | - SHS_INFO *si; | ||
| 2606 | +shsDigest(SHS_INFO *si) | ||
| 2607 | { | ||
| 2608 | longReverse(si->digest, SHS_DIGESTSIZE); | ||
| 2609 | return (unsigned char*) si->digest; | ||
| 2610 | diff --git a/src/lib/crypto/crypto_tests/aes-test.c b/src/lib/crypto/crypto_tests/aes-test.c | ||
| 2611 | index a7382a4..d26f711 100644 | ||
| 2612 | --- a/src/lib/crypto/crypto_tests/aes-test.c | ||
| 2613 | +++ b/src/lib/crypto/crypto_tests/aes-test.c | ||
| 2614 | @@ -37,14 +37,14 @@ static char plain[16], cipher[16], zero[16]; | ||
| 2615 | |||
| 2616 | static krb5_keyblock enc_key; | ||
| 2617 | static krb5_data ivec; | ||
| 2618 | -static void init() | ||
| 2619 | +static void init(void) | ||
| 2620 | { | ||
| 2621 | enc_key.contents = (krb5_octet *)key; | ||
| 2622 | enc_key.length = 16; | ||
| 2623 | ivec.data = zero; | ||
| 2624 | ivec.length = 16; | ||
| 2625 | } | ||
| 2626 | -static void enc() | ||
| 2627 | +static void enc(void) | ||
| 2628 | { | ||
| 2629 | krb5_key k; | ||
| 2630 | krb5_crypto_iov iov; | ||
| 2631 | @@ -93,7 +93,7 @@ static void vk_test_1(int len, krb5_enctype etype) | ||
| 2632 | } | ||
| 2633 | printf("\n==========\n"); | ||
| 2634 | } | ||
| 2635 | -static void vk_test() | ||
| 2636 | +static void vk_test(void) | ||
| 2637 | { | ||
| 2638 | vk_test_1(16, ENCTYPE_AES128_CTS_HMAC_SHA1_96); | ||
| 2639 | vk_test_1(32, ENCTYPE_AES256_CTS_HMAC_SHA1_96); | ||
| 2640 | @@ -119,7 +119,7 @@ static void vt_test_1(int len, krb5_enctype etype) | ||
| 2641 | } | ||
| 2642 | printf("\n==========\n"); | ||
| 2643 | } | ||
| 2644 | -static void vt_test() | ||
| 2645 | +static void vt_test(void) | ||
| 2646 | { | ||
| 2647 | vt_test_1(16, ENCTYPE_AES128_CTS_HMAC_SHA1_96); | ||
| 2648 | vt_test_1(32, ENCTYPE_AES256_CTS_HMAC_SHA1_96); | ||
| 2649 | diff --git a/src/lib/crypto/crypto_tests/camellia-test.c b/src/lib/crypto/crypto_tests/camellia-test.c | ||
| 2650 | index 23d1466..ca6579f 100644 | ||
| 2651 | --- a/src/lib/crypto/crypto_tests/camellia-test.c | ||
| 2652 | +++ b/src/lib/crypto/crypto_tests/camellia-test.c | ||
| 2653 | @@ -35,14 +35,14 @@ static char plain[16], cipher[16], zero[16]; | ||
| 2654 | |||
| 2655 | static krb5_keyblock enc_key; | ||
| 2656 | static krb5_data ivec; | ||
| 2657 | -static void init() | ||
| 2658 | +static void init(void) | ||
| 2659 | { | ||
| 2660 | enc_key.contents = (unsigned char *)key; | ||
| 2661 | enc_key.length = 16; | ||
| 2662 | ivec.data = zero; | ||
| 2663 | ivec.length = 16; | ||
| 2664 | } | ||
| 2665 | -static void enc() | ||
| 2666 | +static void enc(void) | ||
| 2667 | { | ||
| 2668 | krb5_key k; | ||
| 2669 | krb5_crypto_iov iov; | ||
| 2670 | @@ -91,7 +91,7 @@ static void vk_test_1(int len) | ||
| 2671 | } | ||
| 2672 | printf("\n==========\n"); | ||
| 2673 | } | ||
| 2674 | -static void vk_test() | ||
| 2675 | +static void vk_test(void) | ||
| 2676 | { | ||
| 2677 | vk_test_1(16); | ||
| 2678 | vk_test_1(32); | ||
| 2679 | @@ -117,7 +117,7 @@ static void vt_test_1(int len, krb5_enctype etype) | ||
| 2680 | } | ||
| 2681 | printf("\n==========\n"); | ||
| 2682 | } | ||
| 2683 | -static void vt_test() | ||
| 2684 | +static void vt_test(void) | ||
| 2685 | { | ||
| 2686 | vt_test_1(16, ENCTYPE_CAMELLIA128_CTS_CMAC); | ||
| 2687 | vt_test_1(32, ENCTYPE_CAMELLIA256_CTS_CMAC); | ||
| 2688 | diff --git a/src/lib/crypto/crypto_tests/t_cf2.c b/src/lib/crypto/crypto_tests/t_cf2.c | ||
| 2689 | index 67c9dcd..4c894ad 100644 | ||
| 2690 | --- a/src/lib/crypto/crypto_tests/t_cf2.c | ||
| 2691 | +++ b/src/lib/crypto/crypto_tests/t_cf2.c | ||
| 2692 | @@ -46,7 +46,9 @@ | ||
| 2693 | #include <stdio.h> | ||
| 2694 | #include <string.h> | ||
| 2695 | |||
| 2696 | -int main () { | ||
| 2697 | +int | ||
| 2698 | +main(void) | ||
| 2699 | +{ | ||
| 2700 | krb5_error_code ret; | ||
| 2701 | char pepper1[1025], pepper2[1025]; | ||
| 2702 | krb5_keyblock *k1 = NULL, *k2 = NULL, *out = NULL; | ||
| 2703 | diff --git a/src/lib/crypto/crypto_tests/t_cts.c b/src/lib/crypto/crypto_tests/t_cts.c | ||
| 2704 | index fe50516..f8a5a53 100644 | ||
| 2705 | --- a/src/lib/crypto/crypto_tests/t_cts.c | ||
| 2706 | +++ b/src/lib/crypto/crypto_tests/t_cts.c | ||
| 2707 | @@ -77,7 +77,7 @@ static void printk(const char *descr, krb5_keyblock *k) { | ||
| 2708 | printd(descr, &d); | ||
| 2709 | } | ||
| 2710 | |||
| 2711 | -static void test_cts() | ||
| 2712 | +static void test_cts(void) | ||
| 2713 | { | ||
| 2714 | static const char input[4*16] = | ||
| 2715 | "I would like the General Gau's Chicken, please, and wonton soup."; | ||
| 2716 | diff --git a/src/lib/crypto/crypto_tests/t_encrypt.c b/src/lib/crypto/crypto_tests/t_encrypt.c | ||
| 2717 | index bd9b946..64092ef 100644 | ||
| 2718 | --- a/src/lib/crypto/crypto_tests/t_encrypt.c | ||
| 2719 | +++ b/src/lib/crypto/crypto_tests/t_encrypt.c | ||
| 2720 | @@ -88,7 +88,7 @@ display(const char *msg, const krb5_data *d) | ||
| 2721 | } | ||
| 2722 | |||
| 2723 | int | ||
| 2724 | -main () | ||
| 2725 | +main(void) | ||
| 2726 | { | ||
| 2727 | krb5_context context = 0; | ||
| 2728 | krb5_data in, in2, out, out2, check, check2, state, signdata; | ||
| 2729 | diff --git a/src/lib/crypto/crypto_tests/t_fork.c b/src/lib/crypto/crypto_tests/t_fork.c | ||
| 2730 | index 428fc8a..8be7474 100644 | ||
| 2731 | --- a/src/lib/crypto/crypto_tests/t_fork.c | ||
| 2732 | +++ b/src/lib/crypto/crypto_tests/t_fork.c | ||
| 2733 | @@ -55,7 +55,7 @@ prepare_enc_data(krb5_key key, size_t in_len, krb5_enc_data *enc_data) | ||
| 2734 | } | ||
| 2735 | |||
| 2736 | int | ||
| 2737 | -main() | ||
| 2738 | +main(void) | ||
| 2739 | { | ||
| 2740 | krb5_keyblock kb_aes, kb_rc4; | ||
| 2741 | krb5_key key_aes, key_rc4; | ||
| 2742 | diff --git a/src/lib/crypto/crypto_tests/t_hmac.c b/src/lib/crypto/crypto_tests/t_hmac.c | ||
| 2743 | index da359cb..e40136b 100644 | ||
| 2744 | --- a/src/lib/crypto/crypto_tests/t_hmac.c | ||
| 2745 | +++ b/src/lib/crypto/crypto_tests/t_hmac.c | ||
| 2746 | @@ -122,7 +122,8 @@ static krb5_error_code hmac1(const struct krb5_hash_provider *h, | ||
| 2747 | return err; | ||
| 2748 | } | ||
| 2749 | |||
| 2750 | -static void test_hmac() | ||
| 2751 | +static void | ||
| 2752 | +test_hmac(void) | ||
| 2753 | { | ||
| 2754 | krb5_keyblock key; | ||
| 2755 | krb5_data in, out; | ||
| 2756 | diff --git a/src/lib/crypto/crypto_tests/t_mddriver.c b/src/lib/crypto/crypto_tests/t_mddriver.c | ||
| 2757 | index ad65d03..035f825 100644 | ||
| 2758 | --- a/src/lib/crypto/crypto_tests/t_mddriver.c | ||
| 2759 | +++ b/src/lib/crypto/crypto_tests/t_mddriver.c | ||
| 2760 | @@ -111,9 +111,8 @@ struct md_test_entry md_test_suite[] = { | ||
| 2761 | -t - runs time trial | ||
| 2762 | -x - runs test script | ||
| 2763 | */ | ||
| 2764 | -int main (argc, argv) | ||
| 2765 | - int argc; | ||
| 2766 | - char *argv[]; | ||
| 2767 | +int | ||
| 2768 | +main(int argc, char *argv[]) | ||
| 2769 | { | ||
| 2770 | int i; | ||
| 2771 | |||
| 2772 | @@ -128,10 +127,8 @@ int main (argc, argv) | ||
| 2773 | return (0); | ||
| 2774 | } | ||
| 2775 | |||
| 2776 | -static void MDHash (bytes, len, count, out) | ||
| 2777 | - char *bytes; | ||
| 2778 | - size_t len, count; | ||
| 2779 | - unsigned char *out; | ||
| 2780 | +static void | ||
| 2781 | +MDHash(char *bytes, size_t len, size_t count, unsigned char *out) | ||
| 2782 | { | ||
| 2783 | krb5_crypto_iov *iov; | ||
| 2784 | krb5_data outdata = make_data (out, MDProvider.hashsize); | ||
| 2785 | @@ -150,8 +147,8 @@ static void MDHash (bytes, len, count, out) | ||
| 2786 | |||
| 2787 | /* Digests a string and prints the result. | ||
| 2788 | */ | ||
| 2789 | -static void MDString (string) | ||
| 2790 | - char *string; | ||
| 2791 | +static void | ||
| 2792 | +MDString(char *string) | ||
| 2793 | { | ||
| 2794 | unsigned char digest[16]; | ||
| 2795 | |||
| 2796 | @@ -164,7 +161,8 @@ static void MDString (string) | ||
| 2797 | /* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte | ||
| 2798 | blocks. | ||
| 2799 | */ | ||
| 2800 | -static void MDTimeTrial () | ||
| 2801 | +static void | ||
| 2802 | +MDTimeTrial(void) | ||
| 2803 | { | ||
| 2804 | time_t endTime, startTime; | ||
| 2805 | unsigned char block[TEST_BLOCK_LEN], digest[16]; | ||
| 2806 | @@ -197,7 +195,8 @@ static void MDTimeTrial () | ||
| 2807 | |||
| 2808 | /* Digests a reference suite of strings and prints the results. | ||
| 2809 | */ | ||
| 2810 | -static void MDTestSuite () | ||
| 2811 | +static void | ||
| 2812 | +MDTestSuite(void) | ||
| 2813 | { | ||
| 2814 | #ifdef HAVE_TEST_SUITE | ||
| 2815 | struct md_test_entry *entry; | ||
| 2816 | @@ -246,8 +245,8 @@ static void MDTestSuite () | ||
| 2817 | |||
| 2818 | /* Prints a message digest in hexadecimal. | ||
| 2819 | */ | ||
| 2820 | -static void MDPrint (digest) | ||
| 2821 | - unsigned char digest[16]; | ||
| 2822 | +static void | ||
| 2823 | +MDPrint(unsigned char digest[16]) | ||
| 2824 | { | ||
| 2825 | unsigned int i; | ||
| 2826 | |||
| 2827 | diff --git a/src/lib/crypto/crypto_tests/t_nfold.c b/src/lib/crypto/crypto_tests/t_nfold.c | ||
| 2828 | index b94353c..a741b61 100644 | ||
| 2829 | --- a/src/lib/crypto/crypto_tests/t_nfold.c | ||
| 2830 | +++ b/src/lib/crypto/crypto_tests/t_nfold.c | ||
| 2831 | @@ -33,17 +33,20 @@ | ||
| 2832 | |||
| 2833 | #define ASIZE(ARRAY) (sizeof(ARRAY)/sizeof(ARRAY[0])) | ||
| 2834 | |||
| 2835 | -static void printhex (size_t len, const unsigned char *p) | ||
| 2836 | +static void | ||
| 2837 | +printhex(size_t len, const unsigned char *p) | ||
| 2838 | { | ||
| 2839 | while (len--) | ||
| 2840 | printf ("%02x", 0xff & *p++); | ||
| 2841 | } | ||
| 2842 | |||
| 2843 | -static void printstringhex (const unsigned char *p) { | ||
| 2844 | +static void | ||
| 2845 | +printstringhex(const unsigned char *p) { | ||
| 2846 | printhex (strlen ((const char *) p), p); | ||
| 2847 | } | ||
| 2848 | |||
| 2849 | -static void rfc_tests () | ||
| 2850 | +static void | ||
| 2851 | +rfc_tests(void) | ||
| 2852 | { | ||
| 2853 | unsigned i; | ||
| 2854 | struct { | ||
| 2855 | @@ -92,7 +95,8 @@ static void rfc_tests () | ||
| 2856 | } | ||
| 2857 | } | ||
| 2858 | |||
| 2859 | -static void fold_kerberos(unsigned int nbytes) | ||
| 2860 | +static void | ||
| 2861 | +fold_kerberos(unsigned int nbytes) | ||
| 2862 | { | ||
| 2863 | unsigned char cipher_text[300]; | ||
| 2864 | unsigned int j; | ||
| 2865 | @@ -125,9 +129,7 @@ unsigned char nfold_192[4][24] = { | ||
| 2866 | }; | ||
| 2867 | |||
| 2868 | int | ||
| 2869 | -main(argc, argv) | ||
| 2870 | - int argc; | ||
| 2871 | - char *argv[]; | ||
| 2872 | +main(int argc, char *argv[]) | ||
| 2873 | { | ||
| 2874 | unsigned char cipher_text[64]; | ||
| 2875 | unsigned int i, j; | ||
| 2876 | diff --git a/src/lib/crypto/crypto_tests/t_prf.c b/src/lib/crypto/crypto_tests/t_prf.c | ||
| 2877 | index d9877bd..6fa0afb 100644 | ||
| 2878 | --- a/src/lib/crypto/crypto_tests/t_prf.c | ||
| 2879 | +++ b/src/lib/crypto/crypto_tests/t_prf.c | ||
| 2880 | @@ -116,7 +116,7 @@ struct test { | ||
| 2881 | }; | ||
| 2882 | |||
| 2883 | int | ||
| 2884 | -main() | ||
| 2885 | +main(void) | ||
| 2886 | { | ||
| 2887 | krb5_error_code ret; | ||
| 2888 | krb5_data output; | ||
| 2889 | diff --git a/src/lib/crypto/crypto_tests/t_sha2.c b/src/lib/crypto/crypto_tests/t_sha2.c | ||
| 2890 | index e6fa584..776c4e9 100644 | ||
| 2891 | --- a/src/lib/crypto/crypto_tests/t_sha2.c | ||
| 2892 | +++ b/src/lib/crypto/crypto_tests/t_sha2.c | ||
| 2893 | @@ -137,7 +137,7 @@ hash_test(const struct krb5_hash_provider *hash, struct test *tests) | ||
| 2894 | } | ||
| 2895 | |||
| 2896 | int | ||
| 2897 | -main() | ||
| 2898 | +main(void) | ||
| 2899 | { | ||
| 2900 | hash_test(&krb5int_hash_sha256, sha256_tests); | ||
| 2901 | hash_test(&krb5int_hash_sha384, sha384_tests); | ||
| 2902 | diff --git a/src/lib/gssapi/generic/t_seqstate.c b/src/lib/gssapi/generic/t_seqstate.c | ||
| 2903 | index 8f44fcf..4df1ed6 100644 | ||
| 2904 | --- a/src/lib/gssapi/generic/t_seqstate.c | ||
| 2905 | +++ b/src/lib/gssapi/generic/t_seqstate.c | ||
| 2906 | @@ -164,7 +164,7 @@ struct test { | ||
| 2907 | }; | ||
| 2908 | |||
| 2909 | int | ||
| 2910 | -main() | ||
| 2911 | +main(void) | ||
| 2912 | { | ||
| 2913 | size_t i, j; | ||
| 2914 | enum width w; | ||
| 2915 | diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c | ||
| 2916 | index b35e11b..227aa54 100644 | ||
| 2917 | --- a/src/lib/gssapi/krb5/accept_sec_context.c | ||
| 2918 | +++ b/src/lib/gssapi/krb5/accept_sec_context.c | ||
| 2919 | @@ -160,11 +160,8 @@ create_constrained_deleg_creds(OM_uint32 *minor_status, | ||
| 2920 | |||
| 2921 | /* Decode, decrypt and store the forwarded creds in the local ccache. */ | ||
| 2922 | static krb5_error_code | ||
| 2923 | -rd_and_store_for_creds(context, auth_context, inbuf, out_cred) | ||
| 2924 | - krb5_context context; | ||
| 2925 | - krb5_auth_context auth_context; | ||
| 2926 | - krb5_data *inbuf; | ||
| 2927 | - krb5_gss_cred_id_t *out_cred; | ||
| 2928 | +rd_and_store_for_creds(krb5_context context, krb5_auth_context auth_context, | ||
| 2929 | + krb5_data *inbuf, krb5_gss_cred_id_t *out_cred) | ||
| 2930 | { | ||
| 2931 | krb5_creds ** creds = NULL; | ||
| 2932 | krb5_error_code retval; | ||
| 2933 | @@ -286,20 +283,12 @@ cleanup: | ||
| 2934 | * Performs third leg of DCE authentication | ||
| 2935 | */ | ||
| 2936 | static OM_uint32 | ||
| 2937 | -kg_accept_dce(minor_status, context_handle, verifier_cred_handle, | ||
| 2938 | - input_token, input_chan_bindings, src_name, mech_type, | ||
| 2939 | - output_token, ret_flags, time_rec, delegated_cred_handle) | ||
| 2940 | - OM_uint32 *minor_status; | ||
| 2941 | - gss_ctx_id_t *context_handle; | ||
| 2942 | - gss_cred_id_t verifier_cred_handle; | ||
| 2943 | - gss_buffer_t input_token; | ||
| 2944 | - gss_channel_bindings_t input_chan_bindings; | ||
| 2945 | - gss_name_t *src_name; | ||
| 2946 | - gss_OID *mech_type; | ||
| 2947 | - gss_buffer_t output_token; | ||
| 2948 | - OM_uint32 *ret_flags; | ||
| 2949 | - OM_uint32 *time_rec; | ||
| 2950 | - gss_cred_id_t *delegated_cred_handle; | ||
| 2951 | +kg_accept_dce(OM_uint32 *minor_status, gss_ctx_id_t *context_handle, | ||
| 2952 | + gss_cred_id_t verifier_cred_handle, gss_buffer_t input_token, | ||
| 2953 | + gss_channel_bindings_t input_chan_bindings, gss_name_t *src_name, | ||
| 2954 | + gss_OID *mech_type, gss_buffer_t output_token, | ||
| 2955 | + OM_uint32 *ret_flags, OM_uint32 *time_rec, | ||
| 2956 | + gss_cred_id_t *delegated_cred_handle) | ||
| 2957 | { | ||
| 2958 | krb5_error_code code; | ||
| 2959 | krb5_gss_ctx_id_rec *ctx = 0; | ||
| 2960 | @@ -637,23 +626,13 @@ fail: | ||
| 2961 | } | ||
| 2962 | |||
| 2963 | static OM_uint32 | ||
| 2964 | -kg_accept_krb5(minor_status, context_handle, | ||
| 2965 | - verifier_cred_handle, input_token, | ||
| 2966 | - input_chan_bindings, src_name, mech_type, | ||
| 2967 | - output_token, ret_flags, time_rec, | ||
| 2968 | - delegated_cred_handle, exts) | ||
| 2969 | - OM_uint32 *minor_status; | ||
| 2970 | - gss_ctx_id_t *context_handle; | ||
| 2971 | - gss_cred_id_t verifier_cred_handle; | ||
| 2972 | - gss_buffer_t input_token; | ||
| 2973 | - gss_channel_bindings_t input_chan_bindings; | ||
| 2974 | - gss_name_t *src_name; | ||
| 2975 | - gss_OID *mech_type; | ||
| 2976 | - gss_buffer_t output_token; | ||
| 2977 | - OM_uint32 *ret_flags; | ||
| 2978 | - OM_uint32 *time_rec; | ||
| 2979 | - gss_cred_id_t *delegated_cred_handle; | ||
| 2980 | - krb5_gss_ctx_ext_t exts; | ||
| 2981 | +kg_accept_krb5(OM_uint32 *minor_status, gss_ctx_id_t *context_handle, | ||
| 2982 | + gss_cred_id_t verifier_cred_handle, gss_buffer_t input_token, | ||
| 2983 | + gss_channel_bindings_t input_chan_bindings, | ||
| 2984 | + gss_name_t *src_name, gss_OID *mech_type, | ||
| 2985 | + gss_buffer_t output_token, OM_uint32 *ret_flags, | ||
| 2986 | + OM_uint32 *time_rec, gss_cred_id_t *delegated_cred_handle, | ||
| 2987 | + krb5_gss_ctx_ext_t exts) | ||
| 2988 | { | ||
| 2989 | krb5_context context; | ||
| 2990 | unsigned char *ptr; | ||
| 2991 | @@ -1310,22 +1289,15 @@ krb5_gss_accept_sec_context_ext( | ||
| 2992 | } | ||
| 2993 | |||
| 2994 | OM_uint32 KRB5_CALLCONV | ||
| 2995 | -krb5_gss_accept_sec_context(minor_status, context_handle, | ||
| 2996 | - verifier_cred_handle, input_token, | ||
| 2997 | - input_chan_bindings, src_name, mech_type, | ||
| 2998 | - output_token, ret_flags, time_rec, | ||
| 2999 | - delegated_cred_handle) | ||
| 3000 | - OM_uint32 *minor_status; | ||
| 3001 | - gss_ctx_id_t *context_handle; | ||
| 3002 | - gss_cred_id_t verifier_cred_handle; | ||
| 3003 | - gss_buffer_t input_token; | ||
| 3004 | - gss_channel_bindings_t input_chan_bindings; | ||
| 3005 | - gss_name_t *src_name; | ||
| 3006 | - gss_OID *mech_type; | ||
| 3007 | - gss_buffer_t output_token; | ||
| 3008 | - OM_uint32 *ret_flags; | ||
| 3009 | - OM_uint32 *time_rec; | ||
| 3010 | - gss_cred_id_t *delegated_cred_handle; | ||
| 3011 | +krb5_gss_accept_sec_context(OM_uint32 *minor_status, | ||
| 3012 | + gss_ctx_id_t *context_handle, | ||
| 3013 | + gss_cred_id_t verifier_cred_handle, | ||
| 3014 | + gss_buffer_t input_token, | ||
| 3015 | + gss_channel_bindings_t input_chan_bindings, | ||
| 3016 | + gss_name_t *src_name, gss_OID *mech_type, | ||
| 3017 | + gss_buffer_t output_token, OM_uint32 *ret_flags, | ||
| 3018 | + OM_uint32 *time_rec, | ||
| 3019 | + gss_cred_id_t *delegated_cred_handle) | ||
| 3020 | { | ||
| 3021 | krb5_gss_ctx_ext_rec exts; | ||
| 3022 | |||
| 3023 | diff --git a/src/lib/gssapi/krb5/compare_name.c b/src/lib/gssapi/krb5/compare_name.c | ||
| 3024 | index 3f3788d..3aa5a0d 100644 | ||
| 3025 | --- a/src/lib/gssapi/krb5/compare_name.c | ||
| 3026 | +++ b/src/lib/gssapi/krb5/compare_name.c | ||
| 3027 | @@ -28,11 +28,8 @@ | ||
| 3028 | #include "gssapiP_krb5.h" | ||
| 3029 | |||
| 3030 | OM_uint32 KRB5_CALLCONV | ||
| 3031 | -krb5_gss_compare_name(minor_status, name1, name2, name_equal) | ||
| 3032 | - OM_uint32 *minor_status; | ||
| 3033 | - gss_name_t name1; | ||
| 3034 | - gss_name_t name2; | ||
| 3035 | - int *name_equal; | ||
| 3036 | +krb5_gss_compare_name(OM_uint32 *minor_status, gss_name_t name1, | ||
| 3037 | + gss_name_t name2, int *name_equal) | ||
| 3038 | { | ||
| 3039 | krb5_context context; | ||
| 3040 | krb5_error_code code; | ||
| 3041 | diff --git a/src/lib/gssapi/krb5/context_time.c b/src/lib/gssapi/krb5/context_time.c | ||
| 3042 | index 226de05..0ab885d 100644 | ||
| 3043 | --- a/src/lib/gssapi/krb5/context_time.c | ||
| 3044 | +++ b/src/lib/gssapi/krb5/context_time.c | ||
| 3045 | @@ -28,10 +28,8 @@ | ||
| 3046 | */ | ||
| 3047 | |||
| 3048 | OM_uint32 KRB5_CALLCONV | ||
| 3049 | -krb5_gss_context_time(minor_status, context_handle, time_rec) | ||
| 3050 | - OM_uint32 *minor_status; | ||
| 3051 | - gss_ctx_id_t context_handle; | ||
| 3052 | - OM_uint32 *time_rec; | ||
| 3053 | +krb5_gss_context_time(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 3054 | + OM_uint32 *time_rec) | ||
| 3055 | { | ||
| 3056 | krb5_error_code code; | ||
| 3057 | krb5_gss_ctx_id_rec *ctx; | ||
| 3058 | diff --git a/src/lib/gssapi/krb5/delete_sec_context.c b/src/lib/gssapi/krb5/delete_sec_context.c | ||
| 3059 | index 4b9dfae..92e84b7 100644 | ||
| 3060 | --- a/src/lib/gssapi/krb5/delete_sec_context.c | ||
| 3061 | +++ b/src/lib/gssapi/krb5/delete_sec_context.c | ||
| 3062 | @@ -28,10 +28,9 @@ | ||
| 3063 | */ | ||
| 3064 | |||
| 3065 | OM_uint32 KRB5_CALLCONV | ||
| 3066 | -krb5_gss_delete_sec_context(minor_status, context_handle, output_token) | ||
| 3067 | - OM_uint32 *minor_status; | ||
| 3068 | - gss_ctx_id_t *context_handle; | ||
| 3069 | - gss_buffer_t output_token; | ||
| 3070 | +krb5_gss_delete_sec_context(OM_uint32 *minor_status, | ||
| 3071 | + gss_ctx_id_t *context_handle, | ||
| 3072 | + gss_buffer_t output_token) | ||
| 3073 | { | ||
| 3074 | krb5_context context; | ||
| 3075 | krb5_gss_ctx_id_rec *ctx; | ||
| 3076 | diff --git a/src/lib/gssapi/krb5/disp_name.c b/src/lib/gssapi/krb5/disp_name.c | ||
| 3077 | index b097bf0..75fef01 100644 | ||
| 3078 | --- a/src/lib/gssapi/krb5/disp_name.c | ||
| 3079 | +++ b/src/lib/gssapi/krb5/disp_name.c | ||
| 3080 | @@ -24,12 +24,9 @@ | ||
| 3081 | #include "gssapiP_krb5.h" | ||
| 3082 | |||
| 3083 | OM_uint32 KRB5_CALLCONV | ||
| 3084 | -krb5_gss_display_name(minor_status, input_name, output_name_buffer, | ||
| 3085 | - output_name_type) | ||
| 3086 | - OM_uint32 *minor_status; | ||
| 3087 | - gss_name_t input_name; | ||
| 3088 | - gss_buffer_t output_name_buffer; | ||
| 3089 | - gss_OID *output_name_type; | ||
| 3090 | +krb5_gss_display_name(OM_uint32 *minor_status, gss_name_t input_name, | ||
| 3091 | + gss_buffer_t output_name_buffer, | ||
| 3092 | + gss_OID *output_name_type) | ||
| 3093 | { | ||
| 3094 | krb5_context context; | ||
| 3095 | krb5_error_code code; | ||
| 3096 | diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c | ||
| 3097 | index 6ff62a9..71000b7 100644 | ||
| 3098 | --- a/src/lib/gssapi/krb5/disp_status.c | ||
| 3099 | +++ b/src/lib/gssapi/krb5/disp_status.c | ||
| 3100 | @@ -154,14 +154,9 @@ void krb5_gss_delete_error_info(void *p) | ||
| 3101 | /**/ | ||
| 3102 | |||
| 3103 | OM_uint32 KRB5_CALLCONV | ||
| 3104 | -krb5_gss_display_status(minor_status, status_value, status_type, | ||
| 3105 | - mech_type, message_context, status_string) | ||
| 3106 | - OM_uint32 *minor_status; | ||
| 3107 | - OM_uint32 status_value; | ||
| 3108 | - int status_type; | ||
| 3109 | - gss_OID mech_type; | ||
| 3110 | - OM_uint32 *message_context; | ||
| 3111 | - gss_buffer_t status_string; | ||
| 3112 | +krb5_gss_display_status(OM_uint32 *minor_status, OM_uint32 status_value, | ||
| 3113 | + int status_type, gss_OID mech_type, | ||
| 3114 | + OM_uint32 *message_context, gss_buffer_t status_string) | ||
| 3115 | { | ||
| 3116 | status_string->length = 0; | ||
| 3117 | status_string->value = NULL; | ||
| 3118 | diff --git a/src/lib/gssapi/krb5/export_sec_context.c b/src/lib/gssapi/krb5/export_sec_context.c | ||
| 3119 | index 44e5008..9730e05 100644 | ||
| 3120 | --- a/src/lib/gssapi/krb5/export_sec_context.c | ||
| 3121 | +++ b/src/lib/gssapi/krb5/export_sec_context.c | ||
| 3122 | @@ -27,10 +27,9 @@ | ||
| 3123 | #include "gssapiP_krb5.h" | ||
| 3124 | #ifndef LEAN_CLIENT | ||
| 3125 | OM_uint32 KRB5_CALLCONV | ||
| 3126 | -krb5_gss_export_sec_context(minor_status, context_handle, interprocess_token) | ||
| 3127 | - OM_uint32 *minor_status; | ||
| 3128 | - gss_ctx_id_t *context_handle; | ||
| 3129 | - gss_buffer_t interprocess_token; | ||
| 3130 | +krb5_gss_export_sec_context(OM_uint32 *minor_status, | ||
| 3131 | + gss_ctx_id_t *context_handle, | ||
| 3132 | + gss_buffer_t interprocess_token) | ||
| 3133 | { | ||
| 3134 | krb5_context context = NULL; | ||
| 3135 | krb5_error_code kret; | ||
| 3136 | diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c | ||
| 3137 | index 1e62b07..370b7d1 100644 | ||
| 3138 | --- a/src/lib/gssapi/krb5/gssapi_krb5.c | ||
| 3139 | +++ b/src/lib/gssapi/krb5/gssapi_krb5.c | ||
| 3140 | @@ -197,9 +197,7 @@ g_set kg_vdb = G_SET_INIT; | ||
| 3141 | * so handling the expiration/invalidation condition here isn't needed. | ||
| 3142 | */ | ||
| 3143 | OM_uint32 | ||
| 3144 | -kg_get_defcred(minor_status, cred) | ||
| 3145 | - OM_uint32 *minor_status; | ||
| 3146 | - gss_cred_id_t *cred; | ||
| 3147 | +kg_get_defcred(OM_uint32 *minor_status, gss_cred_id_t *cred) | ||
| 3148 | { | ||
| 3149 | OM_uint32 major; | ||
| 3150 | |||
| 3151 | diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c | ||
| 3152 | index f64635a..cc6883b 100644 | ||
| 3153 | --- a/src/lib/gssapi/krb5/import_name.c | ||
| 3154 | +++ b/src/lib/gssapi/krb5/import_name.c | ||
| 3155 | @@ -120,12 +120,8 @@ parse_hostbased(const char *str, size_t len, | ||
| 3156 | } | ||
| 3157 | |||
| 3158 | OM_uint32 KRB5_CALLCONV | ||
| 3159 | -krb5_gss_import_name(minor_status, input_name_buffer, | ||
| 3160 | - input_name_type, output_name) | ||
| 3161 | - OM_uint32 *minor_status; | ||
| 3162 | - gss_buffer_t input_name_buffer; | ||
| 3163 | - gss_OID input_name_type; | ||
| 3164 | - gss_name_t *output_name; | ||
| 3165 | +krb5_gss_import_name(OM_uint32 *minor_status, gss_buffer_t input_name_buffer, | ||
| 3166 | + gss_OID input_name_type, gss_name_t *output_name) | ||
| 3167 | { | ||
| 3168 | krb5_context context; | ||
| 3169 | krb5_principal princ = NULL; | ||
| 3170 | diff --git a/src/lib/gssapi/krb5/import_sec_context.c b/src/lib/gssapi/krb5/import_sec_context.c | ||
| 3171 | index 7d26f4d..e39c036 100644 | ||
| 3172 | --- a/src/lib/gssapi/krb5/import_sec_context.c | ||
| 3173 | +++ b/src/lib/gssapi/krb5/import_sec_context.c | ||
| 3174 | @@ -32,8 +32,7 @@ | ||
| 3175 | * Fix up the OID of the mechanism so that uses the static version of | ||
| 3176 | * the OID if possible. | ||
| 3177 | */ | ||
| 3178 | -gss_OID krb5_gss_convert_static_mech_oid(oid) | ||
| 3179 | - gss_OID oid; | ||
| 3180 | +gss_OID krb5_gss_convert_static_mech_oid(gss_OID oid) | ||
| 3181 | { | ||
| 3182 | const gss_OID_desc *p; | ||
| 3183 | OM_uint32 minor_status; | ||
| 3184 | @@ -49,10 +48,9 @@ gss_OID krb5_gss_convert_static_mech_oid(oid) | ||
| 3185 | } | ||
| 3186 | |||
| 3187 | OM_uint32 KRB5_CALLCONV | ||
| 3188 | -krb5_gss_import_sec_context(minor_status, interprocess_token, context_handle) | ||
| 3189 | - OM_uint32 *minor_status; | ||
| 3190 | - gss_buffer_t interprocess_token; | ||
| 3191 | - gss_ctx_id_t *context_handle; | ||
| 3192 | +krb5_gss_import_sec_context(OM_uint32 *minor_status, | ||
| 3193 | + gss_buffer_t interprocess_token, | ||
| 3194 | + gss_ctx_id_t *context_handle) | ||
| 3195 | { | ||
| 3196 | krb5_context context; | ||
| 3197 | krb5_error_code kret = 0; | ||
| 3198 | diff --git a/src/lib/gssapi/krb5/indicate_mechs.c b/src/lib/gssapi/krb5/indicate_mechs.c | ||
| 3199 | index 45538cb..49d55e6 100644 | ||
| 3200 | --- a/src/lib/gssapi/krb5/indicate_mechs.c | ||
| 3201 | +++ b/src/lib/gssapi/krb5/indicate_mechs.c | ||
| 3202 | @@ -29,9 +29,7 @@ | ||
| 3203 | #include "mglueP.h" | ||
| 3204 | |||
| 3205 | OM_uint32 KRB5_CALLCONV | ||
| 3206 | -krb5_gss_indicate_mechs(minor_status, mech_set) | ||
| 3207 | - OM_uint32 *minor_status; | ||
| 3208 | - gss_OID_set *mech_set; | ||
| 3209 | +krb5_gss_indicate_mechs(OM_uint32 *minor_status, gss_OID_set *mech_set) | ||
| 3210 | { | ||
| 3211 | return generic_gss_copy_oid_set(minor_status, kg_all_mechs, mech_set); | ||
| 3212 | } | ||
| 3213 | diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c | ||
| 3214 | index 5748b84..0397fe1 100644 | ||
| 3215 | --- a/src/lib/gssapi/krb5/init_sec_context.c | ||
| 3216 | +++ b/src/lib/gssapi/krb5/init_sec_context.c | ||
| 3217 | @@ -117,14 +117,10 @@ int krb5_gss_dbg_client_expcreds = 0; | ||
| 3218 | * Common code which fetches the correct krb5 credentials from the | ||
| 3219 | * ccache. | ||
| 3220 | */ | ||
| 3221 | -static krb5_error_code get_credentials(context, cred, server, now, | ||
| 3222 | - endtime, out_creds) | ||
| 3223 | - krb5_context context; | ||
| 3224 | - krb5_gss_cred_id_t cred; | ||
| 3225 | - krb5_gss_name_t server; | ||
| 3226 | - krb5_timestamp now; | ||
| 3227 | - krb5_timestamp endtime; | ||
| 3228 | - krb5_creds **out_creds; | ||
| 3229 | +static krb5_error_code | ||
| 3230 | +get_credentials(krb5_context context, krb5_gss_cred_id_t cred, | ||
| 3231 | + krb5_gss_name_t server, krb5_timestamp now, | ||
| 3232 | + krb5_timestamp endtime, krb5_creds **out_creds) | ||
| 3233 | { | ||
| 3234 | krb5_error_code code; | ||
| 3235 | krb5_creds in_creds, evidence_creds, mcreds, *result_creds = NULL; | ||
| 3236 | @@ -365,17 +361,11 @@ cleanup: | ||
| 3237 | } | ||
| 3238 | |||
| 3239 | static krb5_error_code | ||
| 3240 | -make_ap_req_v1(context, ctx, cred, k_cred, ad_context, | ||
| 3241 | - chan_bindings, mech_type, token, exts) | ||
| 3242 | - krb5_context context; | ||
| 3243 | - krb5_gss_ctx_id_rec *ctx; | ||
| 3244 | - krb5_gss_cred_id_t cred; | ||
| 3245 | - krb5_creds *k_cred; | ||
| 3246 | - krb5_authdata_context ad_context; | ||
| 3247 | - gss_channel_bindings_t chan_bindings; | ||
| 3248 | - gss_OID mech_type; | ||
| 3249 | - gss_buffer_t token; | ||
| 3250 | - krb5_gss_ctx_ext_t exts; | ||
| 3251 | +make_ap_req_v1(krb5_context context, krb5_gss_ctx_id_rec *ctx, | ||
| 3252 | + krb5_gss_cred_id_t cred, krb5_creds *k_cred, | ||
| 3253 | + krb5_authdata_context ad_context, | ||
| 3254 | + gss_channel_bindings_t chan_bindings, gss_OID mech_type, | ||
| 3255 | + gss_buffer_t token, krb5_gss_ctx_ext_t exts) | ||
| 3256 | { | ||
| 3257 | krb5_flags mk_req_flags = 0; | ||
| 3258 | krb5_error_code code; | ||
| 3259 | @@ -1048,24 +1038,15 @@ krb5int_gss_use_kdc_context(OM_uint32 *minor_status, | ||
| 3260 | #endif | ||
| 3261 | |||
| 3262 | OM_uint32 KRB5_CALLCONV | ||
| 3263 | -krb5_gss_init_sec_context(minor_status, claimant_cred_handle, | ||
| 3264 | - context_handle, target_name, mech_type, | ||
| 3265 | - req_flags, time_req, input_chan_bindings, | ||
| 3266 | - input_token, actual_mech_type, output_token, | ||
| 3267 | - ret_flags, time_rec) | ||
| 3268 | - OM_uint32 *minor_status; | ||
| 3269 | - gss_cred_id_t claimant_cred_handle; | ||
| 3270 | - gss_ctx_id_t *context_handle; | ||
| 3271 | - gss_name_t target_name; | ||
| 3272 | - gss_OID mech_type; | ||
| 3273 | - OM_uint32 req_flags; | ||
| 3274 | - OM_uint32 time_req; | ||
| 3275 | - gss_channel_bindings_t input_chan_bindings; | ||
| 3276 | - gss_buffer_t input_token; | ||
| 3277 | - gss_OID *actual_mech_type; | ||
| 3278 | - gss_buffer_t output_token; | ||
| 3279 | - OM_uint32 *ret_flags; | ||
| 3280 | - OM_uint32 *time_rec; | ||
| 3281 | +krb5_gss_init_sec_context(OM_uint32 *minor_status, | ||
| 3282 | + gss_cred_id_t claimant_cred_handle, | ||
| 3283 | + gss_ctx_id_t *context_handle, | ||
| 3284 | + gss_name_t target_name, gss_OID mech_type, | ||
| 3285 | + OM_uint32 req_flags, OM_uint32 time_req, | ||
| 3286 | + gss_channel_bindings_t input_chan_bindings, | ||
| 3287 | + gss_buffer_t input_token, gss_OID *actual_mech_type, | ||
| 3288 | + gss_buffer_t output_token, OM_uint32 *ret_flags, | ||
| 3289 | + OM_uint32 *time_rec) | ||
| 3290 | { | ||
| 3291 | krb5_gss_ctx_ext_rec exts; | ||
| 3292 | |||
| 3293 | diff --git a/src/lib/gssapi/krb5/inq_context.c b/src/lib/gssapi/krb5/inq_context.c | ||
| 3294 | index 97678e3..f8229f9 100644 | ||
| 3295 | --- a/src/lib/gssapi/krb5/inq_context.c | ||
| 3296 | +++ b/src/lib/gssapi/krb5/inq_context.c | ||
| 3297 | @@ -78,18 +78,11 @@ | ||
| 3298 | #include "gssapiP_krb5.h" | ||
| 3299 | |||
| 3300 | OM_uint32 KRB5_CALLCONV | ||
| 3301 | -krb5_gss_inquire_context(minor_status, context_handle, initiator_name, | ||
| 3302 | - acceptor_name, lifetime_rec, mech_type, ret_flags, | ||
| 3303 | - locally_initiated, opened) | ||
| 3304 | - OM_uint32 *minor_status; | ||
| 3305 | - gss_ctx_id_t context_handle; | ||
| 3306 | - gss_name_t *initiator_name; | ||
| 3307 | - gss_name_t *acceptor_name; | ||
| 3308 | - OM_uint32 *lifetime_rec; | ||
| 3309 | - gss_OID *mech_type; | ||
| 3310 | - OM_uint32 *ret_flags; | ||
| 3311 | - int *locally_initiated; | ||
| 3312 | - int *opened; | ||
| 3313 | +krb5_gss_inquire_context(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 3314 | + gss_name_t *initiator_name, gss_name_t *acceptor_name, | ||
| 3315 | + OM_uint32 *lifetime_rec, gss_OID *mech_type, | ||
| 3316 | + OM_uint32 *ret_flags, int *locally_initiated, | ||
| 3317 | + int *opened) | ||
| 3318 | { | ||
| 3319 | krb5_context context; | ||
| 3320 | krb5_error_code code; | ||
| 3321 | diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c | ||
| 3322 | index 0e67595..e968f8a 100644 | ||
| 3323 | --- a/src/lib/gssapi/krb5/inq_cred.c | ||
| 3324 | +++ b/src/lib/gssapi/krb5/inq_cred.c | ||
| 3325 | @@ -73,14 +73,9 @@ | ||
| 3326 | #include "gssapiP_krb5.h" | ||
| 3327 | |||
| 3328 | OM_uint32 KRB5_CALLCONV | ||
| 3329 | -krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret, | ||
| 3330 | - cred_usage, mechanisms) | ||
| 3331 | - OM_uint32 *minor_status; | ||
| 3332 | - gss_cred_id_t cred_handle; | ||
| 3333 | - gss_name_t *name; | ||
| 3334 | - OM_uint32 *lifetime_ret; | ||
| 3335 | - gss_cred_usage_t *cred_usage; | ||
| 3336 | - gss_OID_set *mechanisms; | ||
| 3337 | +krb5_gss_inquire_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle, | ||
| 3338 | + gss_name_t *name, OM_uint32 *lifetime_ret, | ||
| 3339 | + gss_cred_usage_t *cred_usage, gss_OID_set *mechanisms) | ||
| 3340 | { | ||
| 3341 | krb5_context context; | ||
| 3342 | gss_cred_id_t defcred = GSS_C_NO_CREDENTIAL; | ||
| 3343 | @@ -209,16 +204,11 @@ cleanup: | ||
| 3344 | |||
| 3345 | /* V2 interface */ | ||
| 3346 | OM_uint32 KRB5_CALLCONV | ||
| 3347 | -krb5_gss_inquire_cred_by_mech(minor_status, cred_handle, | ||
| 3348 | - mech_type, name, initiator_lifetime, | ||
| 3349 | - acceptor_lifetime, cred_usage) | ||
| 3350 | - OM_uint32 *minor_status; | ||
| 3351 | - gss_cred_id_t cred_handle; | ||
| 3352 | - gss_OID mech_type; | ||
| 3353 | - gss_name_t *name; | ||
| 3354 | - OM_uint32 *initiator_lifetime; | ||
| 3355 | - OM_uint32 *acceptor_lifetime; | ||
| 3356 | - gss_cred_usage_t *cred_usage; | ||
| 3357 | +krb5_gss_inquire_cred_by_mech(OM_uint32 *minor_status, | ||
| 3358 | + gss_cred_id_t cred_handle, gss_OID mech_type, | ||
| 3359 | + gss_name_t *name, OM_uint32 *initiator_lifetime, | ||
| 3360 | + OM_uint32 *acceptor_lifetime, | ||
| 3361 | + gss_cred_usage_t *cred_usage) | ||
| 3362 | { | ||
| 3363 | krb5_gss_cred_id_t cred; | ||
| 3364 | OM_uint32 lifetime; | ||
| 3365 | diff --git a/src/lib/gssapi/krb5/inq_names.c b/src/lib/gssapi/krb5/inq_names.c | ||
| 3366 | index b326adb..4a3709b 100644 | ||
| 3367 | --- a/src/lib/gssapi/krb5/inq_names.c | ||
| 3368 | +++ b/src/lib/gssapi/krb5/inq_names.c | ||
| 3369 | @@ -27,10 +27,8 @@ | ||
| 3370 | #include "gssapiP_krb5.h" | ||
| 3371 | |||
| 3372 | OM_uint32 KRB5_CALLCONV | ||
| 3373 | -krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types) | ||
| 3374 | - OM_uint32 *minor_status; | ||
| 3375 | - gss_OID mechanism; | ||
| 3376 | - gss_OID_set *name_types; | ||
| 3377 | +krb5_gss_inquire_names_for_mech(OM_uint32 *minor_status, gss_OID mechanism, | ||
| 3378 | + gss_OID_set *name_types) | ||
| 3379 | { | ||
| 3380 | OM_uint32 major, minor; | ||
| 3381 | |||
| 3382 | diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c | ||
| 3383 | index 99275be..71df11e 100644 | ||
| 3384 | --- a/src/lib/gssapi/krb5/k5seal.c | ||
| 3385 | +++ b/src/lib/gssapi/krb5/k5seal.c | ||
| 3386 | @@ -290,16 +290,10 @@ make_seal_token_v1 (krb5_context context, | ||
| 3387 | and do not encode the ENC_TYPE, MSG_LENGTH, or MSG_TEXT fields */ | ||
| 3388 | |||
| 3389 | OM_uint32 | ||
| 3390 | -kg_seal(minor_status, context_handle, conf_req_flag, qop_req, | ||
| 3391 | - input_message_buffer, conf_state, output_message_buffer, toktype) | ||
| 3392 | - OM_uint32 *minor_status; | ||
| 3393 | - gss_ctx_id_t context_handle; | ||
| 3394 | - int conf_req_flag; | ||
| 3395 | - gss_qop_t qop_req; | ||
| 3396 | - gss_buffer_t input_message_buffer; | ||
| 3397 | - int *conf_state; | ||
| 3398 | - gss_buffer_t output_message_buffer; | ||
| 3399 | - int toktype; | ||
| 3400 | +kg_seal(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 3401 | + int conf_req_flag, gss_qop_t qop_req, | ||
| 3402 | + gss_buffer_t input_message_buffer, int *conf_state, | ||
| 3403 | + gss_buffer_t output_message_buffer, int toktype) | ||
| 3404 | { | ||
| 3405 | krb5_gss_ctx_id_rec *ctx; | ||
| 3406 | krb5_error_code code; | ||
| 3407 | @@ -361,16 +355,10 @@ kg_seal(minor_status, context_handle, conf_req_flag, qop_req, | ||
| 3408 | } | ||
| 3409 | |||
| 3410 | OM_uint32 KRB5_CALLCONV | ||
| 3411 | -krb5_gss_wrap(minor_status, context_handle, conf_req_flag, | ||
| 3412 | - qop_req, input_message_buffer, conf_state, | ||
| 3413 | - output_message_buffer) | ||
| 3414 | - OM_uint32 *minor_status; | ||
| 3415 | - gss_ctx_id_t context_handle; | ||
| 3416 | - int conf_req_flag; | ||
| 3417 | - gss_qop_t qop_req; | ||
| 3418 | - gss_buffer_t input_message_buffer; | ||
| 3419 | - int *conf_state; | ||
| 3420 | - gss_buffer_t output_message_buffer; | ||
| 3421 | +krb5_gss_wrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 3422 | + int conf_req_flag, gss_qop_t qop_req, | ||
| 3423 | + gss_buffer_t input_message_buffer, int *conf_state, | ||
| 3424 | + gss_buffer_t output_message_buffer) | ||
| 3425 | { | ||
| 3426 | return(kg_seal(minor_status, context_handle, conf_req_flag, | ||
| 3427 | qop_req, input_message_buffer, conf_state, | ||
| 3428 | @@ -378,13 +366,9 @@ krb5_gss_wrap(minor_status, context_handle, conf_req_flag, | ||
| 3429 | } | ||
| 3430 | |||
| 3431 | OM_uint32 KRB5_CALLCONV | ||
| 3432 | -krb5_gss_get_mic(minor_status, context_handle, qop_req, | ||
| 3433 | - message_buffer, message_token) | ||
| 3434 | - OM_uint32 *minor_status; | ||
| 3435 | - gss_ctx_id_t context_handle; | ||
| 3436 | - gss_qop_t qop_req; | ||
| 3437 | - gss_buffer_t message_buffer; | ||
| 3438 | - gss_buffer_t message_token; | ||
| 3439 | +krb5_gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 3440 | + gss_qop_t qop_req, gss_buffer_t message_buffer, | ||
| 3441 | + gss_buffer_t message_token) | ||
| 3442 | { | ||
| 3443 | return(kg_seal(minor_status, context_handle, 0, | ||
| 3444 | qop_req, message_buffer, NULL, | ||
| 3445 | diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c | ||
| 3446 | index 9b183bc..c63e04b 100644 | ||
| 3447 | --- a/src/lib/gssapi/krb5/k5unseal.c | ||
| 3448 | +++ b/src/lib/gssapi/krb5/k5unseal.c | ||
| 3449 | @@ -58,17 +58,10 @@ | ||
| 3450 | conf_state is only valid if SEAL. */ | ||
| 3451 | |||
| 3452 | static OM_uint32 | ||
| 3453 | -kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, message_buffer, | ||
| 3454 | - conf_state, qop_state, toktype) | ||
| 3455 | - krb5_context context; | ||
| 3456 | - OM_uint32 *minor_status; | ||
| 3457 | - krb5_gss_ctx_id_rec *ctx; | ||
| 3458 | - unsigned char *ptr; | ||
| 3459 | - int bodysize; | ||
| 3460 | - gss_buffer_t message_buffer; | ||
| 3461 | - int *conf_state; | ||
| 3462 | - gss_qop_t *qop_state; | ||
| 3463 | - int toktype; | ||
| 3464 | +kg_unseal_v1(krb5_context context, OM_uint32 *minor_status, | ||
| 3465 | + krb5_gss_ctx_id_rec *ctx, unsigned char *ptr, int bodysize, | ||
| 3466 | + gss_buffer_t message_buffer, int *conf_state, | ||
| 3467 | + gss_qop_t *qop_state, int toktype) | ||
| 3468 | { | ||
| 3469 | krb5_error_code code; | ||
| 3470 | int conflen = 0; | ||
| 3471 | @@ -360,15 +353,9 @@ kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, message_buffer, | ||
| 3472 | conf_state is only valid if SEAL. */ | ||
| 3473 | |||
| 3474 | OM_uint32 | ||
| 3475 | -kg_unseal(minor_status, context_handle, input_token_buffer, | ||
| 3476 | - message_buffer, conf_state, qop_state, toktype) | ||
| 3477 | - OM_uint32 *minor_status; | ||
| 3478 | - gss_ctx_id_t context_handle; | ||
| 3479 | - gss_buffer_t input_token_buffer; | ||
| 3480 | - gss_buffer_t message_buffer; | ||
| 3481 | - int *conf_state; | ||
| 3482 | - gss_qop_t *qop_state; | ||
| 3483 | - int toktype; | ||
| 3484 | +kg_unseal(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 3485 | + gss_buffer_t input_token_buffer, gss_buffer_t message_buffer, | ||
| 3486 | + int *conf_state, gss_qop_t *qop_state, int toktype) | ||
| 3487 | { | ||
| 3488 | krb5_gss_ctx_id_rec *ctx; | ||
| 3489 | unsigned char *ptr; | ||
| 3490 | @@ -439,15 +426,10 @@ kg_unseal(minor_status, context_handle, input_token_buffer, | ||
| 3491 | } | ||
| 3492 | |||
| 3493 | OM_uint32 KRB5_CALLCONV | ||
| 3494 | -krb5_gss_unwrap(minor_status, context_handle, | ||
| 3495 | - input_message_buffer, output_message_buffer, | ||
| 3496 | - conf_state, qop_state) | ||
| 3497 | - OM_uint32 *minor_status; | ||
| 3498 | - gss_ctx_id_t context_handle; | ||
| 3499 | - gss_buffer_t input_message_buffer; | ||
| 3500 | - gss_buffer_t output_message_buffer; | ||
| 3501 | - int *conf_state; | ||
| 3502 | - gss_qop_t *qop_state; | ||
| 3503 | +krb5_gss_unwrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 3504 | + gss_buffer_t input_message_buffer, | ||
| 3505 | + gss_buffer_t output_message_buffer, int *conf_state, | ||
| 3506 | + gss_qop_t *qop_state) | ||
| 3507 | { | ||
| 3508 | OM_uint32 rstat; | ||
| 3509 | |||
| 3510 | @@ -458,14 +440,9 @@ krb5_gss_unwrap(minor_status, context_handle, | ||
| 3511 | } | ||
| 3512 | |||
| 3513 | OM_uint32 KRB5_CALLCONV | ||
| 3514 | -krb5_gss_verify_mic(minor_status, context_handle, | ||
| 3515 | - message_buffer, token_buffer, | ||
| 3516 | - qop_state) | ||
| 3517 | - OM_uint32 *minor_status; | ||
| 3518 | - gss_ctx_id_t context_handle; | ||
| 3519 | - gss_buffer_t message_buffer; | ||
| 3520 | - gss_buffer_t token_buffer; | ||
| 3521 | - gss_qop_t *qop_state; | ||
| 3522 | +krb5_gss_verify_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 3523 | + gss_buffer_t message_buffer, gss_buffer_t token_buffer, | ||
| 3524 | + gss_qop_t *qop_state) | ||
| 3525 | { | ||
| 3526 | OM_uint32 rstat; | ||
| 3527 | |||
| 3528 | diff --git a/src/lib/gssapi/krb5/process_context_token.c b/src/lib/gssapi/krb5/process_context_token.c | ||
| 3529 | index a672f48..67805fb 100644 | ||
| 3530 | --- a/src/lib/gssapi/krb5/process_context_token.c | ||
| 3531 | +++ b/src/lib/gssapi/krb5/process_context_token.c | ||
| 3532 | @@ -28,11 +28,9 @@ | ||
| 3533 | */ | ||
| 3534 | |||
| 3535 | OM_uint32 KRB5_CALLCONV | ||
| 3536 | -krb5_gss_process_context_token(minor_status, context_handle, | ||
| 3537 | - token_buffer) | ||
| 3538 | - OM_uint32 *minor_status; | ||
| 3539 | - gss_ctx_id_t context_handle; | ||
| 3540 | - gss_buffer_t token_buffer; | ||
| 3541 | +krb5_gss_process_context_token(OM_uint32 *minor_status, | ||
| 3542 | + gss_ctx_id_t context_handle, | ||
| 3543 | + gss_buffer_t token_buffer) | ||
| 3544 | { | ||
| 3545 | krb5_gss_ctx_id_rec *ctx; | ||
| 3546 | OM_uint32 majerr; | ||
| 3547 | diff --git a/src/lib/gssapi/krb5/rel_cred.c b/src/lib/gssapi/krb5/rel_cred.c | ||
| 3548 | index 0da6c1b..9e04e2f 100644 | ||
| 3549 | --- a/src/lib/gssapi/krb5/rel_cred.c | ||
| 3550 | +++ b/src/lib/gssapi/krb5/rel_cred.c | ||
| 3551 | @@ -24,9 +24,7 @@ | ||
| 3552 | #include "gssapiP_krb5.h" | ||
| 3553 | |||
| 3554 | OM_uint32 KRB5_CALLCONV | ||
| 3555 | -krb5_gss_release_cred(minor_status, cred_handle) | ||
| 3556 | - OM_uint32 *minor_status; | ||
| 3557 | - gss_cred_id_t *cred_handle; | ||
| 3558 | +krb5_gss_release_cred(OM_uint32 *minor_status, gss_cred_id_t *cred_handle) | ||
| 3559 | { | ||
| 3560 | krb5_context context; | ||
| 3561 | krb5_gss_cred_id_t cred; | ||
| 3562 | diff --git a/src/lib/gssapi/krb5/rel_name.c b/src/lib/gssapi/krb5/rel_name.c | ||
| 3563 | index 3dabe32..558bb6d 100644 | ||
| 3564 | --- a/src/lib/gssapi/krb5/rel_name.c | ||
| 3565 | +++ b/src/lib/gssapi/krb5/rel_name.c | ||
| 3566 | @@ -24,9 +24,7 @@ | ||
| 3567 | #include "gssapiP_krb5.h" | ||
| 3568 | |||
| 3569 | OM_uint32 KRB5_CALLCONV | ||
| 3570 | -krb5_gss_release_name(minor_status, input_name) | ||
| 3571 | - OM_uint32 *minor_status; | ||
| 3572 | - gss_name_t *input_name; | ||
| 3573 | +krb5_gss_release_name(OM_uint32 *minor_status, gss_name_t *input_name) | ||
| 3574 | { | ||
| 3575 | krb5_context context; | ||
| 3576 | krb5_error_code code; | ||
| 3577 | diff --git a/src/lib/gssapi/krb5/rel_oid.c b/src/lib/gssapi/krb5/rel_oid.c | ||
| 3578 | index 739efe4..900c410 100644 | ||
| 3579 | --- a/src/lib/gssapi/krb5/rel_oid.c | ||
| 3580 | +++ b/src/lib/gssapi/krb5/rel_oid.c | ||
| 3581 | @@ -27,9 +27,7 @@ | ||
| 3582 | #include "gssapiP_krb5.h" | ||
| 3583 | |||
| 3584 | OM_uint32 | ||
| 3585 | -krb5_gss_release_oid(minor_status, oid) | ||
| 3586 | - OM_uint32 *minor_status; | ||
| 3587 | - gss_OID *oid; | ||
| 3588 | +krb5_gss_release_oid(OM_uint32 *minor_status, gss_OID *oid) | ||
| 3589 | { | ||
| 3590 | /* | ||
| 3591 | * The V2 API says the following! | ||
| 3592 | @@ -52,9 +50,7 @@ krb5_gss_release_oid(minor_status, oid) | ||
| 3593 | } | ||
| 3594 | |||
| 3595 | OM_uint32 KRB5_CALLCONV | ||
| 3596 | -krb5_gss_internal_release_oid(minor_status, oid) | ||
| 3597 | - OM_uint32 *minor_status; | ||
| 3598 | - gss_OID *oid; | ||
| 3599 | +krb5_gss_internal_release_oid(OM_uint32 *minor_status, gss_OID *oid) | ||
| 3600 | { | ||
| 3601 | /* | ||
| 3602 | * This function only knows how to release internal OIDs. It will | ||
| 3603 | diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c | ||
| 3604 | index 9e2d32e..1129b6a 100644 | ||
| 3605 | --- a/src/lib/gssapi/krb5/ser_sctx.c | ||
| 3606 | +++ b/src/lib/gssapi/krb5/ser_sctx.c | ||
| 3607 | @@ -137,10 +137,8 @@ kg_oid_size(gss_OID oid, size_t *sizep) | ||
| 3608 | } | ||
| 3609 | |||
| 3610 | static krb5_error_code | ||
| 3611 | -kg_seqstate_externalize(arg, buffer, lenremain) | ||
| 3612 | - g_seqnum_state arg; | ||
| 3613 | - krb5_octet **buffer; | ||
| 3614 | - size_t *lenremain; | ||
| 3615 | +kg_seqstate_externalize(g_seqnum_state arg, krb5_octet **buffer, | ||
| 3616 | + size_t *lenremain) | ||
| 3617 | { | ||
| 3618 | krb5_error_code err; | ||
| 3619 | err = krb5_ser_pack_int32(KV5M_GSS_QUEUE, buffer, lenremain); | ||
| 3620 | @@ -152,10 +150,8 @@ kg_seqstate_externalize(arg, buffer, lenremain) | ||
| 3621 | } | ||
| 3622 | |||
| 3623 | static krb5_error_code | ||
| 3624 | -kg_seqstate_internalize(argp, buffer, lenremain) | ||
| 3625 | - g_seqnum_state *argp; | ||
| 3626 | - krb5_octet **buffer; | ||
| 3627 | - size_t *lenremain; | ||
| 3628 | +kg_seqstate_internalize(g_seqnum_state *argp, krb5_octet **buffer, | ||
| 3629 | + size_t *lenremain) | ||
| 3630 | { | ||
| 3631 | krb5_int32 ibuf; | ||
| 3632 | krb5_octet *bp; | ||
| 3633 | @@ -193,9 +189,7 @@ kg_seqstate_internalize(argp, buffer, lenremain) | ||
| 3634 | } | ||
| 3635 | |||
| 3636 | static krb5_error_code | ||
| 3637 | -kg_seqstate_size(arg, sizep) | ||
| 3638 | - g_seqnum_state arg; | ||
| 3639 | - size_t *sizep; | ||
| 3640 | +kg_seqstate_size(g_seqnum_state arg, size_t *sizep) | ||
| 3641 | { | ||
| 3642 | krb5_error_code kret; | ||
| 3643 | size_t required; | ||
| 3644 | diff --git a/src/lib/gssapi/krb5/util_cksum.c b/src/lib/gssapi/krb5/util_cksum.c | ||
| 3645 | index 5b87956..5f7694f 100644 | ||
| 3646 | --- a/src/lib/gssapi/krb5/util_cksum.c | ||
| 3647 | +++ b/src/lib/gssapi/krb5/util_cksum.c | ||
| 3648 | @@ -28,10 +28,8 @@ | ||
| 3649 | |||
| 3650 | /* Checksumming the channel bindings always uses plain MD5. */ | ||
| 3651 | krb5_error_code | ||
| 3652 | -kg_checksum_channel_bindings(context, cb, cksum) | ||
| 3653 | - krb5_context context; | ||
| 3654 | - gss_channel_bindings_t cb; | ||
| 3655 | - krb5_checksum *cksum; | ||
| 3656 | +kg_checksum_channel_bindings(krb5_context context, gss_channel_bindings_t cb, | ||
| 3657 | + krb5_checksum *cksum) | ||
| 3658 | { | ||
| 3659 | struct k5buf buf; | ||
| 3660 | size_t sumlen; | ||
| 3661 | diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c | ||
| 3662 | index 6e1c9ac..6857363 100644 | ||
| 3663 | --- a/src/lib/gssapi/krb5/util_seed.c | ||
| 3664 | +++ b/src/lib/gssapi/krb5/util_seed.c | ||
| 3665 | @@ -29,10 +29,7 @@ | ||
| 3666 | static const unsigned char zeros[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0}; | ||
| 3667 | |||
| 3668 | krb5_error_code | ||
| 3669 | -kg_make_seed(context, key, seed) | ||
| 3670 | - krb5_context context; | ||
| 3671 | - krb5_key key; | ||
| 3672 | - unsigned char *seed; | ||
| 3673 | +kg_make_seed(krb5_context context, krb5_key key, unsigned char *seed) | ||
| 3674 | { | ||
| 3675 | krb5_error_code code; | ||
| 3676 | krb5_key rkey = NULL; | ||
| 3677 | diff --git a/src/lib/gssapi/krb5/util_seqnum.c b/src/lib/gssapi/krb5/util_seqnum.c | ||
| 3678 | index bef631d..a5a4d5c 100644 | ||
| 3679 | --- a/src/lib/gssapi/krb5/util_seqnum.c | ||
| 3680 | +++ b/src/lib/gssapi/krb5/util_seqnum.c | ||
| 3681 | @@ -30,13 +30,8 @@ | ||
| 3682 | */ | ||
| 3683 | |||
| 3684 | krb5_error_code | ||
| 3685 | -kg_make_seq_num(context, key, direction, seqnum, cksum, buf) | ||
| 3686 | - krb5_context context; | ||
| 3687 | - krb5_key key; | ||
| 3688 | - int direction; | ||
| 3689 | - krb5_ui_4 seqnum; | ||
| 3690 | - unsigned char *cksum; | ||
| 3691 | - unsigned char *buf; | ||
| 3692 | +kg_make_seq_num(krb5_context context, krb5_key key, int direction, | ||
| 3693 | + krb5_ui_4 seqnum, unsigned char *cksum, unsigned char *buf) | ||
| 3694 | { | ||
| 3695 | unsigned char plain[8]; | ||
| 3696 | |||
| 3697 | @@ -59,13 +54,9 @@ kg_make_seq_num(context, key, direction, seqnum, cksum, buf) | ||
| 3698 | return(kg_encrypt(context, key, KG_USAGE_SEQ, cksum, plain, buf, 8)); | ||
| 3699 | } | ||
| 3700 | |||
| 3701 | -krb5_error_code kg_get_seq_num(context, key, cksum, buf, direction, seqnum) | ||
| 3702 | - krb5_context context; | ||
| 3703 | - krb5_key key; | ||
| 3704 | - unsigned char *cksum; | ||
| 3705 | - unsigned char *buf; | ||
| 3706 | - int *direction; | ||
| 3707 | - krb5_ui_4 *seqnum; | ||
| 3708 | +krb5_error_code | ||
| 3709 | +kg_get_seq_num(krb5_context context, krb5_key key, unsigned char *cksum, | ||
| 3710 | + unsigned char *buf, int *direction, krb5_ui_4 *seqnum) | ||
| 3711 | { | ||
| 3712 | krb5_error_code code; | ||
| 3713 | unsigned char plain[8]; | ||
| 3714 | diff --git a/src/lib/gssapi/krb5/val_cred.c b/src/lib/gssapi/krb5/val_cred.c | ||
| 3715 | index cb1cb93..83e7634 100644 | ||
| 3716 | --- a/src/lib/gssapi/krb5/val_cred.c | ||
| 3717 | +++ b/src/lib/gssapi/krb5/val_cred.c | ||
| 3718 | @@ -57,9 +57,7 @@ krb5_gss_validate_cred_1(OM_uint32 *minor_status, gss_cred_id_t cred_handle, | ||
| 3719 | } | ||
| 3720 | |||
| 3721 | OM_uint32 | ||
| 3722 | -krb5_gss_validate_cred(minor_status, cred_handle) | ||
| 3723 | - OM_uint32 *minor_status; | ||
| 3724 | - gss_cred_id_t cred_handle; | ||
| 3725 | +krb5_gss_validate_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle) | ||
| 3726 | { | ||
| 3727 | krb5_context context; | ||
| 3728 | krb5_error_code code; | ||
| 3729 | diff --git a/src/lib/gssapi/krb5/wrap_size_limit.c b/src/lib/gssapi/krb5/wrap_size_limit.c | ||
| 3730 | index 7959f42..8ea6ce1 100644 | ||
| 3731 | --- a/src/lib/gssapi/krb5/wrap_size_limit.c | ||
| 3732 | +++ b/src/lib/gssapi/krb5/wrap_size_limit.c | ||
| 3733 | @@ -74,14 +74,9 @@ | ||
| 3734 | |||
| 3735 | /* V2 interface */ | ||
| 3736 | OM_uint32 KRB5_CALLCONV | ||
| 3737 | -krb5_gss_wrap_size_limit(minor_status, context_handle, conf_req_flag, | ||
| 3738 | - qop_req, req_output_size, max_input_size) | ||
| 3739 | - OM_uint32 *minor_status; | ||
| 3740 | - gss_ctx_id_t context_handle; | ||
| 3741 | - int conf_req_flag; | ||
| 3742 | - gss_qop_t qop_req; | ||
| 3743 | - OM_uint32 req_output_size; | ||
| 3744 | - OM_uint32 *max_input_size; | ||
| 3745 | +krb5_gss_wrap_size_limit(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 3746 | + int conf_req_flag, gss_qop_t qop_req, | ||
| 3747 | + OM_uint32 req_output_size, OM_uint32 *max_input_size) | ||
| 3748 | { | ||
| 3749 | krb5_gss_ctx_id_rec *ctx; | ||
| 3750 | OM_uint32 data_size, conflen; | ||
| 3751 | diff --git a/src/lib/gssapi/mechglue/g_accept_sec_context.c b/src/lib/gssapi/mechglue/g_accept_sec_context.c | ||
| 3752 | index 4f2a66e..e4eff1f 100644 | ||
| 3753 | --- a/src/lib/gssapi/mechglue/g_accept_sec_context.c | ||
| 3754 | +++ b/src/lib/gssapi/mechglue/g_accept_sec_context.c | ||
| 3755 | @@ -128,30 +128,13 @@ allow_mech_by_default(gss_OID mech) | ||
| 3756 | } | ||
| 3757 | |||
| 3758 | OM_uint32 KRB5_CALLCONV | ||
| 3759 | -gss_accept_sec_context (minor_status, | ||
| 3760 | - context_handle, | ||
| 3761 | - verifier_cred_handle, | ||
| 3762 | - input_token_buffer, | ||
| 3763 | - input_chan_bindings, | ||
| 3764 | - src_name, | ||
| 3765 | - mech_type, | ||
| 3766 | - output_token, | ||
| 3767 | - ret_flags, | ||
| 3768 | - time_rec, | ||
| 3769 | - d_cred) | ||
| 3770 | - | ||
| 3771 | -OM_uint32 * minor_status; | ||
| 3772 | -gss_ctx_id_t * context_handle; | ||
| 3773 | -gss_cred_id_t verifier_cred_handle; | ||
| 3774 | -gss_buffer_t input_token_buffer; | ||
| 3775 | -gss_channel_bindings_t input_chan_bindings; | ||
| 3776 | -gss_name_t * src_name; | ||
| 3777 | -gss_OID * mech_type; | ||
| 3778 | -gss_buffer_t output_token; | ||
| 3779 | -OM_uint32 * ret_flags; | ||
| 3780 | -OM_uint32 * time_rec; | ||
| 3781 | -gss_cred_id_t * d_cred; | ||
| 3782 | - | ||
| 3783 | +gss_accept_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle, | ||
| 3784 | + gss_cred_id_t verifier_cred_handle, | ||
| 3785 | + gss_buffer_t input_token_buffer, | ||
| 3786 | + gss_channel_bindings_t input_chan_bindings, | ||
| 3787 | + gss_name_t *src_name, gss_OID *mech_type, | ||
| 3788 | + gss_buffer_t output_token, OM_uint32 *ret_flags, | ||
| 3789 | + OM_uint32 *time_rec, gss_cred_id_t *d_cred) | ||
| 3790 | { | ||
| 3791 | OM_uint32 status, temp_status, temp_minor_status; | ||
| 3792 | OM_uint32 temp_ret_flags = 0; | ||
| 3793 | diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c | ||
| 3794 | index c885f56..2fc9c5c 100644 | ||
| 3795 | --- a/src/lib/gssapi/mechglue/g_acquire_cred.c | ||
| 3796 | +++ b/src/lib/gssapi/mechglue/g_acquire_cred.c | ||
| 3797 | @@ -85,24 +85,10 @@ val_acq_cred_args( | ||
| 3798 | |||
| 3799 | |||
| 3800 | OM_uint32 KRB5_CALLCONV | ||
| 3801 | -gss_acquire_cred(minor_status, | ||
| 3802 | - desired_name, | ||
| 3803 | - time_req, | ||
| 3804 | - desired_mechs, | ||
| 3805 | - cred_usage, | ||
| 3806 | - output_cred_handle, | ||
| 3807 | - actual_mechs, | ||
| 3808 | - time_rec) | ||
| 3809 | - | ||
| 3810 | -OM_uint32 * minor_status; | ||
| 3811 | -gss_name_t desired_name; | ||
| 3812 | -OM_uint32 time_req; | ||
| 3813 | -gss_OID_set desired_mechs; | ||
| 3814 | -int cred_usage; | ||
| 3815 | -gss_cred_id_t * output_cred_handle; | ||
| 3816 | -gss_OID_set * actual_mechs; | ||
| 3817 | -OM_uint32 * time_rec; | ||
| 3818 | - | ||
| 3819 | +gss_acquire_cred(OM_uint32 *minor_status, gss_name_t desired_name, | ||
| 3820 | + OM_uint32 time_req, gss_OID_set desired_mechs, | ||
| 3821 | + int cred_usage, gss_cred_id_t *output_cred_handle, | ||
| 3822 | + gss_OID_set *actual_mechs, OM_uint32 *time_rec) | ||
| 3823 | { | ||
| 3824 | return gss_acquire_cred_from(minor_status, desired_name, time_req, | ||
| 3825 | desired_mechs, cred_usage, NULL, | ||
| 3826 | @@ -110,26 +96,11 @@ OM_uint32 * time_rec; | ||
| 3827 | } | ||
| 3828 | |||
| 3829 | OM_uint32 KRB5_CALLCONV | ||
| 3830 | -gss_acquire_cred_from(minor_status, | ||
| 3831 | - desired_name, | ||
| 3832 | - time_req, | ||
| 3833 | - desired_mechs, | ||
| 3834 | - cred_usage, | ||
| 3835 | - cred_store, | ||
| 3836 | - output_cred_handle, | ||
| 3837 | - actual_mechs, | ||
| 3838 | - time_rec) | ||
| 3839 | - | ||
| 3840 | -OM_uint32 * minor_status; | ||
| 3841 | -gss_name_t desired_name; | ||
| 3842 | -OM_uint32 time_req; | ||
| 3843 | -gss_OID_set desired_mechs; | ||
| 3844 | -int cred_usage; | ||
| 3845 | -gss_const_key_value_set_t cred_store; | ||
| 3846 | -gss_cred_id_t * output_cred_handle; | ||
| 3847 | -gss_OID_set * actual_mechs; | ||
| 3848 | -OM_uint32 * time_rec; | ||
| 3849 | - | ||
| 3850 | +gss_acquire_cred_from(OM_uint32 * minor_status, gss_name_t desired_name, | ||
| 3851 | + OM_uint32 time_req, gss_OID_set desired_mechs, | ||
| 3852 | + int cred_usage, gss_const_key_value_set_t cred_store, | ||
| 3853 | + gss_cred_id_t *output_cred_handle, | ||
| 3854 | + gss_OID_set *actual_mechs, OM_uint32 *time_rec) | ||
| 3855 | { | ||
| 3856 | OM_uint32 major = GSS_S_FAILURE, tmpMinor; | ||
| 3857 | OM_uint32 first_major = GSS_S_COMPLETE, first_minor = 0; | ||
| 3858 | @@ -397,22 +368,12 @@ error: | ||
| 3859 | |||
| 3860 | /* V2 KRB5_CALLCONV */ | ||
| 3861 | OM_uint32 KRB5_CALLCONV | ||
| 3862 | -gss_add_cred(minor_status, input_cred_handle, | ||
| 3863 | - desired_name, desired_mech, cred_usage, | ||
| 3864 | - initiator_time_req, acceptor_time_req, | ||
| 3865 | - output_cred_handle, actual_mechs, | ||
| 3866 | - initiator_time_rec, acceptor_time_rec) | ||
| 3867 | - OM_uint32 *minor_status; | ||
| 3868 | - gss_cred_id_t input_cred_handle; | ||
| 3869 | - gss_name_t desired_name; | ||
| 3870 | - gss_OID desired_mech; | ||
| 3871 | - gss_cred_usage_t cred_usage; | ||
| 3872 | - OM_uint32 initiator_time_req; | ||
| 3873 | - OM_uint32 acceptor_time_req; | ||
| 3874 | - gss_cred_id_t *output_cred_handle; | ||
| 3875 | - gss_OID_set *actual_mechs; | ||
| 3876 | - OM_uint32 *initiator_time_rec; | ||
| 3877 | - OM_uint32 *acceptor_time_rec; | ||
| 3878 | +gss_add_cred(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle, | ||
| 3879 | + gss_name_t desired_name, gss_OID desired_mech, | ||
| 3880 | + gss_cred_usage_t cred_usage, OM_uint32 initiator_time_req, | ||
| 3881 | + OM_uint32 acceptor_time_req, gss_cred_id_t *output_cred_handle, | ||
| 3882 | + gss_OID_set *actual_mechs, OM_uint32 *initiator_time_rec, | ||
| 3883 | + OM_uint32 *acceptor_time_rec) | ||
| 3884 | { | ||
| 3885 | return gss_add_cred_from(minor_status, input_cred_handle, desired_name, | ||
| 3886 | desired_mech, cred_usage, initiator_time_req, | ||
| 3887 | @@ -422,25 +383,13 @@ gss_add_cred(minor_status, input_cred_handle, | ||
| 3888 | } | ||
| 3889 | |||
| 3890 | OM_uint32 KRB5_CALLCONV | ||
| 3891 | -gss_add_cred_from(minor_status, input_cred_handle, | ||
| 3892 | - desired_name, desired_mech, | ||
| 3893 | - cred_usage, | ||
| 3894 | - initiator_time_req, acceptor_time_req, | ||
| 3895 | - cred_store, | ||
| 3896 | - output_cred_handle, actual_mechs, | ||
| 3897 | - initiator_time_rec, acceptor_time_rec) | ||
| 3898 | - OM_uint32 *minor_status; | ||
| 3899 | - gss_cred_id_t input_cred_handle; | ||
| 3900 | - gss_name_t desired_name; | ||
| 3901 | - gss_OID desired_mech; | ||
| 3902 | - gss_cred_usage_t cred_usage; | ||
| 3903 | - OM_uint32 initiator_time_req; | ||
| 3904 | - OM_uint32 acceptor_time_req; | ||
| 3905 | - gss_const_key_value_set_t cred_store; | ||
| 3906 | - gss_cred_id_t *output_cred_handle; | ||
| 3907 | - gss_OID_set *actual_mechs; | ||
| 3908 | - OM_uint32 *initiator_time_rec; | ||
| 3909 | - OM_uint32 *acceptor_time_rec; | ||
| 3910 | +gss_add_cred_from(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle, | ||
| 3911 | + gss_name_t desired_name, gss_OID desired_mech, | ||
| 3912 | + gss_cred_usage_t cred_usage, OM_uint32 initiator_time_req, | ||
| 3913 | + OM_uint32 acceptor_time_req, | ||
| 3914 | + gss_const_key_value_set_t cred_store, | ||
| 3915 | + gss_cred_id_t *output_cred_handle, gss_OID_set *actual_mechs, | ||
| 3916 | + OM_uint32 *initiator_time_rec, OM_uint32 *acceptor_time_rec) | ||
| 3917 | { | ||
| 3918 | OM_uint32 status, temp_minor_status; | ||
| 3919 | OM_uint32 time_req, time_rec = 0, *time_recp = NULL; | ||
| 3920 | diff --git a/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c b/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c | ||
| 3921 | index cc34acc..86abf98 100644 | ||
| 3922 | --- a/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c | ||
| 3923 | +++ b/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c | ||
| 3924 | @@ -98,26 +98,12 @@ val_acq_cred_pw_args( | ||
| 3925 | |||
| 3926 | |||
| 3927 | OM_uint32 KRB5_CALLCONV | ||
| 3928 | -gss_acquire_cred_with_password( | ||
| 3929 | - minor_status, | ||
| 3930 | - desired_name, | ||
| 3931 | - password, | ||
| 3932 | - time_req, | ||
| 3933 | - desired_mechs, | ||
| 3934 | - cred_usage, | ||
| 3935 | - output_cred_handle, | ||
| 3936 | - actual_mechs, | ||
| 3937 | - time_rec) | ||
| 3938 | - | ||
| 3939 | -OM_uint32 * minor_status; | ||
| 3940 | -const gss_name_t desired_name; | ||
| 3941 | -const gss_buffer_t password; | ||
| 3942 | -OM_uint32 time_req; | ||
| 3943 | -const gss_OID_set desired_mechs; | ||
| 3944 | -int cred_usage; | ||
| 3945 | -gss_cred_id_t * output_cred_handle; | ||
| 3946 | -gss_OID_set * actual_mechs; | ||
| 3947 | -OM_uint32 * time_rec; | ||
| 3948 | +gss_acquire_cred_with_password(OM_uint32 *minor_status, | ||
| 3949 | + const gss_name_t desired_name, | ||
| 3950 | + const gss_buffer_t password, OM_uint32 time_req, | ||
| 3951 | + const gss_OID_set desired_mechs, int cred_usage, | ||
| 3952 | + gss_cred_id_t *output_cred_handle, | ||
| 3953 | + gss_OID_set *actual_mechs, OM_uint32 *time_rec) | ||
| 3954 | { | ||
| 3955 | OM_uint32 major = GSS_S_FAILURE; | ||
| 3956 | OM_uint32 initTimeOut, acceptTimeOut, outTime = GSS_C_INDEFINITE; | ||
| 3957 | @@ -306,23 +292,19 @@ val_add_cred_pw_args( | ||
| 3958 | |||
| 3959 | /* V2 KRB5_CALLCONV */ | ||
| 3960 | OM_uint32 KRB5_CALLCONV | ||
| 3961 | -gss_add_cred_with_password(minor_status, input_cred_handle, | ||
| 3962 | - desired_name, desired_mech, password, cred_usage, | ||
| 3963 | - initiator_time_req, acceptor_time_req, | ||
| 3964 | - output_cred_handle, actual_mechs, | ||
| 3965 | - initiator_time_rec, acceptor_time_rec) | ||
| 3966 | - OM_uint32 *minor_status; | ||
| 3967 | - const gss_cred_id_t input_cred_handle; | ||
| 3968 | - const gss_name_t desired_name; | ||
| 3969 | - const gss_OID desired_mech; | ||
| 3970 | - const gss_buffer_t password; | ||
| 3971 | - gss_cred_usage_t cred_usage; | ||
| 3972 | - OM_uint32 initiator_time_req; | ||
| 3973 | - OM_uint32 acceptor_time_req; | ||
| 3974 | - gss_cred_id_t *output_cred_handle; | ||
| 3975 | - gss_OID_set *actual_mechs; | ||
| 3976 | - OM_uint32 *initiator_time_rec; | ||
| 3977 | - OM_uint32 *acceptor_time_rec; | ||
| 3978 | +gss_add_cred_with_password( | ||
| 3979 | + OM_uint32 *minor_status, | ||
| 3980 | + const gss_cred_id_t input_cred_handle, | ||
| 3981 | + const gss_name_t desired_name, | ||
| 3982 | + const gss_OID desired_mech, | ||
| 3983 | + const gss_buffer_t password, | ||
| 3984 | + gss_cred_usage_t cred_usage, | ||
| 3985 | + OM_uint32 initiator_time_req, | ||
| 3986 | + OM_uint32 acceptor_time_req, | ||
| 3987 | + gss_cred_id_t *output_cred_handle, | ||
| 3988 | + gss_OID_set *actual_mechs, | ||
| 3989 | + OM_uint32 *initiator_time_rec, | ||
| 3990 | + OM_uint32 *acceptor_time_rec) | ||
| 3991 | { | ||
| 3992 | OM_uint32 status, temp_minor_status; | ||
| 3993 | OM_uint32 time_req, time_rec; | ||
| 3994 | diff --git a/src/lib/gssapi/mechglue/g_canon_name.c b/src/lib/gssapi/mechglue/g_canon_name.c | ||
| 3995 | index 61f657f..c5214db 100644 | ||
| 3996 | --- a/src/lib/gssapi/mechglue/g_canon_name.c | ||
| 3997 | +++ b/src/lib/gssapi/mechglue/g_canon_name.c | ||
| 3998 | @@ -54,14 +54,8 @@ val_canon_name_args( | ||
| 3999 | |||
| 4000 | |||
| 4001 | OM_uint32 KRB5_CALLCONV | ||
| 4002 | -gss_canonicalize_name(minor_status, | ||
| 4003 | - input_name, | ||
| 4004 | - mech_type, | ||
| 4005 | - output_name) | ||
| 4006 | -OM_uint32 *minor_status; | ||
| 4007 | -const gss_name_t input_name; | ||
| 4008 | -const gss_OID mech_type; | ||
| 4009 | -gss_name_t *output_name; | ||
| 4010 | +gss_canonicalize_name(OM_uint32 *minor_status, const gss_name_t input_name, | ||
| 4011 | + const gss_OID mech_type, gss_name_t *output_name) | ||
| 4012 | { | ||
| 4013 | gss_union_name_t in_union, out_union = NULL, dest_union = NULL; | ||
| 4014 | OM_uint32 major_status = GSS_S_FAILURE, tmpmin; | ||
| 4015 | diff --git a/src/lib/gssapi/mechglue/g_compare_name.c b/src/lib/gssapi/mechglue/g_compare_name.c | ||
| 4016 | index af2e76b..74a9529 100644 | ||
| 4017 | --- a/src/lib/gssapi/mechglue/g_compare_name.c | ||
| 4018 | +++ b/src/lib/gssapi/mechglue/g_compare_name.c | ||
| 4019 | @@ -59,16 +59,8 @@ val_comp_name_args( | ||
| 4020 | |||
| 4021 | |||
| 4022 | OM_uint32 KRB5_CALLCONV | ||
| 4023 | -gss_compare_name (minor_status, | ||
| 4024 | - name1, | ||
| 4025 | - name2, | ||
| 4026 | - name_equal) | ||
| 4027 | - | ||
| 4028 | -OM_uint32 * minor_status; | ||
| 4029 | -gss_name_t name1; | ||
| 4030 | -gss_name_t name2; | ||
| 4031 | -int * name_equal; | ||
| 4032 | - | ||
| 4033 | +gss_compare_name(OM_uint32 * minor_status, gss_name_t name1, gss_name_t name2, | ||
| 4034 | + int * name_equal) | ||
| 4035 | { | ||
| 4036 | OM_uint32 major_status, temp_minor; | ||
| 4037 | gss_union_name_t union_name1, union_name2; | ||
| 4038 | diff --git a/src/lib/gssapi/mechglue/g_context_time.c b/src/lib/gssapi/mechglue/g_context_time.c | ||
| 4039 | index c947e76..b11b32d 100644 | ||
| 4040 | --- a/src/lib/gssapi/mechglue/g_context_time.c | ||
| 4041 | +++ b/src/lib/gssapi/mechglue/g_context_time.c | ||
| 4042 | @@ -29,14 +29,8 @@ | ||
| 4043 | #include "mglueP.h" | ||
| 4044 | |||
| 4045 | OM_uint32 KRB5_CALLCONV | ||
| 4046 | -gss_context_time (minor_status, | ||
| 4047 | - context_handle, | ||
| 4048 | - time_rec) | ||
| 4049 | - | ||
| 4050 | -OM_uint32 * minor_status; | ||
| 4051 | -gss_ctx_id_t context_handle; | ||
| 4052 | -OM_uint32 * time_rec; | ||
| 4053 | - | ||
| 4054 | +gss_context_time(OM_uint32 * minor_status, gss_ctx_id_t context_handle, | ||
| 4055 | + OM_uint32 * time_rec) | ||
| 4056 | { | ||
| 4057 | OM_uint32 status; | ||
| 4058 | gss_union_ctx_id_t ctx; | ||
| 4059 | diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c | ||
| 4060 | index 574ff02..dc86cce 100644 | ||
| 4061 | --- a/src/lib/gssapi/mechglue/g_delete_sec_context.c | ||
| 4062 | +++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c | ||
| 4063 | @@ -62,14 +62,8 @@ val_del_sec_ctx_args( | ||
| 4064 | |||
| 4065 | |||
| 4066 | OM_uint32 KRB5_CALLCONV | ||
| 4067 | -gss_delete_sec_context (minor_status, | ||
| 4068 | - context_handle, | ||
| 4069 | - output_token) | ||
| 4070 | - | ||
| 4071 | -OM_uint32 * minor_status; | ||
| 4072 | -gss_ctx_id_t * context_handle; | ||
| 4073 | -gss_buffer_t output_token; | ||
| 4074 | - | ||
| 4075 | +gss_delete_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle, | ||
| 4076 | + gss_buffer_t output_token) | ||
| 4077 | { | ||
| 4078 | OM_uint32 status; | ||
| 4079 | gss_union_ctx_id_t ctx; | ||
| 4080 | diff --git a/src/lib/gssapi/mechglue/g_dsp_name.c b/src/lib/gssapi/mechglue/g_dsp_name.c | ||
| 4081 | index 21867c8..fae64f7 100644 | ||
| 4082 | --- a/src/lib/gssapi/mechglue/g_dsp_name.c | ||
| 4083 | +++ b/src/lib/gssapi/mechglue/g_dsp_name.c | ||
| 4084 | @@ -70,16 +70,8 @@ val_dsp_name_args( | ||
| 4085 | |||
| 4086 | |||
| 4087 | OM_uint32 KRB5_CALLCONV | ||
| 4088 | -gss_display_name (minor_status, | ||
| 4089 | - input_name, | ||
| 4090 | - output_name_buffer, | ||
| 4091 | - output_name_type) | ||
| 4092 | - | ||
| 4093 | -OM_uint32 * minor_status; | ||
| 4094 | -gss_name_t input_name; | ||
| 4095 | -gss_buffer_t output_name_buffer; | ||
| 4096 | -gss_OID * output_name_type; | ||
| 4097 | - | ||
| 4098 | +gss_display_name(OM_uint32 *minor_status, gss_name_t input_name, | ||
| 4099 | + gss_buffer_t output_name_buffer, gss_OID *output_name_type) | ||
| 4100 | { | ||
| 4101 | OM_uint32 major_status; | ||
| 4102 | gss_union_name_t union_name; | ||
| 4103 | diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c | ||
| 4104 | index 70e8492..14a7a82 100644 | ||
| 4105 | --- a/src/lib/gssapi/mechglue/g_dsp_status.c | ||
| 4106 | +++ b/src/lib/gssapi/mechglue/g_dsp_status.c | ||
| 4107 | @@ -36,20 +36,9 @@ | ||
| 4108 | static OM_uint32 displayMajor(OM_uint32, OM_uint32 *, gss_buffer_t); | ||
| 4109 | |||
| 4110 | OM_uint32 KRB5_CALLCONV | ||
| 4111 | -gss_display_status (minor_status, | ||
| 4112 | - status_value, | ||
| 4113 | - status_type, | ||
| 4114 | - req_mech_type, | ||
| 4115 | - message_context, | ||
| 4116 | - status_string) | ||
| 4117 | - | ||
| 4118 | -OM_uint32 * minor_status; | ||
| 4119 | -OM_uint32 status_value; | ||
| 4120 | -int status_type; | ||
| 4121 | -gss_OID req_mech_type; | ||
| 4122 | -OM_uint32 * message_context; | ||
| 4123 | -gss_buffer_t status_string; | ||
| 4124 | - | ||
| 4125 | +gss_display_status(OM_uint32 *minor_status, OM_uint32 status_value, | ||
| 4126 | + int status_type, gss_OID req_mech_type, | ||
| 4127 | + OM_uint32 *message_context, gss_buffer_t status_string) | ||
| 4128 | { | ||
| 4129 | gss_OID mech_type = (gss_OID) req_mech_type; | ||
| 4130 | gss_mechanism mech; | ||
| 4131 | @@ -147,10 +136,7 @@ gss_buffer_t status_string; | ||
| 4132 | * >= 2 - the supplementary error code bit shifted by 1 | ||
| 4133 | */ | ||
| 4134 | static OM_uint32 | ||
| 4135 | -displayMajor(status, msgCtxt, outStr) | ||
| 4136 | -OM_uint32 status; | ||
| 4137 | -OM_uint32 *msgCtxt; | ||
| 4138 | -gss_buffer_t outStr; | ||
| 4139 | +displayMajor(OM_uint32 status, OM_uint32 *msgCtxt, gss_buffer_t outStr) | ||
| 4140 | { | ||
| 4141 | OM_uint32 oneVal, mask = 0x1, currErr; | ||
| 4142 | char *errStr = NULL; | ||
| 4143 | diff --git a/src/lib/gssapi/mechglue/g_dup_name.c b/src/lib/gssapi/mechglue/g_dup_name.c | ||
| 4144 | index ff01db2..bf6eb60 100644 | ||
| 4145 | --- a/src/lib/gssapi/mechglue/g_dup_name.c | ||
| 4146 | +++ b/src/lib/gssapi/mechglue/g_dup_name.c | ||
| 4147 | @@ -51,12 +51,8 @@ val_dup_name_args( | ||
| 4148 | |||
| 4149 | |||
| 4150 | OM_uint32 KRB5_CALLCONV | ||
| 4151 | -gss_duplicate_name(minor_status, | ||
| 4152 | - src_name, | ||
| 4153 | - dest_name) | ||
| 4154 | -OM_uint32 *minor_status; | ||
| 4155 | -const gss_name_t src_name; | ||
| 4156 | -gss_name_t *dest_name; | ||
| 4157 | +gss_duplicate_name(OM_uint32 *minor_status, const gss_name_t src_name, | ||
| 4158 | + gss_name_t *dest_name) | ||
| 4159 | { | ||
| 4160 | gss_union_name_t src_union, dest_union; | ||
| 4161 | OM_uint32 major_status = GSS_S_FAILURE; | ||
| 4162 | diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c | ||
| 4163 | index a04afe3..68a3267 100644 | ||
| 4164 | --- a/src/lib/gssapi/mechglue/g_exp_sec_context.c | ||
| 4165 | +++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c | ||
| 4166 | @@ -68,14 +68,8 @@ val_exp_sec_ctx_args( | ||
| 4167 | |||
| 4168 | |||
| 4169 | OM_uint32 KRB5_CALLCONV | ||
| 4170 | -gss_export_sec_context(minor_status, | ||
| 4171 | - context_handle, | ||
| 4172 | - interprocess_token) | ||
| 4173 | - | ||
| 4174 | -OM_uint32 * minor_status; | ||
| 4175 | -gss_ctx_id_t * context_handle; | ||
| 4176 | -gss_buffer_t interprocess_token; | ||
| 4177 | - | ||
| 4178 | +gss_export_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle, | ||
| 4179 | + gss_buffer_t interprocess_token) | ||
| 4180 | { | ||
| 4181 | OM_uint32 status; | ||
| 4182 | OM_uint32 length; | ||
| 4183 | diff --git a/src/lib/gssapi/mechglue/g_export_name.c b/src/lib/gssapi/mechglue/g_export_name.c | ||
| 4184 | index c845f8c..2e0611d 100644 | ||
| 4185 | --- a/src/lib/gssapi/mechglue/g_export_name.c | ||
| 4186 | +++ b/src/lib/gssapi/mechglue/g_export_name.c | ||
| 4187 | @@ -20,12 +20,8 @@ | ||
| 4188 | #include <errno.h> | ||
| 4189 | |||
| 4190 | OM_uint32 KRB5_CALLCONV | ||
| 4191 | -gss_export_name(minor_status, | ||
| 4192 | - input_name, | ||
| 4193 | - exported_name) | ||
| 4194 | -OM_uint32 * minor_status; | ||
| 4195 | -const gss_name_t input_name; | ||
| 4196 | -gss_buffer_t exported_name; | ||
| 4197 | +gss_export_name(OM_uint32 *minor_status, const gss_name_t input_name, | ||
| 4198 | + gss_buffer_t exported_name) | ||
| 4199 | { | ||
| 4200 | gss_union_name_t union_name; | ||
| 4201 | |||
| 4202 | diff --git a/src/lib/gssapi/mechglue/g_glue.c b/src/lib/gssapi/mechglue/g_glue.c | ||
| 4203 | index 176fbe6..47f4993 100644 | ||
| 4204 | --- a/src/lib/gssapi/mechglue/g_glue.c | ||
| 4205 | +++ b/src/lib/gssapi/mechglue/g_glue.c | ||
| 4206 | @@ -75,9 +75,8 @@ static gss_OID_desc gss_krb5_mechanism_oid_desc = | ||
| 4207 | |||
| 4208 | #define NTLMSSP_SIGNATURE "NTLMSSP" | ||
| 4209 | |||
| 4210 | -OM_uint32 gssint_get_mech_type(OID, token) | ||
| 4211 | - gss_OID OID; | ||
| 4212 | - gss_buffer_t token; | ||
| 4213 | +OM_uint32 | ||
| 4214 | +gssint_get_mech_type(gss_OID OID, gss_buffer_t token) | ||
| 4215 | { | ||
| 4216 | /* Check for interoperability exceptions */ | ||
| 4217 | if (token->length >= sizeof(NTLMSSP_SIGNATURE) && | ||
| 4218 | @@ -163,12 +162,10 @@ import_internal_attributes(OM_uint32 *minor, | ||
| 4219 | * Internal routines to get and release an internal mechanism name | ||
| 4220 | */ | ||
| 4221 | |||
| 4222 | -OM_uint32 gssint_import_internal_name (minor_status, mech_type, union_name, | ||
| 4223 | - internal_name) | ||
| 4224 | -OM_uint32 *minor_status; | ||
| 4225 | -gss_OID mech_type; | ||
| 4226 | -gss_union_name_t union_name; | ||
| 4227 | -gss_name_t *internal_name; | ||
| 4228 | +OM_uint32 | ||
| 4229 | +gssint_import_internal_name(OM_uint32 *minor_status, gss_OID mech_type, | ||
| 4230 | + gss_union_name_t union_name, | ||
| 4231 | + gss_name_t *internal_name) | ||
| 4232 | { | ||
| 4233 | OM_uint32 status, tmpMinor; | ||
| 4234 | gss_mechanism mech; | ||
| 4235 | @@ -220,12 +217,10 @@ gss_name_t *internal_name; | ||
| 4236 | return (status); | ||
| 4237 | } | ||
| 4238 | |||
| 4239 | -OM_uint32 gssint_export_internal_name(minor_status, mech_type, | ||
| 4240 | - internal_name, name_buf) | ||
| 4241 | - OM_uint32 *minor_status; | ||
| 4242 | - const gss_OID mech_type; | ||
| 4243 | - const gss_name_t internal_name; | ||
| 4244 | - gss_buffer_t name_buf; | ||
| 4245 | +OM_uint32 | ||
| 4246 | +gssint_export_internal_name(OM_uint32 *minor_status, const gss_OID mech_type, | ||
| 4247 | + const gss_name_t internal_name, | ||
| 4248 | + gss_buffer_t name_buf) | ||
| 4249 | { | ||
| 4250 | OM_uint32 status; | ||
| 4251 | gss_mechanism mech; | ||
| 4252 | @@ -307,13 +302,10 @@ OM_uint32 gssint_export_internal_name(minor_status, mech_type, | ||
| 4253 | return (GSS_S_COMPLETE); | ||
| 4254 | } /* gssint_export_internal_name */ | ||
| 4255 | |||
| 4256 | -OM_uint32 gssint_display_internal_name (minor_status, mech_type, internal_name, | ||
| 4257 | - external_name, name_type) | ||
| 4258 | -OM_uint32 *minor_status; | ||
| 4259 | -gss_OID mech_type; | ||
| 4260 | -gss_name_t internal_name; | ||
| 4261 | -gss_buffer_t external_name; | ||
| 4262 | -gss_OID *name_type; | ||
| 4263 | +OM_uint32 | ||
| 4264 | +gssint_display_internal_name(OM_uint32 *minor_status, gss_OID mech_type, | ||
| 4265 | + gss_name_t internal_name, | ||
| 4266 | + gss_buffer_t external_name, gss_OID *name_type) | ||
| 4267 | { | ||
| 4268 | OM_uint32 status; | ||
| 4269 | gss_mechanism mech; | ||
| 4270 | @@ -337,10 +329,9 @@ gss_OID *name_type; | ||
| 4271 | return (GSS_S_BAD_MECH); | ||
| 4272 | } | ||
| 4273 | |||
| 4274 | -OM_uint32 gssint_release_internal_name (minor_status, mech_type, internal_name) | ||
| 4275 | -OM_uint32 *minor_status; | ||
| 4276 | -gss_OID mech_type; | ||
| 4277 | -gss_name_t *internal_name; | ||
| 4278 | +OM_uint32 | ||
| 4279 | +gssint_release_internal_name(OM_uint32 *minor_status, gss_OID mech_type, | ||
| 4280 | + gss_name_t *internal_name) | ||
| 4281 | { | ||
| 4282 | OM_uint32 status; | ||
| 4283 | gss_mechanism mech; | ||
| 4284 | @@ -362,14 +353,10 @@ gss_name_t *internal_name; | ||
| 4285 | return (GSS_S_BAD_MECH); | ||
| 4286 | } | ||
| 4287 | |||
| 4288 | -OM_uint32 gssint_delete_internal_sec_context (minor_status, | ||
| 4289 | - mech_type, | ||
| 4290 | - internal_ctx, | ||
| 4291 | - output_token) | ||
| 4292 | -OM_uint32 *minor_status; | ||
| 4293 | -gss_OID mech_type; | ||
| 4294 | -gss_ctx_id_t *internal_ctx; | ||
| 4295 | -gss_buffer_t output_token; | ||
| 4296 | +OM_uint32 | ||
| 4297 | +gssint_delete_internal_sec_context(OM_uint32 *minor_status, gss_OID mech_type, | ||
| 4298 | + gss_ctx_id_t *internal_ctx, | ||
| 4299 | + gss_buffer_t output_token) | ||
| 4300 | { | ||
| 4301 | OM_uint32 status; | ||
| 4302 | gss_mechanism mech; | ||
| 4303 | @@ -394,12 +381,10 @@ gss_buffer_t output_token; | ||
| 4304 | * name. Note that internal_name should be considered "consumed" by | ||
| 4305 | * this call, whether or not we return an error. | ||
| 4306 | */ | ||
| 4307 | -OM_uint32 gssint_convert_name_to_union_name(minor_status, mech, | ||
| 4308 | - internal_name, external_name) | ||
| 4309 | - OM_uint32 *minor_status; | ||
| 4310 | - gss_mechanism mech; | ||
| 4311 | - gss_name_t internal_name; | ||
| 4312 | - gss_name_t *external_name; | ||
| 4313 | +OM_uint32 | ||
| 4314 | +gssint_convert_name_to_union_name(OM_uint32 *minor_status, gss_mechanism mech, | ||
| 4315 | + gss_name_t internal_name, | ||
| 4316 | + gss_name_t *external_name) | ||
| 4317 | { | ||
| 4318 | OM_uint32 major_status,tmp; | ||
| 4319 | gss_union_name_t union_name; | ||
| 4320 | @@ -473,9 +458,7 @@ allocation_failure: | ||
| 4321 | * external union credential. | ||
| 4322 | */ | ||
| 4323 | gss_cred_id_t | ||
| 4324 | -gssint_get_mechanism_cred(union_cred, mech_type) | ||
| 4325 | - gss_union_cred_t union_cred; | ||
| 4326 | - gss_OID mech_type; | ||
| 4327 | +gssint_get_mechanism_cred(gss_union_cred_t union_cred, gss_OID mech_type) | ||
| 4328 | { | ||
| 4329 | int i; | ||
| 4330 | |||
| 4331 | @@ -494,10 +477,8 @@ gssint_get_mechanism_cred(union_cred, mech_type) | ||
| 4332 | * Both space for the structure and the data is allocated. | ||
| 4333 | */ | ||
| 4334 | OM_uint32 | ||
| 4335 | -gssint_create_copy_buffer(srcBuf, destBuf, addNullChar) | ||
| 4336 | - const gss_buffer_t srcBuf; | ||
| 4337 | - gss_buffer_t *destBuf; | ||
| 4338 | - int addNullChar; | ||
| 4339 | +gssint_create_copy_buffer(const gss_buffer_t srcBuf, gss_buffer_t *destBuf, | ||
| 4340 | + int addNullChar) | ||
| 4341 | { | ||
| 4342 | gss_buffer_t aBuf; | ||
| 4343 | unsigned int len; | ||
| 4344 | diff --git a/src/lib/gssapi/mechglue/g_imp_name.c b/src/lib/gssapi/mechglue/g_imp_name.c | ||
| 4345 | index a805078..65fa6c0 100644 | ||
| 4346 | --- a/src/lib/gssapi/mechglue/g_imp_name.c | ||
| 4347 | +++ b/src/lib/gssapi/mechglue/g_imp_name.c | ||
| 4348 | @@ -81,16 +81,8 @@ val_imp_name_args( | ||
| 4349 | static gss_buffer_desc emptyNameBuffer; | ||
| 4350 | |||
| 4351 | OM_uint32 KRB5_CALLCONV | ||
| 4352 | -gss_import_name(minor_status, | ||
| 4353 | - input_name_buffer, | ||
| 4354 | - input_name_type, | ||
| 4355 | - output_name) | ||
| 4356 | - | ||
| 4357 | -OM_uint32 * minor_status; | ||
| 4358 | -gss_buffer_t input_name_buffer; | ||
| 4359 | -gss_OID input_name_type; | ||
| 4360 | -gss_name_t * output_name; | ||
| 4361 | - | ||
| 4362 | +gss_import_name(OM_uint32 * minor_status, gss_buffer_t input_name_buffer, | ||
| 4363 | + gss_OID input_name_type, gss_name_t * output_name) | ||
| 4364 | { | ||
| 4365 | gss_union_name_t union_name; | ||
| 4366 | OM_uint32 tmp, major_status = GSS_S_FAILURE; | ||
| 4367 | @@ -183,10 +175,8 @@ allocation_failure: | ||
| 4368 | } | ||
| 4369 | |||
| 4370 | static OM_uint32 | ||
| 4371 | -importExportName(minor, unionName, inputNameType) | ||
| 4372 | - OM_uint32 *minor; | ||
| 4373 | - gss_union_name_t unionName; | ||
| 4374 | - gss_OID inputNameType; | ||
| 4375 | +importExportName(OM_uint32 *minor, gss_union_name_t unionName, | ||
| 4376 | + gss_OID inputNameType) | ||
| 4377 | { | ||
| 4378 | gss_OID_desc mechOid; | ||
| 4379 | gss_buffer_desc expName; | ||
| 4380 | diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c | ||
| 4381 | index 6315201..55a3136 100644 | ||
| 4382 | --- a/src/lib/gssapi/mechglue/g_imp_sec_context.c | ||
| 4383 | +++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c | ||
| 4384 | @@ -69,14 +69,9 @@ val_imp_sec_ctx_args( | ||
| 4385 | |||
| 4386 | |||
| 4387 | OM_uint32 KRB5_CALLCONV | ||
| 4388 | -gss_import_sec_context(minor_status, | ||
| 4389 | - interprocess_token, | ||
| 4390 | - context_handle) | ||
| 4391 | - | ||
| 4392 | -OM_uint32 * minor_status; | ||
| 4393 | -gss_buffer_t interprocess_token; | ||
| 4394 | -gss_ctx_id_t * context_handle; | ||
| 4395 | - | ||
| 4396 | +gss_import_sec_context(OM_uint32 *minor_status, | ||
| 4397 | + gss_buffer_t interprocess_token, | ||
| 4398 | + gss_ctx_id_t *context_handle) | ||
| 4399 | { | ||
| 4400 | OM_uint32 length = 0; | ||
| 4401 | OM_uint32 status; | ||
| 4402 | diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c | ||
| 4403 | index a58074c..d639a8d 100644 | ||
| 4404 | --- a/src/lib/gssapi/mechglue/g_init_sec_context.c | ||
| 4405 | +++ b/src/lib/gssapi/mechglue/g_init_sec_context.c | ||
| 4406 | @@ -88,34 +88,15 @@ val_init_sec_ctx_args( | ||
| 4407 | |||
| 4408 | |||
| 4409 | OM_uint32 KRB5_CALLCONV | ||
| 4410 | -gss_init_sec_context (minor_status, | ||
| 4411 | - claimant_cred_handle, | ||
| 4412 | - context_handle, | ||
| 4413 | - target_name, | ||
| 4414 | - req_mech_type, | ||
| 4415 | - req_flags, | ||
| 4416 | - time_req, | ||
| 4417 | - input_chan_bindings, | ||
| 4418 | - input_token, | ||
| 4419 | - actual_mech_type, | ||
| 4420 | - output_token, | ||
| 4421 | - ret_flags, | ||
| 4422 | - time_rec) | ||
| 4423 | - | ||
| 4424 | -OM_uint32 * minor_status; | ||
| 4425 | -gss_cred_id_t claimant_cred_handle; | ||
| 4426 | -gss_ctx_id_t * context_handle; | ||
| 4427 | -gss_name_t target_name; | ||
| 4428 | -gss_OID req_mech_type; | ||
| 4429 | -OM_uint32 req_flags; | ||
| 4430 | -OM_uint32 time_req; | ||
| 4431 | -gss_channel_bindings_t input_chan_bindings; | ||
| 4432 | -gss_buffer_t input_token; | ||
| 4433 | -gss_OID * actual_mech_type; | ||
| 4434 | -gss_buffer_t output_token; | ||
| 4435 | -OM_uint32 * ret_flags; | ||
| 4436 | -OM_uint32 * time_rec; | ||
| 4437 | - | ||
| 4438 | +gss_init_sec_context(OM_uint32 *minor_status, | ||
| 4439 | + gss_cred_id_t claimant_cred_handle, | ||
| 4440 | + gss_ctx_id_t *context_handle, gss_name_t target_name, | ||
| 4441 | + gss_OID req_mech_type, OM_uint32 req_flags, | ||
| 4442 | + OM_uint32 time_req, | ||
| 4443 | + gss_channel_bindings_t input_chan_bindings, | ||
| 4444 | + gss_buffer_t input_token, gss_OID *actual_mech_type, | ||
| 4445 | + gss_buffer_t output_token, OM_uint32 *ret_flags, | ||
| 4446 | + OM_uint32 *time_rec) | ||
| 4447 | { | ||
| 4448 | OM_uint32 status, temp_minor_status; | ||
| 4449 | gss_union_name_t union_name; | ||
| 4450 | diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c | ||
| 4451 | index 22f6c61..7e36c4a 100644 | ||
| 4452 | --- a/src/lib/gssapi/mechglue/g_initialize.c | ||
| 4453 | +++ b/src/lib/gssapi/mechglue/g_initialize.c | ||
| 4454 | @@ -169,9 +169,7 @@ gssint_mechglue_initialize_library(void) | ||
| 4455 | * This routine requires direct access to the mechList. | ||
| 4456 | */ | ||
| 4457 | OM_uint32 KRB5_CALLCONV | ||
| 4458 | -gss_release_oid(minor_status, oid) | ||
| 4459 | -OM_uint32 *minor_status; | ||
| 4460 | -gss_OID *oid; | ||
| 4461 | +gss_release_oid(OM_uint32 *minor_status, gss_OID *oid) | ||
| 4462 | { | ||
| 4463 | OM_uint32 major; | ||
| 4464 | gss_mech_info aMech; | ||
| 4465 | @@ -267,9 +265,7 @@ prune_deprecated(gss_OID_set mech_set) | ||
| 4466 | * a mech oid set, and only update it once the file has changed. | ||
| 4467 | */ | ||
| 4468 | OM_uint32 KRB5_CALLCONV | ||
| 4469 | -gss_indicate_mechs(minorStatus, mechSet_out) | ||
| 4470 | -OM_uint32 *minorStatus; | ||
| 4471 | -gss_OID_set *mechSet_out; | ||
| 4472 | +gss_indicate_mechs(OM_uint32 *minorStatus, gss_OID_set *mechSet_out) | ||
| 4473 | { | ||
| 4474 | OM_uint32 status; | ||
| 4475 | |||
| 4476 | @@ -417,8 +413,7 @@ build_mechSet(void) | ||
| 4477 | * caller is responsible for freeing the memory | ||
| 4478 | */ | ||
| 4479 | char * | ||
| 4480 | -gssint_get_modOptions(oid) | ||
| 4481 | -const gss_OID oid; | ||
| 4482 | +gssint_get_modOptions(const gss_OID oid) | ||
| 4483 | { | ||
| 4484 | gss_mech_info aMech; | ||
| 4485 | char *modOptions = NULL; | ||
| 4486 | @@ -479,7 +474,7 @@ load_if_changed(const char *pathname, time_t last, time_t *highest) | ||
| 4487 | /* Try to load any config files which have changed since the last call. Config | ||
| 4488 | * files are MECH_CONF and any files matching MECH_CONF_PATTERN. */ | ||
| 4489 | static void | ||
| 4490 | -loadConfigFiles() | ||
| 4491 | +loadConfigFiles(void) | ||
| 4492 | { | ||
| 4493 | glob_t globbuf; | ||
| 4494 | time_t highest = (time_t)-1, now; | ||
| 4495 | @@ -679,7 +674,8 @@ gssint_register_mechinfo(gss_mech_info template) | ||
| 4496 | memset(&errinfo, 0, sizeof(errinfo)); \ | ||
| 4497 | if (krb5int_get_plugin_func(_dl, \ | ||
| 4498 | #_symbol, \ | ||
| 4499 | - (void (**)())&(_mech)->_symbol, \ | ||
| 4500 | + (void (**)(void)) \ | ||
| 4501 | + &(_mech)->_symbol, \ | ||
| 4502 | &errinfo) || errinfo.code) { \ | ||
| 4503 | (_mech)->_symbol = NULL; \ | ||
| 4504 | k5_clear_error(&errinfo); \ | ||
| 4505 | @@ -801,7 +797,7 @@ build_dynamicMech(void *dl, const gss_OID mech_type) | ||
| 4506 | memset(&errinfo, 0, sizeof(errinfo)); \ | ||
| 4507 | if (krb5int_get_plugin_func(_dl, \ | ||
| 4508 | "gssi" #_nsym, \ | ||
| 4509 | - (void (**)())&(_mech)->_psym \ | ||
| 4510 | + (void (**)(void))&(_mech)->_psym \ | ||
| 4511 | ## _nsym, \ | ||
| 4512 | &errinfo) || errinfo.code) { \ | ||
| 4513 | (_mech)->_psym ## _nsym = NULL; \ | ||
| 4514 | @@ -948,7 +944,7 @@ loadInterMech(gss_mech_info minfo) | ||
| 4515 | } | ||
| 4516 | |||
| 4517 | if (krb5int_get_plugin_func(dl, MECH_INTERPOSER_SYM, | ||
| 4518 | - (void (**)())&isym, &errinfo) != 0) | ||
| 4519 | + (void (**)(void))&isym, &errinfo) != 0) | ||
| 4520 | goto cleanup; | ||
| 4521 | |||
| 4522 | /* Get a list of mechs to interpose. */ | ||
| 4523 | @@ -1184,7 +1180,7 @@ gssint_get_mechanism(gss_const_OID oid) | ||
| 4524 | return ((gss_mechanism)NULL); | ||
| 4525 | } | ||
| 4526 | |||
| 4527 | - if (krb5int_get_plugin_func(dl, MECH_SYM, (void (**)())&sym, | ||
| 4528 | + if (krb5int_get_plugin_func(dl, MECH_SYM, (void (**)(void))&sym, | ||
| 4529 | &errinfo) == 0) { | ||
| 4530 | /* Call the symbol to get the mechanism table */ | ||
| 4531 | aMech->mech = (*sym)(aMech->mech_type); | ||
| 4532 | diff --git a/src/lib/gssapi/mechglue/g_inq_cred.c b/src/lib/gssapi/mechglue/g_inq_cred.c | ||
| 4533 | index 4ed7774..0aa9acc 100644 | ||
| 4534 | --- a/src/lib/gssapi/mechglue/g_inq_cred.c | ||
| 4535 | +++ b/src/lib/gssapi/mechglue/g_inq_cred.c | ||
| 4536 | @@ -35,20 +35,9 @@ | ||
| 4537 | #include <time.h> | ||
| 4538 | |||
| 4539 | OM_uint32 KRB5_CALLCONV | ||
| 4540 | -gss_inquire_cred(minor_status, | ||
| 4541 | - cred_handle, | ||
| 4542 | - name, | ||
| 4543 | - lifetime, | ||
| 4544 | - cred_usage, | ||
| 4545 | - mechanisms) | ||
| 4546 | - | ||
| 4547 | -OM_uint32 * minor_status; | ||
| 4548 | -gss_cred_id_t cred_handle; | ||
| 4549 | -gss_name_t * name; | ||
| 4550 | -OM_uint32 * lifetime; | ||
| 4551 | -int * cred_usage; | ||
| 4552 | -gss_OID_set * mechanisms; | ||
| 4553 | - | ||
| 4554 | +gss_inquire_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle, | ||
| 4555 | + gss_name_t *name, OM_uint32 *lifetime, int *cred_usage, | ||
| 4556 | + gss_OID_set *mechanisms) | ||
| 4557 | { | ||
| 4558 | OM_uint32 status, temp_minor_status; | ||
| 4559 | gss_union_cred_t union_cred; | ||
| 4560 | @@ -159,15 +148,11 @@ error: | ||
| 4561 | } | ||
| 4562 | |||
| 4563 | OM_uint32 KRB5_CALLCONV | ||
| 4564 | -gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name, | ||
| 4565 | - initiator_lifetime, acceptor_lifetime, cred_usage) | ||
| 4566 | - OM_uint32 *minor_status; | ||
| 4567 | - gss_cred_id_t cred_handle; | ||
| 4568 | - gss_OID mech_type; | ||
| 4569 | - gss_name_t *name; | ||
| 4570 | - OM_uint32 *initiator_lifetime; | ||
| 4571 | - OM_uint32 *acceptor_lifetime; | ||
| 4572 | - gss_cred_usage_t *cred_usage; | ||
| 4573 | +gss_inquire_cred_by_mech(OM_uint32 *minor_status, gss_cred_id_t cred_handle, | ||
| 4574 | + gss_OID mech_type, gss_name_t *name, | ||
| 4575 | + OM_uint32 *initiator_lifetime, | ||
| 4576 | + OM_uint32 *acceptor_lifetime, | ||
| 4577 | + gss_cred_usage_t *cred_usage) | ||
| 4578 | { | ||
| 4579 | gss_union_cred_t union_cred; | ||
| 4580 | gss_cred_id_t mech_cred; | ||
| 4581 | diff --git a/src/lib/gssapi/mechglue/g_inq_names.c b/src/lib/gssapi/mechglue/g_inq_names.c | ||
| 4582 | index d22af8b..066c00c 100644 | ||
| 4583 | --- a/src/lib/gssapi/mechglue/g_inq_names.c | ||
| 4584 | +++ b/src/lib/gssapi/mechglue/g_inq_names.c | ||
| 4585 | @@ -32,12 +32,8 @@ | ||
| 4586 | |||
| 4587 | /* Last argument new for V2 */ | ||
| 4588 | OM_uint32 KRB5_CALLCONV | ||
| 4589 | -gss_inquire_names_for_mech(minor_status, mechanism, name_types) | ||
| 4590 | - | ||
| 4591 | -OM_uint32 * minor_status; | ||
| 4592 | -gss_OID mechanism; | ||
| 4593 | -gss_OID_set * name_types; | ||
| 4594 | - | ||
| 4595 | +gss_inquire_names_for_mech(OM_uint32 *minor_status, gss_OID mechanism, | ||
| 4596 | + gss_OID_set *name_types) | ||
| 4597 | { | ||
| 4598 | OM_uint32 status; | ||
| 4599 | gss_OID selected_mech = GSS_C_NO_OID, public_mech; | ||
| 4600 | diff --git a/src/lib/gssapi/mechglue/g_mechname.c b/src/lib/gssapi/mechglue/g_mechname.c | ||
| 4601 | index cfb0a0d..5664fa1 100644 | ||
| 4602 | --- a/src/lib/gssapi/mechglue/g_mechname.c | ||
| 4603 | +++ b/src/lib/gssapi/mechglue/g_mechname.c | ||
| 4604 | @@ -20,8 +20,8 @@ static gss_mech_spec_name name_list = NULL; | ||
| 4605 | /* | ||
| 4606 | * generic searching helper function. | ||
| 4607 | */ | ||
| 4608 | -static gss_mech_spec_name search_mech_spec(name_type) | ||
| 4609 | - gss_OID name_type; | ||
| 4610 | +static gss_mech_spec_name | ||
| 4611 | +search_mech_spec(gss_OID name_type) | ||
| 4612 | { | ||
| 4613 | gss_mech_spec_name p; | ||
| 4614 | |||
| 4615 | @@ -36,8 +36,8 @@ static gss_mech_spec_name search_mech_spec(name_type) | ||
| 4616 | * Given a name_type, if it is specific to a mechanism, return the | ||
| 4617 | * mechanism OID. Otherwise, return NULL. | ||
| 4618 | */ | ||
| 4619 | -gss_OID gss_find_mechanism_from_name_type(name_type) | ||
| 4620 | - gss_OID name_type; | ||
| 4621 | +gss_OID | ||
| 4622 | +gss_find_mechanism_from_name_type(gss_OID name_type) | ||
| 4623 | { | ||
| 4624 | gss_mech_spec_name p; | ||
| 4625 | |||
| 4626 | @@ -54,10 +54,8 @@ gss_OID gss_find_mechanism_from_name_type(name_type) | ||
| 4627 | * Otherwise, enter the pair into the registry. | ||
| 4628 | */ | ||
| 4629 | OM_uint32 | ||
| 4630 | -gss_add_mech_name_type(minor_status, name_type, mech) | ||
| 4631 | - OM_uint32 *minor_status; | ||
| 4632 | - gss_OID name_type; | ||
| 4633 | - gss_OID mech; | ||
| 4634 | +gss_add_mech_name_type(OM_uint32 *minor_status, gss_OID name_type, | ||
| 4635 | + gss_OID mech) | ||
| 4636 | { | ||
| 4637 | OM_uint32 major_status, tmp; | ||
| 4638 | gss_mech_spec_name p; | ||
| 4639 | diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c | ||
| 4640 | index 1d7970c..f29fb3b 100644 | ||
| 4641 | --- a/src/lib/gssapi/mechglue/g_oid_ops.c | ||
| 4642 | +++ b/src/lib/gssapi/mechglue/g_oid_ops.c | ||
| 4643 | @@ -33,9 +33,7 @@ | ||
| 4644 | */ | ||
| 4645 | |||
| 4646 | OM_uint32 KRB5_CALLCONV | ||
| 4647 | -gss_create_empty_oid_set(minor_status, oid_set) | ||
| 4648 | - OM_uint32 *minor_status; | ||
| 4649 | - gss_OID_set *oid_set; | ||
| 4650 | +gss_create_empty_oid_set(OM_uint32 *minor_status, gss_OID_set *oid_set) | ||
| 4651 | { | ||
| 4652 | OM_uint32 status; | ||
| 4653 | status = generic_gss_create_empty_oid_set(minor_status, oid_set); | ||
| 4654 | @@ -45,10 +43,8 @@ gss_create_empty_oid_set(minor_status, oid_set) | ||
| 4655 | } | ||
| 4656 | |||
| 4657 | OM_uint32 KRB5_CALLCONV | ||
| 4658 | -gss_add_oid_set_member(minor_status, member_oid, oid_set) | ||
| 4659 | - OM_uint32 *minor_status; | ||
| 4660 | - gss_OID member_oid; | ||
| 4661 | - gss_OID_set *oid_set; | ||
| 4662 | +gss_add_oid_set_member(OM_uint32 *minor_status, gss_OID member_oid, | ||
| 4663 | + gss_OID_set *oid_set) | ||
| 4664 | { | ||
| 4665 | OM_uint32 status; | ||
| 4666 | status = generic_gss_add_oid_set_member(minor_status, member_oid, oid_set); | ||
| 4667 | @@ -58,20 +54,14 @@ gss_add_oid_set_member(minor_status, member_oid, oid_set) | ||
| 4668 | } | ||
| 4669 | |||
| 4670 | OM_uint32 KRB5_CALLCONV | ||
| 4671 | -gss_test_oid_set_member(minor_status, member, set, present) | ||
| 4672 | - OM_uint32 *minor_status; | ||
| 4673 | - gss_OID member; | ||
| 4674 | - gss_OID_set set; | ||
| 4675 | - int *present; | ||
| 4676 | +gss_test_oid_set_member(OM_uint32 *minor_status, gss_OID member, | ||
| 4677 | + gss_OID_set set, int *present) | ||
| 4678 | { | ||
| 4679 | return generic_gss_test_oid_set_member(minor_status, member, set, present); | ||
| 4680 | } | ||
| 4681 | |||
| 4682 | OM_uint32 KRB5_CALLCONV | ||
| 4683 | -gss_oid_to_str(minor_status, oid, oid_str) | ||
| 4684 | - OM_uint32 *minor_status; | ||
| 4685 | - gss_OID oid; | ||
| 4686 | - gss_buffer_t oid_str; | ||
| 4687 | +gss_oid_to_str(OM_uint32 *minor_status, gss_OID oid, gss_buffer_t oid_str) | ||
| 4688 | { | ||
| 4689 | OM_uint32 status = generic_gss_oid_to_str(minor_status, oid, oid_str); | ||
| 4690 | if (status != GSS_S_COMPLETE) | ||
| 4691 | @@ -80,10 +70,7 @@ gss_oid_to_str(minor_status, oid, oid_str) | ||
| 4692 | } | ||
| 4693 | |||
| 4694 | OM_uint32 KRB5_CALLCONV | ||
| 4695 | -gss_str_to_oid(minor_status, oid_str, oid) | ||
| 4696 | - OM_uint32 *minor_status; | ||
| 4697 | - gss_buffer_t oid_str; | ||
| 4698 | - gss_OID *oid; | ||
| 4699 | +gss_str_to_oid(OM_uint32 *minor_status, gss_buffer_t oid_str, gss_OID *oid) | ||
| 4700 | { | ||
| 4701 | OM_uint32 status = generic_gss_str_to_oid(minor_status, oid_str, oid); | ||
| 4702 | if (status != GSS_S_COMPLETE) | ||
| 4703 | diff --git a/src/lib/gssapi/mechglue/g_process_context.c b/src/lib/gssapi/mechglue/g_process_context.c | ||
| 4704 | index 3968b5d..2b3f6c7 100644 | ||
| 4705 | --- a/src/lib/gssapi/mechglue/g_process_context.c | ||
| 4706 | +++ b/src/lib/gssapi/mechglue/g_process_context.c | ||
| 4707 | @@ -29,14 +29,8 @@ | ||
| 4708 | #include "mglueP.h" | ||
| 4709 | |||
| 4710 | OM_uint32 KRB5_CALLCONV | ||
| 4711 | -gss_process_context_token (minor_status, | ||
| 4712 | - context_handle, | ||
| 4713 | - token_buffer) | ||
| 4714 | - | ||
| 4715 | -OM_uint32 * minor_status; | ||
| 4716 | -gss_ctx_id_t context_handle; | ||
| 4717 | -gss_buffer_t token_buffer; | ||
| 4718 | - | ||
| 4719 | +gss_process_context_token(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 4720 | + gss_buffer_t token_buffer) | ||
| 4721 | { | ||
| 4722 | OM_uint32 status; | ||
| 4723 | gss_union_ctx_id_t ctx; | ||
| 4724 | diff --git a/src/lib/gssapi/mechglue/g_rel_buffer.c b/src/lib/gssapi/mechglue/g_rel_buffer.c | ||
| 4725 | index 8c3328a..60117bd 100644 | ||
| 4726 | --- a/src/lib/gssapi/mechglue/g_rel_buffer.c | ||
| 4727 | +++ b/src/lib/gssapi/mechglue/g_rel_buffer.c | ||
| 4728 | @@ -33,11 +33,7 @@ | ||
| 4729 | #endif | ||
| 4730 | |||
| 4731 | OM_uint32 KRB5_CALLCONV | ||
| 4732 | -gss_release_buffer (minor_status, | ||
| 4733 | - buffer) | ||
| 4734 | - | ||
| 4735 | -OM_uint32 * minor_status; | ||
| 4736 | -gss_buffer_t buffer; | ||
| 4737 | +gss_release_buffer(OM_uint32 *minor_status, gss_buffer_t buffer) | ||
| 4738 | { | ||
| 4739 | if (minor_status) | ||
| 4740 | *minor_status = 0; | ||
| 4741 | diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c | ||
| 4742 | index ccdee05..ee3d1d7 100644 | ||
| 4743 | --- a/src/lib/gssapi/mechglue/g_rel_cred.c | ||
| 4744 | +++ b/src/lib/gssapi/mechglue/g_rel_cred.c | ||
| 4745 | @@ -31,12 +31,7 @@ | ||
| 4746 | #endif | ||
| 4747 | |||
| 4748 | OM_uint32 KRB5_CALLCONV | ||
| 4749 | -gss_release_cred(minor_status, | ||
| 4750 | - cred_handle) | ||
| 4751 | - | ||
| 4752 | -OM_uint32 * minor_status; | ||
| 4753 | -gss_cred_id_t * cred_handle; | ||
| 4754 | - | ||
| 4755 | +gss_release_cred(OM_uint32 *minor_status, gss_cred_id_t *cred_handle) | ||
| 4756 | { | ||
| 4757 | OM_uint32 status, temp_status; | ||
| 4758 | int j; | ||
| 4759 | diff --git a/src/lib/gssapi/mechglue/g_rel_name.c b/src/lib/gssapi/mechglue/g_rel_name.c | ||
| 4760 | index e008692..d490f9f 100644 | ||
| 4761 | --- a/src/lib/gssapi/mechglue/g_rel_name.c | ||
| 4762 | +++ b/src/lib/gssapi/mechglue/g_rel_name.c | ||
| 4763 | @@ -34,12 +34,7 @@ | ||
| 4764 | #include <string.h> | ||
| 4765 | |||
| 4766 | OM_uint32 KRB5_CALLCONV | ||
| 4767 | -gss_release_name (minor_status, | ||
| 4768 | - input_name) | ||
| 4769 | - | ||
| 4770 | -OM_uint32 * minor_status; | ||
| 4771 | -gss_name_t * input_name; | ||
| 4772 | - | ||
| 4773 | +gss_release_name(OM_uint32 *minor_status, gss_name_t *input_name) | ||
| 4774 | { | ||
| 4775 | gss_union_name_t union_name; | ||
| 4776 | |||
| 4777 | diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c | ||
| 4778 | index fa008d6..9151dd2 100644 | ||
| 4779 | --- a/src/lib/gssapi/mechglue/g_rel_oid_set.c | ||
| 4780 | +++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c | ||
| 4781 | @@ -33,11 +33,7 @@ | ||
| 4782 | #endif | ||
| 4783 | |||
| 4784 | OM_uint32 KRB5_CALLCONV | ||
| 4785 | -gss_release_oid_set (minor_status, | ||
| 4786 | - set) | ||
| 4787 | - | ||
| 4788 | -OM_uint32 * minor_status; | ||
| 4789 | -gss_OID_set * set; | ||
| 4790 | +gss_release_oid_set(OM_uint32 *minor_status, gss_OID_set *set) | ||
| 4791 | { | ||
| 4792 | return generic_gss_release_oid_set(minor_status, set); | ||
| 4793 | } | ||
| 4794 | diff --git a/src/lib/gssapi/mechglue/g_sign.c b/src/lib/gssapi/mechglue/g_sign.c | ||
| 4795 | index 03fbd8c..c9af1da 100644 | ||
| 4796 | --- a/src/lib/gssapi/mechglue/g_sign.c | ||
| 4797 | +++ b/src/lib/gssapi/mechglue/g_sign.c | ||
| 4798 | @@ -66,18 +66,9 @@ val_get_mic_args( | ||
| 4799 | |||
| 4800 | |||
| 4801 | OM_uint32 KRB5_CALLCONV | ||
| 4802 | -gss_get_mic (minor_status, | ||
| 4803 | - context_handle, | ||
| 4804 | - qop_req, | ||
| 4805 | - message_buffer, | ||
| 4806 | - msg_token) | ||
| 4807 | - | ||
| 4808 | -OM_uint32 * minor_status; | ||
| 4809 | -gss_ctx_id_t context_handle; | ||
| 4810 | -gss_qop_t qop_req; | ||
| 4811 | -gss_buffer_t message_buffer; | ||
| 4812 | -gss_buffer_t msg_token; | ||
| 4813 | - | ||
| 4814 | +gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 4815 | + gss_qop_t qop_req, gss_buffer_t message_buffer, | ||
| 4816 | + gss_buffer_t msg_token) | ||
| 4817 | { | ||
| 4818 | OM_uint32 status; | ||
| 4819 | gss_union_ctx_id_t ctx; | ||
| 4820 | @@ -118,18 +109,8 @@ gss_buffer_t msg_token; | ||
| 4821 | } | ||
| 4822 | |||
| 4823 | OM_uint32 KRB5_CALLCONV | ||
| 4824 | -gss_sign (minor_status, | ||
| 4825 | - context_handle, | ||
| 4826 | - qop_req, | ||
| 4827 | - message_buffer, | ||
| 4828 | - msg_token) | ||
| 4829 | - | ||
| 4830 | -OM_uint32 * minor_status; | ||
| 4831 | -gss_ctx_id_t context_handle; | ||
| 4832 | -int qop_req; | ||
| 4833 | -gss_buffer_t message_buffer; | ||
| 4834 | -gss_buffer_t msg_token; | ||
| 4835 | - | ||
| 4836 | +gss_sign(OM_uint32 *minor_status, gss_ctx_id_t context_handle, int qop_req, | ||
| 4837 | + gss_buffer_t message_buffer, gss_buffer_t msg_token) | ||
| 4838 | { | ||
| 4839 | return (gss_get_mic(minor_status, context_handle, (gss_qop_t) qop_req, | ||
| 4840 | message_buffer, msg_token)); | ||
| 4841 | diff --git a/src/lib/gssapi/mechglue/g_store_cred.c b/src/lib/gssapi/mechglue/g_store_cred.c | ||
| 4842 | index c2b6ddf..231b3e8 100644 | ||
| 4843 | --- a/src/lib/gssapi/mechglue/g_store_cred.c | ||
| 4844 | +++ b/src/lib/gssapi/mechglue/g_store_cred.c | ||
| 4845 | @@ -93,24 +93,10 @@ val_store_cred_args( | ||
| 4846 | |||
| 4847 | |||
| 4848 | OM_uint32 KRB5_CALLCONV | ||
| 4849 | -gss_store_cred(minor_status, | ||
| 4850 | - input_cred_handle, | ||
| 4851 | - cred_usage, | ||
| 4852 | - desired_mech, | ||
| 4853 | - overwrite_cred, | ||
| 4854 | - default_cred, | ||
| 4855 | - elements_stored, | ||
| 4856 | - cred_usage_stored) | ||
| 4857 | - | ||
| 4858 | -OM_uint32 *minor_status; | ||
| 4859 | -gss_cred_id_t input_cred_handle; | ||
| 4860 | -gss_cred_usage_t cred_usage; | ||
| 4861 | -const gss_OID desired_mech; | ||
| 4862 | -OM_uint32 overwrite_cred; | ||
| 4863 | -OM_uint32 default_cred; | ||
| 4864 | -gss_OID_set *elements_stored; | ||
| 4865 | -gss_cred_usage_t *cred_usage_stored; | ||
| 4866 | - | ||
| 4867 | +gss_store_cred(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle, | ||
| 4868 | + gss_cred_usage_t cred_usage, const gss_OID desired_mech, | ||
| 4869 | + OM_uint32 overwrite_cred, OM_uint32 default_cred, | ||
| 4870 | + gss_OID_set *elements_stored, gss_cred_usage_t *cred_usage_stored) | ||
| 4871 | { | ||
| 4872 | return gss_store_cred_into(minor_status, input_cred_handle, cred_usage, | ||
| 4873 | desired_mech, overwrite_cred, default_cred, | ||
| 4874 | @@ -119,26 +105,12 @@ gss_cred_usage_t *cred_usage_stored; | ||
| 4875 | } | ||
| 4876 | |||
| 4877 | OM_uint32 KRB5_CALLCONV | ||
| 4878 | -gss_store_cred_into(minor_status, | ||
| 4879 | - input_cred_handle, | ||
| 4880 | - cred_usage, | ||
| 4881 | - desired_mech, | ||
| 4882 | - overwrite_cred, | ||
| 4883 | - default_cred, | ||
| 4884 | - cred_store, | ||
| 4885 | - elements_stored, | ||
| 4886 | - cred_usage_stored) | ||
| 4887 | - | ||
| 4888 | -OM_uint32 *minor_status; | ||
| 4889 | -gss_cred_id_t input_cred_handle; | ||
| 4890 | -gss_cred_usage_t cred_usage; | ||
| 4891 | -gss_OID desired_mech; | ||
| 4892 | -OM_uint32 overwrite_cred; | ||
| 4893 | -OM_uint32 default_cred; | ||
| 4894 | -gss_const_key_value_set_t cred_store; | ||
| 4895 | -gss_OID_set *elements_stored; | ||
| 4896 | -gss_cred_usage_t *cred_usage_stored; | ||
| 4897 | - | ||
| 4898 | +gss_store_cred_into(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle, | ||
| 4899 | + gss_cred_usage_t cred_usage, gss_OID desired_mech, | ||
| 4900 | + OM_uint32 overwrite_cred, OM_uint32 default_cred, | ||
| 4901 | + gss_const_key_value_set_t cred_store, | ||
| 4902 | + gss_OID_set *elements_stored, | ||
| 4903 | + gss_cred_usage_t *cred_usage_stored) | ||
| 4904 | { | ||
| 4905 | OM_uint32 major_status = GSS_S_FAILURE; | ||
| 4906 | gss_union_cred_t union_cred; | ||
| 4907 | diff --git a/src/lib/gssapi/mechglue/g_unseal.c b/src/lib/gssapi/mechglue/g_unseal.c | ||
| 4908 | index c208635..2be3745 100644 | ||
| 4909 | --- a/src/lib/gssapi/mechglue/g_unseal.c | ||
| 4910 | +++ b/src/lib/gssapi/mechglue/g_unseal.c | ||
| 4911 | @@ -29,20 +29,10 @@ | ||
| 4912 | #include "mglueP.h" | ||
| 4913 | |||
| 4914 | OM_uint32 KRB5_CALLCONV | ||
| 4915 | -gss_unwrap (minor_status, | ||
| 4916 | - context_handle, | ||
| 4917 | - input_message_buffer, | ||
| 4918 | - output_message_buffer, | ||
| 4919 | - conf_state, | ||
| 4920 | - qop_state) | ||
| 4921 | - | ||
| 4922 | -OM_uint32 * minor_status; | ||
| 4923 | -gss_ctx_id_t context_handle; | ||
| 4924 | -gss_buffer_t input_message_buffer; | ||
| 4925 | -gss_buffer_t output_message_buffer; | ||
| 4926 | -int * conf_state; | ||
| 4927 | -gss_qop_t * qop_state; | ||
| 4928 | - | ||
| 4929 | +gss_unwrap(OM_uint32 * minor_status, gss_ctx_id_t context_handle, | ||
| 4930 | + gss_buffer_t input_message_buffer, | ||
| 4931 | + gss_buffer_t output_message_buffer, | ||
| 4932 | + int *conf_state, gss_qop_t *qop_state) | ||
| 4933 | { | ||
| 4934 | /* EXPORT DELETE START */ | ||
| 4935 | OM_uint32 status; | ||
| 4936 | @@ -111,20 +101,9 @@ gss_qop_t * qop_state; | ||
| 4937 | } | ||
| 4938 | |||
| 4939 | OM_uint32 KRB5_CALLCONV | ||
| 4940 | -gss_unseal (minor_status, | ||
| 4941 | - context_handle, | ||
| 4942 | - input_message_buffer, | ||
| 4943 | - output_message_buffer, | ||
| 4944 | - conf_state, | ||
| 4945 | - qop_state) | ||
| 4946 | - | ||
| 4947 | -OM_uint32 * minor_status; | ||
| 4948 | -gss_ctx_id_t context_handle; | ||
| 4949 | -gss_buffer_t input_message_buffer; | ||
| 4950 | -gss_buffer_t output_message_buffer; | ||
| 4951 | -int * conf_state; | ||
| 4952 | -int * qop_state; | ||
| 4953 | - | ||
| 4954 | +gss_unseal(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 4955 | + gss_buffer_t input_message_buffer, | ||
| 4956 | + gss_buffer_t output_message_buffer, int *conf_state, int *qop_state) | ||
| 4957 | { | ||
| 4958 | return (gss_unwrap(minor_status, context_handle, | ||
| 4959 | input_message_buffer, | ||
| 4960 | diff --git a/src/lib/gssapi/mechglue/g_unwrap_aead.c b/src/lib/gssapi/mechglue/g_unwrap_aead.c | ||
| 4961 | index 0682bd8..5c9ff30 100644 | ||
| 4962 | --- a/src/lib/gssapi/mechglue/g_unwrap_aead.c | ||
| 4963 | +++ b/src/lib/gssapi/mechglue/g_unwrap_aead.c | ||
| 4964 | @@ -154,20 +154,11 @@ gssint_unwrap_aead (gss_mechanism mech, | ||
| 4965 | } | ||
| 4966 | |||
| 4967 | OM_uint32 KRB5_CALLCONV | ||
| 4968 | -gss_unwrap_aead (minor_status, | ||
| 4969 | - context_handle, | ||
| 4970 | - input_message_buffer, | ||
| 4971 | - input_assoc_buffer, | ||
| 4972 | - output_payload_buffer, | ||
| 4973 | - conf_state, | ||
| 4974 | - qop_state) | ||
| 4975 | -OM_uint32 * minor_status; | ||
| 4976 | -gss_ctx_id_t context_handle; | ||
| 4977 | -gss_buffer_t input_message_buffer; | ||
| 4978 | -gss_buffer_t input_assoc_buffer; | ||
| 4979 | -gss_buffer_t output_payload_buffer; | ||
| 4980 | -int *conf_state; | ||
| 4981 | -gss_qop_t *qop_state; | ||
| 4982 | +gss_unwrap_aead(OM_uint32 * minor_status, gss_ctx_id_t context_handle, | ||
| 4983 | + gss_buffer_t input_message_buffer, | ||
| 4984 | + gss_buffer_t input_assoc_buffer, | ||
| 4985 | + gss_buffer_t output_payload_buffer, | ||
| 4986 | + int *conf_state, gss_qop_t *qop_state) | ||
| 4987 | { | ||
| 4988 | |||
| 4989 | OM_uint32 status; | ||
| 4990 | diff --git a/src/lib/gssapi/mechglue/g_unwrap_iov.c b/src/lib/gssapi/mechglue/g_unwrap_iov.c | ||
| 4991 | index 599be2c..bf9c3bc 100644 | ||
| 4992 | --- a/src/lib/gssapi/mechglue/g_unwrap_iov.c | ||
| 4993 | +++ b/src/lib/gssapi/mechglue/g_unwrap_iov.c | ||
| 4994 | @@ -59,18 +59,9 @@ val_unwrap_iov_args( | ||
| 4995 | |||
| 4996 | |||
| 4997 | OM_uint32 KRB5_CALLCONV | ||
| 4998 | -gss_unwrap_iov (minor_status, | ||
| 4999 | - context_handle, | ||
| 5000 | - conf_state, | ||
| 5001 | - qop_state, | ||
| 5002 | - iov, | ||
| 5003 | - iov_count) | ||
| 5004 | -OM_uint32 * minor_status; | ||
| 5005 | -gss_ctx_id_t context_handle; | ||
| 5006 | -int * conf_state; | ||
| 5007 | -gss_qop_t *qop_state; | ||
| 5008 | -gss_iov_buffer_desc * iov; | ||
| 5009 | -int iov_count; | ||
| 5010 | +gss_unwrap_iov(OM_uint32 * minor_status, gss_ctx_id_t context_handle, | ||
| 5011 | + int *conf_state, gss_qop_t *qop_state, | ||
| 5012 | + gss_iov_buffer_desc *iov, int iov_count) | ||
| 5013 | { | ||
| 5014 | /* EXPORT DELETE START */ | ||
| 5015 | |||
| 5016 | diff --git a/src/lib/gssapi/mechglue/g_verify.c b/src/lib/gssapi/mechglue/g_verify.c | ||
| 5017 | index 8996fce..86ade66 100644 | ||
| 5018 | --- a/src/lib/gssapi/mechglue/g_verify.c | ||
| 5019 | +++ b/src/lib/gssapi/mechglue/g_verify.c | ||
| 5020 | @@ -29,18 +29,9 @@ | ||
| 5021 | #include "mglueP.h" | ||
| 5022 | |||
| 5023 | OM_uint32 KRB5_CALLCONV | ||
| 5024 | -gss_verify_mic (minor_status, | ||
| 5025 | - context_handle, | ||
| 5026 | - message_buffer, | ||
| 5027 | - token_buffer, | ||
| 5028 | - qop_state) | ||
| 5029 | - | ||
| 5030 | -OM_uint32 * minor_status; | ||
| 5031 | -gss_ctx_id_t context_handle; | ||
| 5032 | -gss_buffer_t message_buffer; | ||
| 5033 | -gss_buffer_t token_buffer; | ||
| 5034 | -gss_qop_t * qop_state; | ||
| 5035 | - | ||
| 5036 | +gss_verify_mic(OM_uint32 * minor_status, gss_ctx_id_t context_handle, | ||
| 5037 | + gss_buffer_t message_buffer, gss_buffer_t token_buffer, | ||
| 5038 | + gss_qop_t *qop_state) | ||
| 5039 | { | ||
| 5040 | OM_uint32 status; | ||
| 5041 | gss_union_ctx_id_t ctx; | ||
| 5042 | @@ -89,18 +80,9 @@ gss_qop_t * qop_state; | ||
| 5043 | } | ||
| 5044 | |||
| 5045 | OM_uint32 KRB5_CALLCONV | ||
| 5046 | -gss_verify (minor_status, | ||
| 5047 | - context_handle, | ||
| 5048 | - message_buffer, | ||
| 5049 | - token_buffer, | ||
| 5050 | - qop_state) | ||
| 5051 | - | ||
| 5052 | -OM_uint32 * minor_status; | ||
| 5053 | -gss_ctx_id_t context_handle; | ||
| 5054 | -gss_buffer_t message_buffer; | ||
| 5055 | -gss_buffer_t token_buffer; | ||
| 5056 | -int * qop_state; | ||
| 5057 | - | ||
| 5058 | +gss_verify(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 5059 | + gss_buffer_t message_buffer, gss_buffer_t token_buffer, | ||
| 5060 | + int *qop_state) | ||
| 5061 | { | ||
| 5062 | return (gss_verify_mic(minor_status, context_handle, | ||
| 5063 | message_buffer, token_buffer, | ||
| 5064 | diff --git a/src/lib/gssapi/mechglue/g_wrap_aead.c b/src/lib/gssapi/mechglue/g_wrap_aead.c | ||
| 5065 | index 7fe3b7b..5a6570f 100644 | ||
| 5066 | --- a/src/lib/gssapi/mechglue/g_wrap_aead.c | ||
| 5067 | +++ b/src/lib/gssapi/mechglue/g_wrap_aead.c | ||
| 5068 | @@ -177,15 +177,11 @@ gssint_wrap_aead_iov_shim(gss_mechanism mech, | ||
| 5069 | } | ||
| 5070 | |||
| 5071 | OM_uint32 | ||
| 5072 | -gssint_wrap_aead (gss_mechanism mech, | ||
| 5073 | - OM_uint32 *minor_status, | ||
| 5074 | - gss_union_ctx_id_t ctx, | ||
| 5075 | - int conf_req_flag, | ||
| 5076 | - gss_qop_t qop_req, | ||
| 5077 | - gss_buffer_t input_assoc_buffer, | ||
| 5078 | - gss_buffer_t input_payload_buffer, | ||
| 5079 | - int *conf_state, | ||
| 5080 | - gss_buffer_t output_message_buffer) | ||
| 5081 | +gssint_wrap_aead(gss_mechanism mech, OM_uint32 *minor_status, | ||
| 5082 | + gss_union_ctx_id_t ctx, int conf_req_flag, gss_qop_t qop_req, | ||
| 5083 | + gss_buffer_t input_assoc_buffer, | ||
| 5084 | + gss_buffer_t input_payload_buffer, | ||
| 5085 | + int *conf_state, gss_buffer_t output_message_buffer) | ||
| 5086 | { | ||
| 5087 | /* EXPORT DELETE START */ | ||
| 5088 | OM_uint32 status; | ||
| 5089 | @@ -223,22 +219,15 @@ gssint_wrap_aead (gss_mechanism mech, | ||
| 5090 | } | ||
| 5091 | |||
| 5092 | OM_uint32 KRB5_CALLCONV | ||
| 5093 | -gss_wrap_aead (minor_status, | ||
| 5094 | - context_handle, | ||
| 5095 | - conf_req_flag, | ||
| 5096 | - qop_req, | ||
| 5097 | - input_assoc_buffer, | ||
| 5098 | - input_payload_buffer, | ||
| 5099 | - conf_state, | ||
| 5100 | - output_message_buffer) | ||
| 5101 | -OM_uint32 * minor_status; | ||
| 5102 | -gss_ctx_id_t context_handle; | ||
| 5103 | -int conf_req_flag; | ||
| 5104 | -gss_qop_t qop_req; | ||
| 5105 | -gss_buffer_t input_assoc_buffer; | ||
| 5106 | -gss_buffer_t input_payload_buffer; | ||
| 5107 | -int * conf_state; | ||
| 5108 | -gss_buffer_t output_message_buffer; | ||
| 5109 | +gss_wrap_aead ( | ||
| 5110 | + OM_uint32 * minor_status, | ||
| 5111 | + gss_ctx_id_t context_handle, | ||
| 5112 | + int conf_req_flag, | ||
| 5113 | + gss_qop_t qop_req, | ||
| 5114 | + gss_buffer_t input_assoc_buffer, | ||
| 5115 | + gss_buffer_t input_payload_buffer, | ||
| 5116 | + int * conf_state, | ||
| 5117 | + gss_buffer_t output_message_buffer) | ||
| 5118 | { | ||
| 5119 | OM_uint32 status; | ||
| 5120 | gss_mechanism mech; | ||
| 5121 | diff --git a/src/lib/gssapi/mechglue/g_wrap_iov.c b/src/lib/gssapi/mechglue/g_wrap_iov.c | ||
| 5122 | index 14447c4..aaf3a93 100644 | ||
| 5123 | --- a/src/lib/gssapi/mechglue/g_wrap_iov.c | ||
| 5124 | +++ b/src/lib/gssapi/mechglue/g_wrap_iov.c | ||
| 5125 | @@ -60,20 +60,9 @@ val_wrap_iov_args( | ||
| 5126 | |||
| 5127 | |||
| 5128 | OM_uint32 KRB5_CALLCONV | ||
| 5129 | -gss_wrap_iov (minor_status, | ||
| 5130 | - context_handle, | ||
| 5131 | - conf_req_flag, | ||
| 5132 | - qop_req, | ||
| 5133 | - conf_state, | ||
| 5134 | - iov, | ||
| 5135 | - iov_count) | ||
| 5136 | -OM_uint32 * minor_status; | ||
| 5137 | -gss_ctx_id_t context_handle; | ||
| 5138 | -int conf_req_flag; | ||
| 5139 | -gss_qop_t qop_req; | ||
| 5140 | -int * conf_state; | ||
| 5141 | -gss_iov_buffer_desc * iov; | ||
| 5142 | -int iov_count; | ||
| 5143 | +gss_wrap_iov(OM_uint32 * minor_status, gss_ctx_id_t context_handle, | ||
| 5144 | + int conf_req_flag, gss_qop_t qop_req, int *conf_state, | ||
| 5145 | + gss_iov_buffer_desc *iov, int iov_count) | ||
| 5146 | { | ||
| 5147 | /* EXPORT DELETE START */ | ||
| 5148 | |||
| 5149 | @@ -120,20 +109,10 @@ int iov_count; | ||
| 5150 | } | ||
| 5151 | |||
| 5152 | OM_uint32 KRB5_CALLCONV | ||
| 5153 | -gss_wrap_iov_length (minor_status, | ||
| 5154 | - context_handle, | ||
| 5155 | - conf_req_flag, | ||
| 5156 | - qop_req, | ||
| 5157 | - conf_state, | ||
| 5158 | - iov, | ||
| 5159 | - iov_count) | ||
| 5160 | -OM_uint32 * minor_status; | ||
| 5161 | -gss_ctx_id_t context_handle; | ||
| 5162 | -int conf_req_flag; | ||
| 5163 | -gss_qop_t qop_req; | ||
| 5164 | -int * conf_state; | ||
| 5165 | -gss_iov_buffer_desc * iov; | ||
| 5166 | -int iov_count; | ||
| 5167 | +gss_wrap_iov_length(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 5168 | + int conf_req_flag, gss_qop_t qop_req, | ||
| 5169 | + int *conf_state, gss_iov_buffer_desc *iov, | ||
| 5170 | + int iov_count) | ||
| 5171 | { | ||
| 5172 | /* EXPORT DELETE START */ | ||
| 5173 | |||
| 5174 | @@ -239,12 +218,8 @@ gss_get_mic_iov_length(OM_uint32 *minor_status, gss_ctx_id_t context_handle, | ||
| 5175 | } | ||
| 5176 | |||
| 5177 | OM_uint32 KRB5_CALLCONV | ||
| 5178 | -gss_release_iov_buffer (minor_status, | ||
| 5179 | - iov, | ||
| 5180 | - iov_count) | ||
| 5181 | -OM_uint32 * minor_status; | ||
| 5182 | -gss_iov_buffer_desc * iov; | ||
| 5183 | -int iov_count; | ||
| 5184 | +gss_release_iov_buffer(OM_uint32 * minor_status, gss_iov_buffer_desc *iov, | ||
| 5185 | + int iov_count) | ||
| 5186 | { | ||
| 5187 | OM_uint32 status = GSS_S_COMPLETE; | ||
| 5188 | int i; | ||
| 5189 | diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c | ||
| 5190 | index d84d158..c8d844e 100644 | ||
| 5191 | --- a/src/lib/kadm5/clnt/client_rpc.c | ||
| 5192 | +++ b/src/lib/kadm5/clnt/client_rpc.c | ||
| 5193 | @@ -1,6 +1,7 @@ | ||
| 5194 | /* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */ | ||
| 5195 | #include <gssrpc/rpc.h> | ||
| 5196 | #include <kadm5/kadm_rpc.h> | ||
| 5197 | +#include <kadm5/admin_xdr.h> | ||
| 5198 | #include <krb5.h> | ||
| 5199 | #include <kadm5/admin.h> | ||
| 5200 | #include <string.h> /* for memset prototype */ | ||
| 5201 | diff --git a/src/lib/kadm5/kadm_rpc.h b/src/lib/kadm5/kadm_rpc.h | ||
| 5202 | index 5099c6c..9efe49a 100644 | ||
| 5203 | --- a/src/lib/kadm5/kadm_rpc.h | ||
| 5204 | +++ b/src/lib/kadm5/kadm_rpc.h | ||
| 5205 | @@ -360,49 +360,4 @@ extern enum clnt_stat get_principal_keys_2(getpkeys_arg *, getpkeys_ret *, | ||
| 5206 | CLIENT *); | ||
| 5207 | extern bool_t get_principal_keys_2_svc(getpkeys_arg *, getpkeys_ret *, | ||
| 5208 | struct svc_req *); | ||
| 5209 | - | ||
| 5210 | -extern bool_t xdr_cprinc_arg (); | ||
| 5211 | -extern bool_t xdr_cprinc3_arg (); | ||
| 5212 | -extern bool_t xdr_generic_ret (); | ||
| 5213 | -extern bool_t xdr_dprinc_arg (); | ||
| 5214 | -extern bool_t xdr_mprinc_arg (); | ||
| 5215 | -extern bool_t xdr_rprinc_arg (); | ||
| 5216 | -extern bool_t xdr_gprincs_arg (); | ||
| 5217 | -extern bool_t xdr_gprincs_ret (); | ||
| 5218 | -extern bool_t xdr_chpass_arg (); | ||
| 5219 | -extern bool_t xdr_chpass3_arg (); | ||
| 5220 | -extern bool_t xdr_setkey_arg (); | ||
| 5221 | -extern bool_t xdr_setkey3_arg (); | ||
| 5222 | -extern bool_t xdr_setkey4_arg (); | ||
| 5223 | -extern bool_t xdr_chrand_arg (); | ||
| 5224 | -extern bool_t xdr_chrand3_arg (); | ||
| 5225 | -extern bool_t xdr_chrand_ret (); | ||
| 5226 | -extern bool_t xdr_gprinc_arg (); | ||
| 5227 | -extern bool_t xdr_gprinc_ret (); | ||
| 5228 | -extern bool_t xdr_kadm5_ret_t (); | ||
| 5229 | -extern bool_t xdr_kadm5_principal_ent_rec (); | ||
| 5230 | -extern bool_t xdr_kadm5_policy_ent_rec (); | ||
| 5231 | -extern bool_t xdr_krb5_keyblock (); | ||
| 5232 | -extern bool_t xdr_krb5_principal (); | ||
| 5233 | -extern bool_t xdr_krb5_enctype (); | ||
| 5234 | -extern bool_t xdr_krb5_octet (); | ||
| 5235 | -extern bool_t xdr_krb5_int32 (); | ||
| 5236 | -extern bool_t xdr_u_int32 (); | ||
| 5237 | -extern bool_t xdr_cpol_arg (); | ||
| 5238 | -extern bool_t xdr_dpol_arg (); | ||
| 5239 | -extern bool_t xdr_mpol_arg (); | ||
| 5240 | -extern bool_t xdr_gpol_arg (); | ||
| 5241 | -extern bool_t xdr_gpol_ret (); | ||
| 5242 | -extern bool_t xdr_gpols_arg (); | ||
| 5243 | -extern bool_t xdr_gpols_ret (); | ||
| 5244 | -extern bool_t xdr_getprivs_ret (); | ||
| 5245 | -extern bool_t xdr_purgekeys_arg (); | ||
| 5246 | -extern bool_t xdr_gstrings_arg (); | ||
| 5247 | -extern bool_t xdr_gstrings_ret (); | ||
| 5248 | -extern bool_t xdr_sstring_arg (); | ||
| 5249 | -extern bool_t xdr_krb5_string_attr (); | ||
| 5250 | -extern bool_t xdr_kadm5_key_data (); | ||
| 5251 | -extern bool_t xdr_getpkeys_arg (); | ||
| 5252 | -extern bool_t xdr_getpkeys_ret (); | ||
| 5253 | - | ||
| 5254 | #endif /* __KADM_RPC_H__ */ | ||
| 5255 | diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c | ||
| 5256 | index 287cae7..5e052dd 100644 | ||
| 5257 | --- a/src/lib/kadm5/kadm_rpc_xdr.c | ||
| 5258 | +++ b/src/lib/kadm5/kadm_rpc_xdr.c | ||
| 5259 | @@ -408,7 +408,7 @@ _xdr_kadm5_principal_ent_rec(XDR *xdrs, kadm5_principal_ent_rec *objp, | ||
| 5260 | return (FALSE); | ||
| 5261 | } | ||
| 5262 | if (!xdr_nulltype(xdrs, (void **) &objp->mod_name, | ||
| 5263 | - xdr_krb5_principal)) { | ||
| 5264 | + (xdrproc_t)xdr_krb5_principal)) { | ||
| 5265 | return (FALSE); | ||
| 5266 | } | ||
| 5267 | if (!xdr_krb5_timestamp(xdrs, &objp->mod_date)) { | ||
| 5268 | @@ -451,12 +451,13 @@ _xdr_kadm5_principal_ent_rec(XDR *xdrs, kadm5_principal_ent_rec *objp, | ||
| 5269 | return (FALSE); | ||
| 5270 | } | ||
| 5271 | if (!xdr_nulltype(xdrs, (void **) &objp->tl_data, | ||
| 5272 | - xdr_krb5_tl_data)) { | ||
| 5273 | + (xdrproc_t)xdr_krb5_tl_data)) { | ||
| 5274 | return FALSE; | ||
| 5275 | } | ||
| 5276 | n = objp->n_key_data; | ||
| 5277 | r = xdr_array(xdrs, (caddr_t *) &objp->key_data, &n, objp->n_key_data, | ||
| 5278 | - sizeof(krb5_key_data), xdr_krb5_key_data_nocontents); | ||
| 5279 | + sizeof(krb5_key_data), | ||
| 5280 | + (xdrproc_t)xdr_krb5_key_data_nocontents); | ||
| 5281 | objp->n_key_data = n; | ||
| 5282 | if (!r) { | ||
| 5283 | return (FALSE); | ||
| 5284 | @@ -528,7 +529,7 @@ _xdr_kadm5_policy_ent_rec(XDR *xdrs, kadm5_policy_ent_rec *objp, int vers) | ||
| 5285 | return (FALSE); | ||
| 5286 | } | ||
| 5287 | if (!xdr_nulltype(xdrs, (void **) &objp->tl_data, | ||
| 5288 | - xdr_krb5_tl_data)) { | ||
| 5289 | + (xdrproc_t)xdr_krb5_tl_data)) { | ||
| 5290 | return FALSE; | ||
| 5291 | } | ||
| 5292 | } | ||
| 5293 | @@ -576,7 +577,7 @@ xdr_cprinc3_arg(XDR *xdrs, cprinc3_arg *objp) | ||
| 5294 | if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple, | ||
| 5295 | (unsigned int *)&objp->n_ks_tuple, ~0, | ||
| 5296 | sizeof(krb5_key_salt_tuple), | ||
| 5297 | - xdr_krb5_key_salt_tuple)) { | ||
| 5298 | + (xdrproc_t)xdr_krb5_key_salt_tuple)) { | ||
| 5299 | return (FALSE); | ||
| 5300 | } | ||
| 5301 | if (!xdr_nullstring(xdrs, &objp->passwd)) { | ||
| 5302 | @@ -668,7 +669,7 @@ xdr_gprincs_ret(XDR *xdrs, gprincs_ret *objp) | ||
| 5303 | } | ||
| 5304 | if (!xdr_array(xdrs, (caddr_t *) &objp->princs, | ||
| 5305 | (unsigned int *) &objp->count, ~0, | ||
| 5306 | - sizeof(char *), xdr_nullstring)) { | ||
| 5307 | + sizeof(char *), (xdrproc_t)xdr_nullstring)) { | ||
| 5308 | return (FALSE); | ||
| 5309 | } | ||
| 5310 | } | ||
| 5311 | @@ -706,7 +707,7 @@ xdr_chpass3_arg(XDR *xdrs, chpass3_arg *objp) | ||
| 5312 | if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple, | ||
| 5313 | (unsigned int*)&objp->n_ks_tuple, ~0, | ||
| 5314 | sizeof(krb5_key_salt_tuple), | ||
| 5315 | - xdr_krb5_key_salt_tuple)) { | ||
| 5316 | + (xdrproc_t)xdr_krb5_key_salt_tuple)) { | ||
| 5317 | return (FALSE); | ||
| 5318 | } | ||
| 5319 | if (!xdr_nullstring(xdrs, &objp->pass)) { | ||
| 5320 | @@ -726,7 +727,7 @@ xdr_setkey_arg(XDR *xdrs, setkey_arg *objp) | ||
| 5321 | } | ||
| 5322 | if (!xdr_array(xdrs, (caddr_t *) &objp->keyblocks, | ||
| 5323 | (unsigned int *) &objp->n_keys, ~0, | ||
| 5324 | - sizeof(krb5_keyblock), xdr_krb5_keyblock)) { | ||
| 5325 | + sizeof(krb5_keyblock), (xdrproc_t)xdr_krb5_keyblock)) { | ||
| 5326 | return (FALSE); | ||
| 5327 | } | ||
| 5328 | return (TRUE); | ||
| 5329 | @@ -746,12 +747,13 @@ xdr_setkey3_arg(XDR *xdrs, setkey3_arg *objp) | ||
| 5330 | } | ||
| 5331 | if (!xdr_array(xdrs, (caddr_t *) &objp->ks_tuple, | ||
| 5332 | (unsigned int *) &objp->n_ks_tuple, ~0, | ||
| 5333 | - sizeof(krb5_key_salt_tuple), xdr_krb5_key_salt_tuple)) { | ||
| 5334 | + sizeof(krb5_key_salt_tuple), | ||
| 5335 | + (xdrproc_t)xdr_krb5_key_salt_tuple)) { | ||
| 5336 | return (FALSE); | ||
| 5337 | } | ||
| 5338 | if (!xdr_array(xdrs, (caddr_t *) &objp->keyblocks, | ||
| 5339 | (unsigned int *) &objp->n_keys, ~0, | ||
| 5340 | - sizeof(krb5_keyblock), xdr_krb5_keyblock)) { | ||
| 5341 | + sizeof(krb5_keyblock), (xdrproc_t)xdr_krb5_keyblock)) { | ||
| 5342 | return (FALSE); | ||
| 5343 | } | ||
| 5344 | return (TRUE); | ||
| 5345 | @@ -771,7 +773,8 @@ xdr_setkey4_arg(XDR *xdrs, setkey4_arg *objp) | ||
| 5346 | } | ||
| 5347 | if (!xdr_array(xdrs, (caddr_t *) &objp->key_data, | ||
| 5348 | (unsigned int *) &objp->n_key_data, ~0, | ||
| 5349 | - sizeof(kadm5_key_data), xdr_kadm5_key_data)) { | ||
| 5350 | + sizeof(kadm5_key_data), | ||
| 5351 | + (xdrproc_t)xdr_kadm5_key_data)) { | ||
| 5352 | return FALSE; | ||
| 5353 | } | ||
| 5354 | return TRUE; | ||
| 5355 | @@ -804,7 +807,7 @@ xdr_chrand3_arg(XDR *xdrs, chrand3_arg *objp) | ||
| 5356 | if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple, | ||
| 5357 | (unsigned int*)&objp->n_ks_tuple, ~0, | ||
| 5358 | sizeof(krb5_key_salt_tuple), | ||
| 5359 | - xdr_krb5_key_salt_tuple)) { | ||
| 5360 | + (xdrproc_t)xdr_krb5_key_salt_tuple)) { | ||
| 5361 | return (FALSE); | ||
| 5362 | } | ||
| 5363 | return (TRUE); | ||
| 5364 | @@ -822,7 +825,8 @@ xdr_chrand_ret(XDR *xdrs, chrand_ret *objp) | ||
| 5365 | if (objp->code == KADM5_OK) { | ||
| 5366 | if (!xdr_array(xdrs, (char **)&objp->keys, | ||
| 5367 | (unsigned int *)&objp->n_keys, ~0, | ||
| 5368 | - sizeof(krb5_keyblock), xdr_krb5_keyblock)) | ||
| 5369 | + sizeof(krb5_keyblock), | ||
| 5370 | + (xdrproc_t)xdr_krb5_keyblock)) | ||
| 5371 | return FALSE; | ||
| 5372 | } | ||
| 5373 | |||
| 5374 | @@ -965,7 +969,7 @@ xdr_gpols_ret(XDR *xdrs, gpols_ret *objp) | ||
| 5375 | } | ||
| 5376 | if (!xdr_array(xdrs, (caddr_t *) &objp->pols, | ||
| 5377 | (unsigned int *) &objp->count, ~0, | ||
| 5378 | - sizeof(char *), xdr_nullstring)) { | ||
| 5379 | + sizeof(char *), (xdrproc_t)xdr_nullstring)) { | ||
| 5380 | return (FALSE); | ||
| 5381 | } | ||
| 5382 | } | ||
| 5383 | @@ -1030,7 +1034,7 @@ xdr_gstrings_ret(XDR *xdrs, gstrings_ret *objp) | ||
| 5384 | if (!xdr_array(xdrs, (caddr_t *) &objp->strings, | ||
| 5385 | (unsigned int *) &objp->count, ~0, | ||
| 5386 | sizeof(krb5_string_attr), | ||
| 5387 | - xdr_krb5_string_attr)) { | ||
| 5388 | + (xdrproc_t)xdr_krb5_string_attr)) { | ||
| 5389 | return (FALSE); | ||
| 5390 | } | ||
| 5391 | } | ||
| 5392 | @@ -1198,7 +1202,8 @@ xdr_getpkeys_ret(XDR *xdrs, getpkeys_ret *objp) | ||
| 5393 | if (objp->code == KADM5_OK) { | ||
| 5394 | if (!xdr_array(xdrs, (caddr_t *) &objp->key_data, | ||
| 5395 | (unsigned int *) &objp->n_key_data, ~0, | ||
| 5396 | - sizeof(kadm5_key_data), xdr_kadm5_key_data)) { | ||
| 5397 | + sizeof(kadm5_key_data), | ||
| 5398 | + (xdrproc_t)xdr_kadm5_key_data)) { | ||
| 5399 | return FALSE; | ||
| 5400 | } | ||
| 5401 | } | ||
| 5402 | diff --git a/src/lib/kadm5/misc_free.c b/src/lib/kadm5/misc_free.c | ||
| 5403 | index 74d2376..9ac47bb 100644 | ||
| 5404 | --- a/src/lib/kadm5/misc_free.c | ||
| 5405 | +++ b/src/lib/kadm5/misc_free.c | ||
| 5406 | @@ -41,9 +41,8 @@ kadm5_free_name_list(void *server_handle, char **names, int count) | ||
| 5407 | } | ||
| 5408 | |||
| 5409 | /* XXX this ought to be in libkrb5.a, but isn't */ | ||
| 5410 | -kadm5_ret_t krb5_free_key_data_contents(context, key) | ||
| 5411 | - krb5_context context; | ||
| 5412 | - krb5_key_data *key; | ||
| 5413 | +kadm5_ret_t | ||
| 5414 | +krb5_free_key_data_contents(krb5_context context, krb5_key_data *key) | ||
| 5415 | { | ||
| 5416 | int i, idx; | ||
| 5417 | |||
| 5418 | diff --git a/src/lib/kadm5/srv/adb_xdr.c b/src/lib/kadm5/srv/adb_xdr.c | ||
| 5419 | index fc73297..b6ffdb8 100644 | ||
| 5420 | --- a/src/lib/kadm5/srv/adb_xdr.c | ||
| 5421 | +++ b/src/lib/kadm5/srv/adb_xdr.c | ||
| 5422 | @@ -53,8 +53,7 @@ xdr_osa_pw_hist_ent(XDR *xdrs, osa_pw_hist_ent *objp) | ||
| 5423 | { | ||
| 5424 | if (!xdr_array(xdrs, (caddr_t *) &objp->key_data, | ||
| 5425 | (u_int *) &objp->n_key_data, ~0, | ||
| 5426 | - sizeof(krb5_key_data), | ||
| 5427 | - xdr_krb5_key_data)) | ||
| 5428 | + sizeof(krb5_key_data), (xdrproc_t)xdr_krb5_key_data)) | ||
| 5429 | return (FALSE); | ||
| 5430 | return (TRUE); | ||
| 5431 | } | ||
| 5432 | @@ -88,8 +87,7 @@ xdr_osa_princ_ent_rec(XDR *xdrs, osa_princ_ent_t objp) | ||
| 5433 | return (FALSE); | ||
| 5434 | if (!xdr_array(xdrs, (caddr_t *) &objp->old_keys, | ||
| 5435 | (unsigned int *) &objp->old_key_len, ~0, | ||
| 5436 | - sizeof(osa_pw_hist_ent), | ||
| 5437 | - xdr_osa_pw_hist_ent)) | ||
| 5438 | + sizeof(osa_pw_hist_ent), (xdrproc_t)xdr_osa_pw_hist_ent)) | ||
| 5439 | return (FALSE); | ||
| 5440 | return (TRUE); | ||
| 5441 | } | ||
| 5442 | diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c | ||
| 5443 | index 8c3ad3a..d5bb0b1 100644 | ||
| 5444 | --- a/src/lib/kadm5/srv/svr_principal.c | ||
| 5445 | +++ b/src/lib/kadm5/srv/svr_principal.c | ||
| 5446 | @@ -30,9 +30,9 @@ static int decrypt_key_data(krb5_context context, | ||
| 5447 | /* | ||
| 5448 | * XXX Functions that ought to be in libkrb5.a, but aren't. | ||
| 5449 | */ | ||
| 5450 | -kadm5_ret_t krb5_copy_key_data_contents(context, from, to) | ||
| 5451 | - krb5_context context; | ||
| 5452 | - krb5_key_data *from, *to; | ||
| 5453 | +kadm5_ret_t | ||
| 5454 | +krb5_copy_key_data_contents(krb5_context context, krb5_key_data *from, | ||
| 5455 | + krb5_key_data *to) | ||
| 5456 | { | ||
| 5457 | int i, idx; | ||
| 5458 | |||
| 5459 | @@ -75,10 +75,8 @@ static krb5_tl_data *dup_tl_data(krb5_tl_data *tl) | ||
| 5460 | } | ||
| 5461 | |||
| 5462 | /* This is in lib/kdb/kdb_cpw.c, but is static */ | ||
| 5463 | -static void cleanup_key_data(context, count, data) | ||
| 5464 | - krb5_context context; | ||
| 5465 | - int count; | ||
| 5466 | - krb5_key_data * data; | ||
| 5467 | +static void | ||
| 5468 | +cleanup_key_data(krb5_context context, int count, krb5_key_data *data) | ||
| 5469 | { | ||
| 5470 | int i; | ||
| 5471 | |||
| 5472 | diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c | ||
| 5473 | index 7982956..f2fae83 100644 | ||
| 5474 | --- a/src/lib/kadm5/str_conv.c | ||
| 5475 | +++ b/src/lib/kadm5/str_conv.c | ||
| 5476 | @@ -267,11 +267,8 @@ cleanup: | ||
| 5477 | * Salttype may be negative to indicate a search for only a enctype. | ||
| 5478 | */ | ||
| 5479 | krb5_boolean | ||
| 5480 | -krb5_keysalt_is_present(ksaltlist, nksalts, enctype, salttype) | ||
| 5481 | - krb5_key_salt_tuple *ksaltlist; | ||
| 5482 | - krb5_int32 nksalts; | ||
| 5483 | - krb5_enctype enctype; | ||
| 5484 | - krb5_int32 salttype; | ||
| 5485 | +krb5_keysalt_is_present(krb5_key_salt_tuple *ksaltlist, krb5_int32 nksalts, | ||
| 5486 | + krb5_enctype enctype, krb5_int32 salttype) | ||
| 5487 | { | ||
| 5488 | krb5_boolean foundit; | ||
| 5489 | int i; | ||
| 5490 | @@ -375,12 +372,11 @@ cleanup: | ||
| 5491 | * If ignoresalt set, then salttype is ignored. | ||
| 5492 | */ | ||
| 5493 | krb5_error_code | ||
| 5494 | -krb5_keysalt_iterate(ksaltlist, nksalt, ignoresalt, iterator, arg) | ||
| 5495 | - krb5_key_salt_tuple *ksaltlist; | ||
| 5496 | - krb5_int32 nksalt; | ||
| 5497 | - krb5_boolean ignoresalt; | ||
| 5498 | - krb5_error_code (*iterator) (krb5_key_salt_tuple *, krb5_pointer); | ||
| 5499 | - krb5_pointer arg; | ||
| 5500 | +krb5_keysalt_iterate(krb5_key_salt_tuple *ksaltlist, krb5_int32 nksalt, | ||
| 5501 | + krb5_boolean ignoresalt, | ||
| 5502 | + krb5_error_code (*iterator)(krb5_key_salt_tuple *, | ||
| 5503 | + void *), | ||
| 5504 | + void *arg) | ||
| 5505 | { | ||
| 5506 | int i; | ||
| 5507 | krb5_error_code kret; | ||
| 5508 | diff --git a/src/lib/kadm5/t_kadm5.c b/src/lib/kadm5/t_kadm5.c | ||
| 5509 | index 153147f..b3ab100 100644 | ||
| 5510 | --- a/src/lib/kadm5/t_kadm5.c | ||
| 5511 | +++ b/src/lib/kadm5/t_kadm5.c | ||
| 5512 | @@ -276,7 +276,7 @@ cpw_test_succeed(char *user, krb5_principal princ, char *pass) | ||
| 5513 | } | ||
| 5514 | |||
| 5515 | static void | ||
| 5516 | -test_chpass() | ||
| 5517 | +test_chpass(void) | ||
| 5518 | { | ||
| 5519 | krb5_principal princ = parse_princ("chpass-test"); | ||
| 5520 | krb5_principal hist_princ = parse_princ("kadmin/history"); | ||
| 5521 | @@ -334,7 +334,7 @@ cpol_test_compare(char *user, kadm5_policy_ent_t ent, uint32_t mask) | ||
| 5522 | } | ||
| 5523 | |||
| 5524 | static void | ||
| 5525 | -test_create_policy() | ||
| 5526 | +test_create_policy(void) | ||
| 5527 | { | ||
| 5528 | void *handle; | ||
| 5529 | kadm5_policy_ent_rec ent; | ||
| 5530 | @@ -440,7 +440,7 @@ cprinc_test_compare(char *user, kadm5_principal_ent_t ent, uint32_t mask, | ||
| 5531 | } | ||
| 5532 | |||
| 5533 | static void | ||
| 5534 | -test_create_principal() | ||
| 5535 | +test_create_principal(void) | ||
| 5536 | { | ||
| 5537 | void *handle; | ||
| 5538 | kadm5_principal_ent_rec ent; | ||
| 5539 | @@ -535,7 +535,7 @@ dpol_test_succeed(char *user, char *name) | ||
| 5540 | } | ||
| 5541 | |||
| 5542 | static void | ||
| 5543 | -test_delete_policy() | ||
| 5544 | +test_delete_policy(void) | ||
| 5545 | { | ||
| 5546 | krb5_principal princ = parse_princ("delete-policy-test-princ"); | ||
| 5547 | |||
| 5548 | @@ -587,7 +587,7 @@ dprinc_test_succeed(char *user, krb5_principal princ) | ||
| 5549 | } | ||
| 5550 | |||
| 5551 | static void | ||
| 5552 | -test_delete_principal() | ||
| 5553 | +test_delete_principal(void) | ||
| 5554 | { | ||
| 5555 | krb5_principal princ = parse_princ("delete-principal-test"); | ||
| 5556 | |||
| 5557 | @@ -638,7 +638,7 @@ gpol_test_fail(char *user, char *name, krb5_error_code code) | ||
| 5558 | } | ||
| 5559 | |||
| 5560 | static void | ||
| 5561 | -test_get_policy() | ||
| 5562 | +test_get_policy(void) | ||
| 5563 | { | ||
| 5564 | /* Fails with unknown policy. */ | ||
| 5565 | dpol_test_fail("admin", "unknown-policy", KADM5_UNK_POLICY); | ||
| 5566 | @@ -684,7 +684,7 @@ gprinc_test_fail(char *user, krb5_principal princ, krb5_error_code code) | ||
| 5567 | } | ||
| 5568 | |||
| 5569 | static void | ||
| 5570 | -test_get_principal() | ||
| 5571 | +test_get_principal(void) | ||
| 5572 | { | ||
| 5573 | void *handle; | ||
| 5574 | kadm5_principal_ent_rec ent; | ||
| 5575 | @@ -743,7 +743,7 @@ test_get_principal() | ||
| 5576 | } | ||
| 5577 | |||
| 5578 | static void | ||
| 5579 | -test_init_destroy() | ||
| 5580 | +test_init_destroy(void) | ||
| 5581 | { | ||
| 5582 | krb5_context ctx; | ||
| 5583 | kadm5_ret_t ret; | ||
| 5584 | @@ -1019,7 +1019,7 @@ mpol_test_compare(void *handle, kadm5_policy_ent_t ent, uint32_t mask) | ||
| 5585 | } | ||
| 5586 | |||
| 5587 | static void | ||
| 5588 | -test_modify_policy() | ||
| 5589 | +test_modify_policy(void) | ||
| 5590 | { | ||
| 5591 | kadm5_policy_ent_rec ent; | ||
| 5592 | |||
| 5593 | @@ -1109,7 +1109,7 @@ mprinc_test_compare(char *user, kadm5_principal_ent_t ent, uint32_t mask) | ||
| 5594 | } | ||
| 5595 | |||
| 5596 | static void | ||
| 5597 | -test_modify_principal() | ||
| 5598 | +test_modify_principal(void) | ||
| 5599 | { | ||
| 5600 | void *handle; | ||
| 5601 | krb5_principal princ = parse_princ("modify-principal-test"); | ||
| 5602 | @@ -1233,7 +1233,7 @@ rnd_test_succeed(char *user, krb5_principal princ) | ||
| 5603 | } | ||
| 5604 | |||
| 5605 | static void | ||
| 5606 | -test_randkey() | ||
| 5607 | +test_randkey(void) | ||
| 5608 | { | ||
| 5609 | void *handle; | ||
| 5610 | krb5_principal princ = parse_princ("randkey-principal-test"); | ||
| 5611 | diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c | ||
| 5612 | index 415ae64..0837f56 100644 | ||
| 5613 | --- a/src/lib/kdb/kdb5.c | ||
| 5614 | +++ b/src/lib/kdb/kdb5.c | ||
| 5615 | @@ -75,13 +75,13 @@ free_mkey_list(krb5_context context, krb5_keylist_node *mkey_list) | ||
| 5616 | } | ||
| 5617 | |||
| 5618 | int | ||
| 5619 | -kdb_init_lock_list() | ||
| 5620 | +kdb_init_lock_list(void) | ||
| 5621 | { | ||
| 5622 | return k5_mutex_finish_init(&db_lock); | ||
| 5623 | } | ||
| 5624 | |||
| 5625 | static int | ||
| 5626 | -kdb_lock_list() | ||
| 5627 | +kdb_lock_list(void) | ||
| 5628 | { | ||
| 5629 | int err; | ||
| 5630 | err = CALL_INIT_FUNCTION (kdb_init_lock_list); | ||
| 5631 | @@ -92,14 +92,14 @@ kdb_lock_list() | ||
| 5632 | } | ||
| 5633 | |||
| 5634 | void | ||
| 5635 | -kdb_fini_lock_list() | ||
| 5636 | +kdb_fini_lock_list(void) | ||
| 5637 | { | ||
| 5638 | if (INITIALIZER_RAN(kdb_init_lock_list)) | ||
| 5639 | k5_mutex_destroy(&db_lock); | ||
| 5640 | } | ||
| 5641 | |||
| 5642 | static void | ||
| 5643 | -kdb_unlock_list() | ||
| 5644 | +kdb_unlock_list(void) | ||
| 5645 | { | ||
| 5646 | k5_mutex_unlock(&db_lock); | ||
| 5647 | } | ||
| 5648 | diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c | ||
| 5649 | index 450860f..c33c7cf 100644 | ||
| 5650 | --- a/src/lib/kdb/kdb_cpw.c | ||
| 5651 | +++ b/src/lib/kdb/kdb_cpw.c | ||
| 5652 | @@ -57,10 +57,7 @@ | ||
| 5653 | enum save { DISCARD_ALL, KEEP_LAST_KVNO, KEEP_ALL }; | ||
| 5654 | |||
| 5655 | int | ||
| 5656 | -krb5_db_get_key_data_kvno(context, count, data) | ||
| 5657 | - krb5_context context; | ||
| 5658 | - int count; | ||
| 5659 | - krb5_key_data * data; | ||
| 5660 | +krb5_db_get_key_data_kvno(krb5_context context, int count, krb5_key_data *data) | ||
| 5661 | { | ||
| 5662 | int i, kvno; | ||
| 5663 | /* Find last key version number */ | ||
| 5664 | @@ -73,10 +70,7 @@ krb5_db_get_key_data_kvno(context, count, data) | ||
| 5665 | } | ||
| 5666 | |||
| 5667 | static void | ||
| 5668 | -cleanup_key_data(context, count, data) | ||
| 5669 | - krb5_context context; | ||
| 5670 | - int count; | ||
| 5671 | - krb5_key_data * data; | ||
| 5672 | +cleanup_key_data(krb5_context context, int count, krb5_key_data *data) | ||
| 5673 | { | ||
| 5674 | int i; | ||
| 5675 | |||
| 5676 | @@ -149,13 +143,9 @@ preserve_old_keys(krb5_context context, krb5_keyblock *mkey, | ||
| 5677 | } | ||
| 5678 | |||
| 5679 | static krb5_error_code | ||
| 5680 | -add_key_rnd(context, master_key, ks_tuple, ks_tuple_count, db_entry, kvno) | ||
| 5681 | - krb5_context context; | ||
| 5682 | - krb5_keyblock * master_key; | ||
| 5683 | - krb5_key_salt_tuple * ks_tuple; | ||
| 5684 | - int ks_tuple_count; | ||
| 5685 | - krb5_db_entry * db_entry; | ||
| 5686 | - int kvno; | ||
| 5687 | +add_key_rnd(krb5_context context, krb5_keyblock *master_key, | ||
| 5688 | + krb5_key_salt_tuple *ks_tuple, int ks_tuple_count, | ||
| 5689 | + krb5_db_entry *db_entry, int kvno) | ||
| 5690 | { | ||
| 5691 | krb5_keyblock key; | ||
| 5692 | int i, j; | ||
| 5693 | @@ -246,15 +236,9 @@ make_random_salt(krb5_context context, krb5_keysalt *salt_out) | ||
| 5694 | * If passwd is NULL the assumes that the caller wants a random password. | ||
| 5695 | */ | ||
| 5696 | static krb5_error_code | ||
| 5697 | -add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd, | ||
| 5698 | - db_entry, kvno) | ||
| 5699 | - krb5_context context; | ||
| 5700 | - krb5_keyblock * master_key; | ||
| 5701 | - krb5_key_salt_tuple * ks_tuple; | ||
| 5702 | - int ks_tuple_count; | ||
| 5703 | - const char * passwd; | ||
| 5704 | - krb5_db_entry * db_entry; | ||
| 5705 | - int kvno; | ||
| 5706 | +add_key_pwd(krb5_context context, krb5_keyblock *master_key, | ||
| 5707 | + krb5_key_salt_tuple *ks_tuple, int ks_tuple_count, | ||
| 5708 | + const char *passwd, krb5_db_entry *db_entry, int kvno) | ||
| 5709 | { | ||
| 5710 | krb5_error_code retval; | ||
| 5711 | krb5_keysalt key_salt; | ||
| 5712 | diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c | ||
| 5713 | index a623e00..346cf96 100644 | ||
| 5714 | --- a/src/lib/kdb/keytab.c | ||
| 5715 | +++ b/src/lib/kdb/keytab.c | ||
| 5716 | @@ -71,10 +71,7 @@ krb5_db_register_keytab(krb5_context context) | ||
| 5717 | } | ||
| 5718 | |||
| 5719 | krb5_error_code | ||
| 5720 | -krb5_ktkdb_resolve(context, name, id) | ||
| 5721 | - krb5_context context; | ||
| 5722 | - const char * name; | ||
| 5723 | - krb5_keytab * id; | ||
| 5724 | +krb5_ktkdb_resolve(krb5_context context, const char *name, krb5_keytab *id) | ||
| 5725 | { | ||
| 5726 | if ((*id = (krb5_keytab) malloc(sizeof(**id))) == NULL) | ||
| 5727 | return(ENOMEM); | ||
| 5728 | @@ -84,9 +81,7 @@ krb5_ktkdb_resolve(context, name, id) | ||
| 5729 | } | ||
| 5730 | |||
| 5731 | krb5_error_code | ||
| 5732 | -krb5_ktkdb_close(context, kt) | ||
| 5733 | - krb5_context context; | ||
| 5734 | - krb5_keytab kt; | ||
| 5735 | +krb5_ktkdb_close(krb5_context context, krb5_keytab kt) | ||
| 5736 | { | ||
| 5737 | /* | ||
| 5738 | * This routine is responsible for freeing all memory allocated | ||
| 5739 | @@ -119,13 +114,9 @@ krb5_ktkdb_set_context(krb5_context ctx) | ||
| 5740 | } | ||
| 5741 | |||
| 5742 | krb5_error_code | ||
| 5743 | -krb5_ktkdb_get_entry(in_context, id, principal, kvno, enctype, entry) | ||
| 5744 | - krb5_context in_context; | ||
| 5745 | - krb5_keytab id; | ||
| 5746 | - krb5_const_principal principal; | ||
| 5747 | - krb5_kvno kvno; | ||
| 5748 | - krb5_enctype enctype; | ||
| 5749 | - krb5_keytab_entry * entry; | ||
| 5750 | +krb5_ktkdb_get_entry(krb5_context in_context, krb5_keytab id, | ||
| 5751 | + krb5_const_principal principal, krb5_kvno kvno, | ||
| 5752 | + krb5_enctype enctype, krb5_keytab_entry *entry) | ||
| 5753 | { | ||
| 5754 | krb5_context context; | ||
| 5755 | krb5_error_code kerror = 0; | ||
| 5756 | diff --git a/src/lib/kdb/t_stringattr.c b/src/lib/kdb/t_stringattr.c | ||
| 5757 | index 1174036..2c64301 100644 | ||
| 5758 | --- a/src/lib/kdb/t_stringattr.c | ||
| 5759 | +++ b/src/lib/kdb/t_stringattr.c | ||
| 5760 | @@ -38,7 +38,7 @@ | ||
| 5761 | */ | ||
| 5762 | |||
| 5763 | int | ||
| 5764 | -main() | ||
| 5765 | +main(void) | ||
| 5766 | { | ||
| 5767 | krb5_db_entry *ent; | ||
| 5768 | krb5_context context; | ||
| 5769 | diff --git a/src/lib/krad/packet.c b/src/lib/krad/packet.c | ||
| 5770 | index c597174..aee830b 100644 | ||
| 5771 | --- a/src/lib/krad/packet.c | ||
| 5772 | +++ b/src/lib/krad/packet.c | ||
| 5773 | @@ -200,7 +200,7 @@ auth_generate_response(krb5_context ctx, const char *secret, | ||
| 5774 | |||
| 5775 | /* Create a new packet. */ | ||
| 5776 | static krad_packet * | ||
| 5777 | -packet_new() | ||
| 5778 | +packet_new(void) | ||
| 5779 | { | ||
| 5780 | krad_packet *pkt; | ||
| 5781 | |||
| 5782 | diff --git a/src/lib/krad/t_attr.c b/src/lib/krad/t_attr.c | ||
| 5783 | index eb2a780..2bce7aa 100644 | ||
| 5784 | --- a/src/lib/krad/t_attr.c | ||
| 5785 | +++ b/src/lib/krad/t_attr.c | ||
| 5786 | @@ -40,7 +40,7 @@ const static unsigned char auth[] = { | ||
| 5787 | }; | ||
| 5788 | |||
| 5789 | int | ||
| 5790 | -main() | ||
| 5791 | +main(void) | ||
| 5792 | { | ||
| 5793 | unsigned char outbuf[MAX_ATTRSETSIZE]; | ||
| 5794 | const char *decoded = "accept"; | ||
| 5795 | diff --git a/src/lib/krad/t_attrset.c b/src/lib/krad/t_attrset.c | ||
| 5796 | index 7928335..085f4b2 100644 | ||
| 5797 | --- a/src/lib/krad/t_attrset.c | ||
| 5798 | +++ b/src/lib/krad/t_attrset.c | ||
| 5799 | @@ -40,7 +40,7 @@ const static unsigned char encpass[] = { | ||
| 5800 | }; | ||
| 5801 | |||
| 5802 | int | ||
| 5803 | -main() | ||
| 5804 | +main(void) | ||
| 5805 | { | ||
| 5806 | unsigned char buffer[KRAD_PACKET_SIZE_MAX], encoded[MAX_ATTRSETSIZE]; | ||
| 5807 | const char *username = "testUser", *password = "accept"; | ||
| 5808 | diff --git a/src/lib/krad/t_code.c b/src/lib/krad/t_code.c | ||
| 5809 | index b245a7e..6cd522a 100644 | ||
| 5810 | --- a/src/lib/krad/t_code.c | ||
| 5811 | +++ b/src/lib/krad/t_code.c | ||
| 5812 | @@ -30,7 +30,7 @@ | ||
| 5813 | #include "t_test.h" | ||
| 5814 | |||
| 5815 | int | ||
| 5816 | -main() | ||
| 5817 | +main(void) | ||
| 5818 | { | ||
| 5819 | const char *tmp; | ||
| 5820 | |||
| 5821 | diff --git a/src/lib/krb5/ccache/cc_keyring.c b/src/lib/krb5/ccache/cc_keyring.c | ||
| 5822 | index 1dadeef..ab3cda6 100644 | ||
| 5823 | --- a/src/lib/krb5/ccache/cc_keyring.c | ||
| 5824 | +++ b/src/lib/krb5/ccache/cc_keyring.c | ||
| 5825 | @@ -314,7 +314,7 @@ get_persistent_real(uid_t uid) | ||
| 5826 | * for the session anchor. | ||
| 5827 | */ | ||
| 5828 | static key_serial_t | ||
| 5829 | -session_write_anchor() | ||
| 5830 | +session_write_anchor(void) | ||
| 5831 | { | ||
| 5832 | key_serial_t s, u; | ||
| 5833 | |||
| 5834 | diff --git a/src/lib/krb5/krb/plugin.c b/src/lib/krb5/krb/plugin.c | ||
| 5835 | index 3bb7a38..1286e9e 100644 | ||
| 5836 | --- a/src/lib/krb5/krb/plugin.c | ||
| 5837 | +++ b/src/lib/krb5/krb/plugin.c | ||
| 5838 | @@ -355,7 +355,7 @@ load_if_needed(krb5_context context, struct plugin_mapping *map, | ||
| 5839 | krb5_error_code ret; | ||
| 5840 | char *symname = NULL; | ||
| 5841 | struct plugin_file_handle *handle = NULL; | ||
| 5842 | - void (*initvt_fn)(); | ||
| 5843 | + void (*initvt_fn)(void); | ||
| 5844 | |||
| 5845 | if (map->module != NULL || map->dyn_path == NULL) | ||
| 5846 | return; | ||
| 5847 | diff --git a/src/lib/krb5/krb/t_authdata.c b/src/lib/krb5/krb/t_authdata.c | ||
| 5848 | index dd834b9..44f4a1c 100644 | ||
| 5849 | --- a/src/lib/krb5/krb/t_authdata.c | ||
| 5850 | +++ b/src/lib/krb5/krb/t_authdata.c | ||
| 5851 | @@ -74,7 +74,7 @@ static void compare_authdata(const krb5_authdata *adc1, krb5_authdata *adc2) { | ||
| 5852 | } | ||
| 5853 | |||
| 5854 | int | ||
| 5855 | -main() | ||
| 5856 | +main(void) | ||
| 5857 | { | ||
| 5858 | krb5_context context; | ||
| 5859 | krb5_authdata **results; | ||
| 5860 | diff --git a/src/lib/krb5/krb/t_response_items.c b/src/lib/krb5/krb/t_response_items.c | ||
| 5861 | index 0deb929..a6b02ca 100644 | ||
| 5862 | --- a/src/lib/krb5/krb/t_response_items.c | ||
| 5863 | +++ b/src/lib/krb5/krb/t_response_items.c | ||
| 5864 | @@ -61,7 +61,7 @@ nstrcmp(const char *a, const char *b) | ||
| 5865 | } | ||
| 5866 | |||
| 5867 | int | ||
| 5868 | -main() | ||
| 5869 | +main(void) | ||
| 5870 | { | ||
| 5871 | k5_response_items *ri; | ||
| 5872 | |||
| 5873 | diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c | ||
| 5874 | index d6746b7..9780c2e 100644 | ||
| 5875 | --- a/src/lib/krb5/krb/t_ser.c | ||
| 5876 | +++ b/src/lib/krb5/krb/t_ser.c | ||
| 5877 | @@ -195,7 +195,7 @@ ser_checksum(krb5_checksum *cksum) | ||
| 5878 | } | ||
| 5879 | |||
| 5880 | static void | ||
| 5881 | -ser_context_test() | ||
| 5882 | +ser_context_test(void) | ||
| 5883 | { | ||
| 5884 | krb5_context context; | ||
| 5885 | profile_t sprofile; | ||
| 5886 | @@ -216,7 +216,7 @@ ser_context_test() | ||
| 5887 | } | ||
| 5888 | |||
| 5889 | static void | ||
| 5890 | -ser_acontext_test() | ||
| 5891 | +ser_acontext_test(void) | ||
| 5892 | { | ||
| 5893 | krb5_auth_context actx; | ||
| 5894 | krb5_address local_address; | ||
| 5895 | @@ -306,7 +306,7 @@ ser_acontext_test() | ||
| 5896 | } | ||
| 5897 | |||
| 5898 | static void | ||
| 5899 | -ser_princ_test() | ||
| 5900 | +ser_princ_test(void) | ||
| 5901 | { | ||
| 5902 | krb5_principal princ; | ||
| 5903 | char pname[1024]; | ||
| 5904 | @@ -320,7 +320,7 @@ ser_princ_test() | ||
| 5905 | } | ||
| 5906 | |||
| 5907 | static void | ||
| 5908 | -ser_cksum_test() | ||
| 5909 | +ser_cksum_test(void) | ||
| 5910 | { | ||
| 5911 | krb5_checksum checksum; | ||
| 5912 | krb5_octet ckdata[24]; | ||
| 5913 | diff --git a/src/lib/krb5/krb/t_sname_match.c b/src/lib/krb5/krb/t_sname_match.c | ||
| 5914 | index 021b720..ee5623c 100644 | ||
| 5915 | --- a/src/lib/krb5/krb/t_sname_match.c | ||
| 5916 | +++ b/src/lib/krb5/krb/t_sname_match.c | ||
| 5917 | @@ -80,7 +80,7 @@ struct test { | ||
| 5918 | }; | ||
| 5919 | |||
| 5920 | int | ||
| 5921 | -main() | ||
| 5922 | +main(void) | ||
| 5923 | { | ||
| 5924 | size_t i; | ||
| 5925 | struct test *t; | ||
| 5926 | diff --git a/src/lib/krb5/krb/t_valid_times.c b/src/lib/krb5/krb/t_valid_times.c | ||
| 5927 | index e4b5f1b..1a8036e 100644 | ||
| 5928 | --- a/src/lib/krb5/krb/t_valid_times.c | ||
| 5929 | +++ b/src/lib/krb5/krb/t_valid_times.c | ||
| 5930 | @@ -36,7 +36,7 @@ | ||
| 5931 | #define BOUNDARY (uint32_t)INT32_MIN | ||
| 5932 | |||
| 5933 | int | ||
| 5934 | -main() | ||
| 5935 | +main(void) | ||
| 5936 | { | ||
| 5937 | krb5_error_code ret; | ||
| 5938 | krb5_context context; | ||
| 5939 | diff --git a/src/lib/krb5/rcache/t_memrcache.c b/src/lib/krb5/rcache/t_memrcache.c | ||
| 5940 | index 6f212b0..665da75 100644 | ||
| 5941 | --- a/src/lib/krb5/rcache/t_memrcache.c | ||
| 5942 | +++ b/src/lib/krb5/rcache/t_memrcache.c | ||
| 5943 | @@ -33,7 +33,7 @@ | ||
| 5944 | #include "memrcache.c" | ||
| 5945 | |||
| 5946 | int | ||
| 5947 | -main() | ||
| 5948 | +main(void) | ||
| 5949 | { | ||
| 5950 | krb5_error_code ret; | ||
| 5951 | krb5_context context; | ||
| 5952 | diff --git a/src/lib/rpc/auth_gss.c b/src/lib/rpc/auth_gss.c | ||
| 5953 | index 319bc75..f61322d 100644 | ||
| 5954 | --- a/src/lib/rpc/auth_gss.c | ||
| 5955 | +++ b/src/lib/rpc/auth_gss.c | ||
| 5956 | @@ -445,9 +445,9 @@ authgss_refresh(AUTH *auth, struct rpc_msg *msg) | ||
| 5957 | memset(&gr, 0, sizeof(gr)); | ||
| 5958 | |||
| 5959 | call_stat = clnt_call(gd->clnt, NULLPROC, | ||
| 5960 | - xdr_rpc_gss_init_args, | ||
| 5961 | + (xdrproc_t)xdr_rpc_gss_init_args, | ||
| 5962 | &send_token, | ||
| 5963 | - xdr_rpc_gss_init_res, | ||
| 5964 | + (xdrproc_t)xdr_rpc_gss_init_res, | ||
| 5965 | (caddr_t)&gr, AUTH_TIMEOUT); | ||
| 5966 | |||
| 5967 | gss_release_buffer(&min_stat, &send_token); | ||
| 5968 | diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c | ||
| 5969 | index 8ab7ab5..b5e03b9 100644 | ||
| 5970 | --- a/src/lib/rpc/auth_gssapi.c | ||
| 5971 | +++ b/src/lib/rpc/auth_gssapi.c | ||
| 5972 | @@ -283,11 +283,11 @@ next_token: | ||
| 5973 | |||
| 5974 | PRINTF(("gssapi_create: calling GSSAPI_INIT (%d)\n", init_func)); | ||
| 5975 | |||
| 5976 | - xdr_free(xdr_authgssapi_init_res, &call_res); | ||
| 5977 | + xdr_free((xdrproc_t)xdr_authgssapi_init_res, &call_res); | ||
| 5978 | memset(&call_res, 0, sizeof(call_res)); | ||
| 5979 | callstat = clnt_call(clnt, init_func, | ||
| 5980 | - xdr_authgssapi_init_arg, &call_arg, | ||
| 5981 | - xdr_authgssapi_init_res, &call_res, | ||
| 5982 | + (xdrproc_t)xdr_authgssapi_init_arg, &call_arg, | ||
| 5983 | + (xdrproc_t)xdr_authgssapi_init_res, &call_res, | ||
| 5984 | timeout); | ||
| 5985 | gss_release_buffer(minor_stat, &call_arg.token); | ||
| 5986 | |||
| 5987 | @@ -436,7 +436,7 @@ next_token: | ||
| 5988 | /* don't assume the caller will want to change clnt->cl_auth */ | ||
| 5989 | clnt->cl_auth = save_auth; | ||
| 5990 | |||
| 5991 | - xdr_free(xdr_authgssapi_init_res, &call_res); | ||
| 5992 | + xdr_free((xdrproc_t)xdr_authgssapi_init_res, &call_res); | ||
| 5993 | return auth; | ||
| 5994 | |||
| 5995 | /******************************************************************/ | ||
| 5996 | @@ -458,7 +458,7 @@ cleanup: | ||
| 5997 | if (rpc_createerr.cf_stat == 0) | ||
| 5998 | rpc_createerr.cf_stat = RPC_AUTHERROR; | ||
| 5999 | |||
| 6000 | - xdr_free(xdr_authgssapi_init_res, &call_res); | ||
| 6001 | + xdr_free((xdrproc_t)xdr_authgssapi_init_res, &call_res); | ||
| 6002 | return auth; | ||
| 6003 | } | ||
| 6004 | |||
| 6005 | @@ -760,7 +760,7 @@ skip_call: | ||
| 6006 | static bool_t auth_gssapi_wrap( | ||
| 6007 | AUTH *auth, | ||
| 6008 | XDR *out_xdrs, | ||
| 6009 | - bool_t (*xdr_func)(), | ||
| 6010 | + xdrproc_t xdr_func, | ||
| 6011 | caddr_t xdr_ptr) | ||
| 6012 | { | ||
| 6013 | OM_uint32 gssstat, minor_stat; | ||
| 6014 | @@ -791,7 +791,7 @@ static bool_t auth_gssapi_wrap( | ||
| 6015 | static bool_t auth_gssapi_unwrap( | ||
| 6016 | AUTH *auth, | ||
| 6017 | XDR *in_xdrs, | ||
| 6018 | - bool_t (*xdr_func)(), | ||
| 6019 | + xdrproc_t xdr_func, | ||
| 6020 | caddr_t xdr_ptr) | ||
| 6021 | { | ||
| 6022 | OM_uint32 gssstat, minor_stat; | ||
| 6023 | diff --git a/src/lib/rpc/auth_gssapi_misc.c b/src/lib/rpc/auth_gssapi_misc.c | ||
| 6024 | index a60eb7f..57fc1fb 100644 | ||
| 6025 | --- a/src/lib/rpc/auth_gssapi_misc.c | ||
| 6026 | +++ b/src/lib/rpc/auth_gssapi_misc.c | ||
| 6027 | @@ -199,7 +199,7 @@ bool_t auth_gssapi_wrap_data( | ||
| 6028 | gss_ctx_id_t context, | ||
| 6029 | uint32_t seq_num, | ||
| 6030 | XDR *out_xdrs, | ||
| 6031 | - bool_t (*xdr_func)(), | ||
| 6032 | + xdrproc_t xdr_func, | ||
| 6033 | caddr_t xdr_ptr) | ||
| 6034 | { | ||
| 6035 | gss_buffer_desc in_buf, out_buf; | ||
| 6036 | @@ -267,7 +267,7 @@ bool_t auth_gssapi_unwrap_data( | ||
| 6037 | gss_ctx_id_t context, | ||
| 6038 | uint32_t seq_num, | ||
| 6039 | XDR *in_xdrs, | ||
| 6040 | - bool_t (*xdr_func)(), | ||
| 6041 | + xdrproc_t xdr_func, | ||
| 6042 | caddr_t xdr_ptr) | ||
| 6043 | { | ||
| 6044 | gss_buffer_desc in_buf, out_buf; | ||
| 6045 | diff --git a/src/lib/rpc/authunix_prot.c b/src/lib/rpc/authunix_prot.c | ||
| 6046 | index 512d5a5..92276c3 100644 | ||
| 6047 | --- a/src/lib/rpc/authunix_prot.c | ||
| 6048 | +++ b/src/lib/rpc/authunix_prot.c | ||
| 6049 | @@ -58,7 +58,8 @@ xdr_authunix_parms(XDR *xdrs, struct authunix_parms *p) | ||
| 6050 | && xdr_int(xdrs, &(p->aup_uid)) | ||
| 6051 | && xdr_int(xdrs, &(p->aup_gid)) | ||
| 6052 | && xdr_array(xdrs, (caddr_t *)&(p->aup_gids), | ||
| 6053 | - &(p->aup_len), NGRPS, sizeof(int), xdr_int) ) { | ||
| 6054 | + &(p->aup_len), NGRPS, sizeof(int), | ||
| 6055 | + (xdrproc_t)xdr_int)) { | ||
| 6056 | return (TRUE); | ||
| 6057 | } | ||
| 6058 | return (FALSE); | ||
| 6059 | diff --git a/src/lib/rpc/clnt_perror.c b/src/lib/rpc/clnt_perror.c | ||
| 6060 | index fcc3657..912b267 100644 | ||
| 6061 | --- a/src/lib/rpc/clnt_perror.c | ||
| 6062 | +++ b/src/lib/rpc/clnt_perror.c | ||
| 6063 | @@ -76,7 +76,6 @@ char * | ||
| 6064 | clnt_sperror(CLIENT *rpch, char *s) | ||
| 6065 | { | ||
| 6066 | struct rpc_err e; | ||
| 6067 | - void clnt_perrno(); | ||
| 6068 | char *err; | ||
| 6069 | char *bufstart = get_buf(); | ||
| 6070 | char *str = bufstart; | ||
| 6071 | diff --git a/src/lib/rpc/clnt_raw.c b/src/lib/rpc/clnt_raw.c | ||
| 6072 | index dcbb5cf..7e62a5c 100644 | ||
| 6073 | --- a/src/lib/rpc/clnt_raw.c | ||
| 6074 | +++ b/src/lib/rpc/clnt_raw.c | ||
| 6075 | @@ -80,7 +80,7 @@ static struct clnt_ops client_ops = { | ||
| 6076 | clntraw_control | ||
| 6077 | }; | ||
| 6078 | |||
| 6079 | -void svc_getreq(); | ||
| 6080 | +void svc_getreq(int); | ||
| 6081 | |||
| 6082 | /* | ||
| 6083 | * Create a client handle for memory based rpc. | ||
| 6084 | diff --git a/src/lib/rpc/dyn.c b/src/lib/rpc/dyn.c | ||
| 6085 | index bce1fd2..a505f34 100644 | ||
| 6086 | --- a/src/lib/rpc/dyn.c | ||
| 6087 | +++ b/src/lib/rpc/dyn.c | ||
| 6088 | @@ -30,10 +30,8 @@ | ||
| 6089 | /* | ||
| 6090 | * Made obsolete by DynInsert, now just a convenience function. | ||
| 6091 | */ | ||
| 6092 | -int DynAppend(obj, els, num) | ||
| 6093 | - DynObjectP obj; | ||
| 6094 | - DynPtr els; | ||
| 6095 | - int num; | ||
| 6096 | +int | ||
| 6097 | +DynAppend(DynObjectP obj, DynPtr els, int num) | ||
| 6098 | { | ||
| 6099 | return DynInsert(obj, DynSize(obj), els, num); | ||
| 6100 | } | ||
| 6101 | @@ -52,8 +50,8 @@ int DynAppend(obj, els, num) | ||
| 6102 | |||
| 6103 | static int default_increment = DEFAULT_INC; | ||
| 6104 | |||
| 6105 | -DynObjectP DynCreate(el_size, inc) | ||
| 6106 | - int el_size, inc; | ||
| 6107 | +DynObjectP | ||
| 6108 | +DynCreate(int el_size, int inc) | ||
| 6109 | { | ||
| 6110 | DynObjectP obj; | ||
| 6111 | |||
| 6112 | @@ -77,8 +75,8 @@ DynObjectP DynCreate(el_size, inc) | ||
| 6113 | return obj; | ||
| 6114 | } | ||
| 6115 | |||
| 6116 | -DynObjectP DynCopy(obj) | ||
| 6117 | - DynObjectP obj; | ||
| 6118 | +DynObjectP | ||
| 6119 | +DynCopy(DynObjectP obj) | ||
| 6120 | { | ||
| 6121 | DynObjectP obj1; | ||
| 6122 | |||
| 6123 | @@ -104,8 +102,8 @@ DynObjectP DynCopy(obj) | ||
| 6124 | return obj1; | ||
| 6125 | } | ||
| 6126 | |||
| 6127 | -int DynDestroy(obj) | ||
| 6128 | - /*@only@*/DynObjectP obj; | ||
| 6129 | +int | ||
| 6130 | +DynDestroy(/*@only@*/DynObjectP obj) | ||
| 6131 | { | ||
| 6132 | if (obj->paranoid) { | ||
| 6133 | if (obj->debug) | ||
| 6134 | @@ -118,8 +116,8 @@ int DynDestroy(obj) | ||
| 6135 | return DYN_OK; | ||
| 6136 | } | ||
| 6137 | |||
| 6138 | -int DynRelease(obj) | ||
| 6139 | - DynObjectP obj; | ||
| 6140 | +int | ||
| 6141 | +DynRelease(DynObjectP obj) | ||
| 6142 | { | ||
| 6143 | if (obj->debug) | ||
| 6144 | fprintf(stderr, "dyn: release: freeing object structure.\n"); | ||
| 6145 | @@ -134,9 +132,8 @@ int DynRelease(obj) | ||
| 6146 | * contains the source code for the function DynDebug(). | ||
| 6147 | */ | ||
| 6148 | |||
| 6149 | -int DynDebug(obj, state) | ||
| 6150 | - DynObjectP obj; | ||
| 6151 | - int state; | ||
| 6152 | +int | ||
| 6153 | +DynDebug(DynObjectP obj, int state) | ||
| 6154 | { | ||
| 6155 | obj->debug = state; | ||
| 6156 | |||
| 6157 | @@ -155,9 +152,8 @@ int DynDebug(obj, state) | ||
| 6158 | * Checkers! Get away from that "hard disk erase" button! | ||
| 6159 | * (Stupid dog. He almost did it to me again ...) | ||
| 6160 | */ | ||
| 6161 | -int DynDelete(obj, idx) | ||
| 6162 | - DynObjectP obj; | ||
| 6163 | - int idx; | ||
| 6164 | +int | ||
| 6165 | +DynDelete(DynObjectP obj, int idx) | ||
| 6166 | { | ||
| 6167 | if (idx < 0) { | ||
| 6168 | if (obj->debug) | ||
| 6169 | @@ -219,9 +215,8 @@ int DynDelete(obj, idx) | ||
| 6170 | * contains the source code for the function DynInitZero(). | ||
| 6171 | */ | ||
| 6172 | |||
| 6173 | -int DynInitzero(obj, state) | ||
| 6174 | - DynObjectP obj; | ||
| 6175 | - int state; | ||
| 6176 | +int | ||
| 6177 | +DynInitzero(DynObjectP obj, int state) | ||
| 6178 | { | ||
| 6179 | obj->initzero = state; | ||
| 6180 | |||
| 6181 | @@ -237,10 +232,8 @@ int DynInitzero(obj, state) | ||
| 6182 | * contains the source code for the function DynInsert(). | ||
| 6183 | */ | ||
| 6184 | |||
| 6185 | -int DynInsert(obj, idx, els_in, num) | ||
| 6186 | - DynObjectP obj; | ||
| 6187 | - void *els_in; | ||
| 6188 | - int idx, num; | ||
| 6189 | +int | ||
| 6190 | +DynInsert(DynObjectP obj, int idx, void *els_in, int num) | ||
| 6191 | { | ||
| 6192 | DynPtr els = (DynPtr) els_in; | ||
| 6193 | int ret; | ||
| 6194 | @@ -290,9 +283,8 @@ int DynInsert(obj, idx, els_in, num) | ||
| 6195 | * contains the source code for the function DynDebug(). | ||
| 6196 | */ | ||
| 6197 | |||
| 6198 | -int DynParanoid(obj, state) | ||
| 6199 | - DynObjectP obj; | ||
| 6200 | - int state; | ||
| 6201 | +int | ||
| 6202 | +DynParanoid(DynObjectP obj, int state) | ||
| 6203 | { | ||
| 6204 | obj->paranoid = state; | ||
| 6205 | |||
| 6206 | @@ -308,8 +300,8 @@ int DynParanoid(obj, state) | ||
| 6207 | * contains the source code for the functions DynGet() and DynAdd(). | ||
| 6208 | */ | ||
| 6209 | |||
| 6210 | -DynPtr DynArray(obj) | ||
| 6211 | - DynObjectP obj; | ||
| 6212 | +DynPtr | ||
| 6213 | +DynArray(DynObjectP obj) | ||
| 6214 | { | ||
| 6215 | if (obj->debug) | ||
| 6216 | fprintf(stderr, "dyn: array: returning array pointer %p.\n", | ||
| 6217 | @@ -318,9 +310,8 @@ DynPtr DynArray(obj) | ||
| 6218 | return obj->array; | ||
| 6219 | } | ||
| 6220 | |||
| 6221 | -DynPtr DynGet(obj, num) | ||
| 6222 | - DynObjectP obj; | ||
| 6223 | - int num; | ||
| 6224 | +DynPtr | ||
| 6225 | +DynGet(DynObjectP obj, int num) | ||
| 6226 | { | ||
| 6227 | if (num < 0) { | ||
| 6228 | if (obj->debug) | ||
| 6229 | @@ -342,9 +333,7 @@ DynPtr DynGet(obj, num) | ||
| 6230 | return (DynPtr) obj->array + obj->el_size*num; | ||
| 6231 | } | ||
| 6232 | |||
| 6233 | -int DynAdd(obj, el) | ||
| 6234 | - DynObjectP obj; | ||
| 6235 | - void *el; | ||
| 6236 | +int DynAdd(DynObjectP obj, void *el) | ||
| 6237 | { | ||
| 6238 | int ret; | ||
| 6239 | |||
| 6240 | @@ -364,10 +353,8 @@ int DynAdd(obj, el) | ||
| 6241 | * obj->num_el) will not be updated properly and many other functions | ||
| 6242 | * in the library will lose. Have a nice day. | ||
| 6243 | */ | ||
| 6244 | -int DynPut(obj, el_in, idx) | ||
| 6245 | - DynObjectP obj; | ||
| 6246 | - void *el_in; | ||
| 6247 | - int idx; | ||
| 6248 | +int | ||
| 6249 | +DynPut(DynObjectP obj, void *el_in, int idx) | ||
| 6250 | { | ||
| 6251 | DynPtr el = (DynPtr) el_in; | ||
| 6252 | int ret; | ||
| 6253 | @@ -397,9 +384,8 @@ int DynPut(obj, el_in, idx) | ||
| 6254 | /* | ||
| 6255 | * Resize the array so that element req exists. | ||
| 6256 | */ | ||
| 6257 | -int _DynResize(obj, req) | ||
| 6258 | - DynObjectP obj; | ||
| 6259 | - int req; | ||
| 6260 | +int | ||
| 6261 | +_DynResize(DynObjectP obj, int req) | ||
| 6262 | { | ||
| 6263 | int size; | ||
| 6264 | |||
| 6265 | @@ -430,9 +416,8 @@ int _DynResize(obj, req) | ||
| 6266 | * Ideally, this function should not be called from outside the | ||
| 6267 | * library. However, nothing will break if it is. | ||
| 6268 | */ | ||
| 6269 | -int _DynRealloc(obj, num_incs) | ||
| 6270 | - DynObjectP obj; | ||
| 6271 | - int num_incs; | ||
| 6272 | +int | ||
| 6273 | +_DynRealloc(DynObjectP obj, int num_incs) | ||
| 6274 | { | ||
| 6275 | DynPtr temp; | ||
| 6276 | int new_size_in_bytes; | ||
| 6277 | @@ -475,8 +460,8 @@ int _DynRealloc(obj, num_incs) | ||
| 6278 | * contains the source code for the function DynSize(). | ||
| 6279 | */ | ||
| 6280 | |||
| 6281 | -int DynSize(obj) | ||
| 6282 | - DynObjectP obj; | ||
| 6283 | +int | ||
| 6284 | +DynSize(DynObjectP obj) | ||
| 6285 | { | ||
| 6286 | if (obj->debug) | ||
| 6287 | fprintf(stderr, "dyn: size: returning size %d.\n", obj->num_el); | ||
| 6288 | @@ -484,8 +469,8 @@ int DynSize(obj) | ||
| 6289 | return obj->num_el; | ||
| 6290 | } | ||
| 6291 | |||
| 6292 | -int DynCapacity(obj) | ||
| 6293 | - DynObjectP obj; | ||
| 6294 | +int | ||
| 6295 | +DynCapacity(DynObjectP obj) | ||
| 6296 | { | ||
| 6297 | if (obj->debug) | ||
| 6298 | fprintf(stderr, "dyn: capacity: returning cap of %d.\n", obj->size); | ||
| 6299 | diff --git a/src/lib/rpc/pmap_clnt.c b/src/lib/rpc/pmap_clnt.c | ||
| 6300 | index 952a251..5c3bba3 100644 | ||
| 6301 | --- a/src/lib/rpc/pmap_clnt.c | ||
| 6302 | +++ b/src/lib/rpc/pmap_clnt.c | ||
| 6303 | @@ -54,8 +54,6 @@ static char sccsid[] = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro"; | ||
| 6304 | static struct timeval timeout = { 5, 0 }; | ||
| 6305 | static struct timeval tottimeout = { 60, 0 }; | ||
| 6306 | |||
| 6307 | -void clnt_perror(); | ||
| 6308 | - | ||
| 6309 | /* | ||
| 6310 | * Set a mapping between program,version and port. | ||
| 6311 | * Calls the pmap service remotely to do the mapping. | ||
| 6312 | @@ -128,7 +126,8 @@ pmap_set( | ||
| 6313 | } | ||
| 6314 | } | ||
| 6315 | #endif | ||
| 6316 | - if (CLNT_CALL(client, PMAPPROC_SET, xdr_pmap, &parms, xdr_bool, &rslt, | ||
| 6317 | + if (CLNT_CALL(client, PMAPPROC_SET, (xdrproc_t)xdr_pmap, &parms, | ||
| 6318 | + (xdrproc_t)xdr_bool, &rslt, | ||
| 6319 | tottimeout) != RPC_SUCCESS) { | ||
| 6320 | clnt_perror(client, "Cannot register service"); | ||
| 6321 | return (FALSE); | ||
| 6322 | @@ -161,8 +160,8 @@ pmap_unset( | ||
| 6323 | parms.pm_prog = program; | ||
| 6324 | parms.pm_vers = version; | ||
| 6325 | parms.pm_port = parms.pm_prot = 0; | ||
| 6326 | - CLNT_CALL(client, PMAPPROC_UNSET, xdr_pmap, &parms, xdr_bool, &rslt, | ||
| 6327 | - tottimeout); | ||
| 6328 | + CLNT_CALL(client, PMAPPROC_UNSET, (xdrproc_t)xdr_pmap, &parms, | ||
| 6329 | + (xdrproc_t)xdr_bool, &rslt, tottimeout); | ||
| 6330 | CLNT_DESTROY(client); | ||
| 6331 | (void)close(sock); | ||
| 6332 | return (rslt); | ||
| 6333 | diff --git a/src/lib/rpc/pmap_getmaps.c b/src/lib/rpc/pmap_getmaps.c | ||
| 6334 | index b8a9cec..a9c4c52 100644 | ||
| 6335 | --- a/src/lib/rpc/pmap_getmaps.c | ||
| 6336 | +++ b/src/lib/rpc/pmap_getmaps.c | ||
| 6337 | @@ -77,8 +77,9 @@ pmap_getmaps(struct sockaddr_in *address) | ||
| 6338 | client = clnttcp_create(address, PMAPPROG, | ||
| 6339 | PMAPVERS, &sock, 50, 500); | ||
| 6340 | if (client != (CLIENT *)NULL) { | ||
| 6341 | - if (CLNT_CALL(client, PMAPPROC_DUMP, xdr_void, NULL, xdr_pmaplist, | ||
| 6342 | - &head, minutetimeout) != RPC_SUCCESS) { | ||
| 6343 | + if (CLNT_CALL(client, PMAPPROC_DUMP, xdr_void, NULL, | ||
| 6344 | + (xdrproc_t)xdr_pmaplist, &head, | ||
| 6345 | + minutetimeout) != RPC_SUCCESS) { | ||
| 6346 | clnt_perror(client, "pmap_getmaps rpc problem"); | ||
| 6347 | } | ||
| 6348 | CLNT_DESTROY(client); | ||
| 6349 | diff --git a/src/lib/rpc/pmap_getport.c b/src/lib/rpc/pmap_getport.c | ||
| 6350 | index 66635a1..2d0792b 100644 | ||
| 6351 | --- a/src/lib/rpc/pmap_getport.c | ||
| 6352 | +++ b/src/lib/rpc/pmap_getport.c | ||
| 6353 | @@ -79,8 +79,10 @@ pmap_getport( | ||
| 6354 | parms.pm_vers = version; | ||
| 6355 | parms.pm_prot = protocol; | ||
| 6356 | parms.pm_port = 0; /* not needed or used */ | ||
| 6357 | - if (CLNT_CALL(client, PMAPPROC_GETPORT, xdr_pmap, &parms, | ||
| 6358 | - xdr_u_short, &port, tottimeout) != RPC_SUCCESS){ | ||
| 6359 | + if (CLNT_CALL(client, PMAPPROC_GETPORT, | ||
| 6360 | + (xdrproc_t)xdr_pmap, &parms, | ||
| 6361 | + (xdrproc_t)xdr_u_short, &port, | ||
| 6362 | + tottimeout) != RPC_SUCCESS){ | ||
| 6363 | rpc_createerr.cf_stat = RPC_PMAPFAILURE; | ||
| 6364 | clnt_geterr(client, &rpc_createerr.cf_error); | ||
| 6365 | } else if (port == 0) { | ||
| 6366 | diff --git a/src/lib/rpc/pmap_prot2.c b/src/lib/rpc/pmap_prot2.c | ||
| 6367 | index aeccac6..3c0c612 100644 | ||
| 6368 | --- a/src/lib/rpc/pmap_prot2.c | ||
| 6369 | +++ b/src/lib/rpc/pmap_prot2.c | ||
| 6370 | @@ -109,7 +109,8 @@ xdr_pmaplist(XDR *xdrs, struct pmaplist **rp) | ||
| 6371 | if (freeing) | ||
| 6372 | next = &((*rp)->pml_next); | ||
| 6373 | if (! xdr_reference(xdrs, (caddr_t *)rp, | ||
| 6374 | - (u_int)sizeof(struct pmaplist), xdr_pmap)) | ||
| 6375 | + (u_int)sizeof(struct pmaplist), | ||
| 6376 | + (xdrproc_t)xdr_pmap)) | ||
| 6377 | return (FALSE); | ||
| 6378 | rp = (freeing) ? next : &((*rp)->pml_next); | ||
| 6379 | } | ||
| 6380 | diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c | ||
| 6381 | index 522cb20..79d52fe 100644 | ||
| 6382 | --- a/src/lib/rpc/pmap_rmt.c | ||
| 6383 | +++ b/src/lib/rpc/pmap_rmt.c | ||
| 6384 | @@ -105,8 +105,9 @@ pmap_rmtcall( | ||
| 6385 | r.port_ptr = port_ptr; | ||
| 6386 | r.results_ptr = resp; | ||
| 6387 | r.xdr_results = xdrres; | ||
| 6388 | - stat = CLNT_CALL(client, PMAPPROC_CALLIT, xdr_rmtcall_args, &a, | ||
| 6389 | - xdr_rmtcallres, &r, tout); | ||
| 6390 | + stat = CLNT_CALL(client, PMAPPROC_CALLIT, | ||
| 6391 | + (xdrproc_t)xdr_rmtcall_args, &a, | ||
| 6392 | + (xdrproc_t)xdr_rmtcallres, &r, tout); | ||
| 6393 | CLNT_DESTROY(client); | ||
| 6394 | } else { | ||
| 6395 | stat = RPC_FAILED; | ||
| 6396 | @@ -344,7 +345,7 @@ clnt_broadcast( | ||
| 6397 | recv_again: | ||
| 6398 | msg.acpted_rply.ar_verf = gssrpc__null_auth; | ||
| 6399 | msg.acpted_rply.ar_results.where = (caddr_t)&r; | ||
| 6400 | - msg.acpted_rply.ar_results.proc = xdr_rmtcallres; | ||
| 6401 | + msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_rmtcallres; | ||
| 6402 | readfds = mask; | ||
| 6403 | t2 = t; | ||
| 6404 | switch (select(gssrpc__rpc_dtablesize(), &readfds, (fd_set *)NULL, | ||
| 6405 | diff --git a/src/lib/rpc/rpc_prot.c b/src/lib/rpc/rpc_prot.c | ||
| 6406 | index 9b82e12..296968b 100644 | ||
| 6407 | --- a/src/lib/rpc/rpc_prot.c | ||
| 6408 | +++ b/src/lib/rpc/rpc_prot.c | ||
| 6409 | @@ -132,8 +132,8 @@ xdr_rejected_reply(XDR *xdrs, struct rejected_reply *rr) | ||
| 6410 | } | ||
| 6411 | |||
| 6412 | static struct xdr_discrim reply_dscrm[3] = { | ||
| 6413 | - { (int)MSG_ACCEPTED, xdr_accepted_reply }, | ||
| 6414 | - { (int)MSG_DENIED, xdr_rejected_reply }, | ||
| 6415 | + { (int)MSG_ACCEPTED, (xdrproc_t)xdr_accepted_reply }, | ||
| 6416 | + { (int)MSG_DENIED, (xdrproc_t)xdr_rejected_reply }, | ||
| 6417 | { __dontcare__, NULL_xdrproc_t } }; | ||
| 6418 | |||
| 6419 | /* | ||
| 6420 | diff --git a/src/lib/rpc/svc.c b/src/lib/rpc/svc.c | ||
| 6421 | index cfbc7aa..0bcf04e 100644 | ||
| 6422 | --- a/src/lib/rpc/svc.c | ||
| 6423 | +++ b/src/lib/rpc/svc.c | ||
| 6424 | @@ -80,7 +80,7 @@ static struct svc_callout { | ||
| 6425 | struct svc_callout *sc_next; | ||
| 6426 | rpcprog_t sc_prog; | ||
| 6427 | rpcprog_t sc_vers; | ||
| 6428 | - void (*sc_dispatch)(); | ||
| 6429 | + void (*sc_dispatch)(struct svc_req *, SVCXPRT *); | ||
| 6430 | } *svc_head; | ||
| 6431 | |||
| 6432 | static struct svc_callout *svc_find(rpcprog_t, rpcvers_t, | ||
| 6433 | @@ -162,7 +162,7 @@ svc_register( | ||
| 6434 | SVCXPRT *xprt, | ||
| 6435 | rpcprog_t prog, | ||
| 6436 | rpcvers_t vers, | ||
| 6437 | - void (*dispatch)(), | ||
| 6438 | + void (*dispatch)(struct svc_req *, SVCXPRT *), | ||
| 6439 | int protocol) | ||
| 6440 | { | ||
| 6441 | struct svc_callout *prev; | ||
| 6442 | diff --git a/src/lib/rpc/svc_auth_gss.c b/src/lib/rpc/svc_auth_gss.c | ||
| 6443 | index aba7694..98d601c 100644 | ||
| 6444 | --- a/src/lib/rpc/svc_auth_gss.c | ||
| 6445 | +++ b/src/lib/rpc/svc_auth_gss.c | ||
| 6446 | @@ -193,7 +193,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, | ||
| 6447 | /* Deserialize arguments. */ | ||
| 6448 | memset(&recv_tok, 0, sizeof(recv_tok)); | ||
| 6449 | |||
| 6450 | - if (!svc_getargs(rqst->rq_xprt, xdr_rpc_gss_init_args, | ||
| 6451 | + if (!svc_getargs(rqst->rq_xprt, (xdrproc_t)xdr_rpc_gss_init_args, | ||
| 6452 | (caddr_t)&recv_tok)) | ||
| 6453 | return (FALSE); | ||
| 6454 | |||
| 6455 | @@ -209,7 +209,8 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, | ||
| 6456 | NULL, | ||
| 6457 | NULL); | ||
| 6458 | |||
| 6459 | - svc_freeargs(rqst->rq_xprt, xdr_rpc_gss_init_args, (caddr_t)&recv_tok); | ||
| 6460 | + svc_freeargs(rqst->rq_xprt, (xdrproc_t)xdr_rpc_gss_init_args, | ||
| 6461 | + (caddr_t)&recv_tok); | ||
| 6462 | |||
| 6463 | log_status("accept_sec_context", gr->gr_major, gr->gr_minor); | ||
| 6464 | if (gr->gr_major != GSS_S_COMPLETE && | ||
| 6465 | @@ -495,7 +496,8 @@ gssrpc__svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, | ||
| 6466 | } | ||
| 6467 | *no_dispatch = TRUE; | ||
| 6468 | |||
| 6469 | - call_stat = svc_sendreply(rqst->rq_xprt, xdr_rpc_gss_init_res, | ||
| 6470 | + call_stat = svc_sendreply(rqst->rq_xprt, | ||
| 6471 | + (xdrproc_t)xdr_rpc_gss_init_res, | ||
| 6472 | (caddr_t)&gr); | ||
| 6473 | |||
| 6474 | gss_release_buffer(&min_stat, &gr.gr_token); | ||
| 6475 | @@ -544,7 +546,7 @@ gssrpc__svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, | ||
| 6476 | } | ||
| 6477 | retstat = AUTH_OK; | ||
| 6478 | freegc: | ||
| 6479 | - xdr_free(xdr_rpc_gss_cred, gc); | ||
| 6480 | + xdr_free((xdrproc_t)xdr_rpc_gss_cred, gc); | ||
| 6481 | log_debug("returning %d from svcauth_gss()", retstat); | ||
| 6482 | return (retstat); | ||
| 6483 | } | ||
| 6484 | diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c | ||
| 6485 | index b7ffee4..267c154 100644 | ||
| 6486 | --- a/src/lib/rpc/svc_auth_gssapi.c | ||
| 6487 | +++ b/src/lib/rpc/svc_auth_gssapi.c | ||
| 6488 | @@ -201,7 +201,7 @@ enum auth_stat gssrpc__svcauth_gssapi( | ||
| 6489 | if (! xdr_authgssapi_creds(&xdrs, &creds)) { | ||
| 6490 | PRINTF(("svcauth_gssapi: failed decoding creds\n")); | ||
| 6491 | LOG_MISCERR("protocol error in client credentials"); | ||
| 6492 | - xdr_free(xdr_authgssapi_creds, &creds); | ||
| 6493 | + xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds); | ||
| 6494 | XDR_DESTROY(&xdrs); | ||
| 6495 | ret = AUTH_BADCRED; | ||
| 6496 | goto error; | ||
| 6497 | @@ -223,7 +223,7 @@ enum auth_stat gssrpc__svcauth_gssapi( | ||
| 6498 | if (creds.auth_msg && rqst->rq_proc == AUTH_GSSAPI_EXIT) { | ||
| 6499 | PRINTF(("svcauth_gssapi: GSSAPI_EXIT, cleaning up\n")); | ||
| 6500 | svc_sendreply(rqst->rq_xprt, xdr_void, NULL); | ||
| 6501 | - xdr_free(xdr_authgssapi_creds, &creds); | ||
| 6502 | + xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds); | ||
| 6503 | cleanup(); | ||
| 6504 | exit(0); | ||
| 6505 | } | ||
| 6506 | @@ -306,7 +306,7 @@ enum auth_stat gssrpc__svcauth_gssapi( | ||
| 6507 | |||
| 6508 | /* call is for us, deserialize arguments */ | ||
| 6509 | memset(&call_arg, 0, sizeof(call_arg)); | ||
| 6510 | - if (! svc_getargs(rqst->rq_xprt, xdr_authgssapi_init_arg, | ||
| 6511 | + if (! svc_getargs(rqst->rq_xprt, (xdrproc_t)xdr_authgssapi_init_arg, | ||
| 6512 | &call_arg)) { | ||
| 6513 | PRINTF(("svcauth_gssapi: cannot decode args\n")); | ||
| 6514 | LOG_MISCERR("protocol error in procedure arguments"); | ||
| 6515 | @@ -446,7 +446,7 @@ enum auth_stat gssrpc__svcauth_gssapi( | ||
| 6516 | minor_stat = call_res.gss_minor; | ||
| 6517 | |||
| 6518 | /* done with call args */ | ||
| 6519 | - xdr_free(xdr_authgssapi_init_arg, &call_arg); | ||
| 6520 | + xdr_free((xdrproc_t)xdr_authgssapi_init_arg, &call_arg); | ||
| 6521 | |||
| 6522 | PRINTF(("svcauth_gssapi: accept_sec_context returned %#x %#x\n", | ||
| 6523 | call_res.gss_major, call_res.gss_minor)); | ||
| 6524 | @@ -459,7 +459,7 @@ enum auth_stat gssrpc__svcauth_gssapi( | ||
| 6525 | badauth(call_res.gss_major, call_res.gss_minor, rqst->rq_xprt); | ||
| 6526 | |||
| 6527 | gss_release_buffer(&minor_stat, &output_token); | ||
| 6528 | - svc_sendreply(rqst->rq_xprt, xdr_authgssapi_init_res, | ||
| 6529 | + svc_sendreply(rqst->rq_xprt, (xdrproc_t)xdr_authgssapi_init_res, | ||
| 6530 | (caddr_t) &call_res); | ||
| 6531 | *no_dispatch = TRUE; | ||
| 6532 | ret = AUTH_OK; | ||
| 6533 | @@ -492,7 +492,7 @@ enum auth_stat gssrpc__svcauth_gssapi( | ||
| 6534 | } | ||
| 6535 | |||
| 6536 | PRINTF(("svcauth_gssapi: sending reply\n")); | ||
| 6537 | - svc_sendreply(rqst->rq_xprt, xdr_authgssapi_init_res, | ||
| 6538 | + svc_sendreply(rqst->rq_xprt, (xdrproc_t)xdr_authgssapi_init_res, | ||
| 6539 | (caddr_t) &call_res); | ||
| 6540 | *no_dispatch = TRUE; | ||
| 6541 | |||
| 6542 | @@ -583,11 +583,13 @@ enum auth_stat gssrpc__svcauth_gssapi( | ||
| 6543 | case AUTH_GSSAPI_MSG: | ||
| 6544 | PRINTF(("svcauth_gssapi: GSSAPI_MSG, getting args\n")); | ||
| 6545 | memset(&call_arg, 0, sizeof(call_arg)); | ||
| 6546 | - if (! svc_getargs(rqst->rq_xprt, xdr_authgssapi_init_arg, | ||
| 6547 | + if (! svc_getargs(rqst->rq_xprt, | ||
| 6548 | + (xdrproc_t)xdr_authgssapi_init_arg, | ||
| 6549 | &call_arg)) { | ||
| 6550 | PRINTF(("svcauth_gssapi: cannot decode args\n")); | ||
| 6551 | LOG_MISCERR("protocol error in call arguments"); | ||
| 6552 | - xdr_free(xdr_authgssapi_init_arg, &call_arg); | ||
| 6553 | + xdr_free((xdrproc_t)xdr_authgssapi_init_arg, | ||
| 6554 | + &call_arg); | ||
| 6555 | ret = AUTH_BADCRED; | ||
| 6556 | goto error; | ||
| 6557 | } | ||
| 6558 | @@ -598,7 +600,7 @@ enum auth_stat gssrpc__svcauth_gssapi( | ||
| 6559 | &call_arg.token); | ||
| 6560 | |||
| 6561 | /* done with call args */ | ||
| 6562 | - xdr_free(xdr_authgssapi_init_arg, &call_arg); | ||
| 6563 | + xdr_free((xdrproc_t)xdr_authgssapi_init_arg, &call_arg); | ||
| 6564 | |||
| 6565 | if (gssstat != GSS_S_COMPLETE) { | ||
| 6566 | AUTH_GSSAPI_DISPLAY_STATUS(("processing token", | ||
| 6567 | @@ -641,7 +643,7 @@ enum auth_stat gssrpc__svcauth_gssapi( | ||
| 6568 | if (creds.client_handle.length != 0) { | ||
| 6569 | PRINTF(("svcauth_gssapi: freeing client_handle len %d\n", | ||
| 6570 | (int) creds.client_handle.length)); | ||
| 6571 | - xdr_free(xdr_authgssapi_creds, &creds); | ||
| 6572 | + xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds); | ||
| 6573 | } | ||
| 6574 | |||
| 6575 | PRINTF(("\n")); | ||
| 6576 | @@ -651,7 +653,7 @@ error: | ||
| 6577 | if (creds.client_handle.length != 0) { | ||
| 6578 | PRINTF(("svcauth_gssapi: freeing client_handle len %d\n", | ||
| 6579 | (int) creds.client_handle.length)); | ||
| 6580 | - xdr_free(xdr_authgssapi_creds, &creds); | ||
| 6581 | + xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds); | ||
| 6582 | } | ||
| 6583 | |||
| 6584 | PRINTF(("\n")); | ||
| 6585 | @@ -1079,7 +1081,7 @@ void svcauth_gssapi_set_log_miscerr_func( | ||
| 6586 | static bool_t svc_auth_gssapi_wrap( | ||
| 6587 | SVCAUTH *auth, | ||
| 6588 | XDR *out_xdrs, | ||
| 6589 | - bool_t (*xdr_func)(), | ||
| 6590 | + xdrproc_t xdr_func, | ||
| 6591 | caddr_t xdr_ptr) | ||
| 6592 | { | ||
| 6593 | OM_uint32 gssstat, minor_stat; | ||
| 6594 | @@ -1102,7 +1104,7 @@ static bool_t svc_auth_gssapi_wrap( | ||
| 6595 | static bool_t svc_auth_gssapi_unwrap( | ||
| 6596 | SVCAUTH *auth, | ||
| 6597 | XDR *in_xdrs, | ||
| 6598 | - bool_t (*xdr_func)(), | ||
| 6599 | + xdrproc_t xdr_func, | ||
| 6600 | caddr_t xdr_ptr) | ||
| 6601 | { | ||
| 6602 | svc_auth_gssapi_data *client_data = SVCAUTH_PRIVATE(auth); | ||
| 6603 | diff --git a/src/lib/rpc/svc_simple.c b/src/lib/rpc/svc_simple.c | ||
| 6604 | index 315275f..aa6c0a6 100644 | ||
| 6605 | --- a/src/lib/rpc/svc_simple.c | ||
| 6606 | +++ b/src/lib/rpc/svc_simple.c | ||
| 6607 | @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro"; | ||
| 6608 | #include <netdb.h> | ||
| 6609 | |||
| 6610 | static struct proglst { | ||
| 6611 | - char *(*p_progname)(); | ||
| 6612 | + char *(*p_progname)(void *); | ||
| 6613 | int p_prognum; | ||
| 6614 | int p_procnum; | ||
| 6615 | xdrproc_t p_inproc, p_outproc; | ||
| 6616 | @@ -62,7 +62,7 @@ registerrpc( | ||
| 6617 | rpcprog_t prognum, | ||
| 6618 | rpcvers_t versnum, | ||
| 6619 | rpcproc_t procnum, | ||
| 6620 | - char *(*progname)(), | ||
| 6621 | + char *(*progname)(void *), | ||
| 6622 | xdrproc_t inproc, | ||
| 6623 | xdrproc_t outproc) | ||
| 6624 | { | ||
| 6625 | diff --git a/src/lib/rpc/unit-test/client.c b/src/lib/rpc/unit-test/client.c | ||
| 6626 | index c9a812b..9b907bc 100644 | ||
| 6627 | --- a/src/lib/rpc/unit-test/client.c | ||
| 6628 | +++ b/src/lib/rpc/unit-test/client.c | ||
| 6629 | @@ -42,7 +42,7 @@ char *whoami; | ||
| 6630 | #ifdef __GNUC__ | ||
| 6631 | __attribute__((noreturn)) | ||
| 6632 | #endif | ||
| 6633 | -static void usage() | ||
| 6634 | +static void usage(void) | ||
| 6635 | { | ||
| 6636 | fprintf(stderr, "usage: %s {-t|-u} [-a] [-s num] [-m num] host service [count]\n", | ||
| 6637 | whoami); | ||
| 6638 | @@ -50,9 +50,7 @@ static void usage() | ||
| 6639 | } | ||
| 6640 | |||
| 6641 | int | ||
| 6642 | -main(argc, argv) | ||
| 6643 | - int argc; | ||
| 6644 | - char **argv; | ||
| 6645 | +main(int argc, char **argv) | ||
| 6646 | { | ||
| 6647 | char *host, *port, *target, *echo_arg, **echo_resp, buf[BIG_BUF]; | ||
| 6648 | CLIENT *clnt; | ||
| 6649 | @@ -172,7 +170,7 @@ main(argc, argv) | ||
| 6650 | strcmp(echo_arg, (*echo_resp) + 6) != 0) | ||
| 6651 | fprintf(stderr, "RPC_TEST_ECHO call %d response wrong: " | ||
| 6652 | "arg = %s, resp = %s\n", i, echo_arg, *echo_resp); | ||
| 6653 | - gssrpc_xdr_free(xdr_wrapstring, echo_resp); | ||
| 6654 | + gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp); | ||
| 6655 | } | ||
| 6656 | |||
| 6657 | /* | ||
| 6658 | @@ -194,7 +192,7 @@ main(argc, argv) | ||
| 6659 | clnt_perror(clnt, whoami); | ||
| 6660 | } else { | ||
| 6661 | fprintf(stderr, "bad seq didn't cause failure\n"); | ||
| 6662 | - gssrpc_xdr_free(xdr_wrapstring, echo_resp); | ||
| 6663 | + gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp); | ||
| 6664 | } | ||
| 6665 | |||
| 6666 | AUTH_PRIVATE(clnt->cl_auth)->seq_num -= 3; | ||
| 6667 | @@ -207,7 +205,7 @@ main(argc, argv) | ||
| 6668 | if (echo_resp == NULL) | ||
| 6669 | clnt_perror(clnt, "Sequence number improperly reset"); | ||
| 6670 | else | ||
| 6671 | - gssrpc_xdr_free(xdr_wrapstring, echo_resp); | ||
| 6672 | + gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp); | ||
| 6673 | |||
| 6674 | /* | ||
| 6675 | * Now simulate a lost server response, and see if | ||
| 6676 | @@ -219,7 +217,7 @@ main(argc, argv) | ||
| 6677 | if (echo_resp == NULL) | ||
| 6678 | clnt_perror(clnt, "Auto-resynchronization failed"); | ||
| 6679 | else | ||
| 6680 | - gssrpc_xdr_free(xdr_wrapstring, echo_resp); | ||
| 6681 | + gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp); | ||
| 6682 | |||
| 6683 | /* | ||
| 6684 | * Now make sure auto-resyncrhonization actually worked | ||
| 6685 | @@ -229,7 +227,7 @@ main(argc, argv) | ||
| 6686 | if (echo_resp == NULL) | ||
| 6687 | clnt_perror(clnt, "Auto-resynchronization did not work"); | ||
| 6688 | else | ||
| 6689 | - gssrpc_xdr_free(xdr_wrapstring, echo_resp); | ||
| 6690 | + gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp); | ||
| 6691 | |||
| 6692 | if (! auth_once) { | ||
| 6693 | tmp_auth = clnt->cl_auth; | ||
| 6694 | @@ -259,7 +257,7 @@ main(argc, argv) | ||
| 6695 | strcmp(echo_arg, (*echo_resp) + 6) != 0) | ||
| 6696 | fprintf(stderr, | ||
| 6697 | "RPC_TEST_LENGTHS call %d response wrong\n", i); | ||
| 6698 | - gssrpc_xdr_free(xdr_wrapstring, echo_resp); | ||
| 6699 | + gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp); | ||
| 6700 | } | ||
| 6701 | |||
| 6702 | /* cycle from 1 to 255 */ | ||
| 6703 | diff --git a/src/lib/rpc/unit-test/rpc_test_clnt.c b/src/lib/rpc/unit-test/rpc_test_clnt.c | ||
| 6704 | index 4e4a18a..b914167 100644 | ||
| 6705 | --- a/src/lib/rpc/unit-test/rpc_test_clnt.c | ||
| 6706 | +++ b/src/lib/rpc/unit-test/rpc_test_clnt.c | ||
| 6707 | @@ -5,9 +5,7 @@ | ||
| 6708 | static struct timeval TIMEOUT = { 25, 0 }; | ||
| 6709 | |||
| 6710 | char ** | ||
| 6711 | -rpc_test_echo_1(argp, clnt) | ||
| 6712 | - char **argp; | ||
| 6713 | - CLIENT *clnt; | ||
| 6714 | +rpc_test_echo_1(char **argp, CLIENT *clnt) | ||
| 6715 | { | ||
| 6716 | static char *clnt_res; | ||
| 6717 | |||
| 6718 | diff --git a/src/lib/rpc/unit-test/rpc_test_svc.c b/src/lib/rpc/unit-test/rpc_test_svc.c | ||
| 6719 | index c54c081..3aa7674 100644 | ||
| 6720 | --- a/src/lib/rpc/unit-test/rpc_test_svc.c | ||
| 6721 | +++ b/src/lib/rpc/unit-test/rpc_test_svc.c | ||
| 6722 | @@ -14,16 +14,14 @@ static int _rpcsvcstate = _IDLE; /* Set when a request is serviced */ | ||
| 6723 | static int _rpcsvccount = 0; /* Number of requests being serviced */ | ||
| 6724 | |||
| 6725 | void | ||
| 6726 | -rpc_test_prog_1_svc(rqstp, transp) | ||
| 6727 | - struct svc_req *rqstp; | ||
| 6728 | - SVCXPRT *transp; | ||
| 6729 | +rpc_test_prog_1_svc(struct svc_req *rqstp, SVCXPRT *transp) | ||
| 6730 | { | ||
| 6731 | union { | ||
| 6732 | char *rpc_test_echo_1_arg; | ||
| 6733 | } argument; | ||
| 6734 | char *result; | ||
| 6735 | - bool_t (*xdr_argument)(), (*xdr_result)(); | ||
| 6736 | - char *(*local)(); | ||
| 6737 | + xdrproc_t xdr_argument, xdr_result; | ||
| 6738 | + char *(*local)(char *, struct svc_req *); | ||
| 6739 | |||
| 6740 | _rpcsvccount++; | ||
| 6741 | switch (rqstp->rq_proc) { | ||
| 6742 | @@ -35,9 +33,9 @@ rpc_test_prog_1_svc(rqstp, transp) | ||
| 6743 | return; | ||
| 6744 | |||
| 6745 | case RPC_TEST_ECHO: | ||
| 6746 | - xdr_argument = xdr_wrapstring; | ||
| 6747 | - xdr_result = xdr_wrapstring; | ||
| 6748 | - local = (char *(*)()) rpc_test_echo_1_svc; | ||
| 6749 | + xdr_argument = (xdrproc_t)xdr_wrapstring; | ||
| 6750 | + xdr_result = (xdrproc_t)xdr_wrapstring; | ||
| 6751 | + local = (char *(*)(char *, struct svc_req *)) rpc_test_echo_1_svc; | ||
| 6752 | break; | ||
| 6753 | |||
| 6754 | default: | ||
| 6755 | @@ -53,7 +51,7 @@ rpc_test_prog_1_svc(rqstp, transp) | ||
| 6756 | _rpcsvcstate = _SERVED; | ||
| 6757 | return; | ||
| 6758 | } | ||
| 6759 | - result = (*local)(&argument, rqstp); | ||
| 6760 | + result = (*local)((char *)&argument, rqstp); | ||
| 6761 | if (result != NULL && !svc_sendreply(transp, xdr_result, result)) { | ||
| 6762 | svcerr_systemerr(transp); | ||
| 6763 | } | ||
| 6764 | diff --git a/src/lib/rpc/unit-test/server.c b/src/lib/rpc/unit-test/server.c | ||
| 6765 | index c3bbcbf..4400b96 100644 | ||
| 6766 | --- a/src/lib/rpc/unit-test/server.c | ||
| 6767 | +++ b/src/lib/rpc/unit-test/server.c | ||
| 6768 | @@ -40,7 +40,7 @@ static void rpc_test_badverf(gss_name_t client, gss_name_t server, | ||
| 6769 | #define SERVICE_NAME "host" | ||
| 6770 | #endif | ||
| 6771 | |||
| 6772 | -static void usage() | ||
| 6773 | +static void usage(void) | ||
| 6774 | { | ||
| 6775 | fprintf(stderr, "Usage: server {-t|-u} [svc-debug] [misc-debug]\n"); | ||
| 6776 | exit(1); | ||
| 6777 | diff --git a/src/lib/rpc/xdr.c b/src/lib/rpc/xdr.c | ||
| 6778 | index 24c3de4..49c31b3 100644 | ||
| 6779 | --- a/src/lib/rpc/xdr.c | ||
| 6780 | +++ b/src/lib/rpc/xdr.c | ||
| 6781 | @@ -579,14 +579,14 @@ xdr_union( | ||
| 6782 | */ | ||
| 6783 | for (; choices->proc != NULL_xdrproc_t; choices++) { | ||
| 6784 | if (choices->value == dscm) | ||
| 6785 | - return ((*(choices->proc))(xdrs, unp, LASTUNSIGNED)); | ||
| 6786 | + return choices->proc(xdrs, unp); | ||
| 6787 | } | ||
| 6788 | |||
| 6789 | /* | ||
| 6790 | * no match - execute the default xdr routine if there is one | ||
| 6791 | */ | ||
| 6792 | return ((dfault == NULL_xdrproc_t) ? FALSE : | ||
| 6793 | - (*dfault)(xdrs, unp, LASTUNSIGNED)); | ||
| 6794 | + (*dfault)(xdrs, unp)); | ||
| 6795 | } | ||
| 6796 | |||
| 6797 | |||
| 6798 | diff --git a/src/lib/rpc/xdr_array.c b/src/lib/rpc/xdr_array.c | ||
| 6799 | index aeaa7f2..3507d53 100644 | ||
| 6800 | --- a/src/lib/rpc/xdr_array.c | ||
| 6801 | +++ b/src/lib/rpc/xdr_array.c | ||
| 6802 | @@ -113,7 +113,7 @@ xdr_array( | ||
| 6803 | * now we xdr each element of array | ||
| 6804 | */ | ||
| 6805 | for (i = 0; (i < c) && stat; i++) { | ||
| 6806 | - stat = (*elproc)(xdrs, target, LASTUNSIGNED); | ||
| 6807 | + stat = (*elproc)(xdrs, target); | ||
| 6808 | target += elsize; | ||
| 6809 | } | ||
| 6810 | |||
| 6811 | @@ -150,7 +150,7 @@ xdr_vector( | ||
| 6812 | |||
| 6813 | elptr = basep; | ||
| 6814 | for (i = 0; i < nelem; i++) { | ||
| 6815 | - if (! (*xdr_elem)(xdrs, elptr, LASTUNSIGNED)) { | ||
| 6816 | + if (! (*xdr_elem)(xdrs, elptr)) { | ||
| 6817 | return(FALSE); | ||
| 6818 | } | ||
| 6819 | elptr += elemsize; | ||
| 6820 | diff --git a/src/lib/rpc/xdr_rec.c b/src/lib/rpc/xdr_rec.c | ||
| 6821 | index 1f6a776..1852540 100644 | ||
| 6822 | --- a/src/lib/rpc/xdr_rec.c | ||
| 6823 | +++ b/src/lib/rpc/xdr_rec.c | ||
| 6824 | @@ -99,7 +99,7 @@ typedef struct rec_strm { | ||
| 6825 | /* | ||
| 6826 | * out-goung bits | ||
| 6827 | */ | ||
| 6828 | - int (*writeit)(); | ||
| 6829 | + int (*writeit)(caddr_t, caddr_t, int); | ||
| 6830 | caddr_t out_base; /* output buffer (points to frag header) */ | ||
| 6831 | caddr_t out_finger; /* next output position */ | ||
| 6832 | caddr_t out_boundry; /* data cannot up to this address */ | ||
| 6833 | @@ -108,7 +108,7 @@ typedef struct rec_strm { | ||
| 6834 | /* | ||
| 6835 | * in-coming bits | ||
| 6836 | */ | ||
| 6837 | - int (*readit)(); | ||
| 6838 | + int (*readit)(caddr_t, caddr_t, int); | ||
| 6839 | uint32_t in_size; /* fixed size of the input buffer */ | ||
| 6840 | caddr_t in_base; | ||
| 6841 | caddr_t in_finger; /* location of next byte to be had */ | ||
| 6842 | @@ -140,8 +140,10 @@ xdrrec_create( | ||
| 6843 | u_int sendsize, | ||
| 6844 | u_int recvsize, | ||
| 6845 | caddr_t tcp_handle, | ||
| 6846 | - int (*readit)(), /* like read, but pass it a tcp_handle, not sock */ | ||
| 6847 | - int (*writeit)() /* like write, but pass it a tcp_handle, not sock */ | ||
| 6848 | + /* like read, but pass it a tcp_handle, not sock */ | ||
| 6849 | + int (*readit)(caddr_t, caddr_t, int), | ||
| 6850 | + /* like write, but pass it a tcp_handle, not sock */ | ||
| 6851 | + int (*writeit)(caddr_t, caddr_t, int) | ||
| 6852 | ) | ||
| 6853 | { | ||
| 6854 | RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM)); | ||
| 6855 | @@ -528,8 +530,7 @@ get_input_bytes(RECSTREAM *rstrm, caddr_t addr, int len) | ||
| 6856 | } | ||
| 6857 | |||
| 6858 | static bool_t /* next four bytes of input stream are treated as a header */ | ||
| 6859 | -set_input_fragment(rstrm) | ||
| 6860 | - RECSTREAM *rstrm; | ||
| 6861 | +set_input_fragment(RECSTREAM *rstrm) | ||
| 6862 | { | ||
| 6863 | uint32_t header; | ||
| 6864 | |||
| 6865 | diff --git a/src/lib/rpc/xdr_reference.c b/src/lib/rpc/xdr_reference.c | ||
| 6866 | index eff279d..f3d4b7d 100644 | ||
| 6867 | --- a/src/lib/rpc/xdr_reference.c | ||
| 6868 | +++ b/src/lib/rpc/xdr_reference.c | ||
| 6869 | @@ -47,8 +47,6 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI"; | ||
| 6870 | #include <gssrpc/types.h> | ||
| 6871 | #include <gssrpc/xdr.h> | ||
| 6872 | |||
| 6873 | -#define LASTUNSIGNED ((u_int)0-1) | ||
| 6874 | - | ||
| 6875 | /* | ||
| 6876 | * XDR an indirect pointer | ||
| 6877 | * xdr_reference is for recursively translating a structure that is | ||
| 6878 | @@ -88,7 +86,7 @@ xdr_reference( | ||
| 6879 | break; | ||
| 6880 | } | ||
| 6881 | |||
| 6882 | - stat = (*proc)(xdrs, loc, LASTUNSIGNED); | ||
| 6883 | + stat = (*proc)(xdrs, loc); | ||
| 6884 | |||
| 6885 | if (xdrs->x_op == XDR_FREE) { | ||
| 6886 | mem_free(loc, size); | ||
| 6887 | diff --git a/src/lib/rpc/xdr_sizeof.c b/src/lib/rpc/xdr_sizeof.c | ||
| 6888 | index 5b77fa6..0c460e7 100644 | ||
| 6889 | --- a/src/lib/rpc/xdr_sizeof.c | ||
| 6890 | +++ b/src/lib/rpc/xdr_sizeof.c | ||
| 6891 | @@ -43,9 +43,7 @@ | ||
| 6892 | |||
| 6893 | /* ARGSUSED */ | ||
| 6894 | static bool_t | ||
| 6895 | -x_putlong(xdrs, longp) | ||
| 6896 | - XDR *xdrs; | ||
| 6897 | - long *longp; | ||
| 6898 | +x_putlong(XDR *xdrs, long *longp) | ||
| 6899 | { | ||
| 6900 | xdrs->x_handy += BYTES_PER_XDR_UNIT; | ||
| 6901 | return (TRUE); | ||
| 6902 | @@ -53,10 +51,7 @@ x_putlong(xdrs, longp) | ||
| 6903 | |||
| 6904 | /* ARGSUSED */ | ||
| 6905 | static bool_t | ||
| 6906 | -x_putbytes(xdrs, bp, len) | ||
| 6907 | - XDR *xdrs; | ||
| 6908 | - char *bp; | ||
| 6909 | - int len; | ||
| 6910 | +x_putbytes(XDR *xdrs, char *bp, u_int len) | ||
| 6911 | { | ||
| 6912 | xdrs->x_handy += len; | ||
| 6913 | |||
| 6914 | @@ -64,26 +59,21 @@ x_putbytes(xdrs, bp, len) | ||
| 6915 | } | ||
| 6916 | |||
| 6917 | static u_int | ||
| 6918 | -x_getpostn(xdrs) | ||
| 6919 | - XDR *xdrs; | ||
| 6920 | +x_getpostn(XDR *xdrs) | ||
| 6921 | { | ||
| 6922 | return (xdrs->x_handy); | ||
| 6923 | } | ||
| 6924 | |||
| 6925 | /* ARGSUSED */ | ||
| 6926 | static bool_t | ||
| 6927 | -x_setpostn(xdrs, pos) | ||
| 6928 | - XDR *xdrs; | ||
| 6929 | - u_int pos; | ||
| 6930 | +x_setpostn(XDR *xdrs, u_int pos) | ||
| 6931 | { | ||
| 6932 | /* This is not allowed */ | ||
| 6933 | return (FALSE); | ||
| 6934 | } | ||
| 6935 | |||
| 6936 | static rpc_inline_t * | ||
| 6937 | -x_inline(xdrs, len) | ||
| 6938 | - XDR *xdrs; | ||
| 6939 | - int len; | ||
| 6940 | +x_inline(XDR *xdrs, int len) | ||
| 6941 | { | ||
| 6942 | if (len == 0) { | ||
| 6943 | return (NULL); | ||
| 6944 | @@ -110,15 +100,14 @@ x_inline(xdrs, len) | ||
| 6945 | } | ||
| 6946 | |||
| 6947 | static int | ||
| 6948 | -harmless() | ||
| 6949 | +harmless(void) | ||
| 6950 | { | ||
| 6951 | /* Always return FALSE/NULL, as the case may be */ | ||
| 6952 | return (0); | ||
| 6953 | } | ||
| 6954 | |||
| 6955 | static void | ||
| 6956 | -x_destroy(xdrs) | ||
| 6957 | - XDR *xdrs; | ||
| 6958 | +x_destroy(XDR *xdrs) | ||
| 6959 | { | ||
| 6960 | xdrs->x_handy = 0; | ||
| 6961 | xdrs->x_private = NULL; | ||
| 6962 | @@ -130,9 +119,7 @@ x_destroy(xdrs) | ||
| 6963 | } | ||
| 6964 | |||
| 6965 | unsigned long | ||
| 6966 | -xdr_sizeof(func, data) | ||
| 6967 | - xdrproc_t func; | ||
| 6968 | - void *data; | ||
| 6969 | +xdr_sizeof(xdrproc_t func, void *data) | ||
| 6970 | { | ||
| 6971 | XDR x; | ||
| 6972 | struct xdr_ops ops; | ||
| 6973 | diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c | ||
| 6974 | index 7cf8aa4..9b75f34 100644 | ||
| 6975 | --- a/src/plugins/kdb/db2/db2_exp.c | ||
| 6976 | +++ b/src/plugins/kdb/db2/db2_exp.c | ||
| 6977 | @@ -68,7 +68,7 @@ k5_mutex_t *krb5_db2_mutex; | ||
| 6978 | return result; \ | ||
| 6979 | } \ | ||
| 6980 | /* hack: decl to allow a following ";" */ \ | ||
| 6981 | - static TYPE wrap_##NAME () | ||
| 6982 | + static TYPE wrap_##NAME ARGLIST | ||
| 6983 | |||
| 6984 | /* Two special cases: void (can't assign result), and krb5_error_code | ||
| 6985 | (return error from locking code). */ | ||
| 6986 | @@ -81,7 +81,7 @@ k5_mutex_t *krb5_db2_mutex; | ||
| 6987 | k5_mutex_unlock (krb5_db2_mutex); \ | ||
| 6988 | } \ | ||
| 6989 | /* hack: decl to allow a following ";" */ \ | ||
| 6990 | - static void wrap_##NAME () | ||
| 6991 | + static void wrap_##NAME ARGLIST | ||
| 6992 | |||
| 6993 | #define WRAP_K(NAME,ARGLIST,ARGNAMES) \ | ||
| 6994 | WRAP(NAME,krb5_error_code,ARGLIST,ARGNAMES) | ||
| 6995 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_close.c b/src/plugins/kdb/db2/libdb2/btree/bt_close.c | ||
| 6996 | index 11be134..f12d74b 100644 | ||
| 6997 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_close.c | ||
| 6998 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_close.c | ||
| 6999 | @@ -61,8 +61,7 @@ static int bt_meta __P((BTREE *)); | ||
| 7000 | * RET_ERROR, RET_SUCCESS | ||
| 7001 | */ | ||
| 7002 | int | ||
| 7003 | -__bt_close(dbp) | ||
| 7004 | - DB *dbp; | ||
| 7005 | +__bt_close(DB *dbp) | ||
| 7006 | { | ||
| 7007 | BTREE *t; | ||
| 7008 | int fd; | ||
| 7009 | @@ -116,9 +115,7 @@ __bt_close(dbp) | ||
| 7010 | * RET_SUCCESS, RET_ERROR. | ||
| 7011 | */ | ||
| 7012 | int | ||
| 7013 | -__bt_sync(dbp, flags) | ||
| 7014 | - const DB *dbp; | ||
| 7015 | - u_int flags; | ||
| 7016 | +__bt_sync(const DB *dbp, u_int flags) | ||
| 7017 | { | ||
| 7018 | BTREE *t; | ||
| 7019 | int status; | ||
| 7020 | @@ -160,8 +157,7 @@ __bt_sync(dbp, flags) | ||
| 7021 | * RET_ERROR, RET_SUCCESS | ||
| 7022 | */ | ||
| 7023 | static int | ||
| 7024 | -bt_meta(t) | ||
| 7025 | - BTREE *t; | ||
| 7026 | +bt_meta(BTREE *t) | ||
| 7027 | { | ||
| 7028 | BTMETA m; | ||
| 7029 | void *p; | ||
| 7030 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_conv.c b/src/plugins/kdb/db2/libdb2/btree/bt_conv.c | ||
| 7031 | index c0644ed..99c4af5 100644 | ||
| 7032 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_conv.c | ||
| 7033 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_conv.c | ||
| 7034 | @@ -59,10 +59,7 @@ static void mswap __P((PAGE *)); | ||
| 7035 | * h: page to convert | ||
| 7036 | */ | ||
| 7037 | void | ||
| 7038 | -__bt_pgin(t, pg, pp) | ||
| 7039 | - void *t; | ||
| 7040 | - db_pgno_t pg; | ||
| 7041 | - void *pp; | ||
| 7042 | +__bt_pgin(void *t, db_pgno_t pg, void *pp) | ||
| 7043 | { | ||
| 7044 | PAGE *h; | ||
| 7045 | indx_t i, top; | ||
| 7046 | @@ -128,10 +125,7 @@ __bt_pgin(t, pg, pp) | ||
| 7047 | } | ||
| 7048 | |||
| 7049 | void | ||
| 7050 | -__bt_pgout(t, pg, pp) | ||
| 7051 | - void *t; | ||
| 7052 | - db_pgno_t pg; | ||
| 7053 | - void *pp; | ||
| 7054 | +__bt_pgout(void *t, db_pgno_t pg, void *pp) | ||
| 7055 | { | ||
| 7056 | PAGE *h; | ||
| 7057 | indx_t i, top; | ||
| 7058 | @@ -203,8 +197,7 @@ __bt_pgout(t, pg, pp) | ||
| 7059 | * p: page to convert | ||
| 7060 | */ | ||
| 7061 | static void | ||
| 7062 | -mswap(pg) | ||
| 7063 | - PAGE *pg; | ||
| 7064 | +mswap(PAGE *pg) | ||
| 7065 | { | ||
| 7066 | char *p; | ||
| 7067 | |||
| 7068 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_delete.c b/src/plugins/kdb/db2/libdb2/btree/bt_delete.c | ||
| 7069 | index 28cc24d..f8dd59e 100644 | ||
| 7070 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_delete.c | ||
| 7071 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_delete.c | ||
| 7072 | @@ -59,10 +59,7 @@ static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *)); | ||
| 7073 | * Return RET_SPECIAL if the key is not found. | ||
| 7074 | */ | ||
| 7075 | int | ||
| 7076 | -__bt_delete(dbp, key, flags) | ||
| 7077 | - const DB *dbp; | ||
| 7078 | - const DBT *key; | ||
| 7079 | - u_int flags; | ||
| 7080 | +__bt_delete(const DB *dbp, const DBT *key, u_int flags) | ||
| 7081 | { | ||
| 7082 | BTREE *t; | ||
| 7083 | CURSOR *c; | ||
| 7084 | @@ -140,10 +137,7 @@ __bt_delete(dbp, key, flags) | ||
| 7085 | * 0 on success, 1 on failure | ||
| 7086 | */ | ||
| 7087 | static int | ||
| 7088 | -__bt_stkacq(t, hp, c) | ||
| 7089 | - BTREE *t; | ||
| 7090 | - PAGE **hp; | ||
| 7091 | - CURSOR *c; | ||
| 7092 | +__bt_stkacq(BTREE *t, PAGE **hp, CURSOR *c) | ||
| 7093 | { | ||
| 7094 | BINTERNAL *bi; | ||
| 7095 | EPG *e; | ||
| 7096 | @@ -288,9 +282,7 @@ ret: mpool_put(t->bt_mp, h, 0); | ||
| 7097 | * RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found. | ||
| 7098 | */ | ||
| 7099 | static int | ||
| 7100 | -__bt_bdelete(t, key) | ||
| 7101 | - BTREE *t; | ||
| 7102 | - const DBT *key; | ||
| 7103 | +__bt_bdelete(BTREE *t, const DBT *key) | ||
| 7104 | { | ||
| 7105 | EPG *e; | ||
| 7106 | PAGE *h; | ||
| 7107 | @@ -375,9 +367,7 @@ loop: if ((e = __bt_search(t, key, &exact)) == NULL) | ||
| 7108 | * mpool_put's the page | ||
| 7109 | */ | ||
| 7110 | static int | ||
| 7111 | -__bt_pdelete(t, h) | ||
| 7112 | - BTREE *t; | ||
| 7113 | - PAGE *h; | ||
| 7114 | +__bt_pdelete(BTREE *t, PAGE *h) | ||
| 7115 | { | ||
| 7116 | BINTERNAL *bi; | ||
| 7117 | PAGE *pg; | ||
| 7118 | @@ -471,11 +461,7 @@ __bt_pdelete(t, h) | ||
| 7119 | * RET_SUCCESS, RET_ERROR. | ||
| 7120 | */ | ||
| 7121 | int | ||
| 7122 | -__bt_dleaf(t, key, h, idx) | ||
| 7123 | - BTREE *t; | ||
| 7124 | - const DBT *key; | ||
| 7125 | - PAGE *h; | ||
| 7126 | - u_int idx; | ||
| 7127 | +__bt_dleaf(BTREE *t, const DBT *key, PAGE *h, u_int idx) | ||
| 7128 | { | ||
| 7129 | BLEAF *bl; | ||
| 7130 | indx_t cnt, *ip, offset; | ||
| 7131 | @@ -536,11 +522,7 @@ __bt_dleaf(t, key, h, idx) | ||
| 7132 | * RET_SUCCESS, RET_ERROR. | ||
| 7133 | */ | ||
| 7134 | static int | ||
| 7135 | -__bt_curdel(t, key, h, idx) | ||
| 7136 | - BTREE *t; | ||
| 7137 | - const DBT *key; | ||
| 7138 | - PAGE *h; | ||
| 7139 | - u_int idx; | ||
| 7140 | +__bt_curdel(BTREE *t, const DBT *key, PAGE *h, u_int idx) | ||
| 7141 | { | ||
| 7142 | CURSOR *c; | ||
| 7143 | EPG e; | ||
| 7144 | @@ -635,9 +617,7 @@ dup2: c->pg.pgno = e.page->pgno; | ||
| 7145 | * h: page to be deleted | ||
| 7146 | */ | ||
| 7147 | int | ||
| 7148 | -__bt_relink(t, h) | ||
| 7149 | - BTREE *t; | ||
| 7150 | - PAGE *h; | ||
| 7151 | +__bt_relink(BTREE *t, PAGE *h) | ||
| 7152 | { | ||
| 7153 | PAGE *pg; | ||
| 7154 | |||
| 7155 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_get.c b/src/plugins/kdb/db2/libdb2/btree/bt_get.c | ||
| 7156 | index b631821..012a341 100644 | ||
| 7157 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_get.c | ||
| 7158 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_get.c | ||
| 7159 | @@ -60,11 +60,7 @@ static char sccsid[] = "@(#)bt_get.c 8.6 (Berkeley) 7/20/94"; | ||
| 7160 | * RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found. | ||
| 7161 | */ | ||
| 7162 | int | ||
| 7163 | -__bt_get(dbp, key, data, flags) | ||
| 7164 | - const DB *dbp; | ||
| 7165 | - const DBT *key; | ||
| 7166 | - DBT *data; | ||
| 7167 | - u_int flags; | ||
| 7168 | +__bt_get(const DB *dbp, const DBT *key, DBT *data, u_int flags) | ||
| 7169 | { | ||
| 7170 | BTREE *t; | ||
| 7171 | EPG *e; | ||
| 7172 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_open.c b/src/plugins/kdb/db2/libdb2/btree/bt_open.c | ||
| 7173 | index 2977b17..0bb19d7 100644 | ||
| 7174 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_open.c | ||
| 7175 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_open.c | ||
| 7176 | @@ -89,10 +89,8 @@ static int tmp __P((void)); | ||
| 7177 | * | ||
| 7178 | */ | ||
| 7179 | DB * | ||
| 7180 | -__bt_open(fname, flags, mode, openinfo, dflags) | ||
| 7181 | - const char *fname; | ||
| 7182 | - int flags, mode, dflags; | ||
| 7183 | - const BTREEINFO *openinfo; | ||
| 7184 | +__bt_open(const char *fname, int flags, int mode, const BTREEINFO *openinfo, | ||
| 7185 | + int dflags) | ||
| 7186 | { | ||
| 7187 | struct stat sb; | ||
| 7188 | BTMETA m; | ||
| 7189 | @@ -352,8 +350,7 @@ err: if (t) { | ||
| 7190 | * RET_ERROR, RET_SUCCESS | ||
| 7191 | */ | ||
| 7192 | static int | ||
| 7193 | -nroot(t) | ||
| 7194 | - BTREE *t; | ||
| 7195 | +nroot(BTREE *t) | ||
| 7196 | { | ||
| 7197 | PAGE *meta, *root; | ||
| 7198 | db_pgno_t npg; | ||
| 7199 | @@ -458,8 +455,7 @@ byteorder() | ||
| 7200 | } | ||
| 7201 | |||
| 7202 | int | ||
| 7203 | -__bt_fd(dbp) | ||
| 7204 | - const DB *dbp; | ||
| 7205 | +__bt_fd(const DB *dbp) | ||
| 7206 | { | ||
| 7207 | BTREE *t; | ||
| 7208 | |||
| 7209 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c b/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c | ||
| 7210 | index 8b1f597..8301b5d 100644 | ||
| 7211 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c | ||
| 7212 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c | ||
| 7213 | @@ -77,12 +77,7 @@ static char sccsid[] = "@(#)bt_overflow.c 8.5 (Berkeley) 7/16/94"; | ||
| 7214 | * RET_ERROR, RET_SUCCESS | ||
| 7215 | */ | ||
| 7216 | int | ||
| 7217 | -__ovfl_get(t, p, ssz, buf, bufsz) | ||
| 7218 | - BTREE *t; | ||
| 7219 | - void *p; | ||
| 7220 | - size_t *ssz; | ||
| 7221 | - void **buf; | ||
| 7222 | - size_t *bufsz; | ||
| 7223 | +__ovfl_get(BTREE *t, void *p, size_t *ssz, void **buf, size_t *bufsz) | ||
| 7224 | { | ||
| 7225 | PAGE *h; | ||
| 7226 | db_pgno_t pg; | ||
| 7227 | @@ -136,10 +131,7 @@ __ovfl_get(t, p, ssz, buf, bufsz) | ||
| 7228 | * RET_ERROR, RET_SUCCESS | ||
| 7229 | */ | ||
| 7230 | int | ||
| 7231 | -__ovfl_put(t, dbt, pg) | ||
| 7232 | - BTREE *t; | ||
| 7233 | - const DBT *dbt; | ||
| 7234 | - db_pgno_t *pg; | ||
| 7235 | +__ovfl_put(BTREE *t, const DBT *dbt, db_pgno_t *pg) | ||
| 7236 | { | ||
| 7237 | PAGE *h, *last; | ||
| 7238 | void *p; | ||
| 7239 | @@ -190,9 +182,7 @@ __ovfl_put(t, dbt, pg) | ||
| 7240 | * RET_ERROR, RET_SUCCESS | ||
| 7241 | */ | ||
| 7242 | int | ||
| 7243 | -__ovfl_delete(t, p) | ||
| 7244 | - BTREE *t; | ||
| 7245 | - void *p; | ||
| 7246 | +__ovfl_delete(BTREE *t, void *p) | ||
| 7247 | { | ||
| 7248 | PAGE *h; | ||
| 7249 | db_pgno_t pg; | ||
| 7250 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_page.c b/src/plugins/kdb/db2/libdb2/btree/bt_page.c | ||
| 7251 | index 3663cf7..38aa39a 100644 | ||
| 7252 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_page.c | ||
| 7253 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_page.c | ||
| 7254 | @@ -57,9 +57,7 @@ static char sccsid[] = "@(#)bt_page.c 8.4 (Berkeley) 11/2/95"; | ||
| 7255 | * mpool_put's the page. | ||
| 7256 | */ | ||
| 7257 | int | ||
| 7258 | -__bt_free(t, h) | ||
| 7259 | - BTREE *t; | ||
| 7260 | - PAGE *h; | ||
| 7261 | +__bt_free(BTREE *t, PAGE *h) | ||
| 7262 | { | ||
| 7263 | /* Insert the page at the head of the free list. */ | ||
| 7264 | h->prevpg = P_INVALID; | ||
| 7265 | @@ -83,9 +81,7 @@ __bt_free(t, h) | ||
| 7266 | * Pointer to a page, NULL on error. | ||
| 7267 | */ | ||
| 7268 | PAGE * | ||
| 7269 | -__bt_new(t, npg) | ||
| 7270 | - BTREE *t; | ||
| 7271 | - db_pgno_t *npg; | ||
| 7272 | +__bt_new(BTREE *t, db_pgno_t *npg) | ||
| 7273 | { | ||
| 7274 | PAGE *h; | ||
| 7275 | |||
| 7276 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_put.c b/src/plugins/kdb/db2/libdb2/btree/bt_put.c | ||
| 7277 | index 7d65928..1303c0b 100644 | ||
| 7278 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_put.c | ||
| 7279 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_put.c | ||
| 7280 | @@ -64,11 +64,7 @@ static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *)); | ||
| 7281 | * tree and R_NOOVERWRITE specified. | ||
| 7282 | */ | ||
| 7283 | int | ||
| 7284 | -__bt_put(dbp, key, data, flags) | ||
| 7285 | - const DB *dbp; | ||
| 7286 | - DBT *key; | ||
| 7287 | - const DBT *data; | ||
| 7288 | - u_int flags; | ||
| 7289 | +__bt_put(const DB *dbp, DBT *key, const DBT *data, u_int flags) | ||
| 7290 | { | ||
| 7291 | BTREE *t; | ||
| 7292 | DBT tkey, tdata; | ||
| 7293 | @@ -272,10 +268,7 @@ u_long bt_cache_hit, bt_cache_miss; | ||
| 7294 | * EPG for new record or NULL if not found. | ||
| 7295 | */ | ||
| 7296 | static EPG * | ||
| 7297 | -bt_fast(t, key, data, exactp) | ||
| 7298 | - BTREE *t; | ||
| 7299 | - const DBT *key, *data; | ||
| 7300 | - int *exactp; | ||
| 7301 | +bt_fast(BTREE *t, const DBT *key, const DBT *data, int *exactp) | ||
| 7302 | { | ||
| 7303 | PAGE *h; | ||
| 7304 | u_int32_t nbytes; | ||
| 7305 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_search.c b/src/plugins/kdb/db2/libdb2/btree/bt_search.c | ||
| 7306 | index c633d14..ed512cc 100644 | ||
| 7307 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_search.c | ||
| 7308 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_search.c | ||
| 7309 | @@ -63,10 +63,7 @@ static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *)); | ||
| 7310 | * the bt_cur field of the tree. A pointer to the field is returned. | ||
| 7311 | */ | ||
| 7312 | EPG * | ||
| 7313 | -__bt_search(t, key, exactp) | ||
| 7314 | - BTREE *t; | ||
| 7315 | - const DBT *key; | ||
| 7316 | - int *exactp; | ||
| 7317 | +__bt_search(BTREE *t, const DBT *key, int *exactp) | ||
| 7318 | { | ||
| 7319 | PAGE *h; | ||
| 7320 | indx_t base, idx, lim; | ||
| 7321 | @@ -148,11 +145,7 @@ next: BT_PUSH(t, h->pgno, idx); | ||
| 7322 | * If an exact match found. | ||
| 7323 | */ | ||
| 7324 | static int | ||
| 7325 | -__bt_snext(t, h, key, exactp) | ||
| 7326 | - BTREE *t; | ||
| 7327 | - PAGE *h; | ||
| 7328 | - const DBT *key; | ||
| 7329 | - int *exactp; | ||
| 7330 | +__bt_snext(BTREE *t, PAGE *h, const DBT *key, int *exactp) | ||
| 7331 | { | ||
| 7332 | BINTERNAL *bi; | ||
| 7333 | EPG e; | ||
| 7334 | @@ -228,11 +221,7 @@ __bt_snext(t, h, key, exactp) | ||
| 7335 | * If an exact match found. | ||
| 7336 | */ | ||
| 7337 | static int | ||
| 7338 | -__bt_sprev(t, h, key, exactp) | ||
| 7339 | - BTREE *t; | ||
| 7340 | - PAGE *h; | ||
| 7341 | - const DBT *key; | ||
| 7342 | - int *exactp; | ||
| 7343 | +__bt_sprev(BTREE *t, PAGE *h, const DBT *key, int *exactp) | ||
| 7344 | { | ||
| 7345 | BINTERNAL *bi; | ||
| 7346 | EPG e; | ||
| 7347 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_seq.c b/src/plugins/kdb/db2/libdb2/btree/bt_seq.c | ||
| 7348 | index 2c8c2de..97db44a 100644 | ||
| 7349 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_seq.c | ||
| 7350 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_seq.c | ||
| 7351 | @@ -102,10 +102,7 @@ static int bt_rseq_prev(BTREE *, EPG *); | ||
| 7352 | * RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key. | ||
| 7353 | */ | ||
| 7354 | int | ||
| 7355 | -__bt_seq(dbp, key, data, flags) | ||
| 7356 | - const DB *dbp; | ||
| 7357 | - DBT *key, *data; | ||
| 7358 | - u_int flags; | ||
| 7359 | +__bt_seq(const DB *dbp, DBT *key, DBT *data, u_int flags) | ||
| 7360 | { | ||
| 7361 | BTREE *t; | ||
| 7362 | EPG e; | ||
| 7363 | @@ -179,11 +176,7 @@ __bt_seq(dbp, key, data, flags) | ||
| 7364 | * RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key. | ||
| 7365 | */ | ||
| 7366 | static int | ||
| 7367 | -__bt_seqset(t, ep, key, flags) | ||
| 7368 | - BTREE *t; | ||
| 7369 | - EPG *ep; | ||
| 7370 | - DBT *key; | ||
| 7371 | - int flags; | ||
| 7372 | +__bt_seqset(BTREE *t, EPG *ep, DBT *key, int flags) | ||
| 7373 | { | ||
| 7374 | PAGE *h; | ||
| 7375 | db_pgno_t pg; | ||
| 7376 | @@ -273,10 +266,7 @@ __bt_seqset(t, ep, key, flags) | ||
| 7377 | * RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key. | ||
| 7378 | */ | ||
| 7379 | static int | ||
| 7380 | -__bt_seqadv(t, ep, flags) | ||
| 7381 | - BTREE *t; | ||
| 7382 | - EPG *ep; | ||
| 7383 | - int flags; | ||
| 7384 | +__bt_seqadv(BTREE *t, EPG *ep, int flags) | ||
| 7385 | { | ||
| 7386 | CURSOR *c; | ||
| 7387 | PAGE *h; | ||
| 7388 | @@ -495,11 +485,7 @@ bt_rseq_prev(BTREE *t, EPG *ep) | ||
| 7389 | * or RET_SPECIAL if no such key exists. | ||
| 7390 | */ | ||
| 7391 | static int | ||
| 7392 | -__bt_first(t, key, erval, exactp) | ||
| 7393 | - BTREE *t; | ||
| 7394 | - const DBT *key; | ||
| 7395 | - EPG *erval; | ||
| 7396 | - int *exactp; | ||
| 7397 | +__bt_first(BTREE *t, const DBT *key, EPG *erval, int *exactp) | ||
| 7398 | { | ||
| 7399 | PAGE *h, *hprev; | ||
| 7400 | EPG *ep, save; | ||
| 7401 | @@ -596,10 +582,7 @@ __bt_first(t, key, erval, exactp) | ||
| 7402 | * index: page index | ||
| 7403 | */ | ||
| 7404 | void | ||
| 7405 | -__bt_setcur(t, pgno, idx) | ||
| 7406 | - BTREE *t; | ||
| 7407 | - db_pgno_t pgno; | ||
| 7408 | - u_int idx; | ||
| 7409 | +__bt_setcur(BTREE *t, db_pgno_t pgno, u_int idx) | ||
| 7410 | { | ||
| 7411 | /* Lose any already deleted key. */ | ||
| 7412 | if (t->bt_cursor.key.data != NULL) { | ||
| 7413 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_split.c b/src/plugins/kdb/db2/libdb2/btree/bt_split.c | ||
| 7414 | index c7e4e72..8901bd6 100644 | ||
| 7415 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_split.c | ||
| 7416 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_split.c | ||
| 7417 | @@ -79,13 +79,8 @@ u_long bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved; | ||
| 7418 | * RET_ERROR, RET_SUCCESS | ||
| 7419 | */ | ||
| 7420 | int | ||
| 7421 | -__bt_split(t, sp, key, data, flags, ilen, argskip) | ||
| 7422 | - BTREE *t; | ||
| 7423 | - PAGE *sp; | ||
| 7424 | - const DBT *key, *data; | ||
| 7425 | - int flags; | ||
| 7426 | - size_t ilen; | ||
| 7427 | - u_int32_t argskip; | ||
| 7428 | +__bt_split(BTREE *t, PAGE *sp, const DBT *key, const DBT *data, int flags, | ||
| 7429 | + size_t ilen, u_int32_t argskip) | ||
| 7430 | { | ||
| 7431 | BINTERNAL *bi = NULL; | ||
| 7432 | BLEAF *bl = NULL, *tbl; | ||
| 7433 | @@ -345,11 +340,7 @@ err2: mpool_put(t->bt_mp, l, 0); | ||
| 7434 | * Pointer to page in which to insert or NULL on error. | ||
| 7435 | */ | ||
| 7436 | static PAGE * | ||
| 7437 | -bt_page(t, h, lp, rp, skip, ilen) | ||
| 7438 | - BTREE *t; | ||
| 7439 | - PAGE *h, **lp, **rp; | ||
| 7440 | - indx_t *skip; | ||
| 7441 | - size_t ilen; | ||
| 7442 | +bt_page(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen) | ||
| 7443 | { | ||
| 7444 | PAGE *l, *r, *tp; | ||
| 7445 | db_pgno_t npg; | ||
| 7446 | @@ -450,11 +441,7 @@ bt_page(t, h, lp, rp, skip, ilen) | ||
| 7447 | * Pointer to page in which to insert or NULL on error. | ||
| 7448 | */ | ||
| 7449 | static PAGE * | ||
| 7450 | -bt_root(t, h, lp, rp, skip, ilen) | ||
| 7451 | - BTREE *t; | ||
| 7452 | - PAGE *h, **lp, **rp; | ||
| 7453 | - indx_t *skip; | ||
| 7454 | - size_t ilen; | ||
| 7455 | +bt_root(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen) | ||
| 7456 | { | ||
| 7457 | PAGE *l, *r, *tp; | ||
| 7458 | db_pgno_t lnpg, rnpg; | ||
| 7459 | @@ -497,9 +484,7 @@ bt_root(t, h, lp, rp, skip, ilen) | ||
| 7460 | * RET_ERROR, RET_SUCCESS | ||
| 7461 | */ | ||
| 7462 | static int | ||
| 7463 | -bt_rroot(t, h, l, r) | ||
| 7464 | - BTREE *t; | ||
| 7465 | - PAGE *h, *l, *r; | ||
| 7466 | +bt_rroot(BTREE *t, PAGE *h, PAGE *l, PAGE *r) | ||
| 7467 | { | ||
| 7468 | char *dest; | ||
| 7469 | |||
| 7470 | @@ -537,9 +522,7 @@ bt_rroot(t, h, l, r) | ||
| 7471 | * RET_ERROR, RET_SUCCESS | ||
| 7472 | */ | ||
| 7473 | static int | ||
| 7474 | -bt_broot(t, h, l, r) | ||
| 7475 | - BTREE *t; | ||
| 7476 | - PAGE *h, *l, *r; | ||
| 7477 | +bt_broot(BTREE *t, PAGE *h, PAGE *l, PAGE *r) | ||
| 7478 | { | ||
| 7479 | BINTERNAL *bi; | ||
| 7480 | BLEAF *bl; | ||
| 7481 | @@ -617,11 +600,7 @@ bt_broot(t, h, l, r) | ||
| 7482 | * Pointer to page in which to insert. | ||
| 7483 | */ | ||
| 7484 | static PAGE * | ||
| 7485 | -bt_psplit(t, h, l, r, pskip, ilen) | ||
| 7486 | - BTREE *t; | ||
| 7487 | - PAGE *h, *l, *r; | ||
| 7488 | - indx_t *pskip; | ||
| 7489 | - size_t ilen; | ||
| 7490 | +bt_psplit(BTREE *t, PAGE *h, PAGE *l, PAGE *r, indx_t *pskip, size_t ilen) | ||
| 7491 | { | ||
| 7492 | BINTERNAL *bi; | ||
| 7493 | BLEAF *bl; | ||
| 7494 | @@ -796,9 +775,7 @@ bt_psplit(t, h, l, r, pskip, ilen) | ||
| 7495 | * RET_SUCCESS, RET_ERROR. | ||
| 7496 | */ | ||
| 7497 | static int | ||
| 7498 | -bt_preserve(t, pg) | ||
| 7499 | - BTREE *t; | ||
| 7500 | - db_pgno_t pg; | ||
| 7501 | +bt_preserve(BTREE *t, db_pgno_t pg) | ||
| 7502 | { | ||
| 7503 | PAGE *h; | ||
| 7504 | |||
| 7505 | @@ -824,8 +801,7 @@ bt_preserve(t, pg) | ||
| 7506 | * all the way back to bt_split/bt_rroot and it's not very clean. | ||
| 7507 | */ | ||
| 7508 | static recno_t | ||
| 7509 | -rec_total(h) | ||
| 7510 | - PAGE *h; | ||
| 7511 | +rec_total(PAGE *h) | ||
| 7512 | { | ||
| 7513 | recno_t recs; | ||
| 7514 | indx_t nxt, top; | ||
| 7515 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_utils.c b/src/plugins/kdb/db2/libdb2/btree/bt_utils.c | ||
| 7516 | index be2f24f..13d1f2c 100644 | ||
| 7517 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_utils.c | ||
| 7518 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_utils.c | ||
| 7519 | @@ -64,11 +64,8 @@ static char sccsid[] = "@(#)bt_utils.c 8.8 (Berkeley) 7/20/94"; | ||
| 7520 | * RET_SUCCESS, RET_ERROR. | ||
| 7521 | */ | ||
| 7522 | int | ||
| 7523 | -__bt_ret(t, e, key, rkey, data, rdata, copy) | ||
| 7524 | - BTREE *t; | ||
| 7525 | - EPG *e; | ||
| 7526 | - DBT *key, *rkey, *data, *rdata; | ||
| 7527 | - int copy; | ||
| 7528 | +__bt_ret(BTREE *t, EPG *e, DBT *key, DBT *rkey, DBT *data, DBT *rdata, | ||
| 7529 | + int copy) | ||
| 7530 | { | ||
| 7531 | BLEAF *bl; | ||
| 7532 | void *p; | ||
| 7533 | @@ -150,10 +147,7 @@ dataonly: | ||
| 7534 | * > 0 if k1 is > record | ||
| 7535 | */ | ||
| 7536 | int | ||
| 7537 | -__bt_cmp(t, k1, e) | ||
| 7538 | - BTREE *t; | ||
| 7539 | - const DBT *k1; | ||
| 7540 | - EPG *e; | ||
| 7541 | +__bt_cmp(BTREE *t, const DBT *k1, EPG *e) | ||
| 7542 | { | ||
| 7543 | BINTERNAL *bi; | ||
| 7544 | BLEAF *bl; | ||
| 7545 | @@ -213,8 +207,7 @@ __bt_cmp(t, k1, e) | ||
| 7546 | * > 0 if a is > b | ||
| 7547 | */ | ||
| 7548 | int | ||
| 7549 | -__bt_defcmp(a, b) | ||
| 7550 | - const DBT *a, *b; | ||
| 7551 | +__bt_defcmp(const DBT *a, const DBT *b) | ||
| 7552 | { | ||
| 7553 | size_t len; | ||
| 7554 | u_char *p1, *p2; | ||
| 7555 | @@ -243,8 +236,7 @@ __bt_defcmp(a, b) | ||
| 7556 | * Number of bytes needed to distinguish b from a. | ||
| 7557 | */ | ||
| 7558 | size_t | ||
| 7559 | -__bt_defpfx(a, b) | ||
| 7560 | - const DBT *a, *b; | ||
| 7561 | +__bt_defpfx(const DBT *a, const DBT *b) | ||
| 7562 | { | ||
| 7563 | u_char *p1, *p2; | ||
| 7564 | size_t cnt, len; | ||
| 7565 | diff --git a/src/plugins/kdb/db2/libdb2/db/db.c b/src/plugins/kdb/db2/libdb2/db/db.c | ||
| 7566 | index fba7795..f85484f 100644 | ||
| 7567 | --- a/src/plugins/kdb/db2/libdb2/db/db.c | ||
| 7568 | +++ b/src/plugins/kdb/db2/libdb2/db/db.c | ||
| 7569 | @@ -45,11 +45,8 @@ static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94"; | ||
| 7570 | #include "db-int.h" | ||
| 7571 | |||
| 7572 | DB * | ||
| 7573 | -kdb2_dbopen(fname, flags, mode, type, openinfo) | ||
| 7574 | - const char *fname; | ||
| 7575 | - int flags, mode; | ||
| 7576 | - DBTYPE type; | ||
| 7577 | - const void *openinfo; | ||
| 7578 | +kdb2_dbopen(const char *fname, int flags, int mode, DBTYPE type, | ||
| 7579 | + const void *openinfo) | ||
| 7580 | { | ||
| 7581 | |||
| 7582 | #define DB_FLAGS (DB_LOCK | DB_SHMEM | DB_TXN) | ||
| 7583 | @@ -74,7 +71,7 @@ kdb2_dbopen(fname, flags, mode, type, openinfo) | ||
| 7584 | } | ||
| 7585 | |||
| 7586 | static int | ||
| 7587 | -__dberr() | ||
| 7588 | +__dberr(void) | ||
| 7589 | { | ||
| 7590 | return (RET_ERROR); | ||
| 7591 | } | ||
| 7592 | @@ -86,14 +83,15 @@ __dberr() | ||
| 7593 | * dbp: pointer to the DB structure. | ||
| 7594 | */ | ||
| 7595 | void | ||
| 7596 | -__dbpanic(dbp) | ||
| 7597 | - DB *dbp; | ||
| 7598 | +__dbpanic(DB *dbp) | ||
| 7599 | { | ||
| 7600 | /* The only thing that can succeed is a close. */ | ||
| 7601 | - dbp->del = (int (*)())__dberr; | ||
| 7602 | - dbp->fd = (int (*)())__dberr; | ||
| 7603 | - dbp->get = (int (*)())__dberr; | ||
| 7604 | - dbp->put = (int (*)())__dberr; | ||
| 7605 | - dbp->seq = (int (*)())__dberr; | ||
| 7606 | - dbp->sync = (int (*)())__dberr; | ||
| 7607 | + dbp->del = (int (*)(const struct __db *, const DBT *, u_int))__dberr; | ||
| 7608 | + dbp->fd = (int (*)(const struct __db *))__dberr; | ||
| 7609 | + dbp->get = (int (*)(const struct __db *, const DBT *, DBT *, | ||
| 7610 | + u_int))__dberr; | ||
| 7611 | + dbp->put = (int (*)(const struct __db *, DBT *, const DBT *, | ||
| 7612 | + u_int))__dberr; | ||
| 7613 | + dbp->seq = (int (*)(const struct __db *, DBT *, DBT *, u_int))__dberr; | ||
| 7614 | + dbp->sync = (int (*)(const struct __db *, u_int))__dberr; | ||
| 7615 | } | ||
| 7616 | diff --git a/src/plugins/kdb/db2/libdb2/hash/dbm.c b/src/plugins/kdb/db2/libdb2/hash/dbm.c | ||
| 7617 | index 4878cbc..2dca256 100644 | ||
| 7618 | --- a/src/plugins/kdb/db2/libdb2/hash/dbm.c | ||
| 7619 | +++ b/src/plugins/kdb/db2/libdb2/hash/dbm.c | ||
| 7620 | @@ -69,8 +69,7 @@ static DBM *__cur_db; | ||
| 7621 | static void no_open_db __P((void)); | ||
| 7622 | |||
| 7623 | int | ||
| 7624 | -kdb2_dbminit(file) | ||
| 7625 | - char *file; | ||
| 7626 | +kdb2_dbminit(char *file) | ||
| 7627 | { | ||
| 7628 | if (__cur_db != NULL) | ||
| 7629 | (void)kdb2_dbm_close(__cur_db); | ||
| 7630 | @@ -82,8 +81,7 @@ kdb2_dbminit(file) | ||
| 7631 | } | ||
| 7632 | |||
| 7633 | datum | ||
| 7634 | -kdb2_fetch(key) | ||
| 7635 | - datum key; | ||
| 7636 | +kdb2_fetch(datum key) | ||
| 7637 | { | ||
| 7638 | datum item; | ||
| 7639 | |||
| 7640 | @@ -111,8 +109,7 @@ kdb2_firstkey() | ||
| 7641 | } | ||
| 7642 | |||
| 7643 | datum | ||
| 7644 | -kdb2_nextkey(key) | ||
| 7645 | - datum key; | ||
| 7646 | +kdb2_nextkey(datum key) | ||
| 7647 | { | ||
| 7648 | datum item; | ||
| 7649 | |||
| 7650 | @@ -126,8 +123,7 @@ kdb2_nextkey(key) | ||
| 7651 | } | ||
| 7652 | |||
| 7653 | int | ||
| 7654 | -kdb2_delete(key) | ||
| 7655 | - datum key; | ||
| 7656 | +kdb2_delete(datum key) | ||
| 7657 | { | ||
| 7658 | if (__cur_db == NULL) { | ||
| 7659 | no_open_db(); | ||
| 7660 | @@ -137,8 +133,7 @@ kdb2_delete(key) | ||
| 7661 | } | ||
| 7662 | |||
| 7663 | int | ||
| 7664 | -kdb2_store(key, dat) | ||
| 7665 | - datum key, dat; | ||
| 7666 | +kdb2_store(datum key, datum dat) | ||
| 7667 | { | ||
| 7668 | if (__cur_db == NULL) { | ||
| 7669 | no_open_db(); | ||
| 7670 | @@ -159,9 +154,7 @@ no_open_db() | ||
| 7671 | * NULL on failure | ||
| 7672 | */ | ||
| 7673 | DBM * | ||
| 7674 | -kdb2_dbm_open(file, flags, mode) | ||
| 7675 | - const char *file; | ||
| 7676 | - int flags, mode; | ||
| 7677 | +kdb2_dbm_open(const char *file, int flags, int mode) | ||
| 7678 | { | ||
| 7679 | HASHINFO info; | ||
| 7680 | char path[MAXPATHLEN]; | ||
| 7681 | @@ -183,8 +176,7 @@ kdb2_dbm_open(file, flags, mode) | ||
| 7682 | * Nothing. | ||
| 7683 | */ | ||
| 7684 | void | ||
| 7685 | -kdb2_dbm_close(db) | ||
| 7686 | - DBM *db; | ||
| 7687 | +kdb2_dbm_close(DBM *db) | ||
| 7688 | { | ||
| 7689 | (void)(db->close)(db); | ||
| 7690 | } | ||
| 7691 | @@ -195,9 +187,7 @@ kdb2_dbm_close(db) | ||
| 7692 | * NULL on failure | ||
| 7693 | */ | ||
| 7694 | datum | ||
| 7695 | -kdb2_dbm_fetch(db, key) | ||
| 7696 | - DBM *db; | ||
| 7697 | - datum key; | ||
| 7698 | +kdb2_dbm_fetch(DBM *db, datum key) | ||
| 7699 | { | ||
| 7700 | datum retval; | ||
| 7701 | int status; | ||
| 7702 | @@ -226,8 +216,7 @@ kdb2_dbm_fetch(db, key) | ||
| 7703 | * NULL on failure | ||
| 7704 | */ | ||
| 7705 | datum | ||
| 7706 | -kdb2_dbm_firstkey(db) | ||
| 7707 | - DBM *db; | ||
| 7708 | +kdb2_dbm_firstkey(DBM *db) | ||
| 7709 | { | ||
| 7710 | int status; | ||
| 7711 | datum retkey; | ||
| 7712 | @@ -254,8 +243,7 @@ kdb2_dbm_firstkey(db) | ||
| 7713 | * NULL on failure | ||
| 7714 | */ | ||
| 7715 | datum | ||
| 7716 | -kdb2_dbm_nextkey(db) | ||
| 7717 | - DBM *db; | ||
| 7718 | +kdb2_dbm_nextkey(DBM *db) | ||
| 7719 | { | ||
| 7720 | int status; | ||
| 7721 | datum retkey; | ||
| 7722 | @@ -282,9 +270,7 @@ kdb2_dbm_nextkey(db) | ||
| 7723 | * <0 failure | ||
| 7724 | */ | ||
| 7725 | int | ||
| 7726 | -kdb2_dbm_delete(db, key) | ||
| 7727 | - DBM *db; | ||
| 7728 | - datum key; | ||
| 7729 | +kdb2_dbm_delete(DBM *db, datum key) | ||
| 7730 | { | ||
| 7731 | int status; | ||
| 7732 | |||
| 7733 | @@ -310,10 +296,7 @@ kdb2_dbm_delete(db, key) | ||
| 7734 | * 1 if DBM_INSERT and entry exists | ||
| 7735 | */ | ||
| 7736 | int | ||
| 7737 | -kdb2_dbm_store(db, key, content, flags) | ||
| 7738 | - DBM *db; | ||
| 7739 | - datum key, content; | ||
| 7740 | - int flags; | ||
| 7741 | +kdb2_dbm_store(DBM *db, datum key, datum content, int flags) | ||
| 7742 | { | ||
| 7743 | #ifdef NEED_COPY | ||
| 7744 | DBT k, c; | ||
| 7745 | @@ -331,8 +314,7 @@ kdb2_dbm_store(db, key, content, flags) | ||
| 7746 | } | ||
| 7747 | |||
| 7748 | int | ||
| 7749 | -kdb2_dbm_error(db) | ||
| 7750 | - DBM *db; | ||
| 7751 | +kdb2_dbm_error(DBM *db) | ||
| 7752 | { | ||
| 7753 | HTAB *hp; | ||
| 7754 | |||
| 7755 | @@ -341,8 +323,7 @@ kdb2_dbm_error(db) | ||
| 7756 | } | ||
| 7757 | |||
| 7758 | int | ||
| 7759 | -kdb2_dbm_clearerr(db) | ||
| 7760 | - DBM *db; | ||
| 7761 | +kdb2_dbm_clearerr(DBM *db) | ||
| 7762 | { | ||
| 7763 | HTAB *hp; | ||
| 7764 | |||
| 7765 | @@ -352,8 +333,7 @@ kdb2_dbm_clearerr(db) | ||
| 7766 | } | ||
| 7767 | |||
| 7768 | int | ||
| 7769 | -kdb2_dbm_dirfno(db) | ||
| 7770 | - DBM *db; | ||
| 7771 | +kdb2_dbm_dirfno(DBM *db) | ||
| 7772 | { | ||
| 7773 | return(((HTAB *)db->internal)->fp); | ||
| 7774 | } | ||
| 7775 | diff --git a/src/plugins/kdb/db2/libdb2/hash/hash.c b/src/plugins/kdb/db2/libdb2/hash/hash.c | ||
| 7776 | index 862dbb1..7c3e951 100644 | ||
| 7777 | --- a/src/plugins/kdb/db2/libdb2/hash/hash.c | ||
| 7778 | +++ b/src/plugins/kdb/db2/libdb2/hash/hash.c | ||
| 7779 | @@ -94,10 +94,8 @@ u_int32_t hash_accesses, hash_collisions, hash_expansions, hash_overflows, | ||
| 7780 | /* OPEN/CLOSE */ | ||
| 7781 | |||
| 7782 | extern DB * | ||
| 7783 | -__kdb2_hash_open(file, flags, mode, info, dflags) | ||
| 7784 | - const char *file; | ||
| 7785 | - int flags, mode, dflags; | ||
| 7786 | - const HASHINFO *info; /* Special directives for create */ | ||
| 7787 | +__kdb2_hash_open(const char *file, int flags, int mode, const HASHINFO *info, | ||
| 7788 | + int dflags) | ||
| 7789 | { | ||
| 7790 | struct stat statbuf; | ||
| 7791 | DB *dbp; | ||
| 7792 | @@ -260,8 +258,7 @@ error0: | ||
| 7793 | } | ||
| 7794 | |||
| 7795 | static int32_t | ||
| 7796 | -hash_close(dbp) | ||
| 7797 | - DB *dbp; | ||
| 7798 | +hash_close(DB *dbp) | ||
| 7799 | { | ||
| 7800 | HTAB *hashp; | ||
| 7801 | int32_t retval; | ||
| 7802 | @@ -276,8 +273,7 @@ hash_close(dbp) | ||
| 7803 | } | ||
| 7804 | |||
| 7805 | static int32_t | ||
| 7806 | -hash_fd(dbp) | ||
| 7807 | - const DB *dbp; | ||
| 7808 | +hash_fd(const DB *dbp) | ||
| 7809 | { | ||
| 7810 | HTAB *hashp; | ||
| 7811 | |||
| 7812 | @@ -294,10 +290,7 @@ hash_fd(dbp) | ||
| 7813 | |||
| 7814 | /************************** LOCAL CREATION ROUTINES **********************/ | ||
| 7815 | static HTAB * | ||
| 7816 | -init_hash(hashp, file, info) | ||
| 7817 | - HTAB *hashp; | ||
| 7818 | - const char *file; | ||
| 7819 | - const HASHINFO *info; | ||
| 7820 | +init_hash(HTAB *hashp, const char *file, const HASHINFO *info) | ||
| 7821 | { | ||
| 7822 | struct stat statbuf; | ||
| 7823 | |||
| 7824 | @@ -349,9 +342,7 @@ init_hash(hashp, file, info) | ||
| 7825 | * Returns 0 on No Error | ||
| 7826 | */ | ||
| 7827 | static int32_t | ||
| 7828 | -init_htab(hashp, nelem) | ||
| 7829 | - HTAB *hashp; | ||
| 7830 | - int32_t nelem; | ||
| 7831 | +init_htab(HTAB *hashp, int32_t nelem) | ||
| 7832 | { | ||
| 7833 | int32_t l2, nbuckets; | ||
| 7834 | |||
| 7835 | @@ -403,9 +394,7 @@ init_htab(hashp, nelem) | ||
| 7836 | * Functions to get/put hash header. We access the file directly. | ||
| 7837 | */ | ||
| 7838 | static u_int32_t | ||
| 7839 | -hget_header(hashp, page_size) | ||
| 7840 | - HTAB *hashp; | ||
| 7841 | - u_int32_t page_size; | ||
| 7842 | +hget_header(HTAB *hashp, u_int32_t page_size) | ||
| 7843 | { | ||
| 7844 | u_int32_t num_copied; | ||
| 7845 | u_int8_t *hdr_dest; | ||
| 7846 | @@ -431,8 +420,7 @@ hget_header(hashp, page_size) | ||
| 7847 | } | ||
| 7848 | |||
| 7849 | static void | ||
| 7850 | -hput_header(hashp) | ||
| 7851 | - HTAB *hashp; | ||
| 7852 | +hput_header(HTAB *hashp) | ||
| 7853 | { | ||
| 7854 | HASHHDR *whdrp; | ||
| 7855 | #if DB_BYTE_ORDER == DB_LITTLE_ENDIAN | ||
| 7856 | @@ -462,8 +450,7 @@ hput_header(hashp) | ||
| 7857 | * structure, freeing all allocated space. | ||
| 7858 | */ | ||
| 7859 | static int32_t | ||
| 7860 | -hdestroy(hashp) | ||
| 7861 | - HTAB *hashp; | ||
| 7862 | +hdestroy(HTAB *hashp) | ||
| 7863 | { | ||
| 7864 | int32_t save_errno; | ||
| 7865 | |||
| 7866 | @@ -549,9 +536,7 @@ hdestroy(hashp) | ||
| 7867 | * -1 ERROR | ||
| 7868 | */ | ||
| 7869 | static int32_t | ||
| 7870 | -hash_sync(dbp, flags) | ||
| 7871 | - const DB *dbp; | ||
| 7872 | - u_int32_t flags; | ||
| 7873 | +hash_sync(const DB *dbp, u_int32_t flags) | ||
| 7874 | { | ||
| 7875 | HTAB *hashp; | ||
| 7876 | |||
| 7877 | @@ -570,8 +555,7 @@ hash_sync(dbp, flags) | ||
| 7878 | * -1 indicates that errno should be set | ||
| 7879 | */ | ||
| 7880 | static int32_t | ||
| 7881 | -flush_meta(hashp) | ||
| 7882 | - HTAB *hashp; | ||
| 7883 | +flush_meta(HTAB *hashp) | ||
| 7884 | { | ||
| 7885 | int32_t i; | ||
| 7886 | |||
| 7887 | @@ -607,11 +591,7 @@ flush_meta(hashp) | ||
| 7888 | /* *** make sure this is true! */ | ||
| 7889 | |||
| 7890 | static int32_t | ||
| 7891 | -hash_get(dbp, key, data, flag) | ||
| 7892 | - const DB *dbp; | ||
| 7893 | - const DBT *key; | ||
| 7894 | - DBT *data; | ||
| 7895 | - u_int32_t flag; | ||
| 7896 | +hash_get(const DB *dbp, const DBT *key, DBT *data, u_int32_t flag) | ||
| 7897 | { | ||
| 7898 | HTAB *hashp; | ||
| 7899 | |||
| 7900 | @@ -624,11 +604,7 @@ hash_get(dbp, key, data, flag) | ||
| 7901 | } | ||
| 7902 | |||
| 7903 | static int32_t | ||
| 7904 | -hash_put(dbp, key, data, flag) | ||
| 7905 | - const DB *dbp; | ||
| 7906 | - DBT *key; | ||
| 7907 | - const DBT *data; | ||
| 7908 | - u_int32_t flag; | ||
| 7909 | +hash_put(const DB *dbp, DBT *key, const DBT *data, u_int32_t flag) | ||
| 7910 | { | ||
| 7911 | HTAB *hashp; | ||
| 7912 | |||
| 7913 | @@ -646,10 +622,7 @@ hash_put(dbp, key, data, flag) | ||
| 7914 | } | ||
| 7915 | |||
| 7916 | static int32_t | ||
| 7917 | -hash_delete(dbp, key, flag) | ||
| 7918 | - const DB *dbp; | ||
| 7919 | - const DBT *key; | ||
| 7920 | - u_int32_t flag; /* Ignored */ | ||
| 7921 | +hash_delete(const DB *dbp, const DBT *key, u_int32_t flag) | ||
| 7922 | { | ||
| 7923 | HTAB *hashp; | ||
| 7924 | |||
| 7925 | @@ -670,11 +643,7 @@ hash_delete(dbp, key, flag) | ||
| 7926 | * Assume that hashp has been set in wrapper routine. | ||
| 7927 | */ | ||
| 7928 | static int32_t | ||
| 7929 | -hash_access(hashp, action, key, val) | ||
| 7930 | - HTAB *hashp; | ||
| 7931 | - ACTION action; | ||
| 7932 | - const DBT *key; | ||
| 7933 | - DBT *val; | ||
| 7934 | +hash_access(HTAB *hashp, ACTION action, const DBT *key, DBT *val) | ||
| 7935 | { | ||
| 7936 | DBT page_key, page_val; | ||
| 7937 | CURSOR cursor; | ||
| 7938 | @@ -791,8 +760,7 @@ found: __get_item_done(hashp, &cursor); | ||
| 7939 | |||
| 7940 | /* ****************** CURSORS ********************************** */ | ||
| 7941 | CURSOR * | ||
| 7942 | -__cursor_creat(dbp) | ||
| 7943 | - const DB *dbp; | ||
| 7944 | +__cursor_creat(const DB *dbp) | ||
| 7945 | { | ||
| 7946 | CURSOR *new_curs; | ||
| 7947 | HTAB *hashp; | ||
| 7948 | @@ -823,11 +791,7 @@ __cursor_creat(dbp) | ||
| 7949 | } | ||
| 7950 | |||
| 7951 | static int32_t | ||
| 7952 | -cursor_get(dbp, cursorp, key, val, flags) | ||
| 7953 | - const DB *dbp; | ||
| 7954 | - CURSOR *cursorp; | ||
| 7955 | - DBT *key, *val; | ||
| 7956 | - u_int32_t flags; | ||
| 7957 | +cursor_get(const DB *dbp, CURSOR *cursorp, DBT *key, DBT *val, u_int32_t flags) | ||
| 7958 | { | ||
| 7959 | HTAB *hashp; | ||
| 7960 | ITEM_INFO item_info; | ||
| 7961 | @@ -896,10 +860,7 @@ cursor_get(dbp, cursorp, key, val, flags) | ||
| 7962 | } | ||
| 7963 | |||
| 7964 | static int32_t | ||
| 7965 | -cursor_delete(dbp, cursor, flags) | ||
| 7966 | - const DB *dbp; | ||
| 7967 | - CURSOR *cursor; | ||
| 7968 | - u_int32_t flags; | ||
| 7969 | +cursor_delete(const DB *dbp, CURSOR *cursor, u_int32_t flags) | ||
| 7970 | { | ||
| 7971 | /* XXX this is empirically determined, so it might not be completely | ||
| 7972 | correct, but it seems to work. At the very least it fixes | ||
| 7973 | @@ -912,10 +873,7 @@ cursor_delete(dbp, cursor, flags) | ||
| 7974 | } | ||
| 7975 | |||
| 7976 | static int32_t | ||
| 7977 | -hash_seq(dbp, key, val, flag) | ||
| 7978 | - const DB *dbp; | ||
| 7979 | - DBT *key, *val; | ||
| 7980 | - u_int32_t flag; | ||
| 7981 | +hash_seq(const DB *dbp, DBT *key, DBT *val, u_int32_t flag) | ||
| 7982 | { | ||
| 7983 | HTAB *hashp; | ||
| 7984 | |||
| 7985 | @@ -939,8 +897,7 @@ hash_seq(dbp, key, val, flag) | ||
| 7986 | * -1 ==> Error | ||
| 7987 | */ | ||
| 7988 | int32_t | ||
| 7989 | -__expand_table(hashp) | ||
| 7990 | - HTAB *hashp; | ||
| 7991 | +__expand_table(HTAB *hashp) | ||
| 7992 | { | ||
| 7993 | u_int32_t old_bucket, new_bucket; | ||
| 7994 | int32_t spare_ndx; | ||
| 7995 | @@ -979,10 +936,7 @@ __expand_table(hashp) | ||
| 7996 | } | ||
| 7997 | |||
| 7998 | u_int32_t | ||
| 7999 | -__call_hash(hashp, k, len) | ||
| 8000 | - HTAB *hashp; | ||
| 8001 | - int8_t *k; | ||
| 8002 | - int32_t len; | ||
| 8003 | +__call_hash(HTAB *hashp, int8_t *k, int32_t len) | ||
| 8004 | { | ||
| 8005 | u_int32_t n, bucket; | ||
| 8006 | |||
| 8007 | @@ -998,8 +952,7 @@ __call_hash(hashp, k, len) | ||
| 8008 | * Hashp->hdr needs to be byteswapped. | ||
| 8009 | */ | ||
| 8010 | static void | ||
| 8011 | -swap_header_copy(srcp, destp) | ||
| 8012 | - HASHHDR *srcp, *destp; | ||
| 8013 | +swap_header_copy(HASHHDR *srcp, HASHHDR *destp) | ||
| 8014 | { | ||
| 8015 | int32_t i; | ||
| 8016 | |||
| 8017 | @@ -1024,8 +977,7 @@ swap_header_copy(srcp, destp) | ||
| 8018 | } | ||
| 8019 | |||
| 8020 | static void | ||
| 8021 | -swap_header(hashp) | ||
| 8022 | - HTAB *hashp; | ||
| 8023 | +swap_header(HTAB *hashp) | ||
| 8024 | { | ||
| 8025 | HASHHDR *hdrp; | ||
| 8026 | int32_t i; | ||
| 8027 | diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c | ||
| 8028 | index 4b95278..6befb7a 100644 | ||
| 8029 | --- a/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c | ||
| 8030 | +++ b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c | ||
| 8031 | @@ -83,10 +83,7 @@ static int32_t collect_data __P((HTAB *, PAGE16 *, int32_t)); | ||
| 8032 | * -1 ==> ERROR | ||
| 8033 | */ | ||
| 8034 | int32_t | ||
| 8035 | -__big_insert(hashp, pagep, key, val) | ||
| 8036 | - HTAB *hashp; | ||
| 8037 | - PAGE16 *pagep; | ||
| 8038 | - const DBT *key, *val; | ||
| 8039 | +__big_insert(HTAB *hashp, PAGE16 *pagep, const DBT *key, const DBT *val) | ||
| 8040 | { | ||
| 8041 | size_t key_size, val_size; | ||
| 8042 | indx_t key_move_bytes, val_move_bytes; | ||
| 8043 | @@ -185,11 +182,7 @@ __big_delete(hashp, pagep, ndx) | ||
| 8044 | * -1 error | ||
| 8045 | */ | ||
| 8046 | int32_t | ||
| 8047 | -__find_bigpair(hashp, cursorp, key, size) | ||
| 8048 | - HTAB *hashp; | ||
| 8049 | - CURSOR *cursorp; | ||
| 8050 | - int8_t *key; | ||
| 8051 | - int32_t size; | ||
| 8052 | +__find_bigpair(HTAB *hashp, CURSOR *cursorp, int8_t *key, int32_t size) | ||
| 8053 | { | ||
| 8054 | PAGE16 *pagep, *hold_pagep; | ||
| 8055 | db_pgno_t next_pgno; | ||
| 8056 | @@ -257,11 +250,7 @@ __find_bigpair(hashp, cursorp, key, size) | ||
| 8057 | * Fill in the key and data for this big pair. | ||
| 8058 | */ | ||
| 8059 | int32_t | ||
| 8060 | -__big_keydata(hashp, pagep, key, val, ndx) | ||
| 8061 | - HTAB *hashp; | ||
| 8062 | - PAGE16 *pagep; | ||
| 8063 | - DBT *key, *val; | ||
| 8064 | - int32_t ndx; | ||
| 8065 | +__big_keydata(HTAB *hashp, PAGE16 *pagep, DBT *key, DBT *val, int32_t ndx) | ||
| 8066 | { | ||
| 8067 | ITEM_INFO ii; | ||
| 8068 | PAGE16 *key_pagep; | ||
| 8069 | @@ -315,11 +304,8 @@ __get_bigkey(hashp, pagep, ndx, key) | ||
| 8070 | * Return the big key and data indicated in item_info. | ||
| 8071 | */ | ||
| 8072 | int32_t | ||
| 8073 | -__big_return(hashp, item_info, val, on_bigkey_page) | ||
| 8074 | - HTAB *hashp; | ||
| 8075 | - ITEM_INFO *item_info; | ||
| 8076 | - DBT *val; | ||
| 8077 | - int32_t on_bigkey_page; | ||
| 8078 | +__big_return(HTAB *hashp, ITEM_INFO *item_info, DBT *val, | ||
| 8079 | + int32_t on_bigkey_page) | ||
| 8080 | { | ||
| 8081 | PAGE16 *pagep; | ||
| 8082 | db_pgno_t next_pgno; | ||
| 8083 | @@ -366,11 +352,7 @@ __big_return(hashp, item_info, val, on_bigkey_page) | ||
| 8084 | * Return total length of data; -1 if error. | ||
| 8085 | */ | ||
| 8086 | static int32_t | ||
| 8087 | -collect_key(hashp, pagep, len, last_page) | ||
| 8088 | - HTAB *hashp; | ||
| 8089 | - PAGE16 *pagep; | ||
| 8090 | - int32_t len; | ||
| 8091 | - db_pgno_t *last_page; | ||
| 8092 | +collect_key(HTAB *hashp, PAGE16 *pagep, int32_t len, db_pgno_t *last_page) | ||
| 8093 | { | ||
| 8094 | PAGE16 *next_pagep; | ||
| 8095 | int32_t totlen, retval; | ||
| 8096 | @@ -434,10 +416,7 @@ collect_key(hashp, pagep, len, last_page) | ||
| 8097 | * Return total length of data; -1 if error. | ||
| 8098 | */ | ||
| 8099 | static int32_t | ||
| 8100 | -collect_data(hashp, pagep, len) | ||
| 8101 | - HTAB *hashp; | ||
| 8102 | - PAGE16 *pagep; | ||
| 8103 | - int32_t len; | ||
| 8104 | +collect_data(HTAB *hashp, PAGE16 *pagep, int32_t len) | ||
| 8105 | { | ||
| 8106 | PAGE16 *next_pagep; | ||
| 8107 | int32_t totlen, retval; | ||
| 8108 | diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_func.c b/src/plugins/kdb/db2/libdb2/hash/hash_func.c | ||
| 8109 | index 1dee694..f169be6 100644 | ||
| 8110 | --- a/src/plugins/kdb/db2/libdb2/hash/hash_func.c | ||
| 8111 | +++ b/src/plugins/kdb/db2/libdb2/hash/hash_func.c | ||
| 8112 | @@ -66,9 +66,7 @@ u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4; | ||
| 8113 | |||
| 8114 | #if 0 | ||
| 8115 | static u_int32_t | ||
| 8116 | -hash1(key, len) | ||
| 8117 | - const void *key; | ||
| 8118 | - size_t len; | ||
| 8119 | +hash1(const void *key, size_t len) | ||
| 8120 | { | ||
| 8121 | u_int32_t h; | ||
| 8122 | u_int8_t *k; | ||
| 8123 | @@ -88,9 +86,7 @@ hash1(key, len) | ||
| 8124 | #define dcharhash(h, c) ((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c)) | ||
| 8125 | |||
| 8126 | static u_int32_t | ||
| 8127 | -hash2(key, len) | ||
| 8128 | - const void *key; | ||
| 8129 | - size_t len; | ||
| 8130 | +hash2(const void *key, size_t len) | ||
| 8131 | { | ||
| 8132 | u_int32_t h; | ||
| 8133 | u_int8_t *e, c, *k; | ||
| 8134 | @@ -116,9 +112,7 @@ hash2(key, len) | ||
| 8135 | * Ozan Yigit's original sdbm hash. | ||
| 8136 | */ | ||
| 8137 | static u_int32_t | ||
| 8138 | -hash3(key, len) | ||
| 8139 | - const void *key; | ||
| 8140 | - size_t len; | ||
| 8141 | +hash3(const void *key, size_t len) | ||
| 8142 | { | ||
| 8143 | u_int32_t n, loop; | ||
| 8144 | u_int8_t *k; | ||
| 8145 | @@ -159,9 +153,7 @@ hash3(key, len) | ||
| 8146 | |||
| 8147 | /* Chris Torek's hash function. */ | ||
| 8148 | static u_int32_t | ||
| 8149 | -hash4(key, len) | ||
| 8150 | - const void *key; | ||
| 8151 | - size_t len; | ||
| 8152 | +hash4(const void *key, size_t len) | ||
| 8153 | { | ||
| 8154 | u_int32_t h, loop; | ||
| 8155 | const u_int8_t *k; | ||
| 8156 | diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_log2.c b/src/plugins/kdb/db2/libdb2/hash/hash_log2.c | ||
| 8157 | index 8c710e5..7fdfd85 100644 | ||
| 8158 | --- a/src/plugins/kdb/db2/libdb2/hash/hash_log2.c | ||
| 8159 | +++ b/src/plugins/kdb/db2/libdb2/hash/hash_log2.c | ||
| 8160 | @@ -44,8 +44,7 @@ static char sccsid[] = "@(#)hash_log2.c 8.4 (Berkeley) 11/7/95"; | ||
| 8161 | #include "extern.h" | ||
| 8162 | |||
| 8163 | u_int32_t | ||
| 8164 | -__kdb2_log2(num) | ||
| 8165 | - u_int32_t num; | ||
| 8166 | +__kdb2_log2(u_int32_t num) | ||
| 8167 | { | ||
| 8168 | u_int32_t i, limit; | ||
| 8169 | |||
| 8170 | diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_page.c b/src/plugins/kdb/db2/libdb2/hash/hash_page.c | ||
| 8171 | index 0da3571..dba29e0 100644 | ||
| 8172 | --- a/src/plugins/kdb/db2/libdb2/hash/hash_page.c | ||
| 8173 | +++ b/src/plugins/kdb/db2/libdb2/hash/hash_page.c | ||
| 8174 | @@ -84,11 +84,8 @@ static void account_page(HTAB *, db_pgno_t, int); | ||
| 8175 | #endif | ||
| 8176 | |||
| 8177 | u_int32_t | ||
| 8178 | -__get_item(hashp, cursorp, key, val, item_info) | ||
| 8179 | - HTAB *hashp; | ||
| 8180 | - CURSOR *cursorp; | ||
| 8181 | - DBT *key, *val; | ||
| 8182 | - ITEM_INFO *item_info; | ||
| 8183 | +__get_item(HTAB *hashp, CURSOR *cursorp, DBT *key, DBT *val, | ||
| 8184 | + ITEM_INFO *item_info) | ||
| 8185 | { | ||
| 8186 | db_pgno_t next_pgno; | ||
| 8187 | int32_t i; | ||
| 8188 | @@ -159,9 +156,7 @@ __get_item(hashp, cursorp, key, val, item_info) | ||
| 8189 | } | ||
| 8190 | |||
| 8191 | u_int32_t | ||
| 8192 | -__get_item_reset(hashp, cursorp) | ||
| 8193 | - HTAB *hashp; | ||
| 8194 | - CURSOR *cursorp; | ||
| 8195 | +__get_item_reset(HTAB *hashp, CURSOR *cursorp) | ||
| 8196 | { | ||
| 8197 | if (cursorp->pagep) | ||
| 8198 | __put_page(hashp, cursorp->pagep, A_RAW, 0); | ||
| 8199 | @@ -174,9 +169,7 @@ __get_item_reset(hashp, cursorp) | ||
| 8200 | } | ||
| 8201 | |||
| 8202 | u_int32_t | ||
| 8203 | -__get_item_done(hashp, cursorp) | ||
| 8204 | - HTAB *hashp; | ||
| 8205 | - CURSOR *cursorp; | ||
| 8206 | +__get_item_done(HTAB *hashp, CURSOR *cursorp) | ||
| 8207 | { | ||
| 8208 | if (cursorp->pagep) | ||
| 8209 | __put_page(hashp, cursorp->pagep, A_RAW, 0); | ||
| 8210 | @@ -190,11 +183,8 @@ __get_item_done(hashp, cursorp) | ||
| 8211 | } | ||
| 8212 | |||
| 8213 | u_int32_t | ||
| 8214 | -__get_item_first(hashp, cursorp, key, val, item_info) | ||
| 8215 | - HTAB *hashp; | ||
| 8216 | - CURSOR *cursorp; | ||
| 8217 | - DBT *key, *val; | ||
| 8218 | - ITEM_INFO *item_info; | ||
| 8219 | +__get_item_first(HTAB *hashp, CURSOR *cursorp, DBT *key, DBT *val, | ||
| 8220 | + ITEM_INFO *item_info) | ||
| 8221 | { | ||
| 8222 | __get_item_reset(hashp, cursorp); | ||
| 8223 | cursorp->bucket = 0; | ||
| 8224 | @@ -206,11 +196,8 @@ __get_item_first(hashp, cursorp, key, val, item_info) | ||
| 8225 | * just returns the page number and index of the bigkey pointer pair. | ||
| 8226 | */ | ||
| 8227 | u_int32_t | ||
| 8228 | -__get_item_next(hashp, cursorp, key, val, item_info) | ||
| 8229 | - HTAB *hashp; | ||
| 8230 | - CURSOR *cursorp; | ||
| 8231 | - DBT *key, *val; | ||
| 8232 | - ITEM_INFO *item_info; | ||
| 8233 | +__get_item_next(HTAB *hashp, CURSOR *cursorp, DBT *key, DBT *val, | ||
| 8234 | + ITEM_INFO *item_info) | ||
| 8235 | { | ||
| 8236 | int status; | ||
| 8237 | |||
| 8238 | @@ -224,9 +211,7 @@ __get_item_next(hashp, cursorp, key, val, item_info) | ||
| 8239 | * Put a non-big pair on a page. | ||
| 8240 | */ | ||
| 8241 | static void | ||
| 8242 | -putpair(p, key, val) | ||
| 8243 | - PAGE8 *p; | ||
| 8244 | - const DBT *key, *val; | ||
| 8245 | +putpair(PAGE8 *p, const DBT *key, const DBT *val) | ||
| 8246 | { | ||
| 8247 | u_int16_t *pagep, n, off; | ||
| 8248 | |||
| 8249 | @@ -275,10 +260,7 @@ prev_realkey(pagep, n) | ||
| 8250 | * -1 error | ||
| 8251 | */ | ||
| 8252 | extern int32_t | ||
| 8253 | -__delpair(hashp, cursorp, item_info) | ||
| 8254 | - HTAB *hashp; | ||
| 8255 | - CURSOR *cursorp; | ||
| 8256 | - ITEM_INFO *item_info; | ||
| 8257 | +__delpair(HTAB *hashp, CURSOR *cursorp, ITEM_INFO *item_info) | ||
| 8258 | { | ||
| 8259 | PAGE16 *pagep; | ||
| 8260 | indx_t ndx; | ||
| 8261 | @@ -412,9 +394,7 @@ __delpair(hashp, cursorp, item_info) | ||
| 8262 | } | ||
| 8263 | |||
| 8264 | extern int32_t | ||
| 8265 | -__split_page(hashp, obucket, nbucket) | ||
| 8266 | - HTAB *hashp; | ||
| 8267 | - u_int32_t obucket, nbucket; | ||
| 8268 | +__split_page(HTAB *hashp, u_int32_t obucket, u_int32_t nbucket) | ||
| 8269 | { | ||
| 8270 | DBT key, val; | ||
| 8271 | ITEM_INFO old_ii, new_ii; | ||
| 8272 | @@ -661,9 +641,7 @@ add_bigptr(hashp, item_info, big_pgno) | ||
| 8273 | * NULL on error | ||
| 8274 | */ | ||
| 8275 | extern PAGE16 * | ||
| 8276 | -__add_ovflpage(hashp, pagep) | ||
| 8277 | - HTAB *hashp; | ||
| 8278 | - PAGE16 *pagep; | ||
| 8279 | +__add_ovflpage(HTAB *hashp, PAGE16 *pagep) | ||
| 8280 | { | ||
| 8281 | PAGE16 *new_pagep; | ||
| 8282 | u_int16_t ovfl_num; | ||
| 8283 | @@ -768,10 +746,7 @@ page_init(hashp, pagep, pgno, type) | ||
| 8284 | } | ||
| 8285 | |||
| 8286 | int32_t | ||
| 8287 | -__new_page(hashp, addr, addr_type) | ||
| 8288 | - HTAB *hashp; | ||
| 8289 | - u_int32_t addr; | ||
| 8290 | - int32_t addr_type; | ||
| 8291 | +__new_page(HTAB *hashp, u_int32_t addr, int32_t addr_type) | ||
| 8292 | { | ||
| 8293 | db_pgno_t paddr; | ||
| 8294 | PAGE16 *pagep; | ||
| 8295 | @@ -804,10 +779,7 @@ __new_page(hashp, addr, addr_type) | ||
| 8296 | } | ||
| 8297 | |||
| 8298 | int32_t | ||
| 8299 | -__delete_page(hashp, pagep, page_type) | ||
| 8300 | - HTAB *hashp; | ||
| 8301 | - PAGE16 *pagep; | ||
| 8302 | - int32_t page_type; | ||
| 8303 | +__delete_page(HTAB *hashp, PAGE16 *pagep, int32_t page_type) | ||
| 8304 | { | ||
| 8305 | if (page_type == A_OVFL) | ||
| 8306 | __free_ovflpage(hashp, pagep); | ||
| 8307 | @@ -815,9 +787,7 @@ __delete_page(hashp, pagep, page_type) | ||
| 8308 | } | ||
| 8309 | |||
| 8310 | static u_int8_t | ||
| 8311 | -is_bitmap_pgno(hashp, pgno) | ||
| 8312 | - HTAB *hashp; | ||
| 8313 | - db_pgno_t pgno; | ||
| 8314 | +is_bitmap_pgno(HTAB *hashp, db_pgno_t pgno) | ||
| 8315 | { | ||
| 8316 | int32_t i; | ||
| 8317 | |||
| 8318 | @@ -828,10 +798,7 @@ is_bitmap_pgno(hashp, pgno) | ||
| 8319 | } | ||
| 8320 | |||
| 8321 | void | ||
| 8322 | -__pgin_routine(pg_cookie, pgno, page) | ||
| 8323 | - void *pg_cookie; | ||
| 8324 | - db_pgno_t pgno; | ||
| 8325 | - void *page; | ||
| 8326 | +__pgin_routine(void *pg_cookie, db_pgno_t pgno, void *page) | ||
| 8327 | { | ||
| 8328 | HTAB *hashp; | ||
| 8329 | PAGE16 *pagep; | ||
| 8330 | @@ -868,10 +835,7 @@ __pgin_routine(pg_cookie, pgno, page) | ||
| 8331 | } | ||
| 8332 | |||
| 8333 | void | ||
| 8334 | -__pgout_routine(pg_cookie, pgno, page) | ||
| 8335 | - void *pg_cookie; | ||
| 8336 | - db_pgno_t pgno; | ||
| 8337 | - void *page; | ||
| 8338 | +__pgout_routine(void *pg_cookie, db_pgno_t pgno, void *page) | ||
| 8339 | { | ||
| 8340 | HTAB *hashp; | ||
| 8341 | PAGE16 *pagep; | ||
| 8342 | @@ -905,10 +869,7 @@ __pgout_routine(pg_cookie, pgno, page) | ||
| 8343 | * -1 ==>failure | ||
| 8344 | */ | ||
| 8345 | extern int32_t | ||
| 8346 | -__put_page(hashp, pagep, addr_type, is_dirty) | ||
| 8347 | - HTAB *hashp; | ||
| 8348 | - PAGE16 *pagep; | ||
| 8349 | - int32_t addr_type, is_dirty; | ||
| 8350 | +__put_page(HTAB *hashp, PAGE16 *pagep, int32_t addr_type, int32_t is_dirty) | ||
| 8351 | { | ||
| 8352 | #if DEBUG_SLOW | ||
| 8353 | account_page(hashp, | ||
| 8354 | @@ -924,10 +885,7 @@ __put_page(hashp, pagep, addr_type, is_dirty) | ||
| 8355 | * -1 indicates FAILURE | ||
| 8356 | */ | ||
| 8357 | extern PAGE16 * | ||
| 8358 | -__get_page(hashp, addr, addr_type) | ||
| 8359 | - HTAB *hashp; | ||
| 8360 | - u_int32_t addr; | ||
| 8361 | - int32_t addr_type; | ||
| 8362 | +__get_page(HTAB *hashp, u_int32_t addr, int32_t addr_type) | ||
| 8363 | { | ||
| 8364 | PAGE16 *pagep; | ||
| 8365 | db_pgno_t paddr; | ||
| 8366 | @@ -958,8 +916,7 @@ __get_page(hashp, addr, addr_type) | ||
| 8367 | } | ||
| 8368 | |||
| 8369 | static void | ||
| 8370 | -swap_page_header_in(pagep) | ||
| 8371 | - PAGE16 *pagep; | ||
| 8372 | +swap_page_header_in(PAGE16 *pagep) | ||
| 8373 | { | ||
| 8374 | u_int32_t i; | ||
| 8375 | |||
| 8376 | @@ -977,8 +934,7 @@ swap_page_header_in(pagep) | ||
| 8377 | } | ||
| 8378 | |||
| 8379 | static void | ||
| 8380 | -swap_page_header_out(pagep) | ||
| 8381 | - PAGE16 *pagep; | ||
| 8382 | +swap_page_header_out(PAGE16 *pagep) | ||
| 8383 | { | ||
| 8384 | u_int32_t i; | ||
| 8385 | |||
| 8386 | @@ -1001,9 +957,7 @@ swap_page_header_out(pagep) | ||
| 8387 | * once they are read in. | ||
| 8388 | */ | ||
| 8389 | extern int32_t | ||
| 8390 | -__ibitmap(hashp, pnum, nbits, ndx) | ||
| 8391 | - HTAB *hashp; | ||
| 8392 | - int32_t pnum, nbits, ndx; | ||
| 8393 | +__ibitmap(HTAB *hashp, int32_t pnum, int32_t nbits, int32_t ndx) | ||
| 8394 | { | ||
| 8395 | u_int32_t *ip; | ||
| 8396 | int32_t clearbytes, clearints; | ||
| 8397 | @@ -1027,8 +981,7 @@ __ibitmap(hashp, pnum, nbits, ndx) | ||
| 8398 | } | ||
| 8399 | |||
| 8400 | static u_int32_t | ||
| 8401 | -first_free(map) | ||
| 8402 | - u_int32_t map; | ||
| 8403 | +first_free(u_int32_t map) | ||
| 8404 | { | ||
| 8405 | u_int32_t i, mask; | ||
| 8406 | |||
| 8407 | @@ -1044,8 +997,7 @@ first_free(map) | ||
| 8408 | * returns 0 on error | ||
| 8409 | */ | ||
| 8410 | static u_int16_t | ||
| 8411 | -overflow_page(hashp) | ||
| 8412 | - HTAB *hashp; | ||
| 8413 | +overflow_page(HTAB *hashp) | ||
| 8414 | { | ||
| 8415 | u_int32_t *freep; | ||
| 8416 | u_int32_t bit, first_page, free_bit, free_page, i, in_use_bits, j; | ||
| 8417 | @@ -1206,9 +1158,7 @@ found: | ||
| 8418 | |||
| 8419 | #ifdef DEBUG | ||
| 8420 | int | ||
| 8421 | -bucket_to_page(hashp, n) | ||
| 8422 | - HTAB *hashp; | ||
| 8423 | - int n; | ||
| 8424 | +bucket_to_page(HTAB *hashp, int n) | ||
| 8425 | { | ||
| 8426 | int ret_val; | ||
| 8427 | |||
| 8428 | @@ -1219,9 +1169,7 @@ bucket_to_page(hashp, n) | ||
| 8429 | } | ||
| 8430 | |||
| 8431 | int32_t | ||
| 8432 | -oaddr_to_page(hashp, n) | ||
| 8433 | - HTAB *hashp; | ||
| 8434 | - int n; | ||
| 8435 | +oaddr_to_page(HTAB *hashp, int n) | ||
| 8436 | { | ||
| 8437 | int ret_val, temp; | ||
| 8438 | |||
| 8439 | @@ -1234,9 +1182,7 @@ oaddr_to_page(hashp, n) | ||
| 8440 | #endif /* DEBUG */ | ||
| 8441 | |||
| 8442 | static indx_t | ||
| 8443 | -page_to_oaddr(hashp, pgno) | ||
| 8444 | - HTAB *hashp; | ||
| 8445 | - db_pgno_t pgno; | ||
| 8446 | +page_to_oaddr(HTAB *hashp, db_pgno_t pgno) | ||
| 8447 | { | ||
| 8448 | int32_t sp, ret_val; | ||
| 8449 | |||
| 8450 | @@ -1268,9 +1214,7 @@ page_to_oaddr(hashp, pgno) | ||
| 8451 | * Mark this overflow page as free. | ||
| 8452 | */ | ||
| 8453 | extern void | ||
| 8454 | -__free_ovflpage(hashp, pagep) | ||
| 8455 | - HTAB *hashp; | ||
| 8456 | - PAGE16 *pagep; | ||
| 8457 | +__free_ovflpage(HTAB *hashp, PAGE16 *pagep) | ||
| 8458 | { | ||
| 8459 | u_int32_t *freep; | ||
| 8460 | u_int32_t bit_address, free_page, free_bit; | ||
| 8461 | @@ -1307,9 +1251,7 @@ __free_ovflpage(hashp, pagep) | ||
| 8462 | } | ||
| 8463 | |||
| 8464 | static u_int32_t * | ||
| 8465 | -fetch_bitmap(hashp, ndx) | ||
| 8466 | - HTAB *hashp; | ||
| 8467 | - int32_t ndx; | ||
| 8468 | +fetch_bitmap(HTAB *hashp, int32_t ndx) | ||
| 8469 | { | ||
| 8470 | if (ndx >= hashp->nmaps) | ||
| 8471 | return (NULL); | ||
| 8472 | @@ -1322,10 +1264,7 @@ fetch_bitmap(hashp, ndx) | ||
| 8473 | |||
| 8474 | #ifdef DEBUG_SLOW | ||
| 8475 | static void | ||
| 8476 | -account_page(hashp, pgno, inout) | ||
| 8477 | - HTAB *hashp; | ||
| 8478 | - db_pgno_t pgno; | ||
| 8479 | - int inout; | ||
| 8480 | +account_page(HTAB *hashp, db_pgno_t pgno, int inout) | ||
| 8481 | { | ||
| 8482 | static struct { | ||
| 8483 | db_pgno_t pgno; | ||
| 8484 | diff --git a/src/plugins/kdb/db2/libdb2/hash/hsearch.c b/src/plugins/kdb/db2/libdb2/hash/hsearch.c | ||
| 8485 | index 02ff7ef..ffcdfcf 100644 | ||
| 8486 | --- a/src/plugins/kdb/db2/libdb2/hash/hsearch.c | ||
| 8487 | +++ b/src/plugins/kdb/db2/libdb2/hash/hsearch.c | ||
| 8488 | @@ -50,8 +50,7 @@ static DB *dbp = NULL; | ||
| 8489 | static ENTRY retval; | ||
| 8490 | |||
| 8491 | extern int | ||
| 8492 | -hcreate(nel) | ||
| 8493 | - u_int nel; | ||
| 8494 | +hcreate(u_int nel) | ||
| 8495 | { | ||
| 8496 | HASHINFO info; | ||
| 8497 | |||
| 8498 | @@ -66,9 +65,7 @@ hcreate(nel) | ||
| 8499 | } | ||
| 8500 | |||
| 8501 | extern ENTRY * | ||
| 8502 | -hsearch(item, action) | ||
| 8503 | - ENTRY item; | ||
| 8504 | - ACTION action; | ||
| 8505 | +hsearch(ENTRY item, ACTION action) | ||
| 8506 | { | ||
| 8507 | DBT key, val; | ||
| 8508 | int status; | ||
| 8509 | @@ -98,7 +95,7 @@ hsearch(item, action) | ||
| 8510 | } | ||
| 8511 | |||
| 8512 | extern void | ||
| 8513 | -hdestroy() | ||
| 8514 | +hdestroy(void) | ||
| 8515 | { | ||
| 8516 | if (dbp) { | ||
| 8517 | (void)(dbp->close)(dbp); | ||
| 8518 | diff --git a/src/plugins/kdb/db2/libdb2/mpool/mpool.c b/src/plugins/kdb/db2/libdb2/mpool/mpool.c | ||
| 8519 | index 0fcfd4a..028fb18 100644 | ||
| 8520 | --- a/src/plugins/kdb/db2/libdb2/mpool/mpool.c | ||
| 8521 | +++ b/src/plugins/kdb/db2/libdb2/mpool/mpool.c | ||
| 8522 | @@ -56,10 +56,7 @@ static int mpool_write __P((MPOOL *, BKT *)); | ||
| 8523 | * Initialize a memory pool. | ||
| 8524 | */ | ||
| 8525 | MPOOL * | ||
| 8526 | -mpool_open(key, fd, pagesize, maxcache) | ||
| 8527 | - void *key; | ||
| 8528 | - int fd; | ||
| 8529 | - db_pgno_t pagesize, maxcache; | ||
| 8530 | +mpool_open(void *key, int fd, db_pgno_t pagesize, db_pgno_t maxcache) | ||
| 8531 | { | ||
| 8532 | struct stat sb; | ||
| 8533 | MPOOL *mp; | ||
| 8534 | @@ -96,11 +93,8 @@ mpool_open(key, fd, pagesize, maxcache) | ||
| 8535 | * Initialize input/output filters. | ||
| 8536 | */ | ||
| 8537 | void | ||
| 8538 | -mpool_filter(mp, pgin, pgout, pgcookie) | ||
| 8539 | - MPOOL *mp; | ||
| 8540 | - void (*pgin) __P((void *, db_pgno_t, void *)); | ||
| 8541 | - void (*pgout) __P((void *, db_pgno_t, void *)); | ||
| 8542 | - void *pgcookie; | ||
| 8543 | +mpool_filter(MPOOL *mp, void (*pgin) __P((void *, db_pgno_t, void *)), | ||
| 8544 | + void (*pgout) __P((void *, db_pgno_t, void *)), void *pgcookie) | ||
| 8545 | { | ||
| 8546 | mp->pgin = pgin; | ||
| 8547 | mp->pgout = pgout; | ||
| 8548 | @@ -112,10 +106,7 @@ mpool_filter(mp, pgin, pgout, pgcookie) | ||
| 8549 | * Get a new page of memory. | ||
| 8550 | */ | ||
| 8551 | void * | ||
| 8552 | -mpool_new(mp, pgnoaddr, flags) | ||
| 8553 | - MPOOL *mp; | ||
| 8554 | - db_pgno_t *pgnoaddr; | ||
| 8555 | - u_int flags; | ||
| 8556 | +mpool_new(MPOOL *mp, db_pgno_t *pgnoaddr, u_int flags) | ||
| 8557 | { | ||
| 8558 | struct _hqh *head; | ||
| 8559 | BKT *bp; | ||
| 8560 | @@ -149,9 +140,7 @@ mpool_new(mp, pgnoaddr, flags) | ||
| 8561 | } | ||
| 8562 | |||
| 8563 | int | ||
| 8564 | -mpool_delete(mp, page) | ||
| 8565 | - MPOOL *mp; | ||
| 8566 | - void *page; | ||
| 8567 | +mpool_delete(MPOOL *mp, void *page) | ||
| 8568 | { | ||
| 8569 | struct _hqh *head; | ||
| 8570 | BKT *bp; | ||
| 8571 | @@ -180,10 +169,7 @@ mpool_delete(mp, page) | ||
| 8572 | * Get a page. | ||
| 8573 | */ | ||
| 8574 | void * | ||
| 8575 | -mpool_get(mp, pgno, flags) | ||
| 8576 | - MPOOL *mp; | ||
| 8577 | - db_pgno_t pgno; | ||
| 8578 | - u_int flags; /* XXX not used? */ | ||
| 8579 | +mpool_get(MPOOL *mp, db_pgno_t pgno, u_int flags) | ||
| 8580 | { | ||
| 8581 | struct _hqh *head; | ||
| 8582 | BKT *bp; | ||
| 8583 | @@ -278,10 +264,7 @@ mpool_get(mp, pgno, flags) | ||
| 8584 | * Return a page. | ||
| 8585 | */ | ||
| 8586 | int | ||
| 8587 | -mpool_put(mp, page, flags) | ||
| 8588 | - MPOOL *mp; | ||
| 8589 | - void *page; | ||
| 8590 | - u_int flags; | ||
| 8591 | +mpool_put(MPOOL *mp, void *page, u_int flags) | ||
| 8592 | { | ||
| 8593 | BKT *bp; | ||
| 8594 | |||
| 8595 | @@ -307,8 +290,7 @@ mpool_put(mp, page, flags) | ||
| 8596 | * Close the buffer pool. | ||
| 8597 | */ | ||
| 8598 | int | ||
| 8599 | -mpool_close(mp) | ||
| 8600 | - MPOOL *mp; | ||
| 8601 | +mpool_close(MPOOL *mp) | ||
| 8602 | { | ||
| 8603 | BKT *bp; | ||
| 8604 | |||
| 8605 | @@ -328,8 +310,7 @@ mpool_close(mp) | ||
| 8606 | * Sync the pool to disk. | ||
| 8607 | */ | ||
| 8608 | int | ||
| 8609 | -mpool_sync(mp) | ||
| 8610 | - MPOOL *mp; | ||
| 8611 | +mpool_sync(MPOOL *mp) | ||
| 8612 | { | ||
| 8613 | BKT *bp; | ||
| 8614 | |||
| 8615 | @@ -348,8 +329,7 @@ mpool_sync(mp) | ||
| 8616 | * Get a page from the cache (or create one). | ||
| 8617 | */ | ||
| 8618 | static BKT * | ||
| 8619 | -mpool_bkt(mp) | ||
| 8620 | - MPOOL *mp; | ||
| 8621 | +mpool_bkt(MPOOL *mp) | ||
| 8622 | { | ||
| 8623 | struct _hqh *head; | ||
| 8624 | BKT *bp; | ||
| 8625 | @@ -407,9 +387,7 @@ new: if ((bp = (BKT *)malloc(sizeof(BKT) + mp->pagesize)) == NULL) | ||
| 8626 | * Write a page to disk. | ||
| 8627 | */ | ||
| 8628 | static int | ||
| 8629 | -mpool_write(mp, bp) | ||
| 8630 | - MPOOL *mp; | ||
| 8631 | - BKT *bp; | ||
| 8632 | +mpool_write(MPOOL *mp, BKT *bp) | ||
| 8633 | { | ||
| 8634 | off_t off; | ||
| 8635 | |||
| 8636 | @@ -451,9 +429,7 @@ mpool_write(mp, bp) | ||
| 8637 | * Lookup a page in the cache. | ||
| 8638 | */ | ||
| 8639 | static BKT * | ||
| 8640 | -mpool_look(mp, pgno) | ||
| 8641 | - MPOOL *mp; | ||
| 8642 | - db_pgno_t pgno; | ||
| 8643 | +mpool_look(MPOOL *mp, db_pgno_t pgno) | ||
| 8644 | { | ||
| 8645 | struct _hqh *head; | ||
| 8646 | BKT *bp; | ||
| 8647 | @@ -478,8 +454,7 @@ mpool_look(mp, pgno) | ||
| 8648 | * Print out cache statistics. | ||
| 8649 | */ | ||
| 8650 | void | ||
| 8651 | -mpool_stat(mp) | ||
| 8652 | - MPOOL *mp; | ||
| 8653 | +mpool_stat(MPOOL *mp) | ||
| 8654 | { | ||
| 8655 | BKT *bp; | ||
| 8656 | int cnt; | ||
| 8657 | @@ -520,8 +495,7 @@ mpool_stat(mp) | ||
| 8658 | } | ||
| 8659 | #else | ||
| 8660 | void | ||
| 8661 | -mpool_stat(mp) | ||
| 8662 | - MPOOL *mp; | ||
| 8663 | +mpool_stat(MPOOL *mp) | ||
| 8664 | { | ||
| 8665 | } | ||
| 8666 | #endif | ||
| 8667 | diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_close.c b/src/plugins/kdb/db2/libdb2/recno/rec_close.c | ||
| 8668 | index 4ef4dd1..b858e5c 100644 | ||
| 8669 | --- a/src/plugins/kdb/db2/libdb2/recno/rec_close.c | ||
| 8670 | +++ b/src/plugins/kdb/db2/libdb2/recno/rec_close.c | ||
| 8671 | @@ -59,8 +59,7 @@ static char sccsid[] = "@(#)rec_close.c 8.9 (Berkeley) 11/18/94"; | ||
| 8672 | * RET_ERROR, RET_SUCCESS | ||
| 8673 | */ | ||
| 8674 | int | ||
| 8675 | -__rec_close(dbp) | ||
| 8676 | - DB *dbp; | ||
| 8677 | +__rec_close(DB *dbp) | ||
| 8678 | { | ||
| 8679 | BTREE *t; | ||
| 8680 | int status; | ||
| 8681 | @@ -108,9 +107,7 @@ __rec_close(dbp) | ||
| 8682 | * RET_SUCCESS, RET_ERROR. | ||
| 8683 | */ | ||
| 8684 | int | ||
| 8685 | -__rec_sync(dbp, flags) | ||
| 8686 | - const DB *dbp; | ||
| 8687 | - u_int flags; | ||
| 8688 | +__rec_sync(const DB *dbp, u_int flags) | ||
| 8689 | { | ||
| 8690 | struct iovec iov[2]; | ||
| 8691 | BTREE *t; | ||
| 8692 | diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_delete.c b/src/plugins/kdb/db2/libdb2/recno/rec_delete.c | ||
| 8693 | index b69c9ad..7e574df 100644 | ||
| 8694 | --- a/src/plugins/kdb/db2/libdb2/recno/rec_delete.c | ||
| 8695 | +++ b/src/plugins/kdb/db2/libdb2/recno/rec_delete.c | ||
| 8696 | @@ -61,10 +61,7 @@ static int rec_rdelete __P((BTREE *, recno_t)); | ||
| 8697 | * RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found. | ||
| 8698 | */ | ||
| 8699 | int | ||
| 8700 | -__rec_delete(dbp, key, flags) | ||
| 8701 | - const DB *dbp; | ||
| 8702 | - const DBT *key; | ||
| 8703 | - u_int flags; | ||
| 8704 | +__rec_delete(const DB *dbp, const DBT *key, u_int flags) | ||
| 8705 | { | ||
| 8706 | BTREE *t; | ||
| 8707 | recno_t nrec; | ||
| 8708 | @@ -117,9 +114,7 @@ einval: errno = EINVAL; | ||
| 8709 | * RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found. | ||
| 8710 | */ | ||
| 8711 | static int | ||
| 8712 | -rec_rdelete(t, nrec) | ||
| 8713 | - BTREE *t; | ||
| 8714 | - recno_t nrec; | ||
| 8715 | +rec_rdelete(BTREE *t, recno_t nrec) | ||
| 8716 | { | ||
| 8717 | EPG *e; | ||
| 8718 | PAGE *h; | ||
| 8719 | @@ -151,10 +146,7 @@ rec_rdelete(t, nrec) | ||
| 8720 | * RET_SUCCESS, RET_ERROR. | ||
| 8721 | */ | ||
| 8722 | int | ||
| 8723 | -__rec_dleaf(t, h, idx) | ||
| 8724 | - BTREE *t; | ||
| 8725 | - PAGE *h; | ||
| 8726 | - u_int32_t idx; | ||
| 8727 | +__rec_dleaf(BTREE *t, PAGE *h, u_int32_t idx) | ||
| 8728 | { | ||
| 8729 | RLEAF *rl; | ||
| 8730 | indx_t *ip, cnt, offset; | ||
| 8731 | diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_get.c b/src/plugins/kdb/db2/libdb2/recno/rec_get.c | ||
| 8732 | index 230b2d4..c89cb55 100644 | ||
| 8733 | --- a/src/plugins/kdb/db2/libdb2/recno/rec_get.c | ||
| 8734 | +++ b/src/plugins/kdb/db2/libdb2/recno/rec_get.c | ||
| 8735 | @@ -60,11 +60,7 @@ static char sccsid[] = "@(#)rec_get.c 8.9 (Berkeley) 8/18/94"; | ||
| 8736 | * RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found. | ||
| 8737 | */ | ||
| 8738 | int | ||
| 8739 | -__rec_get(dbp, key, data, flags) | ||
| 8740 | - const DB *dbp; | ||
| 8741 | - const DBT *key; | ||
| 8742 | - DBT *data; | ||
| 8743 | - u_int flags; | ||
| 8744 | +__rec_get(const DB *dbp, const DBT *key, DBT *data, u_int flags) | ||
| 8745 | { | ||
| 8746 | BTREE *t; | ||
| 8747 | EPG *e; | ||
| 8748 | @@ -119,9 +115,7 @@ __rec_get(dbp, key, data, flags) | ||
| 8749 | * RET_ERROR, RET_SUCCESS | ||
| 8750 | */ | ||
| 8751 | int | ||
| 8752 | -__rec_fpipe(t, top) | ||
| 8753 | - BTREE *t; | ||
| 8754 | - recno_t top; | ||
| 8755 | +__rec_fpipe(BTREE *t, recno_t top) | ||
| 8756 | { | ||
| 8757 | DBT data; | ||
| 8758 | recno_t nrec; | ||
| 8759 | @@ -175,9 +169,7 @@ __rec_fpipe(t, top) | ||
| 8760 | * RET_ERROR, RET_SUCCESS | ||
| 8761 | */ | ||
| 8762 | int | ||
| 8763 | -__rec_vpipe(t, top) | ||
| 8764 | - BTREE *t; | ||
| 8765 | - recno_t top; | ||
| 8766 | +__rec_vpipe(BTREE *t, recno_t top) | ||
| 8767 | { | ||
| 8768 | DBT data; | ||
| 8769 | recno_t nrec; | ||
| 8770 | @@ -232,9 +224,7 @@ __rec_vpipe(t, top) | ||
| 8771 | * RET_ERROR, RET_SUCCESS | ||
| 8772 | */ | ||
| 8773 | int | ||
| 8774 | -__rec_fmap(t, top) | ||
| 8775 | - BTREE *t; | ||
| 8776 | - recno_t top; | ||
| 8777 | +__rec_fmap(BTREE *t, recno_t top) | ||
| 8778 | { | ||
| 8779 | DBT data; | ||
| 8780 | recno_t nrec; | ||
| 8781 | @@ -282,9 +272,7 @@ __rec_fmap(t, top) | ||
| 8782 | * RET_ERROR, RET_SUCCESS | ||
| 8783 | */ | ||
| 8784 | int | ||
| 8785 | -__rec_vmap(t, top) | ||
| 8786 | - BTREE *t; | ||
| 8787 | - recno_t top; | ||
| 8788 | +__rec_vmap(BTREE *t, recno_t top) | ||
| 8789 | { | ||
| 8790 | DBT data; | ||
| 8791 | u_char *sp, *ep; | ||
| 8792 | diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_open.c b/src/plugins/kdb/db2/libdb2/recno/rec_open.c | ||
| 8793 | index d8b26e7..acbf03d 100644 | ||
| 8794 | --- a/src/plugins/kdb/db2/libdb2/recno/rec_open.c | ||
| 8795 | +++ b/src/plugins/kdb/db2/libdb2/recno/rec_open.c | ||
| 8796 | @@ -55,10 +55,8 @@ static char sccsid[] = "@(#)rec_open.c 8.12 (Berkeley) 11/18/94"; | ||
| 8797 | #include "recno.h" | ||
| 8798 | |||
| 8799 | DB * | ||
| 8800 | -__rec_open(fname, flags, mode, openinfo, dflags) | ||
| 8801 | - const char *fname; | ||
| 8802 | - int flags, mode, dflags; | ||
| 8803 | - const RECNOINFO *openinfo; | ||
| 8804 | +__rec_open(const char *fname, int flags, int mode, const RECNOINFO *openinfo, | ||
| 8805 | + int dflags) | ||
| 8806 | { | ||
| 8807 | BTREE *t; | ||
| 8808 | BTREEINFO btopeninfo; | ||
| 8809 | @@ -226,8 +224,7 @@ err: sverrno = errno; | ||
| 8810 | } | ||
| 8811 | |||
| 8812 | int | ||
| 8813 | -__rec_fd(dbp) | ||
| 8814 | - const DB *dbp; | ||
| 8815 | +__rec_fd(const DB *dbp) | ||
| 8816 | { | ||
| 8817 | BTREE *t; | ||
| 8818 | |||
| 8819 | diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_put.c b/src/plugins/kdb/db2/libdb2/recno/rec_put.c | ||
| 8820 | index c53c957..8456f1d 100644 | ||
| 8821 | --- a/src/plugins/kdb/db2/libdb2/recno/rec_put.c | ||
| 8822 | +++ b/src/plugins/kdb/db2/libdb2/recno/rec_put.c | ||
| 8823 | @@ -59,11 +59,7 @@ static char sccsid[] = "@(#)rec_put.c 8.7 (Berkeley) 8/18/94"; | ||
| 8824 | * already in the tree and R_NOOVERWRITE specified. | ||
| 8825 | */ | ||
| 8826 | int | ||
| 8827 | -__rec_put(dbp, key, data, flags) | ||
| 8828 | - const DB *dbp; | ||
| 8829 | - DBT *key; | ||
| 8830 | - const DBT *data; | ||
| 8831 | - u_int flags; | ||
| 8832 | +__rec_put(const DB *dbp, DBT *key, const DBT *data, u_int flags) | ||
| 8833 | { | ||
| 8834 | BTREE *t; | ||
| 8835 | DBT fdata, tdata; | ||
| 8836 | @@ -187,11 +183,7 @@ einval: errno = EINVAL; | ||
| 8837 | * RET_ERROR, RET_SUCCESS | ||
| 8838 | */ | ||
| 8839 | int | ||
| 8840 | -__rec_iput(t, nrec, data, flags) | ||
| 8841 | - BTREE *t; | ||
| 8842 | - recno_t nrec; | ||
| 8843 | - const DBT *data; | ||
| 8844 | - u_int flags; | ||
| 8845 | +__rec_iput(BTREE *t, recno_t nrec, const DBT *data, u_int flags) | ||
| 8846 | { | ||
| 8847 | DBT tdata; | ||
| 8848 | EPG *e; | ||
| 8849 | diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_search.c b/src/plugins/kdb/db2/libdb2/recno/rec_search.c | ||
| 8850 | index 244d79f..55e5ba8 100644 | ||
| 8851 | --- a/src/plugins/kdb/db2/libdb2/recno/rec_search.c | ||
| 8852 | +++ b/src/plugins/kdb/db2/libdb2/recno/rec_search.c | ||
| 8853 | @@ -61,10 +61,7 @@ static char sccsid[] = "@(#)rec_search.c 8.4 (Berkeley) 7/14/94"; | ||
| 8854 | * the bt_cur field of the tree. A pointer to the field is returned. | ||
| 8855 | */ | ||
| 8856 | EPG * | ||
| 8857 | -__rec_search(t, recno, op) | ||
| 8858 | - BTREE *t; | ||
| 8859 | - recno_t recno; | ||
| 8860 | - enum SRCHOP op; | ||
| 8861 | +__rec_search(BTREE *t, recno_t recno, enum SRCHOP op) | ||
| 8862 | { | ||
| 8863 | indx_t idx; | ||
| 8864 | PAGE *h; | ||
| 8865 | diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_seq.c b/src/plugins/kdb/db2/libdb2/recno/rec_seq.c | ||
| 8866 | index 8af1378..cf48ea2 100644 | ||
| 8867 | --- a/src/plugins/kdb/db2/libdb2/recno/rec_seq.c | ||
| 8868 | +++ b/src/plugins/kdb/db2/libdb2/recno/rec_seq.c | ||
| 8869 | @@ -58,10 +58,7 @@ static char sccsid[] = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94"; | ||
| 8870 | * RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key. | ||
| 8871 | */ | ||
| 8872 | int | ||
| 8873 | -__rec_seq(dbp, key, data, flags) | ||
| 8874 | - const DB *dbp; | ||
| 8875 | - DBT *key, *data; | ||
| 8876 | - u_int flags; | ||
| 8877 | +__rec_seq(const DB *dbp, DBT *key, DBT *data, u_int flags) | ||
| 8878 | { | ||
| 8879 | BTREE *t; | ||
| 8880 | EPG *e; | ||
| 8881 | diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_utils.c b/src/plugins/kdb/db2/libdb2/recno/rec_utils.c | ||
| 8882 | index f757a72..2eaa39b 100644 | ||
| 8883 | --- a/src/plugins/kdb/db2/libdb2/recno/rec_utils.c | ||
| 8884 | +++ b/src/plugins/kdb/db2/libdb2/recno/rec_utils.c | ||
| 8885 | @@ -59,11 +59,7 @@ static char sccsid[] = "@(#)rec_utils.c 8.6 (Berkeley) 7/16/94"; | ||
| 8886 | * RET_SUCCESS, RET_ERROR. | ||
| 8887 | */ | ||
| 8888 | int | ||
| 8889 | -__rec_ret(t, e, nrec, key, data) | ||
| 8890 | - BTREE *t; | ||
| 8891 | - EPG *e; | ||
| 8892 | - recno_t nrec; | ||
| 8893 | - DBT *key, *data; | ||
| 8894 | +__rec_ret(BTREE *t, EPG *e, recno_t nrec, DBT *key, DBT *data) | ||
| 8895 | { | ||
| 8896 | RLEAF *rl; | ||
| 8897 | void *p; | ||
| 8898 | diff --git a/src/plugins/kdb/db2/libdb2/test/dbtest.c b/src/plugins/kdb/db2/libdb2/test/dbtest.c | ||
| 8899 | index 5d76b1d..04bf34b 100644 | ||
| 8900 | --- a/src/plugins/kdb/db2/libdb2/test/dbtest.c | ||
| 8901 | +++ b/src/plugins/kdb/db2/libdb2/test/dbtest.c | ||
| 8902 | @@ -121,9 +121,7 @@ DB *XXdbp; /* Global for gdb. */ | ||
| 8903 | u_long XXlineno; /* Fast breakpoint for gdb. */ | ||
| 8904 | |||
| 8905 | int | ||
| 8906 | -main(argc, argv) | ||
| 8907 | - int argc; | ||
| 8908 | - char *argv[]; | ||
| 8909 | +main(int argc, char *argv[]) | ||
| 8910 | { | ||
| 8911 | extern int optind; | ||
| 8912 | extern char *optarg; | ||
| 8913 | @@ -380,8 +378,7 @@ lkey: switch (command) { | ||
| 8914 | #define NOOVERWRITE "put failed, would overwrite key\n" | ||
| 8915 | |||
| 8916 | void | ||
| 8917 | -compare(db1, db2) | ||
| 8918 | - DBT *db1, *db2; | ||
| 8919 | +compare(DBT *db1, DBT *db2) | ||
| 8920 | { | ||
| 8921 | size_t len; | ||
| 8922 | u_char *p1, *p2; | ||
| 8923 | @@ -402,9 +399,7 @@ compare(db1, db2) | ||
| 8924 | } | ||
| 8925 | |||
| 8926 | void | ||
| 8927 | -get(dbp, kp) | ||
| 8928 | - DB *dbp; | ||
| 8929 | - DBT *kp; | ||
| 8930 | +get(DB *dbp, DBT *kp) | ||
| 8931 | { | ||
| 8932 | DBT data; | ||
| 8933 | |||
| 8934 | @@ -437,9 +432,7 @@ get(dbp, kp) | ||
| 8935 | } | ||
| 8936 | |||
| 8937 | void | ||
| 8938 | -getdata(dbp, kp, dp) | ||
| 8939 | - DB *dbp; | ||
| 8940 | - DBT *kp, *dp; | ||
| 8941 | +getdata(DB *dbp, DBT *kp, DBT *dp) | ||
| 8942 | { | ||
| 8943 | switch (dbp->get(dbp, kp, dp, flags)) { | ||
| 8944 | case 0: | ||
| 8945 | @@ -454,9 +447,7 @@ getdata(dbp, kp, dp) | ||
| 8946 | } | ||
| 8947 | |||
| 8948 | void | ||
| 8949 | -put(dbp, kp, dp) | ||
| 8950 | - DB *dbp; | ||
| 8951 | - DBT *kp, *dp; | ||
| 8952 | +put(DB *dbp, DBT *kp, DBT *dp) | ||
| 8953 | { | ||
| 8954 | switch (dbp->put(dbp, kp, dp, flags)) { | ||
| 8955 | case 0: | ||
| 8956 | @@ -473,9 +464,7 @@ put(dbp, kp, dp) | ||
| 8957 | } | ||
| 8958 | |||
| 8959 | void | ||
| 8960 | -rem(dbp, kp) | ||
| 8961 | - DB *dbp; | ||
| 8962 | - DBT *kp; | ||
| 8963 | +rem(DB *dbp, DBT *kp) | ||
| 8964 | { | ||
| 8965 | switch (dbp->del(dbp, kp, flags)) { | ||
| 8966 | case 0: | ||
| 8967 | @@ -502,8 +491,7 @@ rem(dbp, kp) | ||
| 8968 | } | ||
| 8969 | |||
| 8970 | void | ||
| 8971 | -synk(dbp) | ||
| 8972 | - DB *dbp; | ||
| 8973 | +synk(DB *dbp) | ||
| 8974 | { | ||
| 8975 | switch (dbp->sync(dbp, flags)) { | ||
| 8976 | case 0: | ||
| 8977 | @@ -515,9 +503,7 @@ synk(dbp) | ||
| 8978 | } | ||
| 8979 | |||
| 8980 | void | ||
| 8981 | -seq(dbp, kp) | ||
| 8982 | - DB *dbp; | ||
| 8983 | - DBT *kp; | ||
| 8984 | +seq(DB *dbp, DBT *kp) | ||
| 8985 | { | ||
| 8986 | DBT data; | ||
| 8987 | |||
| 8988 | @@ -551,10 +537,7 @@ seq(dbp, kp) | ||
| 8989 | } | ||
| 8990 | |||
| 8991 | void | ||
| 8992 | -dump(dbp, rev, recurse) | ||
| 8993 | - DB *dbp; | ||
| 8994 | - int rev; | ||
| 8995 | - int recurse; | ||
| 8996 | +dump(DB *dbp, int rev, int recurse) | ||
| 8997 | { | ||
| 8998 | DBT key, data; | ||
| 8999 | int lflags, nflags; | ||
| 9000 | @@ -588,8 +571,7 @@ done: return; | ||
| 9001 | } | ||
| 9002 | |||
| 9003 | void | ||
| 9004 | -unlinkpg(dbp) | ||
| 9005 | - DB *dbp; | ||
| 9006 | +unlinkpg(DB *dbp) | ||
| 9007 | { | ||
| 9008 | BTREE *t = dbp->internal; | ||
| 9009 | PAGE *h = NULL; | ||
| 9010 | @@ -623,8 +605,7 @@ cleanup: | ||
| 9011 | } | ||
| 9012 | |||
| 9013 | u_int | ||
| 9014 | -setflags(s) | ||
| 9015 | - char *s; | ||
| 9016 | +setflags(char *s) | ||
| 9017 | { | ||
| 9018 | char *p; | ||
| 9019 | |||
| 9020 | @@ -648,8 +629,7 @@ setflags(s) | ||
| 9021 | } | ||
| 9022 | |||
| 9023 | char * | ||
| 9024 | -sflags(lflags) | ||
| 9025 | - int lflags; | ||
| 9026 | +sflags(int lflags) | ||
| 9027 | { | ||
| 9028 | switch (lflags) { | ||
| 9029 | case R_CURSOR: return ("R_CURSOR"); | ||
| 9030 | @@ -667,8 +647,7 @@ sflags(lflags) | ||
| 9031 | } | ||
| 9032 | |||
| 9033 | DBTYPE | ||
| 9034 | -dbtype(s) | ||
| 9035 | - char *s; | ||
| 9036 | +dbtype(char *s) | ||
| 9037 | { | ||
| 9038 | if (!strcmp(s, "btree")) | ||
| 9039 | return (DB_BTREE); | ||
| 9040 | @@ -681,9 +660,7 @@ dbtype(s) | ||
| 9041 | } | ||
| 9042 | |||
| 9043 | void * | ||
| 9044 | -setinfo(db_type, s) | ||
| 9045 | - DBTYPE db_type; | ||
| 9046 | - char *s; | ||
| 9047 | +setinfo(DBTYPE db_type, char *s) | ||
| 9048 | { | ||
| 9049 | static BTREEINFO ib; | ||
| 9050 | static HASHINFO ih; | ||
| 9051 | @@ -777,9 +754,7 @@ setinfo(db_type, s) | ||
| 9052 | } | ||
| 9053 | |||
| 9054 | void * | ||
| 9055 | -rfile(name, lenp) | ||
| 9056 | - char *name; | ||
| 9057 | - size_t *lenp; | ||
| 9058 | +rfile(char *name, size_t *lenp) | ||
| 9059 | { | ||
| 9060 | struct stat sb; | ||
| 9061 | void *p; | ||
| 9062 | @@ -806,9 +781,7 @@ rfile(name, lenp) | ||
| 9063 | } | ||
| 9064 | |||
| 9065 | void * | ||
| 9066 | -xmalloc(text, len) | ||
| 9067 | - char *text; | ||
| 9068 | - size_t len; | ||
| 9069 | +xmalloc(char *text, size_t len) | ||
| 9070 | { | ||
| 9071 | void *p; | ||
| 9072 | |||
| 9073 | diff --git a/src/plugins/kdb/db2/pol_xdr.c b/src/plugins/kdb/db2/pol_xdr.c | ||
| 9074 | index e857633..448d4b0 100644 | ||
| 9075 | --- a/src/plugins/kdb/db2/pol_xdr.c | ||
| 9076 | +++ b/src/plugins/kdb/db2/pol_xdr.c | ||
| 9077 | @@ -82,7 +82,7 @@ xdr_osa_policy_ent_rec(XDR *xdrs, osa_policy_ent_t objp) | ||
| 9078 | if (!xdr_short(xdrs, &objp->n_tl_data)) | ||
| 9079 | return (FALSE); | ||
| 9080 | if (!xdr_nulltype(xdrs, (void **) &objp->tl_data, | ||
| 9081 | - xdr_krb5_tl_data)) | ||
| 9082 | + (xdrproc_t)xdr_krb5_tl_data)) | ||
| 9083 | return FALSE; | ||
| 9084 | } | ||
| 9085 | return (TRUE); | ||
| 9086 | diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c | ||
| 9087 | index 0b56ba8..7ddea92 100644 | ||
| 9088 | --- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c | ||
| 9089 | +++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c | ||
| 9090 | @@ -186,8 +186,8 @@ static struct _cmd_table { | ||
| 9091 | * The function cmd_lookup returns the structure matching the | ||
| 9092 | * command name and returns NULL if nothing matches. | ||
| 9093 | */ | ||
| 9094 | -static struct _cmd_table *cmd_lookup(name) | ||
| 9095 | - char *name; | ||
| 9096 | +static struct _cmd_table * | ||
| 9097 | +cmd_lookup(const char *name) | ||
| 9098 | { | ||
| 9099 | int i; | ||
| 9100 | |||
| 9101 | diff --git a/src/plugins/kdb/lmdb/kdb_lmdb.c b/src/plugins/kdb/lmdb/kdb_lmdb.c | ||
| 9102 | index bd288e2..dbab796 100644 | ||
| 9103 | --- a/src/plugins/kdb/lmdb/kdb_lmdb.c | ||
| 9104 | +++ b/src/plugins/kdb/lmdb/kdb_lmdb.c | ||
| 9105 | @@ -468,13 +468,13 @@ error: | ||
| 9106 | } | ||
| 9107 | |||
| 9108 | static krb5_error_code | ||
| 9109 | -klmdb_lib_init() | ||
| 9110 | +klmdb_lib_init(void) | ||
| 9111 | { | ||
| 9112 | return 0; | ||
| 9113 | } | ||
| 9114 | |||
| 9115 | static krb5_error_code | ||
| 9116 | -klmdb_lib_cleanup() | ||
| 9117 | +klmdb_lib_cleanup(void) | ||
| 9118 | { | ||
| 9119 | return 0; | ||
| 9120 | } | ||
| 9121 | diff --git a/src/plugins/kdb/test/kdb_test.c b/src/plugins/kdb/test/kdb_test.c | ||
| 9122 | index f4d4380..8d14091 100644 | ||
| 9123 | --- a/src/plugins/kdb/test/kdb_test.c | ||
| 9124 | +++ b/src/plugins/kdb/test/kdb_test.c | ||
| 9125 | @@ -312,13 +312,13 @@ make_strings(char **stringattrs, krb5_db_entry *ent) | ||
| 9126 | } | ||
| 9127 | |||
| 9128 | static krb5_error_code | ||
| 9129 | -test_init() | ||
| 9130 | +test_init(void) | ||
| 9131 | { | ||
| 9132 | return 0; | ||
| 9133 | } | ||
| 9134 | |||
| 9135 | static krb5_error_code | ||
| 9136 | -test_cleanup() | ||
| 9137 | +test_cleanup(void) | ||
| 9138 | { | ||
| 9139 | return 0; | ||
| 9140 | } | ||
| 9141 | diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | ||
| 9142 | index cb9c796..4c81256 100644 | ||
| 9143 | --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | ||
| 9144 | +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | ||
| 9145 | @@ -3450,7 +3450,7 @@ load_pkcs11_module(krb5_context context, const char *modname, | ||
| 9146 | CK_RV (*getflist)(CK_FUNCTION_LIST_PTR_PTR); | ||
| 9147 | struct errinfo einfo = EMPTY_ERRINFO; | ||
| 9148 | const char *errmsg = NULL; | ||
| 9149 | - void (*sym)(); | ||
| 9150 | + void (*sym)(void); | ||
| 9151 | long err; | ||
| 9152 | CK_RV rv; | ||
| 9153 | |||
| 9154 | @@ -3469,7 +3469,7 @@ load_pkcs11_module(krb5_context context, const char *modname, | ||
| 9155 | goto error; | ||
| 9156 | } | ||
| 9157 | |||
| 9158 | - getflist = (CK_RV (*)())sym; | ||
| 9159 | + getflist = (CK_RV (*)(CK_FUNCTION_LIST_PTR_PTR))sym; | ||
| 9160 | rv = (*getflist)(p11p); | ||
| 9161 | if (rv != CKR_OK) { | ||
| 9162 | TRACE_PKINIT_PKCS11_GETFLIST_FAILED(context, pkcs11err(rv)); | ||
| 9163 | diff --git a/src/plugins/preauth/spake/t_vectors.c b/src/plugins/preauth/spake/t_vectors.c | ||
| 9164 | index 2279202..983b305 100644 | ||
| 9165 | --- a/src/plugins/preauth/spake/t_vectors.c | ||
| 9166 | +++ b/src/plugins/preauth/spake/t_vectors.c | ||
| 9167 | @@ -464,7 +464,7 @@ run_test(const struct test *t) | ||
| 9168 | } | ||
| 9169 | |||
| 9170 | int | ||
| 9171 | -main() | ||
| 9172 | +main(void) | ||
| 9173 | { | ||
| 9174 | size_t i; | ||
| 9175 | |||
| 9176 | diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c | ||
| 9177 | index 926aa94..2fa6dce 100644 | ||
| 9178 | --- a/src/tests/asn.1/krb5_decode_test.c | ||
| 9179 | +++ b/src/tests/asn.1/krb5_decode_test.c | ||
| 9180 | @@ -54,9 +54,8 @@ static void ktest_free_reply_key_pack(krb5_context context, | ||
| 9181 | static void ktest_free_kkdcp_message(krb5_context context, | ||
| 9182 | krb5_kkdcp_message *val); | ||
| 9183 | |||
| 9184 | -int main(argc, argv) | ||
| 9185 | - int argc; | ||
| 9186 | - char **argv; | ||
| 9187 | +int | ||
| 9188 | +main(int argc, char **argv) | ||
| 9189 | { | ||
| 9190 | krb5_data code; | ||
| 9191 | krb5_error_code retval; | ||
| 9192 | diff --git a/src/tests/asn.1/krb5_encode_test.c b/src/tests/asn.1/krb5_encode_test.c | ||
| 9193 | index 26c064e..f4e754b 100644 | ||
| 9194 | --- a/src/tests/asn.1/krb5_encode_test.c | ||
| 9195 | +++ b/src/tests/asn.1/krb5_encode_test.c | ||
| 9196 | @@ -37,7 +37,7 @@ krb5_context test_context; | ||
| 9197 | int error_count = 0; | ||
| 9198 | int do_trval = 0; | ||
| 9199 | int first_trval = 1; | ||
| 9200 | -int trval2(); | ||
| 9201 | +int trval2(FILE *, unsigned char *, int, int, int *); | ||
| 9202 | |||
| 9203 | static void | ||
| 9204 | encoder_print_results(krb5_data *code, char *typestring, char *description) | ||
| 9205 | @@ -51,7 +51,7 @@ encoder_print_results(krb5_data *code, char *typestring, char *description) | ||
| 9206 | else | ||
| 9207 | printf("\n"); | ||
| 9208 | printf("encode_krb5_%s%s:\n", typestring, description); | ||
| 9209 | - r = trval2(stdout, code->data, code->length, 0, &rlen); | ||
| 9210 | + r = trval2(stdout, (uint8_t *)code->data, code->length, 0, &rlen); | ||
| 9211 | printf("\n"); | ||
| 9212 | if (rlen < 0 || (unsigned int) rlen != code->length) { | ||
| 9213 | printf("Error: length mismatch: was %d, parsed %d\n", | ||
| 9214 | @@ -72,9 +72,8 @@ encoder_print_results(krb5_data *code, char *typestring, char *description) | ||
| 9215 | ktest_destroy_data(&code); | ||
| 9216 | } | ||
| 9217 | |||
| 9218 | -static void PRS(argc, argv) | ||
| 9219 | - int argc; | ||
| 9220 | - char **argv; | ||
| 9221 | +static void | ||
| 9222 | +PRS(int argc, char **argv) | ||
| 9223 | { | ||
| 9224 | extern char *optarg; | ||
| 9225 | int optchar; | ||
| 9226 | @@ -107,9 +106,7 @@ static void PRS(argc, argv) | ||
| 9227 | } | ||
| 9228 | |||
| 9229 | int | ||
| 9230 | -main(argc, argv) | ||
| 9231 | - int argc; | ||
| 9232 | - char **argv; | ||
| 9233 | +main(int argc, char **argv) | ||
| 9234 | { | ||
| 9235 | krb5_data *code; | ||
| 9236 | krb5_error_code retval; | ||
| 9237 | diff --git a/src/tests/asn.1/t_trval.c b/src/tests/asn.1/t_trval.c | ||
| 9238 | index 57d8253..009ed5b 100644 | ||
| 9239 | --- a/src/tests/asn.1/t_trval.c | ||
| 9240 | +++ b/src/tests/asn.1/t_trval.c | ||
| 9241 | @@ -36,7 +36,8 @@ | ||
| 9242 | -DSTANDALONE code. */ | ||
| 9243 | #include "trval.c" | ||
| 9244 | |||
| 9245 | -static void usage() | ||
| 9246 | +static void | ||
| 9247 | +usage(void) | ||
| 9248 | { | ||
| 9249 | fprintf(stderr, "Usage: trval [--types] [--krb5] [--krb5decode] [--hex] [-notypebytes] [file]\n"); | ||
| 9250 | exit(1); | ||
| 9251 | @@ -46,10 +47,8 @@ static void usage() | ||
| 9252 | * Returns true if the option was selected. Allow "-option" and | ||
| 9253 | * "--option" syntax, since we used to accept only "-option" | ||
| 9254 | */ | ||
| 9255 | -static | ||
| 9256 | -int check_option(word, option) | ||
| 9257 | - char *word; | ||
| 9258 | - char *option; | ||
| 9259 | +static int | ||
| 9260 | +check_option(char *word, char *option) | ||
| 9261 | { | ||
| 9262 | if (word[0] != '-') | ||
| 9263 | return 0; | ||
| 9264 | @@ -60,9 +59,8 @@ int check_option(word, option) | ||
| 9265 | return 1; | ||
| 9266 | } | ||
| 9267 | |||
| 9268 | -int main(argc, argv) | ||
| 9269 | - int argc; | ||
| 9270 | - char **argv; | ||
| 9271 | +int | ||
| 9272 | +main(int argc, char **argv) | ||
| 9273 | { | ||
| 9274 | int optflg = 1; | ||
| 9275 | FILE *fp; | ||
| 9276 | diff --git a/src/tests/asn.1/trval.c b/src/tests/asn.1/trval.c | ||
| 9277 | index c14bcde..e0e58cc 100644 | ||
| 9278 | --- a/src/tests/asn.1/trval.c | ||
| 9279 | +++ b/src/tests/asn.1/trval.c | ||
| 9280 | @@ -120,7 +120,8 @@ int trval2 (FILE *, unsigned char *, int, int, int *); | ||
| 9281 | |||
| 9282 | /****************************************************************************/ | ||
| 9283 | |||
| 9284 | -static int convert_nibble(int ch) | ||
| 9285 | +static int | ||
| 9286 | +convert_nibble(int ch) | ||
| 9287 | { | ||
| 9288 | if (isdigit(ch)) | ||
| 9289 | return (ch - '0'); | ||
| 9290 | @@ -131,9 +132,8 @@ static int convert_nibble(int ch) | ||
| 9291 | return -1; | ||
| 9292 | } | ||
| 9293 | |||
| 9294 | -int trval(fin, fout) | ||
| 9295 | - FILE *fin; | ||
| 9296 | - FILE *fout; | ||
| 9297 | +int | ||
| 9298 | +trval(FILE *fin, FILE *fout) | ||
| 9299 | { | ||
| 9300 | unsigned char *p; | ||
| 9301 | unsigned int maxlen; | ||
| 9302 | @@ -169,12 +169,8 @@ int trval(fin, fout) | ||
| 9303 | return(r); | ||
| 9304 | } | ||
| 9305 | |||
| 9306 | -int trval2(fp, enc, len, lev, rlen) | ||
| 9307 | - FILE *fp; | ||
| 9308 | - unsigned char *enc; | ||
| 9309 | - int len; | ||
| 9310 | - int lev; | ||
| 9311 | - int *rlen; | ||
| 9312 | +int | ||
| 9313 | +trval2(FILE *fp, unsigned char *enc, int len, int lev, int *rlen) | ||
| 9314 | { | ||
| 9315 | int l, eid, elen, xlen, r, rlen2 = 0; | ||
| 9316 | int rlen_ext = 0; | ||
| 9317 | @@ -248,10 +244,8 @@ context_restart: | ||
| 9318 | return(r); | ||
| 9319 | } | ||
| 9320 | |||
| 9321 | -int decode_len(fp, enc, len) | ||
| 9322 | - FILE *fp; | ||
| 9323 | - unsigned char *enc; | ||
| 9324 | - int len; | ||
| 9325 | +int | ||
| 9326 | +decode_len(FILE *fp, unsigned char *enc, int len) | ||
| 9327 | { | ||
| 9328 | int rlen; | ||
| 9329 | int i; | ||
| 9330 | @@ -270,12 +264,8 @@ int decode_len(fp, enc, len) | ||
| 9331 | /* | ||
| 9332 | * This is the printing function for bit strings | ||
| 9333 | */ | ||
| 9334 | -int do_prim_bitstring(fp, tag, enc, len, lev) | ||
| 9335 | - FILE *fp; | ||
| 9336 | - int tag; | ||
| 9337 | - unsigned char *enc; | ||
| 9338 | - int len; | ||
| 9339 | - int lev; | ||
| 9340 | +int | ||
| 9341 | +do_prim_bitstring(FILE *fp, int tag, unsigned char *enc, int len, int lev) | ||
| 9342 | { | ||
| 9343 | int i; | ||
| 9344 | long num = 0; | ||
| 9345 | @@ -297,12 +287,8 @@ int do_prim_bitstring(fp, tag, enc, len, lev) | ||
| 9346 | /* | ||
| 9347 | * This is the printing function for integers | ||
| 9348 | */ | ||
| 9349 | -int do_prim_int(fp, tag, enc, len, lev) | ||
| 9350 | - FILE *fp; | ||
| 9351 | - int tag; | ||
| 9352 | - unsigned char *enc; | ||
| 9353 | - int len; | ||
| 9354 | - int lev; | ||
| 9355 | +int | ||
| 9356 | +do_prim_int(FILE *fp, int tag, unsigned char *enc, int len, int lev) | ||
| 9357 | { | ||
| 9358 | int i; | ||
| 9359 | long num = 0; | ||
| 9360 | @@ -327,12 +313,8 @@ int do_prim_int(fp, tag, enc, len, lev) | ||
| 9361 | * This is the printing function which we use if it's a string or | ||
| 9362 | * other other type which is best printed as a string | ||
| 9363 | */ | ||
| 9364 | -int do_prim_string(fp, tag, enc, len, lev) | ||
| 9365 | - FILE *fp; | ||
| 9366 | - int tag; | ||
| 9367 | - unsigned char *enc; | ||
| 9368 | - int len; | ||
| 9369 | - int lev; | ||
| 9370 | +int | ||
| 9371 | +do_prim_string(FILE *fp, int tag, unsigned char *enc, int len, int lev) | ||
| 9372 | { | ||
| 9373 | int i; | ||
| 9374 | |||
| 9375 | @@ -349,12 +331,8 @@ int do_prim_string(fp, tag, enc, len, lev) | ||
| 9376 | return 1; | ||
| 9377 | } | ||
| 9378 | |||
| 9379 | -int do_prim(fp, tag, enc, len, lev) | ||
| 9380 | - FILE *fp; | ||
| 9381 | - int tag; | ||
| 9382 | - unsigned char *enc; | ||
| 9383 | - int len; | ||
| 9384 | - int lev; | ||
| 9385 | +int | ||
| 9386 | +do_prim(FILE *fp, int tag, unsigned char *enc, int len, int lev) | ||
| 9387 | { | ||
| 9388 | int n; | ||
| 9389 | int i; | ||
| 9390 | @@ -396,12 +374,8 @@ int do_prim(fp, tag, enc, len, lev) | ||
| 9391 | return(OK); | ||
| 9392 | } | ||
| 9393 | |||
| 9394 | -int do_cons(fp, enc, len, lev, rlen) | ||
| 9395 | - FILE *fp; | ||
| 9396 | - unsigned char *enc; | ||
| 9397 | - int len; | ||
| 9398 | - int lev; | ||
| 9399 | - int *rlen; | ||
| 9400 | +int | ||
| 9401 | +do_cons(FILE *fp, unsigned char *enc, int len, int lev, int *rlen) | ||
| 9402 | { | ||
| 9403 | int n; | ||
| 9404 | int r = 0; | ||
| 9405 | @@ -430,9 +404,8 @@ struct typestring_table { | ||
| 9406 | int new_appl; | ||
| 9407 | }; | ||
| 9408 | |||
| 9409 | -static char *lookup_typestring(table, key1, key2) | ||
| 9410 | - struct typestring_table *table; | ||
| 9411 | - int key1, key2; | ||
| 9412 | +static char * | ||
| 9413 | +lookup_typestring(struct typestring_table *table, int key1, int key2) | ||
| 9414 | { | ||
| 9415 | struct typestring_table *ent; | ||
| 9416 | |||
| 9417 | @@ -700,10 +673,8 @@ struct typestring_table krb5_fields[] = { | ||
| 9418 | }; | ||
| 9419 | #endif | ||
| 9420 | |||
| 9421 | -void print_tag_type(fp, eid, lev) | ||
| 9422 | - FILE *fp; | ||
| 9423 | - int eid; | ||
| 9424 | - int lev; | ||
| 9425 | +void | ||
| 9426 | +print_tag_type(FILE *fp, int eid, int lev) | ||
| 9427 | { | ||
| 9428 | int tag = eid & ID_TAG; | ||
| 9429 | int do_space = 1; | ||
| 9430 | diff --git a/src/tests/conccache.c b/src/tests/conccache.c | ||
| 9431 | index 7b0ca63..9fe5305 100644 | ||
| 9432 | --- a/src/tests/conccache.c | ||
| 9433 | +++ b/src/tests/conccache.c | ||
| 9434 | @@ -110,7 +110,7 @@ refresh_cache(krb5_context context) | ||
| 9435 | } | ||
| 9436 | |||
| 9437 | static pid_t | ||
| 9438 | -spawn_cred_subprocess() | ||
| 9439 | +spawn_cred_subprocess(void) | ||
| 9440 | { | ||
| 9441 | krb5_context context; | ||
| 9442 | pid_t pid; | ||
| 9443 | @@ -133,7 +133,7 @@ spawn_cred_subprocess() | ||
| 9444 | } | ||
| 9445 | |||
| 9446 | static pid_t | ||
| 9447 | -spawn_refresh_subprocess() | ||
| 9448 | +spawn_refresh_subprocess(void) | ||
| 9449 | { | ||
| 9450 | krb5_context context; | ||
| 9451 | pid_t pid; | ||
| 9452 | diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c | ||
| 9453 | index 7c06666..61ca9f6 100644 | ||
| 9454 | --- a/src/tests/create/kdb5_mkdums.c | ||
| 9455 | +++ b/src/tests/create/kdb5_mkdums.c | ||
| 9456 | @@ -56,9 +56,7 @@ struct mblock { | ||
| 9457 | int set_dbname_help (char *, char *); | ||
| 9458 | |||
| 9459 | static void | ||
| 9460 | -usage(who, status) | ||
| 9461 | - char *who; | ||
| 9462 | - int status; | ||
| 9463 | +usage(char *who, int status) | ||
| 9464 | { | ||
| 9465 | fprintf(stderr, | ||
| 9466 | "usage: %s -p prefix -n num_to_create [-d dbpathname] [-r realmname]\n", | ||
| 9467 | @@ -83,9 +81,7 @@ static krb5_boolean manual_mkey = FALSE; | ||
| 9468 | void add_princ (krb5_context, char *); | ||
| 9469 | |||
| 9470 | int | ||
| 9471 | -main(argc, argv) | ||
| 9472 | - int argc; | ||
| 9473 | - char *argv[]; | ||
| 9474 | +main(int argc, char *argv[]) | ||
| 9475 | { | ||
| 9476 | extern char *optarg; | ||
| 9477 | int optchar, i, n; | ||
| 9478 | @@ -209,9 +205,7 @@ main(argc, argv) | ||
| 9479 | } | ||
| 9480 | |||
| 9481 | void | ||
| 9482 | -add_princ(context, str_newprinc) | ||
| 9483 | - krb5_context context; | ||
| 9484 | - char * str_newprinc; | ||
| 9485 | +add_princ(krb5_context context, char *str_newprinc) | ||
| 9486 | { | ||
| 9487 | krb5_error_code retval; | ||
| 9488 | krb5_principal newprinc; | ||
| 9489 | @@ -317,9 +311,7 @@ error: /* Do cleanup of newentry regardless of error */ | ||
| 9490 | } | ||
| 9491 | |||
| 9492 | int | ||
| 9493 | -set_dbname_help(pname, dbname) | ||
| 9494 | - char *pname; | ||
| 9495 | - char *dbname; | ||
| 9496 | +set_dbname_help(char *pname, char *dbname) | ||
| 9497 | { | ||
| 9498 | krb5_error_code retval; | ||
| 9499 | krb5_data pwd, scratch; | ||
| 9500 | diff --git a/src/tests/forward.c b/src/tests/forward.c | ||
| 9501 | index 7327cc9..90f359a 100644 | ||
| 9502 | --- a/src/tests/forward.c | ||
| 9503 | +++ b/src/tests/forward.c | ||
| 9504 | @@ -51,7 +51,7 @@ check(krb5_error_code code) | ||
| 9505 | } | ||
| 9506 | |||
| 9507 | int | ||
| 9508 | -main() | ||
| 9509 | +main(void) | ||
| 9510 | { | ||
| 9511 | krb5_ccache cc; | ||
| 9512 | krb5_creds mcred, tgt, *fcred; | ||
| 9513 | diff --git a/src/tests/gss-threads/gss-client.c b/src/tests/gss-threads/gss-client.c | ||
| 9514 | index c0cf25d..8c006c2 100644 | ||
| 9515 | --- a/src/tests/gss-threads/gss-client.c | ||
| 9516 | +++ b/src/tests/gss-threads/gss-client.c | ||
| 9517 | @@ -68,7 +68,7 @@ | ||
| 9518 | static int verbose = 1; | ||
| 9519 | |||
| 9520 | static void | ||
| 9521 | -usage() | ||
| 9522 | +usage(void) | ||
| 9523 | { | ||
| 9524 | fprintf(stderr, "Usage: gss-client [-port port] [-mech mechanism] [-d]\n"); | ||
| 9525 | fprintf(stderr, " [-seq] [-noreplay] [-nomutual]"); | ||
| 9526 | @@ -134,7 +134,7 @@ get_server_info(char *host, u_short port) | ||
| 9527 | * displayed and -1 is returned. | ||
| 9528 | */ | ||
| 9529 | static int | ||
| 9530 | -connect_to_server() | ||
| 9531 | +connect_to_server(void) | ||
| 9532 | { | ||
| 9533 | int s; | ||
| 9534 | |||
| 9535 | diff --git a/src/tests/gss-threads/gss-server.c b/src/tests/gss-threads/gss-server.c | ||
| 9536 | index a9f980e..e0a3773 100644 | ||
| 9537 | --- a/src/tests/gss-threads/gss-server.c | ||
| 9538 | +++ b/src/tests/gss-threads/gss-server.c | ||
| 9539 | @@ -74,7 +74,7 @@ | ||
| 9540 | #endif | ||
| 9541 | |||
| 9542 | static void | ||
| 9543 | -usage() | ||
| 9544 | +usage(void) | ||
| 9545 | { | ||
| 9546 | fprintf(stderr, "Usage: gss-server [-port port] [-verbose] [-once]"); | ||
| 9547 | #ifdef _WIN32 | ||
| 9548 | diff --git a/src/tests/gssapi/reload.c b/src/tests/gssapi/reload.c | ||
| 9549 | index 4fe3565..00bda32 100644 | ||
| 9550 | --- a/src/tests/gssapi/reload.c | ||
| 9551 | +++ b/src/tests/gssapi/reload.c | ||
| 9552 | @@ -64,7 +64,7 @@ load_gssapi(void) | ||
| 9553 | } | ||
| 9554 | |||
| 9555 | int | ||
| 9556 | -main() | ||
| 9557 | +main(void) | ||
| 9558 | { | ||
| 9559 | void *support; | ||
| 9560 | |||
| 9561 | diff --git a/src/tests/gssapi/t_add_cred.c b/src/tests/gssapi/t_add_cred.c | ||
| 9562 | index 68b37e3..7ab52d6 100644 | ||
| 9563 | --- a/src/tests/gssapi/t_add_cred.c | ||
| 9564 | +++ b/src/tests/gssapi/t_add_cred.c | ||
| 9565 | @@ -43,7 +43,7 @@ | ||
| 9566 | #include "common.h" | ||
| 9567 | |||
| 9568 | int | ||
| 9569 | -main() | ||
| 9570 | +main(void) | ||
| 9571 | { | ||
| 9572 | OM_uint32 minor, major; | ||
| 9573 | gss_cred_id_t cred1, cred2; | ||
| 9574 | diff --git a/src/tests/gssapi/t_enctypes.c b/src/tests/gssapi/t_enctypes.c | ||
| 9575 | index 3fd31e2..3325db7 100644 | ||
| 9576 | --- a/src/tests/gssapi/t_enctypes.c | ||
| 9577 | +++ b/src/tests/gssapi/t_enctypes.c | ||
| 9578 | @@ -47,7 +47,7 @@ | ||
| 9579 | */ | ||
| 9580 | |||
| 9581 | static void | ||
| 9582 | -usage() | ||
| 9583 | +usage(void) | ||
| 9584 | { | ||
| 9585 | errout("Usage: t_enctypes [-i initenctypes] [-a accenctypes] " | ||
| 9586 | "targetname"); | ||
| 9587 | diff --git a/src/tests/gssapi/t_invalid.c b/src/tests/gssapi/t_invalid.c | ||
| 9588 | index 882e163..c4a5a99 100644 | ||
| 9589 | --- a/src/tests/gssapi/t_invalid.c | ||
| 9590 | +++ b/src/tests/gssapi/t_invalid.c | ||
| 9591 | @@ -559,7 +559,7 @@ try_accept(void *value, size_t len) | ||
| 9592 | |||
| 9593 | /* Accept contexts using superficially valid but truncated encapsulations. */ | ||
| 9594 | static void | ||
| 9595 | -test_short_encapsulation() | ||
| 9596 | +test_short_encapsulation(void) | ||
| 9597 | { | ||
| 9598 | /* Include just the initial application tag, to see if we overrun reading | ||
| 9599 | * the sequence length. */ | ||
| 9600 | diff --git a/src/tests/gssapi/t_oid.c b/src/tests/gssapi/t_oid.c | ||
| 9601 | index 1c9d394..6425313 100644 | ||
| 9602 | --- a/src/tests/gssapi/t_oid.c | ||
| 9603 | +++ b/src/tests/gssapi/t_oid.c | ||
| 9604 | @@ -129,7 +129,7 @@ oid_equal(gss_OID o1, gss_OID o2) | ||
| 9605 | } | ||
| 9606 | |||
| 9607 | int | ||
| 9608 | -main() | ||
| 9609 | +main(void) | ||
| 9610 | { | ||
| 9611 | size_t i; | ||
| 9612 | OM_uint32 major, minor; | ||
| 9613 | diff --git a/src/tests/gssapi/t_spnego.c b/src/tests/gssapi/t_spnego.c | ||
| 9614 | index 2483228..4091739 100644 | ||
| 9615 | --- a/src/tests/gssapi/t_spnego.c | ||
| 9616 | +++ b/src/tests/gssapi/t_spnego.c | ||
| 9617 | @@ -195,7 +195,7 @@ test_mskrb_oid(gss_name_t tname, gss_cred_id_t acred) | ||
| 9618 | /* Check that we return a compatibility NegTokenInit2 message containing | ||
| 9619 | * NegHints for an empty initiator token. */ | ||
| 9620 | static void | ||
| 9621 | -test_neghints() | ||
| 9622 | +test_neghints(void) | ||
| 9623 | { | ||
| 9624 | OM_uint32 major, minor; | ||
| 9625 | gss_buffer_desc itok = GSS_C_EMPTY_BUFFER, atok; | ||
| 9626 | diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c | ||
| 9627 | index 8220fd9..76ef527 100644 | ||
| 9628 | --- a/src/tests/hammer/kdc5_hammer.c | ||
| 9629 | +++ b/src/tests/hammer/kdc5_hammer.c | ||
| 9630 | @@ -68,9 +68,7 @@ int get_tgt | ||
| 9631 | krb5_ccache); | ||
| 9632 | |||
| 9633 | static void | ||
| 9634 | -usage(who, status) | ||
| 9635 | -char *who; | ||
| 9636 | -int status; | ||
| 9637 | +usage(char *who, int status) | ||
| 9638 | { | ||
| 9639 | fprintf(stderr, | ||
| 9640 | "usage: %s -p prefix -n num_to_check [-c cachename] [-r realmname]\n", | ||
| 9641 | @@ -100,9 +98,7 @@ struct h_timer tgs_req_times = { 0.0, 1000000.0, -1.0, 0 }; | ||
| 9642 | tstart_time.tv_usec))/1000000.0))) | ||
| 9643 | |||
| 9644 | int | ||
| 9645 | -main(argc, argv) | ||
| 9646 | - int argc; | ||
| 9647 | - char **argv; | ||
| 9648 | +main(int argc, char **argv) | ||
| 9649 | { | ||
| 9650 | krb5_ccache ccache = NULL; | ||
| 9651 | char *cache_name = NULL; /* -f option */ | ||
| 9652 | @@ -271,11 +267,8 @@ main(argc, argv) | ||
| 9653 | |||
| 9654 | |||
| 9655 | static krb5_error_code | ||
| 9656 | -get_server_key(context, server, enctype, key) | ||
| 9657 | - krb5_context context; | ||
| 9658 | - krb5_principal server; | ||
| 9659 | - krb5_enctype enctype; | ||
| 9660 | - krb5_keyblock ** key; | ||
| 9661 | +get_server_key(krb5_context context, krb5_principal server, | ||
| 9662 | + krb5_enctype enctype, krb5_keyblock **key) | ||
| 9663 | { | ||
| 9664 | krb5_error_code retval; | ||
| 9665 | krb5_encrypt_block eblock; | ||
| 9666 | @@ -311,15 +304,10 @@ cleanup_salt: | ||
| 9667 | return retval; | ||
| 9668 | } | ||
| 9669 | |||
| 9670 | -int verify_cs_pair(context, p_client_str, p_client, service, hostname, | ||
| 9671 | - p_num, c_depth, s_depth, ccache) | ||
| 9672 | - krb5_context context; | ||
| 9673 | - char *p_client_str; | ||
| 9674 | - krb5_principal p_client; | ||
| 9675 | - char * service; | ||
| 9676 | - char * hostname; | ||
| 9677 | - int p_num, c_depth, s_depth; | ||
| 9678 | - krb5_ccache ccache; | ||
| 9679 | +int | ||
| 9680 | +verify_cs_pair(krb5_context context, char *p_client_str, | ||
| 9681 | + krb5_principal p_client, char *service, char *hostname, | ||
| 9682 | + int p_num, int c_depth, int s_depth, krb5_ccache ccache) | ||
| 9683 | { | ||
| 9684 | krb5_error_code retval; | ||
| 9685 | krb5_creds creds; | ||
| 9686 | @@ -433,11 +421,9 @@ cleanup: | ||
| 9687 | return retval; | ||
| 9688 | } | ||
| 9689 | |||
| 9690 | -int get_tgt (context, p_client_str, p_client, ccache) | ||
| 9691 | - krb5_context context; | ||
| 9692 | - char *p_client_str; | ||
| 9693 | - krb5_principal *p_client; | ||
| 9694 | - krb5_ccache ccache; | ||
| 9695 | +int | ||
| 9696 | +get_tgt(krb5_context context, char *p_client_str, krb5_principal *p_client, | ||
| 9697 | + krb5_ccache ccache) | ||
| 9698 | { | ||
| 9699 | long lifetime = KRB5_DEFAULT_LIFE; /* -l option */ | ||
| 9700 | krb5_error_code code; | ||
| 9701 | diff --git a/src/tests/kdbtest.c b/src/tests/kdbtest.c | ||
| 9702 | index 3f61f3e..6459c33 100644 | ||
| 9703 | --- a/src/tests/kdbtest.c | ||
| 9704 | +++ b/src/tests/kdbtest.c | ||
| 9705 | @@ -271,7 +271,7 @@ iter_pol_handler(void *data, osa_policy_ent_t pol) | ||
| 9706 | } | ||
| 9707 | |||
| 9708 | int | ||
| 9709 | -main() | ||
| 9710 | +main(void) | ||
| 9711 | { | ||
| 9712 | krb5_db_entry *ent; | ||
| 9713 | osa_policy_ent_t pol; | ||
| 9714 | diff --git a/src/tests/misc/test_getpw.c b/src/tests/misc/test_getpw.c | ||
| 9715 | index 6031e15..59ff5d3 100644 | ||
| 9716 | --- a/src/tests/misc/test_getpw.c | ||
| 9717 | +++ b/src/tests/misc/test_getpw.c | ||
| 9718 | @@ -32,7 +32,7 @@ | ||
| 9719 | #include <unistd.h> | ||
| 9720 | #include <sys/types.h> | ||
| 9721 | |||
| 9722 | -int main() | ||
| 9723 | +int main(void) | ||
| 9724 | { | ||
| 9725 | uid_t my_uid; | ||
| 9726 | struct passwd *pwd, pwx; | ||
| 9727 | diff --git a/src/tests/plugorder.c b/src/tests/plugorder.c | ||
| 9728 | index e1245e4..a2b7e34 100644 | ||
| 9729 | --- a/src/tests/plugorder.c | ||
| 9730 | +++ b/src/tests/plugorder.c | ||
| 9731 | @@ -77,7 +77,7 @@ blt3(krb5_context context, int maj_ver, int min_ver, krb5_plugin_vtable vtable) | ||
| 9732 | } | ||
| 9733 | |||
| 9734 | int | ||
| 9735 | -main() | ||
| 9736 | +main(void) | ||
| 9737 | { | ||
| 9738 | krb5_plugin_initvt_fn *modules = NULL, *mod; | ||
| 9739 | struct krb5_pwqual_vtable_st vt; | ||
| 9740 | diff --git a/src/tests/shlib/t_loader.c b/src/tests/shlib/t_loader.c | ||
| 9741 | index 29481a7..203f023 100644 | ||
| 9742 | --- a/src/tests/shlib/t_loader.c | ||
| 9743 | +++ b/src/tests/shlib/t_loader.c | ||
| 9744 | @@ -180,7 +180,7 @@ static void do_close(void *libhandle) | ||
| 9745 | |||
| 9746 | #endif | ||
| 9747 | |||
| 9748 | -int main() | ||
| 9749 | +int main(void) | ||
| 9750 | { | ||
| 9751 | void *celib, *k5lib, *gsslib, *celib2; | ||
| 9752 | |||
| 9753 | diff --git a/src/tests/softpkcs11/main.c b/src/tests/softpkcs11/main.c | ||
| 9754 | index 82b05ff..908f926 100644 | ||
| 9755 | --- a/src/tests/softpkcs11/main.c | ||
| 9756 | +++ b/src/tests/softpkcs11/main.c | ||
| 9757 | @@ -860,7 +860,7 @@ func_not_supported(void) | ||
| 9758 | } | ||
| 9759 | |||
| 9760 | static char * | ||
| 9761 | -get_rcfilename() | ||
| 9762 | +get_rcfilename(void) | ||
| 9763 | { | ||
| 9764 | struct passwd *pw; | ||
| 9765 | const char *home = NULL; | ||
| 9766 | diff --git a/src/tests/t_inetd.c b/src/tests/t_inetd.c | ||
| 9767 | index d22cf31..3790467 100644 | ||
| 9768 | --- a/src/tests/t_inetd.c | ||
| 9769 | +++ b/src/tests/t_inetd.c | ||
| 9770 | @@ -59,16 +59,15 @@ | ||
| 9771 | |||
| 9772 | char *progname; | ||
| 9773 | |||
| 9774 | -static void usage() | ||
| 9775 | +static void | ||
| 9776 | +usage(void) | ||
| 9777 | { | ||
| 9778 | fprintf(stderr, "%s: port program argv0 argv1 ...\n", progname); | ||
| 9779 | exit(1); | ||
| 9780 | } | ||
| 9781 | |||
| 9782 | int | ||
| 9783 | -main(argc, argv) | ||
| 9784 | - int argc; | ||
| 9785 | - char **argv; | ||
| 9786 | +main(int argc, char **argv) | ||
| 9787 | { | ||
| 9788 | unsigned short port; | ||
| 9789 | char *path; | ||
| 9790 | diff --git a/src/tests/test1.c b/src/tests/test1.c | ||
| 9791 | index aed656e..b213a34 100644 | ||
| 9792 | --- a/src/tests/test1.c | ||
| 9793 | +++ b/src/tests/test1.c | ||
| 9794 | @@ -31,7 +31,7 @@ unsigned char key_two[8] = { 0xea, 0x89, 0x57, 0x76, 0x5b, 0xcd, 0x0d, 0x34 }; | ||
| 9795 | |||
| 9796 | extern void dump_data(); | ||
| 9797 | |||
| 9798 | -tkt_test_1() | ||
| 9799 | +tkt_test_1(void) | ||
| 9800 | { | ||
| 9801 | krb5_data *data; | ||
| 9802 | krb5_ticket tk_in, *tk_out; | ||
| 9803 | @@ -185,7 +185,7 @@ tkt_test_1() | ||
| 9804 | |||
| 9805 | |||
| 9806 | |||
| 9807 | -main() | ||
| 9808 | +main(void) | ||
| 9809 | { | ||
| 9810 | krb5_init_ets(); | ||
| 9811 | tkt_test_1(); | ||
| 9812 | diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c | ||
| 9813 | index 3b152ba..d53e92a 100644 | ||
| 9814 | --- a/src/tests/verify/kdb5_verify.c | ||
| 9815 | +++ b/src/tests/verify/kdb5_verify.c | ||
| 9816 | @@ -50,9 +50,7 @@ struct mblock { | ||
| 9817 | int set_dbname_help (krb5_context, char *, char *); | ||
| 9818 | |||
| 9819 | static void | ||
| 9820 | -usage(who, status) | ||
| 9821 | - char *who; | ||
| 9822 | - int status; | ||
| 9823 | +usage(char *who, int status) | ||
| 9824 | { | ||
| 9825 | fprintf(stderr, | ||
| 9826 | "usage: %s -p prefix -n num_to_check [-d dbpathname] [-r realmname]\n", | ||
| 9827 | @@ -78,9 +76,7 @@ static krb5_boolean manual_mkey = FALSE; | ||
| 9828 | int check_princ (krb5_context, char *); | ||
| 9829 | |||
| 9830 | int | ||
| 9831 | -main(argc, argv) | ||
| 9832 | - int argc; | ||
| 9833 | - char *argv[]; | ||
| 9834 | +main(int argc, char *argv[]) | ||
| 9835 | { | ||
| 9836 | extern char *optarg; | ||
| 9837 | int optchar, i, n; | ||
| 9838 | @@ -221,9 +217,7 @@ main(argc, argv) | ||
| 9839 | } | ||
| 9840 | |||
| 9841 | int | ||
| 9842 | -check_princ(context, str_princ) | ||
| 9843 | - krb5_context context; | ||
| 9844 | - char * str_princ; | ||
| 9845 | +check_princ(krb5_context context, char *str_princ) | ||
| 9846 | { | ||
| 9847 | krb5_error_code retval; | ||
| 9848 | krb5_db_entry *kdbe = NULL; | ||
| 9849 | @@ -343,10 +337,7 @@ out: | ||
| 9850 | } | ||
| 9851 | |||
| 9852 | int | ||
| 9853 | -set_dbname_help(context, pname, dbname) | ||
| 9854 | - krb5_context context; | ||
| 9855 | - char *pname; | ||
| 9856 | - char *dbname; | ||
| 9857 | +set_dbname_help(krb5_context context, char *pname, char *dbname) | ||
| 9858 | { | ||
| 9859 | krb5_error_code retval; | ||
| 9860 | krb5_data pwd, scratch; | ||
| 9861 | diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c | ||
| 9862 | index 7dc02a3..13ad3af 100644 | ||
| 9863 | --- a/src/util/et/error_message.c | ||
| 9864 | +++ b/src/util/et/error_message.c | ||
| 9865 | @@ -82,7 +82,7 @@ void com_err_terminate(void) | ||
| 9866 | #endif | ||
| 9867 | |||
| 9868 | static char * | ||
| 9869 | -get_thread_buffer () | ||
| 9870 | +get_thread_buffer(void) | ||
| 9871 | { | ||
| 9872 | char *cp; | ||
| 9873 | cp = k5_getspecific(K5_KEY_COM_ERR); | ||
| 9874 | diff --git a/src/util/et/test_et.c b/src/util/et/test_et.c | ||
| 9875 | index 9faf10f..2002e5f 100644 | ||
| 9876 | --- a/src/util/et/test_et.c | ||
| 9877 | +++ b/src/util/et/test_et.c | ||
| 9878 | @@ -17,7 +17,8 @@ extern const char *error_table_name (errcode_t); | ||
| 9879 | extern int sys_nerr; | ||
| 9880 | #endif | ||
| 9881 | |||
| 9882 | -int main() | ||
| 9883 | +int | ||
| 9884 | +main(void) | ||
| 9885 | { | ||
| 9886 | printf("Before initiating error table:\n\n"); | ||
| 9887 | #ifndef EXPORT_LIST | ||
| 9888 | diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c | ||
| 9889 | index cc92248..077c852 100644 | ||
| 9890 | --- a/src/util/profile/prof_init.c | ||
| 9891 | +++ b/src/util/profile/prof_init.c | ||
| 9892 | @@ -103,7 +103,7 @@ init_load_module(const char *modspec, profile_t *ret_profile) | ||
| 9893 | struct errinfo einfo = { 0 }; | ||
| 9894 | prf_lib_handle_t lib_handle = NULL; | ||
| 9895 | struct plugin_file_handle *plhandle = NULL; | ||
| 9896 | - void *cbdata = NULL, (*fptr)(); | ||
| 9897 | + void *cbdata = NULL, (*fptr)(void); | ||
| 9898 | int have_lock = 0, have_cbdata = 0; | ||
| 9899 | struct profile_vtable vtable = { 1 }; /* Set minor_ver to 1, rest null. */ | ||
| 9900 | errcode_t err; | ||
| 9901 | diff --git a/src/util/profile/t_profile.c b/src/util/profile/t_profile.c | ||
| 9902 | index b0e715b..bffd115 100644 | ||
| 9903 | --- a/src/util/profile/t_profile.c | ||
| 9904 | +++ b/src/util/profile/t_profile.c | ||
| 9905 | @@ -72,7 +72,7 @@ write_file(const char *name, int nlines, ...) | ||
| 9906 | /* Regression test for #2685 (profile iterator breaks when modifications | ||
| 9907 | * made) */ | ||
| 9908 | static void | ||
| 9909 | -test_iterate() | ||
| 9910 | +test_iterate(void) | ||
| 9911 | { | ||
| 9912 | profile_t p; | ||
| 9913 | void *iter; | ||
| 9914 | @@ -129,7 +129,7 @@ test_iterate() | ||
| 9915 | * global shared profiles list. | ||
| 9916 | */ | ||
| 9917 | static void | ||
| 9918 | -test_shared() | ||
| 9919 | +test_shared(void) | ||
| 9920 | { | ||
| 9921 | profile_t a, b; | ||
| 9922 | struct utimbuf times; | ||
| 9923 | @@ -164,7 +164,7 @@ test_shared() | ||
| 9924 | /* Regression test for #2950 (profile_clear_relation not reflected within | ||
| 9925 | * handle where deletion is performed) */ | ||
| 9926 | static void | ||
| 9927 | -test_clear() | ||
| 9928 | +test_clear(void) | ||
| 9929 | { | ||
| 9930 | profile_t p; | ||
| 9931 | const char *names[] = { "test section 1", "quux", NULL }; | ||
| 9932 | @@ -183,7 +183,7 @@ test_clear() | ||
| 9933 | } | ||
| 9934 | |||
| 9935 | static void | ||
| 9936 | -test_include() | ||
| 9937 | +test_include(void) | ||
| 9938 | { | ||
| 9939 | profile_t p; | ||
| 9940 | const char *names[] = { "test section 1", "bar", NULL }; | ||
| 9941 | @@ -237,7 +237,7 @@ test_include() | ||
| 9942 | |||
| 9943 | /* Test syntactic independence of included profile files. */ | ||
| 9944 | static void | ||
| 9945 | -test_independence() | ||
| 9946 | +test_independence(void) | ||
| 9947 | { | ||
| 9948 | profile_t p; | ||
| 9949 | const char *names1[] = { "sec1", "var", "a", NULL }; | ||
| 9950 | @@ -264,7 +264,7 @@ test_independence() | ||
| 9951 | |||
| 9952 | /* Regression test for #7971 (deleted sections should not be iterable) */ | ||
| 9953 | static void | ||
| 9954 | -test_delete_section() | ||
| 9955 | +test_delete_section(void) | ||
| 9956 | { | ||
| 9957 | profile_t p; | ||
| 9958 | const char *sect[] = { "test section 1", NULL }; | ||
| 9959 | @@ -290,7 +290,7 @@ test_delete_section() | ||
| 9960 | /* Regression test for #7971 (profile_clear_relation() error with deleted node | ||
| 9961 | * at end of value set) */ | ||
| 9962 | static void | ||
| 9963 | -test_delete_clear_relation() | ||
| 9964 | +test_delete_clear_relation(void) | ||
| 9965 | { | ||
| 9966 | profile_t p; | ||
| 9967 | const char *names[] = { "test section 1", "testkey", NULL }; | ||
| 9968 | @@ -305,7 +305,7 @@ test_delete_clear_relation() | ||
| 9969 | |||
| 9970 | /* Test that order of relations is preserved if some relations are deleted. */ | ||
| 9971 | static void | ||
| 9972 | -test_delete_ordering() | ||
| 9973 | +test_delete_ordering(void) | ||
| 9974 | { | ||
| 9975 | profile_t p; | ||
| 9976 | const char *names[] = { "test section 1", "testkey", NULL }; | ||
| 9977 | @@ -329,7 +329,7 @@ test_delete_ordering() | ||
| 9978 | /* Regression test for #8431 (profile_flush_to_file erroneously changes flag | ||
| 9979 | * state on source object) */ | ||
| 9980 | static void | ||
| 9981 | -test_flush_to_file() | ||
| 9982 | +test_flush_to_file(void) | ||
| 9983 | { | ||
| 9984 | profile_t p; | ||
| 9985 | |||
| 9986 | @@ -349,7 +349,7 @@ test_flush_to_file() | ||
| 9987 | /* Regression test for #7863 (multiply-specified subsections should | ||
| 9988 | * be merged) */ | ||
| 9989 | static void | ||
| 9990 | -test_merge_subsections() | ||
| 9991 | +test_merge_subsections(void) | ||
| 9992 | { | ||
| 9993 | profile_t p; | ||
| 9994 | const char *n1[] = { "test section 2", "child_section2", "child", NULL }; | ||
| 9995 | @@ -374,7 +374,7 @@ test_merge_subsections() | ||
| 9996 | } | ||
| 9997 | |||
| 9998 | int | ||
| 9999 | -main() | ||
| 10000 | +main(void) | ||
| 10001 | { | ||
| 10002 | test_iterate(); | ||
| 10003 | test_shared(); | ||
| 10004 | diff --git a/src/util/profile/test_load.c b/src/util/profile/test_load.c | ||
| 10005 | index cb870ef..fe2d1e3 100644 | ||
| 10006 | --- a/src/util/profile/test_load.c | ||
| 10007 | +++ b/src/util/profile/test_load.c | ||
| 10008 | @@ -29,7 +29,7 @@ | ||
| 10009 | #include "prof_int.h" | ||
| 10010 | |||
| 10011 | int | ||
| 10012 | -main() | ||
| 10013 | +main(void) | ||
| 10014 | { | ||
| 10015 | profile_t pr, pr2; | ||
| 10016 | const char *files[] = { "./modtest.conf", NULL }; | ||
| 10017 | diff --git a/src/util/profile/test_parse.c b/src/util/profile/test_parse.c | ||
| 10018 | index 9f2631e..0532254 100644 | ||
| 10019 | --- a/src/util/profile/test_parse.c | ||
| 10020 | +++ b/src/util/profile/test_parse.c | ||
| 10021 | @@ -11,9 +11,8 @@ | ||
| 10022 | |||
| 10023 | void dump_profile (struct profile_node *root, int level); | ||
| 10024 | |||
| 10025 | -int main(argc, argv) | ||
| 10026 | - int argc; | ||
| 10027 | - char **argv; | ||
| 10028 | +int | ||
| 10029 | +main(int argc, char **argv) | ||
| 10030 | { | ||
| 10031 | struct profile_node *root; | ||
| 10032 | unsigned long retval; | ||
| 10033 | diff --git a/src/util/profile/test_profile.c b/src/util/profile/test_profile.c | ||
| 10034 | index 6f6fcc7..31b1063 100644 | ||
| 10035 | --- a/src/util/profile/test_profile.c | ||
| 10036 | +++ b/src/util/profile/test_profile.c | ||
| 10037 | @@ -19,8 +19,8 @@ const char *program_name = "test_profile"; | ||
| 10038 | #define PRINT_VALUE 1 | ||
| 10039 | #define PRINT_VALUES 2 | ||
| 10040 | |||
| 10041 | -static void do_batchmode(profile) | ||
| 10042 | - profile_t profile; | ||
| 10043 | +static void | ||
| 10044 | +do_batchmode(profile_t profile) | ||
| 10045 | { | ||
| 10046 | errcode_t retval; | ||
| 10047 | int argc, ret; | ||
| 10048 | @@ -108,10 +108,8 @@ static void do_batchmode(profile) | ||
| 10049 | |||
| 10050 | } | ||
| 10051 | |||
| 10052 | - | ||
| 10053 | -int main(argc, argv) | ||
| 10054 | - int argc; | ||
| 10055 | - char **argv; | ||
| 10056 | +int | ||
| 10057 | +main(int argc, char **argv) | ||
| 10058 | { | ||
| 10059 | profile_t profile; | ||
| 10060 | long retval; | ||
| 10061 | diff --git a/src/util/profile/test_vtable.c b/src/util/profile/test_vtable.c | ||
| 10062 | index 9a0b227..a7b6f54 100644 | ||
| 10063 | --- a/src/util/profile/test_vtable.c | ||
| 10064 | +++ b/src/util/profile/test_vtable.c | ||
| 10065 | @@ -232,7 +232,8 @@ struct profile_vtable full_vtable = { | ||
| 10066 | full_flush | ||
| 10067 | }; | ||
| 10068 | |||
| 10069 | -int main() | ||
| 10070 | +int | ||
| 10071 | +main(void) | ||
| 10072 | { | ||
| 10073 | profile_t profile; | ||
| 10074 | char **values, *str, *name, *value; | ||
| 10075 | diff --git a/src/util/ss/error.c b/src/util/ss/error.c | ||
| 10076 | index b5768a6..e5cd1b2 100644 | ||
| 10077 | --- a/src/util/ss/error.c | ||
| 10078 | +++ b/src/util/ss/error.c | ||
| 10079 | @@ -33,8 +33,8 @@ | ||
| 10080 | #include "com_err.h" | ||
| 10081 | #include "copyright.h" | ||
| 10082 | |||
| 10083 | -char * ss_name(sci_idx) | ||
| 10084 | - int sci_idx; | ||
| 10085 | +char * | ||
| 10086 | +ss_name(int sci_idx) | ||
| 10087 | { | ||
| 10088 | ss_data *infop; | ||
| 10089 | |||
| 10090 | @@ -50,7 +50,8 @@ char * ss_name(sci_idx) | ||
| 10091 | } | ||
| 10092 | } | ||
| 10093 | |||
| 10094 | -void ss_error (int sci_idx, long code, const char * fmt, ...) | ||
| 10095 | +void | ||
| 10096 | +ss_error(int sci_idx, long code, const char *fmt, ...) | ||
| 10097 | { | ||
| 10098 | char *whoami; | ||
| 10099 | va_list pvar; | ||
| 10100 | @@ -61,10 +62,8 @@ void ss_error (int sci_idx, long code, const char * fmt, ...) | ||
| 10101 | va_end(pvar); | ||
| 10102 | } | ||
| 10103 | |||
| 10104 | -void ss_perror (sci_idx, code, msg) /* for compatibility */ | ||
| 10105 | - int sci_idx; | ||
| 10106 | - long code; | ||
| 10107 | - char const *msg; | ||
| 10108 | +void | ||
| 10109 | +ss_perror(int sci_idx, long code, char const *msg) /* for compatibility */ | ||
| 10110 | { | ||
| 10111 | ss_error (sci_idx, code, "%s", msg); | ||
| 10112 | } | ||
| 10113 | diff --git a/src/util/ss/execute_cmd.c b/src/util/ss/execute_cmd.c | ||
| 10114 | index c06ee56..065c241 100644 | ||
| 10115 | --- a/src/util/ss/execute_cmd.c | ||
| 10116 | +++ b/src/util/ss/execute_cmd.c | ||
| 10117 | @@ -52,11 +52,9 @@ | ||
| 10118 | * Notes: | ||
| 10119 | */ | ||
| 10120 | |||
| 10121 | -static int check_request_table (rqtbl, argc, argv, sci_idx) | ||
| 10122 | - ss_request_table *rqtbl; | ||
| 10123 | - int argc; | ||
| 10124 | - char *argv[]; | ||
| 10125 | - int sci_idx; | ||
| 10126 | +static int | ||
| 10127 | +check_request_table(ss_request_table *rqtbl, int argc, char *argv[], | ||
| 10128 | + int sci_idx) | ||
| 10129 | { | ||
| 10130 | ss_request_entry *request; | ||
| 10131 | ss_data *info; | ||
| 10132 | @@ -101,10 +99,8 @@ static int check_request_table (rqtbl, argc, argv, sci_idx) | ||
| 10133 | * Notes: | ||
| 10134 | */ | ||
| 10135 | |||
| 10136 | -static int really_execute_command (sci_idx, argc, argv) | ||
| 10137 | - int sci_idx; | ||
| 10138 | - int argc; | ||
| 10139 | - char **argv[]; | ||
| 10140 | +static int | ||
| 10141 | +really_execute_command(int sci_idx, int argc, char **argv[]) | ||
| 10142 | { | ||
| 10143 | ss_request_table **rqtbl; | ||
| 10144 | ss_data *info; | ||
| 10145 | @@ -135,9 +131,7 @@ static int really_execute_command (sci_idx, argc, argv) | ||
| 10146 | */ | ||
| 10147 | |||
| 10148 | int | ||
| 10149 | -ss_execute_command(sci_idx, argv) | ||
| 10150 | - int sci_idx; | ||
| 10151 | - char *argv[]; | ||
| 10152 | +ss_execute_command(int sci_idx, char *argv[]) | ||
| 10153 | { | ||
| 10154 | unsigned int i, argc; | ||
| 10155 | char **argp; | ||
| 10156 | @@ -172,9 +166,8 @@ ss_execute_command(sci_idx, argv) | ||
| 10157 | * Notes: | ||
| 10158 | */ | ||
| 10159 | |||
| 10160 | -int ss_execute_line (sci_idx, line_ptr) | ||
| 10161 | - int sci_idx; | ||
| 10162 | - char *line_ptr; | ||
| 10163 | +int | ||
| 10164 | +ss_execute_line(int sci_idx, char *line_ptr) | ||
| 10165 | { | ||
| 10166 | char **argv; | ||
| 10167 | int argc, ret; | ||
| 10168 | diff --git a/src/util/ss/help.c b/src/util/ss/help.c | ||
| 10169 | index 6d333c9..747fde5 100644 | ||
| 10170 | --- a/src/util/ss/help.c | ||
| 10171 | +++ b/src/util/ss/help.c | ||
| 10172 | @@ -15,11 +15,8 @@ | ||
| 10173 | #include "copyright.h" | ||
| 10174 | |||
| 10175 | |||
| 10176 | -void ss_help (argc, argv, sci_idx, info_ptr) | ||
| 10177 | - int argc; | ||
| 10178 | - char const * const *argv; | ||
| 10179 | - int sci_idx; | ||
| 10180 | - pointer info_ptr; | ||
| 10181 | +void | ||
| 10182 | +ss_help(int argc, char const * const *argv, int sci_idx, pointer info_ptr) | ||
| 10183 | { | ||
| 10184 | char buffer[MAXPATHLEN]; | ||
| 10185 | char const *request_name; | ||
| 10186 | @@ -81,15 +78,11 @@ got_it: | ||
| 10187 | ss_page_stdin(); | ||
| 10188 | default: | ||
| 10189 | (void) close(fd); /* what can we do if it fails? */ | ||
| 10190 | -#ifdef WAIT_USES_INT | ||
| 10191 | - while (wait((int *)NULL) != child) { | ||
| 10192 | -#else | ||
| 10193 | - while (wait((union wait *)NULL) != child) { | ||
| 10194 | -#endif | ||
| 10195 | - /* do nothing if wrong pid */ | ||
| 10196 | - }; | ||
| 10197 | - } | ||
| 10198 | + while (wait(NULL) != child) { | ||
| 10199 | + /* do nothing if wrong pid */ | ||
| 10200 | + }; | ||
| 10201 | } | ||
| 10202 | +} | ||
| 10203 | |||
| 10204 | #ifndef USE_DIRENT_H | ||
| 10205 | #include <sys/dir.h> | ||
| 10206 | @@ -97,60 +90,56 @@ got_it: | ||
| 10207 | #include <dirent.h> | ||
| 10208 | #endif | ||
| 10209 | |||
| 10210 | - void ss_add_info_dir(sci_idx, info_dir, code_ptr) | ||
| 10211 | - int sci_idx; | ||
| 10212 | - char *info_dir; | ||
| 10213 | - int *code_ptr; | ||
| 10214 | - { | ||
| 10215 | - ss_data *info; | ||
| 10216 | - DIR *d; | ||
| 10217 | - int n_dirs; | ||
| 10218 | - char **dirs; | ||
| 10219 | +void | ||
| 10220 | +ss_add_info_dir(int sci_idx, char *info_dir, int *code_ptr) | ||
| 10221 | +{ | ||
| 10222 | + ss_data *info; | ||
| 10223 | + DIR *d; | ||
| 10224 | + int n_dirs; | ||
| 10225 | + char **dirs; | ||
| 10226 | |||
| 10227 | - info = ss_info(sci_idx); | ||
| 10228 | - if ((info_dir == NULL) || (*info_dir == '\0')) { | ||
| 10229 | - *code_ptr = SS_ET_NO_INFO_DIR; | ||
| 10230 | - return; | ||
| 10231 | - } | ||
| 10232 | - if ((d = opendir(info_dir)) == (DIR *)NULL) { | ||
| 10233 | - *code_ptr = errno; | ||
| 10234 | - return; | ||
| 10235 | - } | ||
| 10236 | - closedir(d); | ||
| 10237 | - dirs = info->info_dirs; | ||
| 10238 | - for (n_dirs = 0; dirs[n_dirs] != (char *)NULL; n_dirs++) | ||
| 10239 | - ; /* get number of non-NULL dir entries */ | ||
| 10240 | - dirs = (char **)realloc((char *)dirs, | ||
| 10241 | - (unsigned)(n_dirs + 2)*sizeof(char *)); | ||
| 10242 | - if (dirs == (char **)NULL) { | ||
| 10243 | - info->info_dirs = (char **)NULL; | ||
| 10244 | - *code_ptr = errno; | ||
| 10245 | - return; | ||
| 10246 | - } | ||
| 10247 | - info->info_dirs = dirs; | ||
| 10248 | - dirs[n_dirs + 1] = (char *)NULL; | ||
| 10249 | - dirs[n_dirs] = strdup(info_dir); | ||
| 10250 | - *code_ptr = 0; | ||
| 10251 | + info = ss_info(sci_idx); | ||
| 10252 | + if ((info_dir == NULL) || (*info_dir == '\0')) { | ||
| 10253 | + *code_ptr = SS_ET_NO_INFO_DIR; | ||
| 10254 | + return; | ||
| 10255 | + } | ||
| 10256 | + if ((d = opendir(info_dir)) == (DIR *)NULL) { | ||
| 10257 | + *code_ptr = errno; | ||
| 10258 | + return; | ||
| 10259 | } | ||
| 10260 | + closedir(d); | ||
| 10261 | + dirs = info->info_dirs; | ||
| 10262 | + for (n_dirs = 0; dirs[n_dirs] != (char *)NULL; n_dirs++) | ||
| 10263 | + ; /* get number of non-NULL dir entries */ | ||
| 10264 | + dirs = (char **)realloc((char *)dirs, | ||
| 10265 | + (unsigned)(n_dirs + 2)*sizeof(char *)); | ||
| 10266 | + if (dirs == (char **)NULL) { | ||
| 10267 | + info->info_dirs = (char **)NULL; | ||
| 10268 | + *code_ptr = errno; | ||
| 10269 | + return; | ||
| 10270 | + } | ||
| 10271 | + info->info_dirs = dirs; | ||
| 10272 | + dirs[n_dirs + 1] = (char *)NULL; | ||
| 10273 | + dirs[n_dirs] = strdup(info_dir); | ||
| 10274 | + *code_ptr = 0; | ||
| 10275 | +} | ||
| 10276 | |||
| 10277 | - void ss_delete_info_dir(sci_idx, info_dir, code_ptr) | ||
| 10278 | - int sci_idx; | ||
| 10279 | - char *info_dir; | ||
| 10280 | - int *code_ptr; | ||
| 10281 | - { | ||
| 10282 | - char **i_d; | ||
| 10283 | - char **info_dirs; | ||
| 10284 | +void | ||
| 10285 | +ss_delete_info_dir(int sci_idx, char *info_dir, int *code_ptr) | ||
| 10286 | +{ | ||
| 10287 | + char **i_d; | ||
| 10288 | + char **info_dirs; | ||
| 10289 | |||
| 10290 | - info_dirs = ss_info(sci_idx)->info_dirs; | ||
| 10291 | - for (i_d = info_dirs; *i_d; i_d++) { | ||
| 10292 | - if (!strcmp(*i_d, info_dir)) { | ||
| 10293 | - while (*i_d) { | ||
| 10294 | - *i_d = *(i_d+1); | ||
| 10295 | - i_d++; | ||
| 10296 | - } | ||
| 10297 | - *code_ptr = 0; | ||
| 10298 | - return; | ||
| 10299 | + info_dirs = ss_info(sci_idx)->info_dirs; | ||
| 10300 | + for (i_d = info_dirs; *i_d; i_d++) { | ||
| 10301 | + if (!strcmp(*i_d, info_dir)) { | ||
| 10302 | + while (*i_d) { | ||
| 10303 | + *i_d = *(i_d+1); | ||
| 10304 | + i_d++; | ||
| 10305 | } | ||
| 10306 | + *code_ptr = 0; | ||
| 10307 | + return; | ||
| 10308 | } | ||
| 10309 | - *code_ptr = SS_ET_NO_INFO_DIR; | ||
| 10310 | } | ||
| 10311 | + *code_ptr = SS_ET_NO_INFO_DIR; | ||
| 10312 | +} | ||
| 10313 | diff --git a/src/util/ss/invocation.c b/src/util/ss/invocation.c | ||
| 10314 | index 378bc3e..7736c95 100644 | ||
| 10315 | --- a/src/util/ss/invocation.c | ||
| 10316 | +++ b/src/util/ss/invocation.c | ||
| 10317 | @@ -36,12 +36,10 @@ | ||
| 10318 | _ss_table[sci_idx], make sure you change the allocation routine to | ||
| 10319 | not assume there are no null pointers in the middle of the | ||
| 10320 | array. */ | ||
| 10321 | -int ss_create_invocation(subsystem_name, version_string, info_ptr, | ||
| 10322 | - request_table_ptr, code_ptr) | ||
| 10323 | - char *subsystem_name, *version_string; | ||
| 10324 | - char *info_ptr; | ||
| 10325 | - ss_request_table *request_table_ptr; | ||
| 10326 | - int *code_ptr; | ||
| 10327 | +int | ||
| 10328 | +ss_create_invocation(char *subsystem_name, char *version_string, | ||
| 10329 | + char *info_ptr, ss_request_table *request_table_ptr, | ||
| 10330 | + int *code_ptr) | ||
| 10331 | { | ||
| 10332 | int sci_idx; | ||
| 10333 | ss_data *new_table; | ||
| 10334 | @@ -115,8 +113,7 @@ int ss_create_invocation(subsystem_name, version_string, info_ptr, | ||
| 10335 | } | ||
| 10336 | |||
| 10337 | void | ||
| 10338 | -ss_delete_invocation(sci_idx) | ||
| 10339 | - int sci_idx; | ||
| 10340 | +ss_delete_invocation(int sci_idx) | ||
| 10341 | { | ||
| 10342 | ss_data *t; | ||
| 10343 | int ignored_code; | ||
| 10344 | diff --git a/src/util/ss/list_rqs.c b/src/util/ss/list_rqs.c | ||
| 10345 | index c0882bf..8376e21 100644 | ||
| 10346 | --- a/src/util/ss/list_rqs.c | ||
| 10347 | +++ b/src/util/ss/list_rqs.c | ||
| 10348 | @@ -21,15 +21,8 @@ static char const twentyfive_spaces[26] = | ||
| 10349 | static char const NL[2] = "\n"; | ||
| 10350 | |||
| 10351 | void | ||
| 10352 | -ss_list_requests(argc, argv, sci_idx, info_ptr) | ||
| 10353 | - int argc; | ||
| 10354 | - const char * const *argv; | ||
| 10355 | - int sci_idx; | ||
| 10356 | -#ifdef __STDC__ | ||
| 10357 | - void *info_ptr; | ||
| 10358 | -#else | ||
| 10359 | - char *info_ptr; | ||
| 10360 | -#endif | ||
| 10361 | +ss_list_requests(int argc, const char * const *argv, int sci_idx, | ||
| 10362 | + void *info_ptr) | ||
| 10363 | { | ||
| 10364 | ss_request_entry *entry; | ||
| 10365 | char const *const *name; | ||
| 10366 | diff --git a/src/util/ss/listen.c b/src/util/ss/listen.c | ||
| 10367 | index fe18475..79f258f 100644 | ||
| 10368 | --- a/src/util/ss/listen.c | ||
| 10369 | +++ b/src/util/ss/listen.c | ||
| 10370 | @@ -28,7 +28,8 @@ static jmp_buf listen_jmpb; | ||
| 10371 | |||
| 10372 | #ifdef NO_READLINE | ||
| 10373 | /* Dumb replacement for readline when we don't have support for a real one. */ | ||
| 10374 | -static char *readline(const char *prompt) | ||
| 10375 | +static char * | ||
| 10376 | +readline(const char *prompt) | ||
| 10377 | { | ||
| 10378 | struct termios termbuf; | ||
| 10379 | char input[BUFSIZ]; | ||
| 10380 | @@ -49,20 +50,21 @@ static char *readline(const char *prompt) | ||
| 10381 | } | ||
| 10382 | |||
| 10383 | /* No-op replacement for add_history() when we have no readline support. */ | ||
| 10384 | -static void add_history(const char *line) | ||
| 10385 | +static void | ||
| 10386 | +add_history(const char *line) | ||
| 10387 | { | ||
| 10388 | } | ||
| 10389 | #endif | ||
| 10390 | |||
| 10391 | -static void listen_int_handler(signo) | ||
| 10392 | - int signo; | ||
| 10393 | +static void | ||
| 10394 | +listen_int_handler(int signo) | ||
| 10395 | { | ||
| 10396 | putc('\n', stdout); | ||
| 10397 | longjmp(listen_jmpb, 1); | ||
| 10398 | } | ||
| 10399 | |||
| 10400 | -int ss_listen (sci_idx) | ||
| 10401 | - int sci_idx; | ||
| 10402 | +int | ||
| 10403 | +ss_listen(int sci_idx) | ||
| 10404 | { | ||
| 10405 | char *cp; | ||
| 10406 | ss_data *info; | ||
| 10407 | @@ -83,12 +85,12 @@ int ss_listen (sci_idx) | ||
| 10408 | info->abort = 0; | ||
| 10409 | |||
| 10410 | #ifdef POSIX_SIGNALS | ||
| 10411 | - csig.sa_handler = (void (*)())0; | ||
| 10412 | + csig.sa_handler = (void (*)(int))0; | ||
| 10413 | sigemptyset(&nmask); | ||
| 10414 | sigaddset(&nmask, SIGINT); | ||
| 10415 | sigprocmask(SIG_BLOCK, &nmask, &omask); | ||
| 10416 | #else | ||
| 10417 | - sig_cont = (void (*)())0; | ||
| 10418 | + sig_cont = (void (*)(int))0; | ||
| 10419 | mask = sigblock(sigmask(SIGINT)); | ||
| 10420 | #endif | ||
| 10421 | |||
| 10422 | @@ -115,7 +117,7 @@ int ss_listen (sci_idx) | ||
| 10423 | nsig.sa_handler = listen_int_handler; /* fgets is not signal-safe */ | ||
| 10424 | osig = csig; | ||
| 10425 | sigaction(SIGCONT, &nsig, &csig); | ||
| 10426 | - if ((void (*)())csig.sa_handler==(void (*)())listen_int_handler) | ||
| 10427 | + if ((void (*)(int))csig.sa_handler==(void (*)(int))listen_int_handler) | ||
| 10428 | csig = osig; | ||
| 10429 | #else | ||
| 10430 | old_sig_cont = sig_cont; | ||
| 10431 | @@ -166,20 +168,16 @@ egress: | ||
| 10432 | return code; | ||
| 10433 | } | ||
| 10434 | |||
| 10435 | -void ss_abort_subsystem(sci_idx, code) | ||
| 10436 | - int sci_idx; | ||
| 10437 | - int code; | ||
| 10438 | +void | ||
| 10439 | +ss_abort_subsystem(int sci_idx, int code) | ||
| 10440 | { | ||
| 10441 | ss_info(sci_idx)->abort = 1; | ||
| 10442 | ss_info(sci_idx)->exit_status = code; | ||
| 10443 | |||
| 10444 | } | ||
| 10445 | |||
| 10446 | -void ss_quit(argc, argv, sci_idx, infop) | ||
| 10447 | - int argc; | ||
| 10448 | - char const * const *argv; | ||
| 10449 | - int sci_idx; | ||
| 10450 | - pointer infop; | ||
| 10451 | +void | ||
| 10452 | +ss_quit(int argc, char const * const *argv, int sci_idx, pointer infop) | ||
| 10453 | { | ||
| 10454 | ss_abort_subsystem(sci_idx, 0); | ||
| 10455 | } | ||
| 10456 | diff --git a/src/util/ss/pager.c b/src/util/ss/pager.c | ||
| 10457 | index 3e47ed3..255c721 100644 | ||
| 10458 | --- a/src/util/ss/pager.c | ||
| 10459 | +++ b/src/util/ss/pager.c | ||
| 10460 | @@ -10,13 +10,13 @@ | ||
| 10461 | #include "copyright.h" | ||
| 10462 | #include <errno.h> | ||
| 10463 | #include <stdio.h> | ||
| 10464 | +#include <stdlib.h> | ||
| 10465 | #include <sys/types.h> | ||
| 10466 | #include <sys/file.h> | ||
| 10467 | #include <signal.h> | ||
| 10468 | |||
| 10469 | static char MORE[] = "more"; | ||
| 10470 | extern char *_ss_pager_name; | ||
| 10471 | -extern char *getenv(); | ||
| 10472 | |||
| 10473 | /* | ||
| 10474 | * this needs a *lot* of work.... | ||
| 10475 | @@ -25,10 +25,10 @@ extern char *getenv(); | ||
| 10476 | * handle SIGINT sensibly | ||
| 10477 | * allow finer control -- put-page-break-here | ||
| 10478 | */ | ||
| 10479 | -void ss_page_stdin(); | ||
| 10480 | +void ss_page_stdin(void); | ||
| 10481 | |||
| 10482 | #ifndef NO_FORK | ||
| 10483 | -int ss_pager_create() | ||
| 10484 | +int ss_pager_create(void) | ||
| 10485 | { | ||
| 10486 | int filedes[2]; | ||
| 10487 | |||
| 10488 | @@ -56,7 +56,7 @@ int ss_pager_create() | ||
| 10489 | } | ||
| 10490 | } | ||
| 10491 | #else /* don't fork */ | ||
| 10492 | -int ss_pager_create() | ||
| 10493 | +int ss_pager_create(void) | ||
| 10494 | { | ||
| 10495 | int fd; | ||
| 10496 | fd = open("/dev/tty", O_WRONLY, 0); | ||
| 10497 | @@ -66,7 +66,7 @@ int ss_pager_create() | ||
| 10498 | } | ||
| 10499 | #endif | ||
| 10500 | |||
| 10501 | -void ss_page_stdin() | ||
| 10502 | +void ss_page_stdin(void) | ||
| 10503 | { | ||
| 10504 | int i; | ||
| 10505 | #ifdef POSIX_SIGNALS | ||
| 10506 | diff --git a/src/util/ss/parse.c b/src/util/ss/parse.c | ||
| 10507 | index 78a831b..6fb031c 100644 | ||
| 10508 | --- a/src/util/ss/parse.c | ||
| 10509 | +++ b/src/util/ss/parse.c | ||
| 10510 | @@ -53,10 +53,8 @@ enum parse_mode { WHITESPACE, TOKEN, QUOTED_STRING }; | ||
| 10511 | #define NEW_ARGV(old,n) (char **)realloc((char *)old, \ | ||
| 10512 | (unsigned)(n+2)*sizeof(char*)) | ||
| 10513 | |||
| 10514 | -char **ss_parse (sci_idx, line_ptr, argc_ptr) | ||
| 10515 | - int sci_idx; | ||
| 10516 | - char *line_ptr; | ||
| 10517 | - int *argc_ptr; | ||
| 10518 | +char ** | ||
| 10519 | +ss_parse(int sci_idx, char *line_ptr, int *argc_ptr) | ||
| 10520 | { | ||
| 10521 | char **argv, *cp; | ||
| 10522 | char **newargv; | ||
| 10523 | diff --git a/src/util/ss/prompt.c b/src/util/ss/prompt.c | ||
| 10524 | index 5aa2ad6..48e57d6 100644 | ||
| 10525 | --- a/src/util/ss/prompt.c | ||
| 10526 | +++ b/src/util/ss/prompt.c | ||
| 10527 | @@ -11,16 +11,13 @@ | ||
| 10528 | #include "ss_internal.h" | ||
| 10529 | |||
| 10530 | void | ||
| 10531 | -ss_set_prompt(sci_idx, new_prompt) | ||
| 10532 | - int sci_idx; | ||
| 10533 | - char *new_prompt; | ||
| 10534 | +ss_set_prompt(int sci_idx, char *new_prompt) | ||
| 10535 | { | ||
| 10536 | ss_info(sci_idx)->prompt = new_prompt; | ||
| 10537 | } | ||
| 10538 | |||
| 10539 | char * | ||
| 10540 | -ss_get_prompt(sci_idx) | ||
| 10541 | - int sci_idx; | ||
| 10542 | +ss_get_prompt(int sci_idx) | ||
| 10543 | { | ||
| 10544 | return(ss_info(sci_idx)->prompt); | ||
| 10545 | } | ||
| 10546 | diff --git a/src/util/ss/request_tbl.c b/src/util/ss/request_tbl.c | ||
| 10547 | index 03cde1b..fc4461b 100644 | ||
| 10548 | --- a/src/util/ss/request_tbl.c | ||
| 10549 | +++ b/src/util/ss/request_tbl.c | ||
| 10550 | @@ -11,11 +11,7 @@ | ||
| 10551 | #define ssrt ss_request_table /* for some readable code... */ | ||
| 10552 | |||
| 10553 | void | ||
| 10554 | -ss_add_request_table(sci_idx, rqtbl_ptr, position, code_ptr) | ||
| 10555 | - int sci_idx; | ||
| 10556 | - ssrt *rqtbl_ptr; | ||
| 10557 | - int position; /* 1 -> becomes second... */ | ||
| 10558 | - int *code_ptr; | ||
| 10559 | +ss_add_request_table(int sci_idx, ssrt *rqtbl_ptr, int position, int *code_ptr) | ||
| 10560 | { | ||
| 10561 | ss_data *info; | ||
| 10562 | int i, size; | ||
| 10563 | @@ -44,10 +40,7 @@ ss_add_request_table(sci_idx, rqtbl_ptr, position, code_ptr) | ||
| 10564 | } | ||
| 10565 | |||
| 10566 | void | ||
| 10567 | -ss_delete_request_table(sci_idx, rqtbl_ptr, code_ptr) | ||
| 10568 | - int sci_idx; | ||
| 10569 | - ssrt *rqtbl_ptr; | ||
| 10570 | - int *code_ptr; | ||
| 10571 | +ss_delete_request_table(int sci_idx, ssrt *rqtbl_ptr, int *code_ptr) | ||
| 10572 | { | ||
| 10573 | ss_data *info; | ||
| 10574 | ssrt **rt1, **rt2; | ||
| 10575 | diff --git a/src/util/ss/requests.c b/src/util/ss/requests.c | ||
| 10576 | index aa6752f..651f220 100644 | ||
| 10577 | --- a/src/util/ss/requests.c | ||
| 10578 | +++ b/src/util/ss/requests.c | ||
| 10579 | @@ -9,7 +9,7 @@ | ||
| 10580 | #include <stdio.h> | ||
| 10581 | #include "ss_internal.h" | ||
| 10582 | |||
| 10583 | -#define DECLARE(name) void name(argc,argv,sci_idx,info_ptr)int argc,sci_idx;const char * const *argv; pointer info_ptr; | ||
| 10584 | +#define DECLARE(name) void name(int argc, const char *const *argv, int sci_idx, pointer info_ptr) | ||
| 10585 | |||
| 10586 | /* | ||
| 10587 | * ss_self_identify -- assigned by default to the "." request | ||
| 10588 | diff --git a/src/util/ss/ss.h b/src/util/ss/ss.h | ||
| 10589 | index 38d8974..faac0d9 100644 | ||
| 10590 | --- a/src/util/ss/ss.h | ||
| 10591 | +++ b/src/util/ss/ss.h | ||
| 10592 | @@ -48,7 +48,6 @@ typedef struct _ss_rp_options { /* DEFAULT VALUES */ | ||
| 10593 | void ss_help __SS_PROTO; | ||
| 10594 | void ss_list_requests __SS_PROTO; | ||
| 10595 | void ss_quit __SS_PROTO; | ||
| 10596 | -char *ss_current_request(); | ||
| 10597 | char *ss_name(int); | ||
| 10598 | void ss_error (int, long, char const *, ...) | ||
| 10599 | #if !defined(__cplusplus) && (__GNUC__ > 2) | ||
| 10600 | diff --git a/src/util/ss/ss_internal.h b/src/util/ss/ss_internal.h | ||
| 10601 | index 1f5ddff..cdd88af 100644 | ||
| 10602 | --- a/src/util/ss/ss_internal.h | ||
| 10603 | +++ b/src/util/ss/ss_internal.h | ||
| 10604 | @@ -84,8 +84,7 @@ typedef struct _ss_data { /* init values */ | ||
| 10605 | #define ss_info(sci_idx) (_ss_table[sci_idx]) | ||
| 10606 | #define ss_current_request(sci_idx,code_ptr) \ | ||
| 10607 | (*code_ptr=0,ss_info(sci_idx)->current_request) | ||
| 10608 | -void ss_unknown_function(); | ||
| 10609 | -void ss_delete_info_dir(); | ||
| 10610 | +void ss_delete_info_dir(int, char *, int *); | ||
| 10611 | char **ss_parse (int, char *, int *); | ||
| 10612 | ss_abbrev_info *ss_abbrev_initialize (char *, int *); | ||
| 10613 | void ss_page_stdin (void); | ||
| 10614 | diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c | ||
| 10615 | index 0850565..253b118 100644 | ||
| 10616 | --- a/src/util/support/plugins.c | ||
| 10617 | +++ b/src/util/support/plugins.c | ||
| 10618 | @@ -240,13 +240,13 @@ krb5int_get_plugin_data(struct plugin_file_handle *h, const char *csymname, | ||
| 10619 | |||
| 10620 | long KRB5_CALLCONV | ||
| 10621 | krb5int_get_plugin_func(struct plugin_file_handle *h, const char *csymname, | ||
| 10622 | - void (**sym_out)(), struct errinfo *ep) | ||
| 10623 | + void (**sym_out)(void), struct errinfo *ep) | ||
| 10624 | { | ||
| 10625 | void *dptr = NULL; | ||
| 10626 | long ret = get_sym(h, csymname, &dptr, ep); | ||
| 10627 | |||
| 10628 | if (!ret) | ||
| 10629 | - *sym_out = (void (*)())dptr; | ||
| 10630 | + *sym_out = (void (*)(void))dptr; | ||
| 10631 | return ret; | ||
| 10632 | } | ||
| 10633 | |||
| 10634 | @@ -552,7 +552,7 @@ krb5int_get_plugin_dir_func (struct plugin_dir_handle *dirhandle, | ||
| 10635 | struct errinfo *ep) | ||
| 10636 | { | ||
| 10637 | long err = 0; | ||
| 10638 | - void (**p)() = NULL; | ||
| 10639 | + void (**p)(void) = NULL; | ||
| 10640 | size_t count = 0; | ||
| 10641 | |||
| 10642 | /* XXX Do we need to add a leading "_" to the symbol name on any | ||
| 10643 | @@ -569,10 +569,10 @@ krb5int_get_plugin_dir_func (struct plugin_dir_handle *dirhandle, | ||
| 10644 | int i = 0; | ||
| 10645 | |||
| 10646 | for (i = 0; !err && (dirhandle->files[i] != NULL); i++) { | ||
| 10647 | - void (*sym)() = NULL; | ||
| 10648 | + void (*sym)(void) = NULL; | ||
| 10649 | |||
| 10650 | if (krb5int_get_plugin_func (dirhandle->files[i], symname, &sym, ep) == 0) { | ||
| 10651 | - void (**newp)() = NULL; | ||
| 10652 | + void (**newp)(void) = NULL; | ||
| 10653 | |||
| 10654 | count++; | ||
| 10655 | newp = realloc (p, ((count + 1) * sizeof (*p))); /* +1 for NULL */ | ||
| 10656 | diff --git a/src/util/support/t_hashtab.c b/src/util/support/t_hashtab.c | ||
| 10657 | index f51abc4..d90d5d9 100644 | ||
| 10658 | --- a/src/util/support/t_hashtab.c | ||
| 10659 | +++ b/src/util/support/t_hashtab.c | ||
| 10660 | @@ -104,7 +104,7 @@ const uint64_t vectors[64] = { | ||
| 10661 | }; | ||
| 10662 | |||
| 10663 | static void | ||
| 10664 | -test_siphash() | ||
| 10665 | +test_siphash(void) | ||
| 10666 | { | ||
| 10667 | uint8_t seq[64]; | ||
| 10668 | uint64_t k0, k1, hval; | ||
| 10669 | @@ -122,7 +122,7 @@ test_siphash() | ||
| 10670 | } | ||
| 10671 | |||
| 10672 | static void | ||
| 10673 | -test_hashtab() | ||
| 10674 | +test_hashtab(void) | ||
| 10675 | { | ||
| 10676 | int st; | ||
| 10677 | struct k5_hashtab *ht; | ||
| 10678 | @@ -168,7 +168,7 @@ test_hashtab() | ||
| 10679 | } | ||
| 10680 | |||
| 10681 | int | ||
| 10682 | -main() | ||
| 10683 | +main(void) | ||
| 10684 | { | ||
| 10685 | test_siphash(); | ||
| 10686 | test_hashtab(); | ||
| 10687 | diff --git a/src/util/support/t_hex.c b/src/util/support/t_hex.c | ||
| 10688 | index a586a1b..40e6aa2 100644 | ||
| 10689 | --- a/src/util/support/t_hex.c | ||
| 10690 | +++ b/src/util/support/t_hex.c | ||
| 10691 | @@ -137,7 +137,8 @@ struct { | ||
| 10692 | { "F8F9FAFBFCFDFEFF", "\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF", 8, 1 }, | ||
| 10693 | }; | ||
| 10694 | |||
| 10695 | -int main() | ||
| 10696 | +int | ||
| 10697 | +main(void) | ||
| 10698 | { | ||
| 10699 | size_t i; | ||
| 10700 | char *hex; | ||
| 10701 | diff --git a/src/util/support/t_json.c b/src/util/support/t_json.c | ||
| 10702 | index 1f22924..bacca6f 100644 | ||
| 10703 | --- a/src/util/support/t_json.c | ||
| 10704 | +++ b/src/util/support/t_json.c | ||
| 10705 | @@ -86,7 +86,7 @@ check(int pred, const char *str) | ||
| 10706 | } | ||
| 10707 | |||
| 10708 | static void | ||
| 10709 | -test_array() | ||
| 10710 | +test_array(void) | ||
| 10711 | { | ||
| 10712 | k5_json_string v1; | ||
| 10713 | k5_json_number v2; | ||
| 10714 | diff --git a/src/util/support/t_k5buf.c b/src/util/support/t_k5buf.c | ||
| 10715 | index 734b272..18e7e9b 100644 | ||
| 10716 | --- a/src/util/support/t_k5buf.c | ||
| 10717 | +++ b/src/util/support/t_k5buf.c | ||
| 10718 | @@ -54,7 +54,7 @@ check_buf(struct k5buf *buf, const char *name) | ||
| 10719 | } | ||
| 10720 | |||
| 10721 | static void | ||
| 10722 | -test_basic() | ||
| 10723 | +test_basic(void) | ||
| 10724 | { | ||
| 10725 | struct k5buf buf; | ||
| 10726 | char storage[1024]; | ||
| 10727 | @@ -76,7 +76,7 @@ test_basic() | ||
| 10728 | } | ||
| 10729 | |||
| 10730 | static void | ||
| 10731 | -test_realloc() | ||
| 10732 | +test_realloc(void) | ||
| 10733 | { | ||
| 10734 | struct k5buf buf; | ||
| 10735 | char data[1024]; | ||
| 10736 | @@ -132,7 +132,7 @@ test_realloc() | ||
| 10737 | } | ||
| 10738 | |||
| 10739 | static void | ||
| 10740 | -test_overflow() | ||
| 10741 | +test_overflow(void) | ||
| 10742 | { | ||
| 10743 | struct k5buf buf; | ||
| 10744 | char storage[10]; | ||
| 10745 | @@ -153,7 +153,7 @@ test_overflow() | ||
| 10746 | } | ||
| 10747 | |||
| 10748 | static void | ||
| 10749 | -test_error() | ||
| 10750 | +test_error(void) | ||
| 10751 | { | ||
| 10752 | struct k5buf buf; | ||
| 10753 | char storage[1]; | ||
| 10754 | @@ -173,7 +173,7 @@ test_error() | ||
| 10755 | } | ||
| 10756 | |||
| 10757 | static void | ||
| 10758 | -test_truncate() | ||
| 10759 | +test_truncate(void) | ||
| 10760 | { | ||
| 10761 | struct k5buf buf; | ||
| 10762 | |||
| 10763 | @@ -188,7 +188,7 @@ test_truncate() | ||
| 10764 | } | ||
| 10765 | |||
| 10766 | static void | ||
| 10767 | -test_binary() | ||
| 10768 | +test_binary(void) | ||
| 10769 | { | ||
| 10770 | struct k5buf buf; | ||
| 10771 | char data[] = { 'a', 0, 'b' }, *s; | ||
| 10772 | @@ -205,7 +205,7 @@ test_binary() | ||
| 10773 | } | ||
| 10774 | |||
| 10775 | static void | ||
| 10776 | -test_fmt() | ||
| 10777 | +test_fmt(void) | ||
| 10778 | { | ||
| 10779 | struct k5buf buf; | ||
| 10780 | char storage[10], data[1024]; | ||
| 10781 | @@ -246,7 +246,7 @@ test_fmt() | ||
| 10782 | } | ||
| 10783 | |||
| 10784 | int | ||
| 10785 | -main() | ||
| 10786 | +main(void) | ||
| 10787 | { | ||
| 10788 | test_basic(); | ||
| 10789 | test_realloc(); | ||
| 10790 | diff --git a/src/util/support/t_unal.c b/src/util/support/t_unal.c | ||
| 10791 | index f67cd31..6d097f0 100644 | ||
| 10792 | --- a/src/util/support/t_unal.c | ||
| 10793 | +++ b/src/util/support/t_unal.c | ||
| 10794 | @@ -2,7 +2,8 @@ | ||
| 10795 | #undef NDEBUG | ||
| 10796 | #include "k5-platform.h" | ||
| 10797 | |||
| 10798 | -int main () | ||
| 10799 | +int | ||
| 10800 | +main(void) | ||
| 10801 | { | ||
| 10802 | /* Test some low-level assumptions the Kerberos code depends | ||
| 10803 | on. */ | ||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-more-non-prototype-functions.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-more-non-prototype-functions.patch deleted file mode 100644 index d4267b3bf7..0000000000 --- a/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-more-non-prototype-functions.patch +++ /dev/null | |||
| @@ -1,862 +0,0 @@ | |||
| 1 | From 5a9aa1607ff2bc94369c89f4c99725125b923977 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Arjun <pkillarjun@protonmail.com> | ||
| 3 | Date: Thu, 9 May 2024 20:47:08 +0530 | ||
| 4 | Subject: [PATCH 1/2] Fix more non-prototype functions | ||
| 5 | |||
| 6 | Add "void" designations to more function declarations and definitions | ||
| 7 | not changed by commits 3ae9244cd021a75eba909d872a92c25db490714d and | ||
| 8 | 4b9d7f7c107f01a61600fddcd8cde3812d0366a2. | ||
| 9 | |||
| 10 | [ghudson@mit.edu: change additional functions; split into two commits; | ||
| 11 | rewrote commit message] | ||
| 12 | |||
| 13 | Upstream-Status: Backport [https://github.com/krb5/krb5/commit/623d649ba852839ba4822934bad9f97c184bf3ab] | ||
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 15 | --- | ||
| 16 | src/ccapi/common/win/OldCC/ccutils.c | 2 +- | ||
| 17 | src/ccapi/common/win/OldCC/ccutils.h | 2 +- | ||
| 18 | src/ccapi/common/win/OldCC/util.h | 2 +- | ||
| 19 | src/ccapi/common/win/win-utils.c | 2 +- | ||
| 20 | src/ccapi/common/win/win-utils.h | 4 +- | ||
| 21 | src/ccapi/lib/ccapi_context.h | 2 +- | ||
| 22 | src/ccapi/lib/win/dllmain.h | 2 +- | ||
| 23 | src/ccapi/server/ccs_server.c | 2 +- | ||
| 24 | src/ccapi/server/ccs_server.h | 2 +- | ||
| 25 | src/ccapi/server/win/WorkQueue.h | 8 +-- | ||
| 26 | src/ccapi/test/pingtest.c | 2 +- | ||
| 27 | src/include/gssrpc/netdb.h | 4 +- | ||
| 28 | src/include/port-sockets.h | 2 +- | ||
| 29 | src/kadmin/cli/getdate.y | 2 +- | ||
| 30 | src/kadmin/dbutil/kdb5_util.c | 2 +- | ||
| 31 | src/kprop/kprop.c | 2 +- | ||
| 32 | src/lib/crypto/crypto_tests/t_pkcs5.c | 4 +- | ||
| 33 | src/lib/crypto/crypto_tests/vectors.c | 10 ++-- | ||
| 34 | src/lib/gssapi/generic/maptest.c | 2 +- | ||
| 35 | src/lib/krb5/ccache/ccapi/stdcc.c | 6 +- | ||
| 36 | src/lib/krb5/ccache/ccapi/winccld.c | 9 ++- | ||
| 37 | src/lib/krb5/ccache/ccbase.c | 2 +- | ||
| 38 | src/lib/krb5/krb/bld_princ.c | 4 +- | ||
| 39 | src/lib/krb5/krb/conv_creds.c | 2 +- | ||
| 40 | src/lib/krb5/krb/init_ctx.c | 2 +- | ||
| 41 | src/lib/krb5/os/dnsglue.c | 4 +- | ||
| 42 | src/lib/krb5/os/localaddr.c | 6 +- | ||
| 43 | src/lib/rpc/getrpcent.c | 6 +- | ||
| 44 | src/lib/win_glue.c | 8 +-- | ||
| 45 | src/plugins/kdb/db2/kdb_db2.c | 4 +- | ||
| 46 | src/plugins/kdb/db2/libdb2/hash/dbm.c | 2 +- | ||
| 47 | .../kdb/ldap/libkdb_ldap/kdb_ldap_conn.c | 4 +- | ||
| 48 | src/tests/threads/gss-perf.c | 4 +- | ||
| 49 | src/tests/threads/init_ctx.c | 2 +- | ||
| 50 | src/tests/threads/profread.c | 2 +- | ||
| 51 | src/tests/threads/t_rcache.c | 2 +- | ||
| 52 | src/util/et/com_err.c | 4 +- | ||
| 53 | src/util/et/error_message.c | 2 +- | ||
| 54 | src/util/profile/prof_file.c | 4 +- | ||
| 55 | src/util/support/secure_getenv.c | 2 +- | ||
| 56 | src/windows/include/leashwin.h | 60 +++++++++---------- | ||
| 57 | 41 files changed, 100 insertions(+), 99 deletions(-) | ||
| 58 | |||
| 59 | diff --git a/src/ccapi/common/win/OldCC/ccutils.c b/src/ccapi/common/win/OldCC/ccutils.c | ||
| 60 | index 403c67e..7abaefa 100644 | ||
| 61 | --- a/src/ccapi/common/win/OldCC/ccutils.c | ||
| 62 | +++ b/src/ccapi/common/win/OldCC/ccutils.c | ||
| 63 | @@ -30,7 +30,7 @@ | ||
| 64 | #include "cci_debugging.h" | ||
| 65 | #include "util.h" | ||
| 66 | |||
| 67 | -BOOL isNT() { | ||
| 68 | +BOOL isNT(void) { | ||
| 69 | OSVERSIONINFO osvi; | ||
| 70 | DWORD status = 0; | ||
| 71 | BOOL bSupportedVersion = FALSE; | ||
| 72 | diff --git a/src/ccapi/common/win/OldCC/ccutils.h b/src/ccapi/common/win/OldCC/ccutils.h | ||
| 73 | index 9da3d87..0fb7e14 100644 | ||
| 74 | --- a/src/ccapi/common/win/OldCC/ccutils.h | ||
| 75 | +++ b/src/ccapi/common/win/OldCC/ccutils.h | ||
| 76 | @@ -33,7 +33,7 @@ extern "C" { | ||
| 77 | #define REPLY_SUFFIX (char*)"reply" | ||
| 78 | #define LISTEN_SUFFIX (char*)"listen" | ||
| 79 | |||
| 80 | -BOOL isNT(); | ||
| 81 | +BOOL isNT(void); | ||
| 82 | char* allocEventName (char* uuid, char* suffix); | ||
| 83 | HANDLE createThreadEvent(char* uuid, char* suffix); | ||
| 84 | HANDLE openThreadEvent (char* uuid, char* suffix); | ||
| 85 | diff --git a/src/ccapi/common/win/OldCC/util.h b/src/ccapi/common/win/OldCC/util.h | ||
| 86 | index 45e069a..7ee5319 100644 | ||
| 87 | --- a/src/ccapi/common/win/OldCC/util.h | ||
| 88 | +++ b/src/ccapi/common/win/OldCC/util.h | ||
| 89 | @@ -30,7 +30,7 @@ | ||
| 90 | extern "C" { | ||
| 91 | #endif | ||
| 92 | |||
| 93 | -BOOL isNT(); | ||
| 94 | +BOOL isNT(void); | ||
| 95 | |||
| 96 | void* | ||
| 97 | user_allocate( | ||
| 98 | diff --git a/src/ccapi/common/win/win-utils.c b/src/ccapi/common/win/win-utils.c | ||
| 99 | index b49cca8..d9018a6 100644 | ||
| 100 | --- a/src/ccapi/common/win/win-utils.c | ||
| 101 | +++ b/src/ccapi/common/win/win-utils.c | ||
| 102 | @@ -60,7 +60,7 @@ char* serverEndpoint(const char* user) { | ||
| 103 | return _serverEndpoint; | ||
| 104 | } | ||
| 105 | |||
| 106 | -char* timestamp() { | ||
| 107 | +char* timestamp(void) { | ||
| 108 | SYSTEMTIME _stime; | ||
| 109 | GetSystemTime(&_stime); | ||
| 110 | GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, &_stime, "HH:mm:ss", _ts, sizeof(_ts)-1); | ||
| 111 | diff --git a/src/ccapi/common/win/win-utils.h b/src/ccapi/common/win/win-utils.h | ||
| 112 | index 41cab24..94d0a9f 100644 | ||
| 113 | --- a/src/ccapi/common/win/win-utils.h | ||
| 114 | +++ b/src/ccapi/common/win/win-utils.h | ||
| 115 | @@ -50,6 +50,6 @@ char* clientEndpoint(const char* UUID); | ||
| 116 | char* serverEndpoint(const char* UUID); | ||
| 117 | extern unsigned char* pszProtocolSequence; | ||
| 118 | |||
| 119 | -char* timestamp(); | ||
| 120 | +char* timestamp(void); | ||
| 121 | |||
| 122 | -#endif // _win_utils_h | ||
| 123 | \ No newline at end of file | ||
| 124 | +#endif // _win_utils_h | ||
| 125 | diff --git a/src/ccapi/lib/ccapi_context.h b/src/ccapi/lib/ccapi_context.h | ||
| 126 | index 51b8982..88f0ee8 100644 | ||
| 127 | --- a/src/ccapi/lib/ccapi_context.h | ||
| 128 | +++ b/src/ccapi/lib/ccapi_context.h | ||
| 129 | @@ -79,7 +79,7 @@ cc_int32 ccapi_context_compare (cc_context_t in_context, | ||
| 130 | cc_uint32 *out_equal); | ||
| 131 | |||
| 132 | #ifdef WIN32 | ||
| 133 | -void cci_thread_init__auxinit(); | ||
| 134 | +void cci_thread_init__auxinit(void); | ||
| 135 | #endif | ||
| 136 | |||
| 137 | |||
| 138 | diff --git a/src/ccapi/lib/win/dllmain.h b/src/ccapi/lib/win/dllmain.h | ||
| 139 | index 8238566..28ca34e 100644 | ||
| 140 | --- a/src/ccapi/lib/win/dllmain.h | ||
| 141 | +++ b/src/ccapi/lib/win/dllmain.h | ||
| 142 | @@ -32,7 +32,7 @@ | ||
| 143 | extern "C" { // we need to export the C interface | ||
| 144 | #endif | ||
| 145 | |||
| 146 | -DWORD GetTlsIndex(); | ||
| 147 | +DWORD GetTlsIndex(void); | ||
| 148 | |||
| 149 | #ifdef __cplusplus | ||
| 150 | } | ||
| 151 | diff --git a/src/ccapi/server/ccs_server.c b/src/ccapi/server/ccs_server.c | ||
| 152 | index 1fc8d2c..de74b71 100644 | ||
| 153 | --- a/src/ccapi/server/ccs_server.c | ||
| 154 | +++ b/src/ccapi/server/ccs_server.c | ||
| 155 | @@ -402,7 +402,7 @@ cc_int32 ccs_server_send_reply (ccs_pipe_t in_reply_pipe, | ||
| 156 | |||
| 157 | /* ------------------------------------------------------------------------ */ | ||
| 158 | |||
| 159 | -cc_uint64 ccs_server_client_count () | ||
| 160 | +cc_uint64 ccs_server_client_count (void) | ||
| 161 | { | ||
| 162 | return ccs_client_array_count (g_client_array); | ||
| 163 | } | ||
| 164 | diff --git a/src/ccapi/server/ccs_server.h b/src/ccapi/server/ccs_server.h | ||
| 165 | index e920ad9..f71ab06 100644 | ||
| 166 | --- a/src/ccapi/server/ccs_server.h | ||
| 167 | +++ b/src/ccapi/server/ccs_server.h | ||
| 168 | @@ -48,6 +48,6 @@ cc_int32 ccs_server_send_reply (ccs_pipe_t in_reply_pipe, | ||
| 169 | cc_int32 in_reply_err, | ||
| 170 | k5_ipc_stream in_reply_data); | ||
| 171 | |||
| 172 | -cc_uint64 ccs_server_client_count (); | ||
| 173 | +cc_uint64 ccs_server_client_count (void); | ||
| 174 | |||
| 175 | #endif /* CCS_SERVER_H */ | ||
| 176 | diff --git a/src/ccapi/server/win/WorkQueue.h b/src/ccapi/server/win/WorkQueue.h | ||
| 177 | index 68aa8b1..66a2960 100644 | ||
| 178 | --- a/src/ccapi/server/win/WorkQueue.h | ||
| 179 | +++ b/src/ccapi/server/win/WorkQueue.h | ||
| 180 | @@ -29,14 +29,14 @@ | ||
| 181 | #include "windows.h" | ||
| 182 | #include "ccs_pipe.h" | ||
| 183 | |||
| 184 | -EXTERN_C int worklist_initialize(); | ||
| 185 | +EXTERN_C int worklist_initialize(void); | ||
| 186 | |||
| 187 | -EXTERN_C int worklist_cleanup(); | ||
| 188 | +EXTERN_C int worklist_cleanup(void); | ||
| 189 | |||
| 190 | /* Wait for work to be added to the list (via worklist_add) from another thread */ | ||
| 191 | -EXTERN_C void worklist_wait(); | ||
| 192 | +EXTERN_C void worklist_wait(void); | ||
| 193 | |||
| 194 | -EXTERN_C BOOL worklist_isEmpty(); | ||
| 195 | +EXTERN_C BOOL worklist_isEmpty(void); | ||
| 196 | |||
| 197 | EXTERN_C int worklist_add( const long rpcmsg, | ||
| 198 | const ccs_pipe_t pipe, | ||
| 199 | diff --git a/src/ccapi/test/pingtest.c b/src/ccapi/test/pingtest.c | ||
| 200 | index 0ffc15e..24327c2 100644 | ||
| 201 | --- a/src/ccapi/test/pingtest.c | ||
| 202 | +++ b/src/ccapi/test/pingtest.c | ||
| 203 | @@ -23,7 +23,7 @@ extern cc_int32 cci_os_ipc_msg( cc_int32 in_launch_server, | ||
| 204 | |||
| 205 | static DWORD dwTlsIndex; | ||
| 206 | |||
| 207 | -DWORD GetTlsIndex() {return dwTlsIndex;} | ||
| 208 | +DWORD GetTlsIndex(void) {return dwTlsIndex;} | ||
| 209 | |||
| 210 | RPC_STATUS send_test(char* endpoint) { | ||
| 211 | unsigned char* pszNetworkAddress = NULL; | ||
| 212 | diff --git a/src/include/gssrpc/netdb.h b/src/include/gssrpc/netdb.h | ||
| 213 | index f933fbb..2f62edf 100644 | ||
| 214 | --- a/src/include/gssrpc/netdb.h | ||
| 215 | +++ b/src/include/gssrpc/netdb.h | ||
| 216 | @@ -53,6 +53,8 @@ struct rpcent { | ||
| 217 | }; | ||
| 218 | #endif /*STRUCT_RPCENT_IN_RPC_NETDB_H*/ | ||
| 219 | |||
| 220 | -struct rpcent *getrpcbyname(), *getrpcbynumber(), *getrpcent(); | ||
| 221 | +struct rpcent *getrpcbyname(const char *name); | ||
| 222 | +struct rpcent *getrpcbynumber(int number); | ||
| 223 | +struct rpcent *getrpcent(void); | ||
| 224 | |||
| 225 | #endif | ||
| 226 | diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h | ||
| 227 | index 57e5d1d..228e4cf 100644 | ||
| 228 | --- a/src/include/port-sockets.h | ||
| 229 | +++ b/src/include/port-sockets.h | ||
| 230 | @@ -111,7 +111,7 @@ static __inline void TranslatedWSASetLastError(int posix_error) | ||
| 231 | * Translate Winsock errors to their POSIX counterparts. This is necessary for | ||
| 232 | * MSVC 2010+, where both Winsock and POSIX errors are defined. | ||
| 233 | */ | ||
| 234 | -static __inline int TranslatedWSAGetLastError() | ||
| 235 | +static __inline int TranslatedWSAGetLastError(void) | ||
| 236 | { | ||
| 237 | int err = WSAGetLastError(); | ||
| 238 | switch (err) { | ||
| 239 | diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y | ||
| 240 | index 3d69f0b..b69e26e 100644 | ||
| 241 | --- a/src/kadmin/cli/getdate.y | ||
| 242 | +++ b/src/kadmin/cli/getdate.y | ||
| 243 | @@ -775,7 +775,7 @@ LookupWord(char *buff) | ||
| 244 | |||
| 245 | |||
| 246 | static int | ||
| 247 | -yylex() | ||
| 248 | +yylex(void) | ||
| 249 | { | ||
| 250 | char c; | ||
| 251 | char *p; | ||
| 252 | diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c | ||
| 253 | index 55d529f..3a07fd5 100644 | ||
| 254 | --- a/src/kadmin/dbutil/kdb5_util.c | ||
| 255 | +++ b/src/kadmin/dbutil/kdb5_util.c | ||
| 256 | @@ -74,7 +74,7 @@ int exit_status = 0; | ||
| 257 | krb5_context util_context; | ||
| 258 | kadm5_config_params global_params; | ||
| 259 | |||
| 260 | -void usage() | ||
| 261 | +void usage(void) | ||
| 262 | { | ||
| 263 | fprintf(stderr, | ||
| 264 | _("Usage: kdb5_util [-r realm] [-d dbname] " | ||
| 265 | diff --git a/src/kprop/kprop.c b/src/kprop/kprop.c | ||
| 266 | index 8f9fd69..e8f7feb 100644 | ||
| 267 | --- a/src/kprop/kprop.c | ||
| 268 | +++ b/src/kprop/kprop.c | ||
| 269 | @@ -80,7 +80,7 @@ static void send_error(krb5_context context, krb5_creds *my_creds, int fd, | ||
| 270 | char *err_text, krb5_error_code err_code); | ||
| 271 | static void update_last_prop_file(char *hostname, char *file_name); | ||
| 272 | |||
| 273 | -static void usage() | ||
| 274 | +static void usage(void) | ||
| 275 | { | ||
| 276 | fprintf(stderr, _("\nUsage: %s [-r realm] [-f file] [-d] [-P port] " | ||
| 277 | "[-s keytab] replica_host\n\n"), progname); | ||
| 278 | diff --git a/src/lib/crypto/crypto_tests/t_pkcs5.c b/src/lib/crypto/crypto_tests/t_pkcs5.c | ||
| 279 | index 8e87a80..f4bb33e 100644 | ||
| 280 | --- a/src/lib/crypto/crypto_tests/t_pkcs5.c | ||
| 281 | +++ b/src/lib/crypto/crypto_tests/t_pkcs5.c | ||
| 282 | @@ -38,7 +38,7 @@ static void printdata (krb5_data *d) { | ||
| 283 | printhex (d->length, d->data); | ||
| 284 | } | ||
| 285 | |||
| 286 | -static void test_pbkdf2_rfc3211() | ||
| 287 | +static void test_pbkdf2_rfc3211(void) | ||
| 288 | { | ||
| 289 | char x[100]; | ||
| 290 | krb5_error_code err; | ||
| 291 | @@ -92,7 +92,7 @@ static void test_pbkdf2_rfc3211() | ||
| 292 | } | ||
| 293 | } | ||
| 294 | |||
| 295 | -int main () | ||
| 296 | +int main(void) | ||
| 297 | { | ||
| 298 | test_pbkdf2_rfc3211(); | ||
| 299 | return 0; | ||
| 300 | diff --git a/src/lib/crypto/crypto_tests/vectors.c b/src/lib/crypto/crypto_tests/vectors.c | ||
| 301 | index bcf5c91..314d5c7 100644 | ||
| 302 | --- a/src/lib/crypto/crypto_tests/vectors.c | ||
| 303 | +++ b/src/lib/crypto/crypto_tests/vectors.c | ||
| 304 | @@ -56,7 +56,7 @@ static void printdata (krb5_data *d) { printhex (d->length, d->data); } | ||
| 305 | |||
| 306 | static void printkey (krb5_keyblock *k) { printhex (k->length, k->contents); } | ||
| 307 | |||
| 308 | -static void test_nfold () | ||
| 309 | +static void test_nfold (void) | ||
| 310 | { | ||
| 311 | int i; | ||
| 312 | static const struct { | ||
| 313 | @@ -96,7 +96,7 @@ static void test_nfold () | ||
| 314 | so try to generate them. */ | ||
| 315 | |||
| 316 | static void | ||
| 317 | -test_mit_des_s2k () | ||
| 318 | +test_mit_des_s2k (void) | ||
| 319 | { | ||
| 320 | static const struct { | ||
| 321 | const char *pass; | ||
| 322 | @@ -190,7 +190,7 @@ test_s2k (krb5_enctype enctype) | ||
| 323 | } | ||
| 324 | } | ||
| 325 | |||
| 326 | -static void test_des3_s2k () { test_s2k (ENCTYPE_DES3_CBC_SHA1); } | ||
| 327 | +static void test_des3_s2k (void) { test_s2k (ENCTYPE_DES3_CBC_SHA1); } | ||
| 328 | |||
| 329 | static void | ||
| 330 | keyToData (krb5_keyblock *k, krb5_data *d) | ||
| 331 | @@ -227,7 +227,7 @@ void DR (krb5_data *out, krb5_keyblock *in, const krb5_data *usage) { | ||
| 332 | #define KEYBYTES 21 | ||
| 333 | #define KEYLENGTH 24 | ||
| 334 | |||
| 335 | -void test_dr_dk () | ||
| 336 | +void test_dr_dk (void) | ||
| 337 | { | ||
| 338 | static const struct { | ||
| 339 | unsigned char keydata[KEYLENGTH]; | ||
| 340 | @@ -371,7 +371,7 @@ static void printk(const char *descr, krb5_keyblock *k) { | ||
| 341 | |||
| 342 | |||
| 343 | static void | ||
| 344 | -test_pbkdf2() | ||
| 345 | +test_pbkdf2(void) | ||
| 346 | { | ||
| 347 | static struct { | ||
| 348 | int count; | ||
| 349 | diff --git a/src/lib/gssapi/generic/maptest.c b/src/lib/gssapi/generic/maptest.c | ||
| 350 | index 566d88c..ab3ed90 100644 | ||
| 351 | --- a/src/lib/gssapi/generic/maptest.c | ||
| 352 | +++ b/src/lib/gssapi/generic/maptest.c | ||
| 353 | @@ -42,7 +42,7 @@ static void intprt(int v, FILE *f) | ||
| 354 | |||
| 355 | foo foo1; | ||
| 356 | |||
| 357 | -int main () | ||
| 358 | +int main (void) | ||
| 359 | { | ||
| 360 | elt v1 = { 1, 2 }, v2 = { 3, 4 }; | ||
| 361 | const elt *vp; | ||
| 362 | diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c | ||
| 363 | index 427b329..9cd2ad3 100644 | ||
| 364 | --- a/src/lib/krb5/ccache/ccapi/stdcc.c | ||
| 365 | +++ b/src/lib/krb5/ccache/ccapi/stdcc.c | ||
| 366 | @@ -101,7 +101,7 @@ krb5_cc_ops krb5_cc_stdcc_ops = { | ||
| 367 | * changes made. We register a unique message type with which | ||
| 368 | * we'll communicate to all other processes. | ||
| 369 | */ | ||
| 370 | -static void cache_changed() | ||
| 371 | +static void cache_changed(void) | ||
| 372 | { | ||
| 373 | static unsigned int message = 0; | ||
| 374 | |||
| 375 | @@ -112,7 +112,7 @@ static void cache_changed() | ||
| 376 | } | ||
| 377 | #else /* _WIN32 */ | ||
| 378 | |||
| 379 | -static void cache_changed() | ||
| 380 | +static void cache_changed(void) | ||
| 381 | { | ||
| 382 | return; | ||
| 383 | } | ||
| 384 | @@ -242,7 +242,7 @@ static krb5_error_code stdccv3_setup (krb5_context context, | ||
| 385 | } | ||
| 386 | |||
| 387 | /* krb5_stdcc_shutdown is exported; use the old name */ | ||
| 388 | -void krb5_stdcc_shutdown() | ||
| 389 | +void krb5_stdcc_shutdown(void) | ||
| 390 | { | ||
| 391 | if (gCntrlBlock) { cc_context_release(gCntrlBlock); } | ||
| 392 | gCntrlBlock = NULL; | ||
| 393 | diff --git a/src/lib/krb5/ccache/ccapi/winccld.c b/src/lib/krb5/ccache/ccapi/winccld.c | ||
| 394 | index 8b2e90c..62b1bd7 100644 | ||
| 395 | --- a/src/lib/krb5/ccache/ccapi/winccld.c | ||
| 396 | +++ b/src/lib/krb5/ccache/ccapi/winccld.c | ||
| 397 | @@ -18,8 +18,8 @@ extern const krb5_cc_ops krb5_fcc_ops; | ||
| 398 | |||
| 399 | static int krb5_win_ccdll_loaded = 0; | ||
| 400 | |||
| 401 | -extern void krb5_win_ccdll_load(); | ||
| 402 | -extern int krb5_is_ccdll_loaded(); | ||
| 403 | +extern void krb5_win_ccdll_load(krb5_context context); | ||
| 404 | +extern int krb5_is_ccdll_loaded(void); | ||
| 405 | |||
| 406 | /* | ||
| 407 | * return codes | ||
| 408 | @@ -81,8 +81,7 @@ static int LoadFuncs(const char* dll_name, FUNC_INFO fi[], | ||
| 409 | return LF_OK; | ||
| 410 | } | ||
| 411 | |||
| 412 | -void krb5_win_ccdll_load(context) | ||
| 413 | - krb5_context context; | ||
| 414 | +void krb5_win_ccdll_load(krb5_context context) | ||
| 415 | { | ||
| 416 | krb5_cc_register(context, &krb5_fcc_ops, 0); | ||
| 417 | if (krb5_win_ccdll_loaded) | ||
| 418 | @@ -93,7 +92,7 @@ void krb5_win_ccdll_load(context) | ||
| 419 | krb5_cc_dfl_ops = &krb5_cc_stdcc_ops; /* Use stdcc! */ | ||
| 420 | } | ||
| 421 | |||
| 422 | -int krb5_is_ccdll_loaded() | ||
| 423 | +int krb5_is_ccdll_loaded(void) | ||
| 424 | { | ||
| 425 | return krb5_win_ccdll_loaded; | ||
| 426 | } | ||
| 427 | diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c | ||
| 428 | index 5a01320..696b681 100644 | ||
| 429 | --- a/src/lib/krb5/ccache/ccbase.c | ||
| 430 | +++ b/src/lib/krb5/ccache/ccbase.c | ||
| 431 | @@ -614,7 +614,7 @@ k5_cccol_unlock(krb5_context context) | ||
| 432 | |||
| 433 | /* necessary to make reentrant locks play nice with krb5int_cc_finalize */ | ||
| 434 | void | ||
| 435 | -k5_cccol_force_unlock() | ||
| 436 | +k5_cccol_force_unlock(void) | ||
| 437 | { | ||
| 438 | /* sanity check */ | ||
| 439 | if ((&cccol_lock)->refcount == 0) { | ||
| 440 | diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c | ||
| 441 | index ff8265a..701454f 100644 | ||
| 442 | --- a/src/lib/krb5/krb/bld_princ.c | ||
| 443 | +++ b/src/lib/krb5/krb/bld_princ.c | ||
| 444 | @@ -170,13 +170,13 @@ const krb5_principal_data anon_princ = { | ||
| 445 | }; | ||
| 446 | |||
| 447 | const krb5_data * KRB5_CALLCONV | ||
| 448 | -krb5_anonymous_realm() | ||
| 449 | +krb5_anonymous_realm(void) | ||
| 450 | { | ||
| 451 | return &anon_realm_data; | ||
| 452 | } | ||
| 453 | |||
| 454 | krb5_const_principal KRB5_CALLCONV | ||
| 455 | -krb5_anonymous_principal() | ||
| 456 | +krb5_anonymous_principal(void) | ||
| 457 | { | ||
| 458 | return &anon_princ; | ||
| 459 | } | ||
| 460 | diff --git a/src/lib/krb5/krb/conv_creds.c b/src/lib/krb5/krb/conv_creds.c | ||
| 461 | index 6f46088..8d0a317 100644 | ||
| 462 | --- a/src/lib/krb5/krb/conv_creds.c | ||
| 463 | +++ b/src/lib/krb5/krb/conv_creds.c | ||
| 464 | @@ -55,7 +55,7 @@ krb524_convert_creds_kdc(krb5_context context, krb5_creds *v5creds, | ||
| 465 | return KRB524_KRB4_DISABLED; | ||
| 466 | } | ||
| 467 | |||
| 468 | -void KRB5_CALLCONV krb524_init_ets () | ||
| 469 | +void KRB5_CALLCONV krb524_init_ets (void) | ||
| 470 | { | ||
| 471 | } | ||
| 472 | #endif | ||
| 473 | diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c | ||
| 474 | index a6c2bbe..8fd9403 100644 | ||
| 475 | --- a/src/lib/krb5/krb/init_ctx.c | ||
| 476 | +++ b/src/lib/krb5/krb/init_ctx.c | ||
| 477 | @@ -66,7 +66,7 @@ static krb5_enctype default_enctype_list[] = { | ||
| 478 | }; | ||
| 479 | |||
| 480 | #if (defined(_WIN32)) | ||
| 481 | -extern krb5_error_code krb5_vercheck(); | ||
| 482 | +extern krb5_error_code krb5_vercheck(void); | ||
| 483 | extern void krb5_win_ccdll_load(krb5_context context); | ||
| 484 | #endif | ||
| 485 | |||
| 486 | diff --git a/src/lib/krb5/os/dnsglue.c b/src/lib/krb5/os/dnsglue.c | ||
| 487 | index 668a7a6..5da550c 100644 | ||
| 488 | --- a/src/lib/krb5/os/dnsglue.c | ||
| 489 | +++ b/src/lib/krb5/os/dnsglue.c | ||
| 490 | @@ -439,7 +439,7 @@ cleanup: | ||
| 491 | } | ||
| 492 | |||
| 493 | char * | ||
| 494 | -k5_primary_domain() | ||
| 495 | +k5_primary_domain(void) | ||
| 496 | { | ||
| 497 | return NULL; | ||
| 498 | } | ||
| 499 | @@ -497,7 +497,7 @@ errout: | ||
| 500 | } | ||
| 501 | |||
| 502 | char * | ||
| 503 | -k5_primary_domain() | ||
| 504 | +k5_primary_domain(void) | ||
| 505 | { | ||
| 506 | char *domain; | ||
| 507 | DECLARE_HANDLE(h); | ||
| 508 | diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c | ||
| 509 | index 92d765f..4e9d07f 100644 | ||
| 510 | --- a/src/lib/krb5/os/localaddr.c | ||
| 511 | +++ b/src/lib/krb5/os/localaddr.c | ||
| 512 | @@ -363,7 +363,7 @@ struct linux_ipv6_addr_list { | ||
| 513 | struct linux_ipv6_addr_list *next; | ||
| 514 | }; | ||
| 515 | static struct linux_ipv6_addr_list * | ||
| 516 | -get_linux_ipv6_addrs () | ||
| 517 | +get_linux_ipv6_addrs (void) | ||
| 518 | { | ||
| 519 | struct linux_ipv6_addr_list *lst = 0; | ||
| 520 | FILE *f; | ||
| 521 | @@ -1082,7 +1082,7 @@ static int print_addr (/*@unused@*/ void *dataptr, struct sockaddr *sa) | ||
| 522 | return 0; | ||
| 523 | } | ||
| 524 | |||
| 525 | -int main () | ||
| 526 | +int main (void) | ||
| 527 | { | ||
| 528 | int r; | ||
| 529 | |||
| 530 | @@ -1417,7 +1417,7 @@ get_localaddrs (krb5_context context, krb5_address ***addr, int use_profile) | ||
| 531 | * by Robert Quinn | ||
| 532 | */ | ||
| 533 | #if defined(_WIN32) | ||
| 534 | -static struct hostent *local_addr_fallback_kludge() | ||
| 535 | +static struct hostent *local_addr_fallback_kludge(void) | ||
| 536 | { | ||
| 537 | static struct hostent host; | ||
| 538 | static SOCKADDR_IN addr; | ||
| 539 | diff --git a/src/lib/rpc/getrpcent.c b/src/lib/rpc/getrpcent.c | ||
| 540 | index ad6793f..b3d94bc 100644 | ||
| 541 | --- a/src/lib/rpc/getrpcent.c | ||
| 542 | +++ b/src/lib/rpc/getrpcent.c | ||
| 543 | @@ -56,10 +56,10 @@ struct rpcdata { | ||
| 544 | char line[BUFSIZ+1]; | ||
| 545 | char *domain; | ||
| 546 | } *rpcdata; | ||
| 547 | -static struct rpcdata *get_rpcdata(); | ||
| 548 | +static struct rpcdata *get_rpcdata(void); | ||
| 549 | |||
| 550 | -static struct rpcent *interpret(); | ||
| 551 | -struct hostent *gethostent(); | ||
| 552 | +static struct rpcent *interpret(void); | ||
| 553 | +struct hostent *gethostent(void); | ||
| 554 | |||
| 555 | static char RPCDB[] = "/etc/rpc"; | ||
| 556 | |||
| 557 | diff --git a/src/lib/win_glue.c b/src/lib/win_glue.c | ||
| 558 | index d650cc3..011acda 100644 | ||
| 559 | --- a/src/lib/win_glue.c | ||
| 560 | +++ b/src/lib/win_glue.c | ||
| 561 | @@ -6,7 +6,7 @@ | ||
| 562 | #include "asn1_err.h" | ||
| 563 | #include "kdb5_err.h" | ||
| 564 | #include "profile.h" | ||
| 565 | -extern void krb5_stdcc_shutdown(); | ||
| 566 | +extern void krb5_stdcc_shutdown(void); | ||
| 567 | #endif | ||
| 568 | #ifdef GSSAPI | ||
| 569 | #include "gssapi/generic/gssapi_err_generic.h" | ||
| 570 | @@ -233,7 +233,7 @@ static int CallVersionServer(app_title, app_version, app_ini, code_cover) | ||
| 571 | #endif | ||
| 572 | |||
| 573 | #ifdef TIMEBOMB | ||
| 574 | -static krb5_error_code do_timebomb() | ||
| 575 | +static krb5_error_code do_timebomb(void) | ||
| 576 | { | ||
| 577 | char buf[1024]; | ||
| 578 | long timeleft; | ||
| 579 | @@ -276,7 +276,7 @@ static krb5_error_code do_timebomb() | ||
| 580 | * doesn't allow you to make messaging calls from LibMain. So, we now | ||
| 581 | * do the timebomb/version server stuff from krb5_init_context(). | ||
| 582 | */ | ||
| 583 | -krb5_error_code krb5_vercheck() | ||
| 584 | +krb5_error_code krb5_vercheck(void) | ||
| 585 | { | ||
| 586 | static int verchecked = 0; | ||
| 587 | if (verchecked) | ||
| 588 | @@ -314,7 +314,7 @@ krb5_error_code krb5_vercheck() | ||
| 589 | |||
| 590 | static HINSTANCE hlibinstance; | ||
| 591 | |||
| 592 | -HINSTANCE get_lib_instance() | ||
| 593 | +HINSTANCE get_lib_instance(void) | ||
| 594 | { | ||
| 595 | return hlibinstance; | ||
| 596 | } | ||
| 597 | diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c | ||
| 598 | index 2c163d9..381228e 100644 | ||
| 599 | --- a/src/plugins/kdb/db2/kdb_db2.c | ||
| 600 | +++ b/src/plugins/kdb/db2/kdb_db2.c | ||
| 601 | @@ -1165,13 +1165,13 @@ krb5_db2_set_lockmode(krb5_context context, krb5_boolean mode) | ||
| 602 | * DAL API functions | ||
| 603 | */ | ||
| 604 | krb5_error_code | ||
| 605 | -krb5_db2_lib_init() | ||
| 606 | +krb5_db2_lib_init(void) | ||
| 607 | { | ||
| 608 | return 0; | ||
| 609 | } | ||
| 610 | |||
| 611 | krb5_error_code | ||
| 612 | -krb5_db2_lib_cleanup() | ||
| 613 | +krb5_db2_lib_cleanup(void) | ||
| 614 | { | ||
| 615 | /* right now, no cleanup required */ | ||
| 616 | return 0; | ||
| 617 | diff --git a/src/plugins/kdb/db2/libdb2/hash/dbm.c b/src/plugins/kdb/db2/libdb2/hash/dbm.c | ||
| 618 | index 2dca256..8e23d4c 100644 | ||
| 619 | --- a/src/plugins/kdb/db2/libdb2/hash/dbm.c | ||
| 620 | +++ b/src/plugins/kdb/db2/libdb2/hash/dbm.c | ||
| 621 | @@ -95,7 +95,7 @@ kdb2_fetch(datum key) | ||
| 622 | } | ||
| 623 | |||
| 624 | datum | ||
| 625 | -kdb2_firstkey() | ||
| 626 | +kdb2_firstkey(void) | ||
| 627 | { | ||
| 628 | datum item; | ||
| 629 | |||
| 630 | diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c | ||
| 631 | index cee4b7b..5e77d5e 100644 | ||
| 632 | --- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c | ||
| 633 | +++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c | ||
| 634 | @@ -314,13 +314,13 @@ krb5_ldap_rebind(krb5_ldap_context *ldap_context, | ||
| 635 | * DAL API functions | ||
| 636 | */ | ||
| 637 | krb5_error_code | ||
| 638 | -krb5_ldap_lib_init() | ||
| 639 | +krb5_ldap_lib_init(void) | ||
| 640 | { | ||
| 641 | return 0; | ||
| 642 | } | ||
| 643 | |||
| 644 | krb5_error_code | ||
| 645 | -krb5_ldap_lib_cleanup() | ||
| 646 | +krb5_ldap_lib_cleanup(void) | ||
| 647 | { | ||
| 648 | /* right now, no cleanup required */ | ||
| 649 | return 0; | ||
| 650 | diff --git a/src/tests/threads/gss-perf.c b/src/tests/threads/gss-perf.c | ||
| 651 | index f3630c2..0ca6d84 100644 | ||
| 652 | --- a/src/tests/threads/gss-perf.c | ||
| 653 | +++ b/src/tests/threads/gss-perf.c | ||
| 654 | @@ -78,7 +78,7 @@ static void usage (void) __attribute__((noreturn)); | ||
| 655 | static void set_target (char *); | ||
| 656 | |||
| 657 | static void | ||
| 658 | -usage () | ||
| 659 | +usage (void) | ||
| 660 | { | ||
| 661 | fprintf (stderr, "usage: %s [ options ] service-name\n", prog); | ||
| 662 | fprintf (stderr, " service-name\tGSSAPI host-based service name (e.g., 'host@FQDN')\n"); | ||
| 663 | @@ -249,7 +249,7 @@ do_accept (gss_buffer_desc *msg, int iter) | ||
| 664 | } | ||
| 665 | |||
| 666 | static gss_buffer_desc | ||
| 667 | -do_init () | ||
| 668 | +do_init (void) | ||
| 669 | { | ||
| 670 | OM_uint32 maj_stat, min_stat; | ||
| 671 | gss_ctx_id_t ctx = GSS_C_NO_CONTEXT; | ||
| 672 | diff --git a/src/tests/threads/init_ctx.c b/src/tests/threads/init_ctx.c | ||
| 673 | index 42619a9..dc3d417 100644 | ||
| 674 | --- a/src/tests/threads/init_ctx.c | ||
| 675 | +++ b/src/tests/threads/init_ctx.c | ||
| 676 | @@ -57,7 +57,7 @@ static int do_pause; | ||
| 677 | static void usage (void) __attribute__((noreturn)); | ||
| 678 | |||
| 679 | static void | ||
| 680 | -usage () | ||
| 681 | +usage (void) | ||
| 682 | { | ||
| 683 | fprintf (stderr, "usage: %s [ options ]\n", prog); | ||
| 684 | fprintf (stderr, "options:\n"); | ||
| 685 | diff --git a/src/tests/threads/profread.c b/src/tests/threads/profread.c | ||
| 686 | index be28ba4..69bdb05 100644 | ||
| 687 | --- a/src/tests/threads/profread.c | ||
| 688 | +++ b/src/tests/threads/profread.c | ||
| 689 | @@ -59,7 +59,7 @@ static int do_pause; | ||
| 690 | static void usage (void) __attribute__((noreturn)); | ||
| 691 | |||
| 692 | static void | ||
| 693 | -usage () | ||
| 694 | +usage (void) | ||
| 695 | { | ||
| 696 | fprintf (stderr, "usage: %s [ options ]\n", prog); | ||
| 697 | fprintf (stderr, "options:\n"); | ||
| 698 | diff --git a/src/tests/threads/t_rcache.c b/src/tests/threads/t_rcache.c | ||
| 699 | index 07c45cc..8121429 100644 | ||
| 700 | --- a/src/tests/threads/t_rcache.c | ||
| 701 | +++ b/src/tests/threads/t_rcache.c | ||
| 702 | @@ -51,7 +51,7 @@ int n_threads = DEFAULT_N_THREADS; | ||
| 703 | int interval = DEFAULT_INTERVAL; | ||
| 704 | int *ip; | ||
| 705 | |||
| 706 | -static void wait_for_tick () | ||
| 707 | +static void wait_for_tick (void) | ||
| 708 | { | ||
| 709 | time_t now, next; | ||
| 710 | now = time(0); | ||
| 711 | diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c | ||
| 712 | index c1e3be7..2e74a4f 100644 | ||
| 713 | --- a/src/util/et/com_err.c | ||
| 714 | +++ b/src/util/et/com_err.c | ||
| 715 | @@ -35,7 +35,7 @@ static /*@null@*/ et_old_error_hook_func com_err_hook = 0; | ||
| 716 | k5_mutex_t com_err_hook_lock = K5_MUTEX_PARTIAL_INITIALIZER; | ||
| 717 | |||
| 718 | #if defined(_WIN32) | ||
| 719 | -BOOL isGuiApp() { | ||
| 720 | +BOOL isGuiApp(void) { | ||
| 721 | DWORD mypid; | ||
| 722 | HANDLE myprocess; | ||
| 723 | mypid = GetCurrentProcessId(); | ||
| 724 | @@ -161,7 +161,7 @@ et_old_error_hook_func set_com_err_hook (et_old_error_hook_func new_proc) | ||
| 725 | return x; | ||
| 726 | } | ||
| 727 | |||
| 728 | -et_old_error_hook_func reset_com_err_hook () | ||
| 729 | +et_old_error_hook_func reset_com_err_hook (void) | ||
| 730 | { | ||
| 731 | et_old_error_hook_func x; | ||
| 732 | |||
| 733 | diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c | ||
| 734 | index 13ad3af..94445a9 100644 | ||
| 735 | --- a/src/util/et/error_message.c | ||
| 736 | +++ b/src/util/et/error_message.c | ||
| 737 | @@ -303,7 +303,7 @@ remove_error_table(const struct error_table *et) | ||
| 738 | return ENOENT; | ||
| 739 | } | ||
| 740 | |||
| 741 | -int com_err_finish_init() | ||
| 742 | +int com_err_finish_init(void) | ||
| 743 | { | ||
| 744 | return CALL_INIT_FUNCTION(com_err_initialize); | ||
| 745 | } | ||
| 746 | diff --git a/src/util/profile/prof_file.c b/src/util/profile/prof_file.c | ||
| 747 | index aa951df..c10a368 100644 | ||
| 748 | --- a/src/util/profile/prof_file.c | ||
| 749 | +++ b/src/util/profile/prof_file.c | ||
| 750 | @@ -509,11 +509,11 @@ void profile_dereference_data_locked(prf_data_t data) | ||
| 751 | profile_free_file_data(data); | ||
| 752 | } | ||
| 753 | |||
| 754 | -void profile_lock_global() | ||
| 755 | +void profile_lock_global(void) | ||
| 756 | { | ||
| 757 | k5_mutex_lock(&g_shared_trees_mutex); | ||
| 758 | } | ||
| 759 | -void profile_unlock_global() | ||
| 760 | +void profile_unlock_global(void) | ||
| 761 | { | ||
| 762 | k5_mutex_unlock(&g_shared_trees_mutex); | ||
| 763 | } | ||
| 764 | diff --git a/src/util/support/secure_getenv.c b/src/util/support/secure_getenv.c | ||
| 765 | index 6df0591..c9b34b6 100644 | ||
| 766 | --- a/src/util/support/secure_getenv.c | ||
| 767 | +++ b/src/util/support/secure_getenv.c | ||
| 768 | @@ -68,7 +68,7 @@ static int elevated_privilege = 0; | ||
| 769 | MAKE_INIT_FUNCTION(k5_secure_getenv_init); | ||
| 770 | |||
| 771 | int | ||
| 772 | -k5_secure_getenv_init() | ||
| 773 | +k5_secure_getenv_init(void) | ||
| 774 | { | ||
| 775 | int saved_errno = errno; | ||
| 776 | |||
| 777 | diff --git a/src/windows/include/leashwin.h b/src/windows/include/leashwin.h | ||
| 778 | index 08b9c7d..c85e6df 100644 | ||
| 779 | --- a/src/windows/include/leashwin.h | ||
| 780 | +++ b/src/windows/include/leashwin.h | ||
| 781 | @@ -160,51 +160,51 @@ void Leash_reset_defaults(void); | ||
| 782 | #define GOOD_TICKETS 1 | ||
| 783 | |||
| 784 | /* Leash Configuration functions - alters Current User Registry */ | ||
| 785 | -DWORD Leash_get_default_lifetime(); | ||
| 786 | +DWORD Leash_get_default_lifetime(void); | ||
| 787 | DWORD Leash_set_default_lifetime(DWORD minutes); | ||
| 788 | -DWORD Leash_reset_default_lifetime(); | ||
| 789 | -DWORD Leash_get_default_renew_till(); | ||
| 790 | +DWORD Leash_reset_default_lifetime(void); | ||
| 791 | +DWORD Leash_get_default_renew_till(void); | ||
| 792 | DWORD Leash_set_default_renew_till(DWORD minutes); | ||
| 793 | -DWORD Leash_reset_default_renew_till(); | ||
| 794 | -DWORD Leash_get_default_renewable(); | ||
| 795 | +DWORD Leash_reset_default_renew_till(void); | ||
| 796 | +DWORD Leash_get_default_renewable(void); | ||
| 797 | DWORD Leash_set_default_renewable(DWORD onoff); | ||
| 798 | -DWORD Leash_reset_default_renewable(); | ||
| 799 | -DWORD Leash_get_default_forwardable(); | ||
| 800 | +DWORD Leash_reset_default_renewable(void); | ||
| 801 | +DWORD Leash_get_default_forwardable(void); | ||
| 802 | DWORD Leash_set_default_forwardable(DWORD onoff); | ||
| 803 | -DWORD Leash_reset_default_forwardable(); | ||
| 804 | -DWORD Leash_get_default_noaddresses(); | ||
| 805 | +DWORD Leash_reset_default_forwardable(void); | ||
| 806 | +DWORD Leash_get_default_noaddresses(void); | ||
| 807 | DWORD Leash_set_default_noaddresses(DWORD onoff); | ||
| 808 | -DWORD Leash_reset_default_noaddresses(); | ||
| 809 | -DWORD Leash_get_default_proxiable(); | ||
| 810 | +DWORD Leash_reset_default_noaddresses(void); | ||
| 811 | +DWORD Leash_get_default_proxiable(void); | ||
| 812 | DWORD Leash_set_default_proxiable(DWORD onoff); | ||
| 813 | -DWORD Leash_reset_default_proxiable(); | ||
| 814 | -DWORD Leash_get_default_publicip(); | ||
| 815 | +DWORD Leash_reset_default_proxiable(void); | ||
| 816 | +DWORD Leash_get_default_publicip(void); | ||
| 817 | DWORD Leash_set_default_publicip(DWORD ipv4addr); | ||
| 818 | -DWORD Leash_reset_default_publicip(); | ||
| 819 | -DWORD Leash_get_hide_kinit_options(); | ||
| 820 | +DWORD Leash_reset_default_publicip(void); | ||
| 821 | +DWORD Leash_get_hide_kinit_options(void); | ||
| 822 | DWORD Leash_set_hide_kinit_options(DWORD onoff); | ||
| 823 | -DWORD Leash_reset_hide_kinit_options(); | ||
| 824 | -DWORD Leash_get_default_life_min(); | ||
| 825 | +DWORD Leash_reset_hide_kinit_options(void); | ||
| 826 | +DWORD Leash_get_default_life_min(void); | ||
| 827 | DWORD Leash_set_default_life_min(DWORD minutes); | ||
| 828 | -DWORD Leash_reset_default_life_min(); | ||
| 829 | -DWORD Leash_get_default_life_max(); | ||
| 830 | +DWORD Leash_reset_default_life_min(void); | ||
| 831 | +DWORD Leash_get_default_life_max(void); | ||
| 832 | DWORD Leash_set_default_life_max(DWORD minutes); | ||
| 833 | -DWORD Leash_reset_default_life_max(); | ||
| 834 | -DWORD Leash_get_default_renew_min(); | ||
| 835 | +DWORD Leash_reset_default_life_max(void); | ||
| 836 | +DWORD Leash_get_default_renew_min(void); | ||
| 837 | DWORD Leash_set_default_renew_min(DWORD minutes); | ||
| 838 | -DWORD Leash_reset_default_renew_min(); | ||
| 839 | -DWORD Leash_get_default_renew_max(); | ||
| 840 | +DWORD Leash_reset_default_renew_min(void); | ||
| 841 | +DWORD Leash_get_default_renew_max(void); | ||
| 842 | DWORD Leash_set_default_renew_max(DWORD minutes); | ||
| 843 | -DWORD Leash_reset_default_renew_max(); | ||
| 844 | -DWORD Leash_get_default_uppercaserealm(); | ||
| 845 | +DWORD Leash_reset_default_renew_max(void); | ||
| 846 | +DWORD Leash_get_default_uppercaserealm(void); | ||
| 847 | DWORD Leash_set_default_uppercaserealm(DWORD onoff); | ||
| 848 | -DWORD Leash_reset_default_uppercaserealm(); | ||
| 849 | -DWORD Leash_get_default_mslsa_import(); | ||
| 850 | +DWORD Leash_reset_default_uppercaserealm(void); | ||
| 851 | +DWORD Leash_get_default_mslsa_import(void); | ||
| 852 | DWORD Leash_set_default_mslsa_import(DWORD onoffmatch); | ||
| 853 | -DWORD Leash_reset_default_mslsa_import(); | ||
| 854 | -DWORD Leash_get_default_preserve_kinit_settings(); | ||
| 855 | +DWORD Leash_reset_default_mslsa_import(void); | ||
| 856 | +DWORD Leash_get_default_preserve_kinit_settings(void); | ||
| 857 | DWORD Leash_set_default_preserve_kinit_settings(DWORD onoff); | ||
| 858 | -DWORD Leash_reset_default_preserve_kinit_settings(); | ||
| 859 | +DWORD Leash_reset_default_preserve_kinit_settings(void); | ||
| 860 | #ifdef __cplusplus | ||
| 861 | } | ||
| 862 | #endif | ||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0002-Avoid-strict-prototype-compiler-errors.patch b/meta-oe/recipes-connectivity/krb5/krb5/0002-Avoid-strict-prototype-compiler-errors.patch deleted file mode 100644 index 63072c790c..0000000000 --- a/meta-oe/recipes-connectivity/krb5/krb5/0002-Avoid-strict-prototype-compiler-errors.patch +++ /dev/null | |||
| @@ -1,379 +0,0 @@ | |||
| 1 | From 422c63a716a55da5c750396c0f215b5be9e060b6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Steffen=20Kie=C3=9F?= | ||
| 3 | <steffen.kiess@cis.iti.uni-stuttgart.de> | ||
| 4 | Date: Tue, 13 Feb 2024 18:39:27 +0100 | ||
| 5 | Subject: [PATCH 2/2] Avoid strict-prototype compiler errors | ||
| 6 | |||
| 7 | Commit 4b9d7f7c107f01a61600fddcd8cde3812d0366a2 added the | ||
| 8 | -Werror=strict-prototypes parameter to the build process, but left | ||
| 9 | behind 28 function definitions using "()" instead of "(void)". Most | ||
| 10 | of these definitions could not cause compiler errors for various | ||
| 11 | reasons (such as an accompanying prototype), but a few could cause | ||
| 12 | errors in gcc depending on the build configuration. | ||
| 13 | |||
| 14 | For consistency and safety, add "(void)" to all 28 definitions. | ||
| 15 | |||
| 16 | [ghudson@mit.edu: rewrote commit message] | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://github.com/krb5/krb5/commit/3ae9244cd021a75eba909d872a92c25db490714d] | ||
| 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 20 | --- | ||
| 21 | src/clients/kcpytkt/kcpytkt.c | 2 +- | ||
| 22 | src/clients/kdeltkt/kdeltkt.c | 2 +- | ||
| 23 | src/clients/kinit/kinit.c | 4 ++-- | ||
| 24 | src/clients/kinit/kinit_kdb.c | 2 +- | ||
| 25 | src/clients/klist/klist.c | 4 ++-- | ||
| 26 | src/kadmin/cli/kadmin.c | 2 +- | ||
| 27 | src/kadmin/dbutil/kdb5_util.c | 4 ++-- | ||
| 28 | src/kdc/main.c | 2 +- | ||
| 29 | src/kprop/kpropd.c | 4 ++-- | ||
| 30 | src/lib/crypto/builtin/enc_provider/aes.c | 2 +- | ||
| 31 | src/lib/crypto/openssl/hmac.c | 2 +- | ||
| 32 | src/lib/krb5/ccache/t_memory.c | 4 ++-- | ||
| 33 | src/lib/krb5/ccache/t_stdio.c | 4 ++-- | ||
| 34 | src/plugins/kdb/db2/libdb2/btree/bt_debug.c | 2 +- | ||
| 35 | src/plugins/kdb/db2/libdb2/btree/bt_open.c | 4 ++-- | ||
| 36 | src/plugins/kdb/db2/libdb2/hash/dbm.c | 2 +- | ||
| 37 | src/plugins/kdb/db2/libdb2/test/btree.tests/main.c | 2 +- | ||
| 38 | src/plugins/kdb/db2/libdb2/test/dbtest.c | 2 +- | ||
| 39 | src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 2 +- | ||
| 40 | src/plugins/tls/k5tls/openssl.c | 2 +- | ||
| 41 | src/tests/asn.1/make-vectors.c | 2 +- | ||
| 42 | 21 files changed, 28 insertions(+), 28 deletions(-) | ||
| 43 | |||
| 44 | diff --git a/src/clients/kcpytkt/kcpytkt.c b/src/clients/kcpytkt/kcpytkt.c | ||
| 45 | index 0b88022..f1d50e5 100644 | ||
| 46 | --- a/src/clients/kcpytkt/kcpytkt.c | ||
| 47 | +++ b/src/clients/kcpytkt/kcpytkt.c | ||
| 48 | @@ -10,7 +10,7 @@ static char *prog; | ||
| 49 | static int quiet = 0; | ||
| 50 | |||
| 51 | static void | ||
| 52 | -xusage() | ||
| 53 | +xusage(void) | ||
| 54 | { | ||
| 55 | fprintf(stderr, "xusage: %s [-c from_ccache] [-e etype] [-f flags] " | ||
| 56 | "dest_ccache service1 service2 ...\n", prog); | ||
| 57 | diff --git a/src/clients/kdeltkt/kdeltkt.c b/src/clients/kdeltkt/kdeltkt.c | ||
| 58 | index cd0bf63..66a32a8 100644 | ||
| 59 | --- a/src/clients/kdeltkt/kdeltkt.c | ||
| 60 | +++ b/src/clients/kdeltkt/kdeltkt.c | ||
| 61 | @@ -10,7 +10,7 @@ static char *prog; | ||
| 62 | static int quiet = 0; | ||
| 63 | |||
| 64 | static void | ||
| 65 | -xusage() | ||
| 66 | +xusage(void) | ||
| 67 | { | ||
| 68 | fprintf(stderr, "xusage: %s [-c ccache] [-e etype] [-f flags] service1 " | ||
| 69 | "service2 ...\n", prog); | ||
| 70 | diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c | ||
| 71 | index 7a33ffa..b27b723 100644 | ||
| 72 | --- a/src/clients/kinit/kinit.c | ||
| 73 | +++ b/src/clients/kinit/kinit.c | ||
| 74 | @@ -55,7 +55,7 @@ get_name_from_os(void) | ||
| 75 | #else /* HAVE_PWD_H */ | ||
| 76 | #ifdef _WIN32 | ||
| 77 | static char * | ||
| 78 | -get_name_from_os() | ||
| 79 | +get_name_from_os(void) | ||
| 80 | { | ||
| 81 | static char name[1024]; | ||
| 82 | DWORD name_size = sizeof(name); | ||
| 83 | @@ -69,7 +69,7 @@ get_name_from_os() | ||
| 84 | } | ||
| 85 | #else /* _WIN32 */ | ||
| 86 | static char * | ||
| 87 | -get_name_from_os() | ||
| 88 | +get_name_from_os(void) | ||
| 89 | { | ||
| 90 | return NULL; | ||
| 91 | } | ||
| 92 | diff --git a/src/clients/kinit/kinit_kdb.c b/src/clients/kinit/kinit_kdb.c | ||
| 93 | index fbd174b..4e7cd50 100644 | ||
| 94 | --- a/src/clients/kinit/kinit_kdb.c | ||
| 95 | +++ b/src/clients/kinit/kinit_kdb.c | ||
| 96 | @@ -69,7 +69,7 @@ kinit_kdb_init(krb5_context *pcontext, char *realm) | ||
| 97 | } | ||
| 98 | |||
| 99 | void | ||
| 100 | -kinit_kdb_fini() | ||
| 101 | +kinit_kdb_fini(void) | ||
| 102 | { | ||
| 103 | kadm5_destroy(server_handle); | ||
| 104 | } | ||
| 105 | diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c | ||
| 106 | index c797b16..27cf0ee 100644 | ||
| 107 | --- a/src/clients/klist/klist.c | ||
| 108 | +++ b/src/clients/klist/klist.c | ||
| 109 | @@ -359,7 +359,7 @@ do_keytab(const char *name) | ||
| 110 | } | ||
| 111 | |||
| 112 | static void | ||
| 113 | -list_all_ccaches() | ||
| 114 | +list_all_ccaches(void) | ||
| 115 | { | ||
| 116 | krb5_error_code ret; | ||
| 117 | krb5_ccache cache; | ||
| 118 | @@ -451,7 +451,7 @@ show_all_ccaches(void) | ||
| 119 | } | ||
| 120 | |||
| 121 | static void | ||
| 122 | -do_ccache() | ||
| 123 | +do_ccache(void) | ||
| 124 | { | ||
| 125 | krb5_error_code ret; | ||
| 126 | krb5_ccache cache; | ||
| 127 | diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c | ||
| 128 | index 23b64b0..c1256f7 100644 | ||
| 129 | --- a/src/kadmin/cli/kadmin.c | ||
| 130 | +++ b/src/kadmin/cli/kadmin.c | ||
| 131 | @@ -607,7 +607,7 @@ kadmin_startup(int argc, char *argv[], char **request_out, char ***args_out) | ||
| 132 | } | ||
| 133 | |||
| 134 | int | ||
| 135 | -quit() | ||
| 136 | +quit(void) | ||
| 137 | { | ||
| 138 | kadm5_ret_t retval; | ||
| 139 | |||
| 140 | diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c | ||
| 141 | index 3a07fd5..187428e 100644 | ||
| 142 | --- a/src/kadmin/dbutil/kdb5_util.c | ||
| 143 | +++ b/src/kadmin/dbutil/kdb5_util.c | ||
| 144 | @@ -367,7 +367,7 @@ main(int argc, char *argv[]) | ||
| 145 | * program is run). | ||
| 146 | */ | ||
| 147 | static int | ||
| 148 | -open_db_and_mkey() | ||
| 149 | +open_db_and_mkey(void) | ||
| 150 | { | ||
| 151 | krb5_error_code retval; | ||
| 152 | krb5_data scratch, pwd, seed; | ||
| 153 | @@ -489,7 +489,7 @@ open_db_and_mkey() | ||
| 154 | #endif | ||
| 155 | |||
| 156 | int | ||
| 157 | -quit() | ||
| 158 | +quit(void) | ||
| 159 | { | ||
| 160 | krb5_error_code retval; | ||
| 161 | static krb5_boolean finished = 0; | ||
| 162 | diff --git a/src/kdc/main.c b/src/kdc/main.c | ||
| 163 | index bfdfef5..ad1d1bf 100644 | ||
| 164 | --- a/src/kdc/main.c | ||
| 165 | +++ b/src/kdc/main.c | ||
| 166 | @@ -854,7 +854,7 @@ write_pid_file(const char *path) | ||
| 167 | } | ||
| 168 | |||
| 169 | static void | ||
| 170 | -finish_realms() | ||
| 171 | +finish_realms(void) | ||
| 172 | { | ||
| 173 | int i; | ||
| 174 | |||
| 175 | diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c | ||
| 176 | index 1b530fc..b11f3a9 100644 | ||
| 177 | --- a/src/kprop/kpropd.c | ||
| 178 | +++ b/src/kprop/kpropd.c | ||
| 179 | @@ -376,7 +376,7 @@ get_wildcard_addr(struct addrinfo **res) | ||
| 180 | } | ||
| 181 | |||
| 182 | static void | ||
| 183 | -do_standalone() | ||
| 184 | +do_standalone(void) | ||
| 185 | { | ||
| 186 | struct sockaddr_in frominet; | ||
| 187 | struct addrinfo *res; | ||
| 188 | @@ -630,7 +630,7 @@ full_resync(CLIENT *clnt) | ||
| 189 | * Returns non-zero on failure due to errors. | ||
| 190 | */ | ||
| 191 | krb5_error_code | ||
| 192 | -do_iprop() | ||
| 193 | +do_iprop(void) | ||
| 194 | { | ||
| 195 | kadm5_ret_t retval; | ||
| 196 | krb5_principal iprop_svc_principal = NULL; | ||
| 197 | diff --git a/src/lib/crypto/builtin/enc_provider/aes.c b/src/lib/crypto/builtin/enc_provider/aes.c | ||
| 198 | index 7fa9449..39e2a84 100644 | ||
| 199 | --- a/src/lib/crypto/builtin/enc_provider/aes.c | ||
| 200 | +++ b/src/lib/crypto/builtin/enc_provider/aes.c | ||
| 201 | @@ -69,7 +69,7 @@ void k5_iEnc256_CBC(struct aes_data *data); | ||
| 202 | void k5_iDec256_CBC(struct aes_data *data); | ||
| 203 | |||
| 204 | static krb5_boolean | ||
| 205 | -aesni_supported_by_cpu() | ||
| 206 | +aesni_supported_by_cpu(void) | ||
| 207 | { | ||
| 208 | unsigned int a, b, c, d; | ||
| 209 | |||
| 210 | diff --git a/src/lib/crypto/openssl/hmac.c b/src/lib/crypto/openssl/hmac.c | ||
| 211 | index bf12b8d..799d700 100644 | ||
| 212 | --- a/src/lib/crypto/openssl/hmac.c | ||
| 213 | +++ b/src/lib/crypto/openssl/hmac.c | ||
| 214 | @@ -70,7 +70,7 @@ | ||
| 215 | |||
| 216 | #define HMAC_CTX_new compat_hmac_ctx_new | ||
| 217 | static HMAC_CTX * | ||
| 218 | -compat_hmac_ctx_new() | ||
| 219 | +compat_hmac_ctx_new(void) | ||
| 220 | { | ||
| 221 | HMAC_CTX *ctx; | ||
| 222 | |||
| 223 | diff --git a/src/lib/krb5/ccache/t_memory.c b/src/lib/krb5/ccache/t_memory.c | ||
| 224 | index 6d103a0..0f94e82 100644 | ||
| 225 | --- a/src/lib/krb5/ccache/t_memory.c | ||
| 226 | +++ b/src/lib/krb5/ccache/t_memory.c | ||
| 227 | @@ -85,7 +85,7 @@ krb5_creds test_creds = { | ||
| 228 | }; | ||
| 229 | |||
| 230 | void | ||
| 231 | -init_test_cred() | ||
| 232 | +init_test_cred(void) | ||
| 233 | { | ||
| 234 | test_creds.client = (krb5_principal) malloc(sizeof(krb5_data *)*3); | ||
| 235 | test_creds.client[0] = &client1; | ||
| 236 | @@ -104,7 +104,7 @@ init_test_cred() | ||
| 237 | }; | ||
| 238 | |||
| 239 | void | ||
| 240 | -mcc_test() | ||
| 241 | +mcc_test(void) | ||
| 242 | { | ||
| 243 | krb5_ccache id; | ||
| 244 | krb5_creds creds; | ||
| 245 | diff --git a/src/lib/krb5/ccache/t_stdio.c b/src/lib/krb5/ccache/t_stdio.c | ||
| 246 | index 15185e3..06a9c2d 100644 | ||
| 247 | --- a/src/lib/krb5/ccache/t_stdio.c | ||
| 248 | +++ b/src/lib/krb5/ccache/t_stdio.c | ||
| 249 | @@ -98,7 +98,7 @@ krb5_creds test_creds = { | ||
| 250 | }; | ||
| 251 | |||
| 252 | void | ||
| 253 | -init_test_cred() | ||
| 254 | +init_test_cred(void) | ||
| 255 | { | ||
| 256 | test_creds.client = (krb5_principal) malloc(sizeof(krb5_data *)*3); | ||
| 257 | test_creds.client[0] = &client1; | ||
| 258 | @@ -118,7 +118,7 @@ init_test_cred() | ||
| 259 | |||
| 260 | int flags = 0; | ||
| 261 | void | ||
| 262 | -scc_test() | ||
| 263 | +scc_test(void) | ||
| 264 | { | ||
| 265 | krb5_ccache id; | ||
| 266 | krb5_creds creds; | ||
| 267 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_debug.c b/src/plugins/kdb/db2/libdb2/btree/bt_debug.c | ||
| 268 | index bc71076..5a955e0 100644 | ||
| 269 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_debug.c | ||
| 270 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_debug.c | ||
| 271 | @@ -56,7 +56,7 @@ static FILE *tracefp; | ||
| 272 | * initialize debugging. | ||
| 273 | */ | ||
| 274 | static void | ||
| 275 | -__bt_dinit() | ||
| 276 | +__bt_dinit(void) | ||
| 277 | { | ||
| 278 | static int first = 1; | ||
| 279 | |||
| 280 | diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_open.c b/src/plugins/kdb/db2/libdb2/btree/bt_open.c | ||
| 281 | index 0bb19d7..56bab19 100644 | ||
| 282 | --- a/src/plugins/kdb/db2/libdb2/btree/bt_open.c | ||
| 283 | +++ b/src/plugins/kdb/db2/libdb2/btree/bt_open.c | ||
| 284 | @@ -390,7 +390,7 @@ nroot(BTREE *t) | ||
| 285 | } | ||
| 286 | |||
| 287 | static int | ||
| 288 | -tmp() | ||
| 289 | +tmp(void) | ||
| 290 | { | ||
| 291 | #ifdef SIG_BLOCK | ||
| 292 | sigset_t set, oset; | ||
| 293 | @@ -437,7 +437,7 @@ tmp() | ||
| 294 | } | ||
| 295 | |||
| 296 | static int | ||
| 297 | -byteorder() | ||
| 298 | +byteorder(void) | ||
| 299 | { | ||
| 300 | u_int32_t x; | ||
| 301 | u_char *p; | ||
| 302 | diff --git a/src/plugins/kdb/db2/libdb2/hash/dbm.c b/src/plugins/kdb/db2/libdb2/hash/dbm.c | ||
| 303 | index 8e23d4c..6e5e96b 100644 | ||
| 304 | --- a/src/plugins/kdb/db2/libdb2/hash/dbm.c | ||
| 305 | +++ b/src/plugins/kdb/db2/libdb2/hash/dbm.c | ||
| 306 | @@ -143,7 +143,7 @@ kdb2_store(datum key, datum dat) | ||
| 307 | } | ||
| 308 | |||
| 309 | static void | ||
| 310 | -no_open_db() | ||
| 311 | +no_open_db(void) | ||
| 312 | { | ||
| 313 | (void)fprintf(stderr, "dbm: no open database.\n"); | ||
| 314 | } | ||
| 315 | diff --git a/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c b/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c | ||
| 316 | index 088f903..eec843d 100644 | ||
| 317 | --- a/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c | ||
| 318 | +++ b/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c | ||
| 319 | @@ -908,7 +908,7 @@ keydata(key, data) | ||
| 320 | } | ||
| 321 | |||
| 322 | void | ||
| 323 | -usage() | ||
| 324 | +usage(void) | ||
| 325 | { | ||
| 326 | (void)fprintf(stderr, | ||
| 327 | "usage: %s [-bdluw] [-c cache] [-i file] [-p page] [file]\n", | ||
| 328 | diff --git a/src/plugins/kdb/db2/libdb2/test/dbtest.c b/src/plugins/kdb/db2/libdb2/test/dbtest.c | ||
| 329 | index 04bf34b..a2866b4 100644 | ||
| 330 | --- a/src/plugins/kdb/db2/libdb2/test/dbtest.c | ||
| 331 | +++ b/src/plugins/kdb/db2/libdb2/test/dbtest.c | ||
| 332 | @@ -792,7 +792,7 @@ xmalloc(char *text, size_t len) | ||
| 333 | } | ||
| 334 | |||
| 335 | void | ||
| 336 | -usage() | ||
| 337 | +usage(void) | ||
| 338 | { | ||
| 339 | (void)fprintf(stderr, | ||
| 340 | "usage: dbtest [-l] [-f file] [-i info] [-o file] type script\n"); | ||
| 341 | diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | ||
| 342 | index 4c81256..4a8b6d9 100644 | ||
| 343 | --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | ||
| 344 | +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | ||
| 345 | @@ -3075,7 +3075,7 @@ cleanup: | ||
| 346 | } | ||
| 347 | |||
| 348 | int | ||
| 349 | -pkinit_openssl_init() | ||
| 350 | +pkinit_openssl_init(void) | ||
| 351 | { | ||
| 352 | /* Initialize OpenSSL. */ | ||
| 353 | ERR_load_crypto_strings(); | ||
| 354 | diff --git a/src/plugins/tls/k5tls/openssl.c b/src/plugins/tls/k5tls/openssl.c | ||
| 355 | index 99fda7f..aab67c0 100644 | ||
| 356 | --- a/src/plugins/tls/k5tls/openssl.c | ||
| 357 | +++ b/src/plugins/tls/k5tls/openssl.c | ||
| 358 | @@ -49,7 +49,7 @@ static int ex_handle_id = -1; | ||
| 359 | MAKE_INIT_FUNCTION(init_openssl); | ||
| 360 | |||
| 361 | int | ||
| 362 | -init_openssl() | ||
| 363 | +init_openssl(void) | ||
| 364 | { | ||
| 365 | SSL_library_init(); | ||
| 366 | SSL_load_error_strings(); | ||
| 367 | diff --git a/src/tests/asn.1/make-vectors.c b/src/tests/asn.1/make-vectors.c | ||
| 368 | index 2fc8546..6f2b7dd 100644 | ||
| 369 | --- a/src/tests/asn.1/make-vectors.c | ||
| 370 | +++ b/src/tests/asn.1/make-vectors.c | ||
| 371 | @@ -224,7 +224,7 @@ printbuf(void) | ||
| 372 | } | ||
| 373 | |||
| 374 | int | ||
| 375 | -main() | ||
| 376 | +main(void) | ||
| 377 | { | ||
| 378 | /* Initialize values which can't use static initializers. */ | ||
| 379 | asn_long2INTEGER(&otp_format, 2); /* Alphanumeric */ | ||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch b/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch deleted file mode 100644 index 46eb6aa96c..0000000000 --- a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch +++ /dev/null | |||
| @@ -1,207 +0,0 @@ | |||
| 1 | From c5f9c816107f70139de11b38aa02db2f1774ee0d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Greg Hudson <ghudson@mit.edu> | ||
| 3 | Date: Tue, 5 Mar 2024 19:53:07 -0500 | ||
| 4 | Subject: [PATCH] Fix two unlikely memory leaks | ||
| 5 | |||
| 6 | In gss_krb5int_make_seal_token_v3(), one of the bounds checks (which | ||
| 7 | could probably never be triggered) leaks plain.data. Fix this leak | ||
| 8 | and use current practices for cleanup throughout the function. | ||
| 9 | |||
| 10 | In xmt_rmtcallres() (unused within the tree and likely elsewhere), | ||
| 11 | store port_ptr into crp->port_ptr as soon as it is allocated; | ||
| 12 | otherwise it could leak if the subsequent xdr_u_int32() operation | ||
| 13 | fails. | ||
| 14 | |||
| 15 | CVE: CVE-2024-26458 CVE-2024-26461 | ||
| 16 | Upstream-Status: Backport [https://github.com/krb5/krb5/commit/c5f9c816107f70139de11b38aa02db2f1774ee0d] | ||
| 17 | |||
| 18 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
| 19 | --- | ||
| 20 | src/lib/gssapi/krb5/k5sealv3.c | 56 +++++++++++++++------------------- | ||
| 21 | src/lib/rpc/pmap_rmt.c | 9 +++--- | ||
| 22 | 2 files changed, 29 insertions(+), 36 deletions(-) | ||
| 23 | |||
| 24 | diff --git a/src/lib/gssapi/krb5/k5sealv3.c b/src/lib/gssapi/krb5/k5sealv3.c | ||
| 25 | index 1fcbdfb..d3210c1 100644 | ||
| 26 | --- a/src/lib/gssapi/krb5/k5sealv3.c | ||
| 27 | +++ b/src/lib/gssapi/krb5/k5sealv3.c | ||
| 28 | @@ -65,7 +65,7 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
| 29 | int conf_req_flag, int toktype) | ||
| 30 | { | ||
| 31 | size_t bufsize = 16; | ||
| 32 | - unsigned char *outbuf = 0; | ||
| 33 | + unsigned char *outbuf = NULL; | ||
| 34 | krb5_error_code err; | ||
| 35 | int key_usage; | ||
| 36 | unsigned char acceptor_flag; | ||
| 37 | @@ -75,9 +75,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
| 38 | #endif | ||
| 39 | size_t ec; | ||
| 40 | unsigned short tok_id; | ||
| 41 | - krb5_checksum sum; | ||
| 42 | + krb5_checksum sum = { 0 }; | ||
| 43 | krb5_key key; | ||
| 44 | krb5_cksumtype cksumtype; | ||
| 45 | + krb5_data plain = empty_data(); | ||
| 46 | + | ||
| 47 | + token->value = NULL; | ||
| 48 | + token->length = 0; | ||
| 49 | |||
| 50 | acceptor_flag = ctx->initiate ? 0 : FLAG_SENDER_IS_ACCEPTOR; | ||
| 51 | key_usage = (toktype == KG_TOK_WRAP_MSG | ||
| 52 | @@ -107,14 +111,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
| 53 | #endif | ||
| 54 | |||
| 55 | if (toktype == KG_TOK_WRAP_MSG && conf_req_flag) { | ||
| 56 | - krb5_data plain; | ||
| 57 | krb5_enc_data cipher; | ||
| 58 | size_t ec_max; | ||
| 59 | size_t encrypt_size; | ||
| 60 | |||
| 61 | /* 300: Adds some slop. */ | ||
| 62 | - if (SIZE_MAX - 300 < message->length) | ||
| 63 | - return ENOMEM; | ||
| 64 | + if (SIZE_MAX - 300 < message->length) { | ||
| 65 | + err = ENOMEM; | ||
| 66 | + goto cleanup; | ||
| 67 | + } | ||
| 68 | ec_max = SIZE_MAX - message->length - 300; | ||
| 69 | if (ec_max > 0xffff) | ||
| 70 | ec_max = 0xffff; | ||
| 71 | @@ -126,20 +131,20 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
| 72 | #endif | ||
| 73 | err = alloc_data(&plain, message->length + 16 + ec); | ||
| 74 | if (err) | ||
| 75 | - return err; | ||
| 76 | + goto cleanup; | ||
| 77 | |||
| 78 | /* Get size of ciphertext. */ | ||
| 79 | encrypt_size = krb5_encrypt_size(plain.length, key->keyblock.enctype); | ||
| 80 | if (encrypt_size > SIZE_MAX / 2) { | ||
| 81 | err = ENOMEM; | ||
| 82 | - goto error; | ||
| 83 | + goto cleanup; | ||
| 84 | } | ||
| 85 | bufsize = 16 + encrypt_size; | ||
| 86 | /* Allocate space for header plus encrypted data. */ | ||
| 87 | outbuf = gssalloc_malloc(bufsize); | ||
| 88 | if (outbuf == NULL) { | ||
| 89 | - free(plain.data); | ||
| 90 | - return ENOMEM; | ||
| 91 | + err = ENOMEM; | ||
| 92 | + goto cleanup; | ||
| 93 | } | ||
| 94 | |||
| 95 | /* TOK_ID */ | ||
| 96 | @@ -164,11 +169,8 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
| 97 | cipher.ciphertext.length = bufsize - 16; | ||
| 98 | cipher.enctype = key->keyblock.enctype; | ||
| 99 | err = krb5_k_encrypt(context, key, key_usage, 0, &plain, &cipher); | ||
| 100 | - zap(plain.data, plain.length); | ||
| 101 | - free(plain.data); | ||
| 102 | - plain.data = 0; | ||
| 103 | if (err) | ||
| 104 | - goto error; | ||
| 105 | + goto cleanup; | ||
| 106 | |||
| 107 | /* Now that we know we're returning a valid token.... */ | ||
| 108 | ctx->seq_send++; | ||
| 109 | @@ -181,7 +183,6 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
| 110 | /* If the rotate fails, don't worry about it. */ | ||
| 111 | #endif | ||
| 112 | } else if (toktype == KG_TOK_WRAP_MSG && !conf_req_flag) { | ||
| 113 | - krb5_data plain; | ||
| 114 | size_t cksumsize; | ||
| 115 | |||
| 116 | /* Here, message is the application-supplied data; message2 is | ||
| 117 | @@ -193,21 +194,19 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
| 118 | wrap_with_checksum: | ||
| 119 | err = alloc_data(&plain, message->length + 16); | ||
| 120 | if (err) | ||
| 121 | - return err; | ||
| 122 | + goto cleanup; | ||
| 123 | |||
| 124 | err = krb5_c_checksum_length(context, cksumtype, &cksumsize); | ||
| 125 | if (err) | ||
| 126 | - goto error; | ||
| 127 | + goto cleanup; | ||
| 128 | |||
| 129 | assert(cksumsize <= 0xffff); | ||
| 130 | |||
| 131 | bufsize = 16 + message2->length + cksumsize; | ||
| 132 | outbuf = gssalloc_malloc(bufsize); | ||
| 133 | if (outbuf == NULL) { | ||
| 134 | - free(plain.data); | ||
| 135 | - plain.data = 0; | ||
| 136 | err = ENOMEM; | ||
| 137 | - goto error; | ||
| 138 | + goto cleanup; | ||
| 139 | } | ||
| 140 | |||
| 141 | /* TOK_ID */ | ||
| 142 | @@ -239,23 +238,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
| 143 | if (message2->length) | ||
| 144 | memcpy(outbuf + 16, message2->value, message2->length); | ||
| 145 | |||
| 146 | - sum.contents = outbuf + 16 + message2->length; | ||
| 147 | - sum.length = cksumsize; | ||
| 148 | - | ||
| 149 | err = krb5_k_make_checksum(context, cksumtype, key, | ||
| 150 | key_usage, &plain, &sum); | ||
| 151 | - zap(plain.data, plain.length); | ||
| 152 | - free(plain.data); | ||
| 153 | - plain.data = 0; | ||
| 154 | if (err) { | ||
| 155 | zap(outbuf,bufsize); | ||
| 156 | - goto error; | ||
| 157 | + goto cleanup; | ||
| 158 | } | ||
| 159 | if (sum.length != cksumsize) | ||
| 160 | abort(); | ||
| 161 | memcpy(outbuf + 16 + message2->length, sum.contents, cksumsize); | ||
| 162 | - krb5_free_checksum_contents(context, &sum); | ||
| 163 | - sum.contents = 0; | ||
| 164 | /* Now that we know we're actually generating the token... */ | ||
| 165 | ctx->seq_send++; | ||
| 166 | |||
| 167 | @@ -285,12 +276,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
| 168 | |||
| 169 | token->value = outbuf; | ||
| 170 | token->length = bufsize; | ||
| 171 | - return 0; | ||
| 172 | + outbuf = NULL; | ||
| 173 | + err = 0; | ||
| 174 | |||
| 175 | -error: | ||
| 176 | +cleanup: | ||
| 177 | + krb5_free_checksum_contents(context, &sum); | ||
| 178 | + zapfree(plain.data, plain.length); | ||
| 179 | gssalloc_free(outbuf); | ||
| 180 | - token->value = NULL; | ||
| 181 | - token->length = 0; | ||
| 182 | return err; | ||
| 183 | } | ||
| 184 | |||
| 185 | diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c | ||
| 186 | index 8c7e30c..522cb20 100644 | ||
| 187 | --- a/src/lib/rpc/pmap_rmt.c | ||
| 188 | +++ b/src/lib/rpc/pmap_rmt.c | ||
| 189 | @@ -160,11 +160,12 @@ xdr_rmtcallres( | ||
| 190 | caddr_t port_ptr; | ||
| 191 | |||
| 192 | port_ptr = (caddr_t)(void *)crp->port_ptr; | ||
| 193 | - if (xdr_reference(xdrs, &port_ptr, sizeof (uint32_t), | ||
| 194 | - xdr_u_int32) && xdr_u_int32(xdrs, &crp->resultslen)) { | ||
| 195 | - crp->port_ptr = (uint32_t *)(void *)port_ptr; | ||
| 196 | + if (!xdr_reference(xdrs, &port_ptr, sizeof (uint32_t), | ||
| 197 | + (xdrproc_t)xdr_u_int32)) | ||
| 198 | + return (FALSE); | ||
| 199 | + crp->port_ptr = (uint32_t *)(void *)port_ptr; | ||
| 200 | + if (xdr_u_int32(xdrs, &crp->resultslen)) | ||
| 201 | return ((*(crp->xdr_results))(xdrs, crp->results_ptr)); | ||
| 202 | - } | ||
| 203 | return (FALSE); | ||
| 204 | } | ||
| 205 | |||
| 206 | -- | ||
| 207 | 2.40.0 | ||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2025-24528.patch b/meta-oe/recipes-connectivity/krb5/krb5/CVE-2025-24528.patch deleted file mode 100644 index ac6039edf1..0000000000 --- a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2025-24528.patch +++ /dev/null | |||
| @@ -1,68 +0,0 @@ | |||
| 1 | From 78ceba024b64d49612375be4a12d1c066b0bfbd0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Zoltan Borbely <Zoltan.Borbely@morganstanley.com> | ||
| 3 | Date: Tue, 28 Jan 2025 16:39:25 -0500 | ||
| 4 | Subject: [PATCH] Prevent overflow when calculating ulog block size | ||
| 5 | |||
| 6 | In kdb_log.c:resize(), log an error and fail if the update size is | ||
| 7 | larger than the largest possible block size (2^16-1). | ||
| 8 | |||
| 9 | CVE-2025-24528: | ||
| 10 | |||
| 11 | In MIT krb5 release 1.7 and later with incremental propagation | ||
| 12 | enabled, an authenticated attacker can cause kadmind to write beyond | ||
| 13 | the end of the mapped region for the iprop log file, likely causing a | ||
| 14 | process crash. | ||
| 15 | |||
| 16 | [ghudson@mit.edu: edited commit message and added CVE description] | ||
| 17 | |||
| 18 | ticket: 9159 (new) | ||
| 19 | tags: pullup | ||
| 20 | target_version: 1.21-next | ||
| 21 | |||
| 22 | CVE: CVE-2025-24528 | ||
| 23 | |||
| 24 | Upstream-Status: Backport [https://github.com/krb5/krb5/commit/78ceba024b64d49612375be4a12d1c066b0bfbd0] | ||
| 25 | |||
| 26 | Signed-off-by: Divya Chellam <divya.chellam@windriver.com> | ||
| 27 | --- | ||
| 28 | src/lib/kdb/kdb_log.c | 10 ++++++++-- | ||
| 29 | 1 file changed, 8 insertions(+), 2 deletions(-) | ||
| 30 | |||
| 31 | diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c | ||
| 32 | index 2659a25..68fae91 100644 | ||
| 33 | --- a/src/lib/kdb/kdb_log.c | ||
| 34 | +++ b/src/lib/kdb/kdb_log.c | ||
| 35 | @@ -183,7 +183,7 @@ extend_file_to(int fd, unsigned int new_size) | ||
| 36 | */ | ||
| 37 | static krb5_error_code | ||
| 38 | resize(kdb_hlog_t *ulog, uint32_t ulogentries, int ulogfd, | ||
| 39 | - unsigned int recsize) | ||
| 40 | + unsigned int recsize, const kdb_incr_update_t *upd) | ||
| 41 | { | ||
| 42 | unsigned int new_block, new_size; | ||
| 43 | |||
| 44 | @@ -195,6 +195,12 @@ resize(kdb_hlog_t *ulog, uint32_t ulogentries, int ulogfd, | ||
| 45 | new_block *= ULOG_BLOCK; | ||
| 46 | new_size += ulogentries * new_block; | ||
| 47 | |||
| 48 | + if (new_block > UINT16_MAX) { | ||
| 49 | + syslog(LOG_ERR, _("ulog overflow caused by principal %.*s"), | ||
| 50 | + upd->kdb_princ_name.utf8str_t_len, | ||
| 51 | + upd->kdb_princ_name.utf8str_t_val); | ||
| 52 | + return KRB5_LOG_ERROR; | ||
| 53 | + } | ||
| 54 | if (new_size > MAXLOGLEN) | ||
| 55 | return KRB5_LOG_ERROR; | ||
| 56 | |||
| 57 | @@ -291,7 +297,7 @@ store_update(kdb_log_context *log_ctx, kdb_incr_update_t *upd) | ||
| 58 | recsize = sizeof(kdb_ent_header_t) + upd_size; | ||
| 59 | |||
| 60 | if (recsize > ulog->kdb_block) { | ||
| 61 | - retval = resize(ulog, ulogentries, log_ctx->ulogfd, recsize); | ||
| 62 | + retval = resize(ulog, ulogentries, log_ctx->ulogfd, recsize, upd); | ||
| 63 | if (retval) | ||
| 64 | return retval; | ||
| 65 | } | ||
| 66 | -- | ||
| 67 | 2.40.0 | ||
| 68 | |||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/fix-strchr-conformance-to-C23.patch b/meta-oe/recipes-connectivity/krb5/krb5/fix-strchr-conformance-to-C23.patch new file mode 100644 index 0000000000..0cc50d2fdb --- /dev/null +++ b/meta-oe/recipes-connectivity/krb5/krb5/fix-strchr-conformance-to-C23.patch | |||
| @@ -0,0 +1,191 @@ | |||
| 1 | From cf3fcbb7ad5f3ffd78eb7dd4ecbc96c98ad15208 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Bokovoy <abokovoy@redhat.com> | ||
| 3 | Date: Wed, 10 Dec 2025 10:42:02 +0200 | ||
| 4 | Subject: [PATCH] Fix strchr() conformance to C23 | ||
| 5 | |||
| 6 | C23 7.28.5.1 specifies search functions such as strchr() as generic, | ||
| 7 | returning const char * if the first argument is of type const char *. | ||
| 8 | Fix uses of strchr() to conform to this change. | ||
| 9 | |||
| 10 | [jrische@redhat.com: altered changes to avoid casts; fixed an | ||
| 11 | additional case] | ||
| 12 | [ghudson@mit.edu: condensed some declarations; rewrote commit message] | ||
| 13 | |||
| 14 | ticket: 9191 (new) | ||
| 15 | |||
| 16 | Signed-off-by: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com> | ||
| 17 | Upstream-Status: Backport [https://github.com/krb5/krb5/commit/ad4dcf1856dadc4b352b5c8ff08e51c7290fb41f] | ||
| 18 | --- | ||
| 19 | src/lib/krb5/ccache/ccbase.c | 4 ++-- | ||
| 20 | src/lib/krb5/os/expand_path.c | 3 ++- | ||
| 21 | src/lib/krb5/os/locate_kdc.c | 15 +++++++-------- | ||
| 22 | src/plugins/preauth/pkinit/pkinit_crypto.h | 2 +- | ||
| 23 | src/preauth/pkinit/pkinit_crypto_openssl.c | 6 +++--- | ||
| 24 | src/plugins/preauth/pkinit/pkinit_identity.c | 2 +- | ||
| 25 | src/plugins/preauth/pkinit/pkinit_matching.c | 2 +- | ||
| 26 | src/tests/responder.c | 3 +-- | ||
| 27 | 8 files changed, 18 insertions(+), 19 deletions(-) | ||
| 28 | |||
| 29 | diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c | ||
| 30 | index 696b681..30a0a41 100644 | ||
| 31 | --- a/src/lib/krb5/ccache/ccbase.c | ||
| 32 | +++ b/src/lib/krb5/ccache/ccbase.c | ||
| 33 | @@ -201,8 +201,8 @@ krb5_cc_register(krb5_context context, const krb5_cc_ops *ops, | ||
| 34 | krb5_error_code KRB5_CALLCONV | ||
| 35 | krb5_cc_resolve (krb5_context context, const char *name, krb5_ccache *cache) | ||
| 36 | { | ||
| 37 | - char *pfx, *cp; | ||
| 38 | - const char *resid; | ||
| 39 | + char *pfx; | ||
| 40 | + const char *cp, *resid; | ||
| 41 | unsigned int pfxlen; | ||
| 42 | krb5_error_code err; | ||
| 43 | const krb5_cc_ops *ops; | ||
| 44 | diff --git a/src/lib/krb5/os/expand_path.c b/src/lib/krb5/os/expand_path.c | ||
| 45 | index 5cbccf0..6569b88 100644 | ||
| 46 | --- a/src/lib/krb5/os/expand_path.c | ||
| 47 | +++ b/src/lib/krb5/os/expand_path.c | ||
| 48 | @@ -454,7 +454,8 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in, | ||
| 49 | { | ||
| 50 | krb5_error_code ret; | ||
| 51 | struct k5buf buf; | ||
| 52 | - char *tok_begin, *tok_end, *tok_val, **extra_tokens = NULL, *path; | ||
| 53 | + const char *tok_begin, *tok_end; | ||
| 54 | + char *tok_val, **extra_tokens = NULL, *path; | ||
| 55 | const char *path_left; | ||
| 56 | size_t nargs = 0, i; | ||
| 57 | va_list ap; | ||
| 58 | diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c | ||
| 59 | index d1df04a..6559465 100644 | ||
| 60 | --- a/src/lib/krb5/os/locate_kdc.c | ||
| 61 | +++ b/src/lib/krb5/os/locate_kdc.c | ||
| 62 | @@ -214,8 +214,8 @@ oom: | ||
| 63 | } | ||
| 64 | |||
| 65 | static void | ||
| 66 | -parse_uri_if_https(const char *host_or_uri, k5_transport *transport, | ||
| 67 | - const char **host, const char **uri_path) | ||
| 68 | +parse_uri_if_https(char *host_or_uri, k5_transport *transport, | ||
| 69 | + char **host, const char **uri_path) | ||
| 70 | { | ||
| 71 | char *cp; | ||
| 72 | |||
| 73 | @@ -257,8 +257,7 @@ locate_srv_conf_1(krb5_context context, const krb5_data *realm, | ||
| 74 | k5_transport transport, int udpport) | ||
| 75 | { | ||
| 76 | const char *realm_srv_names[4]; | ||
| 77 | - char **hostlist = NULL, *realmstr = NULL, *host = NULL; | ||
| 78 | - const char *hostspec; | ||
| 79 | + char **hostlist = NULL, *realmstr = NULL, *host = NULL, *hostspec; | ||
| 80 | krb5_error_code code; | ||
| 81 | size_t i; | ||
| 82 | int default_port; | ||
| 83 | @@ -587,8 +586,8 @@ prof_locate_server(krb5_context context, const krb5_data *realm, | ||
| 84 | * Return a NULL *host_out if there are any problems parsing the URI. | ||
| 85 | */ | ||
| 86 | static void | ||
| 87 | -parse_uri_fields(const char *uri, k5_transport *transport_out, | ||
| 88 | - const char **host_out, int *primary_out) | ||
| 89 | +parse_uri_fields(char *uri, k5_transport *transport_out, | ||
| 90 | + char **host_out, int *primary_out) | ||
| 91 | |||
| 92 | { | ||
| 93 | k5_transport transport; | ||
| 94 | @@ -656,8 +655,8 @@ locate_uri(krb5_context context, const krb5_data *realm, | ||
| 95 | krb5_error_code ret; | ||
| 96 | k5_transport transport, host_trans; | ||
| 97 | struct srv_dns_entry *answers, *entry; | ||
| 98 | - char *host, *sitename; | ||
| 99 | - const char *host_field, *path; | ||
| 100 | + char *host, *sitename, *host_field; | ||
| 101 | + const char *path; | ||
| 102 | int port, def_port, primary; | ||
| 103 | |||
| 104 | ret = get_sitename(context, realm, &sitename); | ||
| 105 | diff --git a/src/plugins/preauth/pkinit/pkinit_crypto.h b/src/plugins/preauth/pkinit/pkinit_crypto.h | ||
| 106 | index 57bb3cb..be2d02c 100644 | ||
| 107 | --- a/src/plugins/preauth/pkinit/pkinit_crypto.h | ||
| 108 | +++ b/src/plugins/preauth/pkinit/pkinit_crypto.h | ||
| 109 | @@ -440,7 +440,7 @@ krb5_error_code crypto_load_cas_and_crls | ||
| 110 | defines the storage type (file, directory, etc) */ | ||
| 111 | int catype, /* IN | ||
| 112 | defines the ca type (anchor, intermediate, crls) */ | ||
| 113 | - char *id); /* IN | ||
| 114 | + const char *id); /* IN | ||
| 115 | defines the location (filename, directory name, etc) */ | ||
| 116 | |||
| 117 | /* | ||
| 118 | diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | ||
| 119 | index f222dbd..0a731a8 100644 | ||
| 120 | --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | ||
| 121 | +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | ||
| 122 | @@ -4999,7 +4999,7 @@ load_cas_and_crls(krb5_context context, | ||
| 123 | pkinit_req_crypto_context req_cryptoctx, | ||
| 124 | pkinit_identity_crypto_context id_cryptoctx, | ||
| 125 | int catype, | ||
| 126 | - char *filename) | ||
| 127 | + const char *filename) | ||
| 128 | { | ||
| 129 | STACK_OF(X509_INFO) *sk = NULL; | ||
| 130 | STACK_OF(X509) *ca_certs = NULL; | ||
| 131 | @@ -5157,7 +5157,7 @@ load_cas_and_crls_dir(krb5_context context, | ||
| 132 | pkinit_req_crypto_context req_cryptoctx, | ||
| 133 | pkinit_identity_crypto_context id_cryptoctx, | ||
| 134 | int catype, | ||
| 135 | - char *dirname) | ||
| 136 | + const char *dirname) | ||
| 137 | { | ||
| 138 | krb5_error_code retval = EINVAL; | ||
| 139 | char **fnames = NULL, *filename; | ||
| 140 | @@ -5201,7 +5201,7 @@ crypto_load_cas_and_crls(krb5_context context, | ||
| 141 | pkinit_identity_crypto_context id_cryptoctx, | ||
| 142 | int idtype, | ||
| 143 | int catype, | ||
| 144 | - char *id) | ||
| 145 | + const char *id) | ||
| 146 | { | ||
| 147 | switch (idtype) { | ||
| 148 | case IDTYPE_FILE: | ||
| 149 | diff --git a/src/plugins/preauth/pkinit/pkinit_identity.c b/src/plugins/preauth/pkinit/pkinit_identity.c | ||
| 150 | index 0dcfcfc..ad65f23 100644 | ||
| 151 | --- a/src/plugins/preauth/pkinit/pkinit_identity.c | ||
| 152 | +++ b/src/plugins/preauth/pkinit/pkinit_identity.c | ||
| 153 | @@ -473,7 +473,7 @@ process_option_ca_crl(krb5_context context, | ||
| 154 | const char *value, | ||
| 155 | int catype) | ||
| 156 | { | ||
| 157 | - char *residual; | ||
| 158 | + const char *residual; | ||
| 159 | unsigned int typelen; | ||
| 160 | int idtype; | ||
| 161 | |||
| 162 | diff --git a/src/plugins/preauth/pkinit/pkinit_matching.c b/src/plugins/preauth/pkinit/pkinit_matching.c | ||
| 163 | index 0ea072c..b3c8df1 100644 | ||
| 164 | --- a/src/plugins/preauth/pkinit/pkinit_matching.c | ||
| 165 | +++ b/src/plugins/preauth/pkinit/pkinit_matching.c | ||
| 166 | @@ -262,7 +262,7 @@ parse_rule_component(krb5_context context, | ||
| 167 | char err_buf[128]; | ||
| 168 | int ret; | ||
| 169 | struct keyword_desc *kw, *nextkw; | ||
| 170 | - char *nk; | ||
| 171 | + const char *nk; | ||
| 172 | int found_next_kw = 0; | ||
| 173 | char *value = NULL; | ||
| 174 | size_t len; | ||
| 175 | diff --git a/src/tests/responder.c b/src/tests/responder.c | ||
| 176 | index 82f870e..4221a20 100644 | ||
| 177 | --- a/src/tests/responder.c | ||
| 178 | +++ b/src/tests/responder.c | ||
| 179 | @@ -282,8 +282,7 @@ responder(krb5_context ctx, void *rawdata, krb5_responder_context rctx) | ||
| 180 | /* Provide a particular response for an OTP challenge. */ | ||
| 181 | if (data->otp_answer != NULL) { | ||
| 182 | if (krb5_responder_otp_get_challenge(ctx, rctx, &ochl) == 0) { | ||
| 183 | - key = strchr(data->otp_answer, '='); | ||
| 184 | - if (key != NULL) { | ||
| 185 | + if (strchr(data->otp_answer, '=') != NULL) { | ||
| 186 | /* Make a copy of the answer that we can chop up. */ | ||
| 187 | key = strdup(data->otp_answer); | ||
| 188 | if (key == NULL) | ||
| 189 | -- | ||
| 190 | 2.34.1 | ||
| 191 | |||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.21.3.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb index c042dba5a7..5d8ab2dc01 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.21.3.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb | |||
| @@ -14,16 +14,14 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n | |||
| 14 | HOMEPAGE = "http://web.mit.edu/Kerberos/" | 14 | HOMEPAGE = "http://web.mit.edu/Kerberos/" |
| 15 | SECTION = "console/network" | 15 | SECTION = "console/network" |
| 16 | LICENSE = "MIT" | 16 | LICENSE = "MIT" |
| 17 | LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=71c06694263581762668e88b7b77a1a5" | 17 | LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=c1deab93872560046ba4411e77050d24" |
| 18 | 18 | ||
| 19 | inherit autotools-brokensep binconfig perlnative systemd update-rc.d pkgconfig | 19 | inherit autotools-brokensep binconfig perlnative systemd update-rc.d pkgconfig |
| 20 | 20 | ||
| 21 | SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 21 | SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
| 22 | SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ | 22 | SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ |
| 23 | file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \ | 23 | file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \ |
| 24 | file://0001-Eliminate-old-style-function-declarations.patch;patchdir=.. \ | 24 | file://fix-strchr-conformance-to-C23.patch;striplevel=2 \ |
| 25 | file://0001-Fix-more-non-prototype-functions.patch;patchdir=.. \ | ||
| 26 | file://0002-Avoid-strict-prototype-compiler-errors.patch;patchdir=.. \ | ||
| 27 | file://crosscompile_nm.patch \ | 25 | file://crosscompile_nm.patch \ |
| 28 | file://etc/init.d/krb5-kdc \ | 26 | file://etc/init.d/krb5-kdc \ |
| 29 | file://etc/init.d/krb5-admin-server \ | 27 | file://etc/init.d/krb5-admin-server \ |
| @@ -31,11 +29,9 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ | |||
| 31 | file://etc/default/krb5-admin-server \ | 29 | file://etc/default/krb5-admin-server \ |
| 32 | file://krb5-kdc.service \ | 30 | file://krb5-kdc.service \ |
| 33 | file://krb5-admin-server.service \ | 31 | file://krb5-admin-server.service \ |
| 34 | file://CVE-2024-26458_CVE-2024-26461.patch;striplevel=2 \ | ||
| 35 | file://CVE-2025-24528.patch;striplevel=2 \ | ||
| 36 | " | 32 | " |
| 37 | 33 | ||
| 38 | SRC_URI[sha256sum] = "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35" | 34 | SRC_URI[sha256sum] = "3243ffbc8ea4d4ac22ddc7dd2a1dc54c57874c40648b60ff97009763554eaf13" |
| 39 | 35 | ||
| 40 | CVE_PRODUCT = "kerberos" | 36 | CVE_PRODUCT = "kerberos" |
| 41 | CVE_VERSION = "5-${PV}" | 37 | CVE_VERSION = "5-${PV}" |
| @@ -156,7 +152,7 @@ FILES:${PN}-kdc = "${libdir}/krb5/plugins/kdb/db2.so \ | |||
| 156 | ${sysconfdir}/tmpfiles.d/krb5.conf \ | 152 | ${sysconfdir}/tmpfiles.d/krb5.conf \ |
| 157 | ${systemd_system_unitdir}/krb5-kdc.service" | 153 | ${systemd_system_unitdir}/krb5-kdc.service" |
| 158 | 154 | ||
| 159 | FILES:${PN}-kdc-ldap = "${libdir}/krb5/libkdb_ldap${SOLIBS} \ | 155 | FILES:${PN}-kdc-ldap = "${libdir}/libkdb_ldap${SOLIBS} \ |
| 160 | ${libdir}/krb5/plugins/kdb/kldap.so \ | 156 | ${libdir}/krb5/plugins/kdb/kldap.so \ |
| 161 | ${sbindir}/kdb5_ldap_util" | 157 | ${sbindir}/kdb5_ldap_util" |
| 162 | 158 | ||
diff --git a/meta-oe/recipes-connectivity/libcppconnman/libcppconnman_git.bb b/meta-oe/recipes-connectivity/libcppconnman/libcppconnman_git.bb new file mode 100644 index 0000000000..daa32a8d48 --- /dev/null +++ b/meta-oe/recipes-connectivity/libcppconnman/libcppconnman_git.bb | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | SUMMARY = "Amarula libcppconnman library" | ||
| 2 | LICENSE = "LGPL-2.1-or-later" | ||
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a87a7059d580c45495c1218f53e3610d" | ||
| 4 | |||
| 5 | SECTION = "libs" | ||
| 6 | |||
| 7 | SRC_URI = "git://github.com/amarula/libcppconnman.git;protocol=https;branch=main" | ||
| 8 | SRCREV = "d89262c2cd7336da8ba9eb06228d422847fe4b20" | ||
| 9 | |||
| 10 | inherit cmake pkgconfig | ||
| 11 | |||
| 12 | DEPENDS += "glib-2.0" | ||
| 13 | |||
| 14 | EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DBUILD_CONNMAN=ON" | ||
| 15 | |||
| 16 | # LICENSE file | ||
| 17 | FILES:${PN} += "${datadir}/Amarula" | ||
diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice/0001-include-unistd.h-for-usleep.patch b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice/0001-include-unistd.h-for-usleep.patch deleted file mode 100644 index 424a203e56..0000000000 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice/0001-include-unistd.h-for-usleep.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 6cb8069cfe08114f1dc7b50a7fcd4dc040cd1bbb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 9 May 2023 20:19:23 -0700 | ||
| 4 | Subject: [PATCH] include unistd.h for usleep() | ||
| 5 | |||
| 6 | clang16 flags the missing header | ||
| 7 | |||
| 8 | Fixes | ||
| 9 | ../../git/tools/idevicedevmodectl.c:363:2: error: call to undeclared function 'usleep'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] | ||
| 10 | |||
| 11 | Upstream-Status: Submitted [https://github.com/libimobiledevice/libimobiledevice/pull/1444] | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | tools/idevicedevmodectl.c | 1 + | ||
| 15 | 1 file changed, 1 insertion(+) | ||
| 16 | |||
| 17 | diff --git a/tools/idevicedevmodectl.c b/tools/idevicedevmodectl.c | ||
| 18 | index 739bc13..9fe8d6a 100644 | ||
| 19 | --- a/tools/idevicedevmodectl.c | ||
| 20 | +++ b/tools/idevicedevmodectl.c | ||
| 21 | @@ -34,6 +34,7 @@ | ||
| 22 | #ifndef WIN32 | ||
| 23 | #include <signal.h> | ||
| 24 | #endif | ||
| 25 | +#include <unistd.h> | ||
| 26 | |||
| 27 | #ifdef WIN32 | ||
| 28 | #include <windows.h> | ||
| 29 | -- | ||
| 30 | 2.40.1 | ||
| 31 | |||
diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.4.0.bb index 3c93c9a37b..eeae93e261 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.4.0.bb | |||
| @@ -6,13 +6,10 @@ LIC_FILES_CHKSUM = "\ | |||
| 6 | " | 6 | " |
| 7 | HOMEPAGE = "http://www.libimobiledevice.org/" | 7 | HOMEPAGE = "http://www.libimobiledevice.org/" |
| 8 | 8 | ||
| 9 | DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt libimobiledevice-glue openssl" | 9 | DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt libimobiledevice-glue openssl libtatsu" |
| 10 | 10 | ||
| 11 | PV = "1.3.0+git" | 11 | SRCREV = "149f7623c672c1fa73122c7119a12bfc0012f2ac" |
| 12 | 12 | SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master;tag=${PV}" | |
| 13 | SRCREV = "860ffb707af3af94467d2ece4ad258dda957c6cd" | ||
| 14 | SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master \ | ||
| 15 | file://0001-include-unistd.h-for-usleep.patch" | ||
| 16 | 13 | ||
| 17 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
| 18 | 15 | ||
diff --git a/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.10.bb b/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.11.bb index 6bfcbec25f..ca3fe2c8ee 100644 --- a/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.10.bb +++ b/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.11.bb | |||
| @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8b6cb42d66e6b3c47a909c3ce678a7b" | |||
| 6 | 6 | ||
| 7 | DEPENDS = "boost openssl" | 7 | DEPENDS = "boost openssl" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/arvidn/libtorrent.git;branch=master;protocol=https \ | 9 | SRC_URI = "git://github.com/arvidn/libtorrent.git;branch=master;protocol=https;tag=v${PV} \ |
| 10 | git://github.com/arvidn/try_signal.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/try_signal;name=try_signal" | 10 | git://github.com/arvidn/try_signal.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/try_signal;name=try_signal" |
| 11 | 11 | ||
| 12 | SRCREV = "74bc93a37a5e31c78f0aa02037a68fb9ac5deb41" | 12 | SRCREV = "9d7443f467147d1784fb7516d2a882db1abb5a8b" |
| 13 | SRCREV_try_signal = "105cce59972f925a33aa6b1c3109e4cd3caf583d" | 13 | SRCREV_try_signal = "105cce59972f925a33aa6b1c3109e4cd3caf583d" |
| 14 | SRCREV_FORMAT .= "_try_signal" | 14 | SRCREV_FORMAT .= "_try_signal" |
| 15 | 15 | ||
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.6.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.7.bb index 63f2bfccaa..315df3f854 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.6.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.7.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | |||
| 7 | DEPENDS = "zlib curl libsigc++-2.0 openssl cppunit" | 7 | DEPENDS = "zlib curl libsigc++-2.0 openssl cppunit" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https;tag=v${PV}" | 9 | SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https;tag=v${PV}" |
| 10 | SRCREV = "ecb3b6bb6ecb38c19da2d6bb899a23638cb7fa04" | 10 | SRCREV = "336c16c017309a694b9e0b420c9063d016bd83ee" |
| 11 | 11 | ||
| 12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
| 13 | 13 | ||
diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.5.2.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.5.7.bb index 35545aacee..9c7c60742d 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.5.2.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.5.7.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b5d391cc7929bcba238f9ba6805f7574" | |||
| 6 | DEPENDS = "zlib" | 6 | DEPENDS = "zlib" |
| 7 | DEPENDS:append:class-native = " libcap-native" | 7 | DEPENDS:append:class-native = " libcap-native" |
| 8 | 8 | ||
| 9 | SRCREV = "85c6f7959fd40d8aaf7a50be3c9b75f08389a01c" | 9 | SRCREV = "94b9bdbfec2a89464505fc8cc379f33d4e334018" |
| 10 | SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.5-stable;tag=v${PV}" | 10 | SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.5-stable;tag=v${PV}" |
| 11 | 11 | ||
| 12 | UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" | 12 | UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" |
diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.24.2.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.24.2.bb index db42c00a92..4e16436c98 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.24.2.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.24.2.bb | |||
| @@ -37,9 +37,8 @@ PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" | |||
| 37 | 37 | ||
| 38 | inherit upstream-version-is-even ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} | 38 | inherit upstream-version-is-even ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} |
| 39 | 39 | ||
| 40 | EXTRA_OEMESON = " \ | 40 | EXTRA_OEMESON += " \ |
| 41 | -Dudevdir=${nonarch_base_libdir}/udev \ | 41 | -Dudevdir=${nonarch_base_libdir}/udev \ |
| 42 | -Dqrtr=false \ | ||
| 43 | " | 42 | " |
| 44 | 43 | ||
| 45 | FILES:${PN} += " \ | 44 | FILES:${PN} += " \ |
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch deleted file mode 100644 index 4215f698c7..0000000000 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From 02fa96d0d59211e64483273e5253ca45c4395154 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "mark.yang" <mark.yang@lge.com> | ||
| 3 | Date: Wed, 9 Apr 2025 19:05:55 +0900 | ||
| 4 | Subject: [PATCH] Fix build error due to bool keyword with gcc-15 | ||
| 5 | |||
| 6 | * gcc-15 uses gnu23 for c. | ||
| 7 | 'bool' is a keyword. | ||
| 8 | TOPDIR/tmp/work/core2-64-oe-linux/paho-mqtt-c/1.3.14/git/src/MQTTPacket.h:31:22: error: 'bool' cannot be defined via 'typedef' | ||
| 9 | 31 | typedef unsigned int bool; | ||
| 10 | | ^~~~ | ||
| 11 | TOPDIR/tmp/work/core2-64-oe-linux/paho-mqtt-c/1.3.14/git/src/MQTTPacket.h:31:22: note: 'bool' is a keyword with '-std=c23' onwards | ||
| 12 | TOPDIR/tmp/work/core2-64-oe-linux/paho-mqtt-c/1.3.14/git/src/MQTTPacket.h:31:1: warning: useless type name in empty declaration | ||
| 13 | 31 | typedef unsigned int bool; | ||
| 14 | | ^~~~~~~ | ||
| 15 | |||
| 16 | Upstream-Status: Submitted [https://github.com/eclipse-paho/paho.mqtt.c/pull/1595] | ||
| 17 | Signed-off-by: mark.yang <mark.yang@lge.com> | ||
| 18 | Signed-off-by: markyang92 <pllpokko@alumni.kaist.ac.kr> | ||
| 19 | |||
| 20 | --- | ||
| 21 | src/MQTTPacket.h | 2 ++ | ||
| 22 | 1 file changed, 2 insertions(+) | ||
| 23 | |||
| 24 | diff --git a/src/MQTTPacket.h b/src/MQTTPacket.h | ||
| 25 | index fd384ae9..0c64a0f4 100644 | ||
| 26 | --- a/src/MQTTPacket.h | ||
| 27 | +++ b/src/MQTTPacket.h | ||
| 28 | @@ -28,7 +28,9 @@ | ||
| 29 | #include "LinkedList.h" | ||
| 30 | #include "Clients.h" | ||
| 31 | |||
| 32 | +#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L | ||
| 33 | typedef unsigned int bool; | ||
| 34 | +#endif | ||
| 35 | typedef void* (*pf)(int, unsigned char, char*, size_t); | ||
| 36 | |||
| 37 | #include "MQTTProperties.h" | ||
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.14.bb b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.16.bb index ad6637ed88..a3ef667db7 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.14.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.16.bb | |||
| @@ -11,11 +11,10 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
| 14 | git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master \ | 14 | git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master;tag=v${PV} \ |
| 15 | file://0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch \ | ||
| 16 | " | 15 | " |
| 17 | 16 | ||
| 18 | SRCREV = "2150ba29d9df24ad1733c460eb099f292af84ee5" | 17 | SRCREV = "4a939ddb01eea581a32fd6f0adcfee51b91d2601" |
| 19 | 18 | ||
| 20 | DEPENDS = "openssl" | 19 | DEPENDS = "openssl" |
| 21 | 20 | ||
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.6.0.bb index 5b4aed3001..53c1d5770b 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.6.0.bb | |||
| @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=master;tag=v${PV}" | 13 | SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=master;tag=v${PV}" |
| 14 | SRCREV = "17ff3dc0270738adc710667be44847eebc038ae0" | 14 | SRCREV = "c0b43a49d7b7e7b5e7009658ca22f19ac1112c83" |
| 15 | 15 | ||
| 16 | DEPENDS = "openssl paho-mqtt-c" | 16 | DEPENDS = "openssl paho-mqtt-c" |
| 17 | 17 | ||
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.6.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.7.bb index 9f0666f2bb..0ec048dcf5 100644 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.6.bb +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.7.bb | |||
| @@ -7,7 +7,7 @@ DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurse | |||
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https;tag=v${PV}" | 8 | SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https;tag=v${PV}" |
| 9 | 9 | ||
| 10 | SRCREV = "ae14baa357aafd072de6f57f005cde4eb75e7dda" | 10 | SRCREV = "7ead88448b8068c6737a975604884f96f6ae498c" |
| 11 | 11 | ||
| 12 | inherit autotools pkgconfig | 12 | inherit autotools pkgconfig |
| 13 | 13 | ||
diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.6.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.7.bb index 56ade35bc7..db442e41dc 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.6.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.7.bb | |||
| @@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz \ | |||
| 11 | file://ser2net.service \ | 11 | file://ser2net.service \ |
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRC_URI[sha256sum] = "a468073c7bf8166c78c61d30bba487916dc4088e98f96e190b37ea8100a94fd4" | 14 | SRC_URI[sha256sum] = "6b921bc7efb1b9a8a78268d63332701902cc1c8dbac51842d46ede6ffb5fa2a4" |
| 15 | 15 | ||
| 16 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" | 16 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" |
| 17 | 17 | ||
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch b/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch deleted file mode 100644 index a08366a36d..0000000000 --- a/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | From a18ae078a32e08a7193d0bae20190060bd1e8b85 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yat Ho <lagoho7@gmail.com> | ||
| 3 | Date: Thu, 1 May 2025 09:14:19 +0800 | ||
| 4 | Subject: [PATCH] build: bump CMake version to 3.10 (#4) | ||
| 5 | |||
| 6 | CMake < 3.5 compatibility has been removed from CMake 4.0 and CMake < 3.10 compatibility has been deprecated in CMake 3.31. | ||
| 7 | |||
| 8 | https://cmake.org/cmake/help/latest/release/4.0.html | ||
| 9 | https://cmake.org/cmake/help/latest/release/3.31.html | ||
| 10 | |||
| 11 | Upstream-Status: Backport [https://github.com/transmission/dht/commit/38c9f261d9b58b76b9eaf85f84ec1b35151a1eac] | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | CMakeLists.txt | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 18 | index 6d4aa99..596dbfb 100644 | ||
| 19 | --- a/CMakeLists.txt | ||
| 20 | +++ b/CMakeLists.txt | ||
| 21 | @@ -1,4 +1,4 @@ | ||
| 22 | -cmake_minimum_required(VERSION 2.8) | ||
| 23 | +cmake_minimum_required(VERSION 3.10) | ||
| 24 | project(dht C) | ||
| 25 | |||
| 26 | add_library(${PROJECT_NAME} STATIC | ||
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch b/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch deleted file mode 100644 index 887bc21114..0000000000 --- a/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 9c5ed3204bdb722b5624f6b9dbfba240a50b336c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: fanquake <fanquake@gmail.com> | ||
| 3 | Date: Fri, 12 Jan 2024 10:25:27 +0000 | ||
| 4 | Subject: [PATCH] build: set minimum required CMake to 3.5 | ||
| 5 | |||
| 6 | Avoids: | ||
| 7 | ```bash | ||
| 8 | CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required): | ||
| 9 | Compatibility with CMake < 3.5 will be removed from a future version of | ||
| 10 | CMake. | ||
| 11 | |||
| 12 | Update the VERSION argument <min> value or use a ...<max> suffix to tell | ||
| 13 | CMake that the project does not need compatibility with older versions. | ||
| 14 | ``` | ||
| 15 | |||
| 16 | Upstream-Status: Backport [https://github.com/miniupnp/libnatpmp/pull/43] | ||
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 18 | --- | ||
| 19 | CMakeLists.txt | 2 +- | ||
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 21 | |||
| 22 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 23 | index 3034df8..e7cffe5 100644 | ||
| 24 | --- a/CMakeLists.txt | ||
| 25 | +++ b/CMakeLists.txt | ||
| 26 | @@ -1,4 +1,4 @@ | ||
| 27 | -cmake_minimum_required(VERSION 2.8) | ||
| 28 | +cmake_minimum_required(VERSION 3.5) | ||
| 29 | project(natpmp C) | ||
| 30 | |||
| 31 | add_definitions(-DNATPMP_STATICLIB -DENABLE_STRNATPMPERR) | ||
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch b/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch deleted file mode 100644 index 1714ad1b99..0000000000 --- a/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | From aa19cb131c953e4520be5284d86964f371ee059f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yat Ho <lagoho7@gmail.com> | ||
| 3 | Date: Mon, 13 May 2024 16:21:28 +0800 | ||
| 4 | Subject: [PATCH] miniupnpc: bump CMake version to 3.14 | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://github.com/transmission/miniupnpc/commit/e7b0fa83c313c50a66da76ad6fb446e5bfdb482f] | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- | ||
| 9 | CMakeLists.txt | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 13 | index 0a53e27..2c713b5 100644 | ||
| 14 | --- a/CMakeLists.txt | ||
| 15 | +++ b/CMakeLists.txt | ||
| 16 | @@ -1,4 +1,4 @@ | ||
| 17 | -cmake_minimum_required (VERSION 2.6) | ||
| 18 | +cmake_minimum_required (VERSION 3.14) | ||
| 19 | |||
| 20 | project (miniupnpc C) | ||
| 21 | set (MINIUPNPC_VERSION 2.0) | ||
diff --git a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb b/meta-oe/recipes-connectivity/transmission/transmission_4.1.0.bb index 518f8653ca..aed1e2e32a 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_4.1.0.bb | |||
| @@ -2,23 +2,20 @@ DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" | |||
| 2 | SECTION = "network" | 2 | SECTION = "network" |
| 3 | HOMEPAGE = "https://transmissionbt.com/" | 3 | HOMEPAGE = "https://transmissionbt.com/" |
| 4 | LICENSE = "MIT & GPL-2.0-only" | 4 | LICENSE = "MIT & GPL-2.0-only" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d54f298b276b8cc5f20168e43a0e8103" |
| 6 | 6 | ||
| 7 | DEPENDS = "curl libevent libpsl gnutls openssl libtool intltool-native glib-2.0-native" | 7 | DEPENDS = "curl libevent libpsl gnutls openssl libtool intltool-native glib-2.0-native" |
| 8 | RDEPENDS:${PN}-web = "${PN}" | 8 | RDEPENDS:${PN}-web = "${PN}" |
| 9 | 9 | ||
| 10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
| 11 | gitsm://github.com/transmission/transmission;branch=4.0.x;protocol=https \ | 11 | gitsm://github.com/transmission/transmission;branch=4.1.x;protocol=https;tag=${PV} \ |
| 12 | file://0001-build-bump-CMake-version-to-3.10-4.patch;patchdir=third-party/dht \ | ||
| 13 | file://0001-bump-cmake-to-3.10.patch;patchdir=third-party/libb64 \ | 12 | file://0001-bump-cmake-to-3.10.patch;patchdir=third-party/libb64 \ |
| 14 | file://0001-Increase-minimum-CMake-version-to-3.10.patch;patchdir=third-party/libdeflate \ | 13 | file://0001-Increase-minimum-CMake-version-to-3.10.patch;patchdir=third-party/libdeflate \ |
| 15 | file://0001-miniupnpc-bump-CMake-version-to-3.14.patch;patchdir=third-party/miniupnpc \ | ||
| 16 | file://0001-build-set-minimum-required-CMake-to-3.5.patch;patchdir=third-party/libnatpmp \ | ||
| 17 | file://transmission-daemon \ | 14 | file://transmission-daemon \ |
| 18 | " | 15 | " |
| 19 | 16 | ||
| 20 | # Transmission release 4.0.6 | 17 | # Transmission release 4.1.0 |
| 21 | SRCREV = "38c164933e9f77c110b48fe745861c3b98e3d83e" | 18 | SRCREV = "272401184f0736e6063f9da90be7d037e907508a" |
| 22 | 19 | ||
| 23 | 20 | ||
| 24 | inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg | 21 | inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg |
| @@ -45,9 +42,9 @@ do_install:append() { | |||
| 45 | fi | 42 | fi |
| 46 | 43 | ||
| 47 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 44 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
| 48 | sed -i '/User=/c\User=${TRANSMISSION_USER}' ${S}/daemon/transmission-daemon.service | 45 | sed -i '/User=/c\User=${TRANSMISSION_USER}' ${B}/daemon/transmission-daemon.service |
| 49 | install -d ${D}${systemd_unitdir}/system | 46 | install -d ${D}${systemd_unitdir}/system |
| 50 | install -m 0644 ${S}/daemon/transmission-daemon.service ${D}${systemd_unitdir}/system | 47 | install -m 0644 ${B}/daemon/transmission-daemon.service ${D}${systemd_unitdir}/system |
| 51 | fi | 48 | fi |
| 52 | } | 49 | } |
| 53 | 50 | ||
diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.19.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.23.bb index 28e4cc4eb0..1cbe9ed9b0 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.19.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.23.bb | |||
| @@ -27,7 +27,7 @@ SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/7.0/${BPN}-${PV}.tar.gz | |||
| 27 | file://0001-Fix-configure.ac.patch \ | 27 | file://0001-Fix-configure.ac.patch \ |
| 28 | file://zabbix-agent.service \ | 28 | file://zabbix-agent.service \ |
| 29 | " | 29 | " |
| 30 | SRC_URI[sha256sum] = "30bef0173493b199377c9061b34e8a2e16a28eb0d6f7e9c7b942433e4b75367f" | 30 | SRC_URI[sha256sum] = "43ea5fcb1e5db25e74bdc83ea8936d79b8093b614af4e889417485bc74f061e2" |
| 31 | 31 | ||
| 32 | inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd | 32 | inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd |
| 33 | 33 | ||
| @@ -75,3 +75,5 @@ do_install:append() { | |||
| 75 | FILES:${PN} += "${libdir}" | 75 | FILES:${PN} += "${libdir}" |
| 76 | 76 | ||
| 77 | RDEPENDS:${PN} = "logrotate" | 77 | RDEPENDS:${PN} = "logrotate" |
| 78 | |||
| 79 | CVE_STATUS[CVE-2026-23925] = "fixed-version: fixed since 7.0.18" | ||
diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.6.0.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.6.1.bb index cfa476cd1c..bedd379e89 100644 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.6.0.bb +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.6.1.bb | |||
| @@ -6,7 +6,7 @@ LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https;tag=${PV}" | 8 | SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https;tag=${PV}" |
| 9 | SRCREV = "b705ad73bef724de0ed33f60462c70b380b6b300" | 9 | SRCREV = "521a3d88bb731b94cc9998a0f711a5ca9e831e04" |
| 10 | 10 | ||
| 11 | DEPENDS = "libsigc++-3" | 11 | DEPENDS = "libsigc++-3" |
| 12 | 12 | ||
diff --git a/meta-oe/recipes-core/emlog/emlog.inc b/meta-oe/recipes-core/emlog/emlog.inc index ff2a106c6e..d51c9723fd 100644 --- a/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-oe/recipes-core/emlog/emlog.inc | |||
| @@ -4,8 +4,7 @@ LICENSE = "GPL-2.0-only" | |||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
| 5 | 5 | ||
| 6 | SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master" | 6 | SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master" |
| 7 | SRC_URI += "file://0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch" | 7 | SRCREV = "a50aae487f689c1abb46b151abc68d6635b9b2fe" |
| 8 | SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca" | ||
| 9 | PV = "0.70+git" | 8 | PV = "0.70+git" |
| 10 | 9 | ||
| 11 | CVE_PRODUCT = "nicupavel:emlog" | 10 | CVE_PRODUCT = "nicupavel:emlog" |
diff --git a/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch b/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch deleted file mode 100644 index 86f719b0bb..0000000000 --- a/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From dca01ea62833249d78ac3bdf277b73424bf93e89 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 14 Dec 2024 09:55:10 -0800 | ||
| 4 | Subject: [PATCH] emlog: Do not use no_llseek with kernel 6.12.0+ | ||
| 5 | |||
| 6 | no_llseek is finally gone with 6.12-rc1 [1] | ||
| 7 | |||
| 8 | [1] https://github.com/torvalds/linux/commit/cb787f4ac0c2e439ea8d7e6387b925f74576bdf8 | ||
| 9 | |||
| 10 | Upstream-Status: Submitted [https://github.com/nicupavel/emlog/pull/16] | ||
| 11 | --- | ||
| 12 | emlog.c | 7 ++++++- | ||
| 13 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/emlog.c b/emlog.c | ||
| 16 | index 2ead738..b45c72d 100644 | ||
| 17 | --- a/emlog.c | ||
| 18 | +++ b/emlog.c | ||
| 19 | @@ -464,7 +464,12 @@ static const struct file_operations emlog_fops = { | ||
| 20 | .open = emlog_open, | ||
| 21 | .release = emlog_release, | ||
| 22 | .poll = emlog_poll, | ||
| 23 | - .llseek = no_llseek, /* no_llseek by default introduced at v2.6.37-rc1 */ | ||
| 24 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) | ||
| 25 | + /* no_llseek by default introduced at v2.6.37-rc1 and | ||
| 26 | + * removed in 6.12.0 | ||
| 27 | + */ | ||
| 28 | + .llseek = no_llseek, | ||
| 29 | +#endif | ||
| 30 | .owner = THIS_MODULE, | ||
| 31 | }; | ||
| 32 | |||
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.86.0.bb index 48a1a2a624..b0c83f7eba 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.86.0.bb | |||
| @@ -2,8 +2,8 @@ SUMMARY = "C++ bindings for the glib library" | |||
| 2 | HOMEPAGE = "http://www.gtkmm.org/" | 2 | HOMEPAGE = "http://www.gtkmm.org/" |
| 3 | SECTION = "libs" | 3 | SECTION = "libs" |
| 4 | LICENSE = "LGPL-2.1-only & GPL-2.0-only" | 4 | LICENSE = "LGPL-2.1-only & GPL-2.0-only" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \ |
| 6 | file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" | 6 | file://COPYING.tools;md5=570a9b3749dd0463a1778803b12a6dce" |
| 7 | 7 | ||
| 8 | DEPENDS = "mm-common glib-2.0 libsigc++-3 glib-2.0-native" | 8 | DEPENDS = "mm-common glib-2.0 libsigc++-3 glib-2.0-native" |
| 9 | 9 | ||
| @@ -12,7 +12,7 @@ inherit gnomebase | |||
| 12 | 12 | ||
| 13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
| 14 | 14 | ||
| 15 | SRC_URI[archive.sha256sum] = "539b0a29e15a96676c4f0594541250566c5ca44da5d4d87a3732fa2d07909e4a" | 15 | SRC_URI[archive.sha256sum] = "39c0e9f6da046d679390774efdb9ad564436236736dc2f7825e614b2d4087826" |
| 16 | 16 | ||
| 17 | S = "${UNPACKDIR}/${GNOMEBN}-${PV}" | 17 | S = "${UNPACKDIR}/${GNOMEBN}-${PV}" |
| 18 | 18 | ||
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.8.bb index 7c7a3fafb7..e0e52f2032 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.8.bb | |||
| @@ -12,7 +12,7 @@ inherit gnomebase | |||
| 12 | 12 | ||
| 13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
| 14 | 14 | ||
| 15 | SRC_URI[archive.sha256sum] = "fe02c1e5f5825940d82b56b6ec31a12c06c05c1583cfe62f934d0763e1e542b3" | 15 | SRC_URI[archive.sha256sum] = "64f11d3b95a24e2a8d4166ecff518730f79ecc27222ef41faf7c7e0340fc9329" |
| 16 | 16 | ||
| 17 | FILES:${PN} = "${libdir}/lib*.so.*" | 17 | FILES:${PN} = "${libdir}/lib*.so.*" |
| 18 | FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" | 18 | FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" |
diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch b/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch deleted file mode 100644 index c471b098d4..0000000000 --- a/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 469beab0747549599959a30188deb3b27df3a346 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Wed, 2 Apr 2025 11:19:54 +0800 | ||
| 4 | Subject: [PATCH] crypt.h: Remove register keyword | ||
| 5 | |||
| 6 | Fixes: | ||
| 7 | | In file included from /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/test/test_compat.cc:17: | ||
| 8 | | /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/compat/crypt.h:62:9: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] | ||
| 9 | | 62 | register int keyshift = (int)((*(pkeys + 1)) >> 24); | ||
| 10 | | | ^~~~~~~~ | ||
| 11 | | 1 error generated. | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/zlib-ng/minizip-ng/pull/853] | ||
| 14 | |||
| 15 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 16 | --- | ||
| 17 | compat/crypt.h | 2 +- | ||
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/compat/crypt.h b/compat/crypt.h | ||
| 21 | index 41c6454..ccdd83a 100644 | ||
| 22 | --- a/compat/crypt.h | ||
| 23 | +++ b/compat/crypt.h | ||
| 24 | @@ -59,7 +59,7 @@ static int update_keys(unsigned long *pkeys, const z_crc_t *pcrc_32_tab, int c) | ||
| 25 | (*(pkeys + 1)) += (*(pkeys + 0)) & 0xff; | ||
| 26 | (*(pkeys + 1)) = (*(pkeys + 1)) * 134775813L + 1; | ||
| 27 | { | ||
| 28 | - register int keyshift = (int)((*(pkeys + 1)) >> 24); | ||
| 29 | + int keyshift = (int)((*(pkeys + 1)) >> 24); | ||
| 30 | (*(pkeys + 2)) = CRC32((*(pkeys + 2)), keyshift); | ||
| 31 | } | ||
| 32 | return c; | ||
| 33 | -- | ||
| 34 | 2.34.1 | ||
| 35 | |||
diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb index cf98c0cf2e..2e7f438821 100644 --- a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb +++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb | |||
| @@ -7,11 +7,10 @@ LICENSE = "Zlib" | |||
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \ | 9 | SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \ |
| 10 | file://0001-crypt.h-Remove-register-keyword.patch \ | ||
| 11 | file://run-ptest \ | 10 | file://run-ptest \ |
| 12 | " | 11 | " |
| 13 | 12 | ||
| 14 | SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de" | 13 | SRCREV = "f3ed731e27a97e30dffe076ed5e0537daae5c1bd" |
| 15 | 14 | ||
| 16 | 15 | ||
| 17 | RCONFLICTS:${PN} += "minizip" | 16 | RCONFLICTS:${PN} += "minizip" |
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 9b92e7e3d5..0cbe3964c4 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
| @@ -52,6 +52,7 @@ RDEPENDS:packagegroup-meta-oe = "\ | |||
| 52 | 52 | ||
| 53 | RDEPENDS:packagegroup-meta-oe-benchmarks = "\ | 53 | RDEPENDS:packagegroup-meta-oe-benchmarks = "\ |
| 54 | bonnie++ \ | 54 | bonnie++ \ |
| 55 | cpupower \ | ||
| 55 | dbench \ | 56 | dbench \ |
| 56 | dhrystone \ | 57 | dhrystone \ |
| 57 | fio \ | 58 | fio \ |
| @@ -67,6 +68,7 @@ RDEPENDS:packagegroup-meta-oe-benchmarks = "\ | |||
| 67 | nbench-byte \ | 68 | nbench-byte \ |
| 68 | phoronix-test-suite \ | 69 | phoronix-test-suite \ |
| 69 | qperf \ | 70 | qperf \ |
| 71 | rtla \ | ||
| 70 | s-suite \ | 72 | s-suite \ |
| 71 | stressapptest \ | 73 | stressapptest \ |
| 72 | tinymembench \ | 74 | tinymembench \ |
| @@ -821,8 +823,8 @@ RDEPENDS:packagegroup-meta-oe-support = "\ | |||
| 821 | lvm2 \ | 823 | lvm2 \ |
| 822 | mailcap \ | 824 | mailcap \ |
| 823 | mbuffer \ | 825 | mbuffer \ |
| 826 | media-types \ | ||
| 824 | mg \ | 827 | mg \ |
| 825 | mime-support \ | ||
| 826 | minini \ | 828 | minini \ |
| 827 | monit \ | 829 | monit \ |
| 828 | mscgen \ | 830 | mscgen \ |
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc index aec2e0a47d..0e842a9c91 100644 --- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc | |||
| @@ -3,330 +3,337 @@ | |||
| 3 | # from Cargo.lock | 3 | # from Cargo.lock |
| 4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
| 5 | crate://crates.io/adler2/2.0.1 \ | 5 | crate://crates.io/adler2/2.0.1 \ |
| 6 | crate://crates.io/aho-corasick/1.1.3 \ | 6 | crate://crates.io/aho-corasick/1.1.4 \ |
| 7 | crate://crates.io/allocator-api2/0.2.21 \ | 7 | crate://crates.io/allocator-api2/0.2.21 \ |
| 8 | crate://crates.io/android_system_properties/0.1.5 \ | 8 | crate://crates.io/android_system_properties/0.1.5 \ |
| 9 | crate://crates.io/ansi-width/0.1.0 \ | 9 | crate://crates.io/ansi-width/0.1.0 \ |
| 10 | crate://crates.io/anstream/0.6.19 \ | 10 | crate://crates.io/anstream/0.6.21 \ |
| 11 | crate://crates.io/anstyle/1.0.11 \ | 11 | crate://crates.io/anstyle/1.0.13 \ |
| 12 | crate://crates.io/anstyle-parse/0.2.7 \ | 12 | crate://crates.io/anstyle-parse/0.2.7 \ |
| 13 | crate://crates.io/anstyle-query/1.1.3 \ | 13 | crate://crates.io/anstyle-query/1.1.5 \ |
| 14 | crate://crates.io/anstyle-wincon/3.0.9 \ | 14 | crate://crates.io/anstyle-wincon/3.0.11 \ |
| 15 | crate://crates.io/anyhow/1.0.100 \ | 15 | crate://crates.io/anyhow/1.0.101 \ |
| 16 | crate://crates.io/approx/0.5.1 \ | 16 | crate://crates.io/approx/0.5.1 \ |
| 17 | crate://crates.io/arbitrary/1.4.1 \ | ||
| 18 | crate://crates.io/arrayref/0.3.9 \ | 17 | crate://crates.io/arrayref/0.3.9 \ |
| 19 | crate://crates.io/arrayvec/0.7.6 \ | 18 | crate://crates.io/arrayvec/0.7.6 \ |
| 20 | crate://crates.io/autocfg/1.4.0 \ | 19 | crate://crates.io/autocfg/1.5.0 \ |
| 21 | crate://crates.io/base64-simd/0.8.0 \ | 20 | crate://crates.io/base64-simd/0.8.0 \ |
| 22 | crate://crates.io/bigdecimal/0.4.9 \ | 21 | crate://crates.io/bigdecimal/0.4.10 \ |
| 23 | crate://crates.io/binary-heap-plus/0.5.0 \ | 22 | crate://crates.io/binary-heap-plus/0.5.0 \ |
| 24 | crate://crates.io/bincode/2.0.1 \ | ||
| 25 | crate://crates.io/bincode_derive/2.0.1 \ | ||
| 26 | crate://crates.io/bindgen/0.72.1 \ | 23 | crate://crates.io/bindgen/0.72.1 \ |
| 27 | crate://crates.io/bitflags/1.3.2 \ | 24 | crate://crates.io/bitflags/1.3.2 \ |
| 28 | crate://crates.io/bitflags/2.9.1 \ | 25 | crate://crates.io/bitflags/2.10.0 \ |
| 29 | crate://crates.io/bitvec/1.0.1 \ | 26 | crate://crates.io/bitvec/1.0.1 \ |
| 30 | crate://crates.io/blake2b_simd/1.0.3 \ | 27 | crate://crates.io/blake2b_simd/1.0.4 \ |
| 31 | crate://crates.io/blake3/1.8.2 \ | 28 | crate://crates.io/blake3/1.8.3 \ |
| 32 | crate://crates.io/block-buffer/0.10.4 \ | 29 | crate://crates.io/block-buffer/0.10.4 \ |
| 30 | crate://crates.io/block2/0.6.2 \ | ||
| 33 | crate://crates.io/bstr/1.12.1 \ | 31 | crate://crates.io/bstr/1.12.1 \ |
| 34 | crate://crates.io/bumpalo/3.18.1 \ | 32 | crate://crates.io/bumpalo/3.19.1 \ |
| 35 | crate://crates.io/bytecount/0.6.9 \ | 33 | crate://crates.io/bytecount/0.6.9 \ |
| 36 | crate://crates.io/byteorder/1.5.0 \ | 34 | crate://crates.io/byteorder/1.5.0 \ |
| 37 | crate://crates.io/cc/1.2.27 \ | 35 | crate://crates.io/calendrical_calculations/0.2.3 \ |
| 36 | crate://crates.io/cc/1.2.55 \ | ||
| 38 | crate://crates.io/cexpr/0.6.0 \ | 37 | crate://crates.io/cexpr/0.6.0 \ |
| 39 | crate://crates.io/cfg-if/1.0.1 \ | 38 | crate://crates.io/cfg-if/1.0.4 \ |
| 40 | crate://crates.io/cfg_aliases/0.2.1 \ | 39 | crate://crates.io/cfg_aliases/0.2.1 \ |
| 41 | crate://crates.io/chrono/0.4.42 \ | 40 | crate://crates.io/chrono/0.4.43 \ |
| 42 | crate://crates.io/clang-sys/1.8.1 \ | 41 | crate://crates.io/clang-sys/1.8.1 \ |
| 43 | crate://crates.io/clap/4.5.53 \ | 42 | crate://crates.io/clap/4.5.60 \ |
| 44 | crate://crates.io/clap_builder/4.5.53 \ | 43 | crate://crates.io/clap_builder/4.5.60 \ |
| 45 | crate://crates.io/clap_complete/4.5.61 \ | 44 | crate://crates.io/clap_complete/4.5.66 \ |
| 46 | crate://crates.io/clap_lex/0.7.5 \ | 45 | crate://crates.io/clap_lex/1.0.0 \ |
| 47 | crate://crates.io/clap_mangen/0.2.31 \ | 46 | crate://crates.io/clap_mangen/0.2.31 \ |
| 48 | crate://crates.io/codspeed/4.1.0 \ | 47 | crate://crates.io/codspeed/4.3.0 \ |
| 49 | crate://crates.io/codspeed-divan-compat/4.1.0 \ | 48 | crate://crates.io/codspeed-divan-compat/4.3.0 \ |
| 50 | crate://crates.io/codspeed-divan-compat-macros/4.1.0 \ | 49 | crate://crates.io/codspeed-divan-compat-macros/4.3.0 \ |
| 51 | crate://crates.io/codspeed-divan-compat-walltime/4.1.0 \ | 50 | crate://crates.io/codspeed-divan-compat-walltime/4.3.0 \ |
| 52 | crate://crates.io/colorchoice/1.0.4 \ | 51 | crate://crates.io/colorchoice/1.0.4 \ |
| 53 | crate://crates.io/colored/2.2.0 \ | 52 | crate://crates.io/colored/2.2.0 \ |
| 54 | crate://crates.io/compare/0.1.0 \ | 53 | crate://crates.io/compare/0.1.0 \ |
| 55 | crate://crates.io/condtype/1.3.0 \ | 54 | crate://crates.io/condtype/1.3.0 \ |
| 56 | crate://crates.io/console/0.16.0 \ | 55 | crate://crates.io/console/0.16.2 \ |
| 57 | crate://crates.io/const-random/0.1.18 \ | 56 | crate://crates.io/const-random/0.1.18 \ |
| 58 | crate://crates.io/const-random-macro/0.1.16 \ | 57 | crate://crates.io/const-random-macro/0.1.16 \ |
| 59 | crate://crates.io/constant_time_eq/0.3.1 \ | 58 | crate://crates.io/constant_time_eq/0.4.2 \ |
| 60 | crate://crates.io/convert_case/0.7.1 \ | ||
| 61 | crate://crates.io/core-foundation-sys/0.8.7 \ | 59 | crate://crates.io/core-foundation-sys/0.8.7 \ |
| 60 | crate://crates.io/core_maths/0.1.1 \ | ||
| 62 | crate://crates.io/cpufeatures/0.2.17 \ | 61 | crate://crates.io/cpufeatures/0.2.17 \ |
| 63 | crate://crates.io/crc/3.3.0 \ | 62 | crate://crates.io/crc/3.3.0 \ |
| 64 | crate://crates.io/crc-catalog/2.4.0 \ | 63 | crate://crates.io/crc-catalog/2.4.0 \ |
| 65 | crate://crates.io/crc-fast/1.8.1 \ | 64 | crate://crates.io/crc-fast/1.9.0 \ |
| 66 | crate://crates.io/crc32fast/1.5.0 \ | 65 | crate://crates.io/crc32fast/1.5.0 \ |
| 67 | crate://crates.io/crossbeam-deque/0.8.6 \ | 66 | crate://crates.io/crossbeam-deque/0.8.6 \ |
| 68 | crate://crates.io/crossbeam-epoch/0.9.18 \ | 67 | crate://crates.io/crossbeam-epoch/0.9.18 \ |
| 69 | crate://crates.io/crossbeam-utils/0.8.21 \ | 68 | crate://crates.io/crossbeam-utils/0.8.21 \ |
| 70 | crate://crates.io/crossterm/0.29.0 \ | 69 | crate://crates.io/crossterm/0.29.0 \ |
| 71 | crate://crates.io/crossterm_winapi/0.9.1 \ | 70 | crate://crates.io/crossterm_winapi/0.9.1 \ |
| 72 | crate://crates.io/crunchy/0.2.3 \ | 71 | crate://crates.io/crunchy/0.2.4 \ |
| 73 | crate://crates.io/crypto-common/0.1.6 \ | 72 | crate://crates.io/crypto-common/0.1.7 \ |
| 74 | crate://crates.io/ctor/0.6.3 \ | 73 | crate://crates.io/ctor/0.6.3 \ |
| 75 | crate://crates.io/ctor-proc-macro/0.0.7 \ | 74 | crate://crates.io/ctor-proc-macro/0.0.7 \ |
| 76 | crate://crates.io/ctrlc/3.4.7 \ | 75 | crate://crates.io/ctrlc/3.5.1 \ |
| 77 | crate://crates.io/data-encoding/2.9.0 \ | 76 | crate://crates.io/data-encoding/2.10.0 \ |
| 78 | crate://crates.io/data-encoding-macro/0.1.18 \ | 77 | crate://crates.io/data-encoding-macro/0.1.19 \ |
| 79 | crate://crates.io/data-encoding-macro-internal/0.1.16 \ | 78 | crate://crates.io/data-encoding-macro-internal/0.1.17 \ |
| 80 | crate://crates.io/deranged/0.5.2 \ | 79 | crate://crates.io/deranged/0.5.5 \ |
| 81 | crate://crates.io/derive_arbitrary/1.4.1 \ | ||
| 82 | crate://crates.io/derive_more/2.0.1 \ | ||
| 83 | crate://crates.io/derive_more-impl/2.0.1 \ | ||
| 84 | crate://crates.io/diff/0.1.13 \ | 80 | crate://crates.io/diff/0.1.13 \ |
| 85 | crate://crates.io/digest/0.10.7 \ | 81 | crate://crates.io/digest/0.10.7 \ |
| 82 | crate://crates.io/dispatch2/0.3.0 \ | ||
| 86 | crate://crates.io/displaydoc/0.2.5 \ | 83 | crate://crates.io/displaydoc/0.2.5 \ |
| 87 | crate://crates.io/divan-macros/0.1.17 \ | 84 | crate://crates.io/divan-macros/0.1.17 \ |
| 88 | crate://crates.io/dlv-list/0.5.2 \ | 85 | crate://crates.io/dlv-list/0.5.2 \ |
| 89 | crate://crates.io/dns-lookup/3.0.1 \ | 86 | crate://crates.io/dns-lookup/3.0.1 \ |
| 90 | crate://crates.io/document-features/0.2.11 \ | 87 | crate://crates.io/document-features/0.2.12 \ |
| 91 | crate://crates.io/dtor/0.1.0 \ | 88 | crate://crates.io/dtor/0.1.1 \ |
| 92 | crate://crates.io/dtor-proc-macro/0.0.6 \ | 89 | crate://crates.io/dtor-proc-macro/0.0.6 \ |
| 93 | crate://crates.io/dunce/1.0.5 \ | 90 | crate://crates.io/dunce/1.0.5 \ |
| 94 | crate://crates.io/either/1.15.0 \ | 91 | crate://crates.io/either/1.15.0 \ |
| 95 | crate://crates.io/encode_unicode/1.0.0 \ | 92 | crate://crates.io/encode_unicode/1.0.0 \ |
| 96 | crate://crates.io/equivalent/1.0.2 \ | 93 | crate://crates.io/equivalent/1.0.2 \ |
| 97 | crate://crates.io/errno/0.3.12 \ | 94 | crate://crates.io/errno/0.3.14 \ |
| 98 | crate://crates.io/exacl/0.12.0 \ | 95 | crate://crates.io/exacl/0.12.0 \ |
| 99 | crate://crates.io/fastrand/2.3.0 \ | 96 | crate://crates.io/fastrand/2.3.0 \ |
| 100 | crate://crates.io/file_diff/1.0.0 \ | 97 | crate://crates.io/file_diff/1.0.0 \ |
| 101 | crate://crates.io/filedescriptor/0.8.3 \ | 98 | crate://crates.io/filedescriptor/0.8.3 \ |
| 102 | crate://crates.io/filetime/0.2.26 \ | 99 | crate://crates.io/filetime/0.2.27 \ |
| 103 | crate://crates.io/fixed_decimal/0.7.0 \ | 100 | crate://crates.io/find-msvc-tools/0.1.9 \ |
| 104 | crate://crates.io/flate2/1.1.2 \ | 101 | crate://crates.io/fixed_decimal/0.7.1 \ |
| 102 | crate://crates.io/flate2/1.1.9 \ | ||
| 105 | crate://crates.io/fluent/0.17.0 \ | 103 | crate://crates.io/fluent/0.17.0 \ |
| 106 | crate://crates.io/fluent-bundle/0.16.0 \ | 104 | crate://crates.io/fluent-bundle/0.16.0 \ |
| 107 | crate://crates.io/fluent-langneg/0.13.0 \ | 105 | crate://crates.io/fluent-langneg/0.13.1 \ |
| 108 | crate://crates.io/fluent-syntax/0.12.0 \ | 106 | crate://crates.io/fluent-syntax/0.12.0 \ |
| 109 | crate://crates.io/fnv/1.0.7 \ | ||
| 110 | crate://crates.io/foldhash/0.1.5 \ | 107 | crate://crates.io/foldhash/0.1.5 \ |
| 108 | crate://crates.io/foldhash/0.2.0 \ | ||
| 111 | crate://crates.io/fs_extra/1.3.0 \ | 109 | crate://crates.io/fs_extra/1.3.0 \ |
| 112 | crate://crates.io/fsevent-sys/4.1.0 \ | 110 | crate://crates.io/fsevent-sys/4.1.0 \ |
| 113 | crate://crates.io/fts-sys/0.2.17 \ | 111 | crate://crates.io/fts-sys/0.2.17 \ |
| 114 | crate://crates.io/funty/2.0.0 \ | 112 | crate://crates.io/funty/2.0.0 \ |
| 115 | crate://crates.io/futures-core/0.3.31 \ | 113 | crate://crates.io/futures-core/0.3.32 \ |
| 116 | crate://crates.io/futures-macro/0.3.31 \ | 114 | crate://crates.io/futures-macro/0.3.32 \ |
| 117 | crate://crates.io/futures-task/0.3.31 \ | 115 | crate://crates.io/futures-task/0.3.32 \ |
| 118 | crate://crates.io/futures-timer/3.0.3 \ | 116 | crate://crates.io/futures-timer/3.0.3 \ |
| 119 | crate://crates.io/futures-util/0.3.31 \ | 117 | crate://crates.io/futures-util/0.3.32 \ |
| 120 | crate://crates.io/gcd/2.3.0 \ | 118 | crate://crates.io/gcd/2.3.0 \ |
| 121 | crate://crates.io/generic-array/0.14.7 \ | 119 | crate://crates.io/generic-array/0.14.7 \ |
| 122 | crate://crates.io/getrandom/0.2.16 \ | 120 | crate://crates.io/getrandom/0.2.17 \ |
| 123 | crate://crates.io/getrandom/0.3.3 \ | 121 | crate://crates.io/getrandom/0.3.4 \ |
| 124 | crate://crates.io/glob/0.3.3 \ | 122 | crate://crates.io/glob/0.3.3 \ |
| 125 | crate://crates.io/half/2.7.1 \ | 123 | crate://crates.io/half/2.7.1 \ |
| 126 | crate://crates.io/hashbrown/0.14.5 \ | 124 | crate://crates.io/hashbrown/0.14.5 \ |
| 127 | crate://crates.io/hashbrown/0.15.4 \ | 125 | crate://crates.io/hashbrown/0.15.5 \ |
| 126 | crate://crates.io/hashbrown/0.16.1 \ | ||
| 128 | crate://crates.io/hex/0.4.3 \ | 127 | crate://crates.io/hex/0.4.3 \ |
| 129 | crate://crates.io/hex-literal/1.1.0 \ | 128 | crate://crates.io/hex-literal/1.1.0 \ |
| 130 | crate://crates.io/hostname/0.4.2 \ | 129 | crate://crates.io/hostname/0.4.2 \ |
| 131 | crate://crates.io/iana-time-zone/0.1.64 \ | 130 | crate://crates.io/iana-time-zone/0.1.65 \ |
| 132 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ | 131 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ |
| 132 | crate://crates.io/icu_calendar/2.1.1 \ | ||
| 133 | crate://crates.io/icu_calendar_data/2.1.1 \ | ||
| 133 | crate://crates.io/icu_collator/2.1.1 \ | 134 | crate://crates.io/icu_collator/2.1.1 \ |
| 134 | crate://crates.io/icu_collator_data/2.1.1 \ | 135 | crate://crates.io/icu_collator_data/2.1.1 \ |
| 135 | crate://crates.io/icu_collections/2.1.1 \ | 136 | crate://crates.io/icu_collections/2.1.1 \ |
| 137 | crate://crates.io/icu_datetime/2.1.1 \ | ||
| 138 | crate://crates.io/icu_datetime_data/2.1.2 \ | ||
| 136 | crate://crates.io/icu_decimal/2.1.1 \ | 139 | crate://crates.io/icu_decimal/2.1.1 \ |
| 137 | crate://crates.io/icu_decimal_data/2.1.1 \ | 140 | crate://crates.io/icu_decimal_data/2.1.1 \ |
| 138 | crate://crates.io/icu_locale/2.1.1 \ | 141 | crate://crates.io/icu_locale/2.1.1 \ |
| 139 | crate://crates.io/icu_locale_core/2.1.1 \ | 142 | crate://crates.io/icu_locale_core/2.1.1 \ |
| 140 | crate://crates.io/icu_locale_data/2.1.1 \ | 143 | crate://crates.io/icu_locale_data/2.1.2 \ |
| 141 | crate://crates.io/icu_normalizer/2.1.1 \ | 144 | crate://crates.io/icu_normalizer/2.1.1 \ |
| 142 | crate://crates.io/icu_normalizer_data/2.1.1 \ | 145 | crate://crates.io/icu_normalizer_data/2.1.1 \ |
| 143 | crate://crates.io/icu_properties/2.1.1 \ | 146 | crate://crates.io/icu_pattern/0.4.1 \ |
| 144 | crate://crates.io/icu_properties_data/2.1.1 \ | 147 | crate://crates.io/icu_plurals/2.1.1 \ |
| 148 | crate://crates.io/icu_plurals_data/2.1.1 \ | ||
| 149 | crate://crates.io/icu_properties/2.1.2 \ | ||
| 150 | crate://crates.io/icu_properties_data/2.1.2 \ | ||
| 145 | crate://crates.io/icu_provider/2.1.1 \ | 151 | crate://crates.io/icu_provider/2.1.1 \ |
| 146 | crate://crates.io/indexmap/2.9.0 \ | 152 | crate://crates.io/icu_time/2.1.1 \ |
| 147 | crate://crates.io/indicatif/0.18.3 \ | 153 | crate://crates.io/icu_time_data/2.1.1 \ |
| 154 | crate://crates.io/indexmap/2.13.0 \ | ||
| 155 | crate://crates.io/indicatif/0.18.4 \ | ||
| 148 | crate://crates.io/inotify/0.11.0 \ | 156 | crate://crates.io/inotify/0.11.0 \ |
| 149 | crate://crates.io/inotify-sys/0.1.5 \ | 157 | crate://crates.io/inotify-sys/0.1.5 \ |
| 150 | crate://crates.io/intl-memoizer/0.5.3 \ | 158 | crate://crates.io/intl-memoizer/0.5.3 \ |
| 151 | crate://crates.io/intl_pluralrules/7.0.2 \ | 159 | crate://crates.io/intl_pluralrules/7.0.2 \ |
| 152 | crate://crates.io/is_terminal_polyfill/1.70.1 \ | 160 | crate://crates.io/is_terminal_polyfill/1.70.2 \ |
| 153 | crate://crates.io/itertools/0.13.0 \ | 161 | crate://crates.io/itertools/0.13.0 \ |
| 154 | crate://crates.io/itertools/0.14.0 \ | 162 | crate://crates.io/itertools/0.14.0 \ |
| 155 | crate://crates.io/itoa/1.0.15 \ | 163 | crate://crates.io/itoa/1.0.17 \ |
| 156 | crate://crates.io/jiff/0.2.16 \ | 164 | crate://crates.io/ixdtf/0.6.4 \ |
| 157 | crate://crates.io/jiff-static/0.2.16 \ | 165 | crate://crates.io/jiff/0.2.23 \ |
| 158 | crate://crates.io/jiff-tzdb/0.1.4 \ | 166 | crate://crates.io/jiff-icu/0.2.2 \ |
| 167 | crate://crates.io/jiff-static/0.2.23 \ | ||
| 168 | crate://crates.io/jiff-tzdb/0.1.5 \ | ||
| 159 | crate://crates.io/jiff-tzdb-platform/0.1.3 \ | 169 | crate://crates.io/jiff-tzdb-platform/0.1.3 \ |
| 160 | crate://crates.io/js-sys/0.3.77 \ | 170 | crate://crates.io/js-sys/0.3.85 \ |
| 161 | crate://crates.io/keccak/0.1.5 \ | 171 | crate://crates.io/keccak/0.1.6 \ |
| 162 | crate://crates.io/kqueue/1.1.1 \ | 172 | crate://crates.io/kqueue/1.1.1 \ |
| 163 | crate://crates.io/kqueue-sys/1.0.4 \ | 173 | crate://crates.io/kqueue-sys/1.0.4 \ |
| 164 | crate://crates.io/lazy_static/1.5.0 \ | 174 | crate://crates.io/lazy_static/1.5.0 \ |
| 165 | crate://crates.io/libc/0.2.175 \ | 175 | crate://crates.io/libc/0.2.182 \ |
| 166 | crate://crates.io/libloading/0.8.8 \ | 176 | crate://crates.io/libloading/0.8.9 \ |
| 167 | crate://crates.io/libm/0.2.15 \ | 177 | crate://crates.io/libm/0.2.16 \ |
| 168 | crate://crates.io/libredox/0.1.3 \ | 178 | crate://crates.io/libredox/0.1.12 \ |
| 169 | crate://crates.io/libz-rs-sys/0.5.1 \ | 179 | crate://crates.io/linux-raw-sys/0.12.1 \ |
| 170 | crate://crates.io/linux-raw-sys/0.11.0 \ | 180 | crate://crates.io/litemap/0.8.1 \ |
| 171 | crate://crates.io/linux-raw-sys/0.12.0 \ | 181 | crate://crates.io/litrs/1.0.0 \ |
| 172 | crate://crates.io/litemap/0.8.0 \ | 182 | crate://crates.io/lock_api/0.4.14 \ |
| 173 | crate://crates.io/litrs/0.4.1 \ | 183 | crate://crates.io/log/0.4.29 \ |
| 174 | crate://crates.io/lock_api/0.4.13 \ | 184 | crate://crates.io/lru/0.16.3 \ |
| 175 | crate://crates.io/log/0.4.27 \ | ||
| 176 | crate://crates.io/lru/0.12.5 \ | ||
| 177 | crate://crates.io/lscolors/0.21.0 \ | 185 | crate://crates.io/lscolors/0.21.0 \ |
| 178 | crate://crates.io/md-5/0.10.6 \ | 186 | crate://crates.io/md-5/0.10.6 \ |
| 179 | crate://crates.io/memchr/2.7.6 \ | 187 | crate://crates.io/memchr/2.8.0 \ |
| 180 | crate://crates.io/memmap2/0.9.9 \ | 188 | crate://crates.io/memmap2/0.9.10 \ |
| 181 | crate://crates.io/memoffset/0.9.1 \ | 189 | crate://crates.io/memoffset/0.9.1 \ |
| 182 | crate://crates.io/minimal-lexical/0.2.1 \ | 190 | crate://crates.io/minimal-lexical/0.2.1 \ |
| 183 | crate://crates.io/miniz_oxide/0.8.9 \ | 191 | crate://crates.io/miniz_oxide/0.8.9 \ |
| 184 | crate://crates.io/mio/1.0.4 \ | 192 | crate://crates.io/mio/1.1.1 \ |
| 185 | crate://crates.io/nix/0.30.1 \ | 193 | crate://crates.io/nix/0.30.1 \ |
| 186 | crate://crates.io/nom/7.1.3 \ | 194 | crate://crates.io/nom/7.1.3 \ |
| 187 | crate://crates.io/nom/8.0.0 \ | 195 | crate://crates.io/nom/8.0.0 \ |
| 188 | crate://crates.io/notify/8.2.0 \ | 196 | crate://crates.io/notify/8.2.0 \ |
| 189 | crate://crates.io/notify-types/2.0.0 \ | 197 | crate://crates.io/notify-types/2.1.0 \ |
| 190 | crate://crates.io/nu-ansi-term/0.50.3 \ | 198 | crate://crates.io/nu-ansi-term/0.50.3 \ |
| 191 | crate://crates.io/num-bigint/0.4.6 \ | 199 | crate://crates.io/num-bigint/0.4.6 \ |
| 192 | crate://crates.io/num-conv/0.1.0 \ | 200 | crate://crates.io/num-conv/0.2.0 \ |
| 193 | crate://crates.io/num-integer/0.1.46 \ | 201 | crate://crates.io/num-integer/0.1.46 \ |
| 194 | crate://crates.io/num-modular/0.5.1 \ | 202 | crate://crates.io/num-modular/0.6.1 \ |
| 195 | crate://crates.io/num-prime/0.4.4 \ | 203 | crate://crates.io/num-prime/0.5.0 \ |
| 196 | crate://crates.io/num-traits/0.2.19 \ | 204 | crate://crates.io/num-traits/0.2.19 \ |
| 197 | crate://crates.io/num_threads/0.1.7 \ | 205 | crate://crates.io/num_threads/0.1.7 \ |
| 206 | crate://crates.io/objc2/0.6.3 \ | ||
| 207 | crate://crates.io/objc2-encode/4.1.0 \ | ||
| 198 | crate://crates.io/once_cell/1.21.3 \ | 208 | crate://crates.io/once_cell/1.21.3 \ |
| 199 | crate://crates.io/once_cell_polyfill/1.70.1 \ | 209 | crate://crates.io/once_cell_polyfill/1.70.2 \ |
| 200 | crate://crates.io/onig/6.5.1 \ | 210 | crate://crates.io/onig/6.5.1 \ |
| 201 | crate://crates.io/onig_sys/69.9.1 \ | 211 | crate://crates.io/onig_sys/69.9.1 \ |
| 202 | crate://crates.io/ordered-multimap/0.7.3 \ | 212 | crate://crates.io/ordered-multimap/0.7.3 \ |
| 203 | crate://crates.io/os_display/0.1.4 \ | 213 | crate://crates.io/os_display/0.1.4 \ |
| 204 | crate://crates.io/outref/0.5.2 \ | 214 | crate://crates.io/outref/0.5.2 \ |
| 205 | crate://crates.io/parking_lot/0.12.4 \ | 215 | crate://crates.io/parking_lot/0.12.5 \ |
| 206 | crate://crates.io/parking_lot_core/0.9.11 \ | 216 | crate://crates.io/parking_lot_core/0.9.12 \ |
| 207 | crate://crates.io/parse_datetime/0.13.3 \ | 217 | crate://crates.io/parse_datetime/0.14.0 \ |
| 208 | crate://crates.io/phf/0.13.1 \ | 218 | crate://crates.io/phf/0.13.1 \ |
| 209 | crate://crates.io/phf_codegen/0.13.1 \ | 219 | crate://crates.io/phf_codegen/0.13.1 \ |
| 210 | crate://crates.io/phf_generator/0.13.1 \ | 220 | crate://crates.io/phf_generator/0.13.1 \ |
| 211 | crate://crates.io/phf_shared/0.13.1 \ | 221 | crate://crates.io/phf_shared/0.13.1 \ |
| 212 | crate://crates.io/pin-project-lite/0.2.16 \ | 222 | crate://crates.io/pin-project-lite/0.2.16 \ |
| 213 | crate://crates.io/pin-utils/0.1.0 \ | ||
| 214 | crate://crates.io/pkg-config/0.3.32 \ | 223 | crate://crates.io/pkg-config/0.3.32 \ |
| 215 | crate://crates.io/platform-info/2.0.5 \ | 224 | crate://crates.io/platform-info/2.0.5 \ |
| 216 | crate://crates.io/portable-atomic/1.11.1 \ | 225 | crate://crates.io/portable-atomic/1.13.1 \ |
| 217 | crate://crates.io/portable-atomic-util/0.2.4 \ | 226 | crate://crates.io/portable-atomic-util/0.2.5 \ |
| 218 | crate://crates.io/potential_utf/0.1.4 \ | 227 | crate://crates.io/potential_utf/0.1.4 \ |
| 219 | crate://crates.io/powerfmt/0.2.0 \ | 228 | crate://crates.io/powerfmt/0.2.0 \ |
| 220 | crate://crates.io/ppv-lite86/0.2.21 \ | 229 | crate://crates.io/ppv-lite86/0.2.21 \ |
| 221 | crate://crates.io/pretty_assertions/1.4.1 \ | 230 | crate://crates.io/pretty_assertions/1.4.1 \ |
| 222 | crate://crates.io/prettyplease/0.2.34 \ | 231 | crate://crates.io/prettyplease/0.2.37 \ |
| 223 | crate://crates.io/proc-macro-crate/3.3.0 \ | 232 | crate://crates.io/proc-macro-crate/3.4.0 \ |
| 224 | crate://crates.io/proc-macro2/1.0.103 \ | 233 | crate://crates.io/proc-macro2/1.0.106 \ |
| 225 | crate://crates.io/procfs/0.18.0 \ | 234 | crate://crates.io/procfs/0.18.0 \ |
| 226 | crate://crates.io/procfs-core/0.18.0 \ | 235 | crate://crates.io/procfs-core/0.18.0 \ |
| 227 | crate://crates.io/quote/1.0.42 \ | 236 | crate://crates.io/quote/1.0.45 \ |
| 228 | crate://crates.io/r-efi/5.2.0 \ | 237 | crate://crates.io/r-efi/5.3.0 \ |
| 229 | crate://crates.io/radium/0.7.0 \ | 238 | crate://crates.io/radium/0.7.0 \ |
| 230 | crate://crates.io/rand/0.8.5 \ | 239 | crate://crates.io/rand/0.8.5 \ |
| 231 | crate://crates.io/rand/0.9.2 \ | 240 | crate://crates.io/rand/0.9.2 \ |
| 232 | crate://crates.io/rand_chacha/0.3.1 \ | 241 | crate://crates.io/rand_chacha/0.3.1 \ |
| 233 | crate://crates.io/rand_chacha/0.9.0 \ | 242 | crate://crates.io/rand_chacha/0.9.0 \ |
| 234 | crate://crates.io/rand_core/0.6.4 \ | 243 | crate://crates.io/rand_core/0.6.4 \ |
| 235 | crate://crates.io/rand_core/0.9.3 \ | 244 | crate://crates.io/rand_core/0.9.5 \ |
| 236 | crate://crates.io/rayon/1.11.0 \ | 245 | crate://crates.io/rayon/1.11.0 \ |
| 237 | crate://crates.io/rayon-core/1.13.0 \ | 246 | crate://crates.io/rayon-core/1.13.0 \ |
| 238 | crate://crates.io/redox_syscall/0.5.13 \ | 247 | crate://crates.io/redox_syscall/0.5.18 \ |
| 239 | crate://crates.io/regex/1.12.2 \ | 248 | crate://crates.io/redox_syscall/0.7.0 \ |
| 240 | crate://crates.io/regex-automata/0.4.12 \ | 249 | crate://crates.io/regex/1.12.3 \ |
| 241 | crate://crates.io/regex-lite/0.1.7 \ | 250 | crate://crates.io/regex-automata/0.4.14 \ |
| 242 | crate://crates.io/regex-syntax/0.8.5 \ | 251 | crate://crates.io/regex-lite/0.1.9 \ |
| 252 | crate://crates.io/regex-syntax/0.8.9 \ | ||
| 243 | crate://crates.io/relative-path/1.9.3 \ | 253 | crate://crates.io/relative-path/1.9.3 \ |
| 244 | crate://crates.io/rlimit/0.10.2 \ | 254 | crate://crates.io/rlimit/0.11.0 \ |
| 245 | crate://crates.io/roff/0.2.2 \ | 255 | crate://crates.io/roff/0.2.2 \ |
| 246 | crate://crates.io/rstest/0.26.1 \ | 256 | crate://crates.io/rstest/0.26.1 \ |
| 247 | crate://crates.io/rstest_macros/0.26.1 \ | 257 | crate://crates.io/rstest_macros/0.26.1 \ |
| 248 | crate://crates.io/rust-ini/0.21.3 \ | 258 | crate://crates.io/rust-ini/0.21.3 \ |
| 249 | crate://crates.io/rustc-hash/2.1.1 \ | 259 | crate://crates.io/rustc-hash/2.1.1 \ |
| 250 | crate://crates.io/rustc_version/0.4.1 \ | 260 | crate://crates.io/rustc_version/0.4.1 \ |
| 251 | crate://crates.io/rustix/1.1.2 \ | 261 | crate://crates.io/rustix/1.1.4 \ |
| 252 | crate://crates.io/rustversion/1.0.21 \ | 262 | crate://crates.io/rustversion/1.0.22 \ |
| 253 | crate://crates.io/ryu/1.0.20 \ | ||
| 254 | crate://crates.io/same-file/1.0.6 \ | 263 | crate://crates.io/same-file/1.0.6 \ |
| 255 | crate://crates.io/scopeguard/1.2.0 \ | 264 | crate://crates.io/scopeguard/1.2.0 \ |
| 256 | crate://crates.io/self_cell/1.2.1 \ | 265 | crate://crates.io/self_cell/1.2.2 \ |
| 257 | crate://crates.io/selinux/0.5.2 \ | 266 | crate://crates.io/selinux/0.6.0 \ |
| 258 | crate://crates.io/selinux-sys/0.6.15 \ | 267 | crate://crates.io/selinux-sys/0.6.15 \ |
| 259 | crate://crates.io/semver/1.0.26 \ | 268 | crate://crates.io/semver/1.0.27 \ |
| 260 | crate://crates.io/serde/1.0.228 \ | 269 | crate://crates.io/serde/1.0.228 \ |
| 261 | crate://crates.io/serde-big-array/0.5.1 \ | ||
| 262 | crate://crates.io/serde_core/1.0.228 \ | 270 | crate://crates.io/serde_core/1.0.228 \ |
| 263 | crate://crates.io/serde_derive/1.0.228 \ | 271 | crate://crates.io/serde_derive/1.0.228 \ |
| 264 | crate://crates.io/serde_json/1.0.140 \ | 272 | crate://crates.io/serde_json/1.0.149 \ |
| 265 | crate://crates.io/sha1/0.10.6 \ | 273 | crate://crates.io/sha1/0.10.6 \ |
| 266 | crate://crates.io/sha2/0.10.9 \ | 274 | crate://crates.io/sha2/0.10.9 \ |
| 267 | crate://crates.io/sha3/0.10.8 \ | 275 | crate://crates.io/sha3/0.10.8 \ |
| 268 | crate://crates.io/shlex/1.3.0 \ | 276 | crate://crates.io/shlex/1.3.0 \ |
| 269 | crate://crates.io/signal-hook/0.3.18 \ | 277 | crate://crates.io/signal-hook/0.3.18 \ |
| 270 | crate://crates.io/signal-hook-mio/0.2.4 \ | 278 | crate://crates.io/signal-hook-mio/0.2.5 \ |
| 271 | crate://crates.io/signal-hook-registry/1.4.5 \ | 279 | crate://crates.io/signal-hook-registry/1.4.8 \ |
| 272 | crate://crates.io/simd-adler32/0.3.7 \ | 280 | crate://crates.io/simd-adler32/0.3.8 \ |
| 273 | crate://crates.io/siphasher/1.0.1 \ | 281 | crate://crates.io/siphasher/1.0.2 \ |
| 274 | crate://crates.io/slab/0.4.9 \ | 282 | crate://crates.io/slab/0.4.12 \ |
| 275 | crate://crates.io/sm3/0.4.2 \ | 283 | crate://crates.io/sm3/0.4.2 \ |
| 276 | crate://crates.io/smallvec/1.15.1 \ | 284 | crate://crates.io/smallvec/1.15.1 \ |
| 277 | crate://crates.io/smawk/0.3.2 \ | 285 | crate://crates.io/smawk/0.3.2 \ |
| 278 | crate://crates.io/socket2/0.6.0 \ | 286 | crate://crates.io/socket2/0.6.2 \ |
| 279 | crate://crates.io/spin/0.10.0 \ | 287 | crate://crates.io/spin/0.10.0 \ |
| 280 | crate://crates.io/stable_deref_trait/1.2.0 \ | 288 | crate://crates.io/stable_deref_trait/1.2.1 \ |
| 281 | crate://crates.io/statrs/0.18.0 \ | 289 | crate://crates.io/statrs/0.18.0 \ |
| 290 | crate://crates.io/string-interner/0.19.0 \ | ||
| 282 | crate://crates.io/strsim/0.11.1 \ | 291 | crate://crates.io/strsim/0.11.1 \ |
| 283 | crate://crates.io/syn/2.0.103 \ | 292 | crate://crates.io/syn/2.0.114 \ |
| 284 | crate://crates.io/synstructure/0.13.2 \ | 293 | crate://crates.io/synstructure/0.13.2 \ |
| 285 | crate://crates.io/tap/1.0.1 \ | 294 | crate://crates.io/tap/1.0.1 \ |
| 286 | crate://crates.io/tempfile/3.23.0 \ | 295 | crate://crates.io/tempfile/3.26.0 \ |
| 287 | crate://crates.io/terminal_size/0.4.3 \ | 296 | crate://crates.io/terminal_size/0.4.3 \ |
| 288 | crate://crates.io/textwrap/0.16.2 \ | 297 | crate://crates.io/textwrap/0.16.2 \ |
| 289 | crate://crates.io/thiserror/1.0.69 \ | 298 | crate://crates.io/thiserror/1.0.69 \ |
| 290 | crate://crates.io/thiserror/2.0.17 \ | 299 | crate://crates.io/thiserror/2.0.18 \ |
| 291 | crate://crates.io/thiserror-impl/1.0.69 \ | 300 | crate://crates.io/thiserror-impl/1.0.69 \ |
| 292 | crate://crates.io/thiserror-impl/2.0.17 \ | 301 | crate://crates.io/thiserror-impl/2.0.18 \ |
| 293 | crate://crates.io/time/0.3.44 \ | 302 | crate://crates.io/time/0.3.47 \ |
| 294 | crate://crates.io/time-core/0.1.6 \ | 303 | crate://crates.io/time-core/0.1.8 \ |
| 295 | crate://crates.io/time-macros/0.2.24 \ | 304 | crate://crates.io/time-macros/0.2.27 \ |
| 296 | crate://crates.io/tiny-keccak/2.0.2 \ | 305 | crate://crates.io/tiny-keccak/2.0.2 \ |
| 297 | crate://crates.io/tinystr/0.8.1 \ | 306 | crate://crates.io/tinystr/0.8.2 \ |
| 298 | crate://crates.io/toml_datetime/0.6.11 \ | 307 | crate://crates.io/toml_datetime/0.7.5+spec-1.1.0 \ |
| 299 | crate://crates.io/toml_edit/0.22.27 \ | 308 | crate://crates.io/toml_edit/0.23.10+spec-1.0.0 \ |
| 309 | crate://crates.io/toml_parser/1.0.6+spec-1.1.0 \ | ||
| 300 | crate://crates.io/type-map/0.5.1 \ | 310 | crate://crates.io/type-map/0.5.1 \ |
| 301 | crate://crates.io/typenum/1.18.0 \ | 311 | crate://crates.io/typed-path/0.12.2 \ |
| 312 | crate://crates.io/typenum/1.19.0 \ | ||
| 302 | crate://crates.io/unic-langid/0.9.6 \ | 313 | crate://crates.io/unic-langid/0.9.6 \ |
| 303 | crate://crates.io/unic-langid-impl/0.9.6 \ | 314 | crate://crates.io/unic-langid-impl/0.9.6 \ |
| 304 | crate://crates.io/unicode-ident/1.0.18 \ | 315 | crate://crates.io/unicode-ident/1.0.22 \ |
| 305 | crate://crates.io/unicode-linebreak/0.1.5 \ | 316 | crate://crates.io/unicode-linebreak/0.1.5 \ |
| 306 | crate://crates.io/unicode-segmentation/1.12.0 \ | ||
| 307 | crate://crates.io/unicode-width/0.1.14 \ | 317 | crate://crates.io/unicode-width/0.1.14 \ |
| 308 | crate://crates.io/unicode-width/0.2.2 \ | 318 | crate://crates.io/unicode-width/0.2.2 \ |
| 309 | crate://crates.io/unindent/0.2.4 \ | 319 | crate://crates.io/unindent/0.2.4 \ |
| 310 | crate://crates.io/unit-prefix/0.5.2 \ | 320 | crate://crates.io/unit-prefix/0.5.2 \ |
| 311 | crate://crates.io/unty/0.0.4 \ | ||
| 312 | crate://crates.io/utf16_iter/1.0.5 \ | 321 | crate://crates.io/utf16_iter/1.0.5 \ |
| 313 | crate://crates.io/utf8_iter/1.0.4 \ | 322 | crate://crates.io/utf8_iter/1.0.4 \ |
| 314 | crate://crates.io/utf8parse/0.2.2 \ | 323 | crate://crates.io/utf8parse/0.2.2 \ |
| 315 | crate://crates.io/utmp-classic/0.1.6 \ | 324 | crate://crates.io/utmp-classic/0.1.6 \ |
| 316 | crate://crates.io/utmp-classic-raw/0.1.3 \ | 325 | crate://crates.io/utmp-classic-raw/0.1.3 \ |
| 317 | crate://crates.io/uuid/1.17.0 \ | 326 | crate://crates.io/uuid/1.20.0 \ |
| 318 | crate://crates.io/uutils_term_grid/0.7.0 \ | 327 | crate://crates.io/uutils_term_grid/0.7.0 \ |
| 319 | crate://crates.io/version_check/0.9.5 \ | 328 | crate://crates.io/version_check/0.9.5 \ |
| 320 | crate://crates.io/virtue/0.0.18 \ | ||
| 321 | crate://crates.io/vsimd/0.8.0 \ | 329 | crate://crates.io/vsimd/0.8.0 \ |
| 322 | crate://crates.io/walkdir/2.5.0 \ | 330 | crate://crates.io/walkdir/2.5.0 \ |
| 323 | crate://crates.io/wasi/0.11.1+wasi-snapshot-preview1 \ | 331 | crate://crates.io/wasi/0.11.1+wasi-snapshot-preview1 \ |
| 324 | crate://crates.io/wasi/0.14.2+wasi-0.2.4 \ | 332 | crate://crates.io/wasip2/1.0.2+wasi-0.2.9 \ |
| 325 | crate://crates.io/wasm-bindgen/0.2.100 \ | 333 | crate://crates.io/wasm-bindgen/0.2.108 \ |
| 326 | crate://crates.io/wasm-bindgen-backend/0.2.100 \ | 334 | crate://crates.io/wasm-bindgen-macro/0.2.108 \ |
| 327 | crate://crates.io/wasm-bindgen-macro/0.2.100 \ | 335 | crate://crates.io/wasm-bindgen-macro-support/0.2.108 \ |
| 328 | crate://crates.io/wasm-bindgen-macro-support/0.2.100 \ | 336 | crate://crates.io/wasm-bindgen-shared/0.2.108 \ |
| 329 | crate://crates.io/wasm-bindgen-shared/0.2.100 \ | ||
| 330 | crate://crates.io/web-time/1.1.0 \ | 337 | crate://crates.io/web-time/1.1.0 \ |
| 331 | crate://crates.io/wild/2.2.1 \ | 338 | crate://crates.io/wild/2.2.1 \ |
| 332 | crate://crates.io/winapi/0.3.9 \ | 339 | crate://crates.io/winapi/0.3.9 \ |
| @@ -343,372 +350,380 @@ SRC_URI += " \ | |||
| 343 | crate://crates.io/windows-sys/0.60.2 \ | 350 | crate://crates.io/windows-sys/0.60.2 \ |
| 344 | crate://crates.io/windows-sys/0.61.2 \ | 351 | crate://crates.io/windows-sys/0.61.2 \ |
| 345 | crate://crates.io/windows-targets/0.52.6 \ | 352 | crate://crates.io/windows-targets/0.52.6 \ |
| 346 | crate://crates.io/windows-targets/0.53.2 \ | 353 | crate://crates.io/windows-targets/0.53.5 \ |
| 347 | crate://crates.io/windows_aarch64_gnullvm/0.52.6 \ | 354 | crate://crates.io/windows_aarch64_gnullvm/0.52.6 \ |
| 348 | crate://crates.io/windows_aarch64_gnullvm/0.53.0 \ | 355 | crate://crates.io/windows_aarch64_gnullvm/0.53.1 \ |
| 349 | crate://crates.io/windows_aarch64_msvc/0.52.6 \ | 356 | crate://crates.io/windows_aarch64_msvc/0.52.6 \ |
| 350 | crate://crates.io/windows_aarch64_msvc/0.53.0 \ | 357 | crate://crates.io/windows_aarch64_msvc/0.53.1 \ |
| 351 | crate://crates.io/windows_i686_gnu/0.52.6 \ | 358 | crate://crates.io/windows_i686_gnu/0.52.6 \ |
| 352 | crate://crates.io/windows_i686_gnu/0.53.0 \ | 359 | crate://crates.io/windows_i686_gnu/0.53.1 \ |
| 353 | crate://crates.io/windows_i686_gnullvm/0.52.6 \ | 360 | crate://crates.io/windows_i686_gnullvm/0.52.6 \ |
| 354 | crate://crates.io/windows_i686_gnullvm/0.53.0 \ | 361 | crate://crates.io/windows_i686_gnullvm/0.53.1 \ |
| 355 | crate://crates.io/windows_i686_msvc/0.52.6 \ | 362 | crate://crates.io/windows_i686_msvc/0.52.6 \ |
| 356 | crate://crates.io/windows_i686_msvc/0.53.0 \ | 363 | crate://crates.io/windows_i686_msvc/0.53.1 \ |
| 357 | crate://crates.io/windows_x86_64_gnu/0.52.6 \ | 364 | crate://crates.io/windows_x86_64_gnu/0.52.6 \ |
| 358 | crate://crates.io/windows_x86_64_gnu/0.53.0 \ | 365 | crate://crates.io/windows_x86_64_gnu/0.53.1 \ |
| 359 | crate://crates.io/windows_x86_64_gnullvm/0.52.6 \ | 366 | crate://crates.io/windows_x86_64_gnullvm/0.52.6 \ |
| 360 | crate://crates.io/windows_x86_64_gnullvm/0.53.0 \ | 367 | crate://crates.io/windows_x86_64_gnullvm/0.53.1 \ |
| 361 | crate://crates.io/windows_x86_64_msvc/0.52.6 \ | 368 | crate://crates.io/windows_x86_64_msvc/0.52.6 \ |
| 362 | crate://crates.io/windows_x86_64_msvc/0.53.0 \ | 369 | crate://crates.io/windows_x86_64_msvc/0.53.1 \ |
| 363 | crate://crates.io/winnow/0.7.11 \ | 370 | crate://crates.io/winnow/0.7.14 \ |
| 364 | crate://crates.io/wit-bindgen-rt/0.39.0 \ | 371 | crate://crates.io/wit-bindgen/0.51.0 \ |
| 365 | crate://crates.io/write16/1.0.0 \ | 372 | crate://crates.io/write16/1.0.0 \ |
| 366 | crate://crates.io/writeable/0.6.2 \ | 373 | crate://crates.io/writeable/0.6.2 \ |
| 367 | crate://crates.io/wyz/0.5.1 \ | 374 | crate://crates.io/wyz/0.5.1 \ |
| 368 | crate://crates.io/xattr/1.6.1 \ | 375 | crate://crates.io/xattr/1.6.1 \ |
| 369 | crate://crates.io/yansi/1.0.1 \ | 376 | crate://crates.io/yansi/1.0.1 \ |
| 370 | crate://crates.io/yoke/0.8.0 \ | 377 | crate://crates.io/yoke/0.8.1 \ |
| 371 | crate://crates.io/yoke-derive/0.8.0 \ | 378 | crate://crates.io/yoke-derive/0.8.1 \ |
| 372 | crate://crates.io/z85/3.0.6 \ | 379 | crate://crates.io/z85/3.0.7 \ |
| 373 | crate://crates.io/zerocopy/0.7.35 \ | 380 | crate://crates.io/zerocopy/0.7.35 \ |
| 374 | crate://crates.io/zerocopy/0.8.27 \ | 381 | crate://crates.io/zerocopy/0.8.39 \ |
| 375 | crate://crates.io/zerocopy-derive/0.7.35 \ | 382 | crate://crates.io/zerocopy-derive/0.7.35 \ |
| 376 | crate://crates.io/zerocopy-derive/0.8.27 \ | 383 | crate://crates.io/zerocopy-derive/0.8.39 \ |
| 377 | crate://crates.io/zerofrom/0.1.6 \ | 384 | crate://crates.io/zerofrom/0.1.6 \ |
| 378 | crate://crates.io/zerofrom-derive/0.1.6 \ | 385 | crate://crates.io/zerofrom-derive/0.1.6 \ |
| 379 | crate://crates.io/zerotrie/0.2.2 \ | 386 | crate://crates.io/zerotrie/0.2.3 \ |
| 380 | crate://crates.io/zerovec/0.11.5 \ | 387 | crate://crates.io/zerovec/0.11.5 \ |
| 381 | crate://crates.io/zerovec-derive/0.11.1 \ | 388 | crate://crates.io/zerovec-derive/0.11.2 \ |
| 382 | crate://crates.io/zip/6.0.0 \ | 389 | crate://crates.io/zip/8.2.0 \ |
| 383 | crate://crates.io/zlib-rs/0.5.1 \ | 390 | crate://crates.io/zlib-rs/0.6.0 \ |
| 384 | crate://crates.io/zopfli/0.8.2 \ | 391 | crate://crates.io/zmij/1.0.19 \ |
| 392 | crate://crates.io/zopfli/0.8.3 \ | ||
| 385 | " | 393 | " |
| 386 | 394 | ||
| 387 | SRC_URI[adler2-2.0.1.sha256sum] = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" | 395 | SRC_URI[adler2-2.0.1.sha256sum] = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" |
| 388 | SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" | 396 | SRC_URI[aho-corasick-1.1.4.sha256sum] = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" |
| 389 | SRC_URI[allocator-api2-0.2.21.sha256sum] = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" | 397 | SRC_URI[allocator-api2-0.2.21.sha256sum] = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" |
| 390 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" | 398 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" |
| 391 | SRC_URI[ansi-width-0.1.0.sha256sum] = "219e3ce6f2611d83b51ec2098a12702112c29e57203a6b0a0929b2cddb486608" | 399 | SRC_URI[ansi-width-0.1.0.sha256sum] = "219e3ce6f2611d83b51ec2098a12702112c29e57203a6b0a0929b2cddb486608" |
| 392 | SRC_URI[anstream-0.6.19.sha256sum] = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" | 400 | SRC_URI[anstream-0.6.21.sha256sum] = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" |
| 393 | SRC_URI[anstyle-1.0.11.sha256sum] = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" | 401 | SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" |
| 394 | SRC_URI[anstyle-parse-0.2.7.sha256sum] = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" | 402 | SRC_URI[anstyle-parse-0.2.7.sha256sum] = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" |
| 395 | SRC_URI[anstyle-query-1.1.3.sha256sum] = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" | 403 | SRC_URI[anstyle-query-1.1.5.sha256sum] = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" |
| 396 | SRC_URI[anstyle-wincon-3.0.9.sha256sum] = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" | 404 | SRC_URI[anstyle-wincon-3.0.11.sha256sum] = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" |
| 397 | SRC_URI[anyhow-1.0.100.sha256sum] = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" | 405 | SRC_URI[anyhow-1.0.101.sha256sum] = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea" |
| 398 | SRC_URI[approx-0.5.1.sha256sum] = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" | 406 | SRC_URI[approx-0.5.1.sha256sum] = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" |
| 399 | SRC_URI[arbitrary-1.4.1.sha256sum] = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" | ||
| 400 | SRC_URI[arrayref-0.3.9.sha256sum] = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" | 407 | SRC_URI[arrayref-0.3.9.sha256sum] = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" |
| 401 | SRC_URI[arrayvec-0.7.6.sha256sum] = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" | 408 | SRC_URI[arrayvec-0.7.6.sha256sum] = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" |
| 402 | SRC_URI[autocfg-1.4.0.sha256sum] = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" | 409 | SRC_URI[autocfg-1.5.0.sha256sum] = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" |
| 403 | SRC_URI[base64-simd-0.8.0.sha256sum] = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" | 410 | SRC_URI[base64-simd-0.8.0.sha256sum] = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" |
| 404 | SRC_URI[bigdecimal-0.4.9.sha256sum] = "560f42649de9fa436b73517378a147ec21f6c997a546581df4b4b31677828934" | 411 | SRC_URI[bigdecimal-0.4.10.sha256sum] = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695" |
| 405 | SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296" | 412 | SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296" |
| 406 | SRC_URI[bincode-2.0.1.sha256sum] = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" | ||
| 407 | SRC_URI[bincode_derive-2.0.1.sha256sum] = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" | ||
| 408 | SRC_URI[bindgen-0.72.1.sha256sum] = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" | 413 | SRC_URI[bindgen-0.72.1.sha256sum] = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" |
| 409 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 414 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" |
| 410 | SRC_URI[bitflags-2.9.1.sha256sum] = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" | 415 | SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" |
| 411 | SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" | 416 | SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" |
| 412 | SRC_URI[blake2b_simd-1.0.3.sha256sum] = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99" | 417 | SRC_URI[blake2b_simd-1.0.4.sha256sum] = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3" |
| 413 | SRC_URI[blake3-1.8.2.sha256sum] = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" | 418 | SRC_URI[blake3-1.8.3.sha256sum] = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d" |
| 414 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" | 419 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" |
| 420 | SRC_URI[block2-0.6.2.sha256sum] = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" | ||
| 415 | SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" | 421 | SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" |
| 416 | SRC_URI[bumpalo-3.18.1.sha256sum] = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" | 422 | SRC_URI[bumpalo-3.19.1.sha256sum] = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" |
| 417 | SRC_URI[bytecount-0.6.9.sha256sum] = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" | 423 | SRC_URI[bytecount-0.6.9.sha256sum] = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" |
| 418 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" | 424 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" |
| 419 | SRC_URI[cc-1.2.27.sha256sum] = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" | 425 | SRC_URI[calendrical_calculations-0.2.3.sha256sum] = "3a0b39595c6ee54a8d0900204ba4c401d0ab4eb45adaf07178e8d017541529e7" |
| 426 | SRC_URI[cc-1.2.55.sha256sum] = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" | ||
| 420 | SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" | 427 | SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" |
| 421 | SRC_URI[cfg-if-1.0.1.sha256sum] = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" | 428 | SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" |
| 422 | SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" | 429 | SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" |
| 423 | SRC_URI[chrono-0.4.42.sha256sum] = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" | 430 | SRC_URI[chrono-0.4.43.sha256sum] = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" |
| 424 | SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" | 431 | SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" |
| 425 | SRC_URI[clap-4.5.53.sha256sum] = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" | 432 | SRC_URI[clap-4.5.60.sha256sum] = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" |
| 426 | SRC_URI[clap_builder-4.5.53.sha256sum] = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" | 433 | SRC_URI[clap_builder-4.5.60.sha256sum] = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" |
| 427 | SRC_URI[clap_complete-4.5.61.sha256sum] = "39615915e2ece2550c0149addac32fb5bd312c657f43845bb9088cb9c8a7c992" | 434 | SRC_URI[clap_complete-4.5.66.sha256sum] = "c757a3b7e39161a4e56f9365141ada2a6c915a8622c408ab6bb4b5d047371031" |
| 428 | SRC_URI[clap_lex-0.7.5.sha256sum] = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" | 435 | SRC_URI[clap_lex-1.0.0.sha256sum] = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" |
| 429 | SRC_URI[clap_mangen-0.2.31.sha256sum] = "439ea63a92086df93893164221ad4f24142086d535b3a0957b9b9bea2dc86301" | 436 | SRC_URI[clap_mangen-0.2.31.sha256sum] = "439ea63a92086df93893164221ad4f24142086d535b3a0957b9b9bea2dc86301" |
| 430 | SRC_URI[codspeed-4.1.0.sha256sum] = "c3b847e05a34be5c38f3f2a5052178a3bd32e6b5702f3ea775efde95c483a539" | 437 | SRC_URI[codspeed-4.3.0.sha256sum] = "38c2eb3388ebe26b5a0ab6bf4969d9c4840143d7f6df07caa3cc851b0606cef6" |
| 431 | SRC_URI[codspeed-divan-compat-4.1.0.sha256sum] = "f0f0e9fe5eaa39995ec35e46407f7154346cc25bd1300c64c21636f3d00cb2cc" | 438 | SRC_URI[codspeed-divan-compat-4.3.0.sha256sum] = "b2de65b7489a59709724d489070c6d05b7744039e4bf751d0a2006b90bb5593d" |
| 432 | SRC_URI[codspeed-divan-compat-macros-4.1.0.sha256sum] = "88c8babf2a40fd2206a2e030cf020d0d58144cd56e1dc408bfba02cdefb08b4f" | 439 | SRC_URI[codspeed-divan-compat-macros-4.3.0.sha256sum] = "56ca01ce4fd22b8dcc6c770dcd6b74343642e842482b94e8920d14e10c57638d" |
| 433 | SRC_URI[codspeed-divan-compat-walltime-4.1.0.sha256sum] = "7f26092328e12a36704ffc552f379c6405dd94d3149970b79b22d371717c2aae" | 440 | SRC_URI[codspeed-divan-compat-walltime-4.3.0.sha256sum] = "720ab9d0714718afe5f5832be6e5f5eb5ce97836e24ca7bf7042eea4308b9fb8" |
| 434 | SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" | 441 | SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" |
| 435 | SRC_URI[colored-2.2.0.sha256sum] = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" | 442 | SRC_URI[colored-2.2.0.sha256sum] = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" |
| 436 | SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3" | 443 | SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3" |
| 437 | SRC_URI[condtype-1.3.0.sha256sum] = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" | 444 | SRC_URI[condtype-1.3.0.sha256sum] = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" |
| 438 | SRC_URI[console-0.16.0.sha256sum] = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d" | 445 | SRC_URI[console-0.16.2.sha256sum] = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4" |
| 439 | SRC_URI[const-random-0.1.18.sha256sum] = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" | 446 | SRC_URI[const-random-0.1.18.sha256sum] = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" |
| 440 | SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" | 447 | SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" |
| 441 | SRC_URI[constant_time_eq-0.3.1.sha256sum] = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" | 448 | SRC_URI[constant_time_eq-0.4.2.sha256sum] = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" |
| 442 | SRC_URI[convert_case-0.7.1.sha256sum] = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" | ||
| 443 | SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" | 449 | SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" |
| 450 | SRC_URI[core_maths-0.1.1.sha256sum] = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30" | ||
| 444 | SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" | 451 | SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" |
| 445 | SRC_URI[crc-3.3.0.sha256sum] = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" | 452 | SRC_URI[crc-3.3.0.sha256sum] = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" |
| 446 | SRC_URI[crc-catalog-2.4.0.sha256sum] = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" | 453 | SRC_URI[crc-catalog-2.4.0.sha256sum] = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" |
| 447 | SRC_URI[crc-fast-1.8.1.sha256sum] = "2c15e7f62c7d6e256e6d0fc3fc1ef395348e4bc395dcf14d6990da0e5aa6e8b0" | 454 | SRC_URI[crc-fast-1.9.0.sha256sum] = "2fd92aca2c6001b1bf5ba0ff84ee74ec8501b52bbef0cac80bf25a6c1d87a83d" |
| 448 | SRC_URI[crc32fast-1.5.0.sha256sum] = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" | 455 | SRC_URI[crc32fast-1.5.0.sha256sum] = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" |
| 449 | SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" | 456 | SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" |
| 450 | SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" | 457 | SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" |
| 451 | SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" | 458 | SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" |
| 452 | SRC_URI[crossterm-0.29.0.sha256sum] = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" | 459 | SRC_URI[crossterm-0.29.0.sha256sum] = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" |
| 453 | SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" | 460 | SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" |
| 454 | SRC_URI[crunchy-0.2.3.sha256sum] = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" | 461 | SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" |
| 455 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" | 462 | SRC_URI[crypto-common-0.1.7.sha256sum] = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" |
| 456 | SRC_URI[ctor-0.6.3.sha256sum] = "424e0138278faeb2b401f174ad17e715c829512d74f3d1e81eb43365c2e0590e" | 463 | SRC_URI[ctor-0.6.3.sha256sum] = "424e0138278faeb2b401f174ad17e715c829512d74f3d1e81eb43365c2e0590e" |
| 457 | SRC_URI[ctor-proc-macro-0.0.7.sha256sum] = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1" | 464 | SRC_URI[ctor-proc-macro-0.0.7.sha256sum] = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1" |
| 458 | SRC_URI[ctrlc-3.4.7.sha256sum] = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73" | 465 | SRC_URI[ctrlc-3.5.1.sha256sum] = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790" |
| 459 | SRC_URI[data-encoding-2.9.0.sha256sum] = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" | 466 | SRC_URI[data-encoding-2.10.0.sha256sum] = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" |
| 460 | SRC_URI[data-encoding-macro-0.1.18.sha256sum] = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d" | 467 | SRC_URI[data-encoding-macro-0.1.19.sha256sum] = "8142a83c17aa9461d637e649271eae18bf2edd00e91f2e105df36c3c16355bdb" |
| 461 | SRC_URI[data-encoding-macro-internal-0.1.16.sha256sum] = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976" | 468 | SRC_URI[data-encoding-macro-internal-0.1.17.sha256sum] = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" |
| 462 | SRC_URI[deranged-0.5.2.sha256sum] = "75d7cc94194b4dd0fa12845ef8c911101b7f37633cda14997a6e82099aa0b693" | 469 | SRC_URI[deranged-0.5.5.sha256sum] = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" |
| 463 | SRC_URI[derive_arbitrary-1.4.1.sha256sum] = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" | ||
| 464 | SRC_URI[derive_more-2.0.1.sha256sum] = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" | ||
| 465 | SRC_URI[derive_more-impl-2.0.1.sha256sum] = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" | ||
| 466 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" | 470 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" |
| 467 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" | 471 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" |
| 472 | SRC_URI[dispatch2-0.3.0.sha256sum] = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" | ||
| 468 | SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" | 473 | SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" |
| 469 | SRC_URI[divan-macros-0.1.17.sha256sum] = "8dc51d98e636f5e3b0759a39257458b22619cac7e96d932da6eeb052891bb67c" | 474 | SRC_URI[divan-macros-0.1.17.sha256sum] = "8dc51d98e636f5e3b0759a39257458b22619cac7e96d932da6eeb052891bb67c" |
| 470 | SRC_URI[dlv-list-0.5.2.sha256sum] = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" | 475 | SRC_URI[dlv-list-0.5.2.sha256sum] = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" |
| 471 | SRC_URI[dns-lookup-3.0.1.sha256sum] = "6e39034cee21a2f5bbb66ba0e3689819c4bb5d00382a282006e802a7ffa6c41d" | 476 | SRC_URI[dns-lookup-3.0.1.sha256sum] = "6e39034cee21a2f5bbb66ba0e3689819c4bb5d00382a282006e802a7ffa6c41d" |
| 472 | SRC_URI[document-features-0.2.11.sha256sum] = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" | 477 | SRC_URI[document-features-0.2.12.sha256sum] = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" |
| 473 | SRC_URI[dtor-0.1.0.sha256sum] = "e58a0764cddb55ab28955347b45be00ade43d4d6f3ba4bf3dc354e4ec9432934" | 478 | SRC_URI[dtor-0.1.1.sha256sum] = "404d02eeb088a82cfd873006cb713fe411306c7d182c344905e101fb1167d301" |
| 474 | SRC_URI[dtor-proc-macro-0.0.6.sha256sum] = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5" | 479 | SRC_URI[dtor-proc-macro-0.0.6.sha256sum] = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5" |
| 475 | SRC_URI[dunce-1.0.5.sha256sum] = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" | 480 | SRC_URI[dunce-1.0.5.sha256sum] = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" |
| 476 | SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" | 481 | SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" |
| 477 | SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" | 482 | SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" |
| 478 | SRC_URI[equivalent-1.0.2.sha256sum] = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" | 483 | SRC_URI[equivalent-1.0.2.sha256sum] = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" |
| 479 | SRC_URI[errno-0.3.12.sha256sum] = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" | 484 | SRC_URI[errno-0.3.14.sha256sum] = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" |
| 480 | SRC_URI[exacl-0.12.0.sha256sum] = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" | 485 | SRC_URI[exacl-0.12.0.sha256sum] = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" |
| 481 | SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" | 486 | SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" |
| 482 | SRC_URI[file_diff-1.0.0.sha256sum] = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5" | 487 | SRC_URI[file_diff-1.0.0.sha256sum] = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5" |
| 483 | SRC_URI[filedescriptor-0.8.3.sha256sum] = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d" | 488 | SRC_URI[filedescriptor-0.8.3.sha256sum] = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d" |
| 484 | SRC_URI[filetime-0.2.26.sha256sum] = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" | 489 | SRC_URI[filetime-0.2.27.sha256sum] = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" |
| 485 | SRC_URI[fixed_decimal-0.7.0.sha256sum] = "35943d22b2f19c0cb198ecf915910a8158e94541c89dcc63300d7799d46c2c5e" | 490 | SRC_URI[find-msvc-tools-0.1.9.sha256sum] = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" |
| 486 | SRC_URI[flate2-1.1.2.sha256sum] = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" | 491 | SRC_URI[fixed_decimal-0.7.1.sha256sum] = "35eabf480f94d69182677e37571d3be065822acfafd12f2f085db44fbbcc8e57" |
| 492 | SRC_URI[flate2-1.1.9.sha256sum] = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" | ||
| 487 | SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477" | 493 | SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477" |
| 488 | SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4" | 494 | SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4" |
| 489 | SRC_URI[fluent-langneg-0.13.0.sha256sum] = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" | 495 | SRC_URI[fluent-langneg-0.13.1.sha256sum] = "7eebbe59450baee8282d71676f3bfed5689aeab00b27545e83e5f14b1195e8b0" |
| 490 | SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" | 496 | SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" |
| 491 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" | ||
| 492 | SRC_URI[foldhash-0.1.5.sha256sum] = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" | 497 | SRC_URI[foldhash-0.1.5.sha256sum] = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" |
| 498 | SRC_URI[foldhash-0.2.0.sha256sum] = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" | ||
| 493 | SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" | 499 | SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" |
| 494 | SRC_URI[fsevent-sys-4.1.0.sha256sum] = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" | 500 | SRC_URI[fsevent-sys-4.1.0.sha256sum] = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" |
| 495 | SRC_URI[fts-sys-0.2.17.sha256sum] = "9c03259139c9b098dd92241b046fedfeebcd6b000d491c821b24ced28558a9c2" | 501 | SRC_URI[fts-sys-0.2.17.sha256sum] = "9c03259139c9b098dd92241b046fedfeebcd6b000d491c821b24ced28558a9c2" |
| 496 | SRC_URI[funty-2.0.0.sha256sum] = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" | 502 | SRC_URI[funty-2.0.0.sha256sum] = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" |
| 497 | SRC_URI[futures-core-0.3.31.sha256sum] = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" | 503 | SRC_URI[futures-core-0.3.32.sha256sum] = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" |
| 498 | SRC_URI[futures-macro-0.3.31.sha256sum] = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" | 504 | SRC_URI[futures-macro-0.3.32.sha256sum] = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" |
| 499 | SRC_URI[futures-task-0.3.31.sha256sum] = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" | 505 | SRC_URI[futures-task-0.3.32.sha256sum] = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" |
| 500 | SRC_URI[futures-timer-3.0.3.sha256sum] = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" | 506 | SRC_URI[futures-timer-3.0.3.sha256sum] = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" |
| 501 | SRC_URI[futures-util-0.3.31.sha256sum] = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" | 507 | SRC_URI[futures-util-0.3.32.sha256sum] = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" |
| 502 | SRC_URI[gcd-2.3.0.sha256sum] = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" | 508 | SRC_URI[gcd-2.3.0.sha256sum] = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" |
| 503 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" | 509 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" |
| 504 | SRC_URI[getrandom-0.2.16.sha256sum] = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" | 510 | SRC_URI[getrandom-0.2.17.sha256sum] = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" |
| 505 | SRC_URI[getrandom-0.3.3.sha256sum] = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" | 511 | SRC_URI[getrandom-0.3.4.sha256sum] = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" |
| 506 | SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" | 512 | SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" |
| 507 | SRC_URI[half-2.7.1.sha256sum] = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" | 513 | SRC_URI[half-2.7.1.sha256sum] = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" |
| 508 | SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" | 514 | SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" |
| 509 | SRC_URI[hashbrown-0.15.4.sha256sum] = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" | 515 | SRC_URI[hashbrown-0.15.5.sha256sum] = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" |
| 516 | SRC_URI[hashbrown-0.16.1.sha256sum] = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" | ||
| 510 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" | 517 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" |
| 511 | SRC_URI[hex-literal-1.1.0.sha256sum] = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1" | 518 | SRC_URI[hex-literal-1.1.0.sha256sum] = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1" |
| 512 | SRC_URI[hostname-0.4.2.sha256sum] = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd" | 519 | SRC_URI[hostname-0.4.2.sha256sum] = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd" |
| 513 | SRC_URI[iana-time-zone-0.1.64.sha256sum] = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" | 520 | SRC_URI[iana-time-zone-0.1.65.sha256sum] = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" |
| 514 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" | 521 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" |
| 522 | SRC_URI[icu_calendar-2.1.1.sha256sum] = "d6f0e52e009b6b16ba9c0693578796f2dd4aaa59a7f8f920423706714a89ac4e" | ||
| 523 | SRC_URI[icu_calendar_data-2.1.1.sha256sum] = "527f04223b17edfe0bd43baf14a0cb1b017830db65f3950dc00224860a9a446d" | ||
| 515 | SRC_URI[icu_collator-2.1.1.sha256sum] = "32eed11a5572f1088b63fa21dc2e70d4a865e5739fc2d10abc05be93bae97019" | 524 | SRC_URI[icu_collator-2.1.1.sha256sum] = "32eed11a5572f1088b63fa21dc2e70d4a865e5739fc2d10abc05be93bae97019" |
| 516 | SRC_URI[icu_collator_data-2.1.1.sha256sum] = "5ab06f0e83a613efddba3e4913e00e43ed4001fae651cb7d40fc7e66b83b6fb9" | 525 | SRC_URI[icu_collator_data-2.1.1.sha256sum] = "5ab06f0e83a613efddba3e4913e00e43ed4001fae651cb7d40fc7e66b83b6fb9" |
| 517 | SRC_URI[icu_collections-2.1.1.sha256sum] = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" | 526 | SRC_URI[icu_collections-2.1.1.sha256sum] = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" |
| 527 | SRC_URI[icu_datetime-2.1.1.sha256sum] = "1b9d49f41ded8e63761b6b4c3120dfdc289415a1ed10107db6198eb311057ca5" | ||
| 528 | SRC_URI[icu_datetime_data-2.1.2.sha256sum] = "46597233625417b7c8052a63d916e4fdc73df21614ac0b679492a5d6e3b01aeb" | ||
| 518 | SRC_URI[icu_decimal-2.1.1.sha256sum] = "a38c52231bc348f9b982c1868a2af3195199623007ba2c7650f432038f5b3e8e" | 529 | SRC_URI[icu_decimal-2.1.1.sha256sum] = "a38c52231bc348f9b982c1868a2af3195199623007ba2c7650f432038f5b3e8e" |
| 519 | SRC_URI[icu_decimal_data-2.1.1.sha256sum] = "2905b4044eab2dd848fe84199f9195567b63ab3a93094711501363f63546fef7" | 530 | SRC_URI[icu_decimal_data-2.1.1.sha256sum] = "2905b4044eab2dd848fe84199f9195567b63ab3a93094711501363f63546fef7" |
| 520 | SRC_URI[icu_locale-2.1.1.sha256sum] = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60" | 531 | SRC_URI[icu_locale-2.1.1.sha256sum] = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60" |
| 521 | SRC_URI[icu_locale_core-2.1.1.sha256sum] = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" | 532 | SRC_URI[icu_locale_core-2.1.1.sha256sum] = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" |
| 522 | SRC_URI[icu_locale_data-2.1.1.sha256sum] = "f03e2fcaefecdf05619f3d6f91740e79ab969b4dd54f77cbf546b1d0d28e3147" | 533 | SRC_URI[icu_locale_data-2.1.2.sha256sum] = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831" |
| 523 | SRC_URI[icu_normalizer-2.1.1.sha256sum] = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" | 534 | SRC_URI[icu_normalizer-2.1.1.sha256sum] = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" |
| 524 | SRC_URI[icu_normalizer_data-2.1.1.sha256sum] = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" | 535 | SRC_URI[icu_normalizer_data-2.1.1.sha256sum] = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" |
| 525 | SRC_URI[icu_properties-2.1.1.sha256sum] = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" | 536 | SRC_URI[icu_pattern-0.4.1.sha256sum] = "7a7ff8c0ff6f61cdce299dcb54f557b0a251adbc78f6f0c35a21332c452b4a1b" |
| 526 | SRC_URI[icu_properties_data-2.1.1.sha256sum] = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" | 537 | SRC_URI[icu_plurals-2.1.1.sha256sum] = "4f9cfe49f5b1d1163cc58db451562339916a9ca5cbcaae83924d41a0bf839474" |
| 538 | SRC_URI[icu_plurals_data-2.1.1.sha256sum] = "f018a98dccf7f0eb02ba06ac0ff67d102d8ded80734724305e924de304e12ff0" | ||
| 539 | SRC_URI[icu_properties-2.1.2.sha256sum] = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" | ||
| 540 | SRC_URI[icu_properties_data-2.1.2.sha256sum] = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" | ||
| 527 | SRC_URI[icu_provider-2.1.1.sha256sum] = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" | 541 | SRC_URI[icu_provider-2.1.1.sha256sum] = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" |
| 528 | SRC_URI[indexmap-2.9.0.sha256sum] = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" | 542 | SRC_URI[icu_time-2.1.1.sha256sum] = "8242b00da3b3b6678f731437a11c8833a43c821ae081eca60ba1b7579d45b6d8" |
| 529 | SRC_URI[indicatif-0.18.3.sha256sum] = "9375e112e4b463ec1b1c6c011953545c65a30164fbab5b581df32b3abf0dcb88" | 543 | SRC_URI[icu_time_data-2.1.1.sha256sum] = "3e10b0e5e87a2c84bd5fa407705732052edebe69291d347d0c3033785470edbf" |
| 544 | SRC_URI[indexmap-2.13.0.sha256sum] = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" | ||
| 545 | SRC_URI[indicatif-0.18.4.sha256sum] = "25470f23803092da7d239834776d653104d551bc4d7eacaf31e6837854b8e9eb" | ||
| 530 | SRC_URI[inotify-0.11.0.sha256sum] = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" | 546 | SRC_URI[inotify-0.11.0.sha256sum] = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" |
| 531 | SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" | 547 | SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" |
| 532 | SRC_URI[intl-memoizer-0.5.3.sha256sum] = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f" | 548 | SRC_URI[intl-memoizer-0.5.3.sha256sum] = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f" |
| 533 | SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" | 549 | SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" |
| 534 | SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" | 550 | SRC_URI[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" |
| 535 | SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" | 551 | SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" |
| 536 | SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" | 552 | SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" |
| 537 | SRC_URI[itoa-1.0.15.sha256sum] = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" | 553 | SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" |
| 538 | SRC_URI[jiff-0.2.16.sha256sum] = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35" | 554 | SRC_URI[ixdtf-0.6.4.sha256sum] = "84de9d95a6d2547d9b77ee3f25fa0ee32e3c3a6484d47a55adebc0439c077992" |
| 539 | SRC_URI[jiff-static-0.2.16.sha256sum] = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69" | 555 | SRC_URI[jiff-0.2.23.sha256sum] = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" |
| 540 | SRC_URI[jiff-tzdb-0.1.4.sha256sum] = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524" | 556 | SRC_URI[jiff-icu-0.2.2.sha256sum] = "0e67c2beaae8b10a82d849b9aabb698a43a682f32b17bcdc035d5ecadb44d646" |
| 557 | SRC_URI[jiff-static-0.2.23.sha256sum] = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" | ||
| 558 | SRC_URI[jiff-tzdb-0.1.5.sha256sum] = "68971ebff725b9e2ca27a601c5eb38a4c5d64422c4cbab0c535f248087eda5c2" | ||
| 541 | SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" | 559 | SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" |
| 542 | SRC_URI[js-sys-0.3.77.sha256sum] = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" | 560 | SRC_URI[js-sys-0.3.85.sha256sum] = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" |
| 543 | SRC_URI[keccak-0.1.5.sha256sum] = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" | 561 | SRC_URI[keccak-0.1.6.sha256sum] = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" |
| 544 | SRC_URI[kqueue-1.1.1.sha256sum] = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" | 562 | SRC_URI[kqueue-1.1.1.sha256sum] = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" |
| 545 | SRC_URI[kqueue-sys-1.0.4.sha256sum] = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" | 563 | SRC_URI[kqueue-sys-1.0.4.sha256sum] = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" |
| 546 | SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" | 564 | SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" |
| 547 | SRC_URI[libc-0.2.175.sha256sum] = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" | 565 | SRC_URI[libc-0.2.182.sha256sum] = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" |
| 548 | SRC_URI[libloading-0.8.8.sha256sum] = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" | 566 | SRC_URI[libloading-0.8.9.sha256sum] = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" |
| 549 | SRC_URI[libm-0.2.15.sha256sum] = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" | 567 | SRC_URI[libm-0.2.16.sha256sum] = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" |
| 550 | SRC_URI[libredox-0.1.3.sha256sum] = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" | 568 | SRC_URI[libredox-0.1.12.sha256sum] = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" |
| 551 | SRC_URI[libz-rs-sys-0.5.1.sha256sum] = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221" | 569 | SRC_URI[linux-raw-sys-0.12.1.sha256sum] = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" |
| 552 | SRC_URI[linux-raw-sys-0.11.0.sha256sum] = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" | 570 | SRC_URI[litemap-0.8.1.sha256sum] = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" |
| 553 | SRC_URI[linux-raw-sys-0.12.0.sha256sum] = "b83b49c75b50cb715b09d337b045481493a8ada2bb3e872f2bae71db45b27696" | 571 | SRC_URI[litrs-1.0.0.sha256sum] = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" |
| 554 | SRC_URI[litemap-0.8.0.sha256sum] = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" | 572 | SRC_URI[lock_api-0.4.14.sha256sum] = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" |
| 555 | SRC_URI[litrs-0.4.1.sha256sum] = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" | 573 | SRC_URI[log-0.4.29.sha256sum] = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" |
| 556 | SRC_URI[lock_api-0.4.13.sha256sum] = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" | 574 | SRC_URI[lru-0.16.3.sha256sum] = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" |
| 557 | SRC_URI[log-0.4.27.sha256sum] = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" | ||
| 558 | SRC_URI[lru-0.12.5.sha256sum] = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" | ||
| 559 | SRC_URI[lscolors-0.21.0.sha256sum] = "d60e266dfb1426eb2d24792602e041131fdc0236bb7007abc0e589acafd60929" | 575 | SRC_URI[lscolors-0.21.0.sha256sum] = "d60e266dfb1426eb2d24792602e041131fdc0236bb7007abc0e589acafd60929" |
| 560 | SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" | 576 | SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" |
| 561 | SRC_URI[memchr-2.7.6.sha256sum] = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" | 577 | SRC_URI[memchr-2.8.0.sha256sum] = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" |
| 562 | SRC_URI[memmap2-0.9.9.sha256sum] = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490" | 578 | SRC_URI[memmap2-0.9.10.sha256sum] = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3" |
| 563 | SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" | 579 | SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" |
| 564 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" | 580 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" |
| 565 | SRC_URI[miniz_oxide-0.8.9.sha256sum] = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" | 581 | SRC_URI[miniz_oxide-0.8.9.sha256sum] = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" |
| 566 | SRC_URI[mio-1.0.4.sha256sum] = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" | 582 | SRC_URI[mio-1.1.1.sha256sum] = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" |
| 567 | SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" | 583 | SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" |
| 568 | SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" | 584 | SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" |
| 569 | SRC_URI[nom-8.0.0.sha256sum] = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" | 585 | SRC_URI[nom-8.0.0.sha256sum] = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" |
| 570 | SRC_URI[notify-8.2.0.sha256sum] = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" | 586 | SRC_URI[notify-8.2.0.sha256sum] = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" |
| 571 | SRC_URI[notify-types-2.0.0.sha256sum] = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" | 587 | SRC_URI[notify-types-2.1.0.sha256sum] = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" |
| 572 | SRC_URI[nu-ansi-term-0.50.3.sha256sum] = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" | 588 | SRC_URI[nu-ansi-term-0.50.3.sha256sum] = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" |
| 573 | SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" | 589 | SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" |
| 574 | SRC_URI[num-conv-0.1.0.sha256sum] = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" | 590 | SRC_URI[num-conv-0.2.0.sha256sum] = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" |
| 575 | SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" | 591 | SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" |
| 576 | SRC_URI[num-modular-0.5.1.sha256sum] = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" | 592 | SRC_URI[num-modular-0.6.1.sha256sum] = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f" |
| 577 | SRC_URI[num-prime-0.4.4.sha256sum] = "e238432a7881ec7164503ccc516c014bf009be7984cde1ba56837862543bdec3" | 593 | SRC_URI[num-prime-0.5.0.sha256sum] = "b285c575532a33ef6fdd3a57640d0b1c70e6ca48644d6df7bbd4b7a0cfbbb12d" |
| 578 | SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" | 594 | SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" |
| 579 | SRC_URI[num_threads-0.1.7.sha256sum] = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" | 595 | SRC_URI[num_threads-0.1.7.sha256sum] = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" |
| 596 | SRC_URI[objc2-0.6.3.sha256sum] = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" | ||
| 597 | SRC_URI[objc2-encode-4.1.0.sha256sum] = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" | ||
| 580 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" | 598 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" |
| 581 | SRC_URI[once_cell_polyfill-1.70.1.sha256sum] = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" | 599 | SRC_URI[once_cell_polyfill-1.70.2.sha256sum] = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" |
| 582 | SRC_URI[onig-6.5.1.sha256sum] = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0" | 600 | SRC_URI[onig-6.5.1.sha256sum] = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0" |
| 583 | SRC_URI[onig_sys-69.9.1.sha256sum] = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc" | 601 | SRC_URI[onig_sys-69.9.1.sha256sum] = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc" |
| 584 | SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" | 602 | SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" |
| 585 | SRC_URI[os_display-0.1.4.sha256sum] = "ad5fd71b79026fb918650dde6d125000a233764f1c2f1659a1c71118e33ea08f" | 603 | SRC_URI[os_display-0.1.4.sha256sum] = "ad5fd71b79026fb918650dde6d125000a233764f1c2f1659a1c71118e33ea08f" |
| 586 | SRC_URI[outref-0.5.2.sha256sum] = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" | 604 | SRC_URI[outref-0.5.2.sha256sum] = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" |
| 587 | SRC_URI[parking_lot-0.12.4.sha256sum] = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" | 605 | SRC_URI[parking_lot-0.12.5.sha256sum] = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" |
| 588 | SRC_URI[parking_lot_core-0.9.11.sha256sum] = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" | 606 | SRC_URI[parking_lot_core-0.9.12.sha256sum] = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" |
| 589 | SRC_URI[parse_datetime-0.13.3.sha256sum] = "acea383beda9652270f3c9678d83aa58cbfc16880343cae0c0c8c7d6c0974132" | 607 | SRC_URI[parse_datetime-0.14.0.sha256sum] = "413775a7eac2261d2211a79d10ef275e5b6f7b527eec42ad09adce2ffa92b6e5" |
| 590 | SRC_URI[phf-0.13.1.sha256sum] = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" | 608 | SRC_URI[phf-0.13.1.sha256sum] = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" |
| 591 | SRC_URI[phf_codegen-0.13.1.sha256sum] = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1" | 609 | SRC_URI[phf_codegen-0.13.1.sha256sum] = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1" |
| 592 | SRC_URI[phf_generator-0.13.1.sha256sum] = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" | 610 | SRC_URI[phf_generator-0.13.1.sha256sum] = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" |
| 593 | SRC_URI[phf_shared-0.13.1.sha256sum] = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" | 611 | SRC_URI[phf_shared-0.13.1.sha256sum] = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" |
| 594 | SRC_URI[pin-project-lite-0.2.16.sha256sum] = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" | 612 | SRC_URI[pin-project-lite-0.2.16.sha256sum] = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" |
| 595 | SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" | ||
| 596 | SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" | 613 | SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" |
| 597 | SRC_URI[platform-info-2.0.5.sha256sum] = "7539aeb3fdd8cb4f6a331307cf71a1039cee75e94e8a71725b9484f4a0d9451a" | 614 | SRC_URI[platform-info-2.0.5.sha256sum] = "7539aeb3fdd8cb4f6a331307cf71a1039cee75e94e8a71725b9484f4a0d9451a" |
| 598 | SRC_URI[portable-atomic-1.11.1.sha256sum] = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" | 615 | SRC_URI[portable-atomic-1.13.1.sha256sum] = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" |
| 599 | SRC_URI[portable-atomic-util-0.2.4.sha256sum] = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" | 616 | SRC_URI[portable-atomic-util-0.2.5.sha256sum] = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5" |
| 600 | SRC_URI[potential_utf-0.1.4.sha256sum] = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" | 617 | SRC_URI[potential_utf-0.1.4.sha256sum] = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" |
| 601 | SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" | 618 | SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" |
| 602 | SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" | 619 | SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" |
| 603 | SRC_URI[pretty_assertions-1.4.1.sha256sum] = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" | 620 | SRC_URI[pretty_assertions-1.4.1.sha256sum] = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" |
| 604 | SRC_URI[prettyplease-0.2.34.sha256sum] = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55" | 621 | SRC_URI[prettyplease-0.2.37.sha256sum] = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" |
| 605 | SRC_URI[proc-macro-crate-3.3.0.sha256sum] = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" | 622 | SRC_URI[proc-macro-crate-3.4.0.sha256sum] = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" |
| 606 | SRC_URI[proc-macro2-1.0.103.sha256sum] = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" | 623 | SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" |
| 607 | SRC_URI[procfs-0.18.0.sha256sum] = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" | 624 | SRC_URI[procfs-0.18.0.sha256sum] = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" |
| 608 | SRC_URI[procfs-core-0.18.0.sha256sum] = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" | 625 | SRC_URI[procfs-core-0.18.0.sha256sum] = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" |
| 609 | SRC_URI[quote-1.0.42.sha256sum] = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" | 626 | SRC_URI[quote-1.0.45.sha256sum] = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" |
| 610 | SRC_URI[r-efi-5.2.0.sha256sum] = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" | 627 | SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" |
| 611 | SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" | 628 | SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" |
| 612 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" | 629 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" |
| 613 | SRC_URI[rand-0.9.2.sha256sum] = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" | 630 | SRC_URI[rand-0.9.2.sha256sum] = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" |
| 614 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" | 631 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" |
| 615 | SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" | 632 | SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" |
| 616 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" | 633 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" |
| 617 | SRC_URI[rand_core-0.9.3.sha256sum] = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" | 634 | SRC_URI[rand_core-0.9.5.sha256sum] = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" |
| 618 | SRC_URI[rayon-1.11.0.sha256sum] = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" | 635 | SRC_URI[rayon-1.11.0.sha256sum] = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" |
| 619 | SRC_URI[rayon-core-1.13.0.sha256sum] = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" | 636 | SRC_URI[rayon-core-1.13.0.sha256sum] = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" |
| 620 | SRC_URI[redox_syscall-0.5.13.sha256sum] = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" | 637 | SRC_URI[redox_syscall-0.5.18.sha256sum] = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" |
| 621 | SRC_URI[regex-1.12.2.sha256sum] = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" | 638 | SRC_URI[redox_syscall-0.7.0.sha256sum] = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27" |
| 622 | SRC_URI[regex-automata-0.4.12.sha256sum] = "722166aa0d7438abbaa4d5cc2c649dac844e8c56d82fb3d33e9c34b5cd268fc6" | 639 | SRC_URI[regex-1.12.3.sha256sum] = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" |
| 623 | SRC_URI[regex-lite-0.1.7.sha256sum] = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30" | 640 | SRC_URI[regex-automata-0.4.14.sha256sum] = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" |
| 624 | SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" | 641 | SRC_URI[regex-lite-0.1.9.sha256sum] = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973" |
| 642 | SRC_URI[regex-syntax-0.8.9.sha256sum] = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" | ||
| 625 | SRC_URI[relative-path-1.9.3.sha256sum] = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" | 643 | SRC_URI[relative-path-1.9.3.sha256sum] = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" |
| 626 | SRC_URI[rlimit-0.10.2.sha256sum] = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a" | 644 | SRC_URI[rlimit-0.11.0.sha256sum] = "f35ee2729c56bb610f6dba436bf78135f728b7373bdffae2ec815b2d3eb98cc3" |
| 627 | SRC_URI[roff-0.2.2.sha256sum] = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" | 645 | SRC_URI[roff-0.2.2.sha256sum] = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" |
| 628 | SRC_URI[rstest-0.26.1.sha256sum] = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49" | 646 | SRC_URI[rstest-0.26.1.sha256sum] = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49" |
| 629 | SRC_URI[rstest_macros-0.26.1.sha256sum] = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0" | 647 | SRC_URI[rstest_macros-0.26.1.sha256sum] = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0" |
| 630 | SRC_URI[rust-ini-0.21.3.sha256sum] = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7" | 648 | SRC_URI[rust-ini-0.21.3.sha256sum] = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7" |
| 631 | SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" | 649 | SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" |
| 632 | SRC_URI[rustc_version-0.4.1.sha256sum] = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" | 650 | SRC_URI[rustc_version-0.4.1.sha256sum] = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" |
| 633 | SRC_URI[rustix-1.1.2.sha256sum] = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" | 651 | SRC_URI[rustix-1.1.4.sha256sum] = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" |
| 634 | SRC_URI[rustversion-1.0.21.sha256sum] = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" | 652 | SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" |
| 635 | SRC_URI[ryu-1.0.20.sha256sum] = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" | ||
| 636 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" | 653 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" |
| 637 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" | 654 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" |
| 638 | SRC_URI[self_cell-1.2.1.sha256sum] = "16c2f82143577edb4921b71ede051dac62ca3c16084e918bf7b40c96ae10eb33" | 655 | SRC_URI[self_cell-1.2.2.sha256sum] = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" |
| 639 | SRC_URI[selinux-0.5.2.sha256sum] = "2ef2ca58174235414aee5465f5d8ef9f5833023b31484eb52ca505f306f4573c" | 656 | SRC_URI[selinux-0.6.0.sha256sum] = "7f4d7a0c34b924081f7fbdcb93121399f0d4182c0ec4bf9c01bfe4e7e21fcf16" |
| 640 | SRC_URI[selinux-sys-0.6.15.sha256sum] = "debaba5832b4831ffe0ba9118b526c752c960f41c46c4ef197d9a15f5179d6fd" | 657 | SRC_URI[selinux-sys-0.6.15.sha256sum] = "debaba5832b4831ffe0ba9118b526c752c960f41c46c4ef197d9a15f5179d6fd" |
| 641 | SRC_URI[semver-1.0.26.sha256sum] = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" | 658 | SRC_URI[semver-1.0.27.sha256sum] = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" |
| 642 | SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" | 659 | SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" |
| 643 | SRC_URI[serde-big-array-0.5.1.sha256sum] = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" | ||
| 644 | SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" | 660 | SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" |
| 645 | SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" | 661 | SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" |
| 646 | SRC_URI[serde_json-1.0.140.sha256sum] = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" | 662 | SRC_URI[serde_json-1.0.149.sha256sum] = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" |
| 647 | SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" | 663 | SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" |
| 648 | SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" | 664 | SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" |
| 649 | SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" | 665 | SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" |
| 650 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" | 666 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" |
| 651 | SRC_URI[signal-hook-0.3.18.sha256sum] = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" | 667 | SRC_URI[signal-hook-0.3.18.sha256sum] = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" |
| 652 | SRC_URI[signal-hook-mio-0.2.4.sha256sum] = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" | 668 | SRC_URI[signal-hook-mio-0.2.5.sha256sum] = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc" |
| 653 | SRC_URI[signal-hook-registry-1.4.5.sha256sum] = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" | 669 | SRC_URI[signal-hook-registry-1.4.8.sha256sum] = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" |
| 654 | SRC_URI[simd-adler32-0.3.7.sha256sum] = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" | 670 | SRC_URI[simd-adler32-0.3.8.sha256sum] = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" |
| 655 | SRC_URI[siphasher-1.0.1.sha256sum] = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" | 671 | SRC_URI[siphasher-1.0.2.sha256sum] = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" |
| 656 | SRC_URI[slab-0.4.9.sha256sum] = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" | 672 | SRC_URI[slab-0.4.12.sha256sum] = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" |
| 657 | SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" | 673 | SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" |
| 658 | SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" | 674 | SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" |
| 659 | SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" | 675 | SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" |
| 660 | SRC_URI[socket2-0.6.0.sha256sum] = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" | 676 | SRC_URI[socket2-0.6.2.sha256sum] = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" |
| 661 | SRC_URI[spin-0.10.0.sha256sum] = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591" | 677 | SRC_URI[spin-0.10.0.sha256sum] = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591" |
| 662 | SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" | 678 | SRC_URI[stable_deref_trait-1.2.1.sha256sum] = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" |
| 663 | SRC_URI[statrs-0.18.0.sha256sum] = "2a3fe7c28c6512e766b0874335db33c94ad7b8f9054228ae1c2abd47ce7d335e" | 679 | SRC_URI[statrs-0.18.0.sha256sum] = "2a3fe7c28c6512e766b0874335db33c94ad7b8f9054228ae1c2abd47ce7d335e" |
| 680 | SRC_URI[string-interner-0.19.0.sha256sum] = "23de088478b31c349c9ba67816fa55d9355232d63c3afea8bf513e31f0f1d2c0" | ||
| 664 | SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" | 681 | SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" |
| 665 | SRC_URI[syn-2.0.103.sha256sum] = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8" | 682 | SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" |
| 666 | SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" | 683 | SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" |
| 667 | SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" | 684 | SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" |
| 668 | SRC_URI[tempfile-3.23.0.sha256sum] = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" | 685 | SRC_URI[tempfile-3.26.0.sha256sum] = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" |
| 669 | SRC_URI[terminal_size-0.4.3.sha256sum] = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0" | 686 | SRC_URI[terminal_size-0.4.3.sha256sum] = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0" |
| 670 | SRC_URI[textwrap-0.16.2.sha256sum] = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" | 687 | SRC_URI[textwrap-0.16.2.sha256sum] = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" |
| 671 | SRC_URI[thiserror-1.0.69.sha256sum] = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" | 688 | SRC_URI[thiserror-1.0.69.sha256sum] = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" |
| 672 | SRC_URI[thiserror-2.0.17.sha256sum] = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" | 689 | SRC_URI[thiserror-2.0.18.sha256sum] = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" |
| 673 | SRC_URI[thiserror-impl-1.0.69.sha256sum] = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" | 690 | SRC_URI[thiserror-impl-1.0.69.sha256sum] = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" |
| 674 | SRC_URI[thiserror-impl-2.0.17.sha256sum] = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" | 691 | SRC_URI[thiserror-impl-2.0.18.sha256sum] = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" |
| 675 | SRC_URI[time-0.3.44.sha256sum] = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" | 692 | SRC_URI[time-0.3.47.sha256sum] = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" |
| 676 | SRC_URI[time-core-0.1.6.sha256sum] = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" | 693 | SRC_URI[time-core-0.1.8.sha256sum] = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" |
| 677 | SRC_URI[time-macros-0.2.24.sha256sum] = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" | 694 | SRC_URI[time-macros-0.2.27.sha256sum] = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" |
| 678 | SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" | 695 | SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" |
| 679 | SRC_URI[tinystr-0.8.1.sha256sum] = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" | 696 | SRC_URI[tinystr-0.8.2.sha256sum] = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" |
| 680 | SRC_URI[toml_datetime-0.6.11.sha256sum] = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" | 697 | SRC_URI[toml_datetime-0.7.5+spec-1.1.0.sha256sum] = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" |
| 681 | SRC_URI[toml_edit-0.22.27.sha256sum] = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" | 698 | SRC_URI[toml_edit-0.23.10+spec-1.0.0.sha256sum] = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" |
| 699 | SRC_URI[toml_parser-1.0.6+spec-1.1.0.sha256sum] = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" | ||
| 682 | SRC_URI[type-map-0.5.1.sha256sum] = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" | 700 | SRC_URI[type-map-0.5.1.sha256sum] = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" |
| 683 | SRC_URI[typenum-1.18.0.sha256sum] = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" | 701 | SRC_URI[typed-path-0.12.2.sha256sum] = "3015e6ce46d5ad8751e4a772543a30c7511468070e98e64e20165f8f81155b64" |
| 702 | SRC_URI[typenum-1.19.0.sha256sum] = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" | ||
| 684 | SRC_URI[unic-langid-0.9.6.sha256sum] = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84cb8df7b3ef952748d752a7d05" | 703 | SRC_URI[unic-langid-0.9.6.sha256sum] = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84cb8df7b3ef952748d752a7d05" |
| 685 | SRC_URI[unic-langid-impl-0.9.6.sha256sum] = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658" | 704 | SRC_URI[unic-langid-impl-0.9.6.sha256sum] = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658" |
| 686 | SRC_URI[unicode-ident-1.0.18.sha256sum] = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" | 705 | SRC_URI[unicode-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" |
| 687 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" | 706 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" |
| 688 | SRC_URI[unicode-segmentation-1.12.0.sha256sum] = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" | ||
| 689 | SRC_URI[unicode-width-0.1.14.sha256sum] = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" | 707 | SRC_URI[unicode-width-0.1.14.sha256sum] = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" |
| 690 | SRC_URI[unicode-width-0.2.2.sha256sum] = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" | 708 | SRC_URI[unicode-width-0.2.2.sha256sum] = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" |
| 691 | SRC_URI[unindent-0.2.4.sha256sum] = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" | 709 | SRC_URI[unindent-0.2.4.sha256sum] = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" |
| 692 | SRC_URI[unit-prefix-0.5.2.sha256sum] = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3" | 710 | SRC_URI[unit-prefix-0.5.2.sha256sum] = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3" |
| 693 | SRC_URI[unty-0.0.4.sha256sum] = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" | ||
| 694 | SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" | 711 | SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" |
| 695 | SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" | 712 | SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" |
| 696 | SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" | 713 | SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" |
| 697 | SRC_URI[utmp-classic-0.1.6.sha256sum] = "e24c654e19afaa6b8f3877ece5d3bed849c2719c56f6752b18ca7da4fcc6e85a" | 714 | SRC_URI[utmp-classic-0.1.6.sha256sum] = "e24c654e19afaa6b8f3877ece5d3bed849c2719c56f6752b18ca7da4fcc6e85a" |
| 698 | SRC_URI[utmp-classic-raw-0.1.3.sha256sum] = "22c226537a3d6e01c440c1926ca0256dbee2d19b2229ede6fc4863a6493dd831" | 715 | SRC_URI[utmp-classic-raw-0.1.3.sha256sum] = "22c226537a3d6e01c440c1926ca0256dbee2d19b2229ede6fc4863a6493dd831" |
| 699 | SRC_URI[uuid-1.17.0.sha256sum] = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" | 716 | SRC_URI[uuid-1.20.0.sha256sum] = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" |
| 700 | SRC_URI[uutils_term_grid-0.7.0.sha256sum] = "fcba141ce511bad08e80b43f02976571072e1ff4286f7d628943efbd277c6361" | 717 | SRC_URI[uutils_term_grid-0.7.0.sha256sum] = "fcba141ce511bad08e80b43f02976571072e1ff4286f7d628943efbd277c6361" |
| 701 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" | 718 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" |
| 702 | SRC_URI[virtue-0.0.18.sha256sum] = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" | ||
| 703 | SRC_URI[vsimd-0.8.0.sha256sum] = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" | 719 | SRC_URI[vsimd-0.8.0.sha256sum] = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" |
| 704 | SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" | 720 | SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" |
| 705 | SRC_URI[wasi-0.11.1+wasi-snapshot-preview1.sha256sum] = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" | 721 | SRC_URI[wasi-0.11.1+wasi-snapshot-preview1.sha256sum] = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" |
| 706 | SRC_URI[wasi-0.14.2+wasi-0.2.4.sha256sum] = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" | 722 | SRC_URI[wasip2-1.0.2+wasi-0.2.9.sha256sum] = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" |
| 707 | SRC_URI[wasm-bindgen-0.2.100.sha256sum] = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" | 723 | SRC_URI[wasm-bindgen-0.2.108.sha256sum] = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" |
| 708 | SRC_URI[wasm-bindgen-backend-0.2.100.sha256sum] = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" | 724 | SRC_URI[wasm-bindgen-macro-0.2.108.sha256sum] = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" |
| 709 | SRC_URI[wasm-bindgen-macro-0.2.100.sha256sum] = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" | 725 | SRC_URI[wasm-bindgen-macro-support-0.2.108.sha256sum] = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" |
| 710 | SRC_URI[wasm-bindgen-macro-support-0.2.100.sha256sum] = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" | 726 | SRC_URI[wasm-bindgen-shared-0.2.108.sha256sum] = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" |
| 711 | SRC_URI[wasm-bindgen-shared-0.2.100.sha256sum] = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" | ||
| 712 | SRC_URI[web-time-1.1.0.sha256sum] = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" | 727 | SRC_URI[web-time-1.1.0.sha256sum] = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" |
| 713 | SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" | 728 | SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" |
| 714 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" | 729 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" |
| @@ -725,48 +740,50 @@ SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776b | |||
| 725 | SRC_URI[windows-sys-0.60.2.sha256sum] = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" | 740 | SRC_URI[windows-sys-0.60.2.sha256sum] = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" |
| 726 | SRC_URI[windows-sys-0.61.2.sha256sum] = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" | 741 | SRC_URI[windows-sys-0.61.2.sha256sum] = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" |
| 727 | SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" | 742 | SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" |
| 728 | SRC_URI[windows-targets-0.53.2.sha256sum] = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" | 743 | SRC_URI[windows-targets-0.53.5.sha256sum] = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" |
| 729 | SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" | 744 | SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" |
| 730 | SRC_URI[windows_aarch64_gnullvm-0.53.0.sha256sum] = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" | 745 | SRC_URI[windows_aarch64_gnullvm-0.53.1.sha256sum] = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" |
| 731 | SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" | 746 | SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" |
| 732 | SRC_URI[windows_aarch64_msvc-0.53.0.sha256sum] = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" | 747 | SRC_URI[windows_aarch64_msvc-0.53.1.sha256sum] = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" |
| 733 | SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" | 748 | SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" |
| 734 | SRC_URI[windows_i686_gnu-0.53.0.sha256sum] = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" | 749 | SRC_URI[windows_i686_gnu-0.53.1.sha256sum] = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" |
| 735 | SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" | 750 | SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" |
| 736 | SRC_URI[windows_i686_gnullvm-0.53.0.sha256sum] = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" | 751 | SRC_URI[windows_i686_gnullvm-0.53.1.sha256sum] = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" |
| 737 | SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" | 752 | SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" |
| 738 | SRC_URI[windows_i686_msvc-0.53.0.sha256sum] = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" | 753 | SRC_URI[windows_i686_msvc-0.53.1.sha256sum] = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" |
| 739 | SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" | 754 | SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" |
| 740 | SRC_URI[windows_x86_64_gnu-0.53.0.sha256sum] = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" | 755 | SRC_URI[windows_x86_64_gnu-0.53.1.sha256sum] = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" |
| 741 | SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" | 756 | SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" |
| 742 | SRC_URI[windows_x86_64_gnullvm-0.53.0.sha256sum] = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" | 757 | SRC_URI[windows_x86_64_gnullvm-0.53.1.sha256sum] = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" |
| 743 | SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" | 758 | SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" |
| 744 | SRC_URI[windows_x86_64_msvc-0.53.0.sha256sum] = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" | 759 | SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" |
| 745 | SRC_URI[winnow-0.7.11.sha256sum] = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" | 760 | SRC_URI[winnow-0.7.14.sha256sum] = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" |
| 746 | SRC_URI[wit-bindgen-rt-0.39.0.sha256sum] = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" | 761 | SRC_URI[wit-bindgen-0.51.0.sha256sum] = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" |
| 747 | SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" | 762 | SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" |
| 748 | SRC_URI[writeable-0.6.2.sha256sum] = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" | 763 | SRC_URI[writeable-0.6.2.sha256sum] = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" |
| 749 | SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" | 764 | SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" |
| 750 | SRC_URI[xattr-1.6.1.sha256sum] = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" | 765 | SRC_URI[xattr-1.6.1.sha256sum] = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" |
| 751 | SRC_URI[yansi-1.0.1.sha256sum] = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" | 766 | SRC_URI[yansi-1.0.1.sha256sum] = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" |
| 752 | SRC_URI[yoke-0.8.0.sha256sum] = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" | 767 | SRC_URI[yoke-0.8.1.sha256sum] = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" |
| 753 | SRC_URI[yoke-derive-0.8.0.sha256sum] = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" | 768 | SRC_URI[yoke-derive-0.8.1.sha256sum] = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" |
| 754 | SRC_URI[z85-3.0.6.sha256sum] = "9b3a41ce106832b4da1c065baa4c31cf640cf965fa1483816402b7f6b96f0a64" | 769 | SRC_URI[z85-3.0.7.sha256sum] = "c6e61e59a957b7ccee15d2049f86e8bfd6f66968fcd88f018950662d9b86e675" |
| 755 | SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" | 770 | SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" |
| 756 | SRC_URI[zerocopy-0.8.27.sha256sum] = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" | 771 | SRC_URI[zerocopy-0.8.39.sha256sum] = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a" |
| 757 | SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" | 772 | SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" |
| 758 | SRC_URI[zerocopy-derive-0.8.27.sha256sum] = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" | 773 | SRC_URI[zerocopy-derive-0.8.39.sha256sum] = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" |
| 759 | SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" | 774 | SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" |
| 760 | SRC_URI[zerofrom-derive-0.1.6.sha256sum] = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" | 775 | SRC_URI[zerofrom-derive-0.1.6.sha256sum] = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" |
| 761 | SRC_URI[zerotrie-0.2.2.sha256sum] = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" | 776 | SRC_URI[zerotrie-0.2.3.sha256sum] = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" |
| 762 | SRC_URI[zerovec-0.11.5.sha256sum] = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" | 777 | SRC_URI[zerovec-0.11.5.sha256sum] = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" |
| 763 | SRC_URI[zerovec-derive-0.11.1.sha256sum] = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" | 778 | SRC_URI[zerovec-derive-0.11.2.sha256sum] = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" |
| 764 | SRC_URI[zip-6.0.0.sha256sum] = "eb2a05c7c36fde6c09b08576c9f7fb4cda705990f73b58fe011abf7dfb24168b" | 779 | SRC_URI[zip-8.2.0.sha256sum] = "b680f2a0cd479b4cff6e1233c483fdead418106eae419dc60200ae9850f6d004" |
| 765 | SRC_URI[zlib-rs-0.5.1.sha256sum] = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a" | 780 | SRC_URI[zlib-rs-0.6.0.sha256sum] = "a7948af682ccbc3342b6e9420e8c51c1fe5d7bf7756002b4a3c6cabfe96a7e3c" |
| 766 | SRC_URI[zopfli-0.8.2.sha256sum] = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" | 781 | SRC_URI[zmij-1.0.19.sha256sum] = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445" |
| 782 | SRC_URI[zopfli-0.8.3.sha256sum] = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" | ||
| 767 | # from fuzz/Cargo.lock | 783 | # from fuzz/Cargo.lock |
| 768 | SRC_URI += " \ | 784 | SRC_URI += " \ |
| 769 | crate://crates.io/adler2/2.0.1 \ | 785 | crate://crates.io/adler2/2.0.1 \ |
| 786 | crate://crates.io/aho-corasick/1.1.4 \ | ||
| 770 | crate://crates.io/android_system_properties/0.1.5 \ | 787 | crate://crates.io/android_system_properties/0.1.5 \ |
| 771 | crate://crates.io/anstream/0.6.21 \ | 788 | crate://crates.io/anstream/0.6.21 \ |
| 772 | crate://crates.io/anstyle/1.0.13 \ | 789 | crate://crates.io/anstyle/1.0.13 \ |
| @@ -778,34 +795,34 @@ SRC_URI += " \ | |||
| 778 | crate://crates.io/arrayvec/0.7.6 \ | 795 | crate://crates.io/arrayvec/0.7.6 \ |
| 779 | crate://crates.io/autocfg/1.5.0 \ | 796 | crate://crates.io/autocfg/1.5.0 \ |
| 780 | crate://crates.io/base64-simd/0.8.0 \ | 797 | crate://crates.io/base64-simd/0.8.0 \ |
| 781 | crate://crates.io/bigdecimal/0.4.9 \ | 798 | crate://crates.io/bigdecimal/0.4.10 \ |
| 782 | crate://crates.io/binary-heap-plus/0.5.0 \ | 799 | crate://crates.io/binary-heap-plus/0.5.0 \ |
| 783 | crate://crates.io/bitflags/2.10.0 \ | 800 | crate://crates.io/bitflags/2.10.0 \ |
| 784 | crate://crates.io/blake2b_simd/1.0.3 \ | 801 | crate://crates.io/blake2b_simd/1.0.4 \ |
| 785 | crate://crates.io/blake3/1.8.2 \ | 802 | crate://crates.io/blake3/1.8.3 \ |
| 786 | crate://crates.io/block-buffer/0.10.4 \ | 803 | crate://crates.io/block-buffer/0.10.4 \ |
| 787 | crate://crates.io/block2/0.6.2 \ | 804 | crate://crates.io/block2/0.6.2 \ |
| 788 | crate://crates.io/bstr/1.12.1 \ | 805 | crate://crates.io/bstr/1.12.1 \ |
| 789 | crate://crates.io/bumpalo/3.19.0 \ | 806 | crate://crates.io/bumpalo/3.19.1 \ |
| 790 | crate://crates.io/bytecount/0.6.9 \ | 807 | crate://crates.io/bytecount/0.6.9 \ |
| 791 | crate://crates.io/cc/1.2.48 \ | 808 | crate://crates.io/calendrical_calculations/0.2.3 \ |
| 809 | crate://crates.io/cc/1.2.55 \ | ||
| 792 | crate://crates.io/cfg-if/1.0.4 \ | 810 | crate://crates.io/cfg-if/1.0.4 \ |
| 793 | crate://crates.io/cfg_aliases/0.2.1 \ | 811 | crate://crates.io/cfg_aliases/0.2.1 \ |
| 794 | crate://crates.io/chrono/0.4.42 \ | 812 | crate://crates.io/chrono/0.4.43 \ |
| 795 | crate://crates.io/clap/4.5.53 \ | 813 | crate://crates.io/clap/4.5.57 \ |
| 796 | crate://crates.io/clap_builder/4.5.53 \ | 814 | crate://crates.io/clap_builder/4.5.57 \ |
| 797 | crate://crates.io/clap_lex/0.7.6 \ | 815 | crate://crates.io/clap_lex/0.7.7 \ |
| 798 | crate://crates.io/colorchoice/1.0.4 \ | 816 | crate://crates.io/colorchoice/1.0.4 \ |
| 799 | crate://crates.io/compare/0.1.0 \ | 817 | crate://crates.io/compare/0.1.0 \ |
| 800 | crate://crates.io/console/0.16.1 \ | 818 | crate://crates.io/console/0.16.2 \ |
| 801 | crate://crates.io/const-random/0.1.18 \ | 819 | crate://crates.io/const-random/0.1.18 \ |
| 802 | crate://crates.io/const-random-macro/0.1.16 \ | 820 | crate://crates.io/const-random-macro/0.1.16 \ |
| 803 | crate://crates.io/constant_time_eq/0.3.1 \ | 821 | crate://crates.io/constant_time_eq/0.4.2 \ |
| 804 | crate://crates.io/core-foundation-sys/0.8.7 \ | 822 | crate://crates.io/core-foundation-sys/0.8.7 \ |
| 823 | crate://crates.io/core_maths/0.1.1 \ | ||
| 805 | crate://crates.io/cpufeatures/0.2.17 \ | 824 | crate://crates.io/cpufeatures/0.2.17 \ |
| 806 | crate://crates.io/crc/3.4.0 \ | 825 | crate://crates.io/crc-fast/1.10.0 \ |
| 807 | crate://crates.io/crc-catalog/2.4.0 \ | ||
| 808 | crate://crates.io/crc-fast/1.8.0 \ | ||
| 809 | crate://crates.io/crc32fast/1.5.0 \ | 826 | crate://crates.io/crc32fast/1.5.0 \ |
| 810 | crate://crates.io/crossbeam-deque/0.8.6 \ | 827 | crate://crates.io/crossbeam-deque/0.8.6 \ |
| 811 | crate://crates.io/crossbeam-epoch/0.9.18 \ | 828 | crate://crates.io/crossbeam-epoch/0.9.18 \ |
| @@ -813,9 +830,9 @@ SRC_URI += " \ | |||
| 813 | crate://crates.io/crunchy/0.2.4 \ | 830 | crate://crates.io/crunchy/0.2.4 \ |
| 814 | crate://crates.io/crypto-common/0.1.7 \ | 831 | crate://crates.io/crypto-common/0.1.7 \ |
| 815 | crate://crates.io/ctrlc/3.5.1 \ | 832 | crate://crates.io/ctrlc/3.5.1 \ |
| 816 | crate://crates.io/data-encoding/2.9.0 \ | 833 | crate://crates.io/data-encoding/2.10.0 \ |
| 817 | crate://crates.io/data-encoding-macro/0.1.18 \ | 834 | crate://crates.io/data-encoding-macro/0.1.19 \ |
| 818 | crate://crates.io/data-encoding-macro-internal/0.1.16 \ | 835 | crate://crates.io/data-encoding-macro-internal/0.1.17 \ |
| 819 | crate://crates.io/digest/0.10.7 \ | 836 | crate://crates.io/digest/0.10.7 \ |
| 820 | crate://crates.io/dispatch2/0.3.0 \ | 837 | crate://crates.io/dispatch2/0.3.0 \ |
| 821 | crate://crates.io/displaydoc/0.2.5 \ | 838 | crate://crates.io/displaydoc/0.2.5 \ |
| @@ -825,51 +842,65 @@ SRC_URI += " \ | |||
| 825 | crate://crates.io/encode_unicode/1.0.0 \ | 842 | crate://crates.io/encode_unicode/1.0.0 \ |
| 826 | crate://crates.io/errno/0.3.14 \ | 843 | crate://crates.io/errno/0.3.14 \ |
| 827 | crate://crates.io/fastrand/2.3.0 \ | 844 | crate://crates.io/fastrand/2.3.0 \ |
| 828 | crate://crates.io/find-msvc-tools/0.1.5 \ | 845 | crate://crates.io/find-msvc-tools/0.1.9 \ |
| 829 | crate://crates.io/flate2/1.1.5 \ | 846 | crate://crates.io/fixed_decimal/0.7.1 \ |
| 847 | crate://crates.io/flate2/1.1.9 \ | ||
| 830 | crate://crates.io/fluent/0.17.0 \ | 848 | crate://crates.io/fluent/0.17.0 \ |
| 831 | crate://crates.io/fluent-bundle/0.16.0 \ | 849 | crate://crates.io/fluent-bundle/0.16.0 \ |
| 832 | crate://crates.io/fluent-langneg/0.13.1 \ | 850 | crate://crates.io/fluent-langneg/0.13.1 \ |
| 833 | crate://crates.io/fluent-syntax/0.12.0 \ | 851 | crate://crates.io/fluent-syntax/0.12.0 \ |
| 834 | crate://crates.io/fnv/1.0.7 \ | 852 | crate://crates.io/foldhash/0.2.0 \ |
| 835 | crate://crates.io/generic-array/0.14.7 \ | 853 | crate://crates.io/generic-array/0.14.7 \ |
| 836 | crate://crates.io/getrandom/0.2.16 \ | 854 | crate://crates.io/getrandom/0.2.17 \ |
| 837 | crate://crates.io/getrandom/0.3.4 \ | 855 | crate://crates.io/getrandom/0.3.4 \ |
| 838 | crate://crates.io/glob/0.3.3 \ | 856 | crate://crates.io/glob/0.3.3 \ |
| 839 | crate://crates.io/hashbrown/0.14.5 \ | 857 | crate://crates.io/hashbrown/0.14.5 \ |
| 840 | crate://crates.io/hex/0.4.3 \ | 858 | crate://crates.io/hex/0.4.3 \ |
| 841 | crate://crates.io/iana-time-zone/0.1.64 \ | 859 | crate://crates.io/iana-time-zone/0.1.65 \ |
| 842 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ | 860 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ |
| 861 | crate://crates.io/icu_calendar/2.1.1 \ | ||
| 862 | crate://crates.io/icu_calendar_data/2.1.1 \ | ||
| 843 | crate://crates.io/icu_collator/2.1.1 \ | 863 | crate://crates.io/icu_collator/2.1.1 \ |
| 844 | crate://crates.io/icu_collator_data/2.1.1 \ | 864 | crate://crates.io/icu_collator_data/2.1.1 \ |
| 845 | crate://crates.io/icu_collections/2.1.1 \ | 865 | crate://crates.io/icu_collections/2.1.1 \ |
| 866 | crate://crates.io/icu_datetime/2.1.1 \ | ||
| 867 | crate://crates.io/icu_datetime_data/2.1.2 \ | ||
| 868 | crate://crates.io/icu_decimal/2.1.1 \ | ||
| 869 | crate://crates.io/icu_decimal_data/2.1.1 \ | ||
| 846 | crate://crates.io/icu_locale/2.1.1 \ | 870 | crate://crates.io/icu_locale/2.1.1 \ |
| 847 | crate://crates.io/icu_locale_core/2.1.1 \ | 871 | crate://crates.io/icu_locale_core/2.1.1 \ |
| 848 | crate://crates.io/icu_locale_data/2.1.1 \ | 872 | crate://crates.io/icu_locale_data/2.1.2 \ |
| 849 | crate://crates.io/icu_normalizer/2.1.1 \ | 873 | crate://crates.io/icu_normalizer/2.1.1 \ |
| 850 | crate://crates.io/icu_normalizer_data/2.1.1 \ | 874 | crate://crates.io/icu_normalizer_data/2.1.1 \ |
| 851 | crate://crates.io/icu_properties/2.1.1 \ | 875 | crate://crates.io/icu_pattern/0.4.1 \ |
| 852 | crate://crates.io/icu_properties_data/2.1.1 \ | 876 | crate://crates.io/icu_plurals/2.1.1 \ |
| 877 | crate://crates.io/icu_plurals_data/2.1.1 \ | ||
| 878 | crate://crates.io/icu_properties/2.1.2 \ | ||
| 879 | crate://crates.io/icu_properties_data/2.1.2 \ | ||
| 853 | crate://crates.io/icu_provider/2.1.1 \ | 880 | crate://crates.io/icu_provider/2.1.1 \ |
| 881 | crate://crates.io/icu_time/2.1.1 \ | ||
| 882 | crate://crates.io/icu_time_data/2.1.1 \ | ||
| 854 | crate://crates.io/intl-memoizer/0.5.3 \ | 883 | crate://crates.io/intl-memoizer/0.5.3 \ |
| 855 | crate://crates.io/intl_pluralrules/7.0.2 \ | 884 | crate://crates.io/intl_pluralrules/7.0.2 \ |
| 856 | crate://crates.io/is_terminal_polyfill/1.70.2 \ | 885 | crate://crates.io/is_terminal_polyfill/1.70.2 \ |
| 857 | crate://crates.io/itertools/0.14.0 \ | 886 | crate://crates.io/itertools/0.14.0 \ |
| 858 | crate://crates.io/jiff/0.2.16 \ | 887 | crate://crates.io/ixdtf/0.6.4 \ |
| 859 | crate://crates.io/jiff-static/0.2.16 \ | 888 | crate://crates.io/jiff/0.2.19 \ |
| 860 | crate://crates.io/jiff-tzdb/0.1.4 \ | 889 | crate://crates.io/jiff-icu/0.2.2 \ |
| 890 | crate://crates.io/jiff-static/0.2.19 \ | ||
| 891 | crate://crates.io/jiff-tzdb/0.1.5 \ | ||
| 861 | crate://crates.io/jiff-tzdb-platform/0.1.3 \ | 892 | crate://crates.io/jiff-tzdb-platform/0.1.3 \ |
| 862 | crate://crates.io/jobserver/0.1.34 \ | 893 | crate://crates.io/jobserver/0.1.34 \ |
| 863 | crate://crates.io/js-sys/0.3.83 \ | 894 | crate://crates.io/js-sys/0.3.85 \ |
| 864 | crate://crates.io/keccak/0.1.5 \ | 895 | crate://crates.io/keccak/0.1.6 \ |
| 865 | crate://crates.io/libc/0.2.178 \ | 896 | crate://crates.io/libc/0.2.182 \ |
| 866 | crate://crates.io/libfuzzer-sys/0.4.10 \ | 897 | crate://crates.io/libfuzzer-sys/0.4.12 \ |
| 867 | crate://crates.io/libm/0.2.15 \ | 898 | crate://crates.io/libm/0.2.16 \ |
| 868 | crate://crates.io/linux-raw-sys/0.11.0 \ | 899 | crate://crates.io/linux-raw-sys/0.12.1 \ |
| 869 | crate://crates.io/litemap/0.8.1 \ | 900 | crate://crates.io/litemap/0.8.1 \ |
| 870 | crate://crates.io/log/0.4.29 \ | 901 | crate://crates.io/log/0.4.29 \ |
| 871 | crate://crates.io/md-5/0.10.6 \ | 902 | crate://crates.io/md-5/0.10.6 \ |
| 872 | crate://crates.io/memchr/2.7.6 \ | 903 | crate://crates.io/memchr/2.8.0 \ |
| 873 | crate://crates.io/miniz_oxide/0.8.9 \ | 904 | crate://crates.io/miniz_oxide/0.8.9 \ |
| 874 | crate://crates.io/nix/0.30.1 \ | 905 | crate://crates.io/nix/0.30.1 \ |
| 875 | crate://crates.io/nom/8.0.0 \ | 906 | crate://crates.io/nom/8.0.0 \ |
| @@ -885,30 +916,30 @@ SRC_URI += " \ | |||
| 885 | crate://crates.io/ordered-multimap/0.7.3 \ | 916 | crate://crates.io/ordered-multimap/0.7.3 \ |
| 886 | crate://crates.io/os_display/0.1.4 \ | 917 | crate://crates.io/os_display/0.1.4 \ |
| 887 | crate://crates.io/outref/0.5.2 \ | 918 | crate://crates.io/outref/0.5.2 \ |
| 888 | crate://crates.io/parse_datetime/0.13.3 \ | 919 | crate://crates.io/parse_datetime/0.14.0 \ |
| 889 | crate://crates.io/phf/0.13.1 \ | ||
| 890 | crate://crates.io/phf_shared/0.13.1 \ | ||
| 891 | crate://crates.io/pkg-config/0.3.32 \ | 920 | crate://crates.io/pkg-config/0.3.32 \ |
| 892 | crate://crates.io/portable-atomic/1.11.1 \ | 921 | crate://crates.io/portable-atomic/1.13.1 \ |
| 893 | crate://crates.io/portable-atomic-util/0.2.4 \ | 922 | crate://crates.io/portable-atomic-util/0.2.5 \ |
| 894 | crate://crates.io/potential_utf/0.1.4 \ | 923 | crate://crates.io/potential_utf/0.1.4 \ |
| 895 | crate://crates.io/ppv-lite86/0.2.21 \ | 924 | crate://crates.io/ppv-lite86/0.2.21 \ |
| 896 | crate://crates.io/proc-macro2/1.0.103 \ | 925 | crate://crates.io/proc-macro2/1.0.106 \ |
| 897 | crate://crates.io/procfs/0.18.0 \ | 926 | crate://crates.io/procfs/0.18.0 \ |
| 898 | crate://crates.io/procfs-core/0.18.0 \ | 927 | crate://crates.io/procfs-core/0.18.0 \ |
| 899 | crate://crates.io/quote/1.0.42 \ | 928 | crate://crates.io/quote/1.0.44 \ |
| 900 | crate://crates.io/r-efi/5.3.0 \ | 929 | crate://crates.io/r-efi/5.3.0 \ |
| 901 | crate://crates.io/rand/0.9.2 \ | 930 | crate://crates.io/rand/0.9.2 \ |
| 902 | crate://crates.io/rand_chacha/0.9.0 \ | 931 | crate://crates.io/rand_chacha/0.9.0 \ |
| 903 | crate://crates.io/rand_core/0.9.3 \ | 932 | crate://crates.io/rand_core/0.9.5 \ |
| 904 | crate://crates.io/rayon/1.11.0 \ | 933 | crate://crates.io/rayon/1.11.0 \ |
| 905 | crate://crates.io/rayon-core/1.13.0 \ | 934 | crate://crates.io/rayon-core/1.13.0 \ |
| 906 | crate://crates.io/regex-automata/0.4.13 \ | 935 | crate://crates.io/regex/1.12.3 \ |
| 936 | crate://crates.io/regex-automata/0.4.14 \ | ||
| 937 | crate://crates.io/regex-syntax/0.8.9 \ | ||
| 907 | crate://crates.io/rust-ini/0.21.3 \ | 938 | crate://crates.io/rust-ini/0.21.3 \ |
| 908 | crate://crates.io/rustc-hash/2.1.1 \ | 939 | crate://crates.io/rustc-hash/2.1.1 \ |
| 909 | crate://crates.io/rustix/1.1.2 \ | 940 | crate://crates.io/rustix/1.1.4 \ |
| 910 | crate://crates.io/rustversion/1.0.22 \ | 941 | crate://crates.io/rustversion/1.0.22 \ |
| 911 | crate://crates.io/self_cell/1.2.1 \ | 942 | crate://crates.io/self_cell/1.2.2 \ |
| 912 | crate://crates.io/serde/1.0.228 \ | 943 | crate://crates.io/serde/1.0.228 \ |
| 913 | crate://crates.io/serde_core/1.0.228 \ | 944 | crate://crates.io/serde_core/1.0.228 \ |
| 914 | crate://crates.io/serde_derive/1.0.228 \ | 945 | crate://crates.io/serde_derive/1.0.228 \ |
| @@ -916,20 +947,19 @@ SRC_URI += " \ | |||
| 916 | crate://crates.io/sha2/0.10.9 \ | 947 | crate://crates.io/sha2/0.10.9 \ |
| 917 | crate://crates.io/sha3/0.10.8 \ | 948 | crate://crates.io/sha3/0.10.8 \ |
| 918 | crate://crates.io/shlex/1.3.0 \ | 949 | crate://crates.io/shlex/1.3.0 \ |
| 919 | crate://crates.io/simd-adler32/0.3.7 \ | 950 | crate://crates.io/simd-adler32/0.3.8 \ |
| 920 | crate://crates.io/similar/2.7.0 \ | 951 | crate://crates.io/similar/2.7.0 \ |
| 921 | crate://crates.io/siphasher/1.0.1 \ | ||
| 922 | crate://crates.io/sm3/0.4.2 \ | 952 | crate://crates.io/sm3/0.4.2 \ |
| 923 | crate://crates.io/smallvec/1.15.1 \ | 953 | crate://crates.io/smallvec/1.15.1 \ |
| 924 | crate://crates.io/spin/0.10.0 \ | 954 | crate://crates.io/spin/0.10.0 \ |
| 925 | crate://crates.io/stable_deref_trait/1.2.1 \ | 955 | crate://crates.io/stable_deref_trait/1.2.1 \ |
| 926 | crate://crates.io/strsim/0.11.1 \ | 956 | crate://crates.io/strsim/0.11.1 \ |
| 927 | crate://crates.io/syn/2.0.111 \ | 957 | crate://crates.io/syn/2.0.114 \ |
| 928 | crate://crates.io/synstructure/0.13.2 \ | 958 | crate://crates.io/synstructure/0.13.2 \ |
| 929 | crate://crates.io/tempfile/3.23.0 \ | 959 | crate://crates.io/tempfile/3.26.0 \ |
| 930 | crate://crates.io/terminal_size/0.4.3 \ | 960 | crate://crates.io/terminal_size/0.4.3 \ |
| 931 | crate://crates.io/thiserror/2.0.17 \ | 961 | crate://crates.io/thiserror/2.0.18 \ |
| 932 | crate://crates.io/thiserror-impl/2.0.17 \ | 962 | crate://crates.io/thiserror-impl/2.0.18 \ |
| 933 | crate://crates.io/tiny-keccak/2.0.2 \ | 963 | crate://crates.io/tiny-keccak/2.0.2 \ |
| 934 | crate://crates.io/tinystr/0.8.2 \ | 964 | crate://crates.io/tinystr/0.8.2 \ |
| 935 | crate://crates.io/type-map/0.5.1 \ | 965 | crate://crates.io/type-map/0.5.1 \ |
| @@ -945,11 +975,11 @@ SRC_URI += " \ | |||
| 945 | crate://crates.io/version_check/0.9.5 \ | 975 | crate://crates.io/version_check/0.9.5 \ |
| 946 | crate://crates.io/vsimd/0.8.0 \ | 976 | crate://crates.io/vsimd/0.8.0 \ |
| 947 | crate://crates.io/wasi/0.11.1+wasi-snapshot-preview1 \ | 977 | crate://crates.io/wasi/0.11.1+wasi-snapshot-preview1 \ |
| 948 | crate://crates.io/wasip2/1.0.1+wasi-0.2.4 \ | 978 | crate://crates.io/wasip2/1.0.2+wasi-0.2.9 \ |
| 949 | crate://crates.io/wasm-bindgen/0.2.106 \ | 979 | crate://crates.io/wasm-bindgen/0.2.108 \ |
| 950 | crate://crates.io/wasm-bindgen-macro/0.2.106 \ | 980 | crate://crates.io/wasm-bindgen-macro/0.2.108 \ |
| 951 | crate://crates.io/wasm-bindgen-macro-support/0.2.106 \ | 981 | crate://crates.io/wasm-bindgen-macro-support/0.2.108 \ |
| 952 | crate://crates.io/wasm-bindgen-shared/0.2.106 \ | 982 | crate://crates.io/wasm-bindgen-shared/0.2.108 \ |
| 953 | crate://crates.io/wild/2.2.1 \ | 983 | crate://crates.io/wild/2.2.1 \ |
| 954 | crate://crates.io/winapi-util/0.1.11 \ | 984 | crate://crates.io/winapi-util/0.1.11 \ |
| 955 | crate://crates.io/windows-core/0.62.2 \ | 985 | crate://crates.io/windows-core/0.62.2 \ |
| @@ -970,14 +1000,14 @@ SRC_URI += " \ | |||
| 970 | crate://crates.io/windows_x86_64_gnullvm/0.53.1 \ | 1000 | crate://crates.io/windows_x86_64_gnullvm/0.53.1 \ |
| 971 | crate://crates.io/windows_x86_64_msvc/0.53.1 \ | 1001 | crate://crates.io/windows_x86_64_msvc/0.53.1 \ |
| 972 | crate://crates.io/winnow/0.7.14 \ | 1002 | crate://crates.io/winnow/0.7.14 \ |
| 973 | crate://crates.io/wit-bindgen/0.46.0 \ | 1003 | crate://crates.io/wit-bindgen/0.51.0 \ |
| 974 | crate://crates.io/write16/1.0.0 \ | 1004 | crate://crates.io/write16/1.0.0 \ |
| 975 | crate://crates.io/writeable/0.6.2 \ | 1005 | crate://crates.io/writeable/0.6.2 \ |
| 976 | crate://crates.io/yoke/0.8.1 \ | 1006 | crate://crates.io/yoke/0.8.1 \ |
| 977 | crate://crates.io/yoke-derive/0.8.1 \ | 1007 | crate://crates.io/yoke-derive/0.8.1 \ |
| 978 | crate://crates.io/z85/3.0.6 \ | 1008 | crate://crates.io/z85/3.0.6 \ |
| 979 | crate://crates.io/zerocopy/0.8.31 \ | 1009 | crate://crates.io/zerocopy/0.8.39 \ |
| 980 | crate://crates.io/zerocopy-derive/0.8.31 \ | 1010 | crate://crates.io/zerocopy-derive/0.8.39 \ |
| 981 | crate://crates.io/zerofrom/0.1.6 \ | 1011 | crate://crates.io/zerofrom/0.1.6 \ |
| 982 | crate://crates.io/zerofrom-derive/0.1.6 \ | 1012 | crate://crates.io/zerofrom-derive/0.1.6 \ |
| 983 | crate://crates.io/zerotrie/0.2.3 \ | 1013 | crate://crates.io/zerotrie/0.2.3 \ |
| @@ -986,6 +1016,7 @@ SRC_URI += " \ | |||
| 986 | " | 1016 | " |
| 987 | 1017 | ||
| 988 | SRC_URI[adler2-2.0.1.sha256sum] = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" | 1018 | SRC_URI[adler2-2.0.1.sha256sum] = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" |
| 1019 | SRC_URI[aho-corasick-1.1.4.sha256sum] = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" | ||
| 989 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" | 1020 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" |
| 990 | SRC_URI[anstream-0.6.21.sha256sum] = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" | 1021 | SRC_URI[anstream-0.6.21.sha256sum] = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" |
| 991 | SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" | 1022 | SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" |
| @@ -997,34 +1028,34 @@ SRC_URI[arrayref-0.3.9.sha256sum] = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd422 | |||
| 997 | SRC_URI[arrayvec-0.7.6.sha256sum] = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" | 1028 | SRC_URI[arrayvec-0.7.6.sha256sum] = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" |
| 998 | SRC_URI[autocfg-1.5.0.sha256sum] = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" | 1029 | SRC_URI[autocfg-1.5.0.sha256sum] = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" |
| 999 | SRC_URI[base64-simd-0.8.0.sha256sum] = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" | 1030 | SRC_URI[base64-simd-0.8.0.sha256sum] = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" |
| 1000 | SRC_URI[bigdecimal-0.4.9.sha256sum] = "560f42649de9fa436b73517378a147ec21f6c997a546581df4b4b31677828934" | 1031 | SRC_URI[bigdecimal-0.4.10.sha256sum] = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695" |
| 1001 | SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296" | 1032 | SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296" |
| 1002 | SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" | 1033 | SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" |
| 1003 | SRC_URI[blake2b_simd-1.0.3.sha256sum] = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99" | 1034 | SRC_URI[blake2b_simd-1.0.4.sha256sum] = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3" |
| 1004 | SRC_URI[blake3-1.8.2.sha256sum] = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" | 1035 | SRC_URI[blake3-1.8.3.sha256sum] = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d" |
| 1005 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" | 1036 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" |
| 1006 | SRC_URI[block2-0.6.2.sha256sum] = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" | 1037 | SRC_URI[block2-0.6.2.sha256sum] = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" |
| 1007 | SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" | 1038 | SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" |
| 1008 | SRC_URI[bumpalo-3.19.0.sha256sum] = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" | 1039 | SRC_URI[bumpalo-3.19.1.sha256sum] = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" |
| 1009 | SRC_URI[bytecount-0.6.9.sha256sum] = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" | 1040 | SRC_URI[bytecount-0.6.9.sha256sum] = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" |
| 1010 | SRC_URI[cc-1.2.48.sha256sum] = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" | 1041 | SRC_URI[calendrical_calculations-0.2.3.sha256sum] = "3a0b39595c6ee54a8d0900204ba4c401d0ab4eb45adaf07178e8d017541529e7" |
| 1042 | SRC_URI[cc-1.2.55.sha256sum] = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" | ||
| 1011 | SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" | 1043 | SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" |
| 1012 | SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" | 1044 | SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" |
| 1013 | SRC_URI[chrono-0.4.42.sha256sum] = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" | 1045 | SRC_URI[chrono-0.4.43.sha256sum] = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" |
| 1014 | SRC_URI[clap-4.5.53.sha256sum] = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" | 1046 | SRC_URI[clap-4.5.57.sha256sum] = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a" |
| 1015 | SRC_URI[clap_builder-4.5.53.sha256sum] = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" | 1047 | SRC_URI[clap_builder-4.5.57.sha256sum] = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238" |
| 1016 | SRC_URI[clap_lex-0.7.6.sha256sum] = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" | 1048 | SRC_URI[clap_lex-0.7.7.sha256sum] = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" |
| 1017 | SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" | 1049 | SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" |
| 1018 | SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3" | 1050 | SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3" |
| 1019 | SRC_URI[console-0.16.1.sha256sum] = "b430743a6eb14e9764d4260d4c0d8123087d504eeb9c48f2b2a5e810dd369df4" | 1051 | SRC_URI[console-0.16.2.sha256sum] = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4" |
| 1020 | SRC_URI[const-random-0.1.18.sha256sum] = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" | 1052 | SRC_URI[const-random-0.1.18.sha256sum] = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" |
| 1021 | SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" | 1053 | SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" |
| 1022 | SRC_URI[constant_time_eq-0.3.1.sha256sum] = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" | 1054 | SRC_URI[constant_time_eq-0.4.2.sha256sum] = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" |
| 1023 | SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" | 1055 | SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" |
| 1056 | SRC_URI[core_maths-0.1.1.sha256sum] = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30" | ||
| 1024 | SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" | 1057 | SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" |
| 1025 | SRC_URI[crc-3.4.0.sha256sum] = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" | 1058 | SRC_URI[crc-fast-1.10.0.sha256sum] = "e75b2483e97a5a7da73ac68a05b629f9c53cff58d8ed1c77866079e18b00dba5" |
| 1026 | SRC_URI[crc-catalog-2.4.0.sha256sum] = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" | ||
| 1027 | SRC_URI[crc-fast-1.8.0.sha256sum] = "a2f7c8d397a6353ef0c1d6217ab91b3ddb5431daf57fd013f506b967dcf44458" | ||
| 1028 | SRC_URI[crc32fast-1.5.0.sha256sum] = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" | 1059 | SRC_URI[crc32fast-1.5.0.sha256sum] = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" |
| 1029 | SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" | 1060 | SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" |
| 1030 | SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" | 1061 | SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" |
| @@ -1032,9 +1063,9 @@ SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4c | |||
| 1032 | SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" | 1063 | SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" |
| 1033 | SRC_URI[crypto-common-0.1.7.sha256sum] = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" | 1064 | SRC_URI[crypto-common-0.1.7.sha256sum] = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" |
| 1034 | SRC_URI[ctrlc-3.5.1.sha256sum] = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790" | 1065 | SRC_URI[ctrlc-3.5.1.sha256sum] = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790" |
| 1035 | SRC_URI[data-encoding-2.9.0.sha256sum] = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" | 1066 | SRC_URI[data-encoding-2.10.0.sha256sum] = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" |
| 1036 | SRC_URI[data-encoding-macro-0.1.18.sha256sum] = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d" | 1067 | SRC_URI[data-encoding-macro-0.1.19.sha256sum] = "8142a83c17aa9461d637e649271eae18bf2edd00e91f2e105df36c3c16355bdb" |
| 1037 | SRC_URI[data-encoding-macro-internal-0.1.16.sha256sum] = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976" | 1068 | SRC_URI[data-encoding-macro-internal-0.1.17.sha256sum] = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" |
| 1038 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" | 1069 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" |
| 1039 | SRC_URI[dispatch2-0.3.0.sha256sum] = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" | 1070 | SRC_URI[dispatch2-0.3.0.sha256sum] = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" |
| 1040 | SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" | 1071 | SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" |
| @@ -1044,51 +1075,65 @@ SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fe | |||
| 1044 | SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" | 1075 | SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" |
| 1045 | SRC_URI[errno-0.3.14.sha256sum] = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" | 1076 | SRC_URI[errno-0.3.14.sha256sum] = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" |
| 1046 | SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" | 1077 | SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" |
| 1047 | SRC_URI[find-msvc-tools-0.1.5.sha256sum] = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" | 1078 | SRC_URI[find-msvc-tools-0.1.9.sha256sum] = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" |
| 1048 | SRC_URI[flate2-1.1.5.sha256sum] = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" | 1079 | SRC_URI[fixed_decimal-0.7.1.sha256sum] = "35eabf480f94d69182677e37571d3be065822acfafd12f2f085db44fbbcc8e57" |
| 1080 | SRC_URI[flate2-1.1.9.sha256sum] = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" | ||
| 1049 | SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477" | 1081 | SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477" |
| 1050 | SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4" | 1082 | SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4" |
| 1051 | SRC_URI[fluent-langneg-0.13.1.sha256sum] = "7eebbe59450baee8282d71676f3bfed5689aeab00b27545e83e5f14b1195e8b0" | 1083 | SRC_URI[fluent-langneg-0.13.1.sha256sum] = "7eebbe59450baee8282d71676f3bfed5689aeab00b27545e83e5f14b1195e8b0" |
| 1052 | SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" | 1084 | SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" |
| 1053 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" | 1085 | SRC_URI[foldhash-0.2.0.sha256sum] = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" |
| 1054 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" | 1086 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" |
| 1055 | SRC_URI[getrandom-0.2.16.sha256sum] = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" | 1087 | SRC_URI[getrandom-0.2.17.sha256sum] = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" |
| 1056 | SRC_URI[getrandom-0.3.4.sha256sum] = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" | 1088 | SRC_URI[getrandom-0.3.4.sha256sum] = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" |
| 1057 | SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" | 1089 | SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" |
| 1058 | SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" | 1090 | SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" |
| 1059 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" | 1091 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" |
| 1060 | SRC_URI[iana-time-zone-0.1.64.sha256sum] = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" | 1092 | SRC_URI[iana-time-zone-0.1.65.sha256sum] = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" |
| 1061 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" | 1093 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" |
| 1094 | SRC_URI[icu_calendar-2.1.1.sha256sum] = "d6f0e52e009b6b16ba9c0693578796f2dd4aaa59a7f8f920423706714a89ac4e" | ||
| 1095 | SRC_URI[icu_calendar_data-2.1.1.sha256sum] = "527f04223b17edfe0bd43baf14a0cb1b017830db65f3950dc00224860a9a446d" | ||
| 1062 | SRC_URI[icu_collator-2.1.1.sha256sum] = "32eed11a5572f1088b63fa21dc2e70d4a865e5739fc2d10abc05be93bae97019" | 1096 | SRC_URI[icu_collator-2.1.1.sha256sum] = "32eed11a5572f1088b63fa21dc2e70d4a865e5739fc2d10abc05be93bae97019" |
| 1063 | SRC_URI[icu_collator_data-2.1.1.sha256sum] = "5ab06f0e83a613efddba3e4913e00e43ed4001fae651cb7d40fc7e66b83b6fb9" | 1097 | SRC_URI[icu_collator_data-2.1.1.sha256sum] = "5ab06f0e83a613efddba3e4913e00e43ed4001fae651cb7d40fc7e66b83b6fb9" |
| 1064 | SRC_URI[icu_collections-2.1.1.sha256sum] = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" | 1098 | SRC_URI[icu_collections-2.1.1.sha256sum] = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" |
| 1099 | SRC_URI[icu_datetime-2.1.1.sha256sum] = "1b9d49f41ded8e63761b6b4c3120dfdc289415a1ed10107db6198eb311057ca5" | ||
| 1100 | SRC_URI[icu_datetime_data-2.1.2.sha256sum] = "46597233625417b7c8052a63d916e4fdc73df21614ac0b679492a5d6e3b01aeb" | ||
| 1101 | SRC_URI[icu_decimal-2.1.1.sha256sum] = "a38c52231bc348f9b982c1868a2af3195199623007ba2c7650f432038f5b3e8e" | ||
| 1102 | SRC_URI[icu_decimal_data-2.1.1.sha256sum] = "2905b4044eab2dd848fe84199f9195567b63ab3a93094711501363f63546fef7" | ||
| 1065 | SRC_URI[icu_locale-2.1.1.sha256sum] = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60" | 1103 | SRC_URI[icu_locale-2.1.1.sha256sum] = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60" |
| 1066 | SRC_URI[icu_locale_core-2.1.1.sha256sum] = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" | 1104 | SRC_URI[icu_locale_core-2.1.1.sha256sum] = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" |
| 1067 | SRC_URI[icu_locale_data-2.1.1.sha256sum] = "f03e2fcaefecdf05619f3d6f91740e79ab969b4dd54f77cbf546b1d0d28e3147" | 1105 | SRC_URI[icu_locale_data-2.1.2.sha256sum] = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831" |
| 1068 | SRC_URI[icu_normalizer-2.1.1.sha256sum] = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" | 1106 | SRC_URI[icu_normalizer-2.1.1.sha256sum] = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" |
| 1069 | SRC_URI[icu_normalizer_data-2.1.1.sha256sum] = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" | 1107 | SRC_URI[icu_normalizer_data-2.1.1.sha256sum] = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" |
| 1070 | SRC_URI[icu_properties-2.1.1.sha256sum] = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" | 1108 | SRC_URI[icu_pattern-0.4.1.sha256sum] = "7a7ff8c0ff6f61cdce299dcb54f557b0a251adbc78f6f0c35a21332c452b4a1b" |
| 1071 | SRC_URI[icu_properties_data-2.1.1.sha256sum] = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" | 1109 | SRC_URI[icu_plurals-2.1.1.sha256sum] = "4f9cfe49f5b1d1163cc58db451562339916a9ca5cbcaae83924d41a0bf839474" |
| 1110 | SRC_URI[icu_plurals_data-2.1.1.sha256sum] = "f018a98dccf7f0eb02ba06ac0ff67d102d8ded80734724305e924de304e12ff0" | ||
| 1111 | SRC_URI[icu_properties-2.1.2.sha256sum] = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" | ||
| 1112 | SRC_URI[icu_properties_data-2.1.2.sha256sum] = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" | ||
| 1072 | SRC_URI[icu_provider-2.1.1.sha256sum] = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" | 1113 | SRC_URI[icu_provider-2.1.1.sha256sum] = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" |
| 1114 | SRC_URI[icu_time-2.1.1.sha256sum] = "8242b00da3b3b6678f731437a11c8833a43c821ae081eca60ba1b7579d45b6d8" | ||
| 1115 | SRC_URI[icu_time_data-2.1.1.sha256sum] = "3e10b0e5e87a2c84bd5fa407705732052edebe69291d347d0c3033785470edbf" | ||
| 1073 | SRC_URI[intl-memoizer-0.5.3.sha256sum] = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f" | 1116 | SRC_URI[intl-memoizer-0.5.3.sha256sum] = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f" |
| 1074 | SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" | 1117 | SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" |
| 1075 | SRC_URI[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" | 1118 | SRC_URI[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" |
| 1076 | SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" | 1119 | SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" |
| 1077 | SRC_URI[jiff-0.2.16.sha256sum] = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35" | 1120 | SRC_URI[ixdtf-0.6.4.sha256sum] = "84de9d95a6d2547d9b77ee3f25fa0ee32e3c3a6484d47a55adebc0439c077992" |
| 1078 | SRC_URI[jiff-static-0.2.16.sha256sum] = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69" | 1121 | SRC_URI[jiff-0.2.19.sha256sum] = "d89a5b5e10d5a9ad6e5d1f4bd58225f655d6fe9767575a5e8ac5a6fe64e04495" |
| 1079 | SRC_URI[jiff-tzdb-0.1.4.sha256sum] = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524" | 1122 | SRC_URI[jiff-icu-0.2.2.sha256sum] = "0e67c2beaae8b10a82d849b9aabb698a43a682f32b17bcdc035d5ecadb44d646" |
| 1123 | SRC_URI[jiff-static-0.2.19.sha256sum] = "ff7a39c8862fc1369215ccf0a8f12dd4598c7f6484704359f0351bd617034dbf" | ||
| 1124 | SRC_URI[jiff-tzdb-0.1.5.sha256sum] = "68971ebff725b9e2ca27a601c5eb38a4c5d64422c4cbab0c535f248087eda5c2" | ||
| 1080 | SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" | 1125 | SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" |
| 1081 | SRC_URI[jobserver-0.1.34.sha256sum] = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" | 1126 | SRC_URI[jobserver-0.1.34.sha256sum] = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" |
| 1082 | SRC_URI[js-sys-0.3.83.sha256sum] = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" | 1127 | SRC_URI[js-sys-0.3.85.sha256sum] = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" |
| 1083 | SRC_URI[keccak-0.1.5.sha256sum] = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" | 1128 | SRC_URI[keccak-0.1.6.sha256sum] = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" |
| 1084 | SRC_URI[libc-0.2.178.sha256sum] = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" | 1129 | SRC_URI[libc-0.2.182.sha256sum] = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" |
| 1085 | SRC_URI[libfuzzer-sys-0.4.10.sha256sum] = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404" | 1130 | SRC_URI[libfuzzer-sys-0.4.12.sha256sum] = "f12a681b7dd8ce12bff52488013ba614b869148d54dd79836ab85aafdd53f08d" |
| 1086 | SRC_URI[libm-0.2.15.sha256sum] = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" | 1131 | SRC_URI[libm-0.2.16.sha256sum] = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" |
| 1087 | SRC_URI[linux-raw-sys-0.11.0.sha256sum] = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" | 1132 | SRC_URI[linux-raw-sys-0.12.1.sha256sum] = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" |
| 1088 | SRC_URI[litemap-0.8.1.sha256sum] = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" | 1133 | SRC_URI[litemap-0.8.1.sha256sum] = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" |
| 1089 | SRC_URI[log-0.4.29.sha256sum] = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" | 1134 | SRC_URI[log-0.4.29.sha256sum] = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" |
| 1090 | SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" | 1135 | SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" |
| 1091 | SRC_URI[memchr-2.7.6.sha256sum] = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" | 1136 | SRC_URI[memchr-2.8.0.sha256sum] = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" |
| 1092 | SRC_URI[miniz_oxide-0.8.9.sha256sum] = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" | 1137 | SRC_URI[miniz_oxide-0.8.9.sha256sum] = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" |
| 1093 | SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" | 1138 | SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" |
| 1094 | SRC_URI[nom-8.0.0.sha256sum] = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" | 1139 | SRC_URI[nom-8.0.0.sha256sum] = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" |
| @@ -1104,30 +1149,30 @@ SRC_URI[onig_sys-69.9.1.sha256sum] = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e558 | |||
| 1104 | SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" | 1149 | SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" |
| 1105 | SRC_URI[os_display-0.1.4.sha256sum] = "ad5fd71b79026fb918650dde6d125000a233764f1c2f1659a1c71118e33ea08f" | 1150 | SRC_URI[os_display-0.1.4.sha256sum] = "ad5fd71b79026fb918650dde6d125000a233764f1c2f1659a1c71118e33ea08f" |
| 1106 | SRC_URI[outref-0.5.2.sha256sum] = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" | 1151 | SRC_URI[outref-0.5.2.sha256sum] = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" |
| 1107 | SRC_URI[parse_datetime-0.13.3.sha256sum] = "acea383beda9652270f3c9678d83aa58cbfc16880343cae0c0c8c7d6c0974132" | 1152 | SRC_URI[parse_datetime-0.14.0.sha256sum] = "413775a7eac2261d2211a79d10ef275e5b6f7b527eec42ad09adce2ffa92b6e5" |
| 1108 | SRC_URI[phf-0.13.1.sha256sum] = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" | ||
| 1109 | SRC_URI[phf_shared-0.13.1.sha256sum] = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" | ||
| 1110 | SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" | 1153 | SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" |
| 1111 | SRC_URI[portable-atomic-1.11.1.sha256sum] = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" | 1154 | SRC_URI[portable-atomic-1.13.1.sha256sum] = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" |
| 1112 | SRC_URI[portable-atomic-util-0.2.4.sha256sum] = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" | 1155 | SRC_URI[portable-atomic-util-0.2.5.sha256sum] = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5" |
| 1113 | SRC_URI[potential_utf-0.1.4.sha256sum] = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" | 1156 | SRC_URI[potential_utf-0.1.4.sha256sum] = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" |
| 1114 | SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" | 1157 | SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" |
| 1115 | SRC_URI[proc-macro2-1.0.103.sha256sum] = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" | 1158 | SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" |
| 1116 | SRC_URI[procfs-0.18.0.sha256sum] = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" | 1159 | SRC_URI[procfs-0.18.0.sha256sum] = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" |
| 1117 | SRC_URI[procfs-core-0.18.0.sha256sum] = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" | 1160 | SRC_URI[procfs-core-0.18.0.sha256sum] = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" |
| 1118 | SRC_URI[quote-1.0.42.sha256sum] = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" | 1161 | SRC_URI[quote-1.0.44.sha256sum] = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" |
| 1119 | SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" | 1162 | SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" |
| 1120 | SRC_URI[rand-0.9.2.sha256sum] = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" | 1163 | SRC_URI[rand-0.9.2.sha256sum] = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" |
| 1121 | SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" | 1164 | SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" |
| 1122 | SRC_URI[rand_core-0.9.3.sha256sum] = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" | 1165 | SRC_URI[rand_core-0.9.5.sha256sum] = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" |
| 1123 | SRC_URI[rayon-1.11.0.sha256sum] = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" | 1166 | SRC_URI[rayon-1.11.0.sha256sum] = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" |
| 1124 | SRC_URI[rayon-core-1.13.0.sha256sum] = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" | 1167 | SRC_URI[rayon-core-1.13.0.sha256sum] = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" |
| 1125 | SRC_URI[regex-automata-0.4.13.sha256sum] = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" | 1168 | SRC_URI[regex-1.12.3.sha256sum] = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" |
| 1169 | SRC_URI[regex-automata-0.4.14.sha256sum] = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" | ||
| 1170 | SRC_URI[regex-syntax-0.8.9.sha256sum] = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" | ||
| 1126 | SRC_URI[rust-ini-0.21.3.sha256sum] = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7" | 1171 | SRC_URI[rust-ini-0.21.3.sha256sum] = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7" |
| 1127 | SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" | 1172 | SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" |
| 1128 | SRC_URI[rustix-1.1.2.sha256sum] = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" | 1173 | SRC_URI[rustix-1.1.4.sha256sum] = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" |
| 1129 | SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" | 1174 | SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" |
| 1130 | SRC_URI[self_cell-1.2.1.sha256sum] = "16c2f82143577edb4921b71ede051dac62ca3c16084e918bf7b40c96ae10eb33" | 1175 | SRC_URI[self_cell-1.2.2.sha256sum] = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" |
| 1131 | SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" | 1176 | SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" |
| 1132 | SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" | 1177 | SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" |
| 1133 | SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" | 1178 | SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" |
| @@ -1135,20 +1180,19 @@ SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1 | |||
| 1135 | SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" | 1180 | SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" |
| 1136 | SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" | 1181 | SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" |
| 1137 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" | 1182 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" |
| 1138 | SRC_URI[simd-adler32-0.3.7.sha256sum] = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" | 1183 | SRC_URI[simd-adler32-0.3.8.sha256sum] = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" |
| 1139 | SRC_URI[similar-2.7.0.sha256sum] = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" | 1184 | SRC_URI[similar-2.7.0.sha256sum] = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" |
| 1140 | SRC_URI[siphasher-1.0.1.sha256sum] = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" | ||
| 1141 | SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" | 1185 | SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" |
| 1142 | SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" | 1186 | SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" |
| 1143 | SRC_URI[spin-0.10.0.sha256sum] = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591" | 1187 | SRC_URI[spin-0.10.0.sha256sum] = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591" |
| 1144 | SRC_URI[stable_deref_trait-1.2.1.sha256sum] = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" | 1188 | SRC_URI[stable_deref_trait-1.2.1.sha256sum] = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" |
| 1145 | SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" | 1189 | SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" |
| 1146 | SRC_URI[syn-2.0.111.sha256sum] = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" | 1190 | SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" |
| 1147 | SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" | 1191 | SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" |
| 1148 | SRC_URI[tempfile-3.23.0.sha256sum] = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" | 1192 | SRC_URI[tempfile-3.26.0.sha256sum] = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" |
| 1149 | SRC_URI[terminal_size-0.4.3.sha256sum] = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0" | 1193 | SRC_URI[terminal_size-0.4.3.sha256sum] = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0" |
| 1150 | SRC_URI[thiserror-2.0.17.sha256sum] = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" | 1194 | SRC_URI[thiserror-2.0.18.sha256sum] = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" |
| 1151 | SRC_URI[thiserror-impl-2.0.17.sha256sum] = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" | 1195 | SRC_URI[thiserror-impl-2.0.18.sha256sum] = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" |
| 1152 | SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" | 1196 | SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" |
| 1153 | SRC_URI[tinystr-0.8.2.sha256sum] = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" | 1197 | SRC_URI[tinystr-0.8.2.sha256sum] = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" |
| 1154 | SRC_URI[type-map-0.5.1.sha256sum] = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" | 1198 | SRC_URI[type-map-0.5.1.sha256sum] = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" |
| @@ -1164,11 +1208,11 @@ SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa570 | |||
| 1164 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" | 1208 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" |
| 1165 | SRC_URI[vsimd-0.8.0.sha256sum] = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" | 1209 | SRC_URI[vsimd-0.8.0.sha256sum] = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" |
| 1166 | SRC_URI[wasi-0.11.1+wasi-snapshot-preview1.sha256sum] = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" | 1210 | SRC_URI[wasi-0.11.1+wasi-snapshot-preview1.sha256sum] = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" |
| 1167 | SRC_URI[wasip2-1.0.1+wasi-0.2.4.sha256sum] = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" | 1211 | SRC_URI[wasip2-1.0.2+wasi-0.2.9.sha256sum] = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" |
| 1168 | SRC_URI[wasm-bindgen-0.2.106.sha256sum] = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" | 1212 | SRC_URI[wasm-bindgen-0.2.108.sha256sum] = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" |
| 1169 | SRC_URI[wasm-bindgen-macro-0.2.106.sha256sum] = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" | 1213 | SRC_URI[wasm-bindgen-macro-0.2.108.sha256sum] = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" |
| 1170 | SRC_URI[wasm-bindgen-macro-support-0.2.106.sha256sum] = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" | 1214 | SRC_URI[wasm-bindgen-macro-support-0.2.108.sha256sum] = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" |
| 1171 | SRC_URI[wasm-bindgen-shared-0.2.106.sha256sum] = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" | 1215 | SRC_URI[wasm-bindgen-shared-0.2.108.sha256sum] = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" |
| 1172 | SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" | 1216 | SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" |
| 1173 | SRC_URI[winapi-util-0.1.11.sha256sum] = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" | 1217 | SRC_URI[winapi-util-0.1.11.sha256sum] = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" |
| 1174 | SRC_URI[windows-core-0.62.2.sha256sum] = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" | 1218 | SRC_URI[windows-core-0.62.2.sha256sum] = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" |
| @@ -1189,14 +1233,14 @@ SRC_URI[windows_x86_64_gnu-0.53.1.sha256sum] = "9c3842cdd74a865a8066ab39c8a7a473 | |||
| 1189 | SRC_URI[windows_x86_64_gnullvm-0.53.1.sha256sum] = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" | 1233 | SRC_URI[windows_x86_64_gnullvm-0.53.1.sha256sum] = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" |
| 1190 | SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" | 1234 | SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" |
| 1191 | SRC_URI[winnow-0.7.14.sha256sum] = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" | 1235 | SRC_URI[winnow-0.7.14.sha256sum] = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" |
| 1192 | SRC_URI[wit-bindgen-0.46.0.sha256sum] = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" | 1236 | SRC_URI[wit-bindgen-0.51.0.sha256sum] = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" |
| 1193 | SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" | 1237 | SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" |
| 1194 | SRC_URI[writeable-0.6.2.sha256sum] = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" | 1238 | SRC_URI[writeable-0.6.2.sha256sum] = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" |
| 1195 | SRC_URI[yoke-0.8.1.sha256sum] = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" | 1239 | SRC_URI[yoke-0.8.1.sha256sum] = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" |
| 1196 | SRC_URI[yoke-derive-0.8.1.sha256sum] = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" | 1240 | SRC_URI[yoke-derive-0.8.1.sha256sum] = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" |
| 1197 | SRC_URI[z85-3.0.6.sha256sum] = "9b3a41ce106832b4da1c065baa4c31cf640cf965fa1483816402b7f6b96f0a64" | 1241 | SRC_URI[z85-3.0.6.sha256sum] = "9b3a41ce106832b4da1c065baa4c31cf640cf965fa1483816402b7f6b96f0a64" |
| 1198 | SRC_URI[zerocopy-0.8.31.sha256sum] = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" | 1242 | SRC_URI[zerocopy-0.8.39.sha256sum] = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a" |
| 1199 | SRC_URI[zerocopy-derive-0.8.31.sha256sum] = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" | 1243 | SRC_URI[zerocopy-derive-0.8.39.sha256sum] = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" |
| 1200 | SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" | 1244 | SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" |
| 1201 | SRC_URI[zerofrom-derive-0.1.6.sha256sum] = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" | 1245 | SRC_URI[zerofrom-derive-0.1.6.sha256sum] = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" |
| 1202 | SRC_URI[zerotrie-0.2.3.sha256sum] = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" | 1246 | SRC_URI[zerotrie-0.2.3.sha256sum] = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" |
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.5.0.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.7.0.bb index ab3e0eb6ff..5103d86e92 100644 --- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.5.0.bb +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.7.0.bb | |||
| @@ -11,7 +11,7 @@ SRC_URI = " \ | |||
| 11 | git://github.com/uutils/coreutils.git;protocol=https;branch=main;tag=${PV} \ | 11 | git://github.com/uutils/coreutils.git;protocol=https;branch=main;tag=${PV} \ |
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRCREV = "64203e309810d7e01eaf9c6cc7c21df22a8a896d" | 14 | SRCREV = "995c9e04a6cc34a3a95b23a26fa59ae87e7744bd" |
| 15 | 15 | ||
| 16 | require ${BPN}-crates.inc | 16 | require ${BPN}-crates.inc |
| 17 | 17 | ||
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.3.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.4.bb index 44bf66c1ed..34755fc3ad 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.3.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.4.bb | |||
| @@ -24,7 +24,7 @@ DEPENDS:append:libc-musl = " argp-standalone" | |||
| 24 | LDFLAGS:append:libc-musl = " -largp" | 24 | LDFLAGS:append:libc-musl = " -largp" |
| 25 | 25 | ||
| 26 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" | 26 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" |
| 27 | SRC_URI[sha256sum] = "4a8a23b8b9d1a3250452e40acead4421a03e45a38954ad0595634f4266aa800f" | 27 | SRC_URI[sha256sum] = "443e46f8964c9acc780f455afbb8e23aa0e8ed7ec504cfc59e04f406fa1e8a83" |
| 28 | 28 | ||
| 29 | inherit autotools gettext pkgconfig | 29 | inherit autotools gettext pkgconfig |
| 30 | 30 | ||
diff --git a/meta-oe/recipes-crypto/libsodium/libsodium/0001-Fix-compilation-with-GCC-on-aarch64.patch b/meta-oe/recipes-crypto/libsodium/libsodium/0001-Fix-compilation-with-GCC-on-aarch64.patch new file mode 100644 index 0000000000..c5c0d12b87 --- /dev/null +++ b/meta-oe/recipes-crypto/libsodium/libsodium/0001-Fix-compilation-with-GCC-on-aarch64.patch | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | From fc66d1bd0d3db6392424a1fd10dcf4343ce72c52 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Frank Denis <github@pureftpd.org> | ||
| 3 | Date: Wed, 7 Jan 2026 12:00:49 +0100 | ||
| 4 | Subject: [PATCH] Fix compilation with GCC on aarch64 | ||
| 5 | |||
| 6 | Use unsigned NEON intrinsics everywhere | ||
| 7 | |||
| 8 | Fixes #1502 | ||
| 9 | |||
| 10 | Upstream-Status: Backport [https://github.com/jedisct1/libsodium/commit/6702f69bef6044163acc7715e6ac7e430890ce78] | ||
| 11 | --- | ||
| 12 | src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c | 14 +++++++------- | ||
| 13 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c b/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c | ||
| 16 | index c5a27e92..bad4ce38 100644 | ||
| 17 | --- a/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c | ||
| 18 | +++ b/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c | ||
| 19 | @@ -37,7 +37,7 @@ typedef uint64x2_t BlockVec; | ||
| 20 | # define XOR128_3(a, b, c) veorq_u64(veorq_u64((a), (b)), (c)) | ||
| 21 | # define SET64x2(a, b) vsetq_lane_u64((uint64_t) (a), vmovq_n_u64((uint64_t) (b)), 1) | ||
| 22 | # define BYTESHL128(a, b) \ | ||
| 23 | - vreinterpretq_u64_u8(vextq_s8(vdupq_n_s8(0), vreinterpretq_s8_u64(a), 16 - (b))) | ||
| 24 | + vreinterpretq_u64_u8(vextq_u8(vdupq_n_u8(0), vreinterpretq_u8_u64(a), 16 - (b))) | ||
| 25 | |||
| 26 | # define AES_XENCRYPT(block_vec, rkey) \ | ||
| 27 | vreinterpretq_u64_u8( \ | ||
| 28 | @@ -348,12 +348,12 @@ pfx_set_bit(uint8_t ip16[16], const unsigned int bit_index, const uint8_t bit_va | ||
| 29 | static void | ||
| 30 | pfx_shift_left(uint8_t ip16[16]) | ||
| 31 | { | ||
| 32 | - BlockVec v = LOAD128(ip16); | ||
| 33 | - const BlockVec shl = vshlq_n_u8(vreinterpretq_u8_u64(v), 1); | ||
| 34 | - const BlockVec msb = vshrq_n_u8(vreinterpretq_u8_u64(v), 7); | ||
| 35 | - const BlockVec zero = vdupq_n_u8(0); | ||
| 36 | - const BlockVec carries = vextq_u8(vreinterpretq_u8_u64(msb), zero, 1); | ||
| 37 | - v = vreinterpretq_u64_u8(vorrq_u8(shl, carries)); | ||
| 38 | + BlockVec v = LOAD128(ip16); | ||
| 39 | + const uint8x16_t shl = vshlq_n_u8(vreinterpretq_u8_u64(v), 1); | ||
| 40 | + const uint8x16_t msb = vshrq_n_u8(vreinterpretq_u8_u64(v), 7); | ||
| 41 | + const uint8x16_t zero = vdupq_n_u8(0); | ||
| 42 | + const uint8x16_t carries = vextq_u8(msb, zero, 1); | ||
| 43 | + v = vreinterpretq_u64_u8(vorrq_u8(shl, carries)); | ||
| 44 | STORE128(ip16, v); | ||
| 45 | } | ||
| 46 | |||
| 47 | -- | ||
| 48 | 2.47.3 | ||
| 49 | |||
diff --git a/meta-oe/recipes-crypto/libsodium/libsodium/CVE-2025-69277.patch b/meta-oe/recipes-crypto/libsodium/libsodium/CVE-2025-69277.patch deleted file mode 100644 index a2ced62760..0000000000 --- a/meta-oe/recipes-crypto/libsodium/libsodium/CVE-2025-69277.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | From ad3004ec8731730e93fcfbbc824e67eadc1c1bae Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Frank Denis <github@pureftpd.org> | ||
| 3 | Date: Mon, 29 Dec 2025 23:22:15 +0100 | ||
| 4 | Subject: [PATCH] core_ed25519_is_valid_point: check Y==Z in addition to X==0 | ||
| 5 | |||
| 6 | CVE: CVE-2025-69277 | ||
| 7 | Upstream-Status: Backport [https://github.com/jedisct1/libsodium/commit/ad3004ec8731730e93fcfbbc824e67eadc1c1bae] | ||
| 8 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 9 | --- | ||
| 10 | src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c | 5 ++++- | ||
| 11 | test/default/core_ed25519.c | 7 ++++++- | ||
| 12 | 2 files changed, 10 insertions(+), 2 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c | ||
| 15 | index d3020132..4b824f6d 100644 | ||
| 16 | --- a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c | ||
| 17 | +++ b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c | ||
| 18 | @@ -1141,10 +1141,13 @@ int | ||
| 19 | ge25519_is_on_main_subgroup(const ge25519_p3 *p) | ||
| 20 | { | ||
| 21 | ge25519_p3 pl; | ||
| 22 | + fe25519 t; | ||
| 23 | |||
| 24 | ge25519_mul_l(&pl, p); | ||
| 25 | |||
| 26 | - return fe25519_iszero(pl.X); | ||
| 27 | + fe25519_sub(t, pl.Y, pl.Z); | ||
| 28 | + | ||
| 29 | + return fe25519_iszero(pl.X) & fe25519_iszero(t); | ||
| 30 | } | ||
| 31 | |||
| 32 | int | ||
| 33 | diff --git a/test/default/core_ed25519.c b/test/default/core_ed25519.c | ||
| 34 | index bc457493..02f72bd6 100644 | ||
| 35 | --- a/test/default/core_ed25519.c | ||
| 36 | +++ b/test/default/core_ed25519.c | ||
| 37 | @@ -13,6 +13,10 @@ static const unsigned char max_canonical_p[32] = { | ||
| 38 | 0xe4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 39 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f | ||
| 40 | }; | ||
| 41 | +static const unsigned char not_main_subgroup_p[32] = { | ||
| 42 | + 0x95, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, | ||
| 43 | + 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99 | ||
| 44 | +}; | ||
| 45 | static const unsigned char L_p1[32] = { | ||
| 46 | 0xee, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, | ||
| 47 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10 | ||
| 48 | @@ -133,11 +137,12 @@ main(void) | ||
| 49 | assert(crypto_core_ed25519_is_valid_point(p) == 0); | ||
| 50 | |||
| 51 | p[0] = 9; | ||
| 52 | - assert(crypto_core_ed25519_is_valid_point(p) == 1); | ||
| 53 | + assert(crypto_core_ed25519_is_valid_point(p) == 0); | ||
| 54 | |||
| 55 | assert(crypto_core_ed25519_is_valid_point(max_canonical_p) == 1); | ||
| 56 | assert(crypto_core_ed25519_is_valid_point(non_canonical_invalid_p) == 0); | ||
| 57 | assert(crypto_core_ed25519_is_valid_point(non_canonical_p) == 0); | ||
| 58 | + assert(crypto_core_ed25519_is_valid_point(not_main_subgroup_p) == 0); | ||
| 59 | |||
| 60 | memcpy(p2, p, crypto_core_ed25519_BYTES); | ||
| 61 | add_P(p2); | ||
diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb deleted file mode 100644 index 972b8b8694..0000000000 --- a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | SUMMARY = "The Sodium crypto library" | ||
| 2 | HOMEPAGE = "http://libsodium.org/" | ||
| 3 | BUGTRACKER = "https://github.com/jedisct1/libsodium/issues" | ||
| 4 | LICENSE = "ISC" | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c59be7bb29f8e431b5f2d690b6734185" | ||
| 6 | |||
| 7 | SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz" | ||
| 8 | SRC_URI[sha256sum] = "ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19" | ||
| 9 | |||
| 10 | SRC_URI += "file://CVE-2025-69277.patch" | ||
| 11 | |||
| 12 | inherit autotools | ||
| 13 | |||
| 14 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.21.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.21.bb new file mode 100644 index 0000000000..a1647d2a30 --- /dev/null +++ b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.21.bb | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | SUMMARY = "The Sodium crypto library" | ||
| 2 | HOMEPAGE = "http://libsodium.org/" | ||
| 3 | BUGTRACKER = "https://github.com/jedisct1/libsodium/issues" | ||
| 4 | LICENSE = "ISC" | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4942a8ebbbc7f2212bd68a47df264a4f" | ||
| 6 | |||
| 7 | SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz \ | ||
| 8 | file://0001-Fix-compilation-with-GCC-on-aarch64.patch \ | ||
| 9 | " | ||
| 10 | SRC_URI[sha256sum] = "9e4285c7a419e82dedb0be63a72eea357d6943bc3e28e6735bf600dd4883feaf" | ||
| 11 | |||
| 12 | |||
| 13 | inherit autotools | ||
| 14 | |||
| 15 | BBCLASSEXTEND = "native nativesdk" | ||
| 16 | |||
| 17 | CVE_STATUS[CVE-2025-69277] = "fixed-version: fixed in 1.0.20" | ||
diff --git a/meta-oe/recipes-dbs/lmdb/files/CVE-2026-22185.patch b/meta-oe/recipes-dbs/lmdb/files/CVE-2026-22185.patch deleted file mode 100644 index 6c85b2b8ed..0000000000 --- a/meta-oe/recipes-dbs/lmdb/files/CVE-2026-22185.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 94ca20e5aed5d8730e045bb945fa3485b28a7981 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Tue, 6 Jan 2026 20:52:25 +0000 | ||
| 4 | Subject: [PATCH] ITS#10421 mdb_load: check for malicious input | ||
| 5 | |||
| 6 | From: Howard Chu <hyc@openldap.org> | ||
| 7 | |||
| 8 | CVE: CVE-2026-22185 | ||
| 9 | Upstream-Status: Backport [https://github.com/LMDB/lmdb/commit/8e1fda85532a3c74276df38a42d234dcdfa1e40d] | ||
| 10 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 11 | --- | ||
| 12 | libraries/liblmdb/mdb_load.c | 6 ++++++ | ||
| 13 | 1 file changed, 6 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c | ||
| 16 | index d2a3cec..7eccf40 100644 | ||
| 17 | --- a/libraries/liblmdb/mdb_load.c | ||
| 18 | +++ b/libraries/liblmdb/mdb_load.c | ||
| 19 | @@ -208,6 +208,12 @@ badend: | ||
| 20 | |||
| 21 | c1 = buf->mv_data; | ||
| 22 | len = strlen((char *)c1); | ||
| 23 | + if (!len) { | ||
| 24 | + /* This can only happen with an intentionally invalid input | ||
| 25 | + * with a NUL byte after the leading SPACE | ||
| 26 | + */ | ||
| 27 | + goto badend; | ||
| 28 | + } | ||
| 29 | l2 = len; | ||
| 30 | |||
| 31 | /* Is buffer too short? */ | ||
diff --git a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.35.bb index 29bfbb81fa..36f2056914 100644 --- a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb +++ b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.35.bb | |||
| @@ -8,14 +8,13 @@ HOMEPAGE = "https://symas.com/lightning-memory-mapped-database/" | |||
| 8 | LICENSE = "OLDAP-2.8" | 8 | LICENSE = "OLDAP-2.8" |
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1;protocol=https \ | 11 | SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1;protocol=https;tag=LMDB_${PV} \ |
| 12 | file://run-ptest \ | 12 | file://run-ptest \ |
| 13 | file://0001-Makefile-use-libprefix-instead-of-libdir.patch \ | 13 | file://0001-Makefile-use-libprefix-instead-of-libdir.patch \ |
| 14 | file://0001-make-set-soname-on-liblmdb.patch;patchdir=../.. \ | 14 | file://0001-make-set-soname-on-liblmdb.patch;patchdir=../.. \ |
| 15 | file://CVE-2026-22185.patch;striplevel=3 \ | ||
| 16 | " | 15 | " |
| 17 | 16 | ||
| 18 | SRCREV = "ce201088de95d26fc0da36ba805bf2ddc2ba74ff" | 17 | SRCREV = "69087ced3cb6082f7dcfb4fc2dcaa3b68a7e2e8c" |
| 19 | 18 | ||
| 20 | inherit ptest | 19 | inherit ptest |
| 21 | 20 | ||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.9.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.10.bb index ff48dcd806..ff48dcd806 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.9.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.10.bb | |||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 4fcb5a1e40..9470184d3d 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
| @@ -23,12 +23,10 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ | |||
| 23 | file://lfs64.patch \ | 23 | file://lfs64.patch \ |
| 24 | file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ | 24 | file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ |
| 25 | file://riscv32.patch \ | 25 | file://riscv32.patch \ |
| 26 | file://0001-Remove-x86-specific-loop-in-my_convert.patch \ | ||
| 27 | file://0001-support-reproducible-builds.patch \ | 26 | file://0001-support-reproducible-builds.patch \ |
| 28 | file://0001-storage-mroonga-CMakeLists.txt-fix-reproducible-buil.patch \ | 27 | file://0001-storage-mroonga-CMakeLists.txt-fix-reproducible-buil.patch \ |
| 29 | file://0001-MDEV-38029-my_tzinfo-t-fails-for-certain-TZ-values-o.patch \ | ||
| 30 | " | 28 | " |
| 31 | SRC_URI[sha256sum] = "8e481ca29b5a740444d45451c8ea2d93711cf525d6fa5d27bc9512cf8973b075" | 29 | SRC_URI[sha256sum] = "14783ddc5edd966ff05aa0efd5ed6d3d369ed5b9e4080a448f00f87a9f0a4a6b" |
| 32 | 30 | ||
| 33 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags" | 31 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags" |
| 34 | 32 | ||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-38029-my_tzinfo-t-fails-for-certain-TZ-values-o.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-38029-my_tzinfo-t-fails-for-certain-TZ-values-o.patch deleted file mode 100644 index f1e07e304a..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-38029-my_tzinfo-t-fails-for-certain-TZ-values-o.patch +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | From 61bc216ff9e1d0a8a7fafce57ba916018cd6ac6d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Vladislav Vaintroub <vvaintroub@gmail.com> | ||
| 3 | Date: Wed, 19 Nov 2025 13:01:56 +0100 | ||
| 4 | Subject: [PATCH] MDEV-38029 my_tzinfo-t fails for certain TZ values on musl | ||
| 5 | |||
| 6 | From: Vladislav Vaintroub <vvaintroub@gmail.com> | ||
| 7 | |||
| 8 | The test fails for TZ values such as `PST8PDT` (present but outdated in | ||
| 9 | tzdb) and custom forms like `GST-1GDT`. On musl, these values do not | ||
| 10 | trigger the expected DST transitions, leading to incorrect DST offsets | ||
| 11 | or abbreviations. | ||
| 12 | |||
| 13 | This appears to be a musl libc bug; the same TZ values behave correctly | ||
| 14 | elsewhere, including Windows. We work around it by skipping the | ||
| 15 | affected tests when musl is detected. | ||
| 16 | |||
| 17 | Upstream-Status: Submitted [https://github.com/MariaDB/server/pull/4452] | ||
| 18 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 19 | --- | ||
| 20 | unittest/mysys/my_tzinfo-t.c | 14 ++++++++++++++ | ||
| 21 | 1 file changed, 14 insertions(+) | ||
| 22 | |||
| 23 | diff --git a/unittest/mysys/my_tzinfo-t.c b/unittest/mysys/my_tzinfo-t.c | ||
| 24 | index b38ebd37..585d52f8 100644 | ||
| 25 | --- a/unittest/mysys/my_tzinfo-t.c | ||
| 26 | +++ b/unittest/mysys/my_tzinfo-t.c | ||
| 27 | @@ -112,6 +112,20 @@ void test_timezone(const char *tz_env, const char **expected_tznames, | ||
| 28 | } | ||
| 29 | } | ||
| 30 | ok(found, "%s: timezone_name = %s", tz_env, timezone_name); | ||
| 31 | + | ||
| 32 | +#if defined __linux__ && !defined __GLIBC__ && !defined __UCLIBC__ | ||
| 33 | + /* | ||
| 34 | + MUSL incorrectly calculates UTC offsets and abbreviations | ||
| 35 | + for certain values of TZ (DST related). See MDEV-38029 | ||
| 36 | + Skip tests in this case. | ||
| 37 | + */ | ||
| 38 | + if (!strcmp(tz_env, "PST8PDT") || !strcmp(tz_env, "GST-1GDT")) | ||
| 39 | + { | ||
| 40 | + skip(6, "musl UTC offset/abbreviation bug, tzname %s, see MDEV-38029", tz_env); | ||
| 41 | + return; | ||
| 42 | + } | ||
| 43 | +#endif | ||
| 44 | + | ||
| 45 | my_tzinfo(SUMMER_TIMESTAMP, &tz); | ||
| 46 | ok(summer_gmt_off == tz.seconds_offset, "%s: Summer GMT offset %ld", tz_env, tz.seconds_offset); | ||
| 47 | check_utc_offset(SUMMER_TIMESTAMP,tz.seconds_offset, tz_env); | ||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-x86-specific-loop-in-my_convert.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-x86-specific-loop-in-my_convert.patch deleted file mode 100644 index afcf4fe843..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-x86-specific-loop-in-my_convert.patch +++ /dev/null | |||
| @@ -1,93 +0,0 @@ | |||
| 1 | From 79d2a95391abc133e86688696ae21628b7035b2d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= | ||
| 3 | <zboszor@gmail.com> | ||
| 4 | Date: Wed, 1 Oct 2025 09:29:04 +0200 | ||
| 5 | Subject: [PATCH] Remove x86 specific loop in my_convert() | ||
| 6 | MIME-Version: 1.0 | ||
| 7 | Content-Type: text/plain; charset=UTF-8 | ||
| 8 | Content-Transfer-Encoding: 8bit | ||
| 9 | |||
| 10 | mysqldump/mariadb-dump crashes with this backtrace: | ||
| 11 | |||
| 12 | | (gdb) bt | ||
| 13 | | #0 my_convert (to=<optimized out>, to_length=160, to_cs=0x55b5740fbda0 <my_charset_utf8mb4_general_ci>, from=<optimized out>, from_length=40, | ||
| 14 | | from_cs=0x55b57408bda0 <my_charset_utf8mb3_unicode_ci>, errors=0x7f950c35cd6c) at /usr/src/debug/mariadb/11.8.3/strings/ctype.c:1256 | ||
| 15 | | #1 0x000055b572d9f4a0 in copy_and_convert (to=0x7f94fc00c9db "Configuratiogicate_log\020automagicate_log\017is_done_message\017is_done_message", | ||
| 16 | | to_length=<optimized out>, to_cs=<optimized out>, from=0x7f94fc059f37 "Configuration downloading from portal...", from_length=40, from_cs=<optimized out>, | ||
| 17 | | errors=0x7f950c35cd6c) at /usr/src/debug/mariadb/11.8.3/sql/sql_string.h:53 | ||
| 18 | | #2 Protocol::net_store_data_cs (this=0x7f94fc001260, from=0x7f94fc059f37 "Configuration downloading from portal...", length=40, from_cs=<optimized out>, | ||
| 19 | | to_cs=<optimized out>) at /usr/src/debug/mariadb/11.8.3/sql/protocol.cc:114 | ||
| 20 | | #3 0x000055b572da103f in Protocol::send_result_set_row (this=this@entry=0x7f94fc001260, row_items=row_items@entry=0x7f94fc013418) | ||
| 21 | | at /usr/src/debug/mariadb/11.8.3/sql/protocol.cc:1359 | ||
| 22 | | #4 0x000055b572e19442 in select_send::send_data (this=0x7f94fc014f78, items=...) at /usr/src/debug/mariadb/11.8.3/sql/sql_class.cc:3294 | ||
| 23 | | #5 0x000055b572ef7c69 in select_result_sink::send_data_with_check (u=<optimized out>, sent=<optimized out>, this=<optimized out>, items=...) | ||
| 24 | | at /usr/src/debug/mariadb/11.8.3/sql/sql_class.h:6264 | ||
| 25 | | #6 select_result_sink::send_data_with_check (this=<optimized out>, items=..., u=<optimized out>, sent=<optimized out>) | ||
| 26 | | at /usr/src/debug/mariadb/11.8.3/sql/sql_class.h:6254 | ||
| 27 | | #7 end_send (join=<optimized out>, join_tab=<optimized out>, end_of_records=<optimized out>) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:25629 | ||
| 28 | | #8 0x000055b572ec38b6 in evaluate_join_record (join=join@entry=0x7f94fc014fa0, join_tab=join_tab@entry=0x7f94fc016940, error=error@entry=0) | ||
| 29 | | at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:24523 | ||
| 30 | | #9 0x000055b572edcbf2 in sub_select (join=0x7f94fc014fa0, join_tab=0x7f94fc016940, end_of_records=<optimized out>) | ||
| 31 | | at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:24290 | ||
| 32 | | #10 0x000055b572f119c6 in do_select (join=0x7f94fc014fa0, procedure=<optimized out>) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:23801 | ||
| 33 | | #11 JOIN::exec_inner (this=this@entry=0x7f94fc014fa0) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:5071 | ||
| 34 | | #12 0x000055b572f11d43 in JOIN::exec (this=this@entry=0x7f94fc014fa0) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:4859 | ||
| 35 | | #13 0x000055b572f0ffe6 in mysql_select (thd=thd@entry=0x7f94fc000cd8, tables=0x7f94fc013f38, fields=..., conds=0x0, og_num=0, order=0x0, group=0x0, having=0x0, | ||
| 36 | | proc_param=0x0, select_options=551922436864, result=0x7f94fc014f78, unit=0x7f94fc005038, select_lex=0x7f94fc013160) | ||
| 37 | | at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:5387 | ||
| 38 | | #14 0x000055b572f107dd in handle_select (thd=thd@entry=0x7f94fc000cd8, lex=lex@entry=0x7f94fc004f58, result=result@entry=0x7f94fc014f78, | ||
| 39 | | setup_tables_done_option=setup_tables_done_option@entry=0) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:633 | ||
| 40 | | #15 0x000055b572e77d9e in execute_sqlcom_select (thd=thd@entry=0x7f94fc000cd8, all_tables=0x7f94fc013f38) at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:6190 | ||
| 41 | | #16 0x000055b572e877be in mysql_execute_command (thd=thd@entry=0x7f94fc000cd8, is_called_from_prepared_stmt=is_called_from_prepared_stmt@entry=false) | ||
| 42 | | at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:3975 | ||
| 43 | | #17 0x000055b572e88e03 in mysql_parse (thd=0x7f94fc000cd8, rawbuf=<optimized out>, length=<optimized out>, parser_state=<optimized out>) | ||
| 44 | | at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:7905 | ||
| 45 | | #18 0x000055b572e8b2a1 in dispatch_command (command=command@entry=COM_QUERY, thd=thd@entry=0x7f94fc000cd8, packet=packet@entry=0x7f94fc0088a9 "", | ||
| 46 | | packet_length=packet_length@entry=152, blocking=blocking@entry=true) at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:1903 | ||
| 47 | | #19 0x000055b572e8cf7c in do_command (thd=thd@entry=0x7f94fc000cd8, blocking=blocking@entry=true) at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:1416 | ||
| 48 | | #20 0x000055b572fcfc0d in do_handle_one_connection (connect=<optimized out>, put_in_cache=true) at /usr/src/debug/mariadb/11.8.3/sql/sql_connect.cc:1415 | ||
| 49 | | #21 0x000055b572fcffc5 in handle_one_connection (arg=arg@entry=0x55b57943cbd8) at /usr/src/debug/mariadb/11.8.3/sql/sql_connect.cc:1327 | ||
| 50 | | #22 0x000055b573382440 in pfs_spawn_thread (arg=0x55b5795eb598) at /usr/src/debug/mariadb/11.8.3/storage/perfschema/pfs.cc:2198 | ||
| 51 | | #23 0x00007f952e8571dd in start_thread (arg=<optimized out>) at pthread_create.c:448 | ||
| 52 | | #24 0x00007f952e8d318c in __GI___clone3 () at ../sysdeps/unix/sysv/linux/x86_64/clone3.S:78 | ||
| 53 | |||
| 54 | See also: | ||
| 55 | https://jira.mariadb.org/browse/MDEV-37786 | ||
| 56 | https://jira.mariadb.org/browse/MDEV-37148 | ||
| 57 | |||
| 58 | Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> | ||
| 59 | Upstream-Status: Inappropriate [oe specific] | ||
| 60 | --- | ||
| 61 | strings/ctype.c | 16 ---------------- | ||
| 62 | 1 file changed, 16 deletions(-) | ||
| 63 | |||
| 64 | diff --git a/strings/ctype.c b/strings/ctype.c | ||
| 65 | index 629514e5e9c..d7e788c693b 100644 | ||
| 66 | --- a/strings/ctype.c | ||
| 67 | +++ b/strings/ctype.c | ||
| 68 | @@ -1243,22 +1243,6 @@ my_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, | ||
| 69 | |||
| 70 | length= length2= MY_MIN(to_length, from_length); | ||
| 71 | |||
| 72 | -#if defined(__i386__) || defined(__x86_64__) | ||
| 73 | - /* | ||
| 74 | - Special loop for i386, it allows to refer to a | ||
| 75 | - non-aligned memory block as UINT32, which makes | ||
| 76 | - it possible to copy four bytes at once. This | ||
| 77 | - gives about 10% performance improvement comparing | ||
| 78 | - to byte-by-byte loop. | ||
| 79 | - */ | ||
| 80 | - for ( ; length >= 4; length-= 4, from+= 4, to+= 4) | ||
| 81 | - { | ||
| 82 | - if ((*(uint32*)from) & 0x80808080) | ||
| 83 | - break; | ||
| 84 | - *((uint32*) to)= *((const uint32*) from); | ||
| 85 | - } | ||
| 86 | -#endif /* __i386__ */ | ||
| 87 | - | ||
| 88 | for (; ; *to++= *from++, length--) | ||
| 89 | { | ||
| 90 | if (!length) | ||
| 91 | -- | ||
| 92 | 2.51.0 | ||
| 93 | |||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_11.4.9.bb b/meta-oe/recipes-dbs/mysql/mariadb_11.4.10.bb index b1d1355e2b..b1d1355e2b 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb_11.4.9.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_11.4.10.bb | |||
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch index 89a509087f..445a6d4910 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From f0d8240dbf594e6dfab31fd7d70ce340ac365a65 Mon Sep 17 00:00:00 2001 | 1 | From ab23817b4f4a02de21f63800adc30d6236c15c8b Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 3 Nov 2024 15:50:50 -0800 | 3 | Date: Sun, 3 Nov 2024 15:50:50 -0800 |
| 4 | Subject: [PATCH] tcl.m4: Recognize tclsh9 | 4 | Subject: [PATCH] tcl.m4: Recognize tclsh9 |
diff --git a/meta-oe/recipes-dbs/postgresql/files/0002-Improve-reproducibility.patch b/meta-oe/recipes-dbs/postgresql/files/0002-Improve-reproducibility.patch index b3e87cbc46..e0605347e3 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0002-Improve-reproducibility.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0002-Improve-reproducibility.patch | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | From 084cc44215c1d5e6d33bc3d2e1d24da4fc98bdcd Mon Sep 17 00:00:00 2001 | 1 | From 736c190e0c8a1c5ce3dc84292d066292e969d81e Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Mon, 28 Dec 2020 16:38:21 +0800 | 3 | Date: Mon, 28 Dec 2020 16:38:21 +0800 |
| 4 | Subject: [PATCH 2/5] Improve reproducibility, | 4 | Subject: [PATCH] Improve reproducibility, |
| 5 | 5 | ||
| 6 | Remove build patch from binaries which pg_config do | 6 | Remove build patch from binaries which pg_config do |
| 7 | not record var-CC, var-CFLAGS, and configure | 7 | not record var-CC, var-CFLAGS, and configure |
| @@ -23,7 +23,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
| 23 | 1 file changed, 3 deletions(-) | 23 | 1 file changed, 3 deletions(-) |
| 24 | 24 | ||
| 25 | diff --git a/src/common/Makefile b/src/common/Makefile | 25 | diff --git a/src/common/Makefile b/src/common/Makefile |
| 26 | index 113029b..58842a6 100644 | 26 | index 3d83299..e14cda6 100644 |
| 27 | --- a/src/common/Makefile | 27 | --- a/src/common/Makefile |
| 28 | +++ b/src/common/Makefile | 28 | +++ b/src/common/Makefile |
| 29 | @@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.global | 29 | @@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.global |
| @@ -36,6 +36,3 @@ index 113029b..58842a6 100644 | |||
| 36 | override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" | 36 | override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" |
| 37 | override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" | 37 | override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" |
| 38 | override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" | 38 | override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" |
| 39 | -- | ||
| 40 | 2.25.1 | ||
| 41 | |||
diff --git a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch index ce19bacc47..b91228aedd 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 30b1b37d309f67ba6d58f2197bd917107bc7d56c Mon Sep 17 00:00:00 2001 | 1 | From 29289c6f5b665ed9943bb7701a542fcdf64c4a22 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Fan Yu <yifan.yu@windriver.com> | 2 | From: Yi Fan Yu <yifan.yu@windriver.com> |
| 3 | Date: Fri, 5 Feb 2021 17:15:42 -0500 | 3 | Date: Fri, 5 Feb 2021 17:15:42 -0500 |
| 4 | Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check | 4 | Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check |
| @@ -13,12 +13,12 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | |||
| 13 | 1 file changed, 4 deletions(-) | 13 | 1 file changed, 4 deletions(-) |
| 14 | 14 | ||
| 15 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
| 16 | index 642dbde..af37179 100644 | 16 | index 856b091..646394c 100644 |
| 17 | --- a/configure.ac | 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac | 18 | +++ b/configure.ac |
| 19 | @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros | 19 | @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros |
| 20 | 20 | ||
| 21 | AC_INIT([PostgreSQL], [17.7], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) | 21 | AC_INIT([PostgreSQL], [17.8], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) |
| 22 | 22 | ||
| 23 | -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. | 23 | -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. |
| 24 | -Untested combinations of 'autoconf' and PostgreSQL versions are not | 24 | -Untested combinations of 'autoconf' and PostgreSQL versions are not |
diff --git a/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch b/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch index d94f028036..1514c223c1 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 62733bdc9346651637d9e5ac7cbf8d7311ef5d97 Mon Sep 17 00:00:00 2001 | 1 | From e4b32033827ed73c95e6e6aa26dd45e828ffc18b Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Mon, 1 Aug 2022 15:44:38 +0800 | 3 | Date: Mon, 1 Aug 2022 15:44:38 +0800 |
| 4 | Subject: [PATCH] config_info.c: not expose build info | 4 | Subject: [PATCH] config_info.c: not expose build info |
| @@ -14,7 +14,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
| 14 | 2 files changed, 2 insertions(+), 70 deletions(-) | 14 | 2 files changed, 2 insertions(+), 70 deletions(-) |
| 15 | 15 | ||
| 16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
| 17 | index f0fa973..8ccd8bc 100644 | 17 | index 646394c..f5a5590 100644 |
| 18 | --- a/configure.ac | 18 | --- a/configure.ac |
| 19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
| 20 | @@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group]) | 20 | @@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group]) |
diff --git a/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch b/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch index 8219fc80e9..753cd1bb97 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From d1fb37569b5a8c21968f69164e8bc6e4bb0185eb Mon Sep 17 00:00:00 2001 | 1 | From 220b65291734b81a3c232877cf5fced20fe773e3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Manoj Saun <manojsingh.saun@windriver.com> | 2 | From: Manoj Saun <manojsingh.saun@windriver.com> |
| 3 | Date: Wed, 22 Mar 2023 08:07:26 +0000 | 3 | Date: Wed, 22 Mar 2023 08:07:26 +0000 |
| 4 | Subject: [PATCH] postgresql: fix ptest failure of sysviews | 4 | Subject: [PATCH] postgresql: fix ptest failure of sysviews |
| @@ -44,6 +44,3 @@ index b047fb5..d1e3999 100644 | |||
| 44 | 44 | ||
| 45 | -- We expect no cursors in this test; see also portals.sql | 45 | -- We expect no cursors in this test; see also portals.sql |
| 46 | select count(*) = 0 as ok from pg_cursors; | 46 | select count(*) = 0 as ok from pg_cursors; |
| 47 | -- | ||
| 48 | 2.34.1 | ||
| 49 | |||
diff --git a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index a2f0500a8c..1142ff4878 100644 --- a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 1a9416bae71aa935797add3fa11407732ad010c0 Mon Sep 17 00:00:00 2001 | 1 | From 29e76cad362c7154920aa49aa0137e1773c4d3ec Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Tue, 27 Nov 2018 13:25:15 +0800 | 3 | Date: Tue, 27 Nov 2018 13:25:15 +0800 |
| 4 | Subject: [PATCH] not check libperl under cross compiling | 4 | Subject: [PATCH] not check libperl under cross compiling |
| @@ -20,10 +20,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 21 | 21 | ||
| 22 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
| 23 | index f398184..493d5cd 100644 | 23 | index ce0966f..856b091 100644 |
| 24 | --- a/configure.ac | 24 | --- a/configure.ac |
| 25 | +++ b/configure.ac | 25 | +++ b/configure.ac |
| 26 | @@ -2336,7 +2336,7 @@ Use --without-tcl to disable building PL/Tcl.]) | 26 | @@ -2340,7 +2340,7 @@ Use --without-tcl to disable building PL/Tcl.]) |
| 27 | fi | 27 | fi |
| 28 | 28 | ||
| 29 | # check for <perl.h> | 29 | # check for <perl.h> |
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_17.7.bb b/meta-oe/recipes-dbs/postgresql/postgresql_17.8.bb index 81b096194c..ad1e9704cc 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql_17.7.bb +++ b/meta-oe/recipes-dbs/postgresql/postgresql_17.8.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require postgresql.inc | 1 | require postgresql.inc |
| 2 | 2 | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=08b6032a749e67f6e3de84ea8e466933" | 3 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=55760ee57ce4e51e4b57f0801ff032dd" |
| 4 | 4 | ||
| 5 | SRC_URI += "\ | 5 | SRC_URI += "\ |
| 6 | file://not-check-libperl.patch \ | 6 | file://not-check-libperl.patch \ |
| @@ -12,6 +12,6 @@ SRC_URI += "\ | |||
| 12 | file://0001-tcl.m4-Recognize-tclsh9.patch \ | 12 | file://0001-tcl.m4-Recognize-tclsh9.patch \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | SRC_URI[sha256sum] = "ef9e343302eccd33112f1b2f0247be493cb5768313adeb558b02de8797a2e9b5" | 15 | SRC_URI[sha256sum] = "a88d195dd93730452d0cfa1a11896720d6d1ba084bc2be7d7fc557fa4e4158a0" |
| 16 | 16 | ||
| 17 | CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Doesn't apply to our configuration of postgresql so we can safely ignore it." | 17 | CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Doesn't apply to our configuration of postgresql so we can safely ignore it." |
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch new file mode 100644 index 0000000000..dac61773e5 --- /dev/null +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | From 7509f5d4bfcd8ba8bc0ad8c2054b2b336d8c0c9f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Minjae Kim <mj.kim@mercedes-benz.com> | ||
| 3 | Date: Mon, 9 Feb 2026 20:34:53 +0000 | ||
| 4 | Subject: [PATCH] Findzstd.cmake: support pkg-config based zstd detection | ||
| 5 | |||
| 6 | In Yocto builds, zstd is built via Makefile and does not install | ||
| 7 | CMake package configuration files. As a result, Findzstd.cmake | ||
| 8 | fails to detect ZSTD_INCLUDE_DIRS. | ||
| 9 | |||
| 10 | Add pkg-config based detection as a fallback to properly locate | ||
| 11 | zstd headers and libraries. | ||
| 12 | |||
| 13 | fix error: | ||
| 14 | | Could NOT find zstd (missing: ZSTD_INCLUDE_DIRS) | ||
| 15 | | Call Stack (most recent call first): | ||
| 16 | |||
| 17 | |||
| 18 | Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/14308] | ||
| 19 | |||
| 20 | Signed-off-by: Minjae Kim <flowergom@gmail.com> | ||
| 21 | |||
| 22 | --- | ||
| 23 | cmake/modules/Findzstd.cmake | 4 ++++ | ||
| 24 | 1 file changed, 4 insertions(+) | ||
| 25 | |||
| 26 | diff --git a/cmake/modules/Findzstd.cmake b/cmake/modules/Findzstd.cmake | ||
| 27 | index e82fa148c8..f160be9ae0 100644 | ||
| 28 | --- a/cmake/modules/Findzstd.cmake | ||
| 29 | +++ b/cmake/modules/Findzstd.cmake | ||
| 30 | @@ -14,6 +14,10 @@ find_library(ZSTD_LIBRARIES | ||
| 31 | HINTS ${zstd_ROOT_DIR}/lib) | ||
| 32 | |||
| 33 | include(FindPackageHandleStandardArgs) | ||
| 34 | +find_package(PkgConfig QUIET) | ||
| 35 | +if(PKG_CONFIG_FOUND) | ||
| 36 | + pkg_check_modules(ZSTD QUIET libzstd) | ||
| 37 | +endif() | ||
| 38 | find_package_handle_standard_args(zstd DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS) | ||
| 39 | |||
| 40 | mark_as_advanced( | ||
| 41 | -- | ||
| 42 | 2.43.0 | ||
| 43 | |||
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch index 168bd76ac7..31e3eb53d3 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch | |||
| @@ -22,35 +22,9 @@ TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.h:28 | |||
| 22 | Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/13437] | 22 | Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/13437] |
| 23 | Signed-off-by: mark.yang <mark.yang@lge.com> | 23 | Signed-off-by: mark.yang <mark.yang@lge.com> |
| 24 | --- | 24 | --- |
| 25 | db/blob/blob_file_meta.h | 1 + | ||
| 26 | include/rocksdb/trace_record.h | 1 + | ||
| 27 | include/rocksdb/write_batch_base.h | 1 + | 25 | include/rocksdb/write_batch_base.h | 1 + |
| 28 | 3 files changed, 3 insertions(+) | 26 | 1 file changed, 1 insertion(+) |
| 29 | 27 | ||
| 30 | diff --git a/db/blob/blob_file_meta.h b/db/blob/blob_file_meta.h | ||
| 31 | index d7c8a1243..2e47726f8 100644 | ||
| 32 | --- a/db/blob/blob_file_meta.h | ||
| 33 | +++ b/db/blob/blob_file_meta.h | ||
| 34 | @@ -6,6 +6,7 @@ | ||
| 35 | #pragma once | ||
| 36 | |||
| 37 | #include <cassert> | ||
| 38 | +#include <cstdint> | ||
| 39 | #include <iosfwd> | ||
| 40 | #include <memory> | ||
| 41 | #include <string> | ||
| 42 | diff --git a/include/rocksdb/trace_record.h b/include/rocksdb/trace_record.h | ||
| 43 | index 8f9c3ee2f..d321f5387 100644 | ||
| 44 | --- a/include/rocksdb/trace_record.h | ||
| 45 | +++ b/include/rocksdb/trace_record.h | ||
| 46 | @@ -5,6 +5,7 @@ | ||
| 47 | |||
| 48 | #pragma once | ||
| 49 | |||
| 50 | +#include <cstdint> | ||
| 51 | #include <memory> | ||
| 52 | #include <string> | ||
| 53 | #include <vector> | ||
| 54 | diff --git a/include/rocksdb/write_batch_base.h b/include/rocksdb/write_batch_base.h | 28 | diff --git a/include/rocksdb/write_batch_base.h b/include/rocksdb/write_batch_base.h |
| 55 | index 3334a1292..43b186029 100644 | 29 | index 3334a1292..43b186029 100644 |
| 56 | --- a/include/rocksdb/write_batch_base.h | 30 | --- a/include/rocksdb/write_batch_base.h |
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0005-Implement-timer-implementation-for-mips-platform.patch b/meta-oe/recipes-dbs/rocksdb/files/0005-Implement-timer-implementation-for-mips-platform.patch index 2979b73d2f..6205e55b3f 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/0005-Implement-timer-implementation-for-mips-platform.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/0005-Implement-timer-implementation-for-mips-platform.patch | |||
| @@ -14,9 +14,9 @@ diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_t | |||
| 14 | index 0a7488c397..ad7d9f2124 100644 | 14 | index 0a7488c397..ad7d9f2124 100644 |
| 15 | --- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h | 15 | --- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h |
| 16 | +++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h | 16 | +++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h |
| 17 | @@ -162,6 +162,12 @@ static inline tokutime_t toku_time_now(void) { | 17 | @@ -158,6 +158,12 @@ static inline tokutime_t toku_time_now(void) { |
| 18 | unsigned long result; | 18 | unsigned long result; |
| 19 | asm volatile ("rdtime.d\t%0,$r0" : "=r" (result)); | 19 | asm volatile("rdtime.d\t%0,$r0" : "=r"(result)); |
| 20 | return result; | 20 | return result; |
| 21 | +#elif defined(__mips__) | 21 | +#elif defined(__mips__) |
| 22 | + // mips apparently only allows rdtsc for superusers, so we fall | 22 | + // mips apparently only allows rdtsc for superusers, so we fall |
diff --git a/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch b/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch index 9a85e8db45..0f957433a7 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch | |||
| @@ -26,7 +26,7 @@ index 93b884dd9c1..2ca925d505c 100644 | |||
| 26 | +option(ROCKSDB_BUILD_STATIC "Build static versions of the RocksDB libraries" ON) | 26 | +option(ROCKSDB_BUILD_STATIC "Build static versions of the RocksDB libraries" ON) |
| 27 | 27 | ||
| 28 | if( NOT DEFINED CMAKE_CXX_STANDARD ) | 28 | if( NOT DEFINED CMAKE_CXX_STANDARD ) |
| 29 | set(CMAKE_CXX_STANDARD 17) | 29 | set(CMAKE_CXX_STANDARD 20) |
| 30 | @@ -1139,11 +1140,13 @@ string(REGEX REPLACE "[^0-9: /-]+" "" GIT_DATE "${GIT_DATE}") | 30 | @@ -1139,11 +1140,13 @@ string(REGEX REPLACE "[^0-9: /-]+" "" GIT_DATE "${GIT_DATE}") |
| 31 | set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc) | 31 | set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc) |
| 32 | configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY) | 32 | configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY) |
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_10.10.1.bb index c6d5a0ec7f..cc0e887ea5 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_10.10.1.bb | |||
| @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | |||
| 6 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 6 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 7 | file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" | 7 | file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" |
| 8 | 8 | ||
| 9 | SRCREV = "ae8fb3e5000e46d8d4c9dbf3a36019c0aaceebff" | 9 | SRCREV = "4595a5e95ae8525c42e172a054435782b3479c57" |
| 10 | SRCBRANCH = "9.10.fb" | 10 | SRCBRANCH = "10.10.fb" |
| 11 | 11 | ||
| 12 | SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ | 12 | SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https;tag=v${PV} \ |
| 13 | file://0001-cmake-Add-check-for-atomic-support.patch \ | 13 | file://0001-cmake-Add-check-for-atomic-support.patch \ |
| 14 | file://0002-cmake-Use-exported-target-for-bz2.patch \ | 14 | file://0002-cmake-Use-exported-target-for-bz2.patch \ |
| 15 | file://0003-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch \ | 15 | file://0003-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch \ |
| @@ -22,6 +22,7 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt | |||
| 22 | file://run-ptest \ | 22 | file://run-ptest \ |
| 23 | file://0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch \ | 23 | file://0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch \ |
| 24 | file://0001-checkpoint.h-Add-missing-includes-cstdint.patch \ | 24 | file://0001-checkpoint.h-Add-missing-includes-cstdint.patch \ |
| 25 | file://0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch \ | ||
| 25 | " | 26 | " |
| 26 | 27 | ||
| 27 | SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" | 28 | SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" |
| @@ -38,7 +39,7 @@ PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2" | |||
| 38 | PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON,-DWITH_LZ4=OFF,lz4" | 39 | PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON,-DWITH_LZ4=OFF,lz4" |
| 39 | PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" | 40 | PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" |
| 40 | PACKAGECONFIG[zstd] = "-DWITH_ZSTD=ON,-DWITH_ZSTD=OFF,zstd" | 41 | PACKAGECONFIG[zstd] = "-DWITH_ZSTD=ON,-DWITH_ZSTD=OFF,zstd" |
| 41 | PACKAGECONFIG[lite] = "-DROCKSDB_LITE=ON,-DROCKSDB_LITE=OFF" | 42 | PACKAGECONFIG[liburing] = "-DWITH_LIBURING=ON,-DWITH_LIBURING=OFF,liburing" |
| 42 | PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags" | 43 | PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags" |
| 43 | 44 | ||
| 44 | # Tools and tests currently don't compile on armv5 so we disable them | 45 | # Tools and tests currently don't compile on armv5 so we disable them |
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260107.0.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260107.1.bb index e2bce0be11..128ed81556 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260107.0.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260107.1.bb | |||
| @@ -11,7 +11,7 @@ SRC_URI = "https://github.com/abseil/${BPN}/releases/download/${PV}/${BP}.tar.gz | |||
| 11 | file://0001-absl-always-use-asm-sgidefs.h.patch \ | 11 | file://0001-absl-always-use-asm-sgidefs.h.patch \ |
| 12 | file://0002-abseil-ppc-fixes.patch \ | 12 | file://0002-abseil-ppc-fixes.patch \ |
| 13 | " | 13 | " |
| 14 | SRC_URI[sha256sum] = "4c124408da902be896a2f368042729655709db5e3004ec99f57e3e14439bc1b2" | 14 | SRC_URI[sha256sum] = "4314e2a7cbac89cac25a2f2322870f343d81579756ceff7f431803c2c9090195" |
| 15 | 15 | ||
| 16 | UPSTREAM_CHECK_URI = "https://github.com/abseil/abseil-cpp/releases" | 16 | UPSTREAM_CHECK_URI = "https://github.com/abseil/abseil-cpp/releases" |
| 17 | UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)" |
| @@ -21,6 +21,7 @@ inherit cmake | |||
| 21 | EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ | 21 | EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ |
| 22 | -DBUILD_TESTING=OFF \ | 22 | -DBUILD_TESTING=OFF \ |
| 23 | -DABSL_ENABLE_INSTALL=ON \ | 23 | -DABSL_ENABLE_INSTALL=ON \ |
| 24 | -DCMAKE_CXX_STANDARD=17 \ | ||
| 24 | " | 25 | " |
| 25 | # riscv32-yoe-linux-ld.lld: error: undefined reference: __atomic_store_8 | 26 | # riscv32-yoe-linux-ld.lld: error: undefined reference: __atomic_store_8 |
| 26 | # >>> referenced by <recipe-sysroot>/usr/lib/libabsl_flags_internal.so.2505.0.0 (disallowed by --no-allow-shlib-undefined) | 27 | # >>> referenced by <recipe-sysroot>/usr/lib/libabsl_flags_internal.so.2505.0.0 (disallowed by --no-allow-shlib-undefined) |
| @@ -52,3 +53,6 @@ python split_dynamic_packages() { | |||
| 52 | ALLOW_EMPTY:${PN} = "1" | 53 | ALLOW_EMPTY:${PN} = "1" |
| 53 | 54 | ||
| 54 | BBCLASSEXTEND = "native nativesdk" | 55 | BBCLASSEXTEND = "native nativesdk" |
| 56 | |||
| 57 | # Add CVE_PRODUCT to match the NVD CPE product name | ||
| 58 | CVE_PRODUCT = "abseil:common_libraries" | ||
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup index dbd7115151..47e4edb9be 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup | |||
| @@ -2,9 +2,12 @@ | |||
| 2 | 2 | ||
| 3 | set -e | 3 | set -e |
| 4 | 4 | ||
| 5 | conf="Conf 1" | ||
| 5 | manufacturer=RPB | 6 | manufacturer=RPB |
| 6 | model="Android device" | 7 | model="Android device" |
| 8 | product=0xd002 | ||
| 7 | serial=0123456789ABCDEF | 9 | serial=0123456789ABCDEF |
| 10 | vendor=0x18d1 | ||
| 8 | 11 | ||
| 9 | if [ -r /etc/android-gadget-setup.machine ] ; then | 12 | if [ -r /etc/android-gadget-setup.machine ] ; then |
| 10 | . /etc/android-gadget-setup.machine | 13 | . /etc/android-gadget-setup.machine |
| @@ -23,12 +26,12 @@ mkdir configs/c.1 | |||
| 23 | mkdir functions/ffs.usb0 | 26 | mkdir functions/ffs.usb0 |
| 24 | mkdir strings/0x409 | 27 | mkdir strings/0x409 |
| 25 | mkdir configs/c.1/strings/0x409 | 28 | mkdir configs/c.1/strings/0x409 |
| 26 | echo -n 0x18d1 > idVendor | 29 | echo -n "$vendor" > idVendor |
| 27 | echo -n 0xd002 > idProduct | 30 | echo -n "$product" > idProduct |
| 28 | echo "$serial" > strings/0x409/serialnumber | 31 | echo "$serial" > strings/0x409/serialnumber |
| 29 | echo "$manufacturer" > strings/0x409/manufacturer | 32 | echo "$manufacturer" > strings/0x409/manufacturer |
| 30 | echo "$model" > strings/0x409/product | 33 | echo "$model" > strings/0x409/product |
| 31 | echo "Conf 1" > configs/c.1/strings/0x409/configuration | 34 | echo "$conf" > configs/c.1/strings/0x409/configuration |
| 32 | ln -s functions/ffs.usb0 configs/c.1 | 35 | ln -s functions/ffs.usb0 configs/c.1 |
| 33 | 36 | ||
| 34 | mkdir -p /dev/usb-ffs/adb | 37 | mkdir -p /dev/usb-ffs/adb |
diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb b/meta-oe/recipes-devtools/capnproto/capnproto_1.4.0.bb index 0ea243fd20..948ff80345 100644 --- a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb +++ b/meta-oe/recipes-devtools/capnproto/capnproto_1.4.0.bb | |||
| @@ -5,9 +5,9 @@ SECTION = "console/tools" | |||
| 5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
| 6 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" | 6 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \ | 8 | SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https;tag=v${PV} \ |
| 9 | file://0001-Export-binaries-only-for-native-build.patch" | 9 | file://0001-Export-binaries-only-for-native-build.patch" |
| 10 | SRCREV = "1a0e12c0a3ba1f0dbbad45ddfef555166e0a14fc" | 10 | SRCREV = "8b892a8a11a632f5d52b877a49728808a142379a" |
| 11 | 11 | ||
| 12 | S = "${UNPACKDIR}/${BP}/c++" | 12 | S = "${UNPACKDIR}/${BP}/c++" |
| 13 | 13 | ||
| @@ -29,3 +29,6 @@ PACKAGE_BEFORE_PN = "${PN}-compiler" | |||
| 29 | RDEPENDS:${PN}-dev += "${PN}-compiler" | 29 | RDEPENDS:${PN}-dev += "${PN}-compiler" |
| 30 | 30 | ||
| 31 | BBCLASSEXTEND = "native nativesdk" | 31 | BBCLASSEXTEND = "native nativesdk" |
| 32 | |||
| 33 | CVE_STATUS[CVE-2026-32239] = "fixed-version: fixed in 1.4.0" | ||
| 34 | CVE_STATUS[CVE-2026-32240] = "fixed-version: fixed in 1.4.0" | ||
diff --git a/meta-oe/recipes-devtools/castxml/castxml_0.6.13.bb b/meta-oe/recipes-devtools/castxml/castxml_0.7.0.bb index 9e506a8709..43eeeeace7 100644 --- a/meta-oe/recipes-devtools/castxml/castxml_0.6.13.bb +++ b/meta-oe/recipes-devtools/castxml/castxml_0.7.0.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "C-family abstract syntax tree XML output tool." | |||
| 2 | LICENSE = "Apache-2.0" | 2 | LICENSE = "Apache-2.0" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 4 | 4 | ||
| 5 | SRCREV = "13e1572729981289a7a96d762960994134f73f76" | 5 | SRCREV = "2d52b47cfd88b703d3247f77bb7c3ad7372bc9cb" |
| 6 | SRC_URI = "git://github.com/CastXML/CastXML;protocol=https;branch=master;tag=v${PV}" | 6 | SRC_URI = "git://github.com/CastXML/CastXML;protocol=https;branch=master;tag=v${PV}" |
| 7 | 7 | ||
| 8 | DEPENDS = "clang" | 8 | DEPENDS = "clang" |
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.2.20260111.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.2.20260308.0.bb index 5f6f550829..51ad8cff8e 100644 --- a/meta-oe/recipes-devtools/ctags/ctags_6.2.20260111.0.bb +++ b/meta-oe/recipes-devtools/ctags/ctags_6.2.20260308.0.bb | |||
| @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | |||
| 14 | 14 | ||
| 15 | inherit autotools-brokensep pkgconfig manpages | 15 | inherit autotools-brokensep pkgconfig manpages |
| 16 | 16 | ||
| 17 | SRCREV = "b11e39a7a89dc0b556e843db5aa34d0198066b9d" | 17 | SRCREV = "db5c5e00f09e62d27108025de24bcec919eac83b" |
| 18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https;tag=p${PV}" | 18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https;tag=p${PV}" |
| 19 | 19 | ||
| 20 | 20 | ||
diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch deleted file mode 100644 index bf1f22b906..0000000000 --- a/meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch +++ /dev/null | |||
| @@ -1,58 +0,0 @@ | |||
| 1 | From a976f66ac7d1b9f43a3071e22b5014fcfeab04b3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Mark D. Roth" <roth@google.com> | ||
| 3 | Date: Tue, 6 Jan 2026 10:09:45 -0800 | ||
| 4 | Subject: [PATCH] [build] add missing includes (#41351) | ||
| 5 | |||
| 6 | Fixes #41305. | ||
| 7 | |||
| 8 | Closes #41351 | ||
| 9 | |||
| 10 | COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/41351 from markdroth:add_missing_includes 223be6932adb00d085149c53167c1b0318745f6c | ||
| 11 | PiperOrigin-RevId: 852829597 | ||
| 12 | |||
| 13 | Upstream-Status: Backport [https://github.com/grpc/grpc/commit/d54219b508423f0a2ff6a0b98c16fb6dafd44b84] | ||
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 15 | --- | ||
| 16 | include/grpc/event_engine/memory_request.h | 2 ++ | ||
| 17 | src/core/channelz/v2tov1/property_list.cc | 1 + | ||
| 18 | src/core/util/glob.cc | 2 ++ | ||
| 19 | 3 files changed, 5 insertions(+) | ||
| 20 | |||
| 21 | diff --git a/include/grpc/event_engine/memory_request.h b/include/grpc/event_engine/memory_request.h | ||
| 22 | index 76bcbb2036..ad8cab842e 100644 | ||
| 23 | --- a/include/grpc/event_engine/memory_request.h | ||
| 24 | +++ b/include/grpc/event_engine/memory_request.h | ||
| 25 | @@ -17,6 +17,8 @@ | ||
| 26 | #include <grpc/support/port_platform.h> | ||
| 27 | #include <stddef.h> | ||
| 28 | |||
| 29 | +#include <string> | ||
| 30 | + | ||
| 31 | #include "absl/strings/string_view.h" | ||
| 32 | |||
| 33 | namespace grpc_event_engine { | ||
| 34 | diff --git a/src/core/channelz/v2tov1/property_list.cc b/src/core/channelz/v2tov1/property_list.cc | ||
| 35 | index 64bbb6307c..03367cce7c 100644 | ||
| 36 | --- a/src/core/channelz/v2tov1/property_list.cc | ||
| 37 | +++ b/src/core/channelz/v2tov1/property_list.cc | ||
| 38 | @@ -15,6 +15,7 @@ | ||
| 39 | #include "src/core/channelz/v2tov1/property_list.h" | ||
| 40 | |||
| 41 | #include <cstdint> | ||
| 42 | +#include <limits> | ||
| 43 | #include <optional> | ||
| 44 | #include <string> | ||
| 45 | |||
| 46 | diff --git a/src/core/util/glob.cc b/src/core/util/glob.cc | ||
| 47 | index 1b1c16e23d..22e54259f0 100644 | ||
| 48 | --- a/src/core/util/glob.cc | ||
| 49 | +++ b/src/core/util/glob.cc | ||
| 50 | @@ -12,6 +12,8 @@ | ||
| 51 | // See the License for the specific language governing permissions and | ||
| 52 | // limitations under the License. | ||
| 53 | |||
| 54 | +#include <algorithm> | ||
| 55 | + | ||
| 56 | #include "absl/strings/string_view.h" | ||
| 57 | |||
| 58 | namespace grpc_core { | ||
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.76.0.bb b/meta-oe/recipes-devtools/grpc/grpc_1.78.1.bb index 39c9fb98de..6739c659d3 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.76.0.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.78.1.bb | |||
| @@ -23,11 +23,10 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" | |||
| 23 | # Both dependencies are mutually exclusive | 23 | # Both dependencies are mutually exclusive |
| 24 | # RDEPENDS:${PN}-dev += "${PN}-compiler" | 24 | # RDEPENDS:${PN}-dev += "${PN}-compiler" |
| 25 | 25 | ||
| 26 | SRCREV = "f5ffb68d8a2fd603dff16287e90a4ac571e1fec6" | 26 | SRCREV = "5b6492ea90b2b867a6adad1b10a6edda28e860d1" |
| 27 | BRANCH = "v1.76.x" | 27 | BRANCH = "v1.78.x" |
| 28 | SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH};tag=v${PV} \ | 28 | SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH};tag=v${PV} \ |
| 29 | file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ | 29 | file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ |
| 30 | file://0001-build-add-missing-includes-41351.patch \ | ||
| 31 | " | 30 | " |
| 32 | 31 | ||
| 33 | inherit cmake pkgconfig | 32 | inherit cmake pkgconfig |
diff --git a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.2.bb index 5ad953d260..fa4698b2b3 100644 --- a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb +++ b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.2.bb | |||
| @@ -4,10 +4,10 @@ SECTION = "libs" | |||
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8325a5ce4414c65ffdda392e0d96a9ff" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8325a5ce4414c65ffdda392e0d96a9ff" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/Thalhammer/jwt-cpp.git;branch=master;protocol=https \ | 7 | SRC_URI = "git://github.com/Thalhammer/jwt-cpp.git;branch=master;protocol=https;tag=v${PV} \ |
| 8 | " | 8 | " |
| 9 | 9 | ||
| 10 | SRCREV = "e71e0c2d584baff06925bbb3aad683f677e4d498" | 10 | SRCREV = "b0ea29a58fc852a67d4e896d266880c2c63b0c4c" |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | DEPENDS = "openssl" | 13 | DEPENDS = "openssl" |
| @@ -16,4 +16,4 @@ inherit cmake | |||
| 16 | 16 | ||
| 17 | EXTRA_OECMAKE += "-DJWT_BUILD_EXAMPLES=OFF -DJWT_CMAKE_FILES_INSTALL_DIR=${libdir}/cmake/${BPN}" | 17 | EXTRA_OECMAKE += "-DJWT_BUILD_EXAMPLES=OFF -DJWT_CMAKE_FILES_INSTALL_DIR=${libdir}/cmake/${BPN}" |
| 18 | 18 | ||
| 19 | BBCLASSEXTEND = "nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-oe/recipes-devtools/librust-cxx/librust-cxx-crates.inc b/meta-oe/recipes-devtools/librust-cxx/librust-cxx-crates.inc new file mode 100644 index 0000000000..c313d24e5c --- /dev/null +++ b/meta-oe/recipes-devtools/librust-cxx/librust-cxx-crates.inc | |||
| @@ -0,0 +1,130 @@ | |||
| 1 | # Autogenerated with 'bitbake -c update_crates cxx' | ||
| 2 | |||
| 3 | # from Cargo.lock | ||
| 4 | SRC_URI += " \ | ||
| 5 | crate://crates.io/anstyle/1.0.13 \ | ||
| 6 | crate://crates.io/bitflags/2.10.0 \ | ||
| 7 | crate://crates.io/cc/1.2.53 \ | ||
| 8 | crate://crates.io/cfg-if/1.0.4 \ | ||
| 9 | crate://crates.io/clap/4.5.54 \ | ||
| 10 | crate://crates.io/clap_builder/4.5.54 \ | ||
| 11 | crate://crates.io/clap_lex/0.7.7 \ | ||
| 12 | crate://crates.io/codespan-reporting/0.13.1 \ | ||
| 13 | crate://crates.io/cxx-build/1.0.194 \ | ||
| 14 | crate://crates.io/cxx-gen/0.7.194 \ | ||
| 15 | crate://crates.io/cxx-test-suite/0.0.1 \ | ||
| 16 | crate://crates.io/cxxbridge-cmd/1.0.194 \ | ||
| 17 | crate://crates.io/cxxbridge-flags/1.0.194 \ | ||
| 18 | crate://crates.io/cxxbridge-macro/1.0.194 \ | ||
| 19 | crate://crates.io/dissimilar/1.0.10 \ | ||
| 20 | crate://crates.io/equivalent/1.0.2 \ | ||
| 21 | crate://crates.io/errno/0.3.14 \ | ||
| 22 | crate://crates.io/fastrand/2.3.0 \ | ||
| 23 | crate://crates.io/find-msvc-tools/0.1.8 \ | ||
| 24 | crate://crates.io/foldhash/0.2.0 \ | ||
| 25 | crate://crates.io/getrandom/0.3.4 \ | ||
| 26 | crate://crates.io/glob/0.3.3 \ | ||
| 27 | crate://crates.io/hashbrown/0.16.1 \ | ||
| 28 | crate://crates.io/indexmap/2.13.0 \ | ||
| 29 | crate://crates.io/indoc/2.0.7 \ | ||
| 30 | crate://crates.io/itoa/1.0.17 \ | ||
| 31 | crate://crates.io/libc/0.2.180 \ | ||
| 32 | crate://crates.io/link-cplusplus/1.0.12 \ | ||
| 33 | crate://crates.io/linux-raw-sys/0.11.0 \ | ||
| 34 | crate://crates.io/memchr/2.7.6 \ | ||
| 35 | crate://crates.io/once_cell/1.21.3 \ | ||
| 36 | crate://crates.io/proc-macro2/1.0.105 \ | ||
| 37 | crate://crates.io/quote/1.0.43 \ | ||
| 38 | crate://crates.io/r-efi/5.3.0 \ | ||
| 39 | crate://crates.io/rustix/1.1.3 \ | ||
| 40 | crate://crates.io/rustversion/1.0.22 \ | ||
| 41 | crate://crates.io/scratch/1.0.9 \ | ||
| 42 | crate://crates.io/serde/1.0.228 \ | ||
| 43 | crate://crates.io/serde_core/1.0.228 \ | ||
| 44 | crate://crates.io/serde_derive/1.0.228 \ | ||
| 45 | crate://crates.io/serde_json/1.0.149 \ | ||
| 46 | crate://crates.io/serde_spanned/1.0.4 \ | ||
| 47 | crate://crates.io/shlex/1.3.0 \ | ||
| 48 | crate://crates.io/strsim/0.11.1 \ | ||
| 49 | crate://crates.io/syn/2.0.114 \ | ||
| 50 | crate://crates.io/target-triple/1.0.0 \ | ||
| 51 | crate://crates.io/tempfile/3.24.0 \ | ||
| 52 | crate://crates.io/termcolor/1.4.1 \ | ||
| 53 | crate://crates.io/toml/0.9.11+spec-1.1.0 \ | ||
| 54 | crate://crates.io/toml_datetime/0.7.5+spec-1.1.0 \ | ||
| 55 | crate://crates.io/toml_parser/1.0.6+spec-1.1.0 \ | ||
| 56 | crate://crates.io/toml_writer/1.0.6+spec-1.1.0 \ | ||
| 57 | crate://crates.io/trybuild/1.0.114 \ | ||
| 58 | crate://crates.io/unicode-ident/1.0.22 \ | ||
| 59 | crate://crates.io/unicode-width/0.2.2 \ | ||
| 60 | crate://crates.io/wasip2/1.0.2+wasi-0.2.9 \ | ||
| 61 | crate://crates.io/winapi-util/0.1.11 \ | ||
| 62 | crate://crates.io/windows-link/0.2.1 \ | ||
| 63 | crate://crates.io/windows-sys/0.61.2 \ | ||
| 64 | crate://crates.io/winnow/0.7.14 \ | ||
| 65 | crate://crates.io/wit-bindgen/0.51.0 \ | ||
| 66 | crate://crates.io/zmij/1.0.16 \ | ||
| 67 | " | ||
| 68 | |||
| 69 | SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" | ||
| 70 | SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" | ||
| 71 | SRC_URI[cc-1.2.53.sha256sum] = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932" | ||
| 72 | SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" | ||
| 73 | SRC_URI[clap-4.5.54.sha256sum] = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" | ||
| 74 | SRC_URI[clap_builder-4.5.54.sha256sum] = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" | ||
| 75 | SRC_URI[clap_lex-0.7.7.sha256sum] = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" | ||
| 76 | SRC_URI[codespan-reporting-0.13.1.sha256sum] = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681" | ||
| 77 | SRC_URI[cxx-build-1.0.194.sha256sum] = "b0f4697d190a142477b16aef7da8a99bfdc41e7e8b1687583c0d23a79c7afc1e" | ||
| 78 | SRC_URI[cxx-gen-0.7.194.sha256sum] = "035b6c61a944483e8a4b2ad4fb8b13830d63491bd004943716ad16d85dcc64bc" | ||
| 79 | SRC_URI[cxx-test-suite-0.0.1.sha256sum] = "2a0a413bcefc6b37668d9eae784f5fe11232343e11101f1d1834163a509610e7" | ||
| 80 | SRC_URI[cxxbridge-cmd-1.0.194.sha256sum] = "d0956799fa8678d4c50eed028f2de1c0552ae183c76e976cf7ca8c4e36a7c328" | ||
| 81 | SRC_URI[cxxbridge-flags-1.0.194.sha256sum] = "23384a836ab4f0ad98ace7e3955ad2de39de42378ab487dc28d3990392cb283a" | ||
| 82 | SRC_URI[cxxbridge-macro-1.0.194.sha256sum] = "e6acc6b5822b9526adfb4fc377b67128fdd60aac757cc4a741a6278603f763cf" | ||
| 83 | SRC_URI[dissimilar-1.0.10.sha256sum] = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921" | ||
| 84 | SRC_URI[equivalent-1.0.2.sha256sum] = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" | ||
| 85 | SRC_URI[errno-0.3.14.sha256sum] = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" | ||
| 86 | SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" | ||
| 87 | SRC_URI[find-msvc-tools-0.1.8.sha256sum] = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" | ||
| 88 | SRC_URI[foldhash-0.2.0.sha256sum] = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" | ||
| 89 | SRC_URI[getrandom-0.3.4.sha256sum] = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" | ||
| 90 | SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" | ||
| 91 | SRC_URI[hashbrown-0.16.1.sha256sum] = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" | ||
| 92 | SRC_URI[indexmap-2.13.0.sha256sum] = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" | ||
| 93 | SRC_URI[indoc-2.0.7.sha256sum] = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" | ||
| 94 | SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" | ||
| 95 | SRC_URI[libc-0.2.180.sha256sum] = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" | ||
| 96 | SRC_URI[link-cplusplus-1.0.12.sha256sum] = "7f78c730aaa7d0b9336a299029ea49f9ee53b0ed06e9202e8cb7db9bae7b8c82" | ||
| 97 | SRC_URI[linux-raw-sys-0.11.0.sha256sum] = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" | ||
| 98 | SRC_URI[memchr-2.7.6.sha256sum] = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" | ||
| 99 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" | ||
| 100 | SRC_URI[proc-macro2-1.0.105.sha256sum] = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" | ||
| 101 | SRC_URI[quote-1.0.43.sha256sum] = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" | ||
| 102 | SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" | ||
| 103 | SRC_URI[rustix-1.1.3.sha256sum] = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" | ||
| 104 | SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" | ||
| 105 | SRC_URI[scratch-1.0.9.sha256sum] = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2" | ||
| 106 | SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" | ||
| 107 | SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" | ||
| 108 | SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" | ||
| 109 | SRC_URI[serde_json-1.0.149.sha256sum] = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" | ||
| 110 | SRC_URI[serde_spanned-1.0.4.sha256sum] = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" | ||
| 111 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" | ||
| 112 | SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" | ||
| 113 | SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" | ||
| 114 | SRC_URI[target-triple-1.0.0.sha256sum] = "591ef38edfb78ca4771ee32cf494cb8771944bee237a9b91fc9c1424ac4b777b" | ||
| 115 | SRC_URI[tempfile-3.24.0.sha256sum] = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" | ||
| 116 | SRC_URI[termcolor-1.4.1.sha256sum] = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" | ||
| 117 | SRC_URI[toml-0.9.11+spec-1.1.0.sha256sum] = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" | ||
| 118 | SRC_URI[toml_datetime-0.7.5+spec-1.1.0.sha256sum] = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" | ||
| 119 | SRC_URI[toml_parser-1.0.6+spec-1.1.0.sha256sum] = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" | ||
| 120 | SRC_URI[toml_writer-1.0.6+spec-1.1.0.sha256sum] = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" | ||
| 121 | SRC_URI[trybuild-1.0.114.sha256sum] = "3e17e807bff86d2a06b52bca4276746584a78375055b6e45843925ce2802b335" | ||
| 122 | SRC_URI[unicode-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" | ||
| 123 | SRC_URI[unicode-width-0.2.2.sha256sum] = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" | ||
| 124 | SRC_URI[wasip2-1.0.2+wasi-0.2.9.sha256sum] = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" | ||
| 125 | SRC_URI[winapi-util-0.1.11.sha256sum] = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" | ||
| 126 | SRC_URI[windows-link-0.2.1.sha256sum] = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" | ||
| 127 | SRC_URI[windows-sys-0.61.2.sha256sum] = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" | ||
| 128 | SRC_URI[winnow-0.7.14.sha256sum] = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" | ||
| 129 | SRC_URI[wit-bindgen-0.51.0.sha256sum] = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" | ||
| 130 | SRC_URI[zmij-1.0.16.sha256sum] = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65" | ||
diff --git a/meta-oe/recipes-devtools/librust-cxx/librust-cxx_1.0.194.bb b/meta-oe/recipes-devtools/librust-cxx/librust-cxx_1.0.194.bb new file mode 100644 index 0000000000..b0d0477236 --- /dev/null +++ b/meta-oe/recipes-devtools/librust-cxx/librust-cxx_1.0.194.bb | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | SUMMARY = "Safe interoperability between Rust and C++" | ||
| 2 | HOMEPAGE = "https://crates.io/crates/cxx" | ||
| 3 | DESCRIPTION = "cxx is a library that enables safe and efficient interoperability \ | ||
| 4 | between Rust and C++ code. It defines the FFI boundary in a single \ | ||
| 5 | Rust module, allowing static analysis of types and function signatures \ | ||
| 6 | for compatibility and safety. The library generates the necessary Rust \ | ||
| 7 | and C++ bindings automatically during the build process. It provides near \ | ||
| 8 | zero-overhead integration and supports idiomatic use of common Rust and C++ \ | ||
| 9 | standard library types." | ||
| 10 | |||
| 11 | LICENSE = "MIT" | ||
| 12 | LIC_FILES_CHKSUM = " \ | ||
| 13 | file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \ | ||
| 14 | " | ||
| 15 | |||
| 16 | SRC_URI = "crate://crates.io/cxx/${PV};name=cxx" | ||
| 17 | SRC_URI[cxx.sha256sum] = "747d8437319e3a2f43d93b341c137927ca70c0f5dabeea7a005a73665e247c7e" | ||
| 18 | |||
| 19 | S = "${CARGO_VENDORING_DIRECTORY}/cxx-${PV}" | ||
| 20 | |||
| 21 | DEBUG_PREFIX_MAP += "-ffile-prefix-map=${CARGO_HOME}=${TARGET_DBGSRC_DIR}" | ||
| 22 | |||
| 23 | inherit cargo cargo-update-recipe-crates | ||
| 24 | |||
| 25 | require ${BPN}-crates.inc | ||
| 26 | |||
| 27 | do_install () { | ||
| 28 | install -d ${D}${rustlibdir} | ||
| 29 | # The cxx deps directory also contains dependency files (.d) generated | ||
| 30 | # during compilation. These files are only needed for incremental builds | ||
| 31 | # and are not required when installing the cxx libraries. | ||
| 32 | rm -f ${B}/target/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/*.d | ||
| 33 | cp ${B}/target/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/* ${D}${rustlibdir} | ||
| 34 | } | ||
| 35 | |||
| 36 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch index c8c9922d55..9516ee5cb1 100644 --- a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch +++ b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch | |||
| @@ -11,7 +11,7 @@ include/toml11/impl/../fwd/literal_fwd.hpp:22:26: error: identifier '_toml' prec | |||
| 11 | | | ~~~~~~~~~~~^~~~~ | 11 | | | ~~~~~~~~~~~^~~~~ |
| 12 | | | operator""_toml | 12 | | | operator""_toml |
| 13 | 13 | ||
| 14 | Upstream-Status: Submitted [https://github.com/ToruNiina/toml11/pull/285] | 14 | Upstream-Status: Backport [https://github.com/ToruNiina/toml11/commit/dee78f822d8a5b985e565e5c1ef42a59557aa8fc] |
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 16 | --- | 16 | --- |
| 17 | include/toml11/fwd/literal_fwd.hpp | 2 +- | 17 | include/toml11/fwd/literal_fwd.hpp | 2 +- |
diff --git a/meta-oe/recipes-devtools/libtoml11/files/run-ptest b/meta-oe/recipes-devtools/libtoml11/files/run-ptest index 9bc480aa7f..4da9e68cc5 100755 --- a/meta-oe/recipes-devtools/libtoml11/files/run-ptest +++ b/meta-oe/recipes-devtools/libtoml11/files/run-ptest | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | #!/bin/sh | 1 | #!/usr/bin/env sh |
| 2 | |||
| 3 | cd tests || exit 1 | ||
| 4 | |||
| 5 | rm -rf tests.log | ||
| 2 | 6 | ||
| 3 | cd tests | ||
| 4 | for atest in test_* ; do | 7 | for atest in test_* ; do |
| 5 | rm -rf tests.log | 8 | if ./"${atest}" >> tests.log 2>&1; then |
| 6 | ./${atest} > tests.log 2>&1 | ||
| 7 | if [ $? = 0 ] ; then | ||
| 8 | echo "PASS: ${atest}" | 9 | echo "PASS: ${atest}" |
| 9 | else | 10 | else |
| 10 | echo "FAIL: ${atest}" | 11 | echo "FAIL: ${atest}" |
diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb index 38786b79ed..7e097e4612 100644 --- a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb +++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb | |||
| @@ -3,6 +3,8 @@ DESCRIPTION = "toml11 is a feature-rich TOML language library for \ | |||
| 3 | C++11/14/17/20." | 3 | C++11/14/17/20." |
| 4 | 4 | ||
| 5 | HOMEPAGE = "https://github.com/ToruNiina/toml11" | 5 | HOMEPAGE = "https://github.com/ToruNiina/toml11" |
| 6 | BUGTRACKER = "https://github.com/ToruNiina/toml11/issues" | ||
| 7 | CVE_PRODUCT = "libtoml11" | ||
| 6 | 8 | ||
| 7 | SECTION = "libs" | 9 | SECTION = "libs" |
| 8 | 10 | ||
| @@ -11,23 +13,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=44d1fcf70c7aa6991533c38daf7befa3" | |||
| 11 | 13 | ||
| 12 | PE = "1" | 14 | PE = "1" |
| 13 | 15 | ||
| 14 | SRCREV = "be08ba2be2a964edcdb3d3e3ea8d100abc26f286" | 16 | SRC_URI = "\ |
| 15 | SRCREV_json = "8c391e04fe4195d8be862c97f38cfe10e2a3472e" | 17 | gitsm://github.com/ToruNiina/toml11.git;protocol=https;branch=main;tag=v${PV} \ |
| 16 | SRCREV_doctest = "ae7a13539fb71f270b87eb2e874fbac80bc8dda2" | 18 | file://0001-Remove-whitespace-in-operator.patch \ |
| 17 | 19 | file://run-ptest \ | |
| 18 | SRC_URI = "git://github.com/ToruNiina/toml11;branch=main;protocol=https \ | ||
| 19 | git://github.com/nlohmann/json;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/tests/extlib/json;name=json;branch=develop;protocol=https \ | ||
| 20 | git://github.com/doctest/doctest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/tests/extlib/doctest;name=doctest;branch=master;protocol=https \ | ||
| 21 | file://0001-Remove-whitespace-in-operator.patch \ | ||
| 22 | file://run-ptest \ | ||
| 23 | " | 20 | " |
| 24 | SRCREV_FORMAT = "json_doctest" | 21 | SRCREV = "be08ba2be2a964edcdb3d3e3ea8d100abc26f286" |
| 25 | |||
| 26 | 22 | ||
| 27 | inherit cmake ptest | 23 | inherit cmake ptest |
| 28 | 24 | ||
| 29 | EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \ | 25 | EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \ |
| 30 | -DTOML11_BUILD_TESTS=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "ON", "OFF", d)} \ | 26 | -DTOML11_BUILD_TESTS=${@bb.utils.contains("PTEST_ENABLED", "1", "ON", "OFF", d)} \ |
| 31 | " | 27 | " |
| 32 | 28 | ||
| 33 | ALLOW_EMPTY:${PN} = "1" | 29 | ALLOW_EMPTY:${PN} = "1" |
| @@ -36,3 +32,5 @@ do_install_ptest () { | |||
| 36 | install -d ${D}${PTEST_PATH}/tests | 32 | install -d ${D}${PTEST_PATH}/tests |
| 37 | cp -r ${B}/tests/test_* ${D}${PTEST_PATH}/tests | 33 | cp -r ${B}/tests/test_* ${D}${PTEST_PATH}/tests |
| 38 | } | 34 | } |
| 35 | |||
| 36 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb index 9df5fca0e6..9d392f1c29 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb | |||
| @@ -11,7 +11,6 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ | |||
| 11 | PV = "2.1" | 11 | PV = "2.1" |
| 12 | SRCREV = "538a82133ad6fddfd0ca64de167c4aca3bc1a2da" | 12 | SRCREV = "538a82133ad6fddfd0ca64de167c4aca3bc1a2da" |
| 13 | 13 | ||
| 14 | |||
| 15 | inherit pkgconfig binconfig siteinfo | 14 | inherit pkgconfig binconfig siteinfo |
| 16 | 15 | ||
| 17 | BBCLASSEXTEND = "native" | 16 | BBCLASSEXTEND = "native" |
diff --git a/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb b/meta-oe/recipes-devtools/luaposix/luaposix_36.3.bb index 59bc4dfcfe..686b1365d0 100644 --- a/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb +++ b/meta-oe/recipes-devtools/luaposix/luaposix_36.3.bb | |||
| @@ -1,14 +1,14 @@ | |||
| 1 | DESCRIPTION = "luaposix is a POSIX binding for Lua." | 1 | DESCRIPTION = "luaposix is a POSIX binding for Lua." |
| 2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
| 3 | HOMEPAGE = "https://github.com/luaposix/luaposix" | 3 | HOMEPAGE = "https://github.com/luaposix/luaposix" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f30d022f6ef53952fa87cc0b6fffb153" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9a2c76dbe2ca56cf57296af9c9995c27" |
| 5 | 5 | ||
| 6 | DEPENDS += "lua-native lua virtual/crypt" | 6 | DEPENDS += "lua-native lua virtual/crypt" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release-v36.2;protocol=https \ | 8 | SRC_URI = "git://github.com/luaposix/luaposix.git;nobranch=1;tag=v${PV};protocol=https \ |
| 9 | " | 9 | " |
| 10 | SRCREV = "5a8d8c768fc3c51f42cb591e9523a60399efc6a1" | 10 | SRCREV = "e6b94b37c19c4bd19a7dc475a4f4cb56f61f5da9" |
| 11 | LUA_VERSION = "5.4" | 11 | LUA_VERSION = "5.5" |
| 12 | 12 | ||
| 13 | B = "${S}" | 13 | B = "${S}" |
| 14 | 14 | ||
diff --git a/meta-oe/recipes-devtools/memstat/memstat/0001-makefile-Do-not-override-cflags.patch b/meta-oe/recipes-devtools/memstat/memstat/0001-makefile-Do-not-override-cflags.patch new file mode 100644 index 0000000000..8ac7a8ff54 --- /dev/null +++ b/meta-oe/recipes-devtools/memstat/memstat/0001-makefile-Do-not-override-cflags.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From a0806283da1b82b511aa879fa2f71deb01f849bd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 26 Jan 2026 22:22:54 -0800 | ||
| 4 | Subject: [PATCH] makefile: Do not override cflags | ||
| 5 | |||
| 6 | bitbake environment passes correct clfags for OE env | ||
| 7 | overriding it means some important flags for cross-compiling | ||
| 8 | go missing and causes | ||
| 9 | |||
| 10 | memstat-1.0-r0 do_package_qa: QA Issue: File /usr/bin/.debug/memstat in package memstat-dbg contains reference to TMPDIR [buildpaths] | ||
| 11 | |||
| 12 | Upstream-Status: Inappropriate [OE-specific] | ||
| 13 | |||
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 15 | --- | ||
| 16 | Makefile | 1 - | ||
| 17 | 1 file changed, 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/Makefile b/Makefile | ||
| 20 | index 29f8129..5426bf4 100644 | ||
| 21 | --- a/Makefile | ||
| 22 | +++ b/Makefile | ||
| 23 | @@ -3,7 +3,6 @@ | ||
| 24 | # Copyright 1998, by Bernd Eckenfels <ecki@debian.org> | ||
| 25 | # This file is under the GPL. | ||
| 26 | # | ||
| 27 | -CFLAGS = -g -Wall -O2 | ||
| 28 | prefix = $(DESTDIR)/ | ||
| 29 | exec_prefix = $(prefix)/usr | ||
| 30 | |||
diff --git a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb index a65782d017..a0b4d0b9cc 100644 --- a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb +++ b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb | |||
| @@ -14,10 +14,13 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=87be186443b1ac2cfa466f475e1ee0cb | |||
| 14 | 14 | ||
| 15 | SRC_URI = "http://sourceforge.net/projects/memstattool/files/memstat_${PV}.tar.gz \ | 15 | SRC_URI = "http://sourceforge.net/projects/memstattool/files/memstat_${PV}.tar.gz \ |
| 16 | file://0001-Include-limits.h-for-PATH_MAX-definition.patch \ | 16 | file://0001-Include-limits.h-for-PATH_MAX-definition.patch \ |
| 17 | file://0001-makefile-Do-not-override-cflags.patch \ | ||
| 17 | " | 18 | " |
| 18 | 19 | ||
| 19 | SRC_URI[sha256sum] = "245d5fc7fb87bcfd14486cd34917cae2856e799559ac568434af12c4852bce94" | 20 | SRC_URI[sha256sum] = "245d5fc7fb87bcfd14486cd34917cae2856e799559ac568434af12c4852bce94" |
| 20 | 21 | ||
| 22 | TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}" | ||
| 23 | |||
| 21 | do_install:append(){ | 24 | do_install:append(){ |
| 22 | install -d ${D}${bindir} | 25 | install -d ${D}${bindir} |
| 23 | install -m 0755 memstat ${D}${bindir} | 26 | install -m 0755 memstat ${D}${bindir} |
diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.3.2.bb b/meta-oe/recipes-devtools/mpich/mpich_5.0.0.bb index f1ac212023..505fc6f92b 100644 --- a/meta-oe/recipes-devtools/mpich/mpich_4.3.2.bb +++ b/meta-oe/recipes-devtools/mpich/mpich_5.0.0.bb | |||
| @@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a296dfb961b957b0e8adf67d8478d3d" | 6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a296dfb961b957b0e8adf67d8478d3d" |
| 7 | 7 | ||
| 8 | SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" | 8 | SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" |
| 9 | SRC_URI[sha256sum] = "47d774587a7156a53752218c811c852e70ac44db9c502dc3f399b4cb817e3818" | 9 | SRC_URI[sha256sum] = "e9350e32224283e95311f22134f36c98e3cd1c665d17fae20a6cc92ed3cffe11" |
| 10 | 10 | ||
| 11 | RDEPENDS:${PN} += "bash perl libxml2" | 11 | RDEPENDS:${PN} += "bash perl libxml2" |
| 12 | 12 | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-detect-aarch64-Neon-correctly.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-detect-aarch64-Neon-correctly.patch new file mode 100644 index 0000000000..15de2c1119 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-detect-aarch64-Neon-correctly.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | From 41ec2d5302b77be27ca972102c29ce12471ed4b0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Thu, 12 Feb 2026 11:09:44 +0100 | ||
| 4 | Subject: [PATCH 2/2] detect aarch64 Neon correctly | ||
| 5 | |||
| 6 | The llhttp vendored dependency of nodejs takes advantage of Arm NEON | ||
| 7 | instructions when they are available, however they are detected by | ||
| 8 | checking for an outdated CPU feature macro: it checks for __ARM_NEON__, | ||
| 9 | however it is not defined by new compilers for aarch64, rather they | ||
| 10 | set __ARM_NEON. The Arm C extension guide[1] refers to __ARM_NEON macro | ||
| 11 | aswell. | ||
| 12 | |||
| 13 | This patch changes the detection to check for both macros when detecting | ||
| 14 | the availability of NEON instructions. | ||
| 15 | |||
| 16 | The code this patch modifies is generated, so the patch itself isn't | ||
| 17 | suitable for upstream submission, as the root cause of the error is | ||
| 18 | in the generator itself. A PR has been submitted[2] to the generator | ||
| 19 | project to rectify this issue. | ||
| 20 | |||
| 21 | [1]: https://developer.arm.com/documentation/ihi0053/d/ - pdf, section 6.9 | ||
| 22 | [2]: https://github.com/nodejs/llparse/pull/84 | ||
| 23 | |||
| 24 | Upstream-Status: Inappropriate [see above] | ||
| 25 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 26 | --- | ||
| 27 | deps/llhttp/src/llhttp.c | 4 ++-- | ||
| 28 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 29 | |||
| 30 | diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c | ||
| 31 | index a0e59e50..b069bbbb 100644 | ||
| 32 | --- a/deps/llhttp/src/llhttp.c | ||
| 33 | +++ b/deps/llhttp/src/llhttp.c | ||
| 34 | @@ -10,7 +10,7 @@ | ||
| 35 | #endif /* _MSC_VER */ | ||
| 36 | #endif /* __SSE4_2__ */ | ||
| 37 | |||
| 38 | -#ifdef __ARM_NEON__ | ||
| 39 | +#if defined(__ARM_NEON__) || defined(__ARM_NEON) | ||
| 40 | #include <arm_neon.h> | ||
| 41 | #endif /* __ARM_NEON__ */ | ||
| 42 | |||
| 43 | @@ -2625,7 +2625,7 @@ static llparse_state_t llhttp__internal__run( | ||
| 44 | goto s_n_llhttp__internal__n_header_value_otherwise; | ||
| 45 | } | ||
| 46 | #endif /* __SSE4_2__ */ | ||
| 47 | - #ifdef __ARM_NEON__ | ||
| 48 | + #if defined(__ARM_NEON__) || defined(__ARM_NEON) | ||
| 49 | while (endp - p >= 16) { | ||
| 50 | uint8x16_t input; | ||
| 51 | uint8x16_t single; | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-fix-arm-Neon-intrinsics-types.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-fix-arm-Neon-intrinsics-types.patch new file mode 100644 index 0000000000..ddbad575f0 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-fix-arm-Neon-intrinsics-types.patch | |||
| @@ -0,0 +1,59 @@ | |||
| 1 | From 3f4283dac7d88a89b42f1f2966a862cee5afe486 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Thu, 12 Feb 2026 11:03:53 +0100 | ||
| 4 | Subject: [PATCH 1/2] fix arm Neon intrinsics types | ||
| 5 | |||
| 6 | The current code calls these intrinsics with incorrect datatypes | ||
| 7 | (it uses a vector of uint16 instead of uint8), causing compilation | ||
| 8 | to fail with the following error: | ||
| 9 | |||
| 10 | | ../deps/llhttp/src/llhttp.c: In function 'llhttp__internal__run': | ||
| 11 | | ../deps/llhttp/src/llhttp.c:2645:9: note: use '-flax-vector-conversions' to permit conversions between vectors with differing element types or numbers of subparts | ||
| 12 | | 2645 | ); | ||
| 13 | | | ^ | ||
| 14 | | ../deps/llhttp/src/llhttp.c:2643:11: error: incompatible type for argument 1 of 'vandq_u16' | ||
| 15 | | 2643 | vcgeq_u8(input, vdupq_n_u8(' ')), | ||
| 16 | |||
| 17 | To avoid this, set the correct intrinsics call that matches the | ||
| 18 | actual arguments. | ||
| 19 | |||
| 20 | The code that this patch modifies is generated code, so in itself | ||
| 21 | this change isn't appropriate for upstream. The actual problem | ||
| 22 | is in the code generator itself, for which a PR is already pending | ||
| 23 | for merging[1]. This patch is a port of that PR. | ||
| 24 | |||
| 25 | [1]: https://github.com/nodejs/llparse/pull/79 | ||
| 26 | |||
| 27 | Upstream-Status: Inappropriate [see above] | ||
| 28 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 29 | --- | ||
| 30 | deps/llhttp/src/llhttp.c | 12 ++++++------ | ||
| 31 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
| 32 | |||
| 33 | diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c | ||
| 34 | index aa4c4682..887603fd 100644 | ||
| 35 | --- a/deps/llhttp/src/llhttp.c | ||
| 36 | +++ b/deps/llhttp/src/llhttp.c | ||
| 37 | @@ -2639,17 +2639,17 @@ static llparse_state_t llhttp__internal__run( | ||
| 38 | /* Find first character that does not match `ranges` */ | ||
| 39 | single = vceqq_u8(input, vdupq_n_u8(0x9)); | ||
| 40 | mask = single; | ||
| 41 | - single = vandq_u16( | ||
| 42 | + single = vandq_u8( | ||
| 43 | vcgeq_u8(input, vdupq_n_u8(' ')), | ||
| 44 | vcleq_u8(input, vdupq_n_u8('~')) | ||
| 45 | ); | ||
| 46 | - mask = vorrq_u16(mask, single); | ||
| 47 | - single = vandq_u16( | ||
| 48 | + mask = vorrq_u8(mask, single); | ||
| 49 | + single = vandq_u8( | ||
| 50 | vcgeq_u8(input, vdupq_n_u8(0x80)), | ||
| 51 | vcleq_u8(input, vdupq_n_u8(0xff)) | ||
| 52 | ); | ||
| 53 | - mask = vorrq_u16(mask, single); | ||
| 54 | - narrow = vshrn_n_u16(mask, 4); | ||
| 55 | + mask = vorrq_u8(mask, single); | ||
| 56 | + narrow = vshrn_n_u16(vreinterpretq_u16_u8(mask), 4); | ||
| 57 | match_mask = ~vget_lane_u64(vreinterpret_u64_u8(narrow), 0); | ||
| 58 | match_len = __builtin_ctzll(match_mask) >> 2; | ||
| 59 | if (match_len != 16) { | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-llhttp-fix-NEON-header-value-__builtin_ctzll-undefin.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-llhttp-fix-NEON-header-value-__builtin_ctzll-undefin.patch new file mode 100644 index 0000000000..683dddcf04 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-llhttp-fix-NEON-header-value-__builtin_ctzll-undefin.patch | |||
| @@ -0,0 +1,60 @@ | |||
| 1 | From a63a5faea54055973bf5f0a514444532563cc20d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Telukula Jeevan Kumar Sahu <j-sahu@ti.com> | ||
| 3 | Date: Fri, 27 Feb 2026 20:58:43 +0530 | ||
| 4 | Subject: [PATCH] llhttp: fix NEON header value __builtin_ctzll undefined | ||
| 5 | behavior | ||
| 6 | |||
| 7 | When all 16 bytes match the allowed range, match_mask becomes 0 after | ||
| 8 | the bitwise NOT. Calling __builtin_ctzll(0) is undefined behavior per | ||
| 9 | the C standard. | ||
| 10 | |||
| 11 | The code expects match_len == 16 when all bytes match (so the branch | ||
| 12 | is skipped and p += 16 continues the loop), but this relied on | ||
| 13 | ctzll(0) returning 64, which is not guaranteed. | ||
| 14 | |||
| 15 | GCC at -O2 exploits this UB by deducing that __builtin_ctzll() result | ||
| 16 | is always in range [0, 63], and after >> 2 always in [0, 15], which | ||
| 17 | is never equal to 16. The compiler then optimizes | ||
| 18 | "if (match_len != 16)" to always-true, causing every valid 16-byte | ||
| 19 | chunk to be falsely rejected as containing an invalid character. | ||
| 20 | |||
| 21 | This manifests as HTTP 400 Bad Request (HPE_INVALID_HEADER_TOKEN) for | ||
| 22 | any HTTP header value longer than 16 characters on ARM targets with | ||
| 23 | NEON enabled. | ||
| 24 | |||
| 25 | Fix by explicitly checking for match_mask == 0 and setting | ||
| 26 | match_len = 16, avoiding the undefined behavior entirely. This bug | ||
| 27 | affects both aarch64 and armv7 NEON targets. | ||
| 28 | |||
| 29 | The fix has been merged upstream in llparse 7.3.1 [1] and is included | ||
| 30 | in llhttp 9.3.1. This patch can be dropped when nodejs updates its | ||
| 31 | bundled llhttp to >= 9.3.1. | ||
| 32 | |||
| 33 | [1]: https://github.com/nodejs/llparse/pull/83 | ||
| 34 | |||
| 35 | Upstream-Status: Inappropriate | ||
| 36 | Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com> | ||
| 37 | --- | ||
| 38 | deps/llhttp/src/llhttp.c | 6 +++++- | ||
| 39 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
| 40 | |||
| 41 | diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c | ||
| 42 | index 14b731e..b0a46c6 100644 | ||
| 43 | --- a/deps/llhttp/src/llhttp.c | ||
| 44 | +++ b/deps/llhttp/src/llhttp.c | ||
| 45 | @@ -2651,7 +2651,11 @@ static llparse_state_t llhttp__internal__run( | ||
| 46 | mask = vorrq_u8(mask, single); | ||
| 47 | narrow = vshrn_n_u16(vreinterpretq_u16_u8(mask), 4); | ||
| 48 | match_mask = ~vget_lane_u64(vreinterpret_u64_u8(narrow), 0); | ||
| 49 | - match_len = __builtin_ctzll(match_mask) >> 2; | ||
| 50 | + if (match_mask == 0) { | ||
| 51 | + match_len = 16; | ||
| 52 | + } else { | ||
| 53 | + match_len = __builtin_ctzll(match_mask) >> 2; | ||
| 54 | + } | ||
| 55 | if (match_len != 16) { | ||
| 56 | p += match_len; | ||
| 57 | goto s_n_llhttp__internal__n_header_value_otherwise; | ||
| 58 | -- | ||
| 59 | 2.34.1 | ||
| 60 | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch index d987ac50be..835c7018de 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch | |||
| @@ -17,6 +17,10 @@ Fix: | |||
| 17 | Upstream-Status: Inappropriate [OE specific] | 17 | Upstream-Status: Inappropriate [OE specific] |
| 18 | 18 | ||
| 19 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 19 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 20 | |||
| 21 | Added libatomic library explicitly to x86 targets. | ||
| 22 | |||
| 23 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 20 | --- | 24 | --- |
| 21 | node.gyp | 13 ++++++++++++- | 25 | node.gyp | 13 ++++++++++++- |
| 22 | tools/v8_gypfiles/v8.gyp | 15 ++++++++++++--- | 26 | tools/v8_gypfiles/v8.gyp | 15 ++++++++++++--- |
| @@ -26,7 +30,7 @@ diff --git a/node.gyp b/node.gyp | |||
| 26 | index b425f443..f296f35c 100644 | 30 | index b425f443..f296f35c 100644 |
| 27 | --- a/node.gyp | 31 | --- a/node.gyp |
| 28 | +++ b/node.gyp | 32 | +++ b/node.gyp |
| 29 | @@ -487,7 +487,18 @@ | 33 | @@ -503,7 +503,18 @@ |
| 30 | ], | 34 | ], |
| 31 | }], | 35 | }], |
| 32 | ['OS=="linux" and clang==1', { | 36 | ['OS=="linux" and clang==1', { |
| @@ -50,7 +54,7 @@ diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp | |||
| 50 | index b23263cf..dcabf4ca 100644 | 54 | index b23263cf..dcabf4ca 100644 |
| 51 | --- a/tools/v8_gypfiles/v8.gyp | 55 | --- a/tools/v8_gypfiles/v8.gyp |
| 52 | +++ b/tools/v8_gypfiles/v8.gyp | 56 | +++ b/tools/v8_gypfiles/v8.gyp |
| 53 | @@ -1100,9 +1100,18 @@ | 57 | @@ -1348,9 +1348,18 @@ |
| 54 | # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library | 58 | # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library |
| 55 | # to implement atomic memory access | 59 | # to implement atomic memory access |
| 56 | ['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', { | 60 | ['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', { |
| @@ -72,6 +76,21 @@ index b23263cf..dcabf4ca 100644 | |||
| 72 | }], | 76 | }], |
| 73 | ], | 77 | ], |
| 74 | }, # v8_base_without_compiler | 78 | }, # v8_base_without_compiler |
| 75 | -- | 79 | diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp |
| 76 | 2.35.5 | 80 | index cb82d4f15bc..65cb123b7bf 100644 |
| 77 | 81 | --- a/tools/v8_gypfiles/v8.gyp | |
| 82 | +++ b/tools/v8_gypfiles/v8.gyp | ||
| 83 | @@ -1820,6 +1820,13 @@ | ||
| 84 | ['enable_lto=="true"', { | ||
| 85 | 'ldflags': [ '-fno-lto' ], | ||
| 86 | }], | ||
| 87 | + # For future patch-rebases: this hunk is in mksnapshot target. | ||
| 88 | + # ia32 includes x86 also | ||
| 89 | + ['v8_target_arch=="ia32"', { | ||
| 90 | + 'link_settings': { | ||
| 91 | + 'libraries': ['-latomic'] | ||
| 92 | + } | ||
| 93 | + }], | ||
| 94 | ], | ||
| 95 | }, # mksnapshot | ||
| 96 | { | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.22.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.22.1.bb index 1ef01cc3b2..09d6b896b2 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_22.22.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.22.1.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" | 1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" |
| 2 | HOMEPAGE = "http://nodejs.org" | 2 | HOMEPAGE = "http://nodejs.org" |
| 3 | LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" | 3 | LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0 & BlueOak-1.0.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1fdf4f79da4006c3b5183fddc768f1c8" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b195f4ea4368177a2fd84b879f09cba8" |
| 5 | 5 | ||
| 6 | CVE_PRODUCT = "nodejs node.js" | 6 | CVE_PRODUCT = "nodejs node.js" |
| 7 | 7 | ||
| @@ -31,6 +31,9 @@ SRC_URI = "https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ | |||
| 31 | file://0001-positional-args.patch \ | 31 | file://0001-positional-args.patch \ |
| 32 | file://0001-custom-env.patch \ | 32 | file://0001-custom-env.patch \ |
| 33 | file://0001-build-remove-redundant-mXX-flags-for-V8.patch \ | 33 | file://0001-build-remove-redundant-mXX-flags-for-V8.patch \ |
| 34 | file://0001-fix-arm-Neon-intrinsics-types.patch \ | ||
| 35 | file://0001-detect-aarch64-Neon-correctly.patch \ | ||
| 36 | file://0001-llhttp-fix-NEON-header-value-__builtin_ctzll-undefin.patch \ | ||
| 34 | file://run-ptest \ | 37 | file://run-ptest \ |
| 35 | " | 38 | " |
| 36 | SRC_URI:append:class-target = " \ | 39 | SRC_URI:append:class-target = " \ |
| @@ -39,17 +42,13 @@ SRC_URI:append:class-target = " \ | |||
| 39 | SRC_URI:append:toolchain-clang:powerpc64le = " \ | 42 | SRC_URI:append:toolchain-clang:powerpc64le = " \ |
| 40 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ | 43 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ |
| 41 | " | 44 | " |
| 42 | SRC_URI[sha256sum] = "4c138012bb5352f49822a8f3e6d1db71e00639d0c36d5b6756f91e4c6f30b683" | 45 | SRC_URI[sha256sum] = "87104b07e7acee748bcc5391e1bc69cf3571caa0fdfb8b1d6b5fd3f9599b7849" |
| 43 | 46 | ||
| 44 | S = "${UNPACKDIR}/node-v${PV}" | 47 | S = "${UNPACKDIR}/node-v${PV}" |
| 45 | 48 | ||
| 46 | # v8 errors out if you have set CCACHE | 49 | # v8 errors out if you have set CCACHE |
| 47 | CCACHE = "" | 50 | CCACHE = "" |
| 48 | 51 | ||
| 49 | # Use '-flax-vector-conversions' to permit conversions between vectors | ||
| 50 | # with differing element types or numbers of subparts | ||
| 51 | CFLAGS:append:toolchain-gcc:arm = " -flax-vector-conversions" | ||
| 52 | |||
| 53 | def map_nodejs_arch(a, d): | 52 | def map_nodejs_arch(a, d): |
| 54 | import re | 53 | import re |
| 55 | 54 | ||
| @@ -74,8 +73,8 @@ PACKAGECONFIG ??= "ares brotli icu zlib" | |||
| 74 | PACKAGECONFIG[ares] = "--shared-cares,,c-ares c-ares-native" | 73 | PACKAGECONFIG[ares] = "--shared-cares,,c-ares c-ares-native" |
| 75 | PACKAGECONFIG[brotli] = "--shared-brotli,,brotli brotli-native" | 74 | PACKAGECONFIG[brotli] = "--shared-brotli,,brotli brotli-native" |
| 76 | PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu icu-native" | 75 | PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu icu-native" |
| 77 | PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" | 76 | PACKAGECONFIG[libuv] = "--shared-libuv,,libuv libuv-native" |
| 78 | PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" | 77 | PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2 nghttp2-native" |
| 79 | PACKAGECONFIG[shared] = "--shared" | 78 | PACKAGECONFIG[shared] = "--shared" |
| 80 | PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" | 79 | PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" |
| 81 | 80 | ||
| @@ -133,8 +132,6 @@ python do_create_v8_qemu_wrapper () { | |||
| 133 | do_create_v8_qemu_wrapper[dirs] = "${B}" | 132 | do_create_v8_qemu_wrapper[dirs] = "${B}" |
| 134 | addtask create_v8_qemu_wrapper after do_configure before do_compile | 133 | addtask create_v8_qemu_wrapper after do_configure before do_compile |
| 135 | 134 | ||
| 136 | LDFLAGS:append:x86 = " -latomic" | ||
| 137 | |||
| 138 | export CC_host | 135 | export CC_host |
| 139 | export CFLAGS_host | 136 | export CFLAGS_host |
| 140 | export CXX_host | 137 | export CXX_host |
diff --git a/meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch b/meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch deleted file mode 100644 index dad5a9646a..0000000000 --- a/meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | From 6fa2b7de3e647e64c5d693aea7f3bacbfa964f53 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ihor Solodari <ihor.solodrai@linux.dev> | ||
| 3 | Date: Wed, 20 Aug 2025 09:00:03 +0100 | ||
| 4 | Subject: [PATCH] btf_encoder: Fix elf_functions cleanup on error | ||
| 5 | |||
| 6 | When elf_functions__new() errors out and jumps to | ||
| 7 | elf_functions__delete(), pahole segfaults on attempt to list_del() the | ||
| 8 | elf_functions instance from a list, to which it was never added. | ||
| 9 | |||
| 10 | Fix this by moving list_del() call out of elf_functions__delete(). | ||
| 11 | Remove from the list only on normal cleanup in | ||
| 12 | elf_functions_list__clear(). | ||
| 13 | |||
| 14 | v1: | ||
| 15 | https://lore.kernel.org/dwarves/979a1ac4-21d3-4384-8ce4-d10f41887088@linux.dev/ | ||
| 16 | |||
| 17 | Closes: | ||
| 18 | https://lore.kernel.org/dwarves/24bcc853-533c-42ab-bc37-0c13e0baa217@windriver.com/ | ||
| 19 | Reported-by: Changqing Li <changqing.li@windriver.com> | ||
| 20 | Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev> | ||
| 21 | Reviewed-by: Arnaldo Carvalho de Melo <acme@redhat.com> | ||
| 22 | Link: https://lore.kernel.org/dwarves/acef4a0e-7d3b-4e05-b3ca-1007580f2754@linux.dev/ | ||
| 23 | Signed-off-by: Alan Maguire <alan.maguire@oracle.com> | ||
| 24 | |||
| 25 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?h=next&id=fe6738f4b46b63dcdc5b15b252a014b3eaba16a4] | ||
| 26 | |||
| 27 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 28 | --- | ||
| 29 | btf_encoder.c | 2 +- | ||
| 30 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 31 | |||
| 32 | diff --git a/btf_encoder.c b/btf_encoder.c | ||
| 33 | index 511c1ea..2f8c6bb 100644 | ||
| 34 | --- a/btf_encoder.c | ||
| 35 | +++ b/btf_encoder.c | ||
| 36 | @@ -162,7 +162,6 @@ static inline void elf_functions__delete(struct elf_functions *funcs) | ||
| 37 | free(funcs->entries[i].alias); | ||
| 38 | free(funcs->entries); | ||
| 39 | elf_symtab__delete(funcs->symtab); | ||
| 40 | - list_del(&funcs->node); | ||
| 41 | free(funcs); | ||
| 42 | } | ||
| 43 | |||
| 44 | @@ -204,6 +203,7 @@ static inline void elf_functions_list__clear(struct list_head *elf_functions_lis | ||
| 45 | |||
| 46 | list_for_each_safe(pos, tmp, elf_functions_list) { | ||
| 47 | funcs = list_entry(pos, struct elf_functions, node); | ||
| 48 | + list_del(&funcs->node); | ||
| 49 | elf_functions__delete(funcs); | ||
| 50 | } | ||
| 51 | } | ||
| 52 | -- | ||
| 53 | 2.34.1 | ||
| 54 | |||
diff --git a/meta-oe/recipes-devtools/pahole/pahole_1.29.bb b/meta-oe/recipes-devtools/pahole/pahole_1.31.bb index 4f2737767b..62f053b6aa 100644 --- a/meta-oe/recipes-devtools/pahole/pahole_1.29.bb +++ b/meta-oe/recipes-devtools/pahole/pahole_1.31.bb | |||
| @@ -9,10 +9,10 @@ DEPENDS = "elfutils zlib libbpf" | |||
| 9 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 9 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 10 | COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" | 10 | COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" |
| 11 | 11 | ||
| 12 | SRCREV = "b9cc7963051b2099795129450f9b70c81950d02f" | 12 | SRCREV = "1f2805b6eef104df3125143c949b391f6122e5b9" |
| 13 | SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \ | 13 | SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master;tag=v${PV} \ |
| 14 | file://0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch \ | 14 | file://0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch \ |
| 15 | file://0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch" | 15 | " |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | inherit cmake pkgconfig | 18 | inherit cmake pkgconfig |
diff --git a/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.10.bb b/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.10.bb new file mode 100644 index 0000000000..08dfcb7545 --- /dev/null +++ b/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.10.bb | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | SUMMARY = "Security-focused ELF files checking tool" | ||
| 2 | DESCRIPTION = "This is a small set of various PaX aware and related \ | ||
| 3 | utilities for ELF binaries. It can check ELF binary files and running \ | ||
| 4 | processes for issues that might be relevant when using ELF binaries \ | ||
| 5 | along with PaX, such as non-PIC code or executable stack and heap." | ||
| 6 | HOMEPAGE = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities" | ||
| 7 | LICENSE = "GPL-2.0-or-later" | ||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" | ||
| 9 | |||
| 10 | SRC_URI = "git://github.com/gentoo/pax-utils;protocol=https;branch=master;tag=v${PV}" | ||
| 11 | SRCREV = "d279ca563775105859f1f8c8467b8244d758cc62" | ||
| 12 | |||
| 13 | RDEPENDS:${PN} += "bash" | ||
| 14 | |||
| 15 | BBCLASSEXTEND = "native" | ||
| 16 | |||
| 17 | inherit meson pkgconfig | ||
| 18 | |||
| 19 | PACKAGECONFIG ??= "" | ||
| 20 | |||
| 21 | PACKAGECONFIG[libcap] = "-Duse_libcap=enabled, -Duse_libcap=disabled, libcap" | ||
| 22 | PACKAGECONFIG[libseccomp] = "-Duse_seccomp=true, -Duse_seccomp=false, libseccomp" | ||
| 23 | PACKAGECONFIG[pyelftools] = "-Dlddtree_implementation=python, -Dlddtree_implementation=sh,, python3-pyelftools" | ||
| 24 | |||
| 25 | do_install:append(){ | ||
| 26 | if ${@bb.utils.contains('PACKAGECONFIG', 'pyelftools', 'true', 'false', d)}; then | ||
| 27 | sed -i 's,#!/usr/bin/env python,#!/usr/bin/env python3,' ${D}${bindir}/lddtree | ||
| 28 | fi | ||
| 29 | } | ||
| 30 | |||
diff --git a/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb b/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb deleted file mode 100644 index 4e80ca87ee..0000000000 --- a/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | SUMMARY = "Security-focused ELF files checking tool" | ||
| 2 | DESCRIPTION = "This is a small set of various PaX aware and related \ | ||
| 3 | utilities for ELF binaries. It can check ELF binary files and running \ | ||
| 4 | processes for issues that might be relevant when using ELF binaries \ | ||
| 5 | along with PaX, such as non-PIC code or executable stack and heap." | ||
| 6 | HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml" | ||
| 7 | LICENSE = "GPL-2.0-or-later" | ||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" | ||
| 9 | |||
| 10 | SRC_URI = "https://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz" | ||
| 11 | SRC_URI[sha256sum] = "eeca7fbd98bc66bead4a77000c2025d9f17ea8201b84245882406ce00b9b6b14" | ||
| 12 | |||
| 13 | RDEPENDS:${PN} += "bash" | ||
| 14 | |||
| 15 | export GNULIB_OVERRIDES_WINT_T = "0" | ||
| 16 | |||
| 17 | do_configure:prepend() { | ||
| 18 | touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/README | ||
| 19 | } | ||
| 20 | |||
| 21 | do_install() { | ||
| 22 | oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install | ||
| 23 | } | ||
| 24 | |||
| 25 | BBCLASSEXTEND = "native" | ||
| 26 | |||
| 27 | inherit autotools pkgconfig | ||
| 28 | |||
| 29 | PACKAGECONFIG ??= "" | ||
| 30 | |||
| 31 | PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap" | ||
| 32 | PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp" | ||
| 33 | PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, python3-pyelftools" | ||
| 34 | |||
| 35 | EXTRA_OECONF += "--enable-largefile" | ||
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb index d697485e69..52fb36ef40 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.bb +++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb | |||
| @@ -24,7 +24,6 @@ SRC_URI:append = " \ | |||
| 24 | git://chromium.googlesource.com/chromium/src/third_party/zlib.git;nobranch=1;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zlib;name=zlib \ | 24 | git://chromium.googlesource.com/chromium/src/third_party/zlib.git;nobranch=1;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zlib;name=zlib \ |
| 25 | git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/lzma;name=lzma \ | 25 | git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/lzma;name=lzma \ |
| 26 | git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zstd;name=zstd \ | 26 | git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zstd;name=zstd \ |
| 27 | https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/;name=gn \ | ||
| 28 | \ | 27 | \ |
| 29 | file://0001-Remove-check_build_deps-build-steps.patch \ | 28 | file://0001-Remove-check_build_deps-build-steps.patch \ |
| 30 | " | 29 | " |
| @@ -45,8 +44,6 @@ SRCREV_zstd = "77211fcc5e08c781734a386402ada93d0d18d093" | |||
| 45 | 44 | ||
| 46 | SRCREV_FORMAT .= "_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib_zstd" | 45 | SRCREV_FORMAT .= "_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib_zstd" |
| 47 | 46 | ||
| 48 | SRC_URI[gn.sha256sum] = "f706aaa0676e3e22f5fc9ca482295d7caee8535d1869f99efa2358177b64f5cd" | ||
| 49 | |||
| 50 | require perfetto.inc | 47 | require perfetto.inc |
| 51 | 48 | ||
| 52 | DEPENDS += " ninja-native gn-native" | 49 | DEPENDS += " ninja-native gn-native" |
| @@ -71,12 +68,6 @@ B = "${WORKDIR}/build" | |||
| 71 | do_configure () { | 68 | do_configure () { |
| 72 | # Configuration needs to be done from the source directory | 69 | # Configuration needs to be done from the source directory |
| 73 | cd ${S} | 70 | cd ${S} |
| 74 | # Rename a few build tools if they have not been renamed | ||
| 75 | cd buildtools | ||
| 76 | |||
| 77 | mkdir linux64 && cp ${RECIPE_SYSROOT_NATIVE}${bindir}/gn linux64/gn | ||
| 78 | chmod +x linux64/gn | ||
| 79 | cd .. | ||
| 80 | 71 | ||
| 81 | CC_BIN=`echo $CC | awk '{print $1}'` | 72 | CC_BIN=`echo $CC | awk '{print $1}'` |
| 82 | CXX_BIN=`echo $CXX | awk '{print $1}'` | 73 | CXX_BIN=`echo $CXX | awk '{print $1}'` |
| @@ -109,7 +100,7 @@ do_configure () { | |||
| 109 | ARGS=$ARGS" target_linker=\"$CC_BIN ${TUNE_CCARGS} ${LDFLAGS}\"" | 100 | ARGS=$ARGS" target_linker=\"$CC_BIN ${TUNE_CCARGS} ${LDFLAGS}\"" |
| 110 | ARGS=$ARGS" target_ar=\"$AR\"" | 101 | ARGS=$ARGS" target_ar=\"$AR\"" |
| 111 | ARGS="'$ARGS'" | 102 | ARGS="'$ARGS'" |
| 112 | cmd="tools/gn gen --args=$ARGS ${B}" | 103 | cmd="gn gen --args=$ARGS ${B}" |
| 113 | 104 | ||
| 114 | echo $cmd | 105 | echo $cmd |
| 115 | # Use eval, not just call $cmd, due to escaping of single quotation marks | 106 | # Use eval, not just call $cmd, due to escaping of single quotation marks |
diff --git a/meta-oe/recipes-devtools/perl/exiftool_13.45.bb b/meta-oe/recipes-devtools/perl/exiftool_13.52.bb index 9feaeb10b1..f40116144e 100644 --- a/meta-oe/recipes-devtools/perl/exiftool_13.45.bb +++ b/meta-oe/recipes-devtools/perl/exiftool_13.52.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff | |||
| 7 | 7 | ||
| 8 | inherit cpan | 8 | inherit cpan |
| 9 | 9 | ||
| 10 | SRCREV = "6219b531484ad790d7fcfa5732d5a9f42ff9e5b7" | 10 | SRCREV = "02c78a2e051894b57ad8a11024f8cfa05957e725" |
| 11 | SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master;tag=${PV}" | 11 | SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master;tag=${PV}" |
| 12 | 12 | ||
| 13 | RDEPENDS:${PN} = " \ | 13 | RDEPENDS:${PN} = " \ |
diff --git a/meta-oe/recipes-devtools/php/php_8.5.1.bb b/meta-oe/recipes-devtools/php/php_8.5.4.bb index c3abf58ad5..efa778b6d8 100644 --- a/meta-oe/recipes-devtools/php/php_8.5.1.bb +++ b/meta-oe/recipes-devtools/php/php_8.5.4.bb | |||
| @@ -12,7 +12,7 @@ DEPENDS:class-native = "zlib-native libxml2-native" | |||
| 12 | 12 | ||
| 13 | PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" | 13 | PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" |
| 14 | 14 | ||
| 15 | SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ | 15 | SRC_URI = "https://php.net/distributions/php-${PV}.tar.bz2 \ |
| 16 | file://0001-configure.ac-don-t-include-build-libtool.m4.patch \ | 16 | file://0001-configure.ac-don-t-include-build-libtool.m4.patch \ |
| 17 | file://0002-ext-phar-Makefile.frag-Fix-phar-packaging.patch \ | 17 | file://0002-ext-phar-Makefile.frag-Fix-phar-packaging.patch \ |
| 18 | " | 18 | " |
| @@ -32,7 +32,7 @@ UPSTREAM_CHECK_REGEX = "releases/tag/php-(?P<pver>\d+(\.\d+)+)" | |||
| 32 | 32 | ||
| 33 | S = "${UNPACKDIR}/php-${PV}" | 33 | S = "${UNPACKDIR}/php-${PV}" |
| 34 | 34 | ||
| 35 | SRC_URI[sha256sum] = "55f428c426e7241752ea9afff160bb64c32a9321cbd6d17d1c145b8df8823737" | 35 | SRC_URI[sha256sum] = "2ac929a29a6b7ef4b8acec981a417b91bdf7f548f597df665cc56ab9ea95fc75" |
| 36 | 36 | ||
| 37 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" | 37 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" |
| 38 | CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." | 38 | CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." |
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch deleted file mode 100644 index 1f5c9127de..0000000000 --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From cd6c5f36c0dc38e4734b74b03923489b7bfb9aba Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 10 Mar 2025 19:59:19 -0700 | ||
| 4 | Subject: [PATCH] Fix build on mips/clang | ||
| 5 | |||
| 6 | clang20 crashes on mips, until its fixed upstream disable tailcall on | ||
| 7 | mips | ||
| 8 | |||
| 9 | https://github.com/llvm/llvm-project/issues/51709 | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [Clang workaround] | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | |||
| 14 | Rebase to v5.29.4 | ||
| 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 16 | --- | ||
| 17 | src/google/protobuf/port_def.inc | 1 + | ||
| 18 | 1 file changed, 1 insertion(+) | ||
| 19 | |||
| 20 | diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc | ||
| 21 | index 56f995e45..428d096b3 100644 | ||
| 22 | --- a/src/google/protobuf/port_def.inc | ||
| 23 | +++ b/src/google/protobuf/port_def.inc | ||
| 24 | @@ -227,6 +227,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), | ||
| 25 | #error PROTOBUF_TAILCALL was previously defined | ||
| 26 | #endif | ||
| 27 | #if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) && \ | ||
| 28 | + !defined(__mips__) && \ | ||
| 29 | !defined(_ARCH_PPC) && !defined(__wasm__) && \ | ||
| 30 | !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__) | ||
| 31 | // Compilation fails on ARM32: b/195943306 | ||
| 32 | -- | ||
| 33 | 2.25.1 | ||
| 34 | |||
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch index 2edba6b7eb..788db3e406 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch +++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch | |||
| @@ -30,9 +30,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt | |||
| 30 | index e90cb8aa2..3ffac1307 100644 | 30 | index e90cb8aa2..3ffac1307 100644 |
| 31 | --- a/CMakeLists.txt | 31 | --- a/CMakeLists.txt |
| 32 | +++ b/CMakeLists.txt | 32 | +++ b/CMakeLists.txt |
| 33 | @@ -14,6 +14,10 @@ endif() | 33 | @@ -18,6 +18,10 @@ if(CMAKE_CXX_STANDARD AND CMAKE_CXX_STANDARD LESS 17) |
| 34 | # Project | 34 | message(FATAL_ERROR "The minimum supported C++ standard is C++ 17") |
| 35 | project(protobuf C CXX) | 35 | endif() |
| 36 | 36 | ||
| 37 | +set(CMAKE_CXX_STANDARD 17) | 37 | +set(CMAKE_CXX_STANDARD 17) |
| 38 | +set(CMAKE_CXX_STANDARD_REQUIRED ON) | 38 | +set(CMAKE_CXX_STANDARD_REQUIRED ON) |
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_6.31.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf_6.33.5.bb index 37b26b610d..66c9c24473 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_6.31.1.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_6.33.5.bb | |||
| @@ -10,22 +10,26 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \ | 10 | file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \ |
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | PROTOC_VERSION = "v${@d.getVar('PV').split('.', 1)[1]}" | ||
| 14 | PROTOC_BRANCH = "${@d.getVar('PV').split('.', 2)[1]}.x" | ||
| 15 | |||
| 13 | DEPENDS = "zlib abseil-cpp jsoncpp" | 16 | DEPENDS = "zlib abseil-cpp jsoncpp" |
| 14 | DEPENDS:append:class-target = " protobuf-native" | 17 | DEPENDS:append:class-target = " protobuf-native" |
| 15 | 18 | ||
| 16 | SRCREV = "74211c0dfc2777318ab53c2cd2c317a2ef9012de" | 19 | SRCREV = "b6f9284da830b69be787732ffdaa35049d20a088" |
| 17 | 20 | ||
| 18 | SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=31.x;protocol=https \ | 21 | SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=${PROTOC_BRANCH};protocol=https;tag=${PROTOC_VERSION} \ |
| 19 | file://run-ptest \ | 22 | file://run-ptest \ |
| 20 | file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ | 23 | file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ |
| 21 | file://0001-fix-protobuf-native-build-failure-with-gcc-10.patch \ | 24 | file://0001-fix-protobuf-native-build-failure-with-gcc-10.patch \ |
| 22 | " | 25 | " |
| 23 | SRC_URI:append:mipsarcho32:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " | ||
| 24 | 26 | ||
| 25 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d\.\d+\.\d+)" | 27 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d\.\d+\.\d+)" |
| 26 | 28 | ||
| 27 | CVE_PRODUCT = "google:protobuf protobuf:protobuf google-protobuf protobuf-cpp" | 29 | CVE_PRODUCT = "google:protobuf protobuf:protobuf google-protobuf protobuf-cpp" |
| 28 | 30 | ||
| 31 | CVE_STATUS[CVE-2026-0994] = "cpe-incorrect: the vulnerability affects only python3-protobuf recipe" | ||
| 32 | |||
| 29 | inherit cmake pkgconfig ptest | 33 | inherit cmake pkgconfig ptest |
| 30 | 34 | ||
| 31 | PACKAGECONFIG ??= "" | 35 | PACKAGECONFIG ??= "" |
| @@ -70,6 +74,7 @@ do_compile_ptest() { | |||
| 70 | # Adapt uf8_range.pc | 74 | # Adapt uf8_range.pc |
| 71 | cp "${B}/third_party/utf8_range/utf8_range.pc" "${B}/${TEST_SRC_DIR}/utf8_range.pc" | 75 | cp "${B}/third_party/utf8_range/utf8_range.pc" "${B}/${TEST_SRC_DIR}/utf8_range.pc" |
| 72 | sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" | 76 | sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" |
| 77 | sed -e 's|includedir=.*|includedir=${S}/third_party/utf8_range|' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" | ||
| 73 | sed -e 's|Libs:|Libs= -L${B}/third_party/utf8_range |' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" | 78 | sed -e 's|Libs:|Libs= -L${B}/third_party/utf8_range |' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" |
| 74 | # Until out-of-tree build of examples is supported, we have to use this approach | 79 | # Until out-of-tree build of examples is supported, we have to use this approach |
| 75 | sed -e 's|../src/google/protobuf/.libs/timestamp.pb.o|${B}/CMakeFiles/libprotobuf.dir/src/google/protobuf/timestamp.pb.cc.o|' -i "${B}/${TEST_SRC_DIR}/Makefile" | 80 | sed -e 's|../src/google/protobuf/.libs/timestamp.pb.o|${B}/CMakeFiles/libprotobuf.dir/src/google/protobuf/timestamp.pb.cc.o|' -i "${B}/${TEST_SRC_DIR}/Makefile" |
diff --git a/meta-oe/recipes-devtools/python/python3-psycopg_3.3.2.bb b/meta-oe/recipes-devtools/python/python3-psycopg_3.3.3.bb index 5ca565504a..d6df529686 100644 --- a/meta-oe/recipes-devtools/python/python3-psycopg_3.3.2.bb +++ b/meta-oe/recipes-devtools/python/python3-psycopg_3.3.3.bb | |||
| @@ -7,7 +7,7 @@ features offered by PostgreSQL." | |||
| 7 | LICENSE = "LGPL-3.0-only" | 7 | LICENSE = "LGPL-3.0-only" |
| 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404" | 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404" |
| 9 | 9 | ||
| 10 | SRC_URI[sha256sum] = "707a67975ee214d200511177a6a80e56e654754c9afca06a7194ea6bbfde9ca7" | 10 | SRC_URI[sha256sum] = "5e9a47458b3c1583326513b2556a2a9473a1001a56c9efe9e587245b43148dd9" |
| 11 | 11 | ||
| 12 | inherit pypi python_setuptools_build_meta | 12 | inherit pypi python_setuptools_build_meta |
| 13 | 13 | ||
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.18.1.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.19.bb index c84b992af8..cfef1851a5 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.18.1.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.19.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
| 8 | DEPENDS = "elfutils" | 8 | DEPENDS = "elfutils" |
| 9 | DEPENDS:append:libc-musl = " argp-standalone" | 9 | DEPENDS:append:libc-musl = " argp-standalone" |
| 10 | 10 | ||
| 11 | SRCREV = "6d006b71ac32e28b7829cc21ccc7bb9c10add964" | 11 | SRCREV = "de15d0cf2730eedae1685d214f54b352530d1aa4" |
| 12 | SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https;tag=v${PV} \ | 12 | SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https;tag=v${PV} \ |
| 13 | file://0001-include-libgen.h-for-basename.patch \ | 13 | file://0001-include-libgen.h-for-basename.patch \ |
| 14 | " | 14 | " |
diff --git a/meta-oe/recipes-extended/7zip/7zip_25.01.bb b/meta-oe/recipes-extended/7zip/7zip_26.00.bb index f4ea6506e1..85219b5052 100644 --- a/meta-oe/recipes-extended/7zip/7zip_25.01.bb +++ b/meta-oe/recipes-extended/7zip/7zip_26.00.bb | |||
| @@ -3,16 +3,16 @@ HOMEPAGE = "http://www.7-zip.org/" | |||
| 3 | LICENSE = "LGPL-2.1-or-later & unRAR & PD & BSD-2-Clause & BSD-3-Clause" | 3 | LICENSE = "LGPL-2.1-or-later & unRAR & PD & BSD-2-Clause & BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c \ | 4 | LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c \ |
| 5 | file://DOC/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de \ | 5 | file://DOC/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de \ |
| 6 | file://DOC/License.txt;md5=e80f9280df93aa8da95cac449f9fd115 \ | 6 | file://DOC/License.txt;md5=a4ae6e492874f0008c7600c2ef80daa4 \ |
| 7 | " | 7 | " |
| 8 | 8 | ||
| 9 | CVE_PRODUCT = "7-zip 7zip" | 9 | CVE_PRODUCT = "7-zip 7zip" |
| 10 | SRC_URI = "git://github.com/ip7z/7zip.git;protocol=https;branch=main \ | 10 | SRC_URI = "git://github.com/ip7z/7zip.git;protocol=https;branch=main;tag=${PV} \ |
| 11 | file://0001-support-yocto-cross-compiling.patch \ | 11 | file://0001-support-yocto-cross-compiling.patch \ |
| 12 | file://0001-Remove-treating-warning-as-errors.patch \ | 12 | file://0001-Remove-treating-warning-as-errors.patch \ |
| 13 | file://7z_wrapper.sh \ | 13 | file://7z_wrapper.sh \ |
| 14 | " | 14 | " |
| 15 | SRCREV = "5e96a8279489832924056b1fa82f29d5837c9469" | 15 | SRCREV = "839151eaaad24771892afaae6bac690e31e58384" |
| 16 | 16 | ||
| 17 | UPSTREAM_CHECK_URI = "https://github.com/ip7z/7zip/releases/latest" | 17 | UPSTREAM_CHECK_URI = "https://github.com/ip7z/7zip/releases/latest" |
| 18 | 18 | ||
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-running-tests-on-target-when-cross-compiling.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-running-tests-on-target-when-cross-compiling.patch deleted file mode 100644 index b6e24a9519..0000000000 --- a/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-running-tests-on-target-when-cross-compiling.patch +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | From 9f0eed91d32ec2f310bd5c23af187f888394fcb4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Marko <peter.marko@siemens.com> | ||
| 3 | Date: Wed, 2 Apr 2025 09:33:03 +0200 | ||
| 4 | Subject: [PATCH] Allow running tests on target when cross-compiling | ||
| 5 | |||
| 6 | When bit7z is Cross-compiled, target device does not contain | ||
| 7 | source/build directory anymore and thus path to test data is different. | ||
| 8 | Make it possible to pass the new path to cmake. | ||
| 9 | |||
| 10 | Upstream-Status: Submitted [https://github.com/rikyoz/bit7z/pull/289] | ||
| 11 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 12 | --- | ||
| 13 | tests/CMakeLists.txt | 9 +++++++-- | ||
| 14 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
| 17 | index 60da280..dbdff1f 100644 | ||
| 18 | --- a/tests/CMakeLists.txt | ||
| 19 | +++ b/tests/CMakeLists.txt | ||
| 20 | @@ -49,6 +49,11 @@ add_executable( ${TESTS_TARGET_PUBLIC} ${SOURCE_FILES} ${PUBLIC_API_SOURCE_FILES | ||
| 21 | |||
| 22 | if( BIT7Z_TESTS_FILESYSTEM ) | ||
| 23 | set( BIT7Z_TESTS_DATA_DIR ${CMAKE_CURRENT_BINARY_DIR}/data ) | ||
| 24 | + if( NOT BIT7Z_TESTS_DATA_DIR_TARGET ) | ||
| 25 | + set( BIT7Z_TESTS_DATA_DIR_TARGET ${BIT7Z_TESTS_DATA_DIR} ) | ||
| 26 | + else() | ||
| 27 | + message( STATUS "Custom test data dir on target: ${BIT7Z_TESTS_DATA_DIR_TARGET}" ) | ||
| 28 | + endif() | ||
| 29 | |||
| 30 | include( FetchContent ) | ||
| 31 | FetchContent_Declare( bit7z-test-data | ||
| 32 | @@ -61,11 +66,11 @@ if( BIT7Z_TESTS_FILESYSTEM ) | ||
| 33 | message( STATUS "Tests data directory: ${BIT7Z_TESTS_DATA_DIR}" ) | ||
| 34 | target_compile_definitions( ${TESTS_TARGET} PRIVATE | ||
| 35 | BIT7Z_TESTS_FILESYSTEM | ||
| 36 | - BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR}" ) | ||
| 37 | + BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR_TARGET}" ) | ||
| 38 | target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE | ||
| 39 | BIT7Z_TESTS_PUBLIC_API_ONLY | ||
| 40 | BIT7Z_TESTS_FILESYSTEM | ||
| 41 | - BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR}" ) | ||
| 42 | + BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR_TARGET}" ) | ||
| 43 | if( NOT EXISTS ${BIT7Z_TESTS_DATA_DIR}/test_filesystem/empty ) | ||
| 44 | file( MAKE_DIRECTORY ${BIT7Z_TESTS_DATA_DIR}/test_filesystem/empty ) | ||
| 45 | endif() | ||
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-specifying-path-to-7z-library-in-tests.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-specifying-path-to-7z-library-in-tests.patch deleted file mode 100644 index adc0d67d97..0000000000 --- a/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-specifying-path-to-7z-library-in-tests.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | From 60137ec132951f941f2fb98cd6353717b322cbf1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Marko <peter.marko@siemens.com> | ||
| 3 | Date: Wed, 2 Apr 2025 10:17:38 +0200 | ||
| 4 | Subject: [PATCH] Allow specifying path to 7z library in tests | ||
| 5 | |||
| 6 | For instance to override path to library on Linux when using real 7-zip | ||
| 7 | instead of pzip: /usr/lib/lib7z.so | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://github.com/rikyoz/bit7z/pull/288] | ||
| 10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 11 | --- | ||
| 12 | tests/CMakeLists.txt | 7 +++++++ | ||
| 13 | tests/src/utils/shared_lib.hpp | 4 +++- | ||
| 14 | 2 files changed, 10 insertions(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
| 17 | index 60da280d..1307366a 100644 | ||
| 18 | --- a/tests/CMakeLists.txt | ||
| 19 | +++ b/tests/CMakeLists.txt | ||
| 20 | @@ -103,6 +103,13 @@ message( STATUS "Use system 7-zip for tests: ${BIT7Z_TESTS_USE_SYSTEM_7ZIP}" ) | ||
| 21 | if( BIT7Z_TESTS_USE_SYSTEM_7ZIP ) | ||
| 22 | target_compile_definitions( ${TESTS_TARGET} PRIVATE BIT7Z_TESTS_USE_SYSTEM_7ZIP ) | ||
| 23 | target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE BIT7Z_TESTS_USE_SYSTEM_7ZIP ) | ||
| 24 | +else() | ||
| 25 | + set( BIT7Z_TESTS_7Z_LIBRARY_PATH "" CACHE STRING "The path of the 7-Zip library to be used for running the tests" ) | ||
| 26 | + if( NOT BIT7Z_TESTS_7Z_LIBRARY_PATH STREQUAL "" ) | ||
| 27 | + message( STATUS "Use custom 7-zip library for tests: ${BIT7Z_TESTS_7Z_LIBRARY_PATH}" ) | ||
| 28 | + target_compile_definitions( ${TESTS_TARGET} PRIVATE BIT7Z_TESTS_7Z_LIBRARY_PATH="${BIT7Z_TESTS_7Z_LIBRARY_PATH}" ) | ||
| 29 | + target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE BIT7Z_TESTS_7Z_LIBRARY_PATH="${BIT7Z_TESTS_7Z_LIBRARY_PATH}" ) | ||
| 30 | + endif() | ||
| 31 | endif() | ||
| 32 | |||
| 33 | # Avoiding linking unnecessary libraries. | ||
| 34 | diff --git a/tests/src/utils/shared_lib.hpp b/tests/src/utils/shared_lib.hpp | ||
| 35 | index 41435a9b..8bc02939 100644 | ||
| 36 | --- a/tests/src/utils/shared_lib.hpp | ||
| 37 | +++ b/tests/src/utils/shared_lib.hpp | ||
| 38 | @@ -20,7 +20,9 @@ namespace bit7z { | ||
| 39 | namespace test { | ||
| 40 | |||
| 41 | inline auto sevenzip_lib_path() -> tstring { | ||
| 42 | -#ifdef BIT7Z_TESTS_USE_SYSTEM_7ZIP | ||
| 43 | +#ifdef BIT7Z_TESTS_7Z_LIBRARY_PATH | ||
| 44 | + static const tstring lib_path = BIT7Z_STRING( BIT7Z_TESTS_7Z_LIBRARY_PATH ); | ||
| 45 | +#elif defined( BIT7Z_TESTS_USE_SYSTEM_7ZIP ) | ||
| 46 | #ifdef _WIN64 | ||
| 47 | static const tstring lib_path = BIT7Z_STRING( "C:\\Program Files\\7-Zip\\7z.dll" ); | ||
| 48 | #elif defined( _WIN32 ) | ||
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch deleted file mode 100644 index b1bf6923f2..0000000000 --- a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | From d504abaf2b0a514193f52df42098bc16de4718b2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Oz <rik20@live.it> | ||
| 3 | Date: Fri, 17 Jan 2025 21:23:59 +0100 | ||
| 4 | Subject: [PATCH] Fix int8_t storage in BitPropVariant on Arm architectures | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://github.com/rikyoz/bit7z/commit/d504abaf2b0a514193f52df42098bc16de4718b2] | ||
| 7 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 8 | --- | ||
| 9 | include/bit7z/bitwindows.hpp | 4 ++++ | ||
| 10 | src/bitpropvariant.cpp | 2 +- | ||
| 11 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/include/bit7z/bitwindows.hpp b/include/bit7z/bitwindows.hpp | ||
| 14 | index 5849b956..2f29a989 100644 | ||
| 15 | --- a/include/bit7z/bitwindows.hpp | ||
| 16 | +++ b/include/bit7z/bitwindows.hpp | ||
| 17 | @@ -126,7 +126,11 @@ struct PROPVARIANT { | ||
| 18 | WORD wReserved2; | ||
| 19 | WORD wReserved3; | ||
| 20 | union { | ||
| 21 | +#if defined( __arm__ ) || defined( __aarch64__ ) | ||
| 22 | + signed char cVal; | ||
| 23 | +#else | ||
| 24 | char cVal; | ||
| 25 | +#endif | ||
| 26 | unsigned char bVal; | ||
| 27 | short iVal; | ||
| 28 | unsigned short uiVal; | ||
| 29 | diff --git a/src/bitpropvariant.cpp b/src/bitpropvariant.cpp | ||
| 30 | index 1e7f094f..642e1268 100644 | ||
| 31 | --- a/src/bitpropvariant.cpp | ||
| 32 | +++ b/src/bitpropvariant.cpp | ||
| 33 | @@ -157,7 +157,7 @@ BitPropVariant::BitPropVariant( uint64_t value ) noexcept: PROPVARIANT() { | ||
| 34 | BitPropVariant::BitPropVariant( int8_t value ) noexcept: PROPVARIANT() { | ||
| 35 | vt = VT_I1; | ||
| 36 | wReserved1 = 0; | ||
| 37 | - cVal = static_cast< char >( value ); | ||
| 38 | + cVal = static_cast< decltype(cVal) >( value ); | ||
| 39 | } | ||
| 40 | |||
| 41 | BitPropVariant::BitPropVariant( int16_t value ) noexcept: PROPVARIANT() { | ||
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-reinterpret-cast-compiler-errors.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-reinterpret-cast-compiler-errors.patch deleted file mode 100644 index 08b64f4999..0000000000 --- a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-reinterpret-cast-compiler-errors.patch +++ /dev/null | |||
| @@ -1,52 +0,0 @@ | |||
| 1 | From bedeec4d57d29be7de91697277ace00ba87d3e75 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Marko <peter.marko@siemens.com> | ||
| 3 | Date: Tue, 1 Apr 2025 15:23:51 +0200 | ||
| 4 | Subject: [PATCH] Fix reinterpret-cast compiler errors | ||
| 5 | |||
| 6 | Building on 32-bit arm, following warning/error occurs: | ||
| 7 | |||
| 8 | src/internal/windows.cpp: In function 'bit7z::OLECHAR* AllocStringBuffer(LPCSTR, uint32_t)': | ||
| 9 | src/internal/windows.cpp:79:6: error: cast from 'unsigned char*' to 'bstr_prefix_t*' {aka 'unsigned int*'} increases required alignment of target type [-Werror=cast-align] | ||
| 10 | 79 | *reinterpret_cast< bstr_prefix_t* >( bstrBuffer ) = byteLength; | ||
| 11 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 12 | git/src/internal/windows.cpp:83:19: error: cast from 'unsigned char*' to 'bit7z::BSTR' {aka 'wchar_t*'} increases required alignment of target type [-Werror=cast-align] | ||
| 13 | 83 | BSTR result = reinterpret_cast< BSTR >( bstrBuffer + sizeof( bstr_prefix_t ) ); | ||
| 14 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 15 | cc1plus: all warnings being treated as errors | ||
| 16 | |||
| 17 | Fix it by using the desired variable size right away and thus avoid | ||
| 18 | casting to an array with different alignment. | ||
| 19 | |||
| 20 | Upstream-Status: Backport [https://github.com/rikyoz/bit7z/commit/b2789ea9b0fbb2a74dbf6764ddb72d60659a3bce] | ||
| 21 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 22 | --- | ||
| 23 | src/internal/windows.cpp | 7 +++---- | ||
| 24 | 1 file changed, 3 insertions(+), 4 deletions(-) | ||
| 25 | |||
| 26 | diff --git a/src/internal/windows.cpp b/src/internal/windows.cpp | ||
| 27 | index 9304aed7..7bee5959 100644 | ||
| 28 | --- a/src/internal/windows.cpp | ||
| 29 | +++ b/src/internal/windows.cpp | ||
| 30 | @@ -68,19 +68,18 @@ auto AllocStringBuffer( LPCSTR str, uint32_t byteLength ) -> BSTR { | ||
| 31 | |||
| 32 | // Allocating memory for storing the BSTR as a byte array. | ||
| 33 | // NOLINTNEXTLINE(cppcoreguidelines-no-malloc, cppcoreguidelines-owning-memory) | ||
| 34 | - auto* bstrBuffer = static_cast< byte_t* >( std::calloc( bufferSize, sizeof( byte_t ) ) ); | ||
| 35 | + auto* bstrBuffer = static_cast< bstr_prefix_t* >( std::calloc( bufferSize, sizeof( byte_t ) ) ); | ||
| 36 | |||
| 37 | if ( bstrBuffer == nullptr ) { // Failed to allocate memory for the BSTR buffer. | ||
| 38 | return nullptr; | ||
| 39 | } | ||
| 40 | |||
| 41 | // Storing the number of bytes of the BSTR as a prefix of it. | ||
| 42 | - // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) | ||
| 43 | - *reinterpret_cast< bstr_prefix_t* >( bstrBuffer ) = byteLength; | ||
| 44 | + *bstrBuffer = byteLength; | ||
| 45 | |||
| 46 | // The actual BSTR must point after the byteLength prefix. | ||
| 47 | // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic, cppcoreguidelines-pro-type-reinterpret-cast) | ||
| 48 | - BSTR result = reinterpret_cast< BSTR >( bstrBuffer + sizeof( bstr_prefix_t ) ); | ||
| 49 | + BSTR result = reinterpret_cast< BSTR >( bstrBuffer + 1 ); | ||
| 50 | if ( str != nullptr ) { | ||
| 51 | // Copying byte-by-byte the input string to the BSTR. | ||
| 52 | // Note: flawfinder warns about not checking for buffer overflows; this is a false alarm, | ||
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-tests-with-musl.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-tests-with-musl.patch deleted file mode 100644 index b1f3d0f2ec..0000000000 --- a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-tests-with-musl.patch +++ /dev/null | |||
| @@ -1,51 +0,0 @@ | |||
| 1 | From bc5f2e5af90854c8f84b5829493dd01facf9af84 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Marko <peter.marko@siemens.com> | ||
| 3 | Date: Mon, 7 Apr 2025 16:29:32 +0200 | ||
| 4 | Subject: [PATCH] Fix tests with musl | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/rikyoz/bit7z/pull/292] | ||
| 7 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 8 | --- | ||
| 9 | tests/src/test_bitexception.cpp | 8 ++++++++ | ||
| 10 | 1 file changed, 8 insertions(+) | ||
| 11 | |||
| 12 | diff --git a/tests/src/test_bitexception.cpp b/tests/src/test_bitexception.cpp | ||
| 13 | index 7161fcc5..d85d430d 100644 | ||
| 14 | --- a/tests/src/test_bitexception.cpp | ||
| 15 | +++ b/tests/src/test_bitexception.cpp | ||
| 16 | @@ -49,6 +49,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays) | ||
| 17 | { HRESULT_WIN32_TEST( ERROR_OPEN_FAILED ), | ||
| 18 | #ifdef _WIN32 | ||
| 19 | "The system cannot open the device or file specified.", | ||
| 20 | +#elif defined( __linux__ ) && !defined ( __GLIBC__ ) | ||
| 21 | + "I/O error", | ||
| 22 | #else | ||
| 23 | "Input/output error", | ||
| 24 | #endif | ||
| 25 | @@ -67,6 +69,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays) | ||
| 26 | { HRESULT_WIN32_TEST( ERROR_SEEK ), | ||
| 27 | #ifdef _WIN32 | ||
| 28 | "The drive cannot locate a specific area or track on the disk.", | ||
| 29 | +#elif defined( __linux__ ) && !defined ( __GLIBC__ ) | ||
| 30 | + "I/O error", | ||
| 31 | #else | ||
| 32 | "Input/output error", | ||
| 33 | #endif | ||
| 34 | @@ -74,6 +78,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays) | ||
| 35 | { HRESULT_WIN32_TEST( ERROR_READ_FAULT ), | ||
| 36 | #ifdef _WIN32 | ||
| 37 | "The system cannot read from the specified device.", | ||
| 38 | +#elif defined( __linux__ ) && !defined ( __GLIBC__ ) | ||
| 39 | + "I/O error", | ||
| 40 | #else | ||
| 41 | "Input/output error", | ||
| 42 | #endif | ||
| 43 | @@ -81,6 +87,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays) | ||
| 44 | { HRESULT_WIN32_TEST( ERROR_WRITE_FAULT ), | ||
| 45 | #ifdef _WIN32 | ||
| 46 | "The system cannot write to the specified device.", | ||
| 47 | +#elif defined( __linux__ ) && !defined ( __GLIBC__ ) | ||
| 48 | + "I/O error", | ||
| 49 | #else | ||
| 50 | "Input/output error", | ||
| 51 | #endif | ||
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-filesystem-gitclone.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-filesystem-gitclone.patch new file mode 100644 index 0000000000..917b70f58e --- /dev/null +++ b/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-filesystem-gitclone.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | Subject: [PATCH] cmake: disable filesystem gitclone | ||
| 2 | |||
| 3 | In Yocto we don't download filesystem, it is satisfied from source dir. | ||
| 4 | This Dependencies.cmake file would try to download filesystem even if it is satisfied. | ||
| 5 | |||
| 6 | Fix error log as following: | ||
| 7 | | fatal: unable to access 'https://github.com/rikyoz/filesystem.git/': Could not resolve host: github.com | ||
| 8 | | Had to git clone more than once: 3 times. | ||
| 9 | | CMake Error at bit7z/4.0.11/build/_deps/ghc_filesystem-subbuild/ghc_filesystem-populate-prefix/tmp/ghc_filesystem-populate-gitclone.cmake:50 (message): | ||
| 10 | | Failed to clone repository: 'https://github.com/rikyoz/filesystem.git' | ||
| 11 | |||
| 12 | Upstream-Status: Inappropriate [OE-specific] | ||
| 13 | |||
| 14 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 15 | --- | ||
| 16 | cmake/Dependencies.cmake | 3 +-- | ||
| 17 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake | ||
| 20 | index 110d9c2b..dc1dead8 100644 | ||
| 21 | --- a/cmake/Dependencies.cmake | ||
| 22 | +++ b/cmake/Dependencies.cmake | ||
| 23 | @@ -39,10 +39,9 @@ if( NOT USE_STANDARD_FILESYSTEM OR NOT STANDARD_FILESYSTEM_COMPILES OR BIT7Z_BUI | ||
| 24 | CPMAddPackage( NAME ghc_filesystem | ||
| 25 | GITHUB_REPOSITORY rikyoz/filesystem | ||
| 26 | GIT_TAG b99c2aebd5ddd6fb2f190731ba80b949fc3842b5 | ||
| 27 | - DOWNLOAD_ONLY YES ) | ||
| 28 | + SOURCE_DIR "${CPM_SOURCE_CACHE}/ghc_filesystem" ) | ||
| 29 | if( ghc_filesystem_ADDED ) | ||
| 30 | message( STATUS "ghc::filesystem source code available at ${ghc_filesystem_SOURCE_DIR}" ) | ||
| 31 | - add_library( ghc_filesystem INTERFACE IMPORTED ) | ||
| 32 | target_include_directories( ghc_filesystem SYSTEM INTERFACE ${ghc_filesystem_SOURCE_DIR}/include ) | ||
| 33 | endif() | ||
| 34 | endif() | ||
| 35 | -- | ||
| 36 | 2.43.0 | ||
| 37 | |||
diff --git a/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb b/meta-oe/recipes-extended/7zip/bit7z_4.0.11.bb index 033461d614..fa4f910e05 100644 --- a/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb +++ b/meta-oe/recipes-extended/7zip/bit7z_4.0.11.bb | |||
| @@ -4,32 +4,27 @@ LICENSE = "MPL-2.0" | |||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=48a3fe23ed1353e0995dadfda05ffdb6" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=48a3fe23ed1353e0995dadfda05ffdb6" |
| 5 | 5 | ||
| 6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
| 7 | git://github.com/rikyoz/bit7z.git;protocol=https;branch=master \ | 7 | git://github.com/rikyoz/bit7z.git;protocol=https;branch=master;tag=v${PV} \ |
| 8 | ${@bb.utils.contains('PTEST_ENABLED', '1', d.getVar('SRC_URI_PTEST'), 'file://0001-cmake-disable-dependency-inclusion.patch', d)} \ | 8 | ${@bb.utils.contains('PTEST_ENABLED', '1', d.getVar('SRC_URI_PTEST'), 'file://0001-cmake-disable-dependency-inclusion.patch', d)} \ |
| 9 | file://0001-Fix-reinterpret-cast-compiler-errors.patch \ | ||
| 10 | file://0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch \ | ||
| 11 | file://0001-Allow-running-tests-on-target-when-cross-compiling.patch \ | ||
| 12 | file://0001-Allow-specifying-path-to-7z-library-in-tests.patch \ | ||
| 13 | file://0001-Fix-tests-with-musl.patch \ | ||
| 14 | " | 9 | " |
| 15 | 10 | ||
| 16 | SRCREV = "386e00ad3286e7a10e5bb6d05a5b41b523fce623" | 11 | SRCREV = "82f359371fda5c16c037ac0659b969334816a9c4" |
| 17 | 12 | ||
| 18 | # ptest dependencies and their revisions | 13 | # ptest dependencies and their revisions |
| 19 | SRC_URI_PTEST = " \ | 14 | SRC_URI_PTEST = " \ |
| 20 | git://github.com/rikyoz/filesystem.git;protocol=https;branch=glibcxx_wchar_streams_workaround;name=filesystem;destsuffix=filesystem \ | 15 | git://github.com/rikyoz/filesystem.git;protocol=https;branch=glibcxx_wchar_streams_workaround;name=filesystem;destsuffix=filesystem \ |
| 21 | git://github.com/rikyoz/bit7z-test-data.git;protocol=https;branch=main;name=testdata;destsuffix=testdata \ | 16 | git://github.com/rikyoz/bit7z-test-data.git;protocol=https;branch=main;name=testdata;destsuffix=testdata \ |
| 22 | git://github.com/catchorg/Catch2.git;protocol=https;branch=v2.x;name=catch2;destsuffix=catch2;tag=${TAG_catch2} \ | 17 | git://github.com/rikyoz/Catch2.git;protocol=https;branch=single-header-v2.x;name=catch2;destsuffix=catch2 \ |
| 23 | https://github.com/cpm-cmake/CPM.cmake/releases/download/v${TAG_CPM}/CPM.cmake;downloadfilename=CPM_${TAG_CPM}.cmake \ | 18 | https://github.com/cpm-cmake/CPM.cmake/releases/download/v${TAG_CPM}/CPM.cmake;downloadfilename=CPM_${TAG_CPM}.cmake \ |
| 24 | file://run-ptest \ | 19 | file://run-ptest \ |
| 20 | file://0001-cmake-disable-filesystem-gitclone.patch \ | ||
| 25 | " | 21 | " |
| 26 | SRCREV_FORMAT = "${@bb.utils.contains('PTEST_ENABLED', '1', 'default_filesystem_testdata_catch2', 'default', d)}" | 22 | SRCREV_FORMAT = "${@bb.utils.contains('PTEST_ENABLED', '1', 'default_filesystem_testdata_catch2', 'default', d)}" |
| 27 | SRCREV_filesystem = "983650f374699e3979f9cdefe13ddff60bd4ac68" | 23 | SRCREV_filesystem = "b99c2aebd5ddd6fb2f190731ba80b949fc3842b5" |
| 28 | SRCREV_testdata = "077e407b1c07b7443626b5902eeb4819388bf656" | 24 | SRCREV_testdata = "077e407b1c07b7443626b5902eeb4819388bf656" |
| 29 | SRCREV_catch2 = "182c910b4b63ff587a3440e08f84f70497e49a81" | 25 | SRCREV_catch2 = "27d8db1770dd5cd3688656095f242474431584a1" |
| 30 | TAG_catch2 = "v2.13.10" | 26 | SRCHASH_CPM = "2020b4fc42dba44817983e06342e682ecfc3d2f484a581f11cc5731fbe4dce8a" |
| 31 | SRCHASH_CPM = "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d" | 27 | TAG_CPM = "0.42.0" |
| 32 | TAG_CPM = "0.40.2" | ||
| 33 | SRC_URI[sha256sum] = "${SRCHASH_CPM}" | 28 | SRC_URI[sha256sum] = "${SRCHASH_CPM}" |
| 34 | 29 | ||
| 35 | 30 | ||
| @@ -51,15 +46,14 @@ do_configure:prepend() { | |||
| 51 | # verify that all dependencies have correct version | 46 | # verify that all dependencies have correct version |
| 52 | grep -q ${SRCREV_filesystem} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_filesystem'!" | 47 | grep -q ${SRCREV_filesystem} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_filesystem'!" |
| 53 | grep -q ${SRCREV_testdata} ${S}/tests/CMakeLists.txt || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_testdata'!" | 48 | grep -q ${SRCREV_testdata} ${S}/tests/CMakeLists.txt || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_testdata'!" |
| 54 | grep -q ${TAG_catch2} ${S}/tests/cmake/Catch2.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_catch2'!" | 49 | grep -q ${SRCREV_catch2} ${S}/tests/CMakeLists.txt || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_catch2'!" |
| 55 | grep -q ${SRCHASH_CPM} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCHASH_CPM'!" | 50 | grep -q ${SRCHASH_CPM} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCHASH_CPM'!" |
| 56 | 51 | ||
| 57 | if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then | 52 | if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then |
| 58 | # use cache instead of download for CPM (CMake's missing package manager) | 53 | # use cache instead of download for CPM (CMake's missing package manager) |
| 59 | mkdir -p ${B}/cmake | 54 | mkdir -p ${B}/cpm_cache/cpm/ |
| 60 | cp ${UNPACKDIR}/CPM_${TAG_CPM}.cmake ${B}/cmake | 55 | cp ${UNPACKDIR}/CPM_${TAG_CPM}.cmake ${B}/cpm_cache/cpm/ |
| 61 | mkdir -p ${B}/cpm_cache/ghc_filesystem | 56 | cp -r ${UNPACKDIR}/filesystem ${B}/cpm_cache/ghc_filesystem |
| 62 | cp -r ${UNPACKDIR}/filesystem ${B}/cpm_cache/ghc_filesystem/fbcc9a9e94e6365273cf51294173f21ff5efdb4f | ||
| 63 | # avoid buildpaths issue as unpackdir is not in prefix maps | 57 | # avoid buildpaths issue as unpackdir is not in prefix maps |
| 64 | cp -r ${UNPACKDIR}/catch2 ${B} | 58 | cp -r ${UNPACKDIR}/catch2 ${B} |
| 65 | fi | 59 | fi |
diff --git a/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb b/meta-oe/recipes-extended/brotli/brotli_1.2.0.bb index 411f8a7610..84495a3236 100644 --- a/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb +++ b/meta-oe/recipes-extended/brotli/brotli_1.2.0.bb | |||
| @@ -7,7 +7,7 @@ LICENSE = "MIT" | |||
| 7 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b" | 7 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/google/brotli.git;branch=master;protocol=https" | 9 | SRC_URI = "git://github.com/google/brotli.git;branch=master;protocol=https" |
| 10 | SRCREV = "ed738e842d2fbdf2d6459e39267a633c4a9b2f5d" | 10 | SRCREV = "028fb5a23661f123017c060daa546b55cf4bde29" |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | inherit cmake lib_package | 13 | inherit cmake lib_package |
diff --git a/meta-oe/recipes-extended/byacc/byacc_20241231.bb b/meta-oe/recipes-extended/byacc/byacc_20260126.bb index 8d74dbb83e..cf58f4025c 100644 --- a/meta-oe/recipes-extended/byacc/byacc_20241231.bb +++ b/meta-oe/recipes-extended/byacc/byacc_20260126.bb | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | # Setting to PD as this is what the upstream has it as. | 4 | # Setting to PD as this is what the upstream has it as. |
| 5 | 5 | ||
| 6 | LICENSE = "PD" | 6 | LICENSE = "PD" |
| 7 | LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=6a728308869d7a7901618a5bcb970f7e" | 7 | LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=0eedc51db8ab59ff33e74b4e8138035c" |
| 8 | require byacc.inc | 8 | require byacc.inc |
| 9 | 9 | ||
| 10 | SRC_URI[sha256sum] = "192c2fae048d4e7f514ba451627f9c4e612765099f819c19191f9fde3e609673" | 10 | SRC_URI[sha256sum] = "b618c5fb44c2f5f048843db90f7d1b24f78f47b07913c8c7ba8c942d3eb24b00" |
diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.14.bb index a81ed30f72..7f095f36fc 100644 --- a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb +++ b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.14.bb | |||
| @@ -11,18 +11,18 @@ HOMEPAGE = "https://canopenterm.de" | |||
| 11 | BUGTRACKER = "https://github.com/CANopenTerm/CANopenTerm/issues" | 11 | BUGTRACKER = "https://github.com/CANopenTerm/CANopenTerm/issues" |
| 12 | 12 | ||
| 13 | LICENSE = "MIT" | 13 | LICENSE = "MIT" |
| 14 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5f8a62fabd50ce3f1d7794bc849ae7a5" | 14 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=bd2edc721b4a0289efe949bdbe7dda79" |
| 15 | 15 | ||
| 16 | DEPENDS = "cjson libinih libsdl3 lua libsocketcan pocketpy" | 16 | DEPENDS = "cjson libinih libsdl3 lua libsocketcan pocketpy alsa-lib" |
| 17 | 17 | ||
| 18 | SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main" | 18 | SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main;tag=v${PV}" |
| 19 | 19 | ||
| 20 | SRCREV = "b0555360e5e8b444a2a9e14088fd253412184eb8" | 20 | SRCREV = "012e48af26b483ead9df1004cfc92e6908b66b24" |
| 21 | 21 | ||
| 22 | inherit cmake pkgconfig ptest | ||
| 22 | 23 | ||
| 23 | inherit cmake ptest | 24 | # Does not compile with clang yes |
| 24 | 25 | TOOLCHAIN = "gcc" | |
| 25 | EXTRA_OECMAKE += "-DBUILD_YOCTO=ON" | ||
| 26 | 26 | ||
| 27 | FILES:${PN} += "${bindir}/CANopenTerm ${bindir}/codb2json ${datadir}" | 27 | FILES:${PN} += "${bindir}/CANopenTerm ${bindir}/codb2json ${datadir}" |
| 28 | 28 | ||
diff --git a/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch b/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch deleted file mode 100644 index 78f36bde45..0000000000 --- a/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch +++ /dev/null | |||
| @@ -1,89 +0,0 @@ | |||
| 1 | From a08acdfadb5eba2a3201209c6da3ad6f2ca4ae79 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Craig Comstock <craig.comstock@northern.tech> | ||
| 3 | Date: Fri, 27 Jan 2023 15:19:48 -0600 | ||
| 4 | Subject: [PATCH] Fixed --with-libxml2=no case in configure.ac | ||
| 5 | |||
| 6 | The CF3_WITH_LIBRARY and AC_CHECK_HEADERS were moved to outside of the check for with-libxml2=no | ||
| 7 | |||
| 8 | Ticket: CFE-4023 | ||
| 9 | Changelog: title | ||
| 10 | --- | ||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | configure.ac | 21 +++++++++++---------- | ||
| 14 | libntech/configure.ac | 21 +++++++++++---------- | ||
| 15 | 2 files changed, 22 insertions(+), 20 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/configure.ac b/configure.ac | ||
| 18 | index e189b10..f6b8226 100644 | ||
| 19 | --- a/configure.ac | ||
| 20 | +++ b/configure.ac | ||
| 21 | @@ -659,19 +659,20 @@ if test "x$with_libxml2" != "xno"; then | ||
| 22 | LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2 | ||
| 23 | fi | ||
| 24 | fi | ||
| 25 | -fi | ||
| 26 | |||
| 27 | -CF3_WITH_LIBRARY(libxml2, | ||
| 28 | - [AC_CHECK_LIB(xml2, xmlFirstElementChild, | ||
| 29 | - [], | ||
| 30 | - [if test "x$with_libxml2" != xcheck; then | ||
| 31 | - AC_MSG_ERROR(Cannot find libxml2); fi] | ||
| 32 | - ) | ||
| 33 | - AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], | ||
| 34 | + CF3_WITH_LIBRARY(libxml2, | ||
| 35 | + [AC_CHECK_LIB(xml2, xmlFirstElementChild, | ||
| 36 | + [], | ||
| 37 | [if test "x$with_libxml2" != xcheck; then | ||
| 38 | AC_MSG_ERROR(Cannot find libxml2); fi] | ||
| 39 | - )] | ||
| 40 | -) | ||
| 41 | + ) | ||
| 42 | + AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], | ||
| 43 | + [if test "x$with_libxml2" != xcheck; then | ||
| 44 | + AC_MSG_ERROR(Cannot find libxml2); fi] | ||
| 45 | + )] | ||
| 46 | + ) | ||
| 47 | + | ||
| 48 | +fi | ||
| 49 | |||
| 50 | AM_CONDITIONAL([HAVE_LIBXML2], | ||
| 51 | [test "x$with_libxml2" != xno && | ||
| 52 | diff --git a/libntech/configure.ac b/libntech/configure.ac | ||
| 53 | index 7bb8787..28b3683 100644 | ||
| 54 | --- a/libntech/configure.ac | ||
| 55 | +++ b/libntech/configure.ac | ||
| 56 | @@ -571,19 +571,20 @@ if test "x$with_libxml2" != "xno"; then | ||
| 57 | LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2 | ||
| 58 | fi | ||
| 59 | fi | ||
| 60 | -fi | ||
| 61 | |||
| 62 | -CF3_WITH_LIBRARY(libxml2, | ||
| 63 | - [AC_CHECK_LIB(xml2, xmlFirstElementChild, | ||
| 64 | - [], | ||
| 65 | - [if test "x$with_libxml2" != xcheck; then | ||
| 66 | - AC_MSG_ERROR(Cannot find libxml2); fi] | ||
| 67 | - ) | ||
| 68 | - AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], | ||
| 69 | + CF3_WITH_LIBRARY(libxml2, | ||
| 70 | + [AC_CHECK_LIB(xml2, xmlFirstElementChild, | ||
| 71 | + [], | ||
| 72 | [if test "x$with_libxml2" != xcheck; then | ||
| 73 | AC_MSG_ERROR(Cannot find libxml2); fi] | ||
| 74 | - )] | ||
| 75 | -) | ||
| 76 | + ) | ||
| 77 | + AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], | ||
| 78 | + [if test "x$with_libxml2" != xcheck; then | ||
| 79 | + AC_MSG_ERROR(Cannot find libxml2); fi] | ||
| 80 | + )] | ||
| 81 | + ) | ||
| 82 | + | ||
| 83 | +fi | ||
| 84 | |||
| 85 | AM_CONDITIONAL([HAVE_LIBXML2], | ||
| 86 | [test "x$with_libxml2" != xno && | ||
| 87 | -- | ||
| 88 | 2.39.1 | ||
| 89 | |||
diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.26.0.bb index de20f585b0..28ea16ea6f 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.26.0.bb | |||
| @@ -10,51 +10,47 @@ its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit." | |||
| 10 | 10 | ||
| 11 | HOMEPAGE = "http://cfengine.com" | 11 | HOMEPAGE = "http://cfengine.com" |
| 12 | 12 | ||
| 13 | SKIP_RECIPE[cfengine] ?= "Needs porting to openssl 3.x" | ||
| 14 | |||
| 15 | LICENSE = "GPL-3.0-only" | 13 | LICENSE = "GPL-3.0-only" |
| 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f" | 14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eef43e6a0b5a8f46ef7f11e1e4b32a6c" |
| 17 | 15 | ||
| 18 | DEPENDS += "attr tokyocabinet bison-native libxml2" | 16 | DEPENDS += "attr tokyocabinet bison-native openssl libpcre2 librsync" |
| 19 | #RDEPENDS:cfengine += "attr tokyocabinet bison-native libxml2" | ||
| 20 | 17 | ||
| 21 | SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BPN}-community-${PV}.tar.gz \ | 18 | SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BPN}-community-${PV}.tar.gz \ |
| 22 | file://0001-Fixed-with-libxml2-no-case-in-configure.ac.patch \ | ||
| 23 | file://set-path-of-default-config-file.patch \ | 19 | file://set-path-of-default-config-file.patch \ |
| 24 | " | 20 | " |
| 25 | SRC_URI[sha256sum] = "911778ddb0a4e03a3ddfc8fc0f033136e1551849ea2dcbdb3f0f14359dfe3126" | 21 | SRC_URI[sha256sum] = "d3c3884b314dae48a6884e919d0a12acac5aea95d970544e4632a1773857d19b" |
| 26 | 22 | ||
| 27 | inherit autotools-brokensep systemd | 23 | inherit autotools-brokensep systemd |
| 28 | 24 | ||
| 29 | export EXPLICIT_VERSION = "${PV}" | 25 | export EXPLICIT_VERSION = "${PV}" |
| 30 | 26 | ||
| 31 | SYSTEMD_SERVICE:${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \ | 27 | SYSTEMD_SERVICE:${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \ |
| 32 | cf-runalerts.service cf-execd.service \ | 28 | cf-execd.service cf-php-fpm.service \ |
| 33 | cf-monitord.service cf-serverd.service \ | 29 | cf-monitord.service cf-serverd.service \ |
| 30 | cf-reactor.service \ | ||
| 34 | " | 31 | " |
| 35 | SYSTEMD_AUTO_ENABLE:${PN} = "disable" | 32 | SYSTEMD_AUTO_ENABLE:${PN} = "disable" |
| 36 | 33 | ||
| 37 | PACKAGECONFIG ??= "libpcre openssl \ | 34 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" |
| 38 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ | 35 | |
| 39 | " | ||
| 40 | PACKAGECONFIG[libxml2] = "--with-libxml2=yes,--with-libxml2=no,libxml2," | 36 | PACKAGECONFIG[libxml2] = "--with-libxml2=yes,--with-libxml2=no,libxml2," |
| 41 | PACKAGECONFIG[mysql] = "--with-mysql=yes,--with-mysql=no,mysql," | 37 | PACKAGECONFIG[mysql] = "--with-mysql=yes,--with-mysql=no,mariadb," |
| 42 | PACKAGECONFIG[postgresql] = "--with-postgresql=yes,--with-postgresql=no,postgresql," | 38 | PACKAGECONFIG[postgresql] = "--with-postgresql=yes,--with-postgresql=no,postgresql," |
| 43 | PACKAGECONFIG[acl] = "--with-libacl=yes,--with-libacl=no,acl," | 39 | PACKAGECONFIG[acl] = "--with-libacl=yes,--with-libacl=no,acl," |
| 44 | PACKAGECONFIG[libvirt] = "--with-libvirt=yes,--with-libvirt=no,libvirt," | 40 | PACKAGECONFIG[libvirt] = "--with-libvirt=yes,--with-libvirt=no,libvirt," |
| 45 | PACKAGECONFIG[libpcre] = "--with-pcre=yes,--with-pcre=no,libpcre," | ||
| 46 | PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl," | ||
| 47 | PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam," | 41 | PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam," |
| 48 | PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml," | 42 | PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml," |
| 49 | PACKAGECONFIG[systemd] = "--with-systemd-service=${systemd_system_unitdir},--without-systemd-service" | 43 | PACKAGECONFIG[systemd] = "--with-systemd-service=${systemd_system_unitdir},--without-systemd-service" |
| 50 | PACKAGECONFIG[libcurl] = "--with-libcurl,--without-libcurl,curl," | 44 | PACKAGECONFIG[libcurl] = "--with-libcurl,--without-libcurl,curl," |
| 51 | 45 | ||
| 52 | EXTRA_OECONF = "hw_cv_func_va_copy=yes --with-init-script=${sysconfdir}/init.d --with-tokyocabinet" | 46 | EXTRA_OECONF = "hw_cv_func_va_copy=yes --with-init-script=${sysconfdir}/init.d --with-tokyocabinet" |
| 47 | CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'mysql', '-I${STAGING_INCDIR}/mysql', '', d)}" | ||
| 48 | CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'libxml2', '-I${STAGING_INCDIR}/libxml2', '', d)}" | ||
| 53 | 49 | ||
| 54 | do_install:append() { | 50 | do_install:append() { |
| 55 | install -d ${D}${localstatedir}/${BPN}/bin | 51 | install -d ${D}${localstatedir}/${BPN}/bin |
| 56 | for f in `ls ${D}${bindir}`; do | 52 | for f in $(find ${D}${bindir} -type f); do |
| 57 | ln -s ${bindir}/`basename $f` ${D}${localstatedir}/${BPN}/bin/ | 53 | ln -sr $f ${D}${localstatedir}/${BPN}/bin/ |
| 58 | done | 54 | done |
| 59 | 55 | ||
| 60 | install -d ${D}${sysconfdir}/default | 56 | install -d ${D}${sysconfdir}/default |
| @@ -73,3 +69,5 @@ EOF | |||
| 73 | } | 69 | } |
| 74 | 70 | ||
| 75 | RDEPENDS:${PN} += "${BPN}-masterfiles" | 71 | RDEPENDS:${PN} += "${BPN}-masterfiles" |
| 72 | |||
| 73 | FILES:${PN} += "${libdir}/python" | ||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch deleted file mode 100644 index 335872c40f..0000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From bc03f142507da92add8ba325fdf8187d47a7d719 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Fri, 13 Dec 2024 16:37:24 +0800 | ||
| 4 | Subject: [PATCH] CMakeLists.txt: make DLT_WatchdogSec can be set by user | ||
| 5 | |||
| 6 | In my test env, WatchdogSec default value 2 is not enough, manually | ||
| 7 | changed to 3 is ok. This makes dlt.service/dlt-system.service start | ||
| 8 | failed during boot time. So, make DLT_WatchdogSec can be set by user, so | ||
| 9 | user can set them to proper value at build time, then service can start | ||
| 10 | successfully in boot time. | ||
| 11 | |||
| 12 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 13 | |||
| 14 | Upstream-Status: Backport [https://github.com/COVESA/dlt-daemon/pull/720/commits/bc03f142507da92add8ba325fdf8187d47a7d719] | ||
| 15 | |||
| 16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 17 | --- | ||
| 18 | systemd/CMakeLists.txt | 8 ++++++-- | ||
| 19 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt | ||
| 22 | index 16cbe86b5..659378d16 100644 | ||
| 23 | --- a/systemd/CMakeLists.txt | ||
| 24 | +++ b/systemd/CMakeLists.txt | ||
| 25 | @@ -18,10 +18,14 @@ if(WITH_SYSTEMD) | ||
| 26 | set(SYSTEMD_CONFIGURATIONS_FILES_DIR ${SYSTEMD_UNITDIR} ) | ||
| 27 | |||
| 28 | if(WITH_SYSTEMD_WATCHDOG) | ||
| 29 | - set( DLT_WatchdogSec 2 ) | ||
| 30 | + if(NOT DEFINED DLT_WatchdogSec) | ||
| 31 | + set(DLT_WatchdogSec 2 CACHE STRING "Watchdog timeout in seconds") | ||
| 32 | + endif() | ||
| 33 | message( STATUS "The systemd watchdog is enabled - timeout is set to ${DLT_WatchdogSec} seconds") | ||
| 34 | else(WITH_SYSTEMD_WATCHDOG) | ||
| 35 | - set( DLT_WatchdogSec 0 ) | ||
| 36 | + if(NOT DEFINED DLT_WatchdogSec) | ||
| 37 | + set(DLT_WatchdogSec 0 CACHE STRING "Watchdog timeout in seconds") | ||
| 38 | + endif() | ||
| 39 | message( STATUS "The systemd watchdog is disabled") | ||
| 40 | endif(WITH_SYSTEMD_WATCHDOG) | ||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-failure-with-glibc-2.43.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-failure-with-glibc-2.43.patch new file mode 100644 index 0000000000..d37489e4b7 --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-failure-with-glibc-2.43.patch | |||
| @@ -0,0 +1,55 @@ | |||
| 1 | From c833520ac8cb473a6d820a063adb10c49304c4a8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Wed, 18 Mar 2026 13:42:04 +0800 | ||
| 4 | Subject: [PATCH] Fix build failure with glibc 2.43 | ||
| 5 | |||
| 6 | src/shared/dlt_common.c:6477:17: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] | ||
| 7 | | 6477 | char *dot = strrchr(filename, '.'); | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/828] | ||
| 10 | |||
| 11 | [1] https://github.com/bminor/glibc/commit/cd748a63ab1a7ae846175c532a3daab341c62690 | ||
| 12 | |||
| 13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 14 | --- | ||
| 15 | include/dlt/dlt_common.h | 2 +- | ||
| 16 | src/shared/dlt_common.c | 4 ++-- | ||
| 17 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h | ||
| 20 | index 85cf5b7..30d3ca7 100644 | ||
| 21 | --- a/include/dlt/dlt_common.h | ||
| 22 | +++ b/include/dlt/dlt_common.h | ||
| 23 | @@ -2308,7 +2308,7 @@ int dlt_execute_command(char *filename, char *command, ...); | ||
| 24 | * @param filename Only file names without prepended path allowed. | ||
| 25 | * @return pointer to extension | ||
| 26 | */ | ||
| 27 | -char *get_filename_ext(const char *filename); | ||
| 28 | +const char *get_filename_ext(const char *filename); | ||
| 29 | |||
| 30 | /** | ||
| 31 | * Extract the base name of given file name (without the extension). | ||
| 32 | diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c | ||
| 33 | index aa0aaaa..4c379af 100644 | ||
| 34 | --- a/src/shared/dlt_common.c | ||
| 35 | +++ b/src/shared/dlt_common.c | ||
| 36 | @@ -6467,14 +6467,14 @@ int dlt_execute_command(char *filename, char *command, ...) | ||
| 37 | return ret; | ||
| 38 | } | ||
| 39 | |||
| 40 | -char *get_filename_ext(const char *filename) | ||
| 41 | +const char *get_filename_ext(const char *filename) | ||
| 42 | { | ||
| 43 | if (filename == NULL) { | ||
| 44 | fprintf(stderr, "ERROR: %s: invalid arguments\n", __func__); | ||
| 45 | return ""; | ||
| 46 | } | ||
| 47 | |||
| 48 | - char *dot = strrchr(filename, '.'); | ||
| 49 | + const char *dot = strrchr(filename, '.'); | ||
| 50 | return (!dot || dot == filename) ? NULL : dot; | ||
| 51 | } | ||
| 52 | |||
| 53 | -- | ||
| 54 | 2.34.1 | ||
| 55 | |||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-failures.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-failures.patch new file mode 100644 index 0000000000..6cfa3a5482 --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-failures.patch | |||
| @@ -0,0 +1,360 @@ | |||
| 1 | From 4813b72cfe82062db41dd1d8cfa7069634d78d9e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Mon, 16 Mar 2026 13:28:40 +0800 | ||
| 4 | Subject: [PATCH] Fix build failures | ||
| 5 | |||
| 6 | Fix the following similar build failures, some of the build failure | ||
| 7 | reproduced with arm64/riscv64, some of the build reproduced with 32bit | ||
| 8 | x86/arm. | ||
| 9 | |||
| 10 | dlt_daemon_common.c:2785:26: error: conversion to 'int8_t' {aka 'signed char'} from 'char' may change the sign of the result [-Werror=sign-conversion] | ||
| 11 | |||
| 12 | src/tests/dlt-test-multi-process-client-v2.c:302:49: error: format '%lld' expects argument of type 'long long int', but argument 2 has type 'time_t' {aka 'long int'} [-Werror=format=] | ||
| 13 | 302 | printf(" Time running (seconds) : %lld\n", time(NULL) - stats.first_message_time); | ||
| 14 | | ~~~^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 15 | | | | | ||
| 16 | | long long int time_t {aka long int} | ||
| 17 | | %ld | ||
| 18 | |||
| 19 | src/lib/dlt_user.c:5109:60: error: format '%lld' expects argument of type 'long long int', but argument 4 has type '__off_t' {aka 'long int'} [-Werror=format=] | ||
| 20 | 5109 | dlt_vlog(LOG_DEBUG, "%s: Current file size=[%lld]\n", __func__, | ||
| 21 | | ~~~^ | ||
| 22 | | | | ||
| 23 | | long long int | ||
| 24 | | %ld | ||
| 25 | 5110 | st.st_size); | ||
| 26 | | ~~~~~~~~~~ | ||
| 27 | | | | ||
| 28 | | __off_t {aka long int} | ||
| 29 | |||
| 30 | Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/827] | ||
| 31 | |||
| 32 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 33 | --- | ||
| 34 | src/daemon/dlt-daemon.c | 8 ++--- | ||
| 35 | src/daemon/dlt_daemon_client.c | 32 ++++++++++---------- | ||
| 36 | src/daemon/dlt_daemon_common.c | 4 +-- | ||
| 37 | src/lib/dlt_user.c | 18 +++++------ | ||
| 38 | src/shared/dlt_common.c | 2 +- | ||
| 39 | src/shared/dlt_multiple_files.c | 2 +- | ||
| 40 | src/tests/dlt-test-multi-process-client-v2.c | 8 ++--- | ||
| 41 | src/tests/dlt-test-multi-process-v2.c | 2 +- | ||
| 42 | src/tests/dlt-test-multi-process.c | 2 +- | ||
| 43 | 9 files changed, 39 insertions(+), 39 deletions(-) | ||
| 44 | |||
| 45 | diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c | ||
| 46 | index 523bf33..2ae5bc9 100644 | ||
| 47 | --- a/src/daemon/dlt-daemon.c | ||
| 48 | +++ b/src/daemon/dlt-daemon.c | ||
| 49 | @@ -457,7 +457,7 @@ int option_file_parser(DltDaemonLocal *daemon_local) | ||
| 50 | |||
| 51 | if (n < 0 || (size_t)n > sizeof(daemon_local->flags.loggingFilename)) { | ||
| 52 | dlt_vlog(LOG_WARNING, "%s: snprintf truncation/error(%ld) %s\n", | ||
| 53 | - __func__, n, daemon_local->flags.loggingFilename); | ||
| 54 | + __func__, (long int)n, daemon_local->flags.loggingFilename); | ||
| 55 | } | ||
| 56 | daemon_local->flags.enableLoggingFileLimit = false; | ||
| 57 | daemon_local->flags.loggingFileSize = 250000; | ||
| 58 | @@ -2501,7 +2501,7 @@ void dlt_daemon_exit_trigger() | ||
| 59 | n = snprintf(tmp, DLT_PATH_MAX, "%s/dlt", dltFifoBaseDir); | ||
| 60 | if (n < 0 || (size_t)n > DLT_PATH_MAX) { | ||
| 61 | dlt_vlog(LOG_WARNING, "%s: snprintf truncation/error(%ld) %s\n", | ||
| 62 | - __func__, n, tmp); | ||
| 63 | + __func__, (long int)n, tmp); | ||
| 64 | } | ||
| 65 | |||
| 66 | (void)unlink(tmp); | ||
| 67 | @@ -2878,8 +2878,8 @@ int dlt_daemon_log_internal(DltDaemon *daemon, DltDaemonLocal *daemon_local, | ||
| 68 | dlt_daemon_client_send(DLT_DAEMON_SEND_TO_ALL, daemon,daemon_local, | ||
| 69 | msg.headerbuffer, sizeof(DltStorageHeader), | ||
| 70 | msg.headerbuffer + sizeof(DltStorageHeader), | ||
| 71 | - (size_t)(msg.headersize - (int32_t)sizeof(DltStorageHeader)), | ||
| 72 | - msg.databuffer, (size_t)msg.datasize, verbose); | ||
| 73 | + (int)(msg.headersize - (int32_t)sizeof(DltStorageHeader)), | ||
| 74 | + msg.databuffer, (int)msg.datasize, verbose); | ||
| 75 | |||
| 76 | free(msg.databuffer); | ||
| 77 | }else { | ||
| 78 | diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c | ||
| 79 | index 50d8f19..20a512b 100644 | ||
| 80 | --- a/src/daemon/dlt_daemon_client.c | ||
| 81 | +++ b/src/daemon/dlt_daemon_client.c | ||
| 82 | @@ -551,8 +551,8 @@ int dlt_daemon_client_send_message_to_all_client(DltDaemon *daemon, | ||
| 83 | return dlt_daemon_client_send(DLT_DAEMON_SEND_TO_ALL, daemon, daemon_local, | ||
| 84 | daemon_local->msg.headerbuffer, sizeof(DltStorageHeader), | ||
| 85 | daemon_local->msg.headerbuffer + sizeof(DltStorageHeader), | ||
| 86 | - (size_t)(daemon_local->msg.headersize - (int32_t)sizeof(DltStorageHeader)), | ||
| 87 | - daemon_local->msg.databuffer, (size_t)daemon_local->msg.datasize, verbose); | ||
| 88 | + (int)(daemon_local->msg.headersize - (int32_t)sizeof(DltStorageHeader)), | ||
| 89 | + daemon_local->msg.databuffer, (int)daemon_local->msg.datasize, verbose); | ||
| 90 | |||
| 91 | } | ||
| 92 | |||
| 93 | @@ -771,8 +771,8 @@ int dlt_daemon_client_send_control_message(int sock, | ||
| 94 | if ((ret = | ||
| 95 | dlt_daemon_client_send(sock, daemon, daemon_local, msg->headerbuffer, sizeof(DltStorageHeader), | ||
| 96 | msg->headerbuffer + sizeof(DltStorageHeader), | ||
| 97 | - (size_t)(msg->headersize - (int32_t)sizeof(DltStorageHeader)), | ||
| 98 | - msg->databuffer, (size_t)msg->datasize, verbose))) { | ||
| 99 | + (int)(msg->headersize - (int32_t)sizeof(DltStorageHeader)), | ||
| 100 | + msg->databuffer, (int)msg->datasize, verbose))) { | ||
| 101 | dlt_log(LOG_DEBUG, "dlt_daemon_control_send_control_message: DLT message send to all failed!.\n"); | ||
| 102 | return ret; | ||
| 103 | } | ||
| 104 | @@ -1919,7 +1919,7 @@ void dlt_daemon_control_get_log_info(int sock, | ||
| 105 | |||
| 106 | /* Allocate buffer for response message */ | ||
| 107 | resp.databuffer = (uint8_t *)malloc((size_t)resp.datasize); | ||
| 108 | - resp.databuffersize = (size_t)resp.datasize; | ||
| 109 | + resp.databuffersize = resp.datasize; | ||
| 110 | |||
| 111 | if (resp.databuffer == 0) { | ||
| 112 | dlt_daemon_control_service_response(sock, | ||
| 113 | @@ -2572,7 +2572,7 @@ int dlt_daemon_control_message_buffer_overflow(int sock, | ||
| 114 | |||
| 115 | if (msg.databuffer == 0) { | ||
| 116 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 117 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 118 | + msg.databuffersize = msg.datasize; | ||
| 119 | } | ||
| 120 | |||
| 121 | if (msg.databuffer == 0) | ||
| 122 | @@ -2633,7 +2633,7 @@ int dlt_daemon_control_message_buffer_overflow_v2(int sock, | ||
| 123 | |||
| 124 | if (msg.databuffer == 0) { | ||
| 125 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 126 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 127 | + msg.databuffersize = msg.datasize; | ||
| 128 | } | ||
| 129 | |||
| 130 | if (msg.databuffer == 0) | ||
| 131 | @@ -2686,7 +2686,7 @@ void dlt_daemon_control_service_response(int sock, | ||
| 132 | |||
| 133 | if (msg.databuffer == 0) { | ||
| 134 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 135 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 136 | + msg.databuffersize = msg.datasize; | ||
| 137 | } | ||
| 138 | |||
| 139 | if (msg.databuffer == 0) | ||
| 140 | @@ -2732,7 +2732,7 @@ void dlt_daemon_control_service_response_v2(int sock, | ||
| 141 | |||
| 142 | if (msg.databuffer == 0) { | ||
| 143 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 144 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 145 | + msg.databuffersize = msg.datasize; | ||
| 146 | } | ||
| 147 | |||
| 148 | if (msg.databuffer == 0) | ||
| 149 | @@ -2779,7 +2779,7 @@ int dlt_daemon_control_message_unregister_context(int sock, | ||
| 150 | |||
| 151 | if (msg.databuffer == 0) { | ||
| 152 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 153 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 154 | + msg.databuffersize = msg.datasize; | ||
| 155 | } | ||
| 156 | |||
| 157 | if (msg.databuffer == 0) | ||
| 158 | @@ -2842,7 +2842,7 @@ int dlt_daemon_control_message_unregister_context_v2(int sock, | ||
| 159 | |||
| 160 | if (msg.databuffer == 0) { | ||
| 161 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 162 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 163 | + msg.databuffersize = msg.datasize; | ||
| 164 | } | ||
| 165 | |||
| 166 | if (msg.databuffer == 0) | ||
| 167 | @@ -2909,7 +2909,7 @@ int dlt_daemon_control_message_connection_info(int sock, | ||
| 168 | |||
| 169 | if (msg.databuffer == 0) { | ||
| 170 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 171 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 172 | + msg.databuffersize = msg.datasize; | ||
| 173 | } | ||
| 174 | |||
| 175 | if (msg.databuffer == 0) | ||
| 176 | @@ -2962,7 +2962,7 @@ int dlt_daemon_control_message_connection_info_v2(int sock, | ||
| 177 | |||
| 178 | if (msg.databuffer == 0) { | ||
| 179 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 180 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 181 | + msg.databuffersize = msg.datasize; | ||
| 182 | } | ||
| 183 | |||
| 184 | if (msg.databuffer == 0) | ||
| 185 | @@ -3010,7 +3010,7 @@ int dlt_daemon_control_message_timezone(int sock, DltDaemon *daemon, DltDaemonLo | ||
| 186 | |||
| 187 | if (msg.databuffer == 0) { | ||
| 188 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 189 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 190 | + msg.databuffersize = msg.datasize; | ||
| 191 | } | ||
| 192 | |||
| 193 | if (msg.databuffer == 0) | ||
| 194 | @@ -3072,7 +3072,7 @@ int dlt_daemon_control_message_timezone_v2(int sock, DltDaemon *daemon, DltDaemo | ||
| 195 | |||
| 196 | if (msg.databuffer == 0) { | ||
| 197 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 198 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 199 | + msg.databuffersize = msg.datasize; | ||
| 200 | } | ||
| 201 | |||
| 202 | if (msg.databuffer == 0) | ||
| 203 | @@ -3127,7 +3127,7 @@ int dlt_daemon_control_message_marker(int sock, DltDaemon *daemon, DltDaemonLoca | ||
| 204 | |||
| 205 | if (msg.databuffer == 0) { | ||
| 206 | msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize); | ||
| 207 | - msg.databuffersize = (size_t)msg.datasize; | ||
| 208 | + msg.databuffersize = msg.datasize; | ||
| 209 | } | ||
| 210 | |||
| 211 | if (msg.databuffer == 0) | ||
| 212 | diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c | ||
| 213 | index 2f08c6a..65b264a 100644 | ||
| 214 | --- a/src/daemon/dlt_daemon_common.c | ||
| 215 | +++ b/src/daemon/dlt_daemon_common.c | ||
| 216 | @@ -2782,7 +2782,7 @@ int dlt_daemon_user_send_log_state(DltDaemon *daemon, DltDaemonApplication *app, | ||
| 217 | if (dlt_user_set_userheader(&userheader, DLT_USER_MESSAGE_LOG_STATE) < DLT_RETURN_OK) | ||
| 218 | return -1; | ||
| 219 | |||
| 220 | - logstate.log_state = daemon->connectionState; | ||
| 221 | + logstate.log_state = (int8_t)daemon->connectionState; | ||
| 222 | |||
| 223 | /* log to FIFO */ | ||
| 224 | ret = dlt_user_log_out2_with_timeout(app->user_handle, | ||
| 225 | @@ -2811,7 +2811,7 @@ int dlt_daemon_user_send_log_state_v2(DltDaemon *daemon, DltDaemonApplication *a | ||
| 226 | if (dlt_user_set_userheader_v2(&userheader, DLT_USER_MESSAGE_LOG_STATE) < DLT_RETURN_OK) | ||
| 227 | return -1; | ||
| 228 | |||
| 229 | - logstate.log_state = daemon->connectionState; | ||
| 230 | + logstate.log_state = (int8_t)daemon->connectionState; | ||
| 231 | |||
| 232 | /* log to FIFO */ | ||
| 233 | ret = dlt_user_log_out2_with_timeout(app->user_handle, | ||
| 234 | diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c | ||
| 235 | index 6d0098d..e432e26 100644 | ||
| 236 | --- a/src/lib/dlt_user.c | ||
| 237 | +++ b/src/lib/dlt_user.c | ||
| 238 | @@ -5106,8 +5106,8 @@ DltReturnValue dlt_user_log_send_log(DltContextData *log, const int mtype, int * | ||
| 239 | return DLT_RETURN_ERROR; | ||
| 240 | } | ||
| 241 | |||
| 242 | - dlt_vlog(LOG_DEBUG, "%s: Current file size=[%ld]\n", __func__, | ||
| 243 | - st.st_size); | ||
| 244 | + dlt_vlog(LOG_DEBUG, "%s: Current file size=[%lld]\n", __func__, | ||
| 245 | + (long long int)st.st_size); | ||
| 246 | /* Check filesize */ | ||
| 247 | /* Return error if the file size has reached to maximum */ | ||
| 248 | unsigned int msg_size = (unsigned int)st.st_size + (unsigned int)msg.headersize + | ||
| 249 | @@ -5115,8 +5115,8 @@ DltReturnValue dlt_user_log_send_log(DltContextData *log, const int mtype, int * | ||
| 250 | if (msg_size > dlt_user.filesize_max) { | ||
| 251 | dlt_user_file_reach_max = true; | ||
| 252 | dlt_vlog(LOG_ERR, | ||
| 253 | - "%s: File size (%ld bytes) reached to defined maximum size (%d bytes)\n", | ||
| 254 | - __func__, st.st_size, dlt_user.filesize_max); | ||
| 255 | + "%s: File size (%lld bytes) reached to defined maximum size (%d bytes)\n", | ||
| 256 | + __func__, (long long int)st.st_size, dlt_user.filesize_max); | ||
| 257 | dlt_mutex_unlock(); | ||
| 258 | return DLT_RETURN_FILESZERR; | ||
| 259 | } | ||
| 260 | @@ -5612,21 +5612,21 @@ DltReturnValue dlt_user_log_send_log_v2(DltContextData *log, const int mtype, Dl | ||
| 261 | return DLT_RETURN_ERROR; | ||
| 262 | } | ||
| 263 | |||
| 264 | - dlt_vlog(LOG_DEBUG, "%s: Current file size=[%ld]\n", __func__, | ||
| 265 | - st.st_size); | ||
| 266 | + dlt_vlog(LOG_DEBUG, "%s: Current file size=[%lld]\n", __func__, | ||
| 267 | + (long long int)st.st_size); | ||
| 268 | /* Check filesize */ | ||
| 269 | /* Return error if the file size has reached to maximum */ | ||
| 270 | unsigned int msg_size = 0; | ||
| 271 | if (st.st_size < 0 || st.st_size > UINT_MAX) { | ||
| 272 | - dlt_vlog(LOG_ERR, "%s: File size (%ld bytes) is invalid or too large for unsigned int\n", __func__, st.st_size); | ||
| 273 | + dlt_vlog(LOG_ERR, "%s: File size (%lld bytes) is invalid or too large for unsigned int\n", __func__, (long long int)st.st_size); | ||
| 274 | return DLT_RETURN_FILESZERR; | ||
| 275 | } | ||
| 276 | msg_size = (unsigned int)st.st_size + (unsigned int) msg.headersizev2 + (unsigned int) log->size; | ||
| 277 | if (msg_size > dlt_user.filesize_max) { | ||
| 278 | dlt_user_file_reach_max = true; | ||
| 279 | dlt_vlog(LOG_ERR, | ||
| 280 | - "%s: File size (%ld bytes) reached to defined maximum size (%d bytes)\n", | ||
| 281 | - __func__, st.st_size, dlt_user.filesize_max); | ||
| 282 | + "%s: File size (%lld bytes) reached to defined maximum size (%d bytes)\n", | ||
| 283 | + __func__, (long long int)st.st_size, dlt_user.filesize_max); | ||
| 284 | return DLT_RETURN_FILESZERR; | ||
| 285 | } | ||
| 286 | else { | ||
| 287 | diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c | ||
| 288 | index 6ad354b..aa0aaaa 100644 | ||
| 289 | --- a/src/shared/dlt_common.c | ||
| 290 | +++ b/src/shared/dlt_common.c | ||
| 291 | @@ -1220,7 +1220,7 @@ DltReturnValue dlt_message_header_flags_v2(DltMessageV2 *msg, char *text, size_t | ||
| 292 | for (int i = 0; i<5; ++i){ | ||
| 293 | tt = (tt << 8) | msg->headerextrav2.seconds[i]; | ||
| 294 | } | ||
| 295 | - snprintf(text + strlen(text), textlength - strlen(text), "%ld.%.9u ", tt, msg->headerextrav2.nanoseconds); | ||
| 296 | + snprintf(text + strlen(text), textlength - strlen(text), "%lld.%.9u ", (long long int)tt, msg->headerextrav2.nanoseconds); | ||
| 297 | } | ||
| 298 | else | ||
| 299 | snprintf(text + strlen(text), textlength - strlen(text), "---------- "); | ||
| 300 | diff --git a/src/shared/dlt_multiple_files.c b/src/shared/dlt_multiple_files.c | ||
| 301 | index c4019e5..65529ff 100644 | ||
| 302 | --- a/src/shared/dlt_multiple_files.c | ||
| 303 | +++ b/src/shared/dlt_multiple_files.c | ||
| 304 | @@ -257,7 +257,7 @@ ssize_t multiple_files_buffer_get_total_size(const MultipleFilesRingBuffer *file | ||
| 305 | if (((unsigned int)res < sizeof(filename)) && (res > 0)) { | ||
| 306 | errno = 0; | ||
| 307 | if (0 == stat(filename, &status)) | ||
| 308 | - size += status.st_size; | ||
| 309 | + size += (ssize_t)status.st_size; | ||
| 310 | else | ||
| 311 | fprintf(stderr, "file %s cannot be stat-ed, error=%s\n", filename, strerror(errno)); | ||
| 312 | } | ||
| 313 | diff --git a/src/tests/dlt-test-multi-process-client-v2.c b/src/tests/dlt-test-multi-process-client-v2.c | ||
| 314 | index 2bb1158..ec99720 100644 | ||
| 315 | --- a/src/tests/dlt-test-multi-process-client-v2.c | ||
| 316 | +++ b/src/tests/dlt-test-multi-process-client-v2.c | ||
| 317 | @@ -299,10 +299,10 @@ void print_stats(s_statistics stats, s_parameters params) | ||
| 318 | printf(" Messages received : %d\n", stats.messages_received); | ||
| 319 | printf(" Broken messages received : %d\n", stats.broken_messages_received); | ||
| 320 | printf(" Bytes received : %d\n", stats.bytes_received); | ||
| 321 | - printf(" Time running (seconds) : %ld\n", time(NULL) - stats.first_message_time); | ||
| 322 | - printf(" Throughput (msgs/sec)/(B/sec) : %ld/%ld\n", | ||
| 323 | - stats.messages_received / ((time(NULL) - stats.first_message_time) + 1), | ||
| 324 | - (stats.bytes_received) / ((time(NULL) - stats.first_message_time) + 1)); | ||
| 325 | + printf(" Time running (seconds) : %lld\n", (long long int)(time(NULL) - stats.first_message_time)); | ||
| 326 | + printf(" Throughput (msgs/sec)/(B/sec) : %lld/%lld\n", | ||
| 327 | + (long long int)(stats.messages_received / ((time(NULL) - stats.first_message_time) + 1)), | ||
| 328 | + (long long int)((stats.bytes_received) / ((time(NULL) - stats.first_message_time) + 1))); | ||
| 329 | |||
| 330 | if (params.messages_left == 0) { | ||
| 331 | if (stats.broken_messages_received == 0) | ||
| 332 | diff --git a/src/tests/dlt-test-multi-process-v2.c b/src/tests/dlt-test-multi-process-v2.c | ||
| 333 | index 44a8622..1d3a54a 100644 | ||
| 334 | --- a/src/tests/dlt-test-multi-process-v2.c | ||
| 335 | +++ b/src/tests/dlt-test-multi-process-v2.c | ||
| 336 | @@ -393,7 +393,7 @@ void *do_logging(void *arg) | ||
| 337 | |||
| 338 | sleep_time = mksleep_time(data->params.delay, data->params.delay_fudge); | ||
| 339 | ts.tv_sec = sleep_time / 1000000000; | ||
| 340 | - ts.tv_nsec = sleep_time % 1000000000; | ||
| 341 | + ts.tv_nsec = (long int)(sleep_time % 1000000000); | ||
| 342 | nanosleep(&ts, NULL); | ||
| 343 | } | ||
| 344 | |||
| 345 | diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c | ||
| 346 | index 016c8b4..00fb11c 100644 | ||
| 347 | --- a/src/tests/dlt-test-multi-process.c | ||
| 348 | +++ b/src/tests/dlt-test-multi-process.c | ||
| 349 | @@ -370,7 +370,7 @@ void *do_logging(void *arg) | ||
| 350 | |||
| 351 | sleep_time = mksleep_time(data->params.delay, data->params.delay_fudge); | ||
| 352 | ts.tv_sec = sleep_time / 1000000000; | ||
| 353 | - ts.tv_nsec = sleep_time % 1000000000; | ||
| 354 | + ts.tv_nsec = (long int)(sleep_time % 1000000000); | ||
| 355 | nanosleep(&ts, NULL); | ||
| 356 | } | ||
| 357 | |||
| 358 | -- | ||
| 359 | 2.34.1 | ||
| 360 | |||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-compile-failure-related-to-gzlog.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-compile-failure-related-to-gzlog.patch new file mode 100644 index 0000000000..f9692d9f4d --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-compile-failure-related-to-gzlog.patch | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | From bee9bce043c72de1d27a4251333ace9fe66bcc74 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Thu, 12 Mar 2026 19:37:11 +0800 | ||
| 4 | Subject: [PATCH] Fix compile failure related to gzlog | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | * In commit [1], gzlog is changed from gzFile to gzFile*, this cause | ||
| 10 | failure: | ||
| 11 | /dlt-daemon/src/offlinelogstorage/dlt_offline_logstorage.c:88:21: error: passing argument 1 of ‘gzclose’ from incompatible pointer type [-Werror=incompatible-pointer-types] | ||
| 12 | 88 | gzclose(data->gzlog); | ||
| 13 | | ~~~~^~~~~~~ | ||
| 14 | | | | ||
| 15 | | struct gzFile_s ** | ||
| 16 | compilation terminated due to -Wfatal-errors. | ||
| 17 | |||
| 18 | so change gzlog back to gzFile, so that all the gzxxx function can work | ||
| 19 | well. | ||
| 20 | |||
| 21 | * Change to gzFile causes the following failure, since fileno need | ||
| 22 | FILE*, according to code "config->gzlog = gzdopen(config->fd, mode)", | ||
| 23 | seems we don't need to use fileno, just use config->fd is ok. | ||
| 24 | /dlt-daemon/src/offlinelogstorage/dlt_offline_logstorage_behavior.c:1133:48: error: passing argument 1 of ‘fileno’ from incompatible pointer type [-Werror=incompatible-pointer-types] | ||
| 25 | 1133 | if (fsync(fileno(config->gzlog)) != 0) { | ||
| 26 | | ~~~~~~^~~~~~~ | ||
| 27 | | | | ||
| 28 | | gzFile {aka struct gzFile_s *} | ||
| 29 | compilation terminated due to -Wfatal-errors. | ||
| 30 | |||
| 31 | [1] https://github.com/COVESA/dlt-daemon/commit/543087ba98c103dc576edadeccf614c9dab1b9b3 | ||
| 32 | |||
| 33 | Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/826] | ||
| 34 | |||
| 35 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 36 | --- | ||
| 37 | src/offlinelogstorage/dlt_offline_logstorage.h | 2 +- | ||
| 38 | src/offlinelogstorage/dlt_offline_logstorage_behavior.c | 2 +- | ||
| 39 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 40 | |||
| 41 | diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h | ||
| 42 | index fe38687..09ea5ce 100644 | ||
| 43 | --- a/src/offlinelogstorage/dlt_offline_logstorage.h | ||
| 44 | +++ b/src/offlinelogstorage/dlt_offline_logstorage.h | ||
| 45 | @@ -217,7 +217,7 @@ struct DltLogStorageFilterConfig | ||
| 46 | FILE *log; /* current open log file */ | ||
| 47 | int fd; /* The file descriptor for the active log file */ | ||
| 48 | #ifdef DLT_LOGSTORAGE_USE_GZIP | ||
| 49 | - gzFile *gzlog; /* current open gz log file */ | ||
| 50 | + gzFile gzlog; /* current open gz log file */ | ||
| 51 | #endif | ||
| 52 | void *cache; /* log data cache */ | ||
| 53 | unsigned int specific_size; /* cache size used for specific_size sync strategy */ | ||
| 54 | diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c | ||
| 55 | index f17fbb2..ff09c9e 100644 | ||
| 56 | --- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c | ||
| 57 | +++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c | ||
| 58 | @@ -1130,7 +1130,7 @@ int dlt_logstorage_prepare_on_msg(DltLogStorageFilterConfig *config, | ||
| 59 | (config->sync == DLT_LOGSTORAGE_SYNC_UNSET)) { | ||
| 60 | #ifdef DLT_LOGSTORAGE_USE_GZIP | ||
| 61 | if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) { | ||
| 62 | - if (fsync(fileno(config->gzlog)) != 0) { | ||
| 63 | + if (fsync(config->fd) != 0) { | ||
| 64 | if (errno != ENOSYS) { | ||
| 65 | dlt_vlog(LOG_ERR, "%s: failed to sync gzip log file\n", __func__); | ||
| 66 | } | ||
| 67 | -- | ||
| 68 | 2.34.1 | ||
| 69 | |||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-kinds-of-build-failure.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-kinds-of-build-failure.patch new file mode 100644 index 0000000000..403d1089e2 --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-kinds-of-build-failure.patch | |||
| @@ -0,0 +1,174 @@ | |||
| 1 | From 3d713358fe19ce02e7c580d26222ec2386c94bc9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Thu, 12 Mar 2026 20:06:34 +0800 | ||
| 4 | Subject: [PATCH] Fix kinds of build failure | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Fix kinds of build failures caused by -Werror=sign-conversion, | ||
| 10 | -Werror=cast-qual, -Werror=conversion etc. | ||
| 11 | Eg: | ||
| 12 | src/offlinelogstorage/dlt_offline_logstorage.h:129:49: error: unsigned conversion from ‘int’ to ‘unsigned int’ changes value from ‘-1’ to ‘4294967295’ [-Werror=sign-conversion] | ||
| 13 | 129 | #define DLT_LOGSTORAGE_GZIP_ERROR -1 /* error case */ | ||
| 14 | | ^ | ||
| 15 | /dlt-daemon/src/offlinelogstorage/dlt_offline_logstorage.c:1303:36: note: in expansion of macro ‘DLT_LOGSTORAGE_GZIP_ERROR’ | ||
| 16 | 1303 | config->gzip_compression = DLT_LOGSTORAGE_GZIP_ERROR; | ||
| 17 | |||
| 18 | | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 19 | |||
| 20 | src/offlinelogstorage/dlt_offline_logstorage_behavior.c:851:16: error: conversion from ‘z_size_t’ {aka ‘long unsigned int’} to ‘int’ may change value [-Werror=conversion] | ||
| 21 | 851 | return gzfwrite(ptr, size, nmemb, config->gzlog); | ||
| 22 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 23 | |||
| 24 | src/console/dlt-control-common.c:922:25: error: cast discards 'const' qualifier from pointer target type [-Werror=cast-qual] | ||
| 25 | 922 | json_object_to_file((char*)filename, json_filter_obj); | ||
| 26 | | | ||
| 27 | |||
| 28 | Use explicit type conversion to make the build can pass | ||
| 29 | |||
| 30 | Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/826] | ||
| 31 | |||
| 32 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 33 | --- | ||
| 34 | src/console/dlt-control-common.c | 2 +- | ||
| 35 | src/daemon/dlt-daemon.c | 4 ++-- | ||
| 36 | src/daemon/udp_connection/dlt_daemon_udp_socket.c | 10 +++++----- | ||
| 37 | src/examples/dlt-example-multicast-clientmsg-view.c | 8 ++++---- | ||
| 38 | src/offlinelogstorage/dlt_offline_logstorage.h | 2 +- | ||
| 39 | .../dlt_offline_logstorage_behavior.c | 4 ++-- | ||
| 40 | 6 files changed, 15 insertions(+), 15 deletions(-) | ||
| 41 | |||
| 42 | diff --git a/src/console/dlt-control-common.c b/src/console/dlt-control-common.c | ||
| 43 | index 2aeea280..4f9e95b4 100644 | ||
| 44 | --- a/src/console/dlt-control-common.c | ||
| 45 | +++ b/src/console/dlt-control-common.c | ||
| 46 | @@ -919,7 +919,7 @@ DltReturnValue dlt_json_filter_save(DltFilter *filter, const char *filename, int | ||
| 47 | } | ||
| 48 | |||
| 49 | printf("Saving current filter into '%s'\n", filename); | ||
| 50 | - json_object_to_file((char*)filename, json_filter_obj); | ||
| 51 | + json_object_to_file(filename, json_filter_obj); | ||
| 52 | |||
| 53 | return DLT_RETURN_OK; | ||
| 54 | } | ||
| 55 | diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c | ||
| 56 | index 97af1cd9..94024eb4 100644 | ||
| 57 | --- a/src/daemon/dlt-daemon.c | ||
| 58 | +++ b/src/daemon/dlt-daemon.c | ||
| 59 | @@ -867,7 +867,7 @@ int option_file_parser(DltDaemonLocal *daemon_local) | ||
| 60 | |||
| 61 | if ((longval == MULTICAST_CONNECTION_DISABLED) | ||
| 62 | || (longval == MULTICAST_CONNECTION_ENABLED)) { | ||
| 63 | - daemon_local->UDPConnectionSetup = longval; | ||
| 64 | + daemon_local->UDPConnectionSetup = (int)longval; | ||
| 65 | printf("Option: %s=%s\n", token, value); | ||
| 66 | } | ||
| 67 | else { | ||
| 68 | @@ -884,7 +884,7 @@ int option_file_parser(DltDaemonLocal *daemon_local) | ||
| 69 | } | ||
| 70 | else if (strcmp(token, "UDPMulticastIPPort") == 0) | ||
| 71 | { | ||
| 72 | - daemon_local->UDPMulticastIPPort = strtol(value, NULL, 10); | ||
| 73 | + daemon_local->UDPMulticastIPPort = (int)strtol(value, NULL, 10); | ||
| 74 | } | ||
| 75 | #endif | ||
| 76 | else if (strcmp(token, "BindAddress") == 0) | ||
| 77 | diff --git a/src/daemon/udp_connection/dlt_daemon_udp_socket.c b/src/daemon/udp_connection/dlt_daemon_udp_socket.c | ||
| 78 | index 4c40cda8..b3408773 100644 | ||
| 79 | --- a/src/daemon/udp_connection/dlt_daemon_udp_socket.c | ||
| 80 | +++ b/src/daemon/udp_connection/dlt_daemon_udp_socket.c | ||
| 81 | @@ -66,7 +66,7 @@ void dlt_daemon_udp_setmulticast_addr(DltDaemonLocal *daemon_local) | ||
| 82 | struct sockaddr_in clientaddr; | ||
| 83 | clientaddr.sin_family = AF_INET; | ||
| 84 | inet_pton(AF_INET, daemon_local->UDPMulticastIPAddress, &clientaddr.sin_addr); | ||
| 85 | - clientaddr.sin_port = htons(daemon_local->UDPMulticastIPPort); | ||
| 86 | + clientaddr.sin_port = htons((uint16_t)daemon_local->UDPMulticastIPPort); | ||
| 87 | memcpy(&g_udpmulticast_addr.clientaddr, &clientaddr, sizeof(struct sockaddr_in)); | ||
| 88 | g_udpmulticast_addr.clientaddr_size = sizeof(g_udpmulticast_addr.clientaddr); | ||
| 89 | g_udpmulticast_addr.isvalidflag = ADDRESS_VALID; | ||
| 90 | @@ -224,17 +224,17 @@ void dlt_daemon_udp_clientmsg_send(DltDaemonClientSockInfo *clientinfo, | ||
| 91 | |||
| 92 | if ((clientinfo->isvalidflag == ADDRESS_VALID) && | ||
| 93 | (size1 > 0) && (size2 > 0)) { | ||
| 94 | - void *data = (void *)calloc(size1 + size2, sizeof(char)); | ||
| 95 | + void *data = (void *)calloc((size_t)(size1 + size2), sizeof(char)); | ||
| 96 | |||
| 97 | if (data == NULL) { | ||
| 98 | dlt_vlog(LOG_ERR, "%s: calloc failure\n", __func__); | ||
| 99 | return; | ||
| 100 | } | ||
| 101 | |||
| 102 | - memcpy(data, data1, size1); | ||
| 103 | - memcpy(data + size1, data2, size2); | ||
| 104 | + memcpy(data, data1, (size_t)size1); | ||
| 105 | + memcpy((int*)data + size1, data2, (size_t)size2); | ||
| 106 | |||
| 107 | - if (sendto(g_udp_sock_fd, data, size1 + size2, 0, (struct sockaddr *)&clientinfo->clientaddr, | ||
| 108 | + if (sendto(g_udp_sock_fd, data, (size_t)(size1 + size2), 0, (struct sockaddr *)&clientinfo->clientaddr, | ||
| 109 | clientinfo->clientaddr_size) < 0) | ||
| 110 | dlt_vlog(LOG_ERR, "%s: Send UDP Packet Data failed\n", __func__); | ||
| 111 | |||
| 112 | diff --git a/src/examples/dlt-example-multicast-clientmsg-view.c b/src/examples/dlt-example-multicast-clientmsg-view.c | ||
| 113 | index c00537e5..f8920453 100644 | ||
| 114 | --- a/src/examples/dlt-example-multicast-clientmsg-view.c | ||
| 115 | +++ b/src/examples/dlt-example-multicast-clientmsg-view.c | ||
| 116 | @@ -74,9 +74,9 @@ int dlt_receiver_receive_socket_udp(struct clientinfostruct *clientinfo, DltRece | ||
| 117 | /* wait for data from socket */ | ||
| 118 | unsigned int addrlen = sizeof(clientinfo->addr); | ||
| 119 | |||
| 120 | - if ((receiver->bytesRcvd = recvfrom(clientinfo->fd, | ||
| 121 | + if ((receiver->bytesRcvd = (int32_t)recvfrom(clientinfo->fd, | ||
| 122 | receiver->buf + receiver->lastBytesRcvd, | ||
| 123 | - receiver->buffersize - receiver->lastBytesRcvd, | ||
| 124 | + (size_t)(receiver->buffersize - receiver->lastBytesRcvd), | ||
| 125 | 0, | ||
| 126 | (struct sockaddr *)&(clientinfo->addr), &addrlen)) | ||
| 127 | <= 0) { | ||
| 128 | @@ -177,11 +177,11 @@ int main() | ||
| 129 | dlt_receiver_receive_socket_udp(&clientinfo, &(clientinfo.receiver)); | ||
| 130 | |||
| 131 | while (dlt_message_read(&msg, (unsigned char *)(clientinfo.receiver.buf), | ||
| 132 | - clientinfo.receiver.bytesRcvd, 0, 0) == DLT_MESSAGE_ERROR_OK) { | ||
| 133 | + (unsigned int)clientinfo.receiver.bytesRcvd, 0, 0) == DLT_MESSAGE_ERROR_OK) { | ||
| 134 | dlt_receive_message_callback_udp(&msg); | ||
| 135 | |||
| 136 | if (dlt_receiver_remove(&(clientinfo.receiver), | ||
| 137 | - msg.headersize + msg.datasize - sizeof(DltStorageHeader)) | ||
| 138 | + msg.headersize + msg.datasize - ((int32_t)(sizeof(DltStorageHeader)))) | ||
| 139 | == DLT_RETURN_ERROR) { | ||
| 140 | /* Return value ignored */ | ||
| 141 | dlt_message_free(&msg, 0); | ||
| 142 | diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h | ||
| 143 | index 09ea5ce4..cfb70f33 100644 | ||
| 144 | --- a/src/offlinelogstorage/dlt_offline_logstorage.h | ||
| 145 | +++ b/src/offlinelogstorage/dlt_offline_logstorage.h | ||
| 146 | @@ -192,7 +192,7 @@ struct DltLogStorageFilterConfig | ||
| 147 | int overwrite; /* Overwrite strategy */ | ||
| 148 | int skip; /* Flag to skip file logging if DISCARD_NEW */ | ||
| 149 | char *ecuid; /* ECU identifier */ | ||
| 150 | - unsigned int gzip_compression; /* Toggle if log files should be gzip compressed */ | ||
| 151 | + int gzip_compression; /* Toggle if log files should be gzip compressed */ | ||
| 152 | /* callback function for filter configurations */ | ||
| 153 | int (*dlt_logstorage_prepare)(DltLogStorageFilterConfig *config, | ||
| 154 | DltLogStorageUserConfig *file_config, | ||
| 155 | diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c | ||
| 156 | index ff09c9eb..ae8f4442 100644 | ||
| 157 | --- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c | ||
| 158 | +++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c | ||
| 159 | @@ -848,10 +848,10 @@ DLT_STATIC int dlt_logstorage_write_to_log(void *ptr, size_t size, size_t nmemb, | ||
| 160 | { | ||
| 161 | #ifdef DLT_LOGSTORAGE_USE_GZIP | ||
| 162 | if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) { | ||
| 163 | - return gzfwrite(ptr, size, nmemb, config->gzlog); | ||
| 164 | + return (int)gzfwrite(ptr, size, nmemb, config->gzlog); | ||
| 165 | } | ||
| 166 | else { | ||
| 167 | - return fwrite(ptr, size, nmemb, config->log); | ||
| 168 | + return (int)fwrite(ptr, size, nmemb, config->log); | ||
| 169 | } | ||
| 170 | #else | ||
| 171 | return (int)fwrite(ptr, size, nmemb, config->log); | ||
| 172 | -- | ||
| 173 | 2.34.1 | ||
| 174 | |||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-fix-build-failure-when-systemd-is-enabled.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-fix-build-failure-when-systemd-is-enabled.patch new file mode 100644 index 0000000000..d19a23cd9c --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-fix-build-failure-when-systemd-is-enabled.patch | |||
| @@ -0,0 +1,423 @@ | |||
| 1 | From 28322f951bb8510ddb4cf767426a67c81ce826ab Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Tue, 17 Mar 2026 13:04:11 +0800 | ||
| 4 | Subject: [PATCH] fix build failure when systemd is enabled | ||
| 5 | |||
| 6 | Fix build failures when -DWITH_SYSTEMD=ON, -DWITH_SYSTEMD_WATCHDOG=ON, | ||
| 7 | -DWITH_SYSTEMD_JOURNAL=ON: | ||
| 8 | Eg: | ||
| 9 | src/system/dlt-system-syslog.c:91:39: error: conversion from 'int' to '__uint16_t' {aka 'short unsigned int'} may change value [-Werror=conversion] | ||
| 10 | 91 | syslog_addr.sin6_port = htons(opts.Port); | ||
| 11 | | ~~~~^~~~~ | ||
| 12 | |||
| 13 | src/system/dlt-system-logfile.c:74:21: error: conversion from 'size_t' {aka 'long unsigned int'} to 'int' may change value [-Werror=conversion] | ||
| 14 | 74 | bytes = fread(buffer, 1, sizeof(buffer) - 1, pFile); | ||
| 15 | | ^~~~~ | ||
| 16 | |||
| 17 | src/daemon/dlt-daemon.c:5513:14: error: unused variable 'curr_time' [-Werror=unused-variable] | ||
| 18 | 5513 | uint32_t curr_time = 0U; | ||
| 19 | | ^~~~~~~~~ | ||
| 20 | |||
| 21 | src/system/dlt-system-syslog.c:120:22: error: conversion from 'ssize_t' {aka 'long int'} to 'int' may change value [-Werror=conversion] | ||
| 22 | 120 | int bytes_read = recvfrom(sock, recv_data, RECV_BUF_SZ, 0, | ||
| 23 | | ^~~~~~~~ | ||
| 24 | |||
| 25 | src/system/dlt-system-logfile.c:76:23: error: comparison of unsigned expression in '>= 0' is always true [-Werror=type-limits] | ||
| 26 | 76 | if (bytes >= 0) | ||
| 27 | | ^~ | ||
| 28 | |||
| 29 | src/system/dlt-system-filetransfer.c:727:56: error: '__builtin___snprintf_chk' output may be truncated before the last format cha racter [-Werror=format-truncation=] | ||
| 30 | 10 727 | snprintf(tosend, length, "%s/%s", opts->Directory[j], ie->name); | ||
| 31 | |||
| 32 | src/system/dlt-system-filetransfer.c:153: error: declaration of 'len' shadows a previous local [-Werror=shadow] | ||
| 33 | |||
| 34 | Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/828] | ||
| 35 | |||
| 36 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 37 | --- | ||
| 38 | src/daemon/dlt-daemon.c | 8 +---- | ||
| 39 | src/daemon/dlt_daemon_client.c | 2 +- | ||
| 40 | src/system/dlt-system-filetransfer.c | 43 +++++++++++++----------- | ||
| 41 | src/system/dlt-system-journal.c | 2 +- | ||
| 42 | src/system/dlt-system-logfile.c | 4 +-- | ||
| 43 | src/system/dlt-system-process-handling.c | 2 +- | ||
| 44 | src/system/dlt-system-processes.c | 2 +- | ||
| 45 | src/system/dlt-system-syslog.c | 6 ++-- | ||
| 46 | src/system/dlt-system-watchdog.c | 8 ++--- | ||
| 47 | systemd/3rdparty/sd-daemon.c | 5 +-- | ||
| 48 | 10 files changed, 40 insertions(+), 42 deletions(-) | ||
| 49 | |||
| 50 | diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c | ||
| 51 | index ef42f89..8c318a4 100644 | ||
| 52 | --- a/src/daemon/dlt-daemon.c | ||
| 53 | +++ b/src/daemon/dlt-daemon.c | ||
| 54 | @@ -1620,7 +1620,7 @@ int main(int argc, char *argv[]) | ||
| 55 | watchdogTimeoutSeconds = 30; | ||
| 56 | } | ||
| 57 | |||
| 58 | - daemon.watchdog_trigger_interval = watchdogTimeoutSeconds; | ||
| 59 | + daemon.watchdog_trigger_interval = (unsigned int)watchdogTimeoutSeconds; | ||
| 60 | daemon.watchdog_last_trigger_time = 0U; | ||
| 61 | create_timer_fd(&daemon_local, | ||
| 62 | watchdogTimeoutSeconds, | ||
| 63 | @@ -5509,9 +5509,6 @@ int dlt_daemon_send_ringbuffer_to_client(DltDaemon *daemon, DltDaemonLocal *daem | ||
| 64 | int ret; | ||
| 65 | static uint8_t data[DLT_DAEMON_RCVBUFSIZE]; | ||
| 66 | int length; | ||
| 67 | -#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE | ||
| 68 | - uint32_t curr_time = 0U; | ||
| 69 | -#endif | ||
| 70 | |||
| 71 | PRINT_FUNCTION_VERBOSE(verbose); | ||
| 72 | |||
| 73 | @@ -5554,9 +5551,6 @@ int dlt_daemon_send_ringbuffer_to_client_v2(DltDaemon *daemon, DltDaemonLocal *d | ||
| 74 | int ret; | ||
| 75 | static uint8_t data[DLT_DAEMON_RCVBUFSIZE]; | ||
| 76 | int length; | ||
| 77 | -#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE | ||
| 78 | - uint32_t curr_time = 0U; | ||
| 79 | -#endif | ||
| 80 | |||
| 81 | PRINT_FUNCTION_VERBOSE(verbose); | ||
| 82 | |||
| 83 | diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c | ||
| 84 | index 20a512b..681bf1e 100644 | ||
| 85 | --- a/src/daemon/dlt_daemon_client.c | ||
| 86 | +++ b/src/daemon/dlt_daemon_client.c | ||
| 87 | @@ -4690,7 +4690,7 @@ int dlt_daemon_process_systemd_timer(DltDaemon *daemon, | ||
| 88 | |||
| 89 | if ((daemon_local == NULL) || (daemon == NULL) || (receiver == NULL)) { | ||
| 90 | dlt_vlog(LOG_ERR, "%s: invalid parameters", __func__); | ||
| 91 | - return res; | ||
| 92 | + return (int)res; | ||
| 93 | } | ||
| 94 | |||
| 95 | res = read(receiver->fd, &expir, sizeof(expir)); | ||
| 96 | diff --git a/src/system/dlt-system-filetransfer.c b/src/system/dlt-system-filetransfer.c | ||
| 97 | index c082f22..6024a3e 100644 | ||
| 98 | --- a/src/system/dlt-system-filetransfer.c | ||
| 99 | +++ b/src/system/dlt-system-filetransfer.c | ||
| 100 | @@ -105,14 +105,14 @@ char *unique_name(char *src) | ||
| 101 | DLT_STRING("dlt-system-filetransfer, creating unique temporary file name.")); | ||
| 102 | time_t t = time(NULL); | ||
| 103 | int ok; | ||
| 104 | - uint32_t l = getFileSerialNumber(src, &ok) ^ t; | ||
| 105 | + uint32_t l = (uint32_t)(getFileSerialNumber(src, &ok) ^ t); | ||
| 106 | |||
| 107 | if (!ok) | ||
| 108 | return (char *)NULL; | ||
| 109 | |||
| 110 | char *basename_f = basename(src); | ||
| 111 | /* Length of ULONG_MAX + 1 */ | ||
| 112 | - int len = 11 + strlen(basename_f); | ||
| 113 | + size_t len = 11 + strlen(basename_f); | ||
| 114 | |||
| 115 | if (len > NAME_MAX) { | ||
| 116 | DLT_LOG(dltsystem, DLT_LOG_WARN, | ||
| 117 | @@ -155,7 +155,7 @@ void send_dumped_file(FiletransferOptions const *opts, char *dst_tosend) | ||
| 118 | while ((total - used) < (total / 2)) { | ||
| 119 | struct timespec t; | ||
| 120 | t.tv_sec = 0; | ||
| 121 | - t.tv_nsec = 1000000ul * opts->TimeoutBetweenLogs; | ||
| 122 | + t.tv_nsec = (long int)(1000000ul * (unsigned long)opts->TimeoutBetweenLogs); | ||
| 123 | nanosleep(&t, NULL); | ||
| 124 | dlt_user_log_resend_buffer(); | ||
| 125 | dlt_user_check_buffer(&total, &used); | ||
| 126 | @@ -220,7 +220,7 @@ int compress_file_to(char *src, char *dst, int level) | ||
| 127 | MALLOC_ASSERT(buf); | ||
| 128 | |||
| 129 | while (!feof(src_file)) { | ||
| 130 | - int read = fread(buf, 1, Z_CHUNK_SZ, src_file); | ||
| 131 | + size_t read = fread(buf, 1, Z_CHUNK_SZ, src_file); | ||
| 132 | |||
| 133 | if (ferror(src_file)) { | ||
| 134 | free(buf); | ||
| 135 | @@ -230,7 +230,7 @@ int compress_file_to(char *src, char *dst, int level) | ||
| 136 | return -1; | ||
| 137 | } | ||
| 138 | |||
| 139 | - gzwrite(dst_file, buf, read); | ||
| 140 | + gzwrite(dst_file, buf, (unsigned int)read); | ||
| 141 | } | ||
| 142 | |||
| 143 | if (remove(src) < 0) | ||
| 144 | @@ -290,7 +290,7 @@ int send_one(char *src, FiletransferOptions const *opts, int which) | ||
| 145 | char *dst_tocompress;/*file which is going to be compressed, the compressed one is named dst_tosend */ | ||
| 146 | |||
| 147 | |||
| 148 | - int len = strlen(fdir) + strlen(SUBDIR_COMPRESS) + strlen(rn) + 3;/*the filename in .tocompress +2 for 2*"/", +1 for \0 */ | ||
| 149 | + size_t len = strlen(fdir) + strlen(SUBDIR_COMPRESS) + strlen(rn) + 3;/*the filename in .tocompress +2 for 2*"/", +1 for \0 */ | ||
| 150 | dst_tocompress = malloc(len); | ||
| 151 | MALLOC_ASSERT(dst_tocompress); | ||
| 152 | |||
| 153 | @@ -328,7 +328,7 @@ int send_one(char *src, FiletransferOptions const *opts, int which) | ||
| 154 | /*move it directly into "tosend" */ | ||
| 155 | DLT_LOG(dltsystem, DLT_LOG_DEBUG, | ||
| 156 | DLT_STRING("dlt-system-filetransfer, Moving file to tmp directory.")); | ||
| 157 | - int len = strlen(fdir) + strlen(SUBDIR_TOSEND) + strlen(rn) + 3; | ||
| 158 | + size_t len = strlen(fdir) + strlen(SUBDIR_TOSEND) + strlen(rn) + 3; | ||
| 159 | dst_tosend = malloc(len);/*the resulting filename in .tosend +2 for 2*"/", +1 for \0 */ | ||
| 160 | |||
| 161 | snprintf(dst_tosend, len, "%s/%s/%s", fdir, SUBDIR_TOSEND, rn); | ||
| 162 | @@ -379,7 +379,7 @@ int flush_dir_send(FiletransferOptions const *opts, const char *compress_dir, co | ||
| 163 | DLT_LOG(dltsystem, DLT_LOG_DEBUG, | ||
| 164 | DLT_STRING("dlt-system-filetransfer, old compressed file found in send directory:"), | ||
| 165 | DLT_STRING(dp->d_name)); | ||
| 166 | - int len = strlen(send_dir) + strlen(dp->d_name) + 2; | ||
| 167 | + size_t len = strlen(send_dir) + strlen(dp->d_name) + 2; | ||
| 168 | fn = malloc(len); | ||
| 169 | MALLOC_ASSERT(fn); | ||
| 170 | snprintf(fn, len, "%s/%s", send_dir, dp->d_name); | ||
| 171 | @@ -394,10 +394,10 @@ int flush_dir_send(FiletransferOptions const *opts, const char *compress_dir, co | ||
| 172 | strncpy(tmp, dp->d_name, strlen(dp->d_name) - strlen(COMPRESS_EXTENSION)); | ||
| 173 | tmp[strlen(dp->d_name) - strlen(COMPRESS_EXTENSION)] = '\0'; | ||
| 174 | |||
| 175 | - int len = strlen(tmp) + strlen(compress_dir) + 1 + 1;/*2 sizes + 1*"/" + \0 */ | ||
| 176 | - char *path_uncompressed = malloc(len); | ||
| 177 | + size_t length = strlen(tmp) + strlen(compress_dir) + 1 + 1;/*2 sizes + 1*"/" + \0 */ | ||
| 178 | + char *path_uncompressed = malloc(length); | ||
| 179 | MALLOC_ASSERT(path_uncompressed); | ||
| 180 | - snprintf(path_uncompressed, len, "%s/%s", compress_dir, tmp); | ||
| 181 | + snprintf(path_uncompressed, length, "%s/%s", compress_dir, tmp); | ||
| 182 | |||
| 183 | struct stat sb; | ||
| 184 | |||
| 185 | @@ -475,7 +475,7 @@ int flush_dir_compress(FiletransferOptions const *opts, int which, const char *c | ||
| 186 | |||
| 187 | |||
| 188 | /*compress file into to_send dir */ | ||
| 189 | - int len = strlen(compress_dir) + strlen(dp->d_name) + 2; | ||
| 190 | + size_t len = strlen(compress_dir) + strlen(dp->d_name) + 2; | ||
| 191 | char *cd_filename = malloc(len); | ||
| 192 | MALLOC_ASSERT(cd_filename); | ||
| 193 | snprintf(cd_filename, len, "%s/%s", compress_dir, dp->d_name); | ||
| 194 | @@ -526,7 +526,7 @@ int flush_dir_original(FiletransferOptions const *opts, int which) | ||
| 195 | |||
| 196 | DLT_LOG(dltsystem, DLT_LOG_DEBUG, | ||
| 197 | DLT_STRING("dlt-system-filetransfer, old file found in directory.")); | ||
| 198 | - int len = strlen(sdir) + strlen(dp->d_name) + 2; | ||
| 199 | + size_t len = strlen(sdir) + strlen(dp->d_name) + 2; | ||
| 200 | char *fn = malloc(len); | ||
| 201 | MALLOC_ASSERT(fn); | ||
| 202 | snprintf(fn, len, "%s/%s", sdir, dp->d_name); | ||
| 203 | @@ -564,7 +564,7 @@ int flush_dir(FiletransferOptions const *opts, int which) | ||
| 204 | |||
| 205 | char *compress_dir; | ||
| 206 | char *send_dir; | ||
| 207 | - int len = strlen(opts->Directory[which]) + strlen(SUBDIR_COMPRESS) + 2; | ||
| 208 | + size_t len = strlen(opts->Directory[which]) + strlen(SUBDIR_COMPRESS) + 2; | ||
| 209 | compress_dir = malloc (len); | ||
| 210 | MALLOC_ASSERT(compress_dir); | ||
| 211 | snprintf(compress_dir, len, "%s/%s", opts->Directory[which], SUBDIR_COMPRESS); | ||
| 212 | @@ -625,7 +625,7 @@ int init_filetransfer_dirs(DltSystemConfiguration *config) | ||
| 213 | /*create subdirectories for processing the files */ | ||
| 214 | |||
| 215 | char *subdirpath; | ||
| 216 | - int len = strlen(opts->Directory[i]) + strlen(SUBDIR_COMPRESS) + 2; | ||
| 217 | + size_t len = strlen(opts->Directory[i]) + strlen(SUBDIR_COMPRESS) + 2; | ||
| 218 | subdirpath = malloc (len); | ||
| 219 | MALLOC_ASSERT(subdirpath); | ||
| 220 | snprintf(subdirpath, len, "%s/%s", opts->Directory[i], SUBDIR_COMPRESS); | ||
| 221 | @@ -699,7 +699,7 @@ int process_files(FiletransferOptions const *opts) | ||
| 222 | |||
| 223 | unsigned int i = 0; | ||
| 224 | |||
| 225 | - while (i < (len - INOTIFY_SZ)) { | ||
| 226 | + while (i < ((long unsigned int)len - INOTIFY_SZ)) { | ||
| 227 | struct inotify_event *ie = (struct inotify_event *)&buf[i]; | ||
| 228 | |||
| 229 | if (ie->len > 0) { | ||
| 230 | @@ -712,26 +712,29 @@ int process_files(FiletransferOptions const *opts) | ||
| 231 | DLT_LOG_DEBUG, | ||
| 232 | DLT_STRING("dlt-system-filetransfer, found new file."), | ||
| 233 | DLT_STRING(ie->name)); | ||
| 234 | - int length = strlen(opts->Directory[j]) + ie->len + 1; | ||
| 235 | + size_t length = strlen(opts->Directory[j]) + strlen(ie->name) + 2; | ||
| 236 | |||
| 237 | if (length > PATH_MAX) { | ||
| 238 | DLT_LOG(filetransferContext, | ||
| 239 | DLT_LOG_ERROR, | ||
| 240 | DLT_STRING( | ||
| 241 | "dlt-system-filetransfer: Very long path for file transfer. Cancelling transfer! Length is: "), | ||
| 242 | - DLT_INT(length)); | ||
| 243 | + DLT_INT((int)length)); | ||
| 244 | return -1; | ||
| 245 | } | ||
| 246 | |||
| 247 | char *tosend = malloc(length); | ||
| 248 | +#pragma GCC diagnostic push | ||
| 249 | +#pragma GCC diagnostic ignored "-Wformat-truncation=" | ||
| 250 | snprintf(tosend, length, "%s/%s", opts->Directory[j], ie->name); | ||
| 251 | +#pragma GCC diagnostic pop | ||
| 252 | send_one(tosend, opts, j); | ||
| 253 | free(tosend); | ||
| 254 | } | ||
| 255 | } | ||
| 256 | } | ||
| 257 | |||
| 258 | - i += INOTIFY_SZ + ie->len; | ||
| 259 | + i += (unsigned int)INOTIFY_SZ + ie->len; | ||
| 260 | } | ||
| 261 | |||
| 262 | #endif | ||
| 263 | @@ -741,4 +744,4 @@ int process_files(FiletransferOptions const *opts) | ||
| 264 | void filetransfer_fd_handler(DltSystemConfiguration *config) | ||
| 265 | { | ||
| 266 | process_files(&(config->Filetransfer)); | ||
| 267 | -} | ||
| 268 | \ No newline at end of file | ||
| 269 | +} | ||
| 270 | diff --git a/src/system/dlt-system-journal.c b/src/system/dlt-system-journal.c | ||
| 271 | index 366555b..9a55c3f 100644 | ||
| 272 | --- a/src/system/dlt-system-journal.c | ||
| 273 | +++ b/src/system/dlt-system-journal.c | ||
| 274 | @@ -393,7 +393,7 @@ void register_journal_fd(sd_journal **j, struct pollfd *pollfd, int i, DltSyste | ||
| 275 | DLT_STRING(strerror(pollfd[i].fd))); | ||
| 276 | j_tmp = NULL; | ||
| 277 | } | ||
| 278 | - pollfd[i].events = sd_journal_get_events(j_tmp); | ||
| 279 | + pollfd[i].events = (short)sd_journal_get_events(j_tmp); | ||
| 280 | if(pollfd[i].events < 0) { | ||
| 281 | DLT_LOG(dltsystem, DLT_LOG_ERROR, DLT_STRING("Error while getting journal events: "), | ||
| 282 | DLT_STRING(strerror(pollfd[i].events))); | ||
| 283 | diff --git a/src/system/dlt-system-logfile.c b/src/system/dlt-system-logfile.c | ||
| 284 | index 941a3be..d31441c 100644 | ||
| 285 | --- a/src/system/dlt-system-logfile.c | ||
| 286 | +++ b/src/system/dlt-system-logfile.c | ||
| 287 | @@ -64,7 +64,7 @@ void send_file(LogFileOptions const *fileopt, int n) | ||
| 288 | FILE *pFile; | ||
| 289 | DltContext context = logfileContext[n]; | ||
| 290 | char buffer[1024]; | ||
| 291 | - int bytes; | ||
| 292 | + size_t bytes; | ||
| 293 | int seq = 1; | ||
| 294 | |||
| 295 | pFile = fopen((*fileopt).Filename[n], "r"); | ||
| 296 | @@ -73,7 +73,7 @@ void send_file(LogFileOptions const *fileopt, int n) | ||
| 297 | while (!feof(pFile)) { | ||
| 298 | bytes = fread(buffer, 1, sizeof(buffer) - 1, pFile); | ||
| 299 | |||
| 300 | - if (bytes >= 0) | ||
| 301 | + if (bytes == (sizeof(buffer) - 1)) | ||
| 302 | buffer[bytes] = 0; | ||
| 303 | else | ||
| 304 | buffer[0] = 0; | ||
| 305 | diff --git a/src/system/dlt-system-process-handling.c b/src/system/dlt-system-process-handling.c | ||
| 306 | index 3e092d4..708e9e3 100644 | ||
| 307 | --- a/src/system/dlt-system-process-handling.c | ||
| 308 | +++ b/src/system/dlt-system-process-handling.c | ||
| 309 | @@ -201,7 +201,7 @@ int register_timer_fd(struct pollfd *pollfd, int fdcnt) | ||
| 310 | void timer_fd_handler(int fd, DltSystemConfiguration *config) | ||
| 311 | { | ||
| 312 | uint64_t timersElapsed = 0ULL; | ||
| 313 | - int r = read(fd, &timersElapsed, 8U); // only needed to reset fd event | ||
| 314 | + int r = (int)read(fd, &timersElapsed, 8U); // only needed to reset fd event | ||
| 315 | if (r < 0) | ||
| 316 | DLT_LOG(dltsystem, DLT_LOG_ERROR, DLT_STRING("Error while reading timer fd: "), | ||
| 317 | DLT_STRING(strerror(r))); | ||
| 318 | diff --git a/src/system/dlt-system-processes.c b/src/system/dlt-system-processes.c | ||
| 319 | index c35596c..b17b8ee 100644 | ||
| 320 | --- a/src/system/dlt-system-processes.c | ||
| 321 | +++ b/src/system/dlt-system-processes.c | ||
| 322 | @@ -72,7 +72,7 @@ void send_process(LogProcessOptions const *popts, int n) | ||
| 323 | struct dirent *dp; | ||
| 324 | char filename[PATH_MAX]; | ||
| 325 | char buffer[1024]; | ||
| 326 | - int bytes; | ||
| 327 | + size_t bytes; | ||
| 328 | int found = 0; | ||
| 329 | |||
| 330 | /* go through all process files in directory */ | ||
| 331 | diff --git a/src/system/dlt-system-syslog.c b/src/system/dlt-system-syslog.c | ||
| 332 | index 59e9d3f..d6b1b8a 100644 | ||
| 333 | --- a/src/system/dlt-system-syslog.c | ||
| 334 | +++ b/src/system/dlt-system-syslog.c | ||
| 335 | @@ -88,7 +88,7 @@ int init_socket(SyslogOptions opts) | ||
| 336 | #ifdef DLT_USE_IPv6 | ||
| 337 | syslog_addr.sin6_family = AF_INET6; | ||
| 338 | syslog_addr.sin6_addr = in6addr_any; | ||
| 339 | - syslog_addr.sin6_port = htons(opts.Port); | ||
| 340 | + syslog_addr.sin6_port = htons((uint16_t)opts.Port); | ||
| 341 | #else | ||
| 342 | syslog_addr.sin_family = AF_INET; | ||
| 343 | syslog_addr.sin_addr.s_addr = INADDR_ANY; | ||
| 344 | @@ -117,7 +117,7 @@ int read_socket(int sock) | ||
| 345 | struct sockaddr_in client_addr; | ||
| 346 | socklen_t addr_len = sizeof(struct sockaddr_in); | ||
| 347 | |||
| 348 | - int bytes_read = recvfrom(sock, recv_data, RECV_BUF_SZ, 0, | ||
| 349 | + int bytes_read = (int)recvfrom(sock, recv_data, RECV_BUF_SZ, 0, | ||
| 350 | (struct sockaddr *)&client_addr, &addr_len); | ||
| 351 | |||
| 352 | if (bytes_read == -1) { | ||
| 353 | @@ -157,4 +157,4 @@ int register_syslog_fd(struct pollfd *pollfd, int i, DltSystemConfiguration *con | ||
| 354 | void syslog_fd_handler(int syslogSock) | ||
| 355 | { | ||
| 356 | read_socket(syslogSock); | ||
| 357 | -} | ||
| 358 | \ No newline at end of file | ||
| 359 | +} | ||
| 360 | diff --git a/src/system/dlt-system-watchdog.c b/src/system/dlt-system-watchdog.c | ||
| 361 | index 7ed1604..6334214 100644 | ||
| 362 | --- a/src/system/dlt-system-watchdog.c | ||
| 363 | +++ b/src/system/dlt-system-watchdog.c | ||
| 364 | @@ -56,7 +56,7 @@ int calculate_period(struct itimerspec *itval) | ||
| 365 | } | ||
| 366 | |||
| 367 | DLT_LOG(watchdogContext, DLT_LOG_DEBUG, DLT_STRING("watchdogusec: "), DLT_STRING(watchdogUSec)); | ||
| 368 | - watchdogTimeoutSeconds = atoi(watchdogUSec); | ||
| 369 | + watchdogTimeoutSeconds = (unsigned int)atoi(watchdogUSec); | ||
| 370 | |||
| 371 | if (watchdogTimeoutSeconds <= 0) { | ||
| 372 | snprintf(str, 512, "systemd watchdog timeout incorrect: %u\n", watchdogTimeoutSeconds); | ||
| 373 | @@ -78,9 +78,9 @@ int calculate_period(struct itimerspec *itval) | ||
| 374 | sec = notifiyPeriodNSec / 1000000; | ||
| 375 | ns = (notifiyPeriodNSec - (sec * 1000000)) * 1000; | ||
| 376 | itval->it_interval.tv_sec = sec; | ||
| 377 | - itval->it_interval.tv_nsec = ns; | ||
| 378 | + itval->it_interval.tv_nsec = (long int)ns; | ||
| 379 | itval->it_value.tv_sec = sec; | ||
| 380 | - itval->it_value.tv_nsec = ns; | ||
| 381 | + itval->it_value.tv_nsec = (long int)ns; | ||
| 382 | |||
| 383 | return 0; | ||
| 384 | } | ||
| 385 | @@ -114,7 +114,7 @@ void watchdog_fd_handler(int fd) | ||
| 386 | #endif | ||
| 387 | { | ||
| 388 | uint64_t timersElapsed = 0ULL; | ||
| 389 | - int r = read(fd, &timersElapsed, 8U); // only needed to reset fd event | ||
| 390 | + int r = (int)read(fd, &timersElapsed, 8U); // only needed to reset fd event | ||
| 391 | if(r < 0) | ||
| 392 | DLT_LOG(watchdogContext, DLT_LOG_ERROR, DLT_STRING("Could not reset systemd watchdog. Exit with: "), | ||
| 393 | DLT_STRING(strerror(r))); | ||
| 394 | diff --git a/systemd/3rdparty/sd-daemon.c b/systemd/3rdparty/sd-daemon.c | ||
| 395 | index de3f985..9fde8cc 100644 | ||
| 396 | --- a/systemd/3rdparty/sd-daemon.c | ||
| 397 | +++ b/systemd/3rdparty/sd-daemon.c | ||
| 398 | @@ -46,6 +46,7 @@ | ||
| 399 | #include <stdio.h> | ||
| 400 | #include <stddef.h> | ||
| 401 | #include <limits.h> | ||
| 402 | +#include <stdint.h> | ||
| 403 | |||
| 404 | #if defined(__linux__) | ||
| 405 | #include <mqueue.h> | ||
| 406 | @@ -456,12 +457,12 @@ _sd_export_ int sd_notify(int unset_environment, const char *state) { | ||
| 407 | sockaddr.un.sun_path[0] = 0; | ||
| 408 | |||
| 409 | memset(&iovec, 0, sizeof(iovec)); | ||
| 410 | - iovec.iov_base = (char*) state; | ||
| 411 | + iovec.iov_base = (void *)(uintptr_t)state; | ||
| 412 | iovec.iov_len = strlen(state); | ||
| 413 | |||
| 414 | memset(&msghdr, 0, sizeof(msghdr)); | ||
| 415 | msghdr.msg_name = &sockaddr; | ||
| 416 | - msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e); | ||
| 417 | + msghdr.msg_namelen = (socklen_t)(offsetof(struct sockaddr_un, sun_path) + strlen(e)); | ||
| 418 | |||
| 419 | if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) | ||
| 420 | msghdr.msg_namelen = sizeof(struct sockaddr_un); | ||
| 421 | -- | ||
| 422 | 2.34.1 | ||
| 423 | |||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0003-allow-build-with-cmake-4.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0003-allow-build-with-cmake-4.patch deleted file mode 100644 index ac5fec5684..0000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0003-allow-build-with-cmake-4.patch +++ /dev/null | |||
| @@ -1,99 +0,0 @@ | |||
| 1 | From ae23f2cccc169874d89903cad24bf36e19bef659 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
| 3 | Date: Wed, 9 Jul 2025 18:18:33 +0300 | ||
| 4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
| 5 | compatibility | ||
| 6 | |||
| 7 | Fix: | ||
| 8 | |||
| 9 | | CMake Error at CMakeLists.txt:17 (cmake_minimum_required): | ||
| 10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
| 11 | | | ||
| 12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
| 13 | | to tell CMake that the project requires at least <min> but has been updated | ||
| 14 | | to work with policies introduced by <max> or earlier. | ||
| 15 | | | ||
| 16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
| 17 | | | ||
| 18 | | | ||
| 19 | | -- Configuring incomplete, errors occurred! | ||
| 20 | |||
| 21 | Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/755] | ||
| 22 | |||
| 23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
| 24 | --- | ||
| 25 | CMakeLists.txt | 2 +- | ||
| 26 | examples/example1/CMakeLists.txt | 2 +- | ||
| 27 | examples/example2/CMakeLists.txt | 2 +- | ||
| 28 | examples/example3/CMakeLists.txt | 2 +- | ||
| 29 | examples/example4/CMakeLists.txt | 2 +- | ||
| 30 | 5 files changed, 5 insertions(+), 5 deletions(-) | ||
| 31 | |||
| 32 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 33 | index 94185b8..2a0f619 100644 | ||
| 34 | --- a/CMakeLists.txt | ||
| 35 | +++ b/CMakeLists.txt | ||
| 36 | @@ -14,7 +14,7 @@ | ||
| 37 | ####### | ||
| 38 | |||
| 39 | # Set minimum Cmake version and setup policy behavior | ||
| 40 | -cmake_minimum_required(VERSION 3.3) | ||
| 41 | +cmake_minimum_required(VERSION 3.5) | ||
| 42 | |||
| 43 | if(${CMAKE_VERSION} VERSION_GREATER "3.20" OR ${CMAKE_VERSION} VERSION_EQUAL "3.20") | ||
| 44 | cmake_policy(SET CMP0115 OLD) | ||
| 45 | diff --git a/examples/example1/CMakeLists.txt b/examples/example1/CMakeLists.txt | ||
| 46 | index 60644a1..44cd053 100644 | ||
| 47 | --- a/examples/example1/CMakeLists.txt | ||
| 48 | +++ b/examples/example1/CMakeLists.txt | ||
| 49 | @@ -17,7 +17,7 @@ | ||
| 50 | # DLT example implementation | ||
| 51 | # | ||
| 52 | |||
| 53 | -cmake_minimum_required( VERSION 2.6 ) | ||
| 54 | +cmake_minimum_required( VERSION 3.5 ) | ||
| 55 | project( automotive-dlt-example1 ) | ||
| 56 | |||
| 57 | # | ||
| 58 | diff --git a/examples/example2/CMakeLists.txt b/examples/example2/CMakeLists.txt | ||
| 59 | index 66a4f24..a8efbcf 100644 | ||
| 60 | --- a/examples/example2/CMakeLists.txt | ||
| 61 | +++ b/examples/example2/CMakeLists.txt | ||
| 62 | @@ -17,7 +17,7 @@ | ||
| 63 | # DLT example implementation | ||
| 64 | # | ||
| 65 | |||
| 66 | -cmake_minimum_required( VERSION 2.6 ) | ||
| 67 | +cmake_minimum_required( VERSION 3.5 ) | ||
| 68 | project( automotive-dlt-example2 ) | ||
| 69 | |||
| 70 | # | ||
| 71 | diff --git a/examples/example3/CMakeLists.txt b/examples/example3/CMakeLists.txt | ||
| 72 | index 45b7467..4d4958d 100644 | ||
| 73 | --- a/examples/example3/CMakeLists.txt | ||
| 74 | +++ b/examples/example3/CMakeLists.txt | ||
| 75 | @@ -17,7 +17,7 @@ | ||
| 76 | # DLT example implementation | ||
| 77 | # | ||
| 78 | |||
| 79 | -cmake_minimum_required( VERSION 2.6 ) | ||
| 80 | +cmake_minimum_required( VERSION 3.5 ) | ||
| 81 | project( automotive-dlt-example3 ) | ||
| 82 | |||
| 83 | # | ||
| 84 | diff --git a/examples/example4/CMakeLists.txt b/examples/example4/CMakeLists.txt | ||
| 85 | index 53a4fad..161c333 100644 | ||
| 86 | --- a/examples/example4/CMakeLists.txt | ||
| 87 | +++ b/examples/example4/CMakeLists.txt | ||
| 88 | @@ -17,7 +17,7 @@ | ||
| 89 | # DLT example implementation | ||
| 90 | # | ||
| 91 | |||
| 92 | -cmake_minimum_required( VERSION 2.6 ) | ||
| 93 | +cmake_minimum_required( VERSION 3.5 ) | ||
| 94 | project( automotive-dlt-example4 ) | ||
| 95 | |||
| 96 | # | ||
| 97 | -- | ||
| 98 | 2.43.0 | ||
| 99 | |||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch deleted file mode 100644 index 3699b8c83a..0000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch +++ /dev/null | |||
| @@ -1,80 +0,0 @@ | |||
| 1 | Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/544] | ||
| 2 | |||
| 3 | From 8121a979026d5fcb05bd4e5d3a0647f321b56106 Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | ||
| 5 | Date: Thu, 28 Sep 2023 12:54:23 +0200 | ||
| 6 | Subject: [PATCH] Add common dlt_cdh_cpuinfo.c to unblock build on non amd64 | ||
| 7 | and i386 arcs | ||
| 8 | |||
| 9 | --- | ||
| 10 | src/core_dump_handler/dlt_cdh.h | 2 ++ | ||
| 11 | src/core_dump_handler/dlt_cdh_cpuinfo.c | 33 +++++++++++++++++++++++++ | ||
| 12 | src/core_dump_handler/dlt_cdh_crashid.c | 2 +- | ||
| 13 | 3 files changed, 36 insertions(+), 1 deletion(-) | ||
| 14 | create mode 100644 src/core_dump_handler/dlt_cdh_cpuinfo.c | ||
| 15 | |||
| 16 | diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h | ||
| 17 | index d572ecf3..8608c6c4 100644 | ||
| 18 | --- a/src/core_dump_handler/dlt_cdh.h | ||
| 19 | +++ b/src/core_dump_handler/dlt_cdh.h | ||
| 20 | @@ -55,6 +55,8 @@ typedef struct | ||
| 21 | uint64_t pc; | ||
| 22 | uint64_t ip; | ||
| 23 | uint64_t lr; | ||
| 24 | + uint64_t sp; | ||
| 25 | + uint64_t fp; | ||
| 26 | |||
| 27 | } cdh_registers_t; | ||
| 28 | |||
| 29 | diff --git a/src/core_dump_handler/dlt_cdh_cpuinfo.c b/src/core_dump_handler/dlt_cdh_cpuinfo.c | ||
| 30 | new file mode 100644 | ||
| 31 | index 00000000..03509fda | ||
| 32 | --- /dev/null | ||
| 33 | +++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c | ||
| 34 | @@ -0,0 +1,33 @@ | ||
| 35 | +/* | ||
| 36 | + * SPDX license identifier: MPL-2.0 | ||
| 37 | + * | ||
| 38 | + * Copyright (C) 2011-2015, BMW AG | ||
| 39 | + * | ||
| 40 | + * This file is part of COVESA Project DLT - Diagnostic Log and Trace. | ||
| 41 | + * | ||
| 42 | + * This Source Code Form is subject to the terms of the | ||
| 43 | + * Mozilla Public License (MPL), v. 2.0. | ||
| 44 | + * If a copy of the MPL was not distributed with this file, | ||
| 45 | + * You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| 46 | + * | ||
| 47 | + * For further information see http://www.covesa.org/. | ||
| 48 | + */ | ||
| 49 | + | ||
| 50 | +/*! | ||
| 51 | + * \author Gianfranco Costamagna <locutusofborg@debian.org> | ||
| 52 | + * | ||
| 53 | + * \copyright Copyright © 2011-2015 BMW AG. \n | ||
| 54 | + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. | ||
| 55 | + * | ||
| 56 | + * \file dlt_cdh_cpuinfo.c | ||
| 57 | + */ | ||
| 58 | + | ||
| 59 | +#include "dlt_cdh_cpuinfo.h" | ||
| 60 | + | ||
| 61 | +void get_registers(prstatus_t *prstatus, cdh_registers_t *registers) | ||
| 62 | +{ | ||
| 63 | +/* struct user_regs_struct *ptr_reg = (struct user_regs_struct *)prstatus->pr_reg; | ||
| 64 | + | ||
| 65 | + registers->pc = ptr_reg->pc;*/ /* [REG_PROC_COUNTER]; */ | ||
| 66 | + | ||
| 67 | +} | ||
| 68 | diff --git a/src/core_dump_handler/dlt_cdh_crashid.c b/src/core_dump_handler/dlt_cdh_crashid.c | ||
| 69 | index bca44e0e..8dd98d70 100644 | ||
| 70 | --- a/src/core_dump_handler/dlt_cdh_crashid.c | ||
| 71 | +++ b/src/core_dump_handler/dlt_cdh_crashid.c | ||
| 72 | @@ -30,7 +30,7 @@ | ||
| 73 | #include <stdio.h> | ||
| 74 | #include <string.h> | ||
| 75 | #include <errno.h> | ||
| 76 | -#include <asm/prctl.h> | ||
| 77 | +#include <sys/prctl.h> | ||
| 78 | #include <inttypes.h> | ||
| 79 | |||
| 80 | #include "dlt_cdh.h" | ||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/567.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/567.patch deleted file mode 100644 index fd36480456..0000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/567.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/567] | ||
| 2 | |||
| 3 | From c84e48f6986054cf8b9459e608235b7bd1635746 Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | ||
| 5 | Date: Mon, 13 Nov 2023 12:37:23 +0100 | ||
| 6 | Subject: [PATCH] dlt_cdh: | ||
| 7 | |||
| 8 | Make sure on 64 bit we read an ELF64 structure. | ||
| 9 | Otherwise we get a read error, and the context file is missing some good | ||
| 10 | to know information | ||
| 11 | --- | ||
| 12 | src/core_dump_handler/dlt_cdh.h | 7 +++++++ | ||
| 13 | 1 file changed, 7 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h | ||
| 16 | index 8608c6c4..3dac480a 100644 | ||
| 17 | --- a/src/core_dump_handler/dlt_cdh.h | ||
| 18 | +++ b/src/core_dump_handler/dlt_cdh.h | ||
| 19 | @@ -45,10 +45,17 @@ | ||
| 20 | #define CORE_FILE_PATTERN "%s/core.%d.%s.%d.gz" | ||
| 21 | #define CONTEXT_FILE_PATTERN "%s/context.%d.%s.%d.txt" | ||
| 22 | |||
| 23 | +#if ((__SIZEOF_POINTER) == 4) | ||
| 24 | #define ELF_Ehdr Elf32_Ehdr | ||
| 25 | #define ELF_Phdr Elf32_Phdr | ||
| 26 | #define ELF_Shdr Elf32_Shdr | ||
| 27 | #define ELF_Nhdr Elf32_Nhdr | ||
| 28 | +#else | ||
| 29 | +#define ELF_Ehdr Elf64_Ehdr | ||
| 30 | +#define ELF_Phdr Elf64_Phdr | ||
| 31 | +#define ELF_Shdr Elf64_Shdr | ||
| 32 | +#define ELF_Nhdr Elf64_Nhdr | ||
| 33 | +#endif | ||
| 34 | |||
| 35 | typedef struct | ||
| 36 | { | ||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb index 82edde6c9d..5e80acd67e 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb | |||
| @@ -17,12 +17,13 @@ DEPENDS = "zlib gzip-native json-c" | |||
| 17 | SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ | 17 | SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ |
| 18 | file://0002-Don-t-execute-processes-as-a-specific-user.patch \ | 18 | file://0002-Don-t-execute-processes-as-a-specific-user.patch \ |
| 19 | file://0004-Modify-systemd-config-directory.patch \ | 19 | file://0004-Modify-systemd-config-directory.patch \ |
| 20 | file://544.patch \ | 20 | file://0001-Fix-compile-failure-related-to-gzlog.patch \ |
| 21 | file://567.patch \ | 21 | file://0001-Fix-kinds-of-build-failure.patch \ |
| 22 | file://0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch \ | 22 | file://0001-Fix-build-failures.patch \ |
| 23 | file://0003-allow-build-with-cmake-4.patch \ | 23 | file://0001-fix-build-failure-when-systemd-is-enabled.patch \ |
| 24 | file://0001-Fix-build-failure-with-glibc-2.43.patch \ | ||
| 24 | " | 25 | " |
| 25 | SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f" | 26 | SRCREV = "f595ea29d1007ca1c3b2d1fd3a88adf7d3db6320" |
| 26 | 27 | ||
| 27 | 28 | ||
| 28 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal ', '', d)} \ | 29 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal ', '', d)} \ |
| @@ -71,4 +72,5 @@ FILES:${PN}-doc += "${datadir}/dlt-filetransfer" | |||
| 71 | 72 | ||
| 72 | do_install:append() { | 73 | do_install:append() { |
| 73 | rm -f ${D}${bindir}/dlt-test-* | 74 | rm -f ${D}${bindir}/dlt-test-* |
| 75 | sed -i -e 's:${RECIPE_SYSROOT}::g' ${D}/usr/lib/pkgconfig/automotive-dlt.pc | ||
| 74 | } | 76 | } |
diff --git a/meta-oe/recipes-extended/fd-find/fd-find-crates.inc b/meta-oe/recipes-extended/fd-find/fd-find-crates.inc index ae70f2182f..3ee3a3eb44 100644 --- a/meta-oe/recipes-extended/fd-find/fd-find-crates.inc +++ b/meta-oe/recipes-extended/fd-find/fd-find-crates.inc | |||
| @@ -2,217 +2,255 @@ | |||
| 2 | 2 | ||
| 3 | # from Cargo.lock | 3 | # from Cargo.lock |
| 4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
| 5 | crate://crates.io/aho-corasick/1.1.3 \ | 5 | crate://crates.io/aho-corasick/1.1.4 \ |
| 6 | crate://crates.io/anstream/0.6.19 \ | 6 | crate://crates.io/anstream/0.6.21 \ |
| 7 | crate://crates.io/anstyle/1.0.11 \ | 7 | crate://crates.io/anstyle/1.0.13 \ |
| 8 | crate://crates.io/anstyle-parse/0.2.7 \ | 8 | crate://crates.io/anstyle-parse/0.2.7 \ |
| 9 | crate://crates.io/anstyle-query/1.1.3 \ | 9 | crate://crates.io/anstyle-query/1.1.5 \ |
| 10 | crate://crates.io/anstyle-wincon/3.0.9 \ | 10 | crate://crates.io/anstyle-wincon/3.0.11 \ |
| 11 | crate://crates.io/anyhow/1.0.98 \ | 11 | crate://crates.io/anyhow/1.0.102 \ |
| 12 | crate://crates.io/argmax/0.4.0 \ | 12 | crate://crates.io/argmax/0.4.0 \ |
| 13 | crate://crates.io/bitflags/1.3.2 \ | 13 | crate://crates.io/bitflags/1.3.2 \ |
| 14 | crate://crates.io/bitflags/2.9.1 \ | 14 | crate://crates.io/bitflags/2.11.0 \ |
| 15 | crate://crates.io/bstr/1.12.0 \ | 15 | crate://crates.io/block2/0.6.2 \ |
| 16 | crate://crates.io/cc/1.2.29 \ | 16 | crate://crates.io/bstr/1.12.1 \ |
| 17 | crate://crates.io/cfg-if/1.0.1 \ | 17 | crate://crates.io/cc/1.2.56 \ |
| 18 | crate://crates.io/cfg-if/1.0.4 \ | ||
| 18 | crate://crates.io/cfg_aliases/0.2.1 \ | 19 | crate://crates.io/cfg_aliases/0.2.1 \ |
| 19 | crate://crates.io/clap/4.5.42 \ | 20 | crate://crates.io/clap/4.5.60 \ |
| 20 | crate://crates.io/clap_builder/4.5.42 \ | 21 | crate://crates.io/clap_builder/4.5.60 \ |
| 21 | crate://crates.io/clap_complete/4.5.55 \ | 22 | crate://crates.io/clap_complete/4.5.66 \ |
| 22 | crate://crates.io/clap_derive/4.5.41 \ | 23 | crate://crates.io/clap_derive/4.5.55 \ |
| 23 | crate://crates.io/clap_lex/0.7.5 \ | 24 | crate://crates.io/clap_lex/1.0.0 \ |
| 24 | crate://crates.io/colorchoice/1.0.4 \ | 25 | crate://crates.io/colorchoice/1.0.4 \ |
| 25 | crate://crates.io/crossbeam-channel/0.5.15 \ | 26 | crate://crates.io/crossbeam-channel/0.5.15 \ |
| 26 | crate://crates.io/crossbeam-deque/0.8.6 \ | 27 | crate://crates.io/crossbeam-deque/0.8.6 \ |
| 27 | crate://crates.io/crossbeam-epoch/0.9.18 \ | 28 | crate://crates.io/crossbeam-epoch/0.9.18 \ |
| 28 | crate://crates.io/crossbeam-utils/0.8.21 \ | 29 | crate://crates.io/crossbeam-utils/0.8.21 \ |
| 29 | crate://crates.io/ctrlc/3.4.7 \ | 30 | crate://crates.io/ctrlc/3.5.2 \ |
| 30 | crate://crates.io/diff/0.1.13 \ | 31 | crate://crates.io/diff/0.1.13 \ |
| 31 | crate://crates.io/errno/0.3.13 \ | 32 | crate://crates.io/dispatch2/0.3.1 \ |
| 32 | crate://crates.io/etcetera/0.10.0 \ | 33 | crate://crates.io/equivalent/1.0.2 \ |
| 34 | crate://crates.io/errno/0.3.14 \ | ||
| 35 | crate://crates.io/etcetera/0.11.0 \ | ||
| 33 | crate://crates.io/faccess/0.2.4 \ | 36 | crate://crates.io/faccess/0.2.4 \ |
| 34 | crate://crates.io/fastrand/2.3.0 \ | 37 | crate://crates.io/fastrand/2.3.0 \ |
| 35 | crate://crates.io/filetime/0.2.25 \ | 38 | crate://crates.io/filetime/0.2.27 \ |
| 36 | crate://crates.io/getrandom/0.3.3 \ | 39 | crate://crates.io/find-msvc-tools/0.1.9 \ |
| 37 | crate://crates.io/globset/0.4.16 \ | 40 | crate://crates.io/foldhash/0.1.5 \ |
| 41 | crate://crates.io/getrandom/0.4.2 \ | ||
| 42 | crate://crates.io/globset/0.4.18 \ | ||
| 43 | crate://crates.io/hashbrown/0.15.5 \ | ||
| 44 | crate://crates.io/hashbrown/0.16.1 \ | ||
| 38 | crate://crates.io/heck/0.5.0 \ | 45 | crate://crates.io/heck/0.5.0 \ |
| 39 | crate://crates.io/home/0.5.9 \ | 46 | crate://crates.io/id-arena/2.3.0 \ |
| 40 | crate://crates.io/ignore/0.4.23 \ | 47 | crate://crates.io/ignore/0.4.25 \ |
| 41 | crate://crates.io/is_terminal_polyfill/1.70.1 \ | 48 | crate://crates.io/indexmap/2.13.0 \ |
| 42 | crate://crates.io/jiff/0.2.15 \ | 49 | crate://crates.io/is_terminal_polyfill/1.70.2 \ |
| 43 | crate://crates.io/jiff-static/0.2.15 \ | 50 | crate://crates.io/itoa/1.0.17 \ |
| 44 | crate://crates.io/jiff-tzdb/0.1.4 \ | 51 | crate://crates.io/jiff/0.2.23 \ |
| 52 | crate://crates.io/jiff-static/0.2.23 \ | ||
| 53 | crate://crates.io/jiff-tzdb/0.1.6 \ | ||
| 45 | crate://crates.io/jiff-tzdb-platform/0.1.3 \ | 54 | crate://crates.io/jiff-tzdb-platform/0.1.3 \ |
| 46 | crate://crates.io/libc/0.2.174 \ | 55 | crate://crates.io/leb128fmt/0.1.0 \ |
| 47 | crate://crates.io/libredox/0.1.4 \ | 56 | crate://crates.io/libc/0.2.183 \ |
| 48 | crate://crates.io/linux-raw-sys/0.9.4 \ | 57 | crate://crates.io/libredox/0.1.14 \ |
| 49 | crate://crates.io/log/0.4.27 \ | 58 | crate://crates.io/linux-raw-sys/0.12.1 \ |
| 50 | crate://crates.io/lscolors/0.20.0 \ | 59 | crate://crates.io/log/0.4.29 \ |
| 51 | crate://crates.io/memchr/2.7.5 \ | 60 | crate://crates.io/lscolors/0.21.0 \ |
| 61 | crate://crates.io/memchr/2.8.0 \ | ||
| 52 | crate://crates.io/nix/0.30.1 \ | 62 | crate://crates.io/nix/0.30.1 \ |
| 53 | crate://crates.io/normpath/1.3.0 \ | 63 | crate://crates.io/nix/0.31.2 \ |
| 54 | crate://crates.io/nu-ansi-term/0.50.1 \ | 64 | crate://crates.io/normpath/1.5.0 \ |
| 65 | crate://crates.io/nu-ansi-term/0.50.3 \ | ||
| 66 | crate://crates.io/objc2/0.6.4 \ | ||
| 67 | crate://crates.io/objc2-encode/4.1.0 \ | ||
| 55 | crate://crates.io/once_cell/1.21.3 \ | 68 | crate://crates.io/once_cell/1.21.3 \ |
| 56 | crate://crates.io/once_cell_polyfill/1.70.1 \ | 69 | crate://crates.io/once_cell_polyfill/1.70.2 \ |
| 57 | crate://crates.io/portable-atomic/1.11.1 \ | 70 | crate://crates.io/plain/0.2.3 \ |
| 58 | crate://crates.io/portable-atomic-util/0.2.4 \ | 71 | crate://crates.io/portable-atomic/1.13.1 \ |
| 59 | crate://crates.io/proc-macro2/1.0.95 \ | 72 | crate://crates.io/portable-atomic-util/0.2.5 \ |
| 60 | crate://crates.io/quote/1.0.40 \ | 73 | crate://crates.io/prettyplease/0.2.37 \ |
| 61 | crate://crates.io/r-efi/5.3.0 \ | 74 | crate://crates.io/proc-macro2/1.0.106 \ |
| 62 | crate://crates.io/redox_syscall/0.5.13 \ | 75 | crate://crates.io/quote/1.0.45 \ |
| 63 | crate://crates.io/regex/1.11.1 \ | 76 | crate://crates.io/r-efi/6.0.0 \ |
| 64 | crate://crates.io/regex-automata/0.4.9 \ | 77 | crate://crates.io/redox_syscall/0.7.3 \ |
| 65 | crate://crates.io/regex-syntax/0.8.5 \ | 78 | crate://crates.io/regex/1.12.3 \ |
| 66 | crate://crates.io/rustix/1.0.7 \ | 79 | crate://crates.io/regex-automata/0.4.14 \ |
| 80 | crate://crates.io/regex-syntax/0.8.10 \ | ||
| 81 | crate://crates.io/rustix/1.1.4 \ | ||
| 67 | crate://crates.io/same-file/1.0.6 \ | 82 | crate://crates.io/same-file/1.0.6 \ |
| 68 | crate://crates.io/serde/1.0.219 \ | 83 | crate://crates.io/semver/1.0.27 \ |
| 69 | crate://crates.io/serde_derive/1.0.219 \ | 84 | crate://crates.io/serde/1.0.228 \ |
| 85 | crate://crates.io/serde_core/1.0.228 \ | ||
| 86 | crate://crates.io/serde_derive/1.0.228 \ | ||
| 87 | crate://crates.io/serde_json/1.0.149 \ | ||
| 70 | crate://crates.io/shlex/1.3.0 \ | 88 | crate://crates.io/shlex/1.3.0 \ |
| 71 | crate://crates.io/strsim/0.11.1 \ | 89 | crate://crates.io/strsim/0.11.1 \ |
| 72 | crate://crates.io/syn/2.0.104 \ | 90 | crate://crates.io/syn/2.0.117 \ |
| 73 | crate://crates.io/tempfile/3.20.0 \ | 91 | crate://crates.io/tempfile/3.26.0 \ |
| 74 | crate://crates.io/terminal_size/0.4.2 \ | 92 | crate://crates.io/terminal_size/0.4.3 \ |
| 75 | crate://crates.io/test-case/3.3.1 \ | 93 | crate://crates.io/test-case/3.3.1 \ |
| 76 | crate://crates.io/test-case-core/3.3.1 \ | 94 | crate://crates.io/test-case-core/3.3.1 \ |
| 77 | crate://crates.io/test-case-macros/3.3.1 \ | 95 | crate://crates.io/test-case-macros/3.3.1 \ |
| 78 | crate://crates.io/tikv-jemalloc-sys/0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7 \ | 96 | crate://crates.io/tikv-jemalloc-sys/0.6.1+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7 \ |
| 79 | crate://crates.io/tikv-jemallocator/0.6.0 \ | 97 | crate://crates.io/tikv-jemallocator/0.6.1 \ |
| 80 | crate://crates.io/unicode-ident/1.0.18 \ | 98 | crate://crates.io/unicode-ident/1.0.24 \ |
| 99 | crate://crates.io/unicode-xid/0.2.6 \ | ||
| 81 | crate://crates.io/utf8parse/0.2.2 \ | 100 | crate://crates.io/utf8parse/0.2.2 \ |
| 82 | crate://crates.io/version_check/0.9.5 \ | ||
| 83 | crate://crates.io/walkdir/2.5.0 \ | 101 | crate://crates.io/walkdir/2.5.0 \ |
| 84 | crate://crates.io/wasi/0.14.2+wasi-0.2.4 \ | 102 | crate://crates.io/wasip2/1.0.2+wasi-0.2.9 \ |
| 103 | crate://crates.io/wasip3/0.4.0+wasi-0.3.0-rc-2026-01-06 \ | ||
| 104 | crate://crates.io/wasm-encoder/0.244.0 \ | ||
| 105 | crate://crates.io/wasm-metadata/0.244.0 \ | ||
| 106 | crate://crates.io/wasmparser/0.244.0 \ | ||
| 85 | crate://crates.io/winapi/0.3.9 \ | 107 | crate://crates.io/winapi/0.3.9 \ |
| 86 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ | 108 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ |
| 87 | crate://crates.io/winapi-util/0.1.9 \ | 109 | crate://crates.io/winapi-util/0.1.11 \ |
| 88 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ | 110 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ |
| 89 | crate://crates.io/windows-sys/0.52.0 \ | 111 | crate://crates.io/windows-link/0.2.1 \ |
| 90 | crate://crates.io/windows-sys/0.59.0 \ | ||
| 91 | crate://crates.io/windows-sys/0.60.2 \ | 112 | crate://crates.io/windows-sys/0.60.2 \ |
| 92 | crate://crates.io/windows-targets/0.52.6 \ | 113 | crate://crates.io/windows-sys/0.61.2 \ |
| 93 | crate://crates.io/windows-targets/0.53.2 \ | 114 | crate://crates.io/windows-targets/0.53.5 \ |
| 94 | crate://crates.io/windows_aarch64_gnullvm/0.52.6 \ | 115 | crate://crates.io/windows_aarch64_gnullvm/0.53.1 \ |
| 95 | crate://crates.io/windows_aarch64_gnullvm/0.53.0 \ | 116 | crate://crates.io/windows_aarch64_msvc/0.53.1 \ |
| 96 | crate://crates.io/windows_aarch64_msvc/0.52.6 \ | 117 | crate://crates.io/windows_i686_gnu/0.53.1 \ |
| 97 | crate://crates.io/windows_aarch64_msvc/0.53.0 \ | 118 | crate://crates.io/windows_i686_gnullvm/0.53.1 \ |
| 98 | crate://crates.io/windows_i686_gnu/0.52.6 \ | 119 | crate://crates.io/windows_i686_msvc/0.53.1 \ |
| 99 | crate://crates.io/windows_i686_gnu/0.53.0 \ | 120 | crate://crates.io/windows_x86_64_gnu/0.53.1 \ |
| 100 | crate://crates.io/windows_i686_gnullvm/0.52.6 \ | 121 | crate://crates.io/windows_x86_64_gnullvm/0.53.1 \ |
| 101 | crate://crates.io/windows_i686_gnullvm/0.53.0 \ | 122 | crate://crates.io/windows_x86_64_msvc/0.53.1 \ |
| 102 | crate://crates.io/windows_i686_msvc/0.52.6 \ | 123 | crate://crates.io/wit-bindgen/0.51.0 \ |
| 103 | crate://crates.io/windows_i686_msvc/0.53.0 \ | 124 | crate://crates.io/wit-bindgen-core/0.51.0 \ |
| 104 | crate://crates.io/windows_x86_64_gnu/0.52.6 \ | 125 | crate://crates.io/wit-bindgen-rust/0.51.0 \ |
| 105 | crate://crates.io/windows_x86_64_gnu/0.53.0 \ | 126 | crate://crates.io/wit-bindgen-rust-macro/0.51.0 \ |
| 106 | crate://crates.io/windows_x86_64_gnullvm/0.52.6 \ | 127 | crate://crates.io/wit-component/0.244.0 \ |
| 107 | crate://crates.io/windows_x86_64_gnullvm/0.53.0 \ | 128 | crate://crates.io/wit-parser/0.244.0 \ |
| 108 | crate://crates.io/windows_x86_64_msvc/0.52.6 \ | 129 | crate://crates.io/zmij/1.0.21 \ |
| 109 | crate://crates.io/windows_x86_64_msvc/0.53.0 \ | ||
| 110 | crate://crates.io/wit-bindgen-rt/0.39.0 \ | ||
| 111 | " | 130 | " |
| 112 | 131 | ||
| 113 | SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" | 132 | SRC_URI[aho-corasick-1.1.4.sha256sum] = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" |
| 114 | SRC_URI[anstream-0.6.19.sha256sum] = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" | 133 | SRC_URI[anstream-0.6.21.sha256sum] = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" |
| 115 | SRC_URI[anstyle-1.0.11.sha256sum] = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" | 134 | SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" |
| 116 | SRC_URI[anstyle-parse-0.2.7.sha256sum] = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" | 135 | SRC_URI[anstyle-parse-0.2.7.sha256sum] = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" |
| 117 | SRC_URI[anstyle-query-1.1.3.sha256sum] = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" | 136 | SRC_URI[anstyle-query-1.1.5.sha256sum] = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" |
| 118 | SRC_URI[anstyle-wincon-3.0.9.sha256sum] = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" | 137 | SRC_URI[anstyle-wincon-3.0.11.sha256sum] = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" |
| 119 | SRC_URI[anyhow-1.0.98.sha256sum] = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" | 138 | SRC_URI[anyhow-1.0.102.sha256sum] = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" |
| 120 | SRC_URI[argmax-0.4.0.sha256sum] = "0144c58b55af0133ec3963ce5e4d07aad866e3bbcfdcddbf4590dbd7ad6ff557" | 139 | SRC_URI[argmax-0.4.0.sha256sum] = "0144c58b55af0133ec3963ce5e4d07aad866e3bbcfdcddbf4590dbd7ad6ff557" |
| 121 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 140 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" |
| 122 | SRC_URI[bitflags-2.9.1.sha256sum] = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" | 141 | SRC_URI[bitflags-2.11.0.sha256sum] = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" |
| 123 | SRC_URI[bstr-1.12.0.sha256sum] = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" | 142 | SRC_URI[block2-0.6.2.sha256sum] = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" |
| 124 | SRC_URI[cc-1.2.29.sha256sum] = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362" | 143 | SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" |
| 125 | SRC_URI[cfg-if-1.0.1.sha256sum] = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" | 144 | SRC_URI[cc-1.2.56.sha256sum] = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" |
| 145 | SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" | ||
| 126 | SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" | 146 | SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" |
| 127 | SRC_URI[clap-4.5.42.sha256sum] = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882" | 147 | SRC_URI[clap-4.5.60.sha256sum] = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" |
| 128 | SRC_URI[clap_builder-4.5.42.sha256sum] = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966" | 148 | SRC_URI[clap_builder-4.5.60.sha256sum] = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" |
| 129 | SRC_URI[clap_complete-4.5.55.sha256sum] = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a" | 149 | SRC_URI[clap_complete-4.5.66.sha256sum] = "c757a3b7e39161a4e56f9365141ada2a6c915a8622c408ab6bb4b5d047371031" |
| 130 | SRC_URI[clap_derive-4.5.41.sha256sum] = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" | 150 | SRC_URI[clap_derive-4.5.55.sha256sum] = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" |
| 131 | SRC_URI[clap_lex-0.7.5.sha256sum] = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" | 151 | SRC_URI[clap_lex-1.0.0.sha256sum] = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" |
| 132 | SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" | 152 | SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" |
| 133 | SRC_URI[crossbeam-channel-0.5.15.sha256sum] = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" | 153 | SRC_URI[crossbeam-channel-0.5.15.sha256sum] = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" |
| 134 | SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" | 154 | SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" |
| 135 | SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" | 155 | SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" |
| 136 | SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" | 156 | SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" |
| 137 | SRC_URI[ctrlc-3.4.7.sha256sum] = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73" | 157 | SRC_URI[ctrlc-3.5.2.sha256sum] = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162" |
| 138 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" | 158 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" |
| 139 | SRC_URI[errno-0.3.13.sha256sum] = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" | 159 | SRC_URI[dispatch2-0.3.1.sha256sum] = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" |
| 140 | SRC_URI[etcetera-0.10.0.sha256sum] = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6" | 160 | SRC_URI[equivalent-1.0.2.sha256sum] = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" |
| 161 | SRC_URI[errno-0.3.14.sha256sum] = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" | ||
| 162 | SRC_URI[etcetera-0.11.0.sha256sum] = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96" | ||
| 141 | SRC_URI[faccess-0.2.4.sha256sum] = "59ae66425802d6a903e268ae1a08b8c38ba143520f227a205edf4e9c7e3e26d5" | 163 | SRC_URI[faccess-0.2.4.sha256sum] = "59ae66425802d6a903e268ae1a08b8c38ba143520f227a205edf4e9c7e3e26d5" |
| 142 | SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" | 164 | SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" |
| 143 | SRC_URI[filetime-0.2.25.sha256sum] = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" | 165 | SRC_URI[filetime-0.2.27.sha256sum] = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" |
| 144 | SRC_URI[getrandom-0.3.3.sha256sum] = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" | 166 | SRC_URI[find-msvc-tools-0.1.9.sha256sum] = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" |
| 145 | SRC_URI[globset-0.4.16.sha256sum] = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5" | 167 | SRC_URI[foldhash-0.1.5.sha256sum] = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" |
| 168 | SRC_URI[getrandom-0.4.2.sha256sum] = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" | ||
| 169 | SRC_URI[globset-0.4.18.sha256sum] = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" | ||
| 170 | SRC_URI[hashbrown-0.15.5.sha256sum] = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" | ||
| 171 | SRC_URI[hashbrown-0.16.1.sha256sum] = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" | ||
| 146 | SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" | 172 | SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" |
| 147 | SRC_URI[home-0.5.9.sha256sum] = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" | 173 | SRC_URI[id-arena-2.3.0.sha256sum] = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" |
| 148 | SRC_URI[ignore-0.4.23.sha256sum] = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" | 174 | SRC_URI[ignore-0.4.25.sha256sum] = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a" |
| 149 | SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" | 175 | SRC_URI[indexmap-2.13.0.sha256sum] = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" |
| 150 | SRC_URI[jiff-0.2.15.sha256sum] = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" | 176 | SRC_URI[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" |
| 151 | SRC_URI[jiff-static-0.2.15.sha256sum] = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" | 177 | SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" |
| 152 | SRC_URI[jiff-tzdb-0.1.4.sha256sum] = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524" | 178 | SRC_URI[jiff-0.2.23.sha256sum] = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" |
| 179 | SRC_URI[jiff-static-0.2.23.sha256sum] = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" | ||
| 180 | SRC_URI[jiff-tzdb-0.1.6.sha256sum] = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076" | ||
| 153 | SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" | 181 | SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" |
| 154 | SRC_URI[libc-0.2.174.sha256sum] = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" | 182 | SRC_URI[leb128fmt-0.1.0.sha256sum] = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" |
| 155 | SRC_URI[libredox-0.1.4.sha256sum] = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638" | 183 | SRC_URI[libc-0.2.183.sha256sum] = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" |
| 156 | SRC_URI[linux-raw-sys-0.9.4.sha256sum] = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" | 184 | SRC_URI[libredox-0.1.14.sha256sum] = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a" |
| 157 | SRC_URI[log-0.4.27.sha256sum] = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" | 185 | SRC_URI[linux-raw-sys-0.12.1.sha256sum] = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" |
| 158 | SRC_URI[lscolors-0.20.0.sha256sum] = "61183da5de8ba09a58e330d55e5ea796539d8443bd00fdeb863eac39724aa4ab" | 186 | SRC_URI[log-0.4.29.sha256sum] = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" |
| 159 | SRC_URI[memchr-2.7.5.sha256sum] = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" | 187 | SRC_URI[lscolors-0.21.0.sha256sum] = "d60e266dfb1426eb2d24792602e041131fdc0236bb7007abc0e589acafd60929" |
| 188 | SRC_URI[memchr-2.8.0.sha256sum] = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" | ||
| 160 | SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" | 189 | SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" |
| 161 | SRC_URI[normpath-1.3.0.sha256sum] = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" | 190 | SRC_URI[nix-0.31.2.sha256sum] = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3" |
| 162 | SRC_URI[nu-ansi-term-0.50.1.sha256sum] = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" | 191 | SRC_URI[normpath-1.5.0.sha256sum] = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b" |
| 192 | SRC_URI[nu-ansi-term-0.50.3.sha256sum] = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" | ||
| 193 | SRC_URI[objc2-0.6.4.sha256sum] = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" | ||
| 194 | SRC_URI[objc2-encode-4.1.0.sha256sum] = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" | ||
| 163 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" | 195 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" |
| 164 | SRC_URI[once_cell_polyfill-1.70.1.sha256sum] = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" | 196 | SRC_URI[once_cell_polyfill-1.70.2.sha256sum] = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" |
| 165 | SRC_URI[portable-atomic-1.11.1.sha256sum] = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" | 197 | SRC_URI[plain-0.2.3.sha256sum] = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" |
| 166 | SRC_URI[portable-atomic-util-0.2.4.sha256sum] = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" | 198 | SRC_URI[portable-atomic-1.13.1.sha256sum] = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" |
| 167 | SRC_URI[proc-macro2-1.0.95.sha256sum] = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" | 199 | SRC_URI[portable-atomic-util-0.2.5.sha256sum] = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5" |
| 168 | SRC_URI[quote-1.0.40.sha256sum] = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" | 200 | SRC_URI[prettyplease-0.2.37.sha256sum] = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" |
| 169 | SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" | 201 | SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" |
| 170 | SRC_URI[redox_syscall-0.5.13.sha256sum] = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" | 202 | SRC_URI[quote-1.0.45.sha256sum] = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" |
| 171 | SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" | 203 | SRC_URI[r-efi-6.0.0.sha256sum] = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" |
| 172 | SRC_URI[regex-automata-0.4.9.sha256sum] = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" | 204 | SRC_URI[redox_syscall-0.7.3.sha256sum] = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16" |
| 173 | SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" | 205 | SRC_URI[regex-1.12.3.sha256sum] = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" |
| 174 | SRC_URI[rustix-1.0.7.sha256sum] = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" | 206 | SRC_URI[regex-automata-0.4.14.sha256sum] = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" |
| 207 | SRC_URI[regex-syntax-0.8.10.sha256sum] = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" | ||
| 208 | SRC_URI[rustix-1.1.4.sha256sum] = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" | ||
| 175 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" | 209 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" |
| 176 | SRC_URI[serde-1.0.219.sha256sum] = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" | 210 | SRC_URI[semver-1.0.27.sha256sum] = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" |
| 177 | SRC_URI[serde_derive-1.0.219.sha256sum] = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" | 211 | SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" |
| 212 | SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" | ||
| 213 | SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" | ||
| 214 | SRC_URI[serde_json-1.0.149.sha256sum] = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" | ||
| 178 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" | 215 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" |
| 179 | SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" | 216 | SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" |
| 180 | SRC_URI[syn-2.0.104.sha256sum] = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" | 217 | SRC_URI[syn-2.0.117.sha256sum] = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" |
| 181 | SRC_URI[tempfile-3.20.0.sha256sum] = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" | 218 | SRC_URI[tempfile-3.26.0.sha256sum] = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" |
| 182 | SRC_URI[terminal_size-0.4.2.sha256sum] = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" | 219 | SRC_URI[terminal_size-0.4.3.sha256sum] = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0" |
| 183 | SRC_URI[test-case-3.3.1.sha256sum] = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" | 220 | SRC_URI[test-case-3.3.1.sha256sum] = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" |
| 184 | SRC_URI[test-case-core-3.3.1.sha256sum] = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" | 221 | SRC_URI[test-case-core-3.3.1.sha256sum] = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" |
| 185 | SRC_URI[test-case-macros-3.3.1.sha256sum] = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" | 222 | SRC_URI[test-case-macros-3.3.1.sha256sum] = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" |
| 186 | SRC_URI[tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.sha256sum] = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" | 223 | SRC_URI[tikv-jemalloc-sys-0.6.1+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.sha256sum] = "cd8aa5b2ab86a2cefa406d889139c162cbb230092f7d1d7cbc1716405d852a3b" |
| 187 | SRC_URI[tikv-jemallocator-0.6.0.sha256sum] = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" | 224 | SRC_URI[tikv-jemallocator-0.6.1.sha256sum] = "0359b4327f954e0567e69fb191cf1436617748813819c94b8cd4a431422d053a" |
| 188 | SRC_URI[unicode-ident-1.0.18.sha256sum] = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" | 225 | SRC_URI[unicode-ident-1.0.24.sha256sum] = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" |
| 226 | SRC_URI[unicode-xid-0.2.6.sha256sum] = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" | ||
| 189 | SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" | 227 | SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" |
| 190 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" | ||
| 191 | SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" | 228 | SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" |
| 192 | SRC_URI[wasi-0.14.2+wasi-0.2.4.sha256sum] = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" | 229 | SRC_URI[wasip2-1.0.2+wasi-0.2.9.sha256sum] = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" |
| 230 | SRC_URI[wasip3-0.4.0+wasi-0.3.0-rc-2026-01-06.sha256sum] = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" | ||
| 231 | SRC_URI[wasm-encoder-0.244.0.sha256sum] = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" | ||
| 232 | SRC_URI[wasm-metadata-0.244.0.sha256sum] = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" | ||
| 233 | SRC_URI[wasmparser-0.244.0.sha256sum] = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" | ||
| 193 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" | 234 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" |
| 194 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" | 235 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" |
| 195 | SRC_URI[winapi-util-0.1.9.sha256sum] = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" | 236 | SRC_URI[winapi-util-0.1.11.sha256sum] = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" |
| 196 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" | 237 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" |
| 197 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" | 238 | SRC_URI[windows-link-0.2.1.sha256sum] = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" |
| 198 | SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" | ||
| 199 | SRC_URI[windows-sys-0.60.2.sha256sum] = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" | 239 | SRC_URI[windows-sys-0.60.2.sha256sum] = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" |
| 200 | SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" | 240 | SRC_URI[windows-sys-0.61.2.sha256sum] = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" |
| 201 | SRC_URI[windows-targets-0.53.2.sha256sum] = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" | 241 | SRC_URI[windows-targets-0.53.5.sha256sum] = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" |
| 202 | SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" | 242 | SRC_URI[windows_aarch64_gnullvm-0.53.1.sha256sum] = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" |
| 203 | SRC_URI[windows_aarch64_gnullvm-0.53.0.sha256sum] = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" | 243 | SRC_URI[windows_aarch64_msvc-0.53.1.sha256sum] = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" |
| 204 | SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" | 244 | SRC_URI[windows_i686_gnu-0.53.1.sha256sum] = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" |
| 205 | SRC_URI[windows_aarch64_msvc-0.53.0.sha256sum] = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" | 245 | SRC_URI[windows_i686_gnullvm-0.53.1.sha256sum] = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" |
| 206 | SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" | 246 | SRC_URI[windows_i686_msvc-0.53.1.sha256sum] = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" |
| 207 | SRC_URI[windows_i686_gnu-0.53.0.sha256sum] = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" | 247 | SRC_URI[windows_x86_64_gnu-0.53.1.sha256sum] = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" |
| 208 | SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" | 248 | SRC_URI[windows_x86_64_gnullvm-0.53.1.sha256sum] = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" |
| 209 | SRC_URI[windows_i686_gnullvm-0.53.0.sha256sum] = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" | 249 | SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" |
| 210 | SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" | 250 | SRC_URI[wit-bindgen-0.51.0.sha256sum] = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" |
| 211 | SRC_URI[windows_i686_msvc-0.53.0.sha256sum] = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" | 251 | SRC_URI[wit-bindgen-core-0.51.0.sha256sum] = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" |
| 212 | SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" | 252 | SRC_URI[wit-bindgen-rust-0.51.0.sha256sum] = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" |
| 213 | SRC_URI[windows_x86_64_gnu-0.53.0.sha256sum] = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" | 253 | SRC_URI[wit-bindgen-rust-macro-0.51.0.sha256sum] = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" |
| 214 | SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" | 254 | SRC_URI[wit-component-0.244.0.sha256sum] = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" |
| 215 | SRC_URI[windows_x86_64_gnullvm-0.53.0.sha256sum] = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" | 255 | SRC_URI[wit-parser-0.244.0.sha256sum] = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" |
| 216 | SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" | 256 | SRC_URI[zmij-1.0.21.sha256sum] = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" |
| 217 | SRC_URI[windows_x86_64_msvc-0.53.0.sha256sum] = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" | ||
| 218 | SRC_URI[wit-bindgen-rt-0.39.0.sha256sum] = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" | ||
diff --git a/meta-oe/recipes-extended/fd-find/fd-find/0001-Define-ALIGNOF_MAX_ALIGN_T-for-riscv32.patch b/meta-oe/recipes-extended/fd-find/fd-find/0001-Define-ALIGNOF_MAX_ALIGN_T-for-riscv32.patch index 82eac5e1a5..db191d8250 100644 --- a/meta-oe/recipes-extended/fd-find/fd-find/0001-Define-ALIGNOF_MAX_ALIGN_T-for-riscv32.patch +++ b/meta-oe/recipes-extended/fd-find/fd-find/0001-Define-ALIGNOF_MAX_ALIGN_T-for-riscv32.patch | |||
| @@ -5,7 +5,7 @@ Subject: [PATCH] Define ALIGNOF_MAX_ALIGN_T for riscv32 | |||
| 5 | 5 | ||
| 6 | Long double is 16byte aligned on both rv32 and rv64 | 6 | Long double is 16byte aligned on both rv32 and rv64 |
| 7 | 7 | ||
| 8 | Upstream-Status: Submitted [https://github.com/tikv/jemallocator/pull/153] | 8 | Upstream-Status: Backport [https://github.com/tikv/jemallocator/commit/f4fde3f8f572b804adf15cf4c68b826109f8c36b] |
| 9 | 9 | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- | 11 | --- |
| @@ -16,8 +16,8 @@ diff --git a/src/lib.rs b/src/lib.rs | |||
| 16 | index 165660e..5f6a2a0 100644 | 16 | index 165660e..5f6a2a0 100644 |
| 17 | --- a/src/lib.rs | 17 | --- a/src/lib.rs |
| 18 | +++ b/src/lib.rs | 18 | +++ b/src/lib.rs |
| 19 | @@ -57,6 +57,7 @@ const ALIGNOF_MAX_ALIGN_T: usize = 8; | 19 | @@ -51,6 +51,7 @@ const ALIGNOF_MAX_ALIGN_T: usize = 8; |
| 20 | target_arch = "powerpc64le", | 20 | target_arch = "powerpc64", |
| 21 | target_arch = "loongarch64", | 21 | target_arch = "loongarch64", |
| 22 | target_arch = "mips64", | 22 | target_arch = "mips64", |
| 23 | + target_arch = "riscv32", | 23 | + target_arch = "riscv32", |
diff --git a/meta-oe/recipes-extended/fd-find/fd-find_10.3.0.bb b/meta-oe/recipes-extended/fd-find/fd-find_10.4.2.bb index 3a28009471..408f97f490 100644 --- a/meta-oe/recipes-extended/fd-find/fd-find_10.3.0.bb +++ b/meta-oe/recipes-extended/fd-find/fd-find_10.4.2.bb | |||
| @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRC_URI = "crate://crates.io/fd-find/${PV};name=fd-find" | 14 | SRC_URI = "crate://crates.io/fd-find/${PV};name=fd-find" |
| 15 | SRC_URI += "file://0001-Define-ALIGNOF_MAX_ALIGN_T-for-riscv32.patch;patchdir=../tikv-jemallocator-0.6.0" | 15 | SRC_URI += "file://0001-Define-ALIGNOF_MAX_ALIGN_T-for-riscv32.patch;patchdir=../tikv-jemallocator-0.6.1" |
| 16 | SRC_URI[fd-find.sha256sum] = "2fbf004b5bbdefab92e76237e2022c77842cdef5d3213fe09fd804e0474785db" | 16 | SRC_URI[fd-find.sha256sum] = "b95ed7d1f53e0446a7d47715801f6bee95f816c4aa33e25b5d89a2734ab00436" |
| 17 | S = "${CARGO_VENDORING_DIRECTORY}/fd-find-${PV}" | 17 | S = "${CARGO_VENDORING_DIRECTORY}/fd-find-${PV}" |
| 18 | 18 | ||
| 19 | inherit cargo cargo-update-recipe-crates | 19 | inherit cargo cargo-update-recipe-crates |
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_4.2.2.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_4.2.3.1.bb index d042293e3d..b476206437 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_4.2.2.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_4.2.3.1.bb | |||
| @@ -17,9 +17,9 @@ DEPENDS = "\ | |||
| 17 | " | 17 | " |
| 18 | DEPENDS:append:libc-musl = " fts" | 18 | DEPENDS:append:libc-musl = " fts" |
| 19 | 19 | ||
| 20 | SRCREV = "ddfef360d7f3ac5268942c47ccc9b01864424a05" | 20 | SRCREV = "fca8b5bf46416267a4c8de185e4044da09cf0f16" |
| 21 | SRC_URI = "\ | 21 | SRC_URI = "\ |
| 22 | git://github.com/fluent/fluent-bit.git;branch=master;protocol=https;tag=v${PV} \ | 22 | git://github.com/fluent/fluent-bit.git;nobranch=1;protocol=https;tag=v${PV} \ |
| 23 | file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \ | 23 | file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \ |
| 24 | file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \ | 24 | file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \ |
| 25 | file://0003-CMakeLists.txt-Revise-init-manager-deduction.patch \ | 25 | file://0003-CMakeLists.txt-Revise-init-manager-deduction.patch \ |
diff --git a/meta-oe/recipes-extended/hplip/hplip/0001-common-utils-Include-string.h-for-strcasestr.patch b/meta-oe/recipes-extended/hplip/hplip/0001-common-utils-Include-string.h-for-strcasestr.patch index 659eca41c9..1457fc62c8 100644 --- a/meta-oe/recipes-extended/hplip/hplip/0001-common-utils-Include-string.h-for-strcasestr.patch +++ b/meta-oe/recipes-extended/hplip/hplip/0001-common-utils-Include-string.h-for-strcasestr.patch | |||
| @@ -7,38 +7,29 @@ Also define _GNU_SOURCE for the same | |||
| 7 | 7 | ||
| 8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |||
| 11 | Rebased for latest version. string.h is included already, left | ||
| 12 | only the _GNU_SOURCE definition. | ||
| 13 | |||
| 14 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 10 | --- | 15 | --- |
| 11 | common/utils.c | 2 ++ | 16 | common/utils.c | 2 ++ |
| 12 | 1 file changed, 2 insertions(+) | 17 | 1 file changed, 2 insertions(+) |
| 13 | 18 | ||
| 14 | --- a/common/utils.c | 19 | --- a/common/utils.c |
| 15 | +++ b/common/utils.c | 20 | +++ b/common/utils.c |
| 16 | @@ -1,9 +1,11 @@ | 21 | @@ -1,3 +1,4 @@ |
| 17 | +#define _GNU_SOURCE | 22 | +#define _GNU_SOURCE |
| 18 | #include "utils.h" | 23 | #include "utils.h" |
| 19 | #include "string.h" | 24 | #include "string.h" |
| 20 | #include <dlfcn.h> | 25 | #include <dlfcn.h> |
| 21 | #include <sys/stat.h> | ||
| 22 | #include <errno.h> | ||
| 23 | #include <stdlib.h> | ||
| 24 | +#include <string.h> /* strcasestr */ | ||
| 25 | |||
| 26 | extern int errno; | ||
| 27 | |||
| 28 | --- a/protocol/hp_ipp.c | 26 | --- a/protocol/hp_ipp.c |
| 29 | +++ b/protocol/hp_ipp.c | 27 | +++ b/protocol/hp_ipp.c |
| 30 | @@ -18,12 +18,13 @@ Boston, MA 02110-1301, USA. | 28 | @@ -18,6 +18,7 @@ Boston, MA 02110-1301, USA. |
| 31 | 29 | ||
| 32 | \******************************************************************************/ | 30 | \******************************************************************************/ |
| 33 | 31 | ||
| 34 | - | ||
| 35 | +#define _GNU_SOURCE | 32 | +#define _GNU_SOURCE |
| 36 | #include <cups/cups.h> | 33 | #include <cups/cups.h> |
| 37 | #include <cups/language.h> | 34 | #include <cups/language.h> |
| 38 | #include <cups/ppd.h> | 35 | #include <cups/ppd.h> |
| 39 | #include <syslog.h> | ||
| 40 | #include <stdarg.h> | ||
| 41 | +#include <string.h> /* strcasecmp */ | ||
| 42 | #include <sys/types.h> | ||
| 43 | #include <pwd.h> | ||
| 44 | #include <sys/stat.h> | ||
diff --git a/meta-oe/recipes-extended/hplip/hplip/0004-Define-missing-prototype-for-functions.patch b/meta-oe/recipes-extended/hplip/hplip/0004-Define-missing-prototype-for-functions.patch index 7223bf939e..b17d8ec8fd 100644 --- a/meta-oe/recipes-extended/hplip/hplip/0004-Define-missing-prototype-for-functions.patch +++ b/meta-oe/recipes-extended/hplip/hplip/0004-Define-missing-prototype-for-functions.patch | |||
| @@ -13,18 +13,19 @@ Upstream-Status: Pending | |||
| 13 | 13 | ||
| 14 | --- a/prnt/cupsext/cupsext.c | 14 | --- a/prnt/cupsext/cupsext.c |
| 15 | +++ b/prnt/cupsext/cupsext.c | 15 | +++ b/prnt/cupsext/cupsext.c |
| 16 | @@ -101,6 +101,11 @@ typedef int Py_ssize_t; | 16 | @@ -99,6 +99,12 @@ typedef int Py_ssize_t; |
| 17 | #define _STRINGIZE(x) #x | 17 | #define _STRINGIZE(x) #x |
| 18 | #define STRINGIZE(x) _STRINGIZE(x) | 18 | #define STRINGIZE(x) _STRINGIZE(x) |
| 19 | 19 | ||
| 20 | +void _releaseCupsInstance(void); | 20 | +void _releaseCupsInstance(void); |
| 21 | +int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, char *model, char *info); | 21 | +int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, char *model, char *info); |
| 22 | +int setDefaultCupsPrinter(char *pr_name); | 22 | +int setDefaultCupsPrinter(char *pr_name); |
| 23 | +int delCupsPrinter(char *pr_name); | 23 | +int delCupsPrinter(char *pr_name); |
| 24 | +int controlCupsPrinter(char *pr_name, int op); | 24 | +int controlCupsPrinter(char *pr_name, int op); |
| 25 | 25 | + | |
| 26 | //static http_t * http = NULL; /* HTTP object */ | 26 | // static http_t * http = NULL; /* HTTP object */ |
| 27 | 27 | ||
| 28 | PyObject *releaseCupsInstance(PyObject *self, PyObject *args) | ||
| 28 | --- a/protocol/hp_ipp.c | 29 | --- a/protocol/hp_ipp.c |
| 29 | +++ b/protocol/hp_ipp.c | 30 | +++ b/protocol/hp_ipp.c |
| 30 | @@ -22,6 +22,7 @@ Boston, MA 02110-1301, USA. | 31 | @@ -22,6 +22,7 @@ Boston, MA 02110-1301, USA. |
| @@ -34,20 +35,20 @@ Upstream-Status: Pending | |||
| 34 | +#include <stdio.h> | 35 | +#include <stdio.h> |
| 35 | #include <syslog.h> | 36 | #include <syslog.h> |
| 36 | #include <stdarg.h> | 37 | #include <stdarg.h> |
| 37 | #include <string.h> /* strcasecmp */ | 38 | #include <sys/types.h> |
| 38 | @@ -42,7 +43,7 @@ Boston, MA 02110-1301, USA. | 39 | @@ -45,7 +46,7 @@ Boston, MA 02110-1301, USA. |
| 39 | #define STRINGIZE(x) _STRINGIZE(x) | 40 | dst[size - 1] = '\0'; \ |
| 40 | 41 | } while (0) | |
| 41 | 42 | ||
| 42 | -http_t* acquireCupsInstance() | 43 | -http_t *acquireCupsInstance() |
| 43 | +http_t* acquireCupsInstance(void) | 44 | +http_t *acquireCupsInstance(void) |
| 44 | { | 45 | { |
| 45 | if ( http == NULL) | 46 | if (http == NULL) |
| 46 | { | 47 | { |
| 47 | @@ -53,7 +54,7 @@ http_t* acquireCupsInstance() | 48 | @@ -55,7 +56,7 @@ http_t* acquireCupsInstance() |
| 49 | return http; | ||
| 48 | } | 50 | } |
| 49 | 51 | ||
| 50 | |||
| 51 | -void _releaseCupsInstance() | 52 | -void _releaseCupsInstance() |
| 52 | +void _releaseCupsInstance(void) | 53 | +void _releaseCupsInstance(void) |
| 53 | { | 54 | { |
diff --git a/meta-oe/recipes-extended/hplip/hplip/0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch b/meta-oe/recipes-extended/hplip/hplip/0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch deleted file mode 100644 index ac0ff81e6f..0000000000 --- a/meta-oe/recipes-extended/hplip/hplip/0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch +++ /dev/null | |||
| @@ -1,64 +0,0 @@ | |||
| 1 | From 4b3014df3990d90d6929510f2bde073171503329 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 2 Sep 2022 18:18:44 -0700 | ||
| 4 | Subject: [PATCH] hp_ipp.c: Add printf format to snprintf calls | ||
| 5 | |||
| 6 | Avoid -Wformat warnings | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | protocol/hp_ipp.c | 14 +++++++------- | ||
| 13 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/protocol/hp_ipp.c b/protocol/hp_ipp.c | ||
| 16 | index 597d9b9..a027baf 100644 | ||
| 17 | --- a/protocol/hp_ipp.c | ||
| 18 | +++ b/protocol/hp_ipp.c | ||
| 19 | @@ -112,7 +112,7 @@ int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, | ||
| 20 | } | ||
| 21 | |||
| 22 | if ( info == NULL ) | ||
| 23 | - snprintf( info,sizeof(info), name ); | ||
| 24 | + snprintf( info,sizeof(info), "%s", name ); | ||
| 25 | |||
| 26 | sprintf( printer_uri, "ipp://localhost/printers/%s", name ); | ||
| 27 | |||
| 28 | @@ -513,27 +513,27 @@ int __parsePrinterAttributes(ipp_t *response, printer_t **printer_list) | ||
| 29 | |||
| 30 | if ( strcmp(attr_name, "printer-name") == 0 && | ||
| 31 | val_tag == IPP_TAG_NAME ) { | ||
| 32 | - snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) ); | ||
| 33 | + snprintf(t_printer->name, sizeof(t_printer->name), "%s", ippGetString(attr, 0, NULL) ); | ||
| 34 | } | ||
| 35 | else if ( strcmp(attr_name, "device-uri") == 0 && | ||
| 36 | val_tag == IPP_TAG_URI ) { | ||
| 37 | - snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) ); | ||
| 38 | + snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), "%s", ippGetString(attr, 0, NULL) ); | ||
| 39 | } | ||
| 40 | else if ( strcmp(attr_name, "printer-uri-supported") == 0 && | ||
| 41 | val_tag == IPP_TAG_URI ) { | ||
| 42 | - snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) ); | ||
| 43 | + snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), "%s", ippGetString(attr, 0, NULL) ); | ||
| 44 | } | ||
| 45 | else if ( strcmp(attr_name, "printer-info") == 0 && | ||
| 46 | val_tag == IPP_TAG_TEXT ) { | ||
| 47 | - snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) ); | ||
| 48 | + snprintf(t_printer->info,sizeof(t_printer->info), "%s", ippGetString(attr, 0, NULL) ); | ||
| 49 | } | ||
| 50 | else if ( strcmp(attr_name, "printer-location") == 0 && | ||
| 51 | val_tag == IPP_TAG_TEXT ) { | ||
| 52 | - snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) ); | ||
| 53 | + snprintf(t_printer->location,sizeof(t_printer->location), "%s", ippGetString(attr, 0, NULL) ); | ||
| 54 | } | ||
| 55 | else if ( strcmp(attr_name, "printer-make-and-model") == 0 && | ||
| 56 | val_tag == IPP_TAG_TEXT ) { | ||
| 57 | - snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) ); | ||
| 58 | + snprintf(t_printer->make_model,sizeof(t_printer->make_model), "%s", ippGetString(attr, 0, NULL) ); | ||
| 59 | } | ||
| 60 | else if ( strcmp(attr_name, "printer-state") == 0 && | ||
| 61 | val_tag == IPP_TAG_ENUM ) { | ||
| 62 | -- | ||
| 63 | 2.37.3 | ||
| 64 | |||
diff --git a/meta-oe/recipes-extended/hplip/hplip/configure.patch b/meta-oe/recipes-extended/hplip/hplip/configure.patch index 0e0fd47fa1..9dad089ff1 100644 --- a/meta-oe/recipes-extended/hplip/hplip/configure.patch +++ b/meta-oe/recipes-extended/hplip/hplip/configure.patch | |||
| @@ -3,7 +3,7 @@ Upstream-Status: Pending | |||
| 3 | --- a/configure.in | 3 | --- a/configure.in |
| 4 | +++ b/configure.in | 4 | +++ b/configure.in |
| 5 | @@ -30,7 +30,7 @@ | 5 | @@ -30,7 +30,7 @@ |
| 6 | AC_INIT([HP Linux Imaging and Printing], [3.22.10], [3.22.10], [hplip]) | 6 | AC_INIT([HP Linux Imaging and Printing], [3.25.8], [3.25.8], [hplip]) |
| 7 | 7 | ||
| 8 | #AM_INIT_AUTOMAKE([1.9 foreign]) | 8 | #AM_INIT_AUTOMAKE([1.9 foreign]) |
| 9 | -AM_INIT_AUTOMAKE | 9 | -AM_INIT_AUTOMAKE |
diff --git a/meta-oe/recipes-extended/hplip/hplip/hplip-3.19.6-fix-return.patch b/meta-oe/recipes-extended/hplip/hplip/hplip-3.19.6-fix-return.patch deleted file mode 100644 index 45b25c5e76..0000000000 --- a/meta-oe/recipes-extended/hplip/hplip/hplip-3.19.6-fix-return.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | From 2fcd0e79b21ec6dbf975ad7d1b5697a78993e2f1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: David Valleau <valleau@chromium.org> | ||
| 3 | Date: Wed, 14 Aug 2019 15:47:38 -0700 | ||
| 4 | Subject: [PATCH] Fixing invalid return in void function | ||
| 5 | |||
| 6 | --- | ||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | prnt/hpps/hppsfilter.c | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | --- a/prnt/hpps/hppsfilter.c | ||
| 13 | +++ b/prnt/hpps/hppsfilter.c | ||
| 14 | @@ -104,7 +104,7 @@ static void open_tempbookletfile(char *m | ||
| 15 | if(ptempbooklet_file == NULL) | ||
| 16 | { | ||
| 17 | fprintf(stderr, "ERROR: Unable to open temp file %s\n", temp_filename); | ||
| 18 | - return 1; | ||
| 19 | + return; | ||
| 20 | } | ||
| 21 | chmod(temp_filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); | ||
| 22 | |||
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-oe/recipes-extended/hplip/hplip_3.25.8.bb index ffc18d90c6..3b5f58f320 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.25.8.bb | |||
| @@ -8,17 +8,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ | |||
| 8 | file://600-fix.patch \ | 8 | file://600-fix.patch \ |
| 9 | file://030-replace_unsafe_memcpy_with_memmove.patch \ | 9 | file://030-replace_unsafe_memcpy_with_memmove.patch \ |
| 10 | file://050-fix-glibcisms.patch \ | 10 | file://050-fix-glibcisms.patch \ |
| 11 | file://hplip-3.19.6-fix-return.patch \ | ||
| 12 | file://0001-common-utils-Include-string.h-for-strcasestr.patch \ | 11 | file://0001-common-utils-Include-string.h-for-strcasestr.patch \ |
| 13 | file://0002-Add-ImageProcessor-only-when-DISBALE_IMAGEPROCESSOR_.patch \ | 12 | file://0002-Add-ImageProcessor-only-when-DISBALE_IMAGEPROCESSOR_.patch \ |
| 14 | file://0003-pserror.c-Define-column-to-be-int-explcitly.patch \ | 13 | file://0003-pserror.c-Define-column-to-be-int-explcitly.patch \ |
| 15 | file://0004-Define-missing-prototype-for-functions.patch \ | 14 | file://0004-Define-missing-prototype-for-functions.patch \ |
| 16 | file://0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch \ | ||
| 17 | file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \ | 15 | file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \ |
| 18 | file://0001-Fix-installing-ipp-usb-quirk.patch \ | 16 | file://0001-Fix-installing-ipp-usb-quirk.patch \ |
| 19 | file://0001-Drop-using-register-storage-classifier.patch \ | 17 | file://0001-Drop-using-register-storage-classifier.patch \ |
| 20 | file://0001-Fix-upstream-CFLAGS-override.patch" | 18 | file://0001-Fix-upstream-CFLAGS-override.patch" |
| 21 | SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" | 19 | SRC_URI[sha256sum] = "1cf6d6c28735435c8eb6646e83bcfb721e51c4b1f0e8cf9105a6faf96dc9ad25" |
| 20 | |||
| 21 | CVE_PRODUCT = "hplip linux_imaging_and_printing" | ||
| 22 | 22 | ||
| 23 | UPSTREAM_CHECK_URI = "https://sourceforge.net/p/hplip/activity" | 23 | UPSTREAM_CHECK_URI = "https://sourceforge.net/p/hplip/activity" |
| 24 | 24 | ||
| @@ -49,6 +49,13 @@ EXTRA_OECONF += "\ | |||
| 49 | 49 | ||
| 50 | EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/" | 50 | EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/" |
| 51 | 51 | ||
| 52 | do_configure:prepend() { | ||
| 53 | # If not set directly, it determines the absolute path of site-packages dir in recipe-sysroot, | ||
| 54 | # and then it installs the python libraries into a folder in ${D} that was constructed from | ||
| 55 | # that path, instead of using the correct ${PYTHON_SITEPACKAGES_DIR}. | ||
| 56 | sed -i 's,^\( PYTHONEXECDIR=\).*,\1"${PYTHON_SITEPACKAGES_DIR}",' configure.in | ||
| 57 | } | ||
| 58 | |||
| 52 | do_install:append() { | 59 | do_install:append() { |
| 53 | rm -rf ${D}${datadir}/hplip/upgrade.py | 60 | rm -rf ${D}${datadir}/hplip/upgrade.py |
| 54 | rm -rf ${D}${datadir}/hplip/uninstall.py | 61 | rm -rf ${D}${datadir}/hplip/uninstall.py |
diff --git a/meta-oe/recipes-extended/iotop/iotop_1.30.bb b/meta-oe/recipes-extended/iotop/iotop_1.31.bb index 9fe774f9f2..f37b5a5dd3 100644 --- a/meta-oe/recipes-extended/iotop/iotop_1.30.bb +++ b/meta-oe/recipes-extended/iotop/iotop_1.31.bb | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | SUMMARY = "A top utility for I/O" | 1 | SUMMARY = "A top utility for I/O" |
| 2 | LICENSE = "GPL-2.0-or-later" | 2 | LICENSE = "GPL-2.0-or-later" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3154adaa1a9ca0d8dcc1944518ece1b9" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=26b36b714daebf72b11715ba73efbad4" |
| 4 | 4 | ||
| 5 | DEPENDS = "ncurses" | 5 | DEPENDS = "ncurses" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/Tomas-M/iotop.git;branch=master;protocol=https;tag=v${PV}" | 7 | SRC_URI = "git://github.com/Tomas-M/iotop.git;branch=master;protocol=https;tag=v${PV}" |
| 8 | SRCREV = "c3366a8a235f9c8ddc4797625f22cfdf12ba2c36" | 8 | SRCREV = "57890d671ba69ebc4a619a1cfe7d76cdd3d836a8" |
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | inherit pkgconfig | 11 | inherit pkgconfig |
diff --git a/meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch b/meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch deleted file mode 100644 index 5264f26f81..0000000000 --- a/meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 5d7b2ced666b4fbccd0da6e06d504ae2960575c8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
| 3 | Date: Tue, 8 Jul 2025 14:54:08 +0300 | ||
| 4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
| 5 | compatibility | ||
| 6 | |||
| 7 | | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
| 8 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
| 9 | | | ||
| 10 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
| 11 | | to tell CMake that the project requires at least <min> but has been updated | ||
| 12 | | to work with policies introduced by <max> or earlier. | ||
| 13 | | | ||
| 14 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
| 15 | | | ||
| 16 | | | ||
| 17 | | -- Configuring incomplete, errors occurred! | ||
| 18 | |||
| 19 | Upstream-Status: Backport [https://github.com/akheron/jansson/commit/96d160df90016066d04d493d1d69639474ba4f20] | ||
| 20 | |||
| 21 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
| 22 | --- | ||
| 23 | CMakeLists.txt | 2 +- | ||
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 25 | |||
| 26 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 27 | index 72f9762..d07412e 100644 | ||
| 28 | --- a/CMakeLists.txt | ||
| 29 | +++ b/CMakeLists.txt | ||
| 30 | @@ -1,4 +1,4 @@ | ||
| 31 | -cmake_minimum_required (VERSION 3.1) | ||
| 32 | +cmake_minimum_required (VERSION 3.5) | ||
| 33 | project(jansson C) | ||
| 34 | |||
| 35 | # Options | ||
| 36 | -- | ||
| 37 | 2.43.0 | ||
| 38 | |||
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb b/meta-oe/recipes-extended/jansson/jansson_2.15.0.bb index e0916759c6..829ac1ad49 100644 --- a/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb +++ b/meta-oe/recipes-extended/jansson/jansson_2.15.0.bb | |||
| @@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d9911525d4128bee234ee2d3ccaa2537" | |||
| 7 | SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ | 7 | SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ |
| 8 | file://0001-Honour-multilib-paths.patch \ | 8 | file://0001-Honour-multilib-paths.patch \ |
| 9 | file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \ | 9 | file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \ |
| 10 | file://0002-allow-build-with-cmake-4.patch \ | ||
| 11 | " | 10 | " |
| 12 | SRC_URI[sha256sum] = "6bd82d3043dadbcd58daaf903d974891128d22aab7dada5d399cb39094af49ce" | 11 | SRC_URI[sha256sum] = "a7eac7765000373165f9373eb748be039c10b2efc00be9af3467ec92357d8954" |
| 13 | 12 | ||
| 14 | UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" | 13 | UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" |
| 15 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-oe/recipes-extended/libcbor/libcbor/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-extended/libcbor/libcbor/0001-allow-build-with-cmake-4.patch deleted file mode 100644 index 1edca539ba..0000000000 --- a/meta-oe/recipes-extended/libcbor/libcbor/0001-allow-build-with-cmake-4.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 4b34fd7b4d674eeba5e9572df1d88bafa1d100e3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
| 3 | Date: Wed, 9 Jul 2025 11:29:39 +0300 | ||
| 4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
| 5 | compatibility | ||
| 6 | |||
| 7 | Fix: | ||
| 8 | |||
| 9 | | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
| 10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
| 11 | | | ||
| 12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
| 13 | | to tell CMake that the project requires at least <min> but has been updated | ||
| 14 | | to work with policies introduced by <max> or earlier. | ||
| 15 | | | ||
| 16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
| 17 | | | ||
| 18 | | | ||
| 19 | | -- Configuring incomplete, errors occurred! | ||
| 20 | |||
| 21 | Upstream-Status: Backport [https://github.com/PJK/libcbor/commit/1183292d4695300785b272532c1e02d68840e4b8] | ||
| 22 | |||
| 23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
| 24 | --- | ||
| 25 | CMakeLists.txt | 2 +- | ||
| 26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 27 | |||
| 28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 29 | index 815675e..a9f9bd5 100644 | ||
| 30 | --- a/CMakeLists.txt | ||
| 31 | +++ b/CMakeLists.txt | ||
| 32 | @@ -1,4 +1,4 @@ | ||
| 33 | -cmake_minimum_required(VERSION 3.0) | ||
| 34 | +cmake_minimum_required(VERSION 3.5) | ||
| 35 | |||
| 36 | project(libcbor) | ||
| 37 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} | ||
| 38 | -- | ||
| 39 | 2.43.0 | ||
| 40 | |||
diff --git a/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb b/meta-oe/recipes-extended/libcbor/libcbor_0.13.0.bb index fa48d23bde..3bed8a6e72 100755 --- a/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb +++ b/meta-oe/recipes-extended/libcbor/libcbor_0.13.0.bb | |||
| @@ -4,10 +4,9 @@ DESCRIPTION = "C library for parsing and generating CBOR, the general-purpose sc | |||
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f3b3881df62ca763a02d359a6e94071" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f3b3881df62ca763a02d359a6e94071" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/PJK/libcbor.git;protocol=https;branch=master \ | 7 | SRC_URI = "git://github.com/PJK/libcbor.git;protocol=https;branch=master;tag=v${PV}" |
| 8 | file://0001-allow-build-with-cmake-4.patch" | ||
| 9 | 8 | ||
| 10 | SRCREV = "ae000f44e8d2a69e1f72a738f7c0b6b4b7cc4fbf" | 9 | SRCREV = "9826a4315116a588f7416912db9da6fcecd8da11" |
| 11 | 10 | ||
| 12 | inherit cmake | 11 | inherit cmake |
| 13 | 12 | ||
diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.12.bb index ffbb3a8c8e..2e149580eb 100644 --- a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb +++ b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.12.bb | |||
| @@ -6,8 +6,8 @@ SECTION = "libs" | |||
| 6 | LICENSE = "LGPL-2.1-or-later" | 6 | LICENSE = "LGPL-2.1-or-later" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" | 7 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/stephane/libmodbus;branch=master;protocol=https" | 9 | SRC_URI = "git://github.com/stephane/libmodbus;branch=master;protocol=https;tag=v${PV}" |
| 10 | SRCREV = "5190e5e141780ae481f24be16d7b39a5f3ad8f8f" | 10 | SRCREV = "9af6c16074df566551bca0a7c37443e48f216289" |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | inherit autotools pkgconfig | 13 | inherit autotools pkgconfig |
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch index aef521bc5d..aef521bc5d 100644 --- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch +++ b/meta-oe/recipes-extended/libx86-1/libx86-1.1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch | |||
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1.1/0001-assume-zero-is-valid-address.patch index 7a46301deb..7a46301deb 100644 --- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch +++ b/meta-oe/recipes-extended/libx86-1/libx86-1.1.1/0001-assume-zero-is-valid-address.patch | |||
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Fix-type-of-the-void-pointer-assignment.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Fix-type-of-the-void-pointer-assignment.patch deleted file mode 100644 index ea3c306fd7..0000000000 --- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Fix-type-of-the-void-pointer-assignment.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From c782e208021409e9b78acb2200abd4319072e78a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 2 Sep 2022 00:28:05 -0700 | ||
| 4 | Subject: [PATCH] Fix type of the void pointer assignment | ||
| 5 | |||
| 6 | Fixes build with clang | ||
| 7 | |||
| 8 | x86-common.c:216:9: error: incompatible integer to pointer conversion assigning to 'void *' from 'long' [-Wint-conversion] | ||
| 9 | offset = mem_info.offset - REAL_MEM_BASE; | ||
| 10 | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | x86-common.c | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/x86-common.c b/x86-common.c | ||
| 19 | index 137bc3c..6f737ed 100644 | ||
| 20 | --- a/x86-common.c | ||
| 21 | +++ b/x86-common.c | ||
| 22 | @@ -213,7 +213,7 @@ void *LRMI_common_init(int high_page) | ||
| 23 | if (!real_mem_init(high_page)) | ||
| 24 | return NULL; | ||
| 25 | |||
| 26 | - offset = mem_info.offset - REAL_MEM_BASE; | ||
| 27 | + offset = (void*)(mem_info.offset - REAL_MEM_BASE); | ||
| 28 | |||
| 29 | /* | ||
| 30 | Map the Interrupt Vectors (0x0 - 0x400) + BIOS data (0x400 - 0x502) | ||
| 31 | -- | ||
| 32 | 2.37.3 | ||
| 33 | |||
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch deleted file mode 100644 index 1c120c04b9..0000000000 --- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch +++ /dev/null | |||
| @@ -1,192 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Upstream-Statue: Pending | ||
| 4 | [from ftp://195.220.108.108/linux/fedora/linux/development/rawhide/source/SRPMS/l/libx86-1.1-21.fc23.src.rpm] | ||
| 5 | |||
| 6 | diff -ur libx86-1.1/lrmi.c libx86-1.1.hack/lrmi.c | ||
| 7 | --- libx86-1.1/lrmi.c 2006-10-30 15:10:16.000000000 -0500 | ||
| 8 | +++ libx86-1.1.hack/lrmi.c 2009-10-26 15:55:42.000000000 -0400 | ||
| 9 | @@ -136,7 +136,7 @@ | ||
| 10 | if (context.ready) | ||
| 11 | return 1; | ||
| 12 | |||
| 13 | - if (!LRMI_common_init()) | ||
| 14 | + if (!LRMI_common_init(0)) | ||
| 15 | return 0; | ||
| 16 | |||
| 17 | /* | ||
| 18 | diff -ur libx86-1.1/thunk.c libx86-1.1.hack/thunk.c | ||
| 19 | --- libx86-1.1/thunk.c 2008-04-02 20:48:00.000000000 -0400 | ||
| 20 | +++ libx86-1.1.hack/thunk.c 2009-10-26 16:05:39.000000000 -0400 | ||
| 21 | @@ -139,11 +139,11 @@ | ||
| 22 | int i; | ||
| 23 | X86EMU_intrFuncs intFuncs[256]; | ||
| 24 | |||
| 25 | - if (!LRMI_common_init()) | ||
| 26 | + mmap_addr = LRMI_common_init(1); | ||
| 27 | + | ||
| 28 | + if (!mmap_addr) | ||
| 29 | return 0; | ||
| 30 | |||
| 31 | - mmap_addr = 0; | ||
| 32 | - | ||
| 33 | X86EMU_pioFuncs pioFuncs = { | ||
| 34 | (&x_inb), | ||
| 35 | (&x_inw), | ||
| 36 | @@ -169,10 +169,10 @@ | ||
| 37 | X86_ESP = 0xFFF9; | ||
| 38 | memset (stack, 0, 64*1024); | ||
| 39 | |||
| 40 | - *((char *)0) = 0x4f; /* Make sure that we end up jumping back to a | ||
| 41 | - halt instruction */ | ||
| 42 | + *mmap_addr = 0x4f; /* Make sure that we end up jumping back to a | ||
| 43 | + halt instruction */ | ||
| 44 | |||
| 45 | - M.mem_base = 0; | ||
| 46 | + M.mem_base = (unsigned long)mmap_addr; | ||
| 47 | M.mem_size = 1024*1024; | ||
| 48 | |||
| 49 | return 1; | ||
| 50 | diff -ur libx86-1.1/x86-common.c libx86-1.1.hack/x86-common.c | ||
| 51 | --- libx86-1.1/x86-common.c 2008-05-16 12:56:23.000000000 -0400 | ||
| 52 | +++ libx86-1.1.hack/x86-common.c 2009-10-26 16:03:21.000000000 -0400 | ||
| 53 | @@ -45,14 +45,15 @@ | ||
| 54 | static struct { | ||
| 55 | int ready; | ||
| 56 | int count; | ||
| 57 | + void *offset; | ||
| 58 | struct mem_block blocks[REAL_MEM_BLOCKS]; | ||
| 59 | } mem_info = { 0 }; | ||
| 60 | |||
| 61 | static int | ||
| 62 | -real_mem_init(void) | ||
| 63 | +real_mem_init(int high_page) | ||
| 64 | { | ||
| 65 | void *m; | ||
| 66 | - int fd_zero; | ||
| 67 | + int fd_zero, flags = MAP_SHARED; | ||
| 68 | |||
| 69 | if (mem_info.ready) | ||
| 70 | return 1; | ||
| 71 | @@ -63,9 +64,12 @@ | ||
| 72 | return 0; | ||
| 73 | } | ||
| 74 | |||
| 75 | + if (!high_page) | ||
| 76 | + flags |= MAP_FIXED; | ||
| 77 | + | ||
| 78 | m = mmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE, | ||
| 79 | - PROT_READ | PROT_WRITE | PROT_EXEC, | ||
| 80 | - MAP_FIXED | MAP_SHARED, fd_zero, 0); | ||
| 81 | + PROT_READ | PROT_WRITE | PROT_EXEC, | ||
| 82 | + flags, fd_zero, 0); | ||
| 83 | |||
| 84 | if (m == (void *)-1) { | ||
| 85 | perror("mmap /dev/zero"); | ||
| 86 | @@ -76,6 +80,7 @@ | ||
| 87 | close(fd_zero); | ||
| 88 | |||
| 89 | mem_info.ready = 1; | ||
| 90 | + mem_info.offset = m; | ||
| 91 | mem_info.count = 1; | ||
| 92 | mem_info.blocks[0].size = REAL_MEM_SIZE; | ||
| 93 | mem_info.blocks[0].free = 1; | ||
| 94 | @@ -87,7 +92,7 @@ | ||
| 95 | real_mem_deinit(void) | ||
| 96 | { | ||
| 97 | if (mem_info.ready) { | ||
| 98 | - munmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE); | ||
| 99 | + munmap(mem_info.offset, REAL_MEM_SIZE); | ||
| 100 | mem_info.ready = 0; | ||
| 101 | } | ||
| 102 | } | ||
| 103 | @@ -119,7 +124,7 @@ | ||
| 104 | LRMI_alloc_real(int size) | ||
| 105 | { | ||
| 106 | int i; | ||
| 107 | - char *r = (char *)REAL_MEM_BASE; | ||
| 108 | + char *r = (char *)mem_info.offset; | ||
| 109 | |||
| 110 | if (!mem_info.ready) | ||
| 111 | return NULL; | ||
| 112 | @@ -151,7 +156,7 @@ | ||
| 113 | LRMI_free_real(void *m) | ||
| 114 | { | ||
| 115 | int i; | ||
| 116 | - char *r = (char *)REAL_MEM_BASE; | ||
| 117 | + char *r = (char *)mem_info.offset; | ||
| 118 | |||
| 119 | if (!mem_info.ready) | ||
| 120 | return; | ||
| 121 | @@ -200,13 +205,15 @@ | ||
| 122 | return *(unsigned short *)(i * 4); | ||
| 123 | } | ||
| 124 | |||
| 125 | -int LRMI_common_init(void) | ||
| 126 | +void *LRMI_common_init(int high_page) | ||
| 127 | { | ||
| 128 | - void *m; | ||
| 129 | + void *m, *offset; | ||
| 130 | int fd_mem; | ||
| 131 | |||
| 132 | - if (!real_mem_init()) | ||
| 133 | - return 0; | ||
| 134 | + if (!real_mem_init(high_page)) | ||
| 135 | + return NULL; | ||
| 136 | + | ||
| 137 | + offset = mem_info.offset - REAL_MEM_BASE; | ||
| 138 | |||
| 139 | /* | ||
| 140 | Map the Interrupt Vectors (0x0 - 0x400) + BIOS data (0x400 - 0x502) | ||
| 141 | @@ -217,33 +224,33 @@ | ||
| 142 | if (fd_mem == -1) { | ||
| 143 | real_mem_deinit(); | ||
| 144 | perror("open /dev/mem"); | ||
| 145 | - return 0; | ||
| 146 | + return NULL; | ||
| 147 | } | ||
| 148 | |||
| 149 | - m = mmap((void *)0, 0x502, | ||
| 150 | - PROT_READ | PROT_WRITE | PROT_EXEC, | ||
| 151 | - MAP_FIXED | MAP_SHARED, fd_mem, 0); | ||
| 152 | + m = mmap(offset, 0x502, | ||
| 153 | + PROT_READ | PROT_WRITE | PROT_EXEC, | ||
| 154 | + MAP_FIXED | MAP_SHARED, fd_mem, 0); | ||
| 155 | |||
| 156 | if (m == (void *)-1) { | ||
| 157 | close(fd_mem); | ||
| 158 | real_mem_deinit(); | ||
| 159 | perror("mmap /dev/mem"); | ||
| 160 | - return 0; | ||
| 161 | + return NULL; | ||
| 162 | } | ||
| 163 | |||
| 164 | - m = mmap((void *)0xa0000, 0x100000 - 0xa0000, | ||
| 165 | + m = mmap(offset+0xa0000, 0x100000 - 0xa0000, | ||
| 166 | PROT_READ | PROT_WRITE | PROT_EXEC, | ||
| 167 | MAP_FIXED | MAP_SHARED, fd_mem, 0xa0000); | ||
| 168 | |||
| 169 | if (m == (void *)-1) { | ||
| 170 | - munmap((void *)0, 0x502); | ||
| 171 | + munmap(offset, 0x502); | ||
| 172 | close(fd_mem); | ||
| 173 | real_mem_deinit(); | ||
| 174 | perror("mmap /dev/mem"); | ||
| 175 | - return 0; | ||
| 176 | + return NULL; | ||
| 177 | } | ||
| 178 | |||
| 179 | close(fd_mem); | ||
| 180 | |||
| 181 | - return 1; | ||
| 182 | + return offset; | ||
| 183 | } | ||
| 184 | diff -ur libx86-1.1/x86-common.h libx86-1.1.hack/x86-common.h | ||
| 185 | --- libx86-1.1/x86-common.h 2006-09-07 18:44:27.000000000 -0400 | ||
| 186 | +++ libx86-1.1.hack/x86-common.h 2009-10-26 16:01:19.000000000 -0400 | ||
| 187 | @@ -40,4 +40,4 @@ | ||
| 188 | |||
| 189 | void *LRMI_alloc_real(int size); | ||
| 190 | void LRMI_free_real(void *m); | ||
| 191 | -int LRMI_common_init(void); | ||
| 192 | +void *LRMI_common_init(int high_page); | ||
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch deleted file mode 100644 index 821ab379d5..0000000000 --- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 4 | |||
| 5 | diff --git a/Makefile b/Makefile | ||
| 6 | index 951b617..6d9b73d 100644 | ||
| 7 | --- a/Makefile | ||
| 8 | +++ b/Makefile | ||
| 9 | @@ -22,7 +22,7 @@ static: $(OBJECTS) | ||
| 10 | $(AR) cru libx86.a $(OBJECTS) | ||
| 11 | |||
| 12 | shared: $(OBJECTS) | ||
| 13 | - $(CC) $(CFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS) | ||
| 14 | + $(CC) $(CFLAGS) $(LDFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS) | ||
| 15 | |||
| 16 | objclean: | ||
| 17 | $(MAKE) -C x86emu clean | ||
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.1.bb index 817322a484..5ef7707a86 100644 --- a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb +++ b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.1.bb | |||
| @@ -7,17 +7,16 @@ LICENSE = "MIT & BSD-3-Clause" | |||
| 7 | SECTION = "libs" | 7 | SECTION = "libs" |
| 8 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=633af6c02e6f624d4c472d970a2aca53" | 8 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=633af6c02e6f624d4c472d970a2aca53" |
| 9 | 9 | ||
| 10 | SRC_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/libx86-${PV}.tar.gz \ | 10 | SRC_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/libx86-v${PV}.tar.lz \ |
| 11 | file://libx86-mmap-offset.patch \ | ||
| 12 | file://0001-assume-zero-is-valid-address.patch \ | 11 | file://0001-assume-zero-is-valid-address.patch \ |
| 13 | file://makefile-add-ldflags.patch \ | ||
| 14 | file://0001-Fix-type-of-the-void-pointer-assignment.patch \ | ||
| 15 | file://0001-Define-CARD32-as-uint-as-it-is-32-bit.patch \ | 12 | file://0001-Define-CARD32-as-uint-as-it-is-32-bit.patch \ |
| 16 | " | 13 | " |
| 17 | SRC_URI[sha256sum] = "5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048" | 14 | SRC_URI[sha256sum] = "0de221c8e2fcc84078155c1a82f86dcd71c2706033eb410d2090d86c99f51141" |
| 18 | 15 | ||
| 19 | UPSTREAM_CHECK_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/" | 16 | UPSTREAM_CHECK_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/" |
| 20 | 17 | ||
| 18 | S = "${UNPACKDIR}/${BPN}-v${PV}" | ||
| 19 | |||
| 21 | BPN = "libx86" | 20 | BPN = "libx86" |
| 22 | COMPATIBLE_HOST = '(x86_64|i.86).*-linux' | 21 | COMPATIBLE_HOST = '(x86_64|i.86).*-linux' |
| 23 | 22 | ||
diff --git a/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb b/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.2.0.bb index 834687b43b..a8c5bab78d 100644 --- a/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb +++ b/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.2.0.bb | |||
| @@ -8,10 +8,12 @@ LICENSE = "GPL-2.0-only" | |||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" |
| 9 | DEPENDS = "liblockfile" | 9 | DEPENDS = "liblockfile" |
| 10 | 10 | ||
| 11 | SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.gz" | 11 | SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.xz" |
| 12 | SRC_URI[sha256sum] = "2c5704b01c8f474f82921780e4592a927b2bf6a6d7616354a6c5d7cd5664857e" | 12 | SRC_URI[sha256sum] = "2988fb5a8b407e52e2aa6282ce45497f465c921d591138c100f4898215844c90" |
| 13 | 13 | ||
| 14 | do_compile() { | 14 | do_compile() { |
| 15 | ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -c rewrite-time.c | ||
| 16 | ${BUILD_CC} -o rewrite-time ${BUILD_LDFLAGS} rewrite-time.o | ||
| 15 | oe_runmake CFLAGS=' -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables ${DEBUG_PREFIX_MAP}' | 17 | oe_runmake CFLAGS=' -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables ${DEBUG_PREFIX_MAP}' |
| 16 | } | 18 | } |
| 17 | 19 | ||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch new file mode 100644 index 0000000000..1b35d2c094 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch | |||
| @@ -0,0 +1,68 @@ | |||
| 1 | This patch fixes configure with python 3.14 | ||
| 2 | |||
| 3 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 4 | |||
| 5 | Upstream-Status: Backport [https://github.com/mozilla-firefox/firefox/commit/d497aa4f770ca02f6083e93b94996a8fe32c2ff4] | ||
| 6 | |||
| 7 | diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py | ||
| 8 | index 5cb627b..c2dcafe 100644 | ||
| 9 | --- a/python/mozbuild/mozbuild/frontend/reader.py | ||
| 10 | +++ b/python/mozbuild/mozbuild/frontend/reader.py | ||
| 11 | @@ -470,7 +470,7 @@ class TemplateFunction(object): | ||
| 12 | return c( | ||
| 13 | ast.Subscript( | ||
| 14 | value=c(ast.Name(id=self._global_name, ctx=ast.Load())), | ||
| 15 | - slice=c(ast.Index(value=c(ast.Str(s=node.id)))), | ||
| 16 | + slice=c(ast.Index(value=c(ast.Constant(value=node.id)))), | ||
| 17 | ctx=node.ctx, | ||
| 18 | ) | ||
| 19 | ) | ||
| 20 | @@ -1035,8 +1035,8 @@ class BuildReader(object): | ||
| 21 | else: | ||
| 22 | # Others | ||
| 23 | assert isinstance(target.slice, ast.Index) | ||
| 24 | - assert isinstance(target.slice.value, ast.Str) | ||
| 25 | - key = target.slice.value.s | ||
| 26 | + assert isinstance(target.slice.value, ast.Constant) | ||
| 27 | + key = target.slice.value.value | ||
| 28 | |||
| 29 | return name, key | ||
| 30 | |||
| 31 | @@ -1044,11 +1044,11 @@ class BuildReader(object): | ||
| 32 | value = node.value | ||
| 33 | if isinstance(value, ast.List): | ||
| 34 | for v in value.elts: | ||
| 35 | - assert isinstance(v, ast.Str) | ||
| 36 | - yield v.s | ||
| 37 | + assert isinstance(v, ast.Constant) | ||
| 38 | + yield v.value | ||
| 39 | else: | ||
| 40 | - assert isinstance(value, ast.Str) | ||
| 41 | - yield value.s | ||
| 42 | + assert isinstance(value, ast.Constant) | ||
| 43 | + yield value.value | ||
| 44 | |||
| 45 | assignments = [] | ||
| 46 | |||
| 47 | diff --git a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py | ||
| 48 | index 1590267..151d27c 100644 | ||
| 49 | --- a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py | ||
| 50 | +++ b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py | ||
| 51 | @@ -327,15 +327,13 @@ def assignment_node_to_source_filename_list(code, node): | ||
| 52 | """ | ||
| 53 | if isinstance(node.value, ast.List) and "elts" in node.value._fields: | ||
| 54 | for f in node.value.elts: | ||
| 55 | - if not isinstance(f, ast.Constant) and not isinstance(f, ast.Str): | ||
| 56 | + if not isinstance(f, ast.Constant): | ||
| 57 | log( | ||
| 58 | "Found non-constant source file name in list: ", | ||
| 59 | ast_get_source_segment(code, f), | ||
| 60 | ) | ||
| 61 | return [] | ||
| 62 | - return [ | ||
| 63 | - f.value if isinstance(f, ast.Constant) else f.s for f in node.value.elts | ||
| 64 | - ] | ||
| 65 | + return [f.value for f in node.value.elts] | ||
| 66 | elif isinstance(node.value, ast.ListComp): | ||
| 67 | # SOURCES += [f for f in foo if blah] | ||
| 68 | log("Could not find the files for " + ast_get_source_segment(code, node.value)) | ||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb b/meta-oe/recipes-extended/mozjs/mozjs-128_128.14.0.bb index fbbe3749ba..635cad96cf 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-128_128.14.0.bb | |||
| @@ -3,22 +3,24 @@ HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonk | |||
| 3 | LICENSE = "MPL-2.0" | 3 | LICENSE = "MPL-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" |
| 5 | 5 | ||
| 6 | SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ | 6 | SRC_URI = " \ |
| 7 | file://0001-Cargo.toml-do-not-abort-on-panic.patch \ | 7 | https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ |
| 8 | file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ | 8 | file://0001-Cargo.toml-do-not-abort-on-panic.patch \ |
| 9 | file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ | 9 | file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ |
| 10 | file://0004-use-asm-sgidefs.h.patch \ | 10 | file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ |
| 11 | file://0005-Add-RISCV32-support.patch \ | 11 | file://0004-use-asm-sgidefs.h.patch \ |
| 12 | file://0006-util.configure-fix-one-occasionally-reproduced-confi.patch \ | 12 | file://0005-Add-RISCV32-support.patch \ |
| 13 | file://0007-Rewrite-cargo-host-linker-in-python3.patch \ | 13 | file://0006-util.configure-fix-one-occasionally-reproduced-confi.patch \ |
| 14 | file://0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \ | 14 | file://0007-Rewrite-cargo-host-linker-in-python3.patch \ |
| 15 | file://0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \ | 15 | file://0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \ |
| 16 | file://0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \ | 16 | file://0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \ |
| 17 | file://0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \ | 17 | file://0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \ |
| 18 | file://0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \ | 18 | file://0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \ |
| 19 | file://0013-Fix-build-error-with-musl.patch \ | 19 | file://0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \ |
| 20 | " | 20 | file://0013-Fix-build-error-with-musl.patch \ |
| 21 | SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d68358f" | 21 | file://D261512.1755672843.patch \ |
| 22 | " | ||
| 23 | SRC_URI[sha256sum] = "93b9ef6229f41cb22ff109b95bbf61a78395a0fe4b870192eeca22947cb09a53" | ||
| 22 | 24 | ||
| 23 | UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128" | 25 | UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128" |
| 24 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 26 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_0.1.1.bb index b003b52d25..3ac4d5b1fe 100644 --- a/meta-oe/recipes-extended/networking/mstpd_git.bb +++ b/meta-oe/recipes-extended/networking/mstpd_0.1.1.bb | |||
| @@ -1,14 +1,12 @@ | |||
| 1 | LICENSE = "GPL-2.0-or-later" | 1 | LICENSE = "GPL-2.0-or-later" |
| 2 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4" | 2 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4" |
| 3 | 3 | ||
| 4 | PV = "0.1.0+git" | ||
| 5 | |||
| 6 | SRC_URI = " \ | 4 | SRC_URI = " \ |
| 7 | git://github.com/mstpd/mstpd;branch=master;protocol=https \ | 5 | git://github.com/mstpd/mstpd;branch=master;protocol=https;tag=${PV} \ |
| 8 | file://bridge-stp \ | 6 | file://bridge-stp \ |
| 9 | file://mstpd.service \ | 7 | file://mstpd.service \ |
| 10 | " | 8 | " |
| 11 | SRCREV = "181c453fc1a00573e19f14960dcc54ad84beea7c" | 9 | SRCREV = "d7dd987b101f277bfef8ac71de7c1d962a424e8e" |
| 12 | 10 | ||
| 13 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+){2,})" | 11 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+){2,})" |
| 14 | 12 | ||
diff --git a/meta-oe/recipes-extended/nushell/nushell-crates.inc b/meta-oe/recipes-extended/nushell/nushell-crates.inc new file mode 100644 index 0000000000..47e8f37aed --- /dev/null +++ b/meta-oe/recipes-extended/nushell/nushell-crates.inc | |||
| @@ -0,0 +1,1488 @@ | |||
| 1 | # Autogenerated with 'bitbake -c update_crates nushell' | ||
| 2 | |||
| 3 | # from Cargo.lock | ||
| 4 | SRC_URI += " \ | ||
| 5 | crate://crates.io/addr2line/0.24.2 \ | ||
| 6 | crate://crates.io/adler2/2.0.0 \ | ||
| 7 | crate://crates.io/aho-corasick/1.1.4 \ | ||
| 8 | crate://crates.io/alloc-no-stdlib/2.0.4 \ | ||
| 9 | crate://crates.io/alloc-stdlib/0.2.2 \ | ||
| 10 | crate://crates.io/alloca/0.4.0 \ | ||
| 11 | crate://crates.io/allocator-api2/0.2.21 \ | ||
| 12 | crate://crates.io/alphanumeric-sort/1.5.3 \ | ||
| 13 | crate://crates.io/android_system_properties/0.1.5 \ | ||
| 14 | crate://crates.io/ansi-str/0.9.0 \ | ||
| 15 | crate://crates.io/ansitok/0.3.0 \ | ||
| 16 | crate://crates.io/anstream/0.6.21 \ | ||
| 17 | crate://crates.io/anstyle/1.0.13 \ | ||
| 18 | crate://crates.io/anstyle-parse/0.2.7 \ | ||
| 19 | crate://crates.io/anstyle-query/1.1.5 \ | ||
| 20 | crate://crates.io/anstyle-wincon/3.0.6 \ | ||
| 21 | crate://crates.io/anyhow/1.0.100 \ | ||
| 22 | crate://crates.io/arbitrary/1.4.1 \ | ||
| 23 | crate://crates.io/arboard/3.6.1 \ | ||
| 24 | crate://crates.io/arrayvec/0.7.6 \ | ||
| 25 | crate://crates.io/assert_cmd/2.1.2 \ | ||
| 26 | crate://crates.io/async-trait/0.1.89 \ | ||
| 27 | crate://crates.io/atoi_simd/0.16.0 \ | ||
| 28 | crate://crates.io/atomic/0.6.1 \ | ||
| 29 | crate://crates.io/atomic-waker/1.1.2 \ | ||
| 30 | crate://crates.io/autocfg/1.5.0 \ | ||
| 31 | crate://crates.io/backtrace/0.3.74 \ | ||
| 32 | crate://crates.io/backtrace-ext/0.2.1 \ | ||
| 33 | crate://crates.io/base64/0.22.1 \ | ||
| 34 | crate://crates.io/base64ct/1.8.0 \ | ||
| 35 | crate://crates.io/bigdecimal/0.4.10 \ | ||
| 36 | crate://crates.io/bindgen/0.70.1 \ | ||
| 37 | crate://crates.io/bit-set/0.8.0 \ | ||
| 38 | crate://crates.io/bit-vec/0.8.0 \ | ||
| 39 | crate://crates.io/bitflags/1.3.2 \ | ||
| 40 | crate://crates.io/bitflags/2.10.0 \ | ||
| 41 | crate://crates.io/block-buffer/0.10.4 \ | ||
| 42 | crate://crates.io/block2/0.6.2 \ | ||
| 43 | crate://crates.io/bracoxide/0.1.8 \ | ||
| 44 | crate://crates.io/brotli/8.0.2 \ | ||
| 45 | crate://crates.io/brotli-decompressor/5.0.0 \ | ||
| 46 | crate://crates.io/bstr/1.12.1 \ | ||
| 47 | crate://crates.io/buf-trait/0.4.1 \ | ||
| 48 | crate://crates.io/bumpalo/3.19.1 \ | ||
| 49 | crate://crates.io/bytecount/0.6.8 \ | ||
| 50 | crate://crates.io/bytemuck/1.25.0 \ | ||
| 51 | crate://crates.io/byteorder/1.5.0 \ | ||
| 52 | crate://crates.io/byteorder-lite/0.1.0 \ | ||
| 53 | crate://crates.io/bytes/1.11.1 \ | ||
| 54 | crate://crates.io/bytesize/2.3.1 \ | ||
| 55 | crate://crates.io/byteyarn/0.5.1 \ | ||
| 56 | crate://crates.io/calamine/0.32.0 \ | ||
| 57 | crate://crates.io/castaway/0.2.3 \ | ||
| 58 | crate://crates.io/cc/1.2.55 \ | ||
| 59 | crate://crates.io/cesu8/1.1.0 \ | ||
| 60 | crate://crates.io/cexpr/0.6.0 \ | ||
| 61 | crate://crates.io/cfg-if/1.0.4 \ | ||
| 62 | crate://crates.io/cfg_aliases/0.2.1 \ | ||
| 63 | crate://crates.io/chacha20/0.10.0 \ | ||
| 64 | crate://crates.io/chardetng/0.1.17 \ | ||
| 65 | crate://crates.io/chrono/0.4.43 \ | ||
| 66 | crate://crates.io/chrono-humanize/0.2.3 \ | ||
| 67 | crate://crates.io/chrono-tz/0.10.0 \ | ||
| 68 | crate://crates.io/chrono-tz-build/0.4.0 \ | ||
| 69 | crate://crates.io/clang-sys/1.8.1 \ | ||
| 70 | crate://crates.io/clap/4.5.23 \ | ||
| 71 | crate://crates.io/clap_builder/4.5.23 \ | ||
| 72 | crate://crates.io/clap_derive/4.5.18 \ | ||
| 73 | crate://crates.io/clap_lex/0.7.4 \ | ||
| 74 | crate://crates.io/clipboard-win/5.4.0 \ | ||
| 75 | crate://crates.io/codepage/0.1.2 \ | ||
| 76 | crate://crates.io/colorchoice/1.0.4 \ | ||
| 77 | crate://crates.io/colorz/1.1.4 \ | ||
| 78 | crate://crates.io/combine/4.6.7 \ | ||
| 79 | crate://crates.io/compact_str/0.9.0 \ | ||
| 80 | crate://crates.io/console/0.16.1 \ | ||
| 81 | crate://crates.io/const_format/0.2.34 \ | ||
| 82 | crate://crates.io/const_format_proc_macros/0.2.34 \ | ||
| 83 | crate://crates.io/convert_case/0.7.1 \ | ||
| 84 | crate://crates.io/cookie/0.18.1 \ | ||
| 85 | crate://crates.io/cookie_store/0.21.1 \ | ||
| 86 | crate://crates.io/core-foundation/0.9.4 \ | ||
| 87 | crate://crates.io/core-foundation/0.10.0 \ | ||
| 88 | crate://crates.io/core-foundation-sys/0.8.7 \ | ||
| 89 | crate://crates.io/cpufeatures/0.2.17 \ | ||
| 90 | crate://crates.io/cpufeatures/0.3.0 \ | ||
| 91 | crate://crates.io/crc32fast/1.4.2 \ | ||
| 92 | crate://crates.io/crossbeam-channel/0.5.15 \ | ||
| 93 | crate://crates.io/crossbeam-deque/0.8.6 \ | ||
| 94 | crate://crates.io/crossbeam-epoch/0.9.18 \ | ||
| 95 | crate://crates.io/crossbeam-utils/0.8.21 \ | ||
| 96 | crate://crates.io/crossterm/0.29.0 \ | ||
| 97 | crate://crates.io/crossterm_winapi/0.9.1 \ | ||
| 98 | crate://crates.io/crunchy/0.2.4 \ | ||
| 99 | crate://crates.io/crypto-common/0.1.7 \ | ||
| 100 | crate://crates.io/csv/1.4.0 \ | ||
| 101 | crate://crates.io/csv-core/0.1.11 \ | ||
| 102 | crate://crates.io/ctrlc/3.5.1 \ | ||
| 103 | crate://crates.io/darling/0.20.10 \ | ||
| 104 | crate://crates.io/darling/0.23.0 \ | ||
| 105 | crate://crates.io/darling_core/0.20.10 \ | ||
| 106 | crate://crates.io/darling_core/0.23.0 \ | ||
| 107 | crate://crates.io/darling_macro/0.20.10 \ | ||
| 108 | crate://crates.io/darling_macro/0.23.0 \ | ||
| 109 | crate://crates.io/data-encoding/2.10.0 \ | ||
| 110 | crate://crates.io/der/0.7.10 \ | ||
| 111 | crate://crates.io/deranged/0.5.5 \ | ||
| 112 | crate://crates.io/derive_arbitrary/1.4.1 \ | ||
| 113 | crate://crates.io/derive_more/2.0.1 \ | ||
| 114 | crate://crates.io/derive_more-impl/2.0.1 \ | ||
| 115 | crate://crates.io/devicons/0.6.12 \ | ||
| 116 | crate://crates.io/diff/0.1.13 \ | ||
| 117 | crate://crates.io/difflib/0.4.0 \ | ||
| 118 | crate://crates.io/digest/0.10.7 \ | ||
| 119 | crate://crates.io/dirs/6.0.0 \ | ||
| 120 | crate://crates.io/dirs-sys/0.5.0 \ | ||
| 121 | crate://crates.io/dispatch2/0.3.0 \ | ||
| 122 | crate://crates.io/displaydoc/0.2.5 \ | ||
| 123 | crate://crates.io/dns-lookup/3.0.1 \ | ||
| 124 | crate://crates.io/doctest-file/1.0.0 \ | ||
| 125 | crate://crates.io/document-features/0.2.11 \ | ||
| 126 | crate://crates.io/downcast-rs/1.2.1 \ | ||
| 127 | crate://crates.io/dtparse/2.0.1 \ | ||
| 128 | crate://crates.io/dunce/1.0.5 \ | ||
| 129 | crate://crates.io/dyn-clone/1.0.20 \ | ||
| 130 | crate://crates.io/edit/0.1.5 \ | ||
| 131 | crate://crates.io/edtui/0.11.1 \ | ||
| 132 | crate://crates.io/edtui-jagged/0.1.13 \ | ||
| 133 | crate://crates.io/either/1.15.0 \ | ||
| 134 | crate://crates.io/encode_unicode/1.0.0 \ | ||
| 135 | crate://crates.io/encoding_rs/0.8.35 \ | ||
| 136 | crate://crates.io/enum_dispatch/0.3.13 \ | ||
| 137 | crate://crates.io/env_home/0.1.0 \ | ||
| 138 | crate://crates.io/equivalent/1.0.2 \ | ||
| 139 | crate://crates.io/erased-serde/0.4.5 \ | ||
| 140 | crate://crates.io/errno/0.3.10 \ | ||
| 141 | crate://crates.io/error-code/3.3.1 \ | ||
| 142 | crate://crates.io/etcetera/0.10.0 \ | ||
| 143 | crate://crates.io/fallible-iterator/0.3.0 \ | ||
| 144 | crate://crates.io/fallible-streaming-iterator/0.1.9 \ | ||
| 145 | crate://crates.io/fancy-regex/0.17.0 \ | ||
| 146 | crate://crates.io/fast-float2/0.2.3 \ | ||
| 147 | crate://crates.io/fastrand/2.3.0 \ | ||
| 148 | crate://crates.io/fax/0.2.6 \ | ||
| 149 | crate://crates.io/fax_derive/0.2.0 \ | ||
| 150 | crate://crates.io/fd-lock/4.0.2 \ | ||
| 151 | crate://crates.io/fdeflate/0.3.7 \ | ||
| 152 | crate://crates.io/file-id/0.2.2 \ | ||
| 153 | crate://crates.io/filesize/0.2.0 \ | ||
| 154 | crate://crates.io/filetime/0.2.25 \ | ||
| 155 | crate://crates.io/find-msvc-tools/0.1.9 \ | ||
| 156 | crate://crates.io/fixedbitset/0.4.2 \ | ||
| 157 | crate://crates.io/flate2/1.1.2 \ | ||
| 158 | crate://crates.io/fluent/0.17.0 \ | ||
| 159 | crate://crates.io/fluent-bundle/0.16.0 \ | ||
| 160 | crate://crates.io/fluent-langneg/0.13.0 \ | ||
| 161 | crate://crates.io/fluent-syntax/0.12.0 \ | ||
| 162 | crate://crates.io/fluent-uri/0.1.4 \ | ||
| 163 | crate://crates.io/fnv/1.0.7 \ | ||
| 164 | crate://crates.io/foldhash/0.1.5 \ | ||
| 165 | crate://crates.io/foldhash/0.2.0 \ | ||
| 166 | crate://crates.io/foreign-types/0.3.2 \ | ||
| 167 | crate://crates.io/foreign-types-shared/0.1.1 \ | ||
| 168 | crate://crates.io/form_urlencoded/1.2.2 \ | ||
| 169 | crate://crates.io/fs_extra/1.3.0 \ | ||
| 170 | crate://crates.io/fsevent-sys/4.1.0 \ | ||
| 171 | crate://crates.io/futures/0.3.31 \ | ||
| 172 | crate://crates.io/futures-channel/0.3.31 \ | ||
| 173 | crate://crates.io/futures-core/0.3.31 \ | ||
| 174 | crate://crates.io/futures-executor/0.3.31 \ | ||
| 175 | crate://crates.io/futures-io/0.3.31 \ | ||
| 176 | crate://crates.io/futures-macro/0.3.31 \ | ||
| 177 | crate://crates.io/futures-sink/0.3.31 \ | ||
| 178 | crate://crates.io/futures-task/0.3.31 \ | ||
| 179 | crate://crates.io/futures-util/0.3.31 \ | ||
| 180 | crate://crates.io/fuzzy-matcher/0.3.7 \ | ||
| 181 | crate://crates.io/generic-array/0.14.7 \ | ||
| 182 | crate://crates.io/gethostname/0.4.3 \ | ||
| 183 | crate://crates.io/getrandom/0.2.17 \ | ||
| 184 | crate://crates.io/getrandom/0.3.4 \ | ||
| 185 | crate://crates.io/getrandom/0.4.1 \ | ||
| 186 | crate://crates.io/gimli/0.31.1 \ | ||
| 187 | crate://crates.io/glob/0.3.1 \ | ||
| 188 | crate://crates.io/glob-match/0.2.1 \ | ||
| 189 | crate://crates.io/goblin/0.7.1 \ | ||
| 190 | crate://crates.io/h2/0.4.13 \ | ||
| 191 | crate://crates.io/half/2.7.1 \ | ||
| 192 | crate://crates.io/hashbrown/0.15.5 \ | ||
| 193 | crate://crates.io/hashbrown/0.16.1 \ | ||
| 194 | crate://crates.io/hashlink/0.10.0 \ | ||
| 195 | crate://crates.io/heck/0.5.0 \ | ||
| 196 | crate://crates.io/hex/0.4.3 \ | ||
| 197 | crate://crates.io/home/0.5.9 \ | ||
| 198 | crate://crates.io/http/1.4.0 \ | ||
| 199 | crate://crates.io/http-body/1.0.1 \ | ||
| 200 | crate://crates.io/http-body-util/0.1.3 \ | ||
| 201 | crate://crates.io/httparse/1.10.1 \ | ||
| 202 | crate://crates.io/httpdate/1.0.3 \ | ||
| 203 | crate://crates.io/human-date-parser/0.3.1 \ | ||
| 204 | crate://crates.io/hyper/1.8.1 \ | ||
| 205 | crate://crates.io/hyper-rustls/0.27.7 \ | ||
| 206 | crate://crates.io/hyper-tls/0.6.0 \ | ||
| 207 | crate://crates.io/hyper-util/0.1.20 \ | ||
| 208 | crate://crates.io/iana-time-zone/0.1.65 \ | ||
| 209 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ | ||
| 210 | crate://crates.io/icu_collections/2.1.1 \ | ||
| 211 | crate://crates.io/icu_locale_core/2.1.1 \ | ||
| 212 | crate://crates.io/icu_normalizer/2.1.1 \ | ||
| 213 | crate://crates.io/icu_normalizer_data/2.1.1 \ | ||
| 214 | crate://crates.io/icu_properties/2.1.2 \ | ||
| 215 | crate://crates.io/icu_properties_data/2.1.2 \ | ||
| 216 | crate://crates.io/icu_provider/2.1.1 \ | ||
| 217 | crate://crates.io/id-arena/2.3.0 \ | ||
| 218 | crate://crates.io/ident_case/1.0.1 \ | ||
| 219 | crate://crates.io/idna/1.1.0 \ | ||
| 220 | crate://crates.io/idna_adapter/1.2.1 \ | ||
| 221 | crate://crates.io/image/0.25.9 \ | ||
| 222 | crate://crates.io/indexmap/2.13.0 \ | ||
| 223 | crate://crates.io/indicatif/0.18.0 \ | ||
| 224 | crate://crates.io/indoc/2.0.7 \ | ||
| 225 | crate://crates.io/inotify/0.9.6 \ | ||
| 226 | crate://crates.io/inotify-sys/0.1.5 \ | ||
| 227 | crate://crates.io/instability/0.3.7 \ | ||
| 228 | crate://crates.io/interprocess/2.3.1 \ | ||
| 229 | crate://crates.io/intl-memoizer/0.5.3 \ | ||
| 230 | crate://crates.io/intl_pluralrules/7.0.2 \ | ||
| 231 | crate://crates.io/inventory/0.3.15 \ | ||
| 232 | crate://crates.io/ipnet/2.10.1 \ | ||
| 233 | crate://crates.io/is-docker/0.2.0 \ | ||
| 234 | crate://crates.io/is-wsl/0.4.0 \ | ||
| 235 | crate://crates.io/is_ci/1.2.0 \ | ||
| 236 | crate://crates.io/is_debug/1.1.0 \ | ||
| 237 | crate://crates.io/is_executable/1.0.4 \ | ||
| 238 | crate://crates.io/is_terminal_polyfill/1.70.2 \ | ||
| 239 | crate://crates.io/itertools/0.11.0 \ | ||
| 240 | crate://crates.io/itertools/0.13.0 \ | ||
| 241 | crate://crates.io/itertools/0.14.0 \ | ||
| 242 | crate://crates.io/itoa/1.0.17 \ | ||
| 243 | crate://crates.io/jiff/0.2.18 \ | ||
| 244 | crate://crates.io/jiff-static/0.2.18 \ | ||
| 245 | crate://crates.io/jiff-tzdb/0.1.4 \ | ||
| 246 | crate://crates.io/jiff-tzdb-platform/0.1.3 \ | ||
| 247 | crate://crates.io/jni/0.21.1 \ | ||
| 248 | crate://crates.io/jni-sys/0.3.0 \ | ||
| 249 | crate://crates.io/js-sys/0.3.78 \ | ||
| 250 | crate://crates.io/kasuari/0.4.8 \ | ||
| 251 | crate://crates.io/kqueue/1.0.8 \ | ||
| 252 | crate://crates.io/kqueue-sys/1.0.4 \ | ||
| 253 | crate://crates.io/lazy_static/1.5.0 \ | ||
| 254 | crate://crates.io/lean_string/0.5.0 \ | ||
| 255 | crate://crates.io/leb128fmt/0.1.0 \ | ||
| 256 | crate://crates.io/lexopt/0.3.1 \ | ||
| 257 | crate://crates.io/libc/0.2.178 \ | ||
| 258 | crate://crates.io/libloading/0.8.6 \ | ||
| 259 | crate://crates.io/libm/0.2.16 \ | ||
| 260 | crate://crates.io/libproc/0.14.10 \ | ||
| 261 | crate://crates.io/libredox/0.1.3 \ | ||
| 262 | crate://crates.io/libsqlite3-sys/0.35.0 \ | ||
| 263 | crate://crates.io/libz-rs-sys/0.5.1 \ | ||
| 264 | crate://crates.io/line-clipping/0.3.5 \ | ||
| 265 | crate://crates.io/linked-hash-map/0.5.6 \ | ||
| 266 | crate://crates.io/linux-raw-sys/0.4.14 \ | ||
| 267 | crate://crates.io/linux-raw-sys/0.11.0 \ | ||
| 268 | crate://crates.io/litemap/0.8.1 \ | ||
| 269 | crate://crates.io/litrs/0.4.1 \ | ||
| 270 | crate://crates.io/lock_api/0.4.14 \ | ||
| 271 | crate://crates.io/lockfree-object-pool/0.1.6 \ | ||
| 272 | crate://crates.io/log/0.4.29 \ | ||
| 273 | crate://crates.io/lru/0.16.3 \ | ||
| 274 | crate://crates.io/lscolors/0.20.0 \ | ||
| 275 | crate://crates.io/lsp-server/0.7.9 \ | ||
| 276 | crate://crates.io/lsp-textdocument/0.5.0 \ | ||
| 277 | crate://crates.io/lsp-types/0.97.0 \ | ||
| 278 | crate://crates.io/mach2/0.6.0 \ | ||
| 279 | crate://crates.io/matchers/0.2.0 \ | ||
| 280 | crate://crates.io/md-5/0.10.6 \ | ||
| 281 | crate://crates.io/memchr/2.7.6 \ | ||
| 282 | crate://crates.io/miette/7.6.0 \ | ||
| 283 | crate://crates.io/miette-derive/7.6.0 \ | ||
| 284 | crate://crates.io/mime/0.3.17 \ | ||
| 285 | crate://crates.io/mime_guess/2.0.5 \ | ||
| 286 | crate://crates.io/minimal-lexical/0.2.1 \ | ||
| 287 | crate://crates.io/miniz_oxide/0.8.9 \ | ||
| 288 | crate://crates.io/mio/0.8.11 \ | ||
| 289 | crate://crates.io/mio/1.0.4 \ | ||
| 290 | crate://crates.io/moxcms/0.7.11 \ | ||
| 291 | crate://crates.io/multipart-rs/0.1.13 \ | ||
| 292 | crate://crates.io/native-tls/0.2.12 \ | ||
| 293 | crate://crates.io/nix/0.30.1 \ | ||
| 294 | crate://crates.io/nom/7.1.3 \ | ||
| 295 | crate://crates.io/notify/6.1.1 \ | ||
| 296 | crate://crates.io/notify-debouncer-full/0.3.2 \ | ||
| 297 | crate://crates.io/ntapi/0.4.1 \ | ||
| 298 | crate://crates.io/nu-ansi-term/0.50.3 \ | ||
| 299 | crate://crates.io/nu-cli/0.111.0 \ | ||
| 300 | crate://crates.io/nu-cmd-base/0.111.0 \ | ||
| 301 | crate://crates.io/nu-cmd-extra/0.111.0 \ | ||
| 302 | crate://crates.io/nu-cmd-lang/0.111.0 \ | ||
| 303 | crate://crates.io/nu-cmd-plugin/0.111.0 \ | ||
| 304 | crate://crates.io/nu-color-config/0.111.0 \ | ||
| 305 | crate://crates.io/nu-command/0.111.0 \ | ||
| 306 | crate://crates.io/nu-derive-value/0.111.0 \ | ||
| 307 | crate://crates.io/nu-engine/0.111.0 \ | ||
| 308 | crate://crates.io/nu-experimental/0.111.0 \ | ||
| 309 | crate://crates.io/nu-explore/0.111.0 \ | ||
| 310 | crate://crates.io/nu-glob/0.111.0 \ | ||
| 311 | crate://crates.io/nu-json/0.111.0 \ | ||
| 312 | crate://crates.io/nu-lsp/0.111.0 \ | ||
| 313 | crate://crates.io/nu-mcp/0.111.0 \ | ||
| 314 | crate://crates.io/nu-parser/0.111.0 \ | ||
| 315 | crate://crates.io/nu-path/0.111.0 \ | ||
| 316 | crate://crates.io/nu-plugin-core/0.111.0 \ | ||
| 317 | crate://crates.io/nu-plugin-engine/0.111.0 \ | ||
| 318 | crate://crates.io/nu-plugin-protocol/0.111.0 \ | ||
| 319 | crate://crates.io/nu-pretty-hex/0.111.0 \ | ||
| 320 | crate://crates.io/nu-protocol/0.111.0 \ | ||
| 321 | crate://crates.io/nu-std/0.111.0 \ | ||
| 322 | crate://crates.io/nu-system/0.111.0 \ | ||
| 323 | crate://crates.io/nu-table/0.111.0 \ | ||
| 324 | crate://crates.io/nu-term-grid/0.111.0 \ | ||
| 325 | crate://crates.io/nu-test-support/0.111.0 \ | ||
| 326 | crate://crates.io/nu-utils/0.111.0 \ | ||
| 327 | crate://crates.io/nucleo-matcher/0.3.1 \ | ||
| 328 | crate://crates.io/num-bigint/0.4.6 \ | ||
| 329 | crate://crates.io/num-conv/0.2.0 \ | ||
| 330 | crate://crates.io/num-format/0.4.4 \ | ||
| 331 | crate://crates.io/num-integer/0.1.46 \ | ||
| 332 | crate://crates.io/num-traits/0.2.19 \ | ||
| 333 | crate://crates.io/num_threads/0.1.7 \ | ||
| 334 | crate://crates.io/nuon/0.111.0 \ | ||
| 335 | crate://crates.io/objc2/0.6.3 \ | ||
| 336 | crate://crates.io/objc2-app-kit/0.3.2 \ | ||
| 337 | crate://crates.io/objc2-core-foundation/0.3.2 \ | ||
| 338 | crate://crates.io/objc2-core-graphics/0.3.2 \ | ||
| 339 | crate://crates.io/objc2-encode/4.1.0 \ | ||
| 340 | crate://crates.io/objc2-foundation/0.3.2 \ | ||
| 341 | crate://crates.io/objc2-io-kit/0.3.2 \ | ||
| 342 | crate://crates.io/objc2-io-surface/0.3.2 \ | ||
| 343 | crate://crates.io/object/0.36.5 \ | ||
| 344 | crate://crates.io/oem_cp/2.1.2 \ | ||
| 345 | crate://crates.io/omnipath/0.1.6 \ | ||
| 346 | crate://crates.io/once_cell/1.21.3 \ | ||
| 347 | crate://crates.io/open/5.3.1 \ | ||
| 348 | crate://crates.io/openssl/0.10.72 \ | ||
| 349 | crate://crates.io/openssl-macros/0.1.1 \ | ||
| 350 | crate://crates.io/openssl-probe/0.1.6 \ | ||
| 351 | crate://crates.io/openssl-probe/0.2.1 \ | ||
| 352 | crate://crates.io/openssl-src/300.4.1+3.4.0 \ | ||
| 353 | crate://crates.io/openssl-sys/0.9.107 \ | ||
| 354 | crate://crates.io/option-ext/0.2.0 \ | ||
| 355 | crate://crates.io/os_display/0.1.3 \ | ||
| 356 | crate://crates.io/os_pipe/1.2.1 \ | ||
| 357 | crate://crates.io/owo-colors/4.1.0 \ | ||
| 358 | crate://crates.io/papergrid/0.17.0 \ | ||
| 359 | crate://crates.io/parking_lot/0.12.5 \ | ||
| 360 | crate://crates.io/parking_lot_core/0.9.12 \ | ||
| 361 | crate://crates.io/parse-zoneinfo/0.3.1 \ | ||
| 362 | crate://crates.io/parse_datetime/0.13.2 \ | ||
| 363 | crate://crates.io/pastey/0.2.1 \ | ||
| 364 | crate://crates.io/pathdiff/0.2.3 \ | ||
| 365 | crate://crates.io/pem-rfc7468/0.7.0 \ | ||
| 366 | crate://crates.io/percent-encoding/2.3.2 \ | ||
| 367 | crate://crates.io/pest/2.8.5 \ | ||
| 368 | crate://crates.io/pest_consume/1.1.3 \ | ||
| 369 | crate://crates.io/pest_consume_macros/1.1.0 \ | ||
| 370 | crate://crates.io/pest_derive/2.8.5 \ | ||
| 371 | crate://crates.io/pest_generator/2.8.5 \ | ||
| 372 | crate://crates.io/pest_meta/2.8.5 \ | ||
| 373 | crate://crates.io/petgraph/0.6.5 \ | ||
| 374 | crate://crates.io/phf/0.11.3 \ | ||
| 375 | crate://crates.io/phf_codegen/0.11.2 \ | ||
| 376 | crate://crates.io/phf_generator/0.11.3 \ | ||
| 377 | crate://crates.io/phf_shared/0.11.3 \ | ||
| 378 | crate://crates.io/pin-project-lite/0.2.16 \ | ||
| 379 | crate://crates.io/pin-utils/0.1.0 \ | ||
| 380 | crate://crates.io/pkg-config/0.3.31 \ | ||
| 381 | crate://crates.io/plain/0.2.3 \ | ||
| 382 | crate://crates.io/platform-info/2.0.4 \ | ||
| 383 | crate://crates.io/png/0.18.0 \ | ||
| 384 | crate://crates.io/pori/0.0.0 \ | ||
| 385 | crate://crates.io/portable-atomic/1.13.1 \ | ||
| 386 | crate://crates.io/portable-atomic-util/0.2.4 \ | ||
| 387 | crate://crates.io/potential_utf/0.1.4 \ | ||
| 388 | crate://crates.io/powerfmt/0.2.0 \ | ||
| 389 | crate://crates.io/ppv-lite86/0.2.21 \ | ||
| 390 | crate://crates.io/predicates/3.1.2 \ | ||
| 391 | crate://crates.io/predicates-core/1.0.8 \ | ||
| 392 | crate://crates.io/predicates-tree/1.0.11 \ | ||
| 393 | crate://crates.io/pretty_assertions/1.4.1 \ | ||
| 394 | crate://crates.io/prettyplease/0.2.37 \ | ||
| 395 | crate://crates.io/print-positions/0.6.1 \ | ||
| 396 | crate://crates.io/proc-macro-error-attr2/2.0.0 \ | ||
| 397 | crate://crates.io/proc-macro-error2/2.0.1 \ | ||
| 398 | crate://crates.io/proc-macro2/1.0.106 \ | ||
| 399 | crate://crates.io/procfs/0.18.0 \ | ||
| 400 | crate://crates.io/procfs-core/0.18.0 \ | ||
| 401 | crate://crates.io/pure-rust-locales/0.8.2 \ | ||
| 402 | crate://crates.io/pwd/1.4.0 \ | ||
| 403 | crate://crates.io/pxfm/0.1.27 \ | ||
| 404 | crate://crates.io/quick-error/2.0.1 \ | ||
| 405 | crate://crates.io/quick-xml/0.38.4 \ | ||
| 406 | crate://crates.io/quick-xml/0.39.0 \ | ||
| 407 | crate://crates.io/quinn/0.11.6 \ | ||
| 408 | crate://crates.io/quinn-proto/0.11.9 \ | ||
| 409 | crate://crates.io/quinn-udp/0.5.8 \ | ||
| 410 | crate://crates.io/quote/1.0.44 \ | ||
| 411 | crate://crates.io/r-efi/5.3.0 \ | ||
| 412 | crate://crates.io/rand/0.8.5 \ | ||
| 413 | crate://crates.io/rand/0.9.0 \ | ||
| 414 | crate://crates.io/rand/0.10.0 \ | ||
| 415 | crate://crates.io/rand_chacha/0.3.1 \ | ||
| 416 | crate://crates.io/rand_chacha/0.9.0 \ | ||
| 417 | crate://crates.io/rand_core/0.6.4 \ | ||
| 418 | crate://crates.io/rand_core/0.9.3 \ | ||
| 419 | crate://crates.io/rand_core/0.10.0 \ | ||
| 420 | crate://crates.io/ratatui/0.30.0 \ | ||
| 421 | crate://crates.io/ratatui-core/0.1.0 \ | ||
| 422 | crate://crates.io/ratatui-crossterm/0.1.0 \ | ||
| 423 | crate://crates.io/ratatui-macros/0.7.0 \ | ||
| 424 | crate://crates.io/ratatui-widgets/0.3.0 \ | ||
| 425 | crate://crates.io/rayon/1.11.0 \ | ||
| 426 | crate://crates.io/rayon-core/1.13.0 \ | ||
| 427 | crate://crates.io/recvmsg/1.0.0 \ | ||
| 428 | crate://crates.io/redox_syscall/0.5.8 \ | ||
| 429 | crate://crates.io/redox_users/0.5.2 \ | ||
| 430 | crate://crates.io/reedline/0.46.0 \ | ||
| 431 | crate://crates.io/ref-cast/1.0.25 \ | ||
| 432 | crate://crates.io/ref-cast-impl/1.0.25 \ | ||
| 433 | crate://crates.io/regex/1.12.3 \ | ||
| 434 | crate://crates.io/regex-automata/0.4.14 \ | ||
| 435 | crate://crates.io/regex-syntax/0.8.9 \ | ||
| 436 | crate://crates.io/relative-path/1.9.3 \ | ||
| 437 | crate://crates.io/reqwest/0.12.9 \ | ||
| 438 | crate://crates.io/ring/0.17.14 \ | ||
| 439 | crate://crates.io/rmcp/0.16.0 \ | ||
| 440 | crate://crates.io/rmcp-macros/0.16.0 \ | ||
| 441 | crate://crates.io/rmp/0.8.15 \ | ||
| 442 | crate://crates.io/rmp-serde/1.3.1 \ | ||
| 443 | crate://crates.io/roxmltree/0.20.0 \ | ||
| 444 | crate://crates.io/rstest/0.23.0 \ | ||
| 445 | crate://crates.io/rstest_macros/0.23.0 \ | ||
| 446 | crate://crates.io/rusqlite/0.37.0 \ | ||
| 447 | crate://crates.io/rust_decimal/1.36.0 \ | ||
| 448 | crate://crates.io/rustc-demangle/0.1.24 \ | ||
| 449 | crate://crates.io/rustc-hash/1.1.0 \ | ||
| 450 | crate://crates.io/rustc-hash/2.1.0 \ | ||
| 451 | crate://crates.io/rustc_version/0.4.1 \ | ||
| 452 | crate://crates.io/rustix/0.38.42 \ | ||
| 453 | crate://crates.io/rustix/1.1.3 \ | ||
| 454 | crate://crates.io/rustls/0.23.28 \ | ||
| 455 | crate://crates.io/rustls-native-certs/0.8.3 \ | ||
| 456 | crate://crates.io/rustls-pemfile/2.2.0 \ | ||
| 457 | crate://crates.io/rustls-pki-types/1.14.0 \ | ||
| 458 | crate://crates.io/rustls-platform-verifier/0.5.3 \ | ||
| 459 | crate://crates.io/rustls-platform-verifier-android/0.1.1 \ | ||
| 460 | crate://crates.io/rustls-webpki/0.103.9 \ | ||
| 461 | crate://crates.io/rustversion/1.0.22 \ | ||
| 462 | crate://crates.io/ryu/1.0.22 \ | ||
| 463 | crate://crates.io/same-file/1.0.6 \ | ||
| 464 | crate://crates.io/scc/2.4.0 \ | ||
| 465 | crate://crates.io/schannel/0.1.27 \ | ||
| 466 | crate://crates.io/schemars/1.2.1 \ | ||
| 467 | crate://crates.io/schemars_derive/1.2.1 \ | ||
| 468 | crate://crates.io/scopeguard/1.2.0 \ | ||
| 469 | crate://crates.io/scroll/0.11.0 \ | ||
| 470 | crate://crates.io/scroll_derive/0.11.1 \ | ||
| 471 | crate://crates.io/sdd/3.0.10 \ | ||
| 472 | crate://crates.io/security-framework/2.11.1 \ | ||
| 473 | crate://crates.io/security-framework/3.0.1 \ | ||
| 474 | crate://crates.io/security-framework-sys/2.12.1 \ | ||
| 475 | crate://crates.io/self_cell/1.2.0 \ | ||
| 476 | crate://crates.io/semver/1.0.27 \ | ||
| 477 | crate://crates.io/serde/1.0.228 \ | ||
| 478 | crate://crates.io/serde_core/1.0.228 \ | ||
| 479 | crate://crates.io/serde_derive/1.0.228 \ | ||
| 480 | crate://crates.io/serde_derive_internals/0.29.1 \ | ||
| 481 | crate://crates.io/serde_json/1.0.149 \ | ||
| 482 | crate://crates.io/serde_repr/0.1.19 \ | ||
| 483 | crate://crates.io/serde_spanned/0.6.9 \ | ||
| 484 | crate://crates.io/serde_spanned/1.0.4 \ | ||
| 485 | crate://crates.io/serde_urlencoded/0.7.1 \ | ||
| 486 | crate://crates.io/serde_yaml/0.9.34+deprecated \ | ||
| 487 | crate://crates.io/serial_test/3.3.1 \ | ||
| 488 | crate://crates.io/serial_test_derive/3.3.1 \ | ||
| 489 | crate://crates.io/sha1_smol/1.0.1 \ | ||
| 490 | crate://crates.io/sha2/0.10.9 \ | ||
| 491 | crate://crates.io/shadow-rs/1.7.0 \ | ||
| 492 | crate://crates.io/sharded-slab/0.1.7 \ | ||
| 493 | crate://crates.io/shlex/1.3.0 \ | ||
| 494 | crate://crates.io/signal-hook/0.3.17 \ | ||
| 495 | crate://crates.io/signal-hook-mio/0.2.4 \ | ||
| 496 | crate://crates.io/signal-hook-registry/1.4.8 \ | ||
| 497 | crate://crates.io/simd-adler32/0.3.7 \ | ||
| 498 | crate://crates.io/simplelog/0.12.2 \ | ||
| 499 | crate://crates.io/siphasher/1.0.1 \ | ||
| 500 | crate://crates.io/slab/0.4.12 \ | ||
| 501 | crate://crates.io/smallvec/1.15.1 \ | ||
| 502 | crate://crates.io/socket2/0.5.10 \ | ||
| 503 | crate://crates.io/socket2/0.6.2 \ | ||
| 504 | crate://crates.io/socks/0.3.4 \ | ||
| 505 | crate://crates.io/sse-stream/0.2.1 \ | ||
| 506 | crate://crates.io/stable_deref_trait/1.2.1 \ | ||
| 507 | crate://crates.io/static_assertions/1.1.0 \ | ||
| 508 | crate://crates.io/strip-ansi-escapes/0.2.1 \ | ||
| 509 | crate://crates.io/strsim/0.11.1 \ | ||
| 510 | crate://crates.io/strum/0.26.3 \ | ||
| 511 | crate://crates.io/strum/0.27.2 \ | ||
| 512 | crate://crates.io/strum_macros/0.26.4 \ | ||
| 513 | crate://crates.io/strum_macros/0.27.2 \ | ||
| 514 | crate://crates.io/subtle/2.6.1 \ | ||
| 515 | crate://crates.io/supports-color/3.0.2 \ | ||
| 516 | crate://crates.io/supports-hyperlinks/3.1.0 \ | ||
| 517 | crate://crates.io/supports-unicode/3.0.0 \ | ||
| 518 | crate://crates.io/syn/1.0.109 \ | ||
| 519 | crate://crates.io/syn/2.0.114 \ | ||
| 520 | crate://crates.io/sync_wrapper/1.0.2 \ | ||
| 521 | crate://crates.io/synstructure/0.13.2 \ | ||
| 522 | crate://crates.io/sys-locale/0.3.2 \ | ||
| 523 | crate://crates.io/sysinfo/0.38.0 \ | ||
| 524 | crate://crates.io/tabled/0.20.0 \ | ||
| 525 | crate://crates.io/tango-bench/0.6.0 \ | ||
| 526 | crate://crates.io/tempfile/3.24.0 \ | ||
| 527 | crate://crates.io/termcolor/1.4.1 \ | ||
| 528 | crate://crates.io/terminal_size/0.4.1 \ | ||
| 529 | crate://crates.io/termtree/0.4.1 \ | ||
| 530 | crate://crates.io/testing_table/0.3.0 \ | ||
| 531 | crate://crates.io/textwrap/0.16.1 \ | ||
| 532 | crate://crates.io/thiserror/1.0.69 \ | ||
| 533 | crate://crates.io/thiserror/2.0.18 \ | ||
| 534 | crate://crates.io/thiserror-impl/1.0.69 \ | ||
| 535 | crate://crates.io/thiserror-impl/2.0.18 \ | ||
| 536 | crate://crates.io/thread_local/1.1.8 \ | ||
| 537 | crate://crates.io/tiff/0.10.3 \ | ||
| 538 | crate://crates.io/time/0.3.47 \ | ||
| 539 | crate://crates.io/time-core/0.1.8 \ | ||
| 540 | crate://crates.io/time-macros/0.2.27 \ | ||
| 541 | crate://crates.io/tinystr/0.8.1 \ | ||
| 542 | crate://crates.io/tinyvec/1.8.0 \ | ||
| 543 | crate://crates.io/tinyvec_macros/0.1.1 \ | ||
| 544 | crate://crates.io/titlecase/3.6.0 \ | ||
| 545 | crate://crates.io/tokio/1.49.0 \ | ||
| 546 | crate://crates.io/tokio-macros/2.6.0 \ | ||
| 547 | crate://crates.io/tokio-native-tls/0.3.1 \ | ||
| 548 | crate://crates.io/tokio-rustls/0.26.4 \ | ||
| 549 | crate://crates.io/tokio-stream/0.1.17 \ | ||
| 550 | crate://crates.io/tokio-util/0.7.18 \ | ||
| 551 | crate://crates.io/toml/0.8.23 \ | ||
| 552 | crate://crates.io/toml/0.9.10+spec-1.1.0 \ | ||
| 553 | crate://crates.io/toml_datetime/0.6.11 \ | ||
| 554 | crate://crates.io/toml_datetime/0.7.5+spec-1.1.0 \ | ||
| 555 | crate://crates.io/toml_edit/0.22.27 \ | ||
| 556 | crate://crates.io/toml_parser/1.0.6+spec-1.1.0 \ | ||
| 557 | crate://crates.io/toml_write/0.1.2 \ | ||
| 558 | crate://crates.io/toml_writer/1.0.6+spec-1.1.0 \ | ||
| 559 | crate://crates.io/tower-service/0.3.3 \ | ||
| 560 | crate://crates.io/tracing/0.1.44 \ | ||
| 561 | crate://crates.io/tracing-attributes/0.1.31 \ | ||
| 562 | crate://crates.io/tracing-core/0.1.36 \ | ||
| 563 | crate://crates.io/tracing-log/0.2.0 \ | ||
| 564 | crate://crates.io/tracing-subscriber/0.3.22 \ | ||
| 565 | crate://crates.io/trash/5.2.4 \ | ||
| 566 | crate://crates.io/tree_magic_mini/3.1.6 \ | ||
| 567 | crate://crates.io/try-lock/0.2.5 \ | ||
| 568 | crate://crates.io/tui-tree-widget/0.24.0 \ | ||
| 569 | crate://crates.io/type-map/0.5.1 \ | ||
| 570 | crate://crates.io/typeid/1.0.2 \ | ||
| 571 | crate://crates.io/typenum/1.19.0 \ | ||
| 572 | crate://crates.io/typetag/0.2.18 \ | ||
| 573 | crate://crates.io/typetag-impl/0.2.18 \ | ||
| 574 | crate://crates.io/tz-rs/0.7.0 \ | ||
| 575 | crate://crates.io/tzdb/0.7.2 \ | ||
| 576 | crate://crates.io/tzdb_data/0.2.1 \ | ||
| 577 | crate://crates.io/ucd-trie/0.1.7 \ | ||
| 578 | crate://crates.io/umask/2.1.0 \ | ||
| 579 | crate://crates.io/unic-langid/0.9.6 \ | ||
| 580 | crate://crates.io/unic-langid-impl/0.9.6 \ | ||
| 581 | crate://crates.io/unicase/2.9.0 \ | ||
| 582 | crate://crates.io/unicode-ident/1.0.22 \ | ||
| 583 | crate://crates.io/unicode-linebreak/0.1.5 \ | ||
| 584 | crate://crates.io/unicode-segmentation/1.12.0 \ | ||
| 585 | crate://crates.io/unicode-truncate/2.0.1 \ | ||
| 586 | crate://crates.io/unicode-width/0.1.11 \ | ||
| 587 | crate://crates.io/unicode-width/0.2.2 \ | ||
| 588 | crate://crates.io/unicode-xid/0.2.6 \ | ||
| 589 | crate://crates.io/unit-prefix/0.5.1 \ | ||
| 590 | crate://crates.io/unsafe-libyaml/0.2.11 \ | ||
| 591 | crate://crates.io/untrusted/0.9.0 \ | ||
| 592 | crate://crates.io/update-informer/1.3.0 \ | ||
| 593 | crate://crates.io/ureq/3.0.12 \ | ||
| 594 | crate://crates.io/ureq-proto/0.4.2 \ | ||
| 595 | crate://crates.io/url/2.5.8 \ | ||
| 596 | crate://crates.io/urlencoding/2.1.3 \ | ||
| 597 | crate://crates.io/utf-8/0.7.6 \ | ||
| 598 | crate://crates.io/utf8_iter/1.0.4 \ | ||
| 599 | crate://crates.io/utf8parse/0.2.2 \ | ||
| 600 | crate://crates.io/uu_cp/0.6.0 \ | ||
| 601 | crate://crates.io/uu_mkdir/0.6.0 \ | ||
| 602 | crate://crates.io/uu_mktemp/0.6.0 \ | ||
| 603 | crate://crates.io/uu_mv/0.6.0 \ | ||
| 604 | crate://crates.io/uu_touch/0.6.0 \ | ||
| 605 | crate://crates.io/uu_uname/0.6.0 \ | ||
| 606 | crate://crates.io/uu_whoami/0.6.0 \ | ||
| 607 | crate://crates.io/uucore/0.6.0 \ | ||
| 608 | crate://crates.io/uucore_procs/0.6.0 \ | ||
| 609 | crate://crates.io/uuid/1.21.0 \ | ||
| 610 | crate://crates.io/v_htmlescape/0.15.8 \ | ||
| 611 | crate://crates.io/valuable/0.1.1 \ | ||
| 612 | crate://crates.io/vcpkg/0.2.15 \ | ||
| 613 | crate://crates.io/version_check/0.9.5 \ | ||
| 614 | crate://crates.io/vte/0.14.1 \ | ||
| 615 | crate://crates.io/wait-timeout/0.2.0 \ | ||
| 616 | crate://crates.io/walkdir/2.5.0 \ | ||
| 617 | crate://crates.io/want/0.3.1 \ | ||
| 618 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ | ||
| 619 | crate://crates.io/wasip2/1.0.2+wasi-0.2.9 \ | ||
| 620 | crate://crates.io/wasip3/0.4.0+wasi-0.3.0-rc-2026-01-06 \ | ||
| 621 | crate://crates.io/wasm-bindgen/0.2.101 \ | ||
| 622 | crate://crates.io/wasm-bindgen-backend/0.2.101 \ | ||
| 623 | crate://crates.io/wasm-bindgen-futures/0.4.51 \ | ||
| 624 | crate://crates.io/wasm-bindgen-macro/0.2.101 \ | ||
| 625 | crate://crates.io/wasm-bindgen-macro-support/0.2.101 \ | ||
| 626 | crate://crates.io/wasm-bindgen-shared/0.2.101 \ | ||
| 627 | crate://crates.io/wasm-encoder/0.244.0 \ | ||
| 628 | crate://crates.io/wasm-metadata/0.244.0 \ | ||
| 629 | crate://crates.io/wasmparser/0.244.0 \ | ||
| 630 | crate://crates.io/wax/0.6.0 \ | ||
| 631 | crate://crates.io/wayland-backend/0.3.12 \ | ||
| 632 | crate://crates.io/wayland-client/0.31.12 \ | ||
| 633 | crate://crates.io/wayland-protocols/0.32.10 \ | ||
| 634 | crate://crates.io/wayland-protocols-wlr/0.3.10 \ | ||
| 635 | crate://crates.io/wayland-scanner/0.31.8 \ | ||
| 636 | crate://crates.io/wayland-sys/0.31.8 \ | ||
| 637 | crate://crates.io/web-sys/0.3.78 \ | ||
| 638 | crate://crates.io/web-time/1.1.0 \ | ||
| 639 | crate://crates.io/webpki-root-certs/0.26.11 \ | ||
| 640 | crate://crates.io/webpki-root-certs/1.0.1 \ | ||
| 641 | crate://crates.io/webpki-roots/0.26.11 \ | ||
| 642 | crate://crates.io/webpki-roots/1.0.0 \ | ||
| 643 | crate://crates.io/weezl/0.1.12 \ | ||
| 644 | crate://crates.io/which/4.4.2 \ | ||
| 645 | crate://crates.io/which/8.0.0 \ | ||
| 646 | crate://crates.io/widestring/1.1.0 \ | ||
| 647 | crate://crates.io/wild/2.2.1 \ | ||
| 648 | crate://crates.io/win_uds/0.2.1 \ | ||
| 649 | crate://crates.io/winapi/0.3.9 \ | ||
| 650 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ | ||
| 651 | crate://crates.io/winapi-util/0.1.9 \ | ||
| 652 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ | ||
| 653 | crate://crates.io/windows/0.56.0 \ | ||
| 654 | crate://crates.io/windows/0.62.1 \ | ||
| 655 | crate://crates.io/windows-collections/0.3.1 \ | ||
| 656 | crate://crates.io/windows-core/0.56.0 \ | ||
| 657 | crate://crates.io/windows-core/0.62.1 \ | ||
| 658 | crate://crates.io/windows-future/0.3.1 \ | ||
| 659 | crate://crates.io/windows-implement/0.56.0 \ | ||
| 660 | crate://crates.io/windows-implement/0.60.2 \ | ||
| 661 | crate://crates.io/windows-interface/0.56.0 \ | ||
| 662 | crate://crates.io/windows-interface/0.59.3 \ | ||
| 663 | crate://crates.io/windows-link/0.2.0 \ | ||
| 664 | crate://crates.io/windows-numerics/0.3.0 \ | ||
| 665 | crate://crates.io/windows-registry/0.2.0 \ | ||
| 666 | crate://crates.io/windows-result/0.1.2 \ | ||
| 667 | crate://crates.io/windows-result/0.2.0 \ | ||
| 668 | crate://crates.io/windows-result/0.4.0 \ | ||
| 669 | crate://crates.io/windows-strings/0.1.0 \ | ||
| 670 | crate://crates.io/windows-strings/0.5.0 \ | ||
| 671 | crate://crates.io/windows-sys/0.45.0 \ | ||
| 672 | crate://crates.io/windows-sys/0.48.0 \ | ||
| 673 | crate://crates.io/windows-sys/0.52.0 \ | ||
| 674 | crate://crates.io/windows-sys/0.59.0 \ | ||
| 675 | crate://crates.io/windows-sys/0.60.2 \ | ||
| 676 | crate://crates.io/windows-sys/0.61.0 \ | ||
| 677 | crate://crates.io/windows-targets/0.42.2 \ | ||
| 678 | crate://crates.io/windows-targets/0.48.5 \ | ||
| 679 | crate://crates.io/windows-targets/0.52.6 \ | ||
| 680 | crate://crates.io/windows-targets/0.53.4 \ | ||
| 681 | crate://crates.io/windows-threading/0.2.0 \ | ||
| 682 | crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ | ||
| 683 | crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ | ||
| 684 | crate://crates.io/windows_aarch64_gnullvm/0.52.6 \ | ||
| 685 | crate://crates.io/windows_aarch64_gnullvm/0.53.1 \ | ||
| 686 | crate://crates.io/windows_aarch64_msvc/0.42.2 \ | ||
| 687 | crate://crates.io/windows_aarch64_msvc/0.48.5 \ | ||
| 688 | crate://crates.io/windows_aarch64_msvc/0.52.6 \ | ||
| 689 | crate://crates.io/windows_aarch64_msvc/0.53.1 \ | ||
| 690 | crate://crates.io/windows_i686_gnu/0.42.2 \ | ||
| 691 | crate://crates.io/windows_i686_gnu/0.48.5 \ | ||
| 692 | crate://crates.io/windows_i686_gnu/0.52.6 \ | ||
| 693 | crate://crates.io/windows_i686_gnu/0.53.1 \ | ||
| 694 | crate://crates.io/windows_i686_gnullvm/0.52.6 \ | ||
| 695 | crate://crates.io/windows_i686_gnullvm/0.53.1 \ | ||
| 696 | crate://crates.io/windows_i686_msvc/0.42.2 \ | ||
| 697 | crate://crates.io/windows_i686_msvc/0.48.5 \ | ||
| 698 | crate://crates.io/windows_i686_msvc/0.52.6 \ | ||
| 699 | crate://crates.io/windows_i686_msvc/0.53.1 \ | ||
| 700 | crate://crates.io/windows_x86_64_gnu/0.42.2 \ | ||
| 701 | crate://crates.io/windows_x86_64_gnu/0.48.5 \ | ||
| 702 | crate://crates.io/windows_x86_64_gnu/0.52.6 \ | ||
| 703 | crate://crates.io/windows_x86_64_gnu/0.53.1 \ | ||
| 704 | crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ | ||
| 705 | crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ | ||
| 706 | crate://crates.io/windows_x86_64_gnullvm/0.52.6 \ | ||
| 707 | crate://crates.io/windows_x86_64_gnullvm/0.53.1 \ | ||
| 708 | crate://crates.io/windows_x86_64_msvc/0.42.2 \ | ||
| 709 | crate://crates.io/windows_x86_64_msvc/0.48.5 \ | ||
| 710 | crate://crates.io/windows_x86_64_msvc/0.52.6 \ | ||
| 711 | crate://crates.io/windows_x86_64_msvc/0.53.1 \ | ||
| 712 | crate://crates.io/winnow/0.7.13 \ | ||
| 713 | crate://crates.io/winreg/0.55.0 \ | ||
| 714 | crate://crates.io/winresource/0.1.19 \ | ||
| 715 | crate://crates.io/winsafe/0.0.19 \ | ||
| 716 | crate://crates.io/wit-bindgen/0.51.0 \ | ||
| 717 | crate://crates.io/wit-bindgen-core/0.51.0 \ | ||
| 718 | crate://crates.io/wit-bindgen-rust/0.51.0 \ | ||
| 719 | crate://crates.io/wit-bindgen-rust-macro/0.51.0 \ | ||
| 720 | crate://crates.io/wit-component/0.244.0 \ | ||
| 721 | crate://crates.io/wit-parser/0.244.0 \ | ||
| 722 | crate://crates.io/wl-clipboard-rs/0.9.3 \ | ||
| 723 | crate://crates.io/writeable/0.6.2 \ | ||
| 724 | crate://crates.io/x11rb/0.13.1 \ | ||
| 725 | crate://crates.io/x11rb-protocol/0.13.1 \ | ||
| 726 | crate://crates.io/xattr/1.3.1 \ | ||
| 727 | crate://crates.io/yansi/1.0.1 \ | ||
| 728 | crate://crates.io/yoke/0.8.1 \ | ||
| 729 | crate://crates.io/yoke-derive/0.8.1 \ | ||
| 730 | crate://crates.io/zerocopy/0.7.35 \ | ||
| 731 | crate://crates.io/zerocopy/0.8.34 \ | ||
| 732 | crate://crates.io/zerocopy-derive/0.7.35 \ | ||
| 733 | crate://crates.io/zerocopy-derive/0.8.34 \ | ||
| 734 | crate://crates.io/zerofrom/0.1.6 \ | ||
| 735 | crate://crates.io/zerofrom-derive/0.1.6 \ | ||
| 736 | crate://crates.io/zeroize/1.8.2 \ | ||
| 737 | crate://crates.io/zerotrie/0.2.3 \ | ||
| 738 | crate://crates.io/zerovec/0.11.4 \ | ||
| 739 | crate://crates.io/zerovec-derive/0.11.2 \ | ||
| 740 | crate://crates.io/zip/4.6.1 \ | ||
| 741 | crate://crates.io/zlib-rs/0.5.1 \ | ||
| 742 | crate://crates.io/zmij/1.0.19 \ | ||
| 743 | crate://crates.io/zopfli/0.8.1 \ | ||
| 744 | crate://crates.io/zune-core/0.4.12 \ | ||
| 745 | crate://crates.io/zune-jpeg/0.4.21 \ | ||
| 746 | " | ||
| 747 | |||
| 748 | SRC_URI[addr2line-0.24.2.sha256sum] = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" | ||
| 749 | SRC_URI[adler2-2.0.0.sha256sum] = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" | ||
| 750 | SRC_URI[aho-corasick-1.1.4.sha256sum] = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" | ||
| 751 | SRC_URI[alloc-no-stdlib-2.0.4.sha256sum] = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" | ||
| 752 | SRC_URI[alloc-stdlib-0.2.2.sha256sum] = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" | ||
| 753 | SRC_URI[alloca-0.4.0.sha256sum] = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4" | ||
| 754 | SRC_URI[allocator-api2-0.2.21.sha256sum] = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" | ||
| 755 | SRC_URI[alphanumeric-sort-1.5.3.sha256sum] = "d67c60c5f10f11c6ee04de72b2dd98bb9d2548cbc314d22a609bfa8bd9e87e8f" | ||
| 756 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" | ||
| 757 | SRC_URI[ansi-str-0.9.0.sha256sum] = "060de1453b69f46304b28274f382132f4e72c55637cf362920926a70d090890d" | ||
| 758 | SRC_URI[ansitok-0.3.0.sha256sum] = "c0a8acea8c2f1c60f0a92a8cd26bf96ca97db56f10bbcab238bbe0cceba659ee" | ||
| 759 | SRC_URI[anstream-0.6.21.sha256sum] = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" | ||
| 760 | SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" | ||
| 761 | SRC_URI[anstyle-parse-0.2.7.sha256sum] = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" | ||
| 762 | SRC_URI[anstyle-query-1.1.5.sha256sum] = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" | ||
| 763 | SRC_URI[anstyle-wincon-3.0.6.sha256sum] = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" | ||
| 764 | SRC_URI[anyhow-1.0.100.sha256sum] = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" | ||
| 765 | SRC_URI[arbitrary-1.4.1.sha256sum] = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" | ||
| 766 | SRC_URI[arboard-3.6.1.sha256sum] = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf" | ||
| 767 | SRC_URI[arrayvec-0.7.6.sha256sum] = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" | ||
| 768 | SRC_URI[assert_cmd-2.1.2.sha256sum] = "9c5bcfa8749ac45dd12cb11055aeeb6b27a3895560d60d71e3c23bf979e60514" | ||
| 769 | SRC_URI[async-trait-0.1.89.sha256sum] = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" | ||
| 770 | SRC_URI[atoi_simd-0.16.0.sha256sum] = "4790f9e8961209112beb783d85449b508673cf4a6a419c8449b210743ac4dbe9" | ||
| 771 | SRC_URI[atomic-0.6.1.sha256sum] = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340" | ||
| 772 | SRC_URI[atomic-waker-1.1.2.sha256sum] = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" | ||
| 773 | SRC_URI[autocfg-1.5.0.sha256sum] = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" | ||
| 774 | SRC_URI[backtrace-0.3.74.sha256sum] = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" | ||
| 775 | SRC_URI[backtrace-ext-0.2.1.sha256sum] = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" | ||
| 776 | SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" | ||
| 777 | SRC_URI[base64ct-1.8.0.sha256sum] = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" | ||
| 778 | SRC_URI[bigdecimal-0.4.10.sha256sum] = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695" | ||
| 779 | SRC_URI[bindgen-0.70.1.sha256sum] = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" | ||
| 780 | SRC_URI[bit-set-0.8.0.sha256sum] = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" | ||
| 781 | SRC_URI[bit-vec-0.8.0.sha256sum] = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" | ||
| 782 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | ||
| 783 | SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" | ||
| 784 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" | ||
| 785 | SRC_URI[block2-0.6.2.sha256sum] = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" | ||
| 786 | SRC_URI[bracoxide-0.1.8.sha256sum] = "daeb5b71668c934a1db0c7b07317a3564f2558c5e9155c70d7d6823c01f2ddcd" | ||
| 787 | SRC_URI[brotli-8.0.2.sha256sum] = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" | ||
| 788 | SRC_URI[brotli-decompressor-5.0.0.sha256sum] = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" | ||
| 789 | SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" | ||
| 790 | SRC_URI[buf-trait-0.4.1.sha256sum] = "21eaafc770e8c073d6c3facafe7617e774305d4954aa6351b9c452eb37ee17b4" | ||
| 791 | SRC_URI[bumpalo-3.19.1.sha256sum] = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" | ||
| 792 | SRC_URI[bytecount-0.6.8.sha256sum] = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" | ||
| 793 | SRC_URI[bytemuck-1.25.0.sha256sum] = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" | ||
| 794 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" | ||
| 795 | SRC_URI[byteorder-lite-0.1.0.sha256sum] = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" | ||
| 796 | SRC_URI[bytes-1.11.1.sha256sum] = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" | ||
| 797 | SRC_URI[bytesize-2.3.1.sha256sum] = "6bd91ee7b2422bcb158d90ef4d14f75ef67f340943fc4149891dcce8f8b972a3" | ||
| 798 | SRC_URI[byteyarn-0.5.1.sha256sum] = "b93e51d26468a15ea59f8525e0c13dc405db43e644a0b1e6d44346c72cf4cf7b" | ||
| 799 | SRC_URI[calamine-0.32.0.sha256sum] = "41bdeb83af82cd9cb686a19ed7efc2f50a21c262610f51ce945a8528860725ce" | ||
| 800 | SRC_URI[castaway-0.2.3.sha256sum] = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" | ||
| 801 | SRC_URI[cc-1.2.55.sha256sum] = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" | ||
| 802 | SRC_URI[cesu8-1.1.0.sha256sum] = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" | ||
| 803 | SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" | ||
| 804 | SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" | ||
| 805 | SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" | ||
| 806 | SRC_URI[chacha20-0.10.0.sha256sum] = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" | ||
| 807 | SRC_URI[chardetng-0.1.17.sha256sum] = "14b8f0b65b7b08ae3c8187e8d77174de20cb6777864c6b832d8ad365999cf1ea" | ||
| 808 | SRC_URI[chrono-0.4.43.sha256sum] = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" | ||
| 809 | SRC_URI[chrono-humanize-0.2.3.sha256sum] = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" | ||
| 810 | SRC_URI[chrono-tz-0.10.0.sha256sum] = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6" | ||
| 811 | SRC_URI[chrono-tz-build-0.4.0.sha256sum] = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7" | ||
| 812 | SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" | ||
| 813 | SRC_URI[clap-4.5.23.sha256sum] = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" | ||
| 814 | SRC_URI[clap_builder-4.5.23.sha256sum] = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" | ||
| 815 | SRC_URI[clap_derive-4.5.18.sha256sum] = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" | ||
| 816 | SRC_URI[clap_lex-0.7.4.sha256sum] = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" | ||
| 817 | SRC_URI[clipboard-win-5.4.0.sha256sum] = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" | ||
| 818 | SRC_URI[codepage-0.1.2.sha256sum] = "48f68d061bc2828ae826206326e61251aca94c1e4a5305cf52d9138639c918b4" | ||
| 819 | SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" | ||
| 820 | SRC_URI[colorz-1.1.4.sha256sum] = "6ceb37c5798821e37369cb546f430f19da2f585e0364c9615ae340a9f2e6067b" | ||
| 821 | SRC_URI[combine-4.6.7.sha256sum] = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" | ||
| 822 | SRC_URI[compact_str-0.9.0.sha256sum] = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" | ||
| 823 | SRC_URI[console-0.16.1.sha256sum] = "b430743a6eb14e9764d4260d4c0d8123087d504eeb9c48f2b2a5e810dd369df4" | ||
| 824 | SRC_URI[const_format-0.2.34.sha256sum] = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" | ||
| 825 | SRC_URI[const_format_proc_macros-0.2.34.sha256sum] = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" | ||
| 826 | SRC_URI[convert_case-0.7.1.sha256sum] = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" | ||
| 827 | SRC_URI[cookie-0.18.1.sha256sum] = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" | ||
| 828 | SRC_URI[cookie_store-0.21.1.sha256sum] = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9" | ||
| 829 | SRC_URI[core-foundation-0.9.4.sha256sum] = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" | ||
| 830 | SRC_URI[core-foundation-0.10.0.sha256sum] = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" | ||
| 831 | SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" | ||
| 832 | SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" | ||
| 833 | SRC_URI[cpufeatures-0.3.0.sha256sum] = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" | ||
| 834 | SRC_URI[crc32fast-1.4.2.sha256sum] = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" | ||
| 835 | SRC_URI[crossbeam-channel-0.5.15.sha256sum] = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" | ||
| 836 | SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" | ||
| 837 | SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" | ||
| 838 | SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" | ||
| 839 | SRC_URI[crossterm-0.29.0.sha256sum] = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" | ||
| 840 | SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" | ||
| 841 | SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" | ||
| 842 | SRC_URI[crypto-common-0.1.7.sha256sum] = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" | ||
| 843 | SRC_URI[csv-1.4.0.sha256sum] = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" | ||
| 844 | SRC_URI[csv-core-0.1.11.sha256sum] = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" | ||
| 845 | SRC_URI[ctrlc-3.5.1.sha256sum] = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790" | ||
| 846 | SRC_URI[darling-0.20.10.sha256sum] = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" | ||
| 847 | SRC_URI[darling-0.23.0.sha256sum] = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" | ||
| 848 | SRC_URI[darling_core-0.20.10.sha256sum] = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" | ||
| 849 | SRC_URI[darling_core-0.23.0.sha256sum] = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" | ||
| 850 | SRC_URI[darling_macro-0.20.10.sha256sum] = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" | ||
| 851 | SRC_URI[darling_macro-0.23.0.sha256sum] = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" | ||
| 852 | SRC_URI[data-encoding-2.10.0.sha256sum] = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" | ||
| 853 | SRC_URI[der-0.7.10.sha256sum] = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" | ||
| 854 | SRC_URI[deranged-0.5.5.sha256sum] = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" | ||
| 855 | SRC_URI[derive_arbitrary-1.4.1.sha256sum] = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" | ||
| 856 | SRC_URI[derive_more-2.0.1.sha256sum] = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" | ||
| 857 | SRC_URI[derive_more-impl-2.0.1.sha256sum] = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" | ||
| 858 | SRC_URI[devicons-0.6.12.sha256sum] = "830e47e2f330cf4fdd5a958dcef921b9523ffc21ab6713aa5e77ba2cce03904b" | ||
| 859 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" | ||
| 860 | SRC_URI[difflib-0.4.0.sha256sum] = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" | ||
| 861 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" | ||
| 862 | SRC_URI[dirs-6.0.0.sha256sum] = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" | ||
| 863 | SRC_URI[dirs-sys-0.5.0.sha256sum] = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" | ||
| 864 | SRC_URI[dispatch2-0.3.0.sha256sum] = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" | ||
| 865 | SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" | ||
| 866 | SRC_URI[dns-lookup-3.0.1.sha256sum] = "6e39034cee21a2f5bbb66ba0e3689819c4bb5d00382a282006e802a7ffa6c41d" | ||
| 867 | SRC_URI[doctest-file-1.0.0.sha256sum] = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" | ||
| 868 | SRC_URI[document-features-0.2.11.sha256sum] = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" | ||
| 869 | SRC_URI[downcast-rs-1.2.1.sha256sum] = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" | ||
| 870 | SRC_URI[dtparse-2.0.1.sha256sum] = "23fb403c0926d35af2cc54d961bc2696a10d40725c08360ef69db04a4c201fd7" | ||
| 871 | SRC_URI[dunce-1.0.5.sha256sum] = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" | ||
| 872 | SRC_URI[dyn-clone-1.0.20.sha256sum] = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" | ||
| 873 | SRC_URI[edit-0.1.5.sha256sum] = "f364860e764787163c8c8f58231003839be31276e821e2ad2092ddf496b1aa09" | ||
| 874 | SRC_URI[edtui-0.11.1.sha256sum] = "e49905ece098e793ca21a019598e9efc9a66459ad1d76bd7619e771a42dae2fc" | ||
| 875 | SRC_URI[edtui-jagged-0.1.13.sha256sum] = "c6818b2d6b8b3da52f7491b6331e27d45ae34e5baaffeb1edfde43911fe63dd6" | ||
| 876 | SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" | ||
| 877 | SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" | ||
| 878 | SRC_URI[encoding_rs-0.8.35.sha256sum] = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" | ||
| 879 | SRC_URI[enum_dispatch-0.3.13.sha256sum] = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" | ||
| 880 | SRC_URI[env_home-0.1.0.sha256sum] = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" | ||
| 881 | SRC_URI[equivalent-1.0.2.sha256sum] = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" | ||
| 882 | SRC_URI[erased-serde-0.4.5.sha256sum] = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" | ||
| 883 | SRC_URI[errno-0.3.10.sha256sum] = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" | ||
| 884 | SRC_URI[error-code-3.3.1.sha256sum] = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" | ||
| 885 | SRC_URI[etcetera-0.10.0.sha256sum] = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6" | ||
| 886 | SRC_URI[fallible-iterator-0.3.0.sha256sum] = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" | ||
| 887 | SRC_URI[fallible-streaming-iterator-0.1.9.sha256sum] = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" | ||
| 888 | SRC_URI[fancy-regex-0.17.0.sha256sum] = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8" | ||
| 889 | SRC_URI[fast-float2-0.2.3.sha256sum] = "f8eb564c5c7423d25c886fb561d1e4ee69f72354d16918afa32c08811f6b6a55" | ||
| 890 | SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" | ||
| 891 | SRC_URI[fax-0.2.6.sha256sum] = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" | ||
| 892 | SRC_URI[fax_derive-0.2.0.sha256sum] = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" | ||
| 893 | SRC_URI[fd-lock-4.0.2.sha256sum] = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" | ||
| 894 | SRC_URI[fdeflate-0.3.7.sha256sum] = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" | ||
| 895 | SRC_URI[file-id-0.2.2.sha256sum] = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36" | ||
| 896 | SRC_URI[filesize-0.2.0.sha256sum] = "12d741e2415d4e2e5bd1c1d00409d1a8865a57892c2d689b504365655d237d43" | ||
| 897 | SRC_URI[filetime-0.2.25.sha256sum] = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" | ||
| 898 | SRC_URI[find-msvc-tools-0.1.9.sha256sum] = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" | ||
| 899 | SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" | ||
| 900 | SRC_URI[flate2-1.1.2.sha256sum] = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" | ||
| 901 | SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477" | ||
| 902 | SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4" | ||
| 903 | SRC_URI[fluent-langneg-0.13.0.sha256sum] = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" | ||
| 904 | SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" | ||
| 905 | SRC_URI[fluent-uri-0.1.4.sha256sum] = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" | ||
| 906 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" | ||
| 907 | SRC_URI[foldhash-0.1.5.sha256sum] = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" | ||
| 908 | SRC_URI[foldhash-0.2.0.sha256sum] = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" | ||
| 909 | SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" | ||
| 910 | SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" | ||
| 911 | SRC_URI[form_urlencoded-1.2.2.sha256sum] = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" | ||
| 912 | SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" | ||
| 913 | SRC_URI[fsevent-sys-4.1.0.sha256sum] = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" | ||
| 914 | SRC_URI[futures-0.3.31.sha256sum] = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" | ||
| 915 | SRC_URI[futures-channel-0.3.31.sha256sum] = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" | ||
| 916 | SRC_URI[futures-core-0.3.31.sha256sum] = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" | ||
| 917 | SRC_URI[futures-executor-0.3.31.sha256sum] = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" | ||
| 918 | SRC_URI[futures-io-0.3.31.sha256sum] = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" | ||
| 919 | SRC_URI[futures-macro-0.3.31.sha256sum] = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" | ||
| 920 | SRC_URI[futures-sink-0.3.31.sha256sum] = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" | ||
| 921 | SRC_URI[futures-task-0.3.31.sha256sum] = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" | ||
| 922 | SRC_URI[futures-util-0.3.31.sha256sum] = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" | ||
| 923 | SRC_URI[fuzzy-matcher-0.3.7.sha256sum] = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" | ||
| 924 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" | ||
| 925 | SRC_URI[gethostname-0.4.3.sha256sum] = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" | ||
| 926 | SRC_URI[getrandom-0.2.17.sha256sum] = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" | ||
| 927 | SRC_URI[getrandom-0.3.4.sha256sum] = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" | ||
| 928 | SRC_URI[getrandom-0.4.1.sha256sum] = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" | ||
| 929 | SRC_URI[gimli-0.31.1.sha256sum] = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" | ||
| 930 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" | ||
| 931 | SRC_URI[glob-match-0.2.1.sha256sum] = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d" | ||
| 932 | SRC_URI[goblin-0.7.1.sha256sum] = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134" | ||
| 933 | SRC_URI[h2-0.4.13.sha256sum] = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" | ||
| 934 | SRC_URI[half-2.7.1.sha256sum] = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" | ||
| 935 | SRC_URI[hashbrown-0.15.5.sha256sum] = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" | ||
| 936 | SRC_URI[hashbrown-0.16.1.sha256sum] = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" | ||
| 937 | SRC_URI[hashlink-0.10.0.sha256sum] = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" | ||
| 938 | SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" | ||
| 939 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" | ||
| 940 | SRC_URI[home-0.5.9.sha256sum] = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" | ||
| 941 | SRC_URI[http-1.4.0.sha256sum] = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" | ||
| 942 | SRC_URI[http-body-1.0.1.sha256sum] = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" | ||
| 943 | SRC_URI[http-body-util-0.1.3.sha256sum] = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" | ||
| 944 | SRC_URI[httparse-1.10.1.sha256sum] = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" | ||
| 945 | SRC_URI[httpdate-1.0.3.sha256sum] = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" | ||
| 946 | SRC_URI[human-date-parser-0.3.1.sha256sum] = "406f83c56de4b2c9183be52ae9a4fefa22c0e0c3d3d7ef80be26eaee11c7110e" | ||
| 947 | SRC_URI[hyper-1.8.1.sha256sum] = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" | ||
| 948 | SRC_URI[hyper-rustls-0.27.7.sha256sum] = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" | ||
| 949 | SRC_URI[hyper-tls-0.6.0.sha256sum] = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" | ||
| 950 | SRC_URI[hyper-util-0.1.20.sha256sum] = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" | ||
| 951 | SRC_URI[iana-time-zone-0.1.65.sha256sum] = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" | ||
| 952 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" | ||
| 953 | SRC_URI[icu_collections-2.1.1.sha256sum] = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" | ||
| 954 | SRC_URI[icu_locale_core-2.1.1.sha256sum] = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" | ||
| 955 | SRC_URI[icu_normalizer-2.1.1.sha256sum] = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" | ||
| 956 | SRC_URI[icu_normalizer_data-2.1.1.sha256sum] = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" | ||
| 957 | SRC_URI[icu_properties-2.1.2.sha256sum] = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" | ||
| 958 | SRC_URI[icu_properties_data-2.1.2.sha256sum] = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" | ||
| 959 | SRC_URI[icu_provider-2.1.1.sha256sum] = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" | ||
| 960 | SRC_URI[id-arena-2.3.0.sha256sum] = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" | ||
| 961 | SRC_URI[ident_case-1.0.1.sha256sum] = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" | ||
| 962 | SRC_URI[idna-1.1.0.sha256sum] = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" | ||
| 963 | SRC_URI[idna_adapter-1.2.1.sha256sum] = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" | ||
| 964 | SRC_URI[image-0.25.9.sha256sum] = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a" | ||
| 965 | SRC_URI[indexmap-2.13.0.sha256sum] = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" | ||
| 966 | SRC_URI[indicatif-0.18.0.sha256sum] = "70a646d946d06bedbbc4cac4c218acf4bbf2d87757a784857025f4d447e4e1cd" | ||
| 967 | SRC_URI[indoc-2.0.7.sha256sum] = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" | ||
| 968 | SRC_URI[inotify-0.9.6.sha256sum] = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" | ||
| 969 | SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" | ||
| 970 | SRC_URI[instability-0.3.7.sha256sum] = "0bf9fed6d91cfb734e7476a06bde8300a1b94e217e1b523b6f0cd1a01998c71d" | ||
| 971 | SRC_URI[interprocess-2.3.1.sha256sum] = "53bf2b0e0785c5394a7392f66d7c4fb9c653633c29b27a932280da3cb344c66a" | ||
| 972 | SRC_URI[intl-memoizer-0.5.3.sha256sum] = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f" | ||
| 973 | SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" | ||
| 974 | SRC_URI[inventory-0.3.15.sha256sum] = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" | ||
| 975 | SRC_URI[ipnet-2.10.1.sha256sum] = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" | ||
| 976 | SRC_URI[is-docker-0.2.0.sha256sum] = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" | ||
| 977 | SRC_URI[is-wsl-0.4.0.sha256sum] = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" | ||
| 978 | SRC_URI[is_ci-1.2.0.sha256sum] = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" | ||
| 979 | SRC_URI[is_debug-1.1.0.sha256sum] = "1fe266d2e243c931d8190177f20bf7f24eed45e96f39e87dc49a27b32d12d407" | ||
| 980 | SRC_URI[is_executable-1.0.4.sha256sum] = "d4a1b5bad6f9072935961dfbf1cced2f3d129963d091b6f69f007fe04e758ae2" | ||
| 981 | SRC_URI[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" | ||
| 982 | SRC_URI[itertools-0.11.0.sha256sum] = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" | ||
| 983 | SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" | ||
| 984 | SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" | ||
| 985 | SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" | ||
| 986 | SRC_URI[jiff-0.2.18.sha256sum] = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50" | ||
| 987 | SRC_URI[jiff-static-0.2.18.sha256sum] = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78" | ||
| 988 | SRC_URI[jiff-tzdb-0.1.4.sha256sum] = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524" | ||
| 989 | SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" | ||
| 990 | SRC_URI[jni-0.21.1.sha256sum] = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" | ||
| 991 | SRC_URI[jni-sys-0.3.0.sha256sum] = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" | ||
| 992 | SRC_URI[js-sys-0.3.78.sha256sum] = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" | ||
| 993 | SRC_URI[kasuari-0.4.8.sha256sum] = "9481b4381c813cebeca86bd55c781d21f902f34cf927ec08d6df3dfebcfd2002" | ||
| 994 | SRC_URI[kqueue-1.0.8.sha256sum] = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" | ||
| 995 | SRC_URI[kqueue-sys-1.0.4.sha256sum] = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" | ||
| 996 | SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" | ||
| 997 | SRC_URI[lean_string-0.5.0.sha256sum] = "75e49998bd00bfb567a44a6d3c3d1a970ce35665b5ebf68d64e5e96410be58ae" | ||
| 998 | SRC_URI[leb128fmt-0.1.0.sha256sum] = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" | ||
| 999 | SRC_URI[lexopt-0.3.1.sha256sum] = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7" | ||
| 1000 | SRC_URI[libc-0.2.178.sha256sum] = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" | ||
| 1001 | SRC_URI[libloading-0.8.6.sha256sum] = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" | ||
| 1002 | SRC_URI[libm-0.2.16.sha256sum] = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" | ||
| 1003 | SRC_URI[libproc-0.14.10.sha256sum] = "e78a09b56be5adbcad5aa1197371688dc6bb249a26da3bca2011ee2fb987ebfb" | ||
| 1004 | SRC_URI[libredox-0.1.3.sha256sum] = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" | ||
| 1005 | SRC_URI[libsqlite3-sys-0.35.0.sha256sum] = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" | ||
| 1006 | SRC_URI[libz-rs-sys-0.5.1.sha256sum] = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221" | ||
| 1007 | SRC_URI[line-clipping-0.3.5.sha256sum] = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a" | ||
| 1008 | SRC_URI[linked-hash-map-0.5.6.sha256sum] = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" | ||
| 1009 | SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" | ||
| 1010 | SRC_URI[linux-raw-sys-0.11.0.sha256sum] = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" | ||
| 1011 | SRC_URI[litemap-0.8.1.sha256sum] = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" | ||
| 1012 | SRC_URI[litrs-0.4.1.sha256sum] = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" | ||
| 1013 | SRC_URI[lock_api-0.4.14.sha256sum] = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" | ||
| 1014 | SRC_URI[lockfree-object-pool-0.1.6.sha256sum] = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" | ||
| 1015 | SRC_URI[log-0.4.29.sha256sum] = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" | ||
| 1016 | SRC_URI[lru-0.16.3.sha256sum] = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" | ||
| 1017 | SRC_URI[lscolors-0.20.0.sha256sum] = "61183da5de8ba09a58e330d55e5ea796539d8443bd00fdeb863eac39724aa4ab" | ||
| 1018 | SRC_URI[lsp-server-0.7.9.sha256sum] = "7d6ada348dbc2703cbe7637b2dda05cff84d3da2819c24abcb305dd613e0ba2e" | ||
| 1019 | SRC_URI[lsp-textdocument-0.5.0.sha256sum] = "2da72ba568f141737cbaf0ce7c7f757a00f94f204352bb1297ae0f28ae43398a" | ||
| 1020 | SRC_URI[lsp-types-0.97.0.sha256sum] = "53353550a17c04ac46c585feb189c2db82154fc84b79c7a66c96c2c644f66071" | ||
| 1021 | SRC_URI[mach2-0.6.0.sha256sum] = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b" | ||
| 1022 | SRC_URI[matchers-0.2.0.sha256sum] = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" | ||
| 1023 | SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" | ||
| 1024 | SRC_URI[memchr-2.7.6.sha256sum] = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" | ||
| 1025 | SRC_URI[miette-7.6.0.sha256sum] = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" | ||
| 1026 | SRC_URI[miette-derive-7.6.0.sha256sum] = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" | ||
| 1027 | SRC_URI[mime-0.3.17.sha256sum] = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" | ||
| 1028 | SRC_URI[mime_guess-2.0.5.sha256sum] = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" | ||
| 1029 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" | ||
| 1030 | SRC_URI[miniz_oxide-0.8.9.sha256sum] = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" | ||
| 1031 | SRC_URI[mio-0.8.11.sha256sum] = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" | ||
| 1032 | SRC_URI[mio-1.0.4.sha256sum] = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" | ||
| 1033 | SRC_URI[moxcms-0.7.11.sha256sum] = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97" | ||
| 1034 | SRC_URI[multipart-rs-0.1.13.sha256sum] = "64cae00e7e52aa5072342ef9a2ccd71669be913c2176a81a665b1f9cd79345f2" | ||
| 1035 | SRC_URI[native-tls-0.2.12.sha256sum] = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" | ||
| 1036 | SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" | ||
| 1037 | SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" | ||
| 1038 | SRC_URI[notify-6.1.1.sha256sum] = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" | ||
| 1039 | SRC_URI[notify-debouncer-full-0.3.2.sha256sum] = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e" | ||
| 1040 | SRC_URI[ntapi-0.4.1.sha256sum] = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" | ||
| 1041 | SRC_URI[nu-ansi-term-0.50.3.sha256sum] = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" | ||
| 1042 | SRC_URI[nu-cli-0.111.0.sha256sum] = "a1bc6be1092e83d9917a1d648f85eea9b55726fa18ce5b5f263e19bb06ab22e9" | ||
| 1043 | SRC_URI[nu-cmd-base-0.111.0.sha256sum] = "5a772c2ef1c30886e85f4d8839e87a362b5e0960d186f8adeb5e257ac6522294" | ||
| 1044 | SRC_URI[nu-cmd-extra-0.111.0.sha256sum] = "6d3b021a91851666b3c3eeafd50f442dcbd023e7a1d9de156d61cc6c9fe9e551" | ||
| 1045 | SRC_URI[nu-cmd-lang-0.111.0.sha256sum] = "c107248c529b6c9599396c21105b45f23b3a3c0aed7d2a3f591be1b39dd85187" | ||
| 1046 | SRC_URI[nu-cmd-plugin-0.111.0.sha256sum] = "89be08b9b865e7a53e6d0f137b37045b563ebbe65a2d0bc7d77b9760e0cffe97" | ||
| 1047 | SRC_URI[nu-color-config-0.111.0.sha256sum] = "58fb0a0c4b0bcb93f49530bb8d34c060db9479c0c7e17d16d25944243e91e9db" | ||
| 1048 | SRC_URI[nu-command-0.111.0.sha256sum] = "df19a2b0b3ab0d931755d71d57e9cf638cfaf44af000c882593f5f443ce3fc7d" | ||
| 1049 | SRC_URI[nu-derive-value-0.111.0.sha256sum] = "d71958b54c367bda033f7dcc4a73b61972fb52323f71a1e3533e290fa67148d1" | ||
| 1050 | SRC_URI[nu-engine-0.111.0.sha256sum] = "d41b3e3e2d25c30741a0761856258e22624c0d60064e4f0e12f86202a451d492" | ||
| 1051 | SRC_URI[nu-experimental-0.111.0.sha256sum] = "f328fa0531bdf49c2dc0312b40cb780e3d74e0d3dbb15d508469a5ae4cfd8d8f" | ||
| 1052 | SRC_URI[nu-explore-0.111.0.sha256sum] = "dced08792a481573900d9151d55d7dd4408900946a75821a3041f83c0767414e" | ||
| 1053 | SRC_URI[nu-glob-0.111.0.sha256sum] = "01ee787f61353c9c90581ddf4c0602a07b991cdd06c97dac8b6d323a1a52c43a" | ||
| 1054 | SRC_URI[nu-json-0.111.0.sha256sum] = "a045bd35a37372dcbb39f3cef78f27a1188b892e60a659d31ddd4184292fa8d9" | ||
| 1055 | SRC_URI[nu-lsp-0.111.0.sha256sum] = "35493095cd04225f107a87add14b2dc88a3f40c681ae3932c9e38296ae607056" | ||
| 1056 | SRC_URI[nu-mcp-0.111.0.sha256sum] = "1a3cd7e28762bc064477d0dff90492a792505581c2ca446aefedad3704372ae8" | ||
| 1057 | SRC_URI[nu-parser-0.111.0.sha256sum] = "e39586113dcaf44c4877a01defeadc63a74fe7a2d9130300ff64689fae5a3205" | ||
| 1058 | SRC_URI[nu-path-0.111.0.sha256sum] = "c01d110cb931acf56237ce572e5b156e8e1134227c90deeffb92eedda9482c23" | ||
| 1059 | SRC_URI[nu-plugin-core-0.111.0.sha256sum] = "38ee792aeb0d37e0ed55ca4304e434eece497914e27ae42616a8bb973f5d2720" | ||
| 1060 | SRC_URI[nu-plugin-engine-0.111.0.sha256sum] = "321b29af417505540a6b8888cdd85074ce77ac4c599e0ce5966d84e16f9c56ba" | ||
| 1061 | SRC_URI[nu-plugin-protocol-0.111.0.sha256sum] = "7725f341428db16dbef4392970de32705abc77ee80a902572c8da811dade3564" | ||
| 1062 | SRC_URI[nu-pretty-hex-0.111.0.sha256sum] = "b436bd9cc54a2386f891c5803b4110036a0bb64ef682039025e6095f4a78d4e9" | ||
| 1063 | SRC_URI[nu-protocol-0.111.0.sha256sum] = "f1c0e58cbeb46cbfd40156e6f4b9f90e4a77e774ca863fa158867a4726aab1d1" | ||
| 1064 | SRC_URI[nu-std-0.111.0.sha256sum] = "942a5c16385910e4576f4807500e5ba846cc48ae028ac0a17380af881941fadc" | ||
| 1065 | SRC_URI[nu-system-0.111.0.sha256sum] = "62fe7847b65edbe362a0fcb67dedfab9fd7370e89c0313f7cb7d0a7ab8f9834b" | ||
| 1066 | SRC_URI[nu-table-0.111.0.sha256sum] = "dcd97332ea4c62d24f44e1496a9d805109bc965e8e4f5a1ce6f26898063d8822" | ||
| 1067 | SRC_URI[nu-term-grid-0.111.0.sha256sum] = "5027bbde5eb92b084dc2ad0760181c38aada10b99fdf713911c0c4ee699282a9" | ||
| 1068 | SRC_URI[nu-test-support-0.111.0.sha256sum] = "3007dd1702769fd631c0303a6ab25eedf1fb47efcce5b1b949859be9e62d34a1" | ||
| 1069 | SRC_URI[nu-utils-0.111.0.sha256sum] = "df85a8a4bb28c84d5f7c096c02c859ac454dfac59fd0296ab5eb6ed86619219e" | ||
| 1070 | SRC_URI[nucleo-matcher-0.3.1.sha256sum] = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85" | ||
| 1071 | SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" | ||
| 1072 | SRC_URI[num-conv-0.2.0.sha256sum] = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" | ||
| 1073 | SRC_URI[num-format-0.4.4.sha256sum] = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" | ||
| 1074 | SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" | ||
| 1075 | SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" | ||
| 1076 | SRC_URI[num_threads-0.1.7.sha256sum] = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" | ||
| 1077 | SRC_URI[nuon-0.111.0.sha256sum] = "537036d9904253e4982411574ee4bcb6a24f7c1011b72cb41bc5c5b49051ce24" | ||
| 1078 | SRC_URI[objc2-0.6.3.sha256sum] = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" | ||
| 1079 | SRC_URI[objc2-app-kit-0.3.2.sha256sum] = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" | ||
| 1080 | SRC_URI[objc2-core-foundation-0.3.2.sha256sum] = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" | ||
| 1081 | SRC_URI[objc2-core-graphics-0.3.2.sha256sum] = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" | ||
| 1082 | SRC_URI[objc2-encode-4.1.0.sha256sum] = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" | ||
| 1083 | SRC_URI[objc2-foundation-0.3.2.sha256sum] = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" | ||
| 1084 | SRC_URI[objc2-io-kit-0.3.2.sha256sum] = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15" | ||
| 1085 | SRC_URI[objc2-io-surface-0.3.2.sha256sum] = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" | ||
| 1086 | SRC_URI[object-0.36.5.sha256sum] = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" | ||
| 1087 | SRC_URI[oem_cp-2.1.2.sha256sum] = "8c7959d3349f484aec36462f98226983578bf7d33f9b034c32967489c7000e1f" | ||
| 1088 | SRC_URI[omnipath-0.1.6.sha256sum] = "80adb31078122c880307e9cdfd4e3361e6545c319f9b9dcafcb03acd3b51a575" | ||
| 1089 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" | ||
| 1090 | SRC_URI[open-5.3.1.sha256sum] = "3ecd52f0b8d15c40ce4820aa251ed5de032e5d91fab27f7db2f40d42a8bdf69c" | ||
| 1091 | SRC_URI[openssl-0.10.72.sha256sum] = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" | ||
| 1092 | SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" | ||
| 1093 | SRC_URI[openssl-probe-0.1.6.sha256sum] = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" | ||
| 1094 | SRC_URI[openssl-probe-0.2.1.sha256sum] = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" | ||
| 1095 | SRC_URI[openssl-src-300.4.1+3.4.0.sha256sum] = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" | ||
| 1096 | SRC_URI[openssl-sys-0.9.107.sha256sum] = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" | ||
| 1097 | SRC_URI[option-ext-0.2.0.sha256sum] = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" | ||
| 1098 | SRC_URI[os_display-0.1.3.sha256sum] = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75" | ||
| 1099 | SRC_URI[os_pipe-1.2.1.sha256sum] = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" | ||
| 1100 | SRC_URI[owo-colors-4.1.0.sha256sum] = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56" | ||
| 1101 | SRC_URI[papergrid-0.17.0.sha256sum] = "6978128c8b51d8f4080631ceb2302ab51e32cc6e8615f735ee2f83fd269ae3f1" | ||
| 1102 | SRC_URI[parking_lot-0.12.5.sha256sum] = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" | ||
| 1103 | SRC_URI[parking_lot_core-0.9.12.sha256sum] = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" | ||
| 1104 | SRC_URI[parse-zoneinfo-0.3.1.sha256sum] = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" | ||
| 1105 | SRC_URI[parse_datetime-0.13.2.sha256sum] = "e4955561bc7aa4c40afcfd2a8c34297b13164ae9ac3b30ac348737befdc98e4c" | ||
| 1106 | SRC_URI[pastey-0.2.1.sha256sum] = "b867cad97c0791bbd3aaa6472142568c6c9e8f71937e98379f584cfb0cf35bec" | ||
| 1107 | SRC_URI[pathdiff-0.2.3.sha256sum] = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" | ||
| 1108 | SRC_URI[pem-rfc7468-0.7.0.sha256sum] = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" | ||
| 1109 | SRC_URI[percent-encoding-2.3.2.sha256sum] = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" | ||
| 1110 | SRC_URI[pest-2.8.5.sha256sum] = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7" | ||
| 1111 | SRC_URI[pest_consume-1.1.3.sha256sum] = "79447402d15d18e7142e14c72f2e63fa3d155be1bc5b70b3ccbb610ac55f536b" | ||
| 1112 | SRC_URI[pest_consume_macros-1.1.0.sha256sum] = "9d8630a7a899cb344ec1c16ba0a6b24240029af34bdc0a21f84e411d7f793f29" | ||
| 1113 | SRC_URI[pest_derive-2.8.5.sha256sum] = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed" | ||
| 1114 | SRC_URI[pest_generator-2.8.5.sha256sum] = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5" | ||
| 1115 | SRC_URI[pest_meta-2.8.5.sha256sum] = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365" | ||
| 1116 | SRC_URI[petgraph-0.6.5.sha256sum] = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" | ||
| 1117 | SRC_URI[phf-0.11.3.sha256sum] = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" | ||
| 1118 | SRC_URI[phf_codegen-0.11.2.sha256sum] = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" | ||
| 1119 | SRC_URI[phf_generator-0.11.3.sha256sum] = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" | ||
| 1120 | SRC_URI[phf_shared-0.11.3.sha256sum] = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" | ||
| 1121 | SRC_URI[pin-project-lite-0.2.16.sha256sum] = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" | ||
| 1122 | SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" | ||
| 1123 | SRC_URI[pkg-config-0.3.31.sha256sum] = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" | ||
| 1124 | SRC_URI[plain-0.2.3.sha256sum] = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" | ||
| 1125 | SRC_URI[platform-info-2.0.4.sha256sum] = "91077ffd05d058d70d79eefcd7d7f6aac34980860a7519960f7913b6563a8c3a" | ||
| 1126 | SRC_URI[png-0.18.0.sha256sum] = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0" | ||
| 1127 | SRC_URI[pori-0.0.0.sha256sum] = "a4a63d338dec139f56dacc692ca63ad35a6be6a797442479b55acd611d79e906" | ||
| 1128 | SRC_URI[portable-atomic-1.13.1.sha256sum] = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" | ||
| 1129 | SRC_URI[portable-atomic-util-0.2.4.sha256sum] = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" | ||
| 1130 | SRC_URI[potential_utf-0.1.4.sha256sum] = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" | ||
| 1131 | SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" | ||
| 1132 | SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" | ||
| 1133 | SRC_URI[predicates-3.1.2.sha256sum] = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" | ||
| 1134 | SRC_URI[predicates-core-1.0.8.sha256sum] = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" | ||
| 1135 | SRC_URI[predicates-tree-1.0.11.sha256sum] = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" | ||
| 1136 | SRC_URI[pretty_assertions-1.4.1.sha256sum] = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" | ||
| 1137 | SRC_URI[prettyplease-0.2.37.sha256sum] = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" | ||
| 1138 | SRC_URI[print-positions-0.6.1.sha256sum] = "1df593470e3ef502e48cb0cfc9a3a61e5f61e967b78e1ed35a67ac615cfbd208" | ||
| 1139 | SRC_URI[proc-macro-error-attr2-2.0.0.sha256sum] = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" | ||
| 1140 | SRC_URI[proc-macro-error2-2.0.1.sha256sum] = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" | ||
| 1141 | SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" | ||
| 1142 | SRC_URI[procfs-0.18.0.sha256sum] = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" | ||
| 1143 | SRC_URI[procfs-core-0.18.0.sha256sum] = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" | ||
| 1144 | SRC_URI[pure-rust-locales-0.8.2.sha256sum] = "869675ad2d7541aea90c6d88c81f46a7f4ea9af8cd0395d38f11a95126998a0d" | ||
| 1145 | SRC_URI[pwd-1.4.0.sha256sum] = "72c71c0c79b9701efe4e1e4b563b2016dd4ee789eb99badcb09d61ac4b92e4a2" | ||
| 1146 | SRC_URI[pxfm-0.1.27.sha256sum] = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8" | ||
| 1147 | SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" | ||
| 1148 | SRC_URI[quick-xml-0.38.4.sha256sum] = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" | ||
| 1149 | SRC_URI[quick-xml-0.39.0.sha256sum] = "f2e3bf4aa9d243beeb01a7b3bc30b77cfe2c44e24ec02d751a7104a53c2c49a1" | ||
| 1150 | SRC_URI[quinn-0.11.6.sha256sum] = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" | ||
| 1151 | SRC_URI[quinn-proto-0.11.9.sha256sum] = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" | ||
| 1152 | SRC_URI[quinn-udp-0.5.8.sha256sum] = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527" | ||
| 1153 | SRC_URI[quote-1.0.44.sha256sum] = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" | ||
| 1154 | SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" | ||
| 1155 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" | ||
| 1156 | SRC_URI[rand-0.9.0.sha256sum] = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" | ||
| 1157 | SRC_URI[rand-0.10.0.sha256sum] = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" | ||
| 1158 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" | ||
| 1159 | SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" | ||
| 1160 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" | ||
| 1161 | SRC_URI[rand_core-0.9.3.sha256sum] = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" | ||
| 1162 | SRC_URI[rand_core-0.10.0.sha256sum] = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" | ||
| 1163 | SRC_URI[ratatui-0.30.0.sha256sum] = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc" | ||
| 1164 | SRC_URI[ratatui-core-0.1.0.sha256sum] = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293" | ||
| 1165 | SRC_URI[ratatui-crossterm-0.1.0.sha256sum] = "577c9b9f652b4c121fb25c6a391dd06406d3b092ba68827e6d2f09550edc54b3" | ||
| 1166 | SRC_URI[ratatui-macros-0.7.0.sha256sum] = "a7f1342a13e83e4bb9d0b793d0ea762be633f9582048c892ae9041ef39c936f4" | ||
| 1167 | SRC_URI[ratatui-widgets-0.3.0.sha256sum] = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db" | ||
| 1168 | SRC_URI[rayon-1.11.0.sha256sum] = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" | ||
| 1169 | SRC_URI[rayon-core-1.13.0.sha256sum] = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" | ||
| 1170 | SRC_URI[recvmsg-1.0.0.sha256sum] = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" | ||
| 1171 | SRC_URI[redox_syscall-0.5.8.sha256sum] = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" | ||
| 1172 | SRC_URI[redox_users-0.5.2.sha256sum] = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" | ||
| 1173 | SRC_URI[reedline-0.46.0.sha256sum] = "fe9e7c532bfc2759bc8a28902c04e8b993fc13ebd085ee4292eb1b230fa9beef" | ||
| 1174 | SRC_URI[ref-cast-1.0.25.sha256sum] = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" | ||
| 1175 | SRC_URI[ref-cast-impl-1.0.25.sha256sum] = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" | ||
| 1176 | SRC_URI[regex-1.12.3.sha256sum] = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" | ||
| 1177 | SRC_URI[regex-automata-0.4.14.sha256sum] = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" | ||
| 1178 | SRC_URI[regex-syntax-0.8.9.sha256sum] = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" | ||
| 1179 | SRC_URI[relative-path-1.9.3.sha256sum] = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" | ||
| 1180 | SRC_URI[reqwest-0.12.9.sha256sum] = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" | ||
| 1181 | SRC_URI[ring-0.17.14.sha256sum] = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" | ||
| 1182 | SRC_URI[rmcp-0.16.0.sha256sum] = "cc4c9c94680f75470ee8083a0667988b5d7b5beb70b9f998a8e51de7c682ce60" | ||
| 1183 | SRC_URI[rmcp-macros-0.16.0.sha256sum] = "90c23c8f26cae4da838fbc3eadfaecf2d549d97c04b558e7bd90526a9c28b42a" | ||
| 1184 | SRC_URI[rmp-0.8.15.sha256sum] = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c" | ||
| 1185 | SRC_URI[rmp-serde-1.3.1.sha256sum] = "72f81bee8c8ef9b577d1681a70ebbc962c232461e397b22c208c43c04b67a155" | ||
| 1186 | SRC_URI[roxmltree-0.20.0.sha256sum] = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" | ||
| 1187 | SRC_URI[rstest-0.23.0.sha256sum] = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035" | ||
| 1188 | SRC_URI[rstest_macros-0.23.0.sha256sum] = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a" | ||
| 1189 | SRC_URI[rusqlite-0.37.0.sha256sum] = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" | ||
| 1190 | SRC_URI[rust_decimal-1.36.0.sha256sum] = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" | ||
| 1191 | SRC_URI[rustc-demangle-0.1.24.sha256sum] = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" | ||
| 1192 | SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" | ||
| 1193 | SRC_URI[rustc-hash-2.1.0.sha256sum] = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" | ||
| 1194 | SRC_URI[rustc_version-0.4.1.sha256sum] = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" | ||
| 1195 | SRC_URI[rustix-0.38.42.sha256sum] = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" | ||
| 1196 | SRC_URI[rustix-1.1.3.sha256sum] = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" | ||
| 1197 | SRC_URI[rustls-0.23.28.sha256sum] = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643" | ||
| 1198 | SRC_URI[rustls-native-certs-0.8.3.sha256sum] = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" | ||
| 1199 | SRC_URI[rustls-pemfile-2.2.0.sha256sum] = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" | ||
| 1200 | SRC_URI[rustls-pki-types-1.14.0.sha256sum] = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" | ||
| 1201 | SRC_URI[rustls-platform-verifier-0.5.3.sha256sum] = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" | ||
| 1202 | SRC_URI[rustls-platform-verifier-android-0.1.1.sha256sum] = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" | ||
| 1203 | SRC_URI[rustls-webpki-0.103.9.sha256sum] = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" | ||
| 1204 | SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" | ||
| 1205 | SRC_URI[ryu-1.0.22.sha256sum] = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" | ||
| 1206 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" | ||
| 1207 | SRC_URI[scc-2.4.0.sha256sum] = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" | ||
| 1208 | SRC_URI[schannel-0.1.27.sha256sum] = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" | ||
| 1209 | SRC_URI[schemars-1.2.1.sha256sum] = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" | ||
| 1210 | SRC_URI[schemars_derive-1.2.1.sha256sum] = "7d115b50f4aaeea07e79c1912f645c7513d81715d0420f8bc77a18c6260b307f" | ||
| 1211 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" | ||
| 1212 | SRC_URI[scroll-0.11.0.sha256sum] = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" | ||
| 1213 | SRC_URI[scroll_derive-0.11.1.sha256sum] = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" | ||
| 1214 | SRC_URI[sdd-3.0.10.sha256sum] = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" | ||
| 1215 | SRC_URI[security-framework-2.11.1.sha256sum] = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" | ||
| 1216 | SRC_URI[security-framework-3.0.1.sha256sum] = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" | ||
| 1217 | SRC_URI[security-framework-sys-2.12.1.sha256sum] = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" | ||
| 1218 | SRC_URI[self_cell-1.2.0.sha256sum] = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749" | ||
| 1219 | SRC_URI[semver-1.0.27.sha256sum] = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" | ||
| 1220 | SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" | ||
| 1221 | SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" | ||
| 1222 | SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" | ||
| 1223 | SRC_URI[serde_derive_internals-0.29.1.sha256sum] = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" | ||
| 1224 | SRC_URI[serde_json-1.0.149.sha256sum] = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" | ||
| 1225 | SRC_URI[serde_repr-0.1.19.sha256sum] = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" | ||
| 1226 | SRC_URI[serde_spanned-0.6.9.sha256sum] = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" | ||
| 1227 | SRC_URI[serde_spanned-1.0.4.sha256sum] = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" | ||
| 1228 | SRC_URI[serde_urlencoded-0.7.1.sha256sum] = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" | ||
| 1229 | SRC_URI[serde_yaml-0.9.34+deprecated.sha256sum] = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" | ||
| 1230 | SRC_URI[serial_test-3.3.1.sha256sum] = "0d0b343e184fc3b7bb44dff0705fffcf4b3756ba6aff420dddd8b24ca145e555" | ||
| 1231 | SRC_URI[serial_test_derive-3.3.1.sha256sum] = "6f50427f258fb77356e4cd4aa0e87e2bd2c66dbcee41dc405282cae2bfc26c83" | ||
| 1232 | SRC_URI[sha1_smol-1.0.1.sha256sum] = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" | ||
| 1233 | SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" | ||
| 1234 | SRC_URI[shadow-rs-1.7.0.sha256sum] = "6d9967e7c3cd89d19cd533d8fceb3e5dcee28cf97fe76441481abe1d32723039" | ||
| 1235 | SRC_URI[sharded-slab-0.1.7.sha256sum] = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" | ||
| 1236 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" | ||
| 1237 | SRC_URI[signal-hook-0.3.17.sha256sum] = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" | ||
| 1238 | SRC_URI[signal-hook-mio-0.2.4.sha256sum] = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" | ||
| 1239 | SRC_URI[signal-hook-registry-1.4.8.sha256sum] = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" | ||
| 1240 | SRC_URI[simd-adler32-0.3.7.sha256sum] = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" | ||
| 1241 | SRC_URI[simplelog-0.12.2.sha256sum] = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" | ||
| 1242 | SRC_URI[siphasher-1.0.1.sha256sum] = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" | ||
| 1243 | SRC_URI[slab-0.4.12.sha256sum] = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" | ||
| 1244 | SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" | ||
| 1245 | SRC_URI[socket2-0.5.10.sha256sum] = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" | ||
| 1246 | SRC_URI[socket2-0.6.2.sha256sum] = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" | ||
| 1247 | SRC_URI[socks-0.3.4.sha256sum] = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" | ||
| 1248 | SRC_URI[sse-stream-0.2.1.sha256sum] = "eb4dc4d33c68ec1f27d386b5610a351922656e1fdf5c05bbaad930cd1519479a" | ||
| 1249 | SRC_URI[stable_deref_trait-1.2.1.sha256sum] = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" | ||
| 1250 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" | ||
| 1251 | SRC_URI[strip-ansi-escapes-0.2.1.sha256sum] = "2a8f8038e7e7969abb3f1b7c2a811225e9296da208539e0f79c5251d6cac0025" | ||
| 1252 | SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" | ||
| 1253 | SRC_URI[strum-0.26.3.sha256sum] = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" | ||
| 1254 | SRC_URI[strum-0.27.2.sha256sum] = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" | ||
| 1255 | SRC_URI[strum_macros-0.26.4.sha256sum] = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" | ||
| 1256 | SRC_URI[strum_macros-0.27.2.sha256sum] = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" | ||
| 1257 | SRC_URI[subtle-2.6.1.sha256sum] = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" | ||
| 1258 | SRC_URI[supports-color-3.0.2.sha256sum] = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6" | ||
| 1259 | SRC_URI[supports-hyperlinks-3.1.0.sha256sum] = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b" | ||
| 1260 | SRC_URI[supports-unicode-3.0.0.sha256sum] = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" | ||
| 1261 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" | ||
| 1262 | SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" | ||
| 1263 | SRC_URI[sync_wrapper-1.0.2.sha256sum] = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" | ||
| 1264 | SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" | ||
| 1265 | SRC_URI[sys-locale-0.3.2.sha256sum] = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4" | ||
| 1266 | SRC_URI[sysinfo-0.38.0.sha256sum] = "fe840c5b1afe259a5657392a4dbb74473a14c8db999c3ec2f4ae812e028a94da" | ||
| 1267 | SRC_URI[tabled-0.20.0.sha256sum] = "e39a2ee1fbcd360805a771e1b300f78cc88fec7b8d3e2f71cd37bbf23e725c7d" | ||
| 1268 | SRC_URI[tango-bench-0.6.0.sha256sum] = "257822358c6f206fed78bfe6369cf959063b0644d70f88df6b19f2dadc93423e" | ||
| 1269 | SRC_URI[tempfile-3.24.0.sha256sum] = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" | ||
| 1270 | SRC_URI[termcolor-1.4.1.sha256sum] = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" | ||
| 1271 | SRC_URI[terminal_size-0.4.1.sha256sum] = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" | ||
| 1272 | SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" | ||
| 1273 | SRC_URI[testing_table-0.3.0.sha256sum] = "0f8daae29995a24f65619e19d8d31dea5b389f3d853d8bf297bbf607cd0014cc" | ||
| 1274 | SRC_URI[textwrap-0.16.1.sha256sum] = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" | ||
| 1275 | SRC_URI[thiserror-1.0.69.sha256sum] = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" | ||
| 1276 | SRC_URI[thiserror-2.0.18.sha256sum] = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" | ||
| 1277 | SRC_URI[thiserror-impl-1.0.69.sha256sum] = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" | ||
| 1278 | SRC_URI[thiserror-impl-2.0.18.sha256sum] = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" | ||
| 1279 | SRC_URI[thread_local-1.1.8.sha256sum] = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" | ||
| 1280 | SRC_URI[tiff-0.10.3.sha256sum] = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" | ||
| 1281 | SRC_URI[time-0.3.47.sha256sum] = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" | ||
| 1282 | SRC_URI[time-core-0.1.8.sha256sum] = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" | ||
| 1283 | SRC_URI[time-macros-0.2.27.sha256sum] = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" | ||
| 1284 | SRC_URI[tinystr-0.8.1.sha256sum] = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" | ||
| 1285 | SRC_URI[tinyvec-1.8.0.sha256sum] = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" | ||
| 1286 | SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" | ||
| 1287 | SRC_URI[titlecase-3.6.0.sha256sum] = "eb567088a91d59b492520c8149e2be5ce10d5deb2d9a383f3378df3259679d40" | ||
| 1288 | SRC_URI[tokio-1.49.0.sha256sum] = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" | ||
| 1289 | SRC_URI[tokio-macros-2.6.0.sha256sum] = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" | ||
| 1290 | SRC_URI[tokio-native-tls-0.3.1.sha256sum] = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" | ||
| 1291 | SRC_URI[tokio-rustls-0.26.4.sha256sum] = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" | ||
| 1292 | SRC_URI[tokio-stream-0.1.17.sha256sum] = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" | ||
| 1293 | SRC_URI[tokio-util-0.7.18.sha256sum] = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" | ||
| 1294 | SRC_URI[toml-0.8.23.sha256sum] = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" | ||
| 1295 | SRC_URI[toml-0.9.10+spec-1.1.0.sha256sum] = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" | ||
| 1296 | SRC_URI[toml_datetime-0.6.11.sha256sum] = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" | ||
| 1297 | SRC_URI[toml_datetime-0.7.5+spec-1.1.0.sha256sum] = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" | ||
| 1298 | SRC_URI[toml_edit-0.22.27.sha256sum] = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" | ||
| 1299 | SRC_URI[toml_parser-1.0.6+spec-1.1.0.sha256sum] = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" | ||
| 1300 | SRC_URI[toml_write-0.1.2.sha256sum] = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" | ||
| 1301 | SRC_URI[toml_writer-1.0.6+spec-1.1.0.sha256sum] = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" | ||
| 1302 | SRC_URI[tower-service-0.3.3.sha256sum] = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" | ||
| 1303 | SRC_URI[tracing-0.1.44.sha256sum] = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" | ||
| 1304 | SRC_URI[tracing-attributes-0.1.31.sha256sum] = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" | ||
| 1305 | SRC_URI[tracing-core-0.1.36.sha256sum] = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" | ||
| 1306 | SRC_URI[tracing-log-0.2.0.sha256sum] = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" | ||
| 1307 | SRC_URI[tracing-subscriber-0.3.22.sha256sum] = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" | ||
| 1308 | SRC_URI[trash-5.2.4.sha256sum] = "0102cfb632fbe1adefa067036d4f383045091ae8d4fc4c2c14d3c0f92d878972" | ||
| 1309 | SRC_URI[tree_magic_mini-3.1.6.sha256sum] = "aac5e8971f245c3389a5a76e648bfc80803ae066a1243a75db0064d7c1129d63" | ||
| 1310 | SRC_URI[try-lock-0.2.5.sha256sum] = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" | ||
| 1311 | SRC_URI[tui-tree-widget-0.24.0.sha256sum] = "deca119555009eee2e0cfb9c020f39f632444dc4579918d5fc009d51d75dff92" | ||
| 1312 | SRC_URI[type-map-0.5.1.sha256sum] = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" | ||
| 1313 | SRC_URI[typeid-1.0.2.sha256sum] = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" | ||
| 1314 | SRC_URI[typenum-1.19.0.sha256sum] = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" | ||
| 1315 | SRC_URI[typetag-0.2.18.sha256sum] = "52ba3b6e86ffe0054b2c44f2d86407388b933b16cb0a70eea3929420db1d9bbe" | ||
| 1316 | SRC_URI[typetag-impl-0.2.18.sha256sum] = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483" | ||
| 1317 | SRC_URI[tz-rs-0.7.0.sha256sum] = "e1450bf2b99397e72070e7935c89facaa80092ac812502200375f1f7d33c71a1" | ||
| 1318 | SRC_URI[tzdb-0.7.2.sha256sum] = "0be2ea5956f295449f47c0b825c5e109022ff1a6a53bb4f77682a87c2341fbf5" | ||
| 1319 | SRC_URI[tzdb_data-0.2.1.sha256sum] = "0604b35c1f390a774fdb138cac75a99981078895d24bcab175987440bbff803b" | ||
| 1320 | SRC_URI[ucd-trie-0.1.7.sha256sum] = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" | ||
| 1321 | SRC_URI[umask-2.1.0.sha256sum] = "ec9a46c2549e35c054e0ffe281a3a6ec0007793db4df106604d37ed3f4d73d1c" | ||
| 1322 | SRC_URI[unic-langid-0.9.6.sha256sum] = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84cb8df7b3ef952748d752a7d05" | ||
| 1323 | SRC_URI[unic-langid-impl-0.9.6.sha256sum] = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658" | ||
| 1324 | SRC_URI[unicase-2.9.0.sha256sum] = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" | ||
| 1325 | SRC_URI[unicode-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" | ||
| 1326 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" | ||
| 1327 | SRC_URI[unicode-segmentation-1.12.0.sha256sum] = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" | ||
| 1328 | SRC_URI[unicode-truncate-2.0.1.sha256sum] = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5" | ||
| 1329 | SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" | ||
| 1330 | SRC_URI[unicode-width-0.2.2.sha256sum] = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" | ||
| 1331 | SRC_URI[unicode-xid-0.2.6.sha256sum] = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" | ||
| 1332 | SRC_URI[unit-prefix-0.5.1.sha256sum] = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817" | ||
| 1333 | SRC_URI[unsafe-libyaml-0.2.11.sha256sum] = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" | ||
| 1334 | SRC_URI[untrusted-0.9.0.sha256sum] = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" | ||
| 1335 | SRC_URI[update-informer-1.3.0.sha256sum] = "67b27dcf766dc6ad64c2085201626e1a7955dc1983532bfc8406d552903ace2a" | ||
| 1336 | SRC_URI[ureq-3.0.12.sha256sum] = "9f0fde9bc91026e381155f8c67cb354bcd35260b2f4a29bcc84639f762760c39" | ||
| 1337 | SRC_URI[ureq-proto-0.4.2.sha256sum] = "59db78ad1923f2b1be62b6da81fe80b173605ca0d57f85da2e005382adf693f7" | ||
| 1338 | SRC_URI[url-2.5.8.sha256sum] = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" | ||
| 1339 | SRC_URI[urlencoding-2.1.3.sha256sum] = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" | ||
| 1340 | SRC_URI[utf-8-0.7.6.sha256sum] = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" | ||
| 1341 | SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" | ||
| 1342 | SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" | ||
| 1343 | SRC_URI[uu_cp-0.6.0.sha256sum] = "19885072900bec2d63f0e94f73467d409bbe7b6644b5ab2475b2c728f725a9cb" | ||
| 1344 | SRC_URI[uu_mkdir-0.6.0.sha256sum] = "0bd1198106d4ebf867fe15e31c0396ad5c775070ccd4598f233d32b1eb8c1e11" | ||
| 1345 | SRC_URI[uu_mktemp-0.6.0.sha256sum] = "b9361746c44b4888ea45c33e1a907d93c74b42b8cab9cf3383d30a2380e3330f" | ||
| 1346 | SRC_URI[uu_mv-0.6.0.sha256sum] = "85a89e71fea435be9ec14cc591fd30541433d043540b0c884ad7f3d56a1974d6" | ||
| 1347 | SRC_URI[uu_touch-0.6.0.sha256sum] = "bced62a93ef672b5601ebba3a2b102b04db7ae1fdd16cbf2bd398e7768216474" | ||
| 1348 | SRC_URI[uu_uname-0.6.0.sha256sum] = "6f8bd3abb201d672df3a5da52bf0c6a185ab74f2f367c476dc9f5757ab7f4af3" | ||
| 1349 | SRC_URI[uu_whoami-0.6.0.sha256sum] = "eb5e3381a52672795ecdf34f37fc94c0d616cf5959a6218e52282e04a6ff2cd1" | ||
| 1350 | SRC_URI[uucore-0.6.0.sha256sum] = "b157ba598d7f7ed06f6dbc62999edb9d730b4d3fb58e503d8ad6d5fbe1e04391" | ||
| 1351 | SRC_URI[uucore_procs-0.6.0.sha256sum] = "daa291a52608ac5a2f8539e119666e021baa6b8c01f22f02ed201bbae54cbbc0" | ||
| 1352 | SRC_URI[uuid-1.21.0.sha256sum] = "b672338555252d43fd2240c714dc444b8c6fb0a5c5335e65a07bba7742735ddb" | ||
| 1353 | SRC_URI[v_htmlescape-0.15.8.sha256sum] = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" | ||
| 1354 | SRC_URI[valuable-0.1.1.sha256sum] = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" | ||
| 1355 | SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" | ||
| 1356 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" | ||
| 1357 | SRC_URI[vte-0.14.1.sha256sum] = "231fdcd7ef3037e8330d8e17e61011a2c244126acc0a982f4040ac3f9f0bc077" | ||
| 1358 | SRC_URI[wait-timeout-0.2.0.sha256sum] = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" | ||
| 1359 | SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" | ||
| 1360 | SRC_URI[want-0.3.1.sha256sum] = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" | ||
| 1361 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" | ||
| 1362 | SRC_URI[wasip2-1.0.2+wasi-0.2.9.sha256sum] = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" | ||
| 1363 | SRC_URI[wasip3-0.4.0+wasi-0.3.0-rc-2026-01-06.sha256sum] = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" | ||
| 1364 | SRC_URI[wasm-bindgen-0.2.101.sha256sum] = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" | ||
| 1365 | SRC_URI[wasm-bindgen-backend-0.2.101.sha256sum] = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" | ||
| 1366 | SRC_URI[wasm-bindgen-futures-0.4.51.sha256sum] = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe" | ||
| 1367 | SRC_URI[wasm-bindgen-macro-0.2.101.sha256sum] = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" | ||
| 1368 | SRC_URI[wasm-bindgen-macro-support-0.2.101.sha256sum] = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" | ||
| 1369 | SRC_URI[wasm-bindgen-shared-0.2.101.sha256sum] = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" | ||
| 1370 | SRC_URI[wasm-encoder-0.244.0.sha256sum] = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" | ||
| 1371 | SRC_URI[wasm-metadata-0.244.0.sha256sum] = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" | ||
| 1372 | SRC_URI[wasmparser-0.244.0.sha256sum] = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" | ||
| 1373 | SRC_URI[wax-0.6.0.sha256sum] = "8d12a78aa0bab22d2f26ed1a96df7ab58e8a93506a3e20adb47c51a93b4e1357" | ||
| 1374 | SRC_URI[wayland-backend-0.3.12.sha256sum] = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9" | ||
| 1375 | SRC_URI[wayland-client-0.31.12.sha256sum] = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec" | ||
| 1376 | SRC_URI[wayland-protocols-0.32.10.sha256sum] = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3" | ||
| 1377 | SRC_URI[wayland-protocols-wlr-0.3.10.sha256sum] = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3" | ||
| 1378 | SRC_URI[wayland-scanner-0.31.8.sha256sum] = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3" | ||
| 1379 | SRC_URI[wayland-sys-0.31.8.sha256sum] = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd" | ||
| 1380 | SRC_URI[web-sys-0.3.78.sha256sum] = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12" | ||
| 1381 | SRC_URI[web-time-1.1.0.sha256sum] = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" | ||
| 1382 | SRC_URI[webpki-root-certs-0.26.11.sha256sum] = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" | ||
| 1383 | SRC_URI[webpki-root-certs-1.0.1.sha256sum] = "86138b15b2b7d561bc4469e77027b8dd005a43dc502e9031d1f5afc8ce1f280e" | ||
| 1384 | SRC_URI[webpki-roots-0.26.11.sha256sum] = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" | ||
| 1385 | SRC_URI[webpki-roots-1.0.0.sha256sum] = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" | ||
| 1386 | SRC_URI[weezl-0.1.12.sha256sum] = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" | ||
| 1387 | SRC_URI[which-4.4.2.sha256sum] = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" | ||
| 1388 | SRC_URI[which-8.0.0.sha256sum] = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d" | ||
| 1389 | SRC_URI[widestring-1.1.0.sha256sum] = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" | ||
| 1390 | SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" | ||
| 1391 | SRC_URI[win_uds-0.2.1.sha256sum] = "cfdd26edeb0295aac5e12d2c22b230a22ad74ffca01d7c99db76cfe5f14f232a" | ||
| 1392 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" | ||
| 1393 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" | ||
| 1394 | SRC_URI[winapi-util-0.1.9.sha256sum] = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" | ||
| 1395 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" | ||
| 1396 | SRC_URI[windows-0.56.0.sha256sum] = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" | ||
| 1397 | SRC_URI[windows-0.62.1.sha256sum] = "49e6c4a1f363c8210c6f77ba24f645c61c6fb941eccf013da691f7e09515b8ac" | ||
| 1398 | SRC_URI[windows-collections-0.3.1.sha256sum] = "123e712f464a8a60ce1a13f4c446d2d43ab06464cb5842ff68f5c71b6fb7852e" | ||
| 1399 | SRC_URI[windows-core-0.56.0.sha256sum] = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" | ||
| 1400 | SRC_URI[windows-core-0.62.1.sha256sum] = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" | ||
| 1401 | SRC_URI[windows-future-0.3.1.sha256sum] = "68f3db6b24b120200d649cd4811b4947188ed3a8d2626f7075146c5d178a9a4a" | ||
| 1402 | SRC_URI[windows-implement-0.56.0.sha256sum] = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" | ||
| 1403 | SRC_URI[windows-implement-0.60.2.sha256sum] = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" | ||
| 1404 | SRC_URI[windows-interface-0.56.0.sha256sum] = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" | ||
| 1405 | SRC_URI[windows-interface-0.59.3.sha256sum] = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" | ||
| 1406 | SRC_URI[windows-link-0.2.0.sha256sum] = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" | ||
| 1407 | SRC_URI[windows-numerics-0.3.0.sha256sum] = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8" | ||
| 1408 | SRC_URI[windows-registry-0.2.0.sha256sum] = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" | ||
| 1409 | SRC_URI[windows-result-0.1.2.sha256sum] = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" | ||
| 1410 | SRC_URI[windows-result-0.2.0.sha256sum] = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" | ||
| 1411 | SRC_URI[windows-result-0.4.0.sha256sum] = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" | ||
| 1412 | SRC_URI[windows-strings-0.1.0.sha256sum] = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" | ||
| 1413 | SRC_URI[windows-strings-0.5.0.sha256sum] = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" | ||
| 1414 | SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" | ||
| 1415 | SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" | ||
| 1416 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" | ||
| 1417 | SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" | ||
| 1418 | SRC_URI[windows-sys-0.60.2.sha256sum] = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" | ||
| 1419 | SRC_URI[windows-sys-0.61.0.sha256sum] = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" | ||
| 1420 | SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" | ||
| 1421 | SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" | ||
| 1422 | SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" | ||
| 1423 | SRC_URI[windows-targets-0.53.4.sha256sum] = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" | ||
| 1424 | SRC_URI[windows-threading-0.2.0.sha256sum] = "ab47f085ad6932defa48855254c758cdd0e2f2d48e62a34118a268d8f345e118" | ||
| 1425 | SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" | ||
| 1426 | SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" | ||
| 1427 | SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" | ||
| 1428 | SRC_URI[windows_aarch64_gnullvm-0.53.1.sha256sum] = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" | ||
| 1429 | SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" | ||
| 1430 | SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" | ||
| 1431 | SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" | ||
| 1432 | SRC_URI[windows_aarch64_msvc-0.53.1.sha256sum] = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" | ||
| 1433 | SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" | ||
| 1434 | SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" | ||
| 1435 | SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" | ||
| 1436 | SRC_URI[windows_i686_gnu-0.53.1.sha256sum] = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" | ||
| 1437 | SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" | ||
| 1438 | SRC_URI[windows_i686_gnullvm-0.53.1.sha256sum] = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" | ||
| 1439 | SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" | ||
| 1440 | SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" | ||
| 1441 | SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" | ||
| 1442 | SRC_URI[windows_i686_msvc-0.53.1.sha256sum] = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" | ||
| 1443 | SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" | ||
| 1444 | SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" | ||
| 1445 | SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" | ||
| 1446 | SRC_URI[windows_x86_64_gnu-0.53.1.sha256sum] = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" | ||
| 1447 | SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" | ||
| 1448 | SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" | ||
| 1449 | SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" | ||
| 1450 | SRC_URI[windows_x86_64_gnullvm-0.53.1.sha256sum] = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" | ||
| 1451 | SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" | ||
| 1452 | SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" | ||
| 1453 | SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" | ||
| 1454 | SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" | ||
| 1455 | SRC_URI[winnow-0.7.13.sha256sum] = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" | ||
| 1456 | SRC_URI[winreg-0.55.0.sha256sum] = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" | ||
| 1457 | SRC_URI[winresource-0.1.19.sha256sum] = "7276691b353ad4547af8c3268488d1311f4be791ffdc0c65b8cfa8f41eed693b" | ||
| 1458 | SRC_URI[winsafe-0.0.19.sha256sum] = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" | ||
| 1459 | SRC_URI[wit-bindgen-0.51.0.sha256sum] = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" | ||
| 1460 | SRC_URI[wit-bindgen-core-0.51.0.sha256sum] = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" | ||
| 1461 | SRC_URI[wit-bindgen-rust-0.51.0.sha256sum] = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" | ||
| 1462 | SRC_URI[wit-bindgen-rust-macro-0.51.0.sha256sum] = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" | ||
| 1463 | SRC_URI[wit-component-0.244.0.sha256sum] = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" | ||
| 1464 | SRC_URI[wit-parser-0.244.0.sha256sum] = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" | ||
| 1465 | SRC_URI[wl-clipboard-rs-0.9.3.sha256sum] = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3" | ||
| 1466 | SRC_URI[writeable-0.6.2.sha256sum] = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" | ||
| 1467 | SRC_URI[x11rb-0.13.1.sha256sum] = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" | ||
| 1468 | SRC_URI[x11rb-protocol-0.13.1.sha256sum] = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" | ||
| 1469 | SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" | ||
| 1470 | SRC_URI[yansi-1.0.1.sha256sum] = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" | ||
| 1471 | SRC_URI[yoke-0.8.1.sha256sum] = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" | ||
| 1472 | SRC_URI[yoke-derive-0.8.1.sha256sum] = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" | ||
| 1473 | SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" | ||
| 1474 | SRC_URI[zerocopy-0.8.34.sha256sum] = "71ddd76bcebeed25db614f82bf31a9f4222d3fbba300e6fb6c00afa26cbd4d9d" | ||
| 1475 | SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" | ||
| 1476 | SRC_URI[zerocopy-derive-0.8.34.sha256sum] = "d8187381b52e32220d50b255276aa16a084ec0a9017a0ca2152a1f55c539758d" | ||
| 1477 | SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" | ||
| 1478 | SRC_URI[zerofrom-derive-0.1.6.sha256sum] = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" | ||
| 1479 | SRC_URI[zeroize-1.8.2.sha256sum] = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" | ||
| 1480 | SRC_URI[zerotrie-0.2.3.sha256sum] = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" | ||
| 1481 | SRC_URI[zerovec-0.11.4.sha256sum] = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" | ||
| 1482 | SRC_URI[zerovec-derive-0.11.2.sha256sum] = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" | ||
| 1483 | SRC_URI[zip-4.6.1.sha256sum] = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1" | ||
| 1484 | SRC_URI[zlib-rs-0.5.1.sha256sum] = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a" | ||
| 1485 | SRC_URI[zmij-1.0.19.sha256sum] = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445" | ||
| 1486 | SRC_URI[zopfli-0.8.1.sha256sum] = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" | ||
| 1487 | SRC_URI[zune-core-0.4.12.sha256sum] = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" | ||
| 1488 | SRC_URI[zune-jpeg-0.4.21.sha256sum] = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" | ||
diff --git a/meta-oe/recipes-extended/nushell/nushell_0.111.0.bb b/meta-oe/recipes-extended/nushell/nushell_0.111.0.bb new file mode 100644 index 0000000000..720cfa3c09 --- /dev/null +++ b/meta-oe/recipes-extended/nushell/nushell_0.111.0.bb | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | SUMMARY = "Nushell is a modern shell for structured data" | ||
| 2 | HOMEPAGE = "https://crates.io/crates/nu" | ||
| 3 | DESCRIPTION = "Nushell is a modern shell that works with structured data rather than text. \ | ||
| 4 | Nushell takes cues from a lot of familiar territory: traditional shells like \ | ||
| 5 | bash, object based shells like PowerShell, gradually typed languages like \ | ||
| 6 | TypeScript, functional programming, systems programming, and more." | ||
| 7 | |||
| 8 | LICENSE = "MIT" | ||
| 9 | LIC_FILES_CHKSUM = " \ | ||
| 10 | file://LICENSE;md5=ea22f3cfd911b3519505220cfc0ce542 \ | ||
| 11 | " | ||
| 12 | |||
| 13 | SRC_URI = "crate://crates.io/nu/${PV};name=nu" | ||
| 14 | SRC_URI[nu.sha256sum] = "d976a48ba1dec6203834990d18a76050f05522160a375e53ef6620a864f69471" | ||
| 15 | |||
| 16 | S = "${CARGO_VENDORING_DIRECTORY}/nu-${PV}" | ||
| 17 | |||
| 18 | inherit cargo cargo-update-recipe-crates | ||
| 19 | |||
| 20 | require ${BPN}-crates.inc | ||
| 21 | |||
| 22 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-oe/recipes-extended/parallel/parallel_20251122.bb b/meta-oe/recipes-extended/parallel/parallel_20260222.bb index c2775472d7..cf01b783bb 100644 --- a/meta-oe/recipes-extended/parallel/parallel_20251122.bb +++ b/meta-oe/recipes-extended/parallel/parallel_20260222.bb | |||
| @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2" | 14 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2" |
| 15 | SRC_URI[sha256sum] = "368d1982cfd9dbebb8cd0e444de6199559df94ac2dd1edf95f74350f0af1e84d" | 15 | SRC_URI[sha256sum] = "c6272a48972a0f2fdd3f39560d698f3c5abd3d8a4de40d52f9772f3a03ae1f48" |
| 16 | 16 | ||
| 17 | inherit autotools bash-completion | 17 | inherit autotools bash-completion |
| 18 | 18 | ||
diff --git a/meta-oe/recipes-extended/plocate/plocate_1.1.23.bb b/meta-oe/recipes-extended/plocate/plocate_1.1.24.bb index c9502db16a..b33c339d14 100644 --- a/meta-oe/recipes-extended/plocate/plocate_1.1.23.bb +++ b/meta-oe/recipes-extended/plocate/plocate_1.1.24.bb | |||
| @@ -12,4 +12,4 @@ DEPENDS = "zstd liburing" | |||
| 12 | SRC_URI = "https://plocate.sesse.net/download/${BP}.tar.gz \ | 12 | SRC_URI = "https://plocate.sesse.net/download/${BP}.tar.gz \ |
| 13 | file://0001-Include-linux-stat.h-only-when-sys-stat.h-is-not-inc.patch" | 13 | file://0001-Include-linux-stat.h-only-when-sys-stat.h-is-not-inc.patch" |
| 14 | 14 | ||
| 15 | SRC_URI[sha256sum] = "06bd3b284d5d077b441bef74edb0cc6f8e3f0a6f58b4c15ef865d3c460733783" | 15 | SRC_URI[sha256sum] = "e55a757af1d7efb15ea674993224da4f0258479f8f720bd3dae0925d27dc04a2" |
diff --git a/meta-oe/recipes-extended/polkit/polkit_127.bb b/meta-oe/recipes-extended/polkit/polkit_127.bb index 40eca9f9ee..f97c6efbf7 100644 --- a/meta-oe/recipes-extended/polkit/polkit_127.bb +++ b/meta-oe/recipes-extended/polkit/polkit_127.bb | |||
| @@ -65,3 +65,5 @@ FILES:${PN} += " \ | |||
| 65 | ${systemd_unitdir}/system/polkit-agent-helper.socket \ | 65 | ${systemd_unitdir}/system/polkit-agent-helper.socket \ |
| 66 | ${systemd_unitdir}/system/polkit-agent-helper@.service \ | 66 | ${systemd_unitdir}/system/polkit-agent-helper@.service \ |
| 67 | " | 67 | " |
| 68 | |||
| 69 | CVE_STATUS[CVE-2016-2568] = "unpatched: the fix is a kernel compiled without CONFIG_LEGACY_TIOCSTI" | ||
diff --git a/meta-oe/recipes-extended/qad/qad/0001-fix-compilation-with-glibc-2.43.patch b/meta-oe/recipes-extended/qad/qad/0001-fix-compilation-with-glibc-2.43.patch new file mode 100644 index 0000000000..3bebcc1b11 --- /dev/null +++ b/meta-oe/recipes-extended/qad/qad/0001-fix-compilation-with-glibc-2.43.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From 030b4983e3515b214f4faa61ce1b7c552c007340 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Thu, 19 Mar 2026 18:05:00 +0100 | ||
| 4 | Subject: [PATCH] fix compilation with glibc 2.43 | ||
| 5 | |||
| 6 | Fioxes compilation error: | ||
| 7 | | ../sources/qad-0.0+git/src/server.c:212:22: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] | ||
| 8 | | 212 | char *pLastSlash = strrchr(url, '/'); | ||
| 9 | |||
| 10 | Upstream-Status: Submitted [https://gitlab.com/CodethinkLabs/qad/qad/-/merge_requests/56] | ||
| 11 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 12 | --- | ||
| 13 | src/server.c | 4 ++-- | ||
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/src/server.c b/src/server.c | ||
| 17 | index 648fb46..11ec114 100644 | ||
| 18 | --- a/src/server.c | ||
| 19 | +++ b/src/server.c | ||
| 20 | @@ -307,8 +307,8 @@ void qad_text(const char *post_data, int post_data_size, qad_backend_t *backend, | ||
| 21 | void qad_screenshot(struct MHD_Connection *connection, const char *url, | ||
| 22 | qad_backend_t *backend, connection_info_struct_t *con_info, | ||
| 23 | char *error) { | ||
| 24 | - char *pLastSlash = strrchr(url, '/'); | ||
| 25 | - char *screenName = pLastSlash ? pLastSlash + 1 : NULL; | ||
| 26 | + const char *pLastSlash = strrchr(url, '/'); | ||
| 27 | + const char *screenName = pLastSlash ? pLastSlash + 1 : NULL; | ||
| 28 | int screenNumber = -1; | ||
| 29 | |||
| 30 | if (screenName && *screenName != '\0') { | ||
diff --git a/meta-oe/recipes-extended/qad/qad_git.bb b/meta-oe/recipes-extended/qad/qad_git.bb index 189d2f9d15..4a80b6738f 100644 --- a/meta-oe/recipes-extended/qad/qad_git.bb +++ b/meta-oe/recipes-extended/qad/qad_git.bb | |||
| @@ -10,7 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=402cce7fbcb6ea9ab5a0378dd7f40806 \ | |||
| 10 | file://openqa/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 10 | file://openqa/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 11 | " | 11 | " |
| 12 | SRC_URI = "git://gitlab.com/CodethinkLabs/qad/qad;branch=main;protocol=https \ | 12 | SRC_URI = "git://gitlab.com/CodethinkLabs/qad/qad;branch=main;protocol=https \ |
| 13 | file://0001-Fix-warnings-found-by-clang-compiler.patch" | 13 | file://0001-Fix-warnings-found-by-clang-compiler.patch \ |
| 14 | file://0001-fix-compilation-with-glibc-2.43.patch" | ||
| 14 | 15 | ||
| 15 | SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362" | 16 | SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362" |
| 16 | 17 | ||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.12/0004-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0004-src-Do-not-reset-FINAL_LIBS.patch deleted file mode 100644 index 71044365af..0000000000 --- a/meta-oe/recipes-extended/redis/redis-7.2.12/0004-src-Do-not-reset-FINAL_LIBS.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | From 225f45d5fbeaa8998fac983fcb78d7912d6d6dd3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 10 Sep 2019 20:04:26 -0700 | ||
| 4 | Subject: [PATCH] src: Do not reset FINAL_LIBS | ||
| 5 | |||
| 6 | This helps case where additional libraries are needed to be passed from | ||
| 7 | environment to get it going | ||
| 8 | |||
| 9 | e.g. -latomic is needed on clang/x86 to provide for 64bit atomics | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | src/Makefile | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/src/Makefile b/src/Makefile | ||
| 19 | index b8e0d44..3a68fa6 100644 | ||
| 20 | --- a/src/Makefile | ||
| 21 | +++ b/src/Makefile | ||
| 22 | @@ -122,7 +122,7 @@ endif | ||
| 23 | |||
| 24 | FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) | ||
| 25 | FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) | ||
| 26 | -FINAL_LIBS=-lm | ||
| 27 | +FINAL_LIBS+=-lm | ||
| 28 | DEBUG=-g -ggdb | ||
| 29 | |||
| 30 | # Linux ARM32 needs -latomic at linking time | ||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.12/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0006-Define-correct-gregs-for-RISCV32.patch deleted file mode 100644 index bf44858d16..0000000000 --- a/meta-oe/recipes-extended/redis/redis-7.2.12/0006-Define-correct-gregs-for-RISCV32.patch +++ /dev/null | |||
| @@ -1,60 +0,0 @@ | |||
| 1 | From 8984a5df54fc80de1c99b311f117d28c2a42d959 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 26 Oct 2020 21:32:22 -0700 | ||
| 4 | Subject: [PATCH] Define correct gregs for RISCV32 | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | |||
| 10 | Updated patch for 6.2.8 | ||
| 11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 12 | --- | ||
| 13 | src/debug.c | 26 ++++++++++++++++++++++++-- | ||
| 14 | 1 file changed, 24 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/src/debug.c b/src/debug.c | ||
| 17 | index 684f692..2ee151f 100644 | ||
| 18 | --- a/src/debug.c | ||
| 19 | +++ b/src/debug.c | ||
| 20 | @@ -1215,7 +1215,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) { | ||
| 21 | #endif | ||
| 22 | #elif defined(__linux__) | ||
| 23 | /* Linux */ | ||
| 24 | - #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) | ||
| 25 | + #if defined(__riscv) && __riscv_xlen == 32 | ||
| 26 | + return (void*) uc->uc_mcontext.__gregs[REG_PC]; | ||
| 27 | + #elif defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) | ||
| 28 | GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip); | ||
| 29 | #elif defined(__X86_64__) || defined(__x86_64__) | ||
| 30 | GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip); | ||
| 31 | @@ -1401,8 +1403,28 @@ void logRegisters(ucontext_t *uc) { | ||
| 32 | #endif | ||
| 33 | /* Linux */ | ||
| 34 | #elif defined(__linux__) | ||
| 35 | + /* Linux RISCV32 */ | ||
| 36 | + #if defined(__riscv) && __riscv_xlen == 32 | ||
| 37 | + serverLog(LL_WARNING, | ||
| 38 | + "\n" | ||
| 39 | + "RA:%08lx S0:%08lx S1:%08lx S2:%08lx\n" | ||
| 40 | + "SP:%08lx PC:%08lx A0:%08lx A1:%08lx\n" | ||
| 41 | + "A2 :%08lx A3:%08lx A4:%08lx", | ||
| 42 | + (unsigned long) uc->uc_mcontext.__gregs[REG_RA], | ||
| 43 | + (unsigned long) uc->uc_mcontext.__gregs[REG_S0], | ||
| 44 | + (unsigned long) uc->uc_mcontext.__gregs[REG_S1], | ||
| 45 | + (unsigned long) uc->uc_mcontext.__gregs[REG_S2], | ||
| 46 | + (unsigned long) uc->uc_mcontext.__gregs[REG_SP], | ||
| 47 | + (unsigned long) uc->uc_mcontext.__gregs[REG_PC], | ||
| 48 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 0], | ||
| 49 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 1], | ||
| 50 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 2], | ||
| 51 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 3], | ||
| 52 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 4] | ||
| 53 | + ); | ||
| 54 | + logStackContent((void**)uc->uc_mcontext.__gregs[REG_SP]); | ||
| 55 | /* Linux x86 */ | ||
| 56 | - #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) | ||
| 57 | + #elif defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) | ||
| 58 | serverLog(LL_WARNING, | ||
| 59 | "\n" | ||
| 60 | "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" | ||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.12/0001-hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-8.0.6/0001-hiredis-use-default-CC-if-it-is-set.patch index 99783ce237..a176f7c14e 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.12/0001-hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis-8.0.6/0001-hiredis-use-default-CC-if-it-is-set.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 2fec7733df9a6224875f3ecd3aaafc2857a546c0 Mon Sep 17 00:00:00 2001 | 1 | From 43601f60f268ddbc2e03f7a33ae4a1ad109f092c Mon Sep 17 00:00:00 2001 |
| 2 | From: Venture Research <tech@ventureresearch.com> | 2 | From: Venture Research <tech@ventureresearch.com> |
| 3 | Date: Fri, 8 Feb 2013 17:39:52 -0600 | 3 | Date: Fri, 8 Feb 2013 17:39:52 -0600 |
| 4 | Subject: [PATCH] hiredis: use default CC if it is set | 4 | Subject: [PATCH] hiredis: use default CC if it is set |
| @@ -22,6 +22,10 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | |||
| 22 | 22 | ||
| 23 | Reworked for 6.0.4 | 23 | Reworked for 6.0.4 |
| 24 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 24 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
| 25 | |||
| 26 | Reworked for 8.0.0 | ||
| 27 | Signed-off-by: Eric Meyers <eric.meyers@arthrex.com> | ||
| 28 | |||
| 25 | --- | 29 | --- |
| 26 | deps/hiredis/Makefile | 2 -- | 30 | deps/hiredis/Makefile | 2 -- |
| 27 | 1 file changed, 2 deletions(-) | 31 | 1 file changed, 2 deletions(-) |
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.12/0002-lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-8.0.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch index a3365043b5..f1b59ad0a1 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.12/0002-lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis-8.0.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 71d92a24da61eab1e3697cc83ebc387b57bb6c3b Mon Sep 17 00:00:00 2001 | 1 | From d50d4cb30bfb533185711116822a50d83e5a92e8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Venture Research <tech@ventureresearch.com> | 2 | From: Venture Research <tech@ventureresearch.com> |
| 3 | Date: Fri, 8 Feb 2013 20:22:19 -0600 | 3 | Date: Fri, 8 Feb 2013 20:22:19 -0600 |
| 4 | Subject: [PATCH] lua: update Makefile to use environment build settings | 4 | Subject: [PATCH] lua: update Makefile to use environment build settings |
| @@ -16,6 +16,10 @@ Signed-off-by: Armin Kuster <akust808@gmail.com> | |||
| 16 | 16 | ||
| 17 | updated to work wtih 6.2.1 | 17 | updated to work wtih 6.2.1 |
| 18 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | 18 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> |
| 19 | |||
| 20 | Reworked for 8.0.0 | ||
| 21 | Signed-off-by: Eric Meyers <eric.meyers@arthrex.com> | ||
| 22 | |||
| 19 | --- | 23 | --- |
| 20 | deps/Makefile | 1 - | 24 | deps/Makefile | 1 - |
| 21 | deps/lua/Makefile | 1 - | 25 | deps/lua/Makefile | 1 - |
| @@ -23,10 +27,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | |||
| 23 | 3 files changed, 6 insertions(+), 12 deletions(-) | 27 | 3 files changed, 6 insertions(+), 12 deletions(-) |
| 24 | 28 | ||
| 25 | diff --git a/deps/Makefile b/deps/Makefile | 29 | diff --git a/deps/Makefile b/deps/Makefile |
| 26 | index 3bf0363..fd8765a 100644 | 30 | index 5593e0c..d71265a 100644 |
| 27 | --- a/deps/Makefile | 31 | --- a/deps/Makefile |
| 28 | +++ b/deps/Makefile | 32 | +++ b/deps/Makefile |
| 29 | @@ -94,7 +94,6 @@ endif | 33 | @@ -101,7 +101,6 @@ endif |
| 30 | # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more | 34 | # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more |
| 31 | # challenging to cross-compile lua (and redis). These defines make it easier | 35 | # challenging to cross-compile lua (and redis). These defines make it easier |
| 32 | # to fit redis into cross-compilation environments, which typically set AR. | 36 | # to fit redis into cross-compilation environments, which typically set AR. |
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.12/0003-hack-to-force-use-of-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-8.0.6/0003-hack-to-force-use-of-libc-malloc.patch index 4ab1ca0ca8..2b0db43f7e 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.12/0003-hack-to-force-use-of-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis-8.0.6/0003-hack-to-force-use-of-libc-malloc.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 577335d0309c852d9f6099c255d5a80603fcbdb9 Mon Sep 17 00:00:00 2001 | 1 | From 55e09d562a1b8ca6a7d3ef2349c58f466bc44d2b Mon Sep 17 00:00:00 2001 |
| 2 | From: Venture Research <tech@ventureresearch.com> | 2 | From: Venture Research <tech@ventureresearch.com> |
| 3 | Date: Wed, 6 Feb 2013 20:51:02 -0600 | 3 | Date: Wed, 6 Feb 2013 20:51:02 -0600 |
| 4 | Subject: [PATCH] hack to force use of libc malloc | 4 | Subject: [PATCH] hack to force use of libc malloc |
| @@ -15,15 +15,19 @@ Signed-off-by: Venture Research <tech@ventureresearch.com> | |||
| 15 | 15 | ||
| 16 | Update to work with 4.0.8 | 16 | Update to work with 4.0.8 |
| 17 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | 17 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> |
| 18 | |||
| 19 | Reworked for 8.0.0 | ||
| 20 | Signed-off-by: Eric Meyers <eric.meyers@arthrex.com> | ||
| 21 | |||
| 18 | --- | 22 | --- |
| 19 | src/Makefile | 3 ++- | 23 | src/Makefile | 3 ++- |
| 20 | 1 file changed, 2 insertions(+), 1 deletion(-) | 24 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 21 | 25 | ||
| 22 | diff --git a/src/Makefile b/src/Makefile | 26 | diff --git a/src/Makefile b/src/Makefile |
| 23 | index 6a87909..b8e0d44 100644 | 27 | index 948ef83..5dbbefc 100644 |
| 24 | --- a/src/Makefile | 28 | --- a/src/Makefile |
| 25 | +++ b/src/Makefile | 29 | +++ b/src/Makefile |
| 26 | @@ -13,7 +13,8 @@ | 30 | @@ -17,7 +17,8 @@ |
| 27 | # Just use 'make dep', but this is only needed by developers. | 31 | # Just use 'make dep', but this is only needed by developers. |
| 28 | 32 | ||
| 29 | release_hdr := $(shell sh -c './mkreleasehdr.sh') | 33 | release_hdr := $(shell sh -c './mkreleasehdr.sh') |
| @@ -32,4 +36,4 @@ index 6a87909..b8e0d44 100644 | |||
| 32 | +uname_S := "USE_LIBC_MALLOC" | 36 | +uname_S := "USE_LIBC_MALLOC" |
| 33 | uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') | 37 | uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') |
| 34 | CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1')) | 38 | CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1')) |
| 35 | OPTIMIZATION?=-O3 | 39 | |
diff --git a/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-8.0.6/0004-src-Do-not-reset-FINAL_LIBS.patch index 958106e261..5b8616c652 100644 --- a/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis-8.0.6/0004-src-Do-not-reset-FINAL_LIBS.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From a4d87aca1c00c53b386ee7490223971e00873add Mon Sep 17 00:00:00 2001 | 1 | From 8f7a23705433e3f8850736a3348ecabbf7949e01 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 10 Sep 2019 20:04:26 -0700 | 3 | Date: Tue, 10 Sep 2019 20:04:26 -0700 |
| 4 | Subject: [PATCH] src: Do not reset FINAL_LIBS | 4 | Subject: [PATCH] src: Do not reset FINAL_LIBS |
| @@ -11,20 +11,24 @@ e.g. -latomic is needed on clang/x86 to provide for 64bit atomics | |||
| 11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
| 12 | 12 | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | |||
| 15 | Reworked for 8.0.0 | ||
| 16 | Signed-off-by: Eric Meyers <eric.meyers@arthrex.com> | ||
| 17 | |||
| 14 | --- | 18 | --- |
| 15 | src/Makefile | 2 +- | 19 | src/Makefile | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | 21 | ||
| 18 | diff --git a/src/Makefile b/src/Makefile | 22 | diff --git a/src/Makefile b/src/Makefile |
| 19 | index 35dd314..3770f96 100644 | 23 | index 5dbbefc..15fbe09 100644 |
| 20 | --- a/src/Makefile | 24 | --- a/src/Makefile |
| 21 | +++ b/src/Makefile | 25 | +++ b/src/Makefile |
| 22 | @@ -93,7 +93,7 @@ endif | 26 | @@ -131,7 +131,7 @@ endif |
| 23 | 27 | ||
| 24 | FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) | 28 | FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) |
| 25 | FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) | 29 | FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG) |
| 26 | -FINAL_LIBS=-lm | 30 | -FINAL_LIBS=-lm -lstdc++ |
| 27 | +FINAL_LIBS+=-lm | 31 | +FINAL_LIBS+=-lm -lstdc++ |
| 28 | DEBUG=-g -ggdb | 32 | DEBUG=-g -ggdb |
| 29 | 33 | ||
| 30 | # Linux ARM32 needs -latomic at linking time | 34 | # Linux ARM32 needs -latomic at linking time |
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.12/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis-8.0.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch index a45de28e0e..a94f2ad565 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.12/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch +++ b/meta-oe/recipes-extended/redis/redis-8.0.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From b636c748fb4047b1ef3a4062c675e1ee4584230b Mon Sep 17 00:00:00 2001 | 1 | From 3e5b6732b936883d895638a3098a29dd254a7be4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 21 Dec 2019 12:09:51 -0800 | 3 | Date: Sat, 21 Dec 2019 12:09:51 -0800 |
| 4 | Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER | 4 | Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER |
| @@ -11,15 +11,19 @@ Fixes | |||
| 11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
| 12 | 12 | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | |||
| 15 | Reworked for 8.0.0 | ||
| 16 | Signed-off-by: Eric Meyers <eric.meyers@arthrex.com> | ||
| 17 | |||
| 14 | --- | 18 | --- |
| 15 | src/zmalloc.c | 1 + | 19 | src/zmalloc.c | 1 + |
| 16 | 1 file changed, 1 insertion(+) | 20 | 1 file changed, 1 insertion(+) |
| 17 | 21 | ||
| 18 | diff --git a/src/zmalloc.c b/src/zmalloc.c | 22 | diff --git a/src/zmalloc.c b/src/zmalloc.c |
| 19 | index bbfa386..93e07ff 100644 | 23 | index b2f5718..913be90 100644 |
| 20 | --- a/src/zmalloc.c | 24 | --- a/src/zmalloc.c |
| 21 | +++ b/src/zmalloc.c | 25 | +++ b/src/zmalloc.c |
| 22 | @@ -32,6 +32,7 @@ | 26 | @@ -12,6 +12,7 @@ |
| 23 | #include "config.h" | 27 | #include "config.h" |
| 24 | #include "solarisfixes.h" | 28 | #include "solarisfixes.h" |
| 25 | 29 | ||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.12/init-redis-server b/meta-oe/recipes-extended/redis/redis-8.0.6/init-redis-server index c5f335f57d..c5f335f57d 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.12/init-redis-server +++ b/meta-oe/recipes-extended/redis/redis-8.0.6/init-redis-server | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.12/redis.conf b/meta-oe/recipes-extended/redis/redis-8.0.6/redis.conf index 75037d6dc8..75037d6dc8 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.12/redis.conf +++ b/meta-oe/recipes-extended/redis/redis-8.0.6/redis.conf | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.12/redis.service b/meta-oe/recipes-extended/redis/redis-8.0.6/redis.service index b7791d0df4..b7791d0df4 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.12/redis.service +++ b/meta-oe/recipes-extended/redis/redis-8.0.6/redis.service | |||
diff --git a/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch deleted file mode 100644 index 51a6e9c957..0000000000 --- a/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From 67990f216f2fbbc8a6699c700dfc089aa617905f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Venture Research <tech@ventureresearch.com> | ||
| 3 | Date: Fri, 8 Feb 2013 17:39:52 -0600 | ||
| 4 | Subject: [PATCH] hiredis: use default CC if it is set | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Instead of trying to automagically figure out CC, which breaks with OE | ||
| 10 | as CC has spaces in it, just skip it if one was already passed in. | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | |||
| 14 | Signed-off-by: Venture Research <tech@ventureresearch.com> | ||
| 15 | |||
| 16 | Update to work with 4.0.8 | ||
| 17 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | ||
| 18 | |||
| 19 | Reworked for 6.0.4 | ||
| 20 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
| 21 | --- | ||
| 22 | deps/hiredis/Makefile | 2 -- | ||
| 23 | 1 file changed, 2 deletions(-) | ||
| 24 | |||
| 25 | diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile | ||
| 26 | index 7e41c97..54717e3 100644 | ||
| 27 | --- a/deps/hiredis/Makefile | ||
| 28 | +++ b/deps/hiredis/Makefile | ||
| 29 | @@ -42,8 +42,6 @@ endef | ||
| 30 | export REDIS_TEST_CONFIG | ||
| 31 | |||
| 32 | # Fallback to gcc when $CC is not in $PATH. | ||
| 33 | -CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') | ||
| 34 | -CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') | ||
| 35 | OPTIMIZATION?=-O3 | ||
| 36 | WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers | ||
| 37 | DEBUG_FLAGS?= -g -ggdb | ||
diff --git a/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch deleted file mode 100644 index 17b533669b..0000000000 --- a/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch +++ /dev/null | |||
| @@ -1,77 +0,0 @@ | |||
| 1 | From ef989aab052510bfda32b2b325a5f80b76c42677 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Venture Research <tech@ventureresearch.com> | ||
| 3 | Date: Fri, 8 Feb 2013 20:22:19 -0600 | ||
| 4 | Subject: [PATCH] lua: update Makefile to use environment build settings | ||
| 5 | |||
| 6 | OE-specific parameters, instead of overriding all of these simply use | ||
| 7 | the ones that are already passed in. Also configure for only Linux... | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Venture Research <tech@ventureresearch.com> | ||
| 12 | |||
| 13 | Updated to work with 3.0.x | ||
| 14 | |||
| 15 | Signed-off-by: Armin Kuster <akust808@gmail.com> | ||
| 16 | |||
| 17 | updated to work wtih 6.2.1 | ||
| 18 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | ||
| 19 | --- | ||
| 20 | deps/Makefile | 1 - | ||
| 21 | deps/lua/Makefile | 1 - | ||
| 22 | deps/lua/src/Makefile | 16 ++++++---------- | ||
| 23 | 3 files changed, 6 insertions(+), 12 deletions(-) | ||
| 24 | |||
| 25 | diff --git a/deps/Makefile b/deps/Makefile | ||
| 26 | index cbe3aef..76bc222 100644 | ||
| 27 | --- a/deps/Makefile | ||
| 28 | +++ b/deps/Makefile | ||
| 29 | @@ -81,7 +81,6 @@ endif | ||
| 30 | # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more | ||
| 31 | # challenging to cross-compile lua (and redis). These defines make it easier | ||
| 32 | # to fit redis into cross-compilation environments, which typically set AR. | ||
| 33 | -AR=ar | ||
| 34 | ARFLAGS=rc | ||
| 35 | |||
| 36 | lua: .make-prerequisites | ||
| 37 | diff --git a/deps/lua/Makefile b/deps/lua/Makefile | ||
| 38 | index 209a132..72f4b2b 100644 | ||
| 39 | --- a/deps/lua/Makefile | ||
| 40 | +++ b/deps/lua/Makefile | ||
| 41 | @@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644 | ||
| 42 | |||
| 43 | # Utilities. | ||
| 44 | MKDIR= mkdir -p | ||
| 45 | -RANLIB= ranlib | ||
| 46 | |||
| 47 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= | ||
| 48 | |||
| 49 | diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile | ||
| 50 | index f3bba2f..1555ec0 100644 | ||
| 51 | --- a/deps/lua/src/Makefile | ||
| 52 | +++ b/deps/lua/src/Makefile | ||
| 53 | @@ -5,18 +5,14 @@ | ||
| 54 | # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= | ||
| 55 | |||
| 56 | # Your platform. See PLATS for possible values. | ||
| 57 | -PLAT= none | ||
| 58 | +PLAT= linux | ||
| 59 | |||
| 60 | -CC?= gcc | ||
| 61 | -CFLAGS= -O2 -Wall $(MYCFLAGS) | ||
| 62 | -AR= ar rcu | ||
| 63 | -RANLIB= ranlib | ||
| 64 | -RM= rm -f | ||
| 65 | -LIBS= -lm $(MYLIBS) | ||
| 66 | - | ||
| 67 | -MYCFLAGS= | ||
| 68 | +MYCFLAGS=-DLUA_USE_LINUX | ||
| 69 | MYLDFLAGS= | ||
| 70 | -MYLIBS= | ||
| 71 | +MYLIBS=-Wl,-E -ldl -lreadline -lhistory -lncurses | ||
| 72 | + | ||
| 73 | +CFLAGS += $(MYCFLAGS) | ||
| 74 | +LIBS += -lm $(MYLIBS) | ||
| 75 | |||
| 76 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= | ||
| 77 | |||
diff --git a/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch deleted file mode 100644 index f1021eef6c..0000000000 --- a/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From b9586abcb803747301f6cc4ff93c7642bef693ea Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Venture Research <tech@ventureresearch.com> | ||
| 3 | Date: Wed, 6 Feb 2013 20:51:02 -0600 | ||
| 4 | Subject: [PATCH] hack to force use of libc malloc | ||
| 5 | |||
| 6 | Hack to force libc usage as it seems the option to pass it in has been | ||
| 7 | removed in favor of magic. | ||
| 8 | |||
| 9 | Note that this of course doesn't allow tcmalloc and jemalloc, however | ||
| 10 | jemalloc wasn't building correctly. | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | |||
| 14 | Signed-off-by: Venture Research <tech@ventureresearch.com> | ||
| 15 | |||
| 16 | Update to work with 4.0.8 | ||
| 17 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | ||
| 18 | --- | ||
| 19 | src/Makefile | 3 ++- | ||
| 20 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 21 | |||
| 22 | diff --git a/src/Makefile b/src/Makefile | ||
| 23 | index 7d75c83..35dd314 100644 | ||
| 24 | --- a/src/Makefile | ||
| 25 | +++ b/src/Makefile | ||
| 26 | @@ -13,7 +13,8 @@ | ||
| 27 | # Just use 'make dep', but this is only needed by developers. | ||
| 28 | |||
| 29 | release_hdr := $(shell sh -c './mkreleasehdr.sh') | ||
| 30 | -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | ||
| 31 | +# use fake uname option to force use of generic libc | ||
| 32 | +uname_S := "USE_LIBC_MALLOC" | ||
| 33 | uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') | ||
| 34 | OPTIMIZATION?=-O2 | ||
| 35 | DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram | ||
diff --git a/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch deleted file mode 100644 index d73c66c9d0..0000000000 --- a/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From 2e6311c9c7cd85bf63eab8fe92c08ec1ec01b6fc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 21 Dec 2019 12:09:51 -0800 | ||
| 4 | Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER | ||
| 5 | |||
| 6 | Fixes | ||
| 7 | | zmalloc.c:87:37: error: 'PTHREAD_MUTEX_DEFAULT' undeclared here (not in a function) | ||
| 8 | | 87 | pthread_mutex_t used_memory_mutex = PTHREAD_MUTEX_INITIALIZER; | ||
| 9 | | | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | src/zmalloc.c | 1 + | ||
| 16 | 1 file changed, 1 insertion(+) | ||
| 17 | |||
| 18 | diff --git a/src/zmalloc.c b/src/zmalloc.c | ||
| 19 | index 1f33d09..5e182d1 100644 | ||
| 20 | --- a/src/zmalloc.c | ||
| 21 | +++ b/src/zmalloc.c | ||
| 22 | @@ -28,6 +28,7 @@ | ||
| 23 | * POSSIBILITY OF SUCH DAMAGE. | ||
| 24 | */ | ||
| 25 | |||
| 26 | +#define _GNU_SOURCE | ||
| 27 | #include <stdio.h> | ||
| 28 | #include <stdlib.h> | ||
| 29 | #include <stdint.h> | ||
diff --git a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch deleted file mode 100644 index bb3f5c607e..0000000000 --- a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch +++ /dev/null | |||
| @@ -1,60 +0,0 @@ | |||
| 1 | From 6149911f7a6fbaef3ed418408e2b501fa9479ffa Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 26 Oct 2020 21:32:22 -0700 | ||
| 4 | Subject: [PATCH] Define correct gregs for RISCV32 | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | |||
| 10 | Updated patch for 6.2.1 | ||
| 11 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | ||
| 12 | --- | ||
| 13 | src/debug.c | 26 ++++++++++++++++++++++++-- | ||
| 14 | 1 file changed, 24 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/src/debug.c b/src/debug.c | ||
| 17 | index bb76c5d..55a0696 100644 | ||
| 18 | --- a/src/debug.c | ||
| 19 | +++ b/src/debug.c | ||
| 20 | @@ -1067,7 +1067,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) { | ||
| 21 | #endif | ||
| 22 | #elif defined(__linux__) | ||
| 23 | /* Linux */ | ||
| 24 | - #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) | ||
| 25 | + #if defined(__riscv) && __riscv_xlen == 32 | ||
| 26 | + return (void*) uc->uc_mcontext.__gregs[REG_PC]; | ||
| 27 | + #elif defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) | ||
| 28 | GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip); | ||
| 29 | #elif defined(__X86_64__) || defined(__x86_64__) | ||
| 30 | GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip); | ||
| 31 | @@ -1234,8 +1236,28 @@ void logRegisters(ucontext_t *uc) { | ||
| 32 | #endif | ||
| 33 | /* Linux */ | ||
| 34 | #elif defined(__linux__) | ||
| 35 | + /* Linux RISCV32 */ | ||
| 36 | + #if defined(__riscv) && __riscv_xlen == 32 | ||
| 37 | + serverLog(LL_WARNING, | ||
| 38 | + "\n" | ||
| 39 | + "RA:%08lx S0:%08lx S1:%08lx S2:%08lx\n" | ||
| 40 | + "SP:%08lx PC:%08lx A0:%08lx A1:%08lx\n" | ||
| 41 | + "A2 :%08lx A3:%08lx A4:%08lx", | ||
| 42 | + (unsigned long) uc->uc_mcontext.__gregs[REG_RA], | ||
| 43 | + (unsigned long) uc->uc_mcontext.__gregs[REG_S0], | ||
| 44 | + (unsigned long) uc->uc_mcontext.__gregs[REG_S1], | ||
| 45 | + (unsigned long) uc->uc_mcontext.__gregs[REG_S2], | ||
| 46 | + (unsigned long) uc->uc_mcontext.__gregs[REG_SP], | ||
| 47 | + (unsigned long) uc->uc_mcontext.__gregs[REG_PC], | ||
| 48 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 0], | ||
| 49 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 1], | ||
| 50 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 2], | ||
| 51 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 3], | ||
| 52 | + (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 4] | ||
| 53 | + ); | ||
| 54 | + logStackContent((void**)uc->uc_mcontext.__gregs[REG_SP]); | ||
| 55 | /* Linux x86 */ | ||
| 56 | - #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) | ||
| 57 | + #elif defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) | ||
| 58 | serverLog(LL_WARNING, | ||
| 59 | "\n" | ||
| 60 | "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" | ||
diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis/init-redis-server deleted file mode 100644 index c5f335f57d..0000000000 --- a/meta-oe/recipes-extended/redis/redis/init-redis-server +++ /dev/null | |||
| @@ -1,71 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | # | ||
| 3 | ### BEGIN INIT INFO | ||
| 4 | # Provides: redis-server | ||
| 5 | # Required-Start: $network | ||
| 6 | # Required-Stop: $network | ||
| 7 | # Default-Start: S 2 3 4 5 | ||
| 8 | # Default-Stop: 0 1 6 | ||
| 9 | # Short-Description: Redis, a key-value store | ||
| 10 | # Description: Redis is an open source, advanced key-value store. | ||
| 11 | # http://redis.io | ||
| 12 | ### END INIT INFO | ||
| 13 | |||
| 14 | test -f /usr/bin/redis-server || exit 0 | ||
| 15 | |||
| 16 | ARGS="/etc/redis/redis.conf" | ||
| 17 | |||
| 18 | case "$1" in | ||
| 19 | start) | ||
| 20 | echo "Starting redis-server..." | ||
| 21 | start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS | ||
| 22 | ;; | ||
| 23 | stop) | ||
| 24 | echo "Stopping redis-server..." | ||
| 25 | start-stop-daemon --stop --quiet --exec /usr/bin/redis-server | ||
| 26 | ;; | ||
| 27 | restart) | ||
| 28 | echo "Stopping redis-server..." | ||
| 29 | start-stop-daemon --stop --quiet --exec /usr/bin/redis-server | ||
| 30 | |||
| 31 | # Since busybox implementation ignores --retry arguments repeatedly check | ||
| 32 | # if the process is still running and try another signal after a timeout, | ||
| 33 | # efectively simulating a stop with --retry=TERM/5/KILL/5 schedule. | ||
| 34 | waitAfterTerm=5000000 # us / 5000 ms / 5 s | ||
| 35 | waitAfterKill=5000000 # us / 5000 ms / 5 s | ||
| 36 | waitStep=100000 # us / 100 ms / 0.1 s | ||
| 37 | waited=0 | ||
| 38 | start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server | ||
| 39 | processOff=$? | ||
| 40 | while [ $processOff -eq 0 ] && [ $waited -le $waitAfterTerm ] ; do | ||
| 41 | usleep ${waitStep} | ||
| 42 | ((waited+=${waitStep})) | ||
| 43 | start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server | ||
| 44 | processOff=$? | ||
| 45 | done | ||
| 46 | if [ $processOff -eq 0 ] ; then | ||
| 47 | start-stop-daemon --stop --signal KILL --exec /usr/bin/redis-server | ||
| 48 | start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server | ||
| 49 | processOff=$? | ||
| 50 | fi | ||
| 51 | waited=0 | ||
| 52 | while [ $processOff -eq 0 ] && [ $waited -le $waitAfterKill ] ; do | ||
| 53 | usleep ${waitStep} | ||
| 54 | ((waited+=${waitStep})) | ||
| 55 | start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server | ||
| 56 | processOff=$? | ||
| 57 | done | ||
| 58 | # Here $processOff will indicate if waiting and retrying according to | ||
| 59 | # the schedule ended in a successfull stop or not. | ||
| 60 | |||
| 61 | echo "Starting redis-server..." | ||
| 62 | start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS | ||
| 63 | ;; | ||
| 64 | *) | ||
| 65 | echo "Usage: /etc/init.d/redis-server {start|stop|restart}" | ||
| 66 | exit 1 | ||
| 67 | ;; | ||
| 68 | esac | ||
| 69 | |||
| 70 | exit 0 | ||
| 71 | |||
diff --git a/meta-oe/recipes-extended/redis/redis/redis.conf b/meta-oe/recipes-extended/redis/redis/redis.conf deleted file mode 100644 index 75037d6dc8..0000000000 --- a/meta-oe/recipes-extended/redis/redis/redis.conf +++ /dev/null | |||
| @@ -1,1314 +0,0 @@ | |||
| 1 | # Redis configuration file example. | ||
| 2 | # | ||
| 3 | # Note that in order to read the configuration file, Redis must be | ||
| 4 | # started with the file path as first argument: | ||
| 5 | # | ||
| 6 | # ./redis-server /path/to/redis.conf | ||
| 7 | |||
| 8 | # Note on units: when memory size is needed, it is possible to specify | ||
| 9 | # it in the usual form of 1k 5GB 4M and so forth: | ||
| 10 | # | ||
| 11 | # 1k => 1000 bytes | ||
| 12 | # 1kb => 1024 bytes | ||
| 13 | # 1m => 1000000 bytes | ||
| 14 | # 1mb => 1024*1024 bytes | ||
| 15 | # 1g => 1000000000 bytes | ||
| 16 | # 1gb => 1024*1024*1024 bytes | ||
| 17 | # | ||
| 18 | # units are case insensitive so 1GB 1Gb 1gB are all the same. | ||
| 19 | |||
| 20 | ################################## INCLUDES ################################### | ||
| 21 | |||
| 22 | # Include one or more other config files here. This is useful if you | ||
| 23 | # have a standard template that goes to all Redis servers but also need | ||
| 24 | # to customize a few per-server settings. Include files can include | ||
| 25 | # other files, so use this wisely. | ||
| 26 | # | ||
| 27 | # Notice option "include" won't be rewritten by command "CONFIG REWRITE" | ||
| 28 | # from admin or Redis Sentinel. Since Redis always uses the last processed | ||
| 29 | # line as value of a configuration directive, you'd better put includes | ||
| 30 | # at the beginning of this file to avoid overwriting config change at runtime. | ||
| 31 | # | ||
| 32 | # If instead you are interested in using includes to override configuration | ||
| 33 | # options, it is better to use include as the last line. | ||
| 34 | # | ||
| 35 | # include /path/to/local.conf | ||
| 36 | # include /path/to/other.conf | ||
| 37 | |||
| 38 | ################################## MODULES ##################################### | ||
| 39 | |||
| 40 | # Load modules at startup. If the server is not able to load modules | ||
| 41 | # it will abort. It is possible to use multiple loadmodule directives. | ||
| 42 | # | ||
| 43 | # loadmodule /path/to/my_module.so | ||
| 44 | # loadmodule /path/to/other_module.so | ||
| 45 | |||
| 46 | ################################## NETWORK ##################################### | ||
| 47 | |||
| 48 | # By default, if no "bind" configuration directive is specified, Redis listens | ||
| 49 | # for connections from all the network interfaces available on the server. | ||
| 50 | # It is possible to listen to just one or multiple selected interfaces using | ||
| 51 | # the "bind" configuration directive, followed by one or more IP addresses. | ||
| 52 | # | ||
| 53 | # Examples: | ||
| 54 | # | ||
| 55 | # bind 192.168.1.100 10.0.0.1 | ||
| 56 | # bind 127.0.0.1 ::1 | ||
| 57 | # | ||
| 58 | # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the | ||
| 59 | # internet, binding to all the interfaces is dangerous and will expose the | ||
| 60 | # instance to everybody on the internet. So by default we uncomment the | ||
| 61 | # following bind directive, that will force Redis to listen only into | ||
| 62 | # the IPv4 lookback interface address (this means Redis will be able to | ||
| 63 | # accept connections only from clients running into the same computer it | ||
| 64 | # is running). | ||
| 65 | # | ||
| 66 | # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES | ||
| 67 | # JUST COMMENT THE FOLLOWING LINE. | ||
| 68 | # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 69 | bind 127.0.0.1 | ||
| 70 | |||
| 71 | # Protected mode is a layer of security protection, in order to avoid that | ||
| 72 | # Redis instances left open on the internet are accessed and exploited. | ||
| 73 | # | ||
| 74 | # When protected mode is on and if: | ||
| 75 | # | ||
| 76 | # 1) The server is not binding explicitly to a set of addresses using the | ||
| 77 | # "bind" directive. | ||
| 78 | # 2) No password is configured. | ||
| 79 | # | ||
| 80 | # The server only accepts connections from clients connecting from the | ||
| 81 | # IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain | ||
| 82 | # sockets. | ||
| 83 | # | ||
| 84 | # By default protected mode is enabled. You should disable it only if | ||
| 85 | # you are sure you want clients from other hosts to connect to Redis | ||
| 86 | # even if no authentication is configured, nor a specific set of interfaces | ||
| 87 | # are explicitly listed using the "bind" directive. | ||
| 88 | protected-mode yes | ||
| 89 | |||
| 90 | # Accept connections on the specified port, default is 6379 (IANA #815344). | ||
| 91 | # If port 0 is specified Redis will not listen on a TCP socket. | ||
| 92 | port 6379 | ||
| 93 | |||
| 94 | # TCP listen() backlog. | ||
| 95 | # | ||
| 96 | # In high requests-per-second environments you need an high backlog in order | ||
| 97 | # to avoid slow clients connections issues. Note that the Linux kernel | ||
| 98 | # will silently truncate it to the value of /proc/sys/net/core/somaxconn so | ||
| 99 | # make sure to raise both the value of somaxconn and tcp_max_syn_backlog | ||
| 100 | # in order to get the desired effect. | ||
| 101 | tcp-backlog 511 | ||
| 102 | |||
| 103 | # Unix socket. | ||
| 104 | # | ||
| 105 | # Specify the path for the Unix socket that will be used to listen for | ||
| 106 | # incoming connections. There is no default, so Redis will not listen | ||
| 107 | # on a unix socket when not specified. | ||
| 108 | # | ||
| 109 | # unixsocket /tmp/redis.sock | ||
| 110 | # unixsocketperm 700 | ||
| 111 | |||
| 112 | # Close the connection after a client is idle for N seconds (0 to disable) | ||
| 113 | timeout 0 | ||
| 114 | |||
| 115 | # TCP keepalive. | ||
| 116 | # | ||
| 117 | # If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence | ||
| 118 | # of communication. This is useful for two reasons: | ||
| 119 | # | ||
| 120 | # 1) Detect dead peers. | ||
| 121 | # 2) Take the connection alive from the point of view of network | ||
| 122 | # equipment in the middle. | ||
| 123 | # | ||
| 124 | # On Linux, the specified value (in seconds) is the period used to send ACKs. | ||
| 125 | # Note that to close the connection the double of the time is needed. | ||
| 126 | # On other kernels the period depends on the kernel configuration. | ||
| 127 | # | ||
| 128 | # A reasonable value for this option is 300 seconds, which is the new | ||
| 129 | # Redis default starting with Redis 3.2.1. | ||
| 130 | tcp-keepalive 300 | ||
| 131 | |||
| 132 | ################################# GENERAL ##################################### | ||
| 133 | |||
| 134 | # OE: run as a daemon. | ||
| 135 | daemonize yes | ||
| 136 | |||
| 137 | # If you run Redis from upstart or systemd, Redis can interact with your | ||
| 138 | # supervision tree. Options: | ||
| 139 | # supervised no - no supervision interaction | ||
| 140 | # supervised upstart - signal upstart by putting Redis into SIGSTOP mode | ||
| 141 | # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET | ||
| 142 | # supervised auto - detect upstart or systemd method based on | ||
| 143 | # UPSTART_JOB or NOTIFY_SOCKET environment variables | ||
| 144 | # Note: these supervision methods only signal "process is ready." | ||
| 145 | # They do not enable continuous liveness pings back to your supervisor. | ||
| 146 | supervised no | ||
| 147 | |||
| 148 | # If a pid file is specified, Redis writes it where specified at startup | ||
| 149 | # and removes it at exit. | ||
| 150 | # | ||
| 151 | # When the server runs non daemonized, no pid file is created if none is | ||
| 152 | # specified in the configuration. When the server is daemonized, the pid file | ||
| 153 | # is used even if not specified, defaulting to "/var/run/redis.pid". | ||
| 154 | # | ||
| 155 | # Creating a pid file is best effort: if Redis is not able to create it | ||
| 156 | # nothing bad happens, the server will start and run normally. | ||
| 157 | |||
| 158 | # When running daemonized, Redis writes a pid file in /var/run/redis.pid by | ||
| 159 | # default. You can specify a custom pid file location here. | ||
| 160 | pidfile /var/run/redis.pid | ||
| 161 | |||
| 162 | # Specify the server verbosity level. | ||
| 163 | # This can be one of: | ||
| 164 | # debug (a lot of information, useful for development/testing) | ||
| 165 | # verbose (many rarely useful info, but not a mess like the debug level) | ||
| 166 | # notice (moderately verbose, what you want in production probably) | ||
| 167 | # warning (only very important / critical messages are logged) | ||
| 168 | loglevel notice | ||
| 169 | |||
| 170 | # Specify the log file name. Also the empty string can be used to force | ||
| 171 | # Redis to log on the standard output. Note that if you use standard | ||
| 172 | # output for logging but daemonize, logs will be sent to /dev/null | ||
| 173 | logfile "" | ||
| 174 | |||
| 175 | # To enable logging to the system logger, just set 'syslog-enabled' to yes, | ||
| 176 | # and optionally update the other syslog parameters to suit your needs. | ||
| 177 | syslog-enabled yes | ||
| 178 | |||
| 179 | # Specify the syslog identity. | ||
| 180 | syslog-ident redis | ||
| 181 | |||
| 182 | # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. | ||
| 183 | # syslog-facility local0 | ||
| 184 | |||
| 185 | # Set the number of databases. The default database is DB 0, you can select | ||
| 186 | # a different one on a per-connection basis using SELECT <dbid> where | ||
| 187 | # dbid is a number between 0 and 'databases'-1 | ||
| 188 | databases 16 | ||
| 189 | |||
| 190 | # By default Redis shows an ASCII art logo only when started to log to the | ||
| 191 | # standard output and if the standard output is a TTY. Basically this means | ||
| 192 | # that normally a logo is displayed only in interactive sessions. | ||
| 193 | # | ||
| 194 | # However it is possible to force the pre-4.0 behavior and always show a | ||
| 195 | # ASCII art logo in startup logs by setting the following option to yes. | ||
| 196 | always-show-logo yes | ||
| 197 | |||
| 198 | ################################ SNAPSHOTTING ################################ | ||
| 199 | # | ||
| 200 | # Save the DB on disk: | ||
| 201 | # | ||
| 202 | # save <seconds> <changes> | ||
| 203 | # | ||
| 204 | # Will save the DB if both the given number of seconds and the given | ||
| 205 | # number of write operations against the DB occurred. | ||
| 206 | # | ||
| 207 | # In the example below the behaviour will be to save: | ||
| 208 | # after 900 sec (15 min) if at least 1 key changed | ||
| 209 | # after 300 sec (5 min) if at least 10 keys changed | ||
| 210 | # after 60 sec if at least 10000 keys changed | ||
| 211 | # | ||
| 212 | # Note: you can disable saving completely by commenting out all "save" lines. | ||
| 213 | # | ||
| 214 | # It is also possible to remove all the previously configured save | ||
| 215 | # points by adding a save directive with a single empty string argument | ||
| 216 | # like in the following example: | ||
| 217 | # | ||
| 218 | # save "" | ||
| 219 | |||
| 220 | #save 900 1 | ||
| 221 | #save 300 10 | ||
| 222 | #save 60 10000 | ||
| 223 | |||
| 224 | # OE: tune for a small embedded system with a limited # of keys. | ||
| 225 | save 120 1 | ||
| 226 | save 60 100 | ||
| 227 | save 30 1000 | ||
| 228 | |||
| 229 | # By default Redis will stop accepting writes if RDB snapshots are enabled | ||
| 230 | # (at least one save point) and the latest background save failed. | ||
| 231 | # This will make the user aware (in a hard way) that data is not persisting | ||
| 232 | # on disk properly, otherwise chances are that no one will notice and some | ||
| 233 | # disaster will happen. | ||
| 234 | # | ||
| 235 | # If the background saving process will start working again Redis will | ||
| 236 | # automatically allow writes again. | ||
| 237 | # | ||
| 238 | # However if you have setup your proper monitoring of the Redis server | ||
| 239 | # and persistence, you may want to disable this feature so that Redis will | ||
| 240 | # continue to work as usual even if there are problems with disk, | ||
| 241 | # permissions, and so forth. | ||
| 242 | stop-writes-on-bgsave-error yes | ||
| 243 | |||
| 244 | # Compress string objects using LZF when dump .rdb databases? | ||
| 245 | # For default that's set to 'yes' as it's almost always a win. | ||
| 246 | # If you want to save some CPU in the saving child set it to 'no' but | ||
| 247 | # the dataset will likely be bigger if you have compressible values or keys. | ||
| 248 | rdbcompression yes | ||
| 249 | |||
| 250 | # Since version 5 of RDB a CRC64 checksum is placed at the end of the file. | ||
| 251 | # This makes the format more resistant to corruption but there is a performance | ||
| 252 | # hit to pay (around 10%) when saving and loading RDB files, so you can disable it | ||
| 253 | # for maximum performances. | ||
| 254 | # | ||
| 255 | # RDB files created with checksum disabled have a checksum of zero that will | ||
| 256 | # tell the loading code to skip the check. | ||
| 257 | rdbchecksum yes | ||
| 258 | |||
| 259 | # The filename where to dump the DB | ||
| 260 | dbfilename dump.rdb | ||
| 261 | |||
| 262 | # The working directory. | ||
| 263 | # | ||
| 264 | # The DB will be written inside this directory, with the filename specified | ||
| 265 | # above using the 'dbfilename' configuration directive. | ||
| 266 | # | ||
| 267 | # The Append Only File will also be created inside this directory. | ||
| 268 | # | ||
| 269 | # Note that you must specify a directory here, not a file name. | ||
| 270 | dir /var/lib/redis/ | ||
| 271 | |||
| 272 | ################################# REPLICATION ################################# | ||
| 273 | |||
| 274 | # Master-Slave replication. Use slaveof to make a Redis instance a copy of | ||
| 275 | # another Redis server. A few things to understand ASAP about Redis replication. | ||
| 276 | # | ||
| 277 | # 1) Redis replication is asynchronous, but you can configure a master to | ||
| 278 | # stop accepting writes if it appears to be not connected with at least | ||
| 279 | # a given number of slaves. | ||
| 280 | # 2) Redis slaves are able to perform a partial resynchronization with the | ||
| 281 | # master if the replication link is lost for a relatively small amount of | ||
| 282 | # time. You may want to configure the replication backlog size (see the next | ||
| 283 | # sections of this file) with a sensible value depending on your needs. | ||
| 284 | # 3) Replication is automatic and does not need user intervention. After a | ||
| 285 | # network partition slaves automatically try to reconnect to masters | ||
| 286 | # and resynchronize with them. | ||
| 287 | # | ||
| 288 | # slaveof <masterip> <masterport> | ||
| 289 | |||
| 290 | # If the master is password protected (using the "requirepass" configuration | ||
| 291 | # directive below) it is possible to tell the slave to authenticate before | ||
| 292 | # starting the replication synchronization process, otherwise the master will | ||
| 293 | # refuse the slave request. | ||
| 294 | # | ||
| 295 | # masterauth <master-password> | ||
| 296 | |||
| 297 | # When a slave loses its connection with the master, or when the replication | ||
| 298 | # is still in progress, the slave can act in two different ways: | ||
| 299 | # | ||
| 300 | # 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will | ||
| 301 | # still reply to client requests, possibly with out of date data, or the | ||
| 302 | # data set may just be empty if this is the first synchronization. | ||
| 303 | # | ||
| 304 | # 2) if slave-serve-stale-data is set to 'no' the slave will reply with | ||
| 305 | # an error "SYNC with master in progress" to all the kind of commands | ||
| 306 | # but to INFO and SLAVEOF. | ||
| 307 | # | ||
| 308 | slave-serve-stale-data yes | ||
| 309 | |||
| 310 | # You can configure a slave instance to accept writes or not. Writing against | ||
| 311 | # a slave instance may be useful to store some ephemeral data (because data | ||
| 312 | # written on a slave will be easily deleted after resync with the master) but | ||
| 313 | # may also cause problems if clients are writing to it because of a | ||
| 314 | # misconfiguration. | ||
| 315 | # | ||
| 316 | # Since Redis 2.6 by default slaves are read-only. | ||
| 317 | # | ||
| 318 | # Note: read only slaves are not designed to be exposed to untrusted clients | ||
| 319 | # on the internet. It's just a protection layer against misuse of the instance. | ||
| 320 | # Still a read only slave exports by default all the administrative commands | ||
| 321 | # such as CONFIG, DEBUG, and so forth. To a limited extent you can improve | ||
| 322 | # security of read only slaves using 'rename-command' to shadow all the | ||
| 323 | # administrative / dangerous commands. | ||
| 324 | slave-read-only yes | ||
| 325 | |||
| 326 | # Replication SYNC strategy: disk or socket. | ||
| 327 | # | ||
| 328 | # ------------------------------------------------------- | ||
| 329 | # WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY | ||
| 330 | # ------------------------------------------------------- | ||
| 331 | # | ||
| 332 | # New slaves and reconnecting slaves that are not able to continue the replication | ||
| 333 | # process just receiving differences, need to do what is called a "full | ||
| 334 | # synchronization". An RDB file is transmitted from the master to the slaves. | ||
| 335 | # The transmission can happen in two different ways: | ||
| 336 | # | ||
| 337 | # 1) Disk-backed: The Redis master creates a new process that writes the RDB | ||
| 338 | # file on disk. Later the file is transferred by the parent | ||
| 339 | # process to the slaves incrementally. | ||
| 340 | # 2) Diskless: The Redis master creates a new process that directly writes the | ||
| 341 | # RDB file to slave sockets, without touching the disk at all. | ||
| 342 | # | ||
| 343 | # With disk-backed replication, while the RDB file is generated, more slaves | ||
| 344 | # can be queued and served with the RDB file as soon as the current child producing | ||
| 345 | # the RDB file finishes its work. With diskless replication instead once | ||
| 346 | # the transfer starts, new slaves arriving will be queued and a new transfer | ||
| 347 | # will start when the current one terminates. | ||
| 348 | # | ||
| 349 | # When diskless replication is used, the master waits a configurable amount of | ||
| 350 | # time (in seconds) before starting the transfer in the hope that multiple slaves | ||
| 351 | # will arrive and the transfer can be parallelized. | ||
| 352 | # | ||
| 353 | # With slow disks and fast (large bandwidth) networks, diskless replication | ||
| 354 | # works better. | ||
| 355 | repl-diskless-sync no | ||
| 356 | |||
| 357 | # When diskless replication is enabled, it is possible to configure the delay | ||
| 358 | # the server waits in order to spawn the child that transfers the RDB via socket | ||
| 359 | # to the slaves. | ||
| 360 | # | ||
| 361 | # This is important since once the transfer starts, it is not possible to serve | ||
| 362 | # new slaves arriving, that will be queued for the next RDB transfer, so the server | ||
| 363 | # waits a delay in order to let more slaves arrive. | ||
| 364 | # | ||
| 365 | # The delay is specified in seconds, and by default is 5 seconds. To disable | ||
| 366 | # it entirely just set it to 0 seconds and the transfer will start ASAP. | ||
| 367 | repl-diskless-sync-delay 5 | ||
| 368 | |||
| 369 | # Slaves send PINGs to server in a predefined interval. It's possible to change | ||
| 370 | # this interval with the repl_ping_slave_period option. The default value is 10 | ||
| 371 | # seconds. | ||
| 372 | # | ||
| 373 | # repl-ping-slave-period 10 | ||
| 374 | |||
| 375 | # The following option sets the replication timeout for: | ||
| 376 | # | ||
| 377 | # 1) Bulk transfer I/O during SYNC, from the point of view of slave. | ||
| 378 | # 2) Master timeout from the point of view of slaves (data, pings). | ||
| 379 | # 3) Slave timeout from the point of view of masters (REPLCONF ACK pings). | ||
| 380 | # | ||
| 381 | # It is important to make sure that this value is greater than the value | ||
| 382 | # specified for repl-ping-slave-period otherwise a timeout will be detected | ||
| 383 | # every time there is low traffic between the master and the slave. | ||
| 384 | # | ||
| 385 | # repl-timeout 60 | ||
| 386 | |||
| 387 | # Disable TCP_NODELAY on the slave socket after SYNC? | ||
| 388 | # | ||
| 389 | # If you select "yes" Redis will use a smaller number of TCP packets and | ||
| 390 | # less bandwidth to send data to slaves. But this can add a delay for | ||
| 391 | # the data to appear on the slave side, up to 40 milliseconds with | ||
| 392 | # Linux kernels using a default configuration. | ||
| 393 | # | ||
| 394 | # If you select "no" the delay for data to appear on the slave side will | ||
| 395 | # be reduced but more bandwidth will be used for replication. | ||
| 396 | # | ||
| 397 | # By default we optimize for low latency, but in very high traffic conditions | ||
| 398 | # or when the master and slaves are many hops away, turning this to "yes" may | ||
| 399 | # be a good idea. | ||
| 400 | repl-disable-tcp-nodelay no | ||
| 401 | |||
| 402 | # Set the replication backlog size. The backlog is a buffer that accumulates | ||
| 403 | # slave data when slaves are disconnected for some time, so that when a slave | ||
| 404 | # wants to reconnect again, often a full resync is not needed, but a partial | ||
| 405 | # resync is enough, just passing the portion of data the slave missed while | ||
| 406 | # disconnected. | ||
| 407 | # | ||
| 408 | # The bigger the replication backlog, the longer the time the slave can be | ||
| 409 | # disconnected and later be able to perform a partial resynchronization. | ||
| 410 | # | ||
| 411 | # The backlog is only allocated once there is at least a slave connected. | ||
| 412 | # | ||
| 413 | # repl-backlog-size 1mb | ||
| 414 | |||
| 415 | # After a master has no longer connected slaves for some time, the backlog | ||
| 416 | # will be freed. The following option configures the amount of seconds that | ||
| 417 | # need to elapse, starting from the time the last slave disconnected, for | ||
| 418 | # the backlog buffer to be freed. | ||
| 419 | # | ||
| 420 | # Note that slaves never free the backlog for timeout, since they may be | ||
| 421 | # promoted to masters later, and should be able to correctly "partially | ||
| 422 | # resynchronize" with the slaves: hence they should always accumulate backlog. | ||
| 423 | # | ||
| 424 | # A value of 0 means to never release the backlog. | ||
| 425 | # | ||
| 426 | # repl-backlog-ttl 3600 | ||
| 427 | |||
| 428 | # The slave priority is an integer number published by Redis in the INFO output. | ||
| 429 | # It is used by Redis Sentinel in order to select a slave to promote into a | ||
| 430 | # master if the master is no longer working correctly. | ||
| 431 | # | ||
| 432 | # A slave with a low priority number is considered better for promotion, so | ||
| 433 | # for instance if there are three slaves with priority 10, 100, 25 Sentinel will | ||
| 434 | # pick the one with priority 10, that is the lowest. | ||
| 435 | # | ||
| 436 | # However a special priority of 0 marks the slave as not able to perform the | ||
| 437 | # role of master, so a slave with priority of 0 will never be selected by | ||
| 438 | # Redis Sentinel for promotion. | ||
| 439 | # | ||
| 440 | # By default the priority is 100. | ||
| 441 | slave-priority 100 | ||
| 442 | |||
| 443 | # It is possible for a master to stop accepting writes if there are less than | ||
| 444 | # N slaves connected, having a lag less or equal than M seconds. | ||
| 445 | # | ||
| 446 | # The N slaves need to be in "online" state. | ||
| 447 | # | ||
| 448 | # The lag in seconds, that must be <= the specified value, is calculated from | ||
| 449 | # the last ping received from the slave, that is usually sent every second. | ||
| 450 | # | ||
| 451 | # This option does not GUARANTEE that N replicas will accept the write, but | ||
| 452 | # will limit the window of exposure for lost writes in case not enough slaves | ||
| 453 | # are available, to the specified number of seconds. | ||
| 454 | # | ||
| 455 | # For example to require at least 3 slaves with a lag <= 10 seconds use: | ||
| 456 | # | ||
| 457 | # min-slaves-to-write 3 | ||
| 458 | # min-slaves-max-lag 10 | ||
| 459 | # | ||
| 460 | # Setting one or the other to 0 disables the feature. | ||
| 461 | # | ||
| 462 | # By default min-slaves-to-write is set to 0 (feature disabled) and | ||
| 463 | # min-slaves-max-lag is set to 10. | ||
| 464 | |||
| 465 | # A Redis master is able to list the address and port of the attached | ||
| 466 | # slaves in different ways. For example the "INFO replication" section | ||
| 467 | # offers this information, which is used, among other tools, by | ||
| 468 | # Redis Sentinel in order to discover slave instances. | ||
| 469 | # Another place where this info is available is in the output of the | ||
| 470 | # "ROLE" command of a master. | ||
| 471 | # | ||
| 472 | # The listed IP and address normally reported by a slave is obtained | ||
| 473 | # in the following way: | ||
| 474 | # | ||
| 475 | # IP: The address is auto detected by checking the peer address | ||
| 476 | # of the socket used by the slave to connect with the master. | ||
| 477 | # | ||
| 478 | # Port: The port is communicated by the slave during the replication | ||
| 479 | # handshake, and is normally the port that the slave is using to | ||
| 480 | # list for connections. | ||
| 481 | # | ||
| 482 | # However when port forwarding or Network Address Translation (NAT) is | ||
| 483 | # used, the slave may be actually reachable via different IP and port | ||
| 484 | # pairs. The following two options can be used by a slave in order to | ||
| 485 | # report to its master a specific set of IP and port, so that both INFO | ||
| 486 | # and ROLE will report those values. | ||
| 487 | # | ||
| 488 | # There is no need to use both the options if you need to override just | ||
| 489 | # the port or the IP address. | ||
| 490 | # | ||
| 491 | # slave-announce-ip 5.5.5.5 | ||
| 492 | # slave-announce-port 1234 | ||
| 493 | |||
| 494 | ################################## SECURITY ################################### | ||
| 495 | |||
| 496 | # Require clients to issue AUTH <PASSWORD> before processing any other | ||
| 497 | # commands. This might be useful in environments in which you do not trust | ||
| 498 | # others with access to the host running redis-server. | ||
| 499 | # | ||
| 500 | # This should stay commented out for backward compatibility and because most | ||
| 501 | # people do not need auth (e.g. they run their own servers). | ||
| 502 | # | ||
| 503 | # Warning: since Redis is pretty fast an outside user can try up to | ||
| 504 | # 150k passwords per second against a good box. This means that you should | ||
| 505 | # use a very strong password otherwise it will be very easy to break. | ||
| 506 | # | ||
| 507 | # requirepass foobared | ||
| 508 | |||
| 509 | # Command renaming. | ||
| 510 | # | ||
| 511 | # It is possible to change the name of dangerous commands in a shared | ||
| 512 | # environment. For instance the CONFIG command may be renamed into something | ||
| 513 | # hard to guess so that it will still be available for internal-use tools | ||
| 514 | # but not available for general clients. | ||
| 515 | # | ||
| 516 | # Example: | ||
| 517 | # | ||
| 518 | # rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52 | ||
| 519 | # | ||
| 520 | # It is also possible to completely kill a command by renaming it into | ||
| 521 | # an empty string: | ||
| 522 | # | ||
| 523 | # rename-command CONFIG "" | ||
| 524 | # | ||
| 525 | # Please note that changing the name of commands that are logged into the | ||
| 526 | # AOF file or transmitted to slaves may cause problems. | ||
| 527 | |||
| 528 | ################################### CLIENTS #################################### | ||
| 529 | |||
| 530 | # Set the max number of connected clients at the same time. By default | ||
| 531 | # this limit is set to 10000 clients, however if the Redis server is not | ||
| 532 | # able to configure the process file limit to allow for the specified limit | ||
| 533 | # the max number of allowed clients is set to the current file limit | ||
| 534 | # minus 32 (as Redis reserves a few file descriptors for internal uses). | ||
| 535 | # | ||
| 536 | # Once the limit is reached Redis will close all the new connections sending | ||
| 537 | # an error 'max number of clients reached'. | ||
| 538 | # | ||
| 539 | # maxclients 10000 | ||
| 540 | |||
| 541 | ############################## MEMORY MANAGEMENT ################################ | ||
| 542 | |||
| 543 | # Set a memory usage limit to the specified amount of bytes. | ||
| 544 | # When the memory limit is reached Redis will try to remove keys | ||
| 545 | # according to the eviction policy selected (see maxmemory-policy). | ||
| 546 | # | ||
| 547 | # If Redis can't remove keys according to the policy, or if the policy is | ||
| 548 | # set to 'noeviction', Redis will start to reply with errors to commands | ||
| 549 | # that would use more memory, like SET, LPUSH, and so on, and will continue | ||
| 550 | # to reply to read-only commands like GET. | ||
| 551 | # | ||
| 552 | # This option is usually useful when using Redis as an LRU or LFU cache, or to | ||
| 553 | # set a hard memory limit for an instance (using the 'noeviction' policy). | ||
| 554 | # | ||
| 555 | # WARNING: If you have slaves attached to an instance with maxmemory on, | ||
| 556 | # the size of the output buffers needed to feed the slaves are subtracted | ||
| 557 | # from the used memory count, so that network problems / resyncs will | ||
| 558 | # not trigger a loop where keys are evicted, and in turn the output | ||
| 559 | # buffer of slaves is full with DELs of keys evicted triggering the deletion | ||
| 560 | # of more keys, and so forth until the database is completely emptied. | ||
| 561 | # | ||
| 562 | # In short... if you have slaves attached it is suggested that you set a lower | ||
| 563 | # limit for maxmemory so that there is some free RAM on the system for slave | ||
| 564 | # output buffers (but this is not needed if the policy is 'noeviction'). | ||
| 565 | # | ||
| 566 | # maxmemory <bytes> | ||
| 567 | |||
| 568 | # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory | ||
| 569 | # is reached. You can select among five behaviors: | ||
| 570 | # | ||
| 571 | # volatile-lru -> Evict using approximated LRU among the keys with an expire set. | ||
| 572 | # allkeys-lru -> Evict any key using approximated LRU. | ||
| 573 | # volatile-lfu -> Evict using approximated LFU among the keys with an expire set. | ||
| 574 | # allkeys-lfu -> Evict any key using approximated LFU. | ||
| 575 | # volatile-random -> Remove a random key among the ones with an expire set. | ||
| 576 | # allkeys-random -> Remove a random key, any key. | ||
| 577 | # volatile-ttl -> Remove the key with the nearest expire time (minor TTL) | ||
| 578 | # noeviction -> Don't evict anything, just return an error on write operations. | ||
| 579 | # | ||
| 580 | # LRU means Least Recently Used | ||
| 581 | # LFU means Least Frequently Used | ||
| 582 | # | ||
| 583 | # Both LRU, LFU and volatile-ttl are implemented using approximated | ||
| 584 | # randomized algorithms. | ||
| 585 | # | ||
| 586 | # Note: with any of the above policies, Redis will return an error on write | ||
| 587 | # operations, when there are no suitable keys for eviction. | ||
| 588 | # | ||
| 589 | # At the date of writing these commands are: set setnx setex append | ||
| 590 | # incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd | ||
| 591 | # sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby | ||
| 592 | # zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby | ||
| 593 | # getset mset msetnx exec sort | ||
| 594 | # | ||
| 595 | # The default is: | ||
| 596 | # | ||
| 597 | # maxmemory-policy noeviction | ||
| 598 | |||
| 599 | # LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated | ||
| 600 | # algorithms (in order to save memory), so you can tune it for speed or | ||
| 601 | # accuracy. For default Redis will check five keys and pick the one that was | ||
| 602 | # used less recently, you can change the sample size using the following | ||
| 603 | # configuration directive. | ||
| 604 | # | ||
| 605 | # The default of 5 produces good enough results. 10 Approximates very closely | ||
| 606 | # true LRU but costs more CPU. 3 is faster but not very accurate. | ||
| 607 | # | ||
| 608 | # maxmemory-samples 5 | ||
| 609 | |||
| 610 | ############################# LAZY FREEING #################################### | ||
| 611 | |||
| 612 | # Redis has two primitives to delete keys. One is called DEL and is a blocking | ||
| 613 | # deletion of the object. It means that the server stops processing new commands | ||
| 614 | # in order to reclaim all the memory associated with an object in a synchronous | ||
| 615 | # way. If the key deleted is associated with a small object, the time needed | ||
| 616 | # in order to execute the DEL command is very small and comparable to most other | ||
| 617 | # O(1) or O(log_N) commands in Redis. However if the key is associated with an | ||
| 618 | # aggregated value containing millions of elements, the server can block for | ||
| 619 | # a long time (even seconds) in order to complete the operation. | ||
| 620 | # | ||
| 621 | # For the above reasons Redis also offers non blocking deletion primitives | ||
| 622 | # such as UNLINK (non blocking DEL) and the ASYNC option of FLUSHALL and | ||
| 623 | # FLUSHDB commands, in order to reclaim memory in background. Those commands | ||
| 624 | # are executed in constant time. Another thread will incrementally free the | ||
| 625 | # object in the background as fast as possible. | ||
| 626 | # | ||
| 627 | # DEL, UNLINK and ASYNC option of FLUSHALL and FLUSHDB are user-controlled. | ||
| 628 | # It's up to the design of the application to understand when it is a good | ||
| 629 | # idea to use one or the other. However the Redis server sometimes has to | ||
| 630 | # delete keys or flush the whole database as a side effect of other operations. | ||
| 631 | # Specifically Redis deletes objects independently of a user call in the | ||
| 632 | # following scenarios: | ||
| 633 | # | ||
| 634 | # 1) On eviction, because of the maxmemory and maxmemory policy configurations, | ||
| 635 | # in order to make room for new data, without going over the specified | ||
| 636 | # memory limit. | ||
| 637 | # 2) Because of expire: when a key with an associated time to live (see the | ||
| 638 | # EXPIRE command) must be deleted from memory. | ||
| 639 | # 3) Because of a side effect of a command that stores data on a key that may | ||
| 640 | # already exist. For example the RENAME command may delete the old key | ||
| 641 | # content when it is replaced with another one. Similarly SUNIONSTORE | ||
| 642 | # or SORT with STORE option may delete existing keys. The SET command | ||
| 643 | # itself removes any old content of the specified key in order to replace | ||
| 644 | # it with the specified string. | ||
| 645 | # 4) During replication, when a slave performs a full resynchronization with | ||
| 646 | # its master, the content of the whole database is removed in order to | ||
| 647 | # load the RDB file just transfered. | ||
| 648 | # | ||
| 649 | # In all the above cases the default is to delete objects in a blocking way, | ||
| 650 | # like if DEL was called. However you can configure each case specifically | ||
| 651 | # in order to instead release memory in a non-blocking way like if UNLINK | ||
| 652 | # was called, using the following configuration directives: | ||
| 653 | |||
| 654 | lazyfree-lazy-eviction no | ||
| 655 | lazyfree-lazy-expire no | ||
| 656 | lazyfree-lazy-server-del no | ||
| 657 | slave-lazy-flush no | ||
| 658 | |||
| 659 | ############################## APPEND ONLY MODE ############################### | ||
| 660 | |||
| 661 | # By default Redis asynchronously dumps the dataset on disk. This mode is | ||
| 662 | # good enough in many applications, but an issue with the Redis process or | ||
| 663 | # a power outage may result into a few minutes of writes lost (depending on | ||
| 664 | # the configured save points). | ||
| 665 | # | ||
| 666 | # The Append Only File is an alternative persistence mode that provides | ||
| 667 | # much better durability. For instance using the default data fsync policy | ||
| 668 | # (see later in the config file) Redis can lose just one second of writes in a | ||
| 669 | # dramatic event like a server power outage, or a single write if something | ||
| 670 | # wrong with the Redis process itself happens, but the operating system is | ||
| 671 | # still running correctly. | ||
| 672 | # | ||
| 673 | # AOF and RDB persistence can be enabled at the same time without problems. | ||
| 674 | # If the AOF is enabled on startup Redis will load the AOF, that is the file | ||
| 675 | # with the better durability guarantees. | ||
| 676 | # | ||
| 677 | # Please check http://redis.io/topics/persistence for more information. | ||
| 678 | |||
| 679 | # OE: changed default to enable this | ||
| 680 | appendonly yes | ||
| 681 | |||
| 682 | # The name of the append only file (default: "appendonly.aof") | ||
| 683 | |||
| 684 | appendfilename "appendonly.aof" | ||
| 685 | |||
| 686 | # The fsync() call tells the Operating System to actually write data on disk | ||
| 687 | # instead of waiting for more data in the output buffer. Some OS will really flush | ||
| 688 | # data on disk, some other OS will just try to do it ASAP. | ||
| 689 | # | ||
| 690 | # Redis supports three different modes: | ||
| 691 | # | ||
| 692 | # no: don't fsync, just let the OS flush the data when it wants. Faster. | ||
| 693 | # always: fsync after every write to the append only log. Slow, Safest. | ||
| 694 | # everysec: fsync only one time every second. Compromise. | ||
| 695 | # | ||
| 696 | # The default is "everysec", as that's usually the right compromise between | ||
| 697 | # speed and data safety. It's up to you to understand if you can relax this to | ||
| 698 | # "no" that will let the operating system flush the output buffer when | ||
| 699 | # it wants, for better performances (but if you can live with the idea of | ||
| 700 | # some data loss consider the default persistence mode that's snapshotting), | ||
| 701 | # or on the contrary, use "always" that's very slow but a bit safer than | ||
| 702 | # everysec. | ||
| 703 | # | ||
| 704 | # More details please check the following article: | ||
| 705 | # http://antirez.com/post/redis-persistence-demystified.html | ||
| 706 | # | ||
| 707 | # If unsure, use "everysec". | ||
| 708 | |||
| 709 | # appendfsync always | ||
| 710 | appendfsync everysec | ||
| 711 | # appendfsync no | ||
| 712 | |||
| 713 | # When the AOF fsync policy is set to always or everysec, and a background | ||
| 714 | # saving process (a background save or AOF log background rewriting) is | ||
| 715 | # performing a lot of I/O against the disk, in some Linux configurations | ||
| 716 | # Redis may block too long on the fsync() call. Note that there is no fix for | ||
| 717 | # this currently, as even performing fsync in a different thread will block | ||
| 718 | # our synchronous write(2) call. | ||
| 719 | # | ||
| 720 | # In order to mitigate this problem it's possible to use the following option | ||
| 721 | # that will prevent fsync() from being called in the main process while a | ||
| 722 | # BGSAVE or BGREWRITEAOF is in progress. | ||
| 723 | # | ||
| 724 | # This means that while another child is saving, the durability of Redis is | ||
| 725 | # the same as "appendfsync none". In practical terms, this means that it is | ||
| 726 | # possible to lose up to 30 seconds of log in the worst scenario (with the | ||
| 727 | # default Linux settings). | ||
| 728 | # | ||
| 729 | # If you have latency problems turn this to "yes". Otherwise leave it as | ||
| 730 | # "no" that is the safest pick from the point of view of durability. | ||
| 731 | |||
| 732 | no-appendfsync-on-rewrite no | ||
| 733 | |||
| 734 | # Automatic rewrite of the append only file. | ||
| 735 | # Redis is able to automatically rewrite the log file implicitly calling | ||
| 736 | # BGREWRITEAOF when the AOF log size grows by the specified percentage. | ||
| 737 | # | ||
| 738 | # This is how it works: Redis remembers the size of the AOF file after the | ||
| 739 | # latest rewrite (if no rewrite has happened since the restart, the size of | ||
| 740 | # the AOF at startup is used). | ||
| 741 | # | ||
| 742 | # This base size is compared to the current size. If the current size is | ||
| 743 | # bigger than the specified percentage, the rewrite is triggered. Also | ||
| 744 | # you need to specify a minimal size for the AOF file to be rewritten, this | ||
| 745 | # is useful to avoid rewriting the AOF file even if the percentage increase | ||
| 746 | # is reached but it is still pretty small. | ||
| 747 | # | ||
| 748 | # Specify a percentage of zero in order to disable the automatic AOF | ||
| 749 | # rewrite feature. | ||
| 750 | |||
| 751 | auto-aof-rewrite-percentage 100 | ||
| 752 | auto-aof-rewrite-min-size 64mb | ||
| 753 | |||
| 754 | # An AOF file may be found to be truncated at the end during the Redis | ||
| 755 | # startup process, when the AOF data gets loaded back into memory. | ||
| 756 | # This may happen when the system where Redis is running | ||
| 757 | # crashes, especially when an ext4 filesystem is mounted without the | ||
| 758 | # data=ordered option (however this can't happen when Redis itself | ||
| 759 | # crashes or aborts but the operating system still works correctly). | ||
| 760 | # | ||
| 761 | # Redis can either exit with an error when this happens, or load as much | ||
| 762 | # data as possible (the default now) and start if the AOF file is found | ||
| 763 | # to be truncated at the end. The following option controls this behavior. | ||
| 764 | # | ||
| 765 | # If aof-load-truncated is set to yes, a truncated AOF file is loaded and | ||
| 766 | # the Redis server starts emitting a log to inform the user of the event. | ||
| 767 | # Otherwise if the option is set to no, the server aborts with an error | ||
| 768 | # and refuses to start. When the option is set to no, the user requires | ||
| 769 | # to fix the AOF file using the "redis-check-aof" utility before to restart | ||
| 770 | # the server. | ||
| 771 | # | ||
| 772 | # Note that if the AOF file will be found to be corrupted in the middle | ||
| 773 | # the server will still exit with an error. This option only applies when | ||
| 774 | # Redis will try to read more data from the AOF file but not enough bytes | ||
| 775 | # will be found. | ||
| 776 | aof-load-truncated yes | ||
| 777 | |||
| 778 | # When rewriting the AOF file, Redis is able to use an RDB preamble in the | ||
| 779 | # AOF file for faster rewrites and recoveries. When this option is turned | ||
| 780 | # on the rewritten AOF file is composed of two different stanzas: | ||
| 781 | # | ||
| 782 | # [RDB file][AOF tail] | ||
| 783 | # | ||
| 784 | # When loading Redis recognizes that the AOF file starts with the "REDIS" | ||
| 785 | # string and loads the prefixed RDB file, and continues loading the AOF | ||
| 786 | # tail. | ||
| 787 | # | ||
| 788 | # This is currently turned off by default in order to avoid the surprise | ||
| 789 | # of a format change, but will at some point be used as the default. | ||
| 790 | aof-use-rdb-preamble no | ||
| 791 | |||
| 792 | ################################ LUA SCRIPTING ############################### | ||
| 793 | |||
| 794 | # Max execution time of a Lua script in milliseconds. | ||
| 795 | # | ||
| 796 | # If the maximum execution time is reached Redis will log that a script is | ||
| 797 | # still in execution after the maximum allowed time and will start to | ||
| 798 | # reply to queries with an error. | ||
| 799 | # | ||
| 800 | # When a long running script exceeds the maximum execution time only the | ||
| 801 | # SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be | ||
| 802 | # used to stop a script that did not yet called write commands. The second | ||
| 803 | # is the only way to shut down the server in the case a write command was | ||
| 804 | # already issued by the script but the user doesn't want to wait for the natural | ||
| 805 | # termination of the script. | ||
| 806 | # | ||
| 807 | # Set it to 0 or a negative value for unlimited execution without warnings. | ||
| 808 | lua-time-limit 5000 | ||
| 809 | |||
| 810 | ################################ REDIS CLUSTER ############################### | ||
| 811 | # | ||
| 812 | # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
| 813 | # WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however | ||
| 814 | # in order to mark it as "mature" we need to wait for a non trivial percentage | ||
| 815 | # of users to deploy it in production. | ||
| 816 | # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
| 817 | # | ||
| 818 | # Normal Redis instances can't be part of a Redis Cluster; only nodes that are | ||
| 819 | # started as cluster nodes can. In order to start a Redis instance as a | ||
| 820 | # cluster node enable the cluster support uncommenting the following: | ||
| 821 | # | ||
| 822 | # cluster-enabled yes | ||
| 823 | |||
| 824 | # Every cluster node has a cluster configuration file. This file is not | ||
| 825 | # intended to be edited by hand. It is created and updated by Redis nodes. | ||
| 826 | # Every Redis Cluster node requires a different cluster configuration file. | ||
| 827 | # Make sure that instances running in the same system do not have | ||
| 828 | # overlapping cluster configuration file names. | ||
| 829 | # | ||
| 830 | # cluster-config-file nodes-6379.conf | ||
| 831 | |||
| 832 | # Cluster node timeout is the amount of milliseconds a node must be unreachable | ||
| 833 | # for it to be considered in failure state. | ||
| 834 | # Most other internal time limits are multiple of the node timeout. | ||
| 835 | # | ||
| 836 | # cluster-node-timeout 15000 | ||
| 837 | |||
| 838 | # A slave of a failing master will avoid to start a failover if its data | ||
| 839 | # looks too old. | ||
| 840 | # | ||
| 841 | # There is no simple way for a slave to actually have an exact measure of | ||
| 842 | # its "data age", so the following two checks are performed: | ||
| 843 | # | ||
| 844 | # 1) If there are multiple slaves able to failover, they exchange messages | ||
| 845 | # in order to try to give an advantage to the slave with the best | ||
| 846 | # replication offset (more data from the master processed). | ||
| 847 | # Slaves will try to get their rank by offset, and apply to the start | ||
| 848 | # of the failover a delay proportional to their rank. | ||
| 849 | # | ||
| 850 | # 2) Every single slave computes the time of the last interaction with | ||
| 851 | # its master. This can be the last ping or command received (if the master | ||
| 852 | # is still in the "connected" state), or the time that elapsed since the | ||
| 853 | # disconnection with the master (if the replication link is currently down). | ||
| 854 | # If the last interaction is too old, the slave will not try to failover | ||
| 855 | # at all. | ||
| 856 | # | ||
| 857 | # The point "2" can be tuned by user. Specifically a slave will not perform | ||
| 858 | # the failover if, since the last interaction with the master, the time | ||
| 859 | # elapsed is greater than: | ||
| 860 | # | ||
| 861 | # (node-timeout * slave-validity-factor) + repl-ping-slave-period | ||
| 862 | # | ||
| 863 | # So for example if node-timeout is 30 seconds, and the slave-validity-factor | ||
| 864 | # is 10, and assuming a default repl-ping-slave-period of 10 seconds, the | ||
| 865 | # slave will not try to failover if it was not able to talk with the master | ||
| 866 | # for longer than 310 seconds. | ||
| 867 | # | ||
| 868 | # A large slave-validity-factor may allow slaves with too old data to failover | ||
| 869 | # a master, while a too small value may prevent the cluster from being able to | ||
| 870 | # elect a slave at all. | ||
| 871 | # | ||
| 872 | # For maximum availability, it is possible to set the slave-validity-factor | ||
| 873 | # to a value of 0, which means, that slaves will always try to failover the | ||
| 874 | # master regardless of the last time they interacted with the master. | ||
| 875 | # (However they'll always try to apply a delay proportional to their | ||
| 876 | # offset rank). | ||
| 877 | # | ||
| 878 | # Zero is the only value able to guarantee that when all the partitions heal | ||
| 879 | # the cluster will always be able to continue. | ||
| 880 | # | ||
| 881 | # cluster-slave-validity-factor 10 | ||
| 882 | |||
| 883 | # Cluster slaves are able to migrate to orphaned masters, that are masters | ||
| 884 | # that are left without working slaves. This improves the cluster ability | ||
| 885 | # to resist to failures as otherwise an orphaned master can't be failed over | ||
| 886 | # in case of failure if it has no working slaves. | ||
| 887 | # | ||
| 888 | # Slaves migrate to orphaned masters only if there are still at least a | ||
| 889 | # given number of other working slaves for their old master. This number | ||
| 890 | # is the "migration barrier". A migration barrier of 1 means that a slave | ||
| 891 | # will migrate only if there is at least 1 other working slave for its master | ||
| 892 | # and so forth. It usually reflects the number of slaves you want for every | ||
| 893 | # master in your cluster. | ||
| 894 | # | ||
| 895 | # Default is 1 (slaves migrate only if their masters remain with at least | ||
| 896 | # one slave). To disable migration just set it to a very large value. | ||
| 897 | # A value of 0 can be set but is useful only for debugging and dangerous | ||
| 898 | # in production. | ||
| 899 | # | ||
| 900 | # cluster-migration-barrier 1 | ||
| 901 | |||
| 902 | # By default Redis Cluster nodes stop accepting queries if they detect there | ||
| 903 | # is at least an hash slot uncovered (no available node is serving it). | ||
| 904 | # This way if the cluster is partially down (for example a range of hash slots | ||
| 905 | # are no longer covered) all the cluster becomes, eventually, unavailable. | ||
| 906 | # It automatically returns available as soon as all the slots are covered again. | ||
| 907 | # | ||
| 908 | # However sometimes you want the subset of the cluster which is working, | ||
| 909 | # to continue to accept queries for the part of the key space that is still | ||
| 910 | # covered. In order to do so, just set the cluster-require-full-coverage | ||
| 911 | # option to no. | ||
| 912 | # | ||
| 913 | # cluster-require-full-coverage yes | ||
| 914 | |||
| 915 | # In order to setup your cluster make sure to read the documentation | ||
| 916 | # available at http://redis.io web site. | ||
| 917 | |||
| 918 | ########################## CLUSTER DOCKER/NAT support ######################## | ||
| 919 | |||
| 920 | # In certain deployments, Redis Cluster nodes address discovery fails, because | ||
| 921 | # addresses are NAT-ted or because ports are forwarded (the typical case is | ||
| 922 | # Docker and other containers). | ||
| 923 | # | ||
| 924 | # In order to make Redis Cluster working in such environments, a static | ||
| 925 | # configuration where each node knows its public address is needed. The | ||
| 926 | # following two options are used for this scope, and are: | ||
| 927 | # | ||
| 928 | # * cluster-announce-ip | ||
| 929 | # * cluster-announce-port | ||
| 930 | # * cluster-announce-bus-port | ||
| 931 | # | ||
| 932 | # Each instruct the node about its address, client port, and cluster message | ||
| 933 | # bus port. The information is then published in the header of the bus packets | ||
| 934 | # so that other nodes will be able to correctly map the address of the node | ||
| 935 | # publishing the information. | ||
| 936 | # | ||
| 937 | # If the above options are not used, the normal Redis Cluster auto-detection | ||
| 938 | # will be used instead. | ||
| 939 | # | ||
| 940 | # Note that when remapped, the bus port may not be at the fixed offset of | ||
| 941 | # clients port + 10000, so you can specify any port and bus-port depending | ||
| 942 | # on how they get remapped. If the bus-port is not set, a fixed offset of | ||
| 943 | # 10000 will be used as usually. | ||
| 944 | # | ||
| 945 | # Example: | ||
| 946 | # | ||
| 947 | # cluster-announce-ip 10.1.1.5 | ||
| 948 | # cluster-announce-port 6379 | ||
| 949 | # cluster-announce-bus-port 6380 | ||
| 950 | |||
| 951 | ################################## SLOW LOG ################################### | ||
| 952 | |||
| 953 | # The Redis Slow Log is a system to log queries that exceeded a specified | ||
| 954 | # execution time. The execution time does not include the I/O operations | ||
| 955 | # like talking with the client, sending the reply and so forth, | ||
| 956 | # but just the time needed to actually execute the command (this is the only | ||
| 957 | # stage of command execution where the thread is blocked and can not serve | ||
| 958 | # other requests in the meantime). | ||
| 959 | # | ||
| 960 | # You can configure the slow log with two parameters: one tells Redis | ||
| 961 | # what is the execution time, in microseconds, to exceed in order for the | ||
| 962 | # command to get logged, and the other parameter is the length of the | ||
| 963 | # slow log. When a new command is logged the oldest one is removed from the | ||
| 964 | # queue of logged commands. | ||
| 965 | |||
| 966 | # The following time is expressed in microseconds, so 1000000 is equivalent | ||
| 967 | # to one second. Note that a negative number disables the slow log, while | ||
| 968 | # a value of zero forces the logging of every command. | ||
| 969 | slowlog-log-slower-than 10000 | ||
| 970 | |||
| 971 | # There is no limit to this length. Just be aware that it will consume memory. | ||
| 972 | # You can reclaim memory used by the slow log with SLOWLOG RESET. | ||
| 973 | slowlog-max-len 128 | ||
| 974 | |||
| 975 | ################################ LATENCY MONITOR ############################## | ||
| 976 | |||
| 977 | # The Redis latency monitoring subsystem samples different operations | ||
| 978 | # at runtime in order to collect data related to possible sources of | ||
| 979 | # latency of a Redis instance. | ||
| 980 | # | ||
| 981 | # Via the LATENCY command this information is available to the user that can | ||
| 982 | # print graphs and obtain reports. | ||
| 983 | # | ||
| 984 | # The system only logs operations that were performed in a time equal or | ||
| 985 | # greater than the amount of milliseconds specified via the | ||
| 986 | # latency-monitor-threshold configuration directive. When its value is set | ||
| 987 | # to zero, the latency monitor is turned off. | ||
| 988 | # | ||
| 989 | # By default latency monitoring is disabled since it is mostly not needed | ||
| 990 | # if you don't have latency issues, and collecting data has a performance | ||
| 991 | # impact, that while very small, can be measured under big load. Latency | ||
| 992 | # monitoring can easily be enabled at runtime using the command | ||
| 993 | # "CONFIG SET latency-monitor-threshold <milliseconds>" if needed. | ||
| 994 | latency-monitor-threshold 0 | ||
| 995 | |||
| 996 | ############################# EVENT NOTIFICATION ############################## | ||
| 997 | |||
| 998 | # Redis can notify Pub/Sub clients about events happening in the key space. | ||
| 999 | # This feature is documented at http://redis.io/topics/notifications | ||
| 1000 | # | ||
| 1001 | # For instance if keyspace events notification is enabled, and a client | ||
| 1002 | # performs a DEL operation on key "foo" stored in the Database 0, two | ||
| 1003 | # messages will be published via Pub/Sub: | ||
| 1004 | # | ||
| 1005 | # PUBLISH __keyspace@0__:foo del | ||
| 1006 | # PUBLISH __keyevent@0__:del foo | ||
| 1007 | # | ||
| 1008 | # It is possible to select the events that Redis will notify among a set | ||
| 1009 | # of classes. Every class is identified by a single character: | ||
| 1010 | # | ||
| 1011 | # K Keyspace events, published with __keyspace@<db>__ prefix. | ||
| 1012 | # E Keyevent events, published with __keyevent@<db>__ prefix. | ||
| 1013 | # g Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ... | ||
| 1014 | # $ String commands | ||
| 1015 | # l List commands | ||
| 1016 | # s Set commands | ||
| 1017 | # h Hash commands | ||
| 1018 | # z Sorted set commands | ||
| 1019 | # x Expired events (events generated every time a key expires) | ||
| 1020 | # e Evicted events (events generated when a key is evicted for maxmemory) | ||
| 1021 | # A Alias for g$lshzxe, so that the "AKE" string means all the events. | ||
| 1022 | # | ||
| 1023 | # The "notify-keyspace-events" takes as argument a string that is composed | ||
| 1024 | # of zero or multiple characters. The empty string means that notifications | ||
| 1025 | # are disabled. | ||
| 1026 | # | ||
| 1027 | # Example: to enable list and generic events, from the point of view of the | ||
| 1028 | # event name, use: | ||
| 1029 | # | ||
| 1030 | # notify-keyspace-events Elg | ||
| 1031 | # | ||
| 1032 | # Example 2: to get the stream of the expired keys subscribing to channel | ||
| 1033 | # name __keyevent@0__:expired use: | ||
| 1034 | # | ||
| 1035 | # notify-keyspace-events Ex | ||
| 1036 | # | ||
| 1037 | # By default all notifications are disabled because most users don't need | ||
| 1038 | # this feature and the feature has some overhead. Note that if you don't | ||
| 1039 | # specify at least one of K or E, no events will be delivered. | ||
| 1040 | notify-keyspace-events "" | ||
| 1041 | |||
| 1042 | ############################### ADVANCED CONFIG ############################### | ||
| 1043 | |||
| 1044 | # Hashes are encoded using a memory efficient data structure when they have a | ||
| 1045 | # small number of entries, and the biggest entry does not exceed a given | ||
| 1046 | # threshold. These thresholds can be configured using the following directives. | ||
| 1047 | hash-max-ziplist-entries 512 | ||
| 1048 | hash-max-ziplist-value 64 | ||
| 1049 | |||
| 1050 | # Lists are also encoded in a special way to save a lot of space. | ||
| 1051 | # The number of entries allowed per internal list node can be specified | ||
| 1052 | # as a fixed maximum size or a maximum number of elements. | ||
| 1053 | # For a fixed maximum size, use -5 through -1, meaning: | ||
| 1054 | # -5: max size: 64 Kb <-- not recommended for normal workloads | ||
| 1055 | # -4: max size: 32 Kb <-- not recommended | ||
| 1056 | # -3: max size: 16 Kb <-- probably not recommended | ||
| 1057 | # -2: max size: 8 Kb <-- good | ||
| 1058 | # -1: max size: 4 Kb <-- good | ||
| 1059 | # Positive numbers mean store up to _exactly_ that number of elements | ||
| 1060 | # per list node. | ||
| 1061 | # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), | ||
| 1062 | # but if your use case is unique, adjust the settings as necessary. | ||
| 1063 | list-max-ziplist-size -2 | ||
| 1064 | |||
| 1065 | # Lists may also be compressed. | ||
| 1066 | # Compress depth is the number of quicklist ziplist nodes from *each* side of | ||
| 1067 | # the list to *exclude* from compression. The head and tail of the list | ||
| 1068 | # are always uncompressed for fast push/pop operations. Settings are: | ||
| 1069 | # 0: disable all list compression | ||
| 1070 | # 1: depth 1 means "don't start compressing until after 1 node into the list, | ||
| 1071 | # going from either the head or tail" | ||
| 1072 | # So: [head]->node->node->...->node->[tail] | ||
| 1073 | # [head], [tail] will always be uncompressed; inner nodes will compress. | ||
| 1074 | # 2: [head]->[next]->node->node->...->node->[prev]->[tail] | ||
| 1075 | # 2 here means: don't compress head or head->next or tail->prev or tail, | ||
| 1076 | # but compress all nodes between them. | ||
| 1077 | # 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail] | ||
| 1078 | # etc. | ||
| 1079 | list-compress-depth 0 | ||
| 1080 | |||
| 1081 | # Sets have a special encoding in just one case: when a set is composed | ||
| 1082 | # of just strings that happen to be integers in radix 10 in the range | ||
| 1083 | # of 64 bit signed integers. | ||
| 1084 | # The following configuration setting sets the limit in the size of the | ||
| 1085 | # set in order to use this special memory saving encoding. | ||
| 1086 | set-max-intset-entries 512 | ||
| 1087 | |||
| 1088 | # Similarly to hashes and lists, sorted sets are also specially encoded in | ||
| 1089 | # order to save a lot of space. This encoding is only used when the length and | ||
| 1090 | # elements of a sorted set are below the following limits: | ||
| 1091 | zset-max-ziplist-entries 128 | ||
| 1092 | zset-max-ziplist-value 64 | ||
| 1093 | |||
| 1094 | # HyperLogLog sparse representation bytes limit. The limit includes the | ||
| 1095 | # 16 bytes header. When an HyperLogLog using the sparse representation crosses | ||
| 1096 | # this limit, it is converted into the dense representation. | ||
| 1097 | # | ||
| 1098 | # A value greater than 16000 is totally useless, since at that point the | ||
| 1099 | # dense representation is more memory efficient. | ||
| 1100 | # | ||
| 1101 | # The suggested value is ~ 3000 in order to have the benefits of | ||
| 1102 | # the space efficient encoding without slowing down too much PFADD, | ||
| 1103 | # which is O(N) with the sparse encoding. The value can be raised to | ||
| 1104 | # ~ 10000 when CPU is not a concern, but space is, and the data set is | ||
| 1105 | # composed of many HyperLogLogs with cardinality in the 0 - 15000 range. | ||
| 1106 | hll-sparse-max-bytes 3000 | ||
| 1107 | |||
| 1108 | # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in | ||
| 1109 | # order to help rehashing the main Redis hash table (the one mapping top-level | ||
| 1110 | # keys to values). The hash table implementation Redis uses (see dict.c) | ||
| 1111 | # performs a lazy rehashing: the more operation you run into a hash table | ||
| 1112 | # that is rehashing, the more rehashing "steps" are performed, so if the | ||
| 1113 | # server is idle the rehashing is never complete and some more memory is used | ||
| 1114 | # by the hash table. | ||
| 1115 | # | ||
| 1116 | # The default is to use this millisecond 10 times every second in order to | ||
| 1117 | # actively rehash the main dictionaries, freeing memory when possible. | ||
| 1118 | # | ||
| 1119 | # If unsure: | ||
| 1120 | # use "activerehashing no" if you have hard latency requirements and it is | ||
| 1121 | # not a good thing in your environment that Redis can reply from time to time | ||
| 1122 | # to queries with 2 milliseconds delay. | ||
| 1123 | # | ||
| 1124 | # use "activerehashing yes" if you don't have such hard requirements but | ||
| 1125 | # want to free memory asap when possible. | ||
| 1126 | activerehashing yes | ||
| 1127 | |||
| 1128 | # The client output buffer limits can be used to force disconnection of clients | ||
| 1129 | # that are not reading data from the server fast enough for some reason (a | ||
| 1130 | # common reason is that a Pub/Sub client can't consume messages as fast as the | ||
| 1131 | # publisher can produce them). | ||
| 1132 | # | ||
| 1133 | # The limit can be set differently for the three different classes of clients: | ||
| 1134 | # | ||
| 1135 | # normal -> normal clients including MONITOR clients | ||
| 1136 | # slave -> slave clients | ||
| 1137 | # pubsub -> clients subscribed to at least one pubsub channel or pattern | ||
| 1138 | # | ||
| 1139 | # The syntax of every client-output-buffer-limit directive is the following: | ||
| 1140 | # | ||
| 1141 | # client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds> | ||
| 1142 | # | ||
| 1143 | # A client is immediately disconnected once the hard limit is reached, or if | ||
| 1144 | # the soft limit is reached and remains reached for the specified number of | ||
| 1145 | # seconds (continuously). | ||
| 1146 | # So for instance if the hard limit is 32 megabytes and the soft limit is | ||
| 1147 | # 16 megabytes / 10 seconds, the client will get disconnected immediately | ||
| 1148 | # if the size of the output buffers reach 32 megabytes, but will also get | ||
| 1149 | # disconnected if the client reaches 16 megabytes and continuously overcomes | ||
| 1150 | # the limit for 10 seconds. | ||
| 1151 | # | ||
| 1152 | # By default normal clients are not limited because they don't receive data | ||
| 1153 | # without asking (in a push way), but just after a request, so only | ||
| 1154 | # asynchronous clients may create a scenario where data is requested faster | ||
| 1155 | # than it can read. | ||
| 1156 | # | ||
| 1157 | # Instead there is a default limit for pubsub and slave clients, since | ||
| 1158 | # subscribers and slaves receive data in a push fashion. | ||
| 1159 | # | ||
| 1160 | # Both the hard or the soft limit can be disabled by setting them to zero. | ||
| 1161 | client-output-buffer-limit normal 0 0 0 | ||
| 1162 | client-output-buffer-limit slave 256mb 64mb 60 | ||
| 1163 | client-output-buffer-limit pubsub 32mb 8mb 60 | ||
| 1164 | |||
| 1165 | # Client query buffers accumulate new commands. They are limited to a fixed | ||
| 1166 | # amount by default in order to avoid that a protocol desynchronization (for | ||
| 1167 | # instance due to a bug in the client) will lead to unbound memory usage in | ||
| 1168 | # the query buffer. However you can configure it here if you have very special | ||
| 1169 | # needs, such us huge multi/exec requests or alike. | ||
| 1170 | # | ||
| 1171 | # client-query-buffer-limit 1gb | ||
| 1172 | |||
| 1173 | # In the Redis protocol, bulk requests, that are, elements representing single | ||
| 1174 | # strings, are normally limited ot 512 mb. However you can change this limit | ||
| 1175 | # here. | ||
| 1176 | # | ||
| 1177 | # proto-max-bulk-len 512mb | ||
| 1178 | |||
| 1179 | # Redis calls an internal function to perform many background tasks, like | ||
| 1180 | # closing connections of clients in timeout, purging expired keys that are | ||
| 1181 | # never requested, and so forth. | ||
| 1182 | # | ||
| 1183 | # Not all tasks are performed with the same frequency, but Redis checks for | ||
| 1184 | # tasks to perform according to the specified "hz" value. | ||
| 1185 | # | ||
| 1186 | # By default "hz" is set to 10. Raising the value will use more CPU when | ||
| 1187 | # Redis is idle, but at the same time will make Redis more responsive when | ||
| 1188 | # there are many keys expiring at the same time, and timeouts may be | ||
| 1189 | # handled with more precision. | ||
| 1190 | # | ||
| 1191 | # The range is between 1 and 500, however a value over 100 is usually not | ||
| 1192 | # a good idea. Most users should use the default of 10 and raise this up to | ||
| 1193 | # 100 only in environments where very low latency is required. | ||
| 1194 | hz 10 | ||
| 1195 | |||
| 1196 | # When a child rewrites the AOF file, if the following option is enabled | ||
| 1197 | # the file will be fsync-ed every 32 MB of data generated. This is useful | ||
| 1198 | # in order to commit the file to the disk more incrementally and avoid | ||
| 1199 | # big latency spikes. | ||
| 1200 | aof-rewrite-incremental-fsync yes | ||
| 1201 | |||
| 1202 | # Redis LFU eviction (see maxmemory setting) can be tuned. However it is a good | ||
| 1203 | # idea to start with the default settings and only change them after investigating | ||
| 1204 | # how to improve the performances and how the keys LFU change over time, which | ||
| 1205 | # is possible to inspect via the OBJECT FREQ command. | ||
| 1206 | # | ||
| 1207 | # There are two tunable parameters in the Redis LFU implementation: the | ||
| 1208 | # counter logarithm factor and the counter decay time. It is important to | ||
| 1209 | # understand what the two parameters mean before changing them. | ||
| 1210 | # | ||
| 1211 | # The LFU counter is just 8 bits per key, it's maximum value is 255, so Redis | ||
| 1212 | # uses a probabilistic increment with logarithmic behavior. Given the value | ||
| 1213 | # of the old counter, when a key is accessed, the counter is incremented in | ||
| 1214 | # this way: | ||
| 1215 | # | ||
| 1216 | # 1. A random number R between 0 and 1 is extracted. | ||
| 1217 | # 2. A probability P is calculated as 1/(old_value*lfu_log_factor+1). | ||
| 1218 | # 3. The counter is incremented only if R < P. | ||
| 1219 | # | ||
| 1220 | # The default lfu-log-factor is 10. This is a table of how the frequency | ||
| 1221 | # counter changes with a different number of accesses with different | ||
| 1222 | # logarithmic factors: | ||
| 1223 | # | ||
| 1224 | # +--------+------------+------------+------------+------------+------------+ | ||
| 1225 | # | factor | 100 hits | 1000 hits | 100K hits | 1M hits | 10M hits | | ||
| 1226 | # +--------+------------+------------+------------+------------+------------+ | ||
| 1227 | # | 0 | 104 | 255 | 255 | 255 | 255 | | ||
| 1228 | # +--------+------------+------------+------------+------------+------------+ | ||
| 1229 | # | 1 | 18 | 49 | 255 | 255 | 255 | | ||
| 1230 | # +--------+------------+------------+------------+------------+------------+ | ||
| 1231 | # | 10 | 10 | 18 | 142 | 255 | 255 | | ||
| 1232 | # +--------+------------+------------+------------+------------+------------+ | ||
| 1233 | # | 100 | 8 | 11 | 49 | 143 | 255 | | ||
| 1234 | # +--------+------------+------------+------------+------------+------------+ | ||
| 1235 | # | ||
| 1236 | # NOTE: The above table was obtained by running the following commands: | ||
| 1237 | # | ||
| 1238 | # redis-benchmark -n 1000000 incr foo | ||
| 1239 | # redis-cli object freq foo | ||
| 1240 | # | ||
| 1241 | # NOTE 2: The counter initial value is 5 in order to give new objects a chance | ||
| 1242 | # to accumulate hits. | ||
| 1243 | # | ||
| 1244 | # The counter decay time is the time, in minutes, that must elapse in order | ||
| 1245 | # for the key counter to be divided by two (or decremented if it has a value | ||
| 1246 | # less <= 10). | ||
| 1247 | # | ||
| 1248 | # The default value for the lfu-decay-time is 1. A Special value of 0 means to | ||
| 1249 | # decay the counter every time it happens to be scanned. | ||
| 1250 | # | ||
| 1251 | # lfu-log-factor 10 | ||
| 1252 | # lfu-decay-time 1 | ||
| 1253 | |||
| 1254 | ########################### ACTIVE DEFRAGMENTATION ####################### | ||
| 1255 | # | ||
| 1256 | # WARNING THIS FEATURE IS EXPERIMENTAL. However it was stress tested | ||
| 1257 | # even in production and manually tested by multiple engineers for some | ||
| 1258 | # time. | ||
| 1259 | # | ||
| 1260 | # What is active defragmentation? | ||
| 1261 | # ------------------------------- | ||
| 1262 | # | ||
| 1263 | # Active (online) defragmentation allows a Redis server to compact the | ||
| 1264 | # spaces left between small allocations and deallocations of data in memory, | ||
| 1265 | # thus allowing to reclaim back memory. | ||
| 1266 | # | ||
| 1267 | # Fragmentation is a natural process that happens with every allocator (but | ||
| 1268 | # less so with Jemalloc, fortunately) and certain workloads. Normally a server | ||
| 1269 | # restart is needed in order to lower the fragmentation, or at least to flush | ||
| 1270 | # away all the data and create it again. However thanks to this feature | ||
| 1271 | # implemented by Oran Agra for Redis 4.0 this process can happen at runtime | ||
| 1272 | # in an "hot" way, while the server is running. | ||
| 1273 | # | ||
| 1274 | # Basically when the fragmentation is over a certain level (see the | ||
| 1275 | # configuration options below) Redis will start to create new copies of the | ||
| 1276 | # values in contiguous memory regions by exploiting certain specific Jemalloc | ||
| 1277 | # features (in order to understand if an allocation is causing fragmentation | ||
| 1278 | # and to allocate it in a better place), and at the same time, will release the | ||
| 1279 | # old copies of the data. This process, repeated incrementally for all the keys | ||
| 1280 | # will cause the fragmentation to drop back to normal values. | ||
| 1281 | # | ||
| 1282 | # Important things to understand: | ||
| 1283 | # | ||
| 1284 | # 1. This feature is disabled by default, and only works if you compiled Redis | ||
| 1285 | # to use the copy of Jemalloc we ship with the source code of Redis. | ||
| 1286 | # This is the default with Linux builds. | ||
| 1287 | # | ||
| 1288 | # 2. You never need to enable this feature if you don't have fragmentation | ||
| 1289 | # issues. | ||
| 1290 | # | ||
| 1291 | # 3. Once you experience fragmentation, you can enable this feature when | ||
| 1292 | # needed with the command "CONFIG SET activedefrag yes". | ||
| 1293 | # | ||
| 1294 | # The configuration parameters are able to fine tune the behavior of the | ||
| 1295 | # defragmentation process. If you are not sure about what they mean it is | ||
| 1296 | # a good idea to leave the defaults untouched. | ||
| 1297 | |||
| 1298 | # Enabled active defragmentation | ||
| 1299 | # activedefrag yes | ||
| 1300 | |||
| 1301 | # Minimum amount of fragmentation waste to start active defrag | ||
| 1302 | # active-defrag-ignore-bytes 100mb | ||
| 1303 | |||
| 1304 | # Minimum percentage of fragmentation to start active defrag | ||
| 1305 | # active-defrag-threshold-lower 10 | ||
| 1306 | |||
| 1307 | # Maximum percentage of fragmentation at which we use maximum effort | ||
| 1308 | # active-defrag-threshold-upper 100 | ||
| 1309 | |||
| 1310 | # Minimal effort for defrag in CPU percentage | ||
| 1311 | # active-defrag-cycle-min 25 | ||
| 1312 | |||
| 1313 | # Maximal effort for defrag in CPU percentage | ||
| 1314 | # active-defrag-cycle-max 75 | ||
diff --git a/meta-oe/recipes-extended/redis/redis/redis.service b/meta-oe/recipes-extended/redis/redis/redis.service deleted file mode 100644 index f98f2d19e8..0000000000 --- a/meta-oe/recipes-extended/redis/redis/redis.service +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=Redis In-Memory Data Store | ||
| 3 | After=network.target | ||
| 4 | |||
| 5 | [Service] | ||
| 6 | User=redis | ||
| 7 | Group=redis | ||
| 8 | ExecStart=/usr/bin/redis-server /etc/redis/redis.conf | ||
| 9 | ExecStop=/usr/bin/redis-cli shutdown | ||
| 10 | Restart=always | ||
| 11 | LimitNOFILE=10032 | ||
| 12 | StateDirectory=redis | ||
| 13 | |||
| 14 | [Install] | ||
| 15 | WantedBy=multi-user.target | ||
| 16 | |||
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.21.bb b/meta-oe/recipes-extended/redis/redis_6.2.21.bb deleted file mode 100644 index 474aea7dc3..0000000000 --- a/meta-oe/recipes-extended/redis/redis_6.2.21.bb +++ /dev/null | |||
| @@ -1,77 +0,0 @@ | |||
| 1 | SUMMARY = "Redis key-value store" | ||
| 2 | DESCRIPTION = "Redis is an open source, advanced key-value store." | ||
| 3 | HOMEPAGE = "http://redis.io" | ||
| 4 | SECTION = "libs" | ||
| 5 | LICENSE = "BSD-3-Clause" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" | ||
| 7 | DEPENDS = "readline lua ncurses" | ||
| 8 | |||
| 9 | SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ | ||
| 10 | file://redis.conf \ | ||
| 11 | file://init-redis-server \ | ||
| 12 | file://redis.service \ | ||
| 13 | file://0001-hiredis-use-default-CC-if-it-is-set.patch \ | ||
| 14 | file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \ | ||
| 15 | file://0003-hack-to-force-use-of-libc-malloc.patch \ | ||
| 16 | file://0004-src-Do-not-reset-FINAL_LIBS.patch \ | ||
| 17 | file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \ | ||
| 18 | file://0006-Define-correct-gregs-for-RISCV32.patch \ | ||
| 19 | " | ||
| 20 | |||
| 21 | SRC_URI[sha256sum] = "6383b32ba8d246f41bbbb83663381f5a5f4c4713235433cec22fc4a47e9b6d5f" | ||
| 22 | |||
| 23 | CVE_STATUS[CVE-2025-21605] = "cpe-incorrect: the used version already contains the fix" | ||
| 24 | # The vulnerability originates from Debian's packaging methodology, | ||
| 25 | # which loads system-wide Lua libraries (lua-cjson, lua-cmsgpack), | ||
| 26 | # enabling Lua sandbox escape. Upstream Redis builds, including | ||
| 27 | # those built by Yocto/OpenEmbedded, utilize embedded Lua from the | ||
| 28 | # deps/ directory and are therefore not affected by this issue. | ||
| 29 | CVE_STATUS[CVE-2022-0543] = "not-applicable-config: Debian-specific packaging issue caused by loading system-wide Lua libraries; upstream builds use embedded Lua and are not affected" | ||
| 30 | CVE_STATUS[CVE-2022-3734] = "not-applicable-config: only affects Windows" | ||
| 31 | CVE_STATUS[CVE-2025-46686] = "disputed: upstream rejected because mitigating it would affect other functionality" | ||
| 32 | |||
| 33 | inherit update-rc.d systemd useradd | ||
| 34 | |||
| 35 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | ||
| 36 | FINAL_LIBS:riscv32 = "-latomic" | ||
| 37 | FINAL_LIBS:mips = "-latomic" | ||
| 38 | FINAL_LIBS:arm = "-latomic" | ||
| 39 | FINAL_LIBS:powerpc = "-latomic" | ||
| 40 | |||
| 41 | export FINAL_LIBS | ||
| 42 | |||
| 43 | USERADD_PACKAGES = "${PN}" | ||
| 44 | USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" | ||
| 45 | GROUPADD_PARAM:${PN} = "--system redis" | ||
| 46 | |||
| 47 | REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" | ||
| 48 | |||
| 49 | do_compile:prepend() { | ||
| 50 | oe_runmake -C deps hiredis lua linenoise | ||
| 51 | } | ||
| 52 | |||
| 53 | do_install() { | ||
| 54 | export PREFIX=${D}/${prefix} | ||
| 55 | oe_runmake install | ||
| 56 | install -d ${D}/${sysconfdir}/redis | ||
| 57 | install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf | ||
| 58 | install -d ${D}/${sysconfdir}/init.d | ||
| 59 | install -m 0755 ${UNPACKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server | ||
| 60 | install -d ${D}/var/lib/redis/ | ||
| 61 | chown redis.redis ${D}/var/lib/redis/ | ||
| 62 | |||
| 63 | install -d ${D}${systemd_system_unitdir} | ||
| 64 | install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir} | ||
| 65 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service | ||
| 66 | |||
| 67 | if [ "${REDIS_ON_SYSTEMD}" = true ]; then | ||
| 68 | sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf | ||
| 69 | fi | ||
| 70 | } | ||
| 71 | |||
| 72 | CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" | ||
| 73 | |||
| 74 | INITSCRIPT_NAME = "redis-server" | ||
| 75 | INITSCRIPT_PARAMS = "defaults 87" | ||
| 76 | |||
| 77 | SYSTEMD_SERVICE:${PN} = "redis.service" | ||
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.12.bb b/meta-oe/recipes-extended/redis/redis_8.0.6.bb index 8abf758930..f6866747eb 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.12.bb +++ b/meta-oe/recipes-extended/redis/redis_8.0.6.bb | |||
| @@ -2,8 +2,8 @@ SUMMARY = "Redis key-value store" | |||
| 2 | DESCRIPTION = "Redis is an open source, advanced key-value store." | 2 | DESCRIPTION = "Redis is an open source, advanced key-value store." |
| 3 | HOMEPAGE = "http://redis.io" | 3 | HOMEPAGE = "http://redis.io" |
| 4 | SECTION = "libs" | 4 | SECTION = "libs" |
| 5 | LICENSE = "BSD-3-Clause" | 5 | LICENSE = "RSAL-2 | AGPL-3.0-only | SSPL-1" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" | 6 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9f1da87999fb281d8a9e3e3b2d0403b4" |
| 7 | DEPENDS = "readline lua ncurses" | 7 | DEPENDS = "readline lua ncurses" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ | 9 | SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ |
| @@ -15,18 +15,12 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ | |||
| 15 | file://0003-hack-to-force-use-of-libc-malloc.patch \ | 15 | file://0003-hack-to-force-use-of-libc-malloc.patch \ |
| 16 | file://0004-src-Do-not-reset-FINAL_LIBS.patch \ | 16 | file://0004-src-Do-not-reset-FINAL_LIBS.patch \ |
| 17 | file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \ | 17 | file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \ |
| 18 | file://0006-Define-correct-gregs-for-RISCV32.patch \ | ||
| 19 | " | 18 | " |
| 20 | SRC_URI[sha256sum] = "97c60478a7c777ac914ca9d87a7e88ba265926456107e758c62d8f971d0196bc" | 19 | SRC_URI[sha256sum] = "6d0a9913887a4972536f9da226f1575859c34d86354129163260a5f9c6bd4229" |
| 21 | 20 | ||
| 22 | RPROVIDES:${PN} = "virtual-redis" | 21 | RPROVIDES:${PN} = "virtual-redis" |
| 23 | 22 | ||
| 24 | CVE_STATUS[CVE-2025-21605] = "cpe-incorrect: the used version already contains the fix" | ||
| 25 | CVE_STATUS[CVE-2025-27151] = "cpe-incorrect: the used version already contains the fix" | ||
| 26 | CVE_STATUS[CVE-2025-46686] = "disputed: upstream rejected because mitigating it would affect other functionality" | 23 | CVE_STATUS[CVE-2025-46686] = "disputed: upstream rejected because mitigating it would affect other functionality" |
| 27 | CVE_STATUS[CVE-2025-46817] = "cpe-incorrect: the used version already contains the fix" | ||
| 28 | CVE_STATUS[CVE-2025-46818] = "cpe-incorrect: the used version already contains the fix" | ||
| 29 | CVE_STATUS[CVE-2025-46819] = "cpe-incorrect: the used version already contains the fix" | ||
| 30 | 24 | ||
| 31 | inherit pkgconfig update-rc.d systemd useradd | 25 | inherit pkgconfig update-rc.d systemd useradd |
| 32 | 26 | ||
| @@ -47,6 +41,8 @@ PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd" | |||
| 47 | 41 | ||
| 48 | EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" | 42 | EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" |
| 49 | 43 | ||
| 44 | TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}" | ||
| 45 | |||
| 50 | do_compile:prepend() { | 46 | do_compile:prepend() { |
| 51 | oe_runmake -C deps hdr_histogram fpconv hiredis lua linenoise | 47 | oe_runmake -C deps hdr_histogram fpconv hiredis lua linenoise |
| 52 | } | 48 | } |
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb index 69c281bd92..752ecc6c48 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb | |||
| @@ -25,7 +25,11 @@ AUTOTOOLS_AUXDIR = "${S}/conftools" | |||
| 25 | 25 | ||
| 26 | EXTRA_AUTORECONF = "-I m4 --exclude=autopoint" | 26 | EXTRA_AUTORECONF = "-I m4 --exclude=autopoint" |
| 27 | 27 | ||
| 28 | PACKAGECONFIG ??= "perl graph ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 28 | PACKAGECONFIG ??= " \ |
| 29 | perl \ | ||
| 30 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'graph', '', d)} \ | ||
| 31 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ | ||
| 32 | " | ||
| 29 | 33 | ||
| 30 | PACKAGECONFIG[python] = "--enable-python=yes \ | 34 | PACKAGECONFIG[python] = "--enable-python=yes \ |
| 31 | am_cv_python_pythondir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages \ | 35 | am_cv_python_pythondir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages \ |
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.12.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.12.0.bb index 6bad112e5a..260e4171a7 100644 --- a/meta-oe/recipes-extended/rsyslog/librelp_1.12.0.bb +++ b/meta-oe/recipes-extended/rsyslog/librelp_1.12.0.bb | |||
| @@ -17,9 +17,12 @@ CVE_PRODUCT = "rsyslog:librelp" | |||
| 17 | inherit autotools pkgconfig ptest | 17 | inherit autotools pkgconfig ptest |
| 18 | 18 | ||
| 19 | PACKAGECONFIG ?= "tls-openssl valgrind" | 19 | PACKAGECONFIG ?= "tls-openssl valgrind" |
| 20 | # Valgrind is not available for RISCV yet | 20 | # Valgrind is not available for RISCV32 yet |
| 21 | PACKAGECONFIG:remove:riscv64 = "valgrind" | ||
| 22 | PACKAGECONFIG:remove:riscv32 = "valgrind" | 21 | PACKAGECONFIG:remove:riscv32 = "valgrind" |
| 22 | # armv4/armv5/armv6 is not in COMPATIBLE_HOST of valgrind | ||
| 23 | PACKAGECONFIG:remove:armv4 = "valgrind" | ||
| 24 | PACKAGECONFIG:remove:armv5 = "valgrind" | ||
| 25 | PACKAGECONFIG:remove:armv6 = "valgrind" | ||
| 23 | 26 | ||
| 24 | PACKAGECONFIG[tls] = "--enable-tls,--disable-tls,gnutls nettle" | 27 | PACKAGECONFIG[tls] = "--enable-tls,--disable-tls,gnutls nettle" |
| 25 | PACKAGECONFIG[tls-openssl] = "--enable-tls-openssl,--disable-tls-openssl,openssl" | 28 | PACKAGECONFIG[tls-openssl] = "--enable-tls-openssl,--disable-tls-openssl,openssl" |
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb index 63233fd278..c50a7a3f7a 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb | |||
| @@ -149,11 +149,11 @@ do_install:append() { | |||
| 149 | sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog | 149 | sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog |
| 150 | 150 | ||
| 151 | if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then | 151 | if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then |
| 152 | install -d 0755 ${D}${sysconfdir}/rsyslog.d | 152 | install -d -m 0755 ${D}${sysconfdir}/rsyslog.d |
| 153 | echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf | 153 | echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf |
| 154 | fi | 154 | fi |
| 155 | if ${@bb.utils.contains('PACKAGECONFIG', 'mmjsonparse', 'true', 'false', d)}; then | 155 | if ${@bb.utils.contains('PACKAGECONFIG', 'mmjsonparse', 'true', 'false', d)}; then |
| 156 | install -d 0755 ${D}${sysconfdir}/rsyslog.d | 156 | install -d -m 0755 ${D}${sysconfdir}/rsyslog.d |
| 157 | echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf | 157 | echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf |
| 158 | fi | 158 | fi |
| 159 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 159 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb index 733cddc88b..dc6e12fd80 100644 --- a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb +++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Small Footprint CIM Client Library" | |||
| 2 | DESCRIPTION = "Small Footprint CIM Client Library Runtime Libraries" | 2 | DESCRIPTION = "Small Footprint CIM Client Library Runtime Libraries" |
| 3 | HOMEPAGE = "http://www.sblim.org" | 3 | HOMEPAGE = "http://www.sblim.org" |
| 4 | 4 | ||
| 5 | SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \ | 5 | SRC_URI = "${SOURCEFORGE_MIRROR}/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \ |
| 6 | file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \ | 6 | file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \ |
| 7 | file://0001-Fix-implicit-function-declarations.patch \ | 7 | file://0001-Fix-implicit-function-declarations.patch \ |
| 8 | file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \ | 8 | file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \ |
diff --git a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch index a051f90c43..2961d23bd9 100644 --- a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch +++ b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch | |||
| @@ -1,16 +1,20 @@ | |||
| 1 | From a5835dfe126bfe6ed0b8197c6578960835bf1fe8 Mon Sep 17 00:00:00 2001 | 1 | From 01f08e93a4b5b94d271f5a57baed6473e0511c2c Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
| 3 | Date: Sun, 3 Oct 2021 22:08:50 +0200 | 3 | Date: Sun, 3 Oct 2021 22:08:50 +0200 |
| 4 | Subject: [PATCH] configure.ac: add py 3.10/11 support | 4 | Subject: [PATCH] configure.ac: add py 3.10/11 support |
| 5 | 5 | ||
| 6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
| 7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 8 | |||
| 9 | Update to include Python 3.14 support. | ||
| 10 | |||
| 11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 8 | --- | 12 | --- |
| 9 | configure.ac | 2 +- | 13 | configure.ac | 2 +- |
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | 15 | ||
| 12 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
| 13 | index 4802f35..e0e468f 100644 | 17 | index 4802f35..2eb47a6 100644 |
| 14 | --- a/configure.ac | 18 | --- a/configure.ac |
| 15 | +++ b/configure.ac | 19 | +++ b/configure.ac |
| 16 | @@ -93,7 +93,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) | 20 | @@ -93,7 +93,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) |
| @@ -18,7 +22,10 @@ index 4802f35..e0e468f 100644 | |||
| 18 | # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build | 22 | # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build |
| 19 | SR_PKG_CHECK([python3], [SRD_PKGLIBS], | 23 | SR_PKG_CHECK([python3], [SRD_PKGLIBS], |
| 20 | - [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) | 24 | - [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) |
| 21 | + [python-3.13-embed], [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) | 25 | + [python-3.14-embed], [python-3.13-embed], [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) |
| 22 | AS_IF([test "x$sr_have_python3" = xno], | 26 | AS_IF([test "x$sr_have_python3" = xno], |
| 23 | [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) | 27 | [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) |
| 24 | 28 | ||
| 29 | -- | ||
| 30 | 2.52.0 | ||
| 31 | |||
diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb deleted file mode 100644 index 530e38ce21..0000000000 --- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | LICENSE = "GPL-2.0-only" | ||
| 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" | ||
| 3 | SRCREV = "7626d0a0707391970080d493ce69638719938da7" | ||
| 4 | PV = "1.0+git" | ||
| 5 | |||
| 6 | SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" | ||
| 7 | |||
| 8 | # Upstream repo does not tag | ||
| 9 | UPSTREAM_CHECK_COMMITS = "1" | ||
| 10 | |||
| 11 | |||
| 12 | inherit module | ||
| 13 | |||
| 14 | EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" | ||
| 15 | |||
| 16 | do_install:append() { | ||
| 17 | install -Dm 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h | ||
| 18 | } | ||
| 19 | |||
| 20 | SKIP_RECIPE[can-isotp] ?= "Not needed with kernel 5.10+" | ||
diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-Add-cstdint-for-uintXX_t-types.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-Add-cstdint-for-uintXX_t-types.patch deleted file mode 100644 index e564958dad..0000000000 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-Add-cstdint-for-uintXX_t-types.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 3d076ea588eb3c7f334133b4c31172a14beadf5b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 2 Feb 2023 20:18:27 -0800 | ||
| 4 | Subject: [PATCH] Add <cstdint> for uintXX_t types | ||
| 5 | |||
| 6 | gcc 13 moved some includes around and as a result <cstdint> is no | ||
| 7 | longer transitively included [1]. Explicitly include it | ||
| 8 | for uintXX_t. | ||
| 9 | |||
| 10 | [1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/falcosecurity/libs/pull/862] | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | userspace/libsinsp/filter/parser.h | 1 + | ||
| 16 | userspace/libsinsp/filter_value.h | 1 + | ||
| 17 | 2 files changed, 2 insertions(+) | ||
| 18 | |||
| 19 | --- a/userspace/libsinsp/filter/parser.h | ||
| 20 | +++ b/userspace/libsinsp/filter/parser.h | ||
| 21 | @@ -18,6 +18,7 @@ limitations under the License. | ||
| 22 | #pragma once | ||
| 23 | |||
| 24 | #include "ast.h" | ||
| 25 | +#include <cstdint> | ||
| 26 | |||
| 27 | // | ||
| 28 | // Context-free Grammar for Sinsp Filters | ||
| 29 | --- a/userspace/libsinsp/filter_value.h | ||
| 30 | +++ b/userspace/libsinsp/filter_value.h | ||
| 31 | @@ -18,6 +18,7 @@ limitations under the License. | ||
| 32 | #pragma once | ||
| 33 | |||
| 34 | #include <string.h> | ||
| 35 | +#include <cstdint> | ||
| 36 | #include <utility> | ||
| 37 | |||
| 38 | // Used for CO_IN/CO_PMATCH filterchecks using PT_CHARBUFs to allow | ||
diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-Avoid-duplicate-operations-of-add_library.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-Avoid-duplicate-operations-of-add_library.patch new file mode 100644 index 0000000000..b8ca7dd38b --- /dev/null +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-Avoid-duplicate-operations-of-add_library.patch | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | From 74dec208d95821855130f6ed7b167327f1247e99 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 3 | Date: Thu, 5 Mar 2026 09:28:03 +0000 | ||
| 4 | Subject: [PATCH] Avoid duplicate operations of add_library. | ||
| 5 | |||
| 6 | To fix following configure error | ||
| 7 | | -- Existing strlcat found, will *not* use local definition | ||
| 8 | | CMake Error at falcosecurity-libs/userspace/libscap/CMakeLists.txt:64 (add_library): | ||
| 9 | | add_library cannot create target "scap_error" because another target with | ||
| 10 | | the same name already exists. The existing target is a static library | ||
| 11 | |||
| 12 | Upstream-Status: Inappropriate [oe-specific] | ||
| 13 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 14 | --- | ||
| 15 | cmake/modules/libscap.cmake | 2 +- | ||
| 16 | cmake/modules/libsinsp.cmake | 2 +- | ||
| 17 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/cmake/modules/libscap.cmake b/cmake/modules/libscap.cmake | ||
| 20 | index b41b12ff3..1753598e9 100644 | ||
| 21 | --- a/cmake/modules/libscap.cmake | ||
| 22 | +++ b/cmake/modules/libscap.cmake | ||
| 23 | @@ -14,7 +14,7 @@ | ||
| 24 | # | ||
| 25 | |||
| 26 | if(NOT HAVE_LIBSCAP) | ||
| 27 | - set(HAVE_LIBSCAP On) | ||
| 28 | + set(HAVE_LIBSCAP On CACHE INTERNAL "Flag to indicate libscap has been processed") | ||
| 29 | |||
| 30 | if(NOT LIBS_DIR) | ||
| 31 | get_filename_component(LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE) | ||
| 32 | diff --git a/cmake/modules/libsinsp.cmake b/cmake/modules/libsinsp.cmake | ||
| 33 | index ff336e27f..0fdd2d4a9 100644 | ||
| 34 | --- a/cmake/modules/libsinsp.cmake | ||
| 35 | +++ b/cmake/modules/libsinsp.cmake | ||
| 36 | @@ -14,7 +14,7 @@ | ||
| 37 | # | ||
| 38 | |||
| 39 | if(NOT HAVE_LIBSINSP) | ||
| 40 | - set(HAVE_LIBSINSP On) | ||
| 41 | + set(HAVE_LIBSINSP On CACHE INTERNAL "Flag to indicate libsinsp has been processed") | ||
| 42 | |||
| 43 | if(NOT LIBS_DIR) | ||
| 44 | get_filename_component(LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE) | ||
| 45 | -- | ||
| 46 | 2.43.0 | ||
| 47 | |||
diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch index 903ccdf36a..bcf5da4f2c 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | From ed8969a233adb6bf701de96d0fd0570e5ddcc787 Mon Sep 17 00:00:00 2001 | 1 | From 6ff4114dcbb87f34751064249967aa96c7b8b030 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Liu Yiding <liuyd.fnst@fujitsu.com> |
| 3 | Date: Mon, 21 Mar 2022 19:35:48 -0700 | 3 | Date: Wed, 4 Mar 2026 10:02:10 +0000 |
| 4 | Subject: [PATCH] cmake: Pass PROBE_NAME via CFLAGS | 4 | Subject: [PATCH] cmake: Pass PROBE_NAME via CFLAGS |
| 5 | 5 | ||
| 6 | This helps compliation of driver code where its calling modprobe on the | 6 | This helps compliation of driver code where its calling modprobe on the |
| @@ -8,22 +8,25 @@ given kernel module via system() API | |||
| 8 | 8 | ||
| 9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | |||
| 12 | Update for 0.39.0 | ||
| 13 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 11 | --- | 14 | --- |
| 12 | CMakeLists.txt | 1 + | 15 | CMakeLists.txt | 1 + |
| 13 | 1 file changed, 1 insertion(+) | 16 | 1 file changed, 1 insertion(+) |
| 14 | 17 | ||
| 15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 18 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 16 | index 7dceb7ae..e156c36f 100644 | 19 | index 8e8850dbe..c6d725c05 100644 |
| 17 | --- a/CMakeLists.txt | 20 | --- a/CMakeLists.txt |
| 18 | +++ b/CMakeLists.txt | 21 | +++ b/CMakeLists.txt |
| 19 | @@ -149,6 +149,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") | 22 | @@ -174,6 +174,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") |
| 20 | if(NOT DEFINED PROBE_NAME) | 23 | if(NOT DEFINED DRIVER_NAME) |
| 21 | set(PROBE_NAME "scap") | 24 | set(DRIVER_NAME "scap") |
| 22 | endif() | 25 | endif() |
| 23 | + add_definitions(-DPROBE_NAME="${PROBE_NAME}") | 26 | + add_definitions(-DPROBE_NAME="${PROBE_NAME}") |
| 24 | 27 | ||
| 25 | set(DRIVERS_REPO "https://download.sysdig.com/scap-drivers") | 28 | set(DRIVERS_REPO "https://download.sysdig.com/scap-drivers") |
| 26 | 29 | ||
| 27 | -- | 30 | -- |
| 28 | 2.35.1 | 31 | 2.43.0 |
| 29 | 32 | ||
diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-fix-build-with-gcc-15.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-fix-build-with-gcc-15.patch deleted file mode 100644 index 9a81f1c74c..0000000000 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-fix-build-with-gcc-15.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 47a86dabd065096ffc8818a1cffca96964d18120 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <martin.jansa@gmail.com> | ||
| 3 | Date: Tue, 22 Apr 2025 18:43:46 +0200 | ||
| 4 | Subject: [PATCH] libsinsp: fix build with gcc-15 | ||
| 5 | |||
| 6 | fixes: | ||
| 7 | http://errors.yoctoproject.org/Errors/Details/852848/ | ||
| 8 | |||
| 9 | In file included from TOPDIR/tmp/work/core2-64-oe-linux/sysdig/0.28.0/git/falcosecurity-libs/userspace/chisel/lua_parser.cpp:20: | ||
| 10 | TOPDIR/tmp/work/core2-64-oe-linux/sysdig/0.28.0/git/falcosecurity-libs/userspace/libsinsp/./gen_filter.h:87:17: error: 'uint64_t' does not name a type | ||
| 11 | 87 | virtual uint64_t get_ts() const = 0; | ||
| 12 | | ^~~~~~~~ | ||
| 13 | |||
| 14 | Upstream-Status: Pending [gen_filter is removed in newer version with https://github.com/falcosecurity/libs/commit/47e245f3d343eff27ed178ec2449caa3a01faabb] | ||
| 15 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
| 16 | --- | ||
| 17 | userspace/libsinsp/gen_filter.h | 1 + | ||
| 18 | 1 file changed, 1 insertion(+) | ||
| 19 | |||
| 20 | diff --git a/userspace/libsinsp/gen_filter.h b/userspace/libsinsp/gen_filter.h | ||
| 21 | index f4cfa08b1..79ac30dc3 100644 | ||
| 22 | --- a/userspace/libsinsp/gen_filter.h | ||
| 23 | +++ b/userspace/libsinsp/gen_filter.h | ||
| 24 | @@ -16,6 +16,7 @@ along with Falco. If not, see <http://www.gnu.org/licenses/>. | ||
| 25 | |||
| 26 | #pragma once | ||
| 27 | |||
| 28 | +#include <cstdint> | ||
| 29 | #include <set> | ||
| 30 | #include <list> | ||
| 31 | #include <map> | ||
diff --git a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb b/meta-oe/recipes-extended/sysdig/sysdig_0.39.0.bb index c988b0af59..6d754b9bd0 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_0.39.0.bb | |||
| @@ -19,21 +19,30 @@ JIT:powerpc64le = "" | |||
| 19 | JIT:powerpc64 = "" | 19 | JIT:powerpc64 = "" |
| 20 | 20 | ||
| 21 | DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp \ | 21 | DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp \ |
| 22 | tbb jq openssl elfutils protobuf protobuf-native jq-native valijson" | 22 | tbb jq openssl elfutils protobuf protobuf-native jq-native valijson \ |
| 23 | uthash libbpf clang-native bpftool-native yaml-cpp nlohmann-json" | ||
| 23 | RDEPENDS:${PN} = "bash" | 24 | RDEPENDS:${PN} = "bash" |
| 24 | 25 | ||
| 25 | SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sysdig \ | 26 | SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sysdig \ |
| 26 | git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/falcosecurity-libs \ | 27 | git://github.com/falcosecurity/libs;protocol=https;branch=release/0.18.x;name=falco;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/falcosecurity-libs \ |
| 28 | git://github.com/falcosecurity/libs;protocol=https;branch=release/0.18.x;name=driver;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/driver \ | ||
| 27 | file://0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \ | 29 | file://0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \ |
| 28 | file://0001-Add-cstdint-for-uintXX_t-types.patch;patchdir=./falcosecurity-libs \ | 30 | file://0001-Avoid-duplicate-operations-of-add_library.patch;patchdir=./falcosecurity-libs \ |
| 29 | file://0001-libsinsp-fix-build-with-gcc-15.patch;patchdir=./falcosecurity-libs \ | ||
| 30 | file://0001-update-cmake-Only-add-dependencies-when-we-bundle.patch;patchdir=./falcosecurity-libs \ | ||
| 31 | " | 31 | " |
| 32 | SRCREV_sysdig = "4fb6288275f567f63515df0ff0a6518043ecfa9b" | 32 | SRCREV_sysdig = "6ef29110cf1add746e10ab5b38957e22730b7349" |
| 33 | SRCREV_falco = "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9" | 33 | SRCREV_falco = "e1999d079880d10800c57e004fca794a03cd060a" |
| 34 | SRCREV_driver = "d4efc80ece48174a71c1a420cb52d233fa94f946" | ||
| 34 | 35 | ||
| 35 | SRCREV_FORMAT = "sysdig_falco" | 36 | SRCREV_FORMAT = "sysdig_falco" |
| 36 | 37 | ||
| 38 | #Add this function to generate driver_config.h | ||
| 39 | do_configure:prepend() { | ||
| 40 | mkdir -p ${WORKDIR}/driver_Make | ||
| 41 | cd ${WORKDIR}/driver_Make | ||
| 42 | cmake ${S}/driver -DMINIMAL_BUILD=ON -DCREATE_TEST_TARGETS=OFF | ||
| 43 | cd - | ||
| 44 | } | ||
| 45 | do_configure[cleandirs] = "${WORKDIR}/driver_Make" | ||
| 37 | 46 | ||
| 38 | EXTRA_OECMAKE = "\ | 47 | EXTRA_OECMAKE = "\ |
| 39 | -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ | 48 | -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ |
| @@ -44,11 +53,31 @@ EXTRA_OECMAKE = "\ | |||
| 44 | -DDIR_ETC=${sysconfdir} \ | 53 | -DDIR_ETC=${sysconfdir} \ |
| 45 | -DLUA_INCLUDE_DIR=${STAGING_INCDIR}/luajit-2.1 \ | 54 | -DLUA_INCLUDE_DIR=${STAGING_INCDIR}/luajit-2.1 \ |
| 46 | -DFALCOSECURITY_LIBS_SOURCE_DIR=${S}/falcosecurity-libs \ | 55 | -DFALCOSECURITY_LIBS_SOURCE_DIR=${S}/falcosecurity-libs \ |
| 56 | -DDRIVER_SOURCE_DIR=${S}/driver \ | ||
| 47 | -DVALIJSON_INCLUDE=${STAGING_INCDIR}/valijson \ | 57 | -DVALIJSON_INCLUDE=${STAGING_INCDIR}/valijson \ |
| 58 | -DUSE_BUNDLED_RE2=OFF \ | ||
| 59 | -DUSE_BUNDLED_TBB=OFF \ | ||
| 60 | -DUSE_BUNDLED_JSONCPP=OFF \ | ||
| 61 | -DBUILD_SYSDIG_MODERN_BPF=OFF \ | ||
| 62 | -DCREATE_TEST_TARGETS=OFF \ | ||
| 48 | " | 63 | " |
| 49 | 64 | ||
| 65 | #Add include dir to find driver_config.h | ||
| 66 | CXXFLAGS:append = " -I${WORKDIR}/driver_Make/driver/src" | ||
| 67 | CFLAGS:append = " -I${WORKDIR}/driver_Make/driver/src" | ||
| 68 | |||
| 69 | #To fix do_package QA Issue | ||
| 70 | do_compile:append() { | ||
| 71 | sed -i -e "s,${WORKDIR},,g" ${B}/libsinsp/libsinsp.pc | ||
| 72 | sed -i -e "s,${WORKDIR},,g" ${B}/driver/libscap/libscap.pc | ||
| 73 | mkdir -p ${B}/driver/libsinsp | ||
| 74 | cp ${B}/libsinsp/libsinsp.pc ${B}/driver/libsinsp/ | ||
| 75 | } | ||
| 76 | do_compile[cleandirs] = "${B}/driver/libsinsp" | ||
| 77 | |||
| 50 | #CMAKE_VERBOSE = "VERBOSE=1" | 78 | #CMAKE_VERBOSE = "VERBOSE=1" |
| 51 | 79 | ||
| 80 | |||
| 52 | FILES:${PN} += " \ | 81 | FILES:${PN} += " \ |
| 53 | ${DIR_ETC}/* \ | 82 | ${DIR_ETC}/* \ |
| 54 | ${datadir}/zsh/* \ | 83 | ${datadir}/zsh/* \ |
diff --git a/meta-oe/recipes-extended/tmux/tmux_3.6.bb b/meta-oe/recipes-extended/tmux/tmux_3.6a.bb index 199863d7e4..63011ce040 100644 --- a/meta-oe/recipes-extended/tmux/tmux_3.6.bb +++ b/meta-oe/recipes-extended/tmux/tmux_3.6a.bb | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | SUMMARY = "Terminal multiplexer" | 1 | SUMMARY = "Terminal multiplexer" |
| 2 | HOMEPAGE = "http://tmux.sourceforge.net" | 2 | HOMEPAGE = "https://github.com/tmux/tmux/wiki" |
| 3 | SECTION = "console/utils" | 3 | SECTION = "console/utils" |
| 4 | 4 | ||
| 5 | LICENSE = "ISC" | 5 | LICENSE = "ISC" |
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf | |||
| 8 | DEPENDS = "ncurses libevent bison-native" | 8 | DEPENDS = "ncurses libevent bison-native" |
| 9 | 9 | ||
| 10 | SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" | 10 | SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" |
| 11 | SRC_URI[sha256sum] = "136db80cfbfba617a103401f52874e7c64927986b65b1b700350b6058ad69607" | 11 | SRC_URI[sha256sum] = "b6d8d9c76585db8ef5fa00d4931902fa4b8cbe8166f528f44fc403961a3f3759" |
| 12 | 12 | ||
| 13 | UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" | 13 | UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" |
| 14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+[a-z]?)" | 14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+[a-z]?)" |
diff --git a/meta-oe/recipes-extended/valkey/valkey_9.0.1.bb b/meta-oe/recipes-extended/valkey/valkey_9.0.3.bb index 1f27224772..1842befdee 100644 --- a/meta-oe/recipes-extended/valkey/valkey_9.0.1.bb +++ b/meta-oe/recipes-extended/valkey/valkey_9.0.3.bb | |||
| @@ -15,12 +15,14 @@ SRC_URI = "git://github.com/valkey-io/valkey.git;branch=9.0;protocol=https;tag=$ | |||
| 15 | file://0001-src-Do-not-reset-FINAL_LIBS.patch \ | 15 | file://0001-src-Do-not-reset-FINAL_LIBS.patch \ |
| 16 | file://GNU_SOURCE-7.patch \ | 16 | file://GNU_SOURCE-7.patch \ |
| 17 | " | 17 | " |
| 18 | SRCREV = "ab3c953b80289d88991095f53c1235fc2f8b44d6" | 18 | SRCREV = "6e63ad9ccdceea562a6ea9ea9df9160c0d1109d6" |
| 19 | 19 | ||
| 20 | RPROVIDES:${PN} = "virtual-redis" | 20 | RPROVIDES:${PN} = "virtual-redis" |
| 21 | 21 | ||
| 22 | inherit pkgconfig update-rc.d systemd useradd | 22 | inherit pkgconfig update-rc.d systemd useradd |
| 23 | 23 | ||
| 24 | TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}" | ||
| 25 | |||
| 24 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | 26 | FINAL_LIBS:x86:toolchain-clang = "-latomic" |
| 25 | FINAL_LIBS:riscv32 = "-latomic" | 27 | FINAL_LIBS:riscv32 = "-latomic" |
| 26 | FINAL_LIBS:mips = "-latomic" | 28 | FINAL_LIBS:mips = "-latomic" |
| @@ -63,6 +65,7 @@ do_install() { | |||
| 63 | fi | 65 | fi |
| 64 | } | 66 | } |
| 65 | 67 | ||
| 68 | |||
| 66 | CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf" | 69 | CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf" |
| 67 | 70 | ||
| 68 | INITSCRIPT_NAME = "valkey-server" | 71 | INITSCRIPT_NAME = "valkey-server" |
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb index 815a0b2d0a..a149134f5a 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb | |||
| @@ -50,7 +50,13 @@ EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' | |||
| 50 | PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \ | 50 | PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \ |
| 51 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ | 51 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ |
| 52 | " | 52 | " |
| 53 | PACKAGECONFIG:append:class-target = " mediactrl ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'webkit', '', d)}" | 53 | PACKAGECONFIG:append:class-target = " mediactrl" |
| 54 | |||
| 55 | # (x11 OR wayland) AND opengl -> webkit | ||
| 56 | PACKAGECONFIG:append:class-target = "\ | ||
| 57 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', \ | ||
| 58 | bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webkit', '', d),\ | ||
| 59 | '', d)}" | ||
| 54 | 60 | ||
| 55 | PACKAGECONFIG:class-native ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)}" | 61 | PACKAGECONFIG:class-native ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)}" |
| 56 | 62 | ||
diff --git a/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb b/meta-oe/recipes-gnome/atk/atkmm_2.28.4.bb index bc637470f9..82e4d21f4e 100644 --- a/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb +++ b/meta-oe/recipes-gnome/atk/atkmm_2.28.4.bb | |||
| @@ -12,7 +12,7 @@ inherit gnomebase features_check | |||
| 12 | 12 | ||
| 13 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 13 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 14 | 14 | ||
| 15 | SRC_URI[archive.sha256sum] = "a0bb49765ceccc293ab2c6735ba100431807d384ffa14c2ebd30e07993fd2fa4" | 15 | SRC_URI[archive.sha256sum] = "0a142a8128f83c001efb8014ee463e9a766054ef84686af953135e04d28fdab3" |
| 16 | 16 | ||
| 17 | EXTRA_OEMESON = "-Dbuild-documentation=false" | 17 | EXTRA_OEMESON = "-Dbuild-documentation=false" |
| 18 | 18 | ||
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb index cac6474e73..b09d1150bb 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb | |||
| @@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
| 8 | 8 | ||
| 9 | DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm gdk-pixbuf-native" | 9 | DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm gdk-pixbuf-native" |
| 10 | 10 | ||
| 11 | BPN = "gtkmm" | 11 | GNOMEBN = "gtkmm" |
| 12 | |||
| 13 | 12 | ||
| 14 | inherit gnomebase features_check | 13 | inherit gnomebase features_check |
| 15 | 14 | ||
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb index 439ab800f8..0e08bed8a1 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb | |||
| @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native" | 11 | DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native" |
| 12 | 12 | ||
| 13 | BPN = "gtkmm" | 13 | GNOMEBN = "gtkmm" |
| 14 | 14 | ||
| 15 | inherit gnomebase features_check | 15 | inherit gnomebase features_check |
| 16 | 16 | ||
diff --git a/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_git.bb b/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_git.bb new file mode 100644 index 0000000000..faffca2059 --- /dev/null +++ b/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_git.bb | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | HOMEPAGE = "https://github.com/embear-engineering/drm-framebuffer" | ||
| 2 | SUMMARY = "A simple application which can be used to test a Linux DRM device" | ||
| 3 | SECTION = "graphics" | ||
| 4 | |||
| 5 | LICENSE = "GPL-3.0-only" | ||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" | ||
| 7 | |||
| 8 | SRC_URI = "git://github.com/embear-engineering/drm-framebuffer;protocol=https;branch=main" | ||
| 9 | |||
| 10 | PV = "0.1+git" | ||
| 11 | SRCREV = "a560c2b810c8f677aaaaa9e9e8b1d13854718aba" | ||
| 12 | |||
| 13 | inherit cmake pkgconfig | ||
| 14 | |||
| 15 | DEPENDS = "libdrm" | ||
| 16 | |||
diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_2.15.bb index 2736f61004..99beccb274 100644 --- a/meta-oe/recipes-graphics/fbida/fbida_git.bb +++ b/meta-oe/recipes-graphics/fbida/fbida_2.15.bb | |||
| @@ -7,20 +7,14 @@ SECTION = "utils" | |||
| 7 | LICENSE = "GPL-2.0-only" | 7 | LICENSE = "GPL-2.0-only" |
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" |
| 9 | 9 | ||
| 10 | DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman udev libinput cairo" | 10 | DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman udev libinput cairo libxkbcommon" |
| 11 | 11 | ||
| 12 | PV = "2.14+git" | 12 | GITTAG = "${PN}-${PV}-1" |
| 13 | SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master \ | 13 | SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master;tag=${GITTAG} \ |
| 14 | file://fix-preprocessor.patch \ | 14 | file://fix-preprocessor.patch \ |
| 15 | file://support-jpeg-turbo.patch \ | 15 | file://support-jpeg-turbo.patch \ |
| 16 | file://fbida-gcc10.patch \ | ||
| 17 | file://0001-meson.build-install-fbgs-shell-script.patch \ | ||
| 18 | file://0002-meson.build-add-features-options-for-png-gif-tiff-we.patch \ | ||
| 19 | file://0003-meson.build-do-not-require-xkbcommon.patch \ | ||
| 20 | file://0001-meson.build-make-fbpdf-build-optional.patch \ | ||
| 21 | file://0001-fbida-Include-missing-sys-types.h.patch \ | ||
| 22 | " | 16 | " |
| 23 | SRCREV = "eb769e3d7f4a073d4c37ed524ebd5017c6a578f5" | 17 | SRCREV = "a0d75fbab3ea01bf5b36f813f0ec0d1bfa2db745" |
| 24 | 18 | ||
| 25 | inherit meson pkgconfig features_check | 19 | inherit meson pkgconfig features_check |
| 26 | 20 | ||
diff --git a/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch b/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch deleted file mode 100644 index 0fb58f80e1..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 17490e264e627ead81bf5840c8797de968485943 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 3 Jul 2023 11:25:26 -0700 | ||
| 4 | Subject: [PATCH] fbida: Include missing <sys/types.h> | ||
| 5 | |||
| 6 | Fixes build on musl | ||
| 7 | ../git/gfx.h:43:5: error: unknown type name 'dev_t'; did you mean 'div_t'? | ||
| 8 | dev_t devnum; | ||
| 9 | ^~~~~ | ||
| 10 | div_t | ||
| 11 | TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/fbida/2.14+gitAUTOINC+eb769e3d7f-r0/recipe-sysroot/usr/include/stdlib.h:64:35: note: 'div_t' declared here | ||
| 12 | typedef struct { int quot, rem; } div_t; | ||
| 13 | ^ | ||
| 14 | 1 error generated | ||
| 15 | |||
| 16 | Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/3] | ||
| 17 | |||
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 19 | --- | ||
| 20 | gfx.h | 1 + | ||
| 21 | 1 file changed, 1 insertion(+) | ||
| 22 | |||
| 23 | --- a/gfx.h | ||
| 24 | +++ b/gfx.h | ||
| 25 | @@ -1,5 +1,6 @@ | ||
| 26 | #include <stdbool.h> | ||
| 27 | #include <inttypes.h> | ||
| 28 | +#include <sys/types.h> | ||
| 29 | |||
| 30 | #include <pixman.h> | ||
| 31 | #include <cairo.h> | ||
diff --git a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch deleted file mode 100644 index 4d081258be..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From f9c455e81ad4d870c8ae20b9af8598139231ad26 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 3 | Date: Fri, 9 Sep 2022 09:32:22 +0200 | ||
| 4 | Subject: [PATCH] meson.build: install fbgs shell script | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] | ||
| 7 | Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 8 | --- | ||
| 9 | meson.build | 3 +++ | ||
| 10 | 1 file changed, 3 insertions(+) | ||
| 11 | |||
| 12 | diff --git a/meson.build b/meson.build | ||
| 13 | index cbed982..2129896 100644 | ||
| 14 | --- a/meson.build | ||
| 15 | +++ b/meson.build | ||
| 16 | @@ -126,6 +126,9 @@ executable('fbpdf', | ||
| 17 | sources : fbpdf_srcs, | ||
| 18 | dependencies : fbpdf_deps, | ||
| 19 | install : true) | ||
| 20 | +install_data('fbgs', | ||
| 21 | + install_dir : get_option('bindir'), | ||
| 22 | + install_mode : 'rwxr--r--') | ||
| 23 | |||
| 24 | # build fbcon | ||
| 25 | fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ] | ||
| 26 | -- | ||
| 27 | 2.37.3 | ||
| 28 | |||
diff --git a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch deleted file mode 100644 index b872e213aa..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch +++ /dev/null | |||
| @@ -1,66 +0,0 @@ | |||
| 1 | From c00a155e90a9b22bd6ab5fa5407bb9923ee16ca0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 3 | Date: Fri, 16 Sep 2022 18:45:58 +0200 | ||
| 4 | Subject: [PATCH] meson.build: make fbpdf build optional | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] | ||
| 7 | Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 8 | --- | ||
| 9 | meson.build | 22 ++++++++++++---------- | ||
| 10 | meson_options.txt | 1 + | ||
| 11 | 2 files changed, 13 insertions(+), 10 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/meson.build b/meson.build | ||
| 14 | index 6b3daf3..289d1ec 100644 | ||
| 15 | --- a/meson.build | ||
| 16 | +++ b/meson.build | ||
| 17 | @@ -15,11 +15,11 @@ x11resdir = x11resrun.stdout().strip() | ||
| 18 | |||
| 19 | # pkg-config deps | ||
| 20 | pixman_dep = dependency('pixman-1') | ||
| 21 | -poppler_dep = dependency('poppler-glib') | ||
| 22 | +poppler_dep = dependency('poppler-glib', required: get_option('pdf')) | ||
| 23 | cairo_dep = dependency('cairo') | ||
| 24 | drm_dep = dependency('libdrm') | ||
| 25 | -gbm_dep = dependency('gbm') | ||
| 26 | -epoxy_dep = dependency('epoxy') | ||
| 27 | +gbm_dep = dependency('gbm', required: get_option('pdf')) | ||
| 28 | +epoxy_dep = dependency('epoxy', required: get_option('pdf')) | ||
| 29 | exif_dep = dependency('libexif') | ||
| 30 | png_dep = dependency('libpng', required: get_option('png')) | ||
| 31 | tiff_dep = dependency('libtiff-4', required: get_option('tiff')) | ||
| 32 | @@ -132,13 +132,15 @@ fbpdf_deps = [ drm_dep, gbm_dep, epoxy_dep, | ||
| 33 | pixman_dep, poppler_dep, cairo_dep, | ||
| 34 | udev_dep, input_dep ] | ||
| 35 | |||
| 36 | -executable('fbpdf', | ||
| 37 | - sources : fbpdf_srcs, | ||
| 38 | - dependencies : fbpdf_deps, | ||
| 39 | - install : true) | ||
| 40 | -install_data('fbgs', | ||
| 41 | - install_dir : get_option('bindir'), | ||
| 42 | - install_mode : 'rwxr--r--') | ||
| 43 | +if get_option('pdf').enabled() | ||
| 44 | + executable('fbpdf', | ||
| 45 | + sources : fbpdf_srcs, | ||
| 46 | + dependencies : fbpdf_deps, | ||
| 47 | + install : true) | ||
| 48 | + install_data('fbgs', | ||
| 49 | + install_dir : get_option('bindir'), | ||
| 50 | + install_mode : 'rwxr--r--') | ||
| 51 | +endif | ||
| 52 | |||
| 53 | # build fbcon | ||
| 54 | fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ] | ||
| 55 | diff --git a/meson_options.txt b/meson_options.txt | ||
| 56 | index ce37188..74699ab 100644 | ||
| 57 | --- a/meson_options.txt | ||
| 58 | +++ b/meson_options.txt | ||
| 59 | @@ -3,3 +3,4 @@ option('png', type: 'feature', value : 'enabled') | ||
| 60 | option('tiff', type: 'feature', value : 'enabled') | ||
| 61 | option('webp', type: 'feature', value : 'disabled') | ||
| 62 | option('motif', type: 'feature', value : 'disabled') | ||
| 63 | +option('pdf', type: 'feature', value : 'enabled') | ||
| 64 | -- | ||
| 65 | 2.37.3 | ||
| 66 | |||
diff --git a/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch b/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch deleted file mode 100644 index 4f54fbfba7..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch +++ /dev/null | |||
| @@ -1,124 +0,0 @@ | |||
| 1 | From cdcde5c1fd106a69118dff98118600911392762f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 3 | Date: Fri, 16 Sep 2022 16:25:38 +0200 | ||
| 4 | Subject: [PATCH] meson.build: add features options for png, gif, tiff, webp, and motif | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] | ||
| 7 | Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 8 | --- | ||
| 9 | meson.build | 41 +++++++++++++++++++++++++++-------------- | ||
| 10 | meson_options.txt | 5 +++++ | ||
| 11 | selections.c | 4 ++++ | ||
| 12 | 3 files changed, 36 insertions(+), 14 deletions(-) | ||
| 13 | create mode 100644 meson_options.txt | ||
| 14 | |||
| 15 | diff --git a/meson.build b/meson.build | ||
| 16 | index cd9cc49..b5e3ffc 100644 | ||
| 17 | --- a/meson.build | ||
| 18 | +++ b/meson.build | ||
| 19 | @@ -23,9 +23,9 @@ drm_dep = dependency('libdrm') | ||
| 20 | gbm_dep = dependency('gbm') | ||
| 21 | epoxy_dep = dependency('epoxy') | ||
| 22 | exif_dep = dependency('libexif') | ||
| 23 | -png_dep = dependency('libpng') | ||
| 24 | -tiff_dep = dependency('libtiff-4') | ||
| 25 | -webp_dep = dependency('libwebp', required : false) | ||
| 26 | +png_dep = dependency('libpng', required: get_option('png')) | ||
| 27 | +tiff_dep = dependency('libtiff-4', required: get_option('tiff')) | ||
| 28 | +webp_dep = dependency('libwebp', required : get_option('webp')) | ||
| 29 | udev_dep = dependency('libudev') | ||
| 30 | input_dep = dependency('libinput') | ||
| 31 | xkb_dep = dependency('xkbcommon') | ||
| 32 | @@ -36,20 +36,20 @@ jpeg_dep = cc.find_library('jpeg') | ||
| 33 | util_dep = cc.find_library('util') | ||
| 34 | math_dep = cc.find_library('m', required : false) | ||
| 35 | pcd_dep = cc.find_library('pcd', required : false) | ||
| 36 | -gif_dep = cc.find_library('gif', required : false) | ||
| 37 | +gif_dep = cc.find_library('gif', required: get_option('gif')) | ||
| 38 | |||
| 39 | # motif + x11 libs | ||
| 40 | -motif_dep = cc.find_library('Xm', required : false) | ||
| 41 | -xpm_dep = cc.find_library('Xpm', required : false) | ||
| 42 | -xt_dep = cc.find_library('Xt', required : false) | ||
| 43 | -xext_dep = cc.find_library('Xext', required : false) | ||
| 44 | -x11_dep = cc.find_library('X11', required : false) | ||
| 45 | +motif_dep = cc.find_library('Xm', required : get_option('motif')) | ||
| 46 | +xpm_dep = cc.find_library('Xpm', required : get_option('motif')) | ||
| 47 | +xt_dep = cc.find_library('Xt', required : get_option('motif')) | ||
| 48 | +xext_dep = cc.find_library('Xext', required : get_option('motif')) | ||
| 49 | +x11_dep = cc.find_library('X11', required : get_option('motif')) | ||
| 50 | |||
| 51 | # image formats | ||
| 52 | read_srcs = [ 'readers.c', 'rd/read-ppm.c', 'rd/read-bmp.c', | ||
| 53 | - 'rd/read-jpeg.c', 'rd/read-png.c', 'rd/read-tiff.c' ] | ||
| 54 | + 'rd/read-jpeg.c' ] | ||
| 55 | write_srcs = [ 'writers.c', 'wr/write-ppm.c', 'wr/write-ps.c', | ||
| 56 | - 'wr/write-jpeg.c', 'wr/write-png.c', 'wr/write-tiff.c' ] | ||
| 57 | + 'wr/write-jpeg.c' ] | ||
| 58 | image_deps = [ jpeg_dep, png_dep, tiff_dep, | ||
| 59 | pcd_dep, gif_dep, webp_dep ] | ||
| 60 | |||
| 61 | @@ -57,11 +57,21 @@ if pcd_dep.found() | ||
| 62 | read_srcs += 'rd/read-pcd.c' | ||
| 63 | config.set('HAVE_LIBPCD', true) | ||
| 64 | endif | ||
| 65 | -if gif_dep.found() | ||
| 66 | +if get_option('png').enabled() | ||
| 67 | + read_srcs += 'rd/read-png.c' | ||
| 68 | + write_srcs += 'wr/write-png.c' | ||
| 69 | + config.set('HAVE_LIBPNG', true) | ||
| 70 | +endif | ||
| 71 | +if get_option('tiff').enabled() | ||
| 72 | + read_srcs += 'rd/read-tiff.c' | ||
| 73 | + write_srcs += 'wr/write-tiff.c' | ||
| 74 | + config.set('HAVE_LIBTIFF', true) | ||
| 75 | +endif | ||
| 76 | +if get_option('gif').enabled() | ||
| 77 | read_srcs += 'rd/read-gif.c' | ||
| 78 | config.set('HAVE_LIBGIF', true) | ||
| 79 | endif | ||
| 80 | -if webp_dep.found() | ||
| 81 | +if get_option('webp').enabled() | ||
| 82 | read_srcs += 'rd/read-webp.c' | ||
| 83 | config.set('HAVE_LIBWEBP', true) | ||
| 84 | endif | ||
| 85 | @@ -168,7 +181,7 @@ ida_srcs = [ 'ida.c', 'man.c', 'hex.c', 'x11.c', 'viewer.c', | ||
| 86 | ida_deps = [ pixman_dep, exif_dep, image_deps, math_dep, | ||
| 87 | motif_dep, xpm_dep, xt_dep, xext_dep, x11_dep ] | ||
| 88 | |||
| 89 | -if motif_dep.found() | ||
| 90 | +if get_option('motif').enabled() | ||
| 91 | executable('ida', | ||
| 92 | sources : ida_srcs, | ||
| 93 | dependencies : ida_deps, | ||
| 94 | diff --git a/meson_options.txt b/meson_options.txt | ||
| 95 | new file mode 100644 | ||
| 96 | index 0000000..ce37188 | ||
| 97 | --- /dev/null | ||
| 98 | +++ b/meson_options.txt | ||
| 99 | @@ -0,0 +1,5 @@ | ||
| 100 | +option('gif', type: 'feature', value : 'enabled') | ||
| 101 | +option('png', type: 'feature', value : 'enabled') | ||
| 102 | +option('tiff', type: 'feature', value : 'enabled') | ||
| 103 | +option('webp', type: 'feature', value : 'disabled') | ||
| 104 | +option('motif', type: 'feature', value : 'disabled') | ||
| 105 | diff --git a/selections.c b/selections.c | ||
| 106 | index 7b16264..ccdc686 100644 | ||
| 107 | --- a/selections.c | ||
| 108 | +++ b/selections.c | ||
| 109 | @@ -609,8 +609,12 @@ void ipc_init() | ||
| 110 | #ifdef HAVE_LIBGIF | ||
| 111 | targets[ntargets++] = MIME_IMAGE_GIF; | ||
| 112 | #endif | ||
| 113 | +#ifdef HAVE_LIBPNG | ||
| 114 | targets[ntargets++] = MIME_IMAGE_PNG; | ||
| 115 | +#endif | ||
| 116 | +#ifdef HAVE_LIBTIFF | ||
| 117 | targets[ntargets++] = MIME_IMAGE_TIFF; | ||
| 118 | +#endif | ||
| 119 | targets[ntargets++] = XA_PIXMAP; | ||
| 120 | targets[ntargets++] = XA_STRING; | ||
| 121 | |||
| 122 | -- | ||
| 123 | 2.37.3 | ||
| 124 | |||
diff --git a/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch b/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch deleted file mode 100644 index e769014131..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | From ec82a194f3454ac203a134c9a99bac6d63095d25 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 3 | Date: Fri, 16 Sep 2022 18:29:03 +0200 | ||
| 4 | Subject: [PATCH] meson.build: do not require xkbcommon | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 8 | --- | ||
| 9 | meson.build | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/meson.build b/meson.build | ||
| 13 | index 341939c..b5dab14 100644 | ||
| 14 | --- a/meson.build | ||
| 15 | +++ b/meson.build | ||
| 16 | @@ -26,7 +26,7 @@ tiff_dep = dependency('libtiff-4', required: get_option('tiff')) | ||
| 17 | webp_dep = dependency('libwebp', required : get_option('webp')) | ||
| 18 | udev_dep = dependency('libudev') | ||
| 19 | input_dep = dependency('libinput') | ||
| 20 | -xkb_dep = dependency('xkbcommon') | ||
| 21 | +xkb_dep = dependency('xkbcommon', required : false) | ||
| 22 | tsm_dep = dependency('libtsm', required : false) | ||
| 23 | |||
| 24 | # other library deps | ||
| 25 | -- | ||
| 26 | 2.37.3 | ||
| 27 | |||
diff --git a/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch b/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch deleted file mode 100644 index 1104289f3c..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | Fix build with gcc10 | ||
| 2 | |||
| 3 | Patch from https://src.fedoraproject.org/rpms/fbida/raw/master/f/fbida.gcc10.patch | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | |||
| 8 | --- fbida-2.14/fbi.c.org 2020-03-15 17:02:17.944189632 +0100 | ||
| 9 | +++ fbida-2.14/fbi.c 2020-03-15 17:02:21.880223224 +0100 | ||
| 10 | @@ -100,7 +100,6 @@ | ||
| 11 | |||
| 12 | /* graphics interface */ | ||
| 13 | gfxstate *gfx; | ||
| 14 | -int debug; | ||
| 15 | |||
| 16 | /* framebuffer */ | ||
| 17 | char *fbdev = NULL; | ||
| 18 | --- fbida-2.14/filter.c 2020-03-15 16:44:17.159855150 +0100 | ||
| 19 | +++ fbida-2.14/filter.c 2020-03-15 16:44:27.017941447 +0100 | ||
| 20 | @@ -6,8 +6,6 @@ | ||
| 21 | #include "readers.h" | ||
| 22 | #include "filter.h" | ||
| 23 | |||
| 24 | -int debug = 0; | ||
| 25 | - | ||
| 26 | /* ----------------------------------------------------------------------- */ | ||
| 27 | |||
| 28 | static void | ||
| 29 | --- fbida-2.14/readers.c.org 2020-03-15 17:01:18.692683597 +0100 | ||
| 30 | +++ fbida-2.14/readers.c 2020-03-15 16:57:19.141632384 +0100 | ||
| 31 | @@ -6,6 +6,8 @@ | ||
| 32 | |||
| 33 | #include "readers.h" | ||
| 34 | |||
| 35 | +int debug=0; | ||
| 36 | + | ||
| 37 | /* ----------------------------------------------------------------------- */ | ||
| 38 | |||
| 39 | void load_bits_lsb(unsigned char *dst, unsigned char *src, int width, | ||
| 40 | |||
| 41 | --- fbida-2.14/viewer.c.org 2020-03-15 17:05:02.991595832 +0100 | ||
| 42 | +++ fbida-2.14/viewer.c 2020-03-15 17:04:55.424531467 +0100 | ||
| 43 | @@ -40,7 +40,6 @@ | ||
| 44 | #define PROCESS_LINES 16 | ||
| 45 | |||
| 46 | -int debug; | ||
| 47 | Cursor ptrs[POINTER_COUNT]; | ||
| 48 | |||
| 49 | /* ----------------------------------------------------------------------- */ | ||
| 50 | |||
| 51 | --- fbida-2.14/idaconfig.h.org 2020-03-15 17:07:09.239668196 +0100 | ||
| 52 | +++ fbida-2.14/idaconfig.h 2020-03-15 17:07:21.248770061 +0100 | ||
| 53 | @@ -17,7 +17,7 @@ | ||
| 54 | |||
| 55 | /* -------------------------------------------------------------------------- */ | ||
| 56 | |||
| 57 | -char *ida_lists; | ||
| 58 | +extern char *ida_lists; | ||
| 59 | |||
| 60 | void ida_init_config(void); | ||
| 61 | void ida_read_config(void); | ||
diff --git a/meta-oe/recipes-graphics/feh/feh_3.11.2.bb b/meta-oe/recipes-graphics/feh/feh_3.11.3.bb index 57c30c3475..c79ad488ba 100644 --- a/meta-oe/recipes-graphics/feh/feh_3.11.2.bb +++ b/meta-oe/recipes-graphics/feh/feh_3.11.3.bb | |||
| @@ -9,7 +9,7 @@ DEPENDS = "\ | |||
| 9 | " | 9 | " |
| 10 | 10 | ||
| 11 | SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" | 11 | SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" |
| 12 | SRC_URI[sha256sum] = "020f8bce84c709333dcc6ec5fff36313782e0b50662754947c6585d922a7a7b2" | 12 | SRC_URI[sha256sum] = "f2cca3592a433922c0db7a9365fd63e5402c121d932a9327e279c71be6501063" |
| 13 | 13 | ||
| 14 | inherit mime-xdg features_check | 14 | inherit mime-xdg features_check |
| 15 | # depends on virtual/libx11 | 15 | # depends on virtual/libx11 |
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch b/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch deleted file mode 100644 index 6d133254ed..0000000000 --- a/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch +++ /dev/null | |||
| @@ -1,385 +0,0 @@ | |||
| 1 | From e6ccc8a8cf1391010a8220836a732da9fab19c69 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 7 Sep 2023 12:35:12 -0700 | ||
| 4 | Subject: [PATCH] Fix Translations containing invalid directives %hs | ||
| 5 | |||
| 6 | Found with gettext 0.22 | ||
| 7 | Older versions of msgfmt were more sloppy, thus allowing such mistakes to cause bugs at runtime. | ||
| 8 | |||
| 9 | https://bugs.gentoo.org/908868 | ||
| 10 | https://savannah.gnu.org/bugs/index.php?64333 | ||
| 11 | https://github.com/fontforge/fontforge/issues/5251 | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 15 | --- | ||
| 16 | fontforgeexe/searchview.c | 2 +- | ||
| 17 | po/ca.po | 4 ++-- | ||
| 18 | po/de.po | 4 ++-- | ||
| 19 | po/en_GB.po | 4 ++-- | ||
| 20 | po/fr.po | 40 +++++++++++++++++++-------------------- | ||
| 21 | po/hr.po | 4 ++-- | ||
| 22 | po/it.po | 8 ++++---- | ||
| 23 | po/ja.po | 4 ++-- | ||
| 24 | po/ko.po | 4 ++-- | ||
| 25 | po/pl.po | 4 ++-- | ||
| 26 | po/uk.po | 4 ++-- | ||
| 27 | po/vi.po | 4 ++-- | ||
| 28 | 12 files changed, 43 insertions(+), 43 deletions(-) | ||
| 29 | |||
| 30 | diff --git a/fontforgeexe/searchview.c b/fontforgeexe/searchview.c | ||
| 31 | index 1cb39a221..7e1c109cb 100644 | ||
| 32 | --- a/fontforgeexe/searchview.c | ||
| 33 | +++ b/fontforgeexe/searchview.c | ||
| 34 | @@ -516,7 +516,7 @@ return( true ); | ||
| 35 | if ( ask_if_difficult==2 && !searcher->isvisible ) | ||
| 36 | return( false ); | ||
| 37 | if ( gwwv_ask(_("Bad Reference"),(const char **) buttons,1,1, | ||
| 38 | - _("The %1$s in the search dialog contains a reference to %2$.20hs which does not exist in the new font.\nShould I remove the reference?"), | ||
| 39 | + _("The %1$s in the search dialog contains a reference to %2$.20s which does not exist in the new font.\nShould I remove the reference?"), | ||
| 40 | i==0?_("Search Pattern"):_("Replace Pattern"), | ||
| 41 | r->sc->name)==1 ) | ||
| 42 | return( false ); | ||
| 43 | diff --git a/po/ca.po b/po/ca.po | ||
| 44 | index e2349b6ef..6c920b7c0 100644 | ||
| 45 | --- a/po/ca.po | ||
| 46 | +++ b/po/ca.po | ||
| 47 | @@ -12347,11 +12347,11 @@ msgstr "Tai" | ||
| 48 | |||
| 49 | #, c-format | ||
| 50 | msgid "" | ||
| 51 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 52 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 53 | "not exist in the new font.\n" | ||
| 54 | "Should I remove the reference?" | ||
| 55 | msgstr "" | ||
| 56 | -"Al diàleg de cerca, %1$s conté una referència a %2$.20hs\n" | ||
| 57 | +"Al diàleg de cerca, %1$s conté una referència a %2$.20s\n" | ||
| 58 | "que no existeix en el nou tipus.\n" | ||
| 59 | "Voleu eliminar la referència?" | ||
| 60 | |||
| 61 | diff --git a/po/de.po b/po/de.po | ||
| 62 | index 41430ffae..8a31aeaa2 100644 | ||
| 63 | --- a/po/de.po | ||
| 64 | +++ b/po/de.po | ||
| 65 | @@ -15765,11 +15765,11 @@ msgstr "" | ||
| 66 | |||
| 67 | #, c-format | ||
| 68 | msgid "" | ||
| 69 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 70 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 71 | "not exist in the new font.\n" | ||
| 72 | "Should I remove the reference?" | ||
| 73 | msgstr "" | ||
| 74 | -"%1$s im Suchdialog enthält eine Referenz auf %2$.20hs, die in der neuen " | ||
| 75 | +"%1$s im Suchdialog enthält eine Referenz auf %2$.20s, die in der neuen " | ||
| 76 | "Schrift nicht existiert.\n" | ||
| 77 | "Soll der Referenz entfernt werden?" | ||
| 78 | |||
| 79 | diff --git a/po/en_GB.po b/po/en_GB.po | ||
| 80 | index 9bd2d62bb..fce64c97d 100644 | ||
| 81 | --- a/po/en_GB.po | ||
| 82 | +++ b/po/en_GB.po | ||
| 83 | @@ -728,11 +728,11 @@ msgstr "Template Colour" | ||
| 84 | |||
| 85 | #, c-format | ||
| 86 | msgid "" | ||
| 87 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 88 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 89 | "not exist in the new font.\n" | ||
| 90 | "Should I remove the reference?" | ||
| 91 | msgstr "" | ||
| 92 | -"The %1$s in the search dialogue contains a reference to %2$.20hs which does " | ||
| 93 | +"The %1$s in the search dialogue contains a reference to %2$.20s which does " | ||
| 94 | "not exist in the new font.\n" | ||
| 95 | "Should I remove the reference?" | ||
| 96 | |||
| 97 | diff --git a/po/fr.po b/po/fr.po | ||
| 98 | index 26e446b38..d130f89bc 100644 | ||
| 99 | --- a/po/fr.po | ||
| 100 | +++ b/po/fr.po | ||
| 101 | @@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s" | ||
| 102 | #. GT: $4 is the changed flag ('*' for the changed items) | ||
| 103 | #, c-format | ||
| 104 | msgid "%1$.80s at %2$d from %3$.90s%4$s" | ||
| 105 | -msgstr "%1$.80s à %2$d de %3$.90hs%4$s" | ||
| 106 | +msgstr "%1$.80s à %2$d de %3$.90s%4$s" | ||
| 107 | |||
| 108 | #. GT: This is the title for a window showing a bitmap character | ||
| 109 | #. GT: It will look something like: | ||
| 110 | @@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s" | ||
| 111 | #. GT: $4 is the font name | ||
| 112 | #, c-format | ||
| 113 | msgid "%1$.80s at %2$d size %3$d from %4$.80s" | ||
| 114 | -msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" | ||
| 115 | +msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s" | ||
| 116 | |||
| 117 | #, c-format | ||
| 118 | msgid "%1$s from lookup subtable %2$.50s" | ||
| 119 | @@ -7433,7 +7433,7 @@ msgid "" | ||
| 120 | "Reverting the file will lose those changes.\n" | ||
| 121 | "Is that what you want?" | ||
| 122 | msgstr "" | ||
| 123 | -"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n" | ||
| 124 | +"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n" | ||
| 125 | "Revenir vous fera perdre toutes les modifications.\n" | ||
| 126 | "Voulez vous vraiment revenir ?" | ||
| 127 | |||
| 128 | @@ -19077,11 +19077,11 @@ msgstr "" | ||
| 129 | |||
| 130 | #, c-format | ||
| 131 | msgid "" | ||
| 132 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 133 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 134 | "not exist in the new font.\n" | ||
| 135 | "Should I remove the reference?" | ||
| 136 | msgstr "" | ||
| 137 | -"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20hs qui " | ||
| 138 | +"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20s qui " | ||
| 139 | "n'existe pas dans la nouvelle fonte.\n" | ||
| 140 | "Faut-il supprimer la référence ?" | ||
| 141 | |||
| 142 | @@ -19925,7 +19925,7 @@ msgid "" | ||
| 143 | "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " | ||
| 144 | "encodings" | ||
| 145 | msgstr "" | ||
| 146 | -"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " | ||
| 147 | +"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des " | ||
| 148 | "codages différents" | ||
| 149 | |||
| 150 | #, c-format | ||
| 151 | @@ -19933,7 +19933,7 @@ msgid "" | ||
| 152 | "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " | ||
| 153 | "one cubic)" | ||
| 154 | msgstr "" | ||
| 155 | -"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres " | ||
| 156 | +"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres " | ||
| 157 | "différents (quadratique et cubique)" | ||
| 158 | |||
| 159 | msgid "The generated font won't work with ATM" | ||
| 160 | @@ -19968,8 +19968,8 @@ msgid "" | ||
| 161 | "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " | ||
| 162 | "than in %3$.30s" | ||
| 163 | msgstr "" | ||
| 164 | -"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que " | ||
| 165 | -"dans %3$.30hs" | ||
| 166 | +"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que " | ||
| 167 | +"dans %3$.30s" | ||
| 168 | |||
| 169 | #, c-format | ||
| 170 | msgid "" | ||
| 171 | @@ -19984,8 +19984,8 @@ msgid "" | ||
| 172 | "The glyph %1$.30s in font %2$.30s has a different number of references than " | ||
| 173 | "in %3$.30s" | ||
| 174 | msgstr "" | ||
| 175 | -"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent " | ||
| 176 | -"dans %3$.30hs" | ||
| 177 | +"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent " | ||
| 178 | +"dans %3$.30s" | ||
| 179 | |||
| 180 | #, c-format | ||
| 181 | msgid "" | ||
| 182 | @@ -20457,7 +20457,7 @@ msgstr "" | ||
| 183 | #, c-format | ||
| 184 | msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" | ||
| 185 | msgstr "" | ||
| 186 | -"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" | ||
| 187 | +"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s" | ||
| 188 | |||
| 189 | msgid "The paths that make up this glyph intersect one another" | ||
| 190 | msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres" | ||
| 191 | @@ -21042,7 +21042,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP" | ||
| 192 | |||
| 193 | #, c-format | ||
| 194 | msgid "There is already an anchor point named %1$.40s in %2$.40s." | ||
| 195 | -msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." | ||
| 196 | +msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s." | ||
| 197 | |||
| 198 | msgid "There is another glyph in the font with this name" | ||
| 199 | msgstr "Il y a un autre glyphe dans la fonte avec ce nom" | ||
| 200 | @@ -21441,8 +21441,8 @@ msgid "" | ||
| 201 | "been able to find is %1$.20s-%2$.20s-%4$d.\n" | ||
| 202 | "Shall I use that or let you search?" | ||
| 203 | msgstr "" | ||
| 204 | -"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais " | ||
| 205 | -"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n" | ||
| 206 | +"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais " | ||
| 207 | +"ce que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n" | ||
| 208 | "Devrais-je utiliser cette valeur ou préférez vous chercher ?" | ||
| 209 | |||
| 210 | msgid "" | ||
| 211 | @@ -21770,7 +21770,7 @@ msgid "" | ||
| 212 | "with a 0 offset for this combination. Would you like to alter this kerning " | ||
| 213 | "class entry (or create a kerning pair for just these two glyphs)?" | ||
| 214 | msgstr "" | ||
| 215 | -"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n" | ||
| 216 | +"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n" | ||
| 217 | "avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette " | ||
| 218 | "partie\n" | ||
| 219 | "de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 " | ||
| 220 | @@ -24551,8 +24551,8 @@ msgid "" | ||
| 221 | "referred to.\n" | ||
| 222 | "It will not be copied." | ||
| 223 | msgstr "" | ||
| 224 | -"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" | ||
| 225 | -"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le " | ||
| 226 | +"Vous essayer de coller une référence vers %1$s dans %2$s.\n" | ||
| 227 | +"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le " | ||
| 228 | "glyphe auquel il se référait.\n" | ||
| 229 | "Le glyphe ne sera pas copié." | ||
| 230 | |||
| 231 | @@ -24562,8 +24562,8 @@ msgid "" | ||
| 232 | "But %1$s does not exist in this font.\n" | ||
| 233 | "Would you like to copy the original splines (or delete the reference)?" | ||
| 234 | msgstr "" | ||
| 235 | -"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" | ||
| 236 | -"Mais %1$hs n'existe pas dans cette fonte.\n" | ||
| 237 | +"Vous essayer de coller une référence vers %1$s dans %2$s.\n" | ||
| 238 | +"Mais %1$s n'existe pas dans cette fonte.\n" | ||
| 239 | "Voulez vous copier le contour d'origine (ou supprimer la référence)?" | ||
| 240 | |||
| 241 | msgid "" | ||
| 242 | diff --git a/po/hr.po b/po/hr.po | ||
| 243 | index d261d4ca7..ac41b9250 100644 | ||
| 244 | --- a/po/hr.po | ||
| 245 | +++ b/po/hr.po | ||
| 246 | @@ -20156,11 +20156,11 @@ msgstr "" | ||
| 247 | |||
| 248 | #, c-format | ||
| 249 | msgid "" | ||
| 250 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 251 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 252 | "not exist in the new font.\n" | ||
| 253 | "Should I remove the reference?" | ||
| 254 | msgstr "" | ||
| 255 | -"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20hs koja ne " | ||
| 256 | +"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20s koja ne " | ||
| 257 | "postoji u fontu.\n" | ||
| 258 | "Želiš li dozvoliti uklanjanje reference?" | ||
| 259 | |||
| 260 | diff --git a/po/it.po b/po/it.po | ||
| 261 | index e13711485..d0c3ea987 100644 | ||
| 262 | --- a/po/it.po | ||
| 263 | +++ b/po/it.po | ||
| 264 | @@ -2303,7 +2303,7 @@ msgid "" | ||
| 265 | "Reverting the file will lose those changes.\n" | ||
| 266 | "Is that what you want?" | ||
| 267 | msgstr "" | ||
| 268 | -"Il font %1$.40s nel file %2$.40hs è stato modificato.\n" | ||
| 269 | +"Il font %1$.40s nel file %2$.40s è stato modificato.\n" | ||
| 270 | "Ripristinando il file perderai tutte le modifiche.\n" | ||
| 271 | "È quello che vuoi fare?" | ||
| 272 | |||
| 273 | @@ -5835,7 +5835,7 @@ msgid "" | ||
| 274 | "The glyph %1$.30s has a different number of contours in font %2$.30s than in " | ||
| 275 | "%3$.30s" | ||
| 276 | msgstr "" | ||
| 277 | -"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto " | ||
| 278 | +"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto " | ||
| 279 | "a %3$.30s" | ||
| 280 | |||
| 281 | #, c-format | ||
| 282 | @@ -6235,8 +6235,8 @@ msgid "" | ||
| 283 | "been able to find is %1$.20s-%2$.20s-%4$d.\n" | ||
| 284 | "Shall I use that or let you search?" | ||
| 285 | msgstr "" | ||
| 286 | -"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma " | ||
| 287 | -"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n" | ||
| 288 | +"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma " | ||
| 289 | +"il migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n" | ||
| 290 | "Devo usare questo valore o preferisci cercare tu stesso?" | ||
| 291 | |||
| 292 | msgid "" | ||
| 293 | diff --git a/po/ja.po b/po/ja.po | ||
| 294 | index ed9f5a645..206ae82d1 100644 | ||
| 295 | --- a/po/ja.po | ||
| 296 | +++ b/po/ja.po | ||
| 297 | @@ -11458,11 +11458,11 @@ msgstr "" | ||
| 298 | |||
| 299 | #, c-format | ||
| 300 | msgid "" | ||
| 301 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 302 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 303 | "not exist in the new font.\n" | ||
| 304 | "Should I remove the reference?" | ||
| 305 | msgstr "" | ||
| 306 | -"%1$s には, 新しいフォントには含まれないグリフ %2$.20hs への参照が含まれていま" | ||
| 307 | +"%1$s には, 新しいフォントには含まれないグリフ %2$.20s への参照が含まれていま" | ||
| 308 | "す.\n" | ||
| 309 | "参照を削除しますか?" | ||
| 310 | |||
| 311 | diff --git a/po/ko.po b/po/ko.po | ||
| 312 | index 971b4db03..4d5c8d40d 100644 | ||
| 313 | --- a/po/ko.po | ||
| 314 | +++ b/po/ko.po | ||
| 315 | @@ -20920,11 +20920,11 @@ msgstr "" | ||
| 316 | |||
| 317 | #, c-format | ||
| 318 | msgid "" | ||
| 319 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 320 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 321 | "not exist in the new font.\n" | ||
| 322 | "Should I remove the reference?" | ||
| 323 | msgstr "" | ||
| 324 | -"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20hs에 대한 참조가 포함되어 있" | ||
| 325 | +"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20s에 대한 참조가 포함되어 있" | ||
| 326 | "다.\n" | ||
| 327 | "참조를 제거해야 하는가?" | ||
| 328 | |||
| 329 | diff --git a/po/pl.po b/po/pl.po | ||
| 330 | index 2bbbf00be..c1fd5a454 100644 | ||
| 331 | --- a/po/pl.po | ||
| 332 | +++ b/po/pl.po | ||
| 333 | @@ -19552,11 +19552,11 @@ msgstr "" | ||
| 334 | |||
| 335 | #, c-format | ||
| 336 | msgid "" | ||
| 337 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 338 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 339 | "not exist in the new font.\n" | ||
| 340 | "Should I remove the reference?" | ||
| 341 | msgstr "" | ||
| 342 | -"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20hs, który nie " | ||
| 343 | +"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20s, który nie " | ||
| 344 | "istnieje w nowym foncie.\n" | ||
| 345 | "Czy usunąć to odwołanie?" | ||
| 346 | |||
| 347 | diff --git a/po/uk.po b/po/uk.po | ||
| 348 | index e3768acc3..3302a1005 100644 | ||
| 349 | --- a/po/uk.po | ||
| 350 | +++ b/po/uk.po | ||
| 351 | @@ -19860,11 +19860,11 @@ msgstr "" | ||
| 352 | |||
| 353 | #, c-format | ||
| 354 | msgid "" | ||
| 355 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 356 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 357 | "not exist in the new font.\n" | ||
| 358 | "Should I remove the reference?" | ||
| 359 | msgstr "" | ||
| 360 | -"%1$s у діалоговому вікні пошуку містить посилання на %2$.20hs, якого не " | ||
| 361 | +"%1$s у діалоговому вікні пошуку містить посилання на %2$.20s, якого не " | ||
| 362 | "існує у новому шрифті.\n" | ||
| 363 | "Вилучити це посилання?" | ||
| 364 | |||
| 365 | diff --git a/po/vi.po b/po/vi.po | ||
| 366 | index 6aee8bb3f..f5eb739e6 100644 | ||
| 367 | --- a/po/vi.po | ||
| 368 | +++ b/po/vi.po | ||
| 369 | @@ -17109,11 +17109,11 @@ msgstr "" | ||
| 370 | |||
| 371 | #, c-format | ||
| 372 | msgid "" | ||
| 373 | -"The %1$s in the search dialog contains a reference to %2$.20hs which does " | ||
| 374 | +"The %1$s in the search dialog contains a reference to %2$.20s which does " | ||
| 375 | "not exist in the new font.\n" | ||
| 376 | "Should I remove the reference?" | ||
| 377 | msgstr "" | ||
| 378 | -"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20hs mà không tồn " | ||
| 379 | +"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20s mà không tồn " | ||
| 380 | "tại trong phông mới.\n" | ||
| 381 | "Bạn có muốn gỡ bỏ tham chiếu này không?" | ||
| 382 | |||
| 383 | -- | ||
| 384 | 2.42.0 | ||
| 385 | |||
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2024-25081_CVE-2024-25082.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2024-25081_CVE-2024-25082.patch deleted file mode 100644 index 40f85e9f33..0000000000 --- a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2024-25081_CVE-2024-25082.patch +++ /dev/null | |||
| @@ -1,181 +0,0 @@ | |||
| 1 | From 216eb14b558df344b206bf82e2bdaf03a1f2f429 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Kydas <pk@canva.com> | ||
| 3 | Date: Tue, 6 Feb 2024 20:03:04 +1100 | ||
| 4 | Subject: [PATCH] fix splinefont shell command injection (#5367) | ||
| 5 | |||
| 6 | CVE: CVE-2024-25081 | ||
| 7 | CVE: CVE-2024-25082 | ||
| 8 | Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/216eb14b558df344b206bf82e2bdaf03a1f2f429] | ||
| 9 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 10 | --- | ||
| 11 | fontforge/splinefont.c | 123 +++++++++++++++++++++++++++++------------ | ||
| 12 | 1 file changed, 89 insertions(+), 34 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/fontforge/splinefont.c b/fontforge/splinefont.c | ||
| 15 | index 239fdc035..647daee10 100644 | ||
| 16 | --- a/fontforge/splinefont.c | ||
| 17 | +++ b/fontforge/splinefont.c | ||
| 18 | @@ -788,11 +788,14 @@ return( name ); | ||
| 19 | |||
| 20 | char *Unarchive(char *name, char **_archivedir) { | ||
| 21 | char *dir = getenv("TMPDIR"); | ||
| 22 | - char *pt, *archivedir, *listfile, *listcommand, *unarchivecmd, *desiredfile; | ||
| 23 | + char *pt, *archivedir, *listfile, *desiredfile; | ||
| 24 | char *finalfile; | ||
| 25 | int i; | ||
| 26 | int doall=false; | ||
| 27 | static int cnt=0; | ||
| 28 | + gchar *command[5]; | ||
| 29 | + gchar *stdoutresponse = NULL; | ||
| 30 | + gchar *stderrresponse = NULL; | ||
| 31 | |||
| 32 | *_archivedir = NULL; | ||
| 33 | |||
| 34 | @@ -827,18 +830,30 @@ return( NULL ); | ||
| 35 | listfile = malloc(strlen(archivedir)+strlen("/" TOC_NAME)+1); | ||
| 36 | sprintf( listfile, "%s/" TOC_NAME, archivedir ); | ||
| 37 | |||
| 38 | - listcommand = malloc( strlen(archivers[i].unarchive) + 1 + | ||
| 39 | - strlen( archivers[i].listargs) + 1 + | ||
| 40 | - strlen( name ) + 3 + | ||
| 41 | - strlen( listfile ) +4 ); | ||
| 42 | - sprintf( listcommand, "%s %s %s > %s", archivers[i].unarchive, | ||
| 43 | - archivers[i].listargs, name, listfile ); | ||
| 44 | - if ( system(listcommand)!=0 ) { | ||
| 45 | - free(listcommand); free(listfile); | ||
| 46 | - ArchiveCleanup(archivedir); | ||
| 47 | -return( NULL ); | ||
| 48 | + command[0] = archivers[i].unarchive; | ||
| 49 | + command[1] = archivers[i].listargs; | ||
| 50 | + command[2] = name; | ||
| 51 | + command[3] = NULL; // command args need to be NULL-terminated | ||
| 52 | + | ||
| 53 | + if ( g_spawn_sync( | ||
| 54 | + NULL, | ||
| 55 | + command, | ||
| 56 | + NULL, | ||
| 57 | + G_SPAWN_SEARCH_PATH, | ||
| 58 | + NULL, | ||
| 59 | + NULL, | ||
| 60 | + &stdoutresponse, | ||
| 61 | + &stderrresponse, | ||
| 62 | + NULL, | ||
| 63 | + NULL | ||
| 64 | + ) == FALSE) { // did not successfully execute | ||
| 65 | + ArchiveCleanup(archivedir); | ||
| 66 | + return( NULL ); | ||
| 67 | } | ||
| 68 | - free(listcommand); | ||
| 69 | + // Write out the listfile to be read in later | ||
| 70 | + FILE *fp = fopen(listfile, "wb"); | ||
| 71 | + fwrite(stdoutresponse, strlen(stdoutresponse), 1, fp); | ||
| 72 | + fclose(fp); | ||
| 73 | |||
| 74 | desiredfile = ArchiveParseTOC(listfile, archivers[i].ars, &doall); | ||
| 75 | free(listfile); | ||
| 76 | @@ -847,22 +862,28 @@ return( NULL ); | ||
| 77 | return( NULL ); | ||
| 78 | } | ||
| 79 | |||
| 80 | - /* I tried sending everything to stdout, but that doesn't work if the */ | ||
| 81 | - /* output is a directory file (ufo, sfdir) */ | ||
| 82 | - unarchivecmd = malloc( strlen(archivers[i].unarchive) + 1 + | ||
| 83 | - strlen( archivers[i].listargs) + 1 + | ||
| 84 | - strlen( name ) + 1 + | ||
| 85 | - strlen( desiredfile ) + 3 + | ||
| 86 | - strlen( archivedir ) + 30 ); | ||
| 87 | - sprintf( unarchivecmd, "( cd %s ; %s %s %s %s ) > /dev/null", archivedir, | ||
| 88 | - archivers[i].unarchive, | ||
| 89 | - archivers[i].extractargs, name, doall ? "" : desiredfile ); | ||
| 90 | - if ( system(unarchivecmd)!=0 ) { | ||
| 91 | - free(unarchivecmd); free(desiredfile); | ||
| 92 | - ArchiveCleanup(archivedir); | ||
| 93 | -return( NULL ); | ||
| 94 | + command[0] = archivers[i].unarchive; | ||
| 95 | + command[1] = archivers[i].extractargs; | ||
| 96 | + command[2] = name; | ||
| 97 | + command[3] = doall ? "" : desiredfile; | ||
| 98 | + command[4] = NULL; | ||
| 99 | + | ||
| 100 | + if ( g_spawn_sync( | ||
| 101 | + (gchar*)archivedir, | ||
| 102 | + command, | ||
| 103 | + NULL, | ||
| 104 | + G_SPAWN_SEARCH_PATH, | ||
| 105 | + NULL, | ||
| 106 | + NULL, | ||
| 107 | + &stdoutresponse, | ||
| 108 | + &stderrresponse, | ||
| 109 | + NULL, | ||
| 110 | + NULL | ||
| 111 | + ) == FALSE) { // did not successfully execute | ||
| 112 | + free(desiredfile); | ||
| 113 | + ArchiveCleanup(archivedir); | ||
| 114 | + return( NULL ); | ||
| 115 | } | ||
| 116 | - free(unarchivecmd); | ||
| 117 | |||
| 118 | finalfile = malloc( strlen(archivedir) + 1 + strlen(desiredfile) + 1); | ||
| 119 | sprintf( finalfile, "%s/%s", archivedir, desiredfile ); | ||
| 120 | @@ -885,20 +906,54 @@ struct compressors compressors[] = { | ||
| 121 | |||
| 122 | char *Decompress(char *name, int compression) { | ||
| 123 | char *dir = getenv("TMPDIR"); | ||
| 124 | - char buf[1500]; | ||
| 125 | char *tmpfn; | ||
| 126 | - | ||
| 127 | + gchar *command[4]; | ||
| 128 | + gint stdout_pipe; | ||
| 129 | + gchar buffer[4096]; | ||
| 130 | + gssize bytes_read; | ||
| 131 | + GByteArray *binary_data = g_byte_array_new(); | ||
| 132 | + | ||
| 133 | if ( dir==NULL ) dir = P_tmpdir; | ||
| 134 | tmpfn = malloc(strlen(dir)+strlen(GFileNameTail(name))+2); | ||
| 135 | strcpy(tmpfn,dir); | ||
| 136 | strcat(tmpfn,"/"); | ||
| 137 | strcat(tmpfn,GFileNameTail(name)); | ||
| 138 | *strrchr(tmpfn,'.') = '\0'; | ||
| 139 | - snprintf( buf, sizeof(buf), "%s < %s > %s", compressors[compression].decomp, name, tmpfn ); | ||
| 140 | - if ( system(buf)==0 ) | ||
| 141 | -return( tmpfn ); | ||
| 142 | - free(tmpfn); | ||
| 143 | -return( NULL ); | ||
| 144 | + | ||
| 145 | + command[0] = compressors[compression].decomp; | ||
| 146 | + command[1] = "-c"; | ||
| 147 | + command[2] = name; | ||
| 148 | + command[3] = NULL; | ||
| 149 | + | ||
| 150 | + // Have to use async because g_spawn_sync doesn't handle nul-bytes in the output (which happens with binary data) | ||
| 151 | + if (g_spawn_async_with_pipes( | ||
| 152 | + NULL, | ||
| 153 | + command, | ||
| 154 | + NULL, | ||
| 155 | + G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, | ||
| 156 | + NULL, | ||
| 157 | + NULL, | ||
| 158 | + NULL, | ||
| 159 | + NULL, | ||
| 160 | + &stdout_pipe, | ||
| 161 | + NULL, | ||
| 162 | + NULL) == FALSE) { | ||
| 163 | + //command has failed | ||
| 164 | + return( NULL ); | ||
| 165 | + } | ||
| 166 | + | ||
| 167 | + // Read binary data from pipe and output to file | ||
| 168 | + while ((bytes_read = read(stdout_pipe, buffer, sizeof(buffer))) > 0) { | ||
| 169 | + g_byte_array_append(binary_data, (guint8 *)buffer, bytes_read); | ||
| 170 | + } | ||
| 171 | + close(stdout_pipe); | ||
| 172 | + | ||
| 173 | + FILE *fp = fopen(tmpfn, "wb"); | ||
| 174 | + fwrite(binary_data->data, sizeof(gchar), binary_data->len, fp); | ||
| 175 | + fclose(fp); | ||
| 176 | + g_byte_array_free(binary_data, TRUE); | ||
| 177 | + | ||
| 178 | + return(tmpfn); | ||
| 179 | } | ||
| 180 | |||
| 181 | static char *ForceFileToHaveName(FILE *file, char *exten) { | ||
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15269.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15269.patch new file mode 100644 index 0000000000..a3e26d407a --- /dev/null +++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15269.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From 6a23476bc5eea880f3f24496710a6133c92a198b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sat, 10 Jan 2026 20:06:53 +0100 | ||
| 4 | Subject: [PATCH] Fix CVE-2025-15269: Use-after-free in SFD ligature parsing | ||
| 5 | (#5722) | ||
| 6 | |||
| 7 | From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com> | ||
| 8 | |||
| 9 | Prevent circular linked list in LigaCreateFromOldStyleMultiple by clearing | ||
| 10 | the next pointer after shallow copy. The shallow copy propagates liga's | ||
| 11 | modified next pointer from previous iterations, creating a cycle that | ||
| 12 | causes double-free when the list is traversed and freed. | ||
| 13 | |||
| 14 | Fixes: CVE-2025-15269 | ZDI-25-1195 | ZDI-CAN-28564 | ||
| 15 | |||
| 16 | Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com> | ||
| 17 | |||
| 18 | CVE: CVE-2025-15269 | ||
| 19 | Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/6aea6db5da332d8ac94e3501bb83c1b21f52074d] | ||
| 20 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 21 | --- | ||
| 22 | fontforge/sfd.c | 1 + | ||
| 23 | 1 file changed, 1 insertion(+) | ||
| 24 | |||
| 25 | diff --git a/fontforge/sfd.c b/fontforge/sfd.c | ||
| 26 | index e19d3a30f..be4220515 100644 | ||
| 27 | --- a/fontforge/sfd.c | ||
| 28 | +++ b/fontforge/sfd.c | ||
| 29 | @@ -4647,6 +4647,7 @@ static PST1 *LigaCreateFromOldStyleMultiple(PST1 *liga) { | ||
| 30 | while ( (pt = strrchr(liga->pst.u.lig.components,';'))!=NULL ) { | ||
| 31 | new = chunkalloc(sizeof( PST1 )); | ||
| 32 | *new = *liga; | ||
| 33 | + new->pst.next = NULL; | ||
| 34 | new->pst.u.lig.components = copy(pt+1); | ||
| 35 | last->pst.next = (PST *) new; | ||
| 36 | last = new; | ||
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15270.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15270.patch new file mode 100644 index 0000000000..2ff0fd0b08 --- /dev/null +++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15270.patch | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | From 99067ccd695619686646905e637993f0654abb41 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sat, 31 Jan 2026 21:23:41 +0100 | ||
| 4 | Subject: [PATCH] Fix CVE-2025-15270: Heap buffer overflow in SFD kern class | ||
| 5 | parsing (#5743) | ||
| 6 | |||
| 7 | From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com> | ||
| 8 | |||
| 9 | Fixes: CVE-2025-15270 | ZDI-25-1194 | ZDI-CAN-28563 | ||
| 10 | |||
| 11 | Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com> | ||
| 12 | |||
| 13 | CVE: CVE-2025-15270 | ||
| 14 | Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/d01333a5bfa2ac4ed698c24b323d02107deacad7] | ||
| 15 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 16 | --- | ||
| 17 | fontforge/sfd.c | 8 ++++++++ | ||
| 18 | 1 file changed, 8 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/fontforge/sfd.c b/fontforge/sfd.c | ||
| 21 | index be4220515..d550f02fb 100644 | ||
| 22 | --- a/fontforge/sfd.c | ||
| 23 | +++ b/fontforge/sfd.c | ||
| 24 | @@ -8147,6 +8147,10 @@ bool SFD_GetFontMetaData( FILE *sfd, | ||
| 25 | for ( i=classstart; i<kc->first_cnt; ++i ) { | ||
| 26 | if (kernclassversion < 3) { | ||
| 27 | getint(sfd,&temp); | ||
| 28 | + if (temp < 0) { | ||
| 29 | + LogError(_("Corrupted SFD file: Invalid kern class name length %d. Aborting load."), temp); | ||
| 30 | + return false; | ||
| 31 | + } | ||
| 32 | kc->firsts[i] = malloc(temp+1); kc->firsts[i][temp] = '\0'; | ||
| 33 | nlgetc(sfd); /* skip space */ | ||
| 34 | fread(kc->firsts[i],1,temp,sfd); | ||
| 35 | @@ -8164,6 +8168,10 @@ bool SFD_GetFontMetaData( FILE *sfd, | ||
| 36 | for ( i=1; i<kc->second_cnt; ++i ) { | ||
| 37 | if (kernclassversion < 3) { | ||
| 38 | getint(sfd,&temp); | ||
| 39 | + if (temp < 0) { | ||
| 40 | + LogError(_("Corrupted SFD file: Invalid kern class name length %d. Aborting load."), temp); | ||
| 41 | + return false; | ||
| 42 | + } | ||
| 43 | kc->seconds[i] = malloc(temp+1); kc->seconds[i][temp] = '\0'; | ||
| 44 | nlgetc(sfd); /* skip space */ | ||
| 45 | fread(kc->seconds[i],1,temp,sfd); | ||
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15275.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15275.patch new file mode 100644 index 0000000000..d3d00fd9ac --- /dev/null +++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15275.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From 8aed4d992db246a537d07862f31dd04698c3f7e2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Fri, 9 Jan 2026 16:58:23 +0100 | ||
| 4 | Subject: [PATCH] Fix CVE-2025-15275: Heap buffer overflow in SFD image parsing | ||
| 5 | (#5721) | ||
| 6 | |||
| 7 | From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com> | ||
| 8 | |||
| 9 | Fixes: CVE-2025-15275 | ZDI-25-1189 | ZDI-CAN-28543 | ||
| 10 | |||
| 11 | Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com> | ||
| 12 | |||
| 13 | CVE: CVE-2025-15275 | ||
| 14 | Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/7195402701ace7783753ef9424153eff48c9af44] | ||
| 15 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 16 | --- | ||
| 17 | fontforge/sfd.c | 4 ++++ | ||
| 18 | 1 file changed, 4 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/fontforge/sfd.c b/fontforge/sfd.c | ||
| 21 | index 149941148..e19d3a30f 100644 | ||
| 22 | --- a/fontforge/sfd.c | ||
| 23 | +++ b/fontforge/sfd.c | ||
| 24 | @@ -3585,6 +3585,10 @@ static ImageList *SFDGetImage(FILE *sfd) { | ||
| 25 | getint(sfd,&image_type); | ||
| 26 | getint(sfd,&bpl); | ||
| 27 | getint(sfd,&clutlen); | ||
| 28 | + if ( clutlen < 0 || clutlen > 256 ) { | ||
| 29 | + LogError(_("Invalid clut length %d in sfd file, must be between 0 and 256"), clutlen); | ||
| 30 | + return NULL; | ||
| 31 | + } | ||
| 32 | gethex(sfd,&trans); | ||
| 33 | image = GImageCreate(image_type,width,height); | ||
| 34 | base = image->list_len==0?image->u.image:image->u.images[0]; | ||
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-1.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-1.patch new file mode 100644 index 0000000000..17f33f41ff --- /dev/null +++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-1.patch | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | From ce71f0cdce556f56c5207a33a1be3830a73cc04f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Thu, 8 Jan 2026 15:47:43 +0100 | ||
| 4 | Subject: [PATCH] Fix CVE-2025-15279: Heap buffer overflow in BMP RLE | ||
| 5 | decompression (#5720) | ||
| 6 | |||
| 7 | From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com> | ||
| 8 | |||
| 9 | CVSS: 7.8 (High) | ||
| 10 | ZDI-CAN-27517 | ||
| 11 | Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com> | ||
| 12 | |||
| 13 | CVE: CVE-2025-15279 | ||
| 14 | Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/7d67700cf8888e0bb37b453ad54ed932c8587073] | ||
| 15 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 16 | --- | ||
| 17 | gutils/gimagereadbmp.c | 6 ++++++ | ||
| 18 | 1 file changed, 6 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/gutils/gimagereadbmp.c b/gutils/gimagereadbmp.c | ||
| 21 | index 5a137e28a..133336787 100644 | ||
| 22 | --- a/gutils/gimagereadbmp.c | ||
| 23 | +++ b/gutils/gimagereadbmp.c | ||
| 24 | @@ -181,12 +181,18 @@ static int readpixels(FILE *file,struct bmpheader *head) { | ||
| 25 | int ii = 0; | ||
| 26 | while ( ii<head->height*head->width ) { | ||
| 27 | int cnt = getc(file); | ||
| 28 | + if (cnt < 0 || ii + cnt > head->height * head->width) { | ||
| 29 | + return 0; | ||
| 30 | + } | ||
| 31 | if ( cnt!=0 ) { | ||
| 32 | int ch = getc(file); | ||
| 33 | while ( --cnt>=0 ) | ||
| 34 | head->byte_pixels[ii++] = ch; | ||
| 35 | } else { | ||
| 36 | cnt = getc(file); | ||
| 37 | + if (cnt < 0 || ii + cnt > head->height * head->width) { | ||
| 38 | + return 0; | ||
| 39 | + } | ||
| 40 | if ( cnt>= 3 ) { | ||
| 41 | int odd = cnt&1; | ||
| 42 | while ( --cnt>=0 ) | ||
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-2.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-2.patch new file mode 100644 index 0000000000..840a37a8a9 --- /dev/null +++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-2.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From 4cd078071e2487f052ec997ee13bb910d796587b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Mon, 12 Jan 2026 22:45:16 +0100 | ||
| 4 | Subject: [PATCH] Fix CVE-2025-15279: Move bounds check inside cnt >= 3 block | ||
| 5 | (#5723) | ||
| 6 | |||
| 7 | From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com> | ||
| 8 | |||
| 9 | Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com> | ||
| 10 | |||
| 11 | CVE: CVE-2025-15279 | ||
| 12 | Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/720ea95020c964202928afd2e93b0f5fac11027e] | ||
| 13 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 14 | --- | ||
| 15 | gutils/gimagereadbmp.c | 6 +++--- | ||
| 16 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/gutils/gimagereadbmp.c b/gutils/gimagereadbmp.c | ||
| 19 | index 133336787..ad365158c 100644 | ||
| 20 | --- a/gutils/gimagereadbmp.c | ||
| 21 | +++ b/gutils/gimagereadbmp.c | ||
| 22 | @@ -190,10 +190,10 @@ static int readpixels(FILE *file,struct bmpheader *head) { | ||
| 23 | head->byte_pixels[ii++] = ch; | ||
| 24 | } else { | ||
| 25 | cnt = getc(file); | ||
| 26 | - if (cnt < 0 || ii + cnt > head->height * head->width) { | ||
| 27 | - return 0; | ||
| 28 | - } | ||
| 29 | if ( cnt>= 3 ) { | ||
| 30 | + if (ii + cnt > head->height * head->width) { | ||
| 31 | + return 0; | ||
| 32 | + } | ||
| 33 | int odd = cnt&1; | ||
| 34 | while ( --cnt>=0 ) | ||
| 35 | head->byte_pixels[ii++] = getc(file); | ||
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20251009.bb index af77ec913e..8d65f69354 100644 --- a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb +++ b/meta-oe/recipes-graphics/fontforge/fontforge_20251009.bb | |||
| @@ -7,23 +7,29 @@ LIC_FILES_CHKSUM = " \ | |||
| 7 | " | 7 | " |
| 8 | 8 | ||
| 9 | DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native libspiro" | 9 | DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native libspiro" |
| 10 | DEPENDS:append:class-target = " libxi" | 10 | DEPENDS:append:class-target = " gtkmm3" |
| 11 | 11 | ||
| 12 | inherit cmake pkgconfig python3native python3targetconfig features_check gettext gtk-icon-cache mime mime-xdg | 12 | inherit cmake pkgconfig python3native python3targetconfig features_check gettext gtk-icon-cache mime mime-xdg |
| 13 | 13 | ||
| 14 | REQUIRED_DISTRO_FEATURES:append:class-target = " x11" | 14 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 15 | 15 | ||
| 16 | # tag 20220308 | 16 | SRCREV = "c41bdb922285f35defd1e1385adfd13bde1ab32a" |
| 17 | SRCREV = "a1dad3e81da03d5d5f3c4c1c1b9b5ca5ebcfcecf" | 17 | SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https;tag=${PV} \ |
| 18 | SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ | ||
| 19 | file://0001-include-sys-select-on-non-glibc-platforms.patch \ | 18 | file://0001-include-sys-select-on-non-glibc-platforms.patch \ |
| 20 | file://0001-fontforgeexe-Use-env-to-find-fontforge.patch \ | 19 | file://0001-fontforgeexe-Use-env-to-find-fontforge.patch \ |
| 21 | file://0001-cmake-Use-alternate-way-to-detect-libm.patch \ | 20 | file://0001-cmake-Use-alternate-way-to-detect-libm.patch \ |
| 22 | file://0001-Fix-Translations-containing-invalid-directives-hs.patch \ | 21 | file://CVE-2025-15279-1.patch \ |
| 23 | file://CVE-2024-25081_CVE-2024-25082.patch \ | 22 | file://CVE-2025-15279-2.patch \ |
| 24 | " | 23 | file://CVE-2025-15275.patch \ |
| 24 | file://CVE-2025-15269.patch \ | ||
| 25 | file://CVE-2025-15270.patch \ | ||
| 26 | " | ||
| 25 | 27 | ||
| 26 | EXTRA_OECMAKE = "-DENABLE_DOCS=OFF" | 28 | EXTRA_OECMAKE = "-DENABLE_DOCS=OFF" |
| 29 | |||
| 30 | # gui requires gtkmm3, which has no native version at the time of writing this comment | ||
| 31 | EXTRA_OECMAKE:append:class-native = " -DENABLE_GUI=OFF" | ||
| 32 | |||
| 27 | PACKAGECONFIG = "readline" | 33 | PACKAGECONFIG = "readline" |
| 28 | PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline" | 34 | PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline" |
| 29 | 35 | ||
| @@ -31,12 +37,6 @@ CFLAGS += "-fno-strict-aliasing" | |||
| 31 | LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" | 37 | LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" |
| 32 | BUILD_LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" | 38 | BUILD_LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" |
| 33 | 39 | ||
| 34 | #do_configure:prepend() { | ||
| 35 | # uthash sources are expected in uthash/src | ||
| 36 | # mkdir -p ${S}/uthash/src | ||
| 37 | # cp ${STAGING_INCDIR}/ut*.h ${S}/uthash/src | ||
| 38 | #} | ||
| 39 | |||
| 40 | PACKAGES =+ "${PN}-python" | 40 | PACKAGES =+ "${PN}-python" |
| 41 | 41 | ||
| 42 | FILES:${PN} += " \ | 42 | FILES:${PN} += " \ |
diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb index 959463e962..e8ad2aad0f 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb | |||
| @@ -119,9 +119,6 @@ FILES:${PN}-doc = " \ | |||
| 119 | ${mandir} \ | 119 | ${mandir} \ |
| 120 | ${datadir}/fvwm \ | 120 | ${datadir}/fvwm \ |
| 121 | " | 121 | " |
| 122 | RDEPENDS:${PN} = " \ | ||
| 123 | xuser-account \ | ||
| 124 | " | ||
| 125 | RDEPENDS:${PN}-extra += "\ | 122 | RDEPENDS:${PN}-extra += "\ |
| 126 | perl \ | 123 | perl \ |
| 127 | python3-core \ | 124 | python3-core \ |
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_14.0.4.bb b/meta-oe/recipes-graphics/graphviz/graphviz_14.1.3.bb index 3188c8afd5..d885dc43ac 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_14.0.4.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_14.1.3.bb | |||
| @@ -23,7 +23,7 @@ SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-re | |||
| 23 | SRC_URI:append:class-nativesdk = "\ | 23 | SRC_URI:append:class-nativesdk = "\ |
| 24 | file://graphviz-setup.sh \ | 24 | file://graphviz-setup.sh \ |
| 25 | " | 25 | " |
| 26 | SRC_URI[sha256sum] = "a005977de2fec13753f5bde767cf97fdc28ac54bfd6a2737c563748bc4f32317" | 26 | SRC_URI[sha256sum] = "fe76529477c22c0cf833ec5a35b430cf710f4705afc465d86292bf13560be584" |
| 27 | 27 | ||
| 28 | UPSTREAM_CHECK_URI = "https://graphviz.org/download/" | 28 | UPSTREAM_CHECK_URI = "https://graphviz.org/download/" |
| 29 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 29 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-oe/recipes-graphics/jasper/jasper_4.2.8.bb b/meta-oe/recipes-graphics/jasper/jasper_4.2.9.bb index e00b56ddbf..b48fff7081 100644 --- a/meta-oe/recipes-graphics/jasper/jasper_4.2.8.bb +++ b/meta-oe/recipes-graphics/jasper/jasper_4.2.9.bb | |||
| @@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a80440d1d8f17d041c71c7271d6e06eb" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a80440d1d8f17d041c71c7271d6e06eb" |
| 5 | 5 | ||
| 6 | SRC_URI = "https://github.com/jasper-software/${BPN}/releases/download/version-${PV}/${BP}.tar.gz" | 6 | SRC_URI = "https://github.com/jasper-software/${BPN}/releases/download/version-${PV}/${BP}.tar.gz" |
| 7 | SRC_URI[sha256sum] = "98058a94fbff57ec6e31dcaec37290589de0ba6f47c966f92654681a56c71fae" | 7 | SRC_URI[sha256sum] = "f71cf643937a5fcaedcfeb30a22ba406912948ad4413148214df280afc425454" |
| 8 | 8 | ||
| 9 | UPSTREAM_CHECK_URI = "https://github.com/jasper-software/jasper/releases" | 9 | UPSTREAM_CHECK_URI = "https://github.com/jasper-software/jasper/releases" |
| 10 | UPSTREAM_CHECK_REGEX = "releases/tag/version-(?P<pver>\d+(\.\d+)+)" | 10 | UPSTREAM_CHECK_REGEX = "releases/tag/version-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-oe/recipes-graphics/kmscon/files/0001-kmscon_conf.c-Fix-llvm-compilation-failure.patch b/meta-oe/recipes-graphics/kmscon/files/0001-kmscon_conf.c-Fix-llvm-compilation-failure.patch deleted file mode 100644 index 0806f9bb04..0000000000 --- a/meta-oe/recipes-graphics/kmscon/files/0001-kmscon_conf.c-Fix-llvm-compilation-failure.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 03a330d486132e3798a125d26d4f10252ffd8e2d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Adam Duskett <adam.duskett@amarulasolutions.com> | ||
| 3 | Date: Fri, 16 Jan 2026 11:35:39 +0100 | ||
| 4 | Subject: [PATCH] kmscon_conf.c: Fix llvm compilation failure | ||
| 5 | |||
| 6 | When building with an LLVM toolchain, the follow error occurs: | ||
| 7 | |||
| 8 | ``` | ||
| 9 | kmscon_conf.c:757:72: | ||
| 10 | error: expression which evaluates to zero treated as a null pointer constant | ||
| 11 | of type 'void *' [-Werror,-Wnon-literal-null-conversion] | ||
| 12 | CONF_OPTION(0, 0, "gpus", &conf_gpus, NULL, NULL, NULL, &conf->gpus, KMSCON_GPU_ALL), | ||
| 13 | ^~~~~~~~~~~~~~ | ||
| 14 | 1 error generated. | ||
| 15 | ``` | ||
| 16 | |||
| 17 | Fix the error by adding a cast to (void *). | ||
| 18 | |||
| 19 | Upstream-Status: Submitted [https://github.com/kmscon/kmscon/pull/225] | ||
| 20 | Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> | ||
| 21 | --- | ||
| 22 | src/kmscon_conf.c | 2 +- | ||
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 24 | |||
| 25 | diff --git a/src/kmscon_conf.c b/src/kmscon_conf.c | ||
| 26 | index df2e51d..9e9a839 100644 | ||
| 27 | --- a/src/kmscon_conf.c | ||
| 28 | +++ b/src/kmscon_conf.c | ||
| 29 | @@ -754,7 +754,7 @@ int kmscon_conf_new(struct conf_ctx **out) | ||
| 30 | /* Video Options */ | ||
| 31 | CONF_OPTION_BOOL_FULL(0, "drm", aftercheck_drm, NULL, NULL, &conf->drm, true), | ||
| 32 | CONF_OPTION_BOOL(0, "hwaccel", &conf->hwaccel, false), | ||
| 33 | - CONF_OPTION(0, 0, "gpus", &conf_gpus, NULL, NULL, NULL, &conf->gpus, KMSCON_GPU_ALL), | ||
| 34 | + CONF_OPTION(0, 0, "gpus", &conf_gpus, NULL, NULL, NULL, &conf->gpus, (void *)KMSCON_GPU_ALL), | ||
| 35 | CONF_OPTION_STRING(0, "render-engine", &conf->render_engine, NULL), | ||
| 36 | CONF_OPTION_BOOL(0, "use-original-mode", &conf->use_original_mode, true), | ||
| 37 | CONF_OPTION_STRING(0, "mode", &conf->mode, NULL), | ||
| 38 | -- | ||
| 39 | 2.52.0 | ||
| 40 | |||
diff --git a/meta-oe/recipes-graphics/kmscon/kmscon_9.2.1.bb b/meta-oe/recipes-graphics/kmscon/kmscon_9.3.2.bb index 508f24c58e..2db5162857 100644 --- a/meta-oe/recipes-graphics/kmscon/kmscon_9.2.1.bb +++ b/meta-oe/recipes-graphics/kmscon/kmscon_9.3.2.bb | |||
| @@ -19,17 +19,13 @@ DEPENDS = "\ | |||
| 19 | udev \ | 19 | udev \ |
| 20 | " | 20 | " |
| 21 | 21 | ||
| 22 | SRC_URI = "\ | 22 | SRC_URI = "git://github.com/kmscon/kmscon;protocol=https;branch=main;tag=v${PV}" |
| 23 | git://github.com/kmscon/kmscon;branch=main;protocol=https \ | 23 | SRCREV = "9ce1dc0dc639e54e243a21d93e13f502a746f0a8" |
| 24 | file://0001-kmscon_conf.c-Fix-llvm-compilation-failure.patch \ | ||
| 25 | " | ||
| 26 | SRCREV = "7d46650dbb0826f9b89de42f879be879391c14fd" | ||
| 27 | 24 | ||
| 28 | inherit meson pkgconfig systemd | 25 | inherit meson pkgconfig systemd |
| 29 | 26 | ||
| 30 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" | 27 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" |
| 31 | 28 | ||
| 32 | PACKAGECONFIG[backspace_sends_delete] = "-Dbackspace_sends_delete=true, -Dbackspace_sends_delete=false" | ||
| 33 | PACKAGECONFIG[font_pango] = "-Dfont_pango=enabled, -Dfont_pango=disabled, pango" | 29 | PACKAGECONFIG[font_pango] = "-Dfont_pango=enabled, -Dfont_pango=disabled, pango" |
| 34 | PACKAGECONFIG[multi_seat] = "-Dmulti_seat=enabled, -Dmulti_seat=disabled, systemd" | 30 | PACKAGECONFIG[multi_seat] = "-Dmulti_seat=enabled, -Dmulti_seat=disabled, systemd" |
| 35 | PACKAGECONFIG[opengl] = "-Drenderer_gltex=enabled -Dvideo_drm3d=enabled, -Drenderer_gltex=disabled -Dvideo_drm3d=disabled, libdrm virtual/egl virtual/libgles2 virtual/libgbm" | 31 | PACKAGECONFIG[opengl] = "-Drenderer_gltex=enabled -Dvideo_drm3d=enabled, -Drenderer_gltex=disabled -Dvideo_drm3d=disabled, libdrm virtual/egl virtual/libgles2 virtual/libgbm" |
| @@ -61,9 +57,9 @@ do_install:append() { | |||
| 61 | fi | 57 | fi |
| 62 | 58 | ||
| 63 | if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'true', 'false', d)}; then | 59 | if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'true', 'false', d)}; then |
| 60 | mv ${D}${sysconfdir}/kmscon/kmscon.conf.example ${D}${sysconfdir}/kmscon/kmscon.conf | ||
| 64 | sed -e "s@#drm@drm@g" \ | 61 | sed -e "s@#drm@drm@g" \ |
| 65 | -e "s@#hwaccel@hwaccel@g" \ | 62 | -e "s@#hwaccel@hwaccel@g" \ |
| 66 | -e "s@#render-engine=gltex@render-engine=gltex@g" \ | ||
| 67 | -i ${D}${sysconfdir}/kmscon/kmscon.conf | 63 | -i ${D}${sysconfdir}/kmscon/kmscon.conf |
| 68 | fi | 64 | fi |
| 69 | } | 65 | } |
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.58.bb b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.64.bb index 8bbc23fde4..c83b90f77b 100644 --- a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.58.bb +++ b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.64.bb | |||
| @@ -8,10 +8,10 @@ BUGTRACKER = "http://bugzilla.libsdl.org/" | |||
| 8 | SECTION = "libs" | 8 | SECTION = "libs" |
| 9 | 9 | ||
| 10 | LICENSE = "Zlib" | 10 | LICENSE = "Zlib" |
| 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=98241180d857fe975e4b60d44d6c01a5" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca6eaff208365238403badb97aa6b3d2" |
| 12 | 12 | ||
| 13 | SRC_URI = "http://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz" | 13 | SRC_URI = "http://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz" |
| 14 | SRC_URI[sha256sum] = "ae85222c007f7e2acb927c7a47c12726f56478c6f3f35ee0da1ac929f8beb53e" | 14 | SRC_URI[sha256sum] = "b2fa522e7bb08113534904b3dc2d2f7ff7b0c259224d86c12374d5b4a4027930" |
| 15 | S = "${UNPACKDIR}/sdl2-compat-${PV}" | 15 | S = "${UNPACKDIR}/sdl2-compat-${PV}" |
| 16 | 16 | ||
| 17 | DEPENDS += "libsdl3" | 17 | DEPENDS += "libsdl3" |
| @@ -20,7 +20,10 @@ PROVIDES = "virtual/libsdl2" | |||
| 20 | 20 | ||
| 21 | inherit cmake pkgconfig upstream-version-is-even features_check | 21 | inherit cmake pkgconfig upstream-version-is-even features_check |
| 22 | 22 | ||
| 23 | REQUIRED_DISTRO_FEATURES = "opengl x11" | 23 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 24 | |||
| 25 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | ||
| 26 | PACKAGECONFIG[x11] = "-DSDL2COMPAT_X11=ON,-DSDL2COMPAT_X11=OFF,virtual/libx11" | ||
| 24 | 27 | ||
| 25 | do_install:append() { | 28 | do_install:append() { |
| 26 | mv ${D}${libdir}/pkgconfig/sdl2-compat.pc ${D}${libdir}/pkgconfig/sdl2.pc | 29 | mv ${D}${libdir}/pkgconfig/sdl2-compat.pc ${D}${libdir}/pkgconfig/sdl2.pc |
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.6.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.6.bb deleted file mode 100644 index 7c2f4026f2..0000000000 --- a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.6.bb +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | SUMMARY = "Simple DirectMedia Layer image library v2" | ||
| 2 | SECTION = "libs" | ||
| 3 | |||
| 4 | LICENSE = "Zlib" | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455" | ||
| 6 | |||
| 7 | DEPENDS = "tiff zlib libpng jpeg libsdl3 libwebp" | ||
| 8 | |||
| 9 | SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.2.x" | ||
| 10 | SRCREV = "d78dd65454f442bfdbc373201165f1ef579484ab" | ||
| 11 | |||
| 12 | |||
| 13 | inherit cmake pkgconfig | ||
| 14 | |||
| 15 | FILES:${PN} += "${datadir}/licenses" | ||
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb new file mode 100644 index 0000000000..324332eb84 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | SUMMARY = "Simple DirectMedia Layer image library v2" | ||
| 2 | SECTION = "libs" | ||
| 3 | |||
| 4 | LICENSE = "Zlib" | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=df8f4d887d3997f6e9cf81bb7f43dbf7" | ||
| 6 | |||
| 7 | DEPENDS = "tiff zlib libpng jpeg libsdl3 libwebp libjxl" | ||
| 8 | |||
| 9 | SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.4.x" | ||
| 10 | SRCREV = "ad58ecfc27a1bd09e510ceff8bbbdb1094806476" | ||
| 11 | |||
| 12 | EXTRA_OECMAKE += "-DSDLIMAGE_JXL=ON" | ||
| 13 | |||
| 14 | PACKAGECONFIG ?= "" | ||
| 15 | PACKAGECONFIG[av1] = "-DSDLIMAGE_AVIF=ON,-DSDLIMAGE_AVIF=OFF,libavif" | ||
| 16 | |||
| 17 | inherit cmake pkgconfig | ||
| 18 | |||
| 19 | FILES:${PN} += "${datadir}/licenses" | ||
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.30.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.2.bb index bb111050e1..d6501f855c 100644 --- a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.30.bb +++ b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.2.bb | |||
| @@ -8,18 +8,17 @@ BUGTRACKER = "http://bugzilla.libsdl.org/" | |||
| 8 | SECTION = "libs" | 8 | SECTION = "libs" |
| 9 | 9 | ||
| 10 | LICENSE = "Zlib & BSD-2-Clause" | 10 | LICENSE = "Zlib & BSD-2-Clause" |
| 11 | LIC_FILES_CHKSUM = "\ | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=036a54229112040a743509a86b30c80c \ |
| 12 | file://LICENSE.txt;md5=cbf0e3161523f9a9315b6b915c5c4457 \ | 12 | file://src/hidapi/LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077 \ |
| 13 | file://src/hidapi/LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077 \ | 13 | file://src/hidapi/LICENSE-bsd.txt;md5=b5fa085ce0926bb50d0621620a82361f \ |
| 14 | file://src/hidapi/LICENSE-bsd.txt;md5=b5fa085ce0926bb50d0621620a82361f \ | 14 | file://src/video/yuv2rgb/LICENSE;md5=79f8f3418d91531e05f0fc94ca67e071 \ |
| 15 | file://src/video/yuv2rgb/LICENSE;md5=79f8f3418d91531e05f0fc94ca67e071 \ | 15 | " |
| 16 | " | ||
| 17 | 16 | ||
| 18 | SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz" | 17 | SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz" |
| 19 | 18 | ||
| 20 | S = "${UNPACKDIR}/SDL3-${PV}" | 19 | S = "${UNPACKDIR}/SDL3-${PV}" |
| 21 | 20 | ||
| 22 | SRC_URI[sha256sum] = "4c3b09330d866dc52eb65b66259a6684ad387252ca8c57901b3a2b534eb42e3d" | 21 | SRC_URI[sha256sum] = "ef39a2e3f9a8a78296c40da701967dd1b0d0d6e267e483863ce70f8a03b4050c" |
| 23 | 22 | ||
| 24 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even | 23 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even |
| 25 | 24 | ||
| @@ -33,10 +32,8 @@ EXTRA_OECMAKE = " \ | |||
| 33 | -DSDL_PTHREADS=ON \ | 32 | -DSDL_PTHREADS=ON \ |
| 34 | -DSDL_RPATH=OFF \ | 33 | -DSDL_RPATH=OFF \ |
| 35 | -DSDL_SNDIO=OFF \ | 34 | -DSDL_SNDIO=OFF \ |
| 36 | -DSDL_X11_XCURSOR=OFF \ | ||
| 37 | -DSDL_X11_XDBE=OFF \ | 35 | -DSDL_X11_XDBE=OFF \ |
| 38 | -DSDL_X11_XFIXES=OFF \ | 36 | -DSDL_X11_XFIXES=OFF \ |
| 39 | -DSDL_X11_XINPUT=OFF \ | ||
| 40 | -DSDL_X11_XSCRNSAVER=OFF \ | 37 | -DSDL_X11_XSCRNSAVER=OFF \ |
| 41 | -DSDL_X11_XSHAPE=OFF \ | 38 | -DSDL_X11_XSHAPE=OFF \ |
| 42 | " | 39 | " |
| @@ -69,7 +66,7 @@ PACKAGECONFIG[pipewire] = "-DSDL_PIPEWIRE_SHARED=ON,-DSDL_PIPEWIRE_SHARED=OFF,pi | |||
| 69 | PACKAGECONFIG[pulseaudio] = "-DSDL_PULSEAUDIO=ON,-DSDL_PULSEAUDIO=OFF,pulseaudio" | 66 | PACKAGECONFIG[pulseaudio] = "-DSDL_PULSEAUDIO=ON,-DSDL_PULSEAUDIO=OFF,pulseaudio" |
| 70 | PACKAGECONFIG[vulkan] = "-DSDL_VULKAN=ON -DSDL_RENDER_VULKAN=ON,-DSDL_VULKAN=OFF -DSDL_RENDER_VULKAN=OFF" | 67 | PACKAGECONFIG[vulkan] = "-DSDL_VULKAN=ON -DSDL_RENDER_VULKAN=ON,-DSDL_VULKAN=OFF -DSDL_RENDER_VULKAN=OFF" |
| 71 | PACKAGECONFIG[wayland] = "-DSDL_WAYLAND=ON,-DSDL_WAYLAND=OFF,wayland-native wayland wayland-protocols libxkbcommon" | 68 | PACKAGECONFIG[wayland] = "-DSDL_WAYLAND=ON,-DSDL_WAYLAND=OFF,wayland-native wayland wayland-protocols libxkbcommon" |
| 72 | PACKAGECONFIG[x11] = "-DSDL_X11=ON,-DSDL_X11=OFF,virtual/libx11 libxext libxrandr libxrender" | 69 | PACKAGECONFIG[x11] = "-DSDL_X11=ON,-DSDL_X11=OFF,virtual/libx11 libxext libxrandr libxrender libxcursor xinput libxtst" |
| 73 | 70 | ||
| 74 | CFLAGS:append:class-native = " -DNO_SHARED_MEMORY" | 71 | CFLAGS:append:class-native = " -DNO_SHARED_MEMORY" |
| 75 | 72 | ||
diff --git a/meta-oe/recipes-graphics/libtsm/libtsm_4.4.0.bb b/meta-oe/recipes-graphics/libtsm/libtsm_4.4.2.bb index 1764ba628a..6f060cd0f5 100644 --- a/meta-oe/recipes-graphics/libtsm/libtsm_4.4.0.bb +++ b/meta-oe/recipes-graphics/libtsm/libtsm_4.4.2.bb | |||
| @@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "\ | |||
| 22 | DEPENDS = "xkeyboard-config" | 22 | DEPENDS = "xkeyboard-config" |
| 23 | 23 | ||
| 24 | SRC_URI = "git://github.com/kmscon/libtsm;protocol=https;branch=main;tag=v${PV}" | 24 | SRC_URI = "git://github.com/kmscon/libtsm;protocol=https;branch=main;tag=v${PV}" |
| 25 | SRCREV = "0d33498a6de3619628f7802a0c76fc98c8773d5b" | 25 | SRCREV = "b052e48cc776be1cdb940be2dcc1603457c01c96" |
| 26 | 26 | ||
| 27 | inherit meson pkgconfig | 27 | inherit meson pkgconfig |
| 28 | 28 | ||
| @@ -31,5 +31,3 @@ EXTRA_OEMESON:append = " \ | |||
| 31 | -Dtests=false \ | 31 | -Dtests=false \ |
| 32 | -Dgtktsm=false \ | 32 | -Dgtktsm=false \ |
| 33 | " | 33 | " |
| 34 | |||
| 35 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-oe/recipes-graphics/openbox/obconf_git.bb index 917492c982..04f10f138b 100644 --- a/meta-oe/recipes-graphics/openbox/obconf_git.bb +++ b/meta-oe/recipes-graphics/openbox/obconf_git.bb | |||
| @@ -10,12 +10,11 @@ DEPENDS = " \ | |||
| 10 | " | 10 | " |
| 11 | PV = "2.0.4+git" | 11 | PV = "2.0.4+git" |
| 12 | 12 | ||
| 13 | SRCREV = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39" | 13 | SRC_URI = "http://deb.debian.org/debian/pool/main/o/obconf/obconf_2.0.4+git20150213.orig.tar.xz \ |
| 14 | SRC_URI = " \ | 14 | file://0001-Fix-function-protype-visibility.patch" |
| 15 | git://git.openbox.org/dana/obconf;branch=master \ | 15 | SRC_URI[sha256sum] = "2c8837de833a4f2859ddf06e512d7d96d9a7623f90f95d1137779c69e9209feb" |
| 16 | file://0001-Fix-function-protype-visibility.patch \ | ||
| 17 | " | ||
| 18 | 16 | ||
| 17 | S = "${UNPACKDIR}/${BPN}" | ||
| 19 | 18 | ||
| 20 | inherit autotools gettext pkgconfig mime mime-xdg features_check | 19 | inherit autotools gettext pkgconfig mime mime-xdg features_check |
| 21 | # depends on openbox, which is X11-only | 20 | # depends on openbox, which is X11-only |
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2023-39327.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2023-39327.patch new file mode 100644 index 0000000000..05e504a18e --- /dev/null +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2023-39327.patch | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | From a3504b2484cf7443c547037511c40f59aff8ae5a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Mon, 23 Feb 2026 17:22:18 +0100 | ||
| 4 | Subject: [PATCH] CVE-2023-39327 | ||
| 5 | |||
| 6 | This patch fixes CVE-2023-39327. | ||
| 7 | |||
| 8 | This patch comes from OpenSuse: | ||
| 9 | https://build.opensuse.org/projects/openSUSE:Factory/packages/openjpeg2/files/openjpeg2-cve-2023-39327-limit-iterations.patch | ||
| 10 | |||
| 11 | Upstream seems to unresponsive to this vulnerability. | ||
| 12 | |||
| 13 | Upstream-Status: Inactive-Upstream [inactive, when it comes to CVEs] | ||
| 14 | |||
| 15 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 16 | --- | ||
| 17 | src/lib/openjp2/t2.c | 13 +++++++++++++ | ||
| 18 | 1 file changed, 13 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c | ||
| 21 | index 4e8cf601..ad39cd74 100644 | ||
| 22 | --- a/src/lib/openjp2/t2.c | ||
| 23 | +++ b/src/lib/openjp2/t2.c | ||
| 24 | @@ -441,6 +441,8 @@ OPJ_BOOL opj_t2_decode_packets(opj_tcd_t* tcd, | ||
| 25 | * and no l_img_comp->resno_decoded are computed | ||
| 26 | */ | ||
| 27 | OPJ_BOOL* first_pass_failed = NULL; | ||
| 28 | + OPJ_UINT32 l_packet_count = 0; | ||
| 29 | + OPJ_UINT32 l_max_packets = 100000; | ||
| 30 | |||
| 31 | if (l_current_pi->poc.prg == OPJ_PROG_UNKNOWN) { | ||
| 32 | /* TODO ADE : add an error */ | ||
| 33 | @@ -457,6 +459,17 @@ OPJ_BOOL opj_t2_decode_packets(opj_tcd_t* tcd, | ||
| 34 | |||
| 35 | while (opj_pi_next(l_current_pi)) { | ||
| 36 | OPJ_BOOL skip_packet = OPJ_FALSE; | ||
| 37 | + | ||
| 38 | + /* CVE-2023-39327: Check for excessive packet iterations */ | ||
| 39 | + if (++l_packet_count > l_max_packets) { | ||
| 40 | + opj_event_msg(p_manager, EVT_ERROR, | ||
| 41 | + "Excessive packet iterations detected (>%u). Possible malformed stream.\n", | ||
| 42 | + l_max_packets); | ||
| 43 | + opj_pi_destroy(l_pi, l_nb_pocs); | ||
| 44 | + opj_free(first_pass_failed); | ||
| 45 | + return OPJ_FALSE; | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | JAS_FPRINTF(stderr, | ||
| 49 | "packet offset=00000166 prg=%d cmptno=%02d rlvlno=%02d prcno=%03d lyrno=%02d\n\n", | ||
| 50 | l_current_pi->poc.prg1, l_current_pi->compno, l_current_pi->resno, | ||
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb index 6d7d87f5f1..33dc48b2ea 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb | |||
| @@ -7,6 +7,7 @@ DEPENDS = "libpng tiff lcms zlib" | |||
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ | 8 | SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ |
| 9 | file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ | 9 | file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ |
| 10 | file://CVE-2023-39327.patch \ | ||
| 10 | " | 11 | " |
| 11 | SRCREV = "6c4a29b00211eb0430fa0e5e890f1ce5c80f409f" | 12 | SRCREV = "6c4a29b00211eb0430fa0e5e890f1ce5c80f409f" |
| 12 | 13 | ||
diff --git a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb index d99c6ceac0..6afcf08a16 100644 --- a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb +++ b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb | |||
| @@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ | |||
| 7 | DEPENDS = "mm-common cairomm-1.16 glibmm-2.68 pango" | 7 | DEPENDS = "mm-common cairomm-1.16 glibmm-2.68 pango" |
| 8 | 8 | ||
| 9 | GNOMEBN = "pangomm" | 9 | GNOMEBN = "pangomm" |
| 10 | inherit gnomebase features_check | 10 | inherit gnomebase |
| 11 | 11 | ||
| 12 | SRC_URI[archive.sha256sum] = "539f5aa60e9bdc6b955bb448e2a62cc14562744df690258040fbb74bf885755d" | 12 | SRC_URI[archive.sha256sum] = "539f5aa60e9bdc6b955bb448e2a62cc14562744df690258040fbb74bf885755d" |
| 13 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 14 | 13 | ||
| 15 | S = "${UNPACKDIR}/${GNOMEBN}-${PV}" | 14 | S = "${UNPACKDIR}/${GNOMEBN}-${PV}" |
| 16 | 15 | ||
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch index 101adaa82f..924b950c59 100644 --- a/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch +++ b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch | |||
| @@ -6,16 +6,19 @@ Subject: [PATCH] add missing dynamic library to FLTK_LIBRARIES | |||
| 6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
| 7 | 7 | ||
| 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 9 | |||
| 10 | Update for 1.16.0 | ||
| 11 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 9 | --- | 12 | --- |
| 10 | CMakeLists.txt | 2 ++ | 13 | CMakeLists.txt | 2 ++ |
| 11 | 1 file changed, 2 insertions(+) | 14 | 1 file changed, 2 insertions(+) |
| 12 | 15 | ||
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 14 | index 80c2762c..eb581600 100644 | 17 | index a5981938..dd13d0df 100644 |
| 15 | --- a/CMakeLists.txt | 18 | --- a/CMakeLists.txt |
| 16 | +++ b/CMakeLists.txt | 19 | +++ b/CMakeLists.txt |
| 17 | @@ -315,6 +315,8 @@ if(BUILD_VIEWER) | 20 | @@ -315,6 +315,8 @@ if(BUILD_VIEWER) |
| 18 | set(CMAKE_REQUIRED_LIBRARIES) | 21 | endif() |
| 19 | endif() | 22 | endif() |
| 20 | 23 | ||
| 21 | +set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lm -ldl -lpng -ljpeg) | 24 | +set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lm -ldl -lpng -ljpeg) |
| @@ -24,5 +27,5 @@ index 80c2762c..eb581600 100644 | |||
| 24 | trioption(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication") | 27 | trioption(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication") |
| 25 | if(ENABLE_GNUTLS) | 28 | if(ENABLE_GNUTLS) |
| 26 | -- | 29 | -- |
| 27 | 2.25.1 | 30 | 2.43.0 |
| 28 | 31 | ||
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.16.0.bb index efc166dfa6..6e8e80f283 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.16.0.bb | |||
| @@ -16,9 +16,9 @@ REQUIRED_DISTRO_FEATURES = "x11 pam" | |||
| 16 | # out-of-tree builds. | 16 | # out-of-tree builds. |
| 17 | B = "${S}" | 17 | B = "${S}" |
| 18 | 18 | ||
| 19 | SRCREV = "8bdf8734ce12c8ed3c232496fc8a4ccdb04636b8" | 19 | SRCREV = "dc50022844dfad0a0e195d54b8499fcf242fff0c" |
| 20 | 20 | ||
| 21 | SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.15-branch;protocol=https \ | 21 | SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.16-branch;protocol=https \ |
| 22 | file://0001-do-not-build-tests-sub-directory.patch \ | 22 | file://0001-do-not-build-tests-sub-directory.patch \ |
| 23 | file://0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ | 23 | file://0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ |
| 24 | file://0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ | 24 | file://0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ |
| @@ -26,10 +26,10 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.15-branch;protocol=ht | |||
| 26 | 26 | ||
| 27 | # Keep sync with xorg-server in oe-core | 27 | # Keep sync with xorg-server in oe-core |
| 28 | XORG_PN ?= "xorg-server" | 28 | XORG_PN ?= "xorg-server" |
| 29 | XORG_PV ?= "21.1.18" | 29 | XORG_PV ?= "21.1.21" |
| 30 | SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg" | 30 | SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg" |
| 31 | XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}" | 31 | XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}" |
| 32 | SRC_URI[xorg.sha256sum] = "c878d1930d87725d4a5bf498c24f4be8130d5b2646a9fd0f2994deff90116352" | 32 | SRC_URI[xorg.sha256sum] = "c0cbe5545b3f645bae6024b830d1d1154a956350683a4e52b2fff5b0fa1ab519" |
| 33 | 33 | ||
| 34 | # It is the directory containing the Xorg source for the | 34 | # It is the directory containing the Xorg source for the |
| 35 | # machine on which you are building TigerVNC. | 35 | # machine on which you are building TigerVNC. |
| @@ -85,7 +85,7 @@ do_compile:append () { | |||
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | do_install:append() { | 87 | do_install:append() { |
| 88 | oe_runmake -C ${B}/hw/vnc 'DESTDIR=${D}' install | 88 | oe_runmake 'TIGERVNC_BUILDDIR=${B}' -C ${B}/hw/vnc 'DESTDIR=${D}' install |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | FILES:${PN} += " \ | 91 | FILES:${PN} += " \ |
| @@ -94,7 +94,9 @@ FILES:${PN} += " \ | |||
| 94 | ${datadir}/metainfo \ | 94 | ${datadir}/metainfo \ |
| 95 | " | 95 | " |
| 96 | 96 | ||
| 97 | SYSTEMD_SERVICE:${PN} = "vncserver@.service" | 97 | #If user want to enable service of vncserver, vncserver@:<display>.service is needed and further steps are listed in unit file itself. |
| 98 | SYSTEMD_SERVICE:${PN} ?= "vncserver@.service" | ||
| 99 | SYSTEMD_AUTO_ENABLE:${PN} = "disable" | ||
| 98 | 100 | ||
| 99 | CVE_STATUS[CVE-2014-8241] = "fixed-version: The vulnerable code is not present in the used version (1.15.0)" | 101 | CVE_STATUS[CVE-2014-8241] = "fixed-version: The vulnerable code is not present in the used version (1.15.0)" |
| 100 | CVE_STATUS[CVE-2023-6377] = "fixed-version: The vulnerable code is not present in the used xserver version (21.1.18)" | 102 | CVE_STATUS[CVE-2023-6377] = "fixed-version: The vulnerable code is not present in the used xserver version (21.1.18)" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb index b72307519c..e14a85b92c 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb | |||
| @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;md5=97d739900be6e852830f55aa3c07d4a0" | |||
| 9 | 9 | ||
| 10 | RPROVIDES:${PN} = "virtual-japanese-font" | 10 | RPROVIDES:${PN} = "virtual-japanese-font" |
| 11 | 11 | ||
| 12 | SRC_URI = "http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" | 12 | SRC_URI = "https://src.fedoraproject.org/repo/pkgs/sazanami-fonts/sazanami-20040629.tar.bz2/ceef10579a75c92483171f3bd7f77df2/sazanami-20040629.tar.bz2" |
| 13 | S = "${UNPACKDIR}/sazanami-20040629" | 13 | S = "${UNPACKDIR}/sazanami-20040629" |
| 14 | 14 | ||
| 15 | PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho" | 15 | PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb index c7be162b1b..e34770d520 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.en;md5=cc06b20e7a20bdf6c989624405378303 \ | |||
| 8 | file://LICENSE_E.mplus;md5=1c4767416f20215f1e61b970f2117db9 \ | 8 | file://LICENSE_E.mplus;md5=1c4767416f20215f1e61b970f2117db9 \ |
| 9 | " | 9 | " |
| 10 | 10 | ||
| 11 | SRC_URI = "https://osdn.jp/dl/vlgothic/VLGothic-${PV}.tar.xz" | 11 | SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/fonts-vlgothic/${PV}-1ubuntu1/fonts-vlgothic_${PV}.orig.tar.xz" |
| 12 | 12 | ||
| 13 | SRC_URI[sha256sum] = "297a3813675fbea12c5813b55a78091c9a5946515ecbf9fde8b8102e01c579f4" | 13 | SRC_URI[sha256sum] = "297a3813675fbea12c5813b55a78091c9a5946515ecbf9fde8b8102e01c579f4" |
| 14 | 14 | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 67a0dc564c..02f777926e 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | LICENSE = "Apache-2.0" | 1 | LICENSE = "Apache-2.0" |
| 2 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 2 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 3 | 3 | ||
| 4 | SRC_URI = "git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ | 4 | SRC_URI = "git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1;tag=${BP} \ |
| 5 | file://0001-use-library-sonames-for-linking.patch \ | 5 | file://0001-use-library-sonames-for-linking.patch \ |
| 6 | file://generate-srcuri.py \ | 6 | file://generate-srcuri.py \ |
| 7 | " | 7 | " |
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc index da4977ca28..88eea63ba3 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc | |||
| @@ -6,19 +6,19 @@ | |||
| 6 | RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri" | 6 | RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri" |
| 7 | 7 | ||
| 8 | python __anonymous() { | 8 | python __anonymous() { |
| 9 | if d.getVar("PV") != "3.2.13.0": | 9 | if d.getVar("PV") != "3.2.14.0": |
| 10 | bb.warn("-sources.inc out of date, run refresh_srcuri task") | 10 | bb.warn("-sources.inc out of date, run refresh_srcuri task") |
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | SRC_URI += " \ | 13 | SRC_URI += " \ |
| 14 | https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \ | 14 | https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \ |
| 15 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-tools/src;rev=6d43afe9a0ef71712d8cec5b0ce0cd3570d1fd41 \ | 15 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-tools/src;rev=65b2ace21293057714b7fa1e87bd764d3dcef305 \ |
| 16 | git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/glslang/src;rev=8e1494f9d742a27b54193ecd9475dcb2ef23b8b7 \ | 16 | git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/glslang/src;rev=7881226269b1596feb604515743f528f02041375 \ |
| 17 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-headers/src;rev=9268f3057354a2cb65991ba5f38b16d81e803692 \ | 17 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-headers/src;rev=babee77020ff82b571d723ce2c0262e2ec0ee3f1 \ |
| 18 | git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-docs/src;rev=ac3d0660c45ecf86b2952b298d125270228150d1 \ | 18 | git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-docs/src;rev=ac8223b312d40a6bc1733fb3490bdcdb5a389d50 \ |
| 19 | git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=68e4cdd8269c2af39aa16793c9089d1893eae972 \ | 19 | git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=0a11cf1257471c22b9e7d620ab48057fb2f53cf9 \ |
| 20 | git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=57ba1ca211b6f4890c013dcf42cb16069ae916dd \ | 20 | git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=83c140b6f67f45220956b1971e83a53588b4c426 \ |
| 21 | git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \ | 21 | git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \ |
| 22 | git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=25f4401686c5b5ec726641f134b1989450e81027 \ | 22 | git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=aaf915a0e08d679d1e8b835c30e6a346ab0c7ad2 \ |
| 23 | git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \ | 23 | git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \ |
| 24 | " | 24 | " |
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.13.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.14.0.bb index cf01ce2491..2a98ba1bbb 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.13.0.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.14.0.bb | |||
| @@ -2,7 +2,7 @@ DESCRIPTION = "OpenGL CTS" | |||
| 2 | 2 | ||
| 3 | require khronos-cts.inc | 3 | require khronos-cts.inc |
| 4 | 4 | ||
| 5 | SRCREV_vk-gl-cts = "67ce2ed4a32658b6a80afc52dc4d2825cdfdda8a" | 5 | SRCREV_vk-gl-cts = "ed5729a4e50de78f577cc043627aef93af8f16f6" |
| 6 | 6 | ||
| 7 | require opengl-es-cts-sources.inc | 7 | require opengl-es-cts-sources.inc |
| 8 | 8 | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc index cf1d24f637..6ebb9c18db 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri" | 6 | RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri" |
| 7 | 7 | ||
| 8 | python __anonymous() { | 8 | python __anonymous() { |
| 9 | if d.getVar("PV") != "1.4.5.0": | 9 | if d.getVar("PV") != "1.4.5.2": |
| 10 | bb.warn("-sources.inc out of date, run refresh_srcuri task") | 10 | bb.warn("-sources.inc out of date, run refresh_srcuri task") |
| 11 | } | 11 | } |
| 12 | 12 | ||
| @@ -19,6 +19,6 @@ SRC_URI += " \ | |||
| 19 | git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=0a11cf1257471c22b9e7d620ab48057fb2f53cf9 \ | 19 | git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=0a11cf1257471c22b9e7d620ab48057fb2f53cf9 \ |
| 20 | git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=9482448393f3f1f75067cc6ba8ad77fda48691c6 \ | 20 | git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=9482448393f3f1f75067cc6ba8ad77fda48691c6 \ |
| 21 | git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \ | 21 | git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \ |
| 22 | git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=823364b0c7abdc4f4e39418d3dd9dc11623ef146 \ | 22 | git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=aaf915a0e08d679d1e8b835c30e6a346ab0c7ad2 \ |
| 23 | git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \ | 23 | git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \ |
| 24 | " | 24 | " |
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.5.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.5.2.bb index 34dc10e44d..0dd78620fb 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.5.0.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.5.2.bb | |||
| @@ -2,7 +2,7 @@ DESCRIPTION = "Vulkan CTS" | |||
| 2 | 2 | ||
| 3 | require khronos-cts.inc | 3 | require khronos-cts.inc |
| 4 | 4 | ||
| 5 | SRCREV_vk-gl-cts = "db74f486c9d0594bc997f8f79521b424708ba8da" | 5 | SRCREV_vk-gl-cts = "a02761593aedeb1d3941ddd344ca35d7a2f9de46" |
| 6 | 6 | ||
| 7 | require vulkan-cts-sources.inc | 7 | require vulkan-cts-sources.inc |
| 8 | 8 | ||
diff --git a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb index 485915db35..93c00bda03 100644 --- a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb +++ b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb | |||
| @@ -37,6 +37,8 @@ EXTRA_OECMAKE:class-target = " \ | |||
| 37 | -DCMAKE_EXE_LINKER_FLAGS="-Wl,--enable-new-dtags" \ | 37 | -DCMAKE_EXE_LINKER_FLAGS="-Wl,--enable-new-dtags" \ |
| 38 | " | 38 | " |
| 39 | 39 | ||
| 40 | FILES:${PN}-dev += "${bindir}/wayland-scanner++" | ||
| 41 | |||
| 40 | do_install:append:class-target() { | 42 | do_install:append:class-target() { |
| 41 | sed -i -e 's|${S}||g' ${D}${libdir}/cmake/waylandpp/waylandpp-targets.cmake | 43 | sed -i -e 's|${S}||g' ${D}${libdir}/cmake/waylandpp/waylandpp-targets.cmake |
| 42 | sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${libdir}/cmake/waylandpp/waylandpp-targets.cmake | 44 | sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${libdir}/cmake/waylandpp/waylandpp-targets.cmake |
diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch deleted file mode 100644 index bfda2dfe71..0000000000 --- a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From 088bb4cef2c93bef312b076a8c7a3c798cbf2f19 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: daicy <daicy@cn.fujitsu.com> | ||
| 3 | Date: Tue, 8 Dec 2015 11:45:01 +0900 | ||
| 4 | Subject: [PATCH] Makefile.am: Error Fix | ||
| 5 | |||
| 6 | Do not compile man dir since error always occur. | ||
| 7 | | sed: file filenames.sed line 3: unterminated `s' command | ||
| 8 | | make[2]: *** [sessreg.1] Error 1 | ||
| 9 | It is not a good way.But can remove it from SKIP_RECIPE. | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | ||
| 14 | --- | ||
| 15 | Makefile.am | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/Makefile.am b/Makefile.am | ||
| 19 | index cddffd0..94f7048 100644 | ||
| 20 | --- a/Makefile.am | ||
| 21 | +++ b/Makefile.am | ||
| 22 | @@ -18,7 +18,7 @@ | ||
| 23 | # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
| 24 | # PERFORMANCE OF THIS SOFTWARE. | ||
| 25 | |||
| 26 | -SUBDIRS = man | ||
| 27 | +#SUBDIRS = man | ||
| 28 | bin_PROGRAMS = sessreg | ||
| 29 | |||
| 30 | AM_CFLAGS = $(CWARNFLAGS) $(SESSREG_CFLAGS) | ||
| 31 | -- | ||
| 32 | 1.8.4.2 | ||
| 33 | |||
diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.3.bb b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.4.bb index 33ab22cde4..4c71130759 100644 --- a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.3.bb +++ b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.4.bb | |||
| @@ -2,10 +2,10 @@ require recipes-graphics/xorg-app/xorg-app-common.inc | |||
| 2 | 2 | ||
| 3 | SUMMARY = "a simple program for managing utmp/wtmp entries" | 3 | SUMMARY = "a simple program for managing utmp/wtmp entries" |
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=82cc7e3245e8b11a5259108ba5b7e3dc" |
| 6 | SRC_URI += "file://0001-Makefile.am-Error-Fix.patch" | 6 | |
| 7 | SRC_URI_EXT = "xz" | 7 | SRC_URI_EXT = "xz" |
| 8 | SRC_URI[sha256sum] = "022acd5de8077dddc4f919961f79e102ecd5f3228a333681af5cd0e7344facc2" | 8 | SRC_URI[sha256sum] = "4e85b52f4f65a93449753bfb00ceb5d77f3317e24d07dc23147f2f116c785350" |
| 9 | 9 | ||
| 10 | CFLAGS:append:libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP " | 10 | CFLAGS:append:libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP " |
| 11 | 11 | ||
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_404.bb b/meta-oe/recipes-graphics/xorg-app/xterm_407.bb index 944d811566..4aecd77f98 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_404.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_407.bb | |||
| @@ -2,12 +2,12 @@ require recipes-graphics/xorg-app/xorg-app-common.inc | |||
| 2 | SUMMARY = "xterm is the standard terminal emulator for the X Window System" | 2 | SUMMARY = "xterm is the standard terminal emulator for the X Window System" |
| 3 | DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" | 3 | DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" |
| 4 | 4 | ||
| 5 | LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=170620b648626a97057ff6ea99e6396e" | 5 | LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=413ff95100710d7a817c5257bf3940cb" |
| 6 | 6 | ||
| 7 | SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ | 7 | SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ |
| 8 | file://0001-include-missing-pty.h-header-for-openpty.patch \ | 8 | file://0001-include-missing-pty.h-header-for-openpty.patch \ |
| 9 | " | 9 | " |
| 10 | SRC_URI[sha256sum] = "63332f921c227ba59e589fa07dfdad1599c10ac859ea26c72ac1dd4a41b565a4" | 10 | SRC_URI[sha256sum] = "2136eba530068a1b7565abbf17823274f5cefb7fe3618355cbc89dc55c8b7b6a" |
| 11 | 11 | ||
| 12 | PACKAGECONFIG ?= "" | 12 | PACKAGECONFIG ?= "" |
| 13 | PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" | 13 | PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" |
diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb index 073b3f0912..8710ec80dc 100644 --- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb +++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb | |||
| @@ -19,7 +19,6 @@ DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc- | |||
| 19 | # These are only needed as part of the stopgap screensaver implementation: | 19 | # These are only needed as part of the stopgap screensaver implementation: |
| 20 | RDEPENDS:${PN} = " \ | 20 | RDEPENDS:${PN} = " \ |
| 21 | liberation-fonts \ | 21 | liberation-fonts \ |
| 22 | xuser-account \ | ||
| 23 | " | 22 | " |
| 24 | 23 | ||
| 25 | inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check | 24 | inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check |
diff --git a/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb b/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb index 3bbfe4cf9f..2ad41da957 100644 --- a/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb +++ b/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" | |||
| 6 | 6 | ||
| 7 | SECTION = "devel" | 7 | SECTION = "devel" |
| 8 | 8 | ||
| 9 | EXTRA_OEMAKE = "'CC=${CC}'" | 9 | EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS}'" |
| 10 | 10 | ||
| 11 | SRCREV = "468fe4c31e6c62c9bbb328b06ba71eaf7be0b76a" | 11 | SRCREV = "468fe4c31e6c62c9bbb328b06ba71eaf7be0b76a" |
| 12 | 12 | ||
| @@ -14,6 +14,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git;protoc | |||
| 14 | file://0001-Makefile-Add-LDFLAGS-variable.patch \ | 14 | file://0001-Makefile-Add-LDFLAGS-variable.patch \ |
| 15 | " | 15 | " |
| 16 | 16 | ||
| 17 | TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}" | ||
| 18 | |||
| 17 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |
| 18 | 20 | ||
| 19 | 21 | ||
diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb index 453ebe8c7f..b453308770 100644 --- a/meta-oe/recipes-kernel/cpupower/cpupower.bb +++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb | |||
| @@ -5,6 +5,8 @@ LICENSE = "GPL-2.0-only" | |||
| 5 | DEPENDS = "pciutils gettext-native" | 5 | DEPENDS = "pciutils gettext-native" |
| 6 | PROVIDES = "virtual/cpupower" | 6 | PROVIDES = "virtual/cpupower" |
| 7 | 7 | ||
| 8 | B = "${WORKDIR}/${BPN}-${PV}" | ||
| 9 | |||
| 8 | inherit kernelsrc kernel-arch bash-completion | 10 | inherit kernelsrc kernel-arch bash-completion |
| 9 | 11 | ||
| 10 | do_populate_lic[depends] += "virtual/kernel:do_shared_workdir" | 12 | do_populate_lic[depends] += "virtual/kernel:do_shared_workdir" |
| @@ -19,17 +21,16 @@ do_compile() { | |||
| 19 | 21 | ||
| 20 | do_install() { | 22 | do_install() { |
| 21 | oe_runmake DESTDIR=${D} install | 23 | oe_runmake DESTDIR=${D} install |
| 22 | # Do not ship headers | ||
| 23 | rm -rf ${D}${includedir} | ||
| 24 | chown -R root:root ${D} | 24 | chown -R root:root ${D} |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 27 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 28 | PACKAGES =+ "${PN}-systemd" | ||
| 29 | |||
| 30 | FILES:${PN}-systemd = "${sysconfdir}/cpupower-service.conf ${systemd_unitdir}" | ||
| 28 | 31 | ||
| 29 | RDEPENDS:${PN} = "bash" | 32 | RDEPENDS:${PN} = "bash" |
| 30 | 33 | ||
| 31 | python do_package:prepend() { | 34 | python do_package:prepend() { |
| 32 | d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) | 35 | d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) |
| 33 | } | 36 | } |
| 34 | |||
| 35 | B = "${WORKDIR}/${BPN}-${PV}" | ||
diff --git a/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.33.bb b/meta-oe/recipes-kernel/drgn/python3-drgn_0.1.0.bb index b15af42f36..c2b4d9404e 100644 --- a/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.33.bb +++ b/meta-oe/recipes-kernel/drgn/python3-drgn_0.1.0.bb | |||
| @@ -6,7 +6,7 @@ LICENSE = " LGPL-2.1-or-later" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=7c83d30e99508d6b790eacdd3abab846" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=7c83d30e99508d6b790eacdd3abab846" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/osandov/drgn.git;protocol=https;branch=main;tag=v${PV}" | 8 | SRC_URI = "git://github.com/osandov/drgn.git;protocol=https;branch=main;tag=v${PV}" |
| 9 | SRCREV = "781a21cb057ce07f17fd6edf0ffd299426abcbf7" | 9 | SRCREV = "26dd4435315e6735cfa7f4ab0713bb1533a94750" |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | DEPENDS = "\ | 12 | DEPENDS = "\ |
diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-coreinject-fix-assignment-of-const-qualified-type.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-coreinject-fix-assignment-of-const-qualified-type.patch new file mode 100644 index 0000000000..ace46202b7 --- /dev/null +++ b/meta-oe/recipes-kernel/minicoredumper/files/0001-coreinject-fix-assignment-of-const-qualified-type.patch | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | From 07023a2d2ef059a039fef83ee4b33a7e47ca8e3e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: John Ogness <john.ogness@linutronix.de> | ||
| 3 | Date: Tue, 24 Feb 2026 11:33:40 +0106 | ||
| 4 | Subject: [PATCH] coreinject: fix assignment of const-qualified type | ||
| 5 | |||
| 6 | coreinject fails to build with glibc 2.43. | ||
| 7 | |||
| 8 | The issue is due to a new glibc feature: | ||
| 9 | |||
| 10 | * For ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr, | ||
| 11 | strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return | ||
| 12 | pointers into their input arrays now have definitions as macros that | ||
| 13 | return a pointer to a const-qualified type when the input argument is | ||
| 14 | a pointer to a const-qualified type. | ||
| 15 | |||
| 16 | The fix is trivial since the returned strrchr() value is only used in | ||
| 17 | a way compatible with const pointers. The data type was simply defined | ||
| 18 | incorrectly. | ||
| 19 | |||
| 20 | Reported-by: Aurelien Jarno <aurel32@debian.org> | ||
| 21 | Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1128695 | ||
| 22 | Signed-off-by: John Ogness <john.ogness@linutronix.de> | ||
| 23 | |||
| 24 | Upstream-Status: Backport [https://github.com/diamon/minicoredumper/commit/eb66f10ae26edf94bf41d513ce90a4eb1e0f11b3] | ||
| 25 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 26 | --- | ||
| 27 | src/coreinject/main.c | 2 +- | ||
| 28 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 29 | |||
| 30 | diff --git a/src/coreinject/main.c b/src/coreinject/main.c | ||
| 31 | index faf8edf..198485d 100644 | ||
| 32 | --- a/src/coreinject/main.c | ||
| 33 | +++ b/src/coreinject/main.c | ||
| 34 | @@ -240,9 +240,9 @@ static int inject_data(FILE *f_core, FILE *f_symmap, const char *b_fname, | ||
| 35 | struct ident_data indirect; | ||
| 36 | struct ident_data direct; | ||
| 37 | const char *ident; | ||
| 38 | + const char *p; | ||
| 39 | FILE *f_dump; | ||
| 40 | int err = 0; | ||
| 41 | - char *p; | ||
| 42 | |||
| 43 | /* extract ident name from file path */ | ||
| 44 | p = strrchr(b_fname, '/'); | ||
diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb index f68984b072..ff4fdf358e 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \ | 1 | SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \ |
| 2 | to allow minimal and customized crash dumps" | 2 | to allow minimal and customized crash dumps" |
| 3 | HOMEPAGE = "https://www.linutronix.de/minicoredumper/" | ||
| 3 | LICENSE = " LGPL-2.1-only & BSD-2-Clause" | 4 | LICENSE = " LGPL-2.1-only & BSD-2-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=71827c617ec7b45a0dd23658347cc1e9 \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=71827c617ec7b45a0dd23658347cc1e9 \ |
| 5 | file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \ | 6 | file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \ |
| @@ -17,6 +18,7 @@ SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ | |||
| 17 | file://run-ptest \ | 18 | file://run-ptest \ |
| 18 | file://0001-corestripper-Fix-uninitialized-warning.patch \ | 19 | file://0001-corestripper-Fix-uninitialized-warning.patch \ |
| 19 | file://0002-Fix-2038-year-problem-in-timestamp-handling.patch \ | 20 | file://0002-Fix-2038-year-problem-in-timestamp-handling.patch \ |
| 21 | file://0001-coreinject-fix-assignment-of-const-qualified-type.patch \ | ||
| 20 | " | 22 | " |
| 21 | 23 | ||
| 22 | 24 | ||
diff --git a/meta-oe/recipes-kernel/rtla/rtla.bb b/meta-oe/recipes-kernel/rtla/rtla.bb new file mode 100644 index 0000000000..829804c4ea --- /dev/null +++ b/meta-oe/recipes-kernel/rtla/rtla.bb | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | SUMMARY = "Real-Time Linux Analysis tool" | ||
| 2 | LICENSE = "GPL-2.0-only" | ||
| 3 | |||
| 4 | DEPENDS = "libtraceevent libtracefs" | ||
| 5 | PROVIDES = "virtual/rtla" | ||
| 6 | |||
| 7 | B = "${WORKDIR}/${BPN}-${PV}" | ||
| 8 | |||
| 9 | inherit kernelsrc kernel-arch pkgconfig | ||
| 10 | |||
| 11 | do_populate_lic[depends] += "virtual/kernel:do_shared_workdir" | ||
| 12 | |||
| 13 | PACKAGECONFIG ??= "" | ||
| 14 | PACKAGECONFIG[cpupower] = ",,cpupower" | ||
| 15 | |||
| 16 | EXTRA_OEMAKE = "V=1 -C ${S}/tools/tracing/rtla O=${B} CROSS=${TARGET_PREFIX} \ | ||
| 17 | CC="${CC} ${DEBUG_PREFIX_MAP} -D_GNU_SOURCE" LD="${LD}" AR=${AR} ARCH=${ARCH} \ | ||
| 18 | BUILD_BPF_SKEL=0" | ||
| 19 | |||
| 20 | do_compile() { | ||
| 21 | # Older kernels (before 6.9) use a standalone rtla Makefile that does not honor | ||
| 22 | # O= so outputs land in the kernel source tree (shared workdir). Remove | ||
| 23 | # build output to make sure it is rebuilt. For newer kernels this wil be a no-op. | ||
| 24 | rm -f ${S}/tools/tracing/rtla/rtla | ||
| 25 | rm -f ${S}/tools/tracing/rtla/src/*.o | ||
| 26 | |||
| 27 | # Older kernels need additional variable EXTRA_LDFLAGS to pick up correct linker options. | ||
| 28 | export EXTRA_LDFLAGS="${LDFLAGS}" | ||
| 29 | oe_runmake | ||
| 30 | } | ||
| 31 | |||
| 32 | do_install() { | ||
| 33 | install -d ${D}${bindir} | ||
| 34 | |||
| 35 | # Older kernels (before 6.9) use a standalone rtla Makefile that does not honor | ||
| 36 | # O= for the final binary, so it ends up in the kernel source tree. | ||
| 37 | rtla_bin="${B}/rtla" | ||
| 38 | [ -f "${rtla_bin}" ] || rtla_bin="${S}/tools/tracing/rtla/rtla" | ||
| 39 | install -m 755 "${rtla_bin}" ${D}${bindir}/rtla | ||
| 40 | |||
| 41 | # rtla, osnoise, hwnoise, and timerlat are all the same binary | ||
| 42 | ln -s rtla ${D}${bindir}/osnoise | ||
| 43 | ln -s rtla ${D}${bindir}/hwnoise | ||
| 44 | ln -s rtla ${D}${bindir}/timerlat | ||
| 45 | } | ||
| 46 | |||
| 47 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
diff --git a/meta-oe/recipes-kernel/tmon/tmon.bb b/meta-oe/recipes-kernel/tmon/tmon.bb new file mode 100644 index 0000000000..4911f445c5 --- /dev/null +++ b/meta-oe/recipes-kernel/tmon/tmon.bb | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | SUMMARY = "A Monitoring and Testing Tool for Linux kernel thermal subsystem" | ||
| 2 | DESCRIPTION = "TMON is conceived as a tool to help visualize, tune, and \ | ||
| 3 | test the complex thermal subsystem" | ||
| 4 | |||
| 5 | LICENSE = "GPL-2.0-only" | ||
| 6 | |||
| 7 | DEPENDS = "virtual/kernel ncurses" | ||
| 8 | |||
| 9 | do_configure[depends] += "virtual/kernel:do_shared_workdir" | ||
| 10 | |||
| 11 | # This looks in S, so we better make sure there's | ||
| 12 | # something in the directory. | ||
| 13 | # | ||
| 14 | do_populate_lic[depends] += "${PN}:do_configure" | ||
| 15 | |||
| 16 | |||
| 17 | EXTRA_OEMAKE = '\ | ||
| 18 | CC="${CC}" \ | ||
| 19 | -I${STAGING_KERNEL_DIR}/tools/thermal/tmon \ | ||
| 20 | ' | ||
| 21 | |||
| 22 | # If we build under STAGING_KERNEL_DIR, source will not be put | ||
| 23 | # into the dbg rpm. STAGING_KERNEL_DIR will exist by the time | ||
| 24 | # do_configure() is invoked so we can safely copy from it. | ||
| 25 | # | ||
| 26 | do_configure:prepend() { | ||
| 27 | mkdir -p ${S} | ||
| 28 | cp -r ${STAGING_KERNEL_DIR}/tools/thermal/tmon/* ${S} | ||
| 29 | # Fix compile error when pkg-config is on the dependency chain: | ||
| 30 | # tmon.h:42:17: error: field 'tv' has incomplete type | ||
| 31 | sed -i '/PKG_CONFIG.*--cflags.*ncurses/d' ${S}/Makefile | ||
| 32 | } | ||
| 33 | |||
| 34 | do_compile() { | ||
| 35 | oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR} | ||
| 36 | } | ||
| 37 | |||
| 38 | do_install() { | ||
| 39 | oe_runmake INSTALL_ROOT="${D}" install | ||
| 40 | } | ||
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.3.0.bb index c443d9b891..20ffbffd98 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.3.0.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
| 6 | 6 | ||
| 7 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.bz2" | 7 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.bz2" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539" | 9 | SRC_URI[sha256sum] = "53e83d284667535a767fd2d31edad1a6701591960459df373a10f1f21e80a7ed" |
| 10 | 10 | ||
| 11 | inherit autotools pkgconfig github-releases | 11 | inherit autotools pkgconfig github-releases |
| 12 | 12 | ||
| @@ -29,3 +29,5 @@ python libcdio_split_packages() { | |||
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | PACKAGESPLITFUNCS =+ "libcdio_split_packages" | 31 | PACKAGESPLITFUNCS =+ "libcdio_split_packages" |
| 32 | |||
| 33 | CVE_STATUS[CVE-2024-36600] = "fixed-version: fixed in v2.3.0" | ||
diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.1.bb b/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.2.bb index 8170c9055d..f73fd314c2 100644 --- a/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.1.bb +++ b/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.2.bb | |||
| @@ -8,11 +8,11 @@ inherit cmake pkgconfig mime | |||
| 8 | 8 | ||
| 9 | DEPENDS = "highway brotli" | 9 | DEPENDS = "highway brotli" |
| 10 | 10 | ||
| 11 | SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1 \ | 11 | SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1;tag=v${PV} \ |
| 12 | file://0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch \ | 12 | file://0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | SRCREV = "794a5dcf0d54f9f0b20d288a12e87afb91d20dfc" | 15 | SRCREV = "332feb17d17311c748445f7ee75c4fb55cc38530" |
| 16 | 16 | ||
| 17 | EXTRA_OECMAKE = " \ | 17 | EXTRA_OECMAKE = " \ |
| 18 | -DCMAKE_BUILD_TYPE=Release \ | 18 | -DCMAKE_BUILD_TYPE=Release \ |
| @@ -53,3 +53,6 @@ CXXFLAGS:append:toolchain-clang:arm = " -fno-integrated-as" | |||
| 53 | FILES:${PN} += "${libdir}/gdk-pixbuf-2.0 ${datadir}" | 53 | FILES:${PN} += "${libdir}/gdk-pixbuf-2.0 ${datadir}" |
| 54 | 54 | ||
| 55 | BBCLASSEXTEND = "native" | 55 | BBCLASSEXTEND = "native" |
| 56 | |||
| 57 | CVE_STATUS[CVE-2025-12474] = "fixed-version: fixed in v0.11.2" | ||
| 58 | CVE_STATUS[CVE-2026-1837] = "fixed-version: fixed in v0.11.2" | ||
diff --git a/meta-oe/recipes-multimedia/libxmp/libxmp_4.6.3.bb b/meta-oe/recipes-multimedia/libxmp/libxmp_4.7.0.bb index c302f65ed5..22e41aa7cb 100644 --- a/meta-oe/recipes-multimedia/libxmp/libxmp_4.6.3.bb +++ b/meta-oe/recipes-multimedia/libxmp/libxmp_4.7.0.bb | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | SUMMARY = "Extended Module Player Library" | 1 | SUMMARY = "Extended Module Player Library" |
| 2 | HOMEPAGE = "http://xmp.sourceforge.net/" | 2 | HOMEPAGE = "http://xmp.sourceforge.net/" |
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://README;beginline=59;md5=ea030bd80f99071b0d3f9a9f752d1ca8" | 4 | LIC_FILES_CHKSUM = "file://README;beginline=59;md5=b25470e2863502c9ac9886f09c21a8f9" |
| 5 | 5 | ||
| 6 | inherit cmake pkgconfig | 6 | inherit cmake pkgconfig |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/libxmp/libxmp.git;protocol=https;branch=master;tag=libxmp-${PV}" | 8 | SRC_URI = "git://github.com/libxmp/libxmp.git;protocol=https;branch=master;tag=libxmp-${PV}" |
| 9 | SRCREV = "bed660f8e530d399c38f27a5a7732f4e79740585" | 9 | SRCREV = "8a4fdf7d09aedc921de537853b59e1d15b534f24" |
| 10 | 10 | ||
diff --git a/meta-oe/recipes-multimedia/live555/live555/config.linux-cross b/meta-oe/recipes-multimedia/live555/live555/config.linux-cross index fe6a28604b..19881e4a46 100644 --- a/meta-oe/recipes-multimedia/live555/live555/config.linux-cross +++ b/meta-oe/recipes-multimedia/live555/live555/config.linux-cross | |||
| @@ -4,7 +4,7 @@ C_COMPILER = $(CC) | |||
| 4 | C_FLAGS = $(COMPILE_OPTS) | 4 | C_FLAGS = $(COMPILE_OPTS) |
| 5 | CPP = cpp | 5 | CPP = cpp |
| 6 | CPLUSPLUS_COMPILER = $(CXX) | 6 | CPLUSPLUS_COMPILER = $(CXX) |
| 7 | CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 | 7 | CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 -std=c++20 |
| 8 | OBJ = o | 8 | OBJ = o |
| 9 | LINK = $(CXX) -o | 9 | LINK = $(CXX) -o |
| 10 | LINK_OPTS = -L. | 10 | LINK_OPTS = -L. |
diff --git a/meta-oe/recipes-multimedia/live555/live555_20210824.bb b/meta-oe/recipes-multimedia/live555/live555_20260112.bb index 1622a97fe1..ee92fd36c4 100644 --- a/meta-oe/recipes-multimedia/live555/live555_20210824.bb +++ b/meta-oe/recipes-multimedia/live555/live555_20260112.bb | |||
| @@ -16,7 +16,8 @@ SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz | |||
| 16 | # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older | 16 | # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older |
| 17 | MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" | 17 | MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" |
| 18 | 18 | ||
| 19 | SRC_URI[sha256sum] = "ce95a1c79f6d18e959f9dc129b8529b711c60e76754acc285e60946303b923ec" | 19 | SRC_URI[sha256sum] = "2c54c2e090065849d0ab8cc7b06942f4e66dde17f2a0c80ae20b907d562c937e" |
| 20 | CVE_PRODUCT = "live555 live555_media_server live555:streaming_media live555:liblivemedia" | ||
| 20 | 21 | ||
| 21 | S = "${UNPACKDIR}/live" | 22 | S = "${UNPACKDIR}/live" |
| 22 | 23 | ||
diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_6.2.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_6.2.bb index b6b9a068a9..9e54f49dcb 100644 --- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_6.2.bb +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_6.2.bb | |||
| @@ -9,6 +9,7 @@ DEPENDS = "gtkmm4 pulseaudio json-glib" | |||
| 9 | inherit meson features_check pkgconfig gettext | 9 | inherit meson features_check pkgconfig gettext |
| 10 | 10 | ||
| 11 | ANY_OF_DISTRO_FEATURES = "opengl vulkan" | 11 | ANY_OF_DISTRO_FEATURES = "opengl vulkan" |
| 12 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 12 | 13 | ||
| 13 | SRC_URI = "http://www.freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" | 14 | SRC_URI = "http://www.freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" |
| 14 | SRC_URI[sha256sum] = "e93a7836c7307dcbc989e95fc7ec0878322514c475fabd90e89ed52fd4f15d32" | 15 | SRC_URI[sha256sum] = "e93a7836c7307dcbc989e95fc7ec0878322514c475fabd90e89ed52fd4f15d32" |
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-meson.build-fix-arm-_TIME_BITS-64-error.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-meson.build-fix-arm-_TIME_BITS-64-error.patch deleted file mode 100644 index f41dde0e16..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-meson.build-fix-arm-_TIME_BITS-64-error.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 5aabd01e415374fc97eebe80d4635c3bae728f81 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hans Verkuil <hverkuil@xs4all.nl> | ||
| 3 | Date: Sat, 12 Apr 2025 12:30:13 +0200 | ||
| 4 | Subject: [PATCH] meson.build: fix arm _TIME_BITS=64 error | ||
| 5 | |||
| 6 | Undefine _TIME_BITS to avoid this error on 32-bit arm: | ||
| 7 | |||
| 8 | /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ||
| 9 | |||
| 10 | Upstream-Status: Backport [https://github.com/gjasny/v4l-utils/commit/d517cfdcdc16533ab7e06e97c07ca089cf261aef] | ||
| 11 | |||
| 12 | Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> | ||
| 13 | Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> | ||
| 14 | --- | ||
| 15 | meson.build | 6 +++++- | ||
| 16 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/meson.build b/meson.build | ||
| 19 | index 269a9da7..31927cda 100644 | ||
| 20 | --- a/meson.build | ||
| 21 | +++ b/meson.build | ||
| 22 | @@ -53,8 +53,12 @@ v4l2_wrapper_args = [ | ||
| 23 | # As the library needs to provide both 32-bit and 64-bit versions | ||
| 24 | # of file operations, disable transparent large file support (fixes | ||
| 25 | # 'Error: symbol `open64/mmap64' is already defined' compile failure | ||
| 26 | - # otherwise) | ||
| 27 | + # otherwise). | ||
| 28 | + # | ||
| 29 | + # Also disable _TIME_BITS=64 since this is allowed only with | ||
| 30 | + # _FILE_OFFSET_BITS=64, which is now 32. | ||
| 31 | '-U_FILE_OFFSET_BITS', | ||
| 32 | + '-U_TIME_BITS', | ||
| 33 | '-D_FILE_OFFSET_BITS=32', | ||
| 34 | '-D_LARGEFILE64_SOURCE', | ||
| 35 | ] | ||
| 36 | -- | ||
| 37 | 2.34.1 | ||
| 38 | |||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.32.0.bb index 14b8d12c45..d19d518b80 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.32.0.bb | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | SUMMARY = "v4l2 and IR applications" | 1 | SUMMARY = "v4l2 and IR applications" |
| 2 | HOMEPAGE = "https://git.linuxtv.org/v4l-utils.git" | 2 | HOMEPAGE = "https://git.linuxtv.org/v4l-utils.git" |
| 3 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" | 3 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0ebceacbd7029b5e7051e9f529542b7c \ |
| 5 | file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" | 5 | file://COPYING.libv4l;md5=88b8889c2c4329d4cf18ce5895e64c16" |
| 6 | PROVIDES = "libv4l media-ctl" | 6 | PROVIDES = "libv4l media-ctl" |
| 7 | 7 | ||
| 8 | DEPENDS = "jpeg \ | 8 | DEPENDS = "jpeg \ |
| @@ -23,14 +23,12 @@ PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" | |||
| 23 | PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" | 23 | PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" |
| 24 | 24 | ||
| 25 | SRC_URI = "\ | 25 | SRC_URI = "\ |
| 26 | git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.28 \ | 26 | git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=master;tag=v4l-utils-${PV} \ |
| 27 | file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ | 27 | file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ |
| 28 | file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \ | 28 | file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \ |
| 29 | file://0003-meson.build-fix-arm-_TIME_BITS-64-error.patch \ | ||
| 30 | " | 29 | " |
| 31 | 30 | ||
| 32 | SRCREV = "fc15e229d9d337e46d730f00647821adbbd58548" | 31 | SRCREV = "5a666c7ce89c00d66aa8e53c8f098a0c6c401f91" |
| 33 | |||
| 34 | 32 | ||
| 35 | UPSTREAM_CHECK_GITTAGREGEX = "v4l-utils-(?P<pver>\d+(\.\d+)+)" | 33 | UPSTREAM_CHECK_GITTAGREGEX = "v4l-utils-(?P<pver>\d+(\.\d+)+)" |
| 36 | 34 | ||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index 87dc7a7be6..03d3303bc9 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb | |||
| @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" | |||
| 4 | 4 | ||
| 5 | SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master;protocol=https \ | 5 | SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master;protocol=https \ |
| 6 | " | 6 | " |
| 7 | SRCREV = "52c975e5542504ac10bed8b1d68df5c75951d202" | 7 | SRCREV = "3bf1c3bfc25a780dda8333653b80932cb1e422a8" |
| 8 | 8 | ||
| 9 | PV = "0.0" | 9 | PV = "0.0" |
| 10 | 10 | ||
diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.8.1.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_5.9.0.bb index 63d0db1b67..7e2b0e3d39 100644 --- a/meta-oe/recipes-multimedia/wavpack/wavpack_5.8.1.bb +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.9.0.bb | |||
| @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=3a6eec695493cff01ff6f7b7888c5631" | |||
| 4 | 4 | ||
| 5 | DEPENDS = "openssl" | 5 | DEPENDS = "openssl" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https" | 7 | SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https;tag=${PV}" |
| 8 | SRCREV = "4827b9889665b937b6ed71b9c6c0123152cd7a02" | 8 | SRCREV = "5803634a030e2a11dba602ba057b89cc34486c67" |
| 9 | 9 | ||
| 10 | inherit cmake pkgconfig lib_package | 10 | inherit cmake pkgconfig lib_package |
| 11 | 11 | ||
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.15.2.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.16.0.bb index a7cd76e0c7..c81dde000c 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.15.2.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.16.0.bb | |||
| @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" | |||
| 7 | 7 | ||
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" |
| 9 | 9 | ||
| 10 | SRCREV = "d168454ecd099805c675d4a98c66f4891373302a" | 10 | SRCREV = "1024874c5919305883187e2953de8fcb4c3d7fa6" |
| 11 | SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main;tag=v${PV} \ | 11 | SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main;tag=v${PV} \ |
| 12 | file://libvpx-configure-support-blank-prefix.patch \ | 12 | file://libvpx-configure-support-blank-prefix.patch \ |
| 13 | " | 13 | " |
diff --git a/meta-oe/recipes-navigation/geos/geos_3.13.1.bb b/meta-oe/recipes-navigation/geos/geos_3.14.1.bb index ba01968052..28a620c5bf 100644 --- a/meta-oe/recipes-navigation/geos/geos_3.13.1.bb +++ b/meta-oe/recipes-navigation/geos/geos_3.14.1.bb | |||
| @@ -6,7 +6,7 @@ LICENSE = "LGPL-2.1-or-later" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
| 7 | 7 | ||
| 8 | SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2" | 8 | SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2" |
| 9 | SRC_URI[sha256sum] = "df2c50503295f325e7c8d7b783aca8ba4773919cde984193850cf9e361dfd28c" | 9 | SRC_URI[sha256sum] = "3c20919cda9a505db07b5216baa980bacdaa0702da715b43f176fb07eff7e716" |
| 10 | 10 | ||
| 11 | inherit cmake pkgconfig binconfig | 11 | inherit cmake pkgconfig binconfig |
| 12 | 12 | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.27.3.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.27.5.bb index 5b2d6d97d2..f7ca367fa4 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.27.3.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.27.5.bb | |||
| @@ -10,7 +10,7 @@ HOMEPAGE = "https://gpsd.io/" | |||
| 10 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | 10 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ |
| 11 | file://gpsd.init \ | 11 | file://gpsd.init \ |
| 12 | " | 12 | " |
| 13 | SRC_URI[sha256sum] = "a4d85b67797522ae8611958b5fda0bb67e4921afe26bd53e1d2ff0a4158daccb" | 13 | SRC_URI[sha256sum] = "409873f5048462ef1ac413a51ab35caa8b50b31be62b3347bee1cc2994e7c649" |
| 14 | 14 | ||
| 15 | inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig | 15 | inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig |
| 16 | 16 | ||
diff --git a/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb b/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb index a6eedda5d7..24b916a921 100644 --- a/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb +++ b/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | DESCRIPTION = "CUPS backends, filters, and other software" | 1 | DESCRIPTION = "CUPS backends, filters, and other software" |
| 2 | HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters" | 2 | HOMEPAGE = "https://wiki.linuxfoundation.org/openprinting/cups-filters" |
| 3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=6d5b952b53dbe7752199903d082e5f07" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=6d5b952b53dbe7752199903d082e5f07" |
| 5 | 5 | ||
diff --git a/meta-oe/recipes-printing/cups/libcupsfilters/CVE-2025-64503.patch b/meta-oe/recipes-printing/cups/libcupsfilters/CVE-2025-64503.patch new file mode 100644 index 0000000000..b70586296e --- /dev/null +++ b/meta-oe/recipes-printing/cups/libcupsfilters/CVE-2025-64503.patch | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | From da9a7db3b9125c87b11c43b05354ca2eb21ed684 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Mon, 10 Nov 2025 21:10:56 +0100 | ||
| 4 | Subject: [PATCH] Fix out-of-bounds write in cfFilterPDFToRaster() | ||
| 5 | |||
| 6 | From: Till Kamppeter <till.kamppeter@gmail.com> | ||
| 7 | |||
| 8 | PDFs with too large page dimensions could cause an integer overflow and then a too small buffer for the pixel line to be allocated. | ||
| 9 | |||
| 10 | Fixed this by cropping the page size to the maximum allowed by the standard, 14400x14400pt, 200x200in, 5x5m | ||
| 11 | |||
| 12 | https://community.adobe.com/t5/indesign-discussions/maximum-width-of-a-pdf/td-p/9217372 | ||
| 13 | |||
| 14 | Fixes CVE-2025-64503 | ||
| 15 | |||
| 16 | CVE: CVE-2025-64503 | ||
| 17 | Upstream-Status: Backport [https://github.com/OpenPrinting/libcupsfilters/commit/fd01543f372ca3ba1f1c27bd3427110fa0094e3f] | ||
| 18 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 19 | --- | ||
| 20 | cupsfilters/pdftoraster.cxx | 14 ++++++++++++++ | ||
| 21 | 1 file changed, 14 insertions(+) | ||
| 22 | |||
| 23 | diff --git a/cupsfilters/pdftoraster.cxx b/cupsfilters/pdftoraster.cxx | ||
| 24 | index 0235b54..09583df 100644 | ||
| 25 | --- a/cupsfilters/pdftoraster.cxx | ||
| 26 | +++ b/cupsfilters/pdftoraster.cxx | ||
| 27 | @@ -1606,6 +1606,20 @@ out_page(pdftoraster_doc_t *doc, | ||
| 28 | l = inputPageBox.height(); | ||
| 29 | if (l < 0) | ||
| 30 | l = -l; | ||
| 31 | + | ||
| 32 | + // | ||
| 33 | + // Maximum allowed page size for PDF is 200x200 inches (~ 5x5 m), or 14400x14400 pt | ||
| 34 | + // https://community.adobe.com/t5/indesign-discussions/maximum-width-of-a-pdf/td-p/9217372 | ||
| 35 | + // | ||
| 36 | + if (doc->header.cupsPageSize[0] > 14400) { | ||
| 37 | + fprintf(stderr, "ERROR: Page width is %.2fpt, too large, cropping to 14400pt\n", doc->header.cupsPageSize[0]); | ||
| 38 | + doc->header.cupsPageSize[0] = 14400; | ||
| 39 | + } | ||
| 40 | + if (doc->header.cupsPageSize[1] > 14400) { | ||
| 41 | + fprintf(stderr, "ERROR: Page height is %.2fpt, too large, cropping to 14400pt\n", doc->header.cupsPageSize[1]); | ||
| 42 | + doc->header.cupsPageSize[1] = 14400; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | if (rotate == 90 || rotate == 270) | ||
| 46 | doc->header.cupsPageSize[0] = l; | ||
| 47 | else | ||
diff --git a/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb b/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb index 51d8c4f18b..311f33e134 100644 --- a/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb +++ b/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb | |||
| @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aab2024bd2a475438a154cd1640c9684" | |||
| 5 | 5 | ||
| 6 | DEPENDS = "cups fontconfig libexif dbus lcms qpdf poppler libpng jpeg tiff" | 6 | DEPENDS = "cups fontconfig libexif dbus lcms qpdf poppler libpng jpeg tiff" |
| 7 | 7 | ||
| 8 | SRC_URI = " \ | 8 | SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \ |
| 9 | https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \ | 9 | file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch \ |
| 10 | file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch \ | 10 | file://CVE-2025-64503.patch \ |
| 11 | " | 11 | " |
| 12 | SRC_URI[sha256sum] = "6c303e36cfde05a6c88fb940c62b6a18e7cdbfb91f077733ebc98f104925ce36" | 12 | SRC_URI[sha256sum] = "6c303e36cfde05a6c88fb940c62b6a18e7cdbfb91f077733ebc98f104925ce36" |
| 13 | 13 | ||
| 14 | inherit autotools gettext pkgconfig github-releases | 14 | inherit autotools gettext pkgconfig github-releases |
diff --git a/meta-oe/recipes-printing/qpdf/qpdf_12.3.0.bb b/meta-oe/recipes-printing/qpdf/qpdf_12.3.2.bb index 9f89913ad6..68fb0d4f6b 100644 --- a/meta-oe/recipes-printing/qpdf/qpdf_12.3.0.bb +++ b/meta-oe/recipes-printing/qpdf/qpdf_12.3.2.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
| 6 | DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" | 6 | DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main;tag=v${PV}" | 8 | SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main;tag=v${PV}" |
| 9 | SRCREV = "e1af26a3a76336113e3fc9061df32d7a58eb7469" | 9 | SRCREV = "a898bb3a7289d1d05789d6d3f0d5dd534943a8da" |
| 10 | 10 | ||
| 11 | inherit cmake pkgconfig gettext | 11 | inherit cmake pkgconfig gettext |
| 12 | 12 | ||
diff --git a/meta-oe/recipes-security/audit/audit/0001-auparse-test-disable-some-test-cases.patch b/meta-oe/recipes-security/audit/audit/0001-auparse-test-disable-some-test-cases.patch deleted file mode 100644 index fb9a901f3c..0000000000 --- a/meta-oe/recipes-security/audit/audit/0001-auparse-test-disable-some-test-cases.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 003983a6e04a5e8d9373a96cb0a1c13caae9b193 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Sat, 6 Sep 2025 14:04:40 +0800 | ||
| 4 | Subject: [PATCH] auparse/test: disable some test cases | ||
| 5 | |||
| 6 | Disable test cases databuf_test lru_cache_test and uid_name_wrap_test as | ||
| 7 | they can not be built with --disable-static configuration. See [1]. | ||
| 8 | |||
| 9 | [1]: https://github.com/linux-audit/audit-userspace/issues/494 | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [embedded specific] | ||
| 12 | |||
| 13 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 14 | --- | ||
| 15 | auparse/test/Makefile.am | 6 +++--- | ||
| 16 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/auparse/test/Makefile.am b/auparse/test/Makefile.am | ||
| 19 | index 06928438..dad75e76 100644 | ||
| 20 | --- a/auparse/test/Makefile.am | ||
| 21 | +++ b/auparse/test/Makefile.am | ||
| 22 | @@ -21,10 +21,10 @@ | ||
| 23 | # | ||
| 24 | |||
| 25 | CONFIG_CLEAN_FILES = *.loT *.rej *.orig *.cur | ||
| 26 | -noinst_PROGRAMS = auparse_test auparselol_test lookup_test databuf_test \ | ||
| 27 | - auparse_extra_test lru_cache_test uid_name_wrap_test | ||
| 28 | +noinst_PROGRAMS = auparse_test auparselol_test lookup_test \ | ||
| 29 | + auparse_extra_test | ||
| 30 | TESTS = run_auparse_tests.sh run_auparselol_test.sh lookup_test \ | ||
| 31 | - databuf_test auparse_extra_test lru_cache_test uid_name_wrap_test | ||
| 32 | + auparse_extra_test | ||
| 33 | dist_check_SCRIPTS = run_auparse_tests.sh run_auparselol_test.sh | ||
| 34 | EXTRA_DIST = auparse_test.ref auparse_test.ref.py test.log test2.log test3.log test4.log auditd_raw.sed run_auparse_tests.sh auparse_test.py run_auparselol_test.sh | ||
| 35 | CLEANFILES = run_auparse_tests.sh run_auparselol_test.sh | ||
| 36 | -- | ||
| 37 | 2.34.1 | ||
| 38 | |||
diff --git a/meta-oe/recipes-security/audit/audit_4.1.2.bb b/meta-oe/recipes-security/audit/audit_4.1.3.bb index ae06b6023e..12636045d4 100644 --- a/meta-oe/recipes-security/audit/audit_4.1.2.bb +++ b/meta-oe/recipes-security/audit/audit_4.1.3.bb | |||
| @@ -9,11 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ | 10 | SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ |
| 11 | file://0001-Fixed-swig-host-contamination-issue.patch \ | 11 | file://0001-Fixed-swig-host-contamination-issue.patch \ |
| 12 | file://0001-auparse-test-disable-some-test-cases.patch \ | ||
| 13 | file://auditd \ | 12 | file://auditd \ |
| 14 | " | 13 | " |
| 15 | 14 | ||
| 16 | SRCREV = "4db9c700b0c8b24a8113bc00d98101228e7d0212" | 15 | SRCREV = "dfda9708910e4e72412e68d638087b29522df386" |
| 17 | 16 | ||
| 18 | inherit autotools python3targetconfig update-rc.d systemd | 17 | inherit autotools python3targetconfig update-rc.d systemd |
| 19 | 18 | ||
diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb b/meta-oe/recipes-security/passwdqc/passwdqc_2.1.0.bb index 2b9356f60e..fc2ca6c4c6 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_2.1.0.bb | |||
| @@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ac99c8678577a1c2f9f04cccee411d5d" | |||
| 30 | SRC_URI = "https://download.openwall.net/pub/projects/${BPN}/${BP}.tar.gz \ | 30 | SRC_URI = "https://download.openwall.net/pub/projects/${BPN}/${BP}.tar.gz \ |
| 31 | file://makefile-add-ldflags.patch \ | 31 | file://makefile-add-ldflags.patch \ |
| 32 | " | 32 | " |
| 33 | SRC_URI[sha256sum] = "53b0f4bc49369f06195e9e13abb6cff352d5acb79e861004ec95973896488cf4" | 33 | SRC_URI[sha256sum] = "52fa12271104e74126145c6224b22b4a8dd32cc47de04c1e9fb8f348340df4d2" |
| 34 | 34 | ||
| 35 | # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam | 35 | # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam |
| 36 | # this package's pam_passwdqc.so needs pam | 36 | # this package's pam_passwdqc.so needs pam |
diff --git a/meta-oe/recipes-security/softhsm/files/0001-avoid-unnecessary-check-for-sqlite3-binary.patch b/meta-oe/recipes-security/softhsm/files/0001-avoid-unnecessary-check-for-sqlite3-binary.patch deleted file mode 100644 index 7dddcdb78b..0000000000 --- a/meta-oe/recipes-security/softhsm/files/0001-avoid-unnecessary-check-for-sqlite3-binary.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 88d968346184058df18dc69171dcd4fd612c2341 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jan Luebbe <sho@stratum0.net> | ||
| 3 | Date: Mon, 30 Jan 2023 12:48:23 +0100 | ||
| 4 | Subject: [PATCH] avoid unnecessary check for sqlite3 binary | ||
| 5 | |||
| 6 | Only the library is used, not the sqlite3 binary. Drop this check to simplify | ||
| 7 | cross-compilation (as no native sqlite3 binary is needed). | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://github.com/opendnssec/SoftHSMv2/pull/694] | ||
| 10 | --- | ||
| 11 | m4/acx_sqlite3.m4 | 6 ------ | ||
| 12 | 1 file changed, 6 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/m4/acx_sqlite3.m4 b/m4/acx_sqlite3.m4 | ||
| 15 | index fd942a75e1a6..17c126d161f5 100644 | ||
| 16 | --- a/m4/acx_sqlite3.m4 | ||
| 17 | +++ b/m4/acx_sqlite3.m4 | ||
| 18 | @@ -4,19 +4,13 @@ AC_DEFUN([ACX_SQLITE3],[ | ||
| 19 | [ | ||
| 20 | SQLITE3_INCLUDES="-I$withval/include" | ||
| 21 | SQLITE3_LIBDIRS="-L$withval/lib" | ||
| 22 | - AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $withval/bin) | ||
| 23 | |||
| 24 | ],[ | ||
| 25 | SQLITE3_INCLUDES="" | ||
| 26 | SQLITE3_LIBDIRS="" | ||
| 27 | - AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $PATH) | ||
| 28 | ]) | ||
| 29 | |||
| 30 | |||
| 31 | - if ! test -x "$SQLITE3"; then | ||
| 32 | - AC_MSG_ERROR([sqlite3 command not found]) | ||
| 33 | - fi | ||
| 34 | - | ||
| 35 | AC_MSG_CHECKING(what are the SQLite3 includes) | ||
| 36 | AC_MSG_RESULT($SQLITE3_INCLUDES) | ||
| 37 | |||
| 38 | -- | ||
| 39 | 2.30.2 | ||
| 40 | |||
diff --git a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb b/meta-oe/recipes-security/softhsm/softhsm_2.7.0.bb index 30b4fc71d8..5d75cf0fb4 100644 --- a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb +++ b/meta-oe/recipes-security/softhsm/softhsm_2.7.0.bb | |||
| @@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210" | |||
| 6 | DEPENDS = "sqlite3" | 6 | DEPENDS = "sqlite3" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/softhsm/SoftHSMv2.git;protocol=https;branch=main;tag=${PV} \ | 8 | SRC_URI = "git://github.com/softhsm/SoftHSMv2.git;protocol=https;branch=main;tag=${PV} \ |
| 9 | file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \ | ||
| 10 | file://0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch \ | 9 | file://0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch \ |
| 11 | " | 10 | " |
| 12 | SRCREV = "7f99bedae002f0dd04ceeb8d86d59fc4a68a69a0" | 11 | SRCREV = "13e6e86b83748fef74046dbf0c91f664b7acc1c3" |
| 13 | 12 | ||
| 14 | inherit autotools pkgconfig siteinfo | 13 | inherit autotools pkgconfig siteinfo |
| 15 | 14 | ||
diff --git a/meta-oe/recipes-security/spdm-emu/spdm-emu_git.bb b/meta-oe/recipes-security/spdm-emu/spdm-emu_git.bb new file mode 100644 index 0000000000..bc241b5594 --- /dev/null +++ b/meta-oe/recipes-security/spdm-emu/spdm-emu_git.bb | |||
| @@ -0,0 +1,75 @@ | |||
| 1 | SUMMARY = "SPDM Emulator" | ||
| 2 | DESCRIPTION = "Sample SPDM emulator implementation using libspdm \ | ||
| 3 | for testing SPDM communication." | ||
| 4 | HOMEPAGE = "https://github.com/DMTF/spdm-emu" | ||
| 5 | |||
| 6 | LICENSE = "BSD-3-Clause" | ||
| 7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ed4cfe4688e1ac2cc2e6748766571949" | ||
| 8 | |||
| 9 | SRC_URI = "gitsm://github.com/DMTF/spdm-emu;protocol=https;branch=main" | ||
| 10 | |||
| 11 | SRCREV = "5fca359b15e4edd4f070ca83c9da02799b6f78ae" | ||
| 12 | inherit cmake pkgconfig systemd | ||
| 13 | |||
| 14 | DEPENDS = "openssl" | ||
| 15 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | ||
| 16 | PACKAGECONFIG[systemd] = "-DENABLE_SYSTEMD=ON,-DENABLE_SYSTEMD=OFF,systemd" | ||
| 17 | |||
| 18 | SYSTEMD_SERVICE:${PN} = "spdm-responder-emu.service" | ||
| 19 | |||
| 20 | def get_spdm_multiarch(d): | ||
| 21 | target_arch = d.getVar('TARGET_ARCH') | ||
| 22 | multiarch_options = { | ||
| 23 | "x86_64": "x64", | ||
| 24 | "i586": "ia32", | ||
| 25 | "i686": "ia32", | ||
| 26 | "arm": "arm", | ||
| 27 | "aarch64": "aarch64", | ||
| 28 | "riscv32": "riscv32", | ||
| 29 | "riscv64": "riscv64", | ||
| 30 | "ppc64le": "ppc64le", | ||
| 31 | } | ||
| 32 | |||
| 33 | if target_arch in multiarch_options: | ||
| 34 | return multiarch_options[target_arch] | ||
| 35 | |||
| 36 | bb.fatal("unsupported architecture '%s'" % target_arch) | ||
| 37 | |||
| 38 | EXTRA_OECMAKE += "\ | ||
| 39 | -DARCH=${@get_spdm_multiarch(d)} \ | ||
| 40 | -DTOOLCHAIN=NONE \ | ||
| 41 | -DTARGET=Release \ | ||
| 42 | -DCRYPTO=openssl \ | ||
| 43 | -DENABLE_BINARY_BUILD=1 \ | ||
| 44 | -DCOMPILED_LIBCRYPTO_PATH=${libdir} \ | ||
| 45 | -DCOMPILED_LIBSSL_PATH=${libdir} \ | ||
| 46 | " | ||
| 47 | |||
| 48 | OECMAKE_TARGET_COMPILE += " copy_sample_key" | ||
| 49 | |||
| 50 | do_install:append() { | ||
| 51 | # Install binaries to /usr/bin | ||
| 52 | install -d ${D}${bindir} | ||
| 53 | install -m 0755 ${B}/bin/spdm_requester_emu ${D}${bindir}/ | ||
| 54 | install -m 0755 ${B}/bin/spdm_responder_emu ${D}${bindir}/ | ||
| 55 | install -m 0755 ${B}/bin/spdm_device_attester_sample ${D}${bindir}/ | ||
| 56 | install -m 0755 ${B}/bin/spdm_device_validator_sample ${D}${bindir}/ | ||
| 57 | |||
| 58 | # Install certificates/keys to /usr/share/spdm-emu | ||
| 59 | install -d ${D}${datadir}/spdm-emu | ||
| 60 | for f in ${B}/bin/*; do | ||
| 61 | case "$(basename $f)" in | ||
| 62 | spdm_requester_emu|spdm_responder_emu|spdm_device_attester_sample|spdm_device_validator_sample) | ||
| 63 | ;; | ||
| 64 | *) | ||
| 65 | if [ -d "$f" ]; then | ||
| 66 | cp -r --no-preserve=ownership $f ${D}${datadir}/spdm-emu/ | ||
| 67 | else | ||
| 68 | install -m 0644 $f ${D}${datadir}/spdm-emu/ | ||
| 69 | fi | ||
| 70 | ;; | ||
| 71 | esac | ||
| 72 | done | ||
| 73 | } | ||
| 74 | |||
| 75 | FILES:${PN} += "${datadir}/spdm-emu" | ||
diff --git a/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_0.46.bb b/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_git.bb index 48f9a738bb..e239770584 100644 --- a/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_0.46.bb +++ b/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_git.bb | |||
| @@ -8,9 +8,10 @@ BUGTRACKER = "https://github.com/speed47/spectre-meltdown-checker/issues" | |||
| 8 | LICENSE = "GPL-3.0-only" | 8 | LICENSE = "GPL-3.0-only" |
| 9 | LIC_FILES_CHKSUM = "file://spectre-meltdown-checker.sh;beginline=2;endline=2;md5=3ae5399e70af7be9b93f72568069e2f4" | 9 | LIC_FILES_CHKSUM = "file://spectre-meltdown-checker.sh;beginline=2;endline=2;md5=3ae5399e70af7be9b93f72568069e2f4" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/speed47/spectre-meltdown-checker;protocol=https;branch=master" | 11 | PV = "0.46+git" |
| 12 | SRCREV = "b8f8c81d519435c0871b13f02b5c4a72c5bffd5e" | ||
| 13 | 12 | ||
| 13 | SRC_URI = "git://github.com/speed47/spectre-meltdown-checker;protocol=https;branch=master" | ||
| 14 | SRCREV = "a20641fbad57f37da6093203484ca28769e5bb64" | ||
| 14 | 15 | ||
| 15 | # binutils: readelf,objdump might be used for deeper analysis | 16 | # binutils: readelf,objdump might be used for deeper analysis |
| 16 | # coreutils: dd with iflag=skip_bytes oflag=seek_bytes in some cases | 17 | # coreutils: dd with iflag=skip_bytes oflag=seek_bytes in some cases |
diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb index 1826e91697..532829a53a 100644 --- a/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a \ | |||
| 6 | file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ | 6 | file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ |
| 7 | " | 7 | " |
| 8 | 8 | ||
| 9 | SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ | 9 | SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/anthy/9100h-23ubuntu2/anthy_9100h.orig.tar.gz \ |
| 10 | file://not_build_elc.patch \ | 10 | file://not_build_elc.patch \ |
| 11 | file://2ch_t.patch \ | 11 | file://2ch_t.patch \ |
| 12 | " | 12 | " |
diff --git a/meta-oe/recipes-support/asio/asio_1.30.2.bb b/meta-oe/recipes-support/asio/asio_1.36.0.bb index 1f492b71eb..d196a35c69 100644 --- a/meta-oe/recipes-support/asio/asio_1.30.2.bb +++ b/meta-oe/recipes-support/asio/asio_1.36.0.bb | |||
| @@ -17,9 +17,9 @@ inherit autotools ptest | |||
| 17 | 17 | ||
| 18 | ALLOW_EMPTY:${PN} = "1" | 18 | ALLOW_EMPTY:${PN} = "1" |
| 19 | 19 | ||
| 20 | LIC_FILES_CHKSUM = "file://COPYING;md5=2bfc909e030aeafefa72f764165b8d07" | 20 | LIC_FILES_CHKSUM = "file://COPYING;md5=92db288d8a7d89bb9c5821c447c3052c" |
| 21 | 21 | ||
| 22 | SRC_URI[sha256sum] = "9f12cef05c0477eace9c68ccabd19f9e3a04b875d4768c323714cbd3a5fa3c2b" | 22 | SRC_URI[sha256sum] = "7bf4dbe3c1ccd9cc4c94e6e6be026dcc2110f9201d286bb9500dc85d69825524" |
| 23 | 23 | ||
| 24 | PACKAGECONFIG ??= "boost" | 24 | PACKAGECONFIG ??= "boost" |
| 25 | 25 | ||
diff --git a/meta-oe/recipes-support/atop/atop_2.12.0.bb b/meta-oe/recipes-support/atop/atop_2.12.1.bb index 348493245b..4ca74edbaf 100644 --- a/meta-oe/recipes-support/atop/atop_2.12.0.bb +++ b/meta-oe/recipes-support/atop/atop_2.12.1.bb | |||
| @@ -22,7 +22,7 @@ SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ | |||
| 22 | file://fix-permissions.patch \ | 22 | file://fix-permissions.patch \ |
| 23 | file://sysvinit-implement-status.patch \ | 23 | file://sysvinit-implement-status.patch \ |
| 24 | " | 24 | " |
| 25 | SRC_URI[sha256sum] = "0d09ecc90c14e6ef41c22e3c57c142c3e4fb9cf3c94379077a33c961d5343086" | 25 | SRC_URI[sha256sum] = "4fdbe67c5dfaf89405639e18599f4eae77978073ffa54f3c78c368ab54bd12f6" |
| 26 | 26 | ||
| 27 | UPSTREAM_CHECK_URI = "https://atoptool.nl/downloadatop.php" | 27 | UPSTREAM_CHECK_URI = "https://atoptool.nl/downloadatop.php" |
| 28 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+).tar" | 28 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+).tar" |
diff --git a/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch index bab1d1f301..ac72be44dc 100644 --- a/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch +++ b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch | |||
| @@ -1,45 +1,37 @@ | |||
| 1 | From 678c32f867931fd9f410b6e46ea8d101714c7ed5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= <l.goehrs@pengutronix.de> | ||
| 3 | Date: Tue, 6 May 2025 07:45:36 +0200 | ||
| 4 | Subject: [PATCH] CMakeLists: do not use vendored libcurl | 1 | Subject: [PATCH] CMakeLists: do not use vendored libcurl |
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | 2 | ||
| 9 | Upstream-Status: Inappropriate [upstream ticket https://github.com/nxp-imx/bcu/issues/17] | 3 | Upstream-Status: Inappropriate [upstream ticket https://github.com/nxp-imx/bcu/issues/17] |
| 10 | 4 | ||
| 11 | Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de> | 5 | Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de> |
| 6 | |||
| 7 | Update for 1.1.128 | ||
| 8 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 12 | --- | 9 | --- |
| 13 | CMakeLists.txt | 10 +++++----- | 10 | CMakeLists.txt | 5 +++-- |
| 14 | 1 file changed, 5 insertions(+), 5 deletions(-) | 11 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 15 | 12 | ||
| 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 17 | index 42158a2..ac840fc 100644 | 14 | index 0d6b915..f8c76ca 100644 |
| 18 | --- a/CMakeLists.txt | 15 | --- a/CMakeLists.txt |
| 19 | +++ b/CMakeLists.txt | 16 | +++ b/CMakeLists.txt |
| 20 | @@ -17,17 +17,17 @@ pkg_check_modules(LIBFTDI REQUIRED libftdi1) | 17 | @@ -16,14 +16,15 @@ find_package(PkgConfig REQUIRED) |
| 18 | pkg_check_modules(LIBFTDI REQUIRED libftdi1) | ||
| 21 | pkg_check_modules(LIBYAML REQUIRED yaml-0.1) | 19 | pkg_check_modules(LIBYAML REQUIRED yaml-0.1) |
| 22 | pkg_check_modules(LIBOPENSSL REQUIRED openssl) | ||
| 23 | pkg_check_modules(LIBUSB REQUIRED libusb-1.0) | 20 | pkg_check_modules(LIBUSB REQUIRED libusb-1.0) |
| 24 | +pkg_check_modules(LIBCURL REQUIRED libcurl) | 21 | +pkg_check_modules(LIBCURL REQUIRED libcurl) |
| 25 | project(bcu) | 22 | project(bcu) |
| 26 | -include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${PROJECT_SOURCE_DIR}/libftdi/src ${LIBYAML_INCLUDEDIR} ${PROJECT_SOURCE_DIR}/libcurl/include) | 23 | -include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${PROJECT_SOURCE_DIR}/libftdi/src ${LIBYAML_INCLUDEDIR}) |
| 27 | +include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${LIBYAML_INCLUDEDIR}) | 24 | +include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${LIBYAML_INCLUDEDIR}) |
| 28 | include_directories(${PROJECT_SOURCE_DIR}) | 25 | include_directories(${PROJECT_SOURCE_DIR}) |
| 29 | 26 | ||
| 30 | message("operation system is ${CMAKE_SYSTEM}") | 27 | message("operation system is ${CMAKE_SYSTEM}") |
| 31 | if (LINUX) | 28 | if (LINUX) |
| 32 | add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c) | 29 | add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_ftdi_eeprom.c) |
| 33 | - link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS}) | 30 | - link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS}) |
| 34 | - target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${PROJECT_SOURCE_DIR}/libcurl/build.bcu/lib/libcurl.a -lpthread -lssl -lcrypto -lm -ldl) | ||
| 35 | - execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR} | ||
| 36 | - COMMAND ${PROJECT_SOURCE_DIR}/build_libs.sh ${PROJECT_SOURCE_DIR}) | ||
| 37 | + link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS} ${LIBCURL_LIBRARY_DIRS}) | 31 | + link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS} ${LIBCURL_LIBRARY_DIRS}) |
| 38 | + target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${LIBCURL_LIBRARIES} -lpthread -lssl -lcrypto -lm -ldl) | 32 | target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} -lpthread -lm -ldl) |
| 39 | + execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR}) | 33 | execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR} ) |
| 40 | install(TARGETS bcu DESTINATION bin) | 34 | install(TARGETS bcu DESTINATION bin) |
| 41 | elseif (MACOS) | ||
| 42 | add_executable(bcu_mac bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c) | ||
| 43 | -- | 35 | -- |
| 44 | 2.39.5 | 36 | 2.43.0 |
| 45 | 37 | ||
diff --git a/meta-oe/recipes-support/bcu/bcu_1.1.115.bb b/meta-oe/recipes-support/bcu/bcu_1.1.128.bb index 260fba02a9..2b2e5e7fa0 100644 --- a/meta-oe/recipes-support/bcu/bcu_1.1.115.bb +++ b/meta-oe/recipes-support/bcu/bcu_1.1.128.bb | |||
| @@ -9,10 +9,10 @@ SECTION = "devel" | |||
| 9 | LICENSE = "BSD-3-Clause" | 9 | LICENSE = "BSD-3-Clause" |
| 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6" |
| 11 | 11 | ||
| 12 | SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master \ | 12 | SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master;tag=${BPN}_${PV} \ |
| 13 | file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \ | 13 | file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \ |
| 14 | " | 14 | " |
| 15 | SRCREV = "f081c69c26e330cf03ec790051c415c4716509d9" | 15 | SRCREV = "e7027dcb867dae7aebc8fd0a78ab13f05a4557f2" |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | DEPENDS = "curl libyaml libusb1 openssl libftdi" | 18 | DEPENDS = "curl libyaml libusb1 openssl libftdi" |
diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.10.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.12.bb index e611ffb006..2175c8c56d 100644 --- a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.10.bb +++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.12.bb | |||
| @@ -19,11 +19,11 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ | |||
| 19 | HOMEPAGE = "https://www.hboehm.info/gc/" | 19 | HOMEPAGE = "https://www.hboehm.info/gc/" |
| 20 | SECTION = "devel" | 20 | SECTION = "devel" |
| 21 | LICENSE = "MIT" | 21 | LICENSE = "MIT" |
| 22 | LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075" | 22 | LIC_FILES_CHKSUM = "file://README.QUICK;md5=6cff3e88a9b200e8fc98595dc7419dcf" |
| 23 | 23 | ||
| 24 | DEPENDS = "libatomic-ops" | 24 | DEPENDS = "libatomic-ops" |
| 25 | 25 | ||
| 26 | SRCREV = "2955e33aba7467d4777aa985637620f909cc2a14" | 26 | SRCREV = "4fab5386df64466b2b61fc7209bef033cad1e6cc" |
| 27 | SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https;tag=v${PV}" | 27 | SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https;tag=v${PV}" |
| 28 | 28 | ||
| 29 | 29 | ||
diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb index 63500def05..0a8f237180 100644 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb | |||
| @@ -16,7 +16,7 @@ do_configure:prepend() { | |||
| 16 | # will try to fetch https://ceres-solver-review.googlesource.com/tools/hooks/commit-msg durind do_configure | 16 | # will try to fetch https://ceres-solver-review.googlesource.com/tools/hooks/commit-msg durind do_configure |
| 17 | # which sometimes gets stuck (as there is no TIMEOUT set in DOWNLOAD) | 17 | # which sometimes gets stuck (as there is no TIMEOUT set in DOWNLOAD) |
| 18 | # and we really don't need Gerrit's Change-Id tags when just building this | 18 | # and we really don't need Gerrit's Change-Id tags when just building this |
| 19 | touch ${S}/.git/hooks/commit-msg | 19 | touch ${S}/.git/hooks/commit-msg 2>/dev/null || : |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | # We don't want path to eigen3 in ceres-solver RSS to be | 22 | # We don't want path to eigen3 in ceres-solver RSS to be |
diff --git a/meta-oe/recipes-support/cjose/cjose_0.6.2.4.bb b/meta-oe/recipes-support/cjose/cjose_0.6.2.4.bb new file mode 100644 index 0000000000..eb1db40705 --- /dev/null +++ b/meta-oe/recipes-support/cjose/cjose_0.6.2.4.bb | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | SUMMARY = "C library implementing the Javascript Object Signing and Encryption (JOSE)" | ||
| 2 | HOMEPAGE = "https://github.com/OpenIDC/cjose" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7249e2f9437adfb8c88d870438042f0e" | ||
| 5 | |||
| 6 | SRC_URI = "git://github.com/OpenIDC/cjose;protocol=https;branch=version-0.6.2.x;tag=v${PV}" | ||
| 7 | |||
| 8 | SRCREV = "8d94c3ad3237ab6a83d2e92fa541542b1b92c023" | ||
| 9 | |||
| 10 | DEPENDS = "openssl libcheck jansson" | ||
| 11 | |||
| 12 | inherit pkgconfig autotools | ||
| 13 | |||
diff --git a/meta-oe/recipes-support/cmark/cmark_0.31.1.bb b/meta-oe/recipes-support/cmark/cmark_0.31.2.bb index bbbb36dace..b820d9fd65 100644 --- a/meta-oe/recipes-support/cmark/cmark_0.31.1.bb +++ b/meta-oe/recipes-support/cmark/cmark_0.31.2.bb | |||
| @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/commonmark/cmark" | |||
| 3 | LICENSE = "BSD-2-Clause & MIT" | 3 | LICENSE = "BSD-2-Clause & MIT" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" |
| 5 | 5 | ||
| 6 | SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" | 6 | SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https;tag=${PV}" |
| 7 | SRCREV = "bb3678d7a73cb02d35c8876ecd097072636200a8" | 7 | SRCREV = "eec0eeba6d31189fd828314576494566d539b1e3" |
| 8 | 8 | ||
| 9 | inherit cmake lib_package | 9 | inherit cmake lib_package |
| 10 | 10 | ||
diff --git a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb b/meta-oe/recipes-support/driverctl/driverctl_0.121.bb index 578a2b8d3b..026e9f2897 100644 --- a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb +++ b/meta-oe/recipes-support/driverctl/driverctl_0.121.bb | |||
| @@ -7,8 +7,8 @@ REQUIRED_DISTRO_FEATURES = "systemd" | |||
| 7 | DEPENDS = "systemd" | 7 | DEPENDS = "systemd" |
| 8 | RDEPENDS:${PN} += "bash bash-completion" | 8 | RDEPENDS:${PN} += "bash bash-completion" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://gitlab.com/driverctl/driverctl.git;branch=master;protocol=https" | 10 | SRC_URI = "git://gitlab.com/driverctl/driverctl.git;branch=master;protocol=https;tag=${PV}" |
| 11 | SRCREV = "2ba60536eb20ca0a6a751bd8b6501dba84ec45d3" | 11 | SRCREV = "0a72c5b1091d87e839ff083f686477f9eff5fb97" |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | inherit pkgconfig systemd features_check | 14 | inherit pkgconfig systemd features_check |
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.7.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.8.bb index 82ee232fdc..9369daa805 100644 --- a/meta-oe/recipes-support/exiv2/exiv2_0.28.7.bb +++ b/meta-oe/recipes-support/exiv2/exiv2_0.28.8.bb | |||
| @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/Exiv2/exiv2.git;protocol=https;branch=0.28.x;tag=v${ | |||
| 9 | file://0001-Use-automake-output-for-tests.patch \ | 9 | file://0001-Use-automake-output-for-tests.patch \ |
| 10 | file://0001-Allow-test-data-path-configuration.patch \ | 10 | file://0001-Allow-test-data-path-configuration.patch \ |
| 11 | " | 11 | " |
| 12 | SRCREV = "afcb7a8ba84a7de36d2f1ee7689394e078697956" | 12 | SRCREV = "2cd987a731236037b6b78cbff897d08685a8ef49" |
| 13 | 13 | ||
| 14 | inherit cmake gettext ptest | 14 | inherit cmake gettext ptest |
| 15 | 15 | ||
| @@ -19,6 +19,7 @@ PACKAGECONFIG[unittest] = "-DEXIV2_BUILD_UNIT_TESTS=ON -DTEST_FOLDER=${PTEST_PAT | |||
| 19 | 19 | ||
| 20 | RDEPENDS:${PN}-ptest += " \ | 20 | RDEPENDS:${PN}-ptest += " \ |
| 21 | python3-html \ | 21 | python3-html \ |
| 22 | python3-json \ | ||
| 22 | python3-lxml \ | 23 | python3-lxml \ |
| 23 | python3-multiprocessing \ | 24 | python3-multiprocessing \ |
| 24 | python3-shell \ | 25 | python3-shell \ |
| @@ -35,3 +36,5 @@ do_install_ptest(){ | |||
| 35 | install -d ${D}${PTEST_PATH}/src | 36 | install -d ${D}${PTEST_PATH}/src |
| 36 | install ${S}/src/canonmn_int.cpp ${D}${PTEST_PATH}/src | 37 | install ${S}/src/canonmn_int.cpp ${D}${PTEST_PATH}/src |
| 37 | } | 38 | } |
| 39 | |||
| 40 | CVE_STATUS[CVE-2026-27631] = "fixed-version: fixed in 0.28.8" | ||
diff --git a/meta-oe/recipes-support/fastfetch/fastfetch_2.60.0.bb b/meta-oe/recipes-support/fastfetch/fastfetch_2.60.0.bb new file mode 100644 index 0000000000..dbb999969b --- /dev/null +++ b/meta-oe/recipes-support/fastfetch/fastfetch_2.60.0.bb | |||
| @@ -0,0 +1,66 @@ | |||
| 1 | SUMMARY = "A maintained, feature-rich and performance oriented, neofetch like system information tool." | ||
| 2 | DESCRIPTION = "Fastfetch is a neofetch-like tool for fetching system \ | ||
| 3 | information and displaying it in a visually appealing way. It is written \ | ||
| 4 | mainly in C, with a focus on performance and customizability." | ||
| 5 | HOMEPAGE = "https://github.com/fastfetch-cli/fastfetch" | ||
| 6 | BUGTRACKER = "https://github.com/fastfetch-cli/fastfetch/issues" | ||
| 7 | |||
| 8 | LICENSE = "MIT" | ||
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2090e7d93df7ad5a3d41f6fb4226ac76" | ||
| 10 | |||
| 11 | DEPENDS = "yyjson" | ||
| 12 | |||
| 13 | SRC_URI = "git://github.com/fastfetch-cli/fastfetch.git;protocol=https;branch=dev;tag=${PV}" | ||
| 14 | SRCREV = "06ecc9c4805794ca8d632844e64950e82a6d5f7e" | ||
| 15 | |||
| 16 | inherit cmake pkgconfig | ||
| 17 | |||
| 18 | EXTRA_OECMAKE += "\ | ||
| 19 | -DENABLE_SYSTEM_YYJSON=ON \ | ||
| 20 | -DENABLE_DIRECTX_HEADERS=OFF \ | ||
| 21 | " | ||
| 22 | |||
| 23 | PACKAGECONFIG ??= "\ | ||
| 24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl', '', d)} \ | ||
| 25 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)} \ | ||
| 26 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrandr', '', d)} \ | ||
| 27 | ${@bb.utils.filter('DISTRO_FEATURES', 'opencl pulseaudio vulkan wayland', d)} \ | ||
| 28 | dbus \ | ||
| 29 | drm \ | ||
| 30 | sqlite3 \ | ||
| 31 | " | ||
| 32 | |||
| 33 | PACKAGECONFIG[chafa] = "-DENABLE_CHAFA=ON,-DENABLE_CHAFA=OFF,chafa" | ||
| 34 | PACKAGECONFIG[dbus] = "-DENABLE_DBUS=ON,-DENABLE_DBUS=OFF,dbus" | ||
| 35 | PACKAGECONFIG[dconf] = "-DENABLE_DCONF=ON,-DENABLE_DCONF=OFF,dconf" | ||
| 36 | PACKAGECONFIG[ddcutil] = "-DENABLE_DDCUTIL=ON,-DENABLE_DDCUTIL=OFF,ddcutil" | ||
| 37 | PACKAGECONFIG[drm-amdgpu] = "-DENABLE_DRM_AMDGPU=ON,-DENABLE_DRM_AMDGPU=OFF," | ||
| 38 | PACKAGECONFIG[drm] = "-DENABLE_DRM=ON,-DENABLE_DRM=OFF,libdrm" | ||
| 39 | PACKAGECONFIG[egl] = "-DENABLE_EGL=ON,-DENABLE_EGL=OFF,virtual/egl" | ||
| 40 | PACKAGECONFIG[elf] = "-DENABLE_ELF=ON,-DENABLE_ELF=OFF,elfutils" | ||
| 41 | PACKAGECONFIG[flashfetch] = "-DBUILD_FLASHFETCH=ON,-DBUILD_FLASHFETCH=OFF," | ||
| 42 | PACKAGECONFIG[freetype] = "-DENABLE_FREETYPE=ON,-DENABLE_FREETYPE=OFF,freetype" | ||
| 43 | PACKAGECONFIG[gio] = "-DENABLE_GIO=ON,-DENABLE_GIO=OFF,glib-2.0" | ||
| 44 | PACKAGECONFIG[glx] = "-DENABLE_GLX=ON,-DENABLE_GLX=OFF,virtual/libgles2" | ||
| 45 | PACKAGECONFIG[imagemagick] = "-DENABLE_IMAGEMAGICK7=ON -DENABLE_IMAGEMAGICK6=OFF,-DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF,imagemagick" | ||
| 46 | PACKAGECONFIG[opencl] = "-DENABLE_OPENCL=ON,-DENABLE_OPENCL=OFF,opencl-headers virtual/libopencl1" | ||
| 47 | PACKAGECONFIG[pulseaudio] = "-DENABLE_PULSE=ON,-DENABLE_PULSE=OFF,pulseaudio" | ||
| 48 | PACKAGECONFIG[rpm] = "-DENABLE_RPM=ON,-DENABLE_RPM=OFF,rpm" | ||
| 49 | PACKAGECONFIG[sqlite3] = "-DENABLE_SQLITE3=ON,-DENABLE_SQLITE3=OFF,sqlite3" | ||
| 50 | PACKAGECONFIG[vulkan] = "-DENABLE_VULKAN=ON,-DENABLE_VULKAN=OFF,vulkan-loader" | ||
| 51 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON,-DENABLE_WAYLAND=OFF,wayland" | ||
| 52 | PACKAGECONFIG[xcb] = "-DENABLE_XCB_RANDR=ON,-DENABLE_XCB_RANDR=OFF,libxcb" | ||
| 53 | PACKAGECONFIG[xrandr] = "-DENABLE_XRANDR=ON,-DENABLE_XRANDR=OFF,libxrandr" | ||
| 54 | PACKAGECONFIG[zfs] = "-DENABLE_LIBZFS=ON,-DENABLE_LIBZFS=OFF,zfs" | ||
| 55 | PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF,zlib" | ||
| 56 | |||
| 57 | PACKAGES =+ "${PN}-completions" | ||
| 58 | |||
| 59 | FILES:${PN} += "${datadir}/licenses" | ||
| 60 | |||
| 61 | FILES:${PN}-completions = "\ | ||
| 62 | ${datadir}/bash-completion \ | ||
| 63 | ${datadir}/fish \ | ||
| 64 | ${datadir}/zsh \ | ||
| 65 | " | ||
| 66 | RDEPENDS:${PN}-completions += "python3-json" | ||
diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc index 0b2921095c..9d0eb549bd 100644 --- a/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-oe/recipes-support/fltk/fltk.inc | |||
| @@ -1,18 +1,18 @@ | |||
| 1 | SUMMARY = "FLTK is a cross-platform C++ GUI toolkit" | 1 | SUMMARY = "FLTK is a cross-platform C++ GUI toolkit" |
| 2 | HOMEPAGE = "http://www.fltk.org" | 2 | HOMEPAGE = "https://www.fltk.org" |
| 3 | SECTION = "libs" | 3 | SECTION = "libs" |
| 4 | LICENSE = "LGPL-2.0-only & FLTK" | 4 | LICENSE = "LGPL-2.0-only & FLTK" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" |
| 6 | 6 | ||
| 7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
| 8 | http://fltk.org/pub/fltk/${PV}/${BP}-source.tar.bz2 \ | 8 | https://github.com/fltk/fltk/releases/download/release-${PV}/${BP}-source.tar.bz2 \ |
| 9 | file://disable_test.patch \ | 9 | file://disable_test.patch \ |
| 10 | file://0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch \ | 10 | file://0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch \ |
| 11 | file://0002-always-build-fluid-and-export-pointers.patch \ | 11 | file://0002-always-build-fluid-and-export-pointers.patch \ |
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | PV = "1.3.9" | 14 | PV = "1.3.11" |
| 15 | SRC_URI[sha256sum] = "103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2" | 15 | SRC_URI[sha256sum] = "ca2e144e5f89173cd094cc273940d56230b1bf613083a0792e6406dc191cd99f" |
| 16 | 16 | ||
| 17 | inherit cmake pkgconfig | 17 | inherit cmake pkgconfig |
| 18 | 18 | ||
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22852.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22852.patch new file mode 100644 index 0000000000..aa6952fb7d --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22852.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From e3391e8d160f4b1b43d53b4a7d462a3601c45408 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: akallabeth <akallabeth@posteo.net> | ||
| 3 | Date: Sat, 10 Jan 2026 08:36:38 +0100 | ||
| 4 | Subject: [PATCH] free up old audio formats | ||
| 5 | |||
| 6 | CVE: CVE-2026-22852 | ||
| 7 | Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/cd1ffa112cfbe1b40a9fd57e299a8ea12e23df0d] | ||
| 8 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 9 | --- | ||
| 10 | channels/audin/client/audin_main.c | 4 ++++ | ||
| 11 | 1 file changed, 4 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c | ||
| 14 | index 23561b153..5ffe09127 100644 | ||
| 15 | --- a/channels/audin/client/audin_main.c | ||
| 16 | +++ b/channels/audin/client/audin_main.c | ||
| 17 | @@ -219,6 +219,10 @@ static UINT audin_process_formats(AUDIN_PLUGIN* audin, AUDIN_CHANNEL_CALLBACK* c | ||
| 18 | } | ||
| 19 | |||
| 20 | Stream_Seek_UINT32(s); /* cbSizeFormatsPacket */ | ||
| 21 | + | ||
| 22 | + audio_formats_free(callback->formats, callback->formats_count); | ||
| 23 | + callback->formats_count = 0; | ||
| 24 | + | ||
| 25 | callback->formats = audio_formats_new(NumFormats); | ||
| 26 | |||
| 27 | if (!callback->formats) | ||
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22854.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22854.patch new file mode 100644 index 0000000000..791e10ab25 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22854.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From 94d3791abcdbc1e72827921906d5f9c14a2b0a78 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Mon, 12 Jan 2026 03:44:06 +0100 | ||
| 4 | Subject: [PATCH] fix constant type | ||
| 5 | |||
| 6 | From: akallabeth <akallabeth@posteo.net> | ||
| 7 | |||
| 8 | ensure constant is of 64bit integer type | ||
| 9 | |||
| 10 | CVE: CVE-2026-22854 | ||
| 11 | Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/3da319570c8a6be0a79b3306f1ed354c4a943259] | ||
| 12 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 13 | --- | ||
| 14 | channels/drive/client/drive_main.c | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c | ||
| 18 | index b6cf2ad32..5df7fbe97 100644 | ||
| 19 | --- a/channels/drive/client/drive_main.c | ||
| 20 | +++ b/channels/drive/client/drive_main.c | ||
| 21 | @@ -295,7 +295,7 @@ static UINT drive_process_irp_read(DRIVE_DEVICE* drive, IRP* irp) | ||
| 22 | Length = 0; | ||
| 23 | } | ||
| 24 | |||
| 25 | - if (!Stream_EnsureRemainingCapacity(irp->output, Length + 4)) | ||
| 26 | + if (!Stream_EnsureRemainingCapacity(irp->output, 4ull + Length)) | ||
| 27 | { | ||
| 28 | WLog_ERR(TAG, "Stream_EnsureRemainingCapacity failed!"); | ||
| 29 | return ERROR_INTERNAL_ERROR; | ||
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22855.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22855.patch new file mode 100644 index 0000000000..ec0c3a75ec --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22855.patch | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | From df1132783e49ebeaa30206a67b70c7a37f3c5650 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sun, 11 Jan 2026 09:03:57 +0100 | ||
| 4 | Subject: [PATCH] add length validity checks | ||
| 5 | |||
| 6 | From: akallabeth <akallabeth@posteo.net> | ||
| 7 | |||
| 8 | in smartcard_unpack_set_attrib_call input length validity checks were | ||
| 9 | missing. | ||
| 10 | |||
| 11 | CVE: CVE-2026-22855 | ||
| 12 | Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/57c5647d98c2a026de8b681159cb188ca0439ef8] | ||
| 13 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 14 | --- | ||
| 15 | channels/smartcard/client/smartcard_pack.c | 27 +++++++++++++++++----- | ||
| 16 | 1 file changed, 21 insertions(+), 6 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/channels/smartcard/client/smartcard_pack.c b/channels/smartcard/client/smartcard_pack.c | ||
| 19 | index f70eb4e5d..c0673e066 100644 | ||
| 20 | --- a/channels/smartcard/client/smartcard_pack.c | ||
| 21 | +++ b/channels/smartcard/client/smartcard_pack.c | ||
| 22 | @@ -98,8 +98,8 @@ static BOOL smartcard_ndr_pointer_read_(wStream* s, UINT32* index, UINT32* ptr, | ||
| 23 | return TRUE; | ||
| 24 | } | ||
| 25 | |||
| 26 | -static LONG smartcard_ndr_read(wStream* s, BYTE** data, size_t min, size_t elementSize, | ||
| 27 | - ndr_ptr_t type) | ||
| 28 | +static LONG smartcard_ndr_read_ex(wStream* s, BYTE** data, size_t min, size_t elementSize, | ||
| 29 | + ndr_ptr_t type, size_t* plen) | ||
| 30 | { | ||
| 31 | size_t len, offset, len2; | ||
| 32 | void* r; | ||
| 33 | @@ -125,6 +125,9 @@ static LONG smartcard_ndr_read(wStream* s, BYTE** data, size_t min, size_t eleme | ||
| 34 | return STATUS_BUFFER_TOO_SMALL; | ||
| 35 | } | ||
| 36 | |||
| 37 | + if (plen) | ||
| 38 | + *plen = 0; | ||
| 39 | + | ||
| 40 | switch (type) | ||
| 41 | { | ||
| 42 | case NDR_PTR_FULL: | ||
| 43 | @@ -181,11 +184,20 @@ static LONG smartcard_ndr_read(wStream* s, BYTE** data, size_t min, size_t eleme | ||
| 44 | if (!r) | ||
| 45 | return SCARD_E_NO_MEMORY; | ||
| 46 | Stream_Read(s, r, len); | ||
| 47 | - smartcard_unpack_read_size_align(NULL, s, len, 4); | ||
| 48 | + const LONG pad = smartcard_unpack_read_size_align(NULL, s, len, 4); | ||
| 49 | + len += (size_t)pad; | ||
| 50 | *data = r; | ||
| 51 | + if (plen) | ||
| 52 | + *plen = len; | ||
| 53 | return STATUS_SUCCESS; | ||
| 54 | } | ||
| 55 | |||
| 56 | +static LONG smartcard_ndr_read(wStream* s, BYTE** data, size_t min, size_t elementSize, | ||
| 57 | + ndr_ptr_t type) | ||
| 58 | +{ | ||
| 59 | + return smartcard_ndr_read_ex(s, data, min, elementSize, type, NULL); | ||
| 60 | +} | ||
| 61 | + | ||
| 62 | static BOOL smartcard_ndr_pointer_write(wStream* s, UINT32* index, DWORD length) | ||
| 63 | { | ||
| 64 | const UINT32 ndrPtr = 0x20000 + (*index) * 4; | ||
| 65 | @@ -3427,12 +3439,15 @@ LONG smartcard_unpack_set_attrib_call(SMARTCARD_DEVICE* smartcard, wStream* s, S | ||
| 66 | |||
| 67 | if (ndrPtr) | ||
| 68 | { | ||
| 69 | - // TODO: call->cbAttrLen was larger than the pointer value. | ||
| 70 | - // TODO: Maybe need to refine the checks? | ||
| 71 | - status = smartcard_ndr_read(s, &call->pbAttr, 0, 1, NDR_PTR_SIMPLE); | ||
| 72 | + size_t len = 0; | ||
| 73 | + status = smartcard_ndr_read_ex(s, &call->pbAttr, 0, 1, NDR_PTR_SIMPLE, &len); | ||
| 74 | if (status != SCARD_S_SUCCESS) | ||
| 75 | return status; | ||
| 76 | + if (call->cbAttrLen > len) | ||
| 77 | + call->cbAttrLen = (DWORD)(len); | ||
| 78 | } | ||
| 79 | + else | ||
| 80 | + call->cbAttrLen = 0; | ||
| 81 | smartcard_trace_set_attrib_call(smartcard, call); | ||
| 82 | return SCARD_S_SUCCESS; | ||
| 83 | } | ||
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23530.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23530.patch new file mode 100644 index 0000000000..4aac13de93 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23530.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 6f61d18e9707cebe9d7d64346c66da780c7094c4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: akallabeth <akallabeth@posteo.net> | ||
| 3 | Date: Thu, 15 Jan 2026 12:02:02 +0100 | ||
| 4 | Subject: [PATCH] fix decoder length checks | ||
| 5 | |||
| 6 | CVE: CVE-2026-23530 | ||
| 7 | Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/1bab198a2edd0d0e6e1627d21a433151ea190500] | ||
| 8 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 9 | --- | ||
| 10 | libfreerdp/codec/planar.c | 5 +++++ | ||
| 11 | 1 file changed, 5 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/libfreerdp/codec/planar.c b/libfreerdp/codec/planar.c | ||
| 14 | index fe27011e1..1cb2e22bc 100644 | ||
| 15 | --- a/libfreerdp/codec/planar.c | ||
| 16 | +++ b/libfreerdp/codec/planar.c | ||
| 17 | @@ -616,6 +616,11 @@ BOOL planar_decompress(BITMAP_PLANAR_CONTEXT* planar, const BYTE* pSrcData, UINT | ||
| 18 | WINPR_ASSERT(planar); | ||
| 19 | WINPR_ASSERT(prims); | ||
| 20 | |||
| 21 | + if (planar->maxWidth < nSrcWidth) | ||
| 22 | + return FALSE; | ||
| 23 | + if (planar->maxHeight < nSrcHeight) | ||
| 24 | + return FALSE; | ||
| 25 | + | ||
| 26 | if (nDstStep <= 0) | ||
| 27 | nDstStep = nDstWidth * GetBytesPerPixel(DstFormat); | ||
| 28 | |||
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23532.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23532.patch new file mode 100644 index 0000000000..80d4af30b9 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23532.patch | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | From 51929613e6897489736a35eaaf14a3accf143963 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Thu, 15 Jan 2026 12:04:36 +0100 | ||
| 4 | Subject: [PATCH] properly clamp SurfaceToSurface | ||
| 5 | |||
| 6 | From: akallabeth <akallabeth@posteo.net> | ||
| 7 | |||
| 8 | CVE: CVE-2026-23532 | ||
| 9 | Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/c4a7c371342edf0d307cea728f56d3302f0ab38c] | ||
| 10 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 11 | --- | ||
| 12 | libfreerdp/gdi/gfx.c | 9 +++++---- | ||
| 13 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c | ||
| 16 | index 3970715e0..812568bbb 100644 | ||
| 17 | --- a/libfreerdp/gdi/gfx.c | ||
| 18 | +++ b/libfreerdp/gdi/gfx.c | ||
| 19 | @@ -1175,7 +1175,6 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context, | ||
| 20 | UINT status = ERROR_INTERNAL_ERROR; | ||
| 21 | UINT16 index; | ||
| 22 | BOOL sameSurface; | ||
| 23 | - UINT32 nWidth, nHeight; | ||
| 24 | const RECTANGLE_16* rectSrc; | ||
| 25 | RECTANGLE_16 invalidRect; | ||
| 26 | gdiGfxSurface* surfaceSrc; | ||
| 27 | @@ -1199,8 +1198,8 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context, | ||
| 28 | if (!is_rect_valid(rectSrc, surfaceSrc->width, surfaceSrc->height)) | ||
| 29 | goto fail; | ||
| 30 | |||
| 31 | - nWidth = rectSrc->right - rectSrc->left; | ||
| 32 | - nHeight = rectSrc->bottom - rectSrc->top; | ||
| 33 | + const UINT32 nWidth = rectSrc->right - rectSrc->left; | ||
| 34 | + const UINT32 nHeight = rectSrc->bottom - rectSrc->top; | ||
| 35 | |||
| 36 | for (index = 0; index < surfaceToSurface->destPtsCount; index++) | ||
| 37 | { | ||
| 38 | @@ -1209,8 +1208,10 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context, | ||
| 39 | if (!is_rect_valid(&rect, surfaceDst->width, surfaceDst->height)) | ||
| 40 | goto fail; | ||
| 41 | |||
| 42 | + const UINT32 rwidth = rect.right - rect.left; | ||
| 43 | + const UINT32 rheight = rect.bottom - rect.top; | ||
| 44 | if (!freerdp_image_copy(surfaceDst->data, surfaceDst->format, surfaceDst->scanline, | ||
| 45 | - destPt->x, destPt->y, nWidth, nHeight, surfaceSrc->data, | ||
| 46 | + destPt->x, destPt->y, rwidth, rheight, surfaceSrc->data, | ||
| 47 | surfaceSrc->format, surfaceSrc->scanline, rectSrc->left, | ||
| 48 | rectSrc->top, NULL, FREERDP_FLIP_NONE)) | ||
| 49 | goto fail; | ||
diff --git a/meta-oe/recipes-support/freerdp/freerdp/run-ptest b/meta-oe/recipes-support/freerdp/freerdp/run-ptest new file mode 100644 index 0000000000..423a780eb1 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/run-ptest | |||
| @@ -0,0 +1,85 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | #The key is the test binary name, and the value is the list of arguments to | ||
| 4 | #use with the given binary. Each argument is a testcase to execute. | ||
| 5 | |||
| 6 | #These test cases were determined by running the actual test binary | ||
| 7 | #which lists all available test cases. Couldn't find a way to just simply | ||
| 8 | #run all. Also, BusyBox seems to have no associative array support, so | ||
| 9 | #plain variables are used with eval. | ||
| 10 | |||
| 11 | TestAsn="TestAsn1Module TestAsn1Encoder TestAsn1Decoder TestAsn1Encode TestAsn1Decode TestAsn1String \ | ||
| 12 | TestAsn1Integer TestAsn1Compare TestAsn1BerEnc TestAsn1BerDec TestAsn1DerEnc TestAsn1DerDec" | ||
| 13 | TestClient="TestClientRdpFile TestClientChannels TestClientCmdLine" | ||
| 14 | TestClipboard="TestClipboardFormats" | ||
| 15 | TestCommon="TestCommonAssistance" | ||
| 16 | TestCore="TestVersion TestSettings" | ||
| 17 | TestCredUI="TestCredUIParseUserName TestCredUIConfirmCredentials TestCredUIPromptForCredentials TestCredUICmdLinePromptForCredentials" | ||
| 18 | TestCrt="TestTypes TestFormatSpecifiers TestAlignment TestString TestUnicodeConversion" | ||
| 19 | TestCrypto="TestCryptoHash TestCryptoRand TestCryptoCipher TestCryptoProtectData TestCryptoProtectMemory TestCryptoCertEnumCertificatesInStore" | ||
| 20 | TestDsParse="TestDsMakeSpn TestDsCrackNames" | ||
| 21 | TestEnvironment="TestEnvironmentGetEnvironmentStrings TestEnvironmentSetEnvironmentVariable TestEnvironmentMergeEnvironmentStrings TestEnvironmentGetSetEB" | ||
| 22 | TestError="TestErrorSetLastError" | ||
| 23 | TestFile="TestFileCreateFile TestFileDeleteFile TestFileReadFile TestSetFileAttributes TestFileWriteFile \ | ||
| 24 | TestFilePatternMatch TestFileFindFirstFile TestFileFindFirstFileEx TestFileFindNextFile TestFileGetStdHandle" | ||
| 25 | TestFreeRDPCodec="TestFreeRDPRegion TestFreeRDPCodecMppc TestFreeRDPCodecNCrush TestFreeRDPCodecXCrush \ | ||
| 26 | TestFreeRDPCodecZGfx TestFreeRDPCodecPlanar TestFreeRDPCodecClear TestFreeRDPCodecInterleaved \ | ||
| 27 | TestFreeRDPCodecProgressive TestFreeRDPCodecRemoteFX" | ||
| 28 | TestFreeRDPCrypto="TestKnownHosts TestBase64 Test_x509_cert_info" | ||
| 29 | TestFreeRDPUtils="TestRingBuffer" | ||
| 30 | TestGdi="TestGdiRop3 TestGdiLine TestGdiRegion TestGdiRect TestGdiBitBlt TestGdiCreate TestGdiEllipse TestGdiClip" | ||
| 31 | TestInterlocked="TestInterlockedAccess TestInterlockedSList TestInterlockedDList" | ||
| 32 | TestIo="TestIoDevice TestIoGetOverlappedResult" | ||
| 33 | TestLibrary="TestLibraryLoadLibrary TestLibraryGetProcAddress TestLibraryGetModuleFileName" | ||
| 34 | TestLocale="TestLocaleFormatMessage" | ||
| 35 | TestMemory="TestMemoryCreateFileMapping" | ||
| 36 | TestNt="TestNtCreateFile TestNtCurrentTeb" | ||
| 37 | TestPath="TestPathCchAddBackslash TestPathCchRemoveBackslash TestPathCchAddBackslashEx TestPathCchRemoveBackslashEx \ | ||
| 38 | TestPathCchAddExtension TestPathCchAppend TestPathCchAppendEx TestPathCchCanonicalize TestPathCchCanonicalizeEx \ | ||
| 39 | TestPathAllocCanonicalize TestPathCchCombine TestPathCchCombineEx TestPathAllocCombine TestPathCchFindExtension \ | ||
| 40 | TestPathCchRenameExtension TestPathCchRemoveExtension TestPathCchIsRoot TestPathIsUNCEx TestPathCchSkipRoot \ | ||
| 41 | TestPathCchStripToRoot TestPathCchStripPrefix TestPathCchRemoveFileSpec TestPathShell TestPathMakePath" | ||
| 42 | TestPipe="TestPipeCreatePipe TestPipeCreateNamedPipe TestPipeCreateNamedPipeOverlapped" | ||
| 43 | TestPool="TestPoolIO TestPoolSynch TestPoolThread TestPoolTimer TestPoolWork" | ||
| 44 | TestPrimitives="TestPrimitivesAdd TestPrimitivesAlphaComp TestPrimitivesAndOr TestPrimitivesColors TestPrimitivesCopy \ | ||
| 45 | TestPrimitivesSet TestPrimitivesShift TestPrimitivesSign TestPrimitivesYUV TestPrimitivesYCbCr TestPrimitivesYCoCg" | ||
| 46 | TestRdTk="TestRdTkNinePatch" | ||
| 47 | TestSecurity="TestSecurityToken" | ||
| 48 | TestSmartCard="TestSmartCardListReaders" | ||
| 49 | TestSspi="TestQuerySecurityPackageInfo TestEnumerateSecurityPackages TestInitializeSecurityContext TestAcquireCredentialsHandle TestCredSSP TestNTLM" | ||
| 50 | TestSynch="TestSynchInit TestSynchEvent TestSynchMutex TestSynchBarrier TestSynchCritical TestSynchSemaphore \ | ||
| 51 | TestSynchThread TestSynchMultipleThreads TestSynchTimerQueue TestSynchWaitableTimer TestSynchWaitableTimerAPC TestSynchAPC" | ||
| 52 | TestSysInfo="TestGetNativeSystemInfo TestCPUFeatures TestGetComputerName TestSystemTime TestLocalTime" | ||
| 53 | TestThread="TestThreadCommandLineToArgv TestThreadCreateProcess TestThreadExitThread" | ||
| 54 | TestWinPR="TestIntrinsics TestTypes" | ||
| 55 | TestWinPRUtils="TestIni TestVersion TestImage TestBipBuffer TestBacktrace TestQueue TestPrint TestPubSub TestStream \ | ||
| 56 | TestBitStream TestArrayList TestLinkedList TestListDictionary TestCmdLine TestWLog TestWLogCallback TestHashTable \ | ||
| 57 | TestBufferPool TestStreamPool TestMessageQueue TestMessagePipe" | ||
| 58 | TestWnd="TestWndCreateWindowEx TestWndWmCopyData" | ||
| 59 | TestWtsApi="TestWtsApiEnumerateProcesses TestWtsApiEnumerateSessions TestWtsApiQuerySessionInformation \ | ||
| 60 | TestWtsApiSessionNotification TestWtsApiShutdownSystem TestWtsApiWaitSystemEvent" | ||
| 61 | |||
| 62 | run_test(){ | ||
| 63 | binary=$1 | ||
| 64 | tcs=$(eval "echo \$${binary}") | ||
| 65 | if [ -z "$tcs" -o "$tcs" = ".so" ]; then | ||
| 66 | return | ||
| 67 | fi | ||
| 68 | |||
| 69 | EXTRA_ARG="" | ||
| 70 | if [ "$binary" = "TestFile" ]; then | ||
| 71 | # This testcase needs an extra argument. TestFileArea is a folder | ||
| 72 | # where some test files are used by this test. | ||
| 73 | EXTRA_ARG="TestFileArea" | ||
| 74 | fi | ||
| 75 | |||
| 76 | for tc in $tcs; do | ||
| 77 | ./$binary $tc $EXTRA_ARG > ../${binary}_${tc}.out 2>&1 && echo PASS: $binary $tc || echo FAIL: $binary $tc | ||
| 78 | done | ||
| 79 | } | ||
| 80 | |||
| 81 | cd Testing | ||
| 82 | |||
| 83 | for testbin in *; do | ||
| 84 | run_test $testbin | ||
| 85 | done | ||
diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.20.2.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.24.0.bb index 81f160a848..3c0fed5dc4 100644 --- a/meta-oe/recipes-support/freerdp/freerdp3_3.20.2.bb +++ b/meta-oe/recipes-support/freerdp/freerdp3_3.24.0.bb | |||
| @@ -8,7 +8,7 @@ RDEPENDS:${PN}-ptest += "cmake coreutils" | |||
| 8 | 8 | ||
| 9 | inherit pkgconfig cmake ptest | 9 | inherit pkgconfig cmake ptest |
| 10 | 10 | ||
| 11 | SRCREV = "ef106b0c5adf739085ff4e8f45ef384e5a1c7bb3" | 11 | SRCREV = "b00402d3258402c868224b6ffed04182cbed78d9" |
| 12 | SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https;tag=${PV} \ | 12 | SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https;tag=${PV} \ |
| 13 | file://run-ptest" | 13 | file://run-ptest" |
| 14 | 14 | ||
| @@ -38,6 +38,9 @@ EXTRA_OECMAKE = " \ | |||
| 38 | -DWITH_CLIENT_SDL=OFF \ | 38 | -DWITH_CLIENT_SDL=OFF \ |
| 39 | -DWITH_SAMPLE=OFF \ | 39 | -DWITH_SAMPLE=OFF \ |
| 40 | -DWITH_CAIRO=ON \ | 40 | -DWITH_CAIRO=ON \ |
| 41 | -DWITH_MANPAGES=OFF \ | ||
| 42 | -DWITH_INTERNAL_RC4=ON \ | ||
| 43 | -DWITH_INTERNAL_MD4=ON \ | ||
| 41 | " | 44 | " |
| 42 | 45 | ||
| 43 | X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" | 46 | X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" |
| @@ -49,7 +52,6 @@ PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gst | |||
| 49 | PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" | 52 | PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" |
| 50 | PACKAGECONFIG[fuse] = "-DWITH_FUSE=ON,-DWITH_FUSE=OFF,fuse3,fuse3" | 53 | PACKAGECONFIG[fuse] = "-DWITH_FUSE=ON,-DWITH_FUSE=OFF,fuse3,fuse3" |
| 51 | PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" | 54 | PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" |
| 52 | PACKAGECONFIG[manpages] = "-DWITH_MANPAGES=ON,-DWITH_MANPAGES=OFF, libxslt-native docbook-xsl-stylesheets-native" | ||
| 53 | PACKAGECONFIG[ffmpeg] = "-DWITH_DSP_FFMPEG=ON -DWITH_FFMPEG=ON -DWITH_SWSCALE=ON, -DWITH_DSP_FFMPEG=OFF -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF,ffmpeg" | 55 | PACKAGECONFIG[ffmpeg] = "-DWITH_DSP_FFMPEG=ON -DWITH_FFMPEG=ON -DWITH_SWSCALE=ON, -DWITH_DSP_FFMPEG=OFF -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF,ffmpeg" |
| 54 | PACKAGECONFIG[krb5] = "-DWITH_KRB5=ON -DWITH_KRB5_NO_NTLM_FALLBACK=OFF,-DWITH_KRB5=OFF,krb5" | 56 | PACKAGECONFIG[krb5] = "-DWITH_KRB5=ON -DWITH_KRB5_NO_NTLM_FALLBACK=OFF,-DWITH_KRB5=OFF,krb5" |
| 55 | PACKAGECONFIG[openh264] = "-DWITH_OPENH264=ON,-DWITH_OPENH264=OFF,openh264" | 57 | PACKAGECONFIG[openh264] = "-DWITH_OPENH264=ON,-DWITH_OPENH264=OFF,openh264" |
diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb index a78724b925..dff3f6dafe 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb | |||
| @@ -8,19 +8,27 @@ SECTION = "net" | |||
| 8 | LICENSE = "Apache-2.0" | 8 | LICENSE = "Apache-2.0" |
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 10 | 10 | ||
| 11 | inherit pkgconfig cmake gitpkgv | 11 | inherit pkgconfig cmake gitpkgv ptest |
| 12 | |||
| 13 | RDEPENDS:${PN}-ptest += "coreutils pcsc-lite-lib" | ||
| 12 | 14 | ||
| 13 | PE = "1" | 15 | PE = "1" |
| 14 | PKGV = "${GITPKGVTAG}" | 16 | PKGV = "${GITPKGVTAG}" |
| 15 | 17 | ||
| 16 | SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f" | 18 | SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f" |
| 17 | SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ | 19 | SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ |
| 20 | file://run-ptest \ | ||
| 18 | file://winpr-makecert-Build-with-install-RPATH.patch \ | 21 | file://winpr-makecert-Build-with-install-RPATH.patch \ |
| 19 | file://0001-Fixed-compilation-warnings.patch \ | 22 | file://0001-Fixed-compilation-warnings.patch \ |
| 20 | file://0001-Fix-const-qualifier-error.patch \ | 23 | file://0001-Fix-const-qualifier-error.patch \ |
| 21 | file://0002-Do-not-install-tools-a-CMake-targets.patch \ | 24 | file://0002-Do-not-install-tools-a-CMake-targets.patch \ |
| 22 | file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \ | 25 | file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \ |
| 23 | file://CVE-2024-32661.patch \ | 26 | file://CVE-2024-32661.patch \ |
| 27 | file://CVE-2026-22854.patch \ | ||
| 28 | file://CVE-2026-22855.patch \ | ||
| 29 | file://CVE-2026-22852.patch \ | ||
| 30 | file://CVE-2026-23530.patch \ | ||
| 31 | file://CVE-2026-23532.patch \ | ||
| 24 | " | 32 | " |
| 25 | 33 | ||
| 26 | 34 | ||
| @@ -37,6 +45,7 @@ EXTRA_OECMAKE += " \ | |||
| 37 | 45 | ||
| 38 | PACKAGECONFIG ??= " \ | 46 | PACKAGECONFIG ??= " \ |
| 39 | ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ | 47 | ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ |
| 48 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'test', '', d)} \ | ||
| 40 | alsa gstreamer cups pcsc server \ | 49 | alsa gstreamer cups pcsc server \ |
| 41 | " | 50 | " |
| 42 | 51 | ||
| @@ -51,6 +60,7 @@ PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gst | |||
| 51 | PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" | 60 | PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" |
| 52 | PACKAGECONFIG[server] = "-DWITH_SERVER=ON,-DWITH_SERVER=OFF" | 61 | PACKAGECONFIG[server] = "-DWITH_SERVER=ON,-DWITH_SERVER=OFF" |
| 53 | PACKAGECONFIG[alsa] = "-DWITH_ALSA=ON,-DWITH_ALSA=OFF,alsa-lib" | 62 | PACKAGECONFIG[alsa] = "-DWITH_ALSA=ON,-DWITH_ALSA=OFF,alsa-lib" |
| 63 | PACKAGECONFIG[test] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF" | ||
| 54 | 64 | ||
| 55 | PACKAGES =+ "libfreerdp" | 65 | PACKAGES =+ "libfreerdp" |
| 56 | 66 | ||
| @@ -59,6 +69,12 @@ FILES:libfreerdp = "${libdir}/lib*${SOLIBS}" | |||
| 59 | 69 | ||
| 60 | PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" | 70 | PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" |
| 61 | 71 | ||
| 72 | do_configure:prepend() { | ||
| 73 | sed -i 's,CMAKE_CURRENT_SOURCE_DIR,"${PTEST_PATH}/test_data",' ${S}/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c | ||
| 74 | sed -i 's,\${CMAKE_CURRENT_SOURCE_DIR},"${PTEST_PATH}/test_data",' ${S}/libfreerdp/crypto/test/CMakeLists.txt | ||
| 75 | sed -i 's,\${CMAKE_CURRENT_SOURCE_DIR},${PTEST_PATH}/test_data,' ${S}/winpr/libwinpr/utils/test/CMakeLists.txt | ||
| 76 | } | ||
| 77 | |||
| 62 | do_configure:append() { | 78 | do_configure:append() { |
| 63 | sed -i -e 's|${WORKDIR}||g' ${B}/buildflags.h | 79 | sed -i -e 's|${WORKDIR}||g' ${B}/buildflags.h |
| 64 | } | 80 | } |
| @@ -70,6 +86,15 @@ do_install:append () { | |||
| 70 | rm -rf ${D}${libdir}/freerdp | 86 | rm -rf ${D}${libdir}/freerdp |
| 71 | } | 87 | } |
| 72 | 88 | ||
| 89 | do_install_ptest() { | ||
| 90 | install -d ${D}${PTEST_PATH}/test_data | ||
| 91 | cp -r ${B}/Testing ${D}${PTEST_PATH} | ||
| 92 | install -m 0644 ${S}/libfreerdp/codec/test/progressive.bmp ${D}${PTEST_PATH}/test_data/ | ||
| 93 | install -m 0644 ${S}/libfreerdp/crypto/test/Test_x509_cert_info.pem ${D}${PTEST_PATH}/test_data/ | ||
| 94 | install -m 0644 ${S}/winpr/libwinpr/utils/test/lodepng_32bit.png ${D}${PTEST_PATH}/test_data/ | ||
| 95 | install -m 0644 ${S}/winpr/libwinpr/utils/test/lodepng_32bit.bmp ${D}${PTEST_PATH}/test_data/ | ||
| 96 | } | ||
| 97 | |||
| 73 | python populate_packages:prepend () { | 98 | python populate_packages:prepend () { |
| 74 | freerdp_root = d.expand('${libdir}/freerdp') | 99 | freerdp_root = d.expand('${libdir}/freerdp') |
| 75 | 100 | ||
| @@ -95,6 +120,8 @@ python populate_packages:prepend () { | |||
| 95 | } | 120 | } |
| 96 | 121 | ||
| 97 | CVE_STATUS[CVE-2024-32662] = "fixed-version: 2.x is not affected, bug was introduced in 3.0.0" | 122 | CVE_STATUS[CVE-2024-32662] = "fixed-version: 2.x is not affected, bug was introduced in 3.0.0" |
| 123 | CVE_STATUS[CVE-2025-68118] = "not-applicable-platform: Windows-only vulnerability" | ||
| 124 | CVE_STATUS[CVE-2026-22853] = "cpe-incorrect: the vulnerability was introduced in 3.9.0" | ||
| 98 | 125 | ||
| 99 | # avoid http://errors.yoctoproject.org/Errors/Details/852862/ | 126 | # avoid http://errors.yoctoproject.org/Errors/Details/852862/ |
| 100 | # fixed in freerdp3 with https://github.com/FreeRDP/FreeRDP/pull/10553 | 127 | # fixed in freerdp3 with https://github.com/FreeRDP/FreeRDP/pull/10553 |
diff --git a/meta-oe/recipes-support/gd/gd/Fix-ftype-missing-const.patch b/meta-oe/recipes-support/gd/gd/Fix-ftype-missing-const.patch new file mode 100644 index 0000000000..294979ffd9 --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/Fix-ftype-missing-const.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | gcc complains about | ||
| 2 | |||
| 3 | | ../../sources/gd-2.3.3/src/gd_filename.c: In function 'ftype': | ||
| 4 | | ../../sources/gd-2.3.3/src/gd_filename.c:99:9: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] | ||
| 5 | | 99 | ext = strrchr(filename, '.'); | ||
| 6 | | | ^ | ||
| 7 | | cc1: all warnings being treated as errors | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://github.com/libgd/libgd/issues/985] | ||
| 10 | |||
| 11 | diff --git i/src/gd_filename.c w/src/gd_filename.c | ||
| 12 | index 7ce4817f..89b25204 100644 | ||
| 13 | --- i/src/gd_filename.c | ||
| 14 | +++ w/src/gd_filename.c | ||
| 15 | @@ -93,7 +93,7 @@ static const struct FileType { | ||
| 16 | static const struct FileType * | ||
| 17 | ftype(const char *filename) { | ||
| 18 | int n; | ||
| 19 | - char *ext; | ||
| 20 | + const char *ext; | ||
| 21 | |||
| 22 | /* Find the file extension (i.e. the last period in the string. */ | ||
| 23 | ext = strrchr(filename, '.'); | ||
diff --git a/meta-oe/recipes-support/gd/gd_2.3.3.bb b/meta-oe/recipes-support/gd/gd_2.3.3.bb index ea5c487c52..0d7a6d34f9 100644 --- a/meta-oe/recipes-support/gd/gd_2.3.3.bb +++ b/meta-oe/recipes-support/gd/gd_2.3.3.bb | |||
| @@ -15,6 +15,7 @@ DEPENDS = "freetype libpng jpeg zlib tiff" | |||
| 15 | 15 | ||
| 16 | SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1;protocol=https \ | 16 | SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1;protocol=https \ |
| 17 | file://0001-Fix-deprecared-function-prototypes.patch \ | 17 | file://0001-Fix-deprecared-function-prototypes.patch \ |
| 18 | file://Fix-ftype-missing-const.patch \ | ||
| 18 | " | 19 | " |
| 19 | 20 | ||
| 20 | SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" | 21 | SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" |
diff --git a/meta-oe/recipes-support/glaze/glaze_7.1.1.bb b/meta-oe/recipes-support/glaze/glaze_7.1.1.bb new file mode 100644 index 0000000000..ef1f9032b1 --- /dev/null +++ b/meta-oe/recipes-support/glaze/glaze_7.1.1.bb | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | SUMMARY = "Extremely fast, in memory, JSON and reflection library for modern C++. BEVE, CBOR, CSV, MessagePack, TOML, EETF " | ||
| 2 | HOMEPAGE = "https://stephenberry.github.io/glaze/" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4d29875d83fbbf50485c846dbbbed8" | ||
| 5 | |||
| 6 | SRC_URI = "git://github.com/stephenberry/glaze;protocol=https;branch=main;tag=v${PV}" | ||
| 7 | |||
| 8 | SRCREV = "a6008aa05d26ab1653bda73235fe05629f7bdad0" | ||
| 9 | |||
| 10 | inherit cmake | ||
| 11 | |||
| 12 | EXTRA_OECMAKE = "-Dglaze_BUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -Dglaze_ENABLE_FUZZING=OFF -Dglaze_DEVELOPER_MODE=OFF" | ||
| 13 | |||
| 14 | FILES:${PN}-dev += "${datadir}/${BPN}/*.cmake" | ||
| 15 | |||
| 16 | # Glaze is a header-only C++ library, so the main package will be empty. | ||
| 17 | ALLOW_EMPTY:${PN} = "1" | ||
| 18 | |||
| 19 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-oe/recipes-support/gnulib/gnulib_202401.bb b/meta-oe/recipes-support/gnulib/gnulib_202601.bb index f3fbb94ae8..d3ebdca8dd 100644 --- a/meta-oe/recipes-support/gnulib/gnulib_202401.bb +++ b/meta-oe/recipes-support/gnulib/gnulib_202601.bb | |||
| @@ -10,8 +10,8 @@ HOMEPAGE = "http://www.gnu.org/software/gnulib/" | |||
| 10 | SECTION = "devel" | 10 | SECTION = "devel" |
| 11 | LICENSE = "LGPL-2.0-or-later" | 11 | LICENSE = "LGPL-2.0-or-later" |
| 12 | 12 | ||
| 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=ef5bccbf6e492f82800e68bdeab302eb" |
| 14 | SRCREV = "c99c8d491850dc3a6e0b8604a2729d8bc5c0eff1" | 14 | SRCREV = "4a3650d88725e8fda6387fbdbaa0ed98cdca76ce" |
| 15 | 15 | ||
| 16 | SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=stable-${PV};protocol=https \ | 16 | SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=stable-${PV};protocol=https \ |
| 17 | " | 17 | " |
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.4.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.5.bb index 7f6755d51e..b72b57f4df 100644 --- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.4.bb +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.5.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" | |||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main;tag=v${PV}" | 7 | SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main;tag=v${PV}" |
| 8 | SRCREV = "eddb0241389718a23a42db6af5f0164b6e0139af" | 8 | SRCREV = "192ef10025eb2c4cdd392bc502f0c852196baa48" |
| 9 | 9 | ||
| 10 | EXTRA_OECMAKE = " \ | 10 | EXTRA_OECMAKE = " \ |
| 11 | -DBUILD_SHARED_LIBS=yes \ | 11 | -DBUILD_SHARED_LIBS=yes \ |
diff --git a/meta-oe/recipes-support/gosu/gosu_1.17.bb b/meta-oe/recipes-support/gosu/gosu_1.19.bb index 6a4441fc24..937c45b96e 100644 --- a/meta-oe/recipes-support/gosu/gosu_1.17.bb +++ b/meta-oe/recipes-support/gosu/gosu_1.19.bb | |||
| @@ -5,11 +5,11 @@ LICENSE = "Apache-2.0 " | |||
| 5 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 5 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 6 | 6 | ||
| 7 | GO_IMPORT = "github.com/tianon/gosu" | 7 | GO_IMPORT = "github.com/tianon/gosu" |
| 8 | SRC_URI = "git://${GO_IMPORT}.git;destsuffix=src/${GO_IMPORT};branch=master;protocol=https \ | 8 | SRC_URI = "git://${GO_IMPORT}.git;destsuffix=src/${GO_IMPORT};branch=master;protocol=https;tag=${PV} \ |
| 9 | git://github.com/moby/sys;name=user;destsuffix=src/github.com/moby/sys;branch=main;protocol=https \ | 9 | git://github.com/moby/sys;name=user;destsuffix=src/github.com/moby/sys;branch=main;protocol=https \ |
| 10 | git://github.com/golang/sys;name=sys;destsuffix=src/golang.org/x/sys;branch=master;protocol=https \ | 10 | git://github.com/golang/sys;name=sys;destsuffix=src/golang.org/x/sys;branch=master;protocol=https \ |
| 11 | " | 11 | " |
| 12 | SRCREV = "0d1847490b448a17eb347e5e357f2c0478df87ad" | 12 | SRCREV = "6456aaa0f3c854d199d0f037f068eb97515b7513" |
| 13 | #v0.1.0 | 13 | #v0.1.0 |
| 14 | SRCREV_user = "c0711cde08c8fa33857a2c28721659267f49b5e2" | 14 | SRCREV_user = "c0711cde08c8fa33857a2c28721659267f49b5e2" |
| 15 | #v0.1.0 | 15 | #v0.1.0 |
diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.16.bb b/meta-oe/recipes-support/gperftools/gperftools_2.18.1.bb index c0fe586f6d..f2244c43fa 100644 --- a/meta-oe/recipes-support/gperftools/gperftools_2.16.bb +++ b/meta-oe/recipes-support/gperftools/gperftools_2.18.1.bb | |||
| @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" | |||
| 10 | 10 | ||
| 11 | DEPENDS:append:libc-musl = " libucontext" | 11 | DEPENDS:append:libc-musl = " libucontext" |
| 12 | 12 | ||
| 13 | SRCREV = "e1014dead2029b341d06027b4f2b5562d799d5b1" | 13 | SRCREV = "d837a42788ba591d5d791c3b686f2738e7a93562" |
| 14 | SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https" | 14 | SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https;tag=gperftools-${PV}" |
| 15 | 15 | ||
| 16 | SRC_URI:append:libc-musl = " \ | 16 | SRC_URI:append:libc-musl = " \ |
| 17 | file://ppc-musl.patch \ | 17 | file://ppc-musl.patch \ |
diff --git a/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb b/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb index 93fe352b99..350be8dc0e 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb | |||
| @@ -11,11 +11,13 @@ inherit cmake pkgconfig siteinfo qemu multilib_header multilib_script | |||
| 11 | 11 | ||
| 12 | DEPENDS += "qemu-native zlib" | 12 | DEPENDS += "qemu-native zlib" |
| 13 | 13 | ||
| 14 | SRC_URI = "https://support.hdfgroup.org/releases/hdf5/v2_0/v2_0_0/downloads/${BPN}-${PV}.tar.gz \ | 14 | # set downloadfilename to workaround mirroring test issues. When hdf5 is |
| 15 | # upgraded beyond 2.0.0 this can likely be removed | ||
| 16 | SRC_URI = "https://support.hdfgroup.org/releases/hdf5/v2_0/v2_0_0/downloads/${BPN}-${PV}.tar.gz;downloadfilename=${BPN}-${PV}-1.tar.gz \ | ||
| 15 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ | 17 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ |
| 16 | file://0001-cmake-remove-build-flags.patch \ | 18 | file://0001-cmake-remove-build-flags.patch \ |
| 17 | " | 19 | " |
| 18 | SRC_URI[sha256sum] = "6e45a4213cb11bb5860e1b0a7645688ab55562cc2d55c6ff9bcb0984ed12b22b" | 20 | SRC_URI[sha256sum] = "f4c2edc5668fb846627182708dbe1e16c60c467e63177a75b0b9f12c19d7efed" |
| 19 | 21 | ||
| 20 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" | 22 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" |
| 21 | 23 | ||
diff --git a/meta-oe/recipes-support/hstr/hstr_3.1.0.bb b/meta-oe/recipes-support/hstr/hstr_3.2.0.bb index 96be8bd09f..418eeafdbc 100644 --- a/meta-oe/recipes-support/hstr/hstr_3.1.0.bb +++ b/meta-oe/recipes-support/hstr/hstr_3.2.0.bb | |||
| @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" | |||
| 6 | 6 | ||
| 7 | DEPENDS = "ncurses readline" | 7 | DEPENDS = "ncurses readline" |
| 8 | 8 | ||
| 9 | SRC_URI = "https://github.com/dvorka/hstr/releases/download/3.1/hstr-${PV}-tarball.tgz \ | 9 | SRC_URI = "https://github.com/dvorka/hstr/releases/download/v3.2/hstr-${PV}-tarball.tgz \ |
| 10 | file://0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch \ | 10 | file://0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch \ |
| 11 | file://0001-Use-OE-specific-checks-for-ncurses.patch" | 11 | file://0001-Use-OE-specific-checks-for-ncurses.patch" |
| 12 | 12 | ||
| 13 | S = "${UNPACKDIR}/${BPN}" | 13 | S = "${UNPACKDIR}/${BPN}" |
| 14 | 14 | ||
| 15 | SRC_URI[sha256sum] = "4dabf61f045f022bac8bc909e5fd96041af6c53df56d97dfa3cfbf49af4453a5" | 15 | SRC_URI[sha256sum] = "abf0a8625545b2022d62bf0d1c576e3cc783c4ea7cc2ae2843c518743f77f4c9" |
| 16 | 16 | ||
| 17 | UPSTREAM_CHECK_URI = "https://github.com/dvorka/hstr/releases" | 17 | UPSTREAM_CHECK_URI = "https://github.com/dvorka/hstr/releases" |
| 18 | UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)" | 18 | UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-12.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-17.bb index 535ba7df65..2a1152087a 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-12.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-17.bb | |||
| @@ -4,8 +4,8 @@ HOMEPAGE = "https://www.imagemagick.org/" | |||
| 4 | DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ | 4 | DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ |
| 5 | editing raster and vector image files. It can read and write over 200 image file formats." | 5 | editing raster and vector image files. It can read and write over 200 image file formats." |
| 6 | LICENSE = "ImageMagick" | 6 | LICENSE = "ImageMagick" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1f56ade64cf079aff7232f7dbeaea992 \ |
| 8 | file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed" | 8 | file://NOTICE;md5=3974428a57d34b981abb7acc416dde8f" |
| 9 | # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. | 9 | # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. |
| 10 | DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" | 10 | DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" |
| 11 | 11 | ||
| @@ -17,7 +17,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt | |||
| 17 | file://imagemagick-ptest.sh \ | 17 | file://imagemagick-ptest.sh \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRCREV = "bdd4fa561d7bf4c6afd40ee9c89e9f9e82b6e88b" | 20 | SRCREV = "3f2f629405c62106d3569547c03634bc46fcd07d" |
| 21 | 21 | ||
| 22 | inherit autotools pkgconfig update-alternatives ptest | 22 | inherit autotools pkgconfig update-alternatives ptest |
| 23 | export ac_cv_sys_file_offset_bits = "64" | 23 | export ac_cv_sys_file_offset_bits = "64" |
diff --git a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.3.bb b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.5.bb index f4905e3c0b..754e793faa 100644 --- a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.3.bb +++ b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.5.bb | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" | 1 | SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" |
| 2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c9e8d74e78283c6319317d3cb15eded4" |
| 4 | 4 | ||
| 5 | # v2.7.6 | 5 | # v2.7.6 |
| 6 | SRCREV = "72f7fa621357299bb6c8f5d29b4efbafcbd34bf7" | 6 | SRCREV = "23b693f7f7cad8b459beb5cf748078f9cc0e5dc8" |
| 7 | SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master;tag=v${PV} \ | 7 | SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master;tag=v${PV} \ |
| 8 | file://ldflags.patch \ | 8 | file://ldflags.patch \ |
| 9 | " | 9 | " |
diff --git a/meta-oe/recipes-support/inih/libinih_58.bb b/meta-oe/recipes-support/inih/libinih_62.bb index 0ebeec6851..2ec64c7e69 100644 --- a/meta-oe/recipes-support/inih/libinih_58.bb +++ b/meta-oe/recipes-support/inih/libinih_62.bb | |||
| @@ -8,6 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master" | 9 | SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master" |
| 10 | 10 | ||
| 11 | SRCREV = "5cc5e2c24642513aaa5b19126aad42d0e4e0923e" | 11 | SRCREV = "26254ee9de7681f8825433415443e7116ff24b98" |
| 12 | 12 | ||
| 13 | inherit meson pkgconfig | 13 | inherit meson pkgconfig |
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb index 19900d6cbe..2c063fd995 100644 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb | |||
| @@ -23,7 +23,8 @@ EXTRA_OECONF = "\ | |||
| 23 | 23 | ||
| 24 | PACKAGECONFIG ??= " \ | 24 | PACKAGECONFIG ??= " \ |
| 25 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ | 25 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ |
| 26 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk3 gstreamer', '', d)} \ | 26 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gstreamer', '', d)} \ |
| 27 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk3', '', d)} \ | ||
| 27 | " | 28 | " |
| 28 | PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib" | 29 | PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib" |
| 29 | PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio" | 30 | PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio" |
diff --git a/meta-oe/recipes-support/libfido2/libfido2-initial_1.16.0.bb b/meta-oe/recipes-support/libfido2/libfido2-initial_1.16.0.bb new file mode 100644 index 0000000000..7d9838b003 --- /dev/null +++ b/meta-oe/recipes-support/libfido2/libfido2-initial_1.16.0.bb | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | SUMMARY = "FIDO 2.0 support library" | ||
| 2 | DESCRIPTION = "libfido2 provides library functionality and command-line tools to \ | ||
| 3 | communicate with a FIDO device over USB, and to verify attestation and \ | ||
| 4 | assertion signatures." | ||
| 5 | HOMEPAGE = "https://developers.yubico.com/libfido2" | ||
| 6 | LICENSE = "BSD-2-Clause" | ||
| 7 | SECTION = "libs/network" | ||
| 8 | |||
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=20be19aaa222f71738712b26f7f8717b" | ||
| 10 | |||
| 11 | SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" | ||
| 12 | SRC_URI[sha256sum] = "8c2b6fb279b5b42e9ac92ade71832e485852647b53607c43baaafbbcecea04e4" | ||
| 13 | |||
| 14 | inherit nopackages | ||
| 15 | |||
| 16 | PACKAGES = "" | ||
| 17 | |||
| 18 | # The purpose of this recipe is to break a circular dependency between libfido2 and | ||
| 19 | # systemd. libfido2 depends on udev (provided by systemd) to build, while systemd | ||
| 20 | # depends on libfido2 if the fido feature is enabled. However, systemd doesn't | ||
| 21 | # actually link against libfido2. It only needs the headers in place and a dummy | ||
| 22 | # shared library. It opportunistically dlopens libfido2 if it's present, but | ||
| 23 | # for that to work it needs the headers in place. | ||
| 24 | # Just fake enough to make systemd happy, and have it RRECOMMEND the real libfido2. | ||
| 25 | do_install() { | ||
| 26 | mkdir -p ${D}${includedir}/libfido2-initial/fido | ||
| 27 | mkdir -p ${D}${datadir}/pkgconfig | ||
| 28 | |||
| 29 | install -m 644 ${S}/src/fido.h ${D}${includedir}/libfido2-initial | ||
| 30 | install -m 644 ${S}/src/fido/* ${D}${includedir}/libfido2-initial/fido/ | ||
| 31 | |||
| 32 | # Real libfido2 installs its pkg conf file in ${libdir}. | ||
| 33 | sed -e 's,@CMAKE_INSTALL_PREFIX@,${exec_prefix},' \ | ||
| 34 | -e 's,@CMAKE_INSTALL_LIBDIR@,${baselib}/libfido2-initial,' \ | ||
| 35 | -e 's,@FIDO_VERSION@,${PV},' \ | ||
| 36 | -e 's,@PROJECT_NAME@,${BPN},' \ | ||
| 37 | -e '/^Cflags/s,$,/libfido2-initial,' \ | ||
| 38 | ${S}/src/libfido2.pc.in > ${D}${datadir}/pkgconfig/libfido2.pc | ||
| 39 | |||
| 40 | } | ||
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-tools-tests-remove-SIGINT-test-cases.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-tools-tests-remove-SIGINT-test-cases.patch new file mode 100644 index 0000000000..7fe06b9882 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-tools-tests-remove-SIGINT-test-cases.patch | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | From 3c38c5f9ab49384039f35408656a88f87619dd03 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> | ||
| 3 | Date: Wed, 18 Mar 2026 14:07:06 +0100 | ||
| 4 | Subject: [libgpiod][PATCH] tools: tests: remove SIGINT test cases | ||
| 5 | |||
| 6 | In coreutils v9.10 (specifically with commit 8c2461933411 ("timeout: | ||
| 7 | honor ignored signal dispositions")) the behavior of timeout changed and | ||
| 8 | it will no longer propagate SIGINT or SIGQUIT in shell background jobs. | ||
| 9 | This breaks the test cases checking the behavior of tools after SIGINT. | ||
| 10 | We have to assume that if exit after SIGTERM works, then so does it | ||
| 11 | after SIGINT and remove the failing tests. | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://lore.kernel.org/all/20260318131413.56575-1-bartosz.golaszewski@oss.qualcomm.com/] | ||
| 14 | Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> | ||
| 15 | --- | ||
| 16 | tools/gpio-tools-test.bash | 37 ------------------------------------- | ||
| 17 | 1 file changed, 37 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/tools/gpio-tools-test.bash b/tools/gpio-tools-test.bash | ||
| 20 | index 71d6e3d..62f6836 100755 | ||
| 21 | --- a/tools/gpio-tools-test.bash | ||
| 22 | +++ b/tools/gpio-tools-test.bash | ||
| 23 | @@ -1415,17 +1415,6 @@ test_gpioset_with_lines_strictly_by_name() { | ||
| 24 | gpiosim_check_value sim0 6 0 | ||
| 25 | } | ||
| 26 | |||
| 27 | -test_gpioset_interactive_after_SIGINT() { | ||
| 28 | - gpiosim_chip sim0 num_lines=8 line_name=1:foo | ||
| 29 | - | ||
| 30 | - dut_run gpioset -i foo=1 | ||
| 31 | - | ||
| 32 | - dut_kill -SIGINT | ||
| 33 | - dut_wait | ||
| 34 | - | ||
| 35 | - status_is 130 | ||
| 36 | -} | ||
| 37 | - | ||
| 38 | test_gpioset_interactive_after_SIGTERM() { | ||
| 39 | gpiosim_chip sim0 num_lines=8 line_name=1:foo | ||
| 40 | |||
| 41 | @@ -1907,20 +1896,6 @@ test_gpiomon_multiple_lines_across_multiple_chips() { | ||
| 42 | assert_fail dut_readable | ||
| 43 | } | ||
| 44 | |||
| 45 | -test_gpiomon_exit_after_SIGINT() { | ||
| 46 | - gpiosim_chip sim0 num_lines=8 | ||
| 47 | - | ||
| 48 | - local sim0=${GPIOSIM_CHIP_NAME[sim0]} | ||
| 49 | - | ||
| 50 | - dut_run gpiomon --banner --chip "$sim0" 4 | ||
| 51 | - dut_regex_match "Monitoring line .*" | ||
| 52 | - | ||
| 53 | - dut_kill -SIGINT | ||
| 54 | - dut_wait | ||
| 55 | - | ||
| 56 | - status_is 130 | ||
| 57 | -} | ||
| 58 | - | ||
| 59 | test_gpiomon_exit_after_SIGTERM() { | ||
| 60 | gpiosim_chip sim0 num_lines=8 | ||
| 61 | |||
| 62 | @@ -2503,18 +2478,6 @@ test_gpionotify_multiple_lines_across_multiple_chips() { | ||
| 63 | assert_fail dut_readable | ||
| 64 | } | ||
| 65 | |||
| 66 | -test_gpionotify_exit_after_SIGINT() { | ||
| 67 | - gpiosim_chip sim0 num_lines=8 | ||
| 68 | - | ||
| 69 | - dut_run gpionotify --banner --chip "${GPIOSIM_CHIP_NAME[sim0]}" 4 | ||
| 70 | - dut_regex_match "Watching line .*" | ||
| 71 | - | ||
| 72 | - dut_kill -SIGINT | ||
| 73 | - dut_wait | ||
| 74 | - | ||
| 75 | - status_is 130 | ||
| 76 | -} | ||
| 77 | - | ||
| 78 | test_gpionotify_exit_after_SIGTERM() { | ||
| 79 | gpiosim_chip sim0 num_lines=8 | ||
| 80 | |||
| 81 | -- | ||
| 82 | 2.47.3 | ||
| 83 | |||
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.3.bb index 09b0928dfa..38829a620f 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.2.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.3.bb | |||
| @@ -11,9 +11,12 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | 11 | ||
| 12 | FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-2.x:" | 12 | FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-2.x:" |
| 13 | 13 | ||
| 14 | SRC_URI += "file://gpio-manager.init" | 14 | SRC_URI += " \ |
| 15 | file://gpio-manager.init \ | ||
| 16 | file://0001-tools-tests-remove-SIGINT-test-cases.patch \ | ||
| 17 | " | ||
| 15 | 18 | ||
| 16 | SRC_URI[sha256sum] = "7e3bff0209d75fbca2e9fcff1fd5f07cc58b543e129e08b6d4bb1e4a56cfec0d" | 19 | SRC_URI[sha256sum] = "70012b0262e4b90f140431efa841ca89643b02ea6c09f507e23cec664a51b71a" |
| 17 | 20 | ||
| 18 | # Enable all project features for ptest | 21 | # Enable all project features for ptest |
| 19 | PACKAGECONFIG[tests] = " \ | 22 | PACKAGECONFIG[tests] = " \ |
diff --git a/meta-oe/recipes-support/libnice/libnice_0.1.23.bb b/meta-oe/recipes-support/libnice/libnice_0.1.23.bb index bcdcf0ad7f..4411de955c 100644 --- a/meta-oe/recipes-support/libnice/libnice_0.1.23.bb +++ b/meta-oe/recipes-support/libnice/libnice_0.1.23.bb | |||
| @@ -14,8 +14,11 @@ SRC_URI[sha256sum] = "618fc4e8de393b719b1641c1d8eec01826d4d39d15ade92679d221c7f5 | |||
| 14 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/libnice/libnice/-/tags" | 14 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/libnice/libnice/-/tags" |
| 15 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 15 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
| 16 | 16 | ||
| 17 | DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" | 17 | DEPENDS = "glib-2.0 ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" |
| 18 | 18 | ||
| 19 | PACKAGECONFIG ??= "gnutls" | ||
| 20 | PACKAGECONFIG[gnutls] = "-Dcrypto-library=gnutls,,gnutls" | ||
| 21 | PACKAGECONFIG[openssl] = "-Dcrypto-library=openssl,,openssl" | ||
| 19 | PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" | 22 | PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" |
| 20 | PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0" | 23 | PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0" |
| 21 | PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," | 24 | PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," |
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2/0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch b/meta-oe/recipes-support/liboauth2/liboauth2/0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch new file mode 100644 index 0000000000..75da04a3a0 --- /dev/null +++ b/meta-oe/recipes-support/liboauth2/liboauth2/0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From a9f28a44b9b387ef28904e24ca05d28562fdcc45 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Frede Hoey Braendstrup <frede@vokalo.io> | ||
| 3 | Date: Mon, 26 Jan 2026 11:07:24 +0100 | ||
| 4 | Subject: [PATCH] fix(clang): curl_easy_setopt takes a long not an int | ||
| 5 | |||
| 6 | Signed-off-by: Frede Hoey Braendstrup <frede@vokalo.io> | ||
| 7 | Upstream-Status: Backport [https://github.com/OpenIDC/liboauth2/pull/69] | ||
| 8 | --- | ||
| 9 | src/http.c | 4 ++-- | ||
| 10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/src/http.c b/src/http.c | ||
| 13 | index ab7a25a..bc242ed 100644 | ||
| 14 | --- a/src/http.c | ||
| 15 | +++ b/src/http.c | ||
| 16 | @@ -1024,7 +1024,7 @@ bool oauth2_http_call(oauth2_log_t *log, const char *url, const char *data, | ||
| 17 | curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 5L); | ||
| 18 | |||
| 19 | if (ctx) | ||
| 20 | - curl_easy_setopt(curl, CURLOPT_TIMEOUT, ctx->timeout); | ||
| 21 | + curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)ctx->timeout); | ||
| 22 | |||
| 23 | curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, | ||
| 24 | oauth2_http_curl_buf_write); | ||
| 25 | @@ -1092,7 +1092,7 @@ bool oauth2_http_call(oauth2_log_t *log, const char *url, const char *data, | ||
| 26 | |||
| 27 | if (data != NULL) { | ||
| 28 | curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data); | ||
| 29 | - curl_easy_setopt(curl, CURLOPT_POST, 1); | ||
| 30 | + curl_easy_setopt(curl, CURLOPT_POST, 1L); | ||
| 31 | } | ||
| 32 | |||
| 33 | if (ctx) | ||
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2/0002-Fix-use-of-strchr-with-new-GCC.patch b/meta-oe/recipes-support/liboauth2/liboauth2/0002-Fix-use-of-strchr-with-new-GCC.patch new file mode 100644 index 0000000000..65340e806a --- /dev/null +++ b/meta-oe/recipes-support/liboauth2/liboauth2/0002-Fix-use-of-strchr-with-new-GCC.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From 0dcba079907d559550ee8d9a201d26203bb8aebd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Bokovoy <abokovoy@redhat.com> | ||
| 3 | Date: Wed, 7 Jan 2026 11:41:37 +0200 | ||
| 4 | Subject: [PATCH] Fix use of strchr with new GCC | ||
| 5 | |||
| 6 | According to C specification, 7.28.5.1, strchr() is a generic function | ||
| 7 | and its string argument's type is promoted to the result. So if it is | ||
| 8 | const char*, the result will be const char* as well. | ||
| 9 | |||
| 10 | gcc in Fedora Rawhide (15.2.1 20251111 or later) implements this | ||
| 11 | conformance, resulting in a compilation fail with | ||
| 12 | -Werror=discarded-qualifiers. | ||
| 13 | |||
| 14 | Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com> | ||
| 15 | Upstream-Status: Backport [https://github.com/OpenIDC/liboauth2/commit/0dcba079907d559550ee8d9a201d26203bb8aebd] | ||
| 16 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
| 17 | --- | ||
| 18 | src/jose.c | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/src/jose.c b/src/jose.c | ||
| 22 | index fbaf661..a3441c8 100644 | ||
| 23 | --- a/src/jose.c | ||
| 24 | +++ b/src/jose.c | ||
| 25 | @@ -993,7 +993,7 @@ char *oauth2_jose_jwt_header_peek(oauth2_log_t *log, | ||
| 26 | { | ||
| 27 | char *input = NULL, *result = NULL; | ||
| 28 | json_t *json = NULL; | ||
| 29 | - char *p = NULL; | ||
| 30 | + const char *p = NULL; | ||
| 31 | size_t result_len; | ||
| 32 | char *rv = NULL; | ||
| 33 | |||
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb new file mode 100644 index 0000000000..5b1ecd23dd --- /dev/null +++ b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | SUMMARY = "OAuth 2.x and OpenID Connect C library" | ||
| 2 | HOMEPAGE = "https://github.com/OpenIDC/liboauth2" | ||
| 3 | LICENSE = "Apache-2.0" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" | ||
| 5 | |||
| 6 | SRC_URI = " \ | ||
| 7 | git://github.com/OpenIDC/liboauth2;protocol=https;branch=master;tag=v${PV} \ | ||
| 8 | file://0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch \ | ||
| 9 | file://0002-Fix-use-of-strchr-with-new-GCC.patch \ | ||
| 10 | " | ||
| 11 | |||
| 12 | SRCREV = "12571b6d6568c2db7d5f080f60ecb55795c0db19" | ||
| 13 | |||
| 14 | DEPENDS = "libpcre2 jansson curl openssl cjose" | ||
| 15 | |||
| 16 | inherit pkgconfig autotools-brokensep | ||
| 17 | |||
| 18 | PACKAGECONFIG ??= "" | ||
| 19 | PACKAGECONFIG[memcache] = "--with-memcache,--without-memcache,libmemcached" | ||
| 20 | PACKAGECONFIG[redis] = "--with-redis,--without-redis,hiredis" | ||
| 21 | PACKAGECONFIG[jq] = "--with-jq,--without-jq,jq" | ||
| 22 | PACKAGECONFIG[apache] = "--with-apache,--without-apache,apache2" | ||
| 23 | |||
diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.16.bb b/meta-oe/recipes-support/libp11/libp11_0.4.18.bb index 2bd589be8a..950880c1f2 100644 --- a/meta-oe/recipes-support/libp11/libp11_0.4.16.bb +++ b/meta-oe/recipes-support/libp11/libp11_0.4.18.bb | |||
| @@ -9,9 +9,9 @@ LICENSE = "LGPL-2.0-or-later" | |||
| 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" |
| 10 | DEPENDS = "libtool openssl" | 10 | DEPENDS = "libtool openssl" |
| 11 | 11 | ||
| 12 | SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https;tag=${BPN}-${PV}" |
| 13 | 13 | ||
| 14 | SRCREV = "b9c2de288833e38a391ee3cb106f965a40153629" | 14 | SRCREV = "52a437cd51fcfbaaa8b27d2c6f562e88fd015c0d" |
| 15 | 15 | ||
| 16 | UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" |
| 17 | 17 | ||
diff --git a/meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb b/meta-oe/recipes-support/libspdm/libspdm_3.8.2.bb index 431eb8fd40..75c51b92d9 100644 --- a/meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb +++ b/meta-oe/recipes-support/libspdm/libspdm_3.8.2.bb | |||
| @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8f9b59a81a88da8e812af43728b72dd7" | |||
| 9 | 9 | ||
| 10 | DEPENDS = "openssl" | 10 | DEPENDS = "openssl" |
| 11 | 11 | ||
| 12 | SRC_URI = "git://github.com/DMTF/libspdm.git;branch=release-3.8;protocol=https" | 12 | SRC_URI = "git://github.com/DMTF/libspdm.git;branch=release-3.8;protocol=https;tag=${PV}" |
| 13 | SRCREV = "d7c8c8247b4d0bd8ed75d9f35a558a4df173a4c7" | 13 | SRCREV = "5cf0acb87b2f36f8d70a89e5da8476d85db59f46" |
| 14 | 14 | ||
| 15 | inherit cmake | 15 | inherit cmake |
| 16 | 16 | ||
diff --git a/meta-oe/recipes-support/libssh/libssh_0.11.3.bb b/meta-oe/recipes-support/libssh/libssh_0.11.4.bb index 5928581312..fb131c3490 100644 --- a/meta-oe/recipes-support/libssh/libssh_0.11.3.bb +++ b/meta-oe/recipes-support/libssh/libssh_0.11.4.bb | |||
| @@ -13,7 +13,7 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable | |||
| 13 | 13 | ||
| 14 | SRC_URI:append:toolchain-clang = " file://0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch" | 14 | SRC_URI:append:toolchain-clang = " file://0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch" |
| 15 | 15 | ||
| 16 | SRCREV = "301d0e16dfa8a5cac1cff956b6880ca90eb82864" | 16 | SRCREV = "ca9c055d7c78ce357346ac7c2b14047568d47aa1" |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | inherit cmake ptest | 19 | inherit cmake ptest |
diff --git a/meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch b/meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch new file mode 100644 index 0000000000..856bdccdbe --- /dev/null +++ b/meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From 75003957e8f526738b479dff7d5d9a5419111f33 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 18 Mar 2026 15:30:37 -0700 | ||
| 4 | Subject: [PATCH] Adjust for c23 prototype for strchr | ||
| 5 | |||
| 6 | in glibc 2.43+ functions like strchr, memchr, strstr | ||
| 7 | and friends are now const-preserving macros | ||
| 8 | |||
| 9 | That means if you pass a const char *, strchr now returns const char *, | ||
| 10 | which breaks older code patterns that assumed char * or wrapped the | ||
| 11 | result in compatibility helpers | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | |||
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 16 | --- | ||
| 17 | ftp.c | 2 +- | ||
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/ftp.c b/ftp.c | ||
| 21 | index 7a8d05d..41c0a25 100644 | ||
| 22 | --- a/ftp.c | ||
| 23 | +++ b/ftp.c | ||
| 24 | @@ -768,7 +768,7 @@ do { \ | ||
| 25 | } while (0) | ||
| 26 | A(ftp_head); | ||
| 27 | ud = stracpy(get_url_data(c->url)); | ||
| 28 | - if (strchr(cast_const_char ud, POST_CHAR)) *strchr(cast_const_char ud, POST_CHAR) = 0; | ||
| 29 | + if (strchr(ud, POST_CHAR)) *strchr(ud, POST_CHAR) = 0; | ||
| 30 | s0 = init_str(); | ||
| 31 | s0l = 0; | ||
| 32 | add_conv_str(&s0, &s0l, ud, (int)strlen(cast_const_char ud), -1); | ||
diff --git a/meta-oe/recipes-support/links/links-x11_2.26.bb b/meta-oe/recipes-support/links/links-x11_2.30.bb index cbee1f10f1..29ea339d02 100644 --- a/meta-oe/recipes-support/links/links-x11_2.26.bb +++ b/meta-oe/recipes-support/links/links-x11_2.30.bb | |||
| @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
| 10 | SRC_URI += " file://links2.desktop \ | 10 | SRC_URI += " file://links2.desktop \ |
| 11 | file://links2.png" | 11 | file://links2.png" |
| 12 | 12 | ||
| 13 | SRC_URI[sha256sum] = "f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb" | 13 | SRC_URI[sha256sum] = "c4631c6b5a11527cdc3cb7872fc23b7f2b25c2b021d596be410dadb40315f166" |
| 14 | 14 | ||
| 15 | S = "${UNPACKDIR}/links-${PV}" | 15 | S = "${UNPACKDIR}/links-${PV}" |
| 16 | 16 | ||
diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc index a255f0ba6b..5946d8be91 100644 --- a/meta-oe/recipes-support/links/links.inc +++ b/meta-oe/recipes-support/links/links.inc | |||
| @@ -8,6 +8,7 @@ DEPENDS = "jpeg libpng flex openssl zlib" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ | 9 | SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ |
| 10 | file://ac-prog-cxx.patch \ | 10 | file://ac-prog-cxx.patch \ |
| 11 | file://0001-Adjust-for-c23-prototype-for-strchr.patch \ | ||
| 11 | " | 12 | " |
| 12 | 13 | ||
| 13 | PACKAGECONFIG ??= "" | 14 | PACKAGECONFIG ??= "" |
diff --git a/meta-oe/recipes-support/links/links_2.29.bb b/meta-oe/recipes-support/links/links_2.30.bb index e3a15d1819..2a344d11e5 100644 --- a/meta-oe/recipes-support/links/links_2.29.bb +++ b/meta-oe/recipes-support/links/links_2.30.bb | |||
| @@ -8,4 +8,4 @@ EXTRA_OECONF = "--enable-graphics \ | |||
| 8 | --without-libtiff --without-svgalib --with-fb \ | 8 | --without-libtiff --without-svgalib --with-fb \ |
| 9 | --without-directfb --without-pmshell --without-atheos \ | 9 | --without-directfb --without-pmshell --without-atheos \ |
| 10 | --without-x" | 10 | --without-x" |
| 11 | SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" | 11 | SRC_URI[sha256sum] = "c4631c6b5a11527cdc3cb7872fc23b7f2b25c2b021d596be410dadb40315f166" |
diff --git a/meta-oe/recipes-support/mcelog/mcelog_208.bb b/meta-oe/recipes-support/mcelog/mcelog_210.bb index 4a72cd4d66..f009ba98ad 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_208.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_210.bb | |||
| @@ -5,12 +5,12 @@ and should run on all Linux systems that need error handling." | |||
| 5 | HOMEPAGE = "https://mcelog.org/" | 5 | HOMEPAGE = "https://mcelog.org/" |
| 6 | SECTION = "System Environment/Base" | 6 | SECTION = "System Environment/Base" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ | 8 | SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master;tag=v${PV} \ |
| 9 | file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ | 9 | file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ |
| 10 | file://run-ptest \ | 10 | file://run-ptest \ |
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | SRCREV = "2965a540ac2fbf1e0a992afd17c01747d6fd66aa" | 13 | SRCREV = "357b136f95be23be1dda2c5e220e0430e9b20765" |
| 14 | 14 | ||
| 15 | LICENSE = "GPL-2.0-only" | 15 | LICENSE = "GPL-2.0-only" |
| 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
diff --git a/meta-oe/recipes-support/media-types/media-types_14.0.0.bb b/meta-oe/recipes-support/media-types/media-types_14.0.0.bb new file mode 100644 index 0000000000..af91a584bd --- /dev/null +++ b/meta-oe/recipes-support/media-types/media-types_14.0.0.bb | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | SECTION = "base" | ||
| 2 | SUMMARY = "MIME files 'mime.types'" | ||
| 3 | LICENSE = "PD" | ||
| 4 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=f3ace4a4ff8aa9e374be6080e41a822e" | ||
| 5 | DEPENDS = "file" | ||
| 6 | RDEPENDS:${PN} = "perl" | ||
| 7 | RRECOMMENDS:${PN} = "file" | ||
| 8 | |||
| 9 | SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.tar.xz" | ||
| 10 | SRC_URI[sha256sum] = "d5877ac8c1fa3661b3c9ace293ae154c844fad686786f085e954c014f7e73f4d" | ||
| 11 | S = "${UNPACKDIR}/work" | ||
| 12 | |||
| 13 | inherit update-alternatives | ||
| 14 | |||
| 15 | FILES:${PN} += " ${datadir}/bug/media-types" | ||
| 16 | |||
| 17 | docdir:append = "/${BPN}" | ||
| 18 | |||
| 19 | do_install () { | ||
| 20 | install -d ${D}${sysconfdir} | ||
| 21 | install -d ${D}${datadir}/bug/media-types | ||
| 22 | install -d ${D}${docdir} | ||
| 23 | install -m 644 mime.types ${D}${sysconfdir}/ | ||
| 24 | install -m 644 debian/bug-presubj ${D}${datadir}/bug/media-types/presubj | ||
| 25 | install -m 644 debian/changelog ${D}${docdir}/changelog | ||
| 26 | install -m 644 debian/copyright ${D}${docdir}/copyright | ||
| 27 | cd ${D}${docdir}; gzip -9v changelog | ||
| 28 | } | ||
| 29 | |||
| 30 | ALTERNATIVE_PRIORITY = "90" | ||
| 31 | ALTERNATIVE:${PN} = "mime.types" | ||
| 32 | ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" | ||
| 33 | |||
| 34 | INHIBIT_DEFAULT_DEPS = "1" | ||
| 35 | |||
| 36 | # Debian used to have mime-support package which was media-types and | ||
| 37 | # mailcap recipes in one. | ||
| 38 | PACKAGES += "mime-support" | ||
| 39 | RPROVIDES:${PN} += "mime-support" | ||
| 40 | RDEPENDS:mime-support += "${PN} mailcap" | ||
| 41 | ALLOW_EMPTY:mime-support = "1" | ||
diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.62.bb b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb deleted file mode 100644 index 1c0aec13e3..0000000000 --- a/meta-oe/recipes-support/mime-support/mime-support_3.62.bb +++ /dev/null | |||
| @@ -1,65 +0,0 @@ | |||
| 1 | SECTION = "base" | ||
| 2 | SUMMARY = "MIME files 'mime.types' & 'mailcap', and support programs" | ||
| 3 | LICENSE = "PD & Bellcore" | ||
| 4 | LICENSE:${PN} = "PD" | ||
| 5 | # mailcap.man's license is Bellcore | ||
| 6 | LICENSE:${PN}-doc = "PD & Bellcore" | ||
| 7 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=53c851e31d27c3ea8a6217073a5ff01c" | ||
| 8 | |||
| 9 | DEPENDS = "file" | ||
| 10 | RDEPENDS:${PN} = "perl" | ||
| 11 | RRECOMMENDS:${PN} = "file" | ||
| 12 | |||
| 13 | SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz" | ||
| 14 | SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a" | ||
| 15 | S = "${UNPACKDIR}/${BPN}" | ||
| 16 | |||
| 17 | inherit update-alternatives | ||
| 18 | |||
| 19 | FILES:${PN} += " ${libdir}/mime" | ||
| 20 | |||
| 21 | docdir:append = "/${BPN}" | ||
| 22 | |||
| 23 | do_install () { | ||
| 24 | install -d ${D}${sysconfdir} | ||
| 25 | install -d ${D}${libdir}/mime/packages | ||
| 26 | install -d ${D}${docdir} | ||
| 27 | install -d ${D}${sbindir} | ||
| 28 | install -d ${D}${bindir} | ||
| 29 | install -d ${D}${mandir}/man1 | ||
| 30 | install -d ${D}${mandir}/man5 | ||
| 31 | install -d ${D}${mandir}/man8 | ||
| 32 | install -m 644 mime.types ${D}${sysconfdir}/ | ||
| 33 | install -m 644 mailcap ${D}${libdir}/mime/ | ||
| 34 | install -m 644 mailcap.order ${D}${sysconfdir}/ | ||
| 35 | install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5 | ||
| 36 | install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 | ||
| 37 | # install -m 755 install-mime ${D}${sbindir}/ | ||
| 38 | # install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 | ||
| 39 | install -m 755 update-mime ${D}${sbindir}/ | ||
| 40 | install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 | ||
| 41 | install -m 755 run-mailcap ${D}${bindir}/ | ||
| 42 | install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 | ||
| 43 | # install -m 644 rfcs/* ${D}${docdir}/ | ||
| 44 | install -m 644 debian/changelog ${D}${docdir}/changelog.Debian | ||
| 45 | install -m 644 debian/copyright ${D}${docdir}/copyright | ||
| 46 | install -m 755 debian-view ${D}${libdir}/mime/ | ||
| 47 | install -m 755 playaudio ${D}${libdir}/mime/ | ||
| 48 | install -m 755 playdsp ${D}${libdir}/mime/ | ||
| 49 | install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support | ||
| 50 | cd ${D}${mandir}; gzip -9fv */* | ||
| 51 | cd ${D}${docdir}; gzip -9v * | ||
| 52 | cd ${D}${docdir}; gunzip copyright.gz | ||
| 53 | cd ${D}${bindir}; ln -s run-mailcap see | ||
| 54 | cd ${D}${bindir}; ln -s run-mailcap edit | ||
| 55 | cd ${D}${bindir}; ln -s run-mailcap compose | ||
| 56 | cd ${D}${bindir}; ln -s run-mailcap print | ||
| 57 | cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz | ||
| 58 | cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz | ||
| 59 | cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz | ||
| 60 | cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz | ||
| 61 | } | ||
| 62 | |||
| 63 | ALTERNATIVE_PRIORITY = "90" | ||
| 64 | ALTERNATIVE:${PN} = "mime.types" | ||
| 65 | ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" | ||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch index 8fad8d5645..1e8b69abf7 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | From c34eca043178e60ff04dc88953a71b36ce9dc1b0 Mon Sep 17 00:00:00 2001 | 1 | From 5544371deb70e091e86d07f2755396b8a49729d7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Liu Yiding <liuyd.fnst@fujitsu.com> |
| 3 | Date: Mon, 26 Nov 2018 09:19:17 +0800 | 3 | Date: Wed, 28 Jan 2026 09:56:19 +0000 |
| 4 | Subject: [PATCH] RH: use rpm optflags if present | 4 | Subject: [PATCH] RH: use rpm optflags if present |
| 5 | 5 | ||
| 6 | Use the passed in optflags when compiling as an RPM, and keep the | 6 | Use the passed in optflags when compiling as an RPM, and keep the |
| @@ -22,19 +22,22 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
| 22 | 22 | ||
| 23 | Rebase to 0.12.1 | 23 | Rebase to 0.12.1 |
| 24 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | 24 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> |
| 25 | |||
| 26 | Rebase to 0.12.2 | ||
| 27 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 25 | --- | 28 | --- |
| 26 | Makefile.inc | 12 ++++++++++-- | 29 | Makefile.inc | 12 ++++++++++-- |
| 27 | 1 file changed, 10 insertions(+), 2 deletions(-) | 30 | 1 file changed, 10 insertions(+), 2 deletions(-) |
| 28 | 31 | ||
| 29 | diff --git a/Makefile.inc b/Makefile.inc | 32 | diff --git a/Makefile.inc b/Makefile.inc |
| 30 | index d04a3175..eb339251 100644 | 33 | index 7ca96e58..8e168dc8 100644 |
| 31 | --- a/Makefile.inc | 34 | --- a/Makefile.inc |
| 32 | +++ b/Makefile.inc | 35 | +++ b/Makefile.inc |
| 33 | @@ -102,7 +102,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo | 36 | @@ -108,7 +108,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo |
| 34 | MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ | 37 | MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ |
| 35 | echo "modprobe@dm_multipath.service") | 38 | echo "modprobe@dm_multipath.service") |
| 36 | 39 | ||
| 37 | -OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 | 40 | -OPTFLAGS := $(OPT) -g $(STACKPROT) --param=ssp-buffer-size=4 |
| 38 | +ifndef RPM_OPT_FLAGS | 41 | +ifndef RPM_OPT_FLAGS |
| 39 | + OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 | 42 | + OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 |
| 40 | +else | 43 | +else |
| @@ -47,13 +50,13 @@ index d04a3175..eb339251 100644 | |||
| 47 | 50 | ||
| 48 | # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development. | 51 | # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development. |
| 49 | WARN_ONLY := | 52 | WARN_ONLY := |
| 50 | @@ -121,7 +129,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \ | 53 | @@ -127,7 +135,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) $(D_CMOCKA_VERSION) \ |
| 51 | -DABSTRACT_SOCKET=\"$(abstract_socket)\" -DPATHNAME_SOCKET=\"$(pathname_socket)\" \ | 54 | -DABSTRACT_SOCKET=\"$(abstract_socket)\" -DPATHNAME_SOCKET=\"$(pathname_socket)\" \ |
| 52 | -DWSTRINGOP_TRUNCATION=$(if $(WSTRINGOP_TRUNCATION),1,0) \ | 55 | -DWSTRINGOP_TRUNCATION=$(if $(WSTRINGOP_TRUNCATION),1,0) \ |
| 53 | -MMD -MP | 56 | -MMD -MP |
| 54 | -CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ | 57 | -CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ |
| 55 | +CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \ | 58 | +CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \ |
| 56 | -fexceptions | 59 | -fexceptions -fno-strict-aliasing $(if $(ASAN),-fsanitize=address) |
| 57 | BIN_CFLAGS := -fPIE -DPIE | 60 | BIN_CFLAGS := -fPIE -DPIE |
| 58 | LIB_CFLAGS := -fPIC | 61 | LIB_CFLAGS := -fPIC |
| 59 | -- | 62 | -- |
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb index 20d9b6a1b5..bfb75718f2 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb | |||
| @@ -49,7 +49,7 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=st | |||
| 49 | 49 | ||
| 50 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f" | 50 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f" |
| 51 | 51 | ||
| 52 | SRCREV = "a1f7f3d5b4972c39e8950c722a04c21a9e030a31" | 52 | SRCREV = "5bd1163d187520b958d78b85c7b239561dc86192" |
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | inherit systemd pkgconfig | 55 | inherit systemd pkgconfig |
diff --git a/meta-oe/recipes-support/nano/nano_8.7.bb b/meta-oe/recipes-support/nano/nano_8.7.1.bb index b6c65a6f31..e62529ff9b 100644 --- a/meta-oe/recipes-support/nano/nano_8.7.bb +++ b/meta-oe/recipes-support/nano/nano_8.7.1.bb | |||
| @@ -13,7 +13,7 @@ RDEPENDS:${PN} = "ncurses-terminfo-base" | |||
| 13 | PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" | 13 | PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" |
| 14 | 14 | ||
| 15 | SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" | 15 | SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" |
| 16 | SRC_URI[sha256sum] = "afd287aa672c48b8e1a93fdb6c6588453d527510d966822b687f2835f0d986e9" | 16 | SRC_URI[sha256sum] = "76f0dcb248f2e2f1251d4ecd20fd30fb400a360a3a37c6c340e0a52c2d1cdedf" |
| 17 | 17 | ||
| 18 | UPSTREAM_CHECK_URI = "${GNU_MIRROR}/nano" | 18 | UPSTREAM_CHECK_URI = "${GNU_MIRROR}/nano" |
| 19 | 19 | ||
diff --git a/meta-oe/recipes-support/ncdu/ncdu_1.22.bb b/meta-oe/recipes-support/ncdu/ncdu_1.22.bb new file mode 100644 index 0000000000..578ae4a5ed --- /dev/null +++ b/meta-oe/recipes-support/ncdu/ncdu_1.22.bb | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | SUMMARY = "NCurses Disk Usage" | ||
| 2 | DESCRIPTION = "\ | ||
| 3 | ncdu is a curses-based version of the well-known 'du', and provides a \ | ||
| 4 | fast way to see what directories are using your disk space. \ | ||
| 5 | " | ||
| 6 | HOMEPAGE = "https://dev.yorhel.nl/ncdu" | ||
| 7 | BUGTRACKER = "https://code.blicky.net/yorhel/ncdu/issues" | ||
| 8 | SECTION = "console/utils" | ||
| 9 | |||
| 10 | LICENSE = "MIT" | ||
| 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=fd36a36514d73885d04105f000da9813" | ||
| 12 | |||
| 13 | DEPENDS += "ncurses" | ||
| 14 | |||
| 15 | SRC_URI += "git://code.blicky.net/yorhel/ncdu.git;protocol=https;branch=master;tag=v${PV}" | ||
| 16 | SRCREV = "7a1437389691c4adf1999afce63850c808602f08" | ||
| 17 | |||
| 18 | inherit autotools pkgconfig | ||
| 19 | |||
| 20 | PACKAGECONFIG ?= "largefile ncursesw year2038" | ||
| 21 | |||
| 22 | PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile" | ||
| 23 | PACKAGECONFIG[ncurses] = "--with-ncurses,--without-ncurses" | ||
| 24 | PACKAGECONFIG[ncursesw] = "--with-ncursesw,--without-ncursesw" | ||
| 25 | PACKAGECONFIG[year2038] = "--enable-year2038,--disable-year2038" | ||
diff --git a/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index 63f822be25..2a14dffbea 100644 --- a/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch | |||
| @@ -11,14 +11,13 @@ Upstream-Status: Pending | |||
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 12 | --- | 12 | --- |
| 13 | nss/lib/freebl/Makefile | 3 +++ | 13 | nss/lib/freebl/Makefile | 3 +++ |
| 14 | nss/lib/freebl/gcm.c | 2 ++ | 14 | 1 file changed, 3 insertions(+) |
| 15 | 2 files changed, 5 insertions(+) | ||
| 16 | 15 | ||
| 17 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile | 16 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile |
| 18 | index 0ebfc92..3ee7623 100644 | 17 | index 0ebfc92..3ee7623 100644 |
| 19 | --- a/nss/lib/freebl/Makefile | 18 | --- a/nss/lib/freebl/Makefile |
| 20 | +++ b/nss/lib/freebl/Makefile | 19 | +++ b/nss/lib/freebl/Makefile |
| 21 | @@ -142,6 +142,8 @@ endif | 20 | @@ -136,6 +136,8 @@ endif |
| 22 | endif | 21 | endif |
| 23 | endif | 22 | endif |
| 24 | endif | 23 | endif |
| @@ -26,8 +25,8 @@ index 0ebfc92..3ee7623 100644 | |||
| 26 | + DEFINES += -DNSS_USE_ARM_HW_CRYPTO | 25 | + DEFINES += -DNSS_USE_ARM_HW_CRYPTO |
| 27 | ifeq ($(CPU_ARCH),aarch64) | 26 | ifeq ($(CPU_ARCH),aarch64) |
| 28 | ifdef CC_IS_CLANG | 27 | ifdef CC_IS_CLANG |
| 29 | DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 | 28 | DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 -DHAVE_PLATFORM_GHASH |
| 30 | @@ -183,6 +185,7 @@ endif | 29 | @@ -178,6 +180,7 @@ endif |
| 31 | endif | 30 | endif |
| 32 | endif | 31 | endif |
| 33 | endif | 32 | endif |
| @@ -35,23 +34,3 @@ index 0ebfc92..3ee7623 100644 | |||
| 35 | 34 | ||
| 36 | ifeq (,$(filter-out WINNT,$(OS_TARGET))) | 35 | ifeq (,$(filter-out WINNT,$(OS_TARGET))) |
| 37 | ifndef USE_64 | 36 | ifndef USE_64 |
| 38 | diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c | ||
| 39 | index a2f63a6..743158e 100644 | ||
| 40 | --- a/nss/lib/freebl/gcm.c | ||
| 41 | +++ b/nss/lib/freebl/gcm.c | ||
| 42 | @@ -18,6 +18,7 @@ | ||
| 43 | |||
| 44 | #include <limits.h> | ||
| 45 | |||
| 46 | +#ifdef NSS_USE_ARM_HW_CRYPTO | ||
| 47 | /* old gcc doesn't support some poly64x2_t intrinsic */ | ||
| 48 | #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ | ||
| 49 | (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) | ||
| 50 | @@ -27,6 +28,7 @@ | ||
| 51 | /* We don't test on big endian platform, so disable this on big endian. */ | ||
| 52 | #define USE_ARM_GCM | ||
| 53 | #endif | ||
| 54 | +#endif | ||
| 55 | |||
| 56 | #if defined(__ARM_NEON) || defined(__ARM_NEON__) | ||
| 57 | #include <arm_neon.h> | ||
diff --git a/meta-oe/recipes-support/nss/nss_3.119.bb b/meta-oe/recipes-support/nss/nss_3.121.bb index a0345eb8aa..99f54c948a 100644 --- a/meta-oe/recipes-support/nss/nss_3.119.bb +++ b/meta-oe/recipes-support/nss/nss_3.121.bb | |||
| @@ -33,7 +33,7 @@ SRC_URI = "https://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/ | |||
| 33 | file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \ | 33 | file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \ |
| 34 | file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ | 34 | file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ |
| 35 | " | 35 | " |
| 36 | SRC_URI[sha256sum] = "e8412db6c9d6f531e8adfe8a122ec33a8fae920681ff47231a1349bdd399f0e9" | 36 | SRC_URI[sha256sum] = "cb3a8f8781bea78b7b8edd3afb7a2cb58e4881bb0160d189a39b98216ba7632e" |
| 37 | 37 | ||
| 38 | UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/" | 38 | UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/" |
| 39 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)" | 39 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)" |
diff --git a/meta-oe/recipes-support/onig/onig_6.9.10.bb b/meta-oe/recipes-support/onig/onig_6.9.10.bb index f285c2ed73..d7419b4ace 100644 --- a/meta-oe/recipes-support/onig/onig_6.9.10.bb +++ b/meta-oe/recipes-support/onig/onig_6.9.10.bb | |||
| @@ -35,3 +35,6 @@ do_install_ptest() { | |||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | PROVIDES += "oniguruma" | 37 | PROVIDES += "oniguruma" |
| 38 | |||
| 39 | # Add CVE_PRODUCT to match the NVD CPE product name | ||
| 40 | CVE_PRODUCT = "oniguruma_project:oniguruma" | ||
diff --git a/meta-oe/recipes-support/opencv/opencv_4.13.0.bb b/meta-oe/recipes-support/opencv/opencv_4.13.0.bb index 3f4dc23da2..981b06e33b 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.13.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.13.0.bb | |||
| @@ -124,7 +124,7 @@ PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON,-DBUILD_TESTS=OFF,," | |||
| 124 | PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," | 124 | PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," |
| 125 | PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," | 125 | PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," |
| 126 | PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," | 126 | PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," |
| 127 | PACKAGECONFIG[fastcv] = "-DWITH_FASTCV=ON ,-DWITH_FASTCV=OFF,qcom-fastcv-binaries," | 127 | PACKAGECONFIG[fastcv] = "-DWITH_FASTCV=ON ,-DWITH_FASTCV=OFF," |
| 128 | 128 | ||
| 129 | inherit pkgconfig cmake setuptools3-base python3native | 129 | inherit pkgconfig cmake setuptools3-base python3native |
| 130 | 130 | ||
| @@ -171,7 +171,7 @@ python populate_packages:prepend () { | |||
| 171 | fastcv_pkgs = ["libopencv-core", "libopencv-fastcv", "libopencv-imgproc"] | 171 | fastcv_pkgs = ["libopencv-core", "libopencv-fastcv", "libopencv-imgproc"] |
| 172 | if bb.utils.contains('PACKAGECONFIG', 'fastcv', True, False, d): | 172 | if bb.utils.contains('PACKAGECONFIG', 'fastcv', True, False, d): |
| 173 | for pkg in fastcv_pkgs: | 173 | for pkg in fastcv_pkgs: |
| 174 | d.appendVar('RDEPENDS:' + pkg, " qcom-fastcv-binaries") | 174 | d.appendVar('RRECOMMENDS:' + pkg, " qcom-fastcv-binaries") |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | PACKAGES_DYNAMIC += "^libopencv-.*" | 177 | PACKAGES_DYNAMIC += "^libopencv-.*" |
diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.10.bb b/meta-oe/recipes-support/openldap/openldap_2.6.12.bb index 9ef4a83584..beee1b2738 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.6.10.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.6.12.bb | |||
| @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" | |||
| 7 | # basically BSD. opensource.org has listed this license | 7 | # basically BSD. opensource.org has listed this license |
| 8 | # since August 2019. | 8 | # since August 2019. |
| 9 | LICENSE = "OLDAP-2.8" | 9 | LICENSE = "OLDAP-2.8" |
| 10 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \ | 10 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=e71f8d80fdc11f3cea5dee6ad13679ce \ |
| 11 | file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ | 11 | file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ |
| 12 | " | 12 | " |
| 13 | SECTION = "libs" | 13 | SECTION = "libs" |
| @@ -21,7 +21,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ | |||
| 21 | file://0001-build-top.mk-unset-STRIP_OPTS.patch \ | 21 | file://0001-build-top.mk-unset-STRIP_OPTS.patch \ |
| 22 | " | 22 | " |
| 23 | 23 | ||
| 24 | SRC_URI[sha256sum] = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516" | 24 | SRC_URI[sha256sum] = "1716ad779e85d743694c3e3b05277fb71b6a5eadca43c7a958aa62683b22208e" |
| 25 | 25 | ||
| 26 | DEPENDS = "util-linux groff-native" | 26 | DEPENDS = "util-linux groff-native" |
| 27 | 27 | ||
diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.3.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.4.bb index 5aecc2df89..2a003cbb46 100644 --- a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.3.bb +++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.4.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
| 5 | 5 | ||
| 6 | SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master;tag=${PV}" | 6 | SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master;tag=${PV}" |
| 7 | 7 | ||
| 8 | SRCREV = "12f62c67650e1bfb491c18242a75fa61993c4cb8" | 8 | SRCREV = "52c6a3fda367d2badf618a2e0b8f9e59a02f16ff" |
| 9 | 9 | ||
| 10 | inherit autotools pkgconfig | 10 | inherit autotools pkgconfig |
| 11 | 11 | ||
diff --git a/meta-oe/recipes-support/poco/poco_1.14.2.bb b/meta-oe/recipes-support/poco/poco_1.15.0.bb index 8cdcf3649c..a22694031a 100644 --- a/meta-oe/recipes-support/poco/poco_1.14.2.bb +++ b/meta-oe/recipes-support/poco/poco_1.15.0.bb | |||
| @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-${PV};protocol=http | |||
| 13 | file://0002-DataTest-disable-testSQLChannel-test.patch \ | 13 | file://0002-DataTest-disable-testSQLChannel-test.patch \ |
| 14 | file://run-ptest \ | 14 | file://run-ptest \ |
| 15 | " | 15 | " |
| 16 | SRCREV = "96d182a99303fb068575294b36f0cc20da2e7b25" | 16 | SRCREV = "52c558fbcda0578467e4f59c96961eb629ed3c77" |
| 17 | 17 | ||
| 18 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" | 18 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" |
| 19 | 19 | ||
| @@ -126,8 +126,12 @@ PACKAGES_DYNAMIC = "poco-.*" | |||
| 126 | ALLOW_EMPTY:${PN} = "1" | 126 | ALLOW_EMPTY:${PN} = "1" |
| 127 | 127 | ||
| 128 | # cppunit and datatest is only built if tests are enabled | 128 | # cppunit and datatest is only built if tests are enabled |
| 129 | PACKAGES =+ "${PN}-cppunit ${PN}-datatest" | 129 | # Upstream only ships libCppUnit.so.1 + symlink libCppUnit.so (no patch version), |
| 130 | FILES:${PN}-cppunit += "${libdir}/libCppUnit.so*" | 130 | # so split: runtime in poco-cppunit, dev symlink in poco-cppunit-dev |
| 131 | PACKAGES =+ "${PN}-cppunit-dev ${PN}-cppunit ${PN}-datatest" | ||
| 132 | FILES:${PN}-cppunit-dev += "${libdir}/libCppUnit.so" | ||
| 133 | RDEPENDS:${PN}-cppunit-dev += "${PN}-cppunit" | ||
| 134 | FILES:${PN}-cppunit += "${libdir}/libCppUnit.so.1" | ||
| 131 | ALLOW_EMPTY:${PN}-cppunit = "1" | 135 | ALLOW_EMPTY:${PN}-cppunit = "1" |
| 132 | FILES:${PN}-datatest += "${libdir}/libPocoDataTest.so*" | 136 | FILES:${PN}-datatest += "${libdir}/libPocoDataTest.so*" |
| 133 | ALLOW_EMPTY:${PN}-datatest = "1" | 137 | ALLOW_EMPTY:${PN}-datatest = "1" |
diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb b/meta-oe/recipes-support/rdfind/rdfind_1.8.0.bb index 3a15fe6c9a..71ee7871c4 100644 --- a/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb +++ b/meta-oe/recipes-support/rdfind/rdfind_1.8.0.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fa22e16ebbe6638b2bd253338fbded9f" | |||
| 6 | DEPENDS = "nettle autoconf-archive" | 6 | DEPENDS = "nettle autoconf-archive" |
| 7 | 7 | ||
| 8 | SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz" | 8 | SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz" |
| 9 | SRC_URI[sha256sum] = "7a406e8ef1886a5869655604618dd98f672f12c6a6be4926d053be65070f3279" | 9 | SRC_URI[sha256sum] = "0a2d0d32002cc2dc0134ee7b649bcc811ecfb2f8d9f672aa476a851152e7af35" |
| 10 | 10 | ||
| 11 | inherit autotools | 11 | inherit autotools |
| 12 | 12 | ||
diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.36.bb b/meta-oe/recipes-support/remmina/remmina_1.4.43.bb index b8a31fc012..518c75a1a8 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.4.36.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.4.43.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://L | |||
| 7 | DEPENDS = " \ | 7 | DEPENDS = " \ |
| 8 | glib-2.0-native \ | 8 | glib-2.0-native \ |
| 9 | openssl \ | 9 | openssl \ |
| 10 | freerdp \ | 10 | freerdp3 \ |
| 11 | gtk+3 \ | 11 | gtk+3 \ |
| 12 | gdk-pixbuf \ | 12 | gdk-pixbuf \ |
| 13 | atk \ | 13 | atk \ |
| @@ -26,13 +26,19 @@ DEPENDS = " \ | |||
| 26 | DEPENDS:append:libc-musl = " libexecinfo" | 26 | DEPENDS:append:libc-musl = " libexecinfo" |
| 27 | LDFLAGS:append:libc-musl = " -lexecinfo" | 27 | LDFLAGS:append:libc-musl = " -lexecinfo" |
| 28 | 28 | ||
| 29 | SRCREV = "17cf7956b9f925fa788083a2db8d5e669f86bfaf" | 29 | SRCREV = "7be0cf2348d149c6bf5bd882fe91d3bec7d6aebb" |
| 30 | SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" | 30 | SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master;tag=v${PV}" |
| 31 | 31 | ||
| 32 | inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig | 32 | inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig |
| 33 | REQUIRED_DISTRO_FEATURES = "x11" | 33 | REQUIRED_DISTRO_FEATURES = "x11" |
| 34 | 34 | ||
| 35 | EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DHAVE_LIBAPPINDICATOR=OFF -DWITH_WEBKIT2GTK=OFF" | 35 | EXTRA_OECMAKE += "\ |
| 36 | -DWITH_APPINDICATOR=OFF \ | ||
| 37 | -DWITH_GETTEXT=OFF \ | ||
| 38 | -DWITH_TRANSLATIONS=OFF \ | ||
| 39 | -DHAVE_LIBAPPINDICATOR=OFF \ | ||
| 40 | -DWITH_WEBKIT2GTK=OFF \ | ||
| 41 | -DWITH_FREERDP3=ON" | ||
| 36 | 42 | ||
| 37 | PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" | 43 | PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" |
| 38 | # Switch on gtk support in avahi recipe if you want to enable avahi support | 44 | # Switch on gtk support in avahi recipe if you want to enable avahi support |
diff --git a/meta-oe/recipes-support/smarty/smarty_5.7.0.bb b/meta-oe/recipes-support/smarty/smarty_5.8.0.bb index 1d21c7eedf..89fe828ab5 100644 --- a/meta-oe/recipes-support/smarty/smarty_5.7.0.bb +++ b/meta-oe/recipes-support/smarty/smarty_5.8.0.bb | |||
| @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3" | |||
| 12 | 12 | ||
| 13 | SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master;tag=v${PV}" | 13 | SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master;tag=v${PV}" |
| 14 | 14 | ||
| 15 | SRCREV = "73da7e90f302175a570662fcb0ba41f57b7a92ab" | 15 | SRCREV = "78d259d3b971c59a0cd719c270cc5cbb740c36a7" |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | INHIBIT_DEFAULT_DEPS = "1" | 18 | INHIBIT_DEFAULT_DEPS = "1" |
diff --git a/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch b/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch deleted file mode 100644 index a6598b5635..0000000000 --- a/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch +++ /dev/null | |||
| @@ -1,89 +0,0 @@ | |||
| 1 | From c33e7707da86a23c4ad7e2451ddb04df419d6412 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 31 Aug 2025 00:13:07 -0700 | ||
| 4 | Subject: [PATCH] Fix build with boost 1.89 | ||
| 5 | |||
| 6 | boost 1.89+ does not have boost system lib anymore all needed functions | ||
| 7 | are now in header | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | dbus/Makefile.am | 2 +- | ||
| 14 | examples/c++-lib/Makefile.am | 1 - | ||
| 15 | server/Makefile.am | 2 +- | ||
| 16 | snapper/Makefile.am | 2 +- | ||
| 17 | testsuite-cmp/Makefile.am | 1 - | ||
| 18 | zypp-plugin/Makefile.am | 1 - | ||
| 19 | 6 files changed, 3 insertions(+), 6 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/dbus/Makefile.am b/dbus/Makefile.am | ||
| 22 | index 9c0456a..2078d7d 100644 | ||
| 23 | --- a/dbus/Makefile.am | ||
| 24 | +++ b/dbus/Makefile.am | ||
| 25 | @@ -15,4 +15,4 @@ libdbus_la_SOURCES = \ | ||
| 26 | DBusMainLoop.cc DBusMainLoop.h | ||
| 27 | |||
| 28 | libdbus_la_LIBADD = $(DBUS_LIBS) | ||
| 29 | -libdbus_la_LDFLAGS = -lboost_system -lboost_thread | ||
| 30 | +libdbus_la_LDFLAGS = -lboost_thread | ||
| 31 | diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am | ||
| 32 | index 52c81e5..f55da6f 100644 | ||
| 33 | --- a/examples/c++-lib/Makefile.am | ||
| 34 | +++ b/examples/c++-lib/Makefile.am | ||
| 35 | @@ -5,7 +5,6 @@ | ||
| 36 | AM_CPPFLAGS = -I$(top_srcdir) | ||
| 37 | |||
| 38 | LDADD = ../../snapper/libsnapper.la | ||
| 39 | -AM_LDFLAGS = -lboost_system | ||
| 40 | |||
| 41 | noinst_PROGRAMS = List ListAll Create CmpDirs CreateNumber CreateTimeline | ||
| 42 | |||
| 43 | diff --git a/server/Makefile.am b/server/Makefile.am | ||
| 44 | index c03f373..1aef916 100644 | ||
| 45 | --- a/server/Makefile.am | ||
| 46 | +++ b/server/Makefile.am | ||
| 47 | @@ -16,4 +16,4 @@ snapperd_SOURCES = \ | ||
| 48 | FilesTransferTask.cc FilesTransferTask.h | ||
| 49 | |||
| 50 | snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt | ||
| 51 | -snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread | ||
| 52 | +snapperd_LDFLAGS = -lboost_thread -lpthread | ||
| 53 | diff --git a/snapper/Makefile.am b/snapper/Makefile.am | ||
| 54 | index b0fe55c..d75599f 100644 | ||
| 55 | --- a/snapper/Makefile.am | ||
| 56 | +++ b/snapper/Makefile.am | ||
| 57 | @@ -71,7 +71,7 @@ endif | ||
| 58 | |||
| 59 | libsnapper_la_CPPFLAGS = $(XML2_CFLAGS) $(ZLIB_CFLAGS) | ||
| 60 | libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@ | ||
| 61 | -libsnapper_la_LIBADD = -lboost_thread -lboost_system $(XML2_LIBS) -lacl $(ZLIB_LIBS) | ||
| 62 | +libsnapper_la_LIBADD = -lboost_thread $(XML2_LIBS) -lacl $(ZLIB_LIBS) | ||
| 63 | if ENABLE_ROLLBACK | ||
| 64 | libsnapper_la_LIBADD += -lmount | ||
| 65 | endif | ||
| 66 | diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am | ||
| 67 | index 81104bf..555bc3b 100644 | ||
| 68 | --- a/testsuite-cmp/Makefile.am | ||
| 69 | +++ b/testsuite-cmp/Makefile.am | ||
| 70 | @@ -3,7 +3,6 @@ | ||
| 71 | # | ||
| 72 | |||
| 73 | AM_CPPFLAGS = -I$(top_srcdir) | ||
| 74 | -AM_LDFLAGS = -lboost_system | ||
| 75 | |||
| 76 | LDADD = ../snapper/libsnapper.la | ||
| 77 | |||
| 78 | diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am | ||
| 79 | index 9d102e0..e395f59 100644 | ||
| 80 | --- a/zypp-plugin/Makefile.am | ||
| 81 | +++ b/zypp-plugin/Makefile.am | ||
| 82 | @@ -33,7 +33,6 @@ forwarding_zypp_plugin_SOURCES = \ | ||
| 83 | forwarding_zypp_plugin_LDADD = \ | ||
| 84 | ../snapper/libsnapper.la \ | ||
| 85 | ../stomp/libstomp.la \ | ||
| 86 | - -lboost_system \ | ||
| 87 | -lpthread | ||
| 88 | |||
| 89 | TESTS = solvable-matcher.test | ||
diff --git a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb b/meta-oe/recipes-support/snapper/snapper_0.13.0.bb index 981ca84c13..56d4c89d0f 100644 --- a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb +++ b/meta-oe/recipes-support/snapper/snapper_0.13.0.bb | |||
| @@ -6,19 +6,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | |||
| 6 | DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib" | 6 | DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib" |
| 7 | 7 | ||
| 8 | # Build separation is slightly broken | 8 | # Build separation is slightly broken |
| 9 | inherit autotools-brokensep pkgconfig gettext | 9 | inherit autotools-brokensep pkgconfig gettext manpages |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master" |
| 12 | file://0001-Fix-build-with-boost-1.89.patch \ | 12 | SRCREV = "3a3bd97083976d28538d402284ff947b4aab5b8f" |
| 13 | " | ||
| 14 | SRCREV = "4f3d2b2fc58aefa976668cd25b8eac02ba0f85e7" | ||
| 15 | 13 | ||
| 16 | EXTRA_OECONF += "--disable-zypp" | 14 | EXTRA_OECONF += "--disable-zypp" |
| 17 | 15 | ||
| 18 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'api-documentation systemd pam', d)}" | 16 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd pam', d)}" |
| 19 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-security=${base_libdir}/security, --disable-pam,libpam" | 17 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-security=${base_libdir}/security, --disable-pam,libpam" |
| 20 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" | 18 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" |
| 21 | PACKAGECONFIG[api-documentation] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native" | 19 | PACKAGECONFIG[manpages] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native" |
| 22 | 20 | ||
| 23 | # Avoid HOSTTOOLS path in binaries | 21 | # Avoid HOSTTOOLS path in binaries |
| 24 | export DIFF_BIN = "${bindir}/diff" | 22 | export DIFF_BIN = "${bindir}/diff" |
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.10.2.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.11.0.bb index c3b201c4a7..1846758681 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.10.2.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.11.0.bb | |||
| @@ -26,7 +26,7 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta | |||
| 26 | " | 26 | " |
| 27 | SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" | 27 | SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" |
| 28 | 28 | ||
| 29 | SRC_URI[sha256sum] = "841503de6c2486e66fd08f0c62ac2568fc8ed1021297f855e8acd58ad7caff76" | 29 | SRC_URI[sha256sum] = "37ea0d4588533316de122df4e1b249867b0a0575f646c7478d0cc4d747462943" |
| 30 | 30 | ||
| 31 | UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" | 31 | UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" |
| 32 | UPSTREAM_CHECK_REGEX = "releases/tag/syslog-ng-(?P<pver>\d+(\.\d+)+)" | 32 | UPSTREAM_CHECK_REGEX = "releases/tag/syslog-ng-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-oe/recipes-support/tree/tree_2.2.1.bb b/meta-oe/recipes-support/tree/tree_2.3.1.bb index df52d63fbb..b4fa0659b9 100644 --- a/meta-oe/recipes-support/tree/tree_2.2.1.bb +++ b/meta-oe/recipes-support/tree/tree_2.3.1.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" | |||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" |
| 6 | 6 | ||
| 7 | SRC_URI = "https://oldmanprogrammer.net/tar/tree/${BP}.tgz" | 7 | SRC_URI = "https://oldmanprogrammer.net/tar/tree/${BP}.tgz" |
| 8 | SRC_URI[sha256sum] = "68ac45dc78c0c311ada06200ffc3c285e74223ba208061f8d15ffac25e44b2ec" | 8 | SRC_URI[sha256sum] = "47ca786ed4ea4aa277cabd42b1a54635aca41b29e425e9229bd1317831f25665" |
| 9 | 9 | ||
| 10 | # tree's default CFLAGS for Linux | 10 | # tree's default CFLAGS for Linux |
| 11 | CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" | 11 | CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" |
diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb index 890568d727..02908b905a 100644 --- a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb +++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb | |||
| @@ -1,14 +1,14 @@ | |||
| 1 | SUMMARY = "Unicode Character Database" | 1 | SUMMARY = "Unicode Character Database" |
| 2 | HOMEPAGE = "https://unicode.org/ucd/" | 2 | HOMEPAGE = "https://unicode.org/ucd/" |
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ucd-license-v3.txt;md5=ea17640caddb659394df50e5db6efd69" | 4 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ucd-license-v4.txt;md5=3049f4ad14be1ebf8c80a93d9d32b2d6" |
| 5 | 5 | ||
| 6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
| 7 | https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ | 7 | https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ |
| 8 | https://www.unicode.org/license.txt;downloadfilename=ucd-license-v3.txt;name=ucd-license \ | 8 | https://www.unicode.org/license.txt;downloadfilename=ucd-license-v4.txt;name=ucd-license \ |
| 9 | " | 9 | " |
| 10 | SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" | 10 | SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" |
| 11 | SRC_URI[ucd-license.sha256sum] = "abf84f74dea2812799e1dbef7f0581adf7db244881e4febb8684f441568da0ad" | 11 | SRC_URI[ucd-license.sha256sum] = "e7a93b009565cfce55919a381437ac4db883e9da2126fa28b91d12732bc53d96" |
| 12 | 12 | ||
| 13 | inherit allarch | 13 | inherit allarch |
| 14 | 14 | ||
diff --git a/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch b/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch deleted file mode 100644 index c763a9feb6..0000000000 --- a/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | From e886222c70d4b251f0785f670477b7aee938e5af Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
| 3 | Date: Wed, 21 Feb 2024 13:55:41 +0800 | ||
| 4 | Subject: [PATCH] exe/Makefile.am: add CROSS_LAUNCHER to run odbc_config | ||
| 5 | |||
| 6 | In case of cross compilation, the odbc_config cannot run, the error message | ||
| 7 | would be like below: | ||
| 8 | |||
| 9 | /bin/bash: line 1: ../exe/odbc_config: cannot execute binary file: Exec format error | ||
| 10 | |||
| 11 | Add CROSS_LAUNCHER to allow the possibility of running odbc_config correctly in | ||
| 12 | case of cross compilation. | ||
| 13 | |||
| 14 | For example, here's a possible value for it (Yocto project environment, aarch64 target). | ||
| 15 | export CROSS_LAUNCHER="PSEUDO_UNLOAD=1 qemu-aarch64 -r 5.15 \ | ||
| 16 | -L /PATH/TO/unixodbc/2.3.11/recipe-sysroot \ | ||
| 17 | -E LD_LIBRARY_PATH=/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib:/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib " | ||
| 18 | |||
| 19 | Other projects can use the launcher they like to allow correct generation of | ||
| 20 | the odbc.pc file in cross compilation environment. | ||
| 21 | |||
| 22 | Upstream-Status: Submitted [Personal Email, nick.gorham@easysoft.com] | ||
| 23 | |||
| 24 | As said in the official website, https://www.unixodbc.org/, the way to report bug and send | ||
| 25 | out patch is via personal email. So there's a public link above. | ||
| 26 | |||
| 27 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
| 28 | --- | ||
| 29 | exe/Makefile.am | 6 ++++-- | ||
| 30 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
| 31 | |||
| 32 | diff --git a/exe/Makefile.am b/exe/Makefile.am | ||
| 33 | index 03f3d5a..5f33cf2 100644 | ||
| 34 | --- a/exe/Makefile.am | ||
| 35 | +++ b/exe/Makefile.am | ||
| 36 | @@ -59,11 +59,13 @@ slencheck_SOURCES = slencheck.c | ||
| 37 | dltest_DEPENDENCIES = $(LTDLDEPS) | ||
| 38 | dltest_LDADD = $(LIBLTDL) | ||
| 39 | |||
| 40 | +CROSS_LAUNCHER ?= "" | ||
| 41 | + | ||
| 42 | all-am: | ||
| 43 | - @sed "s![@]ODBC_ULEN[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ | ||
| 44 | + @sed "s![@]ODBC_ULEN[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ | ||
| 45 | $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp | ||
| 46 | @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc | ||
| 47 | - @sed "s![@]ODBC_CFLAGS[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ | ||
| 48 | + @sed "s![@]ODBC_CFLAGS[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ | ||
| 49 | $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp | ||
| 50 | @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc | ||
| 51 | |||
| 52 | -- | ||
| 53 | 2.34.1 | ||
| 54 | |||
diff --git a/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch b/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch deleted file mode 100644 index 6884465452..0000000000 --- a/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 1 | From 76beb0938ef14276123996bfd99df23b0c7f0982 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Soumya Sambu <soumya.sambu@windriver.com> | ||
| 3 | Date: Fri, 7 Jun 2024 11:10:46 +0000 | ||
| 4 | Subject: [PATCH] PostgreSQL driver: Fix incompatible pointer-to-integer types | ||
| 5 | |||
| 6 | These result in out-of-bounds stack writes on 64-bit architectures | ||
| 7 | (caller has 4 bytes, callee writes 8 bytes), and seem to have gone | ||
| 8 | unnoticed on little-endian architectures (although big-endian | ||
| 9 | architectures must be broken). | ||
| 10 | |||
| 11 | This change is required to avoid a build failure with GCC 14. | ||
| 12 | |||
| 13 | CVE: CVE-2024-1013 | ||
| 14 | |||
| 15 | Upstream-Status: Backport [https://github.com/lurcher/unixODBC/commit/45f501e1be2db6b017cc242c79bfb9de32b332a1] | ||
| 16 | |||
| 17 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | ||
| 18 | --- | ||
| 19 | Drivers/Postgre7.1/info.c | 6 +++--- | ||
| 20 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c | ||
| 23 | index 63ac91f..2216ecd 100644 | ||
| 24 | --- a/Drivers/Postgre7.1/info.c | ||
| 25 | +++ b/Drivers/Postgre7.1/info.c | ||
| 26 | @@ -1779,14 +1779,14 @@ char *table_name; | ||
| 27 | char index_name[MAX_INFO_STRING]; | ||
| 28 | short fields_vector[8]; | ||
| 29 | char isunique[10], isclustered[10]; | ||
| 30 | -SDWORD index_name_len, fields_vector_len; | ||
| 31 | +SQLLEN index_name_len, fields_vector_len; | ||
| 32 | TupleNode *row; | ||
| 33 | int i; | ||
| 34 | HSTMT hcol_stmt; | ||
| 35 | StatementClass *col_stmt, *indx_stmt; | ||
| 36 | char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING]; | ||
| 37 | char **column_names = 0; | ||
| 38 | -Int4 column_name_len; | ||
| 39 | +SQLLEN column_name_len; | ||
| 40 | int total_columns = 0; | ||
| 41 | char error = TRUE; | ||
| 42 | ConnInfo *ci; | ||
| 43 | @@ -2136,7 +2136,7 @@ HSTMT htbl_stmt; | ||
| 44 | StatementClass *tbl_stmt; | ||
| 45 | char tables_query[STD_STATEMENT_LEN]; | ||
| 46 | char attname[MAX_INFO_STRING]; | ||
| 47 | -SDWORD attname_len; | ||
| 48 | +SQLLEN attname_len; | ||
| 49 | char pktab[MAX_TABLE_LEN + 1]; | ||
| 50 | Int2 result_cols; | ||
| 51 | |||
| 52 | -- | ||
| 53 | 2.40.0 | ||
diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.14.bb index 389c3be903..62992f6f50 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.14.bb | |||
| @@ -10,10 +10,8 @@ DEPENDS = "libtool readline" | |||
| 10 | 10 | ||
| 11 | SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ | 11 | SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ |
| 12 | file://do-not-use-libltdl-source-directory.patch \ | 12 | file://do-not-use-libltdl-source-directory.patch \ |
| 13 | file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ | ||
| 14 | file://CVE-2024-1013.patch \ | ||
| 15 | " | 13 | " |
| 16 | SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" | 14 | SRC_URI[sha256sum] = "4e2814de3e01fc30b0b9f75e83bb5aba91ab0384ee951286504bb70205524771" |
| 17 | 15 | ||
| 18 | UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html" | 16 | UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html" |
| 19 | UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" | 17 | UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" |
| @@ -48,3 +46,5 @@ do_install:prepend() { | |||
| 48 | do_install:append() { | 46 | do_install:append() { |
| 49 | oe_multilib_header unixodbc.h unixODBC/unixodbc_conf.h | 47 | oe_multilib_header unixodbc.h unixODBC/unixodbc_conf.h |
| 50 | } | 48 | } |
| 49 | |||
| 50 | CVE_STATUS[CVE-2024-1013] = "fixed-version: fixed in 2.3.13" | ||
diff --git a/meta-oe/recipes-support/upower/upower_1.91.0.bb b/meta-oe/recipes-support/upower/upower_1.91.1.bb index b81d0c2971..d4107a959a 100644 --- a/meta-oe/recipes-support/upower/upower_1.91.0.bb +++ b/meta-oe/recipes-support/upower/upower_1.91.1.bb | |||
| @@ -13,7 +13,7 @@ DEPENDS = " \ | |||
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/archive/v${PV}/${BPN}-v${PV}.tar.bz2" | 15 | SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/archive/v${PV}/${BPN}-v${PV}.tar.bz2" |
| 16 | SRC_URI[sha256sum] = "954f8ee8d1422c813615862bc6249cb9b31ace1d905fd1f06549c4e47f4ba401" | 16 | SRC_URI[sha256sum] = "d568638d670a63a1886335b7b136f4888cb38a3b28f3f4bcdeaffcca0b0f6df8" |
| 17 | S = "${UNPACKDIR}/${BPN}-v${PV}" | 17 | S = "${UNPACKDIR}/${BPN}-v${PV}" |
| 18 | 18 | ||
| 19 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/tags" | 19 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/tags" |
diff --git a/meta-oe/recipes-support/usbids/usbids_2025.09.15.bb b/meta-oe/recipes-support/usbids/usbids_2025.12.13.bb index 925a8ddda9..ebaa1d1f99 100644 --- a/meta-oe/recipes-support/usbids/usbids_2025.09.15.bb +++ b/meta-oe/recipes-support/usbids/usbids_2025.12.13.bb | |||
| @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" | |||
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https" | 7 | SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https" |
| 8 | 8 | ||
| 9 | # September 15, 2025 | 9 | # December 13, 2025 |
| 10 | SRCREV = "18b3055a9819a341ac2ff957f0b92f564d0d5d6e" | 10 | SRCREV = "5de1427442504bc8e28d35cca5397d64ea177456" |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | do_install() { | 13 | do_install() { |
diff --git a/meta-oe/recipes-support/utf8proc/utf8proc_2.10.0.bb b/meta-oe/recipes-support/utf8proc/utf8proc_2.11.3.bb index 626836bd1c..4510eb9bf3 100644 --- a/meta-oe/recipes-support/utf8proc/utf8proc_2.10.0.bb +++ b/meta-oe/recipes-support/utf8proc/utf8proc_2.11.3.bb | |||
| @@ -12,7 +12,7 @@ SRC_URI = "\ | |||
| 12 | git://github.com/JuliaStrings/utf8proc;protocol=https;branch=master;tag=v${PV} \ | 12 | git://github.com/JuliaStrings/utf8proc;protocol=https;branch=master;tag=v${PV} \ |
| 13 | file://run-ptest \ | 13 | file://run-ptest \ |
| 14 | " | 14 | " |
| 15 | SRCREV = "a1b99daa2a3393884220264c927a48ba1251a9c6" | 15 | SRCREV = "e5e799221b45bbb90f5fdc5c69b6b8dfbf017e78" |
| 16 | 16 | ||
| 17 | inherit cmake ptest | 17 | inherit cmake ptest |
| 18 | 18 | ||
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.4.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.6.bb index eb9b81f154..ac941de811 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.4.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.6.bb | |||
| @@ -15,7 +15,7 @@ VBOX_NAME = "VirtualBox-${PV}" | |||
| 15 | SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ | 15 | SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ |
| 16 | file://Makefile.utils \ | 16 | file://Makefile.utils \ |
| 17 | " | 17 | " |
| 18 | SRC_URI[sha256sum] = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd" | 18 | SRC_URI[sha256sum] = "c58443a0e6fcc7fc7e84c1011a10823b3540c6a2b8f2e27c4d8971272baf09f7" |
| 19 | 19 | ||
| 20 | S ?= "${UNPACKDIR}/vbox_module" | 20 | S ?= "${UNPACKDIR}/vbox_module" |
| 21 | S:task-unpack = "${UNPACKDIR}/${VBOX_NAME}" | 21 | S:task-unpack = "${UNPACKDIR}/${VBOX_NAME}" |
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch index 367e6b8342..411164433a 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch | |||
| @@ -23,12 +23,12 @@ diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h | |||
| 23 | index 16e416d..68dd9a0 100644 | 23 | index 16e416d..68dd9a0 100644 |
| 24 | --- a/Source/WTF/wtf/Compiler.h | 24 | --- a/Source/WTF/wtf/Compiler.h |
| 25 | +++ b/Source/WTF/wtf/Compiler.h | 25 | +++ b/Source/WTF/wtf/Compiler.h |
| 26 | @@ -293,7 +293,7 @@ | 26 | @@ -290,7 +290,7 @@ |
| 27 | #if COMPILER(CLANG) | 27 | // written for 64-bit may fail to tail call on 32-bit. |
| 28 | #if __SIZEOF_POINTER__ == 8 | 28 | // It also doesn't work on ppc64le: https://github.com/llvm/llvm-project/issues/98859 |
| 29 | #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) | 29 | // and on Windows: https://github.com/llvm/llvm-project/issues/116568 |
| 30 | -#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) | 30 | -#if !defined(MUST_TAIL_CALL) && COMPILER(CLANG) && __SIZEOF_POINTER__ == 8 && defined(__cplusplus) && COMPILER_HAS_CPP_ATTRIBUTE(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) |
| 31 | +#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) && !defined(__arm__) | 31 | +#if !defined(MUST_TAIL_CALL) && COMPILER(CLANG) && __SIZEOF_POINTER__ == 8 && defined(__cplusplus) && COMPILER_HAS_CPP_ATTRIBUTE(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) && !defined(__arm__) |
| 32 | #define MUST_TAIL_CALL [[clang::musttail]] | 32 | #define MUST_TAIL_CALL [[clang::musttail]] |
| 33 | #define HAVE_MUST_TAIL_CALL 1 | 33 | #define HAVE_MUST_TAIL_CALL 1 |
| 34 | #endif | 34 | #endif |
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.7.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.50.5.bb index 118592d42b..9be30506d6 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.7.bb +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.50.5.bb | |||
| @@ -23,14 +23,14 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ | |||
| 23 | file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ | 23 | file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ |
| 24 | file://0001-Fix-32bit-arm.patch \ | 24 | file://0001-Fix-32bit-arm.patch \ |
| 25 | " | 25 | " |
| 26 | SRC_URI[sha256sum] = "2c62aebb608e09f930a539f3623a5cc8023b5068029f42a208f45f9124da6e30" | 26 | SRC_URI[sha256sum] = "8737631bac3e9c7ad3e5208f9370e076c09d9c45b39980021ce54edadcc6f94f" |
| 27 | 27 | ||
| 28 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 28 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
| 29 | 29 | ||
| 30 | S = "${UNPACKDIR}/webkitgtk-${PV}" | 30 | S = "${UNPACKDIR}/webkitgtk-${PV}" |
| 31 | 31 | ||
| 32 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 32 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 33 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" | 33 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 34 | 34 | ||
| 35 | CVE_PRODUCT = "webkitgtk webkitgtk\+" | 35 | CVE_PRODUCT = "webkitgtk webkitgtk\+" |
| 36 | 36 | ||
| @@ -51,11 +51,10 @@ DEPENDS += " \ | |||
| 51 | gstreamer1.0-plugins-base \ | 51 | gstreamer1.0-plugins-base \ |
| 52 | glib-2.0-native \ | 52 | glib-2.0-native \ |
| 53 | gettext-native \ | 53 | gettext-native \ |
| 54 | libsoup \ | ||
| 55 | libepoxy \ | ||
| 54 | " | 56 | " |
| 55 | 57 | ||
| 56 | # using soup2 builds (JavaScript) API version 4.0 | ||
| 57 | # using soup3 builds (JavaScript) API version 4.1 | ||
| 58 | PACKAGECONFIG_SOUP ?= "soup3" | ||
| 59 | PACKAGECONFIG ??= " \ | 58 | PACKAGECONFIG ??= " \ |
| 60 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ | 59 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ |
| 61 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ | 60 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ |
| @@ -63,7 +62,6 @@ PACKAGECONFIG ??= " \ | |||
| 63 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ | 62 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ |
| 64 | enchant \ | 63 | enchant \ |
| 65 | libsecret \ | 64 | libsecret \ |
| 66 | ${PACKAGECONFIG_SOUP} \ | ||
| 67 | " | 65 | " |
| 68 | 66 | ||
| 69 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" | 67 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" |
| @@ -83,8 +81,6 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" | |||
| 83 | PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" | 81 | PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" |
| 84 | PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," | 82 | PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," |
| 85 | PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" | 83 | PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" |
| 86 | PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" | ||
| 87 | PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" | ||
| 88 | PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" | 84 | PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" |
| 89 | PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" | 85 | PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" |
| 90 | PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" | 86 | PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" |
| @@ -103,6 +99,7 @@ EXTRA_OECMAKE = " \ | |||
| 103 | ${@oe.utils.vartrue('DEBUG_BUILD', '-DWEBKIT_NO_INLINE_HINTS=ON', '-DWEBKIT_NO_INLINE_HINTS=OFF', d)} \ | 99 | ${@oe.utils.vartrue('DEBUG_BUILD', '-DWEBKIT_NO_INLINE_HINTS=ON', '-DWEBKIT_NO_INLINE_HINTS=OFF', d)} \ |
| 104 | -DENABLE_MINIBROWSER=ON \ | 100 | -DENABLE_MINIBROWSER=ON \ |
| 105 | -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ | 101 | -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ |
| 102 | -DUSE_SOUP2=OFF \ | ||
| 106 | " | 103 | " |
| 107 | # pass -g1 to massively reduce the size of the debug symbols (4.3GB to 700M at time of writing) | 104 | # pass -g1 to massively reduce the size of the debug symbols (4.3GB to 700M at time of writing) |
| 108 | DEBUG_LEVELFLAG = "-g1" | 105 | DEBUG_LEVELFLAG = "-g1" |
| @@ -181,3 +178,7 @@ src_package_preprocess () { | |||
| 181 | ${B}/WebKitGTK/DerivedSources/webkit/*.cpp | 178 | ${B}/WebKitGTK/DerivedSources/webkit/*.cpp |
| 182 | } | 179 | } |
| 183 | 180 | ||
| 181 | |||
| 182 | # complation fails with Clang-21 issue - https://github.com/llvm/llvm-project/issues/132322 | ||
| 183 | # Can be removed when clang is updated to v22 | ||
| 184 | TOOLCHAIN:arm = "gcc" | ||
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb index ca6ebba59c..e0888f1ff4 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb | |||
| @@ -33,7 +33,7 @@ inherit autotools-brokensep ptest pkgconfig | |||
| 33 | #CFLAGS += "-I${STAGING_INCDIR}/nss3" | 33 | #CFLAGS += "-I${STAGING_INCDIR}/nss3" |
| 34 | #CPPFLAGS += "-I${STAGING_INCDIR}/nss3" | 34 | #CPPFLAGS += "-I${STAGING_INCDIR}/nss3" |
| 35 | 35 | ||
| 36 | PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des" | 36 | PACKAGECONFIG ??= "gnutls libgcrypt nss openssl" |
| 37 | PACKAGECONFIG[gnutls] = ",,gnutls" | 37 | PACKAGECONFIG[gnutls] = ",,gnutls" |
| 38 | PACKAGECONFIG[libgcrypt] = ",,libgcrypt" | 38 | PACKAGECONFIG[libgcrypt] = ",,libgcrypt" |
| 39 | PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},--with-nss=no --with-nspr=no,nss nspr" | 39 | PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},--with-nss=no --with-nspr=no,nss nspr" |
diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.10.4.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.10.5.bb index f111c4eed9..225de422e6 100644 --- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.10.4.bb +++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.10.5.bb | |||
| @@ -12,7 +12,7 @@ REQUIRED_DISTRO_FEATURES = "x11 pam" | |||
| 12 | 12 | ||
| 13 | SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git;branch=v0.10;protocol=https;tag=v${PV}" | 13 | SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git;branch=v0.10;protocol=https;tag=v${PV}" |
| 14 | 14 | ||
| 15 | SRCREV = "2b1f913f4aa6b88d63d9ce9302c61cb0e39483f6" | 15 | SRCREV = "c2d3cbafebe00be3221f985c06ef6b97f1c63790" |
| 16 | 16 | ||
| 17 | FILES:${PN} += "${libdir}/xorg/modules/*" | 17 | FILES:${PN} += "${libdir}/xorg/modules/*" |
| 18 | FILES:${PN}-staticdev += " \ | 18 | FILES:${PN}-staticdev += " \ |
diff --git a/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch b/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch deleted file mode 100644 index c716229ab6..0000000000 --- a/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | |||
| 2 | sys/signal.h does almost the same in both glibc and musl: it includes "signal.h" | ||
| 3 | |||
| 4 | However with musl there is also a warning macro about this, which is interpreted as | ||
| 5 | an error during building. | ||
| 6 | |||
| 7 | Fixes error: | ||
| 8 | |||
| 9 | | In file included from ../../sources/xrdp-0.10.4.1/waitforx/waitforx.c:5: | ||
| 10 | | <...>/usr/include/sys/signal.h:1:2: error: #warning redirecting incorrect #include <sys/signal.h> to <signal.h> [-Werror=cpp] | ||
| 11 | | 1 | #warning redirecting incorrect #include <sys/signal.h> to <signal.h> | ||
| 12 | | | ^~~~~~~ | ||
| 13 | | cc1: all warnings being treated as errors | ||
| 14 | |||
| 15 | Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/3678] | ||
| 16 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 17 | |||
| 18 | --- ./waitforx/waitforx.c.orig 2025-11-25 14:38:46.464337398 +0100 | ||
| 19 | +++ ./waitforx/waitforx.c 2025-11-25 14:38:52.007441093 +0100 | ||
| 20 | @@ -2,7 +2,6 @@ | ||
| 21 | #include <signal.h> | ||
| 22 | #include <stdio.h> | ||
| 23 | #include <stdlib.h> | ||
| 24 | -#include <sys/signal.h> | ||
| 25 | #include <unistd.h> | ||
| 26 | |||
| 27 | #include "config_ac.h" | ||
diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.10.5.bb index 8203ada8e5..8d7c5807f2 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.10.5.bb | |||
| @@ -17,9 +17,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN | |||
| 17 | file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ | 17 | file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ |
| 18 | file://0001-mark-count-with-unused-attribute.patch \ | 18 | file://0001-mark-count-with-unused-attribute.patch \ |
| 19 | " | 19 | " |
| 20 | SRC_URI:append:libc-musl = " file://fix-compiling-with-musl.patch" | 20 | SRC_URI[sha256sum] = "9abc96d164de4b1c40e2f3f537d0593d052a640cf3388978c133715ea69fb123" |
| 21 | |||
| 22 | SRC_URI[sha256sum] = "52eadf3e86c57be0de0b9d5c184b52a7946a070746d3eb04b5089dd6d42f8f5f" | ||
| 23 | 21 | ||
| 24 | UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases" | 22 | UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases" |
| 25 | UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" | 23 | UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.9.0.bb index 09db5519ea..5233c569d2 100644 --- a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb +++ b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.9.0.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" | |||
| 8 | # yaml-cpp releases are stored as archive files in github. | 8 | # yaml-cpp releases are stored as archive files in github. |
| 9 | # download the exact revision of release | 9 | # download the exact revision of release |
| 10 | SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" | 10 | SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" |
| 11 | SRCREV = "28f93bdec6387d42332220afa9558060c8016795" | 11 | SRCREV = "56e3bb550c91fd7005566f19c079cb7a503223cf" |
| 12 | PV .= "+git" | 12 | PV .= "+git" |
| 13 | 13 | ||
| 14 | 14 | ||
diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.5.2.bb b/meta-oe/recipes-support/zchunk/zchunk_1.5.3.bb index bbdd06dfda..fc5a55d192 100644 --- a/meta-oe/recipes-support/zchunk/zchunk_1.5.2.bb +++ b/meta-oe/recipes-support/zchunk/zchunk_1.5.3.bb | |||
| @@ -3,9 +3,9 @@ DESCRIPTION = "A file format designed for highly efficient deltas while maintain | |||
| 3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" |
| 5 | 5 | ||
| 6 | SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" | 6 | SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;nobranch=1;tag=${PV}" |
| 7 | 7 | ||
| 8 | SRCREV = "222d1a4da3661dd95c2445b96f7e1e208f55d219" | 8 | SRCREV = "366cf22e725fc273abe0e082c707753cce76c453" |
| 9 | 9 | ||
| 10 | DEPENDS = "zstd" | 10 | DEPENDS = "zstd" |
| 11 | DEPENDS:append:libc-musl = " argp-standalone" | 11 | DEPENDS:append:libc-musl = " argp-standalone" |
diff --git a/meta-oe/recipes-test/catch2/catch2_3.8.1.bb b/meta-oe/recipes-test/catch2/catch2_3.13.0.bb index 48ed26708c..c5d85ba302 100644 --- a/meta-oe/recipes-test/catch2/catch2_3.8.1.bb +++ b/meta-oe/recipes-test/catch2/catch2_3.13.0.bb | |||
| @@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2" | |||
| 4 | LICENSE = "BSL-1.0" | 4 | LICENSE = "BSL-1.0" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https" | 7 | SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https;tag=v${PV}" |
| 8 | SRCREV = "2b60af89e23d28eefc081bc930831ee9d45ea58b" | 8 | SRCREV = "29c9844f688acb27c87338c39cd186ebfe41aa19" |
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | inherit cmake python3native | 11 | inherit cmake python3native |
diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb b/meta-oe/recipes-test/cmocka/cmocka_1.1.8.bb index 09afe36666..f7e8b96ffb 100644 --- a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb +++ b/meta-oe/recipes-test/cmocka/cmocka_1.1.8.bb | |||
| @@ -6,14 +6,11 @@ HOMEPAGE = "https://cmocka.org/" | |||
| 6 | LICENSE = "Apache-2.0" | 6 | LICENSE = "Apache-2.0" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 8 | 8 | ||
| 9 | SRCREV = "a01cc69ee9536f90e57c61a198f2d1944d3d4313" | 9 | SRCREV = "eba4d6ffca53b500ab8dfabc30256bb6c3088b2b" |
| 10 | PV .= "+git" | 10 | SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-1.1;tag=cmocka-${PV} \ |
| 11 | SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-1.1 \ | ||
| 12 | file://0001-include-Check-for-previous-declaration-of-uintptr_t.patch \ | ||
| 13 | file://run-ptest \ | 11 | file://run-ptest \ |
| 14 | " | 12 | " |
| 15 | 13 | ||
| 16 | |||
| 17 | inherit cmake ptest | 14 | inherit cmake ptest |
| 18 | 15 | ||
| 19 | EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}" | 16 | EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}" |
diff --git a/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch b/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch deleted file mode 100644 index 65d30ea993..0000000000 --- a/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From a54e035f802e79e3292d8ad39a14bd7c060eb7b1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Breno Leitao <breno.leitao@gmail.com> | ||
| 3 | Date: Tue, 21 Mar 2023 21:58:28 -0700 | ||
| 4 | Subject: [PATCH] include: Check for previous declaration of uintptr_t | ||
| 5 | |||
| 6 | Adding a extra check before declaring uintptr_t. Currently musl uses | ||
| 7 | macro __DEFINED_uintptr_t once it defines uintptr_t type. Checking | ||
| 8 | this macro before defining it, and, defining it when uintptr_t is | ||
| 9 | defined. | ||
| 10 | |||
| 11 | Taken from Alpine | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | Signed-off-by: Breno Leitao <breno.leitao@gmail.com> | ||
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 16 | --- | ||
| 17 | include/cmocka.h | 3 ++- | ||
| 18 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/include/cmocka.h b/include/cmocka.h | ||
| 21 | index a21d965..f540793 100644 | ||
| 22 | --- a/include/cmocka.h | ||
| 23 | +++ b/include/cmocka.h | ||
| 24 | @@ -121,7 +121,7 @@ typedef uintmax_t LargestIntegralType; | ||
| 25 | ((LargestIntegralType)(value)) | ||
| 26 | |||
| 27 | /* Smallest integral type capable of holding a pointer. */ | ||
| 28 | -#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T) | ||
| 29 | +#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T) && !defined(__DEFINED_uintptr_t) | ||
| 30 | # if defined(_WIN32) | ||
| 31 | /* WIN32 is an ILP32 platform */ | ||
| 32 | typedef unsigned int uintptr_t; | ||
| 33 | @@ -147,6 +147,7 @@ typedef uintmax_t LargestIntegralType; | ||
| 34 | |||
| 35 | # define _UINTPTR_T | ||
| 36 | # define _UINTPTR_T_DEFINED | ||
| 37 | +# define __DEFINED_uintptr_t | ||
| 38 | #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ | ||
| 39 | |||
| 40 | /* Perform an unsigned cast to uintptr_t. */ | ||
| 41 | -- | ||
| 42 | 2.40.0 | ||
| 43 | |||
diff --git a/meta-oe/recipes-test/libfaketime/libfaketime/0001-Add-const-qualifiers-to-fix-build-with-ISO-C23.patch b/meta-oe/recipes-test/libfaketime/libfaketime/0001-Add-const-qualifiers-to-fix-build-with-ISO-C23.patch new file mode 100644 index 0000000000..1696e7146e --- /dev/null +++ b/meta-oe/recipes-test/libfaketime/libfaketime/0001-Add-const-qualifiers-to-fix-build-with-ISO-C23.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From dbe865dfdba0145d993d70b7fd4ec88b2f47554b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tomas Korbar <tkorbar@redhat.com> | ||
| 3 | Date: Mon, 15 Dec 2025 11:03:21 +0100 | ||
| 4 | Subject: [PATCH] Add const qualifiers to fix build with ISO C23 | ||
| 5 | |||
| 6 | Fix https://github.com/wolfcw/libfaketime/issues/524 | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://github.com/wolfcw/libfaketime/pull/525] | ||
| 9 | --- | ||
| 10 | src/libfaketime.c | 4 ++-- | ||
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/src/libfaketime.c b/src/libfaketime.c | ||
| 14 | index ef1dca9..02839c8 100644 | ||
| 15 | --- a/src/libfaketime.c | ||
| 16 | +++ b/src/libfaketime.c | ||
| 17 | @@ -2666,7 +2666,7 @@ int timespec_get(struct timespec *ts, int base) | ||
| 18 | static void parse_ft_string(const char *user_faked_time) | ||
| 19 | { | ||
| 20 | struct tm user_faked_time_tm; | ||
| 21 | - char * tmp_time_fmt; | ||
| 22 | + const char * tmp_time_fmt; | ||
| 23 | char * nstime_str; | ||
| 24 | |||
| 25 | if (!strncmp(user_faked_time, user_faked_time_saved, BUFFERLEN)) | ||
| 26 | @@ -3338,7 +3338,7 @@ static void prepare_config_contents(char *contents) | ||
| 27 | bool str_array_contains(const char *haystack, const char *needle) | ||
| 28 | { | ||
| 29 | size_t needle_len = strlen(needle); | ||
| 30 | - char *pos = strstr(haystack, needle); | ||
| 31 | + const char *pos = strstr(haystack, needle); | ||
| 32 | while (pos) { | ||
| 33 | if (pos == haystack || *(pos - 1) == ',') { | ||
| 34 | char nextc = *(pos + needle_len); | ||
diff --git a/meta-oe/recipes-test/libfaketime/libfaketime/0001-Makefile-Detect-compiler-in-makefile.patch b/meta-oe/recipes-test/libfaketime/libfaketime/0001-Makefile-Detect-compiler-in-makefile.patch deleted file mode 100644 index ff04837652..0000000000 --- a/meta-oe/recipes-test/libfaketime/libfaketime/0001-Makefile-Detect-compiler-in-makefile.patch +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | From 735bb5d053efad274aa4ea5a6682e656ff792909 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 24 Aug 2023 01:49:48 -0700 | ||
| 4 | Subject: [PATCH] Makefile: Detect compiler in makefile | ||
| 5 | |||
| 6 | Add compiler specific options based on detected compiler gcc/clang | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | src/Makefile | 18 +++++++++++++++++- | ||
| 12 | 1 file changed, 17 insertions(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/src/Makefile b/src/Makefile | ||
| 15 | index 62e924c..c15eb33 100644 | ||
| 16 | --- a/src/Makefile | ||
| 17 | +++ b/src/Makefile | ||
| 18 | @@ -110,7 +110,23 @@ PREFIX ?= /usr/local | ||
| 19 | LIBDIRNAME ?= /lib/faketime | ||
| 20 | PLATFORM ?=$(shell uname) | ||
| 21 | |||
| 22 | -CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) | ||
| 23 | +ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1) | ||
| 24 | +COMPILER := clang | ||
| 25 | +else | ||
| 26 | +COMPILER := gcc | ||
| 27 | +endif | ||
| 28 | +export COMPILER | ||
| 29 | + | ||
| 30 | +CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) | ||
| 31 | + | ||
| 32 | +ifeq ($(COMPILER),clang) | ||
| 33 | +CFLAGS += -Wno-tautological-pointer-compare | ||
| 34 | +endif | ||
| 35 | + | ||
| 36 | +ifeq ($(COMPILER),gcc) | ||
| 37 | +CFLAGS += -Wno-nonnull-compare | ||
| 38 | +endif | ||
| 39 | + | ||
| 40 | ifeq ($(PLATFORM),SunOS) | ||
| 41 | CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 | ||
| 42 | endif | ||
| 43 | -- | ||
| 44 | 2.42.0 | ||
| 45 | |||
diff --git a/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb b/meta-oe/recipes-test/libfaketime/libfaketime_0.9.11.bb index 3588e96847..55a4cabe81 100644 --- a/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb +++ b/meta-oe/recipes-test/libfaketime/libfaketime_0.9.11.bb | |||
| @@ -3,19 +3,20 @@ SECTION = "libs" | |||
| 3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 5 | 5 | ||
| 6 | SRCREV = "d475b925943ad404c6c728ac868dc73949e7281c" | 6 | SRCREV = "6714b98794a9e8a413bf90d2927abf5d888ada99" |
| 7 | |||
| 8 | SRC_URI = "git://github.com/wolfcw/libfaketime.git;branch=master;protocol=https \ | ||
| 9 | file://0001-Makefile-Detect-compiler-in-makefile.patch \ | ||
| 10 | " | ||
| 11 | 7 | ||
| 8 | SRC_URI = "git://github.com/wolfcw/libfaketime.git;branch=master;tag=v${PV};protocol=https \ | ||
| 9 | file://0001-Add-const-qualifiers-to-fix-build-with-ISO-C23.patch \ | ||
| 10 | " | ||
| 12 | 11 | ||
| 13 | CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" | 12 | CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" |
| 14 | 13 | ||
| 15 | do_configure[noexec] = "1" | 14 | do_configure[noexec] = "1" |
| 15 | |||
| 16 | do_compile () { | 16 | do_compile () { |
| 17 | oe_runmake | 17 | oe_runmake |
| 18 | } | 18 | } |
| 19 | |||
| 19 | do_install () { | 20 | do_install () { |
| 20 | install -d ${D}${libdir}/faketime | 21 | install -d ${D}${libdir}/faketime |
| 21 | oe_libinstall -C src libfaketime ${D}${libdir}/faketime | 22 | oe_libinstall -C src libfaketime ${D}${libdir}/faketime |
diff --git a/meta-perl/README.md b/meta-perl/README.md index 13014b0ff3..9d56dbe8c6 100644 --- a/meta-perl/README.md +++ b/meta-perl/README.md | |||
| @@ -75,7 +75,7 @@ Maintenance | |||
| 75 | Send patches / pull requests to openembedded-devel@lists.openembedded.org with | 75 | Send patches / pull requests to openembedded-devel@lists.openembedded.org with |
| 76 | '[meta-perl]' in the subject. | 76 | '[meta-perl]' in the subject. |
| 77 | 77 | ||
| 78 | When sending single patches, please using something like: | 78 | When sending single patches, please use something like: |
| 79 | git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][PATCH' | 79 | git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][PATCH' |
| 80 | 80 | ||
| 81 | Layer maintainers: | 81 | Layer maintainers: |
diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf index 7ae1a39fcd..41ff0fefc2 100644 --- a/meta-perl/conf/layer.conf +++ b/meta-perl/conf/layer.conf | |||
| @@ -15,7 +15,7 @@ LAYERVERSION_perl-layer = "1" | |||
| 15 | 15 | ||
| 16 | LAYERDEPENDS_perl-layer = "core openembedded-layer" | 16 | LAYERDEPENDS_perl-layer = "core openembedded-layer" |
| 17 | 17 | ||
| 18 | LAYERSERIES_COMPAT_perl-layer = "walnascar whinlatter" | 18 | LAYERSERIES_COMPAT_perl-layer = "whinlatter wrynose" |
| 19 | 19 | ||
| 20 | # List of known non-reproducible package of the meta-perl layer | 20 | # List of known non-reproducible package of the meta-perl layer |
| 21 | # Please keep this list sorted | 21 | # Please keep this list sorted |
diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.214.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.218.bb index b0feb40b71..9b2a5a689b 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.214.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.218.bb | |||
| @@ -5,11 +5,11 @@ HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Bzip2" | |||
| 5 | SECTION = "libs" | 5 | SECTION = "libs" |
| 6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
| 7 | 7 | ||
| 8 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=d9968e06481ca195215d0f29ba557f98" | 8 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=7b6eb3b7380815648e5067943ed15621" |
| 9 | 9 | ||
| 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-${PV}.tar.gz" | 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-${PV}.tar.gz" |
| 11 | 11 | ||
| 12 | SRC_URI[sha256sum] = "b0810a4d6e1a402892840564e6589e6ecd39cb87561bc556f171b78e900079cb" | 12 | SRC_URI[sha256sum] = "89153e6a2ebda52349493b074fa4b7549ff1f9053de7613c18a5e05c5b415fa8" |
| 13 | 13 | ||
| 14 | DEPENDS += "bzip2" | 14 | DEPENDS += "bzip2" |
| 15 | 15 | ||
diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.214.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.221.bb index d0b8de0455..c772885931 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.214.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.221.bb | |||
| @@ -5,11 +5,11 @@ HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Lzma" | |||
| 5 | SECTION = "libs" | 5 | SECTION = "libs" |
| 6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
| 7 | 7 | ||
| 8 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=db84d74e3df088dfbcfd6b30da2749c8" | 8 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=dcf5ec9168367166aaeabb92ee5754e1" |
| 9 | 9 | ||
| 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Lzma-${PV}.tar.gz" | 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Lzma-${PV}.tar.gz" |
| 11 | 11 | ||
| 12 | SRC_URI[sha256sum] = "1dcc4448969acad4550376476e3fcd2ed96bfaaae7d9622958fd8f9a1ab4c87d" | 12 | SRC_URI[sha256sum] = "e8b2d17c7f29b3e4f286cc3d3f5353df8e811615c42298eedad7cdbfec4aed7f" |
| 13 | 13 | ||
| 14 | DEPENDS += "xz" | 14 | DEPENDS += "xz" |
| 15 | 15 | ||
diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.214.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.222.bb index b4de5d499a..7b5dbd5475 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.214.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.222.bb | |||
| @@ -6,11 +6,11 @@ HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Zlib" | |||
| 6 | SECTION = "libs" | 6 | SECTION = "libs" |
| 7 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 7 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
| 8 | 8 | ||
| 9 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=17;md5=a57e80ea8cb4e0305995c08035c77138" | 9 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=17;md5=ef65cee670356670f1663558bb46f16e" |
| 10 | 10 | ||
| 11 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Zlib-${PV}.tar.gz" | 11 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Zlib-${PV}.tar.gz" |
| 12 | 12 | ||
| 13 | SRC_URI[sha256sum] = "5eea0c05c7b01dc93b620f04c89176eefb5002586ca0bebae3b8c2e70920e62e" | 13 | SRC_URI[sha256sum] = "1dfd7d511a655627c81815d30d3babc28fa5b88455ff03f8b04099dcb51286b8" |
| 14 | 14 | ||
| 15 | DEPENDS += "zlib" | 15 | DEPENDS += "zlib" |
| 16 | 16 | ||
diff --git a/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb b/meta-perl/recipes-perl/libcurses/libcurses-perl_1.46.bb index e6fc3c8300..18f62cefb2 100644 --- a/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb +++ b/meta-perl/recipes-perl/libcurses/libcurses-perl_1.46.bb | |||
| @@ -13,7 +13,7 @@ SRC_URI = "${CPAN_MIRROR}/authors/id/G/GI/GIRAFFED/Curses-${PV}.tar.gz \ | |||
| 13 | file://0001-testtyp.c-Use-proper-prototype-for-main-function.patch \ | 13 | file://0001-testtyp.c-Use-proper-prototype-for-main-function.patch \ |
| 14 | " | 14 | " |
| 15 | 15 | ||
| 16 | SRC_URI[sha256sum] = "84221e0013a2d64a0bae6a32bb44b1ae5734d2cb0465fb89af3e3abd6e05aeb2" | 16 | SRC_URI[sha256sum] = "9631d6e3e2859c85913d8b8724f61fbebb9e932e9e50aa0493a4e0276660a3f9" |
| 17 | 17 | ||
| 18 | S = "${UNPACKDIR}/Curses-${PV}" | 18 | S = "${UNPACKDIR}/Curses-${PV}" |
| 19 | 19 | ||
diff --git a/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.214.bb b/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.217.bb index 93ff89c18a..aab29ad57c 100644 --- a/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.214.bb +++ b/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.217.bb | |||
| @@ -5,11 +5,11 @@ HOMEPAGE = "https://metacpan.org/release/IO-Compress-Lzma" | |||
| 5 | SECTION = "libs" | 5 | SECTION = "libs" |
| 6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
| 7 | 7 | ||
| 8 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=db84d74e3df088dfbcfd6b30da2749c8" | 8 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=dcf5ec9168367166aaeabb92ee5754e1" |
| 9 | 9 | ||
| 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-Lzma-${PV}.tar.gz" | 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-Lzma-${PV}.tar.gz" |
| 11 | 11 | ||
| 12 | SRC_URI[sha256sum] = "f4ee89f3af99e59ad0742fd7b6358f9159ef513f1f6943d7140fb1bfa550dd38" | 12 | SRC_URI[sha256sum] = "3462ecd1e67e85d5e4fa911bc6d8e38a884ba1d6e90a03535f0d28fe2ad0aacf" |
| 13 | 13 | ||
| 14 | S = "${UNPACKDIR}/IO-Compress-Lzma-${PV}" | 14 | S = "${UNPACKDIR}/IO-Compress-Lzma-${PV}" |
| 15 | 15 | ||
diff --git a/meta-perl/recipes-perl/libio/libio-compress-perl_2.214.bb b/meta-perl/recipes-perl/libio/libio-compress-perl_2.218.bb index bb49841422..027788ce69 100644 --- a/meta-perl/recipes-perl/libio/libio-compress-perl_2.214.bb +++ b/meta-perl/recipes-perl/libio/libio-compress-perl_2.218.bb | |||
| @@ -14,11 +14,11 @@ HOMEPAGE = "https://metacpan.org/release/IO-Compress" | |||
| 14 | SECTION = "libs" | 14 | SECTION = "libs" |
| 15 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 15 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
| 16 | 16 | ||
| 17 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=6af707e7b2ec1d8f995b973c427fb244" | 17 | LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=a05fdd79b87a410b6178b73126ffafdd" |
| 18 | 18 | ||
| 19 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-${PV}.tar.gz" | 19 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-${PV}.tar.gz" |
| 20 | 20 | ||
| 21 | SRC_URI[sha256sum] = "0cfbc4b4ac9b28f7cbf22f114e09c9a49ace9e0b6c3778432afa2cde55512d69" | 21 | SRC_URI[sha256sum] = "596bd413513b5151af645eef1a718470e0ac9c2233135a0428eb1ffc2995d95f" |
| 22 | 22 | ||
| 23 | S = "${UNPACKDIR}/IO-Compress-${PV}" | 23 | S = "${UNPACKDIR}/IO-Compress-${PV}" |
| 24 | 24 | ||
diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc index 15172e7f22..6dd53e8a8a 100644 --- a/meta-python/conf/include/ptest-packagelists-meta-python.inc +++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc | |||
| @@ -60,6 +60,7 @@ PTESTS_FAST_META_PYTHON = "\ | |||
| 60 | python3-parse \ | 60 | python3-parse \ |
| 61 | python3-parse-type \ | 61 | python3-parse-type \ |
| 62 | python3-parsimonious \ | 62 | python3-parsimonious \ |
| 63 | python3-pendulum \ | ||
| 63 | python3-platformdirs \ | 64 | python3-platformdirs \ |
| 64 | python3-polyline \ | 65 | python3-polyline \ |
| 65 | python3-portalocker \ | 66 | python3-portalocker \ |
| @@ -80,6 +81,7 @@ PTESTS_FAST_META_PYTHON = "\ | |||
| 80 | python3-pyasyncore \ | 81 | python3-pyasyncore \ |
| 81 | python3-pyroute2 \ | 82 | python3-pyroute2 \ |
| 82 | python3-pyserial \ | 83 | python3-pyserial \ |
| 84 | python3-pytest-env \ | ||
| 83 | python3-pytest-httpx \ | 85 | python3-pytest-httpx \ |
| 84 | python3-pytest-mock \ | 86 | python3-pytest-mock \ |
| 85 | python3-pytest-picked \ | 87 | python3-pytest-picked \ |
| @@ -105,6 +107,8 @@ PTESTS_FAST_META_PYTHON = "\ | |||
| 105 | python3-starlette \ | 107 | python3-starlette \ |
| 106 | python3-tblib \ | 108 | python3-tblib \ |
| 107 | python3-tenacity \ | 109 | python3-tenacity \ |
| 110 | python3-time-machine \ | ||
| 111 | python3-tokenize-rt \ | ||
| 108 | python3-tomli-w \ | 112 | python3-tomli-w \ |
| 109 | python3-tomlkit \ | 113 | python3-tomlkit \ |
| 110 | python3-trustme \ | 114 | python3-trustme \ |
| @@ -130,10 +134,12 @@ PTESTS_SLOW_META_PYTHON = "\ | |||
| 130 | python3-arrow \ | 134 | python3-arrow \ |
| 131 | python3-django \ | 135 | python3-django \ |
| 132 | python3-ecdsa \ | 136 | python3-ecdsa \ |
| 137 | python3-faker \ | ||
| 133 | python3-fastapi \ | 138 | python3-fastapi \ |
| 134 | python3-google-auth \ | 139 | python3-google-auth \ |
| 135 | python3-lz4 \ | 140 | python3-lz4 \ |
| 136 | python3-marshmallow \ | 141 | python3-marshmallow \ |
| 142 | python3-orjson \ | ||
| 137 | python3-pillow \ | 143 | python3-pillow \ |
| 138 | python3-pint \ | 144 | python3-pint \ |
| 139 | python3-pykickstart \ | 145 | python3-pykickstart \ |
diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf index 202c66561f..ea51fa93ad 100644 --- a/meta-python/conf/layer.conf +++ b/meta-python/conf/layer.conf | |||
| @@ -14,7 +14,7 @@ LAYERVERSION_meta-python = "1" | |||
| 14 | 14 | ||
| 15 | LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer" | 15 | LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer" |
| 16 | 16 | ||
| 17 | LAYERSERIES_COMPAT_meta-python = "walnascar whinlatter" | 17 | LAYERSERIES_COMPAT_meta-python = "whinlatter wrynose" |
| 18 | 18 | ||
| 19 | LICENSE_PATH += "${LAYERDIR}/licenses" | 19 | LICENSE_PATH += "${LAYERDIR}/licenses" |
| 20 | 20 | ||
diff --git a/meta-python/recipes-devtools/hotdoc/hotdoc/0001-c_comment_scanner-fix-function-prototypes.patch b/meta-python/recipes-devtools/hotdoc/hotdoc/0001-c_comment_scanner-fix-function-prototypes.patch new file mode 100644 index 0000000000..c26dde93b3 --- /dev/null +++ b/meta-python/recipes-devtools/hotdoc/hotdoc/0001-c_comment_scanner-fix-function-prototypes.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | Subject: [PATCH 1/2] c_comment_scanner: fix function prototypes | ||
| 2 | |||
| 3 | scanner.l: Fix compile error as the following: | ||
| 4 | |||
| 5 | python3-hotdoc/0.17.4/sources/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l:126:1: error: conflicting types for 'parse_comment'; have 'int(PyObject *)' {aka 'int(struct _object *)'} | ||
| 6 | | 126 | parse_comment (PyObject *comments) | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://github.com/hotdoc/hotdoc/commit/adf8518431fafb78c9b47862a0a9a58824b6a421] | ||
| 9 | |||
| 10 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 11 | --- | ||
| 12 | hotdoc/parsers/c_comment_scanner/scanner.l | 4 ++-- | ||
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/hotdoc/parsers/c_comment_scanner/scanner.l b/hotdoc/parsers/c_comment_scanner/scanner.l | ||
| 16 | index 0408601..7bccd64 100644 | ||
| 17 | --- a/hotdoc/parsers/c_comment_scanner/scanner.l | ||
| 18 | +++ b/hotdoc/parsers/c_comment_scanner/scanner.l | ||
| 19 | @@ -34,8 +34,8 @@ | ||
| 20 | extern int yylex (PyObject *comments); | ||
| 21 | #define YY_DECL int yylex (PyObject *comments) | ||
| 22 | static int yywrap (void); | ||
| 23 | -static int parse_comment (); | ||
| 24 | -static int parse_define (); | ||
| 25 | +static int parse_comment (PyObject *); | ||
| 26 | +static int parse_define (PyObject *); | ||
| 27 | %} | ||
| 28 | |||
| 29 | %option nounput | ||
| 30 | -- | ||
| 31 | 2.43.0 | ||
| 32 | |||
diff --git a/meta-python/recipes-devtools/hotdoc/hotdoc/0002-avoid-third-party-backports-dependency-on-sufficient.patch b/meta-python/recipes-devtools/hotdoc/hotdoc/0002-avoid-third-party-backports-dependency-on-sufficient.patch new file mode 100644 index 0000000000..560d1257f0 --- /dev/null +++ b/meta-python/recipes-devtools/hotdoc/hotdoc/0002-avoid-third-party-backports-dependency-on-sufficient.patch | |||
| @@ -0,0 +1,72 @@ | |||
| 1 | Subject: [PATCH 2/2] avoid third-party backports dependency on sufficiently | ||
| 2 | new python | ||
| 3 | |||
| 4 | `backports.entry_points_selectable` backports functionality from python | ||
| 5 | 3.10 to older versions of python. | ||
| 6 | |||
| 7 | Backport this patch to solve runtime backports import problem as following: | ||
| 8 | File "/usr/lib/python3.14/site-packages/hotdoc/utils/utils.py", line 38, in <module> | ||
| 9 | from backports.entry_points_selectable import entry_points | ||
| 10 | ModuleNotFoundError: No module named 'backports' | ||
| 11 | |||
| 12 | Upstream-Status: Backport [https://github.com/hotdoc/hotdoc/commit/51043c3ef889e36c8232280581598b875073ded7] | ||
| 13 | |||
| 14 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 15 | --- | ||
| 16 | hotdoc/extensions/gi/utils.py | 6 +++++- | ||
| 17 | hotdoc/utils/utils.py | 6 +++++- | ||
| 18 | setup.py | 2 +- | ||
| 19 | 3 files changed, 11 insertions(+), 3 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/hotdoc/extensions/gi/utils.py b/hotdoc/extensions/gi/utils.py | ||
| 22 | index 159c2b6..91902cb 100644 | ||
| 23 | --- a/hotdoc/extensions/gi/utils.py | ||
| 24 | +++ b/hotdoc/extensions/gi/utils.py | ||
| 25 | @@ -1,9 +1,13 @@ | ||
| 26 | import os | ||
| 27 | from collections import namedtuple | ||
| 28 | import pathlib | ||
| 29 | +import sys | ||
| 30 | import traceback | ||
| 31 | |||
| 32 | -from backports.entry_points_selectable import entry_points | ||
| 33 | +if sys.version_info >= (3, 10): | ||
| 34 | + from importlib.metadata import entry_points | ||
| 35 | +else: | ||
| 36 | + from backports.entry_points_selectable import entry_points | ||
| 37 | |||
| 38 | from hotdoc.core.links import Link | ||
| 39 | from hotdoc.utils.loggable import info, debug | ||
| 40 | diff --git a/hotdoc/utils/utils.py b/hotdoc/utils/utils.py | ||
| 41 | index 518d308..aef657a 100644 | ||
| 42 | --- a/hotdoc/utils/utils.py | ||
| 43 | +++ b/hotdoc/utils/utils.py | ||
| 44 | @@ -35,7 +35,11 @@ import importlib.util | ||
| 45 | from urllib.request import urlretrieve | ||
| 46 | from pathlib import Path | ||
| 47 | |||
| 48 | -from backports.entry_points_selectable import entry_points | ||
| 49 | +if sys.version_info >= (3, 10): | ||
| 50 | + from importlib.metadata import entry_points | ||
| 51 | +else: | ||
| 52 | + from backports.entry_points_selectable import entry_points | ||
| 53 | + | ||
| 54 | try: | ||
| 55 | import importlib.metadata as meta | ||
| 56 | except ImportError: | ||
| 57 | diff --git a/setup.py b/setup.py | ||
| 58 | index 5d7f131..9ee504d 100644 | ||
| 59 | --- a/setup.py | ||
| 60 | +++ b/setup.py | ||
| 61 | @@ -300,7 +300,7 @@ INSTALL_REQUIRES = [ | ||
| 62 | 'wheezy.template', | ||
| 63 | 'toposort>=1.4', | ||
| 64 | 'importlib_metadata; python_version<"3.10"', | ||
| 65 | - 'backports.entry_points_selectable', | ||
| 66 | + 'backports.entry_points_selectable; python_version<"3.10"', | ||
| 67 | ] | ||
| 68 | |||
| 69 | # dbus-deviation requires sphinx, which requires python 3.5 | ||
| 70 | -- | ||
| 71 | 2.43.0 | ||
| 72 | |||
diff --git a/meta-python/recipes-devtools/hotdoc/hotdoc/0003-CMake-4-compatibility.patch b/meta-python/recipes-devtools/hotdoc/hotdoc/0003-CMake-4-compatibility.patch new file mode 100644 index 0000000000..056ad5d340 --- /dev/null +++ b/meta-python/recipes-devtools/hotdoc/hotdoc/0003-CMake-4-compatibility.patch | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | Subject: [PATCH] CMake 4 compatibility | ||
| 2 | |||
| 3 | All CMake versions older than 3.10 are deprecated. | ||
| 4 | |||
| 5 | Upstream-Status: Backport [https://github.com/MathieuDuponchelle/cmark/commit/bd78193dbff98c3860e77629b5c7bfee6169d1da] | ||
| 6 | |||
| 7 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 8 | --- | ||
| 9 | CMakeLists.txt | 11 ++--------- | ||
| 10 | extensions/CMakeLists.txt | 2 +- | ||
| 11 | 2 files changed, 3 insertions(+), 10 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 14 | index ff97419..45fdf6c 100755 | ||
| 15 | --- a/CMakeLists.txt | ||
| 16 | +++ b/CMakeLists.txt | ||
| 17 | @@ -1,12 +1,5 @@ | ||
| 18 | -cmake_minimum_required(VERSION 2.8.9) | ||
| 19 | - | ||
| 20 | -# prevent ugly developer warnings because version is set directly, not through project() | ||
| 21 | -# it should be redone properly by using VERSION in project() if on CMake 3.x | ||
| 22 | -if(CMAKE_MAJOR_VERSION GREATER 2) | ||
| 23 | - cmake_policy(SET CMP0048 OLD) | ||
| 24 | -endif() | ||
| 25 | - | ||
| 26 | -project(cmark) | ||
| 27 | +cmake_minimum_required(VERSION 3.10) | ||
| 28 | +project(cmark VERSION 0.28.3) | ||
| 29 | |||
| 30 | include("FindAsan.cmake") | ||
| 31 | |||
| 32 | diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt | ||
| 33 | index e62d155..b6a1556 100644 | ||
| 34 | --- a/extensions/CMakeLists.txt | ||
| 35 | +++ b/extensions/CMakeLists.txt | ||
| 36 | @@ -1,4 +1,4 @@ | ||
| 37 | -cmake_minimum_required(VERSION 2.8) | ||
| 38 | +cmake_minimum_required(VERSION 3.10) | ||
| 39 | set(LIBRARY "cmarkextensions") | ||
| 40 | set(LIBRARY_SOURCES | ||
| 41 | core-extensions.c | ||
| 42 | -- | ||
| 43 | 2.43.0 | ||
| 44 | |||
diff --git a/meta-python/recipes-devtools/hotdoc/hotdoc/0004-Use-flex-with-noline-option-to-prevent.patch b/meta-python/recipes-devtools/hotdoc/hotdoc/0004-Use-flex-with-noline-option-to-prevent.patch new file mode 100644 index 0000000000..06adcbd1c2 --- /dev/null +++ b/meta-python/recipes-devtools/hotdoc/hotdoc/0004-Use-flex-with-noline-option-to-prevent.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | Subject: [PATCH] Use flex with --noline option to prevent adding #line to c file | ||
| 2 | |||
| 3 | To fix following do_package QA Issue: | ||
| 4 | |||
| 5 | do_package_qa:QA Issue: File /usr/src/debug/hotdoc/0.17.4/hotdoc/parsers/c_comment_scanner/scanner.c in package hotdoc-src contains reference to TMPDIR [buildpaths] | ||
| 6 | |||
| 7 | Upstream-Status: Inappropriate [oe-specific] | ||
| 8 | |||
| 9 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 10 | --- | ||
| 11 | setup.py | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/setup.py b/setup.py | ||
| 15 | index 9ee504d..9bbc744 100644 | ||
| 16 | --- a/setup.py | ||
| 17 | +++ b/setup.py | ||
| 18 | @@ -365,7 +365,7 @@ class FlexExtension (Extension): | ||
| 19 | |||
| 20 | self.sources.append(built_scanner_path) | ||
| 21 | if newer_group(self.__flex_sources, built_scanner_path): | ||
| 22 | - cmd = ['flex', '-o', built_scanner_path] | ||
| 23 | + cmd = ['flex', '--noline', '-o', built_scanner_path] | ||
| 24 | for s in self.__flex_sources: | ||
| 25 | cmd.append(s) | ||
| 26 | spawn.spawn(cmd, verbose=1) | ||
| 27 | -- | ||
| 28 | 2.43.0 | ||
| 29 | |||
diff --git a/meta-python/recipes-devtools/hotdoc/hotdoc_0.17.4.bb b/meta-python/recipes-devtools/hotdoc/hotdoc_0.17.4.bb new file mode 100644 index 0000000000..081a8d9607 --- /dev/null +++ b/meta-python/recipes-devtools/hotdoc/hotdoc_0.17.4.bb | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | SUMMARY = "Hotdoc is a documentation framework" | ||
| 2 | DESCRIPTION = "Hotdoc is a documentation micro-framework. It provides an interface for extensions to plug upon, along with some base objects (formatters, ...)" | ||
| 3 | HOMEPAGE = "https://github.com/hotdoc/hotdoc" | ||
| 4 | |||
| 5 | LICENSE = "LGPL-2.1-or-later" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=90263a49bc1d9a204656fec4d5616c66" | ||
| 7 | |||
| 8 | SRC_URI[sha256sum] = "c4d5dff647f03aa87a1d2d06035d2819edd099b91635e3b2ee390829357ae9fc" | ||
| 9 | |||
| 10 | SRC_URI = "file://0001-c_comment_scanner-fix-function-prototypes.patch \ | ||
| 11 | file://0002-avoid-third-party-backports-dependency-on-sufficient.patch \ | ||
| 12 | file://0003-CMake-4-compatibility.patch;patchdir=cmark \ | ||
| 13 | " | ||
| 14 | |||
| 15 | SRC_URI:append:class-target = "file://0004-Use-flex-with-noline-option-to-prevent.patch" | ||
| 16 | |||
| 17 | DEPENDS += "libxml2 glib-2.0 json-glib" | ||
| 18 | |||
| 19 | inherit pypi python_setuptools_build_meta pkgconfig | ||
| 20 | |||
| 21 | #Fix LIBDIR path to fix buildpaths QA check of hotdoc/parsers/cmark.cpython-314-x86_64-linux-gnu.so | ||
| 22 | do_configure:prepend:class-target() { | ||
| 23 | sed -i -e "s#'\"%s\"' % CMARK_BUILD_DIR#'\"${PYTHON_SITEPACKAGES_DIR}/${PN}\"'#" ${S}/setup.py | ||
| 24 | } | ||
| 25 | |||
| 26 | RDEPENDS:${PN} += "clang python3-appdirs python3-cchardet python3-dbus-deviation python3-lxml python3-networkx python3-pkgconfig python3-pyyaml python3-schema python3-toposort python3-wheezy-template" | ||
| 27 | |||
| 28 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/files/0001-remove-pkg_resources-import.patch b/meta-python/recipes-devtools/python/files/0001-remove-pkg_resources-import.patch new file mode 100644 index 0000000000..6278d58fc1 --- /dev/null +++ b/meta-python/recipes-devtools/python/files/0001-remove-pkg_resources-import.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From d9152f0dc31b655654edcee6859b3e3a06ef4c98 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sun, 15 Mar 2026 21:16:54 +0100 | ||
| 4 | Subject: [PATCH] remove pkg_resources import | ||
| 5 | |||
| 6 | setutools 82 dropped pkf_resources module. Also, beside importing | ||
| 7 | it, it isn't used for anything. | ||
| 8 | |||
| 9 | Upstream has started to rework their setup config, and moved to | ||
| 10 | build_meta, however that's still in development, and there seem to | ||
| 11 | be no stable version yet. | ||
| 12 | |||
| 13 | Once there is a new version, most likely this patch can be dropped. | ||
| 14 | |||
| 15 | Upstream-Status: Inappropriate [see above] | ||
| 16 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 17 | --- | ||
| 18 | setup.py | 1 - | ||
| 19 | 1 file changed, 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/setup.py b/setup.py | ||
| 22 | index b655222..c2aff91 100644 | ||
| 23 | --- a/setup.py | ||
| 24 | +++ b/setup.py | ||
| 25 | @@ -8,7 +8,6 @@ XStatic - setup.py | ||
| 26 | import os | ||
| 27 | |||
| 28 | from setuptools import setup, find_packages | ||
| 29 | -import pkg_resources | ||
| 30 | |||
| 31 | # The README.txt file should be written in reST so that PyPI can use | ||
| 32 | # it to generate your project's PyPI page. | ||
diff --git a/meta-python/recipes-devtools/python/python3-aiohue_4.8.0.bb b/meta-python/recipes-devtools/python/python3-aiohue_4.8.1.bb index ac20dcb1c1..d5adf6e0af 100644 --- a/meta-python/recipes-devtools/python/python3-aiohue_4.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-aiohue_4.8.1.bb | |||
| @@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
| 4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "78c5af843c916affd8cd7efeddccfc6edd0cca288fe9909c21186fef03606cd0" | 7 | SRC_URI[sha256sum] = "7fddc328add07715001bd3d75a37c730a5befcb4348b120c5259583fb9fa34bb" |
| 8 | 8 | ||
| 9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.18.0.bb b/meta-python/recipes-devtools/python/python3-alembic_1.18.4.bb index 39038958f4..92c8a019e1 100644 --- a/meta-python/recipes-devtools/python/python3-alembic_1.18.0.bb +++ b/meta-python/recipes-devtools/python/python3-alembic_1.18.4.bb | |||
| @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ff111c41e8748bbfa45e8ba92347b681" | |||
| 4 | 4 | ||
| 5 | inherit pypi python_setuptools_build_meta | 5 | inherit pypi python_setuptools_build_meta |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "0c4c03c927dc54d4c56821bdcc988652f4f63bf7b9017fd9d78d63f09fd22b48" | 7 | SRC_URI[sha256sum] = "cb6e1fd84b6174ab8dbb2329f86d631ba9559dd78df550b57804d607672cedbc" |
| 8 | 8 | ||
| 9 | RDEPENDS:${PN} += "\ | 9 | RDEPENDS:${PN} += "\ |
| 10 | python3-dateutil \ | 10 | python3-dateutil \ |
diff --git a/meta-python/recipes-devtools/python/python3-apispec_6.9.0.bb b/meta-python/recipes-devtools/python/python3-apispec_6.10.0.bb index 4b6f3b51c6..52ebc43c6e 100644 --- a/meta-python/recipes-devtools/python/python3-apispec_6.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-apispec_6.10.0.bb | |||
| @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a75956865b40c80a37c1e864716592b4" | |||
| 5 | 5 | ||
| 6 | inherit pypi python_flit_core | 6 | inherit pypi python_flit_core |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "7a38ce7c3eedc7771e6e33295afdd8c4b0acdd9865b483f8cf6cc369c93e8d1e" | 8 | SRC_URI[sha256sum] = "0a888555cd4aa5fb7176041be15684154fd8961055e1672e703abf737e8761bf" |
| 9 | 9 | ||
| 10 | RDEPENDS:${PN} += "python3-packaging" | 10 | RDEPENDS:${PN} += "python3-packaging" |
diff --git a/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb b/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb index bee0b7d815..c027e80b28 100644 --- a/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb +++ b/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | SUMMARY = "A small Python module for determining appropriate + platform-specific dirs, e.g. a user data dir." | 1 | SUMMARY = "A small Python module for determining appropriate + platform-specific dirs, e.g. a user data dir." |
| 2 | HOMEPAGE = "https://github.com/ActiveState/appdirs" | ||
| 2 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=31625363c45eb0c67c630a2f73e438e4" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=31625363c45eb0c67c630a2f73e438e4" |
| 4 | 5 | ||
diff --git a/meta-python/recipes-devtools/python/python3-asgiref_3.11.0.bb b/meta-python/recipes-devtools/python/python3-asgiref_3.11.1.bb index 6cf2e73e7a..e372d4771b 100644 --- a/meta-python/recipes-devtools/python/python3-asgiref_3.11.0.bb +++ b/meta-python/recipes-devtools/python/python3-asgiref_3.11.1.bb | |||
| @@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
| 4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "13acff32519542a1736223fb79a715acdebe24286d98e8b164a73085f40da2c4" | 7 | SRC_URI[sha256sum] = "5f184dc43b7e763efe848065441eac62229c9f7b0475f41f80e207a114eda4ce" |
| 8 | 8 | ||
| 9 | export BUILD_SYS | 9 | export BUILD_SYS |
| 10 | export HOST_SYS | 10 | export HOST_SYS |
diff --git a/meta-python/recipes-devtools/python/python3-astroid_4.0.3.bb b/meta-python/recipes-devtools/python/python3-astroid_4.1.1.bb index efa59fc198..568769c58a 100644 --- a/meta-python/recipes-devtools/python/python3-astroid_4.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-astroid_4.1.1.bb | |||
| @@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
| 4 | LICENSE = "LGPL-2.1-only" | 4 | LICENSE = "LGPL-2.1-only" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "08d1de40d251cc3dc4a7a12726721d475ac189e4e583d596ece7422bc176bda3" | 7 | SRC_URI[sha256sum] = "445d831fe785df8c670bbb46b900b8424b82f85b4af187103f71a63a63ebed43" |
| 8 | 8 | ||
| 9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-asyncinotify_4.3.2.bb b/meta-python/recipes-devtools/python/python3-asyncinotify_4.4.0.bb index 810a142fac..115e88cedf 100644 --- a/meta-python/recipes-devtools/python/python3-asyncinotify_4.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-asyncinotify_4.4.0.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify" | |||
| 3 | LICENSE = "MPL-2.0" | 3 | LICENSE = "MPL-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f75d2927d3c1ed2414ef72048f5ad640" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f75d2927d3c1ed2414ef72048f5ad640" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "3321deedc443c8402229a423623d3ae2fc17c433b9b9bfe170828ee0c7ea3871" | 6 | SRC_URI[sha256sum] = "438bdc0715f4f959e6e0af70e76cea198b4e28e5933c7cbf1e9987b50394afb3" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-autoflake_2.3.1.bb b/meta-python/recipes-devtools/python/python3-autoflake_2.3.3.bb index 0a44d751fb..8767d6f4d5 100644 --- a/meta-python/recipes-devtools/python/python3-autoflake_2.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-autoflake_2.3.3.bb | |||
| @@ -3,7 +3,7 @@ SECTION = "devel/python" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=88246be6a34c1496c253f58599f3db85" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=88246be6a34c1496c253f58599f3db85" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "c98b75dc5b0a86459c4f01a1d32ac7eb4338ec4317a4469515ff1e687ecd909e" | 6 | SRC_URI[sha256sum] = "c24809541e23999f7a7b0d2faadf15deb0bc04cdde49728a2fd943a0c8055504" |
| 7 | 7 | ||
| 8 | inherit pypi python_hatchling | 8 | inherit pypi python_hatchling |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-bandit_1.9.2.bb b/meta-python/recipes-devtools/python/python3-bandit_1.9.4.bb index 55f911bd3f..d8e6f9da87 100644 --- a/meta-python/recipes-devtools/python/python3-bandit_1.9.2.bb +++ b/meta-python/recipes-devtools/python/python3-bandit_1.9.4.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Security oriented static analyser for python code." | |||
| 2 | LICENSE = "Apache-2.0" | 2 | LICENSE = "Apache-2.0" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" |
| 4 | 4 | ||
| 5 | SRC_URI[sha256sum] = "32410415cd93bf9c8b91972159d5cf1e7f063a9146d70345641cd3877de348ce" | 5 | SRC_URI[sha256sum] = "b589e5de2afe70bd4d53fa0c1da6199f4085af666fde00e8a034f152a52cd628" |
| 6 | 6 | ||
| 7 | DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" | 7 | DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" |
| 8 | 8 | ||
diff --git a/meta-python/recipes-devtools/python/python3-bitstruct_8.21.0.bb b/meta-python/recipes-devtools/python/python3-bitstruct_8.22.1.bb index 9431473548..62adcb35b8 100644 --- a/meta-python/recipes-devtools/python/python3-bitstruct_8.21.0.bb +++ b/meta-python/recipes-devtools/python/python3-bitstruct_8.22.1.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/bitstruct" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "ff0be4968a45caf8688e075f55cca7a3fe9212b069ba67e5b27b0926a11948ac" | 6 | SRC_URI[sha256sum] = "97588318c906c60d33129e0061dd830b03d793c517033d312487c75426d1e808" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-black_26.1.0.bb b/meta-python/recipes-devtools/python/python3-black_26.3.0.bb index bcb0f0f408..eaffe06563 100644 --- a/meta-python/recipes-devtools/python/python3-black_26.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-black_26.3.0.bb | |||
| @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d3465a2a183908c9cb95bf490bd1e7ab \ | |||
| 4 | file://docs/license.md;md5=d826b3c5269f21a8a0272af3f00d15c0 \ | 4 | file://docs/license.md;md5=d826b3c5269f21a8a0272af3f00d15c0 \ |
| 5 | file://src/blib2to3/LICENSE;md5=bbbad7490e921f9a73c0e891305cb4b3" | 5 | file://src/blib2to3/LICENSE;md5=bbbad7490e921f9a73c0e891305cb4b3" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "d294ac3340eef9c9eb5d29288e96dc719ff269a88e27b396340459dd85da4c58" | 7 | SRC_URI[sha256sum] = "4d438dfdba1c807c6c7c63c4f15794dda0820d2222e7c4105042ac9ddfc5dd0b" |
| 8 | 8 | ||
| 9 | inherit pypi python_hatchling | 9 | inherit pypi python_hatchling |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-bumble_0.0.221.bb b/meta-python/recipes-devtools/python/python3-bumble_0.0.226.bb index 87a0b8376b..d5cc66f74d 100644 --- a/meta-python/recipes-devtools/python/python3-bumble_0.0.221.bb +++ b/meta-python/recipes-devtools/python/python3-bumble_0.0.226.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/google/bumble" | |||
| 3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7a775f1b11285b6abedd76748d176125" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7a775f1b11285b6abedd76748d176125" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "44e9ed8aab0aba256491c2acedd3080b48bb070cdb6776017d6d794e035f0dec" | 6 | SRC_URI[sha256sum] = "e96f62c282a7376ab56b2f799e232d0985a8965e049030c50a59c4ff0b10f592" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 8 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-cachetools_6.2.4.bb b/meta-python/recipes-devtools/python/python3-cachetools_7.0.4.bb index 51a9f29ff5..f6d9d80454 100644 --- a/meta-python/recipes-devtools/python/python3-cachetools_6.2.4.bb +++ b/meta-python/recipes-devtools/python/python3-cachetools_7.0.4.bb | |||
| @@ -6,7 +6,7 @@ Python 3 Standard Library @lru_cache function decorator." | |||
| 6 | SECTION = "devel/python" | 6 | SECTION = "devel/python" |
| 7 | 7 | ||
| 8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e21bbe53b2730bfe1911cf381b81821e" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=079933dfba36eb60b5e3512ca0ab61ae" |
| 10 | 10 | ||
| 11 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 11 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 12 | 12 | ||
| @@ -14,6 +14,6 @@ RDEPENDS:${PN} += " \ | |||
| 14 | python3-math \ | 14 | python3-math \ |
| 15 | " | 15 | " |
| 16 | 16 | ||
| 17 | SRC_URI[sha256sum] = "82c5c05585e70b6ba2d3ae09ea60b79548872185d2f24ae1f2709d37299fd607" | 17 | SRC_URI[sha256sum] = "7042c0e4eea87812f04744ce6ee9ed3de457875eb1f82d8a206c46d6e48b6734" |
| 18 | 18 | ||
| 19 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python3-can_4.6.1.bb b/meta-python/recipes-devtools/python/python3-can_4.6.1.bb index 04ce22346c..a2746511f8 100644 --- a/meta-python/recipes-devtools/python/python3-can_4.6.1.bb +++ b/meta-python/recipes-devtools/python/python3-can_4.6.1.bb | |||
| @@ -26,7 +26,6 @@ RDEPENDS:${PN} += "\ | |||
| 26 | python3-msgpack \ | 26 | python3-msgpack \ |
| 27 | python3-netserver \ | 27 | python3-netserver \ |
| 28 | python3-packaging \ | 28 | python3-packaging \ |
| 29 | python3-pkg-resources \ | ||
| 30 | python3-setuptools \ | 29 | python3-setuptools \ |
| 31 | python3-sqlite3 \ | 30 | python3-sqlite3 \ |
| 32 | python3-typing-extensions \ | 31 | python3-typing-extensions \ |
diff --git a/meta-python/recipes-devtools/python/python3-cassandra-driver/0001-skip-verifying-the-availability-of-setuptools.patch b/meta-python/recipes-devtools/python/python3-cassandra-driver/0001-skip-verifying-the-availability-of-setuptools.patch new file mode 100644 index 0000000000..b58fd04752 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-cassandra-driver/0001-skip-verifying-the-availability-of-setuptools.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From ebee090ac020c5a4e4194788fc2f53d7a4e30b40 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sun, 15 Mar 2026 21:28:07 +0100 | ||
| 4 | Subject: [PATCH] skip verifying the availability of setuptools | ||
| 5 | |||
| 6 | The setup script checks is setuptools is available (with the correct minimum | ||
| 7 | version), using setuptool's pkg_resouces modules. Setuptools has dropped | ||
| 8 | this module in version 82, making this import fail. | ||
| 9 | |||
| 10 | This patch skips the availability check of Setuptools, it is expected to be | ||
| 11 | always available from oe-core - the patch itself is oe-specific. | ||
| 12 | |||
| 13 | Upstream has already prepared a solution to rework their setup script to | ||
| 14 | work with the latest Setuptools, however that patch builds on several other | ||
| 15 | patches. | ||
| 16 | |||
| 17 | Upstream-Status: Inappropriate [oe-specific] | ||
| 18 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 19 | --- | ||
| 20 | ez_setup.py | 1 + | ||
| 21 | 1 file changed, 1 insertion(+) | ||
| 22 | |||
| 23 | diff --git a/ez_setup.py b/ez_setup.py | ||
| 24 | index 76e7105..c668e5d 100644 | ||
| 25 | --- a/ez_setup.py | ||
| 26 | +++ b/ez_setup.py | ||
| 27 | @@ -107,6 +107,7 @@ def _do_download(version, download_base, to_dir, download_delay): | ||
| 28 | |||
| 29 | def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, | ||
| 30 | to_dir=os.curdir, download_delay=15): | ||
| 31 | + return | ||
| 32 | # making sure we use the absolute path | ||
| 33 | to_dir = os.path.abspath(to_dir) | ||
| 34 | was_imported = 'pkg_resources' in sys.modules or \ | ||
diff --git a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.29.2.bb b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.29.3.bb index f60167d309..6ab86300f5 100644 --- a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.29.2.bb +++ b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.29.3.bb | |||
| @@ -8,9 +8,12 @@ LICENSE = "Apache-2.0" | |||
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" |
| 9 | SRCNAME = "cassandra-driver" | 9 | SRCNAME = "cassandra-driver" |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "c4310a7d0457f51a63fb019d8ef501588c491141362b53097fbc62fa06559b7c" | 11 | SRC_URI += "file://0001-skip-verifying-the-availability-of-setuptools.patch" |
| 12 | SRC_URI[sha256sum] = "ff6b82ee4533f6fd4474d833e693b44b984f58337173ee98ed76bce08721a636" | ||
| 12 | 13 | ||
| 13 | inherit pypi setuptools3 | 14 | PYPI_PACKAGE = "cassandra_driver" |
| 15 | |||
| 16 | inherit pypi python_setuptools_build_meta | ||
| 14 | 17 | ||
| 15 | RDEPENDS:${PN} += "\ | 18 | RDEPENDS:${PN} += "\ |
| 16 | python3-cython \ | 19 | python3-cython \ |
diff --git a/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.4.bb b/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.5.bb index 38086ca017..e69d7536a9 100644 --- a/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.4.bb +++ b/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.5.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48178f3fc1374ad7e830412f812bde05" | |||
| 5 | 5 | ||
| 6 | #SRC_URI += "file://0001-pyproject.toml-Update-mypy-requirement.patch" | 6 | #SRC_URI += "file://0001-pyproject.toml-Update-mypy-requirement.patch" |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a" | 8 | SRC_URI[sha256sum] = "95adae7b6c42a6c5b5b559b1a99149f090a57128155daeea91732c8d970d8644" |
| 9 | 9 | ||
| 10 | DEPENDS += "python3-setuptools-scm-native python3-mypy-native" | 10 | DEPENDS += "python3-setuptools-scm-native python3-mypy-native" |
| 11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-cmake_4.2.1.bb b/meta-python/recipes-devtools/python/python3-cmake_4.2.3.bb index 88f9ff38a0..613652b578 100644 --- a/meta-python/recipes-devtools/python/python3-cmake_4.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-cmake_4.2.3.bb | |||
| @@ -11,7 +11,7 @@ PYPI_PACKAGE = "cmake" | |||
| 11 | PYPI_ARCHIVE_NAME_PREFIX = "pypi-" | 11 | PYPI_ARCHIVE_NAME_PREFIX = "pypi-" |
| 12 | 12 | ||
| 13 | inherit pypi python_setuptools_build_meta | 13 | inherit pypi python_setuptools_build_meta |
| 14 | SRC_URI[sha256sum] = "a07a790ca65946667c0fb286549e8e0b5a850e2f8170ae60d3418573011ca218" | 14 | SRC_URI[sha256sum] = "7a6bc333453c9f7614c7a6e664950d309a5e1f89fa98512d537d4fde27eb8fae" |
| 15 | 15 | ||
| 16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
| 17 | file://CMakeLists.txt \ | 17 | file://CMakeLists.txt \ |
diff --git a/meta-python/recipes-devtools/python/python3-cmd2_3.1.0.bb b/meta-python/recipes-devtools/python/python3-cmd2_3.4.0.bb index 911d0989ff..2ed0bdc769 100644 --- a/meta-python/recipes-devtools/python/python3-cmd2_3.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-cmd2_3.4.0.bb | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | SUMMARY = "Extra features for standard library's cmd module" | 1 | SUMMARY = "Extra features for standard library's cmd module" |
| 2 | HOMEPAGE = "https://github.com/python-cmd2/cmd2" | 2 | HOMEPAGE = "https://github.com/python-cmd2/cmd2" |
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=26efe44f9946f43292f90070d9d5590c" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f2a861642858e0858af9dd4e4716bae0" |
| 5 | 5 | ||
| 6 | DEPENDS += "python3-setuptools-scm-native" | 6 | DEPENDS += "python3-setuptools-scm-native" |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "cce3aece018b0b1055988adaa2b687ac9c1df38bfd2abfc29dbeb51a9707de33" | 8 | SRC_URI[sha256sum] = "fd43ef7540609469f055858146f2c592ca4c58e3c336b5efbc5502459ab0bdb2" |
| 9 | 9 | ||
| 10 | inherit pypi python_setuptools_build_meta python3native | 10 | inherit pypi python_setuptools_build_meta python3native |
| 11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-configargparse_1.7.1.bb b/meta-python/recipes-devtools/python/python3-configargparse_1.7.3.bb index c056109c5a..6715abab3a 100644 --- a/meta-python/recipes-devtools/python/python3-configargparse_1.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-configargparse_1.7.3.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/bw2/ConfigArgParse" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "79c2ddae836a1e5914b71d58e4b9adbd9f7779d4e6351a637b7d2d9b6c46d3d9" | 6 | SRC_URI[sha256sum] = "76dd1a51145fb7ca82621ee08cd38ec0c6316fe27a38b9137b75667d1116399e" |
| 7 | 7 | ||
| 8 | PYPI_PACKAGE = "configargparse" | 8 | PYPI_PACKAGE = "configargparse" |
| 9 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 9 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
diff --git a/meta-python/recipes-devtools/python/python3-coverage_7.13.1.bb b/meta-python/recipes-devtools/python/python3-coverage_7.13.4.bb index d3e98c6987..b02f38e568 100644 --- a/meta-python/recipes-devtools/python/python3-coverage_7.13.1.bb +++ b/meta-python/recipes-devtools/python/python3-coverage_7.13.4.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://coverage.readthedocs.io" | |||
| 3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "b7593fe7eb5feaa3fbb461ac79aac9f9fc0387a5ca8080b0c6fe2ca27b091afd" | 6 | SRC_URI[sha256sum] = "e5c8f6ed1e61a8b2dcdf31eb0b9bbf0130750ca79c1c49eb898e2ad86f5ccc91" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-cssselect2_0.8.0.bb b/meta-python/recipes-devtools/python/python3-cssselect2_0.9.0.bb index 20165a098c..7353e498eb 100644 --- a/meta-python/recipes-devtools/python/python3-cssselect2_0.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-cssselect2_0.9.0.bb | |||
| @@ -6,7 +6,7 @@ DESCRIPTION = "cssselect2 is a straightforward implementation of CSS4 Selectors | |||
| 6 | LICENSE = "BSD-3-Clause" | 6 | LICENSE = "BSD-3-Clause" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=aa7228954285c7398bb6711fee73b4ac" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=aa7228954285c7398bb6711fee73b4ac" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "7674ffb954a3b46162392aee2a3a0aedb2e14ecf99fcc28644900f4e6e3e9d3a" | 9 | SRC_URI[sha256sum] = "759aa22c216326356f65e62e791d66160a0f9c91d1424e8d8adc5e74dddfc6fb" |
| 10 | 10 | ||
| 11 | inherit pypi python_setuptools_build_meta | 11 | inherit pypi python_setuptools_build_meta |
| 12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-dateparser_1.2.2.bb b/meta-python/recipes-devtools/python/python3-dateparser_1.3.0.bb index b66900aebb..012c9654a4 100644 --- a/meta-python/recipes-devtools/python/python3-dateparser_1.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-dateparser_1.3.0.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/scrapinghub/dateparser" | |||
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3d3ed25571191e7aa3f55d0a6efe0051" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3d3ed25571191e7aa3f55d0a6efe0051" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "986316f17cb8cdc23ea8ce563027c5ef12fc725b6fb1d137c14ca08777c5ecf7" | 6 | SRC_URI[sha256sum] = "5bccf5d1ec6785e5be71cc7ec80f014575a09b4923e762f850e57443bddbf1a5" |
| 7 | 7 | ||
| 8 | PYPI_PACKAGE = "dateparser" | 8 | PYPI_PACKAGE = "dateparser" |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-dbus-deviation/0001-Prevent-trying-to-donwload-requierment-which-will-ca.patch b/meta-python/recipes-devtools/python/python3-dbus-deviation/0001-Prevent-trying-to-donwload-requierment-which-will-ca.patch new file mode 100644 index 0000000000..b163db772c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-dbus-deviation/0001-Prevent-trying-to-donwload-requierment-which-will-ca.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | Subject: [PATCH] Prevent trying to donwload requierment which will cause | ||
| 2 | network error. | ||
| 3 | |||
| 4 | 'NewConnectionError('<pip._vendor.urllib3.connection.HTTPSConnection object at 0x7f1e83062ad0>: Failed to establish a new connection: [Errno -3] Temporary failure in name resolution')': /simple/setuptools-git/ | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [oe specific] | ||
| 7 | |||
| 8 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 9 | --- | ||
| 10 | setup.py | 1 - | ||
| 11 | 1 file changed, 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/setup.py b/setup.py | ||
| 14 | index 245193f..d899e4c 100755 | ||
| 15 | --- a/setup.py | ||
| 16 | +++ b/setup.py | ||
| 17 | @@ -92,7 +92,6 @@ setuptools.setup( | ||
| 18 | exclude_package_data={'': ['.gitignore']}, | ||
| 19 | zip_safe=True, | ||
| 20 | setup_requires=[ | ||
| 21 | - 'setuptools_git >= 0.3', | ||
| 22 | 'sphinx', | ||
| 23 | ], | ||
| 24 | install_requires=['lxml'], | ||
| 25 | -- | ||
| 26 | 2.43.0 | ||
| 27 | |||
diff --git a/meta-python/recipes-devtools/python/python3-dbus-deviation_0.6.1.bb b/meta-python/recipes-devtools/python/python3-dbus-deviation_0.6.1.bb new file mode 100644 index 0000000000..e969e85465 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-dbus-deviation_0.6.1.bb | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | SUMMARY = "dbus-deviation is a project for parsing D-Bus introspection XML and processing it in various ways" | ||
| 2 | HOMEPAGE = "https://tecnocode.co.uk/dbus-deviation/" | ||
| 3 | LICENSE = "LGPL-2.1-or-later" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=90263a49bc1d9a204656fec4d5616c66" | ||
| 5 | |||
| 6 | SRC_URI[sha256sum] = "e06b88efe223885d2725df51cf7c9b7b463d1c6f04ea49d4690874318d0eb7a3" | ||
| 7 | |||
| 8 | inherit pypi setuptools3 | ||
| 9 | |||
| 10 | SRC_URI += "file://0001-Prevent-trying-to-donwload-requierment-which-will-ca.patch" | ||
| 11 | |||
| 12 | DEPENDS += "python3-sphinx-native" | ||
| 13 | |||
| 14 | do_install:append() { | ||
| 15 | for ss in $(find ${D}${PYTHON_SITEPACKAGES_DIR} -type f -name "*.py"); do | ||
| 16 | sed -i 's,/usr/bin/python$,/usr/bin/env python3,' "$ss" | ||
| 17 | done | ||
| 18 | } | ||
| 19 | |||
| 20 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/python3-dbus-fast/0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch b/meta-python/recipes-devtools/python/python3-dbus-fast/0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch index 5366627abf..e5b53340a8 100644 --- a/meta-python/recipes-devtools/python/python3-dbus-fast/0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch +++ b/meta-python/recipes-devtools/python/python3-dbus-fast/0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 85189fb66d3abb2645605f8a3c14d8152ef755fe Mon Sep 17 00:00:00 2001 | 1 | From bca444d7069afab9e1ac84f765e744d308d39e57 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 18 May 2025 10:24:19 -0700 | 3 | Date: Sun, 18 May 2025 10:24:19 -0700 |
| 4 | Subject: [PATCH] pyproject.toml: Remove upper version constraint for Cython | 4 | Subject: [PATCH] pyproject.toml: Remove upper version constraint for Cython |
| @@ -11,23 +11,23 @@ Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | |||
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 12 | 12 | ||
| 13 | diff --git a/pyproject.toml b/pyproject.toml | 13 | diff --git a/pyproject.toml b/pyproject.toml |
| 14 | index e22ea42..f670d3d 100644 | 14 | index 6604cb8..40bd8c3 100644 |
| 15 | --- a/pyproject.toml | 15 | --- a/pyproject.toml |
| 16 | +++ b/pyproject.toml | 16 | +++ b/pyproject.toml |
| 17 | @@ -50,7 +50,7 @@ pytest-cov = ">=3,<7" | 17 | @@ -50,7 +50,7 @@ pytest-cov = ">=3,<8" |
| 18 | pytest-asyncio = ">=0.19,<1.3" | 18 | pytest-asyncio = ">=0.19,<1.4" |
| 19 | pycairo = "^1.21.0" | 19 | pycairo = "^1.21.0" |
| 20 | PyGObject = {version = ">=3.50,<3.51", python = "<4"} | 20 | PyGObject = {version = ">=3.50,<3.51", python = "<4"} |
| 21 | -Cython = ">=3,<3.2.0" | 21 | -Cython = ">=3,<3.3.0" |
| 22 | +Cython = ">=3" | 22 | +Cython = ">=3" |
| 23 | setuptools = ">=65.4.1,<81.0.0" | 23 | setuptools = ">=65.4.1,<81.0.0" |
| 24 | pytest-timeout = "^2.1.0" | 24 | pytest-timeout = "^2.1.0" |
| 25 | pytest-codspeed = ">=3.1.1,<5.0.0" | 25 | pytest-codspeed = ">=3.1.1,<5.0.0" |
| 26 | @@ -104,7 +104,7 @@ module = "docs.*" | 26 | @@ -108,7 +108,7 @@ module = "docs.*" |
| 27 | ignore_errors = true | 27 | ignore_errors = true |
| 28 | 28 | ||
| 29 | [build-system] | 29 | [build-system] |
| 30 | -requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3,<3.1.0', "poetry-core>=1.0.0"] | 30 | -requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3,<3.3.0', "poetry-core>=1.0.0"] |
| 31 | +requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3', "poetry-core>=1.0.0"] | 31 | +requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3', "poetry-core>=1.0.0"] |
| 32 | build-backend = "poetry.core.masonry.api" | 32 | build-backend = "poetry.core.masonry.api" |
| 33 | 33 | ||
diff --git a/meta-python/recipes-devtools/python/python3-dbus-fast_2.44.5.bb b/meta-python/recipes-devtools/python/python3-dbus-fast_4.0.0.bb index 4f21ec379e..15bbc1706e 100644 --- a/meta-python/recipes-devtools/python/python3-dbus-fast_2.44.5.bb +++ b/meta-python/recipes-devtools/python/python3-dbus-fast_4.0.0.bb | |||
| @@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947" |
| 5 | 5 | ||
| 6 | SRC_URI += "file://0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch" | 6 | SRC_URI += "file://0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch" |
| 7 | SRC_URI[sha256sum] = "e9d738e3898e2d505d7f2d5d21949bd705d7cd3d7240dda5481bb1c5fd5e3da8" | 7 | SRC_URI[sha256sum] = "e1d3ee49a4a81524d7caaa2d5a31fc71075a1c977b661df958cee24bef86b8fe" |
| 8 | 8 | ||
| 9 | PYPI_PACKAGE = "dbus_fast" | 9 | PYPI_PACKAGE = "dbus_fast" |
| 10 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 10 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
diff --git a/meta-python/recipes-devtools/python/python3-dill_0.4.0.bb b/meta-python/recipes-devtools/python/python3-dill_0.4.1.bb index d421b1a887..e08e97113d 100644 --- a/meta-python/recipes-devtools/python/python3-dill_0.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-dill_0.4.1.bb | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | SUMMARY = "Serialize all of python" | 1 | SUMMARY = "Serialize all of python" |
| 2 | HOMEPAGE = "https://pypi.org/project/dill/" | 2 | HOMEPAGE = "https://pypi.org/project/dill/" |
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ed5ea77287d7d542949d6dd0bc288ac0" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7a60f86720d45856324c45945cfed6b3" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "0633f1d2df477324f53a895b02c901fb961bdbf65a17122586ea7019292cbcf0" | 6 | SRC_URI[sha256sum] = "423092df4182177d4d8ba8290c8a5b640c66ab35ec7da59ccfa00f6fa3eea5fa" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-django.inc b/meta-python/recipes-devtools/python/python3-django.inc index 589f6a5b85..4191d4384f 100644 --- a/meta-python/recipes-devtools/python/python3-django.inc +++ b/meta-python/recipes-devtools/python/python3-django.inc | |||
| @@ -43,6 +43,10 @@ do_install_ptest(){ | |||
| 43 | cp -r ${S}/tests ${D}${PTEST_PATH} | 43 | cp -r ${S}/tests ${D}${PTEST_PATH} |
| 44 | sed -i 's,/usr/bin/env python,/usr/bin/env python3,' ${D}${PTEST_PATH}/tests/runtests.py | 44 | sed -i 's,/usr/bin/env python,/usr/bin/env python3,' ${D}${PTEST_PATH}/tests/runtests.py |
| 45 | ln -sr ${D}${libdir}/python3.*/site-packages/django ${D}${PTEST_PATH}/django | 45 | ln -sr ${D}${libdir}/python3.*/site-packages/django ${D}${PTEST_PATH}/django |
| 46 | |||
| 47 | # make the top folder writable for all - django 6 creates a test db file in there | ||
| 48 | # with a test user | ||
| 49 | chmod 777 ${D}${PTEST_PATH}/tests | ||
| 46 | } | 50 | } |
| 47 | 51 | ||
| 48 | RDEPENDS:${PN}-ptest += " \ | 52 | RDEPENDS:${PN}-ptest += " \ |
diff --git a/meta-python/recipes-devtools/python/python3-django/0001-Fix-test_strip_tags-test.patch b/meta-python/recipes-devtools/python/python3-django/0001-Fix-test_strip_tags-test.patch deleted file mode 100644 index f77c3b963a..0000000000 --- a/meta-python/recipes-devtools/python/python3-django/0001-Fix-test_strip_tags-test.patch +++ /dev/null | |||
| @@ -1,76 +0,0 @@ | |||
| 1 | From 7b80b2186300620931009fd62c2969f108fe7a62 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jacob Walls <jacobtylerwalls@gmail.com> | ||
| 3 | Date: Thu, 11 Dec 2025 08:44:19 -0500 | ||
| 4 | Subject: [PATCH] Refs #36499 -- Adjusted test_strip_tags following Python | ||
| 5 | behavior change for incomplete entities. | ||
| 6 | |||
| 7 | Upstream-Status: Backport [https://github.com/django/django/commit/7b80b2186300620931009fd62c2969f108fe7a62] | ||
| 8 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 9 | --- | ||
| 10 | tests/utils_tests/test_html.py | 25 ++++++++++++++++++++----- | ||
| 11 | 1 file changed, 20 insertions(+), 5 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py | ||
| 14 | index 7412c2624c73..ee115aaf1cf2 100644 | ||
| 15 | --- a/tests/utils_tests/test_html.py | ||
| 16 | +++ b/tests/utils_tests/test_html.py | ||
| 17 | @@ -1,3 +1,4 @@ | ||
| 18 | +import math | ||
| 19 | import os | ||
| 20 | import sys | ||
| 21 | from datetime import datetime | ||
| 22 | @@ -124,7 +125,7 @@ | ||
| 23 | # old and new results. The check below is temporary until all supported | ||
| 24 | # Python versions and CI workers include the fix. See: | ||
| 25 | # https://github.com/python/cpython/commit/6eb6c5db | ||
| 26 | - min_fixed = { | ||
| 27 | + min_fixed_security = { | ||
| 28 | (3, 14): (3, 14), | ||
| 29 | (3, 13): (3, 13, 6), | ||
| 30 | (3, 12): (3, 12, 12), | ||
| 31 | @@ -132,7 +133,21 @@ | ||
| 32 | (3, 10): (3, 10, 19), | ||
| 33 | (3, 9): (3, 9, 24), | ||
| 34 | } | ||
| 35 | - htmlparser_fixed = sys.version_info >= min_fixed[sys.version_info[:2]] | ||
| 36 | + # Similarly, there was a fix for terminating incomplete entities. See: | ||
| 37 | + # https://github.com/python/cpython/commit/95296a9d | ||
| 38 | + min_fixed_incomplete_entities = { | ||
| 39 | + (3, 14): (3, 14, 1), | ||
| 40 | + (3, 13): (3, 13, 10), | ||
| 41 | + (3, 12): (3, 12, math.inf), # not fixed in 3.12. | ||
| 42 | + } | ||
| 43 | + major_version = sys.version_info[:2] | ||
| 44 | + htmlparser_fixed_security = sys.version_info >= min_fixed_security.get( | ||
| 45 | + major_version, major_version | ||
| 46 | + ) | ||
| 47 | + htmlparser_fixed_incomplete_entities = ( | ||
| 48 | + sys.version_info | ||
| 49 | + >= min_fixed_incomplete_entities.get(major_version, major_version) | ||
| 50 | + ) | ||
| 51 | items = ( | ||
| 52 | ( | ||
| 53 | "<p>See: 'é is an apostrophe followed by e acute</p>", | ||
| 54 | @@ -159,16 +174,19 @@ | ||
| 55 | # https://bugs.python.org/issue20288 | ||
| 56 | ("&gotcha&#;<>", "&gotcha&#;<>"), | ||
| 57 | ("<sc<!-- -->ript>test<<!-- -->/script>", "ript>test"), | ||
| 58 | - ("<script>alert()</script>&h", "alert()h"), | ||
| 59 | + ( | ||
| 60 | + "<script>alert()</script>&h", | ||
| 61 | + "alert()&h;" if htmlparser_fixed_incomplete_entities else "alert()h", | ||
| 62 | + ), | ||
| 63 | ( | ||
| 64 | "><!" + ("&" * 16000) + "D", | ||
| 65 | - ">" if htmlparser_fixed else "><!" + ("&" * 16000) + "D", | ||
| 66 | + ">" if htmlparser_fixed_security else "><!" + ("&" * 16000) + "D", | ||
| 67 | ), | ||
| 68 | ("X<<<<br>br>br>br>X", "XX"), | ||
| 69 | ("<" * 50 + "a>" * 50, ""), | ||
| 70 | ( | ||
| 71 | ">" + "<a" * 500 + "a", | ||
| 72 | - ">" if htmlparser_fixed else ">" + "<a" * 500 + "a", | ||
| 73 | + ">" if htmlparser_fixed_security else ">" + "<a" * 500 + "a", | ||
| 74 | ), | ||
| 75 | ("<a" * 49 + "a" * 951, "<a" * 49 + "a" * 951), | ||
| 76 | ("<" + "a" * 1_002, "<" + "a" * 1_002), | ||
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.12.bb b/meta-python/recipes-devtools/python/python3-django_5.2.12.bb new file mode 100644 index 0000000000..13166d4c53 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-django_5.2.12.bb | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | require python3-django.inc | ||
| 2 | inherit python_setuptools_build_meta | ||
| 3 | |||
| 4 | SRC_URI += "file://0001-fix-test_msgfmt_error_including_non_ascii-test.patch" | ||
| 5 | SRC_URI[sha256sum] = "6b809af7165c73eff5ce1c87fdae75d4da6520d6667f86401ecf55b681eb1eeb" | ||
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.9.bb b/meta-python/recipes-devtools/python/python3-django_5.2.9.bb deleted file mode 100644 index 11f438d623..0000000000 --- a/meta-python/recipes-devtools/python/python3-django_5.2.9.bb +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | require python3-django.inc | ||
| 2 | inherit python_setuptools_build_meta | ||
| 3 | |||
| 4 | SRC_URI += "file://0001-fix-test_msgfmt_error_including_non_ascii-test.patch \ | ||
| 5 | file://0001-Fix-test_strip_tags-test.patch \ | ||
| 6 | " | ||
| 7 | SRC_URI[sha256sum] = "16b5ccfc5e8c27e6c0561af551d2ea32852d7352c67d452ae3e76b4f6b2ca495" | ||
diff --git a/meta-python/recipes-devtools/python/python3-django_6.0.1.bb b/meta-python/recipes-devtools/python/python3-django_6.0.3.bb index 9642a3c581..b3aec8870a 100644 --- a/meta-python/recipes-devtools/python/python3-django_6.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-django_6.0.3.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | require python3-django.inc | 1 | require python3-django.inc |
| 2 | inherit python_setuptools_build_meta | 2 | inherit python_setuptools_build_meta |
| 3 | 3 | ||
| 4 | SRC_URI[sha256sum] = "ed76a7af4da21551573b3d9dfc1f53e20dd2e6c7d70a3adc93eedb6338130a5f" | 4 | SRC_URI[sha256sum] = "90be765ee756af8a6cbd6693e56452404b5ad15294f4d5e40c0a55a0f4870fe1" |
| 5 | 5 | ||
| 6 | # Set DEFAULT_PREFERENCE so that the LTS version of django is built by | 6 | # Set DEFAULT_PREFERENCE so that the LTS version of django is built by |
| 7 | # default. To build the 6.x branch, | 7 | # default. To build the 6.x branch, |
diff --git a/meta-python/recipes-devtools/python/python3-elementpath_5.1.0.bb b/meta-python/recipes-devtools/python/python3-elementpath_5.1.1.bb index 06bfa2cf1b..d89a012f9a 100644 --- a/meta-python/recipes-devtools/python/python3-elementpath_5.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-elementpath_5.1.1.bb | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | DESCRIPTION = "Provide XPath 1.0 and 2.0 selectors for Python's ElementTree XML data structures, both for the standard ElementTree library and for the lxml.etree library." | 1 | DESCRIPTION = "Provide XPath 1.0 and 2.0 selectors for Python's ElementTree XML data structures, both for the standard ElementTree library and for the lxml.etree library." |
| 2 | HOMEPAGE = "https://github.com/sissaschool/elementpath" | 2 | HOMEPAGE = "https://github.com/sissaschool/elementpath" |
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9291d2ba8ccce92cf704b173e0dca725" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c04ab6ce886cc843af8941bb199406ba" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "61618f64686ce73cf6f191b17298e2568e9a1763b125fc7f2cb796ad0eacfd1e" | 6 | SRC_URI[sha256sum] = "c4d1bd6aed987258354d0ea004d965eb0a6818213326bd4fd9bde5dacdb20277" |
| 7 | 7 | ||
| 8 | PYPI_PACKAGE = "elementpath" | 8 | PYPI_PACKAGE = "elementpath" |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-engineio_4.9.0.bb b/meta-python/recipes-devtools/python/python3-engineio_4.13.1.bb index 790d1b44cf..f8bb87dfde 100644 --- a/meta-python/recipes-devtools/python/python3-engineio_4.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-engineio_4.13.1.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" | |||
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
| 10 | PYPI_PACKAGE = "python-engineio" | 10 | PYPI_PACKAGE = "python_engineio" |
| 11 | 11 | ||
| 12 | RDEPENDS:${PN} += " \ | 12 | RDEPENDS:${PN} += " \ |
| 13 | python3-netclient \ | 13 | python3-netclient \ |
| @@ -17,4 +17,4 @@ RDEPENDS:${PN} += " \ | |||
| 17 | python3-asyncio \ | 17 | python3-asyncio \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRC_URI[sha256sum] = "e87459c15638e567711fd156e6f9c4a402668871bed79523f0ecfec744729ec7" | 20 | SRC_URI[sha256sum] = "0a853fcef52f5b345425d8c2b921ac85023a04dfcf75d7b74696c61e940fd066" |
diff --git a/meta-python/recipes-devtools/python/python3-evdev_1.9.2.bb b/meta-python/recipes-devtools/python/python3-evdev_1.9.3.bb index 993dfca1e6..ac687afbb4 100644 --- a/meta-python/recipes-devtools/python/python3-evdev_1.9.2.bb +++ b/meta-python/recipes-devtools/python/python3-evdev_1.9.3.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gvalkov/python-evdev" | |||
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d7bd1cc4c71b706c7e2d4053aef50f2a" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d7bd1cc4c71b706c7e2d4053aef50f2a" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "5d3278892ce1f92a74d6bf888cc8525d9f68af85dbe336c95d1c87fb8f423069" | 6 | SRC_URI[sha256sum] = "2c140e01ac8437758fa23fe5c871397412461f42d421aa20241dc8fe8cfccbc9" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 8 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-faker/pytest.ini b/meta-python/recipes-devtools/python/python3-faker/pytest.ini new file mode 100644 index 0000000000..26f64467ce --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-faker/pytest.ini | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | [pytest] | ||
| 2 | addopts = | ||
| 3 | --ignore=tests/pytest | ||
diff --git a/meta-python/recipes-devtools/python/python3-faker_40.8.0.bb b/meta-python/recipes-devtools/python/python3-faker_40.8.0.bb new file mode 100644 index 0000000000..36c81ded0b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-faker_40.8.0.bb | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | SUMMARY = "Faker is a Python package that generates fake data for you." | ||
| 2 | DESCRIPTION = "Faker is a Python package that generates fake data for you. \ | ||
| 3 | Whether you need to bootstrap your database, create good-looking XML documents, \ | ||
| 4 | fill-in your persistence to stress test it, or anonymize data taken from a \ | ||
| 5 | production service, Faker is for you." | ||
| 6 | HOMEPAGE = "https://github.com/joke2k/faker" | ||
| 7 | LICENSE = "MIT" | ||
| 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=53360c4126f7d03b63cb79b0dab9e9e1" | ||
| 9 | |||
| 10 | SRC_URI[sha256sum] = "936a3c9be6c004433f20aa4d99095df5dec82b8c7ad07459756041f8c1728875" | ||
| 11 | |||
| 12 | inherit pypi setuptools3 ptest-python-pytest | ||
| 13 | |||
| 14 | SRC_URI += "file://pytest.ini" | ||
| 15 | |||
| 16 | PACKAGECONFIG ?= "tzdata" | ||
| 17 | PACKAGECONFIG[tzdata] = ",,,python3-tzdata" | ||
| 18 | |||
| 19 | RDEPENDS:${PN} += "\ | ||
| 20 | python3-compression \ | ||
| 21 | python3-core \ | ||
| 22 | python3-crypt \ | ||
| 23 | python3-datetime \ | ||
| 24 | python3-image \ | ||
| 25 | python3-json \ | ||
| 26 | python3-logging \ | ||
| 27 | python3-math \ | ||
| 28 | python3-netclient \ | ||
| 29 | python3-numbers \ | ||
| 30 | python3-pickle \ | ||
| 31 | python3-pytest \ | ||
| 32 | python3-stringold \ | ||
| 33 | python3-unittest \ | ||
| 34 | python3-xml \ | ||
| 35 | python3-zoneinfo \ | ||
| 36 | " | ||
| 37 | |||
| 38 | RDEPENDS:${PN}-ptest += "\ | ||
| 39 | python3-freezegun \ | ||
| 40 | python3-validators \ | ||
| 41 | " | ||
| 42 | |||
| 43 | do_install_ptest:append() { | ||
| 44 | install ${UNPACKDIR}/pytest.ini ${D}${PTEST_PATH}/ | ||
| 45 | install -d ${D}${PTEST_PATH}/tests | ||
| 46 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
| 47 | } | ||
| 48 | |||
diff --git a/meta-python/recipes-devtools/python/python3-fastapi_0.128.0.bb b/meta-python/recipes-devtools/python/python3-fastapi_0.135.1.bb index f047f5321a..4eb9dced82 100644 --- a/meta-python/recipes-devtools/python/python3-fastapi_0.128.0.bb +++ b/meta-python/recipes-devtools/python/python3-fastapi_0.135.1.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://fastapi.tiangolo.com/" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=95792ff3fe8e11aa49ceb247e66e4810" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=95792ff3fe8e11aa49ceb247e66e4810" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "1cc179e1cef10a6be60ffe429f79b829dce99d8de32d7acb7e6c8dfdf7f2645a" | 6 | SRC_URI[sha256sum] = "d04115b508d936d254cea545b7312ecaa58a7b3a0f84952535b4c9afae7668cd" |
| 7 | 7 | ||
| 8 | SRC_URI += "file://run-ptest" | 8 | SRC_URI += "file://run-ptest" |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-filelock_3.20.3.bb b/meta-python/recipes-devtools/python/python3-filelock_3.25.0.bb index 4499b220bd..91faecc92b 100644 --- a/meta-python/recipes-devtools/python/python3-filelock_3.20.3.bb +++ b/meta-python/recipes-devtools/python/python3-filelock_3.25.0.bb | |||
| @@ -2,11 +2,11 @@ | |||
| 2 | # Copyright (C) 2023 iris-GmbH infrared & intelligent sensors | 2 | # Copyright (C) 2023 iris-GmbH infrared & intelligent sensors |
| 3 | SUMMARY = "A single module, which implements a platform independent file lock in Python, which provides a simple way of inter-process communication" | 3 | SUMMARY = "A single module, which implements a platform independent file lock in Python, which provides a simple way of inter-process communication" |
| 4 | HOMEPAGE = "https://py-filelock.readthedocs.io/" | 4 | HOMEPAGE = "https://py-filelock.readthedocs.io/" |
| 5 | LICENSE = "Unlicense" | 5 | LICENSE = "MIT" |
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2c6acbdf7bb74caa37512c3a5ca6857b" |
| 7 | 7 | ||
| 8 | SRC_URI += "file://run-ptest" | 8 | SRC_URI += "file://run-ptest" |
| 9 | SRC_URI[sha256sum] = "18c57ee915c7ec61cff0ecf7f0f869936c7c30191bb0cf406f1341778d0834e1" | 9 | SRC_URI[sha256sum] = "8f00faf3abf9dc730a1ffe9c354ae5c04e079ab7d3a683b7c32da5dd05f26af3" |
| 10 | 10 | ||
| 11 | BBCLASSEXTEND = "native nativesdk" | 11 | BBCLASSEXTEND = "native nativesdk" |
| 12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-flask-cors_5.0.0.bb b/meta-python/recipes-devtools/python/python3-flask-cors_6.0.2.bb index 1fead4f8d1..6134b5ba10 100644 --- a/meta-python/recipes-devtools/python/python3-flask-cors_5.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-flask-cors_6.0.2.bb | |||
| @@ -5,14 +5,14 @@ DESCRIPTION = "\ | |||
| 5 | " | 5 | " |
| 6 | SECTION = "devel/python" | 6 | SECTION = "devel/python" |
| 7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=118fecaa576ab51c1520f95e98db61ce" | 8 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=134f1026f0de92fd30e71976590a2868" |
| 9 | 9 | ||
| 10 | PYPI_PACKAGE = "flask_cors" | 10 | PYPI_PACKAGE = "flask_cors" |
| 11 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 11 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 12 | 12 | ||
| 13 | CVE_PRODUCT = "flask-cors" | 13 | CVE_PRODUCT = "flask-cors" |
| 14 | 14 | ||
| 15 | inherit pypi setuptools3 | 15 | inherit pypi python_setuptools_build_meta |
| 16 | SRC_URI[sha256sum] = "5aadb4b950c4e93745034594d9f3ea6591f734bb3662e16e255ffbf5e89c88ef" | 16 | SRC_URI[sha256sum] = "6e118f3698249ae33e429760db98ce032a8bf9913638d085ca0f4c5534ad2423" |
| 17 | 17 | ||
| 18 | RDEPENDS:${PN} += "python3-flask" | 18 | RDEPENDS:${PN} += "python3-flask" |
diff --git a/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.6.0.bb b/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.7.1.bb index e188f2b09c..b36ea81d97 100644 --- a/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.7.1.bb | |||
| @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9166295d7c482b9440bbb2b5c0fa43ac" | |||
| 5 | 5 | ||
| 6 | inherit pypi setuptools3 | 6 | inherit pypi setuptools3 |
| 7 | 7 | ||
| 8 | PYPI_PACKAGE = "Flask-JWT-Extended" | 8 | PYPI_PACKAGE = "flask_jwt_extended" |
| 9 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 9 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "9215d05a9413d3855764bcd67035e75819d23af2fafb6b55197eb5a3313fdfb2" | 11 | SRC_URI[sha256sum] = "8085d6757505b6f3291a2638c84d207e8f0ad0de662d1f46aa2f77e658a0c976" |
| 12 | 12 | ||
| 13 | RDEPENDS:${PN} += "\ | 13 | RDEPENDS:${PN} += "\ |
| 14 | python3-werkzeug \ | 14 | python3-werkzeug \ |
diff --git a/meta-python/recipes-devtools/python/python3-flask-limiter_4.1.1.bb b/meta-python/recipes-devtools/python/python3-flask-limiter_4.1.1.bb new file mode 100644 index 0000000000..7c2e18ffba --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-flask-limiter_4.1.1.bb | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | SUMMARY = "Rate Limiting extension for Flask" | ||
| 2 | DESCRIPTION = "Flask-Limiter adds rate limiting to Flask applications." | ||
| 3 | HOMEPAGE = "https://github.com/alisaifee/flask-limiter" | ||
| 4 | LICENSE = "MIT" | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2455d5e574bc0fc489411ca45766ac78" | ||
| 6 | |||
| 7 | SRC_URI[sha256sum] = "ca11608fc7eec43dcea606964ca07c3bd4ec1ae89043a0f67f717899a4f48106" | ||
| 8 | |||
| 9 | PYPI_PACKAGE = "flask_limiter" | ||
| 10 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | ||
| 11 | |||
| 12 | inherit pypi python_hatchling | ||
| 13 | |||
| 14 | DEPENDS += "python3-hatch-vcs-native" | ||
| 15 | |||
| 16 | RDEPENDS:${PN} += " \ | ||
| 17 | python3-flask \ | ||
| 18 | python3-limits \ | ||
| 19 | python3-ordered-set \ | ||
| 20 | python3-werkzeug \ | ||
| 21 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb b/meta-python/recipes-devtools/python/python3-flask-mail_0.10.0.bb index c5b839eb72..5d3f60cff0 100644 --- a/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb +++ b/meta-python/recipes-devtools/python/python3-flask-mail_0.10.0.bb | |||
| @@ -2,14 +2,14 @@ SUMMARY = "Flask extension for sending email" | |||
| 2 | DESCRIPTION = "A Flask extension for sending email" | 2 | DESCRIPTION = "A Flask extension for sending email" |
| 3 | HOMEPAGE = " https://github.com/rduplain/flask-email" | 3 | HOMEPAGE = " https://github.com/rduplain/flask-email" |
| 4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5b16dfa6d3f275ace5985bb92949f770" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=201f2b80112efa61b78515bd54e9f138" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "22e5eb9a940bf407bcf30410ecc3708f3c56cc44b29c34e1726fe85006935f41" | 7 | SRC_URI[sha256sum] = "44083e7b02bbcce792209c06252f8569dd5a325a7aaa76afe7330422bd97881d" |
| 8 | 8 | ||
| 9 | PYPI_PACKAGE = "Flask-Mail" | 9 | PYPI_PACKAGE = "flask_mail" |
| 10 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 10 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 11 | 11 | ||
| 12 | inherit pypi setuptools3 | 12 | inherit pypi python_setuptools_build_meta |
| 13 | 13 | ||
| 14 | RDEPENDS:${PN} = " \ | 14 | RDEPENDS:${PN} = " \ |
| 15 | python3-blinker \ | 15 | python3-blinker \ |
diff --git a/meta-python/recipes-devtools/python/python3-flask-marshmallow_1.3.0.bb b/meta-python/recipes-devtools/python/python3-flask-marshmallow_1.4.0.bb index f0cc8ef64f..189ed5335b 100644 --- a/meta-python/recipes-devtools/python/python3-flask-marshmallow_1.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-flask-marshmallow_1.4.0.bb | |||
| @@ -8,7 +8,7 @@ inherit pypi python_flit_core | |||
| 8 | PYPI_PACKAGE = "flask_marshmallow" | 8 | PYPI_PACKAGE = "flask_marshmallow" |
| 9 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 9 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "27a35d0ce5dcba161cc5f2f4764afbc2536c93fa439a793250b827835e3f3be6" | 11 | SRC_URI[sha256sum] = "98c90a253052c72d2ddddc925539ac33bbd780c6fba86478ffe18e3b89d8b471" |
| 12 | 12 | ||
| 13 | RDEPENDS:${PN} += "\ | 13 | RDEPENDS:${PN} += "\ |
| 14 | python3-flask \ | 14 | python3-flask \ |
diff --git a/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.7.bb b/meta-python/recipes-devtools/python/python3-flask-migrate_4.1.0.bb index bacf7851aa..7cdada071f 100644 --- a/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.7.bb +++ b/meta-python/recipes-devtools/python/python3-flask-migrate_4.1.0.bb | |||
| @@ -2,9 +2,9 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb | |||
| 2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" |
| 4 | 4 | ||
| 5 | SRC_URI[sha256sum] = "dff7dd25113c210b069af280ea713b883f3840c1e3455274745d7355778c8622" | 5 | SRC_URI[sha256sum] = "1a336b06eb2c3ace005f5f2ded8641d534c18798d64061f6ff11f79e1434126d" |
| 6 | 6 | ||
| 7 | PYPI_PACKAGE = "Flask-Migrate" | 7 | PYPI_PACKAGE = "flask_migrate" |
| 8 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 8 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 9 | 9 | ||
| 10 | inherit pypi python_setuptools_build_meta | 10 | inherit pypi python_setuptools_build_meta |
diff --git a/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb b/meta-python/recipes-devtools/python/python3-flask-pymongo_3.0.1.bb index 75a52a033e..7773e2830e 100644 --- a/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-flask-pymongo_3.0.1.bb | |||
| @@ -5,13 +5,17 @@ SECTION = "devel/python" | |||
| 5 | LICENSE = "BSD-2-Clause" | 5 | LICENSE = "BSD-2-Clause" |
| 6 | LIC_FILES_CHKSUM = "file://flask_pymongo/wrappers.py;beginline=1;endline=24;md5=424c4e1047d28e01b4e4634a069c019d" | 6 | LIC_FILES_CHKSUM = "file://flask_pymongo/wrappers.py;beginline=1;endline=24;md5=424c4e1047d28e01b4e4634a069c019d" |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "620eb02dc8808a5fcb90f26cab6cba9d6bf497b15032ae3ca99df80366e33314" | 8 | SRC_URI[sha256sum] = "d225b51c21ceca2e670e6cca79b5c584ad17b96252b48e84e3b423ddb73304cc" |
| 9 | 9 | ||
| 10 | PYPI_PACKAGE = "Flask-PyMongo" | 10 | PYPI_PACKAGE = "flask_pymongo" |
| 11 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 11 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 12 | 12 | ||
| 13 | inherit pypi setuptools3 | 13 | inherit pypi python_setuptools_build_meta python_hatchling |
| 14 | 14 | ||
| 15 | DEPENDS = "python3-vcversioner python3-vcversioner-native" | 15 | DEPENDS = " \ |
| 16 | python3-vcversioner \ | ||
| 17 | python3-vcversioner-native \ | ||
| 18 | python3-hatchling-native \ | ||
| 19 | " | ||
| 16 | 20 | ||
| 17 | RDEPENDS:${PN} = "python3-pymongo python3-flask" | 21 | RDEPENDS:${PN} = "python3-pymongo python3-flask" |
diff --git a/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.6.bb b/meta-python/recipes-devtools/python/python3-flask-socketio_5.6.1.bb index 7371d7646c..9e94d20748 100644 --- a/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.6.bb +++ b/meta-python/recipes-devtools/python/python3-flask-socketio_5.6.1.bb | |||
| @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=38cc21254909604298ce763a6e4440a0" | |||
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
| 10 | PYPI_PACKAGE = "Flask-SocketIO" | 10 | PYPI_PACKAGE = "flask_socketio" |
| 11 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 11 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 12 | 12 | ||
| 13 | SRC_URI[sha256sum] = "bb8f9f9123ef47632f5ce57a33514b0c0023ec3696b2384457f0fcaa5b70501c" | 13 | SRC_URI[sha256sum] = "fe5bd995c3ed4da9a98f335d0d830fa1a19d84a64789f6265642a671fdacaeac" |
| 14 | 14 | ||
| 15 | RDEPENDS:${PN} += "\ | 15 | RDEPENDS:${PN} += "\ |
| 16 | python3-flask \ | 16 | python3-flask \ |
diff --git a/meta-python/recipes-devtools/python/python3-flask_3.1.2.bb b/meta-python/recipes-devtools/python/python3-flask_3.1.3.bb index 1b289c7227..559f781e7e 100644 --- a/meta-python/recipes-devtools/python/python3-flask_3.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-flask_3.1.3.bb | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | SUMMARY = "A microframework based on Werkzeug, Jinja2 and good intentions" | 1 | SUMMARY = "A microframework based on Werkzeug, Jinja2 and good intentions" |
| 2 | DESCRIPTION = "\ | 2 | DESCRIPTION = "\ |
| 3 | Flask is a microframework for Python based on Werkzeug, Jinja 2 and good \ | 3 | Flask is a microframework for Python based on Werkzeug, Jinja 2 and good \ |
| 4 | intentions. And before you ask: It’s BSD licensed!" | 4 | intentions. And before you ask: It is BSD licensed!" |
| 5 | HOMEPAGE = "https://github.com/pallets/flask" | 5 | HOMEPAGE = "https://github.com/pallets/flask" |
| 6 | LICENSE = "BSD-3-Clause" | 6 | LICENSE = "BSD-3-Clause" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ffeffa59c90c9c4a033c7574f8f3fb75" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ffeffa59c90c9c4a033c7574f8f3fb75" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "bf656c15c80190ed628ad08cdfd3aaa35beb087855e2f494910aa3774cc4fd87" | 9 | SRC_URI[sha256sum] = "0ef0e52b8a9cd932855379197dd8f94047b359ca0a78695144304cb45f87c9eb" |
| 10 | 10 | ||
| 11 | CVE_PRODUCT = "flask" | 11 | CVE_PRODUCT = "flask" |
| 12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-fsspec_2025.12.0.bb b/meta-python/recipes-devtools/python/python3-fsspec_2026.2.0.bb index ea3e63968f..3b165a663e 100644 --- a/meta-python/recipes-devtools/python/python3-fsspec_2025.12.0.bb +++ b/meta-python/recipes-devtools/python/python3-fsspec_2026.2.0.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/fsspec/filesystem_spec" | |||
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b38a11bf4dcdfc66307f8515ce1fbaa6" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b38a11bf4dcdfc66307f8515ce1fbaa6" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "c505de011584597b1060ff778bb664c1bc022e87921b0e4f10cc9c44f9635973" | 6 | SRC_URI[sha256sum] = "6544e34b16869f5aacd5b90bdf1a71acb37792ea3ddf6125ee69a22a53fb8bff" |
| 7 | 7 | ||
| 8 | inherit pypi python_hatchling ptest | 8 | inherit pypi python_hatchling ptest |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-gcovr_8.5.bb b/meta-python/recipes-devtools/python/python3-gcovr_8.6.bb index 68cc9bc274..3098681bef 100644 --- a/meta-python/recipes-devtools/python/python3-gcovr_8.5.bb +++ b/meta-python/recipes-devtools/python/python3-gcovr_8.6.bb | |||
| @@ -8,7 +8,7 @@ SRC_URI = " \ | |||
| 8 | git://github.com/gcovr/gcovr.git;branch=main;protocol=https \ | 8 | git://github.com/gcovr/gcovr.git;branch=main;protocol=https \ |
| 9 | file://0001-pyproject.toml-Support-newer-versions.patch \ | 9 | file://0001-pyproject.toml-Support-newer-versions.patch \ |
| 10 | " | 10 | " |
| 11 | SRCREV = "71eedb8f300612d4095f2ffa4ac60e3fdd58c192" | 11 | SRCREV = "e01ad73582821b5f90e079482164f8e885121e57" |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | inherit python_hatchling | 14 | inherit python_hatchling |
diff --git a/meta-python/recipes-devtools/python/python3-geojson/0001-Allow-install-over-python-3.14-329.patch b/meta-python/recipes-devtools/python/python3-geojson/0001-Allow-install-over-python-3.14-329.patch new file mode 100644 index 0000000000..c0022bcad7 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-geojson/0001-Allow-install-over-python-3.14-329.patch | |||
| @@ -0,0 +1,56 @@ | |||
| 1 | From 2584c0de5651bd694499449f9da5321b15597270 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: adelplanque <alaindelplanque@mailoo.org> | ||
| 3 | Date: Wed, 17 Dec 2025 22:22:28 +0100 | ||
| 4 | Subject: [PATCH] Allow install over python 3.14 (#329) | ||
| 5 | |||
| 6 | All tests pass over python 3.14.2 | ||
| 7 | |||
| 8 | Upstream-Status: Submitted [https://github.com/jazzband/geojson/pull/240] | ||
| 9 | |||
| 10 | Backport the relevant parts of an upstream PR to allow build with Python 3.14. | ||
| 11 | |||
| 12 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 13 | --- | ||
| 14 | README.rst | 2 +- | ||
| 15 | setup.py | 5 +++-- | ||
| 16 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/README.rst b/README.rst | ||
| 19 | index 26dc790..e3ac38a 100644 | ||
| 20 | --- a/README.rst | ||
| 21 | +++ b/README.rst | ||
| 22 | @@ -29,7 +29,7 @@ This Python library contains: | ||
| 23 | Installation | ||
| 24 | ------------ | ||
| 25 | |||
| 26 | -geojson is compatible with Python 3.7 - 3.13. The recommended way to install is via pip_: | ||
| 27 | +geojson is compatible with Python 3.7 - 3.14. The recommended way to install is via pip_: | ||
| 28 | |||
| 29 | .. code:: | ||
| 30 | |||
| 31 | diff --git a/setup.py b/setup.py | ||
| 32 | index 004d3eb..db277f1 100644 | ||
| 33 | --- a/setup.py | ||
| 34 | +++ b/setup.py | ||
| 35 | @@ -17,8 +17,8 @@ else: | ||
| 36 | |||
| 37 | |||
| 38 | major_version, minor_version = sys.version_info[:2] | ||
| 39 | -if not (major_version == 3 and 7 <= minor_version <= 13): | ||
| 40 | - sys.stderr.write("Sorry, only Python 3.7 - 3.13 are " | ||
| 41 | +if not (major_version == 3 and 7 <= minor_version <= 14): | ||
| 42 | + sys.stderr.write("Sorry, only Python 3.7 - 3.14 are " | ||
| 43 | "supported at this time.\n") | ||
| 44 | exit(1) | ||
| 45 | |||
| 46 | @@ -54,6 +54,7 @@ setup( | ||
| 47 | "Programming Language :: Python :: 3.11", | ||
| 48 | "Programming Language :: Python :: 3.12", | ||
| 49 | "Programming Language :: Python :: 3.13", | ||
| 50 | + "Programming Language :: Python :: 3.14", | ||
| 51 | "Topic :: Scientific/Engineering :: GIS", | ||
| 52 | ] | ||
| 53 | ) | ||
| 54 | -- | ||
| 55 | 2.52.0 | ||
| 56 | |||
diff --git a/meta-python/recipes-devtools/python/python3-geojson_3.2.0.bb b/meta-python/recipes-devtools/python/python3-geojson_3.2.0.bb index 9ee6d580b2..cdb019ebd5 100644 --- a/meta-python/recipes-devtools/python/python3-geojson_3.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-geojson_3.2.0.bb | |||
| @@ -5,6 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=f77f2ed49768c8d4c79ba874c0f94d8a" | |||
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "b860baba1e8c6f71f8f5f6e3949a694daccf40820fa8f138b3f712bd85804903" | 6 | SRC_URI[sha256sum] = "b860baba1e8c6f71f8f5f6e3949a694daccf40820fa8f138b3f712bd85804903" |
| 7 | 7 | ||
| 8 | SRC_URI += " \ | ||
| 9 | file://0001-Allow-install-over-python-3.14-329.patch \ | ||
| 10 | " | ||
| 11 | |||
| 8 | inherit pypi setuptools3 ptest-python-pytest | 12 | inherit pypi setuptools3 ptest-python-pytest |
| 9 | 13 | ||
| 10 | RDEPENDS:${PN} += "python3-simplejson python3-math" | 14 | RDEPENDS:${PN} += "python3-simplejson python3-math" |
diff --git a/meta-python/recipes-devtools/python/python3-gmpy2/0001-Avoid-do_configure-requires-check-error.patch b/meta-python/recipes-devtools/python/python3-gmpy2/0001-Avoid-do_configure-requires-check-error.patch new file mode 100644 index 0000000000..3c602cebe5 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-gmpy2/0001-Avoid-do_configure-requires-check-error.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | Subject: [PATCH] Avoid do_configure requires check error. | ||
| 2 | |||
| 3 | The gmpy2-2.3.0 need setuptools < 80, but version in oe-core is 80.9.0, | ||
| 4 | so fix it to avoid following error. | ||
| 5 | |||
| 6 | | ERROR Missing dependencies: | ||
| 7 | | setuptools<80,>=77 | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate | ||
| 10 | |||
| 11 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 12 | --- | ||
| 13 | pyproject.toml | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/pyproject.toml b/pyproject.toml | ||
| 17 | index 1f00809..3a4f3e2 100644 | ||
| 18 | --- a/pyproject.toml | ||
| 19 | +++ b/pyproject.toml | ||
| 20 | @@ -1,5 +1,5 @@ | ||
| 21 | [build-system] | ||
| 22 | -requires = ['setuptools>=77,<80', 'setuptools_scm[toml]>=6.0'] | ||
| 23 | +requires = ['setuptools>=77', 'setuptools_scm[toml]>=6.0'] | ||
| 24 | build-backend = 'setuptools.build_meta' | ||
| 25 | |||
| 26 | [project] | ||
| 27 | -- | ||
| 28 | 2.43.0 | ||
| 29 | |||
diff --git a/meta-python/recipes-devtools/python/python3-gmpy2_2.2.2.bb b/meta-python/recipes-devtools/python/python3-gmpy2_2.3.0.bb index 2196616a0e..841d87097d 100644 --- a/meta-python/recipes-devtools/python/python3-gmpy2_2.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-gmpy2_2.3.0.bb | |||
| @@ -1,13 +1,16 @@ | |||
| 1 | SUMMARY = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x" | 1 | SUMMARY = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x" |
| 2 | SECTION = "devel/python" | 2 | SECTION = "devel/python" |
| 3 | HOMEPAGE = "https://github.com/gmpy2/gmpy2" | ||
| 3 | LICENSE = "GPL-3.0-only | LGPL-3.0-or-later" | 4 | LICENSE = "GPL-3.0-only | LGPL-3.0-or-later" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ |
| 5 | file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" | 6 | file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" |
| 6 | 7 | ||
| 7 | DEPENDS += "gmp mpfr libmpc" | 8 | DEPENDS += "gmp mpfr libmpc python3-setuptools-scm-native" |
| 8 | 9 | ||
| 9 | SRC_URI[sha256sum] = "d9b8c81e0f5e1a3cabf1ea8d154b29b5ef6e33b8f4e4c37b3da957b2dd6a3fa8" | 10 | SRC_URI[sha256sum] = "2d943cc9051fcd6b15b2a09369e2f7e18c526bc04c210782e4da61b62495eb4a" |
| 10 | 11 | ||
| 11 | inherit pypi python_setuptools_build_meta python3native | 12 | SRC_URI += "file://0001-Avoid-do_configure-requires-check-error.patch" |
| 13 | |||
| 14 | inherit pypi python_setuptools_build_meta | ||
| 12 | 15 | ||
| 13 | BBCLASSEXTEND = "native nativesdk" | 16 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python3-google-auth_2.47.0.bb b/meta-python/recipes-devtools/python/python3-google-auth_2.48.0.bb index 3b141006a5..4e48c62861 100644 --- a/meta-python/recipes-devtools/python/python3-google-auth_2.47.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-auth_2.48.0.bb | |||
| @@ -9,7 +9,7 @@ SRC_URI += " \ | |||
| 9 | file://0001-python3-google-auth-Skip-mTLS-tests-in-ptest-environ.patch \ | 9 | file://0001-python3-google-auth-Skip-mTLS-tests-in-ptest-environ.patch \ |
| 10 | file://run-ptest \ | 10 | file://run-ptest \ |
| 11 | " | 11 | " |
| 12 | SRC_URI[sha256sum] = "833229070a9dfee1a353ae9877dcd2dec069a8281a4e72e72f77d4a70ff945da" | 12 | SRC_URI[sha256sum] = "4f7e706b0cd3208a3d940a19a822c37a476ddba5450156c3e6624a71f7c841ce" |
| 13 | 13 | ||
| 14 | PYPI_PACKAGE = "google_auth" | 14 | PYPI_PACKAGE = "google_auth" |
| 15 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 15 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
diff --git a/meta-python/recipes-devtools/python/python3-gpiod_2.4.0.bb b/meta-python/recipes-devtools/python/python3-gpiod_2.4.1.bb index 405951fe0c..61a3fb929e 100644 --- a/meta-python/recipes-devtools/python/python3-gpiod_2.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-gpiod_2.4.1.bb | |||
| @@ -1,13 +1,11 @@ | |||
| 1 | SUMMARY = "Python bindings for libgpiod." | 1 | SUMMARY = "Python bindings for libgpiod." |
| 2 | 2 | ||
| 3 | LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0" | 3 | LICENSE = "LGPL-2.1-or-later" |
| 4 | # The actual license files live in the upstream libgpiod from which the pypi | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4b54a1fd55a448865a0b32d41598759d" |
| 5 | # package is spun out. | ||
| 6 | LIC_FILES_CHKSUM = "file://pyproject.toml;beginline=13;endline=13;md5=0fbc720d3e48432ee239eedb6adb0f07" | ||
| 7 | 5 | ||
| 8 | SRC_URI += "file://run-ptest" | 6 | SRC_URI += "file://run-ptest" |
| 9 | 7 | ||
| 10 | SRC_URI[sha256sum] = "9243a1a59d084ec749d1df4a1e2f238ffb9d94515b0d9f5335460175143c3aa1" | 8 | SRC_URI[sha256sum] = "d29a1e8b2a065f7ed82f00a96009bc1486fc705bb2ad25820a8ae962ec6d7688" |
| 11 | 9 | ||
| 12 | inherit python_setuptools_build_meta python_pep517 ptest pypi | 10 | inherit python_setuptools_build_meta python_pep517 ptest pypi |
| 13 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-greenlet_3.3.0.bb b/meta-python/recipes-devtools/python/python3-greenlet_3.3.2.bb index b25e781c19..21d6d620cb 100644 --- a/meta-python/recipes-devtools/python/python3-greenlet_3.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-greenlet_3.3.2.bb | |||
| @@ -4,7 +4,7 @@ LICENSE = "MIT & PSF-2.0" | |||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ |
| 5 | file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" | 5 | file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "a82bb225a4e9e4d653dd2fb7b8b2d36e4fb25bc0165422a11e48b88e9e6f78fb" | 7 | SRC_URI[sha256sum] = "2eaf067fc6d886931c7962e8c6bede15d2f01965560f3359b27c80bde2d151f2" |
| 8 | 8 | ||
| 9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.76.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.78.0.bb index 037614da3e..6ac6a72d25 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.76.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.78.0.bb | |||
| @@ -13,11 +13,11 @@ DEPENDS += "c-ares openssl python3-protobuf re2 zlib" | |||
| 13 | SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ | 13 | SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ |
| 14 | file://abseil-ppc-fixes.patch \ | 14 | file://abseil-ppc-fixes.patch \ |
| 15 | " | 15 | " |
| 16 | SRC_URI[sha256sum] = "7be78388d6da1a25c0d5ec506523db58b18be22d9c37d8d3a32c08be4987bd73" | 16 | SRC_URI[sha256sum] = "7382b95189546f375c174f53a5fa873cef91c4b8005faa05cc5b3beea9c4f1c5" |
| 17 | 17 | ||
| 18 | RDEPENDS:${PN} = "python3-protobuf python3-typing-extensions" | 18 | RDEPENDS:${PN} = "python3-protobuf python3-typing-extensions" |
| 19 | 19 | ||
| 20 | inherit setuptools3 | 20 | inherit python_setuptools_build_meta cython |
| 21 | inherit pypi | 21 | inherit pypi |
| 22 | 22 | ||
| 23 | CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" | 23 | CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" |
| @@ -29,6 +29,12 @@ export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1" | |||
| 29 | export GRPC_PYTHON_BUILD_SYSTEM_RE2 = "1" | 29 | export GRPC_PYTHON_BUILD_SYSTEM_RE2 = "1" |
| 30 | export GRPC_PYTHON_BUILD_SYSTEM_ZLIB = "1" | 30 | export GRPC_PYTHON_BUILD_SYSTEM_ZLIB = "1" |
| 31 | 31 | ||
| 32 | do_configure:append() { | ||
| 33 | # Relax strict cython version pin so that the available cython satisfies the requirement. | ||
| 34 | # The C files are pre-generated so cython is not actually used during compilation. | ||
| 35 | sed -i 's/\"cython==/\"cython>=/' ${S}/pyproject.toml | ||
| 36 | } | ||
| 37 | |||
| 32 | do_compile:prepend() { | 38 | do_compile:prepend() { |
| 33 | export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="${@oe.utils.parallel_make(d, False)}" | 39 | export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="${@oe.utils.parallel_make(d, False)}" |
| 34 | } | 40 | } |
diff --git a/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb b/meta-python/recipes-devtools/python/python3-gunicorn_25.1.0.bb index f629214b5a..a8b06786ae 100644 --- a/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-gunicorn_25.1.0.bb | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | SUMMARY = "WSGI HTTP Server for UNIX" | 1 | SUMMARY = "WSGI HTTP Server for UNIX" |
| 2 | 2 | ||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5b70a8b30792a916f50dc96123e61ddf" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5dc9171ccd8fcbd7827c850148b3ca98" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec" | 6 | SRC_URI[sha256sum] = "1426611d959fa77e7de89f8c0f32eed6aa03ee735f98c01efba3e281b1c47616" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta ptest | 8 | inherit pypi python_setuptools_build_meta ptest |
| 9 | 9 | ||
| @@ -15,6 +15,7 @@ SRC_URI += " \ | |||
| 15 | 15 | ||
| 16 | # python-misc for wsgiref | 16 | # python-misc for wsgiref |
| 17 | RDEPENDS:${PN}-ptest += " \ | 17 | RDEPENDS:${PN}-ptest += " \ |
| 18 | bash \ | ||
| 18 | python3-eventlet \ | 19 | python3-eventlet \ |
| 19 | python3-gevent \ | 20 | python3-gevent \ |
| 20 | python3-misc \ | 21 | python3-misc \ |
diff --git a/meta-python/recipes-devtools/python/python3-h5py_3.15.0.bb b/meta-python/recipes-devtools/python/python3-h5py_3.16.0.bb index dd71a18534..883aeb2033 100644 --- a/meta-python/recipes-devtools/python/python3-h5py_3.15.0.bb +++ b/meta-python/recipes-devtools/python/python3-h5py_3.16.0.bb | |||
| @@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
| 4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "ede198dde0c359a3f9dc0af15962707c7195102235cb26b4826e33918789559a" | 7 | SRC_URI[sha256sum] = "a0dbaad796840ccaa67a4c144a0d0c8080073c34c76d5a6941d6818678ef2738" |
| 8 | 8 | ||
| 9 | SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch" | 9 | SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch" |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-html5lib/0001-setup.py-make-pkg_resources-import-optional-for-Pyth.patch b/meta-python/recipes-devtools/python/python3-html5lib/0001-setup.py-make-pkg_resources-import-optional-for-Pyth.patch new file mode 100644 index 0000000000..f791b663f2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-html5lib/0001-setup.py-make-pkg_resources-import-optional-for-Pyth.patch | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | From 5bae4e7b62996f1ef1b9ee6719581bde115d762c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Marko <peter.marko@siemens.com> | ||
| 3 | Date: Fri, 13 Mar 2026 13:37:58 +0100 | ||
| 4 | Subject: [PATCH] setup.py: make pkg_resources import optional for Python 3.12+ | ||
| 5 | |||
| 6 | pkg_resources has been removed from newer Python/setuptools versions. | ||
| 7 | Wrap the import in a try/except block and guard the usage site, | ||
| 8 | allowing html5lib to build without pkg_resources present. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 12 | --- | ||
| 13 | setup.py | 10 +++++++--- | ||
| 14 | 1 file changed, 7 insertions(+), 3 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/setup.py b/setup.py | ||
| 17 | index c393c9c..e659e98 100644 | ||
| 18 | --- a/setup.py | ||
| 19 | +++ b/setup.py | ||
| 20 | @@ -6,9 +6,13 @@ import sys | ||
| 21 | |||
| 22 | from os.path import join, dirname | ||
| 23 | from setuptools import setup, find_packages, __version__ as setuptools_version | ||
| 24 | -from pkg_resources import parse_version | ||
| 25 | |||
| 26 | -import pkg_resources | ||
| 27 | +try: | ||
| 28 | + from pkg_resources import parse_version | ||
| 29 | + import pkg_resources | ||
| 30 | +except ImportError: | ||
| 31 | + parse_version = None | ||
| 32 | + pkg_resources = None | ||
| 33 | |||
| 34 | try: | ||
| 35 | import _markerlib.markers | ||
| 36 | @@ -49,7 +53,7 @@ if _markerlib and sys.version_info[0] == 3: | ||
| 37 | # Avoid the very buggy pkg_resources.parser, which doesn't consistently | ||
| 38 | # recognise the markers needed by this setup.py | ||
| 39 | # Change this to setuptools 20.10.0 to support all markers. | ||
| 40 | -if pkg_resources: | ||
| 41 | +if pkg_resources and parse_version: | ||
| 42 | if parse_version(setuptools_version) < parse_version('18.5'): | ||
| 43 | MarkerEvaluation = pkg_resources.MarkerEvaluation | ||
| 44 | |||
diff --git a/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb b/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb index 3d7e44b87e..9c92164546 100644 --- a/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb +++ b/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb | |||
| @@ -3,6 +3,7 @@ LICENSE = "MIT" | |||
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1ba5ada9e6fead1fdc32f43c9f10ba7c" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1ba5ada9e6fead1fdc32f43c9f10ba7c" |
| 4 | 4 | ||
| 5 | SRC_URI += "file://0001-setup.py-fix-version-parsing-on-Python-3.14-ast.Str-.patch" | 5 | SRC_URI += "file://0001-setup.py-fix-version-parsing-on-Python-3.14-ast.Str-.patch" |
| 6 | SRC_URI += "file://0001-setup.py-make-pkg_resources-import-optional-for-Pyth.patch" | ||
| 6 | SRC_URI[sha256sum] = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f" | 7 | SRC_URI[sha256sum] = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f" |
| 7 | 8 | ||
| 8 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-httplib2_0.31.0.bb b/meta-python/recipes-devtools/python/python3-httplib2_0.31.2.bb index 39f3459320..073818a7f9 100644 --- a/meta-python/recipes-devtools/python/python3-httplib2_0.31.0.bb +++ b/meta-python/recipes-devtools/python/python3-httplib2_0.31.2.bb | |||
| @@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=56e5e931172b6164b62dc7c4aba6c8cf" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=56e5e931172b6164b62dc7c4aba6c8cf" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "ac7ab497c50975147d4f7b1ade44becc7df2f8954d42b38b3d69c515f531135c" | 7 | SRC_URI[sha256sum] = "385e0869d7397484f4eab426197a4c020b606edd43372492337c0b4010ae5d24" |
| 8 | 8 | ||
| 9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-httptools/0001-Allow-building-with-latest-setuptools.patch b/meta-python/recipes-devtools/python/python3-httptools/0001-Allow-building-with-latest-setuptools.patch new file mode 100644 index 0000000000..cad199f275 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-httptools/0001-Allow-building-with-latest-setuptools.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | From 61e4a5acc1ec27ca295f4c0f288b97208fec1f78 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sat, 14 Mar 2026 16:55:54 +0100 | ||
| 4 | Subject: [PATCH] Allow building with latest setuptools | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/MagicStack/httptools/pull/138] | ||
| 7 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 8 | --- | ||
| 9 | pyproject.toml | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/pyproject.toml b/pyproject.toml | ||
| 13 | index e2acba3..86c46de 100644 | ||
| 14 | --- a/pyproject.toml | ||
| 15 | +++ b/pyproject.toml | ||
| 16 | @@ -1,6 +1,6 @@ | ||
| 17 | [build-system] | ||
| 18 | build-backend = "setuptools.build_meta" | ||
| 19 | -requires = ["setuptools==80.9.0"] | ||
| 20 | +requires = ["setuptools>=80.9.0,<=82.0.1"] | ||
| 21 | |||
| 22 | [project] | ||
| 23 | name = "httptools" | ||
diff --git a/meta-python/recipes-devtools/python/python3-httptools_0.7.1.bb b/meta-python/recipes-devtools/python/python3-httptools_0.7.1.bb index f961745a1b..01e317732b 100644 --- a/meta-python/recipes-devtools/python/python3-httptools_0.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-httptools_0.7.1.bb | |||
| @@ -6,3 +6,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0a2d82955bf3facdf04cb882655e840e" | |||
| 6 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 6 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "abd72556974f8e7c74a259655924a717a2365b236c882c3f6f8a45fe94703ac9" | 8 | SRC_URI[sha256sum] = "abd72556974f8e7c74a259655924a717a2365b236c882c3f6f8a45fe94703ac9" |
| 9 | SRC_URI += "file://0001-Allow-building-with-latest-setuptools.patch" | ||
diff --git a/meta-python/recipes-devtools/python/python3-icecream_2.1.9.bb b/meta-python/recipes-devtools/python/python3-icecream_2.1.10.bb index 82b2039334..68728caf9b 100644 --- a/meta-python/recipes-devtools/python/python3-icecream_2.1.9.bb +++ b/meta-python/recipes-devtools/python/python3-icecream_2.1.10.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gruns/icecream" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eca5ce1610d64ed40920efdce85ff8d1" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eca5ce1610d64ed40920efdce85ff8d1" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "e47b6477d29848949ee5050127aeb88fd30f1908e5cf29772e8a1a0fcdf15473" | 6 | SRC_URI[sha256sum] = "15900126ba7dbe1f83819583cbe5ff79a2943224600878d89307e4633b32e528" |
| 7 | 7 | ||
| 8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-icontract_2.7.2.bb b/meta-python/recipes-devtools/python/python3-icontract_2.7.3.bb index 355f1fd88b..e76c7af8b0 100644 --- a/meta-python/recipes-devtools/python/python3-icontract_2.7.2.bb +++ b/meta-python/recipes-devtools/python/python3-icontract_2.7.3.bb | |||
| @@ -3,11 +3,9 @@ HOMEPAGE = "https://pypi.org/project/icontract" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1d4a9b1f6b84bedf7a38843931e0dd57" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1d4a9b1f6b84bedf7a38843931e0dd57" |
| 5 | 5 | ||
| 6 | PR = "r0" | ||
| 7 | |||
| 8 | inherit pypi setuptools3 | 6 | inherit pypi setuptools3 |
| 9 | PYPI_PACKAGE = "icontract" | 7 | PYPI_PACKAGE = "icontract" |
| 10 | SRC_URI[sha256sum] = "281ec16f1d09bbcca7a4227e82cd10b4d5fb291f638df77c29b7acf493dd3178" | 8 | SRC_URI[sha256sum] = "df37a43d86d532407bc6b84dea29dd9f7ece794b73211769fa8a33a76b8ed145" |
| 11 | 9 | ||
| 12 | RDEPENDS:${PN} += "python3-asttokens" | 10 | RDEPENDS:${PN} += "python3-asttokens" |
| 13 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-icu_2.16.bb b/meta-python/recipes-devtools/python/python3-icu_2.16.1.bb index c46e4e9f8b..44d8b9a701 100644 --- a/meta-python/recipes-devtools/python/python3-icu_2.16.bb +++ b/meta-python/recipes-devtools/python/python3-icu_2.16.1.bb | |||
| @@ -10,7 +10,7 @@ DEPENDS += "icu" | |||
| 10 | PYPI_PACKAGE = "pyicu" | 10 | PYPI_PACKAGE = "pyicu" |
| 11 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 11 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 12 | 12 | ||
| 13 | SRC_URI[sha256sum] = "42b3a8062e3b23e927ca727e6b5e1730d86c70279834e4887152895d2eb012d9" | 13 | SRC_URI[sha256sum] = "cafdc2bc6cfbb4b6e511dedeff37316f902af900993b576116b8243f4ad6478c" |
| 14 | 14 | ||
| 15 | SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch" | 15 | SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch" |
| 16 | 16 | ||
diff --git a/meta-python/recipes-devtools/python/python3-identify_2.6.15.bb b/meta-python/recipes-devtools/python/python3-identify_2.6.17.bb index c5498cf294..0ec329c954 100644 --- a/meta-python/recipes-devtools/python/python3-identify_2.6.15.bb +++ b/meta-python/recipes-devtools/python/python3-identify_2.6.17.bb | |||
| @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bbdc006359f3157660173ec7f133a80e" | |||
| 5 | PYPI_PACKAGE = "identify" | 5 | PYPI_PACKAGE = "identify" |
| 6 | 6 | ||
| 7 | inherit pypi setuptools3 | 7 | inherit pypi setuptools3 |
| 8 | SRC_URI[sha256sum] = "e4f4864b96c6557ef2a1e1c951771838f4edc9df3a72ec7118b338801b11c7bf" | 8 | |
| 9 | SRC_URI[sha256sum] = "f816b0b596b204c9fdf076ded172322f2723cf958d02f9c3587504834c8ff04d" | ||
| 9 | 10 | ||
| 10 | RDEPENDS:${PN} = " \ | 11 | RDEPENDS:${PN} = " \ |
| 11 | python3-ukkonen \ | 12 | python3-ukkonen \ |
diff --git a/meta-python/recipes-devtools/python/python3-inline-snapshot_0.30.1.bb b/meta-python/recipes-devtools/python/python3-inline-snapshot_0.32.4.bb index ea1f15a5bd..41b365963c 100644 --- a/meta-python/recipes-devtools/python/python3-inline-snapshot_0.30.1.bb +++ b/meta-python/recipes-devtools/python/python3-inline-snapshot_0.32.4.bb | |||
| @@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7a35eb90dfdf03953dd2074d0fdba1d4" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7a35eb90dfdf03953dd2074d0fdba1d4" |
| 5 | 5 | ||
| 6 | DEPENDS = "python3-hatchling-native" | 6 | DEPENDS = "python3-hatchling-native" |
| 7 | SRC_URI[sha256sum] = "77c2e94a40f2da02909b39e3386c9fc23f532c92af45558e2d7bbabb5fd0cbc1" | 7 | SRC_URI[sha256sum] = "f6c21f3a5cb8b4cc5a9ae80fa5d1b66bb642195884ddd6960d383c21a2258318" |
| 8 | 8 | ||
| 9 | inherit pypi python_hatchling | 9 | inherit pypi python_hatchling |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-ipython_9.9.0.bb b/meta-python/recipes-devtools/python/python3-ipython_9.11.0.bb index 53d334e251..3db3763f3e 100644 --- a/meta-python/recipes-devtools/python/python3-ipython_9.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-ipython_9.11.0.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://ipython.org" | |||
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" | 4 | LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "48fbed1b2de5e2c7177eefa144aba7fcb82dac514f09b57e2ac9da34ddb54220" | 6 | SRC_URI[sha256sum] = "2a94bc4406b22ecc7e4cb95b98450f3ea493a76bec8896cda11b78d7752a6667" |
| 7 | 7 | ||
| 8 | RDEPENDS:${PN} = "\ | 8 | RDEPENDS:${PN} = "\ |
| 9 | python3-setuptools \ | 9 | python3-setuptools \ |
diff --git a/meta-python/recipes-devtools/python/python3-isort_7.0.0.bb b/meta-python/recipes-devtools/python/python3-isort_8.0.1.bb index 86ad769b1d..b8e32a5563 100644 --- a/meta-python/recipes-devtools/python/python3-isort_7.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-isort_8.0.1.bb | |||
| @@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
| 4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=197c46995787b46a2dbf0d519c1754cf" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=197c46995787b46a2dbf0d519c1754cf" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "5513527951aadb3ac4292a41a16cbc50dd1642432f5e8c20057d414bdafb4187" | 7 | SRC_URI[sha256sum] = "171ac4ff559cdc060bcfff550bc8404a486fee0caab245679c2abe7cb253c78d" |
| 8 | 8 | ||
| 9 | inherit pypi python_hatchling | 9 | inherit pypi python_hatchling |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-jmespath_1.0.1.bb b/meta-python/recipes-devtools/python/python3-jmespath_1.1.0.bb index 73f5f4d025..5d03382e69 100644 --- a/meta-python/recipes-devtools/python/python3-jmespath_1.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-jmespath_1.1.0.bb | |||
| @@ -2,9 +2,9 @@ SUMMARY = "JMESPath (pronounced 'james path') allows you to declaratively specif | |||
| 2 | HOMEPAGE = "https://pypi.org/project/jmespath/" | 2 | HOMEPAGE = "https://pypi.org/project/jmespath/" |
| 3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2683790f5fabb41a3f75b70558799eb4" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=03b6f09850fb409684cafac03f85aff1" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe" | 7 | SRC_URI[sha256sum] = "472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d" |
| 8 | 8 | ||
| 9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-langtable_0.0.69.bb b/meta-python/recipes-devtools/python/python3-langtable_0.0.70.bb index 27ab97cd9b..7df58f4e0f 100644 --- a/meta-python/recipes-devtools/python/python3-langtable_0.0.69.bb +++ b/meta-python/recipes-devtools/python/python3-langtable_0.0.70.bb | |||
| @@ -6,7 +6,7 @@ SECTION = "devel/python" | |||
| 6 | 6 | ||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "f0a51870cf837fd689094ce73a420efa0b9b470facda551090f9a93d1e16510c" | 9 | SRC_URI[sha256sum] = "725b94121856a3b76d2345e8596954b82ed1eda78513e55ac55fbe4a4823e66e" |
| 10 | 10 | ||
| 11 | inherit pypi setuptools3 python3native | 11 | inherit pypi setuptools3 python3native |
| 12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-lief_0.17.2.bb b/meta-python/recipes-devtools/python/python3-lief_0.17.3.bb index 44b4976ab1..69e1d59956 100644 --- a/meta-python/recipes-devtools/python/python3-lief_0.17.2.bb +++ b/meta-python/recipes-devtools/python/python3-lief_0.17.3.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" | |||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9ab5db472ff936b441055522f5000547" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9ab5db472ff936b441055522f5000547" |
| 6 | SECTION = "libs" | 6 | SECTION = "libs" |
| 7 | 7 | ||
| 8 | SRCREV = "aa2b617f47c2f75fca9ff00b146dabbaf1b9f422" | 8 | SRCREV = "03aca30b53db2f336b36f90843061bb3f840ff5a" |
| 9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
| 10 | git://github.com/lief-project/LIEF.git;protocol=https;branch=release/0.17.x;tag=${PV} \ | 10 | git://github.com/lief-project/LIEF.git;protocol=https;branch=release/0.17.x;tag=${PV} \ |
| 11 | file://0001-build-requirements.txt-Allow-newer-versions.patch \ | 11 | file://0001-build-requirements.txt-Allow-newer-versions.patch \ |
diff --git a/meta-python/recipes-devtools/python/python3-limits_5.8.0.bb b/meta-python/recipes-devtools/python/python3-limits_5.8.0.bb new file mode 100644 index 0000000000..0439a0e132 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-limits_5.8.0.bb | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | SUMMARY = "Rate limiting utilities" | ||
| 2 | DESCRIPTION = "About Rate limiting using various strategies and \ | ||
| 3 | storage backends such as redis, memcached & mongodb" | ||
| 4 | HOMEPAGE = "https://github.com/alisaifee/limits" | ||
| 5 | LICENSE = "MIT" | ||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2455d5e574bc0fc489411ca45766ac78" | ||
| 7 | |||
| 8 | SRC_URI[sha256sum] = "c9e0d74aed837e8f6f50d1fcebcf5fd8130957287206bc3799adaee5092655da" | ||
| 9 | |||
| 10 | inherit pypi python_hatchling | ||
| 11 | |||
| 12 | DEPENDS += "python3-hatch-vcs-native" | ||
| 13 | |||
| 14 | RDEPENDS:${PN} += " \ | ||
| 15 | python3-deprecated \ | ||
| 16 | python3-packaging \ | ||
| 17 | python3-typing-extensions \ | ||
| 18 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-luma-oled_3.14.0.bb b/meta-python/recipes-devtools/python/python3-luma-oled_3.15.0.bb index 0c0906cedc..1182ad1de3 100644 --- a/meta-python/recipes-devtools/python/python3-luma-oled_3.14.0.bb +++ b/meta-python/recipes-devtools/python/python3-luma-oled_3.15.0.bb | |||
| @@ -4,11 +4,11 @@ A small library to drive an OLED device with either SSD1306 , SSD1309, SSD1322, | |||
| 4 | SSD1325, SSD1327, SSD1331, SSD1351 or SH1106 chipset" | 4 | SSD1325, SSD1327, SSD1331, SSD1351 or SH1106 chipset" |
| 5 | HOMEPAGE = "https://github.com/rm-hull/luma.oled" | 5 | HOMEPAGE = "https://github.com/rm-hull/luma.oled" |
| 6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=95cba8b3a40c6f55d5d901980fe6e067" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ddfca5d3a55dc20707b094137c913c4c" |
| 8 | 8 | ||
| 9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "36218565eda0614c8cf44ef42cb9a5904ddf808e4516e99ddae111fc93c5a206" | 11 | SRC_URI[sha256sum] = "16925fe668f484803df0683add800b19e5dd7316a1d64eb06ec2ae817473901e" |
| 12 | 12 | ||
| 13 | PYPI_PACKAGE = "luma_oled" | 13 | PYPI_PACKAGE = "luma_oled" |
| 14 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 14 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-fix-allow-64-bit-time_t-on-32-bit-systems-in-test_is.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-fix-allow-64-bit-time_t-on-32-bit-systems-in-test_is.patch deleted file mode 100644 index d49950074f..0000000000 --- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-fix-allow-64-bit-time_t-on-32-bit-systems-in-test_is.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From d123b4ddce99c44f2c290fb3d6cc887de98778e6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 3 | Date: Wed, 22 Oct 2025 15:23:56 +0800 | ||
| 4 | Subject: [PATCH 1/2] fix: allow 64-bit time_t on 32-bit systems in | ||
| 5 | test_is32bit | ||
| 6 | |||
| 7 | Some modern 32-bit Linux systems (e.g. with glibc >= 2.34 or musl time64 ABI) | ||
| 8 | use 64-bit time_t by default when _TIME_BITS=64 is enabled. The original test | ||
| 9 | assumed time_t was always 32-bit on 32-bit architectures, which is no longer | ||
| 10 | true. | ||
| 11 | |||
| 12 | Relax the check to accept both 32-bit and 64-bit time_t values: | ||
| 13 | |||
| 14 | self.assertIn(bit32, (32, 64)) | ||
| 15 | |||
| 16 | This makes the test compatible with both legacy and time64 ABIs. | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://gitlab.com/m2crypto/m2crypto/-/commit/818c3dfda6ea] | ||
| 19 | |||
| 20 | Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 21 | --- | ||
| 22 | tests/test_util.py | 2 +- | ||
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 24 | |||
| 25 | diff --git a/tests/test_util.py b/tests/test_util.py | ||
| 26 | index e925d03b090c..233fb7a099d9 100644 | ||
| 27 | --- a/tests/test_util.py | ||
| 28 | +++ b/tests/test_util.py | ||
| 29 | @@ -26,7 +26,7 @@ class UtilTestCase(unittest.TestCase): | ||
| 30 | not in ["true", "1", "yes"] | ||
| 31 | ) | ||
| 32 | ): | ||
| 33 | - self.assertEqual(bit32, 32) | ||
| 34 | + self.assertIn(bit32, (32, 64)) | ||
| 35 | else: | ||
| 36 | self.assertNotEqual(bit32, 32) | ||
| 37 | self.assertIsInstance(bit32, int) | ||
| 38 | -- | ||
| 39 | 2.34.1 | ||
| 40 | |||
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-fix-swig-avoid-clang-GNUC-pragma-block-before-_lib.h.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-fix-swig-avoid-clang-GNUC-pragma-block-before-_lib.h.patch new file mode 100644 index 0000000000..7aa768f44d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-fix-swig-avoid-clang-GNUC-pragma-block-before-_lib.h.patch | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | From df210da932c2cab9d3a80ee88c70611d77824a15 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
| 3 | Date: Wed, 18 Mar 2026 02:26:56 +0000 | ||
| 4 | Subject: [PATCH] fix(swig): avoid clang GNUC pragma block before _lib.h | ||
| 5 | |||
| 6 | Clang defines __GNUC__, so the old guard emitted PRAGMA_* tokens before | ||
| 7 | they were defined, breaking builds on macOS/clang; move the block after | ||
| 8 | <_lib.h> and exclude clang while keeping the GCC<5 workaround. | ||
| 9 | |||
| 10 | Fixes: https://todo.sr.ht/~mcepl/m2crypto/392 | ||
| 11 | |||
| 12 | Upstream-Status: Backport [git.sr.ht/~mcepl/m2crypto/commit/504ca8f438afb0f5041d2b5163e5f666a9a1b742.patch] | ||
| 13 | |||
| 14 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
| 15 | --- | ||
| 16 | src/SWIG/_m2crypto.i | 13 ++++++++----- | ||
| 17 | 1 file changed, 8 insertions(+), 5 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/src/SWIG/_m2crypto.i b/src/SWIG/_m2crypto.i | ||
| 20 | index d89d355..5426446 100644 | ||
| 21 | --- a/src/SWIG/_m2crypto.i | ||
| 22 | +++ b/src/SWIG/_m2crypto.i | ||
| 23 | @@ -43,15 +43,18 @@ typedef unsigned __int64 uint64_t; | ||
| 24 | %} | ||
| 25 | |||
| 26 | %{ | ||
| 27 | -#if defined __GNUC__ && __GNUC__ < 5 | ||
| 28 | -PRAGMA_IGNORE_UNUSED_LABEL | ||
| 29 | -PRAGMA_WARN_STRICT_PROTOTYPES | ||
| 30 | -#endif | ||
| 31 | - | ||
| 32 | #include <openssl/err.h> | ||
| 33 | #include <openssl/rand.h> | ||
| 34 | #include <_lib.h> | ||
| 35 | |||
| 36 | +/* _lib.h defines PRAGMA_* helpers; only needed for old GCC (clang defines | ||
| 37 | + * __GNUC__ too, but doesn't need this workaround). | ||
| 38 | + */ | ||
| 39 | +#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ < 5) | ||
| 40 | +PRAGMA_IGNORE_UNUSED_LABEL | ||
| 41 | +PRAGMA_WARN_STRICT_PROTOTYPES | ||
| 42 | +#endif | ||
| 43 | + | ||
| 44 | #include "compile.h" | ||
| 45 | |||
| 46 | static PyObject *ssl_verify_cb_func; | ||
| 47 | -- | ||
| 48 | 2.43.0 | ||
| 49 | |||
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0002-fix-correct-struct-packing-on-32-bit-with-_TIME_BITS.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0002-fix-correct-struct-packing-on-32-bit-with-_TIME_BITS.patch deleted file mode 100644 index c36afa5cc0..0000000000 --- a/meta-python/recipes-devtools/python/python3-m2crypto/0002-fix-correct-struct-packing-on-32-bit-with-_TIME_BITS.patch +++ /dev/null | |||
| @@ -1,72 +0,0 @@ | |||
| 1 | From b5dbfca23986429853ccb15a38cc526d9df0dd40 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 3 | Date: Wed, 22 Oct 2025 15:23:57 +0800 | ||
| 4 | Subject: [PATCH 2/2] fix: correct struct packing on 32-bit with _TIME_BITS=64 | ||
| 5 | |||
| 6 | On 32-bit platforms with glibc time64 ABI, time_t is 64-bit wide while | ||
| 7 | `long` remains 32-bit. This causes struct timeval to use two 64-bit fields | ||
| 8 | (tv_sec, tv_usec). The previous code incorrectly packed timeout as "ll", | ||
| 9 | leading to EINVAL in setsockopt(SO_RCVTIMEO). | ||
| 10 | |||
| 11 | Use "qq" instead when m2.time_t_bits() == 64 to match the actual ABI. | ||
| 12 | |||
| 13 | Fixes: https://todo.sr.ht/~mcepl/m2crypto/374 | ||
| 14 | |||
| 15 | Upstream-Status: Backport [https://gitlab.com/m2crypto/m2crypto/-/commit/473de659f78e] | ||
| 16 | |||
| 17 | Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 18 | --- | ||
| 19 | src/M2Crypto/SSL/timeout.py | 24 ++++++++++++++++++++---- | ||
| 20 | 1 file changed, 20 insertions(+), 4 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/src/M2Crypto/SSL/timeout.py b/src/M2Crypto/SSL/timeout.py | ||
| 23 | index b45f38b1cbdb..5ba52283b6f8 100644 | ||
| 24 | --- a/src/M2Crypto/SSL/timeout.py | ||
| 25 | +++ b/src/M2Crypto/SSL/timeout.py | ||
| 26 | @@ -33,10 +33,14 @@ class timeout(object): | ||
| 27 | millisec = int(self.sec * 1000 + round(float(self.microsec) / 1000)) | ||
| 28 | binstr = struct.pack("l", millisec) | ||
| 29 | else: | ||
| 30 | - if m2.time_t_bits() == 32: | ||
| 31 | + bits = m2.time_t_bits() | ||
| 32 | + if bits == 32: | ||
| 33 | binstr = struct.pack("ii", self.sec, self.microsec) | ||
| 34 | + elif bits == 64: | ||
| 35 | + # handle both 64-bit and 32-bit+TIME_BITS=64 | ||
| 36 | + binstr = struct.pack("qq", self.sec, self.microsec) | ||
| 37 | else: | ||
| 38 | - binstr = struct.pack("ll", self.sec, self.microsec) | ||
| 39 | + raise ValueError(f"Unsupported time_t_bits: {bits}") | ||
| 40 | return binstr | ||
| 41 | |||
| 42 | |||
| 43 | @@ -48,7 +52,13 @@ def struct_to_timeout(binstr: bytes) -> timeout: | ||
| 44 | sec = int(millisec / 1000) | ||
| 45 | microsec = (millisec % 1000) * 1000 | ||
| 46 | else: | ||
| 47 | - (sec, microsec) = struct.unpack("ll", binstr) | ||
| 48 | + bits = m2.time_t_bits() | ||
| 49 | + if bits == 32: | ||
| 50 | + (sec, microsec) = struct.unpack("ii", binstr) | ||
| 51 | + elif bits == 64: | ||
| 52 | + (sec, microsec) = struct.unpack("qq", binstr) | ||
| 53 | + else: | ||
| 54 | + raise ValueError(f"Unsupported time_t_bits: {bits}") | ||
| 55 | return timeout(sec, microsec) | ||
| 56 | |||
| 57 | |||
| 58 | @@ -56,4 +66,10 @@ def struct_size() -> int: | ||
| 59 | if sys.platform == "win32": | ||
| 60 | return struct.calcsize("l") | ||
| 61 | else: | ||
| 62 | - return struct.calcsize("ll") | ||
| 63 | + bits = m2.time_t_bits() | ||
| 64 | + if bits == 32: | ||
| 65 | + return struct.calcsize("ii") | ||
| 66 | + elif bits == 64: | ||
| 67 | + return struct.calcsize("qq") | ||
| 68 | + else: | ||
| 69 | + raise ValueError(f"Unsupported time_t_bits: {bits}") | ||
| 70 | -- | ||
| 71 | 2.34.1 | ||
| 72 | |||
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.46.2.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.47.0.bb index bd7a2369bd..0ebe30f81c 100644 --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.46.2.bb +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.47.0.bb | |||
| @@ -4,13 +4,10 @@ HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto" | |||
| 4 | LICENSE = "BSD-2-Clause" | 4 | LICENSE = "BSD-2-Clause" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSES/BSD-2-Clause.txt;md5=8099b0e569f862ece05740aef06c82a2" | 5 | LIC_FILES_CHKSUM = "file://LICENSES/BSD-2-Clause.txt;md5=8099b0e569f862ece05740aef06c82a2" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "13c2fa89562f7b8af40cc74b55f490be5e2ab8ccfb739f11c16d3ce6221a61ba" | 7 | SRC_URI[sha256sum] = "9256300be1e0412be802aa1f827e0ce7f94deb1099b8ccdcfd9867a7f0f975bf" |
| 8 | 8 | ||
| 9 | SRC_URI += " \ | 9 | SRC_URI += "file://0001-setup.py-Make-the-cmd-available.patch \ |
| 10 | file://0001-setup.py-Make-the-cmd-available.patch \ | 10 | file://0001-fix-swig-avoid-clang-GNUC-pragma-block-before-_lib.h.patch" |
| 11 | file://0001-fix-allow-64-bit-time_t-on-32-bit-systems-in-test_is.patch \ | ||
| 12 | file://0002-fix-correct-struct-packing-on-32-bit-with-_TIME_BITS.patch \ | ||
| 13 | " | ||
| 14 | 11 | ||
| 15 | CVE_STATUS[CVE-2009-0127] = "disputed: upstream claims there is no bug" | 12 | CVE_STATUS[CVE-2009-0127] = "disputed: upstream claims there is no bug" |
| 16 | CVE_STATUS[CVE-2020-25657] = "fixed-version: the used version (0.46.2) contains the fix already" | 13 | CVE_STATUS[CVE-2020-25657] = "fixed-version: the used version (0.46.2) contains the fix already" |
| @@ -44,7 +41,7 @@ export SWIG_FEATURES | |||
| 44 | 41 | ||
| 45 | export STAGING_DIR | 42 | export STAGING_DIR |
| 46 | 43 | ||
| 47 | do_configure:prepend() { | 44 | do_configure:prepend:class-target() { |
| 48 | # workaround for https://github.com/swiftlang/swift/issues/69311 | 45 | # workaround for https://github.com/swiftlang/swift/issues/69311 |
| 49 | sed -i "/sys\/types.h/d" ${RECIPE_SYSROOT}${includedir}/openssl/e_os2.h | 46 | sed -i "/sys\/types.h/d" ${RECIPE_SYSROOT}${includedir}/openssl/e_os2.h |
| 50 | } | 47 | } |
diff --git a/meta-python/recipes-devtools/python/python3-marshmallow_4.2.0.bb b/meta-python/recipes-devtools/python/python3-marshmallow_4.2.2.bb index 006f91838c..4172a3e745 100644 --- a/meta-python/recipes-devtools/python/python3-marshmallow_4.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-marshmallow_4.2.2.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "\ | |||
| 6 | file://LICENSE;md5=27586b20700d7544c06933afe56f7df4 \ | 6 | file://LICENSE;md5=27586b20700d7544c06933afe56f7df4 \ |
| 7 | file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb" | 7 | file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "908acabd5aa14741419d3678d3296bda6abe28a167b7dcd05969ceb8256943ac" | 9 | SRC_URI[sha256sum] = "ba40340683a2d1c15103647994ff2f6bc2c8c80da01904cbe5d96ee4baa78d9f" |
| 10 | 10 | ||
| 11 | CVE_PRODUCT = "marshmallow" | 11 | CVE_PRODUCT = "marshmallow" |
| 12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.10.8.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.10.8.bb index ce8c7a276a..8489b91402 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib_3.10.8.bb +++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.10.8.bb | |||
| @@ -47,6 +47,8 @@ RDEPENDS:${PN} = "\ | |||
| 47 | python3-packaging \ | 47 | python3-packaging \ |
| 48 | " | 48 | " |
| 49 | 49 | ||
| 50 | TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}" | ||
| 51 | |||
| 50 | CVE_PRODUCT = "matplotlib" | 52 | CVE_PRODUCT = "matplotlib" |
| 51 | 53 | ||
| 52 | BBCLASSEXTEND = "native" | 54 | BBCLASSEXTEND = "native" |
diff --git a/meta-python/recipes-devtools/python/python3-mmh3_5.2.0.bb b/meta-python/recipes-devtools/python/python3-mmh3_5.2.1.bb index c719762885..5d4030f46e 100644 --- a/meta-python/recipes-devtools/python/python3-mmh3_5.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-mmh3_5.2.1.bb | |||
| @@ -2,10 +2,10 @@ SUMMARY = "Python extension for MurmurHash (MurmurHash3), a set of fast and \ | |||
| 2 | robust hash functions" | 2 | robust hash functions" |
| 3 | HOMEPAGE = "https://github.com/hajimes/mmh3" | 3 | HOMEPAGE = "https://github.com/hajimes/mmh3" |
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2edf2352bb2cd3d7787f05247781b314" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=53366c60f8214cfc1d3622ebacd141fb" |
| 6 | 6 | ||
| 7 | inherit pypi python_setuptools_build_meta | 7 | inherit pypi python_setuptools_build_meta |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "1efc8fec8478e9243a78bb993422cf79f8ff85cb4cf6b79647480a31e0d950a8" | 9 | SRC_URI[sha256sum] = "bbea5b775f0ac84945191fb83f845a6fd9a21a03ea7f2e187defac7e401616ad" |
| 10 | 10 | ||
| 11 | BBCLASSEXTEND = "native nativesdk" | 11 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python3-moteus_0.3.97.bb b/meta-python/recipes-devtools/python/python3-moteus_0.3.99.bb index 313619a5b2..3de7f6a0ec 100644 --- a/meta-python/recipes-devtools/python/python3-moteus_0.3.97.bb +++ b/meta-python/recipes-devtools/python/python3-moteus_0.3.99.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=9;md5=24025d3c660abfc62a | |||
| 5 | 5 | ||
| 6 | inherit pypi setuptools3 | 6 | inherit pypi setuptools3 |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "59f6f185390822c41f993c56027e4be338be87d40435acb0e10df1d68d662e69" | 8 | SRC_URI[sha256sum] = "30d3cafa6b23692536102f52d9a7d919f2775fa75bdee087f98782c7e3c88805" |
| 9 | 9 | ||
| 10 | S = "${UNPACKDIR}/moteus-${PV}" | 10 | S = "${UNPACKDIR}/moteus-${PV}" |
| 11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb b/meta-python/recipes-devtools/python/python3-mpmath_1.4.0.bb index 21bae9778c..12ded173e9 100644 --- a/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-mpmath_1.4.0.bb | |||
| @@ -4,13 +4,13 @@ | |||
| 4 | SUMMARY = "Python library for arbitrary-precision floating-point arithmetic" | 4 | SUMMARY = "Python library for arbitrary-precision floating-point arithmetic" |
| 5 | HOMEPAGE = "https://pypi.org/project/mpmath/" | 5 | HOMEPAGE = "https://pypi.org/project/mpmath/" |
| 6 | LICENSE = "BSD-3-Clause" | 6 | LICENSE = "BSD-3-Clause" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bde3c575382996b75d85702949512751" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a6607bd72611b702183473dfb4e6198b" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f" | 9 | SRC_URI[sha256sum] = "d272b40c031ba0ee385e7e5fc735b48560d9838a0d7fbca109919efd23580a22" |
| 10 | 10 | ||
| 11 | CVE_PRODUCT = "mpmath" | 11 | CVE_PRODUCT = "mpmath" |
| 12 | 12 | ||
| 13 | inherit pypi setuptools3 | 13 | inherit pypi python_setuptools_build_meta |
| 14 | 14 | ||
| 15 | DEPENDS += "python3-setuptools-scm-native" | 15 | DEPENDS += "python3-setuptools-scm-native" |
| 16 | RDEPENDS:${PN} += " \ | 16 | RDEPENDS:${PN} += " \ |
diff --git a/meta-python/recipes-devtools/python/python3-multidict_6.7.0.bb b/meta-python/recipes-devtools/python/python3-multidict_6.7.1.bb index 821a880291..15848fefec 100644 --- a/meta-python/recipes-devtools/python/python3-multidict_6.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-multidict_6.7.1.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b4fef6e4b0828c2401fb983363985b39" | |||
| 6 | 6 | ||
| 7 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 7 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "c6e99d9a65ca282e578dfea819cfa9c0a62b2499d8677392e09feaf305e9e6f5" | 9 | SRC_URI[sha256sum] = "ec6652a1bee61c53a3e5776b6049172c53b6aaba34f18c9ad04f82712bac623d" |
| 10 | 10 | ||
| 11 | RDEPENDS:${PN}-ptest += " \ | 11 | RDEPENDS:${PN}-ptest += " \ |
| 12 | python3-objgraph \ | 12 | python3-objgraph \ |
diff --git a/meta-python/recipes-devtools/python/python3-multiprocess_0.70.19.bb b/meta-python/recipes-devtools/python/python3-multiprocess_0.70.19.bb new file mode 100644 index 0000000000..394945df1b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-multiprocess_0.70.19.bb | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | SUMMARY = "Multiprocess extends multiprocessing to provide enhanced serialization, using dill." | ||
| 2 | |||
| 3 | LICENSE = "BSD-3-Clause" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4e77a25170a36f151649917fe8d2858e" | ||
| 5 | |||
| 6 | SRC_URI[sha256sum] = "952021e0e6c55a4a9fe4cd787895b86e239a40e76802a789d6305398d3975897" | ||
| 7 | |||
| 8 | inherit pypi python_setuptools_build_meta | ||
| 9 | |||
| 10 | RDEPENDS:${PN} += "python3-dill" | ||
diff --git a/meta-python/recipes-devtools/python/python3-mypy_1.17.0.bb b/meta-python/recipes-devtools/python/python3-mypy_1.17.0.bb index 94aaabde4e..419de2570a 100644 --- a/meta-python/recipes-devtools/python/python3-mypy_1.17.0.bb +++ b/meta-python/recipes-devtools/python/python3-mypy_1.17.0.bb | |||
| @@ -20,5 +20,6 @@ DEPENDS += " \ | |||
| 20 | RDEPENDS:${PN} += " \ | 20 | RDEPENDS:${PN} += " \ |
| 21 | python3-modules \ | 21 | python3-modules \ |
| 22 | python3-mypy-extensions \ | 22 | python3-mypy-extensions \ |
| 23 | python3-pathspec \ | ||
| 23 | python3-typing-extensions \ | 24 | python3-typing-extensions \ |
| 24 | " | 25 | " |
diff --git a/meta-python/recipes-devtools/python/python3-nanobind_2.10.2.bb b/meta-python/recipes-devtools/python/python3-nanobind_2.12.0.bb index 12b7ff5133..58dbb30c84 100644 --- a/meta-python/recipes-devtools/python/python3-nanobind_2.10.2.bb +++ b/meta-python/recipes-devtools/python/python3-nanobind_2.12.0.bb | |||
| @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/wjakob/nanobind" | |||
| 4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7646f9ee25e49eaf53f89a10665c568c" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7646f9ee25e49eaf53f89a10665c568c" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "08509910ce6d1fadeed69cb0880d4d4fcb77739c6af9bd8fb4419391a3ca4c6b" | 7 | SRC_URI[sha256sum] = "0ae77c1a88f27153fa57045ee00f7b0a7b06b1cd3df942e95a34b38c5d0a5bee" |
| 8 | 8 | ||
| 9 | inherit pypi cmake python_setuptools_build_meta | 9 | inherit pypi cmake python_setuptools_build_meta |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-ninja/CMakeLists.txt b/meta-python/recipes-devtools/python/python3-ninja/CMakeLists.txt deleted file mode 100644 index 04fa451e72..0000000000 --- a/meta-python/recipes-devtools/python/python3-ninja/CMakeLists.txt +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | cmake_minimum_required(VERSION 3.15) | ||
| 2 | |||
| 3 | project(NinjaPythonDistributions) | ||
| 4 | |||
| 5 | set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH}) | ||
| 6 | |||
| 7 | install(CODE " | ||
| 8 | message(STATUS \"Install ninja project\") | ||
| 9 | ") | ||
diff --git a/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch b/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch index b7d191e244..4dfbb2675a 100644 --- a/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch +++ b/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch | |||
| @@ -1,31 +1,22 @@ | |||
| 1 | We don't need to build ninja so there's no need to use scikit-build, | 1 | We don't need to build ninja so there's no need to use scikit-build-core, |
| 2 | as we just need the python module with it's one ninja() function. | 2 | as we just need the python module with its one ninja() function. |
| 3 | 3 | ||
| 4 | Upstream-Status: Inappropriate | 4 | Upstream-Status: Inappropriate |
| 5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 5 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 6 | Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> | ||
| 6 | 7 | ||
| 7 | diff --git a/pyproject.toml b/pyproject.toml | ||
| 8 | index b895c20..577b642 100644 | ||
| 9 | --- a/pyproject.toml | 8 | --- a/pyproject.toml |
| 10 | +++ b/pyproject.toml | 9 | +++ b/pyproject.toml |
| 11 | @@ -2,7 +2,6 @@ | 10 | @@ -1,5 +1,4 @@ |
| 12 | requires = [ | 11 | [build-system] |
| 13 | "setuptools >=42", | 12 | -requires = ["scikit-build-core>=0.10"] |
| 14 | "setuptools-scm[toml]", | 13 | -build-backend = "backend" |
| 15 | - "scikit-build", | 14 | -backend-path = ["_build_backend"] |
| 16 | ] | 15 | +requires = ["setuptools", "setuptools-scm"] |
| 17 | build-backend = "setuptools.build_meta" | 16 | +build-backend = "setuptools.build_meta" |
| 18 | 17 | ||
| 19 | diff --git a/setup.py b/setup.py | 18 | @@ -7,3 +6,3 @@ |
| 20 | index dbe1fbc..3259754 100755 | 19 | name = "ninja" |
| 21 | --- a/setup.py | 20 | -dynamic = ["version", "readme"] |
| 22 | +++ b/setup.py | 21 | +dynamic = ["version"] |
| 23 | @@ -5,7 +5,7 @@ import os | 22 | description = "Ninja is a small build system with a focus on speed" |
| 24 | import sys | ||
| 25 | from distutils.text_file import TextFile | ||
| 26 | |||
| 27 | -from skbuild import setup | ||
| 28 | +from setuptools import setup | ||
| 29 | |||
| 30 | # Add current folder to path | ||
| 31 | # This is required to import versioneer in an isolated pip build | ||
diff --git a/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch b/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch deleted file mode 100644 index 0068efcc3a..0000000000 --- a/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | There's no need to hunt around source or install trees when we're just running ninja | ||
| 2 | from PATH. | ||
| 3 | |||
| 4 | Upstream-Status: Inappropriate | ||
| 5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 6 | |||
| 7 | diff --git a/src/ninja/__init__.py b/src/ninja/__init__.py | ||
| 8 | index f83767e..31bb926 100644 | ||
| 9 | --- a/src/ninja/__init__.py | ||
| 10 | +++ b/src/ninja/__init__.py | ||
| 11 | @@ -19,32 +19,9 @@ except ImportError: | ||
| 12 | os.path.dirname(__file__), '../../Ninja-src/misc'))) | ||
| 13 | from ninja_syntax import Writer, escape, expand # noqa: F401 | ||
| 14 | |||
| 15 | -DATA = os.path.join(os.path.dirname(__file__), 'data') | ||
| 16 | - | ||
| 17 | -# Support running tests from the source tree | ||
| 18 | -if not os.path.exists(DATA): | ||
| 19 | - from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR | ||
| 20 | - from skbuild.constants import set_skbuild_plat_name | ||
| 21 | - | ||
| 22 | - if platform.system().lower() == "darwin": | ||
| 23 | - # Since building the project specifying --plat-name or CMAKE_OSX_* variables | ||
| 24 | - # leads to different SKBUILD_DIR, the code below attempt to guess the most | ||
| 25 | - # likely plat-name. | ||
| 26 | - _skbuild_dirs = os.listdir(os.path.join(os.path.dirname(__file__), '..', '..', '_skbuild')) | ||
| 27 | - if _skbuild_dirs: | ||
| 28 | - _likely_plat_name = '-'.join(_skbuild_dirs[0].split('-')[:3]) | ||
| 29 | - set_skbuild_plat_name(_likely_plat_name) | ||
| 30 | - | ||
| 31 | - _data = os.path.abspath(os.path.join( | ||
| 32 | - os.path.dirname(__file__), '..', '..', SKBUILD_CMAKE_INSTALL_DIR(), 'src/ninja/data')) | ||
| 33 | - if os.path.exists(_data): | ||
| 34 | - DATA = _data | ||
| 35 | - | ||
| 36 | -BIN_DIR = os.path.join(DATA, 'bin') | ||
| 37 | - | ||
| 38 | |||
| 39 | def _program(name, args): | ||
| 40 | - return subprocess.call([os.path.join(BIN_DIR, name)] + args, close_fds=False) | ||
| 41 | + return subprocess.call([name] + args, close_fds=False) | ||
| 42 | |||
| 43 | |||
| 44 | def ninja(): | ||
diff --git a/meta-python/recipes-devtools/python/python3-ninja_1.11.1.1.bb b/meta-python/recipes-devtools/python/python3-ninja_1.13.0.bb index 8f2e6528db..1591be0912 100644 --- a/meta-python/recipes-devtools/python/python3-ninja_1.11.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-ninja_1.13.0.bb | |||
| @@ -6,10 +6,9 @@ PYPI_PACKAGE = "ninja" | |||
| 6 | PYPI_ARCHIVE_NAME_PREFIX = "pypi-" | 6 | PYPI_ARCHIVE_NAME_PREFIX = "pypi-" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | SRC_URI[sha256sum] = "9d793b08dd857e38d0b6ffe9e6b7145d7c485a42dcfea04905ca0cdb6017cc3c" | 9 | SRC_URI[sha256sum] = "4a40ce995ded54d9dc24f8ea37ff3bf62ad192b547f6c7126e7e25045e76f978" |
| 10 | 10 | ||
| 11 | SRC_URI += "file://no-scikit-build.patch \ | 11 | SRC_URI += "file://no-scikit-build.patch " |
| 12 | file://run-ninja-from-path.patch" | ||
| 13 | 12 | ||
| 14 | DEPENDS += "python3-setuptools-scm-native" | 13 | DEPENDS += "python3-setuptools-scm-native" |
| 15 | 14 | ||
diff --git a/meta-python/recipes-devtools/python/python3-orjson-crates.inc b/meta-python/recipes-devtools/python/python3-orjson-crates.inc index 76ed174329..5e3aa8592b 100644 --- a/meta-python/recipes-devtools/python/python3-orjson-crates.inc +++ b/meta-python/recipes-devtools/python/python3-orjson-crates.inc | |||
| @@ -3,82 +3,86 @@ | |||
| 3 | # from Cargo.lock | 3 | # from Cargo.lock |
| 4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
| 5 | crate://crates.io/associative-cache/2.0.0 \ | 5 | crate://crates.io/associative-cache/2.0.0 \ |
| 6 | crate://crates.io/bytecount/0.6.8 \ | 6 | crate://crates.io/bytecount/0.6.9 \ |
| 7 | crate://crates.io/castaway/0.2.3 \ | 7 | crate://crates.io/bytes/1.11.0 \ |
| 8 | crate://crates.io/cc/1.2.20 \ | 8 | crate://crates.io/cc/1.2.55 \ |
| 9 | crate://crates.io/cfg-if/1.0.0 \ | 9 | crate://crates.io/cfg-if/1.0.4 \ |
| 10 | crate://crates.io/compact_str/0.9.0 \ | 10 | crate://crates.io/crunchy/0.2.4 \ |
| 11 | crate://crates.io/crunchy/0.2.3 \ | ||
| 12 | crate://crates.io/encoding_rs/0.8.35 \ | 11 | crate://crates.io/encoding_rs/0.8.35 \ |
| 13 | crate://crates.io/gimli/0.31.1 \ | 12 | crate://crates.io/find-msvc-tools/0.1.9 \ |
| 14 | crate://crates.io/half/2.6.0 \ | 13 | crate://crates.io/gimli/0.32.3 \ |
| 15 | crate://crates.io/itoa/1.0.15 \ | 14 | crate://crates.io/half/2.7.1 \ |
| 15 | crate://crates.io/itoa/1.0.17 \ | ||
| 16 | crate://crates.io/itoap/1.0.1 \ | 16 | crate://crates.io/itoap/1.0.1 \ |
| 17 | crate://crates.io/jiff/0.2.10 \ | 17 | crate://crates.io/jiff/0.2.18 \ |
| 18 | crate://crates.io/jiff-static/0.2.10 \ | 18 | crate://crates.io/jiff-static/0.2.18 \ |
| 19 | crate://crates.io/libc/0.2.172 \ | 19 | crate://crates.io/libc/0.2.180 \ |
| 20 | crate://crates.io/memchr/2.7.4 \ | 20 | crate://crates.io/memchr/2.7.6 \ |
| 21 | crate://crates.io/no-panic/0.1.36 \ | ||
| 21 | crate://crates.io/once_cell/1.21.3 \ | 22 | crate://crates.io/once_cell/1.21.3 \ |
| 22 | crate://crates.io/portable-atomic/1.11.0 \ | 23 | crate://crates.io/portable-atomic/1.13.1 \ |
| 23 | crate://crates.io/portable-atomic-util/0.2.4 \ | 24 | crate://crates.io/portable-atomic-util/0.2.5 \ |
| 24 | crate://crates.io/proc-macro2/1.0.95 \ | 25 | crate://crates.io/proc-macro2/1.0.106 \ |
| 25 | crate://crates.io/pyo3-build-config/0.23.3 \ | 26 | crate://crates.io/pyo3-build-config/0.28.0 \ |
| 26 | crate://crates.io/pyo3-ffi/0.23.3 \ | 27 | crate://crates.io/pyo3-ffi/0.28.0 \ |
| 27 | crate://crates.io/quote/1.0.40 \ | 28 | crate://crates.io/quote/1.0.44 \ |
| 28 | crate://crates.io/rustversion/1.0.20 \ | 29 | crate://crates.io/serde/1.0.228 \ |
| 29 | crate://crates.io/ryu/1.0.20 \ | 30 | crate://crates.io/serde_core/1.0.228 \ |
| 30 | crate://crates.io/serde/1.0.219 \ | 31 | crate://crates.io/serde_derive/1.0.228 \ |
| 31 | crate://crates.io/serde_derive/1.0.219 \ | 32 | crate://crates.io/serde_json/1.0.149 \ |
| 32 | crate://crates.io/serde_json/1.0.140 \ | ||
| 33 | crate://crates.io/shlex/1.3.0 \ | 33 | crate://crates.io/shlex/1.3.0 \ |
| 34 | crate://crates.io/simdutf8/0.1.5 \ | 34 | crate://crates.io/simdutf8/0.1.5 \ |
| 35 | crate://crates.io/smallvec/1.15.0 \ | 35 | crate://crates.io/smallvec/1.15.1 \ |
| 36 | crate://crates.io/static_assertions/1.1.0 \ | 36 | crate://crates.io/syn/2.0.114 \ |
| 37 | crate://crates.io/syn/2.0.101 \ | 37 | crate://crates.io/target-lexicon/0.13.4 \ |
| 38 | crate://crates.io/target-lexicon/0.13.2 \ | 38 | crate://crates.io/unicode-ident/1.0.22 \ |
| 39 | crate://crates.io/unicode-ident/1.0.18 \ | 39 | crate://crates.io/unwinding/0.2.8 \ |
| 40 | crate://crates.io/unwinding/0.2.5 \ | 40 | crate://crates.io/uuid/1.20.0 \ |
| 41 | crate://crates.io/uuid/1.16.0 \ | ||
| 42 | crate://crates.io/version_check/0.9.5 \ | 41 | crate://crates.io/version_check/0.9.5 \ |
| 43 | crate://crates.io/xxhash-rust/0.8.15 \ | 42 | crate://crates.io/xxhash-rust/0.8.15 \ |
| 43 | crate://crates.io/zerocopy/0.8.37 \ | ||
| 44 | crate://crates.io/zerocopy-derive/0.8.37 \ | ||
| 45 | crate://crates.io/zmij/1.0.19 \ | ||
| 44 | " | 46 | " |
| 45 | 47 | ||
| 46 | SRC_URI[associative-cache-2.0.0.sha256sum] = "b993cd767a2bc7307dd87622311ca22c44329cc7a21366206bfa0896827b2bad" | 48 | SRC_URI[associative-cache-2.0.0.sha256sum] = "b993cd767a2bc7307dd87622311ca22c44329cc7a21366206bfa0896827b2bad" |
| 47 | SRC_URI[bytecount-0.6.8.sha256sum] = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" | 49 | SRC_URI[bytecount-0.6.9.sha256sum] = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" |
| 48 | SRC_URI[castaway-0.2.3.sha256sum] = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" | 50 | SRC_URI[bytes-1.11.0.sha256sum] = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" |
| 49 | SRC_URI[cc-1.2.20.sha256sum] = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" | 51 | SRC_URI[cc-1.2.55.sha256sum] = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" |
| 50 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | 52 | SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" |
| 51 | SRC_URI[compact_str-0.9.0.sha256sum] = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" | 53 | SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" |
| 52 | SRC_URI[crunchy-0.2.3.sha256sum] = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" | ||
| 53 | SRC_URI[encoding_rs-0.8.35.sha256sum] = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" | 54 | SRC_URI[encoding_rs-0.8.35.sha256sum] = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" |
| 54 | SRC_URI[gimli-0.31.1.sha256sum] = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" | 55 | SRC_URI[find-msvc-tools-0.1.9.sha256sum] = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" |
| 55 | SRC_URI[half-2.6.0.sha256sum] = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" | 56 | SRC_URI[gimli-0.32.3.sha256sum] = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" |
| 56 | SRC_URI[itoa-1.0.15.sha256sum] = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" | 57 | SRC_URI[half-2.7.1.sha256sum] = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" |
| 58 | SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" | ||
| 57 | SRC_URI[itoap-1.0.1.sha256sum] = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" | 59 | SRC_URI[itoap-1.0.1.sha256sum] = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" |
| 58 | SRC_URI[jiff-0.2.10.sha256sum] = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6" | 60 | SRC_URI[jiff-0.2.18.sha256sum] = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50" |
| 59 | SRC_URI[jiff-static-0.2.10.sha256sum] = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254" | 61 | SRC_URI[jiff-static-0.2.18.sha256sum] = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78" |
| 60 | SRC_URI[libc-0.2.172.sha256sum] = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" | 62 | SRC_URI[libc-0.2.180.sha256sum] = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" |
| 61 | SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" | 63 | SRC_URI[memchr-2.7.6.sha256sum] = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" |
| 64 | SRC_URI[no-panic-0.1.36.sha256sum] = "f967505aabc8af5752d098c34146544a43684817cdba8f9725b292530cabbf53" | ||
| 62 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" | 65 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" |
| 63 | SRC_URI[portable-atomic-1.11.0.sha256sum] = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" | 66 | SRC_URI[portable-atomic-1.13.1.sha256sum] = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" |
| 64 | SRC_URI[portable-atomic-util-0.2.4.sha256sum] = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" | 67 | SRC_URI[portable-atomic-util-0.2.5.sha256sum] = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5" |
| 65 | SRC_URI[proc-macro2-1.0.95.sha256sum] = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" | 68 | SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" |
| 66 | SRC_URI[pyo3-build-config-0.23.3.sha256sum] = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b" | 69 | SRC_URI[pyo3-build-config-0.28.0.sha256sum] = "972720a441c91fd9c49f212a1d2d74c6e3803b231ebc8d66c51efbd7ccab11c8" |
| 67 | SRC_URI[pyo3-ffi-0.23.3.sha256sum] = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d" | 70 | SRC_URI[pyo3-ffi-0.28.0.sha256sum] = "5994456d9dab8934d600d3867571b6410f24fbd6002570ad56356733eb54859b" |
| 68 | SRC_URI[quote-1.0.40.sha256sum] = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" | 71 | SRC_URI[quote-1.0.44.sha256sum] = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" |
| 69 | SRC_URI[rustversion-1.0.20.sha256sum] = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" | 72 | SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" |
| 70 | SRC_URI[ryu-1.0.20.sha256sum] = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" | 73 | SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" |
| 71 | SRC_URI[serde-1.0.219.sha256sum] = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" | 74 | SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" |
| 72 | SRC_URI[serde_derive-1.0.219.sha256sum] = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" | 75 | SRC_URI[serde_json-1.0.149.sha256sum] = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" |
| 73 | SRC_URI[serde_json-1.0.140.sha256sum] = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" | ||
| 74 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" | 76 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" |
| 75 | SRC_URI[simdutf8-0.1.5.sha256sum] = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" | 77 | SRC_URI[simdutf8-0.1.5.sha256sum] = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" |
| 76 | SRC_URI[smallvec-1.15.0.sha256sum] = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" | 78 | SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" |
| 77 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" | 79 | SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" |
| 78 | SRC_URI[syn-2.0.101.sha256sum] = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" | 80 | SRC_URI[target-lexicon-0.13.4.sha256sum] = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba" |
| 79 | SRC_URI[target-lexicon-0.13.2.sha256sum] = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" | 81 | SRC_URI[unicode-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" |
| 80 | SRC_URI[unicode-ident-1.0.18.sha256sum] = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" | 82 | SRC_URI[unwinding-0.2.8.sha256sum] = "60612c845ef41699f39dc8c5391f252942c0a88b7d15da672eff0d14101bbd6d" |
| 81 | SRC_URI[unwinding-0.2.5.sha256sum] = "51f06a05848f650946acef3bf525fe96612226b61f74ae23ffa4e98bfbb8ab3c" | 83 | SRC_URI[uuid-1.20.0.sha256sum] = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" |
| 82 | SRC_URI[uuid-1.16.0.sha256sum] = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" | ||
| 83 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" | 84 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" |
| 84 | SRC_URI[xxhash-rust-0.8.15.sha256sum] = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" | 85 | SRC_URI[xxhash-rust-0.8.15.sha256sum] = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" |
| 86 | SRC_URI[zerocopy-0.8.37.sha256sum] = "7456cf00f0685ad319c5b1693f291a650eaf345e941d082fc4e03df8a03996ac" | ||
| 87 | SRC_URI[zerocopy-derive-0.8.37.sha256sum] = "1328722bbf2115db7e19d69ebcc15e795719e2d66b60827c6a69a117365e37a0" | ||
| 88 | SRC_URI[zmij-1.0.19.sha256sum] = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445" | ||
diff --git a/meta-python/recipes-devtools/python/python3-orjson/0001-Guard-avx512-module-with-x86-target-cfg.patch b/meta-python/recipes-devtools/python/python3-orjson/0001-Guard-avx512-module-with-x86-target-cfg.patch new file mode 100644 index 0000000000..604030e062 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-orjson/0001-Guard-avx512-module-with-x86-target-cfg.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From c5c46664a914d3a7f048c51c3b9c2ab13e21ed1b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tim Orling <tim.orling@konsulko.com> | ||
| 3 | Date: Thu, 29 Jan 2026 09:59:55 -0800 | ||
| 4 | Subject: [PATCH] Guard avx512 module with x86 target cfg | ||
| 5 | |||
| 6 | The avx512.rs module contains x86_64-specific intrinsics and target | ||
| 7 | features that are not valid on non-x86 architectures like RISC-V. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [Rejected by upstream https://github.com/ijl/orjson/pull/609] | ||
| 10 | |||
| 11 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
| 12 | --- | ||
| 13 | src/ffi/pystrref/avx512.rs | 2 ++ | ||
| 14 | 1 file changed, 2 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/src/ffi/pystrref/avx512.rs b/src/ffi/pystrref/avx512.rs | ||
| 17 | index e4c7697..46450ac 100644 | ||
| 18 | --- a/src/ffi/pystrref/avx512.rs | ||
| 19 | +++ b/src/ffi/pystrref/avx512.rs | ||
| 20 | @@ -3,12 +3,14 @@ | ||
| 21 | |||
| 22 | use super::pyunicode_new::*; | ||
| 23 | |||
| 24 | +#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] | ||
| 25 | use core::arch::x86_64::{ | ||
| 26 | _mm512_and_si512, _mm512_cmpgt_epu8_mask, _mm512_cmpneq_epi8_mask, _mm512_loadu_epi8, | ||
| 27 | _mm512_mask_cmpneq_epi8_mask, _mm512_maskz_loadu_epi8, _mm512_max_epu8, _mm512_set1_epi8, | ||
| 28 | }; | ||
| 29 | |||
| 30 | #[inline(never)] | ||
| 31 | +#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] | ||
| 32 | #[target_feature(enable = "avx512f,avx512bw,avx512vl,bmi2")] | ||
| 33 | pub(crate) unsafe fn create_str_impl_avx512vl(buf: &str) -> *mut crate::ffi::PyObject { | ||
| 34 | unsafe { | ||
| 35 | -- | ||
| 36 | 2.39.5 | ||
| 37 | |||
diff --git a/meta-python/recipes-devtools/python/python3-orjson/0002-Guard-x86-feature-detection-macro-in-pystrref-object.patch b/meta-python/recipes-devtools/python/python3-orjson/0002-Guard-x86-feature-detection-macro-in-pystrref-object.patch new file mode 100644 index 0000000000..59105e723c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-orjson/0002-Guard-x86-feature-detection-macro-in-pystrref-object.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From 7ef16220caaa82f7a90047c8c9b5ff2eeb15b9ce Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tim Orling <tim.orling@konsulko.com> | ||
| 3 | Date: Thu, 29 Jan 2026 10:22:31 -0800 | ||
| 4 | Subject: [PATCH 2/2] Guard x86 feature detection macro in pystrref/object.rs | ||
| 5 | |||
| 6 | The std::is_x86_feature_detected! macro only works on x86/x86_64 | ||
| 7 | targets. This patch wraps the feature detection and AVX-512 code path | ||
| 8 | with cfg guards to allow compilation on non-x86 architectures. | ||
| 9 | |||
| 10 | On non-x86 targets, the code will fall through to the generic | ||
| 11 | implementation instead of attempting AVX-512 optimizations. | ||
| 12 | |||
| 13 | Upstream-Status: Inappropriate [Rejected by upstream https://github.com/ijl/orjson/pull/609] | ||
| 14 | |||
| 15 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
| 16 | --- | ||
| 17 | src/ffi/pystrref/object.rs | 1 + | ||
| 18 | 1 file changed, 1 insertion(+) | ||
| 19 | |||
| 20 | diff --git a/src/ffi/pystrref/object.rs b/src/ffi/pystrref/object.rs | ||
| 21 | index 9ef12eb..7c2c046 100644 | ||
| 22 | --- a/src/ffi/pystrref/object.rs | ||
| 23 | +++ b/src/ffi/pystrref/object.rs | ||
| 24 | @@ -29,6 +29,7 @@ static mut STR_CREATE_FN: StrDeserializer = super::scalar::str_impl_kind_scalar; | ||
| 25 | |||
| 26 | pub fn set_str_create_fn() { | ||
| 27 | unsafe { | ||
| 28 | + #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] | ||
| 29 | #[cfg(all(CPython, feature = "avx512"))] | ||
| 30 | if std::is_x86_feature_detected!("avx512vl") { | ||
| 31 | STR_CREATE_FN = super::avx512::create_str_impl_avx512vl; | ||
| 32 | -- | ||
| 33 | 2.39.5 | ||
| 34 | |||
diff --git a/meta-python/recipes-devtools/python/python3-orjson_3.10.17.bb b/meta-python/recipes-devtools/python/python3-orjson_3.10.17.bb deleted file mode 100644 index 2209569aca..0000000000 --- a/meta-python/recipes-devtools/python/python3-orjson_3.10.17.bb +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | SUMMARY = "orjson is a fast, correct JSON library for Python" | ||
| 2 | HOMEPAGE = "https://pypi.org/project/orjson/" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d" | ||
| 5 | |||
| 6 | SRC_URI[sha256sum] = "28eeae6a15243966962b658dfcf7bae9e7bb1f3260dfcf0370dbd41f5ff6058b" | ||
| 7 | |||
| 8 | CVE_PRODUCT = "orjson" | ||
| 9 | |||
| 10 | require ${BPN}-crates.inc | ||
| 11 | |||
| 12 | inherit pypi python_maturin cargo-update-recipe-crates | ||
| 13 | |||
| 14 | DEPENDS = "python3-maturin-native" | ||
| 15 | |||
| 16 | RDEPENDS:${PN} += "python3-maturin python3-mypy" | ||
| 17 | |||
| 18 | do_compile:prepend() { | ||
| 19 | sed -i "/panic = \"abort\"/d" ${S}/Cargo.toml | ||
| 20 | } | ||
| 21 | |||
| 22 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-orjson_3.11.7.bb b/meta-python/recipes-devtools/python/python3-orjson_3.11.7.bb new file mode 100644 index 0000000000..63e2e089e1 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-orjson_3.11.7.bb | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | SUMMARY = "orjson is a fast, correct JSON library for Python" | ||
| 2 | HOMEPAGE = "https://pypi.org/project/orjson/" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d" | ||
| 5 | |||
| 6 | SRCREV = "ec2b066cae79ae4a90ed126ac5723335dd99e408" | ||
| 7 | PYPI_SRC_URI = "git://github.com/ijl/orjson;protocol=https;branch=master;tag=${PV};destsuffix=orjson-${PV}" | ||
| 8 | |||
| 9 | CVE_PRODUCT = "orjson" | ||
| 10 | |||
| 11 | require ${BPN}-crates.inc | ||
| 12 | |||
| 13 | inherit pypi python_maturin cargo-update-recipe-crates ptest-python-pytest | ||
| 14 | |||
| 15 | SRC_URI += " \ | ||
| 16 | file://0001-Guard-avx512-module-with-x86-target-cfg.patch \ | ||
| 17 | file://0002-Guard-x86-feature-detection-macro-in-pystrref-object.patch \ | ||
| 18 | " | ||
| 19 | DEPENDS = "python3-maturin-native" | ||
| 20 | |||
| 21 | RDEPENDS:${PN} += "python3-maturin python3-mypy" | ||
| 22 | |||
| 23 | do_compile:prepend() { | ||
| 24 | sed -i "/panic = \"abort\"/d" ${S}/Cargo.toml | ||
| 25 | } | ||
| 26 | |||
| 27 | do_install_ptest:append() { | ||
| 28 | install -d ${D}${PTEST_PATH}/data | ||
| 29 | cp -rf ${S}/data/* ${D}${PTEST_PATH}/data/ | ||
| 30 | install -d ${D}${PTEST_PATH}/test | ||
| 31 | cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ | ||
| 32 | } | ||
| 33 | |||
| 34 | RDEPENDS:${PN}-ptest += "\ | ||
| 35 | python3-dateutil \ | ||
| 36 | python3-dateutil-zoneinfo \ | ||
| 37 | python3-faker \ | ||
| 38 | python3-numpy \ | ||
| 39 | python3-pandas \ | ||
| 40 | python3-pendulum \ | ||
| 41 | python3-psutil \ | ||
| 42 | python3-pytz \ | ||
| 43 | python3-tzdata \ | ||
| 44 | " | ||
| 45 | |||
| 46 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch index e83576eb62..ed5eb767e9 100644 --- a/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch +++ b/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 16dd09e6c79768a24f5a50ec5985e0b6fdf17f35 Mon Sep 17 00:00:00 2001 | 1 | From 65db03f03dbb61172c6eea8b34d11ea9eb0c6d77 Mon Sep 17 00:00:00 2001 |
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> |
| 3 | Date: Mon, 10 Mar 2025 13:52:11 +0100 | 3 | Date: Mon, 10 Mar 2025 13:52:11 +0100 |
| 4 | Subject: [PATCH] BLD: add option to specify numpy header location | 4 | Subject: [PATCH] BLD: add option to specify numpy header location |
| @@ -19,24 +19,29 @@ include folder location, fall back to the value of this meson option. | |||
| 19 | Upstream-Status: Submitted [https://github.com/pandas-dev/pandas/pull/61095] | 19 | Upstream-Status: Submitted [https://github.com/pandas-dev/pandas/pull/61095] |
| 20 | 20 | ||
| 21 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | 21 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> |
| 22 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
| 22 | --- | 23 | --- |
| 23 | meson.options | 1 + | 24 | meson.options | 1 + |
| 24 | pandas/meson.build | 13 ++++++++++--- | 25 | pandas/meson.build | 12 +++++++++--- |
| 25 | 2 files changed, 11 insertions(+), 3 deletions(-) | 26 | 2 files changed, 10 insertions(+), 3 deletions(-) |
| 26 | create mode 100644 meson.options | 27 | create mode 100644 meson.options |
| 27 | 28 | ||
| 29 | diff --git a/meson.options b/meson.options | ||
| 30 | new file mode 100644 | ||
| 31 | index 0000000..3d3a18d | ||
| 28 | --- /dev/null | 32 | --- /dev/null |
| 29 | +++ b/meson.options | 33 | +++ b/meson.options |
| 30 | @@ -0,0 +1 @@ | 34 | @@ -0,0 +1 @@ |
| 31 | +option('numpy_inc_dir', type : 'string', description : 'The absolute path to the numpy headers') | 35 | +option('numpy_inc_dir', type : 'string', description : 'The absolute path to the numpy headers') |
| 36 | diff --git a/pandas/meson.build b/pandas/meson.build | ||
| 37 | index 840ac25..2c3423e 100644 | ||
| 32 | --- a/pandas/meson.build | 38 | --- a/pandas/meson.build |
| 33 | +++ b/pandas/meson.build | 39 | +++ b/pandas/meson.build |
| 34 | @@ -3,17 +3,24 @@ incdir_numpy = run_command(py, | 40 | @@ -4,17 +4,23 @@ incdir_numpy = run_command( |
| 35 | '-c', | 41 | '-c', |
| 36 | ''' | 42 | ''' |
| 37 | import os | 43 | import os |
| 38 | -import numpy as np | 44 | -import numpy as np |
| 39 | + | ||
| 40 | +try: | 45 | +try: |
| 41 | + import numpy as np | 46 | + import numpy as np |
| 42 | + base_incdir = np.get_include() | 47 | + base_incdir = np.get_include() |
| @@ -53,9 +58,12 @@ Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | |||
| 53 | - incdir = np.get_include() | 58 | - incdir = np.get_include() |
| 54 | + incdir = base_incdir | 59 | + incdir = base_incdir |
| 55 | print(incdir) | 60 | print(incdir) |
| 56 | ''' | 61 | ''', |
| 57 | ], | 62 | ], |
| 58 | + env: {'NUMPY_INC_DIR': get_option('numpy_inc_dir')}, | 63 | + env: {'NUMPY_INC_DIR': get_option('numpy_inc_dir')}, |
| 59 | check: true | 64 | check: true, |
| 60 | ).stdout().strip() | 65 | ).stdout().strip() |
| 61 | 66 | ||
| 67 | -- | ||
| 68 | 2.47.3 | ||
| 69 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-fix-reproducibility-issue.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-fix-reproducibility-issue.patch deleted file mode 100644 index deadacafa9..0000000000 --- a/meta-python/recipes-devtools/python/python3-pandas/0001-fix-reproducibility-issue.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From 80274cd3a0746ddc5421643dd40d47bdf3c6a68c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Fri, 26 Sep 2025 15:47:53 +0800 | ||
| 4 | Subject: [PATCH] fix reproducibility issue | ||
| 5 | |||
| 6 | The type of new_value is either `npy_timedelta' or `int64_t' | ||
| 7 | In build/pandas/_libs/tslibs/timedeltas.cpython-313-x86_64-linux-gnu.so.p/pandas/_libs/tslibs/timedeltas.pyx.c | ||
| 8 | .. | ||
| 9 | npy_timedelta __pyx_v_new_value; | ||
| 10 | ... | ||
| 11 | |||
| 12 | In build/pandas/_libs/tslibs/timedeltas.cpython-313-x86_64-linux-gnu.so.p/pandas/_libs/tslibs/timedeltas.pyx.c | ||
| 13 | ... | ||
| 14 | __pyx_t_5numpy_int64_t __pyx_v_new_value; | ||
| 15 | ... | ||
| 16 | |||
| 17 | Explicitly define it as int64_t to assure the generated source is | ||
| 18 | reproducibility between builds | ||
| 19 | |||
| 20 | Upstream-Status: Submitted [https://github.com/pandas-dev/pandas/pull/62459] | ||
| 21 | |||
| 22 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 23 | --- | ||
| 24 | pandas/_libs/tslibs/timedeltas.pyx | 3 +++ | ||
| 25 | 1 file changed, 3 insertions(+) | ||
| 26 | |||
| 27 | diff --git a/pandas/_libs/tslibs/timedeltas.pyx b/pandas/_libs/tslibs/timedeltas.pyx | ||
| 28 | index f6c69cf..34ac9e7 100644 | ||
| 29 | --- a/pandas/_libs/tslibs/timedeltas.pyx | ||
| 30 | +++ b/pandas/_libs/tslibs/timedeltas.pyx | ||
| 31 | @@ -1820,6 +1820,9 @@ class Timedelta(_Timedelta): | ||
| 32 | |||
| 33 | disallow_ambiguous_unit(unit) | ||
| 34 | |||
| 35 | + cdef: | ||
| 36 | + int64_t new_value; | ||
| 37 | + | ||
| 38 | # GH 30543 if pd.Timedelta already passed, return it | ||
| 39 | # check that only value is passed | ||
| 40 | if isinstance(value, _Timedelta): | ||
| 41 | -- | ||
| 42 | 2.34.1 | ||
| 43 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch deleted file mode 100644 index 950f25303f..0000000000 --- a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From d46b8720a6bccb345f6bdd7ee2f5c357e7eb227b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 3 | Date: Mon, 12 Aug 2024 11:27:36 -0400 | ||
| 4 | Subject: [PATCH] pyproject.toml: don't pin dependency versions | ||
| 5 | |||
| 6 | Pandas will fail to build if the exact versions aren't found, but newer | ||
| 7 | ones actually work. Since newer versions of pandas are adjusting the | ||
| 8 | requires section of pyproject toml further, just patch it for us. | ||
| 9 | |||
| 10 | Upstream-Status: Inappropriate [OE-Specific] | ||
| 11 | |||
| 12 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 13 | --- | ||
| 14 | pyproject.toml | 6 +++--- | ||
| 15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 16 | |||
| 17 | --- a/pyproject.toml | ||
| 18 | +++ b/pyproject.toml | ||
| 19 | @@ -2,10 +2,10 @@ | ||
| 20 | # Minimum requirements for the build system to execute. | ||
| 21 | # See https://github.com/scipy/scipy/pull/12940 for the AIX issue. | ||
| 22 | requires = [ | ||
| 23 | - "meson-python==0.13.1", | ||
| 24 | - "meson==1.2.1", | ||
| 25 | + "meson-python>=0.13.1", | ||
| 26 | + "meson>=1.2.1", | ||
| 27 | "wheel", | ||
| 28 | - "Cython~=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json | ||
| 29 | + "Cython>=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json | ||
| 30 | # Force numpy higher than 2.0, so that built wheels are compatible | ||
| 31 | # with both numpy 1 and 2 | ||
| 32 | "numpy>=2.0", | ||
diff --git a/meta-python/recipes-devtools/python/python3-pandas_2.2.3.bb b/meta-python/recipes-devtools/python/python3-pandas_3.0.1.bb index 91333d129d..a25b367130 100644 --- a/meta-python/recipes-devtools/python/python3-pandas_2.2.3.bb +++ b/meta-python/recipes-devtools/python/python3-pandas_3.0.1.bb | |||
| @@ -4,16 +4,11 @@ high-performance, easy-to-use data structures and data analysis tools for \ | |||
| 4 | the Python programming language." | 4 | the Python programming language." |
| 5 | HOMEPAGE = "https://pandas.pydata.org/" | 5 | HOMEPAGE = "https://pandas.pydata.org/" |
| 6 | LICENSE = "BSD-3-Clause" | 6 | LICENSE = "BSD-3-Clause" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cb819092901ddb13a7d0a4f5e05f098a" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e98642e1210ade884e5254ab18d55b7d" |
| 8 | |||
| 9 | SRC_URI += " \ | ||
| 10 | file://0001-pyproject.toml-don-t-pin-dependency-versions.patch \ | ||
| 11 | file://0001-fix-reproducibility-issue.patch \ | ||
| 12 | " | ||
| 13 | 8 | ||
| 14 | SRC_URI:append:class-target = " file://0001-BLD-add-option-to-specify-numpy-header-location.patch " | 9 | SRC_URI:append:class-target = " file://0001-BLD-add-option-to-specify-numpy-header-location.patch " |
| 15 | 10 | ||
| 16 | SRC_URI[sha256sum] = "4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667" | 11 | SRC_URI[sha256sum] = "4186a699674af418f655dbd420ed87f50d56b4cd6603784279d9eef6627823c8" |
| 17 | 12 | ||
| 18 | CVE_PRODUCT = "pandas" | 13 | CVE_PRODUCT = "pandas" |
| 19 | 14 | ||
diff --git a/meta-python/recipes-devtools/python/python3-paramiko_3.5.1.bb b/meta-python/recipes-devtools/python/python3-paramiko_4.0.0.bb index daf6386888..b1f86acb4e 100644 --- a/meta-python/recipes-devtools/python/python3-paramiko_3.5.1.bb +++ b/meta-python/recipes-devtools/python/python3-paramiko_4.0.0.bb | |||
| @@ -3,11 +3,11 @@ HOMEPAGE = "https://github.com/paramiko/paramiko/" | |||
| 3 | LICENSE = "LGPL-2.1-only" | 3 | LICENSE = "LGPL-2.1-only" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "b2c665bc45b2b215bd7d7f039901b14b067da00f3a11e6640995fd58f2664822" | 6 | SRC_URI[sha256sum] = "6a25f07b380cc9c9a88d2b920ad37167ac4667f8d9886ccebd8f90f654b5d69f" |
| 7 | 7 | ||
| 8 | PYPI_PACKAGE = "paramiko" | 8 | PYPI_PACKAGE = "paramiko" |
| 9 | 9 | ||
| 10 | inherit pypi setuptools3 | 10 | inherit pypi python_setuptools_build_meta |
| 11 | 11 | ||
| 12 | CLEANBROKEN = "1" | 12 | CLEANBROKEN = "1" |
| 13 | 13 | ||
diff --git a/meta-python/recipes-devtools/python/python3-parse_1.20.2.bb b/meta-python/recipes-devtools/python/python3-parse_1.21.1.bb index 6e7139bfbe..3af0c0e27e 100644 --- a/meta-python/recipes-devtools/python/python3-parse_1.20.2.bb +++ b/meta-python/recipes-devtools/python/python3-parse_1.21.1.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/r1chardj0n3s/parse" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "b41d604d16503c79d81af5165155c0b20f6c8d6c559efa66b4b695c3e5a0a0ce" | 6 | SRC_URI[sha256sum] = "825e1a88e9d9fb481b8d2ca709c6195558b6eaa97c559ad3a9a20aa2d12815a3" |
| 7 | 7 | ||
| 8 | SRC_URI += " \ | 8 | SRC_URI += " \ |
| 9 | file://run-ptest \ | 9 | file://run-ptest \ |
diff --git a/meta-python/recipes-devtools/python/python3-parso_0.8.5.bb b/meta-python/recipes-devtools/python/python3-parso_0.8.6.bb index 2bde8c3f40..1659f1babd 100644 --- a/meta-python/recipes-devtools/python/python3-parso_0.8.5.bb +++ b/meta-python/recipes-devtools/python/python3-parso_0.8.6.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cbaa2675b2424d771451332a7a69503f" | |||
| 5 | 5 | ||
| 6 | PYPI_PACKAGE = "parso" | 6 | PYPI_PACKAGE = "parso" |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "034d7354a9a018bdce352f48b2a8a450f05e9d6ee85db84764e9b6bd96dafe5a" | 8 | SRC_URI[sha256sum] = "2b9a0332696df97d454fa67b81618fd69c35a7b90327cbe6ba5c92d2c68a7bfd" |
| 9 | 9 | ||
| 10 | CVE_PRODUCT = "parso" | 10 | CVE_PRODUCT = "parso" |
| 11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-path_17.1.0.bb b/meta-python/recipes-devtools/python/python3-path_17.1.1.bb index 066f756730..be150f3dbb 100644 --- a/meta-python/recipes-devtools/python/python3-path_17.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-path_17.1.1.bb | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | SUMMARY = "A module wrapper for os.path" | 1 | SUMMARY = "A module wrapper for os.path" |
| 2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1aeae65f25a15b1e46d4381f2f094e0a" |
| 4 | 4 | ||
| 5 | SRC_URI[sha256sum] = "d41e05ed4fa1d4f6d702df3c1e0a1a255d7b544287432456455dc7c51e5f98e9" | 5 | SRC_URI[sha256sum] = "2dfcbfec8b4d960f3469c52acf133113c2a8bf12ac7b98d629fa91af87248d42" |
| 6 | 6 | ||
| 7 | SRC_URI += "\ | 7 | SRC_URI += "\ |
| 8 | file://run-ptest \ | 8 | file://run-ptest \ |
| @@ -10,7 +10,10 @@ SRC_URI += "\ | |||
| 10 | 10 | ||
| 11 | inherit pypi python_setuptools_build_meta ptest | 11 | inherit pypi python_setuptools_build_meta ptest |
| 12 | 12 | ||
| 13 | DEPENDS += "python3-setuptools-scm-native" | 13 | DEPENDS += " \ |
| 14 | python3-setuptools-scm-native \ | ||
| 15 | python3-coherent-licensed-native \ | ||
| 16 | " | ||
| 14 | 17 | ||
| 15 | RDEPENDS:${PN} += " \ | 18 | RDEPENDS:${PN} += " \ |
| 16 | python3-appdirs \ | 19 | python3-appdirs \ |
| @@ -22,6 +25,7 @@ RDEPENDS:${PN} += " \ | |||
| 22 | RDEPENDS:${PN}-ptest += " \ | 25 | RDEPENDS:${PN}-ptest += " \ |
| 23 | python3-pytest \ | 26 | python3-pytest \ |
| 24 | python3-unittest-automake-output \ | 27 | python3-unittest-automake-output \ |
| 28 | python3-more-itertools \ | ||
| 25 | " | 29 | " |
| 26 | 30 | ||
| 27 | BBCLASSEXTEND = "nativesdk native" | 31 | BBCLASSEXTEND = "nativesdk native" |
diff --git a/meta-python/recipes-devtools/python/python3-pendulum-crates.inc b/meta-python/recipes-devtools/python/python3-pendulum-crates.inc new file mode 100644 index 0000000000..71a7de9d05 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pendulum-crates.inc | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | # Autogenerated with 'bitbake -c update_crates python3-pendulum' | ||
| 2 | |||
| 3 | # from rust/Cargo.lock | ||
| 4 | SRC_URI += " \ | ||
| 5 | crate://crates.io/autocfg/1.5.0 \ | ||
| 6 | crate://crates.io/cc/1.2.55 \ | ||
| 7 | crate://crates.io/find-msvc-tools/0.1.9 \ | ||
| 8 | crate://crates.io/heck/0.5.0 \ | ||
| 9 | crate://crates.io/indoc/2.0.7 \ | ||
| 10 | crate://crates.io/libc/0.2.180 \ | ||
| 11 | crate://crates.io/memoffset/0.9.1 \ | ||
| 12 | crate://crates.io/once_cell/1.21.3 \ | ||
| 13 | crate://crates.io/portable-atomic/1.13.0 \ | ||
| 14 | crate://crates.io/proc-macro2/1.0.106 \ | ||
| 15 | crate://crates.io/pyo3/0.27.2 \ | ||
| 16 | crate://crates.io/pyo3-build-config/0.27.2 \ | ||
| 17 | crate://crates.io/pyo3-ffi/0.27.2 \ | ||
| 18 | crate://crates.io/pyo3-macros/0.27.2 \ | ||
| 19 | crate://crates.io/pyo3-macros-backend/0.27.2 \ | ||
| 20 | crate://crates.io/python3-dll-a/0.2.14 \ | ||
| 21 | crate://crates.io/quote/1.0.44 \ | ||
| 22 | crate://crates.io/rustversion/1.0.22 \ | ||
| 23 | crate://crates.io/shlex/1.3.0 \ | ||
| 24 | crate://crates.io/syn/2.0.114 \ | ||
| 25 | crate://crates.io/target-lexicon/0.13.4 \ | ||
| 26 | crate://crates.io/unicode-ident/1.0.22 \ | ||
| 27 | crate://crates.io/unindent/0.2.4 \ | ||
| 28 | " | ||
| 29 | |||
| 30 | SRC_URI[autocfg-1.5.0.sha256sum] = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" | ||
| 31 | SRC_URI[cc-1.2.55.sha256sum] = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" | ||
| 32 | SRC_URI[find-msvc-tools-0.1.9.sha256sum] = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" | ||
| 33 | SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" | ||
| 34 | SRC_URI[indoc-2.0.7.sha256sum] = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" | ||
| 35 | SRC_URI[libc-0.2.180.sha256sum] = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" | ||
| 36 | SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" | ||
| 37 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" | ||
| 38 | SRC_URI[portable-atomic-1.13.0.sha256sum] = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" | ||
| 39 | SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" | ||
| 40 | SRC_URI[pyo3-0.27.2.sha256sum] = "ab53c047fcd1a1d2a8820fe84f05d6be69e9526be40cb03b73f86b6b03e6d87d" | ||
| 41 | SRC_URI[pyo3-build-config-0.27.2.sha256sum] = "b455933107de8642b4487ed26d912c2d899dec6114884214a0b3bb3be9261ea6" | ||
| 42 | SRC_URI[pyo3-ffi-0.27.2.sha256sum] = "1c85c9cbfaddf651b1221594209aed57e9e5cff63c4d11d1feead529b872a089" | ||
| 43 | SRC_URI[pyo3-macros-0.27.2.sha256sum] = "0a5b10c9bf9888125d917fb4d2ca2d25c8df94c7ab5a52e13313a07e050a3b02" | ||
| 44 | SRC_URI[pyo3-macros-backend-0.27.2.sha256sum] = "03b51720d314836e53327f5871d4c0cfb4fb37cc2c4a11cc71907a86342c40f9" | ||
| 45 | SRC_URI[python3-dll-a-0.2.14.sha256sum] = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" | ||
| 46 | SRC_URI[quote-1.0.44.sha256sum] = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" | ||
| 47 | SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" | ||
| 48 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" | ||
| 49 | SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" | ||
| 50 | SRC_URI[target-lexicon-0.13.4.sha256sum] = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba" | ||
| 51 | SRC_URI[unicode-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" | ||
| 52 | SRC_URI[unindent-0.2.4.sha256sum] = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pendulum/0001-rust-Cargo.toml-inhibit-strip.patch b/meta-python/recipes-devtools/python/python3-pendulum/0001-rust-Cargo.toml-inhibit-strip.patch new file mode 100644 index 0000000000..f721b9fe40 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pendulum/0001-rust-Cargo.toml-inhibit-strip.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | From 74db4bc77be0e02912975ea198e58addf97bc218 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tim Orling <tim.orling@konsulko.com> | ||
| 3 | Date: Fri, 30 Jan 2026 07:06:05 -0800 | ||
| 4 | Subject: [PATCH] rust/Cargo.toml: inhibit strip | ||
| 5 | |||
| 6 | For OpenEmbedded builds, we want debug symbols which will be stripped | ||
| 7 | later by us. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [oe specific] | ||
| 10 | |||
| 11 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
| 12 | --- | ||
| 13 | rust/Cargo.toml | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/rust/Cargo.toml b/rust/Cargo.toml | ||
| 17 | index 097321f..8bde1fd 100644 | ||
| 18 | --- a/rust/Cargo.toml | ||
| 19 | +++ b/rust/Cargo.toml | ||
| 20 | @@ -10,7 +10,7 @@ crate-type = ["cdylib"] | ||
| 21 | [profile.release] | ||
| 22 | lto = "fat" | ||
| 23 | codegen-units = 1 | ||
| 24 | -strip = true | ||
| 25 | +strip = false | ||
| 26 | overflow-checks = false | ||
| 27 | |||
| 28 | [dependencies] | ||
| 29 | -- | ||
| 30 | 2.43.0 | ||
| 31 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pendulum_3.2.0.bb b/meta-python/recipes-devtools/python/python3-pendulum_3.2.0.bb new file mode 100644 index 0000000000..a2dc7e7d9e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pendulum_3.2.0.bb | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | SUMMARY = "Python datetimes made easy" | ||
| 2 | DESCRIPTION = "Pendulum is a Python package to ease datetimes manipulation. \ | ||
| 3 | It provides classes that are drop-in replacements for the native ones (they \ | ||
| 4 | inherit from them). \ | ||
| 5 | Special care has been taken to ensure timezones are handled correctly, and \ | ||
| 6 | are based on the underlying tzinfo implementation. For example, all \ | ||
| 7 | comparisons are done in UTC or in the timezone of the datetime being used. \ | ||
| 8 | The default timezone, except when using the now(), method will always be UTC. \ | ||
| 9 | " | ||
| 10 | HOMEPAGE = "https://pendulum.eustace.io" | ||
| 11 | LICENSE = "MIT" | ||
| 12 | LIC_FILES_CHKSUM = "file://LICENSE;md5=869e1c364438f234f09673c4039ed114" | ||
| 13 | |||
| 14 | DEPENDS = "python3-maturin-native" | ||
| 15 | |||
| 16 | SRCREV = "aea611d7a1c15ed0da56505c3f370fe4446ba733" | ||
| 17 | PYPI_SRC_URI = "git://github.com/python-pendulum/pendulum;protocol=https;branch=master;tag=${PV};destsuffix=pendulum-${PV}" | ||
| 18 | |||
| 19 | SRC_URI += "file://0001-rust-Cargo.toml-inhibit-strip.patch" | ||
| 20 | |||
| 21 | require ${BPN}-crates.inc | ||
| 22 | |||
| 23 | inherit pypi python_maturin cargo-update-recipe-crates ptest-python-pytest | ||
| 24 | |||
| 25 | do_install_ptest:append() { | ||
| 26 | install -d ${D}${PTEST_PATH}/tests | ||
| 27 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
| 28 | } | ||
| 29 | |||
| 30 | RDEPENDS:${PN} += "python3-dateutil python3-tzdata" | ||
| 31 | |||
| 32 | RDEPENDS:${PN}-ptest += "\ | ||
| 33 | python3-dateutil-zoneinfo \ | ||
| 34 | python3-time-machine \ | ||
| 35 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-pikepdf_10.2.0.bb b/meta-python/recipes-devtools/python/python3-pikepdf_10.3.0.bb index 1854ab0ab9..b633cb9488 100644 --- a/meta-python/recipes-devtools/python/python3-pikepdf_10.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-pikepdf_10.3.0.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pikepdf/pikepdf" | |||
| 3 | LICENSE = "MPL-2.0" | 3 | LICENSE = "MPL-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9741c346eef56131163e13b9db1241b3" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9741c346eef56131163e13b9db1241b3" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "0f398b0daeb2ffd2358f75c06f1dd47b9ba76f1a77dfe938cccf7080c58227d7" | 6 | SRC_URI[sha256sum] = "e2a64a5f1ebf8c411193126b9eeff7faf5739a40bce7441e579531422469fbb1" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pillow_12.1.0.bb b/meta-python/recipes-devtools/python/python3-pillow_12.1.1.bb index 83231cad06..2b3660fc56 100644 --- a/meta-python/recipes-devtools/python/python3-pillow_12.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-pillow_12.1.1.bb | |||
| @@ -5,10 +5,10 @@ HOMEPAGE = "https://pillow.readthedocs.io" | |||
| 5 | LICENSE = "MIT-CMU" | 5 | LICENSE = "MIT-CMU" |
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a1b708da743e3fc0e5c35e92daac0bf8" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a1b708da743e3fc0e5c35e92daac0bf8" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=main;protocol=https;tag=${PV} \ | 8 | SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=12.1.x;protocol=https;tag=${PV} \ |
| 9 | file://0001-support-cross-compiling.patch \ | 9 | file://0001-support-cross-compiling.patch \ |
| 10 | " | 10 | " |
| 11 | SRCREV = "46f45f674d47b5d8bc54230dda8fe9e214598b87" | 11 | SRCREV = "5158d98c807e719c5938aa3886913ef0ea6814e9" |
| 12 | 12 | ||
| 13 | inherit python_setuptools_build_meta ptest-python-pytest | 13 | inherit python_setuptools_build_meta ptest-python-pytest |
| 14 | 14 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb b/meta-python/recipes-devtools/python/python3-pkgconfig_1.6.0.bb index 8f65d3d4c5..e872c7a314 100644 --- a/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb +++ b/meta-python/recipes-devtools/python/python3-pkgconfig_1.6.0.bb | |||
| @@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=faa7f82be8f220bff6156be4790344fc" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=faa7f82be8f220bff6156be4790344fc" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899" | 7 | SRC_URI[sha256sum] = "4a5a6631ce937fafac457104a40d558785a658bbdca5c49b6295bc3fd651907f" |
| 8 | 8 | ||
| 9 | RDEPENDS:${PN} = "pkgconfig \ | 9 | RDEPENDS:${PN} = "pkgconfig \ |
| 10 | python3-shell \ | 10 | python3-shell \ |
diff --git a/meta-python/recipes-devtools/python/python3-platformdirs_4.5.1.bb b/meta-python/recipes-devtools/python/python3-platformdirs_4.9.4.bb index 666ba6805e..df0e3597b7 100644 --- a/meta-python/recipes-devtools/python/python3-platformdirs_4.5.1.bb +++ b/meta-python/recipes-devtools/python/python3-platformdirs_4.9.4.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/platformdirs/platformdirs" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "61d5cdcc6065745cdd94f0f878977f8de9437be93de97c1c12f853c9c0cdcbda" | 6 | SRC_URI[sha256sum] = "1ec356301b7dc906d83f371c8f487070e99d3ccf9e501686456394622a01a934" |
| 7 | 7 | ||
| 8 | inherit pypi python_hatchling ptest-python-pytest | 8 | inherit pypi python_hatchling ptest-python-pytest |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-protobuf_6.33.2.bb b/meta-python/recipes-devtools/python/python3-protobuf_6.33.5.bb index d0ef7753b0..af9ff85f20 100644 --- a/meta-python/recipes-devtools/python/python3-protobuf_6.33.2.bb +++ b/meta-python/recipes-devtools/python/python3-protobuf_6.33.5.bb | |||
| @@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | " | 10 | " |
| 11 | 11 | ||
| 12 | inherit pypi setuptools3 | 12 | inherit pypi setuptools3 |
| 13 | SRC_URI[sha256sum] = "56dc370c91fbb8ac85bc13582c9e373569668a290aa2e66a590c2a0d35ddb9e4" | 13 | SRC_URI[sha256sum] = "6ddcac2a081f8b7b9642c09406bc6a4290128fce5f471cddd165960bb9119e5c" |
| 14 | 14 | ||
| 15 | CVE_PRODUCT += "google:protobuf protobuf:protobuf google-protobuf protobuf-python" | 15 | CVE_PRODUCT += "google:protobuf protobuf:protobuf google-protobuf protobuf-python" |
| 16 | CVE_STATUS[CVE-2026-0994] = "fixed-version: it is fixed in 6.33.5" | ||
| 16 | 17 | ||
| 17 | # http://errors.yoctoproject.org/Errors/Details/184715/ | 18 | # http://errors.yoctoproject.org/Errors/Details/184715/ |
| 18 | # Can't find required file: ../src/google/protobuf/descriptor.proto | 19 | # Can't find required file: ../src/google/protobuf/descriptor.proto |
diff --git a/meta-python/recipes-devtools/python/python3-py7zr_1.1.0.bb b/meta-python/recipes-devtools/python/python3-py7zr_1.1.2.bb index 7a7a7f45ee..5a0fe86ebd 100644 --- a/meta-python/recipes-devtools/python/python3-py7zr_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-py7zr_1.1.2.bb | |||
| @@ -4,7 +4,7 @@ LICENSE = "LGPL-2.1-or-later" | |||
| 4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "087b1a94861ad9eb4d21604f6aaa0a8986a7e00580abd79fedd6f82fecf0592c" | 7 | SRC_URI[sha256sum] = "2aee212c5516ddcbeb76874dc3ece38b4566fc003f51600032c723cfea89ac56" |
| 8 | 8 | ||
| 9 | CVE_PRODUCT = "py7zr" | 9 | CVE_PRODUCT = "py7zr" |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyais_2.15.0.bb b/meta-python/recipes-devtools/python/python3-pyais_2.20.0.bb index 3f124a750d..ce53d39476 100644 --- a/meta-python/recipes-devtools/python/python3-pyais_2.15.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyais_2.20.0.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=79d9e278b76e3e5b3358cd70b328173c" | |||
| 5 | 5 | ||
| 6 | SRC_URI = "git://github.com/M0r13n/pyais;protocol=https;branch=master;tag=v${PV}" | 6 | SRC_URI = "git://github.com/M0r13n/pyais;protocol=https;branch=master;tag=v${PV}" |
| 7 | 7 | ||
| 8 | SRCREV = "7350f9db65ad715e582979bf389133bde07f5e10" | 8 | SRCREV = "2fc03eee875dd2c54af1220bb876651725c8e559" |
| 9 | 9 | ||
| 10 | inherit python_setuptools_build_meta ptest-python-pytest | 10 | inherit python_setuptools_build_meta ptest-python-pytest |
| 11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pybind11-json/0001-CMakeLists-drop-PYTHON_INCLUDE_DIRS-from-interface.patch b/meta-python/recipes-devtools/python/python3-pybind11-json/0001-CMakeLists-drop-PYTHON_INCLUDE_DIRS-from-interface.patch new file mode 100644 index 0000000000..e1bf82e506 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pybind11-json/0001-CMakeLists-drop-PYTHON_INCLUDE_DIRS-from-interface.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From 6d4af27d1b43860d8deb3d1d2b2a910e82618ac1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tafil Avdyli <tafil@tafhub.de> | ||
| 3 | Date: Sat, 24 Jan 2026 09:14:03 +0100 | ||
| 4 | Subject: [PATCH] CMakeLists: drop PYTHON_INCLUDE_DIRS from interface | ||
| 5 | |||
| 6 | Including PYTHON_INCLUDE_DIRS in the INTERFACE list caused a hard-coded | ||
| 7 | Python include directory (e.g. /usr/include/python3.13) to appear in the | ||
| 8 | generated Targets.cmake file. This resulted in a CMake configuration | ||
| 9 | error when the path did not exist: | ||
| 10 | |||
| 11 | Imported target "pybind11_json" includes non-existent path | ||
| 12 | "/usr/include/python3.13" | ||
| 13 | |||
| 14 | pybind11_json is header-only and does not use Python headers, so the | ||
| 15 | include path should not be exported. | ||
| 16 | |||
| 17 | Upstream-Status: Submitted [https://github.com/pybind/pybind11_json/pull/77] | ||
| 18 | Signed-off-by: Tafil Avdyli <tafil@tafhub.de> | ||
| 19 | --- | ||
| 20 | CMakeLists.txt | 1 - | ||
| 21 | 1 file changed, 1 deletion(-) | ||
| 22 | |||
| 23 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 24 | index 0be4838..4b305e4 100644 | ||
| 25 | --- a/CMakeLists.txt | ||
| 26 | +++ b/CMakeLists.txt | ||
| 27 | @@ -45,7 +45,6 @@ add_library(${PROJECT_NAME} INTERFACE) | ||
| 28 | |||
| 29 | target_include_directories(${PROJECT_NAME} | ||
| 30 | INTERFACE | ||
| 31 | - ${PYTHON_INCLUDE_DIRS} | ||
| 32 | $<BUILD_INTERFACE:${PYBIND11_JSON_INCLUDE_DIR}> | ||
| 33 | $<INSTALL_INTERFACE:include>) | ||
| 34 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pybind11-json_0.2.15.bb b/meta-python/recipes-devtools/python/python3-pybind11-json_0.2.15.bb index 8ad7dba76a..2a030af988 100644 --- a/meta-python/recipes-devtools/python/python3-pybind11-json_0.2.15.bb +++ b/meta-python/recipes-devtools/python/python3-pybind11-json_0.2.15.bb | |||
| @@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e25ff0ec476d06d366439e1120cce98" | |||
| 4 | 4 | ||
| 5 | SRCREV = "32043f433ed987b2c2ce99d689ec337bcbd4ba95" | 5 | SRCREV = "32043f433ed987b2c2ce99d689ec337bcbd4ba95" |
| 6 | SRC_URI = "git://github.com/pybind/pybind11_json;branch=master;protocol=https \ | 6 | SRC_URI = "git://github.com/pybind/pybind11_json;branch=master;protocol=https \ |
| 7 | file://d72ad4df929bc9d0882298fc1f85ecf589456ff6.patch" | 7 | file://d72ad4df929bc9d0882298fc1f85ecf589456ff6.patch \ |
| 8 | file://0001-CMakeLists-drop-PYTHON_INCLUDE_DIRS-from-interface.patch" | ||
| 8 | 9 | ||
| 9 | DEPENDS += "nlohmann-json python3-pybind11" | 10 | DEPENDS += "nlohmann-json python3-pybind11" |
| 10 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pychromecast/0001-bump-required-version-to-0.46.1-for-python3-wheel.patch b/meta-python/recipes-devtools/python/python3-pychromecast/0001-bump-required-version-to-0.46.1-for-python3-wheel.patch deleted file mode 100644 index 655b9c08c7..0000000000 --- a/meta-python/recipes-devtools/python/python3-pychromecast/0001-bump-required-version-to-0.46.1-for-python3-wheel.patch +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | From 672b0501526fc7c91725236fc37db82794096832 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 1 Jul 2025 23:14:08 -0700 | ||
| 4 | Subject: [PATCH] bump required version to 0.46.1 for python3-wheel | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | pyproject.toml | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/pyproject.toml b/pyproject.toml | ||
| 14 | index d5a518c..a6a159d 100644 | ||
| 15 | --- a/pyproject.toml | ||
| 16 | +++ b/pyproject.toml | ||
| 17 | @@ -1,5 +1,5 @@ | ||
| 18 | [build-system] | ||
| 19 | -requires = ["setuptools>=65.6,<81.0", "wheel>=0.37.1,<0.46.0"] | ||
| 20 | +requires = ["setuptools>=65.6,<81.0", "wheel>=0.37.1,<0.46.2"] | ||
| 21 | build-backend = "setuptools.build_meta" | ||
| 22 | |||
| 23 | [project] | ||
diff --git a/meta-python/recipes-devtools/python/python3-pychromecast_14.0.9.bb b/meta-python/recipes-devtools/python/python3-pychromecast_14.0.10.bb index 35106f870a..cdd85a550f 100644 --- a/meta-python/recipes-devtools/python/python3-pychromecast_14.0.9.bb +++ b/meta-python/recipes-devtools/python/python3-pychromecast_14.0.10.bb | |||
| @@ -3,11 +3,7 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" |
| 5 | 5 | ||
| 6 | SRC_URI += "\ | 6 | SRC_URI[sha256sum] = "f05a1c8d727d4f104c8c731688053033e05157f2ab81bc8eef50ec0c62f9373c" |
| 7 | file://0001-bump-required-version-to-0.46.1-for-python3-wheel.patch \ | ||
| 8 | " | ||
| 9 | |||
| 10 | SRC_URI[sha256sum] = "fe78841b0b04aa107d08aed216e91ab9cfb54b11d089d382be4e987e3631d4a6" | ||
| 11 | 7 | ||
| 12 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 13 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pydantic_2.12.4.bb b/meta-python/recipes-devtools/python/python3-pydantic_2.12.5.bb index 8793e76aef..e354e4b93d 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic_2.12.4.bb +++ b/meta-python/recipes-devtools/python/python3-pydantic_2.12.5.bb | |||
| @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6" | |||
| 11 | 11 | ||
| 12 | inherit python_hatchling ptest-python-pytest | 12 | inherit python_hatchling ptest-python-pytest |
| 13 | 13 | ||
| 14 | SRCREV = "5c842dfc9c245fb37aa1f5ec5b55c1aed10bd7e6" | 14 | SRCREV = "bd2d0dd0137dfa1a8fdff2529b9dfb1547980150" |
| 15 | PV .= "+git" | 15 | PV .= "+git" |
| 16 | SRC_URI = "git://github.com/pydantic/pydantic;protocol=https;branch=v2.12-fixes" | 16 | SRC_URI = "git://github.com/pydantic/pydantic;protocol=https;branch=v2.12-fixes" |
| 17 | DEPENDS += "python3-hatch-fancy-pypi-readme-native" | 17 | DEPENDS += "python3-hatch-fancy-pypi-readme-native" |
diff --git a/meta-python/recipes-devtools/python/python3-pyee_13.0.0.bb b/meta-python/recipes-devtools/python/python3-pyee_13.0.1.bb index fba54324da..a5a9822cd3 100644 --- a/meta-python/recipes-devtools/python/python3-pyee_13.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyee_13.0.1.bb | |||
| @@ -3,7 +3,7 @@ LICENSE = "MIT" | |||
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b2b1cc8797dff32cec5d783148fceab5" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b2b1cc8797dff32cec5d783148fceab5" |
| 4 | 4 | ||
| 5 | DEPENDS = "python3-setuptools-scm-native" | 5 | DEPENDS = "python3-setuptools-scm-native" |
| 6 | SRC_URI[sha256sum] = "b391e3c5a434d1f5118a25615001dbc8f669cf410ab67d04c4d4e07c55481c37" | 6 | SRC_URI[sha256sum] = "0b931f7c14535667ed4c7e0d531716368715e860b988770fc7eb8578d1f67fc8" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 8 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyjwt_2.10.1.bb b/meta-python/recipes-devtools/python/python3-pyjwt_2.12.1.bb index 37675f1b63..28eceece97 100644 --- a/meta-python/recipes-devtools/python/python3-pyjwt_2.10.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyjwt_2.12.1.bb | |||
| @@ -5,10 +5,13 @@ HOMEPAGE = "https://github.com/jpadilla/pyjwt" | |||
| 5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e4b56d2c9973d8cf54655555be06e551" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e4b56d2c9973d8cf54655555be06e551" |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953" | 8 | SRC_URI[sha256sum] = "c74a7a2adf861c04d002db713dd85f84beb242228e671280bf709d765b03672b" |
| 9 | 9 | ||
| 10 | PYPI_PACKAGE = "pyjwt" | 10 | PYPI_PACKAGE = "pyjwt" |
| 11 | CVE_PRODUCT = "pyjwt" | 11 | CVE_PRODUCT = "pyjwt" |
| 12 | CVE_STATUS[CVE-2025-45768] = "disputed: vulnerability can be avoided if the library is used correctly" | ||
| 13 | CVE_STATUS[CVE-2026-32597] = "fixed-version: fixed in 2.12.0" | ||
| 14 | |||
| 12 | inherit pypi python_setuptools_build_meta | 15 | inherit pypi python_setuptools_build_meta |
| 13 | 16 | ||
| 14 | RDEPENDS:${PN} = "\ | 17 | RDEPENDS:${PN} = "\ |
| @@ -17,3 +20,4 @@ RDEPENDS:${PN} = "\ | |||
| 17 | " | 20 | " |
| 18 | 21 | ||
| 19 | BBCLASSEXTEND = "native nativesdk" | 22 | BBCLASSEXTEND = "native nativesdk" |
| 23 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pylint_4.0.4.bb b/meta-python/recipes-devtools/python/python3-pylint_4.0.5.bb index adee1d10c1..15d8c14806 100644 --- a/meta-python/recipes-devtools/python/python3-pylint_4.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-pylint_4.0.5.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://www.pylint.org/" | |||
| 3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" |
| 5 | 5 | ||
| 6 | SRCREV = "e16f942166511d6fb4427e503a734152fae0c4fe" | 6 | SRCREV = "88e1ab7545a4af4aea15c305a154c164a95ab842" |
| 7 | SRC_URI += "git://github.com/pylint-dev/pylint;branch=main;protocol=https;tag=v${PV} \ | 7 | SRC_URI += "git://github.com/pylint-dev/pylint;branch=main;protocol=https;tag=v${PV} \ |
| 8 | file://0001-Adjust-test-expectations-for-ptest.patch \ | 8 | file://0001-Adjust-test-expectations-for-ptest.patch \ |
| 9 | file://0002-pyproject.toml-Keep-tool.setuptools.license-files.patch \ | 9 | file://0002-pyproject.toml-Keep-tool.setuptools.license-files.patch \ |
diff --git a/meta-python/recipes-devtools/python/python3-pymisp_2.5.17.bb b/meta-python/recipes-devtools/python/python3-pymisp_2.5.33.1.bb index 7267143e7e..4885dda859 100644 --- a/meta-python/recipes-devtools/python/python3-pymisp_2.5.17.bb +++ b/meta-python/recipes-devtools/python/python3-pymisp_2.5.33.1.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" | |||
| 3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "91f1f75a18076e66c9275065d455b76099a723f4f7b66920b89893f942bbaf56" | 6 | SRC_URI[sha256sum] = "b5cd9aac342596fbe2696b7c3ee02a2a221574557c0334451b0d4e21a4c5928f" |
| 7 | 7 | ||
| 8 | inherit python_poetry_core pypi | 8 | inherit python_poetry_core pypi |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pymodbus_3.11.4.bb b/meta-python/recipes-devtools/python/python3-pymodbus_3.12.1.bb index 6d961fda1a..7ba7ee78cd 100644 --- a/meta-python/recipes-devtools/python/python3-pymodbus_3.11.4.bb +++ b/meta-python/recipes-devtools/python/python3-pymodbus_3.12.1.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/riptideio/pymodbus/" | |||
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=12a490c6cffa2e76a6df8aa1fa29e183" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=12a490c6cffa2e76a6df8aa1fa29e183" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "6910e385cb6b2f983cd457e9ecee2ff580dbb23cf3d84aefec0845e71edd606a" | 6 | SRC_URI[sha256sum] = "bcb483381747b3e3aec2c8e01d5df885e5ea43f85b7145dc1907af06aca93a2c" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyperclip_1.9.0.bb b/meta-python/recipes-devtools/python/python3-pyperclip_1.11.0.bb index 80af514fab..09c7fc8f86 100644 --- a/meta-python/recipes-devtools/python/python3-pyperclip_1.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyperclip_1.11.0.bb | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | DESCRIPTION = "A cross-platform clipboard module for Python. (only handles plain text for now)" | 1 | DESCRIPTION = "A cross-platform clipboard module for Python. (only handles plain text for now)" |
| 2 | HOMEPAGE = "https://github.com/asweigart/pyperclip" | 2 | HOMEPAGE = "https://github.com/asweigart/pyperclip" |
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=d7dd4b0d1f7153322a546e89b5a0a632" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b6cd06fd72984ac1f8428337aec8cff7" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "b7de0142ddc81bfc5c7507eea19da920b92252b548b96186caf94a5e2527d310" | 6 | SRC_URI[sha256sum] = "244035963e4428530d9e3a6101a1ef97209c6825edab1567beac148ccc1db1b6" |
| 7 | 7 | ||
| 8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
| 10 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
| 11 | python3-ctypes \ | 11 | python3-ctypes \ |
diff --git a/meta-python/recipes-devtools/python/python3-pyperf_2.9.0.bb b/meta-python/recipes-devtools/python/python3-pyperf_2.10.0.bb index 810e65674a..39b8ee8470 100644 --- a/meta-python/recipes-devtools/python/python3-pyperf_2.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyperf_2.10.0.bb | |||
| @@ -13,7 +13,7 @@ Features: \ | |||
| 13 | LICENSE = "MIT" | 13 | LICENSE = "MIT" |
| 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8" | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8" |
| 15 | 15 | ||
| 16 | SRC_URI[sha256sum] = "dbe0feef8ec1a465df191bba2576149762d15a8c9985c9fea93ab625d875c362" | 16 | SRC_URI[sha256sum] = "dd93ccfda79214725293e95f1fa6e00cb4a64adcf1326039486d4e1f91caaa62" |
| 17 | 17 | ||
| 18 | DEPENDS += "python3-six-native" | 18 | DEPENDS += "python3-six-native" |
| 19 | 19 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyrad/208.patch b/meta-python/recipes-devtools/python/python3-pyrad/208.patch deleted file mode 100644 index b08f183583..0000000000 --- a/meta-python/recipes-devtools/python/python3-pyrad/208.patch +++ /dev/null | |||
| @@ -1,51 +0,0 @@ | |||
| 1 | From d17438da2008f48aa13cc95a626c990bf645799a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Luca Barbieri <lucabarb@gmail.com> | ||
| 3 | Date: Wed, 8 Jan 2025 10:35:22 +0100 | ||
| 4 | Subject: [PATCH 1/2] Fix pyproject.toml format | ||
| 5 | |||
| 6 | Fix pyproject format to correctly build with poetry-core 2.0.0 | ||
| 7 | Upstream-Status: Submitted [https://github.com/pyradius/pyrad/pull/208] | ||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | pyproject.toml | 28 ++++++++++++++-------------- | ||
| 11 | 1 file changed, 14 insertions(+), 14 deletions(-) | ||
| 12 | |||
| 13 | --- a/pyproject.toml | ||
| 14 | +++ b/pyproject.toml | ||
| 15 | @@ -2,16 +2,16 @@ | ||
| 16 | requires = ["poetry-core>=1.0.0"] | ||
| 17 | build-backend = "poetry.core.masonry.api" | ||
| 18 | |||
| 19 | -[tool.poetry] | ||
| 20 | +[project] | ||
| 21 | name = "pyrad" | ||
| 22 | version= "2.4" | ||
| 23 | readme = "README.rst" | ||
| 24 | license = "BSD-3-Clause" | ||
| 25 | description="RADIUS tools" | ||
| 26 | authors = [ | ||
| 27 | - "Istvan Ruzman <istvan@ruzman.eu>", | ||
| 28 | - "Christian Giese <developer@gicnet.de>", | ||
| 29 | -] | ||
| 30 | + { name = "Istvan Ruzman", email = "istvan@ruzman.eu" }, | ||
| 31 | + { name = "Christian Giese", email = "developer@gicnet.de" }, | ||
| 32 | + ] | ||
| 33 | keywords = ["AAA", "accounting", "authentication", "authorization", "RADIUS"] | ||
| 34 | classifiers = [ | ||
| 35 | "Development Status :: 6 - Mature", | ||
| 36 | @@ -28,7 +28,7 @@ include = [ | ||
| 37 | "example/*" | ||
| 38 | ] | ||
| 39 | |||
| 40 | -[tool.poetry.urls] | ||
| 41 | +[project.urls] | ||
| 42 | repository = "https://github.com/pyradius/pyrad" | ||
| 43 | |||
| 44 | [tool.poetry.dependencies] | ||
| 45 | @@ -36,5 +36,5 @@ python = "^2.7 || ^3.6" | ||
| 46 | six = "^1.15.0" | ||
| 47 | netaddr = "^0.8" | ||
| 48 | |||
| 49 | -[tool.poetry.dev-dependencies] | ||
| 50 | +[tool.poetry.group.dev.dependencies] | ||
| 51 | nose = "^0.10.0b1" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyrad/use-poetry-core.patch b/meta-python/recipes-devtools/python/python3-pyrad/use-poetry-core.patch deleted file mode 100644 index 43a177da0a..0000000000 --- a/meta-python/recipes-devtools/python/python3-pyrad/use-poetry-core.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | Upstream-Status: Backport [https://github.com/pyradius/pyrad/commit/ffe182a44909e8f8278fb3e2ea052ddc097b48b9] | ||
| 2 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 3 | |||
| 4 | From a4b70067dd6269e14a2f9530d820390a8a454231 Mon Sep 17 00:00:00 2001 | ||
| 5 | From: Martin Weinelt <hexa@darmstadt.ccc.de> | ||
| 6 | Date: Thu, 14 Apr 2022 22:07:37 +0200 | ||
| 7 | Subject: [PATCH] Use poetry-core for pyproject based builds | ||
| 8 | |||
| 9 | https://github.com/python-poetry/poetry-core#why-is-this-required | ||
| 10 | --- | ||
| 11 | pyproject.toml | 4 ++-- | ||
| 12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/pyproject.toml b/pyproject.toml | ||
| 15 | index 87b1df3..711c52f 100755 | ||
| 16 | --- a/pyproject.toml | ||
| 17 | +++ b/pyproject.toml | ||
| 18 | @@ -1,6 +1,6 @@ | ||
| 19 | [build-system] | ||
| 20 | -requires = ["poetry>=1.0"] | ||
| 21 | -build-backend = "poetry.masonry.api" | ||
| 22 | +requires = ["poetry-core>=1.0.0"] | ||
| 23 | +build-backend = "poetry.core.masonry.api" | ||
| 24 | |||
| 25 | [tool.poetry] | ||
| 26 | name = "pyrad" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb b/meta-python/recipes-devtools/python/python3-pyrad_2.5.4.bb index e8cfffc9cc..404e26381b 100644 --- a/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb +++ b/meta-python/recipes-devtools/python/python3-pyrad_2.5.4.bb | |||
| @@ -1,14 +1,10 @@ | |||
| 1 | SUMMARY = "RADIUS tools" | 1 | SUMMARY = "RADIUS tools" |
| 2 | SECTION = "devel/python" | 2 | SECTION = "devel/python" |
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" | 4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=53dbfa56f61b90215a9f8f0d527c043d" |
| 5 | 5 | ||
| 6 | PYPI_PACKAGE = "pyrad" | 6 | PYPI_PACKAGE = "pyrad" |
| 7 | SRC_URI[sha256sum] = "057de4b7e89d8da57ba782c1bde45c63ebee720ae2c0b0a69beaff15c47e30d9" | 7 | SRC_URI[sha256sum] = "e039c48a026c988d49276bd7c75795f55e0e4c2788f7ddf09419ce0e191a154d" |
| 8 | |||
| 9 | SRC_URI += "file://use-poetry-core.patch \ | ||
| 10 | file://208.patch \ | ||
| 11 | " | ||
| 12 | 8 | ||
| 13 | inherit pypi python_poetry_core | 9 | inherit pypi python_poetry_core |
| 14 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pystemd_0.15.1.bb b/meta-python/recipes-devtools/python/python3-pystemd_0.15.3.bb index 7698d6394d..b987007e39 100644 --- a/meta-python/recipes-devtools/python/python3-pystemd_0.15.1.bb +++ b/meta-python/recipes-devtools/python/python3-pystemd_0.15.3.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Python bindings for interacting with systemd over DBus" | |||
| 2 | LICENSE = "LGPL-2.1-only" | 2 | LICENSE = "LGPL-2.1-only" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" |
| 4 | 4 | ||
| 5 | SRC_URI[sha256sum] = "f217b5792f1e7c391ae46262f43566b6f83364507eaab5d5e73fcd05ab12d2bb" | 5 | SRC_URI[sha256sum] = "3533f6d287a1ffe39dbfffcf2f547454bb8ef7a169ac6a24e81f446ddb258802" |
| 6 | 6 | ||
| 7 | DEPENDS = "systemd" | 7 | DEPENDS = "systemd" |
| 8 | RDEPENDS:${PN} += "\ | 8 | RDEPENDS:${PN} += "\ |
diff --git a/meta-python/recipes-devtools/python/python3-pytest-env_1.5.0.bb b/meta-python/recipes-devtools/python/python3-pytest-env_1.5.0.bb new file mode 100644 index 0000000000..c9fbde1961 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-env_1.5.0.bb | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | SUMMARY = "pytest plugin that allows you to add environment variables." | ||
| 2 | HOMEPAGE = "https://github.com/pytest-dev/pytest-env" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b70ef84b3d8d608b13b0287ed49df651" | ||
| 5 | RECIPE_MAINTAINER = "Tom Geelen <t.f.g.geelen@gmail.com>" | ||
| 6 | |||
| 7 | DEPENDS = "python3-hatch-vcs-native python3-hatchling-native" | ||
| 8 | SRC_URI[sha256sum] = "db8994b9ce170f135a37acc09ac753a6fc697d15e691b576ed8d8ca261c40246" | ||
| 9 | |||
| 10 | inherit pypi python_hatchling ptest-python-pytest | ||
| 11 | |||
| 12 | PYPI_PACKAGE = "pytest_env" | ||
| 13 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | ||
| 14 | |||
| 15 | RDEPENDS:${PN} = "python3-pytest python3-tomli" | ||
| 16 | |||
| 17 | RDEPENDS:${PN}-ptest += " \ | ||
| 18 | python3-covdefaults \ | ||
| 19 | python3-coverage \ | ||
| 20 | python3-pytest-mock \ | ||
| 21 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb b/meta-python/recipes-devtools/python/python3-pytest-html_4.2.0.bb index d45f6a25ee..ea760ff29a 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-html_4.2.0.bb | |||
| @@ -4,7 +4,7 @@ DEPENDS += "python3-setuptools-scm-native" | |||
| 4 | LICENSE = "MPL-2.0" | 4 | LICENSE = "MPL-2.0" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "70a01e8ae5800f4a074b56a4cb1025c8f4f9b038bba5fe31e3c98eb996686f07" | 7 | SRC_URI[sha256sum] = "b6a88cba507500d8709959201e2e757d3941e859fd17cfd4ed87b16fc0c67912" |
| 8 | 8 | ||
| 9 | PYPI_PACKAGE = "pytest_html" | 9 | PYPI_PACKAGE = "pytest_html" |
| 10 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 10 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
diff --git a/meta-python/recipes-devtools/python/python3-python-multipart_0.0.21.bb b/meta-python/recipes-devtools/python/python3-python-multipart_0.0.22.bb index 6fc2b69f7e..b54fe5d309 100644 --- a/meta-python/recipes-devtools/python/python3-python-multipart_0.0.21.bb +++ b/meta-python/recipes-devtools/python/python3-python-multipart_0.0.22.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "A streaming multipart parser for Python" | |||
| 2 | LICENSE = "Apache-2.0" | 2 | LICENSE = "Apache-2.0" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3d98f0d58b28321924a89ab60c82410e" | 3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3d98f0d58b28321924a89ab60c82410e" |
| 4 | 4 | ||
| 5 | SRC_URI[sha256sum] = "7137ebd4d3bbf70ea1622998f902b97a29434a9e8dc40eb203bbcf7c2a2cba92" | 5 | SRC_URI[sha256sum] = "7340bef99a7e0032613f56dc36027b959fd3b30a787ed62d310e951f7c3a3a58" |
| 6 | 6 | ||
| 7 | inherit pypi python_hatchling ptest-python-pytest | 7 | inherit pypi python_hatchling ptest-python-pytest |
| 8 | 8 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pytokens_0.4.0.bb b/meta-python/recipes-devtools/python/python3-pytokens_0.4.1.bb index 1ec1e31086..0772b48f35 100644 --- a/meta-python/recipes-devtools/python/python3-pytokens_0.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-pytokens_0.4.1.bb | |||
| @@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=627dc9a75d5dcc4759b26bacf13a4c46" | |||
| 4 | 4 | ||
| 5 | inherit pypi python_setuptools_build_meta | 5 | inherit pypi python_setuptools_build_meta |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "6b0b03e6ea7c9f9d47c5c61164b69ad30f4f0d70a5d9fe7eac4d19f24f77af2d" | 7 | SRC_URI[sha256sum] = "292052fe80923aae2260c073f822ceba21f3872ced9a68bb7953b348e561179a" |
| 8 | 8 | ||
| 9 | DEPENDS += "python3-mypy-native" | 9 | DEPENDS += "python3-mypy-native" |
diff --git a/meta-python/recipes-devtools/python/python3-redis_5.2.1.bb b/meta-python/recipes-devtools/python/python3-redis_7.3.0.bb index ba214f5869..861221d3ee 100644 --- a/meta-python/recipes-devtools/python/python3-redis_5.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-redis_7.3.0.bb | |||
| @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=609ded3add9111c4c6e102f1d421d3f8" | |||
| 7 | # Prefix archive to avoid clashing with the main redis archives | 7 | # Prefix archive to avoid clashing with the main redis archives |
| 8 | PYPI_ARCHIVE_NAME_PREFIX = "pypi-" | 8 | PYPI_ARCHIVE_NAME_PREFIX = "pypi-" |
| 9 | 9 | ||
| 10 | SRC_URI[sha256sum] = "16f2e22dff21d5125e8481515e386711a34cbec50f0e44413dd7d9c060a54e0f" | 10 | SRC_URI[sha256sum] = "4d1b768aafcf41b01022410b3cc4f15a07d9b3d6fe0c66fc967da2c88e551034" |
| 11 | 11 | ||
| 12 | inherit pypi setuptools3 | 12 | inherit pypi python_hatchling |
| 13 | 13 | ||
| 14 | RDEPENDS:${PN} += " \ | 14 | RDEPENDS:${PN} += " \ |
| 15 | python3-asyncio \ | 15 | python3-asyncio \ |
diff --git a/meta-python/recipes-devtools/python/python3-regex_2025.11.3.bb b/meta-python/recipes-devtools/python/python3-regex_2026.2.28.bb index 8e30bdaacf..4ad0eadc98 100644 --- a/meta-python/recipes-devtools/python/python3-regex_2025.11.3.bb +++ b/meta-python/recipes-devtools/python/python3-regex_2026.2.28.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" | |||
| 5 | 5 | ||
| 6 | inherit pypi python_setuptools_build_meta | 6 | inherit pypi python_setuptools_build_meta |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "1fedc720f9bb2494ce31a58a1631f9c82df6a09b49c19517ea5cc280b4541e01" | 8 | SRC_URI[sha256sum] = "a729e47d418ea11d03469f321aaf67cdee8954cde3ff2cf8403ab87951ad10f2" |
| 9 | 9 | ||
| 10 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
| 11 | python3-stringold \ | 11 | python3-stringold \ |
diff --git a/meta-python/recipes-devtools/python/python3-reportlab_4.4.5.bb b/meta-python/recipes-devtools/python/python3-reportlab_4.4.10.bb index 6386f5c3b1..57e62893b3 100644 --- a/meta-python/recipes-devtools/python/python3-reportlab_4.4.5.bb +++ b/meta-python/recipes-devtools/python/python3-reportlab_4.4.10.bb | |||
| @@ -4,7 +4,7 @@ DESCRIPTION = "An Open Source Python library for generating PDFs and graphics." | |||
| 4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cf24392f451ff6710fca1e96cefa0424" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cf24392f451ff6710fca1e96cefa0424" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "0457d642aa76df7b36b0235349904c58d8f9c606a872456ed04436aafadc1510" | 7 | SRC_URI[sha256sum] = "5cbbb34ac3546039d0086deb2938cdec06b12da3cdb836e813258eb33cd28487" |
| 8 | 8 | ||
| 9 | CVE_PRODUCT = "reportlab" | 9 | CVE_PRODUCT = "reportlab" |
| 10 | CVE_STATUS[CVE-2020-28463] = "fixed-version: has been fixed since 3.5.55" | 10 | CVE_STATUS[CVE-2020-28463] = "fixed-version: has been fixed since 3.5.55" |
diff --git a/meta-python/recipes-devtools/python/python3-responses_0.25.8.bb b/meta-python/recipes-devtools/python/python3-responses_0.26.0.bb index 2370a88843..4d1884225d 100644 --- a/meta-python/recipes-devtools/python/python3-responses_0.25.8.bb +++ b/meta-python/recipes-devtools/python/python3-responses_0.26.0.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e601511a8517f4daf688a8eb95be7a2" | |||
| 5 | 5 | ||
| 6 | inherit pypi python_setuptools_build_meta | 6 | inherit pypi python_setuptools_build_meta |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "9374d047a575c8f781b94454db5cab590b6029505f488d12899ddb10a4af1cf4" | 8 | SRC_URI[sha256sum] = "c7f6923e6343ef3682816ba421c006626777893cb0d5e1434f674b649bac9eb4" |
| 9 | 9 | ||
| 10 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
| 11 | python3-mock \ | 11 | python3-mock \ |
diff --git a/meta-python/recipes-devtools/python/python3-robotframework_7.3.2.bb b/meta-python/recipes-devtools/python/python3-robotframework_7.4.2.bb index df4b31312e..5c83d923d4 100644 --- a/meta-python/recipes-devtools/python/python3-robotframework_7.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-robotframework_7.4.2.bb | |||
| @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
| 11 | 11 | ||
| 12 | inherit pypi setuptools3 | 12 | inherit pypi setuptools3 |
| 13 | 13 | ||
| 14 | SRC_URI[sha256sum] = "3bb3e299831ecb1664f3d5082f6ff9f08ba82d61a745bef2227328ef3049e93a" | 14 | SRC_URI[sha256sum] = "1c934e7f43600de407860cd2bd2fdc41adad4a4a785d8b46b1ed485fdc0f6c9f" |
| 15 | 15 | ||
| 16 | RDEPENDS:${PN} += " \ | 16 | RDEPENDS:${PN} += " \ |
| 17 | python3-shell \ | 17 | python3-shell \ |
diff --git a/meta-python/recipes-devtools/python/python3-schema_0.7.8.bb b/meta-python/recipes-devtools/python/python3-schema_0.7.8.bb new file mode 100644 index 0000000000..b27b890374 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-schema_0.7.8.bb | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | SUMMARY = "A library for validating Python data structures" | ||
| 2 | HOMEPAGE = "https://github.com/keleshev/schema" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=7e70914c99a6ec706baa9fad5e0502df" | ||
| 5 | |||
| 6 | SRC_URI[sha256sum] = "e86cc08edd6fe6e2522648f4e47e3a31920a76e82cce8937535422e310862ab5" | ||
| 7 | |||
| 8 | inherit pypi python_setuptools_build_meta | ||
| 9 | |||
| 10 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/python3-scikit-build-core_0.11.6.bb b/meta-python/recipes-devtools/python/python3-scikit-build-core_0.12.2.bb index 93a83ead65..d7f8aacd97 100644 --- a/meta-python/recipes-devtools/python/python3-scikit-build-core_0.11.6.bb +++ b/meta-python/recipes-devtools/python/python3-scikit-build-core_0.12.2.bb | |||
| @@ -13,6 +13,6 @@ SRC_URI += " \ | |||
| 13 | file://0001-builder.py-Check-PYTHON_INCLUDE_DIR.patch \ | 13 | file://0001-builder.py-Check-PYTHON_INCLUDE_DIR.patch \ |
| 14 | file://0001-Find-cmake-from-PATH-instead-of-CMAKE_BIN_DIR.patch \ | 14 | file://0001-Find-cmake-from-PATH-instead-of-CMAKE_BIN_DIR.patch \ |
| 15 | " | 15 | " |
| 16 | SRC_URI[sha256sum] = "5982ccd839735be99cfd3b92a8847c6c196692f476c215da84b79d2ad12f9f1b" | 16 | SRC_URI[sha256sum] = "562e0bbc9de1a354c87825ccf732080268d6582a0200f648e8c4a2dcb1e3736d" |
| 17 | 17 | ||
| 18 | BBCLASSEXTEND = "native nativesdk" | 18 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python3-scikit-build_0.18.1.bb b/meta-python/recipes-devtools/python/python3-scikit-build_0.19.0.bb index 3b2e8b714e..78a9ee29a3 100644 --- a/meta-python/recipes-devtools/python/python3-scikit-build_0.18.1.bb +++ b/meta-python/recipes-devtools/python/python3-scikit-build_0.19.0.bb | |||
| @@ -9,7 +9,7 @@ UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | |||
| 9 | 9 | ||
| 10 | inherit pypi python_hatchling | 10 | inherit pypi python_hatchling |
| 11 | 11 | ||
| 12 | SRC_URI[sha256sum] = "a4152ac5a084d499c28a7797be0628d8366c336e2fb0e1a063eb32e55efcb8e7" | 12 | SRC_URI[sha256sum] = "46e1b2d71343d14e4c07d7e60902e673c78defb9a2c282b70ad80fb8502ade2e" |
| 13 | 13 | ||
| 14 | RDEPENDS:${PN} = " \ | 14 | RDEPENDS:${PN} = " \ |
| 15 | python3-distro \ | 15 | python3-distro \ |
diff --git a/meta-python/recipes-devtools/python/python3-snagboot_2.5.bb b/meta-python/recipes-devtools/python/python3-snagboot_2.6.bb index fe496ffc2f..16cc5c7882 100644 --- a/meta-python/recipes-devtools/python/python3-snagboot_2.5.bb +++ b/meta-python/recipes-devtools/python/python3-snagboot_2.6.bb | |||
| @@ -3,7 +3,7 @@ SUMMARY = "Snagboot intends to be an open-source replacement vendor-specific too | |||
| 3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "64d114f743cf4d892a63bc35d6af45958e569030881154f9f2ffeac13cf9b664" | 6 | SRC_URI[sha256sum] = "8451ff4cb96f8a4dc7aca06cee8a54db900e93b4e0e946205e0856b7a4cf4632" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
| @@ -19,3 +19,5 @@ RDEPENDS:${PN} += " \ | |||
| 19 | do_install:append() { | 19 | do_install:append() { |
| 20 | install -D -m 0644 ${S}/src/snagrecover/50-snagboot.rules ${D}${sysconfdir}/udev/rules.d/50-snagboot.rules | 20 | install -D -m 0644 ${S}/src/snagrecover/50-snagboot.rules ${D}${sysconfdir}/udev/rules.d/50-snagboot.rules |
| 21 | } | 21 | } |
| 22 | |||
| 23 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-socketio_5.11.2.bb b/meta-python/recipes-devtools/python/python3-socketio_5.16.1.bb index 4251a81d6c..10372e83cc 100644 --- a/meta-python/recipes-devtools/python/python3-socketio_5.11.2.bb +++ b/meta-python/recipes-devtools/python/python3-socketio_5.16.1.bb | |||
| @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" | |||
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
| 10 | PYPI_PACKAGE = "python-socketio" | 10 | PYPI_PACKAGE = "python_socketio" |
| 11 | 11 | ||
| 12 | SRC_URI[sha256sum] = "ae6a1de5c5209ca859dc574dccc8931c4be17ee003e74ce3b8d1306162bb4a37" | 12 | SRC_URI[sha256sum] = "f863f98eacce81ceea2e742f6388e10ca3cdd0764be21d30d5196470edf5ea89" |
| 13 | 13 | ||
| 14 | PACKAGECONFIG ?= "asyncio_client client" | 14 | PACKAGECONFIG ?= "asyncio_client client" |
| 15 | PACKAGECONFIG[asyncio_client] = ",,,python3-aiohttp python3-websockets" | 15 | PACKAGECONFIG[asyncio_client] = ",,,python3-aiohttp python3-websockets" |
diff --git a/meta-python/recipes-devtools/python/python3-soupsieve_2.8.1.bb b/meta-python/recipes-devtools/python/python3-soupsieve_2.8.2.bb index d3fb375eba..63b5d3b2e7 100644 --- a/meta-python/recipes-devtools/python/python3-soupsieve_2.8.1.bb +++ b/meta-python/recipes-devtools/python/python3-soupsieve_2.8.2.bb | |||
| @@ -2,9 +2,9 @@ SUMMARY = "CSS selector library for python-beautifulsoup4" | |||
| 2 | HOMEPAGE = "https://github.com/facelessuser/soupsieve" | 2 | HOMEPAGE = "https://github.com/facelessuser/soupsieve" |
| 3 | 3 | ||
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a23cdb0cf58a8b6d3d25202783bd6553" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=74851a2f1e5c07496dcb452af6a6bf54" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "4cf733bc50fa805f5df4b8ef4740fc0e0fa6218cf3006269afd3f9d6d80fd350" | 7 | SRC_URI[sha256sum] = "78a66b0fdee2ab40b7199dc3e747ee6c6e231899feeaae0b9b98a353afd48fd8" |
| 8 | 8 | ||
| 9 | inherit pypi python_hatchling ptest-python-pytest | 9 | inherit pypi python_hatchling ptest-python-pytest |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.45.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.48.bb index f7d8f383f2..6681792f01 100644 --- a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.45.bb +++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.48.bb | |||
| @@ -2,9 +2,9 @@ DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ | |||
| 2 | application developers the full power and flexibility of SQL" | 2 | application developers the full power and flexibility of SQL" |
| 3 | HOMEPAGE = "https://www.sqlalchemy.org/" | 3 | HOMEPAGE = "https://www.sqlalchemy.org/" |
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=061025f14213ac2818ff353223d6eca6" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=53a9111717b305b0fae0d704a24925c3" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "1632a4bda8d2d25703fdad6363058d882541bdaaee0e5e3ddfa0cd3229efce88" | 7 | SRC_URI[sha256sum] = "5ca74f37f3369b45e1f6b7b06afb182af1fd5dde009e4ffd831830d98cbe5fe7" |
| 8 | 8 | ||
| 9 | inherit pypi python_setuptools_build_meta cython | 9 | inherit pypi python_setuptools_build_meta cython |
| 10 | 10 | ||
| @@ -19,6 +19,7 @@ RDEPENDS:${PN} += " \ | |||
| 19 | python3-profile \ | 19 | python3-profile \ |
| 20 | python3-threading \ | 20 | python3-threading \ |
| 21 | python3-typing-extensions \ | 21 | python3-typing-extensions \ |
| 22 | python3-greenlet \ | ||
| 22 | " | 23 | " |
| 23 | 24 | ||
| 24 | CVE_PRODUCT = "sqlalchemy" | 25 | CVE_PRODUCT = "sqlalchemy" |
diff --git a/meta-python/recipes-devtools/python/python3-sqlparse_0.5.4.bb b/meta-python/recipes-devtools/python/python3-sqlparse_0.5.5.bb index 9f358d40f1..03c032c49e 100644 --- a/meta-python/recipes-devtools/python/python3-sqlparse_0.5.4.bb +++ b/meta-python/recipes-devtools/python/python3-sqlparse_0.5.5.bb | |||
| @@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
| 4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "4396a7d3cf1cd679c1be976cf3dc6e0a51d0111e87787e7a8d780e7d5a998f9e" | 7 | SRC_URI[sha256sum] = "e20d4a9b0b8585fdf63b10d30066c7c94c5d7a7ec47c889a2d83a3caa93ff28e" |
| 8 | 8 | ||
| 9 | CVE_PRODUCT = "sqlparse" | 9 | CVE_PRODUCT = "sqlparse" |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-starlette_0.51.0.bb b/meta-python/recipes-devtools/python/python3-starlette_0.52.1.bb index f6380bdfad..a06feb1b73 100644 --- a/meta-python/recipes-devtools/python/python3-starlette_0.51.0.bb +++ b/meta-python/recipes-devtools/python/python3-starlette_0.52.1.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Starlette is a lightweight ASGI framework/toolkit, which is ideal for | |||
| 2 | LICENSE = "BSD-3-Clause" | 2 | LICENSE = "BSD-3-Clause" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=11e8c8dbfd5fa373c703de492140ff7a" | 3 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=11e8c8dbfd5fa373c703de492140ff7a" |
| 4 | 4 | ||
| 5 | SRC_URI[sha256sum] = "4c4fda9b1bc67f84037d3d14a5112e523509c369d9d47b111b2f984b0cc5ba6c" | 5 | SRC_URI[sha256sum] = "834edd1b0a23167694292e94f597773bc3f89f362be6effee198165a35d62933" |
| 6 | 6 | ||
| 7 | inherit pypi python_hatchling ptest | 7 | inherit pypi python_hatchling ptest |
| 8 | 8 | ||
diff --git a/meta-python/recipes-devtools/python/python3-stevedore_5.6.0.bb b/meta-python/recipes-devtools/python/python3-stevedore_5.7.0.bb index 634df7db37..cb194b6c15 100644 --- a/meta-python/recipes-devtools/python/python3-stevedore_5.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-stevedore_5.7.0.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://docs.openstack.org/stevedore/latest/" | |||
| 3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "f22d15c6ead40c5bbfa9ca54aa7e7b4a07d59b36ae03ed12ced1a54cf0b51945" | 6 | SRC_URI[sha256sum] = "31dd6fe6b3cbe921e21dcefabc9a5f1cf848cf538a1f27543721b8ca09948aa3" |
| 7 | 7 | ||
| 8 | DEPENDS += "python3-pbr-native" | 8 | DEPENDS += "python3-pbr-native" |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb b/meta-python/recipes-devtools/python/python3-tabulate_0.10.0.bb index 75e97355f5..909f47268f 100644 --- a/meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-tabulate_0.10.0.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/astanin/python-tabulate" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad1430c0c4824ec6a5dbb9754b011d7" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad1430c0c4824ec6a5dbb9754b011d7" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c" | 6 | SRC_URI[sha256sum] = "e2cfde8f79420f6deeffdeda9aaec3b6bc5abce947655d17ac662b126e48a60d" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.8.bb b/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.8.bb deleted file mode 100644 index 46f72b8f08..0000000000 --- a/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.8.bb +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | SUMMARY = "Telnet server and client library based on asyncio" | ||
| 2 | HOMEPAGE = "https://github.com/jquast/telnetlib3" | ||
| 3 | LICENSE = "ISC" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b2cbfe1ec99d8830fa20d62c8f21d0e8" | ||
| 5 | |||
| 6 | SRC_URI[sha256sum] = "08a2a7a3a6790f89617442b7d491da8b531d87706fffd6a33eeff57ac440b752" | ||
| 7 | |||
| 8 | PYPI_PACKAGE = "telnetlib3" | ||
| 9 | |||
| 10 | inherit pypi setuptools3 | ||
| 11 | |||
| 12 | RDEPENDS:${PN} = "\ | ||
| 13 | python3-asyncio \ | ||
| 14 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-telnetlib3_2.6.0.bb b/meta-python/recipes-devtools/python/python3-telnetlib3_2.6.0.bb new file mode 100644 index 0000000000..bef533b39b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-telnetlib3_2.6.0.bb | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | SUMMARY = "Telnet server and client library based on asyncio" | ||
| 2 | HOMEPAGE = "https://github.com/jquast/telnetlib3" | ||
| 3 | LICENSE = "ISC" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=15abe157ad6f0b483975cc34bcc1aa99" | ||
| 5 | |||
| 6 | SRC_URI[sha256sum] = "c231e790c626f5b6927a4a85e79bce18cde994c9424254d2193582b430972164" | ||
| 7 | |||
| 8 | PYPI_PACKAGE = "telnetlib3" | ||
| 9 | |||
| 10 | inherit pypi python_setuptools_build_meta python_hatchling | ||
| 11 | |||
| 12 | RDEPENDS:${PN} = "\ | ||
| 13 | python3-asyncio \ | ||
| 14 | python3-wcwidth \ | ||
| 15 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-tenacity_9.1.2.bb b/meta-python/recipes-devtools/python/python3-tenacity_9.1.4.bb index 76d23aee40..5200c4c0b5 100644 --- a/meta-python/recipes-devtools/python/python3-tenacity_9.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-tenacity_9.1.4.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jd/tenacity" | |||
| 3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "1169d376c297e7de388d18b4481760d478b0e99a777cad3a9c86e556f4b697cb" | 6 | SRC_URI[sha256sum] = "adb31d4c263f2bd041081ab33b498309a57c77f9acf2db65aadf0898179cf93a" |
| 7 | 7 | ||
| 8 | SRC_URI:append = "file://0001-ptest-skip-a-test-that-does-not-pass-on-qemu.patch" | 8 | SRC_URI:append = "file://0001-ptest-skip-a-test-that-does-not-pass-on-qemu.patch" |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-time-machine_3.2.0.bb b/meta-python/recipes-devtools/python/python3-time-machine_3.2.0.bb new file mode 100644 index 0000000000..8e2fa51bb4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-time-machine_3.2.0.bb | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | SUMMARY = "Travel through time in your tests." | ||
| 2 | HOMEPAGE = "https://github.com/adamchainz/time-machine" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fb9b93a440d3ef2fb6eeebfa59384c53" | ||
| 5 | |||
| 6 | SRCREV = "1b7ac45defb26c72076dc202aba46967c8c28fa9" | ||
| 7 | PYPI_SRC_URI = "git://github.com/adamchainz/time-machine;protocol=https;branch=main;tag=${PV};destsuffix=time_machine-${PV}" | ||
| 8 | |||
| 9 | inherit pypi python_setuptools_build_meta ptest-python-pytest | ||
| 10 | |||
| 11 | PYPI_PACKAGE = "time_machine" | ||
| 12 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | ||
| 13 | |||
| 14 | RDEPENDS:${PN} += "\ | ||
| 15 | python3-tzdata \ | ||
| 16 | python3-unittest \ | ||
| 17 | python3-zoneinfo \ | ||
| 18 | " | ||
| 19 | do_install_ptest:append() { | ||
| 20 | install -d ${D}${PTEST_PATH}/tests | ||
| 21 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
| 22 | } | ||
| 23 | |||
| 24 | RDEPENDS:${PN}-ptest += "\ | ||
| 25 | python3-dateutil \ | ||
| 26 | python3-freezegun \ | ||
| 27 | python3-tokenize-rt \ | ||
| 28 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-tokenize-rt_6.2.0.bb b/meta-python/recipes-devtools/python/python3-tokenize-rt_6.2.0.bb new file mode 100644 index 0000000000..0f5a1b34d3 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-tokenize-rt_6.2.0.bb | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | SUMMARY = "A wrapper around the stdlib `tokenize` which roundtrips." | ||
| 2 | HOMEPAGE = "https://github.com/asottile/tokenize-rt" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5fd324061c581b8d45b8cb18c560a543" | ||
| 5 | |||
| 6 | SRCREV = "1582bcf0259d183259da1761444c6fc73fa7ad9a" | ||
| 7 | PYPI_SRC_URI = "git://github.com/asottile/tokenize-rt.git;protocol=https;branch=main;tag=v${PV};destsuffix=tokenize_rt-${PV}" | ||
| 8 | |||
| 9 | inherit pypi setuptools3 ptest-python-pytest | ||
| 10 | |||
| 11 | RDEPENDS:${PN} += "python3-core" | ||
| 12 | |||
| 13 | PYPI_PACKAGE = "tokenize_rt" | ||
| 14 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | ||
| 15 | |||
| 16 | do_install_ptest:append() { | ||
| 17 | install -d ${D}${PTEST_PATH}/testing/resources | ||
| 18 | cp -rf ${S}/testing/resources/* ${D}${PTEST_PATH}/testing/resources/ | ||
| 19 | install -d ${D}${PTEST_PATH}/tests | ||
| 20 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
| 21 | } | ||
diff --git a/meta-python/recipes-devtools/python/python3-toposort_1.10.bb b/meta-python/recipes-devtools/python/python3-toposort_1.10.bb new file mode 100644 index 0000000000..ce903dcec3 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-toposort_1.10.bb | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | SUMMARY = "Implements a topological sort algorithm" | ||
| 2 | HOMEPAGE = "https://gitlab.com/ericvsmith/toposort" | ||
| 3 | LICENSE = "Apache-2.0" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
| 5 | |||
| 6 | SRC_URI[sha256sum] = "bfbb479c53d0a696ea7402601f4e693c97b0367837c8898bc6471adfca37a6bd" | ||
| 7 | |||
| 8 | inherit pypi python_setuptools_build_meta | ||
| 9 | |||
| 10 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/python3-tornado_6.5.4.bb b/meta-python/recipes-devtools/python/python3-tornado_6.5.5.bb index 661ec039ce..fb9067c90e 100644 --- a/meta-python/recipes-devtools/python/python3-tornado_6.5.4.bb +++ b/meta-python/recipes-devtools/python/python3-tornado_6.5.5.bb | |||
| @@ -6,7 +6,7 @@ HOMEPAGE = "https://www.tornadoweb.org/en/stable/" | |||
| 6 | LICENSE = "Apache-2.0" | 6 | LICENSE = "Apache-2.0" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "a22fa9047405d03260b483980635f0b041989d8bcc9a313f8fe18b411d84b1d7" | 9 | SRC_URI[sha256sum] = "192b8f3ea91bd7f1f50c06955416ed76c6b72f96779b962f07f911b91e8d30e9" |
| 10 | 10 | ||
| 11 | inherit pypi python_setuptools_build_meta | 11 | inherit pypi python_setuptools_build_meta |
| 12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-tox_4.27.0.bb b/meta-python/recipes-devtools/python/python3-tox_4.49.0.bb index 4deacdb3d9..f07694cb79 100644 --- a/meta-python/recipes-devtools/python/python3-tox_4.27.0.bb +++ b/meta-python/recipes-devtools/python/python3-tox_4.49.0.bb | |||
| @@ -6,7 +6,7 @@ HOMEPAGE = "https://tox.readthedocs.org/" | |||
| 6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "b97d5ecc0c0d5755bcc5348387fef793e1bfa68eb33746412f4c60881d7f5f57" | 9 | SRC_URI[sha256sum] = "2e01f09ae1226749466cbcd8c514fe988ffc8c76b5d523c7f9b745d1711a6e71" |
| 10 | 10 | ||
| 11 | BBCLASSEXTEND = "native nativesdk" | 11 | BBCLASSEXTEND = "native nativesdk" |
| 12 | inherit pypi python_hatchling | 12 | inherit pypi python_hatchling |
diff --git a/meta-python/recipes-devtools/python/python3-tqdm_4.67.1.bb b/meta-python/recipes-devtools/python/python3-tqdm_4.67.3.bb index b768ede830..1637021999 100644 --- a/meta-python/recipes-devtools/python/python3-tqdm_4.67.1.bb +++ b/meta-python/recipes-devtools/python/python3-tqdm_4.67.3.bb | |||
| @@ -3,9 +3,9 @@ HOMEPAGE = "https://tqdm.github.io/" | |||
| 3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
| 4 | 4 | ||
| 5 | LICENSE = "MIT & MPL-2.0" | 5 | LICENSE = "MIT & MPL-2.0" |
| 6 | LIC_FILES_CHKSUM = "file://LICENCE;md5=42dfa9e8c616dbc295df3f58d756b2a1" | 6 | LIC_FILES_CHKSUM = "file://LICENCE;md5=9a9bed097dea538bf341c8623c8f8852" |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2" | 8 | SRC_URI[sha256sum] = "7d825f03f89244ef73f1d4ce193cb1774a8179fd96f31d7e1dcde62092b960bb" |
| 9 | 9 | ||
| 10 | CVE_PRODUCT = "tqdm" | 10 | CVE_PRODUCT = "tqdm" |
| 11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-trio_0.32.0.bb b/meta-python/recipes-devtools/python/python3-trio_0.33.0.bb index cc23d3070e..8bb4514649 100644 --- a/meta-python/recipes-devtools/python/python3-trio_0.32.0.bb +++ b/meta-python/recipes-devtools/python/python3-trio_0.33.0.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=447ea202d14d2aee40d8a2c26c865da9 \ | |||
| 5 | file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 5 | file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
| 6 | file://LICENSE.MIT;md5=5f229c828e5a6f0a2ce90c7d3c054721" | 6 | file://LICENSE.MIT;md5=5f229c828e5a6f0a2ce90c7d3c054721" |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "150f29ec923bcd51231e1d4c71c7006e65247d68759dd1c19af4ea815a25806b" | 8 | SRC_URI[sha256sum] = "a29b92b73f09d4b48ed249acd91073281a7f1063f09caba5dc70465b5c7aa970" |
| 9 | 9 | ||
| 10 | inherit pypi python_setuptools_build_meta | 10 | inherit pypi python_setuptools_build_meta |
| 11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-typeguard_4.4.4.bb b/meta-python/recipes-devtools/python/python3-typeguard_4.5.1.bb index 812288881d..1c62e076cd 100644 --- a/meta-python/recipes-devtools/python/python3-typeguard_4.4.4.bb +++ b/meta-python/recipes-devtools/python/python3-typeguard_4.5.1.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/typeguard/" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f0e423eea5c91e7aa21bdb70184b3e53" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f0e423eea5c91e7aa21bdb70184b3e53" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "3a7fd2dffb705d4d0efaed4306a704c89b9dee850b688f060a8b1615a79e5f74" | 6 | SRC_URI[sha256sum] = "f6f8ecbbc819c9bc749983cc67c02391e16a9b43b8b27f15dc70ed7c4a007274" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 8 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 9 | 9 | ||
| @@ -12,6 +12,7 @@ RDEPENDS:${PN} += " \ | |||
| 12 | python3-compression \ | 12 | python3-compression \ |
| 13 | python3-unittest \ | 13 | python3-unittest \ |
| 14 | python3-typing-extensions \ | 14 | python3-typing-extensions \ |
| 15 | python3-json \ | ||
| 15 | " | 16 | " |
| 16 | 17 | ||
| 17 | RDEPENDS:${PN}-ptest += " \ | 18 | RDEPENDS:${PN}-ptest += " \ |
diff --git a/meta-python/recipes-devtools/python/python3-typer_0.21.1.bb b/meta-python/recipes-devtools/python/python3-typer_0.24.1.bb index 0bf2c0ec4f..6538f16f0d 100644 --- a/meta-python/recipes-devtools/python/python3-typer_0.21.1.bb +++ b/meta-python/recipes-devtools/python/python3-typer_0.24.1.bb | |||
| @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/fastapi/typer" | |||
| 7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=173d405eb704b1499218013178722617" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=173d405eb704b1499218013178722617" |
| 9 | 9 | ||
| 10 | SRC_URI[sha256sum] = "ea835607cd752343b6b2b7ce676893e5a0324082268b48f27aa058bdb7d2145d" | 10 | SRC_URI[sha256sum] = "e39b4732d65fbdcde189ae76cf7cd48aeae72919dea1fdfc16593be016256b45" |
| 11 | 11 | ||
| 12 | inherit pypi python_pdm ptest | 12 | inherit pypi python_pdm ptest |
| 13 | 13 | ||
diff --git a/meta-python/recipes-devtools/python/python3-types-psutil_7.2.1.20251231.bb b/meta-python/recipes-devtools/python/python3-types-psutil_7.2.2.20260130.bb index 90325c4db1..78e96b3122 100644 --- a/meta-python/recipes-devtools/python/python3-types-psutil_7.2.1.20251231.bb +++ b/meta-python/recipes-devtools/python/python3-types-psutil_7.2.2.20260130.bb | |||
| @@ -8,7 +8,7 @@ UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | |||
| 8 | 8 | ||
| 9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "dbf9df530b1130e131e4211ed8cea62c08007bfa69faf2883d296bd241d30e4a" | 11 | SRC_URI[sha256sum] = "15b0ab69c52841cf9ce3c383e8480c620a4d13d6a8e22b16978ebddac5590950" |
| 12 | 12 | ||
| 13 | BBCLASSEXTEND = "native" | 13 | BBCLASSEXTEND = "native" |
| 14 | 14 | ||
diff --git a/meta-python/recipes-devtools/python/python3-uefi-firmware_1.12.bb b/meta-python/recipes-devtools/python/python3-uefi-firmware_1.13.bb index 09732fc865..7fe92e31f2 100644 --- a/meta-python/recipes-devtools/python/python3-uefi-firmware_1.12.bb +++ b/meta-python/recipes-devtools/python/python3-uefi-firmware_1.13.bb | |||
| @@ -7,10 +7,9 @@ HOMEPAGE = "https://github.com/theopolis/uefi-firmware-parser" | |||
| 7 | LICENSE = "BSD-2-Clause & BSD-3-Clause" | 7 | LICENSE = "BSD-2-Clause & BSD-3-Clause" |
| 8 | LIC_FILES_CHKSUM = "file://setup.py;md5=5a59066a8676f17262ef7e691f8ef253" | 8 | LIC_FILES_CHKSUM = "file://setup.py;md5=5a59066a8676f17262ef7e691f8ef253" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/theopolis/uefi-firmware-parser;protocol=https;branch=master" | 10 | SRC_URI = "git://github.com/theopolis/uefi-firmware-parser;protocol=https;branch=master;tag=v${PV}" |
| 11 | |||
| 12 | SRCREV = "0c5fb74bcecc0e5c80625c38130fe948c2a3656e" | ||
| 13 | 11 | ||
| 12 | SRCREV = "6d7cf5f0672c577028462ec175fec9fda95cc5f0" | ||
| 14 | 13 | ||
| 15 | inherit setuptools3 | 14 | inherit setuptools3 |
| 16 | 15 | ||
diff --git a/meta-python/recipes-devtools/python/python3-ukkonen_git.bb b/meta-python/recipes-devtools/python/python3-ukkonen_1.1.0.bb index b9e85e78be..8fc5af1ef7 100644 --- a/meta-python/recipes-devtools/python/python3-ukkonen_git.bb +++ b/meta-python/recipes-devtools/python/python3-ukkonen_1.1.0.bb | |||
| @@ -6,9 +6,8 @@ PYPI_PACKAGE = "ukkonen" | |||
| 6 | 6 | ||
| 7 | inherit setuptools3 | 7 | inherit setuptools3 |
| 8 | 8 | ||
| 9 | PV = "1.0.1+git" | 9 | SRC_URI += "git://github.com/asottile/ukkonen;protocol=https;branch=main;tag=v${PV}" |
| 10 | SRC_URI += "git://github.com/asottile/ukkonen;protocol=https;branch=main" | 10 | SRCREV = "5fa9858f0997927d9f9c1794e1741fe8dbd4c1e8" |
| 11 | SRCREV = "ad108a16e8203867f4860287b61149e0bdd838ca" | ||
| 12 | DEPENDS += " \ | 11 | DEPENDS += " \ |
| 13 | python3-pip-native \ | 12 | python3-pip-native \ |
| 14 | python3-cffi-native \ | 13 | python3-cffi-native \ |
diff --git a/meta-python/recipes-devtools/python/python3-uvicorn_0.40.0.bb b/meta-python/recipes-devtools/python/python3-uvicorn_0.41.0.bb index 227202b8cc..4d12f87c80 100644 --- a/meta-python/recipes-devtools/python/python3-uvicorn_0.40.0.bb +++ b/meta-python/recipes-devtools/python/python3-uvicorn_0.41.0.bb | |||
| @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" | |||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5c778842f66a649636561c423c0eec2e" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5c778842f66a649636561c423c0eec2e" |
| 5 | RECIPE_MAINTAINER = "Tom Geelen <t.f.g.geelen@gmail.com>" | 5 | RECIPE_MAINTAINER = "Tom Geelen <t.f.g.geelen@gmail.com>" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "839676675e87e73694518b5574fd0f24c9d97b46bea16df7b8c05ea1a51071ea" | 7 | SRC_URI[sha256sum] = "09d11cf7008da33113824ee5a1c6422d89fbc2ff476540d69a34c87fab8b571a" |
| 8 | 8 | ||
| 9 | SRC_URI += "file://0001-ptest-disable-failing-tests.patch" | 9 | SRC_URI += "file://0001-ptest-disable-failing-tests.patch" |
| 10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-vector_1.7.0.bb b/meta-python/recipes-devtools/python/python3-vector_1.8.0.bb index bb1e7eeed9..67312c4423 100644 --- a/meta-python/recipes-devtools/python/python3-vector_1.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-vector_1.8.0.bb | |||
| @@ -8,11 +8,11 @@ HOMEPAGE = "https://github.com/scikit-hep/vector" | |||
| 8 | BUGTRACKER = "https://github.com/scikit-hep/vector/issues" | 8 | BUGTRACKER = "https://github.com/scikit-hep/vector/issues" |
| 9 | SECTION = "devel/python" | 9 | SECTION = "devel/python" |
| 10 | LICENSE = "BSD-3-Clause" | 10 | LICENSE = "BSD-3-Clause" |
| 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2963f0dc7a24919505850460dd1a785b" | 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b9f683a957276148387db50971a7b3ef" |
| 12 | 12 | ||
| 13 | DEPENDS += "python3-hatch-vcs-native" | 13 | DEPENDS += "python3-hatch-vcs-native" |
| 14 | 14 | ||
| 15 | SRC_URI[sha256sum] = "8b05ea2953322c74c49d2af180f7eac73ad0aa3d4c391cab896175ec4fa3d642" | 15 | SRC_URI[sha256sum] = "58f95e9e24463851ca34176a20df2fd2e80b41d78615e5b1f7ae4bf313424ca6" |
| 16 | 16 | ||
| 17 | inherit pypi python_hatchling | 17 | inherit pypi python_hatchling |
| 18 | 18 | ||
diff --git a/meta-python/recipes-devtools/python/python3-websocket-client_1.7.0.bb b/meta-python/recipes-devtools/python/python3-websocket-client_1.9.0.bb index fc73f1b0a5..87f25db0fc 100644 --- a/meta-python/recipes-devtools/python/python3-websocket-client_1.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-websocket-client_1.9.0.bb | |||
| @@ -5,9 +5,11 @@ This provide the low level APIs for WebSocket. All APIs \ | |||
| 5 | are the synchronous functions." | 5 | are the synchronous functions." |
| 6 | HOMEPAGE = "https://github.com/websocket-client/websocket-client" | 6 | HOMEPAGE = "https://github.com/websocket-client/websocket-client" |
| 7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6eae3bb7247ccb2c3a087ea8de759c01" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b8d4a5e03977c68fad62beee8185704e" |
| 9 | 9 | ||
| 10 | SRC_URI[sha256sum] = "10e511ea3a8c744631d3bd77e61eb17ed09304c413ad42cf6ddfa4c7787e8fe6" | 10 | SRC_URI[sha256sum] = "9e813624b6eb619999a97dc7958469217c3176312b3a16a4bd1bc7e08a46ec98" |
| 11 | |||
| 12 | PYPI_PACKAGE = "websocket_client" | ||
| 11 | 13 | ||
| 12 | inherit pypi setuptools3 | 14 | inherit pypi setuptools3 |
| 13 | 15 | ||
diff --git a/meta-python/recipes-devtools/python/python3-werkzeug_3.1.5.bb b/meta-python/recipes-devtools/python/python3-werkzeug_3.1.6.bb index 1df88b78d0..edddca72e0 100644 --- a/meta-python/recipes-devtools/python/python3-werkzeug_3.1.5.bb +++ b/meta-python/recipes-devtools/python/python3-werkzeug_3.1.6.bb | |||
| @@ -10,7 +10,7 @@ HOMEPAGE = "https://werkzeug.palletsprojects.com" | |||
| 10 | LICENSE = "BSD-3-Clause" | 10 | LICENSE = "BSD-3-Clause" |
| 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462" |
| 12 | 12 | ||
| 13 | SRC_URI[sha256sum] = "6a548b0e88955dd07ccb25539d7d0cc97417ee9e179677d22c7041c8f078ce67" | 13 | SRC_URI[sha256sum] = "210c6bede5a420a913956b4791a7f4d6843a43b6fcee4dfa08a65e93007d0d25" |
| 14 | 14 | ||
| 15 | CVE_PRODUCT = "werkzeug" | 15 | CVE_PRODUCT = "werkzeug" |
| 16 | 16 | ||
diff --git a/meta-python/recipes-devtools/python/python3-wheezy-template_3.2.5.bb b/meta-python/recipes-devtools/python/python3-wheezy-template_3.2.5.bb new file mode 100644 index 0000000000..a2125a0a0c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-wheezy-template_3.2.5.bb | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | SUMMARY = "a lightweight template library" | ||
| 2 | HOMEPAGE = "https://github.com/akornatskyy/wheezy.template" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fa10554c46b94944529c6a886cf85631" | ||
| 5 | |||
| 6 | PYPI_PACKAGE = "wheezy_template" | ||
| 7 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | ||
| 8 | |||
| 9 | SRC_URI[sha256sum] = "c7c0bf85af0f70ca2ef4b6ea9a74ef372f73392aa17bea0d885dcba7356d0867" | ||
| 10 | |||
| 11 | inherit pypi python_setuptools_build_meta | ||
| 12 | |||
| 13 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/python3-whitenoise_6.11.0.bb b/meta-python/recipes-devtools/python/python3-whitenoise_6.12.0.bb index 142c10aa83..dd8f189f98 100644 --- a/meta-python/recipes-devtools/python/python3-whitenoise_6.11.0.bb +++ b/meta-python/recipes-devtools/python/python3-whitenoise_6.12.0.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aba4901cc64e401cea5a267eac2a2e1e" | |||
| 5 | 5 | ||
| 6 | PYPI_PACKAGE = "whitenoise" | 6 | PYPI_PACKAGE = "whitenoise" |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "0f5bfce6061ae6611cd9396a8231e088722e4fc67bc13a111be74c738d99375f" | 8 | SRC_URI[sha256sum] = "f723ebb76a112e98816ff80fcea0a6c9b8ecde835f8ddda25df7a30a3c2db6ad" |
| 9 | 9 | ||
| 10 | inherit pypi python_setuptools_build_meta | 10 | inherit pypi python_setuptools_build_meta |
| 11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-wrapt_2.0.1.bb b/meta-python/recipes-devtools/python/python3-wrapt_2.1.2.bb index e2cdc960ef..70652048f3 100644 --- a/meta-python/recipes-devtools/python/python3-wrapt_2.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-wrapt_2.1.2.bb | |||
| @@ -2,11 +2,11 @@ SUMMARY = "A Python module for decorators, wrappers and monkey patching." | |||
| 2 | HOMEPAGE = "https://wrapt.readthedocs.org/" | 2 | HOMEPAGE = "https://wrapt.readthedocs.org/" |
| 3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
| 4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=945f689eb1f8c581bb9d635baba5abb5" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=63a78af2900bfcc5ce482f3b8d445898" |
| 6 | 6 | ||
| 7 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 7 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "9c9c635e78497cacb81e84f8b11b23e0aacac7a136e73b8e5b2109a1d9fc468f" | 9 | SRC_URI[sha256sum] = "3996a67eecc2c68fd47b4e3c564405a5777367adfd9b8abb58387b63ee83b21e" |
| 10 | 10 | ||
| 11 | # python3-misc for 'this' module | 11 | # python3-misc for 'this' module |
| 12 | RDEPENDS:${PN}-ptest += " \ | 12 | RDEPENDS:${PN}-ptest += " \ |
diff --git a/meta-python/recipes-devtools/python/python3-wsproto_1.2.0.bb b/meta-python/recipes-devtools/python/python3-wsproto_1.3.2.bb index 4aac092fbe..3a9b18b7af 100644 --- a/meta-python/recipes-devtools/python/python3-wsproto_1.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-wsproto_1.3.2.bb | |||
| @@ -3,11 +3,11 @@ HOMEPAGE = "https://github.com/python-hyper/wsproto/" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=69fabf732409f4ac61875827b258caaf" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=69fabf732409f4ac61875827b258caaf" |
| 5 | 5 | ||
| 6 | inherit pypi setuptools3 ptest-python-pytest | 6 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 7 | 7 | ||
| 8 | PTEST_PYTEST_DIR = "test" | 8 | PTEST_PYTEST_DIR = "test" |
| 9 | 9 | ||
| 10 | SRC_URI[sha256sum] = "ad565f26ecb92588a3e43bc3d96164de84cd9902482b130d0ddbaa9664a85065" | 10 | SRC_URI[sha256sum] = "b86885dcf294e15204919950f666e06ffc6c7c114ca900b060d6e16293528294" |
| 11 | 11 | ||
| 12 | RDEPENDS:${PN} += " \ | 12 | RDEPENDS:${PN} += " \ |
| 13 | python3-h11 \ | 13 | python3-h11 \ |
diff --git a/meta-python/recipes-devtools/python/python3-xmlschema_4.3.0.bb b/meta-python/recipes-devtools/python/python3-xmlschema_4.3.1.bb index 86554f087f..a2f4070079 100644 --- a/meta-python/recipes-devtools/python/python3-xmlschema_4.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-xmlschema_4.3.1.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=385fddea479acdec12ab77a938f68cd9" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=385fddea479acdec12ab77a938f68cd9" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "174c531dd869cd29bf2d1203603d9e619bddf168d6289725738914c96c80936e" | 6 | SRC_URI[sha256sum] = "853effdfaf127849d4724368c17bd669e7f1486e15a0376404ad7954ec31a338" |
| 7 | 7 | ||
| 8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb b/meta-python/recipes-devtools/python/python3-xmodem_0.5.0.bb index e41afb56c0..55305c6cb9 100644 --- a/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb +++ b/meta-python/recipes-devtools/python/python3-xmodem_0.5.0.bb | |||
| @@ -3,9 +3,9 @@ DESCRIPTION = "XMODEM protocol implementation" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=90bc9522130d68de0dcbf33707bbf124" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=90bc9522130d68de0dcbf33707bbf124" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "2f1068aa8676f0d1d112498b5786c4f8ea4f89d8f25d07d3a0f293cd21db1c35" | 6 | SRC_URI[sha256sum] = "a1a818f31c29412f1cab0cd69deccd7be77bc1feb516723af990d00161f6fb6a" |
| 7 | 7 | ||
| 8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
| 9 | 9 | ||
| 10 | do_install:append() { | 10 | do_install:append() { |
| 11 | install -d ${D}${docdir}/${PN} | 11 | install -d ${D}${docdir}/${PN} |
diff --git a/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_6.2.1.1.bb b/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_6.2.1.2.bb index 0562cc2671..934b236983 100644 --- a/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_6.2.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_6.2.1.2.bb | |||
| @@ -2,12 +2,12 @@ DESCRIPTION = "Font Awesome icons packaged for setuptools (easy_install) / pip." | |||
| 2 | HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Font-Awesome" | 2 | HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Font-Awesome" |
| 3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
| 4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
| 5 | LIC_FILES_CHKSUM = "file://PKG-INFO;md5=f1a2fe131dcb2fc6243c26cf05ecdb36" | 5 | LIC_FILES_CHKSUM = "file://PKG-INFO;md5=7c083fdfe0b927a9de368a17fbf13b20" |
| 6 | 6 | ||
| 7 | PYPI_PACKAGE = "XStatic-Font-Awesome" | 7 | PYPI_PACKAGE = "xstatic_font_awesome" |
| 8 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 8 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 9 | 9 | ||
| 10 | SRC_URI[sha256sum] = "f075871096128638f2e1539020d8227754c3d885dd68e7ee6de9a01235076828" | 10 | SRC_URI[sha256sum] = "9f3cb2f038fad7d352722375d3f25af346da9ee093ed9dc2c8c46bd911ab1971" |
| 11 | 11 | ||
| 12 | DEPENDS += " \ | 12 | DEPENDS += " \ |
| 13 | python3-xstatic \ | 13 | python3-xstatic \ |
diff --git a/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb b/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb index f4a75c9b6c..bf542aba5a 100644 --- a/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb | |||
| @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://README.txt;md5=1418684272f85f400cebf1b1a255c5cd" | |||
| 7 | PYPI_PACKAGE = "XStatic" | 7 | PYPI_PACKAGE = "XStatic" |
| 8 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 8 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
| 9 | 9 | ||
| 10 | SRC_URI += "file://0001-remove-pkg_resources-import.patch" | ||
| 10 | SRC_URI[sha256sum] = "402544cc9e179489441054f09c807804e115ea246907de87c0355fb4f5a31268" | 11 | SRC_URI[sha256sum] = "402544cc9e179489441054f09c807804e115ea246907de87c0355fb4f5a31268" |
| 11 | 12 | ||
| 12 | DEPENDS += " \ | 13 | DEPENDS += " \ |
diff --git a/meta-python/recipes-devtools/python/python3-yarl/0001-build-wheel-in-place.patch b/meta-python/recipes-devtools/python/python3-yarl/0001-build-wheel-in-place.patch deleted file mode 100644 index 84f81da775..0000000000 --- a/meta-python/recipes-devtools/python/python3-yarl/0001-build-wheel-in-place.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 606843ad079d9d0dac1172533d42b5a2327b99ed Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Wed, 17 Sep 2025 15:41:09 +0800 | ||
| 4 | Subject: [PATCH] build wheel in place | ||
| 5 | |||
| 6 | In order to make the generated library be reproducible, build wheel | ||
| 7 | in source dir other than tmp dir (/tmp/xxxxxx), then yocto toolchain's | ||
| 8 | option -fdebug-prefix-map could work as expected | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 12 | --- | ||
| 13 | packaging/pep517_backend/_backend.py | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/packaging/pep517_backend/_backend.py b/packaging/pep517_backend/_backend.py | ||
| 17 | index 61cad34..d5d839e 100644 | ||
| 18 | --- a/packaging/pep517_backend/_backend.py | ||
| 19 | +++ b/packaging/pep517_backend/_backend.py | ||
| 20 | @@ -316,7 +316,7 @@ def build_wheel( | ||
| 21 | """ | ||
| 22 | with maybe_prebuild_c_extensions( | ||
| 23 | line_trace_cython_when_unset=False, | ||
| 24 | - build_inplace=False, | ||
| 25 | + build_inplace=True, | ||
| 26 | config_settings=config_settings, | ||
| 27 | ): | ||
| 28 | return _setuptools_build_wheel( | ||
| 29 | -- | ||
| 30 | 2.34.1 | ||
| 31 | |||
diff --git a/meta-python/recipes-devtools/python/python3-yarl_1.22.0.bb b/meta-python/recipes-devtools/python/python3-yarl_1.23.0.bb index 6c2e2259b7..6a973f9acb 100644 --- a/meta-python/recipes-devtools/python/python3-yarl_1.22.0.bb +++ b/meta-python/recipes-devtools/python/python3-yarl_1.23.0.bb | |||
| @@ -3,15 +3,14 @@ HOMEPAGE = "https://github.com/aio-libs/yarl/" | |||
| 3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "bebf8557577d4401ba8bd9ff33906f1376c877aa78d1fe216ad01b4d6745af71" | 6 | SRC_URI[sha256sum] = "53b1ea6ca88ebd4420379c330aea57e258408dd0df9af0992e5de2078dc9f5d5" |
| 7 | 7 | ||
| 8 | PYPI_PACKAGE = "yarl" | 8 | PYPI_PACKAGE = "yarl" |
| 9 | 9 | ||
| 10 | inherit pypi ptest-python-pytest python_setuptools_build_meta cython | 10 | inherit pypi ptest-python-pytest python_setuptools_build_meta cython |
| 11 | 11 | ||
| 12 | SRC_URI += " \ | 12 | PEP517_BUILD_OPTS = "--config-setting=build-inplace=true" |
| 13 | file://0001-build-wheel-in-place.patch \ | 13 | |
| 14 | " | ||
| 15 | 14 | ||
| 16 | DEPENDS += " \ | 15 | DEPENDS += " \ |
| 17 | python3-expandvars-native \ | 16 | python3-expandvars-native \ |
| @@ -33,4 +32,6 @@ RDEPENDS:${PN}-ptest += " \ | |||
| 33 | python3-unittest-automake-output \ | 32 | python3-unittest-automake-output \ |
| 34 | " | 33 | " |
| 35 | 34 | ||
| 35 | INSANE_SKIP:${PN} = "already-stripped" | ||
| 36 | |||
| 36 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/tftpy_0.8.6.bb b/meta-python/recipes-devtools/python/tftpy_0.8.7.bb index 74889c2841..7bb1ebeb57 100644 --- a/meta-python/recipes-devtools/python/tftpy_0.8.6.bb +++ b/meta-python/recipes-devtools/python/tftpy_0.8.7.bb | |||
| @@ -8,6 +8,6 @@ HOMEPAGE = "https://github.com/msoulier/tftpy" | |||
| 8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=22770e72ae03c61f5bcc4e333b61368d" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=22770e72ae03c61f5bcc4e333b61368d" |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "f616f6a43a36d481c266573608597b9dd3c7c63818415d72aa04f1d1795480ea" | 11 | SRC_URI[sha256sum] = "e8a5aa092dab2e1cbb9b94392036827b808dc37eb6cf1b1ab33c81957b3f5fe2" |
| 12 | 12 | ||
| 13 | inherit pypi python_setuptools_build_meta | 13 | inherit pypi python_setuptools_build_meta |
diff --git a/meta-python/recipes-devtools/python3-nltk/python3-nltk_3.9.2.bb b/meta-python/recipes-devtools/python3-nltk/python3-nltk_3.9.3.bb index 43c23254d9..d9f661b262 100644 --- a/meta-python/recipes-devtools/python3-nltk/python3-nltk_3.9.2.bb +++ b/meta-python/recipes-devtools/python3-nltk/python3-nltk_3.9.3.bb | |||
| @@ -8,6 +8,7 @@ LICENSE = "Apache-2.0" | |||
| 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 9 | 9 | ||
| 10 | CVE_PRODUCT = "nltk" | 10 | CVE_PRODUCT = "nltk" |
| 11 | CVE_STATUS[CVE-2026-0846] = "fixed-version: fixed in 3.9.3" | ||
| 11 | 12 | ||
| 12 | RDEPENDS:${PN} = "\ | 13 | RDEPENDS:${PN} = "\ |
| 13 | python3-click \ | 14 | python3-click \ |
| @@ -23,4 +24,4 @@ RRECOMMENDS:${PN} = "\ | |||
| 23 | 24 | ||
| 24 | inherit setuptools3 pypi | 25 | inherit setuptools3 pypi |
| 25 | 26 | ||
| 26 | SRC_URI[sha256sum] = "0f409e9b069ca4177c1903c3e843eef90c7e92992fa4931ae607da6de49e1419" | 27 | SRC_URI[sha256sum] = "cb5945d6424a98d694c2b9a0264519fab4363711065a46aa0ae7a2195b92e71f" |
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.4.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.5.bb index 2899f6909e..857d8e46fa 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.4.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.5.bb | |||
| @@ -16,12 +16,10 @@ SRC_URI += "file://add-back-option-build-base.patch \ | |||
| 16 | file://not-overwrite-cflags-cxxflags.patch \ | 16 | file://not-overwrite-cflags-cxxflags.patch \ |
| 17 | file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \ | 17 | file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \ |
| 18 | " | 18 | " |
| 19 | SRC_URI[sha256sum] = "2eb123979c87bcb329e8a2452269d60ff8f9f651e9bf25c67579e53c4ebbae3c" | 19 | SRC_URI[sha256sum] = "44e836d1bccd99c38790bb034b6ecf70d9060f6734320560f7c4b0d006144793" |
| 20 | 20 | ||
| 21 | inherit pypi setuptools3 cython pkgconfig features_check | 21 | inherit pypi setuptools3 cython pkgconfig features_check |
| 22 | 22 | ||
| 23 | S = "${UNPACKDIR}/wxPython-${PV}" | ||
| 24 | |||
| 25 | REQUIRED_DISTRO_FEATURES = "x11" | 23 | REQUIRED_DISTRO_FEATURES = "x11" |
| 26 | 24 | ||
| 27 | export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR} --baselib=${baselib}'" | 25 | export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR} --baselib=${baselib}'" |
diff --git a/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.2.bb b/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.2.1.bb index 0817bc732a..bc4267ac87 100644 --- a/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.2.bb +++ b/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.2.1.bb | |||
| @@ -4,7 +4,7 @@ HOMEPAGE = "https://rhodesmill.org/pyephem/" | |||
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9c930b395b435b00bb13ec83b0c99f40" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9c930b395b435b00bb13ec83b0c99f40" |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "3c4fd64f453e8f40cf862420a70da95a71b6487ace75e8e0cf85d73707db6065" | 7 | SRC_URI[sha256sum] = "920cb30369c79fde1088c2060d555ea5f8a50fdc80a9265832fd5bf195cf147f" |
| 8 | 8 | ||
| 9 | PYPI_PACKAGE = "ephem" | 9 | PYPI_PACKAGE = "ephem" |
| 10 | 10 | ||
diff --git a/meta-python/recipes-extended/python-rich/python3-rich_14.2.0.bb b/meta-python/recipes-extended/python-rich/python3-rich_14.3.3.bb index c51d55c633..a2af61840f 100644 --- a/meta-python/recipes-extended/python-rich/python3-rich_14.2.0.bb +++ b/meta-python/recipes-extended/python-rich/python3-rich_14.3.3.bb | |||
| @@ -8,7 +8,7 @@ LICENSE = "MIT" | |||
| 8 | 8 | ||
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "73ff50c7c0c1c77c8243079283f4edb376f0f6442433aecb8ce7e6d0b92d1fe4" | 11 | SRC_URI[sha256sum] = "b8daa0b9e4eef54dd8cf7c86c03713f53241884e814f4e2f5fb342fe520f639b" |
| 12 | 12 | ||
| 13 | inherit pypi python_poetry_core | 13 | inherit pypi python_poetry_core |
| 14 | 14 | ||
diff --git a/meta-python/recipes-extended/pywbem/python3-pywbem_1.7.3.bb b/meta-python/recipes-extended/pywbem/python3-pywbem_1.9.0.bb index 6857563079..c2fe5f9738 100644 --- a/meta-python/recipes-extended/pywbem/python3-pywbem_1.7.3.bb +++ b/meta-python/recipes-extended/pywbem/python3-pywbem_1.9.0.bb | |||
| @@ -16,15 +16,16 @@ HOMEPAGE = "https://pywbem.github.io" | |||
| 16 | LICENSE = "LGPL-2.1-only" | 16 | LICENSE = "LGPL-2.1-only" |
| 17 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" | 17 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" |
| 18 | 18 | ||
| 19 | SRC_URI[sha256sum] = "d1f0a2ebd4ffedef8d067af3855216db5190c7f6f27c8d2dcd467e09701c90b0" | 19 | SRC_URI[sha256sum] = "65c1ff972cea2f017b06795f47c0ad7442f8434ff643a544050c10726704f6ab" |
| 20 | 20 | ||
| 21 | inherit pypi setuptools3 update-alternatives | 21 | inherit pypi python_setuptools_build_meta update-alternatives |
| 22 | 22 | ||
| 23 | DEPENDS += " \ | 23 | DEPENDS += " \ |
| 24 | python3-ply-native \ | 24 | python3-ply-native \ |
| 25 | python3-pyyaml-native \ | 25 | python3-pyyaml-native \ |
| 26 | python3-six-native \ | 26 | python3-six-native \ |
| 27 | python3-wheel-native \ | 27 | python3-wheel-native \ |
| 28 | python3-setuptools-scm-native \ | ||
| 28 | " | 29 | " |
| 29 | 30 | ||
| 30 | RDEPENDS:${PN} += "\ | 31 | RDEPENDS:${PN} += "\ |
diff --git a/meta-python/recipes-extended/send2trash/python3-send2trash/0001-add-missing-conftest.py.patch b/meta-python/recipes-extended/send2trash/python3-send2trash/0001-add-missing-conftest.py.patch deleted file mode 100644 index 1592fd661c..0000000000 --- a/meta-python/recipes-extended/send2trash/python3-send2trash/0001-add-missing-conftest.py.patch +++ /dev/null | |||
| @@ -1,52 +0,0 @@ | |||
| 1 | From ed6d20884108fd7e681baf7278e38ac4800fb5c1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Fri, 9 Jan 2026 18:04:08 +0100 | ||
| 4 | Subject: [PATCH] add missing conftest.py | ||
| 5 | |||
| 6 | Conftest.py is missing from the source dictribution of v2.0.0, | ||
| 7 | making the tests to fail. | ||
| 8 | |||
| 9 | The issue is already solved by upstream, but not tagged yet. | ||
| 10 | This patch can be removed with the next release. | ||
| 11 | |||
| 12 | Upstream-Status: Inappropriate [workaround until https://github.com/arsenetar/send2trash/commit/f8a40143f696da41f81cae87e1c7f9a345cd4003 is tagged] | ||
| 13 | |||
| 14 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 15 | --- | ||
| 16 | tests/conftest.py | 27 +++++++++++++++++++++++++++ | ||
| 17 | 1 file changed, 27 insertions(+) | ||
| 18 | create mode 100644 tests/conftest.py | ||
| 19 | |||
| 20 | diff --git a/tests/conftest.py b/tests/conftest.py | ||
| 21 | new file mode 100644 | ||
| 22 | index 0000000..0753384 | ||
| 23 | --- /dev/null | ||
| 24 | +++ b/tests/conftest.py | ||
| 25 | @@ -0,0 +1,27 @@ | ||
| 26 | +# encoding: utf-8 | ||
| 27 | +import sys | ||
| 28 | +import os | ||
| 29 | +from tempfile import NamedTemporaryFile | ||
| 30 | +import pytest | ||
| 31 | + | ||
| 32 | +# Only import HOMETRASH on supported platforms | ||
| 33 | +if sys.platform != "win32": | ||
| 34 | + from send2trash.plat_other import HOMETRASH | ||
| 35 | + | ||
| 36 | + | ||
| 37 | +@pytest.fixture(name="test_file") | ||
| 38 | +def fixture_test_file(): | ||
| 39 | + file = NamedTemporaryFile(dir=os.path.expanduser("~"), prefix="send2trash_test", delete=False) | ||
| 40 | + file.close() | ||
| 41 | + # Verify file was actually created | ||
| 42 | + assert os.path.exists(file.name) is True | ||
| 43 | + yield file.name | ||
| 44 | + # Cleanup trash files on supported platforms | ||
| 45 | + if sys.platform != "win32": | ||
| 46 | + name = os.path.basename(file.name) | ||
| 47 | + # Remove trash files if they exist | ||
| 48 | + if os.path.exists(os.path.join(HOMETRASH, "files", name)): | ||
| 49 | + os.remove(os.path.join(HOMETRASH, "files", name)) | ||
| 50 | + os.remove(os.path.join(HOMETRASH, "info", name + ".trashinfo")) | ||
| 51 | + if os.path.exists(file.name): | ||
| 52 | + os.remove(file.name) | ||
diff --git a/meta-python/recipes-extended/send2trash/python3-send2trash_2.0.0.bb b/meta-python/recipes-extended/send2trash/python3-send2trash_2.1.0.bb index 48dc8e793f..147603a45b 100644 --- a/meta-python/recipes-extended/send2trash/python3-send2trash_2.0.0.bb +++ b/meta-python/recipes-extended/send2trash/python3-send2trash_2.1.0.bb | |||
| @@ -4,9 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a02659c2d5f4cc626e4dcf6504b865eb" | |||
| 4 | 4 | ||
| 5 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 5 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
| 6 | 6 | ||
| 7 | SRC_URI += "file://0001-add-missing-conftest.py.patch \ | 7 | SRC_URI += "file://run-ptest" |
| 8 | file://run-ptest" | 8 | SRC_URI[sha256sum] = "1c72b39f09457db3c05ce1d19158c2cbef4c32b8bedd02c155e49282b7ea7459" |
| 9 | SRC_URI[sha256sum] = "1761421da3f9930bfe51ed7c45343948573383ad4c27e3acebc91be324e7770d" | ||
| 10 | 9 | ||
| 11 | PYPI_PACKAGE = "send2trash" | 10 | PYPI_PACKAGE = "send2trash" |
| 12 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 11 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
diff --git a/meta-webserver/conf/layer.conf b/meta-webserver/conf/layer.conf index dcaae5cca8..0c48efc465 100644 --- a/meta-webserver/conf/layer.conf +++ b/meta-webserver/conf/layer.conf | |||
| @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" | |||
| 17 | 17 | ||
| 18 | LAYERDEPENDS_webserver = "core openembedded-layer" | 18 | LAYERDEPENDS_webserver = "core openembedded-layer" |
| 19 | 19 | ||
| 20 | LAYERSERIES_COMPAT_webserver = "walnascar whinlatter" | 20 | LAYERSERIES_COMPAT_webserver = "whinlatter wrynose" |
| 21 | 21 | ||
| 22 | LICENSE_PATH += "${LAYERDIR}/licenses" | 22 | LICENSE_PATH += "${LAYERDIR}/licenses" |
| 23 | 23 | ||
diff --git a/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.30.3.bb b/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.32.0.bb index 3d152e15ad..f1cf07d418 100644 --- a/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.30.3.bb +++ b/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.32.0.bb | |||
| @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
| 12 | 12 | ||
| 13 | SRC_URI = "git://github.com/swagger-api/swagger-ui;branch=master;protocol=https;tag=v${PV}" | 13 | SRC_URI = "git://github.com/swagger-api/swagger-ui;branch=master;protocol=https;tag=v${PV}" |
| 14 | 14 | ||
| 15 | SRCREV = "199761a94d03753ec62c23bb4ba162bb73c3cfc7" | 15 | SRCREV = "1b33a5976d8f5e02d3bc40de1deae3a4a3642e36" |
| 16 | 16 | ||
| 17 | CVE_STATUS[CVE-2016-1000229] = "fixed-version: fixed since 2.2.1" | 17 | CVE_STATUS[CVE-2016-1000229] = "fixed-version: fixed since 2.2.1" |
| 18 | 18 | ||
diff --git a/meta-webserver/recipes-httpd/hiawatha/files/0001-Add-__attribute__-nonstring-to-remove-unterminated-s.patch b/meta-webserver/recipes-httpd/hiawatha/files/0001-Add-__attribute__-nonstring-to-remove-unterminated-s.patch deleted file mode 100644 index 5a9c719b6d..0000000000 --- a/meta-webserver/recipes-httpd/hiawatha/files/0001-Add-__attribute__-nonstring-to-remove-unterminated-s.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From 56b26ede007453a4ee9832076597e82d2a903700 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Felix Conway <felix.conway@arm.com> | ||
| 3 | Date: Wed, 11 Jun 2025 16:04:06 +0100 | ||
| 4 | Subject: [PATCH 1/2] Add __attribute__ ((nonstring)) to remove | ||
| 5 | unterminated-string-initialization warning | ||
| 6 | |||
| 7 | Upstream-Status: Backport [https://github.com/Mbed-TLS/mbedtls/pull/10216] | ||
| 8 | Signed-off-by: Felix Conway <felix.conway@arm.com> | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | library/ssl_tls13_keys.c | 3 ++- | ||
| 12 | library/ssl_tls13_keys.h | 3 ++- | ||
| 13 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c | ||
| 16 | index 739414e..375814c 100644 | ||
| 17 | --- a/library/ssl_tls13_keys.c | ||
| 18 | +++ b/library/ssl_tls13_keys.c | ||
| 19 | @@ -81,7 +81,8 @@ struct mbedtls_ssl_tls13_labels_struct const mbedtls_ssl_tls13_labels = | ||
| 20 | * the HkdfLabel structure on success. | ||
| 21 | */ | ||
| 22 | |||
| 23 | -static const char tls13_label_prefix[6] = "tls13 "; | ||
| 24 | +/* We need to tell the compiler that we meant to leave out the null character. */ | ||
| 25 | +static const char tls13_label_prefix[6] __attribute__ ((nonstring)) = "tls13 "; | ||
| 26 | |||
| 27 | #define SSL_TLS1_3_KEY_SCHEDULE_HKDF_LABEL_LEN(label_len, context_len) \ | ||
| 28 | (2 /* expansion length */ \ | ||
| 29 | diff --git a/library/ssl_tls13_keys.h b/library/ssl_tls13_keys.h | ||
| 30 | index d3a4c6c..95cde7a 100644 | ||
| 31 | --- a/library/ssl_tls13_keys.h | ||
| 32 | +++ b/library/ssl_tls13_keys.h | ||
| 33 | @@ -40,8 +40,9 @@ | ||
| 34 | |||
| 35 | #if defined(MBEDTLS_SSL_PROTO_TLS1_3) | ||
| 36 | |||
| 37 | +/* We need to tell the compiler that we meant to leave out the null character. */ | ||
| 38 | #define MBEDTLS_SSL_TLS1_3_LABEL(name, string) \ | ||
| 39 | - const unsigned char name [sizeof(string) - 1]; | ||
| 40 | + const unsigned char name [sizeof(string) - 1] __attribute__ ((nonstring)); | ||
| 41 | |||
| 42 | union mbedtls_ssl_tls13_labels_union { | ||
| 43 | MBEDTLS_SSL_TLS1_3_LABEL_LIST | ||
diff --git a/meta-webserver/recipes-httpd/hiawatha/files/0002-Replace-__attribute__-nonstring-with-macro-MBEDTLS_A.patch b/meta-webserver/recipes-httpd/hiawatha/files/0002-Replace-__attribute__-nonstring-with-macro-MBEDTLS_A.patch deleted file mode 100644 index 2f94cee277..0000000000 --- a/meta-webserver/recipes-httpd/hiawatha/files/0002-Replace-__attribute__-nonstring-with-macro-MBEDTLS_A.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | From 91ec670d3f6399510995dedbf99dca2e7e9bd2d8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Felix Conway <felix.conway@arm.com> | ||
| 3 | Date: Thu, 12 Jun 2025 11:28:56 +0100 | ||
| 4 | Subject: [PATCH 2/2] Replace __attribute__((nonstring)) with macro | ||
| 5 | MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING | ||
| 6 | |||
| 7 | This macro applies __attribute__((nonstring)) when using a compiler that supports it | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://github.com/Mbed-TLS/mbedtls/pull/10216] | ||
| 10 | Signed-off-by: Felix Conway <felix.conway@arm.com> | ||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | library/ssl_tls13_keys.c | 2 +- | ||
| 14 | library/ssl_tls13_keys.h | 2 +- | ||
| 15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c | ||
| 18 | index 375814c..621a7d5 100644 | ||
| 19 | --- a/library/ssl_tls13_keys.c | ||
| 20 | +++ b/library/ssl_tls13_keys.c | ||
| 21 | @@ -82,7 +82,7 @@ struct mbedtls_ssl_tls13_labels_struct const mbedtls_ssl_tls13_labels = | ||
| 22 | */ | ||
| 23 | |||
| 24 | /* We need to tell the compiler that we meant to leave out the null character. */ | ||
| 25 | -static const char tls13_label_prefix[6] __attribute__ ((nonstring)) = "tls13 "; | ||
| 26 | +static const char tls13_label_prefix[6] MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING = "tls13 "; | ||
| 27 | |||
| 28 | #define SSL_TLS1_3_KEY_SCHEDULE_HKDF_LABEL_LEN(label_len, context_len) \ | ||
| 29 | (2 /* expansion length */ \ | ||
| 30 | diff --git a/library/ssl_tls13_keys.h b/library/ssl_tls13_keys.h | ||
| 31 | index 95cde7a..3aa94d7 100644 | ||
| 32 | --- a/library/ssl_tls13_keys.h | ||
| 33 | +++ b/library/ssl_tls13_keys.h | ||
| 34 | @@ -42,7 +42,7 @@ | ||
| 35 | |||
| 36 | /* We need to tell the compiler that we meant to leave out the null character. */ | ||
| 37 | #define MBEDTLS_SSL_TLS1_3_LABEL(name, string) \ | ||
| 38 | - const unsigned char name [sizeof(string) - 1] __attribute__ ((nonstring)); | ||
| 39 | + const unsigned char name [sizeof(string) - 1] MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING; | ||
| 40 | |||
| 41 | union mbedtls_ssl_tls13_labels_union { | ||
| 42 | MBEDTLS_SSL_TLS1_3_LABEL_LIST | ||
diff --git a/meta-webserver/recipes-httpd/hiawatha/files/define-MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING.patch b/meta-webserver/recipes-httpd/hiawatha/files/define-MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING.patch deleted file mode 100644 index 6e2d9eb5f1..0000000000 --- a/meta-webserver/recipes-httpd/hiawatha/files/define-MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | Replace __attribute__((nonstring)) with macro MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING | ||
| 2 | This macro applies __attribute__((nonstring)) when using a compiler that supports it | ||
| 3 | |||
| 4 | Upstream-Status: Backport [https://github.com/Mbed-TLS/TF-PSA-Crypto/commit/996f4fa3a2fbe8792ed3efd1bcb3657001f35ae1] | ||
| 5 | |||
| 6 | Signed-off-by: Felix Conway <felix.conway@arm.com> | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | |||
| 9 | --- a/library/ssl_tls13_keys.h | ||
| 10 | +++ b/library/ssl_tls13_keys.h | ||
| 11 | @@ -7,6 +7,22 @@ | ||
| 12 | #if !defined(MBEDTLS_SSL_TLS1_3_KEYS_H) | ||
| 13 | #define MBEDTLS_SSL_TLS1_3_KEYS_H | ||
| 14 | |||
| 15 | +/* GCC >= 15 has a warning 'unterminated-string-initialization' which complains if you initialize | ||
| 16 | + * a string into an array without space for a terminating NULL character. In some places in the | ||
| 17 | + * codebase this behaviour is intended, so we add the macro MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING | ||
| 18 | + * to suppress the warning in these places. | ||
| 19 | + */ | ||
| 20 | +#if defined(__has_attribute) | ||
| 21 | +#if __has_attribute(nonstring) | ||
| 22 | +#define MBEDTLS_HAS_ATTRIBUTE_NONSTRING | ||
| 23 | +#endif /* __has_attribute(nonstring) */ | ||
| 24 | +#endif /* __has_attribute */ | ||
| 25 | +#if defined(MBEDTLS_HAS_ATTRIBUTE_NONSTRING) | ||
| 26 | +#define MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING __attribute__((nonstring)) | ||
| 27 | +#else | ||
| 28 | +#define MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING | ||
| 29 | +#endif /* MBEDTLS_HAS_ATTRIBUTE_NONSTRING */ | ||
| 30 | + | ||
| 31 | /* This requires MBEDTLS_SSL_TLS1_3_LABEL( idx, name, string ) to be defined at | ||
| 32 | * the point of use. See e.g. the definition of mbedtls_ssl_tls13_labels_union | ||
| 33 | * below. */ | ||
diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.7.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_12.0.bb index 4e7e5fa31d..9c9aaed807 100644 --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.7.bb +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_12.0.bb | |||
| @@ -6,15 +6,12 @@ DEPENDS = "libxml2 libxslt virtual/crypt" | |||
| 6 | 6 | ||
| 7 | SECTION = "net" | 7 | SECTION = "net" |
| 8 | 8 | ||
| 9 | SRC_URI = "https://hiawatha.leisink.net/files/hiawatha-${PV}.tar.gz \ | 9 | SRC_URI = "https://hiawatha.leisink.net/files/download/hiawatha-${PV}.tar.gz \ |
| 10 | file://0001-Add-__attribute__-nonstring-to-remove-unterminated-s.patch;patchdir=mbedtls \ | ||
| 11 | file://0002-Replace-__attribute__-nonstring-with-macro-MBEDTLS_A.patch;patchdir=mbedtls \ | ||
| 12 | file://define-MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING.patch;patchdir=mbedtls \ | ||
| 13 | file://hiawatha-init \ | 10 | file://hiawatha-init \ |
| 14 | file://hiawatha.service \ | 11 | file://hiawatha.service \ |
| 15 | " | 12 | " |
| 16 | 13 | ||
| 17 | SRC_URI[sha256sum] = "8bc180ae3b986d02466f081efeefdb1595d96783f581fded2a9b198752ab7ae1" | 14 | SRC_URI[sha256sum] = "942dd76e0b0369188612020cbcc92c19e11ea9e844f5dfaef4e9c7ab6892e247" |
| 18 | 15 | ||
| 19 | INITSCRIPT_NAME = "hiawatha" | 16 | INITSCRIPT_NAME = "hiawatha" |
| 20 | INITSCRIPT_PARAMS = "defaults 70" | 17 | INITSCRIPT_PARAMS = "defaults 70" |
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.28.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.28.2.bb index eaaf2b75e9..9699b7189d 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.28.1.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.28.2.bb | |||
| @@ -2,6 +2,6 @@ require nginx.inc | |||
| 2 | 2 | ||
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3dc49537b08b14c8b66ad247bb4c4593" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3dc49537b08b14c8b66ad247bb4c4593" |
| 4 | 4 | ||
| 5 | SRC_URI[sha256sum] = "40e7a0916d121e8905ef50f2a738b675599e42b2224a582dd938603fed15788e" | 5 | SRC_URI[sha256sum] = "20e5e0f2c917acfb51120eec2fba9a4ba4e1e10fd28465067cc87a7d81a829a3" |
| 6 | 6 | ||
| 7 | CVE_STATUS[CVE-2025-53859] = "cpe-stable-backport: Fix is included in 1.28.1" | 7 | CVE_STATUS[CVE-2025-53859] = "cpe-stable-backport: Fix is included in 1.28.1" |
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.29.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.29.6.bb index c08c8539c4..a1e39b6e36 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.29.1.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.29.6.bb | |||
| @@ -4,7 +4,7 @@ require nginx.inc | |||
| 4 | # 1.29.x is the current mainline branches containing all new features | 4 | # 1.29.x is the current mainline branches containing all new features |
| 5 | DEFAULT_PREFERENCE = "-1" | 5 | DEFAULT_PREFERENCE = "-1" |
| 6 | 6 | ||
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3dc49537b08b14c8b66ad247bb4c4593" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=79da1c70d587d3a199af9255ad393f99" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "c589f7e7ed801ddbd904afbf3de26ae24eb0cce27c7717a2e94df7fb12d6ad27" | 9 | SRC_URI[sha256sum] = "316f298cd9f061d6d0679696152710285b72f75d88eb1f7e323f40c5c52fe0d7" |
| 10 | 10 | ||
diff --git a/meta-webserver/recipes-php/xdebug/xdebug_3.5.0.bb b/meta-webserver/recipes-php/xdebug/xdebug_3.5.1.bb index b07546d521..4c2c6538b5 100644 --- a/meta-webserver/recipes-php/xdebug/xdebug_3.5.0.bb +++ b/meta-webserver/recipes-php/xdebug/xdebug_3.5.1.bb | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | SUMMARY = "Debugging and profiling extension for PHP" | 1 | SUMMARY = "Debugging and profiling extension for PHP" |
| 2 | HOMEPAGE = "https://xdebug.org/" | ||
| 2 | LICENSE = "Xdebug" | 3 | LICENSE = "Xdebug" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=afd6ce4aa04fdc346e5b3c6e634bd75c" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=afd6ce4aa04fdc346e5b3c6e634bd75c" |
| 4 | 5 | ||
| @@ -6,7 +7,7 @@ DEPENDS = "php re2c-native" | |||
| 6 | 7 | ||
| 7 | SRC_URI = "https://xdebug.org/files/xdebug-${PV}.tgz" | 8 | SRC_URI = "https://xdebug.org/files/xdebug-${PV}.tgz" |
| 8 | 9 | ||
| 9 | SRC_URI[sha256sum] = "f6daf55a5c7adadb07dd2af25ff78b1cc9b1c58d6cc442a463eba015b678aabf" | 10 | SRC_URI[sha256sum] = "0f26849a5edf3d9120edc100219854599d54f923a8a4d1cb4fe4403520e49678" |
| 10 | 11 | ||
| 11 | UPSTREAM_CHECK_URI = "https://github.com/xdebug/xdebug/releases" | 12 | UPSTREAM_CHECK_URI = "https://github.com/xdebug/xdebug/releases" |
| 12 | UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)$" | 13 | UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)$" |
diff --git a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.5.bb b/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.6.bb index 307919f775..5ad93ebc69 100644 --- a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.5.bb +++ b/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.6.bb | |||
| @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" | |||
| 6 | 6 | ||
| 7 | SRC_URI = "http://download.lighttpd.net/spawn-fcgi/releases-1.6.x/spawn-fcgi-${PV}.tar.gz" | 7 | SRC_URI = "http://download.lighttpd.net/spawn-fcgi/releases-1.6.x/spawn-fcgi-${PV}.tar.gz" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "a72d7bf7fb6d1a0acda89c93d4f060bf77a2dba97ddcfecd00f11e708f592c40" | 9 | SRC_URI[sha256sum] = "4ffe2e9763cf71ca52c3d642a7bfe20d6be292ba0f2ec07a5900c3110d0e5a85" |
| 10 | 10 | ||
| 11 | inherit autotools | 11 | inherit meson |
| 12 | 12 | ||
| 13 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 13 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
| 14 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 14 | PACKAGECONFIG[ipv6] = "-Dipv6=true,-Dipv6=false," |
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_2.501.bb b/meta-webserver/recipes-webadmin/webmin/webmin_2.621.bb index 2c807947e4..bb5ac1c755 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_2.501.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_2.621.bb | |||
| @@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ | |||
| 19 | file://mysql-config-fix.patch \ | 19 | file://mysql-config-fix.patch \ |
| 20 | file://webmin.service \ | 20 | file://webmin.service \ |
| 21 | " | 21 | " |
| 22 | SRC_URI[sha256sum] = "0f2772a582d4c4cf24085993729cfc94df2a64d619cefede5400c24b02efb08f" | 22 | SRC_URI[sha256sum] = "88381e8bcdd4733b215c114ca2158dc044892ea68dc0da4d235d88d2b1db4bb8" |
| 23 | UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html" | 23 | UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html" |
| 24 | UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz" | 24 | UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz" |
| 25 | 25 | ||
diff --git a/meta-xfce/README.md b/meta-xfce/README.md index 0d0077783e..564590ff39 100644 --- a/meta-xfce/README.md +++ b/meta-xfce/README.md | |||
| @@ -15,7 +15,7 @@ BBMASK = "meta-xfce/recipes-multimedia" | |||
| 15 | 15 | ||
| 16 | Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' | 16 | Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' |
| 17 | 17 | ||
| 18 | When sending single patches, please using something like: | 18 | When sending single patches, please use something like: |
| 19 | git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' | 19 | git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' |
| 20 | 20 | ||
| 21 | Layer maintainer: Kai Kang <kai.kang@windriver.com> | 21 | Layer maintainer: Kai Kang <kai.kang@windriver.com> |
diff --git a/meta-xfce/classes/thunar-plugin.bbclass b/meta-xfce/classes/thunar-plugin.bbclass index ad9e15296e..82a1be6347 100644 --- a/meta-xfce/classes/thunar-plugin.bbclass +++ b/meta-xfce/classes/thunar-plugin.bbclass | |||
| @@ -1,12 +1,10 @@ | |||
| 1 | inherit xfce features_check | 1 | inherit xfce features_check |
| 2 | 2 | ||
| 3 | # xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. | 3 | REQUIRED_DISTRO_FEATURES = "x11" |
| 4 | # cairo would at least needed to be built with xlib. | ||
| 5 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
| 6 | 4 | ||
| 7 | DEPENDS += "thunar" | 5 | DEPENDS += "thunar" |
| 8 | 6 | ||
| 9 | SRC_URI = "http://archive.xfce.org/src/thunar-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.xz" | 7 | SRC_URI = "https://archive.xfce.org/src/thunar-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.xz" |
| 10 | 8 | ||
| 11 | FILES:${PN} += "${libdir}/thunarx-3/*.so" | 9 | FILES:${PN} += "${libdir}/thunarx-3/*.so" |
| 12 | 10 | ||
diff --git a/meta-xfce/classes/xfce-app.bbclass b/meta-xfce/classes/xfce-app.bbclass index 957cfb3362..9469c66d24 100644 --- a/meta-xfce/classes/xfce-app.bbclass +++ b/meta-xfce/classes/xfce-app.bbclass | |||
| @@ -2,5 +2,5 @@ inherit xfce features_check | |||
| 2 | 2 | ||
| 3 | REQUIRED_DISTRO_FEATURES = "x11" | 3 | REQUIRED_DISTRO_FEATURES = "x11" |
| 4 | 4 | ||
| 5 | SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" | 5 | SRC_URI = "https://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" |
| 6 | 6 | ||
diff --git a/meta-xfce/classes/xfce-panel-plugin.bbclass b/meta-xfce/classes/xfce-panel-plugin.bbclass index b2d71a4141..1dc54f8d41 100644 --- a/meta-xfce/classes/xfce-panel-plugin.bbclass +++ b/meta-xfce/classes/xfce-panel-plugin.bbclass | |||
| @@ -4,7 +4,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
| 4 | 4 | ||
| 5 | DEPENDS += "libxfce4ui libxfce4util xfce4-panel" | 5 | DEPENDS += "libxfce4ui libxfce4util xfce4-panel" |
| 6 | 6 | ||
| 7 | SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" | 7 | SRC_URI = "https://archive.xfce.org/src/panel-plugins/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" |
| 8 | 8 | ||
| 9 | FILES:${PN} += "${datadir}/xfce4/panel-plugins/" | 9 | FILES:${PN} += "${datadir}/xfce4/panel-plugins/" |
| 10 | FILES:${PN} += "${datadir}/xfce4/panel/plugins/" | 10 | FILES:${PN} += "${datadir}/xfce4/panel/plugins/" |
diff --git a/meta-xfce/classes/xfce.bbclass b/meta-xfce/classes/xfce.bbclass index 21136742c5..bc4b3561cf 100644 --- a/meta-xfce/classes/xfce.bbclass +++ b/meta-xfce/classes/xfce.bbclass | |||
| @@ -3,9 +3,9 @@ def xfce_verdir(v): | |||
| 3 | m = re.match(r"^([0-9]+)\.([0-9]+)", v) | 3 | m = re.match(r"^([0-9]+)\.([0-9]+)", v) |
| 4 | return "%s.%s" % (m.group(1), m.group(2)) | 4 | return "%s.%s" % (m.group(1), m.group(2)) |
| 5 | 5 | ||
| 6 | HOMEPAGE = "http://www.xfce.org" | 6 | HOMEPAGE = "https://www.xfce.org" |
| 7 | XFCE_COMPRESS_TYPE ?= "bz2" | 7 | XFCE_COMPRESS_TYPE ?= "bz2" |
| 8 | SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" | 8 | SRC_URI = "https://archive.xfce.org/src/xfce/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" |
| 9 | 9 | ||
| 10 | inherit gettext gtk-icon-cache pkgconfig | 10 | inherit gettext gtk-icon-cache pkgconfig |
| 11 | 11 | ||
diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf index e8109725d3..a8b96969b1 100644 --- a/meta-xfce/conf/layer.conf +++ b/meta-xfce/conf/layer.conf | |||
| @@ -19,7 +19,7 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" | |||
| 19 | LAYERDEPENDS_xfce-layer += "meta-python" | 19 | LAYERDEPENDS_xfce-layer += "meta-python" |
| 20 | LAYERDEPENDS_xfce-layer += "networking-layer" | 20 | LAYERDEPENDS_xfce-layer += "networking-layer" |
| 21 | 21 | ||
| 22 | LAYERSERIES_COMPAT_xfce-layer = "walnascar whinlatter" | 22 | LAYERSERIES_COMPAT_xfce-layer = "whinlatter wrynose" |
| 23 | 23 | ||
| 24 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ | 24 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ |
| 25 | openzone->gdk-pixbuf \ | 25 | openzone->gdk-pixbuf \ |
diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.6.1.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.7.0.bb index dc75a4b220..68e84dd3c4 100644 --- a/meta-xfce/recipes-apps/mousepad/mousepad_0.6.1.bb +++ b/meta-xfce/recipes-apps/mousepad/mousepad_0.7.0.bb | |||
| @@ -5,12 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
| 5 | 5 | ||
| 6 | DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" | 6 | DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" |
| 7 | 7 | ||
| 8 | XFCE_COMPRESS_TYPE = "xz" | ||
| 9 | XFCEBASEBUILDCLASS = "meson" | ||
| 10 | |||
| 8 | inherit xfce-app gsettings mime-xdg | 11 | inherit xfce-app gsettings mime-xdg |
| 9 | 12 | ||
| 10 | SRC_URI[sha256sum] = "560c5436c7bc7de33fbf3e9f6cc545280772ad898dfb73257d86533880ffff36" | 13 | SRC_URI[sha256sum] = "e86c59feb08126d4cace368432c16b2dee8e519aaca8a9d2b409ae1cdd200802" |
| 11 | 14 | ||
| 12 | PACKAGECONFIG ??= "" | 15 | PACKAGECONFIG ??= "" |
| 13 | PACKAGECONFIG[spell] = "--enable-plugin-gspell,--disable-plugin-gspell,gspell" | 16 | PACKAGECONFIG[spell] = "-Dgspell-plugin=enabled,-Dgspell-plugin=disabled,gspell" |
| 14 | 17 | ||
| 15 | FILES:${PN} += " \ | 18 | FILES:${PN} += " \ |
| 16 | ${datadir}/glib-2.0/schemas \ | 19 | ${datadir}/glib-2.0/schemas \ |
diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.13.3.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.14.0.bb index 7175690694..d223fa5b9b 100644 --- a/meta-xfce/recipes-apps/ristretto/ristretto_0.13.3.bb +++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.14.0.bb | |||
| @@ -6,10 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" | |||
| 6 | 6 | ||
| 7 | DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file glib-2.0-native python3-packaging-native" | 7 | DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file glib-2.0-native python3-packaging-native" |
| 8 | 8 | ||
| 9 | XFCE_COMPRESS_TYPE = "xz" | ||
| 10 | XFCEBASEBUILDCLASS = "meson" | ||
| 11 | |||
| 9 | inherit xfce-app mime-xdg python3native | 12 | inherit xfce-app mime-xdg python3native |
| 10 | 13 | ||
| 11 | RRECOMMENDS:${PN} += "tumbler" | 14 | RRECOMMENDS:${PN} += "tumbler" |
| 12 | 15 | ||
| 13 | SRC_URI[sha256sum] = "5b9172ef704ae192a5338df6bee4e91a59edc65618c375bb4433ffb38e2126cb" | 16 | SRC_URI[sha256sum] = "502cf1577de14b38132dc89e56884c5e10f86f6a028d8dde379a8839110fda55" |
| 14 | 17 | ||
| 15 | FILES:${PN} += "${datadir}/metainfo" | 18 | FILES:${PN} += "${datadir}/metainfo" |
diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.9.4.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.9.7.bb index 987735e763..60f09d9db7 100644 --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.9.4.bb +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.9.7.bb | |||
| @@ -16,7 +16,7 @@ DEPENDS = " \ | |||
| 16 | inherit xfce-app | 16 | inherit xfce-app |
| 17 | inherit python3native | 17 | inherit python3native |
| 18 | 18 | ||
| 19 | SRC_URI[sha256sum] = "ae6c128c055c44bd07202f73ae69ad833c5e4754f3530696965136e4d9ea7818" | 19 | SRC_URI[sha256sum] = "170d18fd5f40cce823ffc7ae3d7e21644007c3f45808ab4835f0401d21b3516a" |
| 20 | 20 | ||
| 21 | # Avoid trouble with other desktops e.g KDE which also ships dbus service named | 21 | # Avoid trouble with other desktops e.g KDE which also ships dbus service named |
| 22 | # org.freedesktop.Notifications | 22 | # org.freedesktop.Notifications |
diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.15.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.1.1.bb index 7eeaf80a67..24c96ea788 100644 --- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.15.bb +++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.1.1.bb | |||
| @@ -10,8 +10,8 @@ REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" | |||
| 10 | 10 | ||
| 11 | DEPENDS += "intltool-native" | 11 | DEPENDS += "intltool-native" |
| 12 | 12 | ||
| 13 | SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2" | 13 | SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.1/${BP}.tar.xz" |
| 14 | SRC_URI[sha256sum] = "56cce1a27e88a18a282d568cbc601547a5dd704f0449a75bc284f0171aebaf3b" | 14 | SRC_URI[sha256sum] = "0126373a03778bb4894afa151de28d36bfc563ddab96d3bd7c63962350d34ba2" |
| 15 | 15 | ||
| 16 | do_configure() { | 16 | do_configure() { |
| 17 | # special configure - no autotools... | 17 | # special configure - no autotools... |
| @@ -25,4 +25,4 @@ do_install() { | |||
| 25 | 25 | ||
| 26 | FILES:${PN} += "${datadir}/metainfo" | 26 | FILES:${PN} += "${datadir}/metainfo" |
| 27 | 27 | ||
| 28 | RDEPENDS:${PN} += "python3-pygobject python3-pexpect" | 28 | RDEPENDS:${PN} += "python3-pygobject python3-pexpect python3-psutil" |
diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.4.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb index 7322dedc29..2033eb082f 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.4.bb +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb | |||
| @@ -7,13 +7,14 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later " | |||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 8 | file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ | 8 | file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ |
| 9 | " | 9 | " |
| 10 | XFCE_COMPRESS_TYPE = "xz" | ||
| 11 | XFCEBASEBUILDCLASS = "meson" | ||
| 10 | 12 | ||
| 11 | DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" | 13 | DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" |
| 12 | 14 | ||
| 13 | inherit xfce-app | 15 | inherit xfce-app |
| 14 | 16 | ||
| 15 | SRC_URI:append = " file://fix-cross-compile.patch" | 17 | SRC_URI[sha256sum] = "5032f60a31df5e50a80512e301b595be5ea6a6bd762cdd95cacc24cbd29a01d7" |
| 16 | SRC_URI[sha256sum] = "cf717d032d2d0555978c479299da992af6dc3363ae7e758af9515c7166eac170" | ||
| 17 | 18 | ||
| 18 | do_install:append() { | 19 | do_install:append() { |
| 19 | install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver | 20 | install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver |
diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.8.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.6.0.bb index 6490e087fb..e367326db9 100644 --- a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.8.bb +++ b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.6.0.bb | |||
| @@ -3,8 +3,11 @@ HOMEPAGE = "https://docs.xfce.org/apps/xfce4-taskmanager/start" | |||
| 3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 5 | 5 | ||
| 6 | XFCE_COMPRESS_TYPE = "xz" | ||
| 7 | XFCEBASEBUILDCLASS = "meson" | ||
| 8 | |||
| 6 | inherit xfce-app | 9 | inherit xfce-app |
| 7 | 10 | ||
| 8 | DEPENDS += "gtk+3 cairo libwnck libxfce4ui libxmu xfce4-dev-tools-native" | 11 | DEPENDS += "gtk+3 cairo libwnck libxfce4ui libxmu" |
| 9 | 12 | ||
| 10 | SRC_URI[sha256sum] = "14b9d68b8feb88a642a9885b8549efe7fc9e6c155f638003f2a4a58d9eb2baab" | 13 | SRC_URI[sha256sum] = "29bdc7840ab8b9025f6c0e456a83a31090d1c9fd9e26b359baa4a4010cfb0b90" |
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Do-not-display-full-path-in-generated-headers.patch b/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Do-not-display-full-path-in-generated-headers.patch new file mode 100644 index 0000000000..ef4052af51 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Do-not-display-full-path-in-generated-headers.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From c1b15e5249fa975308c75f5f9791a444a44f05bc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> | ||
| 3 | Date: Mon, 16 Mar 2026 16:48:25 +0100 | ||
| 4 | Subject: [PATCH] build: Do not display full path in generated headers | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://gitlab.xfce.org/apps/xfce4-terminal/-/commit/c1b15e5249fa975308c75f5f9791a444a44f05bc] | ||
| 7 | |||
| 8 | Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com> | ||
| 9 | --- | ||
| 10 | terminal/meson.build | 4 ++-- | ||
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/terminal/meson.build b/terminal/meson.build | ||
| 14 | index e0e109f7..5ff7b1ee 100644 | ||
| 15 | --- a/terminal/meson.build | ||
| 16 | +++ b/terminal/meson.build | ||
| 17 | @@ -50,7 +50,7 @@ terminal_sources += gnome.mkenums( | ||
| 18 | install_header: false, | ||
| 19 | sources: 'terminal-preferences.h', | ||
| 20 | fhead: '#ifndef TERMINAL_ENUM_TYPES_H\n#define TERMINAL_ENUM_TYPES_H\n#include <gtk/gtk.h>\nG_BEGIN_DECLS\n', | ||
| 21 | - fprod: '/* enumerations from "@filename@" */\n', | ||
| 22 | + fprod: '/* enumerations from "@basename@" */\n', | ||
| 23 | vhead: 'GType @enum_name@_get_type (void);\n#define TERMINAL_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', | ||
| 24 | ftail: 'G_END_DECLS\n\n#endif /* !TERMINAL_ENUM_TYPES_H */', | ||
| 25 | ) | ||
| 26 | @@ -59,7 +59,7 @@ terminal_sources += gnome.mkenums( | ||
| 27 | install_header: false, | ||
| 28 | sources: 'terminal-preferences.h', | ||
| 29 | fhead: '#include "terminal-enum-types.h"\n#include "terminal-app.h"\n#include "terminal-preferences.h"', | ||
| 30 | - fprod: ' \n/* enumerations from "@filename@" */', | ||
| 31 | + fprod: ' \n/* enumerations from "@basename@" */', | ||
| 32 | vhead: 'GType\n@enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G@Type@Value values[] = {', | ||
| 33 | vprod: ' \t{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },', | ||
| 34 | vtail: ' \t{ 0, NULL, NULL }\n\t};\n\ttype = g_@type@_register_static ("@EnumName@", values);\n }\n\treturn type;\n}\n', | ||
| 35 | -- | ||
| 36 | 2.51.2 | ||
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Properly-guard-wayland-code.patch b/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Properly-guard-wayland-code.patch new file mode 100644 index 0000000000..4f46e8a8d7 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Properly-guard-wayland-code.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From b07d9546a08a3cd70b7e9aaad7a86256fbe32b8b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> | ||
| 3 | Date: Sun, 8 Mar 2026 22:23:34 +0100 | ||
| 4 | Subject: [PATCH] build: Properly guard wayland code | ||
| 5 | |||
| 6 | Closes: #383 | ||
| 7 | Fixes: ab0136ac39d1eb0849dcfca84bbd91e8562a7176 | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://gitlab.xfce.org/apps/xfce4-terminal/-/commit/b07d9546a08a3cd70b7e9aaad7a86256fbe32b8b] | ||
| 10 | |||
| 11 | Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com> | ||
| 12 | --- | ||
| 13 | terminal/terminal-window-dropdown.c | 2 ++ | ||
| 14 | 1 file changed, 2 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/terminal/terminal-window-dropdown.c b/terminal/terminal-window-dropdown.c | ||
| 17 | index 6f9e3b48..074a6ce0 100644 | ||
| 18 | --- a/terminal/terminal-window-dropdown.c | ||
| 19 | +++ b/terminal/terminal-window-dropdown.c | ||
| 20 | @@ -567,11 +567,13 @@ terminal_window_dropdown_finalize (GObject *object) | ||
| 21 | if (dropdown->animation_timeout_id != 0) | ||
| 22 | g_source_remove (dropdown->animation_timeout_id); | ||
| 23 | |||
| 24 | +#ifdef HAVE_GTK_LAYER_SHELL | ||
| 25 | if (dropdown->set_monitor_idle_id != 0) | ||
| 26 | g_source_remove (dropdown->set_monitor_idle_id); | ||
| 27 | |||
| 28 | if (dropdown->monitor_removed_idle_id != 0) | ||
| 29 | g_source_remove (dropdown->monitor_removed_idle_id); | ||
| 30 | +#endif | ||
| 31 | |||
| 32 | if (dropdown->status_icon != NULL) | ||
| 33 | g_object_unref (G_OBJECT (dropdown->status_icon)); | ||
| 34 | -- | ||
| 35 | 2.51.2 | ||
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.1.4.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.1.4.bb deleted file mode 100644 index 50adacbcb1..0000000000 --- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.1.4.bb +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | SUMMARY = "Terminal emulator for the Xfce desktop environment" | ||
| 2 | HOMEPAGE = "https://docs.xfce.org/apps/xfce4-terminal/start" | ||
| 3 | LICENSE = "GPL-2.0-only" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
| 5 | DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui gtk-doc-native" | ||
| 6 | |||
| 7 | inherit xfce-app | ||
| 8 | |||
| 9 | FILES:${PN} += " \ | ||
| 10 | ${datadir}/xfce4 \ | ||
| 11 | ${datadir}/gnome-control-center \ | ||
| 12 | " | ||
| 13 | |||
| 14 | SRC_URI[sha256sum] = "873c921da1f4b986ffb459d4960789c9c063af98648c9f0ca146dc6f6f5b71b7" | ||
| 15 | |||
| 16 | RRECOMMENDS:${PN} += "vte-prompt" | ||
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.2.0.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.2.0.bb new file mode 100644 index 0000000000..bf31ae516e --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.2.0.bb | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | SUMMARY = "Terminal emulator for the Xfce desktop environment" | ||
| 2 | HOMEPAGE = "https://docs.xfce.org/apps/xfce4-terminal/start" | ||
| 3 | LICENSE = "GPL-2.0-only" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
| 5 | DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui libxslt-native docbook-xsl-stylesheets-native gtk-doc-native" | ||
| 6 | |||
| 7 | XFCE_COMPRESS_TYPE = "xz" | ||
| 8 | XFCEBASEBUILDCLASS = "meson" | ||
| 9 | |||
| 10 | inherit xfce-app | ||
| 11 | |||
| 12 | SRC_URI += "\ | ||
| 13 | file://0001-build-Properly-guard-wayland-code.patch \ | ||
| 14 | file://0001-build-Do-not-display-full-path-in-generated-headers.patch \ | ||
| 15 | " | ||
| 16 | SRC_URI[sha256sum] = "6874c7b975cc3dc3bd636d57ffec723de7458202defe65377593d3a7e0734b94" | ||
| 17 | |||
| 18 | FILES:${PN} += " \ | ||
| 19 | ${datadir}/xfce4 \ | ||
| 20 | ${datadir}/gnome-control-center \ | ||
| 21 | " | ||
| 22 | |||
| 23 | RRECOMMENDS:${PN} += "vte-prompt" | ||
diff --git a/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb index d69abfedf2..cdec5f7792 100644 --- a/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb +++ b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
| 5 | 5 | ||
| 6 | inherit xfce | 6 | inherit xfce |
| 7 | 7 | ||
| 8 | SRC_URI = "http://archive.xfce.org/src/art/${BPN}/${@'${PV}'[0:4]}/${BP}.tar.bz2" | 8 | SRC_URI = "https://archive.xfce.org/src/art/${BPN}/${@'${PV}'[0:4]}/${BP}.tar.bz2" |
| 9 | SRC_URI[sha256sum] = "3214d5f00e9703b5e8c9e7c3287d606dedec7285ceb4d5db332e93ada66fd575" | 9 | SRC_URI[sha256sum] = "3214d5f00e9703b5e8c9e7c3287d606dedec7285ceb4d5db332e93ada66fd575" |
| 10 | 10 | ||
| 11 | # using xfwm4-theme as in xfwm4 might cause warnings of packages supplied by | 11 | # using xfwm4-theme as in xfwm4 might cause warnings of packages supplied by |
diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb index 6ee5391d2c..b9ccb6183e 100644 --- a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb +++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb | |||
| @@ -8,7 +8,7 @@ inherit xfce pkgconfig features_check | |||
| 8 | REQUIRED_DISTRO_FEATURES = "x11" | 8 | REQUIRED_DISTRO_FEATURES = "x11" |
| 9 | 9 | ||
| 10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
| 11 | http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \ | 11 | https://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \ |
| 12 | file://0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch \ | 12 | file://0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch \ |
| 13 | " | 13 | " |
| 14 | SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" | 14 | SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" |
diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.8.0.bb b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.8.0.bb index a6972727f2..a71eb0abde 100644 --- a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.8.0.bb +++ b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.8.0.bb | |||
| @@ -7,5 +7,5 @@ XFCE_COMPRESS_TYPE = "xz" | |||
| 7 | 7 | ||
| 8 | inherit xfce-panel-plugin | 8 | inherit xfce-panel-plugin |
| 9 | 9 | ||
| 10 | SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" | 10 | SRC_URI = "https://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" |
| 11 | SRC_URI[sha256sum] = "3833920a3a4a81b3c676c4fab6dd178f4a222d66f316a0783a9149a0153b7fb6" | 11 | SRC_URI[sha256sum] = "3833920a3a4a81b3c676c4fab6dd178f4a222d66f316a0783a9149a0153b7fb6" |
diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.5.0.bb b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.5.0.bb index d54e3b1bd1..7b04a23ada 100644 --- a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.5.0.bb +++ b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.5.0.bb | |||
| @@ -7,5 +7,5 @@ XFCE_COMPRESS_TYPE = "xz" | |||
| 7 | 7 | ||
| 8 | inherit xfce-panel-plugin | 8 | inherit xfce-panel-plugin |
| 9 | 9 | ||
| 10 | SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" | 10 | SRC_URI = "https://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" |
| 11 | SRC_URI[sha256sum] = "a868be8f73e8396c2d61903d46646993c5130d16ded71ddb5da9088abf7cb7ba" | 11 | SRC_URI[sha256sum] = "a868be8f73e8396c2d61903d46646993c5130d16ded71ddb5da9088abf7cb7ba" |
diff --git a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb index 2fa76351a4..4f823c67b5 100644 --- a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb +++ b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb | |||
| @@ -7,7 +7,7 @@ XFCE_COMPRESS_TYPE = "xz" | |||
| 7 | 7 | ||
| 8 | inherit xfce-panel-plugin features_check | 8 | inherit xfce-panel-plugin features_check |
| 9 | 9 | ||
| 10 | REQUIRED_DISTRO_FEATURES = "pulseaudio" | 10 | REQUIRED_DISTRO_FEATURES = "pulseaudio ${@bb.utils.contains_any('DISTRO_FEATURES', 'opengl vulkan', 'x11', '', d)}" |
| 11 | 11 | ||
| 12 | DEPENDS += "dbus-glib pulseaudio" | 12 | DEPENDS += "dbus-glib pulseaudio" |
| 13 | 13 | ||
diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.5.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.5.0.bb index d283684aa2..1d9f7c205a 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.5.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.5.0.bb | |||
| @@ -3,10 +3,12 @@ HOMEPAGE = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start" | |||
| 3 | LICENSE = "GPL-2.0-or-later" | 3 | LICENSE = "GPL-2.0-or-later" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 5 | 5 | ||
| 6 | XFCE_COMPRESS_TYPE = "xz" | ||
| 7 | |||
| 6 | inherit xfce-panel-plugin | 8 | inherit xfce-panel-plugin |
| 7 | 9 | ||
| 8 | SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" | 10 | SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" |
| 9 | SRC_URI[sha256sum] = "f69fdf79b7f76d2a81724828124a6fce76803a9122a4c82de8f3dfa3efbb179a" | 11 | SRC_URI[sha256sum] = "840442b87fdddcd8595bd9f83ea8b81f771fe296bb9d2abf0e1979e208727ae9" |
| 10 | 12 | ||
| 11 | EXTRA_OECONF = " \ | 13 | EXTRA_OECONF = " \ |
| 12 | --disable-procacpi \ | 14 | --disable-procacpi \ |
diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.10.0.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.10.1.bb index 59f4bc9203..6d17c7596a 100644 --- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.10.0.bb +++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.10.1.bb | |||
| @@ -8,4 +8,4 @@ XFCEBASEBUILDCLASS = "meson" | |||
| 8 | 8 | ||
| 9 | inherit xfce-panel-plugin cmake | 9 | inherit xfce-panel-plugin cmake |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "c2efb3782816d44d421dcbee2900b9513bdb2469b695b776641f495601f33a10" | 11 | SRC_URI[sha256sum] = "8b5a777a5d9df1f1c39b109ba8b2d045cb2cc02c41a9a297aa00dcb2a4520530" |
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.20.2.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.20.2.bb index d485abc19a..a0be1f6067 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.20.2.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.20.2.bb | |||
| @@ -10,6 +10,7 @@ inherit xfce gtk-doc gobject-introspection features_check | |||
| 10 | # xfce4 depends on libwnck3. gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. | 10 | # xfce4 depends on libwnck3. gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. |
| 11 | # cairo would at least needed to be built with xlib. | 11 | # cairo would at least needed to be built with xlib. |
| 12 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 12 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 13 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','opengl', "", d)}" | ||
| 13 | 14 | ||
| 14 | # TODO: Check if 0001-... can go | 15 | # TODO: Check if 0001-... can go |
| 15 | SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" | 16 | SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" |
| @@ -19,7 +20,7 @@ EXTRA_OECONF += "--with-vendor-info=${DISTRO}" | |||
| 19 | EXTRA_OECONF += "--disable-vala" | 20 | EXTRA_OECONF += "--disable-vala" |
| 20 | 21 | ||
| 21 | PACKAGECONFIG ??= " \ | 22 | PACKAGECONFIG ??= " \ |
| 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl','x11', "", d)} \ | 23 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11','x11', "", d)} \ |
| 23 | " | 24 | " |
| 24 | PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" | 25 | PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" |
| 25 | PACKAGECONFIG[x11] = "--enable-startup-notification,--disable-startup-notification,libepoxy libice libsm startup-notification" | 26 | PACKAGECONFIG[x11] = "--enable-startup-notification,--disable-startup-notification,libepoxy libice libsm startup-notification" |
diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.20.5.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.20.7.bb index e72eb8b33f..a03804496b 100644 --- a/meta-xfce/recipes-xfce/thunar/thunar_4.20.5.bb +++ b/meta-xfce/recipes-xfce/thunar/thunar_4.20.7.bb | |||
| @@ -7,11 +7,9 @@ DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libnotify xfce4-p | |||
| 7 | 7 | ||
| 8 | inherit xfce gobject-introspection features_check mime-xdg perlnative gtk-doc | 8 | inherit xfce gobject-introspection features_check mime-xdg perlnative gtk-doc |
| 9 | 9 | ||
| 10 | # xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. | 10 | REQUIRED_DISTRO_FEATURES = "x11" |
| 11 | # cairo would at least needed to be built with xlib. | ||
| 12 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
| 13 | 11 | ||
| 14 | SRC_URI[sha256sum] = "da299babd233a079a443e527fa38cba3899b6131ef056593de9451178d812f2a" | 12 | SRC_URI[sha256sum] = "e0dfbb732c3d7c9174d1c0216dd6177f1d4e9297e623dbced32efd3f3e8682e5" |
| 15 | 13 | ||
| 16 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 14 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
| 17 | PACKAGECONFIG[pcre] = "--enable-pcre2,--disable-pcre2,libpcre2" | 15 | PACKAGECONFIG[pcre] = "--enable-pcre2,--disable-pcre2,libpcre2" |
diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.21.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.21.0.bb index 3338126557..121140e2f6 100644 --- a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.21.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.21.0.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
| 7 | DEPENDS = "glib-2.0 libxslt-native meson-native" | 7 | DEPENDS = "glib-2.0 libxslt-native meson-native" |
| 8 | DEPENDS:append:class-target = " ${BPN}-native" | 8 | DEPENDS:append:class-target = " ${BPN}-native" |
| 9 | 9 | ||
| 10 | SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BP}.tar.bz2 \ | 10 | SRC_URI = "https://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BP}.tar.bz2 \ |
| 11 | file://0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch \ | 11 | file://0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch \ |
| 12 | " | 12 | " |
| 13 | SRC_URI:append:class-target = " file://0001-Run-native-xdt-csource-on-tests.patch" | 13 | SRC_URI:append:class-target = " file://0001-Run-native-xdt-csource-on-tests.patch" |
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.1.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.1.bb index 8efa88b9d7..fdfe39014a 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.1.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.1.bb | |||
| @@ -9,9 +9,7 @@ DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxfce4windowing libxml2 \ | |||
| 9 | 9 | ||
| 10 | inherit xfce gtk-doc gobject-introspection features_check mime-xdg | 10 | inherit xfce gtk-doc gobject-introspection features_check mime-xdg |
| 11 | 11 | ||
| 12 | # xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. | 12 | REQUIRED_DISTRO_FEATURES = "x11" |
| 13 | # cairo would at least needed to be built with xlib. | ||
| 14 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
| 15 | 13 | ||
| 16 | SRC_URI += " \ | 14 | SRC_URI += " \ |
| 17 | file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ | 15 | file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ |
