Date: Wednesday, September 17, 2014 @ 23:07:02 Author: jgc Revision: 221874
upgpkg: libsoup 2.47.92-1 Modified: libsoup/trunk/PKGBUILD Deleted: libsoup/trunk/cache-control-dontcrash.patch -------------------------------+ PKGBUILD | 13 +++---------- cache-control-dontcrash.patch | 27 --------------------------- 2 files changed, 3 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-09-17 21:06:52 UTC (rev 221873) +++ PKGBUILD 2014-09-17 21:07:02 UTC (rev 221874) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=libsoup -pkgver=2.47.4 +pkgver=2.47.92 pkgrel=1 pkgdesc="GNOME HTTP Library" arch=(i686 x86_64) @@ -15,16 +15,9 @@ conflicts=(libsoup-gnome) replaces=(libsoup-gnome) options=('!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz - cache-control-dontcrash.patch) -sha256sums=('2e8c1ea1e47c0c1b17d5fa7eba0ba663e0999f75a9e5fdc2607c2bcd418d4086' - 'bba8516f72a295daabda013ed98db44d280732eb77deea312bbaa2486682aa40') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('0680a9f90296b246d3cb3232be095f916caa25b84ea13d4eba6246de2d428348') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../cache-control-dontcrash.patch -} - build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ Deleted: cache-control-dontcrash.patch =================================================================== --- cache-control-dontcrash.patch 2014-09-17 21:06:52 UTC (rev 221873) +++ cache-control-dontcrash.patch 2014-09-17 21:07:02 UTC (rev 221874) @@ -1,27 +0,0 @@ -From 3520c010c74dd7cc3d11e0ab5d8f07df70a4bfc9 Mon Sep 17 00:00:00 2001 -From: Raveendra Karu <[email protected]> -Date: Wed, 23 Jul 2014 09:04:43 +0530 -Subject: soup-cache: don't crash on invalid Cache-Control header - -If a response had a Cache-Control header with a "max-age" attribute -with no value (which is invalid), SoupCache would end up dereferencing -a NULL pointer. - -https://bugzilla.gnome.org/show_bug.cgi?id=733587 - -diff --git a/libsoup/soup-cache.c b/libsoup/soup-cache.c -index c17e537..533a175 100644 ---- a/libsoup/soup-cache.c -+++ b/libsoup/soup-cache.c -@@ -1155,7 +1155,7 @@ soup_cache_has_response (SoupCache *cache, SoupMessage *msg) - return SOUP_CACHE_RESPONSE_STALE; - } - -- if (g_hash_table_lookup_extended (hash, "max-age", NULL, &value)) { -+ if (g_hash_table_lookup_extended (hash, "max-age", NULL, &value) && value) { - max_age = (int)MIN (g_ascii_strtoll (value, NULL, 10), G_MAXINT32); - /* Forcing cache revalidaton - */ --- -cgit v0.10.1 -
