summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-03-09 20:03:09 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-03-09 20:03:09 +0000
commitc0f721393c4b20099a26e0d319aad0fa11033599 (patch)
tree265441a90fd9f531b1899dceb984b21654ccca31 /www-apache/mod_suphp/files
parentStable on amd64 (bug #125111). (diff)
downloadgentoo-2-c0f721393c4b20099a26e0d319aad0fa11033599.tar.gz
gentoo-2-c0f721393c4b20099a26e0d319aad0fa11033599.tar.bz2
gentoo-2-c0f721393c4b20099a26e0d319aad0fa11033599.zip
New Apache 2.2 compatible revision, fix copyright headers.
(Portage version: 2.1_pre5-r3)
Diffstat (limited to 'www-apache/mod_suphp/files')
-rw-r--r--www-apache/mod_suphp/files/digest-mod_suphp-0.6.02
-rw-r--r--www-apache/mod_suphp/files/digest-mod_suphp-0.6.12
-rw-r--r--www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r13
-rw-r--r--www-apache/mod_suphp/files/suphp-apache22-compat.patch75
4 files changed, 82 insertions, 0 deletions
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0
index b2df809d235e..3be8cbc84378 100644
--- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0
+++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0
@@ -1 +1,3 @@
MD5 fa89691101b9ebf18f4922b1382186c6 suphp-0.6.0.tar.gz 247534
+RMD160 953f3be08d7e33ff64e327ee34bb84639888aa5f suphp-0.6.0.tar.gz 247534
+SHA256 6fe1c15da4d4dbb96e02e5c4d8878ffc1d5dc25c4cc3bf4e1cfda93503c69077 suphp-0.6.0.tar.gz 247534
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1
index 04bc290353e8..678c9c1d791b 100644
--- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1
+++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1
@@ -1 +1,3 @@
MD5 7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz 361372
+RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb suphp-0.6.1.tar.gz 361372
+SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 suphp-0.6.1.tar.gz 361372
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r1 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r1
new file mode 100644
index 000000000000..678c9c1d791b
--- /dev/null
+++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r1
@@ -0,0 +1,3 @@
+MD5 7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz 361372
+RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb suphp-0.6.1.tar.gz 361372
+SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 suphp-0.6.1.tar.gz 361372
diff --git a/www-apache/mod_suphp/files/suphp-apache22-compat.patch b/www-apache/mod_suphp/files/suphp-apache22-compat.patch
new file mode 100644
index 000000000000..f8193d76a7b2
--- /dev/null
+++ b/www-apache/mod_suphp/files/suphp-apache22-compat.patch
@@ -0,0 +1,75 @@
+--- src/apache2/mod_suphp.c Sat Jan 7 19:03:59 2006
++++ src/apache2/mod_suphp.c Sat Jan 7 19:20:32 2006
+@@ -56,7 +56,7 @@
+ return -1;
+
+ rv = apr_bucket_read(b, &bucket_data, &bucket_data_len, APR_BLOCK_READ);
+- if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0))
++ if ((rv != APR_SUCCESS) || (bucket_data_len == 0))
+ {
+ return 0;
+ }
+@@ -558,7 +558,9 @@
+ return rv;
+ }
+
+- APR_BRIGADE_FOREACH(bucket, bb)
++
++ bucket = APR_BRIGADE_FIRST(bb);
++ while (bucket != APR_BRIGADE_SENTINEL(bb))
+ {
+ const char *data;
+ apr_size_t len;
+@@ -582,6 +584,8 @@
+ {
+ child_stopped_reading = 1;
+ }
++
++ bucket = APR_BUCKET_NEXT(bucket);
+ }
+ apr_brigade_cleanup(bb);
+ }
+@@ -634,12 +638,15 @@
+
+ const char *buf;
+ apr_size_t blen;
+- APR_BRIGADE_FOREACH(b, bb)
++ b = APR_BRIGADE_FIRST(bb);
++ while (b != APR_BRIGADE_SENTINEL(bb))
+ {
+ if (APR_BUCKET_IS_EOS(b))
+ break;
+ if (apr_bucket_read(b, &buf, &blen, APR_BLOCK_READ) != APR_SUCCESS)
+ break;
++
++ b = APR_BUCKET_NEXT(b);
+ }
+ apr_brigade_destroy(bb);
+ suphp_log_script_err(r, proc->err);
+@@ -655,12 +662,14 @@
+ /* empty brigade (script output) */
+ const char *buf;
+ apr_size_t blen;
+- APR_BRIGADE_FOREACH(b, bb)
++ b = APR_BRIGADE_FIRST(bb);
++ while (b != APR_BRIGADE_SENTINEL(bb))
+ {
+ if (APR_BUCKET_IS_EOS(b))
+ break;
+ if (apr_bucket_read(b, &buf, &blen, APR_BLOCK_READ) != APR_SUCCESS)
+ break;
++ b = APR_BUCKET_NEXT(b);
+ }
+ apr_brigade_destroy(bb);
+ return HTTP_MOVED_TEMPORARILY;
+--- configure 2006-03-04 19:06:30.000000000 +0100
++++ configure 2006-03-04 19:05:37.000000000 +0100
+@@ -20425,7 +20425,7 @@
+ | cut -f2 -d"/" \
+ | cut -f1 -d" "`
+ major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
+- if test "$major_version" = "2.0"; then
++ if test "$major_version" = "2.2"; then
+ APACHE_VERSION_2=true
+ APACHE_VERSION_1_3=false
+ else