rpms/jetty/F-9 jetty-unix.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 jetty-OSGi-MANIFEST.MF, 1.1, 1.2 jetty.init, 1.1, 1.2 jetty.spec, 1.6, 1.7 sources, 1.3, 1.4
Jeff Johnston
jjohnstn at fedoraproject.org
Tue May 19 21:24:24 UTC 2009
Author: jjohnstn
Update of /cvs/pkgs/rpms/jetty/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25166
Modified Files:
.cvsignore jetty-OSGi-MANIFEST.MF jetty.init jetty.spec
sources
Added Files:
jetty-unix.patch
Log Message:
* Tue May 19 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.15-1
- Upgrade to 5.1.15 source tarball for Fedora.
jetty-unix.patch:
--- NEW FILE jetty-unix.patch ---
diff -up ./extra/unix/bin/jetty.sh.fix ./extra/unix/bin/jetty.sh
--- ./extra/unix/bin/jetty.sh.fix 2009-01-06 16:01:00.000000000 -0500
+++ ./extra/unix/bin/jetty.sh 2009-01-06 16:03:55.000000000 -0500
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh
#
# Startup script for jetty under *nix systems (it works under NT/cygwin too).
#
@@ -106,6 +106,13 @@ findDirectory()
done
}
+##################################################
+# Check if we have a tty
+##################################################
+have_tty=0
+if [ "`tty`" != "not a tty" ]; then
+ have_tty=1
+fi
##################################################
# See if there's a user-specific configuration file
@@ -323,7 +330,7 @@ then
then
JETTY_CONSOLE=/dev/console
else
- JETTY_CONSOLE=/dev/tty
+ JETTY_CONSOLE=/dev/null
fi
fi
@@ -356,7 +363,7 @@ then
[ -x $J ] || continue
VERSION=`eval $J -version 2>&1`
[ $? = 0 ] || continue
- VERSION=`expr "$VERSION" : '.*"\(1.[0-9\.]*\)"'`
+ VERSION=`expr "$VERSION" : '.*"\(1.[0-9\._]*\)"'`
[ "$VERSION" = "" ] && continue
expr $VERSION \< 1.2 >/dev/null && continue
echo $VERSION:$J
@@ -466,15 +473,15 @@ RUN_CMD="$JAVA $JAVA_OPTIONS -cp $CLASSP
##################################################
case "$ACTION" in
start)
- echo "Starting Jetty: "
-
if [ -f $JETTY_PID ]
then
echo "Already Running!!"
exit 1
fi
- echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
+ if [ $have_tty -eq 1 ]; then
+ echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
+ fi
nohup sh -c "exec $RUN_CMD >>$JETTY_CONSOLE 2>&1" >/dev/null &
echo $! > $JETTY_PID
@@ -488,7 +495,9 @@ case "$ACTION" in
sleep 2
kill -9 $PID 2>/dev/null
rm -f $JETTY_PID
- echo "STOPPED `date`" >>$JETTY_CONSOLE
+ if [ $have_tty -eq 1 ]; then
+ echo "STOPPED `date`" >>$JETTY_CONSOLE
+ fi
;;
restart)
@@ -533,9 +542,9 @@ case "$ACTION" in
echo "RUN_CMD = $RUN_CMD"
echo
- if [ -f $JETTY_RUN/jetty.pid ]
+ if [ -s $JETTY_PID ]
then
- echo "Jetty running pid="`cat $JETTY_RUN/jetty.pid`
+ echo "Jetty running pid="`cat $JETTY_PID`
exit 0
fi
exit 1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 25 Jun 2008 18:44:39 -0000 1.3
+++ .cvsignore 19 May 2009 21:23:53 -0000 1.4
@@ -1,2 +1,3 @@
jetty-5.1.12.fedora.zip
jetty-5.1.14.fedora.tgz
+jetty-5.1.15.fedora.tgz
Index: jetty-OSGi-MANIFEST.MF
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-9/jetty-OSGi-MANIFEST.MF,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jetty-OSGi-MANIFEST.MF 30 Aug 2007 19:06:45 -0000 1.1
+++ jetty-OSGi-MANIFEST.MF 19 May 2009 21:23:53 -0000 1.2
@@ -7,14 +7,14 @@ Import-Package: javax.net.ssl,javax.secu
commons.logging;version="[1.0.0,2.0.0)",org.xml.sax,org.xml.sax.helpe
rs
Bundle-ManifestVersion: 2
-Export-Package: org.mortbay.html;version="5.1.11",org.mortbay.http;ver
- sion="5.1.11",org.mortbay.http.ajp;version="5.1.11",org.mortbay.http.
- handler;version="5.1.11",org.mortbay.http.nio;version="5.1.11",org.mo
- rtbay.jetty;version="5.1.11",org.mortbay.jetty.servlet;version="5.1.1
- 1",org.mortbay.jetty.win32;version="5.1.11",org.mortbay.log;version="
- 5.1.11",org.mortbay.servlet;version="5.1.11",org.mortbay.util;version
- ="5.1.11",org.mortbay.xml;version="5.1.11"
-Bundle-Version: 5.1.11.v200706111724
+Export-Package: org.mortbay.html;version="5.1.15",org.mortbay.http;ver
+ sion="5.1.15",org.mortbay.http.ajp;version="5.1.15",org.mortbay.http.
+ handler;version="5.1.15",org.mortbay.http.nio;version="5.1.15",org.mo
+ rtbay.jetty;version="5.1.15",org.mortbay.jetty.servlet;version="5.1.1
+ 5",org.mortbay.jetty.win32;version="5.1.15",org.mortbay.log;version="
+ 5.1.15",org.mortbay.servlet;version="5.1.15",org.mortbay.util;version
+ ="5.1.15",org.mortbay.xml;version="5.1.15"
+Bundle-Version: 5.1.14.v200806031611
Bundle-SymbolicName: org.mortbay.jetty
Bundle-Name: Jetty WebServer
Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
Index: jetty.init
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-9/jetty.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jetty.init 30 Aug 2007 19:06:45 -0000 1.1
+++ jetty.init 19 May 2009 21:23:53 -0000 1.2
@@ -19,9 +19,7 @@
# Source function library.
-if [ -x /etc/rc.d/init.d/functions ]; then
- . /etc/rc.d/init.d/functions
-fi
+. /etc/init.d/functions
[ -r /etc/java/java.conf ] && . /etc/java/java.conf
export JAVA_HOME
@@ -54,10 +52,11 @@ if [ -z "$JETTY_PID" ]; then
fi
+prog=jetty
RETVAL=0
start() {
- echo -n "Starting $JETTY_PROG: "
+ echo -n $"Starting $prog: "
if [ -f /var/lock/subsys/jetty ] ; then
if [ -f $JETTY_PID ]; then
@@ -71,16 +70,13 @@ start() {
fi
fi
-# touch $JETTY_PID
-# chown $JETTY_USER:$JETTY_USER $JETTY_PID
-
# [ -x ${JETTY_HOME}/ext ] &&
# rebuild-jar-repository -s ${JETTY_HOME}/ext
if [ -x /etc/rc.d/init.d/functions ]; then
- daemon --user $JETTY_USER $JETTY_SCRIPT start
+ daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT start
else
- su - $JETTY_USER -c "$JETTY_SCRIPT start"
+ su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT start"
fi
RETVAL=$?
@@ -91,20 +87,20 @@ start() {
stop() {
- echo -n "Stopping $JETTY_PROG: "
+ echo -n $"Stopping $prog: "
if [ -f /var/lock/subsys/jetty ] ; then
if [ -x /etc/rc.d/init.d/functions ]; then
- daemon --user $JETTY_USER $JETTY_SCRIPT stop
+ daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop
else
- su - $JETTY_USER -c "$JETTY_SCRIPT stop"
+ su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop"
fi
RETVAL=$?
if [ $RETVAL = 0 ]; then
count=0;
- if [ -f /var/run/jetty/jetty.pid ]; then
+ if [ -f $JETTY_PID ]; then
read kpid < $JETTY_PID
let kwait=$SHUTDOWN_WAIT
@@ -136,7 +132,10 @@ case "$1" in
stop)
stop
;;
- restart)
+ status)
+ status -p $JETTY_PID jetty
+ ;;
+ restart|reload)
stop
sleep 2
start
@@ -148,7 +147,7 @@ case "$1" in
fi
;;
*)
- echo "Usage: $JETTY_PROG {start|stop|restart|condrestart}"
+ echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
exit 1
esac
Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-9/jetty.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- jetty.spec 4 Jul 2008 16:59:23 -0000 1.6
+++ jetty.spec 19 May 2009 21:23:53 -0000 1.7
@@ -46,29 +46,31 @@
%define confdir %{_sysconfdir}/%{name}
%define logdir %{_localstatedir}/log/%{name}
%define homedir %{_datadir}/%{name}
-%define tempdir %{_localstatedir}/cache/%{name}/temp
+%define jettycachedir %{_localstatedir}/cache/%{name}
+%define tempdir %{jettycachedir}/temp
%define rundir %{_localstatedir}/run/%{name}
-%define libdir %{_localstatedir}/lib/%{name}/lib
-%define appdir %{_localstatedir}/lib/%{name}/webapps
-%define demodir %{_localstatedir}/lib/%{name}/demo
+%define jettylibdir %{_localstatedir}/lib/%{name}
+%define libdir %{jettylibdir}/lib
+%define appdir %{jettylibdir}/webapps
+%define demodir %{jettylibdir}/demo
Name: jetty
-Version: 5.1.14
-Release: 1jpp.2%{?dist}
+Version: 5.1.15
+Release: 1%{?dist}
Summary: The Jetty Webserver and Servlet Container
Group: Applications/Internet
License: ASL 2.0
URL: http://jetty.mortbay.org/jetty/
# Following source tarball was originally taken from the following location:
-# http://www.ibiblio.org/maven/jetty/jetty-5.1.x/jetty-5.1.14.tgz
+# http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.15.tgz
# The tarball was modified by removing all jars and BCLA licenses.
-# tar -xzf jetty-5.1.14.tgz
-# pushd jetty-5.1.14
+# tar -xzf jetty-5.1.15.tgz
+# pushd jetty-5.1.15
# find . -name *.jar -exec rm {} \;
# rm ./etc/LICENSE.javax.xml.html ./etc/LICENSE.jsse.txt
# popd
-# tar -czf jetty-5.1.14.fedora.tgz jetty-5.1.14/*
+# tar -czf jetty-5.1.15.fedora.tgz jetty-5.1.15/*
Source0: %{jettyname}-%{version}.fedora.tgz
Source1: jetty.script
Source2: jetty.init
@@ -78,7 +80,7 @@ Patch0: jetty-extra-j2ee-build_x
Patch1: jetty-PostFileFilter.patch
Patch2: jetty-libgcj-bad-serialization.patch
Patch3: jetty-TestRFC2616-libgcj-bad-date-parser.patch
-Patch4: jetty-CERT438616-CERT237888-CERT21284.patch
+Patch5: jetty-unix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{gcj_support}
@@ -100,8 +102,8 @@ BuildRequires: jakarta-commons-el
BuildRequires: jakarta-commons-logging
BuildRequires: jsse
BuildRequires: mx4j >= 0:3.0
-BuildRequires: tomcat5-jasper
-BuildRequires: tomcat5-servlet-2.4-api
+BuildRequires: tomcat5-jasper >= 5.5.26-1.5
+BuildRequires: tomcat5-servlet-2.4-api >= 5.5.26-1.5
BuildRequires: xerces-j2 >= 0:2.7
BuildRequires: xml-commons-apis
@@ -130,15 +132,15 @@ BuildRequires: openorb-ots
BuildRequires: xapool
%endif
#
-Requires: /sbin/chkconfig
+Requires: chkconfig
Requires: jpackage-utils >= 0:1.6
Requires: ant >= 0:1.6
Requires: jakarta-commons-el
Requires: jakarta-commons-logging
-Requires: tomcat5-jasper
+Requires: tomcat5-jasper >= 5.5.26-1.5
Requires: jsp
Requires: mx4j >= 0:3.0
-Requires: tomcat5-servlet-2.4-api
+Requires: tomcat5-servlet-2.4-api >= 5.5.26-1.5
Requires: xerces-j2 >= 0:2.7
Requires: xml-commons-apis
Provides: group(%username) = %jtuid
@@ -167,6 +169,7 @@ platforms.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: %{name} = %{version}
%description javadoc
%{summary}.
@@ -253,7 +256,7 @@ rm src/org/mortbay/util/jmx/MX4JHttpAdap
%patch2 -b .sav
%patch3 -b .sav
-%patch4
+%patch5
# Delete this Sun specific file.
rm src/org/mortbay/http/SunJsseListener.java
@@ -334,7 +337,7 @@ zip -u lib/org.mortbay.jetty.jar META-IN
rm -rf $RPM_BUILD_ROOT
# dirs
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+install -dm 755 $RPM_BUILD_ROOT%{_initrddir}
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -dm 755 $RPM_BUILD_ROOT%{confdir}
@@ -354,7 +357,7 @@ install -dm 755 $RPM_BUILD_ROOT%{appdir}
# main pkg
install -pm 755 extra/unix/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/d%{name}
install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name}
install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
install -pm 644 start.jar $RPM_BUILD_ROOT%{homedir}/bin
install -pm 644 stop.jar $RPM_BUILD_ROOT%{homedir}/bin
@@ -390,7 +393,7 @@ JETTY_PORT=8080
JETTY_RUN=%{_localstatedir}/run/%{name}
JETTY_PID=\$JETTY_RUN/jetty.pid
EO_RC
-) > $RPM_BUILD_ROOT%{homedir}/jettyrc
+) > $RPM_BUILD_ROOT%{homedir}/.jettyrc
# extra
%if %{with_extra}
@@ -517,8 +520,8 @@ fi
%preun
if [ $1 = 0 ]; then
- [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/init.d/%{name} stop
- [ -f %{_sysconfdir}/init.d/%{name} -a -x /sbin/chkconfig ] && /sbin/chkconfig --del %{name}
+ [ -f /var/lock/subsys/%{name} ] && %{_initrddir}/%{name} stop
+ [ -f %{_initrddir}/%{name} -a -x /sbin/chkconfig ] && /sbin/chkconfig --del %{name}
%{_sbindir}/fedora-userdel %{name} >> /dev/null 2>&1 || :
fi
@@ -534,6 +537,8 @@ fi
%{_javadir}/%{name}/%{name}-jmx.jar
%{_javadir}/%{name}/%{name}-servlet.jar
%config(noreplace) %{confdir}
+%dir %{jettylibdir}
+%dir %{jettycachedir}
%dir %{libdir}
%{libdir}/org.mortbay.jetty.jar
%{libdir}/org.mortbay.jmx.jar
@@ -541,15 +546,16 @@ fi
%{homedir}/[^e]*
%{homedir}/ext
%{homedir}/etc
-%{homedir}/jettyrc
+%{homedir}/.jettyrc
%dir %{demodir}
%attr(755, jetty, jetty) %{logdir}
%attr(755, jetty, jetty) %{tempdir}
%attr(755, jetty, jetty) %{rundir}
%dir %{appdir}
+%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/LICENSE.TXT
%doc %{_docdir}/%{name}-%{version}/VERSION.TXT
-%{_sysconfdir}/init.d/%{name}
+%{_initrddir}/%{name}
%{_sysconfdir}/logrotate.d/%{name}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}/
@@ -599,6 +605,40 @@ fi
%endif
%changelog
+* Tue May 19 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.15-1
+- Upgrade to 5.1.15 source tarball for Fedora.
+
+* Fri Apr 22 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-3
+- Add %%{libdir} to files list.
+- Resolves #473585
+
+* Wed Feb 11 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.10
+- Rename jettyc back to .jettyrc.
+- Resolves #485012
+
+* Tue Feb 03 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.9
+- Change %%{_sysconfdir}/init.d references to be %%{_initrddir}
+
+* Mon Feb 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.8
+- Fixes for unowned directories.
+
+* Tue Jan 06 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.7
+- Patch init.d script to add status operation
+- Patch unix djetty script so it doesn't issue error messages about /dev/tty
+ and fix various inconsistencies with the init.d script
+
+* Tue Aug 12 2008 Andrew Overholt <overholt at redhat.com> 5.1.14-1.6
+- Require tomcat5 bits with proper OSGi metadata
+
+* Fri Jul 11 2008 Andrew Overholt <overholt at redhat.com> 5.1.14-1.5
+- Bump release.
+
+* Fri Jul 11 2008 Andrew Overholt <overholt at redhat.com> 5.1.14-1.3
+- Update OSGi manifest
+
+* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.1.14-1.3
+- drop repotag
+
* Fri Jul 04 2008 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1jpp.2
- Security patch
- Resolves #417401, #417411, #417391
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 25 Jun 2008 18:44:39 -0000 1.3
+++ sources 19 May 2009 21:23:53 -0000 1.4
@@ -1 +1 @@
-04dcaaa5407462cea9c514b7f7aabff7 jetty-5.1.14.fedora.tgz
+09d5e3204f5c74efcd3ae9330f92838b jetty-5.1.15.fedora.tgz
More information about the scm-commits
mailing list