diff options
author | spz <spz@pkgsrc.org> | 2008-09-01 06:08:43 +0000 |
---|---|---|
committer | spz <spz@pkgsrc.org> | 2008-09-01 06:08:43 +0000 |
commit | 92c1840e67048d3f7459ab75c6d68b56da469bb0 (patch) | |
tree | 64f52ceb596de57eabf20720d2bfd6da44fa036b | |
parent | b777544697ce93fa77c6aba439ee1b7f1e50414a (diff) | |
download | pkgsrc-92c1840e67048d3f7459ab75c6d68b56da469bb0.tar.gz |
Pullup ticket 2502 - requested by is
fix PR 34723
Revisions pulled up:
- pkgsrc/www/links/Makefile by patch provided
- pkgsrc/www/links/distinfo by patch provided
- pkgsrc/www/links-gui/Makefile by patch provided
- pkgsrc/www/links/patches/patch-aa by patch provided
Module Name: pkgsrc
Committed By: is
Date: Wed Aug 20 09:26:45 UTC 2008
Modified Files:
pkgsrc/www/links: Makefile distinfo
pkgsrc/www/links-gui: Makefile
pkgsrc/www/links/patches: patch-aa
Log Message:
Patch no longer needed, besides failing for some boundary conditions.
Feature request/code had been submitted upstream "back then", and
apparently a different solution has been implemented upstream in the
meantime, but our package was upgraded without removing our patch.
To generate a diff of this commit:
cvs rdiff -r1.54 -r1.55 pkgsrc/www/links/Makefile
cvs rdiff -r1.49 -r1.50 pkgsrc/www/links/distinfo
cvs rdiff -r1.56 -r1.57 pkgsrc/www/links-gui/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/www/links/patches/patch-aa
-rw-r--r-- | www/links-gui/Makefile | 3 | ||||
-rw-r--r-- | www/links/Makefile | 3 | ||||
-rw-r--r-- | www/links/distinfo | 4 | ||||
-rw-r--r-- | www/links/patches/patch-aa | 16 |
4 files changed, 7 insertions, 19 deletions
diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile index f937b6e8a19..6dd20cae351 100644 --- a/www/links-gui/Makefile +++ b/www/links-gui/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.55 2008/05/21 14:00:40 wiz Exp $ +# $NetBSD: Makefile,v 1.55.4.1 2008/09/01 06:08:43 spz Exp $ # PKGNAME= links-gui-2.1.0.36 +PKGREVISION= 1 COMMENT= Lynx-like text and graphics WWW browser CONFLICTS+= links-[0-9]* elinks-0.3* diff --git a/www/links/Makefile b/www/links/Makefile index e99dfa7b0f6..fe6bb5e940f 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.53 2008/05/21 14:00:40 wiz Exp $ +# $NetBSD: Makefile,v 1.53.4.1 2008/09/01 06:08:43 spz Exp $ # PKGNAME= links-2.1.0.36 +PKGREVISION= 1 COMMENT= Lynx-like text WWW browser CONFLICTS+= links-gui-[0-9]* elinks-0.3* diff --git a/www/links/distinfo b/www/links/distinfo index ac47379b4c3..ae6469287e3 100644 --- a/www/links/distinfo +++ b/www/links/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.47 2008/05/21 14:00:40 wiz Exp $ +$NetBSD: distinfo,v 1.47.4.1 2008/09/01 06:08:43 spz Exp $ SHA1 (links-2.1pre36.tar.bz2) = 79ff4ff2d663de99ba590e11f42a52435a6e1809 RMD160 (links-2.1pre36.tar.bz2) = e34d61aa6db196d897afd4f07c1eb6f3a87dd4eb Size (links-2.1pre36.tar.bz2) = 3824394 bytes -SHA1 (patch-aa) = 374bd3262b4f50712cd42898d67e90ebcba72577 +SHA1 (patch-aa) = 47fab20748fc660517ebc2d2ef8a6b9c7c0dd1e4 SHA1 (patch-ab) = a2d461c9d8b6300469ab6195886830fdd63be837 diff --git a/www/links/patches/patch-aa b/www/links/patches/patch-aa index 576157807f7..90c9285c37f 100644 --- a/www/links/patches/patch-aa +++ b/www/links/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2006/04/20 18:34:07 is Exp $ +$NetBSD: patch-aa,v 1.2.20.1 2008/09/01 06:08:43 spz Exp $ --- session.c.orig Sat Jun 29 21:27:04 2002 +++ session.c @@ -20,17 +20,3 @@ $NetBSD: patch-aa,v 1.2 2006/04/20 18:34:07 is Exp $ else add_chr_to_str(&u, &l, (unhx(url[1]) << 4) + unhx(url[2])), url += 2; } return u; -@@ -2047,6 +2047,13 @@ void goto_url_f(struct session *ses, voi - /* this doesn't send referer */ - void goto_url(struct session *ses, unsigned char *url) - { -+ char *p; -+ p = url + strlen(url); -+ do { -+ --p; -+ } while (isspace(*p)); -+ *++p = 0; -+ - goto_url_f(ses, NULL, url, NULL, NULL, -1, 0, 1, 0); - } - |