From afa1721c763c8fc0fb3bd8e34a86ad6ca680d560 Mon Sep 17 00:00:00 2001 From: lawrance Date: Mon, 11 Sep 2006 12:56:36 +0000 Subject: Patch for a minor cross site scripting vulnerability, and bump PORTREVISION. PR: ports/96468 Submitted by: Yann Golanski Security: VuXML: 26a08c77-32da-4dd7-a884-a76fc49aa824 --- www/jakarta-tomcat5/Makefile | 6 +- ...atch-vuxml-26a08c77-32da-4dd7-a884-a76fc49aa824 | 93 ++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 www/jakarta-tomcat5/files/patch-vuxml-26a08c77-32da-4dd7-a884-a76fc49aa824 (limited to 'www/jakarta-tomcat5') diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile index 383d9e3b6f5b..a42482379007 100644 --- a/www/jakarta-tomcat5/Makefile +++ b/www/jakarta-tomcat5/Makefile @@ -7,7 +7,7 @@ PORTNAME= jakarta-tomcat PORTVERSION= 5.0.30 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin @@ -62,6 +62,10 @@ SUB_LIST= AJP_1_3_PORT=${AJP_1_3_PORT} \ TOMCAT_VERSION=${MAJOR_VER:S/.//} \ USER=${TOMCAT_USER} +USE_DOS2UNIX= webapps/jsp-examples/jsp2/jspx/textRotate.jspx \ + webapps/jsp-examples/jsp2/el/functions.jsp \ + webapps/jsp-examples/jsp2/el/implicit-objects.jsp + .include pre-patch: diff --git a/www/jakarta-tomcat5/files/patch-vuxml-26a08c77-32da-4dd7-a884-a76fc49aa824 b/www/jakarta-tomcat5/files/patch-vuxml-26a08c77-32da-4dd7-a884-a76fc49aa824 new file mode 100644 index 000000000000..a4a2f94a1a0a --- /dev/null +++ b/www/jakarta-tomcat5/files/patch-vuxml-26a08c77-32da-4dd7-a884-a76fc49aa824 @@ -0,0 +1,93 @@ +--- webapps/jsp-examples/jsp2/jspx/textRotate.jspx.orig Mon Sep 11 21:55:26 2006 ++++ webapps/jsp-examples/jsp2/jspx/textRotate.jspx Mon Sep 11 21:53:47 2006 +@@ -6,11 +6,12 @@ + + + JSP 2.0 JSPX + +- ++ + + + JSP 2.0 XML Syntax (.jspx) Demo +--- webapps/jsp-examples/jsp2/el/functions.jsp.orig Mon Sep 11 21:55:56 2006 ++++ webapps/jsp-examples/jsp2/el/functions.jsp Mon Sep 11 21:51:56 2006 +@@ -13,6 +13,7 @@ + See the License for the specific language governing permissions and + limitations under the License. + --> ++<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> + <%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%> + + +@@ -30,7 +31,7 @@ +
+ Change Parameter +
+- foo = ++ foo = + +
+
+@@ -42,19 +43,19 @@ + + + \${param["foo"]} +- ${param["foo"]}  ++ ${fn:escapeXml(param["foo"])}  + + + \${my:reverse(param["foo"])} +- ${my:reverse(param["foo"])}  ++ ${my:reverse(fn:escapeXml(param["foo"]))}  + + + \${my:reverse(my:reverse(param["foo"]))} +- ${my:reverse(my:reverse(param["foo"]))}  ++ ${my:reverse(my:reverse(fn:escapeXml(param["foo"])))}  + + + \${my:countVowels(param["foo"])} +- ${my:countVowels(param["foo"])}  ++ ${my:countVowels(fn:escapeXml(param["foo"]))}  + + + +--- webapps/jsp-examples/jsp2/el/implicit-objects.jsp.orig Mon Sep 11 21:55:56 2006 ++++ webapps/jsp-examples/jsp2/el/implicit-objects.jsp Mon Sep 11 21:52:32 2006 +@@ -13,6 +13,8 @@ + See the License for the specific language governing permissions and + limitations under the License. + --> ++<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> ++ + + + JSP 2.0 Expression Language - Implicit Objects +@@ -49,7 +51,7 @@ +
+ Change Parameter +
+- foo = ++ foo = + +
+
+@@ -61,11 +63,11 @@ + + + \${param.foo} +- ${param.foo}  ++ ${fn:escapeXml(param["foo"])}  + + + \${param["foo"]} +- ${param["foo"]}  ++ ${fn:escapeXml(param["foo"])}  + + + \${header["host"]} -- cgit 'active' href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/log/math/entropy/Makefile'>logtreecommitdiffstats
path: root/math/entropy/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Use PLIST_FILES (bento-tested, marcus-reviewed).trevor2004-02-061-0/+1
* Maintainer update of math/entropy to 1.1seanc2003-08-271-1/+1
* De-pkg-comment.knu2003-02-211-0/+1
* MASTER_SITES changed.obraun2002-08-221-1/+1
* Add entropy 1.0, calculate data entropy to benchmark compressionpetef2002-08-11