diff options
| author | Khem Raj <raj.khem@gmail.com> | 2025-10-24 08:59:40 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-10-24 18:45:43 -0700 |
| commit | 86b56782fe4058caf2b866a948d7af9b6adf9fe5 (patch) | |
| tree | b28e7a883e2f44d8d94e49c691aa711c4434adef /meta-oe/recipes-connectivity | |
| parent | cf99ab2d8c4c6791d3475c61f28c9ca9da5920da (diff) | |
| download | meta-openembedded-86b56782fe4058caf2b866a948d7af9b6adf9fe5.tar.gz | |
libtorrent: Upgrade to 0.16.1
Fix a m4 script bug
Drop CVE_STATUS since this is only needed for < 0.14 release
Enable using posix_fallocate when creating a new file to avoid fragmentation
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
| -rw-r--r-- | meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch | 45 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.1.bb (renamed from meta-oe/recipes-connectivity/libtorrent/libtorrent_0.14.0.bb) | 12 |
2 files changed, 50 insertions, 7 deletions
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch b/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch new file mode 100644 index 0000000000..1740b0f478 --- /dev/null +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | From 9df2559d55c454c7128b65103456c2f88b3bf2f5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 24 Oct 2025 08:45:02 -0700 | ||
| 4 | Subject: [PATCH] scripts/common.m4: Insert spaces in shell lists | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | $1=$(echo "$result" | tr -d '\n') | ||
| 10 | |||
| 11 | removes all newlines without inserting spaces | ||
| 12 | That usually isn’t what we want for shell lists. | ||
| 13 | It should typically be space-separated output. | ||
| 14 | |||
| 15 | Fixes a bug seen with yocto where compiler is not a single word | ||
| 16 | but a string e.g. | ||
| 17 | |||
| 18 | ccache aarch64-yoe-linux-musl-clang++ -mcpu=cortex-a72+crc+nocrypto --dyld-prefix=/usr -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/libtorrent/0.16.1/recipe-sysroot | ||
| 19 | |||
| 20 | It changes it to | ||
| 21 | |||
| 22 | ccacheaarch64-yoe-linux-musl-clang++-mcpu=cortex-a72+crc+nocrypto--dyld-prefix=/usr-fstack-protector-strong-O2-D_FORTIFY_SOURCE=2-Wformat-Wformat-security-Werror=format-security--sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/libtorrent/0.16.1/recipe-sysroot | ||
| 23 | |||
| 24 | When doing c++17 checks on compiler, resulting in failure | ||
| 25 | |||
| 26 | Upstream-Status: Submitted [https://github.com/rakshasa/libtorrent/pull/583] | ||
| 27 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 28 | --- | ||
| 29 | scripts/common.m4 | 3 ++- | ||
| 30 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 31 | |||
| 32 | diff --git a/scripts/common.m4 b/scripts/common.m4 | ||
| 33 | index 74b99e6a..44a5fe65 100644 | ||
| 34 | --- a/scripts/common.m4 | ||
| 35 | +++ b/scripts/common.m4 | ||
| 36 | @@ -30,7 +30,8 @@ AC_DEFUN([TORRENT_REMOVE_UNWANTED], | ||
| 37 | $1="$2" | ||
| 38 | else | ||
| 39 | result=`echo "${values_to_check}" | $GREP -Fvx -- "${unwanted_values}" | $GREP -v '^$'` | ||
| 40 | - $1=$(echo "$result" | tr -d '\n') | ||
| 41 | + # join with spaces, squeeze repeats, and trim trailing space | ||
| 42 | + $1=$(printf '%s\n' "$result" | tr '\n' ' ' | sed 's/ */ /g; s/ *$//') | ||
| 43 | fi | ||
| 44 | ]) | ||
| 45 | |||
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.14.0.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.1.bb index 220bb62c64..4a8a68aa15 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.14.0.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.1.bb | |||
| @@ -4,16 +4,14 @@ HOMEPAGE = "http://libtorrent.rakshasa.no/" | |||
| 4 | LICENSE = "GPL-2.0-or-later" | 4 | LICENSE = "GPL-2.0-or-later" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" |
| 6 | 6 | ||
| 7 | DEPENDS = "zlib 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" | 9 | SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https;tag=v${PV} \ |
| 10 | SRCREV = "08fb6635ba249665cb08a4de1b955288d25c21e1" | 10 | file://0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch" |
| 11 | SRCREV = "919d23923ad0a483fa24441093eda1c12cea4c0b" | ||
| 11 | 12 | ||
| 12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 13 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
| 13 | 14 | ||
| 14 | CVE_STATUS[CVE-2009-1760] = "backported-patch: patched in our product" | ||
| 15 | |||
| 16 | |||
| 17 | CVE_PRODUCT = "" | 15 | CVE_PRODUCT = "" |
| 18 | 16 | ||
| 19 | PACKAGECONFIG ??= "instrumentation aligned" | 17 | PACKAGECONFIG ??= "instrumentation aligned" |
| @@ -27,4 +25,4 @@ PACKAGECONFIG[aligned] = "--enable-aligned,--disable-aligned," | |||
| 27 | 25 | ||
| 28 | inherit autotools pkgconfig | 26 | inherit autotools pkgconfig |
| 29 | 27 | ||
| 30 | EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}" | 28 | EXTRA_OECONF = "--with-posix-fallocate" |
