From 73f680414c1c21571dcd41f3f2de047a0525e8c2 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 9 Oct 2023 17:17:51 -0700 Subject: [PATCH 1/3] tracker: update to 3.6.0. --- srcpkgs/tracker/template | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index 0ac5d828e786c..066fd816dae67 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,9 +1,9 @@ # Template file for 'tracker' pkgname=tracker -version=3.5.0 -revision=3 +version=3.6.0 +revision=1 build_style=meson -build_helper="gir" +build_helper="gir qemu" configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled -Dsystemd_user_services=false" hostmakedepends="gettext pkg-config glib-devel vala asciidoc @@ -17,11 +17,12 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Tracker" changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS" distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz" -checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f +checksum=52592cfe19baffd16dbe47475be7da750dbd0b6333fd7acb60faa9da5bc40df2 make_check_pre="dbus-run-session" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" dbus" + configure_args+=" --cross-file=${XBPS_WRAPPERDIR}/meson/xbps_sqlite.cross" fi if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then @@ -31,7 +32,15 @@ fi post_patch() { if [ "$CROSS_BUILD" ]; then # Tell the build system that we have internal fts5 in sqlite3 - vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross + cat > "${XBPS_WRAPPERDIR}/meson/xbps_sqlite.cross" <<-EOF + [properties] + sqlite3_has_fts5 = 'true' + EOF + fi + + # Patch out error due to y2k38 on musl + if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then + vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build fi } From 65aa70752aa02bea896c1fe45d359311f7288d7d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 9 Oct 2023 17:18:12 -0700 Subject: [PATCH 2/3] tracker-miners: update to 3.6.1. --- srcpkgs/tracker-miners/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template index a6e5aa5777024..0b97f47489f81 100644 --- a/srcpkgs/tracker-miners/template +++ b/srcpkgs/tracker-miners/template @@ -1,7 +1,7 @@ # Template file for 'tracker-miners' pkgname=tracker-miners -version=3.5.0 -revision=4 +version=3.6.1 +revision=1 build_style=meson build_helper=qemu # missing libgrss for miner_rss @@ -27,7 +27,7 @@ license="GPL-2.0-or-later" homepage="https://tracker.gnome.org/" changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS" distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" -checksum=17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3 +checksum=eef0e8d4aaca78feffb97d2f0957361869f53ea7768d1991385be51c17e8928e make_check=no # relies on unsupported ops in chroot tracker3-miners_package() { From 415a53361309e9437e3773eeb1be51fd4163683a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 9 Oct 2023 17:18:39 -0700 Subject: [PATCH 3/3] libcue: add patch for CVE-2023-43641 --- ...2c8bded8d24cfa0608b8e97f2eed210a920e.patch | 24 +++++++++++++++++++ srcpkgs/libcue/template | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libcue/patches/fdf72c8bded8d24cfa0608b8e97f2eed210a920e.patch diff --git a/srcpkgs/libcue/patches/fdf72c8bded8d24cfa0608b8e97f2eed210a920e.patch b/srcpkgs/libcue/patches/fdf72c8bded8d24cfa0608b8e97f2eed210a920e.patch new file mode 100644 index 0000000000000..b38727fdcea65 --- /dev/null +++ b/srcpkgs/libcue/patches/fdf72c8bded8d24cfa0608b8e97f2eed210a920e.patch @@ -0,0 +1,24 @@ +From fdf72c8bded8d24cfa0608b8e97f2eed210a920e Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse +Date: Wed, 27 Sep 2023 20:22:43 +0100 +Subject: [PATCH] Check that the array index isn't negative. This fixes + CVE-2023-43641. + +Signed-off-by: Kevin Backhouse +--- + cd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cd.c b/cd.c +index cf77a18..4bbea19 100644 +--- a/cd.c ++++ b/cd.c +@@ -339,7 +339,7 @@ track_get_rem(const Track* track) + + void track_set_index(Track *track, int i, long ind) + { +- if (i > MAXINDEX) { ++ if (i < 0 || i > MAXINDEX) { + fprintf(stderr, "too many indexes\n"); + return; + } diff --git a/srcpkgs/libcue/template b/srcpkgs/libcue/template index 496fd7927bcd9..dd21eb67027ab 100644 --- a/srcpkgs/libcue/template +++ b/srcpkgs/libcue/template @@ -1,7 +1,7 @@ # Template file for 'libcue' pkgname=libcue version=2.2.1 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" hostmakedepends="bison flex"