From 762a00edc6957482753a641571f903b1b09a85c5 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Fri, 30 Sep 2022 13:24:49 +0300
Subject: [PATCH] glib2 rebuild libffi ver.bump

---
 system/base/glib2/files/2921.patch | 33 ++++++++++++++++++++++++++++++
 system/base/glib2/pspec.xml        | 10 ++++++++-
 system/base/libffi/actions.py      |  2 ++
 system/base/libffi/pspec.xml       |  9 +++++++-
 4 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 system/base/glib2/files/2921.patch

diff --git a/system/base/glib2/files/2921.patch b/system/base/glib2/files/2921.patch
new file mode 100644
index 00000000..ef1dcfbc
--- /dev/null
+++ b/system/base/glib2/files/2921.patch
@@ -0,0 +1,33 @@
+From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sun, 25 Sep 2022 14:20:24 +0100
+Subject: [PATCH] Empty values are not valid GParamSpec
+
+The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
+which means the is_valid() vfunc should do the same.
+
+This avoids a segfault when calling g_param_value_is_valid() on a
+GParamSpecParam.
+
+Fixes: #2770
+---
+ gobject/gparamspecs.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
+index f17b3488b9..17b8606572 100644
+--- a/gobject/gparamspecs.c
++++ b/gobject/gparamspecs.c
+@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec   *pspec,
+ {
+   GParamSpec *param = value->data[0].v_pointer;
+ 
++  if (param == NULL)
++    return FALSE;
++
+   return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
+ }
+ 
+-- 
+GitLab
+
diff --git a/system/base/glib2/pspec.xml b/system/base/glib2/pspec.xml
index 67f06458..8d116b5a 100644
--- a/system/base/glib2/pspec.xml
+++ b/system/base/glib2/pspec.xml
@@ -18,7 +18,7 @@
             <Dependency>ninja</Dependency>
             <Dependency versionFrom="1.2.12">zlib-devel</Dependency>
             <Dependency>docbook-xsl</Dependency>
-            <Dependency>libffi-devel</Dependency>
+            <Dependency versionFrom="3.4.3">libffi-devel</Dependency>
             <Dependency>elfutils-devel</Dependency>
             <Dependency>libxslt-devel</Dependency><!-- for man=true  -->
             <Dependency versionFrom="2.37.4">libutil-linux-devel</Dependency>
@@ -28,6 +28,7 @@
             <Patch level="1">noisy-glib-compile-schemas.diff</Patch>
 <!--             <Patch level="1">CVE-2020-6750.patch</Patch> -->
             <Patch level="1">glib-2.68.2-skip_warnings-1.patch</Patch>
+            <Patch level="1">2921.patch</Patch>
         </Patches>
         <AdditionalFiles>
             <AdditionalFile target="multilib.diff" permission="0644">multilib.diff</AdditionalFile>
@@ -141,6 +142,13 @@
     </Package>
 
     <History>
+        <Update release="24">
+            <Date>2022-09-30</Date>
+            <Version>2.74.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="23">
             <Date>2022-09-18</Date>
             <Version>2.74.0</Version>
diff --git a/system/base/libffi/actions.py b/system/base/libffi/actions.py
index a29c006e..320e0354 100644
--- a/system/base/libffi/actions.py
+++ b/system/base/libffi/actions.py
@@ -28,6 +28,8 @@ def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
     
     if get.buildTYPE() == "emul32":
+        pisitools.dosym("/usr/lib/libffi.so.8", "/usr/lib/libffi.so.7")
+        pisitools.dosym("/usr/lib32/libffi.so.8", "/usr/lib32/libffi.so.7")
         return
 
     #if get.buildTYPE() == "emul32":
diff --git a/system/base/libffi/pspec.xml b/system/base/libffi/pspec.xml
index aacf1fbb..67ca895c 100644
--- a/system/base/libffi/pspec.xml
+++ b/system/base/libffi/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>A portable foreign function interface library</Summary>
         <Description>The libffi library provides a portable, high level programming interface to various calling conventions.</Description>
-        <Archive sha1sum="8df6cb570c8d6596a67d1c0773bf00650154f7aa" type="targz">ftp://sourceware.org/pub/libffi/libffi-3.3.tar.gz</Archive>
+        <Archive sha1sum="86c5eddb9312d1d41e280d92678bc0cf177086e8" type="targz">ftp://sourceware.org/pub/libffi/libffi-3.4.3.tar.gz</Archive>
     </Source>
 
     <Package>
@@ -56,6 +56,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2022-09-30</Date>
+            <Version>3.4.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2020-12-09</Date>
             <Version>3.3</Version>