rpms/gnome-user-share/FC-5 gnome-user-share-dav_groupfile, NONE, 1.1 gnome-user-share-httpd-2.2.patch, 1.1, 1.2 gnome-user-share.spec, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/gnome-user-share/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13729

Modified Files:
	gnome-user-share-httpd-2.2.patch gnome-user-share.spec 
Added Files:
	gnome-user-share-dav_groupfile 
Log Message:
* Wed Apr 19 2006 Alexander Larsson <alexl at redhat.com> - 0.9-4
- Fix http 2.2 patch for password authentication
- Patch from Veit Wahlich <cru at zodia.de>




--- NEW FILE gnome-user-share-dav_groupfile ---
guest: guest

gnome-user-share-httpd-2.2.patch:
 dav_user.conf |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

Index: gnome-user-share-httpd-2.2.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/FC-5/gnome-user-share-httpd-2.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-user-share-httpd-2.2.patch	3 Feb 2006 14:45:53 -0000	1.1
+++ gnome-user-share-httpd-2.2.patch	19 Apr 2006 09:06:11 -0000	1.2
@@ -1,16 +1,21 @@
-Migrate to httpd 2.2 configuration.
-
---- dav_user.conf	2005-12-11 05:01:41.000000000 -0500
-+++ dav_user.conf	2006-01-27 17:49:27.000000000 -0500
-@@ -10,6 +10,7 @@
+Index: dav_user.conf
+===================================================================
+RCS file: /cvs/gnome/gnome-user-share/dav_user.conf,v
+retrieving revision 1.5
+diff -u -p -r1.5 dav_user.conf
+--- dav_user.conf	29 Nov 2004 13:41:45 -0000	1.5
++++ dav_user.conf	19 Apr 2006 08:50:04 -0000
+@@ -10,7 +10,9 @@ LimitXMLRequestBody 100000
  
  LoadModule dav_module /etc/httpd/modules/mod_dav.so
  LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so
 +LoadModule authn_file_module /etc/httpd/modules/mod_authn_file.so
  LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so
++LoadModule authz_groupfile_module /etc/httpd/modules/mod_authz_groupfile.so
  
  DocumentRoot ${HOME}/Public
-@@ -20,7 +21,9 @@
+ <Directory "${HOME}/Public">
+@@ -20,16 +22,21 @@ DocumentRoot ${HOME}/Public
    AuthType Digest
    AuthName "Please log in as the user guest"
    AuthDigestDomain /
@@ -18,6 +23,18 @@
 +
 +  AuthDigestProvider file
 +  AuthUserFile ${HOME}/.gnome2/user-share/passwd
++  AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
  
  
    <IfDefine RequirePasswordAlways>
+     Require user guest
++    Require group guest
+   </IfDefine>
+ 
+   <IfDefine RequirePasswordOnWrite>
+     <LimitExcept GET OPTIONS PROPFIND>
+       Require user guest
++      Require group guest
+     </LimitExcept>
+   </IfDefine>
+ </Directory>


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/FC-5/gnome-user-share.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-user-share.spec	1 Mar 2006 12:33:29 -0000	1.10
+++ gnome-user-share.spec	19 Apr 2006 09:06:11 -0000	1.11
@@ -1,11 +1,12 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.9
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.gz
+Source1: %{name}-dav_groupfile
 Patch1: gnome-user-share-httpd-2.2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: httpd >= 2.2.0
@@ -17,7 +18,10 @@
 Prereq: GConf2
 
 %description
-gnome-user-share 
+This programm allows GNOME users to share the files in their ~/Public folder
+directly through the WebDAV protocol. The existence of the DAV services is
+automatically announced on the local IP subnet through Avahi.
+Access can be configured to be readonly, read-write and authenticated.
 
 %prep
 %setup -q
@@ -34,6 +38,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/dav_groupfile
+
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			        \
   --add-only-show-in GNOME                                              \
@@ -62,6 +68,10 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Apr 19 2006 Alexander Larsson <alexl at redhat.com> - 0.9-4
+- Fix http 2.2 patch for password authentication
+- Patch from Veit Wahlich <cru at zodia.de>
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 0.9-3
 - BuildRequires: gtk2-devel, libglade2-devel, libselinux-devel