ports/75487: [maintainer] let www/jakarta-tomcat3 backup config files during deinstall
Kang Liu
liukang at bjut.edu.cn
Sat Dec 25 10:20:03 UTC 2004
>Number: 75487
>Category: ports
>Synopsis: [maintainer] let www/jakarta-tomcat3 backup config files during deinstall
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 25 10:20:01 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Kang Liu
>Release: 4.10 & 5.3
>Organization:
Beijing University of Technology
>Environment:
FreeBSD 4.11-PRERELEASE #81: Mon Dec 13 00:56:55 CST 2004
>Description:
The config files should not be deleted during deinstall.
In my patch:
1. Backup config files during deinstall;
2. Fix wrong plist problem when "NOPORTDOCS" defined;
3. Fix pkg_add permission problem, described in PR: ports/57235
4. Bump PORTREVISION.
>How-To-Repeat:
[1] After "make deinstall" or "pkg_delete", all config files will be delete.
[2] make install -DNOPORTDOCS
[3] make package, then pkg_add
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat3/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- Makefile 6 Dec 2004 02:42:23 -0000 1.46
+++ Makefile 25 Dec 2004 10:05:19 -0000
@@ -7,6 +7,7 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 3.3.2
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= tomcat-3/v${PORTVERSION}/bin
@@ -14,7 +15,9 @@
MAINTAINER= liukang at bjut.edu.cn
COMMENT= Open-source Java web server by Apache, stable 3.x branch
-MAN1= ${CONTROL_SCRIPT_NAME}.1
+.if !defined(NOPORTDOCS)
+MAN1= ${CONTROL_SCRIPT_NAME}.1
+.endif
USE_JAVA= YES
JAVA_VERSION= 1.2+
@@ -25,7 +28,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION:R}
LOG_DIR= ${APP_HOME}/logs
-PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///}
+PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
APP_TITLE= Jakarta Tomcat
APP_SHORTNAME= tomcat${MAJOR_VER}
CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl
@@ -49,31 +52,32 @@
${WRKSRC}/conf/server.xml
JAR_FILE= lib/tomcat.jar
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
-
+CONF_EXT= sample
+PLIST_SUB+= CONF_EXT=${CONF_EXT}
.include <bsd.port.pre.mk>
pre-patch:
- @${ECHO_CMD} "Installation settings:"
- @${ECHO_CMD} " Destination directory: ${APP_HOME}"
- @${ECHO_CMD} " Control program location: ${CONTROL_SCRIPT}"
- @${ECHO_CMD} " Startup script location: ${STARTUP_SCRIPT}"
- @${ECHO_CMD} " Location of JDK: ${JAVA_HOME}"
- @${ECHO_CMD} " Location of Java port: ${JAVA_PORT}"
- @${ECHO_CMD} " Running as (user/group): ${USER}/${GROUP}"
- @${ECHO_CMD} " HTTP port: ${HTTP_PORT}"
- @${ECHO_CMD} " Logfile stdout: ${STDOUT_LOG}"
- @${ECHO_CMD} " Logfile stderr: ${STDERR_LOG}"
- @${ECHO_CMD} " Starting after install: ${AUTO_START}"
- @${ECHO_CMD} " Stop time-out: ${STOP_TIMEOUT} sec."
+ @${ECHO_MSG} "Installation settings:"
+ @${ECHO_MSG} " Destination directory: ${APP_HOME}"
+ @${ECHO_MSG} " Control program location: ${CONTROL_SCRIPT}"
+ @${ECHO_MSG} " Startup script location: ${STARTUP_SCRIPT}"
+ @${ECHO_MSG} " Location of JDK: ${JAVA_HOME}"
+ @${ECHO_MSG} " Location of Java port: ${JAVA_PORT}"
+ @${ECHO_MSG} " Running as (user/group): ${USER}/${GROUP}"
+ @${ECHO_MSG} " HTTP port: ${HTTP_PORT}"
+ @${ECHO_MSG} " Logfile stdout: ${STDOUT_LOG}"
+ @${ECHO_MSG} " Logfile stderr: ${STDERR_LOG}"
+ @${ECHO_MSG} " Starting after install: ${AUTO_START}"
+ @${ECHO_MSG} " Stop time-out: ${STOP_TIMEOUT} sec."
@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
post-patch:
- @${ECHO_CMD} -n ">> Removing unneeded files..."
+ @${ECHO_MSG} -n ">> Removing unneeded files..."
@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
.for f in ${REPLACE_FILES}
- @${ECHO_CMD} -n ">> Customizing `basename $f`..."
+ @${ECHO_MSG} -n ">> Customizing `basename $f`..."
@${SED} \
-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
@@ -98,21 +102,30 @@
-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
-e "/%%USER%%/s//${USER}/g" \
$f > ${WRKDIR}/`basename $f`
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
.endfor
do-install:
- @${ECHO_CMD} -n ">> Creating destination directory..."
+ @${ECHO_MSG} -n ">> Creating destination directory..."
@${MKDIR} ${APP_HOME}
@${MKDIR} ${LOG_DIR}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Copying files to destination directory..."
+ @${ECHO_MSG} ">> Copying files to destination directory..."
+ @(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
+ | while read a; do \
+ ${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
+ if [ ! -e "${APP_HOME}/$$a" ]; then \
+ ${ECHO_MSG} " Installing local configuration file: $$a"; \
+ ${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
+ else \
+ ${ECHO_MSG} " Preserving local configuration file: $$a"; \
+ fi; \
+ done
@${CP} -R ${WRKSRC}/* ${APP_HOME}
- @${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Compiling and installing control program..."
+ @${ECHO_MSG} -n ">> Compiling and installing control program..."
@${SED} \
-e "/%%JAVA_ARGS%%/s//\"-Dtomcat.install=${APP_HOME:S/\//\\\//g}\",/g" \
-e "/%%JAR_ARGS%%/s//\"run\",/g" \
@@ -121,43 +134,43 @@
@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
@${CHMOD} 6754 ${CONTROL_SCRIPT}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Installing startup script..."
+ @${ECHO_MSG} -n ">> Installing startup script..."
@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
@${CHMOD} 0544 ${STARTUP_SCRIPT}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
.if !defined(NOPORTDOCS)
- @${ECHO_CMD} -n ">> Installing man pages..."
+ @${ECHO_MSG} -n ">> Installing man pages..."
@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
.endif
- @${ECHO_CMD} -n ">> Creating log files..."
+ @${ECHO_MSG} -n ">> Creating log files..."
@${INSTALL} /dev/null ${STDOUT_LOG}
@${INSTALL} /dev/null ${STDERR_LOG}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Fixing ownership settings..."
+ @${ECHO_MSG} -n ">> Fixing ownership settings..."
@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Fixing permissions..."
+ @${ECHO_MSG} -n ">> Fixing permissions..."
@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Creating PID file..."
+ @${ECHO_MSG} -n ">> Creating PID file..."
@${TOUCH} ${PID_FILE}
@${CHOWN} ${USER}:${GROUP} ${PID_FILE}
@${CHMOD} 0600 ${PID_FILE}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
post-install:
- @${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
- @${ECHO_CMD} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
+ @${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
+ @${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
.if !defined(NOPORTDOCS)
- @${ECHO_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
+ @${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
.endif
.if ${AUTO_START} == "YES"
@${CONTROL_SCRIPT} start || true
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat3/pkg-plist,v
retrieving revision 1.16
diff -u -r1.16 pkg-plist
--- pkg-plist 6 Dec 2004 02:42:23 -0000 1.16
+++ pkg-plist 25 Dec 2004 09:42:42 -0000
@@ -1,4 +1,23 @@
@comment $FreeBSD: ports/www/jakarta-tomcat3/pkg-plist,v 1.16 2004/12/06 02:42:23 hq Exp $
+ at unexec if cmp -s %D/%%T%%/conf/jk/mod_jk.conf %D/%%T%%/conf/jk/mod_jk.conf.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk/mod_jk.conf; fi
+ at unexec if cmp -s %D/%%T%%/conf/jk/mod_jk.conf-jni %D/%%T%%/conf/jk/mod_jk.conf-jni.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk/mod_jk.conf-jni; fi
+ at unexec if cmp -s %D/%%T%%/conf/jk/obj.conf %D/%%T%%/conf/jk/obj.conf.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk/obj.conf; fi
+ at unexec if cmp -s %D/%%T%%/conf/jk/uriworkermap.properties %D/%%T%%/conf/jk/uriworkermap.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk/uriworkermap.properties; else fi
+ at unexec if cmp -s %D/%%T%%/conf/jk/workers.properties %D/%%T%%/conf/jk/workers.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk/workers.properties; fi
+ at unexec if cmp -s %D/%%T%%/conf/jk/wrapper.properties %D/%%T%%/conf/jk/wrapper.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk/wrapper.properties; fi
+ at unexec if cmp -s %D/%%T%%/conf/jserv/tomcat.conf %D/%%T%%/conf/jserv/tomcat.conf.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jserv/tomcat.conf; fi
+ at unexec if cmp -s %D/%%T%%/conf/jserv/tomcat.properties %D/%%T%%/conf/jserv/tomcat.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jserv/tomcat.properties; fi
+ at unexec if cmp -s %D/%%T%%/conf/jk2.properties %D/%%T%%/conf/jk2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.properties; fi
+ at unexec if cmp -s %D/%%T%%/conf/apps-127.0.0.1.xml %D/%%T%%/conf/apps-127.0.0.1.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/apps-127.0.0.1.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/apps-admin.xml %D/%%T%%/conf/apps-admin.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/apps-admin.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/apps-examples.xml %D/%%T%%/conf/apps-examples.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/apps-examples.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/tomcat.policy %D/%%T%%/conf/tomcat.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat.policy; fi
+ at unexec if cmp -s %D/%%T%%/conf/modules.xml %D/%%T%%/conf/modules.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/modules.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/users/admin-users.xml %D/%%T%%/conf/users/admin-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/users/admin-users.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/users/example-users.xml %D/%%T%%/conf/users/example-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/users/example-users.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/users/global-users.xml %D/%%T%%/conf/users/global-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/users/global-users.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/users/tomcat-users.xml %D/%%T%%/conf/users/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/users/tomcat-users.xml; fi
bin/tomcat3ctl
etc/rc.d/020.jakarta-tomcat3.sh
%%T%%/logs/stdout.log
@@ -98,25 +117,25 @@
%%T%%/webapps/ROOT.war
%%T%%/webapps/admin.war
%%T%%/webapps/examples.war
-%%T%%/conf/jk/mod_jk.conf
-%%T%%/conf/jk/mod_jk.conf-jni
-%%T%%/conf/jk/obj.conf
-%%T%%/conf/jk/uriworkermap.properties
-%%T%%/conf/jk/workers.properties
-%%T%%/conf/jk/wrapper.properties
-%%T%%/conf/jserv/tomcat.conf
-%%T%%/conf/jserv/tomcat.properties
-%%T%%/conf/users/admin-users.xml
-%%T%%/conf/users/example-users.xml
-%%T%%/conf/users/global-users.xml
-%%T%%/conf/users/tomcat-users.xml
-%%T%%/conf/jk2.properties
-%%T%%/conf/modules.xml
-%%T%%/conf/server.xml
-%%T%%/conf/tomcat.policy
-%%T%%/conf/apps-127.0.0.1.xml
-%%T%%/conf/apps-admin.xml
-%%T%%/conf/apps-examples.xml
+%%T%%/conf/jk/mod_jk.conf.%%CONF_EXT%%
+%%T%%/conf/jk/mod_jk.conf-jni.%%CONF_EXT%%
+%%T%%/conf/jk/obj.conf.%%CONF_EXT%%
+%%T%%/conf/jk/uriworkermap.properties.%%CONF_EXT%%
+%%T%%/conf/jk/workers.properties.%%CONF_EXT%%
+%%T%%/conf/jk/wrapper.properties.%%CONF_EXT%%
+%%T%%/conf/jserv/tomcat.conf.%%CONF_EXT%%
+%%T%%/conf/jserv/tomcat.properties.%%CONF_EXT%%
+%%T%%/conf/users/admin-users.xml.%%CONF_EXT%%
+%%T%%/conf/users/example-users.xml.%%CONF_EXT%%
+%%T%%/conf/users/global-users.xml.%%CONF_EXT%%
+%%T%%/conf/users/tomcat-users.xml.%%CONF_EXT%%
+%%T%%/conf/jk2.properties.%%CONF_EXT%%
+%%T%%/conf/modules.xml.%%CONF_EXT%%
+%%T%%/conf/server.xml.%%CONF_EXT%%
+%%T%%/conf/tomcat.policy.%%CONF_EXT%%
+%%T%%/conf/apps-127.0.0.1.xml.%%CONF_EXT%%
+%%T%%/conf/apps-admin.xml.%%CONF_EXT%%
+%%T%%/conf/apps-examples.xml.%%CONF_EXT%%
%%T%%/bin/jspc
%%T%%/bin/shutdown
%%T%%/bin/startup
@@ -124,6 +143,14 @@
%%T%%/ant/tomcat-ant.jar
%%T%%/LICENSE
%%T%%/KEYS
+ at exec mkdir %D/%%T%%/conf/auto || true
+ at exec mkdir %D/%%T%%/modules || true
+ at exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
+ at unexec rmdir %D/%%T%%/conf/users
+ at unexec rmdir %D/%%T%%/conf/auto
+ at unexec rmdir %D/%%T%%/conf/jserv
+ at unexec rmdir %D/%%T%%/conf/jk
+ at unexec rmdir %D/%%T%%/conf
@dirrm %%T%%/logs
@dirrm %%T%%/doc/images
@dirrm %%T%%/doc/appdev/sample/etc
@@ -143,11 +170,6 @@
@dirrm %%T%%/lib/endorsed
@dirrm %%T%%/lib
@dirrm %%T%%/webapps
- at dirrm %%T%%/conf/jk
- at dirrm %%T%%/conf/jserv
- at dirrm %%T%%/conf/users
- at dirrm %%T%%/conf/auto
- at dirrm %%T%%/conf
@dirrm %%T%%/bin
@dirrm %%T%%/ant
@dirrm %%T%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list