Update to midori 0.2.4, remove a patch merged upstream.

(As a sidenode, this version fixes the timeouts i was seeing with google maps)
This commit is contained in:
landry 2010-03-23 20:56:55 +00:00
parent 2f99271888
commit d2d4276477
4 changed files with 8 additions and 37 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2010/01/19 14:25:08 landry Exp $
# $OpenBSD: Makefile,v 1.19 2010/03/23 20:56:55 landry Exp $
COMMENT = lightweight web browser
XFCE_VERSION = 0.2.2
XFCE_VERSION = 0.2.4
XFCE_GOODIE = midori
PKGNAME = ${DISTNAME}p1
MAINTAINER = Landry Breuil <gaston@gcu.info>
CATEGORIES = www

View File

@ -1,5 +1,5 @@
MD5 (midori-0.2.2.tar.bz2) = FPgaehD4Chc9obXohxNACw==
RMD160 (midori-0.2.2.tar.bz2) = N8hCNdks1FjfoeBYNL9TF5c4Tko=
SHA1 (midori-0.2.2.tar.bz2) = BTcY7wyQfV+5BdPNcbBTRgqbGSc=
SHA256 (midori-0.2.2.tar.bz2) = vsOHRZR7eagDUjdJN87Lgf0h0ww18RsRKQ+r2tHkywc=
SIZE (midori-0.2.2.tar.bz2) = 613546
MD5 (midori-0.2.4.tar.bz2) = zNKuFimTwsksng6sd3jGLQ==
RMD160 (midori-0.2.4.tar.bz2) = gpG2ayPICxiBwGofABeJFVpfv3Y=
SHA1 (midori-0.2.4.tar.bz2) = QbEf9KZSVvw/3K+4FR9gGV1/iEU=
SHA256 (midori-0.2.4.tar.bz2) = AqKxPiylG62ugosKMxr5LwmuPWqasKVuZHVE22T3eQ8=
SIZE (midori-0.2.4.tar.bz2) = 645554

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-katze_katze-utils_c,v 1.1 2010/01/19 14:25:08 landry Exp $
Fix use-after-free and memory leak for icon_uri
--- katze/katze-utils.c.orig Tue Dec 15 13:34:29 2009
+++ katze/katze-utils.c Sat Jan 16 22:57:24 2010
@@ -1452,17 +1452,18 @@ katze_load_cached_icon (const gchar* uri,
i++;
if (uri[i] == '/')
{
- icon_uri = g_strdup (uri);
- icon_uri[i] = '\0';
- icon_uri = g_strdup_printf ("%s/favicon.ico", icon_uri);
+ gchar *ticon_uri = g_strdup (uri);
+ ticon_uri[i] = '\0';
+ icon_uri = g_strdup_printf ("%s/favicon.ico", ticon_uri);
+ g_free(ticon_uri);
}
else
icon_uri = g_strdup_printf ("%s/favicon.ico", uri);
checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, icon_uri, -1);
ext = g_strrstr (icon_uri, ".");
- g_free (icon_uri);
filename = g_strdup_printf ("%s%s", checksum, ext ? ext : "");
+ g_free (icon_uri);
g_free (checksum);
path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME,
"icons", filename, NULL);

View File

@ -1,10 +1,9 @@
@comment $OpenBSD: PLIST,v 1.13 2009/12/22 13:02:12 sthen Exp $
@comment $OpenBSD: PLIST,v 1.14 2010/03/23 20:56:55 landry Exp $
@bin bin/midori
lib/midori/
lib/midori/libadblock.so
lib/midori/libcolorful-tabs.so
lib/midori/libcookie-manager.so
lib/midori/libdnsprefetch.so
lib/midori/libfeed-panel.so
lib/midori/libformhistory.so
lib/midori/libmouse-gestures.so