rpms/tomcat5/F-8 tomcat5-5.5-catalina.sh.patch, 1.3, 1.4 tomcat5-5.5.conf, 1.4, 1.5 tomcat5-5.5.init, 1.5, 1.6 tomcat5.spec, 1.102, 1.103
Devrim GÜNDÜZ (devrim)
fedora-extras-commits at redhat.com
Sat Jan 5 12:29:28 UTC 2008
- Previous message (by thread): rpms/tomcat5/F-7 tomcat5-5.5-catalina.sh.patch, 1.3, 1.4 tomcat5-5.5.conf, 1.4, 1.5 tomcat5-5.5.init, 1.5, 1.6 tomcat5.spec, 1.101, 1.102
- Next message (by thread): rpms/eggdrop/devel eggdrop.spec,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: devrim
Update of /cvs/extras/rpms/tomcat5/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11240/F-8
Modified Files:
tomcat5-5.5-catalina.sh.patch tomcat5-5.5.conf
tomcat5-5.5.init tomcat5.spec
Log Message:
First cut of Tomcat5 bug closing day:
- Fix for bz #153187
- Fix init script for bz #380921
- Fix tomcat5.conf and spec file for bz #253605
- Fix for bz #426850
- Fix for bz #312561
tomcat5-5.5-catalina.sh.patch:
Index: tomcat5-5.5-catalina.sh.patch
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/F-8/tomcat5-5.5-catalina.sh.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat5-5.5-catalina.sh.patch 4 Oct 2006 20:19:04 -0000 1.3
+++ tomcat5-5.5-catalina.sh.patch 5 Jan 2008 12:28:54 -0000 1.4
@@ -42,7 +42,7 @@
+if [ -z "$JAVA_HOME" ]; then
+ # Search for java in PATH
+ JAVA=`which java`
-+ if [ -z "$JAVA" ] ; then
++ if [ -n "$JAVA" ] ; then
+ JAVA_BINDIR=`dirname ${JAVA}`
+ JAVA_HOME="${JAVA_BINDIR}/.."
+ fi
Index: tomcat5-5.5.conf
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/F-8/tomcat5-5.5.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat5-5.5.conf 19 Feb 2007 18:52:28 -0000 1.4
+++ tomcat5-5.5.conf 5 Jan 2008 12:28:54 -0000 1.5
@@ -18,7 +18,7 @@
#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
# Use JAVA_OPTS to set java.library.path for libtcnative.so
-#JAVA_OPTS="-Djava.library.path=/usr/lib
+#JAVA_OPTS="-Djava.library.path=@@@LIBDIR@@@
# Bug 190:
# https://www.jpackage.org/bugzilla/show_bug.cgi?id=190
Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/F-8/tomcat5-5.5.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat5-5.5.init 16 May 2007 10:57:12 -0000 1.5
+++ tomcat5-5.5.init 5 Jan 2008 12:28:54 -0000 1.6
@@ -18,11 +18,10 @@
# - heavily rewritten by Deepak Bhole and Jason Corley
#
-# commented out until the RHEL and FC daemon functions converge
# Source the function library
-#if [ -r "/etc/rc.d/init.d/functions" ]; then
- #. /etc/rc.d/init.d/functions
-#fi
+if [ -r "/etc/rc.d/init.d/functions" ]; then
+ . /etc/rc.d/init.d/functions
+fi
NAME="$(basename $0)"
unset ISBOOT
@@ -64,45 +63,17 @@
# Define the tomcat username
TOMCAT_USER="${TOMCAT_USER:-tomcat}"
+# Define the tomcat group
+TOMCAT_GROUP="${TOMCAT_GROUP:-tomcat}"
+
# Define the tomcat log file
TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat5/catalina.out}"
+
+test -e $TOMCAT_LOG || touch $TOMCAT_LOG
+chown $TOMCAT_USER:$TOMCAT_GROUP $TOMCAT_LOG
RETVAL="0"
-# remove when the RHEL and FC daemon functions converge
-# (pulled from /etc/rc.d/init.d/functions)
-function checkpid() {
- local i
- for i in $* ; do
- if [ -d "/proc/${i}" ]; then
- return 0
- fi
- done
- return 1
-}
-
-# remove when the RHEL and FC daemon functions converge
-# (pulled from /etc/rc.d/init.d/functions)
-function echo_failure() {
- echo -en "\\033[60G"
- echo -n "[ "
- echo -n $"FAILED"
- echo -n " ]"
- echo -ne "\r"
- return 1
-}
-
-# remove when the RHEL and FC daemon functions converge
-# (pulled from /etc/rc.d/init.d/functions)
-function echo_success() {
- echo -en "\\033[60G"
- echo -n "[ "
- echo -n $"OK"
- echo -n " ]"
- echo -ne "\r"
- return 0
-}
-
# Look for open ports, as the function name might imply
function findFreePorts() {
local isSet1="false"
Index: tomcat5.spec
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/F-8/tomcat5.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- tomcat5.spec 16 Nov 2007 16:41:23 -0000 1.102
+++ tomcat5.spec 5 Jan 2008 12:28:54 -0000 1.103
@@ -69,7 +69,7 @@
Name: tomcat5
Epoch: 0
Version: 5.5.25
-Release: 1jpp.1%{?dist}
+Release: 2jpp.1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
Group: Networking/Daemons
@@ -620,7 +620,7 @@
touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
%{__install} -d -m 755 ${RPM_BUILD_ROOT}{%{serverdir},%{tempdir},%{workdir}}
%{__install} -d -m 755 ${RPM_BUILD_ROOT}{%{appdir},%{commondir},%{shareddir}}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{init.d,logrotate.d}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{rc.d/init.d,logrotate.d}
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_bindir}
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__install} -m 755 %{SOURCE5} ${RPM_BUILD_ROOT}%{bindir}/relink
@@ -648,7 +648,7 @@
%{__install} -m 0644 %{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
%{__rm} %{name}
%{__install} %{SOURCE1} \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name}
# Global configuration file
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}
%{__cat} > %{name}.conf << EOT
@@ -700,7 +700,7 @@
${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} \
${RPM_BUILD_ROOT}%{_bindir}/d%{name} \
${RPM_BUILD_ROOT}%{_bindir}/%{name} \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name} \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name} \
${RPM_BUILD_ROOT}%{bindir}/relink \
${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}; do
%{__sed} -i -e 's|\@\@\@TCCONF\@\@\@|%{confdir}|g' \
@@ -1070,8 +1070,8 @@
# Always clean up workdir and tempdir on upgrade/removal
%{__rm} -fr %{workdir}/* %{tempdir}/*
if [ $1 = 0 ]; then
- [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/init.d/%{name} stop
- [ -f %{_sysconfdir}/init.d/%{name} ] && /sbin/chkconfig --del %{name}
+ [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/rc.d/init.d/%{name} stop
+ [ -f %{_sysconfdir}/rc.d/init.d/%{name} ] && /sbin/chkconfig --del %{name}
# Remove automated symlinks
for repository in %{commondir}/endorsed; do
find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
@@ -1148,7 +1148,7 @@
%attr(755,root,root) %{bindir}/relink
%attr(644,root,root) %{bindir}/*.jar
%attr(644,root,root) %{bindir}/*.xml
-%attr(755,root,root) %{_sysconfdir}/init.d/%{name}
+%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
%attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.policy
%attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.properties
%attr(660,root,tomcat) %config(noreplace) %{confdir}/logging.properties
@@ -1299,6 +1299,13 @@
%endif
%changelog
+* Sat Jan 5 2008 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.25-2jpp.1
+- Fix for bz #153187
+- Fix init script for bz #380921
+- Fix tomcat5.conf and spec file for bz #253605
+- Fix for bz #426850
+- Fix for bz #312561
+
* Thu Nov 15 2007 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.25-1jpp.1
- Updated to 5.5.25, to fix the following issues:
* CVE-2007-1355
- Previous message (by thread): rpms/tomcat5/F-7 tomcat5-5.5-catalina.sh.patch, 1.3, 1.4 tomcat5-5.5.conf, 1.4, 1.5 tomcat5-5.5.init, 1.5, 1.6 tomcat5.spec, 1.101, 1.102
- Next message (by thread): rpms/eggdrop/devel eggdrop.spec,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list