diff options
Diffstat (limited to 'www/apache22/files')
| -rw-r--r-- | www/apache22/files/apache22.sh.in | 4 | ||||
| -rw-r--r-- | www/apache22/files/patch-CVE-2008-2939 | 11 | ||||
| -rw-r--r-- | www/apache22/files/patch-srclib:apr-util:build:dbm.m4 | 84 |
3 files changed, 7 insertions, 92 deletions
diff --git a/www/apache22/files/apache22.sh.in b/www/apache22/files/apache22.sh.in index 7dffa3dcd349..7e48b8ab61bf 100644 --- a/www/apache22/files/apache22.sh.in +++ b/www/apache22/files/apache22.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache22.sh.in,v 1.7 2008-09-02 07:34:21 clement Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache22.sh.in,v 1.8 2008-12-15 22:05:56 clement Exp $ # # PROVIDE: apache22 @@ -189,8 +189,8 @@ apache22_checkfib () { } apache22_prestart() { - apache22_precmd apache22_checkfib + apache22_precmd } extra_commands="reload graceful gracefulstop configtest" diff --git a/www/apache22/files/patch-CVE-2008-2939 b/www/apache22/files/patch-CVE-2008-2939 deleted file mode 100644 index ad997212844f..000000000000 --- a/www/apache22/files/patch-CVE-2008-2939 +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/proxy/mod_proxy_ftp.c 2008/08/05 19:00:05 682869 -+++ modules/proxy/mod_proxy_ftp.c 2008/08/05 19:01:50 682870 -@@ -383,6 +383,7 @@ - c->bucket_alloc)); - } - if (wildcard != NULL) { -+ wildcard = ap_escape_html(p, wildcard); - APR_BRIGADE_INSERT_TAIL(out, apr_bucket_pool_create(wildcard, - strlen(wildcard), p, - c->bucket_alloc)); - diff --git a/www/apache22/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache22/files/patch-srclib:apr-util:build:dbm.m4 index 25c9242e8d75..ac8306a2ee18 100644 --- a/www/apache22/files/patch-srclib:apr-util:build:dbm.m4 +++ b/www/apache22/files/patch-srclib:apr-util:build:dbm.m4 @@ -1,5 +1,5 @@ ---- srclib/apr-util/build/dbm.m4.orig 2008-05-28 16:27:01.000000000 +0000 -+++ srclib/apr-util/build/dbm.m4 2008-07-11 20:32:59.000000000 +0000 +--- srclib/apr-util/build/dbm.m4.orig 2008-06-25 01:54:26.000000000 +0200 ++++ srclib/apr-util/build/dbm.m4 2008-12-09 22:40:21.000000000 +0100 @@ -315,8 +315,8 @@ fi APU_CHECK_BERKELEY_DB(1, -1, -1, @@ -64,7 +64,7 @@ ) if test "$apu_have_db" = "1"; then apu_db_version=4 -@@ -503,6 +503,25 @@ +@@ -522,6 +522,25 @@ apu_db_version=4 fi ]) @@ -90,7 +90,7 @@ AC_DEFUN([APU_CHECK_DB], [ requested=$1 -@@ -581,6 +600,12 @@ +@@ -606,6 +625,12 @@ AC_MSG_ERROR(Berkeley db4 not found) fi ;; @@ -103,72 +103,7 @@ default) APU_CHECK_DB_ALL("$check_places") ;; -@@ -588,32 +613,35 @@ - ]) - - dnl --dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.6 to 1. -+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.7 to 1. - dnl - AC_DEFUN([APU_CHECK_DB_ALL], [ - all_places=$1 - -- APU_CHECK_DB46("$all_places") -+ APU_CHECK_DB47("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB45("$all_places") -+ APU_CHECK_DB46("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB44("$all_places") -+ APU_CHECK_DB45("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB43("$all_places") -+ APU_CHECK_DB44("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB42("$all_places") -+ APU_CHECK_DB43("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB41("$all_places") -+ APU_CHECK_DB42("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB4("$all_places") -+ APU_CHECK_DB41("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB3("$all_places") -- if test "$apu_db_version" != "3"; then -- APU_CHECK_DB2("$all_places") -- if test "$apu_db_version" != "2"; then -- APU_CHECK_DB1("$all_places") -- if test "$apu_db_version" != "1"; then -- APU_CHECK_DB185("$all_places") -+ APU_CHECK_DB4("$all_places") -+ if test "$apu_db_version" != "4"; then -+ APU_CHECK_DB3("$all_places") -+ if test "$apu_db_version" != "3"; then -+ APU_CHECK_DB2("$all_places") -+ if test "$apu_db_version" != "2"; then -+ APU_CHECK_DB1("$all_places") -+ if test "$apu_db_version" != "1"; then -+ APU_CHECK_DB185("$all_places") -+ fi - fi - fi - fi -@@ -651,11 +679,11 @@ - apu_db_version=0 - - AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. -- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}])], -+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])], - [ - if test "$withval" = "yes"; then - AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. -- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46]) -+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47]) - fi - requested="$withval" - ], [ -@@ -850,6 +878,10 @@ +@@ -882,6 +907,10 @@ apu_use_db=1 apu_default_dbm=db4 ;; @@ -179,12 +114,3 @@ default) dnl ### use more sophisticated DBMs for the default? apu_default_dbm="sdbm (default)" -@@ -857,7 +889,7 @@ - ;; - *) - AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. -- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46]) -+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47]) - ;; - esac - |