rpms/mod_suphp/FC-6 .cvsignore, 1.4, 1.5 mod_suphp.spec, 1.12, 1.13 sources, 1.4, 1.5

[Andreas Thienemann (ixs)]

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26901

Modified Files:
	.cvsignore mod_suphp.spec sources 
Log Message:
* Sat Mar 10 2007 Andreas Thienemann <andreas at bawue.net> - 0.6.2-1
- Updated to 0.6.2
- Reverted our double free patch. Upstream fixed their SmartPointer
  implementation.
- Reverted our apr Patch, upstream is working correctly with Apache 2.2 now



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Feb 2006 16:43:24 -0000	1.4
+++ .cvsignore	10 Mar 2007 23:39:10 -0000	1.5
@@ -1 +1 @@
-suphp-0.6.1.tar.gz
+suphp-0.6.2.tar.gz


Index: mod_suphp.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-6/mod_suphp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_suphp.spec	10 Nov 2006 00:57:30 -0000	1.12
+++ mod_suphp.spec	10 Mar 2007 23:39:10 -0000	1.13
@@ -24,8 +24,8 @@
 
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
-Version: 0.6.1
-Release: 4%{?dist}
+Version: 0.6.2
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -34,15 +34,11 @@
 Source3: README.fedora
 Patch0: mod_suphp-0.6.1-userdir.patch
 Patch1: mod_suphp-0.6.1-AddHandler.patch
-Patch2: mod_suphp-0.6.1-apr.patch
 Patch3: mod_suphp-0.6.1-chroot.patch
-Patch4: mod_suphp-0.6.1-DoubleFree.patch
 URL: http://www.suphp.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.0, php
 Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
-Requires(post): policycoreutils
-Requires(postun): policycoreutils
 BuildRequires: httpd-devel >= 2.0, apr-devel
 
 
@@ -60,12 +56,7 @@
 %patch0 -p 1 -b .userdir
 %patch1 -p 1 -b .AddHandler
 %patch3 -p 1 -b .chroot
-%patch4 -p 1 -b .double-free
 
-# Patch source to conform to apr 1.x standards
-%if "%{fedora}" >= "5"
-%patch2 -p 0 -b .apr
-%endif
 
 # fill placeholders
 sed -e 's|###PHP-BIN###|%{php}|g; s|###HANDLER###|%{handler}|g;' %{SOURCE1} > suphp.conf
@@ -114,20 +105,22 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-
-%postun
-
 %files
 %defattr(-,root,root)
 %doc README COPYING CONFIG.suphp CONFIG.apache README.fedora
-%attr (4550, root, root) %{_sbindir}/suphp
+%attr (4550, root, apache) %{_sbindir}/suphp
 %{_libdir}/httpd/modules/*.so
 %config(noreplace) %{_sysconfdir}/suphp.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_suphp.conf
 
 
 %changelog
+* Sat Mar 10 2007 Andreas Thienemann <andreas at bawue.net> - 0.6.2-1
+- Updated to 0.6.2
+- Reverted our double free patch. Upstream fixed their SmartPointer
+  implementation.
+- Reverted our apr Patch, upstream is working correctly with Apache 2.2 now
+
 * Fri Nov 10 2006 Andreas Thienemann <andreas at bawue.net> - 0.6.1-4
 - Fix double free corruption. For real this time. :-/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Feb 2006 16:40:00 -0000	1.4
+++ sources	10 Mar 2007 23:39:10 -0000	1.5
@@ -1 +1 @@
-7eb8ae29404392d9eb07c69d5242d716  suphp-0.6.1.tar.gz
+06ca9e592a5c6dd3dcb9360c958369c1  suphp-0.6.2.tar.gz