[arch-commits] Commit in grilo-plugins/trunk (PKGBUILD local-metadata-crash.patch)

Jan Steffens heftig at archlinux.org
Sun May 17 13:39:45 UTC 2015


    Date: Sunday, May 17, 2015 @ 15:39:45
  Author: heftig
Revision: 239495

FS#44724 local metadata plugin crashes

Added:
  grilo-plugins/trunk/local-metadata-crash.patch
Modified:
  grilo-plugins/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   13 ++++++++++---
 local-metadata-crash.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-17 11:32:11 UTC (rev 239494)
+++ PKGBUILD	2015-05-17 13:39:45 UTC (rev 239495)
@@ -3,7 +3,7 @@
 
 pkgname=grilo-plugins
 pkgver=0.2.14
-pkgrel=2
+pkgrel=3
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
@@ -14,9 +14,16 @@
             'tracker: Tracker plugin')
 options=('!emptydirs')
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
+        local-metadata-crash.patch)
+sha256sums=('d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab'
+            '221f770b064309635b52095d21d325707d45de03772da5cc579252b7795ced1b')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../local-metadata-crash.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static

Added: local-metadata-crash.patch
===================================================================
--- local-metadata-crash.patch	                        (rev 0)
+++ local-metadata-crash.patch	2015-05-17 13:39:45 UTC (rev 239495)
@@ -0,0 +1,31 @@
+From 85fc7cbf831e914456623a2f7a9efbe81919bf4d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete at collabora.com>
+Date: Tue, 28 Apr 2015 19:46:54 -0400
+Subject: local-metadata: Ignore sanitization if the whole filename is
+ blacklisted
+
+If the whole filename ends up blacklisted, then just take it as-is.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=748604
+
+diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c
+index adc81f0..45856be 100644
+--- a/src/local-metadata/grl-local-metadata.c
++++ b/src/local-metadata/grl-local-metadata.c
+@@ -272,6 +272,13 @@ video_sanitise_string (const gchar *str)
+   if (*line_end != '\0') {
+     line_end = g_utf8_find_prev_char (line, line_end);
+ 
++
++    /* If everything in the string is blacklisted, just ignore
++     * the blackisting logic.
++     */
++    if (line_end == NULL)
++      return g_strdup (str);
++
+     /* After removing substring with blacklisted word, ignore non alpha-numeric
+      * char in the end of the sanitised string */
+     while (g_unichar_isalnum (*line_end) == FALSE &&
+-- 
+cgit v0.10.2
+



More information about the arch-commits mailing list