update to lucee-5.1.0.34 (moving to the 5.1-stable branch).

This commit is contained in:
sthen 2016-11-14 17:31:39 +00:00
parent 62582667a1
commit 286cd719b9
4 changed files with 29 additions and 154 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2016/11/12 15:55:22 sthen Exp $
# $OpenBSD: Makefile,v 1.3 2016/11/14 17:31:39 sthen Exp $
COMMENT= open-source CFML engine
COMMENT= JVM-based scripting language for web apps (open-source CFML)
V= 4.5.3.020
V= 5.1.0.34
DISTNAME= lucee-$V
EXTRACT_SUFX= .war
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{$V}
CATEGORIES= lang www
@ -15,13 +16,13 @@ MAINTAINER = Stuart Henderson <sthen@openbsd.org>
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES = http://cdn.lucee.org/
MASTER_SITES = http://cdn.lucee.org/rest/update/provider/war/
# doesn't actually need tomcat to build, but listing it here avoids
# wasting time on arch where it's unavailable
BUILD_DEPENDS= archivers/unzip \
${RUN_DEPENDS}
RUN_DEPENDS= tomcat->=7,<8:www/tomcat/v7
RUN_DEPENDS= tomcat->=8,<9:www/tomcat/v8
SUBST_VARS= CATALINA_BASE
NO_BUILD= Yes
@ -32,7 +33,7 @@ CATALINA_BASE= /var/tomcat
PREFIX= ${CATALINA_BASE}
do-extract:
mkdir ${WRKSRC}; cd ${WRKSRC}; unzip ${FULLDISTDIR}/${DISTFILES}
mkdir ${WRKSRC}; cd ${WRKSRC}; unzip ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX}
# Avoid conflicting servlet names with any alternative version of Railo/Lucee
# that's installed via .WAR files. Idea from jamiekrug.com. In pre-patch to

View File

@ -1,2 +1,2 @@
SHA256 (lucee-4.5.3.020.war) = eGNnPwSi5GMFYoaleDB8oaSQjbD6Ha1qZvjPMxRNbqE=
SIZE (lucee-4.5.3.020.war) = 62766818
SHA256 (lucee-5.1.0.34.war) = SdTDz7JNMuG5716WPisqwmEpVd81Adv7VqMfnabE+q4=
SIZE (lucee-5.1.0.34.war) = 66712028

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-WEB-INF_web_xml,v 1.1.1.1 2016/09/13 16:24:37 sthen Exp $
$OpenBSD: patch-WEB-INF_web_xml,v 1.2 2016/11/14 17:31:39 sthen Exp $
- Strip anything outside of <web-app> tag so this file can be used
directly as an include in the main tomcat web.xml <web-app> section.
@ -14,8 +14,8 @@ 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 Tue Dec 8 18:06:33 2015
+++ WEB-INF/web.xml Tue Dec 8 18:09:25 2015
--- WEB-INF/web.xml.orig Sat Nov 12 16:20:47 2016
+++ WEB-INF/web.xml Sat Nov 12 16:22:58 2016
@@ -1,9 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
@ -26,10 +26,10 @@ http://jamiekrug.com/blog/index.cfm/2009/4/1/railo-jars-on-jboss-or-tomcat-tips-
@@ -19,31 +13,16 @@
<description>Lucee Engine</description>
<servlet-name>PKG_CFMLServlet</servlet-name>
<servlet-class>lucee.loader.servlet.CFMLServlet</servlet-class>
@@ -11,31 +5,16 @@
<servlet-name>PKG_LuceeServlet</servlet-name>
<servlet-class>lucee.loader.servlet.LuceeServlet</servlet-class>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- to specify the location of the Lucee Server config and libraries, -->
- <!-- uncomment the init-param below. make sure that the param-value -->
@ -58,19 +58,20 @@ http://jamiekrug.com/blog/index.cfm/2009/4/1/railo-jars-on-jboss-or-tomcat-tips-
</init-param>
- !-->
<load-on-startup>1</load-on-startup>
</servlet>
@@ -120,13 +99,3 @@
</servlet>
@@ -135,11 +114,11 @@
- <!-- default file to execute if directory is called with no file name, e.g. http://mysite.com/ !-->
<!-- default file to execute if directory is called with no file name, e.g. http://mysite.com/ !-->
- <welcome-file-list>
- <welcome-file>index.cfm</welcome-file>
- <welcome-file>index.cfml</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
+ <!-- welcome-file-list>
<welcome-file>index.cfm</welcome-file>
<welcome-file>index.lucee</welcome-file>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
- </welcome-file-list>
-
+ </welcome-file-list -->
-</web-app>
+<!-- /web-app -->

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/09/13 16:24:37 sthen Exp $
@comment $OpenBSD: PLIST,v 1.2 2016/11/14 17:31:39 sthen Exp $
@conflict railo-*
@pkgpath lang/railo
@extraunexec rm -rf %D/lucee/config/*
@ -17,135 +17,7 @@ conf/web-lucee.xml.dist
@owner
@group
lib/
lib/ESAPI.jar
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
lib/apache-jakarta-commons-discovery.jar
lib/apache-jakarta-commons-email.jar
lib/apache-jakarta-commons-fileupload.jar
lib/apache-jakarta-commons-httpclient.jar
lib/apache-jakarta-commons-io.jar
lib/apache-jakarta-commons-lang.jar
lib/apache-jakarta-commons-logging-adapters.jar
lib/apache-jakarta-commons-logging-api.jar
lib/apache-jakarta-commons-logging.jar
lib/apache-jakarta-commons-net-ftp.jar
lib/apache-jakarta-commons-net.jar
lib/apache-jakarta-oro.jar
lib/apache-logging-log4j.jar
lib/apache-lucene-analyzers.jar
lib/apache-lucene-highlighter.jar
lib/apache-lucene-misc.jar
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
lib/apache-xml-xerces.jar
lib/backport-util-concurrent.jar
lib/bcprov-jdk14.jar
lib/com.naryx.tagfusion.cfx.jar
lib/concurrent.jar
lib/dom4j.jar
lib/ehcache.jar
lib/flex-messaging-common.jar
lib/flex-messaging-core.jar
lib/flex-messaging-opt.jar
lib/flex-messaging-proxy.jar
lib/flex-messaging-remoting.jar
lib/fonts.jar
lib/fusiondebug-api-server.jar
lib/h2.jar
lib/hibernate.jar
lib/hypersonic-hsqldb.jar
lib/icepdf-core.jar
lib/jacob.jar
lib/javaparser.jar
lib/javassist.jar
lib/javasysmon.jar
lib/jcifs.jar
lib/jcommon.jar
lib/jencrypt.jar
lib/jffmpeg.jar
lib/jfreechart-patch.jar
lib/jfreechart.jar
lib/jmimemagic.jar
lib/jpedal_gpl.jar
lib/jsch-0.1.53.jar
lib/jta.jar
lib/jtds.jar
lib/jug.jar
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-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/lucee-inst.jar
lib/lucee.jar
lib/metadata-extractor.jar
lib/microsoft-mssqlserver.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/org.mortbay.jetty.jar
lib/postgresql.jar
lib/railo-sl4j.jar
lib/resolver.jar
lib/serializer.jar
lib/slf4j-api.jar
lib/slf4j-nop.jar
lib/ss_css2.jar
lib/stax-api.jar
lib/sun-activation.jar
lib/sun-jai_codec.jar
lib/sun-jai_core.jar
lib/sun-jndi-ldap.jar
lib/sun-jndi-ldapbp.jar
lib/sun-jndi-ldapsec.jar
lib/sun-jndi-providerutil.jar
lib/sun-mail.jar
lib/sun-security-jaas.jar
lib/sun-xml-jaxrpc.jar
lib/sun-xml-wsdl4j.jar
lib/sun-xml.saaj.jar
lib/tagsoup.jar
lib/versions
lib/w3c-dom.jar
lib/xdb.jar
lib/xml-apis.jar
lib/xmlbeans.jar
lib/xmlparserv2.jar
@owner _tomcat
@group _tomcat
lucee/
@ -175,6 +47,7 @@ webapps/lucee-default/assets/img/img-exclamation-mark.png
webapps/lucee-default/assets/img/img-first-steps.png
webapps/lucee-default/assets/img/img-lightning.png
webapps/lucee-default/assets/img/img-link.png
webapps/lucee-default/assets/img/img-new.png
webapps/lucee-default/assets/img/lucee-logo.png
webapps/lucee-default/assets/js/
webapps/lucee-default/assets/js/core/