From owner-svn-ports-all@freebsd.org  Mon Jul  8 16:16:24 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 548A615E2847;
 Mon,  8 Jul 2019 16:16:24 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id EF6C175E80;
 Mon,  8 Jul 2019 16:16:23 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C29461ACD6;
 Mon,  8 Jul 2019 16:16:23 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x68GGNJq062603;
 Mon, 8 Jul 2019 16:16:23 GMT (envelope-from tobik@FreeBSD.org)
Received: (from tobik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x68GGN9o062599;
 Mon, 8 Jul 2019 16:16:23 GMT (envelope-from tobik@FreeBSD.org)
Message-Id: <201907081616.x68GGN9o062599@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tobik set sender to
 tobik@FreeBSD.org using -f
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Mon, 8 Jul 2019 16:16:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r506232 - in head/mail/openemm2015: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: tobik
X-SVN-Commit-Paths: in head/mail/openemm2015: . files
X-SVN-Commit-Revision: 506232
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: EF6C175E80
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_SHORT(-0.96)[-0.959,0];
 NEURAL_HAM_LONG(-1.00)[-1.000,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jul 2019 16:16:24 -0000

Author: tobik
Date: Mon Jul  8 16:16:22 2019
New Revision: 506232
URL: https://svnweb.freebsd.org/changeset/ports/506232

Log:
  mail/openemm2015: Unbreak by switching to tomcat85
  
  PR:		238430
  Submitted by:	maintainer

Modified:
  head/mail/openemm2015/Makefile
  head/mail/openemm2015/files/pkg-message.in
  head/mail/openemm2015/pkg-plist

Modified: head/mail/openemm2015/Makefile
==============================================================================
--- head/mail/openemm2015/Makefile	Mon Jul  8 15:21:16 2019	(r506231)
+++ head/mail/openemm2015/Makefile	Mon Jul  8 16:16:22 2019	(r506232)
@@ -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 @@ COMMENT=	OpenEMM a email marketing enterprise app
 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 @@ DOS2UNIX_GLOB=	*.c *.cpp *.h *.java *.xml *.properties
 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 @@ do-install:
 
 	# 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

Modified: head/mail/openemm2015/files/pkg-message.in
==============================================================================
--- head/mail/openemm2015/files/pkg-message.in	Mon Jul  8 15:21:16 2019	(r506231)
+++ head/mail/openemm2015/files/pkg-message.in	Mon Jul  8 16:16:22 2019	(r506232)
@@ -6,7 +6,7 @@ $> mysqldump -aCceQx --hex-blob --routines --triggers 
 
 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 @@ vi TOMCAT_HOME/conf/server.xml
 	<!-- add this part END -->
    </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 @@ vi TOMCAT_HOME/conf/context.xml
         ....
         <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 @@ chmod 644 /var/log/maillog
 # 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,16 +106,16 @@ or
 
 # 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"
 
 #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

Modified: head/mail/openemm2015/pkg-plist
==============================================================================
--- head/mail/openemm2015/pkg-plist	Mon Jul  8 15:21:16 2019	(r506231)
+++ head/mail/openemm2015/pkg-plist	Mon Jul  8 16:16:22 2019	(r506232)
@@ -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%%