packages: apache-mod_ruid2/apache-mod_ruid2.spec, apache-mod_ruid2/apache-m...

[baggins]

Author: baggins                      Date: Fri Mar 11 13:17:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow setting additional groups for "mode stat" locations

---- Files affected:
packages/apache-mod_ruid2:
   apache-mod_ruid2.spec (1.4 -> 1.5) , apache-mod_ruid2-stat-rgroups.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/apache-mod_ruid2/apache-mod_ruid2.spec
diff -u packages/apache-mod_ruid2/apache-mod_ruid2.spec:1.4 packages/apache-mod_ruid2/apache-mod_ruid2.spec:1.5
--- packages/apache-mod_ruid2/apache-mod_ruid2.spec:1.4	Thu Mar 10 17:41:04 2011
+++ packages/apache-mod_ruid2/apache-mod_ruid2.spec	Fri Mar 11 14:16:57 2011
@@ -5,13 +5,14 @@
 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
@@ -39,6 +40,7 @@
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{apxs} -l cap -c mod_%{mod_name}.c
@@ -73,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/03/11 13:16:57  baggins
+- allow setting additional groups for "mode stat" locations
+
 Revision 1.4  2011/03/10 16:41:04  baggins
 - rel 3
 - set hardcoded default uid/gid to http

================================================================
Index: packages/apache-mod_ruid2/apache-mod_ruid2-stat-rgroups.patch
diff -u /dev/null packages/apache-mod_ruid2/apache-mod_ruid2-stat-rgroups.patch:1.1
--- /dev/null	Fri Mar 11 14:17:03 2011
+++ packages/apache-mod_ruid2/apache-mod_ruid2-stat-rgroups.patch	Fri Mar 11 14:16:57 2011
@@ -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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_ruid2/apache-mod_ruid2.spec?r1=1.4&r2=1.5&f=u