From fa3de30eb1376f861cceaa9bba663f97564a5c40 Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 30 Jan 2013 23:37:32 +0000 Subject: [PATCH] major update to Railo 4.0.2.002 - more info at http://www.getrailo.org/index.cfm/whats-up/railo-40-released/ --- lang/railo/Makefile | 9 ++- lang/railo/distinfo | 7 +- lang/railo/patches/patch-WEB-INF_web_xml | 94 +++++++++++++----------- lang/railo/pkg/PLIST | 57 +++++++++----- 4 files changed, 97 insertions(+), 70 deletions(-) diff --git a/lang/railo/Makefile b/lang/railo/Makefile index 3d02c22ae1e..166d08f2324 100644 --- a/lang/railo/Makefile +++ b/lang/railo/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2012/06/30 20:47:53 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2013/01/30 23:37:32 sthen Exp $ COMMENT= open-source CFML engine -V= 3.3.4.003 +V= 4.0.2.002 DISTNAME= railo-$V EXTRACT_SUFX= .war @@ -39,14 +39,15 @@ do-extract: # patch/edit/update-patches cycle. Also strips horizontal whitespace at eol. pre-patch: perl -pi -e 's,,PKG_,g;' \ - -e 's,\h*$$,,;' ${WRKSRC}/WEB-INF/web.xml + -e 's,\h*\r*$$,,;' ${WRKSRC}/WEB-INF/web.xml post-patch: perl -pi -e 's,/var/tomcat/,${CATALINA_BASE}/,g' ${WRKSRC}/WEB-INF/web.xml do-install: ${INSTALL_DATA_DIR} ${PREFIX}/railo ${PREFIX}/lib ${PREFIX}/conf - ${INSTALL_DATA} ${WRKSRC}/WEB-INF/lib/* ${PREFIX}/lib/ + cd ${WRKSRC}/WEB-INF/lib && pax -rw * ${PREFIX}/lib/ + chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/* ${INSTALL_DATA} ${WRKSRC}/index.cfm ${PREFIX}/railo/index.cfm.dist ${INSTALL_DATA} ${WRKSRC}/WEB-INF/web.xml ${PREFIX}/conf/web-railo.xml.dist diff --git a/lang/railo/distinfo b/lang/railo/distinfo index 14650386e79..4440c757e48 100644 --- a/lang/railo/distinfo +++ b/lang/railo/distinfo @@ -1,5 +1,2 @@ -MD5 (railo-3.3.4.003.war) = mu1rIdAFrRLjYts2AqehTQ== -RMD160 (railo-3.3.4.003.war) = uVFW6pAotMH2L7ZIXpkMzaVK9mI= -SHA1 (railo-3.3.4.003.war) = eeniyR+8tAIM/QTrn02LmsvOa28= -SHA256 (railo-3.3.4.003.war) = 4uLYlbR9lg2jmLHER+yYjG15foEe4MGckvsSZojlBkQ= -SIZE (railo-3.3.4.003.war) = 46373828 +SHA256 (railo-4.0.2.002.war) = rA2tqZuo1AerCH6msYQZMdV+yBvgifZfAhP2FZdfGHs= +SIZE (railo-4.0.2.002.war) = 59166761 diff --git a/lang/railo/patches/patch-WEB-INF_web_xml b/lang/railo/patches/patch-WEB-INF_web_xml index 191fbbe58b6..7aea2eb70e4 100644 --- a/lang/railo/patches/patch-WEB-INF_web_xml +++ b/lang/railo/patches/patch-WEB-INF_web_xml @@ -1,4 +1,4 @@ -$OpenBSD: patch-WEB-INF_web_xml,v 1.1.1.1 2012/04/17 13:12:28 sthen Exp $ +$OpenBSD: patch-WEB-INF_web_xml,v 1.2 2013/01/30 23:37:32 sthen Exp $ - Strip anything outside of tag so this file can be used directly as an include in the main tomcat web.xml section. @@ -14,46 +14,58 @@ a single host. http://jamiekrug.com/blog/index.cfm/2009/4/1/railo-jars-on-jboss-or-tomcat-tips-and-tricks ---- WEB-INF/web.xml.orig Mon Apr 9 14:27:42 2012 -+++ WEB-INF/web.xml Mon Apr 9 14:27:42 2012 -@@ -1,8 +1,3 @@ +--- WEB-INF/web.xml.orig Wed Jan 30 12:20:25 2013 ++++ WEB-INF/web.xml Wed Jan 30 12:20:29 2013 +@@ -1,8 +1,2 @@ - -- -- - Railo - - PKG_CFMLServlet -@@ -10,14 +5,14 @@ - railo.loader.servlet.CFMLServlet - - configuration -- /WEB-INF/railo/ -+ /var/tomcat/railo/web-config/{web-context-hash}/ - Configuraton directory - -- -+ - 1 - - -@@ -96,12 +91,3 @@ - / - - --> -- -- index.cfm -- index.cfml -- index.html -- index.htm -- index.jsp -- +- + + +@@ -24,26 +18,22 @@ + + + +- + + + + + + +- + 1 + + +@@ -120,13 +110,3 @@ + + + +- +- +- index.cfm +- index.cfml +- index.html +- index.htm +- index.jsp +- - - +\ No newline at end of file diff --git a/lang/railo/pkg/PLIST b/lang/railo/pkg/PLIST index ac88c9c5a7b..48c0abae77b 100644 --- a/lang/railo/pkg/PLIST +++ b/lang/railo/pkg/PLIST @@ -1,16 +1,23 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2012/04/17 13:12:28 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.2 2013/01/30 23:37:32 sthen Exp $ @extraunexec rm -rf %D/railo/server-config/* %D/railo/web-config/* @extraunexec rm -rf %D/webapps/ROOT/WEB-INF/flex +conf/ conf/web-railo.xml.dist @owner _tomcat @group _tomcat @sample conf/web-railo.xml -@group @owner +@group lib/ +lib/ESAPI.jar +lib/License.txt lib/PDFBox.jar lib/PDFRenderer.jar lib/antlr.jar +lib/apache-commons-httpclient.jar +lib/apache-commons-httpcore.jar +lib/apache-commons-httpmime.jar +lib/apache-commons-sanselan.jar lib/apache-jakarta-commons-codec.jar lib/apache-jakarta-commons-collections.jar lib/apache-jakarta-commons-compress.jar @@ -34,7 +41,10 @@ lib/apache-lucene-similarity.jar lib/apache-lucene-snowball.jar lib/apache-lucene-spellchecker.jar lib/apache-lucene.jar +lib/apache-poi-ooxml-schemas.jar +lib/apache-poi-ooxml.jar lib/apache-poi-tm-extractors.jar +lib/apache-poi.jar lib/apache-ws-axis-ant.jar lib/apache-ws-axis.jar lib/apache-xml-xalan.jar @@ -59,6 +69,7 @@ lib/icepdf-core.jar lib/jacob.jar lib/javaparser.jar lib/javassist.jar +lib/javasysmon.jar lib/jcommon.jar lib/jencrypt.jar lib/jffmpeg.jar @@ -70,38 +81,42 @@ lib/jpedal_gpl.jar lib/jta.jar lib/jtds.jar lib/jug.jar -lib/license-apache.txt -lib/license-eclipse.txt -lib/license-hypersonic.txt -lib/license-jacob.txt -lib/license-janino.txt -lib/license-jencrypt.txt -lib/license-jmimemagic.txt -lib/license-joda.txt -lib/license-jtds.txt -lib/license-mssql.txt -lib/license-mysql.txt -lib/license-openamf.txt -lib/license-pd4ml.txt -lib/license-pdfbox.txt -lib/license-sun.txt -lib/license-tagsoup.txt +lib/junit.jar +lib/license/ +lib/license/license-apache.txt +lib/license/license-eclipse.txt +lib/license/license-hypersonic.txt +lib/license/license-jacob.txt +lib/license/license-janino.txt +lib/license/license-javasysmon.txt +lib/license/license-jencrypt.txt +lib/license/license-jmimemagic.txt +lib/license/license-joda.txt +lib/license/license-jtds.txt +lib/license/license-mssql.txt +lib/license/license-mysql.txt +lib/license/license-openamf.txt +lib/license/license-pd4ml.txt +lib/license/license-pdfbox.txt +lib/license/license-sun.txt +lib/license/license-tagsoup.txt lib/lowagie.itext.jar lib/metadata-extractor.jar -lib/microsoft-msbase.jar lib/microsoft-mssqlserver.jar -lib/microsoft-msutil.jar lib/microsoft-sqljdbc.jar lib/mysql-connector-java-bin.jar lib/objectweb-asm-all.jar +lib/ojdbc14.jar lib/openamf-astranslator.jar lib/openamf.jar lib/postgresql.jar lib/railo-sl4j.jar lib/railo.jar +lib/resolver.jar lib/serializer.jar lib/slf4j-api.jar lib/ss_css2.jar +lib/stax-api.jar lib/sun-activation.jar lib/sun-jai_codec.jar lib/sun-jai_core.jar @@ -117,8 +132,10 @@ lib/sun-xml.saaj.jar lib/tagsoup.jar lib/versions lib/w3c-dom.jar +lib/web.xml.sample lib/xdb.jar lib/xml-apis.jar +lib/xmlbeans.jar lib/xmlparserv2.jar @owner _tomcat @group _tomcat