packages: spawn-fcgi/spawn-fcgi.spec, spawn-fcgi/spawn-fcgi-socket_chown.pa...

[jpc]

Author: jpc                          Date: Tue May 25 12:12:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add socket_chown patch

---- Files affected:
packages/spawn-fcgi:
   spawn-fcgi.spec (1.15 -> 1.16) , spawn-fcgi-socket_chown.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/spawn-fcgi/spawn-fcgi.spec
diff -u packages/spawn-fcgi/spawn-fcgi.spec:1.15 packages/spawn-fcgi/spawn-fcgi.spec:1.16
--- packages/spawn-fcgi/spawn-fcgi.spec:1.15	Thu Sep 24 10:04:50 2009
+++ packages/spawn-fcgi/spawn-fcgi.spec	Tue May 25 14:12:09 2010
@@ -3,11 +3,13 @@
 Summary(pl.UTF-8):	Bezpośrednie uruchamianie procesów fcgi
 Name:		spawn-fcgi
 Version:	1.6.3
-Release:	2
+Release:	3
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
 # Source0-md5:	787ed2f88d2204bf1fe4fbd6e509d1d7
+# Patch to chown & chmod the created unix socket even when run as a regular user.
+Patch0:		%{name}-socket_chown.patch
 URL:		http://redmine.lighttpd.net/projects/spawn-fcgi
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -25,6 +27,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -54,6 +57,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/05/25 12:12:09  jpc
+- add socket_chown patch
+
 Revision 1.15  2009/09/24 08:04:50  glen
 - add daemontools/runit ./run examples
 

================================================================
Index: packages/spawn-fcgi/spawn-fcgi-socket_chown.patch
diff -u /dev/null packages/spawn-fcgi/spawn-fcgi-socket_chown.patch:1.1
--- /dev/null	Tue May 25 14:12:14 2010
+++ packages/spawn-fcgi/spawn-fcgi-socket_chown.patch	Tue May 25 14:12:09 2010
@@ -0,0 +1,28 @@
+--- spawn-fcgi-1.6.3-old/src/spawn-fcgi.c	2010-05-25 13:38:12.000000000 +0200
++++ spawn-fcgi-1.6.3/src/spawn-fcgi.c	2010-05-25 14:04:23.000000000 +0200
+@@ -486,8 +486,8 @@
+ 		case 'c': if (i_am_root) { changeroot = optarg; }/* chroot() */ break;
+ 		case 'u': if (i_am_root) { username = optarg; } /* set user */ break;
+ 		case 'g': if (i_am_root) { groupname = optarg; } /* set group */ break;
+-		case 'U': if (i_am_root) { sockusername = optarg; } /* set socket user */ break;
+-		case 'G': if (i_am_root) { sockgroupname = optarg; } /* set socket group */ break;
++		case 'U': sockusername = optarg; /* set socket user */ break;
++		case 'G': sockgroupname = optarg; /* set socket group */ break;
+ 		case 'S': if (i_am_root) { sockbeforechroot = 1; } /* open socket before chroot() */ break;
+ 		case 'M': sockmode = strtol(optarg, NULL, 0); /* set socket mode */ break;
+ 		case 'n': nofork = 1; break;
+@@ -614,7 +614,13 @@
+ 			setuid(uid);
+ 		}
+ 	} else {
+-		if (-1 == (fcgi_fd = bind_socket(addr, port, unixsocket, 0, 0, sockmode)))
++		uid_t sockuid;
++		gid_t sockgid;
++
++		if (-1 == find_user_group(sockusername, sockgroupname, &sockuid, &sockgid, NULL))
++			return -1;
++
++		if (-1 == (fcgi_fd = bind_socket(addr, port, unixsocket, sockuid, sockgid, sockmode)))
+ 			return -1;
+ 	}
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spawn-fcgi/spawn-fcgi.spec?r1=1.15&r2=1.16&f=u