- this update is sponsored by Marcin Kurzyna

- rotate mod_suphp logfiles
- fixed configure params
- bcond: --disable checkpath

Changed files:
    apache-mod_suphp.spec -> 1.5

diff --git a/apache-mod_suphp.spec b/apache-mod_suphp.spec
index 966e0728bd4bec88941dfe73b9d9080f46163d79..1c7f062232ca8e97be7b5867af560d72d2564947 100644 (file)
--- a/apache-mod_suphp.spec
+++ b/apache-mod_suphp.spec
@@ -1,14 +1,22 @@
+#
+# Available build options:
+#  _disable_checkpath  - set to '1' to disable check if php execution is within DOCUMENT_ROOT
+#                        of the vhost; you want to set it ie. if you use symlinks to directories 
+#                        that lay outside vhost DOCUMENT_ROOT
+#
+#
 %define                mod_name        suphp
 %define        apxs            /usr/sbin/apxs
 Summary:       Apache module: suPHP - execute PHP scripts with the permissions of their owners
 Summary(pl):   Modu³ do apache: suPHP - uruchamianie skryptów PHP z uprawnieniami ich w³a¶cicieli
 Name:          apache-mod_%{mod_name}
 Version:       0.3.1
-Release:       0.1
+Release:       0.4
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz     
 # Source0-md5: edf3063432da532a398d08cc8a48b668
+Source1:       apache-mod_suphp.logrotate
 URL:           http://www.suphp.org/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel <= 1.4
@@ -38,15 +46,14 @@ modu
 %{__autoconf}
 %{__autoheader}
 chmod 755 configure
-%configure \
-       --with-http-user=http \
+%configure --with-apache-user=http \
        --with-min-uid=500 \
-       --with-min-gid=1000
+       --with-min-gid=1000 \
+       --with-apxs=%{apxs} \
+       %{?_disable_checkpath: --enable-checkpath=no}
 
 %{__make}
 
-#%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lz
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir}}
@@ -54,6 +61,9 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir}}
 install src/suphp $RPM_BUILD_ROOT%{_sbindir}
 install src/apache/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+install --mode=640 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/apache-mod_suphp
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -71,8 +81,12 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
+%postun
+rm -f %{_sysconfdir}/logrotate.d/apache-mod_suphp
+
 %files
 %defattr(644,root,root,755)
 %doc README AUTHORS ChangeLog doc
 %attr(4755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_pkglibdir}/*
+%config(noreplace) %{_sysconfdir}/logrotate.d/*