rpms/mod_suphp/devel .cvsignore, 1.2, 1.3 mod_suphp.spec, 1.6, 1.7 sources, 1.2, 1.3 suphp.conf, 1.1, 1.2

[Andreas Thienemann (ixs)]

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18514

Modified Files:
	.cvsignore mod_suphp.spec sources suphp.conf 
Log Message:
* Mon Feb 06 2006 Andreas Thienemann <andreas at bawue.net> 0.6.1-1
- Updated to 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jun 2005 20:21:49 -0000	1.2
+++ .cvsignore	6 Feb 2006 16:36:27 -0000	1.3
@@ -1 +1,6 @@
-suphp-0.5.2.tar.gz
+suphp-0.6.1.tar.gz
+README.fedora
+mod_suphp-0.6.1-userdir.patch
+mod_suphp-0.6.1-AddHandler.patch
+suphp.conf
+mod_suphp.conf


Index: mod_suphp.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_suphp.spec	23 Aug 2005 15:13:10 -0000	1.6
+++ mod_suphp.spec	6 Feb 2006 16:36:27 -0000	1.7
@@ -1,18 +1,27 @@
 # Depending on what version of Fedora we're on, use a different php binary
-%if "%fedora" >= "4"
-   %define php /usr/bin/php-cgi
+%if 0%{?fedora}
+	%if "%fedora" >= "4"
+	   %define php /usr/bin/php-cgi
+	%else
+	   %define php /usr/bin/php
+	%endif
 %else
    %define php /usr/bin/php
 %endif
 
+
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
-Version: 0.5.2
-Release: 8%{?dist}
+Version: 0.6.1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
 Source1: suphp.conf
+Source2: mod_suphp.conf
+Source3: README.fedora
+Patch0: mod_suphp-0.6.1-userdir.patch
+Patch1: mod_suphp-0.6.1-AddHandler.patch
 URL: http://www.suphp.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.0, php
@@ -27,16 +36,20 @@
 
 %prep
 %setup -q -n suphp-%{version}
+%patch0 -p 1 -b .userdir
+%patch1 -p 1 -b .AddHandler
 
 %build
+echo "Building mod_suphp with %{php} as PHP interpreter"
 %configure \
+	--with-apxs=/usr/sbin/apxs \
+	--with-apr=/usr/bin/apr-config \
 	--with-apache-user=apache \
 	--with-min-uid=500 \
 	--with-min-gid=500 \
 	--with-php=%{php} \
 	--with-logfile=/var/log/httpd/suphp_log \
-	--with-setid-mode=owner \
-	--disable-checkpath
+	--with-setid-mode=owner 
 
 pushd src
 make %{?_smp_mflags} suphp
@@ -48,25 +61,36 @@
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%{__install} -c -m 4755 -D src/suphp $RPM_BUILD_ROOT%{_sbindir}/suphp
-%{__install} -m 755 -D src/apache2/mod_suphp.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/mod_suphp.so
+%{__install} -c -m 4755 -D src/suphp %{buildroot}%{_sbindir}/suphp
+%{__install} -m 755 -D src/apache2/mod_suphp.so %{buildroot}%{_libdir}/httpd/modules/mod_suphp.so
 
-# Install the config file
-%{__install} -m 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/suphp.conf
+# Install the config files
+sed -e 's@###PHP-BIN###@%{php}@' %{SOURCE1} > suphp.conf
+%{__install} -m 644 -D suphp.conf %{buildroot}%{_sysconfdir}/suphp.conf
+%{__install} -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_suphp.conf
+
+# Rename docs
+cp doc/CONFIG CONFIG.suphp
+cp doc/apache/CONFIG CONFIG.apache
+cp %{SOURCE3} README.fedora
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README COPYING
-%{_sbindir}/suphp
+%doc README COPYING CONFIG.suphp CONFIG.apache README.fedora
+%attr (4755, root, root) %{_sbindir}/suphp
 %{_libdir}/httpd/modules/*.so
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
+%config(noreplace) %{_sysconfdir}/suphp.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_suphp.conf
 
 %changelog
+* Mon Feb 06 2006 Andreas Thienemann <andreas at bawue.net> 0.6.1-1
+- Updated to 0.6.1
+
 * Tue Jul 09 2005 Andreas Thienemann <andreas at bawue.net> 0.5.2-8
 - Added a dependency on a specific httpd-mmn
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2005 20:21:49 -0000	1.2
+++ sources	6 Feb 2006 16:36:27 -0000	1.3
@@ -1 +1,6 @@
-337909e87027af124052baddddbd2994  suphp-0.5.2.tar.gz
+7eb8ae29404392d9eb07c69d5242d716  suphp-0.6.1.tar.gz
+4d95b68cc54bc401ec5b4005baf0ad51  README.fedora
+5252fb24e364451c1ffb0d3e112a61ba  mod_suphp-0.6.1-userdir.patch
+33939dd30a5271a7d9daeb2b362dd11e  mod_suphp-0.6.1-AddHandler.patch
+b7cbd9c5cea2249625018629b86a2a11  suphp.conf
+2c4c073c47ba34ef72293bdaff693a98  mod_suphp.conf


Index: suphp.conf
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/devel/suphp.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- suphp.conf	30 Jun 2005 20:21:49 -0000	1.1
+++ suphp.conf	6 Feb 2006 16:36:27 -0000	1.2
@@ -1,32 +1,49 @@
-# This is the Apache server configuration file providing suPHP support..
-# It contains the configuration directives to instruct the server how to
-# serve php pages while switching to the user context before rendering.
-# For directives see <URL:http://httpd.apache.org/docs-2.0/mod/mod_suphp.html>
-
-LoadModule suphp_module modules/mod_suphp.so
-
-# To use suPHP to parse PHP-Files
-#AddHandler x-httpd-php .php
-#AddHandler x-httpd-php .php .php4 .php3 .phtml
-
-# This option tells mod_suphp if a PHP-script requested on this server (or
-# VirtualHost) should be run with the PHP-interpreter or returned to the
-# browser "as it is".
-suPHP_Engine off
-
-
-# This option tells mod_suphp which path to pass on to the PHP-interpreter
-# (by setting the PHPRC environment variable).
-# Do *NOT* refer to a file but to the directory the file resists in.
-#
-# E.g.: If you want to use "/path/to/server/config/php.ini", use "suPHP_Config
-# /path/to/server/config".
-#
-# If you don't use this option, PHP will use its compiled in default path.
-#suPHP_ConfigPath /etc
-
-
-# If you compiled suphp with setid-mode "force" or "paranoid", you can
-# specify the user- and groupname to run PHP-scripts with.
-# Example: suPHP_UserGroup foouser bargroup
-# suPHP_UserGroup apache apache
+[global]
+;Path to logfile
+logfile=/var/log/suphp.log
+
+;Loglevel
+loglevel=info
+
+;User Apache is running as
+webserver_user=apache
+
+;Path all scripts have to be in
+docroot=/
+
+;Path to chroot() to before executing script
+;chroot=/mychroot
+
+; Security options
+allow_file_group_writeable=false
+allow_file_others_writeable=false
+allow_directory_group_writeable=false
+allow_directory_others_writeable=false
+
+;Check wheter script is within DOCUMENT_ROOT
+check_vhost_docroot=true
+
+;Send minor error messages to browser
+errors_to_browser=true
+
+;PATH environment variable
+env_path=/bin:/usr/bin
+
+;Umask to set, specify in octal notation
+umask=0077
+
+; Minimum UID
+min_uid=500
+
+; Minimum GID
+min_gid=500
+
+; Use correct permissions for mod_userdir sites
+handle_userdir=true
+
+[handlers]
+;Handler for php-scripts
+x-httpd-php=php:###PHP-BIN###
+
+;Handler for CGI-scripts
+x-suphp-cgi=execute:!self