From 42932524a20556ddbb6ef34552f1f732309be215 Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Sat, 10 Mar 2007 17:04:08 +0000 Subject: - fix unescape bug for default Submitted by: Andrey Chernov --- www/webalizer/Makefile | 2 +- www/webalizer/files/patch-unescape | 11 +++++++++++ www/webalizer/files/webalizer-a-urasim_2.patch | 9 --------- 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 www/webalizer/files/patch-unescape (limited to 'www/webalizer') diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index 769b5ae7ff6a..f48d13307ddc 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -7,7 +7,7 @@ PORTNAME= webalizer PORTVERSION= 2.1.10 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES+= www MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \ ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \ diff --git a/www/webalizer/files/patch-unescape b/www/webalizer/files/patch-unescape new file mode 100644 index 000000000000..f14c9b37871f --- /dev/null +++ b/www/webalizer/files/patch-unescape @@ -0,0 +1,11 @@ +--- webalizer.c.a-urasim Wed Apr 17 07:11:31 2002 ++++ webalizer.c Tue Dec 23 23:26:23 2003 +@@ -1783,7 +1809,7 @@ + if (*cp1) *cp2=from_hex(*cp1++)*16; /* convert hex to an ascii */ + if (*cp1) *cp2+=from_hex(*cp1); /* (hopefully) character */ + if ((*cp2<32)||(*cp2==127)) *cp2='_'; /* make '_' if its bad */ +- if (*cp1) cp2++; cp1++; ++ if (*cp1){ cp2++; cp1++;} /* bug? */ + } + else *cp2++='%'; + } diff --git a/www/webalizer/files/webalizer-a-urasim_2.patch b/www/webalizer/files/webalizer-a-urasim_2.patch index 9195ab73c0b9..42d49acc14d0 100644 --- a/www/webalizer/files/webalizer-a-urasim_2.patch +++ b/www/webalizer/files/webalizer-a-urasim_2.patch @@ -61,15 +61,6 @@ while (*cp1) { if (*cp1=='%') /* Found an escape? */ -@@ -1783,7 +1809,7 @@ - if (*cp1) *cp2=from_hex(*cp1++)*16; /* convert hex to an ascii */ - if (*cp1) *cp2+=from_hex(*cp1); /* (hopefully) character */ - if ((*cp2<32)||(*cp2==127)) *cp2='_'; /* make '_' if its bad */ -- if (*cp1) cp2++; cp1++; -+ if (*cp1){ cp2++; cp1++;} /* bug? */ - } - else *cp2++='%'; - } @@ -1793,6 +1819,116 @@ return str; /* return the string */ } -- cgit v1.2.3