From 20c2b7093d84b6a9d1770f95d5f9f5c38227f69e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sun, 21 Nov 2010 14:11:23 +0000
Subject: [PATCH 1/1] - rel 5 - added example configs for userdir URIs (/~user)

Changed files:
    tomcat-userdir.patch -> 1.1
    tomcat.spec -> 1.184
---
 tomcat-userdir.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++
 tomcat.spec          |  4 +++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 tomcat-userdir.patch

diff --git a/tomcat-userdir.patch b/tomcat-userdir.patch
new file mode 100644
index 0000000..574aa9d
--- /dev/null
+++ b/tomcat-userdir.patch
@@ -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>
diff --git a/tomcat.spec b/tomcat.spec
index df4bf1c..4892ebe 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -11,7 +11,7 @@ Summary:	Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP
 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
@@ -29,6 +29,7 @@ Patch1:		%{name}-extras.xml.patch
 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
@@ -224,6 +225,7 @@ javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # we don't need those scripts
 rm bin/*.bat
-- 
2.44.0