[Jpackage-commits] dist/tomcat5/JPP-6 sources, 1.1, 1.2 tomcat5-5.5-jspc.sh.patch, 1.1, 1.2 tomcat5-5.5.link_admin_jar.patch, 1.1, 1.2 tomcat5.spec, 1.10, 1.11

jpackage jpackage at ryu.zarb.org
Fri Oct 14 23:26:26 CEST 2011


Update of /home/projects/jpackage/cvs/dist/tomcat5/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv31079

Modified Files:
	sources tomcat5-5.5-jspc.sh.patch 
	tomcat5-5.5.link_admin_jar.patch tomcat5.spec 
Log Message:
5.5.34

Index: tomcat5.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tomcat5/JPP-6/tomcat5.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** tomcat5.spec	23 Sep 2010 08:56:21 -0000	1.10
--- tomcat5.spec	14 Oct 2011 21:26:24 -0000	1.11
***************
*** 1,3 ****
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 46,50 ****
  %define jname jasper
  %define majversion 5.5
! %define minversion 29
  %define servletspec 2.4
  %define jspspec 2.0
--- 46,50 ----
  %define jname jasper
  %define majversion 5.5
! %define minversion 34
  %define servletspec 2.4
  %define jspspec 2.0
***************
*** 72,76 ****
  Epoch: 0
  Version: %{majversion}.%{minversion}
! Release: 3%{dist}
  Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
  
--- 72,76 ----
  Epoch: 0
  Version: %{majversion}.%{minversion}
! Release: 1%{dist}
  Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
  
***************
*** 103,106 ****
--- 103,107 ----
  Patch15: %{name}-%{majversion}-unversioned-commons-logging-jar.patch
  Patch16: %{name}-%{majversion}-jspc-classpath.patch
+ Patch17: %{name}-%{majversion}-skip-windows-files.patch
  #FIXME Disable JSP pre-compilation on ppc64, x390x and alpha
  Patch18: %{name}-%{majversion}-skip-jsp-precompile.patch
***************
*** 394,421 ****
  %setup -q -D -T -a 6
  cd %{packdname}
! %patch0 -p0
! %patch1 -p0
! %patch2 -p0
! %patch3 -p0
! %patch4 -p0
! %patch5 -p0
! %patch7 -p0
! %patch8 -p0
! %patch9 -p0
! %patch10 -p0
! %patch12 -p0
! %patch13 -p0
! %patch14 -p0
! %patch15 -p0
! %patch16 -p0
  %{__sed} -i -e 's|\@JAVA_HOME\@|%{java_home}|' build/build.xml
  %ifarch ppc64 s390x alpha
! %patch18 -p0
  %endif
  %if %{with_ecj}
! %patch19 -p0
  %endif
! #%patch98 -p1
! #%patch99 -p0
  rm servletapi/jsr152/examples/jsp2/simpletag/book.jsp
  rm servletapi/jsr152/examples/jsp2/jspattribute/jspattribute.jsp
--- 395,423 ----
  %setup -q -D -T -a 6
  cd %{packdname}
! %patch0 -p0 -b .sav0
! %patch1 -p0 -b .sav1
! %patch2 -p0 -b .sav2
! %patch3 -p0 -b .sav3
! %patch4 -p0 -b .sav4
! %patch5 -p0 -b .sav5
! %patch7 -p0 -b .sav7
! %patch8 -p0 -b .sav8
! %patch9 -p0 -b .sav9
! %patch10 -p0 -b .sav10
! %patch12 -p0 -b .sav12
! %patch13 -p0 -b .sav13
! %patch14 -p0 -b .sav14
! %patch15 -p0 -b .sav15
! %patch16 -p0 -b .sav16
! %patch17 -p0 -b .sav17
  %{__sed} -i -e 's|\@JAVA_HOME\@|%{java_home}|' build/build.xml
  %ifarch ppc64 s390x alpha
! %patch18 -p0 -b .sav18
  %endif
  %if %{with_ecj}
! %patch19 -p0 -b .sav19
  %endif
! #%patch98 -p1 -b .sav98
! #%patch99 -p0 -b .sav99
  rm servletapi/jsr152/examples/jsp2/simpletag/book.jsp
  rm servletapi/jsr152/examples/jsp2/jspattribute/jspattribute.jsp
***************
*** 510,522 ****
  mail.jar=$(build-classpath javamail_1_3_1_api)
  jta.jar=$(build-classpath jta_1_0_1B_api)
- jaas.jar=$(build-classpath jaas)
- jndi.jar=$(build-classpath jndi)
- jdbc20ext.jar=$(build-classpath jdbc-stdext)
- jcert.jar=$(build-classpath jsse/jcert)
- jnet.jar=$(build-classpath jsse/jnet)
- jsse.jar=$(build-classpath jsse/jsse)
  servletapi.build.notrequired=true
  jspapi.build.notrequired=true
  EOBP
  ant -d -Dbuild.compiler="modern" -Djava.home="%{java_home}" init
  cp ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar \
--- 512,524 ----
  mail.jar=$(build-classpath javamail_1_3_1_api)
  jta.jar=$(build-classpath jta_1_0_1B_api)
  servletapi.build.notrequired=true
  jspapi.build.notrequired=true
  EOBP
+ #jaas.jar=$(build-classpath jaas)
+ #jndi.jar=$(build-classpath jndi)
+ #jdbc20ext.jar=$(build-classpath jdbc-stdext)
+ #jcert.jar=$(build-classpath jsse/jcert)
+ #jnet.jar=$(build-classpath jsse/jnet)
+ #jsse.jar=$(build-classpath jsse/jsse)
  ant -d -Dbuild.compiler="modern" -Djava.home="%{java_home}" init
  cp ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar \
***************
*** 547,558 ****
  mail.jar=$(build-classpath javamail_1_3_1_api)
  jta.jar=$(build-classpath jta_1_0_1B_api)
- jaas.jar=$(build-classpath jaas)
- jndi.jar=$(build-classpath jndi)
- jdbc20ext.jar=$(build-classpath jdbc-stdext)
- jcert.jar=$(build-classpath jsse/jcert)
- jnet.jar=$(build-classpath jsse/jnet)
- jsse.jar=$(build-classpath jsse/jsse)
  tomcat5.home=../../build/build
  EOBP
      ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build
  popd
--- 549,560 ----
  mail.jar=$(build-classpath javamail_1_3_1_api)
  jta.jar=$(build-classpath jta_1_0_1B_api)
  tomcat5.home=../../build/build
  EOBP
+ #jaas.jar=$(build-classpath jaas)
+ #jndi.jar=$(build-classpath jndi)
+ #jdbc20ext.jar=$(build-classpath jdbc-stdext)
+ #jcert.jar=$(build-classpath jsse/jcert)
+ #jnet.jar=$(build-classpath jsse/jnet)
+ #jsse.jar=$(build-classpath jsse/jsse)
      ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build
  popd
***************
*** 1466,1469 ****
--- 1468,1477 ----
  
  %changelog
+ * Thu Oct 13 2011 Ralph Apel <r.apel at r-apel.de> 0:5.5.34-1
+ - 5.5.34
+ - enumerate patch backup files
+ - drop from build.properties: jaas.jar,jndi.jar,jdbc20ext.jar,
+   jcert.jar,jnet.jar,jsse.jar
+ 
  * Thu Sep 23 2010 Ralph Apel <r.apel at r-apel.de> 0:5.5.29-3
  - Move depmap frags and parent.pom to -servlet-2.4-api subpkg

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tomcat5/JPP-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	9 Sep 2010 18:34:26 -0000	1.1
--- sources	14 Oct 2011 21:26:24 -0000	1.2
***************
*** 1,2 ****
! 2e661301c211b0860389ea2e37c8c6af  apache-tomcat-5.5.29-src.tar.gz
! 272354d53290092f98f51ebc00d126bf  tomcat5-poms-5.5.29.tar.bz2
--- 1,2 ----
! 767d1b95e7ff40757de166c74066a8ed  apache-tomcat-5.5.34-src.tar.gz
! 46d4e375ffbc32f8ea45a7b23003d0ff  tomcat5-poms-5.5.34.tar.bz2

Index: tomcat5-5.5.link_admin_jar.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tomcat5/JPP-6/tomcat5-5.5.link_admin_jar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** tomcat5-5.5.link_admin_jar.patch	9 Sep 2010 18:34:26 -0000	1.1
--- tomcat5-5.5.link_admin_jar.patch	14 Oct 2011 21:26:24 -0000	1.2
***************
*** 1,12 ****
! --- container/webapps/admin/admin.xml.sav	2006-03-23 16:16:51.000000000 +0100
! +++ container/webapps/admin/admin.xml	2006-03-23 16:17:49.000000000 +0100
! @@ -17,4 +17,9 @@
!      allow="127.0.0.1"/>
     -->
-  
  +  <!-- Allow linking since JPackage do not install jar as copies -->
  +
  +  <Resources className="org.apache.naming.resources.FileDirContext"
  +             allowLinking="true"/>
! +
   </Context>
--- 1,12 ----
! --- container/webapps/admin/admin.xml.sav0	2011-09-18 20:57:23.000000000 +0200
! +++ container/webapps/admin/admin.xml	2011-10-14 22:47:08.000000000 +0200
! @@ -33,5 +33,9 @@
!    <Valve className="org.apache.catalina.valves.RemoteAddrValve"
!      allow="127\.0\.0\.1"/>
     -->
  +  <!-- Allow linking since JPackage do not install jar as copies -->
  +
  +  <Resources className="org.apache.naming.resources.FileDirContext"
  +             allowLinking="true"/>
!  
   </Context>

Index: tomcat5-5.5-jspc.sh.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tomcat5/JPP-6/tomcat5-5.5-jspc.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** tomcat5-5.5-jspc.sh.patch	9 Sep 2010 18:34:26 -0000	1.1
--- tomcat5-5.5-jspc.sh.patch	14 Oct 2011 21:26:24 -0000	1.2
***************
*** 1,4 ****
! --- jasper/src/bin/jspc.sh.sav	2008-07-14 11:30:15.000000000 -0400
! +++ jasper/src/bin/jspc.sh	2008-07-14 11:31:25.000000000 -0400
  @@ -21,32 +21,9 @@
   # $Id$
--- 1,4 ----
! --- jasper/src/bin/jspc.sh.sav9	2011-09-18 20:57:25.000000000 +0200
! +++ jasper/src/bin/jspc.sh	2011-10-14 22:50:49.000000000 +0200
  @@ -21,32 +21,9 @@
   # $Id$




More information about the JPackage-commits mailing list