svn commit: r389854 - in branches/2015Q2/www/tidy-devel: . files
Thierry Thomas
thierry at FreeBSD.org
Tue Jun 16 16:52:52 UTC 2015
Author: thierry
Date: Tue Jun 16 16:52:49 2015
New Revision: 389854
URL: https://svnweb.freebsd.org/changeset/ports/389854
Log:
MFH: r388849
Backport the fix from www/tidy-html5.
PR: ports/200631
Submitted by: Walter Hop
Security: VuXML: bd1ab7a5-0e01-11e5-9976-a0f3c100ae18
Approved by: ports-secteam (implicit)
Reminded by: Fabiano Sidler
Added:
branches/2015Q2/www/tidy-devel/files/patch-src_lexer.c
- copied unchanged from r388849, head/www/tidy-devel/files/patch-src_lexer.c
Modified:
branches/2015Q2/www/tidy-devel/Makefile
branches/2015Q2/www/tidy-devel/files/patch-build_gmake_Makefile
branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_configure.in
branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am
branches/2015Q2/www/tidy-devel/files/patch-console__tidy.c
branches/2015Q2/www/tidy-devel/files/patch-include_platform.h
branches/2015Q2/www/tidy-devel/pkg-plist
Directory Properties:
branches/2015Q2/ (props changed)
Modified: branches/2015Q2/www/tidy-devel/Makefile
==============================================================================
--- branches/2015Q2/www/tidy-devel/Makefile Tue Jun 16 14:27:52 2015 (r389853)
+++ branches/2015Q2/www/tidy-devel/Makefile Tue Jun 16 16:52:49 2015 (r389854)
@@ -3,7 +3,7 @@
PORTNAME?= tidy
DISTVERSION= 090315-cvs
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_LOCAL}
#MASTER_SITES= http://tidy.sourceforge.net/src/%SUBDIR%/ \
Modified: branches/2015Q2/www/tidy-devel/files/patch-build_gmake_Makefile
==============================================================================
--- branches/2015Q2/www/tidy-devel/files/patch-build_gmake_Makefile Tue Jun 16 14:27:52 2015 (r389853)
+++ branches/2015Q2/www/tidy-devel/files/patch-build_gmake_Makefile Tue Jun 16 16:52:49 2015 (r389854)
@@ -1,6 +1,6 @@
---- build/gmake/Makefile.orig 2008-03-22 22:13:38.000000000 +0100
-+++ build/gmake/Makefile 2008-06-21 15:52:41.000000000 +0200
-@@ -58,8 +58,8 @@
+--- build/gmake/Makefile.orig 2008-03-22 21:13:38 UTC
++++ build/gmake/Makefile
+@@ -58,8 +58,8 @@ SHELL=/bin/sh
PROJECT=tidy
# Installation variables. Spaces OK, only dir create and file copy operations.
@@ -11,7 +11,7 @@
bininst = ${runinst_prefix}/bin
libinst = ${devinst_prefix}/lib
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ incinst = ${devinst_prefix}/include/$(PR
maninst = ${devinst_prefix}/man
# Internal variables. - No spaces allowed: libtool chokes on spaces in directory names.
@@ -20,7 +20,7 @@
INCDIR = ${TOPDIR}/include
APPDIR = ${TOPDIR}/console
SRCDIR = ${TOPDIR}/src
-@@ -90,8 +90,8 @@
+@@ -90,8 +90,8 @@ DOCDIR = ${TOPDIR}/htmldoc
# CFLAGS etc..
# For optimised builds, flags such as "-O2" should be added and -D_DEBUG=1
# disabled.
Modified: branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_configure.in
==============================================================================
--- branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_configure.in Tue Jun 16 14:27:52 2015 (r389853)
+++ branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_configure.in Tue Jun 16 16:52:49 2015 (r389854)
@@ -1,6 +1,6 @@
---- build/gnuauto/configure.in.orig Mon Aug 2 09:14:28 2004
-+++ build/gnuauto/configure.in Tue Aug 3 00:05:55 2004
-@@ -72,7 +72,7 @@
+--- build/gnuauto/configure.in.orig 2008-03-24 21:08:16 UTC
++++ build/gnuauto/configure.in
+@@ -72,7 +72,7 @@ AC_ARG_ENABLE(debug,[ --enable-debug
if test $debug_build = yes; then
CFLAGS="$save_cflags -g"
else
Modified: branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am
==============================================================================
--- branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am Tue Jun 16 14:27:52 2015 (r389853)
+++ branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am Tue Jun 16 16:52:49 2015 (r389854)
@@ -1,5 +1,5 @@
---- build/gnuauto/include/Makefile.am.orig Sat Jan 18 15:23:43 2003
-+++ build/gnuauto/include/Makefile.am Thu Feb 20 23:42:21 2003
+--- build/gnuauto/include/Makefile.am.orig 2006-10-06 09:25:13 UTC
++++ build/gnuauto/include/Makefile.am
@@ -53,8 +53,8 @@
# acknowledgment is not required but would be appreciated.
#
Modified: branches/2015Q2/www/tidy-devel/files/patch-console__tidy.c
==============================================================================
--- branches/2015Q2/www/tidy-devel/files/patch-console__tidy.c Tue Jun 16 14:27:52 2015 (r389853)
+++ branches/2015Q2/www/tidy-devel/files/patch-console__tidy.c Tue Jun 16 16:52:49 2015 (r389854)
@@ -1,6 +1,6 @@
---- console/tidy.c.orig Sat Mar 6 08:59:12 2004
-+++ console/tidy.c Fri Mar 12 18:16:30 2004
-@@ -505,6 +505,9 @@
+--- console/tidy.c.orig 2008-03-22 20:53:08 UTC
++++ console/tidy.c
+@@ -1031,6 +1031,9 @@ int main( int argc, char** argv )
else if ( strcasecmp(arg, "quiet") == 0 )
tidyOptSetBool( tdoc, TidyQuiet, yes );
Modified: branches/2015Q2/www/tidy-devel/files/patch-include_platform.h
==============================================================================
--- branches/2015Q2/www/tidy-devel/files/patch-include_platform.h Tue Jun 16 14:27:52 2015 (r389853)
+++ branches/2015Q2/www/tidy-devel/files/patch-include_platform.h Tue Jun 16 16:52:49 2015 (r389854)
@@ -1,6 +1,6 @@
---- include/platform.h.orig Sun Jan 21 21:36:21 2007
-+++ include/platform.h Sat Feb 3 17:39:40 2007
-@@ -33,7 +33,7 @@
+--- include/platform.h.orig 2008-03-17 12:57:01 UTC
++++ include/platform.h
+@@ -33,7 +33,7 @@ extern "C" {
It enables tidy to find config files named ~/.tidyrc if
the HTML_TIDY environment variable is not set.
*/
@@ -9,7 +9,7 @@
/*
Uncomment the following #define if your
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ extern "C" {
Contributed by Todd Lewis.
*/
Copied: branches/2015Q2/www/tidy-devel/files/patch-src_lexer.c (from r388849, head/www/tidy-devel/files/patch-src_lexer.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q2/www/tidy-devel/files/patch-src_lexer.c Tue Jun 16 16:52:49 2015 (r389854, copy of r388849, head/www/tidy-devel/files/patch-src_lexer.c)
@@ -0,0 +1,23 @@
+--- src/lexer.c.orig 2008-03-22 21:06:55 UTC
++++ src/lexer.c
+@@ -3467,16 +3467,17 @@ static tmbstr ParseValue( TidyDocImpl* d
+ /* and prompts attributes unless --literal-attributes is set to yes */
+ /* #994841 - Whitespace is removed from value attributes */
+
+- if (munge &&
++ /* Issue #217 from tidy-html5 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */
++ if ((len > 0) && munge &&
+ TY_(tmbstrcasecmp)(name, "alt") &&
+ TY_(tmbstrcasecmp)(name, "title") &&
+ TY_(tmbstrcasecmp)(name, "value") &&
+ TY_(tmbstrcasecmp)(name, "prompt"))
+ {
+- while (TY_(IsWhite)(lexer->lexbuf[start+len-1]))
++ while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0))
+ --len;
+
+- while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len)
++ while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0))
+ {
+ ++start;
+ --len;
Modified: branches/2015Q2/www/tidy-devel/pkg-plist
==============================================================================
--- branches/2015Q2/www/tidy-devel/pkg-plist Tue Jun 16 14:27:52 2015 (r389853)
+++ branches/2015Q2/www/tidy-devel/pkg-plist Tue Jun 16 16:52:49 2015 (r389854)
@@ -18,5 +18,3 @@ lib/libtidy.a
%%PORTDOCS%%%%DOCSDIR%%/release-notes.html
%%PORTDOCS%%%%DOCSDIR%%/tidy.css
%%PORTDOCS%%%%DOCSDIR%%/tidy.gif
- at dirrm include/tidy
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
More information about the svn-ports-branches
mailing list