OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jan-2007 15:12:11
Branch: HEAD Handle: 2007011214121000
Modified files:
openpkg-src/apache apache.spec
Log:
fix suPHP support
Summary:
Revision Changes Path
1.369 +9 -2 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.368 -r1.369 apache.spec
--- openpkg-src/apache/apache.spec 1 Jan 2007 17:36:32 -0000 1.368
+++ openpkg-src/apache/apache.spec 12 Jan 2007 14:12:10 -0000 1.369
@@ -67,7 +67,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20061227
+Release: 20070112
# package options (suexec related)
%option with_suexec yes
@@ -1063,7 +1063,8 @@
--disable-checkuid \
--disable-checkgid \
%endif
- --with-setid-mode=%{with_suphp_ugid_mode}
+ --with-setid-mode=%{with_suphp_ugid_mode} \
+ --disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
%endif
@@ -1137,6 +1138,12 @@
%endif
%if "%{with_suphp}" == "yes"
cflags="$cflags -DSUPHP_PATH_TO_SUPHP='\"%{l_prefix}/sbin/suphp\"'"
+
+ # ugly hack to extract flags required for certain modes of
+ # operation of suPHP
+ cflags="$cflags \
+ `sed -n -e 's;^OPT_APACHEMOD_USERGROUP_DEF[ ]=\(.*\)$;\1;p'
\
+ ../suphp-%{V_suphp}/src/apache/Makefile`"
%endif
CC="%{l_cc}" \
CFLAGS="$cflags" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
