FreeBSD Bugzilla – Attachment 199793 Details for
Bug 230325
www/tomcat{85,9}: daemon.sh incorrectly refers to jsvc executable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for tomcat9
tomcat9.diff (text/plain), 1.85 KB, created by
Vladimir Druzenko
on 2018-12-03 11:48:24 UTC
(
hide
)
Description:
Patch for tomcat9
Filename:
MIME Type:
Creator:
Vladimir Druzenko
Created:
2018-12-03 11:48:24 UTC
Size:
1.85 KB
patch
obsolete
>diff -uNr www/tomcat9.orig/files/patch-bin__daemon.sh www/tomcat9/files/patch-bin__daemon.sh >--- www/tomcat9.orig/files/patch-bin__daemon.sh >+++ www/tomcat9/files/patch-bin__daemon.sh >@@ -0,0 +1,26 @@ >+--- bin/daemon.sh.orig >++++ bin/daemon.sh >+@@ -115,12 +115,9 @@ >+ test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` >+ test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" >+ test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap >+-# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME >++# If not explicitly set, look for jsvc in %%PREFIX%% >+ if [ -z "$JSVC" ]; then >+- JSVC="$CATALINA_BASE/bin/jsvc" >+- if [ ! -x "$JSVC" ]; then >+- JSVC="$CATALINA_HOME/bin/jsvc" >+- fi >++ JSVC="%%PREFIX%%/bin/jsvc" >+ fi >+ # Set the default service-start wait time if necessary >+ test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 >+@@ -137,7 +134,7 @@ >+ >+ # Add on extra jar files to CLASSPATH >+ test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" >+-CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar" >++CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:%%JAVAJARDIR%%/commons-daemon.jar" >+ >+ test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out" >+ test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp" >diff -uNr www/tomcat9.orig/Makefile www/tomcat9/Makefile >--- www/tomcat9.orig/Makefile >+++ www/tomcat9/Makefile >@@ -45,6 +45,8 @@ > > post-patch: > @${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz >+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh >+ @${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete > > do-install: > @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
vvd
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 230325
:
199644
| 199793 |
199796