diff options
Diffstat (limited to 'mail/openemm2015/files')
17 files changed, 0 insertions, 941 deletions
diff --git a/mail/openemm2015/files/openemm2015.in b/mail/openemm2015/files/openemm2015.in deleted file mode 100644 index b2c261737eea..000000000000 --- a/mail/openemm2015/files/openemm2015.in +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/sh -# -# %%APP_SHORTNAME%% startup script. -# -# $FreeBSD$ -# - -# PROVIDE: %%APP_SHORTNAME%% -# REQUIRE: NETWORKING SERVERS -# KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable %%APP_SHORTNAME%%: -# %%APP_SHORTNAME%%_enable (bool): Set to "YES" to enable %%APP_SHORTNAME%% -# %%APP_SHORTNAME%%_args (str): Optional arguments to OAJBoss -# %%APP_SHORTNAME%%_log_stdout (str) OpenEMM log output stdout, filename. -# %%APP_SHORTNAME%%_log_stderr (str) OpenEMM log output stderr, filename. -# - -. /etc/rc.subr - -name="%%APP_SHORTNAME%%" -rcvar=%%APP_SHORTNAME%%_enable -extra_commands="status" - -load_rc_config $name - -%%APP_SHORTNAME%%_logdir="%%LOG_DIR%%" -%%APP_SHORTNAME%%_enable="${%%APP_SHORTNAME%%_enable:-"NO"}" -%%APP_SHORTNAME%%_log_stdout="${%%APP_SHORTNAME%%_log_stdout:-"${%%APP_SHORTNAME%%_logdir}/log"}" -%%APP_SHORTNAME%%_log_stderr="${%%APP_SHORTNAME%%_log_stderr:-"${%%APP_SHORTNAME%%_logdir}/error"}" -%%APP_SHORTNAME%%_args="${%%APP_SHORTNAME%%_args:-""}" -%%APP_SHORTNAME%%_sleep="${%%APP_SHORTNAME%%_sleep:-"5"}" -%%APP_SHORTNAME%%_kill9="${%%APP_SHORTNAME%%_kill9:-""}" -%%APP_SHORTNAME%%_additional_killall="${%%APP_SHORTNAME%%_additional_killall:-""}" -%%APP_SHORTNAME%%_user="%%USER%%" -%%APP_SHORTNAME%%_group="%%GROUP%%" -%%APP_SHORTNAME%%_lockdir="/var/run/openemm" - - -start_cmd="%%APP_SHORTNAME%%_start" -stop_cmd="%%APP_SHORTNAME%%_stop" -pidfile="%%PID_FILE%%" -tomcat_pidfile="tomcat8.pid" # todo replace dynamic with current version -sendmail_pidfile="sendmail.pid" - -OPENEMM_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.8+" -export JAVA_VERSION - -%%APP_SHORTNAME%%_start () -{ - if [ ! -d "${%%APP_SHORTNAME%%_logdir}" ] - then - install -d -o ${%%APP_SHORTNAME%%_user} ${%%APP_SHORTNAME%%_logdir} - fi - - if [ ! -d "${%%APP_SHORTNAME%%_lockdir}" ] - then - install -d -o ${%%APP_SHORTNAME%%_user} ${%%APP_SHORTNAME%%_lockdir} - fi - - echo "Preconditions for %%APP_SHORTNAME%%" - echo " - check if sendmail processes are stopped, it will be started via this application" - - if [ -f "/var/run/${sendmail_pidfile}"] - then - echo "TODO STOP all sendmail processes" - service sendmail stop - - # check for sendmail queues started via openemm - if [ -f "${%%APP_SHORTNAME%%_lockdir}/mailer.pid" ] - then - echo "Stop Mailer Service...." - pkill qctrl - pkill sendmail - fi - fi - - echo "Starting %%APP_SHORTNAME%%." - - # check for the startup pyhton scripts - - - # check if tomcat is running otherwise warning - if [ ! -f "/var/run/${tomcat_pidfile}" ] - then - echo "Tomcat is not running please start tomcat first" - else - echo "Tomcat is running... starting app" - fi - - echo "Start BOUNCE Servcie...." - daemon -u ${%%APP_SHORTNAME%%_user} ${OPENEMM_HOME}/bin/bounce.sh start >> ${%%APP_SHORTNAME%%_logdir}/bounce.log 2>> ${%%APP_SHORTNAME%%_logdir}/bounce_error.log - echo "Start Merger Service...." - daemon -u ${%%APP_SHORTNAME%%_user} ${OPENEMM_HOME}/bin/merger.sh start >> ${%%APP_SHORTNAME%%_logdir}/merger.log 2>> ${%%APP_SHORTNAME%%_logdir}/merger_error.log - echo "Start Mailer Service...." - daemon ${OPENEMM_HOME}/bin/mailer.sh start >> ${%%APP_SHORTNAME%%_logdir}/mailer.log 2>> ${%%APP_SHORTNAME%%_logdir}/mailer_error.log - pgrep sendmail > ${openemm2015_lockdir}/mailer.pid - - echo "Start SLRT scan Service...." - daemon -u ${%%APP_SHORTNAME%%_user} ${OPENEMM_HOME}/bin/slrtscn.sh start >> ${%%APP_SHORTNAME%%_logdir}/slrtscn.log 2>> ${%%APP_SHORTNAME%%_logdir}/slrtscn_error.log - - echo "START THE APP ITSELF..." - #daemon -u ${%%APP_SHORTNAME%%_user} ${OPENEMM_HOME}/bin/standalone.sh ${%%APP_SHORTNAME%%_args} >> ${%%APP_SHORTNAME%%_log_stdout} 2>> ${%%APP_SHORTNAME%%_log_stderr} - - #sleep ${%%APP_SHORTNAME%%_sleep} # let daemon(8) and sh(1) finish before executing pgrep(1) - #pgrep -U ${%%APP_SHORTNAME%%_user} -f ${OPENEMM_HOME}/modules > ${pidfile} - #chown ${%%APP_SHORTNAME%%_user} $pidfile -} - -%%APP_SHORTNAME%%_stop () -{ - - ${OPENEMM_HOME}/bin/bounce.sh stop - ${OPENEMM_HOME}/bin/merger.sh stop - - #${OPENEMM_HOME}/bin/mailer.sh stop - service sendmail stop # pkill sendmail - #sendmail stop - pkill sendmail - terminator bin/qctrl #pkill qctrl - ${OPENEMM_HOME}/bin/slrtscn.sh stop - - # Subvert the check_pid_file procname check. - # at the moment we dont't handle this here - if [ -f ${pidfile} ] - then - kill `cat ${pidfile}` - # Only if we aware that our setup can hangs, and only after trying simple kill, we can kill it hard way. - if [ ! -z "${%%APP_SHORTNAME%%_kill9}" ] - then - sleep ${%%APP_SHORTNAME%%_sleep} - #kill -9 `cat ${pidfile}` - fi - # In some setups, OpenEMM (Tomcat) can spawn some child processess, which could prevent it from stopping, and freeing net ports. - # Let's blindly kill them all, since we are really know what we are doing. - if [ ! -z "${%%APP_SHORTNAME%%_additional_killall}" ] - then - sleep ${%%APP_SHORTNAME%%_sleep} - killall ${%%APP_SHORTNAME%%_additional_killall} - fi - fi -} - -terminator() { - while [ $# -gt 0 ] ; do - __pat="$1" - shift - if [ "$__pat" ] ; then - for sig in 15 9 ; do - __run="`ps -aux | grep -- \"$__pat\" | grep -v grep | awk '{ print $2 }'`" - if [ "$__run" ] ; then - echo "Stop $__pat program with signal $sig .. " - kill -$sig $__run >/dev/null 2>&1 - sleep 2 - echo "done." - fi - done - fi - done -} - - -%%APP_SHORTNAME%%_status () -{ - # If running, show pid - if [ -f ${pidfile} ] - then - echo "%%APP_SHORTNAME%% is running as pid" `cat ${pidfile}` - else - echo "%%APP_SHORTNAME%% is not running" - fi -} - -run_rc_command "$1" diff --git a/mail/openemm2015/files/patch-backend__GNUmakefile b/mail/openemm2015/files/patch-backend__GNUmakefile deleted file mode 100644 index 0813778619fa..000000000000 --- a/mail/openemm2015/files/patch-backend__GNUmakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- backend/GNUmakefile.orig 2015-02-20 13:02:20 UTC -+++ backend/GNUmakefile -@@ -21,7 +21,7 @@ - ################################################################################## - - all clean:: -- @for dir in contrib src; do $(MAKE) -C $$dir $@ || exit 1; done -+ @for dir in src; do $(MAKE) -C $$dir $@ || exit 1; done - - clean:: - rm -f *~ diff --git a/mail/openemm2015/files/patch-backend__src__c__bav__GNUmakefile b/mail/openemm2015/files/patch-backend__src__c__bav__GNUmakefile deleted file mode 100644 index cc70805fea98..000000000000 --- a/mail/openemm2015/files/patch-backend__src__c__bav__GNUmakefile +++ /dev/null @@ -1,20 +0,0 @@ ---- backend/src/c/bav/GNUmakefile.orig 2015-02-20 13:02:20 UTC -+++ backend/src/c/bav/GNUmakefile -@@ -20,13 +20,13 @@ - # Contributor(s): AGNITAS AG. - ################################################################################## - --CC = gcc --CFLAGS = -I../lib -I../../../contrib/include -pthread --LDFLAGS = -L../lib -L../../../contrib/lib -pthread -+CC?= gcc -+CFLAGS = -I../lib -I/usr/local/lib -I/usr/local/include -pthread -+LDFLAGS = -L../lib -L/usr/local/lib -pthread - # required for Ubuntu 9.10 by user request - LDFLAGS := $(LDFLAGS) -L/usr/lib/libmilter - # --LIBS = -lagn -lmilter -lsa -+LIBS = -lagn -lmilter -lex -lsa - SRCBAV = bav.c cfg.c - SRCWRP = bavwrap.c store.c - OBJBAV = $(SRCBAV:%.c=%.o) diff --git a/mail/openemm2015/files/patch-backend__src__c__bav__bav.c b/mail/openemm2015/files/patch-backend__src__c__bav__bav.c deleted file mode 100644 index 8c85ded66d36..000000000000 --- a/mail/openemm2015/files/patch-backend__src__c__bav__bav.c +++ /dev/null @@ -1,24 +0,0 @@ ---- backend/src/c/bav/bav.c.orig 2015-10-24 14:59:57 UTC -+++ backend/src/c/bav/bav.c -@@ -28,16 +28,17 @@ - # include <sys/types.h> - # include <regex.h> - # include <netinet/in.h> --# include "libmilter/mfapi.h" - # include "bav.h" -+# include "libmilter/mfapi.h" - --# define SOCK_PATH "var/run/bav.sock" --# define LOCK_PATH "var/lock/bav.lock" --# define CFGFILE "var/spool/bav/bav.conf" -+# define SOCK_PATH "/var/run/openemm/bav.sock" -+# define LOCK_PATH "/var/run/openemm/bav.lock" -+# define CFGFILE "/usr/local/openemm2015/var/spool/bav/bav.conf" - # define X_AGN "X-AGNMailloop" - # define X_LOOP "X-AGNLoop" - # define LOOP_SET "set" - -+# define bool int - - static const char *program; - static const char *loglevel; diff --git a/mail/openemm2015/files/patch-backend__src__c__lib__GNUmakefile b/mail/openemm2015/files/patch-backend__src__c__lib__GNUmakefile deleted file mode 100644 index b4061a433bec..000000000000 --- a/mail/openemm2015/files/patch-backend__src__c__lib__GNUmakefile +++ /dev/null @@ -1,13 +0,0 @@ ---- backend/src/c/lib/GNUmakefile.orig 2015-02-20 13:02:20 UTC -+++ backend/src/c/lib/GNUmakefile -@@ -20,8 +20,8 @@ - # Contributor(s): AGNITAS AG. - ################################################################################## - --CC = gcc --CFLAGS = -I. -+CC?= gcc -+CFLAGS+= -I. - SRCS = atob.c \ - buffer.c \ - cache.c \ diff --git a/mail/openemm2015/files/patch-backend__src__c__lib__agn.h b/mail/openemm2015/files/patch-backend__src__c__lib__agn.h deleted file mode 100644 index 0c39d574af68..000000000000 --- a/mail/openemm2015/files/patch-backend__src__c__lib__agn.h +++ /dev/null @@ -1,13 +0,0 @@ ---- backend/src/c/lib/agn.h.orig 2015-10-24 14:59:57 UTC -+++ backend/src/c/lib/agn.h -@@ -136,8 +136,8 @@ typedef unsigned long hash_t; - * Symbolic names for boolean values - */ - typedef enum { /*{{{*/ -- false, -- true -+ false = 0, -+ true = 1 - /*}}}*/ - } bool_t; - diff --git a/mail/openemm2015/files/patch-backend__src__c__tools__GNUmakefile b/mail/openemm2015/files/patch-backend__src__c__tools__GNUmakefile deleted file mode 100644 index 1d97a816e5c9..000000000000 --- a/mail/openemm2015/files/patch-backend__src__c__tools__GNUmakefile +++ /dev/null @@ -1,13 +0,0 @@ ---- backend/src/c/tools/GNUmakefile.orig 2015-02-20 13:02:20 UTC -+++ backend/src/c/tools/GNUmakefile -@@ -20,8 +20,8 @@ - # Contributor(s): AGNITAS AG. - ################################################################################## - --CC = gcc --CFLAGS = -I../lib -+CC?= gcc -+CFLAGS+= -I../lib - LDFLAGS = -L../lib - LIBS = -lagn - SQCTRL = qctrl.c qlib.c qmove.c qstat.c diff --git a/mail/openemm2015/files/patch-backend__src__c__xmlback__GNUmakefile b/mail/openemm2015/files/patch-backend__src__c__xmlback__GNUmakefile deleted file mode 100644 index ffc9b960457a..000000000000 --- a/mail/openemm2015/files/patch-backend__src__c__xmlback__GNUmakefile +++ /dev/null @@ -1,35 +0,0 @@ ---- backend/src/c/xmlback/GNUmakefile.orig 2015-02-20 13:02:20 UTC -+++ backend/src/c/xmlback/GNUmakefile -@@ -20,10 +20,10 @@ - # Contributor(s): AGNITAS AG. - ################################################################################## - --CC = gcc --CFLAGS = '-DVERSION="OpenEMM 2015"' -I. -I../lib $(shell xml2-config --cflags) -I../../../contrib/include/ --LDFLAGS = -L../../../contrib/lib --LIBS = grammar/libgrammar.a -lslang -L../lib -lagn $(shell xml2-config --libs) -ldl -lm -+CC?= gcc -+CFLAGS+= '-DVERSION="OpenEMM 2015"' -I. -I../lib -I/usr/local/include $(shell xml2-config --cflags) -+LDFLAGS = -L/usr/local/lib -+LIBS = grammar/libgrammar.a -lslang -L../lib -lagn $(shell xml2-config --libs) -lcurses -lm - SRCS = append.c \ - block.c \ - blockmail.c \ -@@ -63,7 +63,7 @@ all:: - @$(MAKE) -C ../lib $@ - - all clean:: -- make -C grammar $@ -+ @${MAKE} -C grammar $@ - - all:: xmlback - -@@ -71,7 +71,7 @@ xmlback: $(OBJS) grammar/libgrammar.a - $(CC) $(LDFLAGS) $(OBJS) -o $@ $(LIBS) - - grammar/libgrammar.a: -- make -C grammar -+ @${MAKE} -C grammar - - clean:: - rm -f xmlback *.o *~ diff --git a/mail/openemm2015/files/patch-backend__src__c__xmlback__eval.c b/mail/openemm2015/files/patch-backend__src__c__xmlback__eval.c deleted file mode 100644 index 20c053eb044a..000000000000 --- a/mail/openemm2015/files/patch-backend__src__c__xmlback__eval.c +++ /dev/null @@ -1,133 +0,0 @@ ---- backend/src/c/xmlback/eval.c.orig 2015-10-24 14:59:57 UTC -+++ backend/src/c/xmlback/eval.c -@@ -198,9 +198,9 @@ ctx_clr (void) /*{{{*/ - static inline void - check_error (void) /*{{{*/ - { -- if (SLang_Error) { -+ if (SLang_get_error()) { - SLang_restart (1); -- SLang_Error = 0; -+ SLang_set_error(0); - } - }/*}}}*/ - static void -@@ -243,7 +243,7 @@ type_retrieve (int argc) /*{{{*/ - int dummy; - - if (! (argv = (type_t *) malloc (argc * sizeof (type_t)))) { -- SLang_Error = SL_MALLOC_ERROR; -+ SLang_set_error(SL_MALLOC_ERROR); - return NULL; - } - for (n = 0; n < argc; ++n) -@@ -262,7 +262,7 @@ type_retrieve (int argc) /*{{{*/ - argv[n].v.n = (double) dummy; - break; - case SLANG_DOUBLE_TYPE: -- if (SLang_pop_double (& argv[n].v.n, & dummy, & dummy) == -1) -+ if (SLang_pop_double (& argv[n].v.n) == -1) - st = false; - break; - case SLANG_STRING_TYPE: -@@ -901,7 +901,7 @@ SLin (void) /*{{{*/ - - argc = SLang_Num_Function_Args; - if (argc < 2) { -- SLang_Error = SL_SYNTAX_ERROR; -+ SLang_set_error(SL_SYNTAX_ERROR); - return -1; - } - rc = 0; -@@ -928,7 +928,7 @@ SLin (void) /*{{{*/ - } - free (i); - } else { -- SLang_Error = SL_MALLOC_ERROR; -+ SLang_set_error(SL_MALLOC_ERROR); - rc = -1; - } - } -@@ -940,7 +940,7 @@ SLin (void) /*{{{*/ - - if (d = (double *) malloc (argc * sizeof (double))) { - for (n = 0; n < argc; ++n) -- if (SLang_pop_double (& d[n], & dummy, & dummy) == -1) { -+ if (SLang_pop_double (& d[n]) == -1) { - rc = -1; - break; - } -@@ -952,7 +952,7 @@ SLin (void) /*{{{*/ - } - free (d); - } else { -- SLang_Error = SL_MALLOC_ERROR; -+ SLang_set_error(SL_MALLOC_ERROR); - rc = -1; - } - } -@@ -980,14 +980,14 @@ SLin (void) /*{{{*/ - } - free (s); - } else { -- SLang_Error = SL_MALLOC_ERROR; -+ SLang_set_error(SL_MALLOC_ERROR); - rc = -1; - } - } - break; - } -- if ((rc == -1) && (! SLang_Error)) -- SLang_Error = SL_TYPE_MISMATCH; -+ if ((rc == -1) && (! SLang_get_error())) -+ SLang_set_error(SL_TYPE_MISMATCH); - return rc; - }/*}}}*/ - static int -@@ -1000,7 +1000,7 @@ SLbetween (void) /*{{{*/ - - argc = SLang_Num_Function_Args; - if (argc != 3) { -- SLang_Error = SL_SYNTAX_ERROR; -+ SLang_set_error(SL_SYNTAX_ERROR); - return -1; - } - if (! (argv = type_retrieve (argc))) -@@ -1030,8 +1030,8 @@ SLbetween (void) /*{{{*/ - break; - } - type_release (argc, argv); -- if ((rc == -1) && (! SLang_Error)) -- SLang_Error = SL_TYPE_MISMATCH; -+ if ((rc == -1) && (! SLang_get_error())) -+ SLang_set_error(SL_TYPE_MISMATCH); - return rc; - }/*}}}*/ - static void -@@ -1044,7 +1044,7 @@ SLdecode (void) /*{{{*/ - - argc = SLang_Num_Function_Args; - if ((argc < 4) || (argc % 2 != 0)) { -- SLang_Error = SL_SYNTAX_ERROR; -+ SLang_set_error(SL_SYNTAX_ERROR); - return; - } - if (! (argv = type_retrieve (argc))) -@@ -1068,7 +1068,7 @@ SLdecode (void) /*{{{*/ - if (argv[argc - 1].type != argv[2].type) - st = false; - if (! st) -- SLang_Error = SL_TYPE_MISMATCH; -+ SLang_set_error(SL_TYPE_MISMATCH); - else { - int hit = -1; - -@@ -1092,7 +1092,7 @@ SLdecode (void) /*{{{*/ - switch (argv[hit].type) { - default: - st = false; -- SLang_Error = SL_TYPE_MISMATCH; -+ SLang_set_error(SL_TYPE_MISMATCH); - break; - case SLANG_INT_TYPE: - SLang_push_integer ((int) argv[hit].v.n); diff --git a/mail/openemm2015/files/patch-backend__src__c__xmlback__grammar__GNUmakefile b/mail/openemm2015/files/patch-backend__src__c__xmlback__grammar__GNUmakefile deleted file mode 100644 index 414ddfec61f5..000000000000 --- a/mail/openemm2015/files/patch-backend__src__c__xmlback__grammar__GNUmakefile +++ /dev/null @@ -1,13 +0,0 @@ ---- backend/src/c/xmlback/grammar/GNUmakefile.orig 2015-02-20 13:02:20 UTC -+++ backend/src/c/xmlback/grammar/GNUmakefile -@@ -20,8 +20,8 @@ - # Contributor(s): AGNITAS AG. - ################################################################################## - --CC = gcc --CFLAGS = -I.. -I../../lib $(shell xml2-config --cflags) -+CC?= gcc -+CFLAGS+= -I.. -I../../lib $(shell xml2-config --cflags) - LDFLAGS = - SRCS = transform.c parse.c - OBJS = $(SRCS:%.c=%.o) diff --git a/mail/openemm2015/files/patch-backend__src__script__lib__config.sh b/mail/openemm2015/files/patch-backend__src__script__lib__config.sh deleted file mode 100644 index 621a50bf5443..000000000000 --- a/mail/openemm2015/files/patch-backend__src__script__lib__config.sh +++ /dev/null @@ -1,80 +0,0 @@ ---- backend/src/script/lib/config.sh.orig 2015-02-20 13:02:20 UTC -+++ backend/src/script/lib/config.sh -@@ -34,7 +34,7 @@ host="`uname -n | cut -d. -f1`" - # - # Set the base for the whole system .. - if [ ! "$BASE" ] ; then -- BASE="$HOME" -+ BASE="/usr/local/openemm2015" - fi - export BASE - optbase="$OPENEMM_SW" -@@ -100,7 +100,7 @@ loglast=0 - # - # Sendmail location - # --sendmail="$HOME/bin/smctrl" -+sendmail="/usr/local/openemm2015/bin/smctrl" - if [ ! -x $sendmail ]; then - sendmail="/usr/sbin/sendmail" - if [ ! -x $sendmail ] ; then -@@ -130,7 +130,7 @@ error() { - echo "$*" 1>&2 - } - epoch() { -- python -c " -+ /usr/local/bin/python2.7 -c " - import time - - print int (time.time ()) -@@ -235,7 +235,7 @@ pathstrip() { - if [ $# -ne 1 ] ; then - echo "Usage: $0 <path>" 1>&2 - else -- python -c " -+ /usr/local/bin/python2.7 -c " - import string - def pathstrip (s): - rc = [] -@@ -252,7 +252,7 @@ filecount() { - if [ $# -ne 2 ] ; then - echo "Usage: $0 <dir> <pattern>" 1>&2 - else -- python -c " -+ /usr/local/bin/python2.7 -c " - import os, sre - def filecount (directory, pattern): - n = 0 -@@ -356,7 +356,7 @@ terminator() { - shift - if [ "$__pat" ] ; then - for sig in 15 9 ; do -- __run="`ps -ef | grep -- \"$__pat\" | grep -v grep | awk '{ print $2 }'`" -+ __run="`ps -aux | grep -- \"$__pat\" | grep -v grep | awk '{ print $2 }'`" - if [ "$__run" ] ; then - messagen "Stop $__pat program with signal $sig .. " - kill -$sig $__run >/dev/null 2>&1 -@@ -377,12 +377,12 @@ softterm() { - repeat="on" - while [ $repeat = "on" ]; do - repeat="off" -- __run="`ps -ef | grep -- \"$__pat\" | grep -v grep | awk '{ print $2 }'`" -+ __run="`ps -aux | grep -- \"$__pat\" | grep -v grep | awk '{ print $2 }'`" - if [ "$__run" ] ; then - messagen "Stop $__pat program .. " - kill -15 $__run >/dev/null 2>&1 - sleep 1 -- __run="`ps -ef | grep -- \"$__pat\" | grep -v grep | awk '{ print $2 }'`" -+ __run="`ps -aux | grep -- \"$__pat\" | grep -v grep | awk '{ print $2 }'`" - if [ "$__run" ]; then - messagen "delaying $sv seconds .. " - sleep `expr $sv - 1` -@@ -408,7 +408,7 @@ mestopper() { - messagen "Creating $__fn, waiting for $__pat: " - touch "$__fn" - while true ; do -- __run="`ps -ef | grep -- \"$__pat\" | grep -v grep | awk '{ print $2 }'`" -+ __run="`ps -aux | grep -- \"$__pat\" | grep -v grep | awk '{ print $2 }'`" - if [ ! "$__run" ] ; then - break - fi diff --git a/mail/openemm2015/files/patch-openemm_build.xml b/mail/openemm2015/files/patch-openemm_build.xml deleted file mode 100644 index ff6a15a43b66..000000000000 --- a/mail/openemm2015/files/patch-openemm_build.xml +++ /dev/null @@ -1,188 +0,0 @@ ---- openemm_build.xml.orig 2015-10-24 14:59:58 UTC -+++ openemm_build.xml -@@ -23,8 +23,8 @@ - <property name="catalina.home" location="/opt/openemm/tomcat" /> - <property name="src" location="${oe.home}/src/OpenEMM-${version}-src" /> - <property name="bin" location="${oe.home}/bin/OpenEMM-${version}-bin" /> -- <property name="webroot" location="${bin}/webapps/openemm" /> -- <property name="webroot-ws" location="${bin}/webapps/openemm-ws" /> -+ <property name="webroot" location="${oe.home}/webapps/openemm" /> -+ <property name="webroot-ws" location="${oe.home}/webapps/openemm-ws" /> - - - <!-- HELP --> -@@ -39,24 +39,11 @@ - - <!-- BUILD --> - <target name="build" description="Create OpenEMM Binary Tarball from Source Tarball"> -- <delete dir="${bin}" /> -- <mkdir dir="${bin}" /> -- <delete dir="${src}" /> -- <mkdir dir="${oe.home}/src" /> -- <!-- untar SRC tarball --> -- <exec executable="tar" dir="${oe.home}/src"> -- <arg line="-xvzf ${oe.home}/OpenEMM-${version}-src.tar.gz" /> -- </exec> -- <!-- untar JAR tarball --> -- <mkdir dir="${src}/lib" /> -- <exec executable="tar" dir="${src}/lib"> -- <arg line="-xzvf ${oe.home}/OpenEMM-${version}-JARs.tar.gz" /> -- </exec> - - <!-- Generate Frontend --> - <!-- Generate OpenEMM --> - <mkdir dir="${webroot}/WEB-INF/classes" /> -- <javac srcdir="${src}/src/java" destdir="${webroot}/WEB-INF/classes" fork="yes" executable="${jdk.compile}/bin/javac" debug="true" deprecation="true" includeantruntime="false"> -+ <javac srcdir="${src}/src/java" destdir="${webroot}/WEB-INF/classes" fork="yes" debug="true" deprecation="true" includeantruntime="false"> - <classpath> - <fileset dir="${src}/lib" /> - <fileset dir="${catalina.home}/lib" includes="*.jar"/> -@@ -77,7 +64,7 @@ - </copy> - <!-- Generate OpenEMM WS 2.0 --> - <mkdir dir="${webroot-ws}/WEB-INF/classes" /> -- <javac srcdir="${src}/src/java" destdir="${webroot-ws}/WEB-INF/classes" fork="yes" executable="${jdk.compile}/bin/javac" debug="true" deprecation="true" includeantruntime="false"> -+ <javac srcdir="${src}/src/java" destdir="${webroot-ws}/WEB-INF/classes" fork="yes" debug="true" deprecation="true" includeantruntime="false"> - <classpath> - <fileset dir="${src}/lib" /> - <fileset dir="${catalina.home}/lib" includes="*.jar"/> -@@ -98,58 +85,27 @@ - <fileset dir="${src}/lib" /> - </copy> - <!-- Generate OpenEMM WS 1.0 --> -- <copy todir="${bin}/webservices"> -+ <copy todir="${oe.home}/webservices"> - <fileset dir="${src}/webservices" /> - </copy> - - <!-- Generate Manual --> -- <copy todir="${bin}/webapps/manual"> -+ <copy todir="${oe.home}/webapps/manual"> - <fileset dir="${src}/manual" /> - </copy> - - <!-- Generate Backend --> -- <exec executable="make" dir="${src}/backend" /> - -- <copy todir="${bin}/bin"> -- <fileset dir="${src}/backend/src/script/control" /> -- <filelist dir="${src}/backend/src/c/bav" files="bav"/> -- <filelist dir="${src}/backend/src/c/tools" files="qctrl,smctrl,updater"/> -- <filelist dir="${src}/backend/src/c/xmlback" files="xmlback"/> -- <fileset dir="${src}/tomcat/bin" /> -- </copy> -- <delete> -- <filelist dir="${bin}/bin" files="config.bat,openemm.py,setup.bat,start.bat,update.bat" /> -- </delete> -- <copy todir="${bin}/bin/scripts"> -+ <copy todir="${bin}/scripts"> - <fileset dir="${src}/backend/src/script/process" /> -- <filelist dir="${src}/backend/src/c/bav" files="bavwrap" /> - <filelist dir="${src}/backend/src/script/lib" files="agn.py,aps.py,config.sh" /> - </copy> - <move todir="${bin}/conf/semu"> -- <fileset dir="${bin}/bin/scripts/semu" /> -+ <fileset dir="${bin}/scripts/semu" /> - </move> -- <move todir="${bin}/USR_SHARE" file="${bin}/bin/scripts/upgrade-postproc.sh" /> -- <exec executable="ln" dir="${bin}/bin/scripts"> -- <arg line="-s bavwrap filter_or_forward" /> -- </exec> -- <exec executable="ln" dir="${bin}/bin/scripts"> -- <arg line="-s bavwrap is_no_systemmail" /> -- </exec> -- <exec executable="ln" dir="${bin}/bin/scripts"> -- <arg line="-s bavwrap scan_and_unsubscribe" /> -- </exec> -- <delete dir="${bin}/bin/scripts/upgrade" /> -+ <move todir="${bin}/USR_SHARE" file="${bin}/scripts/upgrade-postproc.sh" /> -+ <delete dir="${bin}/scripts/upgrade" /> - -- <copy todir="${bin}/conf"> -- <fileset dir="${catalina.home}/conf" /> -- </copy> -- <delete> -- <filelist dir="${bin}/conf" files="context.xml,logging.properties,server.xml" /> -- </delete> -- <copy todir="${bin}/conf"> -- <fileset dir="${src}/tomcat/conf"/> -- </copy> -- <delete dir="${bin}/conf/Catalina" /> - <copy todir="${bin}/conf/bav"> - <fileset dir="${src}/backend/src/script/data" /> - </copy> -@@ -157,24 +113,19 @@ - <fileset dir="${src}/backend/src/script/process/upgrade" /> - </copy> - -- <mkdir dir="${bin}/var/lock" /> -- <mkdir dir="${bin}/var/log" /> -- <mkdir dir="${bin}/var/run" /> -- <mkdir dir="${bin}/var/spool/bav" /> -- <mkdir dir="${bin}/var/spool/filter" /> -- <mkdir dir="${bin}/var/spool/log" /> -- <mkdir dir="${bin}/var/spool/ADMIN" /> -- <mkdir dir="${bin}/var/spool/ARCHIVE" /> -- <mkdir dir="${bin}/var/spool/DELETED" /> -- <mkdir dir="${bin}/var/spool/META" /> -- <mkdir dir="${bin}/var/spool/QUEUE" /> -- <mkdir dir="${bin}/var/spool/RECOVER" /> -+ <mkdir dir="${oe.home}/var/lock" /> -+ <mkdir dir="${oe.home}/var/log" /> -+ <mkdir dir="${oe.home}/var/run" /> -+ <mkdir dir="${oe.home}/var/spool/bav" /> -+ <mkdir dir="${oe.home}/var/spool/filter" /> -+ <mkdir dir="${oe.home}/var/spool/log" /> -+ <mkdir dir="${oe.home}/var/spool/ADMIN" /> -+ <mkdir dir="${oe.home}/var/spool/ARCHIVE" /> -+ <mkdir dir="${oe.home}/var/spool/DELETED" /> -+ <mkdir dir="${oe.home}/var/spool/META" /> -+ <mkdir dir="${oe.home}/var/spool/QUEUE" /> -+ <mkdir dir="${oe.home}/var/spool/RECOVER" /> - -- <!-- Generate Other --> -- <mkdir dir="${bin}/logs/openemm" /> -- <mkdir dir="${bin}/logs/openemm-ws" /> -- <mkdir dir="${bin}/plugins" /> -- <mkdir dir="${bin}/temp" /> - - <copy todir="${bin}/USR_SHARE"> - <fileset dir="${src}/sql" /> -@@ -186,35 +137,7 @@ - <copy todir="${bin}/USR_SHARE/ThirdPartyLicences"> - <fileset dir="${src}/other/ThirdPartyLicences" /> - </copy> -- <copy todir="${bin}" file="${bin}/USR_SHARE/README.txt" /> -- <copy todir="${bin}" file="${bin}/USR_SHARE/UPDATE.txt" /> -- -- <!-- Assign Groups+Owners (first) and Permissions (second) --> -- <chgrp group="openemm" type="both" verbose="true"> -- <fileset dir="${bin}" /> -- </chgrp> -- <chown owner="openemm" type="both" verbose="true"> -- <fileset dir="${bin}" /> -- </chown> -- <chgrp group="root" file="${bin}/bin/qctrl" verbose="true" /> -- <chgrp group="root" file="${bin}/bin/smctrl" verbose="true" /> -- <chgrp group="root" file="${bin}/bin/updater" verbose="true" /> -- <chgrp group="root" file="${bin}/conf/bav/bav.rc" verbose="true" /> -- <chown owner="root" file="${bin}/bin/qctrl" verbose="true" /> -- <chown owner="root" file="${bin}/bin/smctrl" verbose="true" /> -- <chown owner="root" file="${bin}/bin/updater" verbose="true" /> -- <chown owner="root" file="${bin}/conf/bav/bav.rc" verbose="true" /> -- <chmod dir="${bin}/bin/" perm="a+x" includes="**/*" verbose="true" /> -- <chmod dir="${bin}/webservices/" perm="a+x" includes="**/*.sh" verbose="true" /> -- <chmod file="${bin}/USR_SHARE/upgrade-postproc.sh" perm="a+x" verbose="true" /> -- <chmod file="${bin}/conf/bav/bav.rc" perm="600" verbose="true" /> -- <exec executable="chmod" dir="${bin}/bin"> -- <arg line="6755 qctrl smctrl updater" /> -- </exec> -- -- <!-- Build Binary Tarball --> -- <exec executable="tar" dir="${bin}"> -- <arg line="-czvf ${oe.home}/OpenEMM-${version}-bin.tar.gz ." /> -- </exec> -+ <copy todir="${oe.home}" file="${bin}/USR_SHARE/README.txt" /> -+ <copy todir="${oe.home}" file="${bin}/USR_SHARE/UPDATE.txt" /> - </target> - </project> diff --git a/mail/openemm2015/files/patch-src__java__org__agnitas__util__XmlUtilities.java b/mail/openemm2015/files/patch-src__java__org__agnitas__util__XmlUtilities.java deleted file mode 100644 index 132822f9a7a3..000000000000 --- a/mail/openemm2015/files/patch-src__java__org__agnitas__util__XmlUtilities.java +++ /dev/null @@ -1,11 +0,0 @@ ---- src/java/org/agnitas/util/XmlUtilities.java.orig 2015-10-24 14:59:57 UTC -+++ src/java/org/agnitas/util/XmlUtilities.java -@@ -278,7 +278,7 @@ public class XmlUtilities { - logger.error(e.getClass().getSimpleName(), e); - throw new Exception("ErrorConstException.XML_PROCESSING " + e.getClass().getSimpleName() + " " + e.getMessage(), e); - } catch (IOException e) { -- logger.error(e.getClass().getSimpleName() + " während der XML-Verarbeitung", e); -+ logger.error(e.getClass().getSimpleName() + " w\u00e4hrend der XML-Verarbeitung", e); - throw new Exception("ErrorConstException.XML_PROCESSING " + e.getClass().getSimpleName() + " " + e.getMessage(), e); - } - } diff --git a/mail/openemm2015/files/patch-src__java__org__agnitas__web__MailingSendAction.java b/mail/openemm2015/files/patch-src__java__org__agnitas__web__MailingSendAction.java deleted file mode 100644 index 44fe86d672cf..000000000000 --- a/mail/openemm2015/files/patch-src__java__org__agnitas__web__MailingSendAction.java +++ /dev/null @@ -1,15 +0,0 @@ ---- src/java/org/agnitas/web/MailingSendAction.java.orig 2015-10-24 14:59:58 UTC -+++ src/java/org/agnitas/web/MailingSendAction.java -@@ -820,9 +820,9 @@ public class MailingSendAction extends S - - /** - * Write mailing send to user log -- * @param admin — admin -- * @param sendDate — scheduled send date -- * @param aMailing — mailing to send -+ * @param admin admin -+ * @param sendDate scheduled send date -+ * @param aMailing mailing to send - */ - protected void logSendAction(Admin admin, Date sendDate, Mailing aMailing) { - final String description = "mailing %s(%d) %s"; diff --git a/mail/openemm2015/files/patch-src__java__org__agnitas__web__filter__GZipRequestFilter.java b/mail/openemm2015/files/patch-src__java__org__agnitas__web__filter__GZipRequestFilter.java deleted file mode 100644 index 24dc93e31d99..000000000000 --- a/mail/openemm2015/files/patch-src__java__org__agnitas__web__filter__GZipRequestFilter.java +++ /dev/null @@ -1,55 +0,0 @@ ---- src/java/org/agnitas/web/filter/GZipRequestFilter.java.orig 2015-10-24 14:59:58 UTC -+++ src/java/org/agnitas/web/filter/GZipRequestFilter.java -@@ -39,6 +39,8 @@ import javax.servlet.ServletInputStream; - import javax.servlet.ServletOutputStream; - import javax.servlet.ServletRequest; - import javax.servlet.ServletResponse; -+import javax.servlet.WriteListener; -+import javax.servlet.ReadListener; - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletRequestWrapper; - import javax.servlet.http.HttpServletResponse; -@@ -177,6 +179,16 @@ public class GZipRequestFilter implement - throws IOException { - this.gzipOutputStream.write(bytes, offset, length); - } -+ -+ @Override -+ public void setWriteListener(WriteListener writeListener){ -+ -+ } -+ -+ @Override -+ public boolean isReady(){ -+ return true; -+ } - } - - private class GZIPServletRequestWrapper extends HttpServletRequestWrapper{ -@@ -207,5 +219,26 @@ public class GZipRequestFilter implement - public int read() throws IOException { - return this.input.read(); - } -+ -+ @Override -+ public void setReadListener(ReadListener readListener){ -+ } -+ -+ @Override -+ public boolean isReady(){ -+ return true; -+ } -+ -+ @Override -+ public boolean isFinished() { -+ -+ int count = -1; -+ -+ try{ -+ count = this.input.available(); -+ } catch (IOException ioe){} -+ -+ return count <= 0; -+ } - } - } diff --git a/mail/openemm2015/files/patch-src__jsp__WEB-INF__web.xml b/mail/openemm2015/files/patch-src__jsp__WEB-INF__web.xml deleted file mode 100644 index b05cac8bec31..000000000000 --- a/mail/openemm2015/files/patch-src__jsp__WEB-INF__web.xml +++ /dev/null @@ -1,14 +0,0 @@ ---- src/jsp/WEB-INF/web.xml.orig 2015-10-24 14:59:58 UTC -+++ src/jsp/WEB-INF/web.xml -@@ -1,8 +1,8 @@ - <?xml version="1.0" encoding="UTF-8"?> --<web-app xmlns="http://java.sun.com/xml/ns/javaee" -+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" --xsi:schemaLocation="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" --version="2.5"> -+xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/" -+version="3.1"> - - <!-- Spring context --> - <context-param> diff --git a/mail/openemm2015/files/pkg-message.in b/mail/openemm2015/files/pkg-message.in deleted file mode 100644 index 23bcdd312089..000000000000 --- a/mail/openemm2015/files/pkg-message.in +++ /dev/null @@ -1,127 +0,0 @@ -[ -{ type: install - message: <<EOM -To Upgrade from prev version backup the db ! - -$> mysqldump -aCceQx --hex-blob --routines --triggers -u root -p -r /tmp/openemm-db.sql openemm -$> mysqldump -aCceQx --hex-blob --routines --triggers -u root -p -r /tmp/openemm_cms-db.sql openemm-cms - - -To integrate the OpenEMM 2015 to the installed Tomcat add this -chunk to the server.xml of Tomcat: -TOMCAT_HOME= %%PREFIX%%/apache-tomcat-8.5/lib/ - -vi TOMCAT_HOME/conf/server.xml - - <Engine> - ..... - <!-- add this part START --> - <Host name="OpenEMM" appBase="webapps-empty" autoDeploy="true" unpackWARs="false" xmlValidation="false" xmlNamespaceAware="false"> - <Alias>localhost</Alias> - <Valve className="org.apache.catalina.valves.AccessLogValve" - resolveHosts="false" directory="${catalina.base}/logs/access/" rotatable="true" buffered="true" - prefix="" suffix="-access_openemm.log" fileDateFormat="yyyyMMdd" - pattern='%a %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"' /> - <Context cookies="false" docBase="%%APP_HOME%%/webapps/openemm" path="/openemm" reloadable="true" > - <JarScanner scanAllDirectories="true" scanBootstrapClassPath="true"/> - </Context> - <Context cookies="false" docBase="%%APP_HOME%%/webapps/openemm-ws" path="/openemm-ws2" reloadable="true" /> - <Context docBase="%%APP_HOME%%/webapps/manual" path="/manual" allowLinking="true" /> - </Host> - <!-- 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: - -vi TOMCAT_HOME/conf/context.xml - -<Context> - .... - <Resource - name="jdbc/openemm_db" - driverClassName="com.mysql.cj.jdbc.Driver" - type="javax.sql.DataSource" - maxTotal="30" - auth="Container" - username="agnitas" - password="openemm" - url="jdbc:mysql://localhost/openemm?useUnicode=yes&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&zeroDateTimeBehavior=convertToNull" - /> - - <Resource - name="jdbc/openemm_cms_db" - driverClassName="com.mysql.cj.jdbc.Driver" - type="javax.sql.DataSource" - maxTotal="30" - auth="Container" - username="agnitas" - password="openemm" - url="jdbc:mysql://localhost/openemm_cms?useUnicode=yes&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&zeroDateTimeBehavior=convertToNull - /> -</Context> - -If database not running on localhost, replace according in the url. - -# IMPORTANT sendmail is completly controlled from OpenEMM! -# It stops and starts sendmail -# check if sendmail is enabled -sendmail_enable="YES" - -# check also if you have a symlink to sendmail -ln -s /etc/rc.d/sendmail /etc/rc.d/ - -# update the read right on the maillog file -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 - -# 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 - -create database openemm; -create database openemm_cms; - -#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'; - -flush privileges; - -# import the inital data -mysql -u root -p openemm < %%PREFIX%%/share/doc/openemm2015/openemm-2015.sql -mysql -u root -p openemm_cms < %%PREFIX%%/share/doc/openemm2015/openemm_cms-2015.sql - -#additional config for db acces can be done -%%PREFIX%%/openemm2015/webapps/openemm/WEB-INF/classes/emm.properties -or -%%PREFIX%%/openemm2015/webapps/openemm/WEB-INF/classes/cms.properties - -# startup config for tomcat and OpenEMM -add to /etc/rc.conf -# 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 tomcat85 start -service openemm2015 start -or -%%PREFIX%%/etc/rc.d/openemm2015 start -EOM -} -] |