[oe-commits] org.oe.dev links-x11_2.1pre21.bb, links_2.1pre12.bb : patches for cookie saving and
xora commit
openembedded-commits at lists.openembedded.org
Sun Aug 27 17:24:14 UTC 2006
links-x11_2.1pre21.bb, links_2.1pre12.bb : patches for cookie saving and
preventing segfault on cookies imported from MDK rpms.
packages/links/* : drop old versions
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 31791b517fd0fdc4e50c48d20a836408a23727d3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=31791b517fd0fdc4e50c48d20a836408a23727d3
Files:
1
packages/links/links-2.1pre12
packages/links/links-2.1pre12/configure.patch
packages/links/links-2.1pre14
packages/links/links-2.1pre14/configure.patch
packages/links/links-x11_2.1pre21.bb
packages/links/links_2.1pre12.bb
packages/links/links_2.1pre14.bb
packages/links/links_2.1pre21.bb
packages/links/files/cookies-save-0.96.patch
packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
packages/links/links-x11_2.1pre22.bb
packages/links/links_2.1pre22.bb
Diffs:
#
# mt diff -r1010cdd56d6aa7beaa724d0136ed285942b3d461 -r31791b517fd0fdc4e50c48d20a836408a23727d3
#
#
#
# delete "packages/links/links-2.1pre12"
#
# delete "packages/links/links-2.1pre12/configure.patch"
#
# delete "packages/links/links-2.1pre14"
#
# delete "packages/links/links-2.1pre14/configure.patch"
#
# delete "packages/links/links-x11_2.1pre21.bb"
#
# delete "packages/links/links_2.1pre12.bb"
#
# delete "packages/links/links_2.1pre14.bb"
#
# delete "packages/links/links_2.1pre21.bb"
#
# add_file "packages/links/files/cookies-save-0.96.patch"
# content [b29c939c8e7752c001f921c897516c75ea28f873]
#
# add_file "packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch"
# content [fa597ff24630e2e933b7bacb6bd24489e9b40cc1]
#
# patch "packages/links/links-x11_2.1pre22.bb"
# from [3555afb32bff50801e9d6e66893d0e0fbe2c0423]
# to [4d0d336db3fe8d31dc0686aa9fdbd668443197a9]
#
# patch "packages/links/links_2.1pre22.bb"
# from [7bdd39fd3d9cfb332041e9be197bdf1deb0435dc]
# to [f38b8cc0e493bf70b73c6fb56409a5e6d1949782]
#
============================================================
--- packages/links/files/cookies-save-0.96.patch b29c939c8e7752c001f921c897516c75ea28f873
+++ packages/links/files/cookies-save-0.96.patch b29c939c8e7752c001f921c897516c75ea28f873
@@ -0,0 +1,106 @@
+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);
+ }
+
============================================================
--- packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch fa597ff24630e2e933b7bacb6bd24489e9b40cc1
+++ packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch fa597ff24630e2e933b7bacb6bd24489e9b40cc1
@@ -0,0 +1,20 @@
+--- 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);
+ }
============================================================
--- packages/links/links-x11_2.1pre22.bb 3555afb32bff50801e9d6e66893d0e0fbe2c0423
+++ packages/links/links-x11_2.1pre22.bb 4d0d336db3fe8d31dc0686aa9fdbd668443197a9
@@ -8,8 +8,12 @@ SRC_URI = "http://links.twibright.com/do
MAINTAINER = "Graeme Gregory <dp at xora.org.uk>"
SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
- file://ac-prog-cxx.patch;patch=1"
+ file://ac-prog-cxx.patch;patch=1 \
+ file://cookies-save-0.96.patch;patch=1 \
+ file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
+PR = "r1"
+
inherit autotools
EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
============================================================
--- packages/links/links_2.1pre22.bb 7bdd39fd3d9cfb332041e9be197bdf1deb0435dc
+++ packages/links/links_2.1pre22.bb f38b8cc0e493bf70b73c6fb56409a5e6d1949782
@@ -8,8 +8,12 @@ SRC_URI = "http://links.twibright.com/do
MAINTAINER = "Graeme Gregory <dp at xora.org.uk>"
SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
- file://ac-prog-cxx.patch;patch=1"
+ file://ac-prog-cxx.patch;patch=1 \
+ file://cookies-save-0.96.patch;patch=1 \
+ file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
+PR = "r1"
+
inherit autotools
EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
More information about the Openembedded-commits
mailing list