From 4513b797edd3c88ef1177d3f9c00956c9ea51426 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 4 Sep 2002 20:47:45 +0000 Subject: Fix annoying bug in command line parsing (+ was handled incorrectly). Patch will be sent to maintainers in a minute. Bump PKGREVISION. Also, use common distinfo file and patch dir for links and links-gui. --- www/links-gui/Makefile | 3 ++- www/links-gui/distinfo | 4 ---- www/links/Makefile | 3 ++- www/links/Makefile.common | 4 +++- www/links/distinfo | 3 ++- www/links/patches/patch-aa | 22 ++++++++++++++++++++++ 6 files changed, 31 insertions(+), 8 deletions(-) delete mode 100644 www/links-gui/distinfo create mode 100644 www/links/patches/patch-aa diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile index 1635e37d34e..4597c24ce1d 100644 --- a/www/links-gui/Makefile +++ b/www/links-gui/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2002/08/26 06:15:25 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/04 20:47:46 wiz Exp $ # PKGNAME= links-gui-2.1.0.2 +PKGREVISION= 1 COMMENT= Lynx-like text and graphics WWW browser CONFLICTS+= links-[0-9]* elinks-[0-9]* diff --git a/www/links-gui/distinfo b/www/links-gui/distinfo deleted file mode 100644 index 3add7a0c8b9..00000000000 --- a/www/links-gui/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.3 2002/08/25 21:52:14 jlam Exp $ - -SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 -Size (links-2.1pre2.tar.bz2) = 3509541 bytes diff --git a/www/links/Makefile b/www/links/Makefile index ffe1bed752f..db11d420ea5 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2002/08/25 21:52:13 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2002/09/04 20:47:45 wiz Exp $ # PKGNAME= links-2.1.0.2 +PKGREVISION= 1 COMMENT= Lynx-like text WWW browser CONFLICTS+= links-gui-[0-9]* elinks-[0-9]* diff --git a/www/links/Makefile.common b/www/links/Makefile.common index 63e80aa5ad8..80e597aeb0f 100644 --- a/www/links/Makefile.common +++ b/www/links/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2002/08/25 21:52:13 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2002/09/04 20:47:45 wiz Exp $ # DISTNAME= links-2.1pre2 @@ -16,5 +16,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-javascript PLIST_SRC= ${.CURDIR}/../../www/links/PLIST +PATCHDIR= ${.CURDIR}/../../www/links/patches +DISTINFO_FILE= ${.CURDIR}/../../www/links/distinfo .include "../../security/openssl/buildlink2.mk" diff --git a/www/links/distinfo b/www/links/distinfo index 9d57f1c4a52..8062c61903d 100644 --- a/www/links/distinfo +++ b/www/links/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.7 2002/08/25 21:52:13 jlam Exp $ +$NetBSD: distinfo,v 1.8 2002/09/04 20:47:45 wiz Exp $ SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 Size (links-2.1pre2.tar.bz2) = 3509541 bytes +SHA1 (patch-aa) = 47fab20748fc660517ebc2d2ef8a6b9c7c0dd1e4 diff --git a/www/links/patches/patch-aa b/www/links/patches/patch-aa new file mode 100644 index 00000000000..c299028fa10 --- /dev/null +++ b/www/links/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1 2002/09/04 20:47:45 wiz Exp $ + +--- session.c.orig Sat Jun 29 21:27:04 2002 ++++ session.c +@@ -185,7 +185,7 @@ unsigned char *encode_url(unsigned char + int l = 0; + for (; *url; url++) { + if (is_safe_in_shell(*url) && *url != '+') add_chr_to_str(&u, &l, *url); +- else add_chr_to_str(&u, &l, '+'), add_chr_to_str(&u, &l, hx(*url >> 4)), add_chr_to_str(&u, &l, hx(*url & 0xf)); ++ else add_chr_to_str(&u, &l, '%'), add_chr_to_str(&u, &l, hx(*url >> 4)), add_chr_to_str(&u, &l, hx(*url & 0xf)); + } + return u; + } +@@ -195,7 +195,7 @@ unsigned char *decode_url(unsigned char + unsigned char *u = init_str(); + int l = 0; + for (; *url; url++) { +- if (*url != '+' || unhx(url[1]) == -1 || unhx(url[2]) == -1) add_chr_to_str(&u, &l, *url); ++ if (*url != '%' || unhx(url[1]) == -1 || unhx(url[2]) == -1) add_chr_to_str(&u, &l, *url); + else add_chr_to_str(&u, &l, (unhx(url[1]) << 4) + unhx(url[2])), url += 2; + } + return u; -- cgit v1.2.3