diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-22 18:08:20 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-23 09:32:57 +0100 |
commit | 6097b49f1fe7183f7b34fa2e4c5a8fbfd805ed26 (patch) | |
tree | e87d88043acb8222d180e5503ab94fe95cbb690d /meta-oe/recipes-support/links/files | |
parent | f7b703f4af4bbadb48e26ea93e54a91f00cb1a57 (diff) | |
download | meta-openembedded-6097b49f1fe7183f7b34fa2e4c5a8fbfd805ed26.tar.gz |
links: upgrade to 2.7 to fix build with libpng-1.5
* cookies api changed between 2.1pre30 and 2.7
* LIC_FILES_CHKSUM changed because of formal change
296c296
< This program is free software; you can redistribute it and/or modify
---
> on, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USAThis program is free software; you can redistribute it and/or
> modify
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/links/files')
-rw-r--r-- | meta-oe/recipes-support/links/files/cookies-save-0.96.patch | 106 | ||||
-rw-r--r-- | meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch | 20 |
2 files changed, 0 insertions, 126 deletions
diff --git a/meta-oe/recipes-support/links/files/cookies-save-0.96.patch b/meta-oe/recipes-support/links/files/cookies-save-0.96.patch deleted file mode 100644 index a1e35c01ca..0000000000 --- a/meta-oe/recipes-support/links/files/cookies-save-0.96.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -ru links-0.96/cookies.c links-0.96+cookies-save/cookies.c ---- links-0.96/cookies.c Mon Sep 3 07:19:37 2001 -+++ links-0.96+cookies-save/cookies.c Mon Sep 3 07:18:42 2001 -@@ -276,15 +276,99 @@ - - void init_cookies(void) - { -- /* !!! FIXME: read cookies */ -+ unsigned char in_buffer[MAX_STR_LEN]; -+ unsigned char *cookfile, *p, *q; -+ FILE *fp; -+ -+ /* must be called after init_home */ -+ if (! links_home) return; -+ -+ cookfile = stracpy(links_home); -+ if (! cookfile) return; -+ add_to_strn(&cookfile, "cookies"); -+ -+ fp = fopen(cookfile, "r"); -+ mem_free(cookfile); -+ if (fp == NULL) return; -+ -+ while (fgets(in_buffer, MAX_STR_LEN, fp)) { -+ struct cookie *cookie; -+ -+ if (!(cookie = mem_alloc(sizeof(struct cookie)))) return; -+ memset(cookie, 0, sizeof(struct cookie)); -+ -+ q = in_buffer; p = strchr(in_buffer, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->name = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->value = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->server = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->path = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->domain = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->expires = atoi(q); -+ -+ cookie->secure = atoi(p); -+ -+ cookie->id = cookie_id++; -+ -+ accept_cookie(cookie); -+ -+ continue; -+ -+inv: -+ free_cookie(cookie); -+ free(cookie); -+ } -+ fclose(fp); - } - - void cleanup_cookies(void) - { - struct cookie *c; -+ unsigned char *cookfile; -+ FILE *fp; -+ - free_list(c_domains); -- /* !!! FIXME: save cookies */ -- foreach (c, cookies) free_cookie(c); -+ -+ cookfile = stracpy(links_home); -+ if (! cookfile) return; -+ add_to_strn(&cookfile, "cookies"); -+ -+ fp = fopen(cookfile, "w"); -+ mem_free(cookfile); -+ if (fp == NULL) return; -+ -+ foreach (c, cookies) { -+ if (c->expires && ! cookie_expired(c)) -+ fprintf(fp, "%s %s %s %s %s %d %d\n", c->name, c->value, -+ c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"", -+ c->domain?c->domain:(unsigned char *)"", c->expires, c->secure); -+ -+ free_cookie(c); -+ } -+ -+ fclose(fp); -+ - free_list(cookies); - } - diff --git a/meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch b/meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch deleted file mode 100644 index 0d3b407e2a..0000000000 --- a/meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- links-2.1pre17/cookies.c.pix 2005-05-15 23:05:10.000000000 +0800 -+++ links-2.1pre17/cookies.c 2005-05-15 23:17:21.000000000 +0800 -@@ -41,7 +41,7 @@ - - void free_cookie(struct cookie *c) - { -- mem_free(c->name); -+ if (c->value) mem_free(c->name); - if (c->value) mem_free(c->value); - if (c->server) mem_free(c->server); - if (c->path) mem_free(c->path); -@@ -355,7 +355,7 @@ - - inv: - free_cookie(cookie); -- free(cookie); -+ mem_free(cookie); - } - fclose(fp); - } |