- updated to 0.6.1

Changed files:
    apache-mod_suphp-apr.patch -> 1.4
    apache-mod_suphp-compiler-flags.patch -> 1.2

diff --git a/apache-mod_suphp-apr.patch b/apache-mod_suphp-apr.patch
index 3168135b2f1f4607b93e5e5ca17902eabe6017b4..c14054f7855eebc8529fa221ad24fc453b9f3e5b 100644 (file)
--- a/apache-mod_suphp-apr.patch
+++ b/apache-mod_suphp-apr.patch
@@ -37,3 +37,76 @@ diff -urN suphp-0.5.2.org/src/apache2/mod_suphp.c suphp-0.5.2/src/apache2/mod_su
              {
                  if (APR_BUCKET_IS_EOS(b))
                      break;
+diff -ur suphp-0.6.1/acinclude.m4 suphp-0.6.1.apr/acinclude.m4
+--- suphp-0.6.1/acinclude.m4   2005-11-26 20:45:49.000000000 +0100
++++ suphp-0.6.1.apr/acinclude.m4       2006-01-27 18:53:40.000000000 +0100
+@@ -40,7 +40,7 @@
+ dnl value of apr_config to fetch any necessary build/link information.
+ dnl
+ 
+-AC_DEFUN(APR_FIND_APR, [
++AC_DEFUN([APR_FIND_APR], [
+   apr_found="no"
+ 
+   if test "$ac_cv_emxos2" = "yes"; then
+@@ -53,18 +53,18 @@
+   AC_MSG_CHECKING(for APR)
+   AC_ARG_WITH(apr,
+   [  --with-apr=DIR|FILE     prefix for installed APR, path to APR build tree,
+-                          or the full path to apr-config],
++                          or the full path to apr-1-config],
+   [
+     if test "$withval" = "no" || test "$withval" = "yes"; then
+       AC_MSG_ERROR([--with-apr requires a directory to be provided])
+     fi
+ 
+-    if $TEST_X "$withval/bin/apr-config"; then
++    if $TEST_X "$withval/bin/apr-1-config"; then
+       apr_found="yes"
+-      apr_config="$withval/bin/apr-config"
+-    elif $TEST_X "$withval/apr-config"; then
++      apr_config="$withval/bin/apr-1-config"
++    elif $TEST_X "$withval/apr-1-config"; then
+       apr_found="yes"
+-      apr_config="$withval/apr-config"
++      apr_config="$withval/apr-1-config"
+     elif $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
+       apr_found="yes"
+       apr_config="$withval"
+@@ -73,7 +73,7 @@
+     dnl if --with-apr is used, then the target prefix/directory must be valid
+     if test "$apr_found" != "yes"; then
+       AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a
+-build directory, or an apr-config file.])
++build directory, or an apr-1-config file.])
+     fi
+   ],[
+     dnl if we have a bundled source directory, use it
+@@ -81,21 +81,21 @@
+       apr_temp_abs_srcdir="`cd $1 && pwd`"
+       apr_found="reconfig"
+       if test -n "$2"; then
+-        apr_config="$2/apr-config"
++        apr_config="$2/apr-1-config"
+       else
+-        apr_config="$1/apr-config"
++        apr_config="$1/apr-1-config"
+       fi
+     fi
+     if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
+-      if apr-config --help > /dev/null 2>&1 ; then
++      if apr-1-config --help > /dev/null 2>&1 ; then
+         apr_found="yes"
+-        apr_config="apr-config"
++        apr_config="apr-1-config"
+       else
+         dnl look in some standard places (apparently not in builtin/default)
+         for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
+-          if $TEST_X "$lookdir/bin/apr-config"; then
++          if $TEST_X "$lookdir/bin/apr-1-config"; then
+             apr_found="yes"
+-            apr_config="$lookdir/bin/apr-config"
++            apr_config="$lookdir/bin/apr-1-config"
+             break
+           fi
+         done

diff --git a/apache-mod_suphp-compiler-flags.patch b/apache-mod_suphp-compiler-flags.patch
index db806e88d2c58dcfe525ef6b0e07d0fc024ca80c..77e0e9fac97d7c622dcf25edf0eaab3dbfc3f0a1 100644 (file)
--- a/apache-mod_suphp-compiler-flags.patch
+++ b/apache-mod_suphp-compiler-flags.patch
@@ -3,9 +3,9 @@
 @@ -3,7 +3,7 @@
  endif
  
- AM_CFLAGS=-I@APXS_INCLUDEDIR@ @APXS_EXTRA_CFLAGS@
+ AM_CFLAGS=-I@APXS_INCLUDEDIR@ -I@APR_INCLUDEDIR@ @APXS_EXTRA_CFLAGS@
 -AM_CFLAGS+=-DSUPHP_PATH_TO_SUPHP=\"${sbindir}/suphp\" $(DEFINE_USERGROUP)
-+AM_CFLAGS+=-DSUPHP_PATH_TO_SUPHP=\"${sbindir}/suphp\" $(DEFINE_USERGROUP) -I${includedir}/apr/ -I${includedir}/apr-util/ -D_LARGEFILE64_SOURCE
++AM_CFLAGS+=-DSUPHP_PATH_TO_SUPHP=\"${sbindir}/suphp\" $(DEFINE_USERGROUP) -I${includedir}/apr-util/ -D_LARGEFILE64_SOURCE
  
  noinst_LTLIBRARIES = mod_suphp.la
  mod_suphp_la_SOURCES = mod_suphp.c