cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to tomcat 8.5.60, 9.0.40

Browse Source
This commit is contained in:
sthen 2020-12-03 20:58:53 +00:00
parent 927ffe1cb3
commit b52a8d9ff0
9 changed files with 62 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
www/tomcat/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.14 2019/08/08 21:03:16 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.15 2020/12/03 20:58:53 sthen Exp $
COMMENT-main ?= Java servlet and Java server pages server
COMMENT-examples =example applications and full documentation
@ -48,36 +48,39 @@ post-extract:
@rm -rf ${WRKDIST}/webapps/docs
mv ${WRKDIR}/tomcat-${MAJ_VER}.${MIN_VER}-doc ${WRKDIST}/webapps/docs
.if ${MAJ_VER} == 7
MGR_XML= ${WRKDIST}/webapps/host-manager/manager.xml
.else
MGR_XML= ${WRKDIST}/webapps/host-manager/WEB-INF/manager.xml
.endif
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/tomcat \
${PREFIX}/tomcat/webapps \
${SAMPLEDIR} \
${WRKINST}/${CATALINA_BASE} \
${WRKINST}/${CATALINA_BASE}/webapps
cd ${WRKDIST} && \
tar cf - bin lib `find * -prune -type f` | \
${INSTALL_DATA_DIR} ${SAMPLEDIR} ${PREFIX}/tomcat{,/webapps} \
${WRKINST}/${CATALINA_BASE}{,/webapps}
# -main
cd ${WRKDIST} && tar cf - bin lib `find * -prune -type f` | \
tar -C ${PREFIX}/tomcat -xf -
cd ${WRKDIST}/webapps && \
tar cf - host-manager manager | \
cd ${WRKDIST}/webapps && tar cf - host-manager manager | \
tar -C ${PREFIX}/tomcat/webapps -xf -
@chmod 0555 ${PREFIX}/tomcat/bin/*.sh
${INSTALL_DATA} `find ${WRKDIST}/conf/* -prune -type f` ${SAMPLEDIR}
${INSTALL_DATA} ${MGR_XML} ${SAMPLEDIR}/
${INSTALL_DATA} ${MGR_XML} ${SAMPLEDIR}/host-manager.xml
perl -pi -e 's/manager/host-manager/' ${SAMPLEDIR}/host-manager.xml
chmod 0555 ${PREFIX}/tomcat/bin/*.sh
${SUBST_CMD} ${SAMPLEDIR}/server.xml
${INSTALL_DATA} ${WRKDIST}/webapps/host-manager/manager.xml \
${SAMPLEDIR}
${INSTALL_DATA} ${WRKDIST}/webapps/host-manager/manager.xml \
${SAMPLEDIR}/host-manager.xml
@perl -pi -e 's/manager/host-manager/' ${SAMPLEDIR}/host-manager.xml
cd ${WRKDIST}/webapps && \
tar cf - ROOT docs examples | \
# -examples
cd ${WRKDIST}/webapps && tar cf - ROOT docs examples | \
tar -C ${WRKINST}/${CATALINA_BASE}/webapps -xf -
# included directly in PLIST-examples via @cwd
${INSTALL_DATA_DIR} ${WRKINST}/${CONFDIR}/Catalina/localhost
${INSTALL_DATA} ${WRKDIST}/webapps/host-manager/manager.xml \
${WRKINST}/${CONFDIR}/Catalina/localhost
${INSTALL_DATA} ${WRKDIST}/webapps/host-manager/manager.xml \
${INSTALL_DATA} ${MGR_XML} ${WRKINST}/${CONFDIR}/Catalina/localhost
${INSTALL_DATA} ${MGR_XML} \
${WRKINST}/${CONFDIR}/Catalina/localhost/host-manager.xml
@perl -pi -e 's/manager/host-manager/' \
perl -pi -e 's/manager/host-manager/' \
${WRKINST}/${CONFDIR}/Catalina/localhost/host-manager.xml
find ${WRKINST} \( \
-name '*.beforesubst' -or \
-name '*.orig' -or \

4
www/tomcat/v8/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.42 2020/10/13 10:26:28 sthen Exp $
# $OpenBSD: Makefile,v 1.43 2020/12/03 20:58:53 sthen Exp $
COMMENT-main = Java servlet 3.1 and Java server pages 2.3 server
PKGSPEC-main = tomcat->=8,<9
MAJ_VER = 8
MIN_VER = 5
MICRO_VER = 59
MICRO_VER = 60
.include <bsd.port.mk>

8
www/tomcat/v8/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (apache-tomcat-8.5.59-fulldocs.tar.gz) = cGs4pjHT4mAjfeGzapKWWaRkE5/8q+HcJAwAU4yyydM=
SHA256 (apache-tomcat-8.5.59.tar.gz) = DA3rv2xjNh8xqRTPEdreAGAwgy55M8j9SDqh688DIhA=
SIZE (apache-tomcat-8.5.59-fulldocs.tar.gz) = 6139525
SIZE (apache-tomcat-8.5.59.tar.gz) = 10432020
SHA256 (apache-tomcat-8.5.60-fulldocs.tar.gz) = ulJ4LKDzAgbPOFVf/7m94Mw3kwskDCkieMAwBREzB6Q=
SHA256 (apache-tomcat-8.5.60.tar.gz) = xHO9SPEh6tJLB5x+M8pD+m47QqpHXLHzWZhFQRONfpQ=
SIZE (apache-tomcat-8.5.60-fulldocs.tar.gz) = 6156576
SIZE (apache-tomcat-8.5.60.tar.gz) = 10488933

11
www/tomcat/v8/pkg/PLIST-examples
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-examples,v 1.32 2020/10/13 10:26:28 sthen Exp $
@comment $OpenBSD: PLIST-examples,v 1.33 2020/12/03 20:58:53 sthen Exp $
@option is-branch
@owner _tomcat
@group _tomcat
@ -13,10 +13,7 @@ webapps/ROOT/bg-nav.png
webapps/ROOT/bg-upper.png
webapps/ROOT/favicon.ico
webapps/ROOT/index.jsp
webapps/ROOT/tomcat-power.gif
webapps/ROOT/tomcat.css
webapps/ROOT/tomcat.gif
webapps/ROOT/tomcat.png
webapps/ROOT/tomcat.svg
webapps/docs/
webapps/docs/BUILDING.txt
@ -470,6 +467,7 @@ webapps/docs/api/org/apache/catalina/realm/JAASCallbackHandler.html
webapps/docs/api/org/apache/catalina/realm/JAASMemoryLoginModule.html
webapps/docs/api/org/apache/catalina/realm/JAASRealm.html
webapps/docs/api/org/apache/catalina/realm/JDBCRealm.html
webapps/docs/api/org/apache/catalina/realm/JNDIRealm.JNDIConnection.html
webapps/docs/api/org/apache/catalina/realm/JNDIRealm.User.html
webapps/docs/api/org/apache/catalina/realm/JNDIRealm.html
webapps/docs/api/org/apache/catalina/realm/LockOutRealm.LockRecord.html
@ -513,6 +511,7 @@ webapps/docs/api/org/apache/catalina/servlets/package-summary.html
webapps/docs/api/org/apache/catalina/servlets/package-tree.html
webapps/docs/api/org/apache/catalina/session/
webapps/docs/api/org/apache/catalina/session/Constants.html
webapps/docs/api/org/apache/catalina/session/DataSourceStore.html
webapps/docs/api/org/apache/catalina/session/FileStore.html
webapps/docs/api/org/apache/catalina/session/JDBCStore.html
webapps/docs/api/org/apache/catalina/session/ManagerBase.SessionTiming.html
@ -1063,6 +1062,8 @@ webapps/docs/api/org/apache/coyote/http11/package-summary.html
webapps/docs/api/org/apache/coyote/http11/package-tree.html
webapps/docs/api/org/apache/coyote/http11/upgrade/
webapps/docs/api/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeInfo.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.html
@ -2742,6 +2743,8 @@ webapps/docs/websocketapi/stylesheet.css
webapps/docs/windows-auth-howto.html
webapps/docs/windows-service-howto.html
webapps/examples/
webapps/examples/META-INF/
webapps/examples/META-INF/context.xml
webapps/examples/WEB-INF/
webapps/examples/WEB-INF/classes/
webapps/examples/WEB-INF/classes/CookieExample.class

8
www/tomcat/v8/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.16 2020/10/13 10:26:28 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.17 2020/12/03 20:58:53 sthen Exp $
@option is-branch
@newgroup _tomcat:526
@newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin
@ -129,12 +129,14 @@ tomcat/webapps/host-manager/WEB-INF/jsp/
tomcat/webapps/host-manager/WEB-INF/jsp/401.jsp
tomcat/webapps/host-manager/WEB-INF/jsp/403.jsp
tomcat/webapps/host-manager/WEB-INF/jsp/404.jsp
tomcat/webapps/host-manager/WEB-INF/manager.xml
tomcat/webapps/host-manager/WEB-INF/web.xml
tomcat/webapps/host-manager/css/
tomcat/webapps/host-manager/css/manager.css
tomcat/webapps/host-manager/images/
tomcat/webapps/host-manager/images/asf-logo.svg
tomcat/webapps/host-manager/images/tomcat.gif
tomcat/webapps/host-manager/images/tomcat.svg
tomcat/webapps/host-manager/index.jsp
tomcat/webapps/host-manager/manager.xml
tomcat/webapps/manager/
tomcat/webapps/manager/META-INF/
tomcat/webapps/manager/META-INF/context.xml

4
www/tomcat/v9/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2020/10/13 10:26:34 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2020/12/03 20:58:54 sthen Exp $
COMMENT-main = Java servlet 4.0 and Java server pages 2.3 server
PKGSPEC-main = tomcat->=9,<10
MAJ_VER = 9
MIN_VER = 0
MICRO_VER = 39
MICRO_VER = 40
.include <bsd.port.mk>

8
www/tomcat/v9/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (apache-tomcat-9.0.39-fulldocs.tar.gz) = wetds/aFOti2210mSqWr5dBdt1JgSc1ffucYm7ulWKc=
SHA256 (apache-tomcat-9.0.39.tar.gz) = b3KD/9qaa4NgMNttgYsJWhOKkf+40mo0GoPdxU6hiDU=
SIZE (apache-tomcat-9.0.39-fulldocs.tar.gz) = 6476143
SIZE (apache-tomcat-9.0.39.tar.gz) = 11282879
SHA256 (apache-tomcat-9.0.40-fulldocs.tar.gz) = XYulBtwRVcgwj4OFnxcH1He6VEQToiLW6ax19JCs+oQ=
SHA256 (apache-tomcat-9.0.40.tar.gz) = u1KxC1APET3EtQTjT0rApfSPMdk+omHHIUWaS35yylI=
SIZE (apache-tomcat-9.0.40-fulldocs.tar.gz) = 6496003
SIZE (apache-tomcat-9.0.40.tar.gz) = 11437266

11
www/tomcat/v9/pkg/PLIST-examples
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-examples,v 1.7 2020/10/13 10:26:35 sthen Exp $
@comment $OpenBSD: PLIST-examples,v 1.8 2020/12/03 20:58:54 sthen Exp $
@option is-branch
@owner _tomcat
@group _tomcat
@ -13,10 +13,7 @@ webapps/ROOT/bg-nav.png
webapps/ROOT/bg-upper.png
webapps/ROOT/favicon.ico
webapps/ROOT/index.jsp
webapps/ROOT/tomcat-power.gif
webapps/ROOT/tomcat.css
webapps/ROOT/tomcat.gif
webapps/ROOT/tomcat.png
webapps/ROOT/tomcat.svg
webapps/docs/
webapps/docs/BUILDING.txt
@ -514,6 +511,7 @@ webapps/docs/api/org/apache/catalina/servlets/package-summary.html
webapps/docs/api/org/apache/catalina/servlets/package-tree.html
webapps/docs/api/org/apache/catalina/session/
webapps/docs/api/org/apache/catalina/session/Constants.html
webapps/docs/api/org/apache/catalina/session/DataSourceStore.html
webapps/docs/api/org/apache/catalina/session/FileStore.html
webapps/docs/api/org/apache/catalina/session/JDBCStore.html
webapps/docs/api/org/apache/catalina/session/ManagerBase.SessionTiming.html
@ -933,6 +931,7 @@ webapps/docs/api/org/apache/catalina/valves/ExtendedAccessLogValve.TimeElement.h
webapps/docs/api/org/apache/catalina/valves/ExtendedAccessLogValve.html
webapps/docs/api/org/apache/catalina/valves/HealthCheckValve.html
webapps/docs/api/org/apache/catalina/valves/JDBCAccessLogValve.html
webapps/docs/api/org/apache/catalina/valves/JsonErrorReportValve.html
webapps/docs/api/org/apache/catalina/valves/LoadBalancerDrainingValve.html
webapps/docs/api/org/apache/catalina/valves/PersistentValve.html
webapps/docs/api/org/apache/catalina/valves/RemoteAddrValve.html
@ -1090,6 +1089,8 @@ webapps/docs/api/org/apache/coyote/http11/package-summary.html
webapps/docs/api/org/apache/coyote/http11/package-tree.html
webapps/docs/api/org/apache/coyote/http11/upgrade/
webapps/docs/api/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeInfo.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.html
webapps/docs/api/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.html
@ -2735,6 +2736,8 @@ webapps/docs/websocketapi/stylesheet.css
webapps/docs/windows-auth-howto.html
webapps/docs/windows-service-howto.html
webapps/examples/
webapps/examples/META-INF/
webapps/examples/META-INF/context.xml
webapps/examples/WEB-INF/
webapps/examples/WEB-INF/classes/
webapps/examples/WEB-INF/classes/CookieExample.class

10
www/tomcat/v9/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2020/10/13 10:26:35 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2020/12/03 20:58:54 sthen Exp $
@option is-branch
@newgroup _tomcat:526
@newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin
@ -99,7 +99,7 @@ tomcat/lib/catalina-ssi.jar
tomcat/lib/catalina-storeconfig.jar
tomcat/lib/catalina-tribes.jar
tomcat/lib/catalina.jar
tomcat/lib/ecj-4.15.jar
tomcat/lib/ecj-4.17.jar
tomcat/lib/el-api.jar
tomcat/lib/jasper-el.jar
tomcat/lib/jasper.jar
@ -133,12 +133,14 @@ tomcat/webapps/host-manager/WEB-INF/jsp/
tomcat/webapps/host-manager/WEB-INF/jsp/401.jsp
tomcat/webapps/host-manager/WEB-INF/jsp/403.jsp
tomcat/webapps/host-manager/WEB-INF/jsp/404.jsp
tomcat/webapps/host-manager/WEB-INF/manager.xml
tomcat/webapps/host-manager/WEB-INF/web.xml
tomcat/webapps/host-manager/css/
tomcat/webapps/host-manager/css/manager.css
tomcat/webapps/host-manager/images/
tomcat/webapps/host-manager/images/asf-logo.svg
tomcat/webapps/host-manager/images/tomcat.gif
tomcat/webapps/host-manager/images/tomcat.svg
tomcat/webapps/host-manager/index.jsp
tomcat/webapps/host-manager/manager.xml
tomcat/webapps/manager/
tomcat/webapps/manager/META-INF/
tomcat/webapps/manager/META-INF/context.xml