Attachment 205587 Details for Bug 238430 – mail/openemm2015 upgrade dependency from tomcat8 to tomcat 8.5

[patch] mail/openemm2015 upgrade dependency from tomcat8 to tomcat 8.5

openemm2015-0.1.diff (text/plain), 6.29 KB, created by horst.leitenmueller on 2019-07-08 15:56:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: horst.leitenmueller

Created: 2019-07-08 15:56:09 UTC

Size: 6.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 506107)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	openemm2015
>-PORTVERSION=	0
>+PORTVERSION=	0.1
> CATEGORIES=	mail java www
> MASTER_SITES=	SF/openemm/OpenEMM%20software/OpenEMM%202015/ \
> 		http://central.maven.org/maven2/com/lowagie/itext/2.1.7/:MAVEN2
>@@ -16,14 +16,13 @@
> LICENSE=	CPAL-1.0
> LICENSE_FILE=	${WRKSRC}/other/LICENSE.txt
> 
>-BROKEN=	depends on expired www/tomcat8
> BROKEN_powerpc64=	fails to build: gmake[1]: clang: Command not found
> 
> LIB_DEPENDS=	libslang.so:devel/libslang2 \
> 		libsa.so:net/ossp-sa
>-#BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
>+BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat85 \
> 		${ANT_CMD}:devel/apache-ant
>-#RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
>+RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat85 \
> 		py27-MySQLdb>=1.2.3:databases/py-MySQLdb
> 
> USES=	dos2unix gmake python:2.7,run
>@@ -35,7 +34,7 @@
> CC=	clang
> CXX=	clang++
> 
>-TOMCATVER=	apache-tomcat-8.0
>+TOMCATVER=	apache-tomcat-8.5
> TOMCATDIR=	${PREFIX}/${TOMCATVER}
> TOMCATHOME=	${LOCALBASE}/${TOMCATVER}
> #WEBAPPDIR=	${TOMCATDIR}/webapps
>@@ -228,6 +227,8 @@
> 
> 	# create log files
> 	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
>+	${TOUCH} ${STAGEDIR}/var/log/${PORTNAME}/openemm.log
>+	${TOUCH} ${STAGEDIR}/var/log/${PORTNAME}/openemm-ws.log
> 	${TOUCH} ${STAGEDIR}/var/log/${PORTNAME}/openemm_core.log
> 	${TOUCH} ${STAGEDIR}/var/log/${PORTNAME}/userlogs.log
> 	${TOUCH} ${STAGEDIR}/var/log/${PORTNAME}/openemm_axis.log
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 506107)
>+++ files/pkg-message.in	(working copy)
>@@ -6,7 +6,7 @@
> 
> To integrate the OpenEMM 2015 to the installed Tomcat add this
> chunk to the server.xml of Tomcat:
>-TOMCAT_HOME= %%PREFIX%%/apache-tomcat-8.0/lib/
>+TOMCAT_HOME= %%PREFIX%%/apache-tomcat-8.5/lib/
> 
> vi TOMCAT_HOME/conf/server.xml
> 
>@@ -28,6 +28,7 @@
> 	
>    </Engine>
> 
>+Change the Engine name="Catalina" to point to defaultHost="OpenEMM"
> Don't forget securing tomcat, or add a httpd in front secured
> 
> additional for the jndi database connect:
>@@ -38,30 +39,24 @@
>         ....
>         <Resource
>                 name="jdbc/openemm_db"
>-                driverClassName="com.mysql.jdbc.Driver"
>+                driverClassName="com.mysql.cj.jdbc.Driver"
>                 type="javax.sql.DataSource"
>-                maxCount="30"
>-                maxActive="50"
>-                maxWait="10000"
>+                maxTotal="30"
>                 auth="Container"
>                 username="agnitas"
>                 password="openemm"
>-                url="jdbc:mysql://localhost/openemm?useUnicode=yes&amp;characterEncoding=UTF-8&amp;useOldAliasMetadataBehavior=true&amp;zeroDateTimeBehavior
>-=convertToNull"
>+                url="jdbc:mysql://localhost/openemm?useUnicode=yes&amp;characterEncoding=UTF-8&amp;useOldAliasMetadataBehavior=true&amp;zeroDateTimeBehavior=convertToNull"
>         />
> 
>         <Resource
>                 name="jdbc/openemm_cms_db"
>-                driverClassName="com.mysql.jdbc.Driver"
>+                driverClassName="com.mysql.cj.jdbc.Driver"
>                 type="javax.sql.DataSource"
>-                maxCount="30"
>-                maxActive="50"
>-                maxWait="10000"
>+                maxTotal="30"
>                 auth="Container"
>                 username="agnitas"
>                 password="openemm"
>-                url="jdbc:mysql://localhost/openemm_cms?useUnicode=yes&amp;characterEncoding=UTF-8&amp;useOldAliasMetadataBehavior=true&amp;zeroDateTimeBeha
>-vior=convertToNull"
>+                url="jdbc:mysql://localhost/openemm_cms?useUnicode=yes&amp;characterEncoding=UTF-8&amp;useOldAliasMetadataBehavior=true&amp;zeroDateTimeBehavior=convertToNull
>         />
> </Context>
> 
>@@ -81,20 +76,20 @@
> # to keep this change permanent change cron info in /etc/newsyslog.conf
> # change line /var/log/maillog                      644  7     *    @T00  JC
> 
>-if not change tracking of mail sending / bounces is not working correct
>+#if not change tracking of mail sending / bounces is not working correct
> 
> # don't forget to add the link for mysql driver jar to tomcat
>+# if not already installed add:  pkg install mysql-connector-java
> ln -s %%PREFIX%%/share/java/classes/mysql-connector-java.jar TOMCAT_HOME/lib
> chown -h www TOMCAT_HOME/lib/mysql-connector-java.jar
> 
> # setup the database scripts
>+#in the installed mysql add 2 databases
> 
>-in the installed mysql add 2 databases
>-
> create database openemm;
> create database openemm_cms;
> 
>-grant the privileges for the 2 db's from where you want to access
>+#grant the privileges for the 2 db's from where you want to access
> grant all privileges on openemm.* to agnitas@'X.Y.%' identified by 'openemm';
> grant all privileges on openemm_cms.* to agnitas@'X.Y.%' identified by 'openemm';
> 
>@@ -111,9 +106,9 @@
> 
> # startup config for tomcat and OpenEMM
> add to /etc/rc.conf
>-# Tomcat8 Server startup with initial config params for OpenEMM
>-tomcat8_enable="YES"
>-tomcat8_java_opts="-server -Djava.awt.headless=true -Xms256m -Xmx512m -XX:MaxPermSize=256m -Xss256k"
>+# Tomcat85 Server startup with initial config params for OpenEMM
>+tomcat85_enable="YES"
>+tomcat85_java_opts="-server -Djava.awt.headless=true -Xms256m -Xmx512m -Xss256k"
> 
> # Openemm 2015
> openemm2015_enable="YES"
>@@ -120,7 +115,7 @@
> 
> #NOW you are ready to start the tomcat and OpenEMM
> 
>-service tomcat8 start
>+service tomcat85 start
> service openemm2015 start
> or
> %%PREFIX%%/etc/rc.d/openemm2015 start
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 506107)
>+++ pkg-plist	(working copy)
>@@ -6023,10 +6023,19 @@
> %%PORTDOCS%%%%DOCSDIR%%/update_openemm-6.RC2-6.0.sql
> @mode 555
> %%PORTDOCS%%%%DOCSDIR%%/upgrade-postproc.sh
>+@mode 755
> @(www,www,) /var/log/%%APP_HOME%%/daily.log
>+@mode 755
>+@(www,www,) /var/log/%%APP_HOME%%/openemm.log
>+@mode 755
>+@(www,www,) /var/log/%%APP_HOME%%/openemm-ws.log
>+@mode 755
> @(www,www,) /var/log/%%APP_HOME%%/openemm_axis.log
>+@mode 755
> @(www,www,) /var/log/%%APP_HOME%%/openemm_core.log
>+@mode 755
> @(www,www,) /var/log/%%APP_HOME%%/userlogs.log
>+@mode 755
> @dir(www,www,) /var/log/%%APP_HOME%%
> @dir %%DOCSDIR%%/ThirdPartyLicences
> @dir %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 238430: 205587