From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 23 19:30:13 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78CE3106566C for ; Thu, 23 Jun 2011 19:30:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 65C6F8FC19 for ; Thu, 23 Jun 2011 19:30:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5NJUDtb088398 for ; Thu, 23 Jun 2011 19:30:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5NJUDJX088393; Thu, 23 Jun 2011 19:30:13 GMT (envelope-from gnats) Date: Thu, 23 Jun 2011 19:30:13 GMT Message-Id: <201106231930.p5NJUDJX088393@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Jason Helfman Cc: Subject: Re: ports/157915 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jason Helfman List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2011 19:30:13 -0000 The following reply was made to PR ports/157915; it has been noted by GNATS. From: Jason Helfman To: bug-followup@freebsd.org Cc: eadler@freebsd.org Subject: Re: ports/157915 Date: Thu, 23 Jun 2011 12:20:55 -0700 Hi, Please disregard previously submitted patches, as this includes all patches. This fixes an option to log via cronolog, properly, as it was not working before, and not certain why. May have been due to bad testing, but this was awhile ago now, and I can't recall. All of that being said, this has been fully tested with default option, and cronolog options, and it works as it should, and logs as it should. Thanks! files/logprocessor-cronolog (dead, removed) Index: tomcat55/Makefile =================================================================== RCS file: /home/jhelfman/ncvs/ports/www/tomcat55/Makefile,v retrieving revision 1.58 diff -u -r1.58 Makefile --- tomcat55/Makefile 15 Feb 2011 07:22:27 -0000 1.58 +++ tomcat55/Makefile 23 Jun 2011 18:54:28 -0000 @@ -34,6 +34,8 @@ TOMCAT_USER?= www TOMCAT_GROUP?= www TOMCAT_UID?= 80 +USERS= ${TOMCAT_USER} +GROUPS= ${TOMCAT_GROUP} HTTP_PORT?= 8180 HTTP_TIMEOUT?= 20000 SHUTDOWN_PORT?= 8005 @@ -61,6 +63,7 @@ HTTP_TIMEOUT=${HTTP_TIMEOUT} \ JAR_FILE=${JAR_FILE} \ JAVA_HOME=${JAVA_HOME} \ + LOG_ARGS=${LOG_ARGS} \ LOG_DIR=${LOG_DIR} \ PID_FILE=${PID_FILE} \ PORTNAME=${PORTNAME} \ @@ -89,15 +92,10 @@ RUN_DEPENDS+= cronolog:${PORTSDIR}/sysutils/cronolog-devel .endif -.if ( defined(WITH_CRONOLOG) || (WITH_CRONOLOG_DEVEL) ) -LOG_PROCESSOR?= ${LOCALBASE}/sbin/cronolog -LOG_PROCESSOR_DIRECTIVES?= "\$$CATALINA_OUT \$$CATALINA_BASE/logs/catalina.out.\%Y_\%m_\%d.out" -LOG_PROCESSOR_OPTS?= --link -REDIRECT?= "2\>\&1" -SUB_LIST+= LOG_PROCESSOR=${LOG_PROCESSOR} \ - LOG_PROCESSOR_DIRECTIVES=${LOG_PROCESSOR_DIRECTIVES} \ - LOG_PROCESSOR_OPTS=${LOG_PROCESSOR_OPTS} \ - REDIRECT=${REDIRECT} +.if !( defined(WITH_CRONOLOG) || (WITH_CRONOLOG_DEVEL) ) +LOG_ARGS?=">> \$${tomcat\%\%TOMCAT_VERSION\%\%_stdout_log} 2>> \$${tomcat\%\%TOMCAT_VERSION\%\%_stderr_log}" +.else +LOG_ARGS?= "2>\&1 | ${LOCALBASE}/sbin/cronolog --link \$${tomcat55_catalina_base}/logs/catalina.out \$${tomcat55_catalina_base}/logs/catalina.\%Y_\%m_\%d.out \&" .endif .if ( defined(WITH_CRONOLOG) && defined(WITH_CRONOLOG_DEVEL) ) @@ -116,11 +114,6 @@ @${ECHO_MSG} " Logfile stdout: ${STDOUT_LOG}" @${ECHO_MSG} " Logfile stderr: ${STDERR_LOG}" -post-patch: -.if ( defined(WITH_CRONOLOG) || (WITH_CRONOLOG_DEVEL) ) - @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/logprocessor-cronolog -.endif - @${ECHO_MSG} -n ">> Removing unneeded files..." @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete @${RMDIR} ${WRKSRC}/bin/[i,x]64 Index: tomcat55/files/logprocessor-cronolog =================================================================== RCS file: tomcat55/files/logprocessor-cronolog diff -N tomcat55/files/logprocessor-cronolog --- tomcat55/files/logprocessor-cronolog 12 Dec 2010 18:46:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,74 +0,0 @@ ---- bin/catalina.sh.orig 2010-09-04 12:53:47.000000000 -0700 -+++ bin/catalina.sh 2010-12-08 16:10:30.000000000 -0800 -@@ -245,7 +245,9 @@ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -- org.apache.catalina.startup.Bootstrap "$@" start -+ org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \ -+ | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" & -+ - else - exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -@@ -253,7 +255,8 @@ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -- org.apache.catalina.startup.Bootstrap "$@" start -+ org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \ -+ | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" & - fi - fi - -@@ -272,14 +275,16 @@ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -- org.apache.catalina.startup.Bootstrap "$@" start -+ org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \ -+ | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" & - else - exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -- org.apache.catalina.startup.Bootstrap "$@" start -+ org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \ -+ | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" & - fi - - elif [ "$1" = "start" ] ; then -@@ -298,8 +303,8 @@ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -- org.apache.catalina.startup.Bootstrap "$@" start \ -- >> "$CATALINA_OUT" 2>&1 & -+ org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \ -+ | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" & - - if [ ! -z "$CATALINA_PID" ]; then - echo $! > $CATALINA_PID -@@ -310,8 +315,8 @@ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -- org.apache.catalina.startup.Bootstrap "$@" start \ -- >> "$CATALINA_OUT" 2>&1 & -+ org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \ -+ | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" & - - if [ ! -z "$CATALINA_PID" ]; then - echo $! > $CATALINA_PID -@@ -332,7 +337,8 @@ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -- org.apache.catalina.startup.Bootstrap "$@" stop -+ org.apache.catalina.startup.Bootstrap "$@" stop %%REDIRECT%% \ -+ | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" & - - if [ $FORCE -eq 1 ]; then - if [ ! -z "$CATALINA_PID" ]; then Index: tomcat55/files/pkg-install.in =================================================================== RCS file: /home/jhelfman/ncvs/ports/www/tomcat55/files/pkg-install.in,v retrieving revision 1.3 diff -u -r1.3 pkg-install.in --- tomcat55/files/pkg-install.in 7 Oct 2010 21:17:37 -0000 1.3 +++ tomcat55/files/pkg-install.in 23 Jun 2011 16:45:35 -0000 @@ -19,46 +19,6 @@ STDOUT_LOG=%%STDOUT_LOG%% STDERR_LOG=%%STDERR_LOG%% -uidgid() { -if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then - - # If not, try to create it - if pw groupadd "${GROUP}" -g ${GID}; then - echo "Added group \"${GROUP}\"." - elif pw groupadd "${GROUP}"; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi -else - echo "You already have a group \"${GROUP}\", so I will use it." -fi - -# See if the user already exists -if ! pw usershow "${USER}" 2>/dev/null 1>&2; then - - # If not, try to create it - if pw useradd "${USER}" -u ${UID} -g "${GROUP}" -h - \ - -s "/usr/sbin/nologin" -d "/nonexistent" \ - -c "World Wide Web Owner"; - then - echo "Added user \"${USER}\"." - elif pw useradd "${USER}" -g "${GROUP}" -h - \ - -s "/usr/sbin/nologin" -d "/nonexistent" \ - -c "World Wide Web Owner"; - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi -else - echo "You already have a user \"${USER}\", so I will use it." -fi -} - - post() { echo -n ">> Creating destination directory..." mkdir -p ${APP_HOME} @@ -93,13 +53,11 @@ # PACKAGE_BUILDING is only defined on the build cluster or tinderbox! # No interactive parts, there is no one who can answer! if [ "x${PACKAGE_BUILDING}" != "x" ]; then - uidgid post exit 0 fi if [ "$2" = "POST-INSTALL" ]; then - uidgid post exit 0 fi Index: tomcat55/files/tomcat55.sh.in =================================================================== RCS file: /home/jhelfman/ncvs/ports/www/tomcat55/files/tomcat55.sh.in,v retrieving revision 1.10 diff -u -r1.10 tomcat55.sh.in --- tomcat55/files/tomcat55.sh.in 7 Oct 2010 21:17:37 -0000 1.10 +++ tomcat55/files/tomcat55.sh.in 23 Jun 2011 18:45:35 -0000 @@ -102,8 +102,7 @@ -Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \ org.apache.catalina.startup.Bootstrap" -log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \ - 2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} " +log_args="%%LOG_ARGS%%" # Subvert the check_pid_file procname check. if [ -f $pidfile ]; then -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5