2.62.4-2: CVE-2020-6750

1 files changed, 8 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f0175bdc6f41..61c9ba8d7333 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=glib2-patched-thumbnailer
 pkgver=2.62.4
-pkgrel=1
+pkgrel=2
 pkgdesc="GLib2 patched with ahodesuka's thumbnailer patch."
-url="https://gist.github.com/Dudemanguy911/d199759b46a79782cc1b301649dec8a5"
+url="https://gist.github.com/Dudemanguy/d199759b46a79782cc1b301649dec8a5"
 arch=(x86_64)
 provides=("glib2=$pkgver")
 conflicts=('glib2')
@@ -19,11 +19,13 @@ options=('!docs' '!emptydirs')
 license=(LGPL2.1)
 _commit=dac69d7128b3b66ed7007ab944eb629d30f4de4b  # tags/2.62.4^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
+        CVE-2020-6750.patch
         noisy-glib-compile-schemas.diff
         glib-compile-schemas.hook
         gio-querymodules.hook
         glib-thumbnailer.patch)
 sha256sums=('SKIP'
+            '220ff38e418a470b7790e65a2c05527793110c38a1105552b93be884230215f7'
             '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
             'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
             '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
@@ -37,8 +39,11 @@ pkgver() {
 prepare() {
   cd glib
 
+  # https://mail.gnome.org/archives/distributor-list/2020-February/msg00001.html
+  git apply -3 ../CVE-2020-6750.patch
+
   # Suppress noise from glib-compile-schemas.hook
-  patch -Np1 -i ../noisy-glib-compile-schemas.diff
+  git apply -3 ../noisy-glib-compile-schemas.diff
 
   # Apply patch to generate thumbnails
   patch -Np1 -i ../glib-thumbnailer.patch