From f65525bcb09e3fa04ee2031a97b76f1829ed7161 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 12 May 2021 11:45:49 +0200 Subject: [PATCH] + grilo-plugins-0.3.13-3 Fix crash with newer lua Resolves: rhbz#1958772 --- 0001-grl-lua-factory-Remove-a-bad-pop.patch | 26 +++++++++++++++++++++ grilo-plugins.spec | 10 +++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-grl-lua-factory-Remove-a-bad-pop.patch diff --git a/0001-grl-lua-factory-Remove-a-bad-pop.patch b/0001-grl-lua-factory-Remove-a-bad-pop.patch new file mode 100644 index 0000000..a143cf0 --- /dev/null +++ b/0001-grl-lua-factory-Remove-a-bad-pop.patch @@ -0,0 +1,26 @@ +From 1b0fae453daf32eda9d0267c1a13cfebe324f89f Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sun, 4 Apr 2021 18:30:57 +0000 +Subject: [PATCH] grl-lua-factory: Remove a bad pop + +This was exposed by Lua 5.4.3, causing a crash. +--- + src/lua-factory/grl-lua-factory.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/lua-factory/grl-lua-factory.c b/src/lua-factory/grl-lua-factory.c +index 4f37984..3a3b824 100644 +--- a/src/lua-factory/grl-lua-factory.c ++++ b/src/lua-factory/grl-lua-factory.c +@@ -1255,8 +1255,6 @@ table_to_tags (lua_State *L) + lua_pop (L, 1); + } + +- lua_pop (L, 1); +- + if (array->len == 0) { + g_ptr_array_free (array, TRUE); + return NULL; +-- +2.31.1 + diff --git a/grilo-plugins.spec b/grilo-plugins.spec index 4954f74..162a696 100644 --- a/grilo-plugins.spec +++ b/grilo-plugins.spec @@ -6,13 +6,16 @@ Name: grilo-plugins Version: 0.3.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plugins for the Grilo framework License: LGPLv2+ URL: https://wiki.gnome.org/Projects/Grilo Source0: https://download.gnome.org/sources/grilo-plugins/%{release_version}/grilo-plugins-%{version}.tar.xz +# https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/108 +Patch0: 0001-grl-lua-factory-Remove-a-bad-pop.patch + BuildRequires: gcc BuildRequires: meson BuildRequires: avahi-gobject-devel @@ -115,6 +118,11 @@ This package contains plugins to get information from theses sources: %{_libdir}/grilo-%{release_version}/*.so* %changelog +* Wed May 12 2021 Bastien Nocera - 0.3.13-3 ++ grilo-plugins-0.3.13-3 +- Fix crash with newer lua +- Resolves: rhbz#1958772 + * Thu Apr 15 2021 Mohan Boddu - 0.3.13-2 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937