Hello community, here is the log from the commit of package tomcat6 for openSUSE:Factory checked in at Mon Oct 25 18:09:28 CEST 2010. -------- --- tomcat6/libtcnative-1-0.changes 2010-03-16 12:41:51.000000000 +0100 +++ tomcat6/libtcnative-1-0.changes 2010-08-05 17:31:56.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 5 15:30:21 UTC 2010 - mvyskocil@suse.cz + +- fixes bnc#622430 - move .so file to main package + +------------------------------------------------------------------- --- tomcat6/tomcat6.changes 2010-02-03 15:47:08.000000000 +0100 +++ tomcat6/tomcat6.changes 2010-10-25 14:49:39.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Sep 14 13:18:45 UTC 2010 - mvyskocil@suse.cz + +- Update to 6.0.29 (bugfix release) +- fix bnc#625415: Tomcat6 does not have permissions to its own directories + * also fix the /etc/tomcat6/Catalina link target +- revert a setclasspath.sh changes +- disable user/group verification of tomcat owned files and directories to + allow easy change of the tomcat user without rpm --verify complaints + +------------------------------------------------------------------- +Thu Jul 15 09:21:45 UTC 2010 - mvyskocil@suse.cz + +- Update to 6.0.28 (bugfix release) +- fix bnc#565901 - missing catalina.sh again + * move catalina.sh to CATALINA_HOME/bin + * add jpackage.org compatible CATALINA_HOME/bin/setclasspath.sh +- add missing logrotate requires +- install scripts with mode 0755 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- apache-tomcat-6.0.24-src.tar.bz2 New: ---- apache-tomcat-6.0.29-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.rXUQhS/_old 2010-10-25 18:04:39.000000000 +0200 +++ /var/tmp/diff_new_pack.rXUQhS/_new 2010-10-25 18:04:39.000000000 +0200 @@ -29,7 +29,7 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 4 +Release: 7 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: Apache Software License .. @@ -131,12 +131,13 @@ %files %defattr(-,root,root) %{_libdir}/%{libname}.so.* +#bnc#622430 - java expects so files installed +%{_libdir}/%{libname}.so %doc jni/native/README %files devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/pkgconfig/*.pc -%{_libdir}/%{libname}.so %changelog ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.rXUQhS/_old 2010-10-25 18:04:39.000000000 +0200 +++ /var/tmp/diff_new_pack.rXUQhS/_new 2010-10-25 18:04:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tomcat6 (Version 6.0.24) +# spec file for package tomcat6 (Version 6.0.29) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project @@ -22,7 +22,7 @@ %define jspspec 2.1 %define major_version 6 %define minor_version 0 -%define micro_version 24 +%define micro_version 29 %define packdname apache-tomcat-%{version}-src %define servletspec 2.5 %define elspec 1.0 @@ -41,7 +41,7 @@ Name: tomcat6 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2 +Release: 1 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: Apache Software License .. @@ -77,8 +77,9 @@ BuildRequires: unzip BuildRequires: jakarta-taglibs-standard >= 1.1 BuildRequires: fdupes -PreReq: jpackage-utils +Requires(pre): jpackage-utils Recommends: libtcnative-1-0 +Recommends: logrotate %endif Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd @@ -235,7 +236,7 @@ -Dbuild.compiler="modern" \ -Dcommons-collections.jar="$(build-classpath commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \ - -Dcommons-daemon.jsvc.tar.gz="HACK" \ + -Dcommons-daemon.native.src.tgz="HACK" \ -Djasper-jdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \ -Dtomcat-dbcp.jar="HACK" \ @@ -250,9 +251,7 @@ %{__rm} output/build/bin/commons-daemon.jar \ output/build/lib/ecj.jar # remove the cruft we created - %{__rm} output/build/bin/HACK \ - output/build/bin/tomcat-native.tar.gz \ - output/build/lib/HACK + %{__rm} output/build/bin/tomcat-native.tar.gz popd pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src %{__mkdir_p} ../web/WEB-INF/classes @@ -276,12 +275,11 @@ %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir} -%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{logdir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{homedir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{tempdir} -%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{cachedir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{cachedir}/Catalina/localhost # move things into place pushd %{packdname}/output/build %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir} @@ -305,12 +303,12 @@ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" %{SOURCE3} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} %endif -%{__install} -m 0644 %{SOURCE2} \ +%{__install} -m 0755 %{SOURCE2} \ ${RPM_BUILD_ROOT}%{_initrddir}/%{name} -%{__install} -m 0644 %{SOURCE4} \ +%{__install} -m 0755 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} #%{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} -%{__install} -m 0644 %{SOURCE8} \ +%{__install} -m 0755 %{SOURCE8} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} @@ -374,15 +372,17 @@ commons-dbcp-tomcat5 commons-pool-tomcat5 ecj %if %defined suse_version # bnc#424675 -install -d -m 0755 ${RPM_BUILD_ROOT}%{cachedir}/Catalina -%{__ln_s} %{cachedir}/Catalina ${RPM_BUILD_ROOT}/%{confdir}/Catalina +%{__ln_s} %{cachedir}/Catalina ${RPM_BUILD_ROOT}/%{confdir} +%{__rm} -rf %{buildroot}/%{confdir}/Catalina +%{__ln_s} %{cachedir}/Catalina ${RPM_BUILD_ROOT}/%{confdir}/ # bnc#418664 install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/ echo "tomcat6/catalina-ant" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/catalina-ant %fdupes $RPM_BUILD_ROOT /srv/%{name} install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir} ln -sf %{_initrddir}/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name} -ln -sf %{_sbindir}/d%{name} %{buildroot}/%{_bindir}/catalina.sh +#bnc#565901 +ln -sf %{_sbindir}/d%{name} %{buildroot}/%{bindir}/catalina.sh %endif %clean @@ -508,38 +508,35 @@ %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper %attr(0755,root,root) %{_sbindir}/d%{name} %attr(0755,root,root) %{_sbindir}/%{name} -%attr(0775,root,tomcat) %dir %{logdir} %attr(0755,root,root) %{_initrddir}/%{name} %if %{defined suse_version} #bnc#565901 -%attr(0755,root,root) %{_bindir}/catalina.sh +%attr(0755,root,root) %{bindir}/catalina.sh %endif %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %if ! %defined suse_version %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %endif -%attr(0775,root,tomcat) %dir %{appdir} %dir %{confdir} %dir %{confdir}/Catalina -#%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties %config(noreplace) %{confdir}/context.xml %config(noreplace) %{confdir}/server.xml -%attr(0660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml %config(noreplace) %{confdir}/web.xml -%attr(0775,root,tomcat) %dir %{cachedir} -%attr(0775,root,tomcat) %dir %{tempdir} -%attr(0775,root,tomcat) %dir %{cachedir} +%verify (not user group) %attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml %{homedir} %if %{defined suse_version} %dir /srv/%{name} %{_sbindir}/rc%{name} -#bnc#424675 -%attr(0775,root,tomcat) %dir %{cachedir}/Catalina %{confdir}/Catalina %endif +# tomcat group writtable dirs - bnc#625415 +%defattr(0664,root,tomcat,0775) +%verify (not user group) %dir %{appdir} +%verify (not user group) %{cachedir} +%verify (not user group) %{logdir} %files admin-webapps %defattr(0644,root,root,0755) ++++++ apache-tomcat-6.0.24-src.tar.bz2 -> apache-tomcat-6.0.29-src.tar.bz2 ++++++ ++++ 24425 lines of diff (skipped) ++++++ tomcat6-6.0-tomcat-users-webapp.patch ++++++ --- /var/tmp/diff_new_pack.rXUQhS/_old 2010-10-25 18:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.rXUQhS/_new 2010-10-25 18:04:40.000000000 +0200 @@ -1,8 +1,8 @@ -Index: apache-tomcat-6.0.24-src/conf/tomcat-users.xml +Index: apache-tomcat-6.0.29-src/conf/tomcat-users.xml =================================================================== ---- apache-tomcat-6.0.24-src/conf/tomcat-users.xml.orig 2010-01-19 14:43:39.000000000 +0100 -+++ apache-tomcat-6.0.24-src/conf/tomcat-users.xml 2010-02-03 11:36:56.881833728 +0100 -@@ -23,4 +23,9 @@ +--- apache-tomcat-6.0.29-src/conf/tomcat-users.xml.orig 2010-06-29 16:33:40.000000000 +0200 ++++ apache-tomcat-6.0.29-src/conf/tomcat-users.xml 2010-07-15 09:35:36.400001376 +0200 +@@ -33,4 +33,9 @@ <user username="both" password="tomcat" roles="tomcat,role1"/> <user username="role1" password="tomcat" roles="role1"/> --> ++++++ tomcat6-6.0.bootstrap-MANIFEST.MF.patch ++++++ --- /var/tmp/diff_new_pack.rXUQhS/_old 2010-10-25 18:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.rXUQhS/_new 2010-10-25 18:04:40.000000000 +0200 @@ -1,12 +1,18 @@ -Index: tomcat6-6.0.24/apache-tomcat-6.0.24-src/res/META-INF/bootstrap.jar.manifest +Index: tomcat6-6.0.29/apache-tomcat-6.0.29-src/res/META-INF/bootstrap.jar.manifest =================================================================== ---- tomcat6-6.0.24.orig/apache-tomcat-6.0.24-src/res/META-INF/bootstrap.jar.manifest 2010-01-19 14:43:41.000000000 +0100 -+++ tomcat6-6.0.24/apache-tomcat-6.0.24-src/res/META-INF/bootstrap.jar.manifest 2010-02-02 15:24:19.683835389 +0100 -@@ -1,5 +1,4 @@ +--- tomcat6-6.0.29.orig/apache-tomcat-6.0.29-src/res/META-INF/bootstrap.jar.manifest 2010-06-29 16:33:42.000000000 +0200 ++++ tomcat6-6.0.29/apache-tomcat-6.0.29-src/res/META-INF/bootstrap.jar.manifest 2010-07-15 09:35:10.044876580 +0200 +@@ -1,6 +1,5 @@ Manifest-Version: 1.0 Main-Class: org.apache.catalina.startup.Bootstrap -Class-Path: commons-daemon.jar tomcat-juli.jar - Specification-Title: Catalina --Specification-Version: 6.0 + Specification-Title: Apache Tomcat Bootstrap + Specification-Version: @VERSION_MAJOR_MINOR@ + Specification-Vendor: Apache Software Foundation +@@ -8,4 +7,4 @@ + Implementation-Version: @VERSION@ + Implementation-Vendor: Apache Software Foundation + X-Compile-Source-JDK: @source.jdk@ +-X-Compile-Target-JDK: @target.jdk@ \ No newline at end of file -+Specification-Version: 6.0 ++X-Compile-Target-JDK: @target.jdk@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org