packages: tomcat/tomcat.spec, tomcat/tomcat-userdir.patch (NEW) - rel 5 - a...

[baggins]

Author: baggins                      Date: Sun Nov 21 14:11:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- added example configs for userdir URIs (/~user)

---- Files affected:
packages/tomcat:
   tomcat.spec (1.183 -> 1.184) , tomcat-userdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.183 packages/tomcat/tomcat.spec:1.184
--- packages/tomcat/tomcat.spec:1.183	Fri Nov 19 22:17:20 2010
+++ packages/tomcat/tomcat.spec	Sun Nov 21 15:11:23 2010
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:		tomcat
 Version:	6.0.29
-Release:	4
+Release:	5
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -30,6 +30,7 @@
 Patch2:		server.xml-URIEncoding-utf8.patch
 Patch3:		%{name}-LDAPUserDatabase.patch
 Patch4:		%{name}-catalina.policy-javadir.patch
+Patch5:		%{name}-userdir.patch
 URL:		http://tomcat.apache.org/
 BuildRequires:	ant >= 1.5.3
 BuildRequires:	ant-trax
@@ -225,6 +226,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # we don't need those scripts
 rm bin/*.bat
@@ -466,6 +468,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2010/11/21 14:11:23  baggins
+- rel 5
+- added example configs for userdir URIs (/~user)
+
 Revision 1.183  2010/11/19 21:17:20  baggins
 - rel 4
 

================================================================
Index: packages/tomcat/tomcat-userdir.patch
diff -u /dev/null packages/tomcat/tomcat-userdir.patch:1.1
--- /dev/null	Sun Nov 21 15:11:28 2010
+++ packages/tomcat/tomcat-userdir.patch	Sun Nov 21 15:11:22 2010
@@ -0,0 +1,48 @@
+--- apache-tomcat-6.0.29-src/conf/server.xml~	2010-11-17 17:41:58.451654998 +0100
++++ apache-tomcat-6.0.29-src/conf/server.xml	2010-11-21 15:05:44.259477500 +0100
+@@ -142,6 +142,45 @@
+         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"  
+                prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
+         -->
++	<!--
++		Automatically map a request URI starting with a tilde
++		character ("~") and a username to a directory
++		(commonly named public_html) in that user's home directory
++		on the server.
++	-->
++	<!--
++		Use /etc/passwd file to identify valid users
++	-->
++	<!--
++	<Listener className="org.apache.catalina.startup.UserConfig"
++		directoryName="public_html"
++		userClass="org.apache.catalina.startup.PasswdUserDatabase"/>
++	-->
++	<!--
++		Use all directories found in a specified base directory
++		to be considered "user home" directories
++	-->
++        <!--
++	<Listener className="org.apache.catalina.startup.UserConfig"
++		directoryName="public_html"
++		homeBase="/home/users"
++		userClass="org.apache.catalina.startup.HomesUserDatabase"/>
++	-->
++	<!--
++		Use LDAP search to identify valid users
++	-->
++        <!--
++	<Listener className="org.apache.catalina.startup.UserConfig"
++		directoryName="public_html"
++		connectionURL="ldaps://ldap.example.com/"
++		connectionName="uid=tomcat,ou=people,dc=example,dc=com"
++		connectionPassword="secret"
++		searchBase="ou=People,dc=mim,dc=uw,dc=edu,dc=pl"
++		searchFilter="(objectClass=posixAccount)"
++		searchSubtree="false"
++		pageSize="1000"
++		userClass="org.apache.catalina.startup.LDAPUserDatabase"/>
++	-->
+ 
+       </Host>
+     </Engine>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.183&r2=1.184&f=u