- allow setting additional groups for "mode stat" locations

Changed files:
    apache-mod_ruid2-stat-rgroups.patch -> 1.1
    apache-mod_ruid2.spec -> 1.5

diff --git a/apache-mod_ruid2-stat-rgroups.patch b/apache-mod_ruid2-stat-rgroups.patch
new file mode 100644 (file)
index 0000000..6ff177f
--- /dev/null
+++ b/apache-mod_ruid2-stat-rgroups.patch
@@ -0,0 +1,13 @@
+--- mod_ruid2-0.9.4/mod_ruid2.c~       2011-02-24 15:25:28.000000000 +0100
++++ mod_ruid2-0.9.4/mod_ruid2.c        2011-03-11 14:15:26.915053808 +0100
+@@ -123,6 +123,10 @@
+               conf->ruid_uid=RUID_DEFAULT_UID;
+               conf->ruid_gid=RUID_DEFAULT_GID;
+               conf->groupsnr=0;
++              if (child->groupsnr != 0) {
++                      memcpy(conf->groups, child->groups, sizeof(child->groups));
++                      conf->groupsnr = child->groupsnr;
++              }
+       } else {
+               conf->ruid_uid = (child->ruid_uid == UNSET) ? parent->ruid_uid : child->ruid_uid;
+               conf->ruid_gid = (child->ruid_gid == UNSET) ? parent->ruid_gid : child->ruid_gid;

diff --git a/apache-mod_ruid2.spec b/apache-mod_ruid2.spec
index fce5d7f02dabbf0a31c4b8862c8da9484da17859..22bc58c465d819c47b799ec5bd3722646d01e34d 100644 (file)
--- a/apache-mod_ruid2.spec
+++ b/apache-mod_ruid2.spec
@@ -4,13 +4,14 @@ Summary:      Apache module: run all httpd process under user's access right
 Summary(pl.UTF-8):     Moduł do apache: uruchamiania procesów httpd na prawach użytkowniów
 Name:          apache-mod_%{mod_name}
 Version:       0.9.4
-Release:       3
+Release:       3.1
 License:       ASL v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://sourceforge.net/projects/mod-ruid/files/mod_ruid2/mod_%{mod_name}-%{version}.tar.bz2
 # Source0-md5: 23e43b818c578142689de4d36868391a
 Source1:       mod_%{mod_name}.conf
 Patch0:                %{name}-uid-gid.patch
+Patch1:                %{name}-stat-rgroups.patch
 URL:           http://mod-ruid.sourceforge.net/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.0
@@ -38,6 +39,7 @@ procesu.
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{apxs} -l cap -c mod_%{mod_name}.c