Index: apache2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache2/Makefile,v retrieving revision 1.169 diff -u -r1.169 Makefile --- apache2/Makefile 8 Mar 2004 12:51:54 -0000 1.169 +++ apache2/Makefile 9 Mar 2004 08:26:08 -0000 @@ -8,12 +8,11 @@ # PORTNAME= apache -PORTVERSION= 2.0.48 -PORTREVISION= 4 +PORTVERSION= 2.0.49.rc1 CATEGORIES= www ipv6 -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ +MASTER_SITES= http://httpd.apache.org/dev/dist/ \ http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo -DISTNAME= httpd-${PORTVERSION} +DISTNAME= httpd-2.0.49-rc1 DISTFILES= ${DISTNAME}.tar.gz powerlogo.gif:powerlogo DIST_SUBDIR= apache2 EXTRACT_ONLY= ${DISTNAME}.tar.gz @@ -30,22 +29,20 @@ ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* # patch files -PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:clement/} -PATCH_SITE_SUBDIR= clement/:clement -PATCHFILES+= httpd-2.0.48-buildconf.patch:clement +PATCH_SITES+= http://people.freebsd.org/~clement/apache/download/ports/devel/patch/:clement +PATCHFILES+= httpd-2.0.49-buildconf.patch:clement PATCH_DIST_STRIP+= -p1:clement -.if defined (WITH_LDAPFIX) -PATCHFILES+= httpd-2.0.48-ldap-fix.patch:clement -.endif .if defined (WITH_WINDOWSUPDATEFIX) -PATCHFILES+= httpd-2.0.48-windowsupdate.patch:clement +PATCHFILES+= httpd-2.0.49-windowsupdate.patch:clement .endif SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ - LIBTOOL_VERSION=${LIBTOOL_VERSION} + LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \ + LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \ + AUTOHEADER=${AUTOHEADER} -WANT_AUTOCONF_VER?= 253 -USE_LIBTOOL= yes +WANT_AUTOCONF_VER?= 257 +USE_LIBTOOL_VER= 15 USE_PERL5= yes USE_REINPLACE= yes CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ @@ -131,7 +128,7 @@ @${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc show-modules: - @for module in $(AVAILABLE_MODULES) ; do \ + @for module in ${AVAILABLE_MODULES} ; do \ ${ECHO_MSG} -n "$${module}: ";\ if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \ ${ECHO_CMD} -n "enabled "; \ Index: apache2/Makefile.doc =================================================================== RCS file: /home/pcvs/ports/www/apache2/Makefile.doc,v retrieving revision 1.5 diff -u -r1.5 Makefile.doc --- apache2/Makefile.doc 16 Feb 2004 14:07:48 -0000 1.5 +++ apache2/Makefile.doc 9 Mar 2004 08:27:17 -0000 @@ -45,6 +45,7 @@ ## SUEXEC_UIDMIN: Minimal allowed UID (default 1000) ## SUEXEC_GIDMIN: Minimal allowed GID (default 1000) ## SUEXEC_CALLER: User allowed to call SuExec (default ${WWWOWN} (www)) +## WITH_EXCEPTION_HOOK: Fatal exception hook support ## ## Port-related: ## WITHOUT_WWW: Implies NO_CGI, NO_WWWDATA, NO_ICONS and NO_ERROR Index: apache2/Makefile.modules =================================================================== RCS file: /home/pcvs/ports/www/apache2/Makefile.modules,v retrieving revision 1.9 diff -u -r1.9 Makefile.modules --- apache2/Makefile.modules 8 Feb 2004 11:53:55 -0000 1.9 +++ apache2/Makefile.modules 9 Mar 2004 08:28:23 -0000 @@ -211,6 +211,11 @@ CONFIGURE_ARGS+= --with-suexec-umask=${WITH_SUEXEC_UMASK} . endif .endif + +.if defined(WITH_EXCEPTION_HOOK) +CONFIFURE_ARGS+= --enable-exception-hook +.endif + .if defined(WITH_EXTRA_MODULES) _APACHE_MODULES+= ${WITH_EXTRA_MODULES} .endif Index: apache2/distinfo =================================================================== RCS file: /home/pcvs/ports/www/apache2/distinfo,v retrieving revision 1.61 diff -u -r1.61 distinfo --- apache2/distinfo 16 Feb 2004 14:07:48 -0000 1.61 +++ apache2/distinfo 9 Mar 2004 08:20:37 -0000 @@ -1,10 +1,8 @@ -MD5 (apache2/httpd-2.0.48.tar.gz) = 466c63bb71b710d20a5c353df8c1a19c -SIZE (apache2/httpd-2.0.48.tar.gz) = 6258490 +MD5 (apache2/httpd-2.0.49-rc1.tar.gz) = 342c37abc2ea81c24ed5ce005da9d0f0 +SIZE (apache2/httpd-2.0.49-rc1.tar.gz) = 5907527 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 SIZE (apache2/powerlogo.gif) = 5279 -MD5 (apache2/httpd-2.0.48-buildconf.patch) = 6c87bda01550a99402c3ea0bd333c5e0 -SIZE (apache2/httpd-2.0.48-buildconf.patch) = 2407 -MD5 (apache2/httpd-2.0.48-ldap-fix.patch) = cfb30edd10c43e51953aecc0da40b104 -SIZE (apache2/httpd-2.0.48-ldap-fix.patch) = 35209 -MD5 (apache2/httpd-2.0.48-windowsupdate.patch) = a96fe94b28094483a112705d0428e6f5 -SIZE (apache2/httpd-2.0.48-windowsupdate.patch) = 464 +MD5 (apache2/httpd-2.0.49-buildconf.patch) = cb42cea62242388b648ff66be21f220a +SIZE (apache2/httpd-2.0.49-buildconf.patch) = 2476 +MD5 (apache2/httpd-2.0.49-windowsupdate.patch) = a96fe94b28094483a112705d0428e6f5 +SIZE (apache2/httpd-2.0.49-windowsupdate.patch) = 464 Index: apache2/files/patch-modules:ssl:ssl_engine_io.c =================================================================== RCS file: apache2/files/patch-modules:ssl:ssl_engine_io.c diff -N apache2/files/patch-modules:ssl:ssl_engine_io.c --- apache2/files/patch-modules:ssl:ssl_engine_io.c 8 Mar 2004 12:51:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ -=================================================================== -RCS file: /home/cvspublic/httpd-2.0/modules/ssl/ssl_engine_io.c,v -retrieving revision 1.100.2.11 -retrieving revision 1.100.2.12 -diff -u -r1.100.2.11 -r1.100.2.12 ---- modules/ssl/ssl_engine_io.c 2004/02/09 20:53:20 1.100.2.11 -+++ modules/ssl/ssl_engine_io.c 2004/03/07 22:03:16 1.100.2.12 -@@ -821,9 +821,11 @@ - sizeof(HTTP_ON_HTTPS_PORT) - 1, \ - alloc) - --static void ssl_io_filter_disable(ap_filter_t *f) -+static void ssl_io_filter_disable(SSLConnRec *sslconn, ap_filter_t *f) - { - bio_filter_in_ctx_t *inctx = f->ctx; -+ SSL_free(inctx->ssl); -+ sslconn->ssl = NULL; - inctx->ssl = NULL; - inctx->filter_ctx->pssl = NULL; - } -@@ -845,7 +847,7 @@ - ssl_log_ssl_error(APLOG_MARK, APLOG_INFO, f->c->base_server); - - sslconn->non_ssl_request = 1; -- ssl_io_filter_disable(f); -+ ssl_io_filter_disable(sslconn, f); - - /* fake the request line */ - bucket = HTTP_ON_HTTPS_PORT_BUCKET(f->c->bucket_alloc); - - Index: apache2/files/patch-srclib:apr-util:build:dbm.4 =================================================================== RCS file: apache2/files/patch-srclib:apr-util:build:dbm.4 diff -N apache2/files/patch-srclib:apr-util:build:dbm.4 --- apache2/files/patch-srclib:apr-util:build:dbm.4 8 Jan 2004 17:42:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,192 +0,0 @@ ---- srclib/apr-util/build/dbm.m4.orig Sun Aug 31 15:27:23 2003 -+++ srclib/apr-util/build/dbm.m4 Thu Jan 8 17:11:11 2004 -@@ -48,6 +48,7 @@ - - # Save the original values of the flags we tweak. - apu_check_lib_save_libs="$LIBS" -+ apu_check_lib_save_ldflags="$LDFLAGS" - apu_check_lib_save_cppflags="$CPPFLAGS" - - # The variable `found' is the prefix under which we've found -@@ -69,15 +70,21 @@ - description="$header and $lib" - ;; - * ) -- LDFLAGS="$LDFLAGS -L$bdb_place/lib" -- CPPFLAGS="$CPPFLAGS -I$bdb_place/include" -+ if test -d $bdb_place; then -+ LDFLAGS="$LDFLAGS -L$bdb_place/lib" -+ CPPFLAGS="$CPPFLAGS -I$bdb_place/include" -+ else -+ AC_MSG_CHECKING([for Berkeley DB $bdb_version in $bdb_place]) -+ AC_MSG_RESULT([directory not found]) -+ continue -+ fi - description="$bdb_place" - ;; - esac - - # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this - # trick to display a message instead. -- AC_MSG_CHECKING([checking for Berkeley DB $bdb_version in $description]) -+ AC_MSG_CHECKING([for Berkeley DB $bdb_version in $description]) - AC_MSG_RESULT() - - for bdb_libname in $bdb_default_search_lib_names; do -@@ -99,7 +106,7 @@ - | sed -e 's/[^a-zA-Z0-9_]/_/g'`" - changequote([,]) - -- AC_MSG_CHECKING([for $bdb_libname]) -+ AC_MSG_CHECKING([for -l$bdb_libname]) - dnl We can't use AC_CACHE_CHECK here, because that won't print out - dnl the value of the computed cache variable properly. - AC_CACHE_VAL($cache_id, -@@ -291,8 +298,8 @@ - fi - APU_CHECK_BERKELEY_DB(1, -1, -1, - "$places", -- "db_185.h", -- "db" -+ "db.h", -+ "c" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=185 -@@ -350,12 +357,12 @@ - AC_DEFUN(APU_CHECK_DB4, [ - places=$1 - if test -z "$places"; then -- places="std /usr/local /usr/local/BerkeleyDB.4.0" -+ places="std /usr/local /usr/local/BerkeleyDB.4.0 /boot/home/config" - fi - APU_CHECK_BERKELEY_DB("4", "0", "-1", - "$places", -- "db4/db.h db.h", -- "db-4.0 db4 db" -+ "db4/db.h", -+ "db4" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -371,12 +378,33 @@ - AC_DEFUN(APU_CHECK_DB41, [ - places=$1 - if test -z "$places"; then -- places="std /usr/local/BerkeleyDB.4.1" -+ places="std /usr/local/BerkeleyDB.4.1 /boot/home/config" - fi - APU_CHECK_BERKELEY_DB("4", "1", "-1", - "$places", -- "db4/db.h db.h", -- "db-4.1 db4 db" -+ "db41/db.h", -+ "db41" -+ ) -+ if test "$apu_have_db" = "1"; then -+ apu_db_version=4 -+ fi -+]) -+ -+ -+dnl -+dnl APU_CHECK_DB42: is DB4.2 present? -+dnl -+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version -+dnl -+AC_DEFUN(APU_CHECK_DB42, [ -+ places=$1 -+ if test -z "$places"; then -+ places="${LOCALBASE}/include:${LOCALBASE}/lib/db42 /usr/local/BerkeleyDB.4.2 /boot/home/config" -+ fi -+ APU_CHECK_BERKELEY_DB("4", "2", "-1", -+ "$places", -+ "db42/db.h", -+ "db-4.2 db-4.2.2" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -431,6 +459,12 @@ - AC_MSG_ERROR(Berkeley db4 not found) - fi - ;; -+ db42) -+ APU_CHECK_DB42("$check_places") -+ if test "$apu_db_version" != "4"; then -+ AC_MSG_ERROR(Berkeley db4 not found) -+ fi -+ ;; - default) - APU_CHECK_DB_ALL("$check_places") - ;; -@@ -438,22 +472,25 @@ - ]) - - dnl --dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.1 to 1. -+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1. - dnl - AC_DEFUN(APU_CHECK_DB_ALL, [ - all_places=$1 -- -- 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 -@@ -487,11 +524,11 @@ - - AC_ARG_WITH(dbm, [ - --with-dbm=DBM choose the DBM type to use. -- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4} -+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42} - ], [ - 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]) -+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42]) - fi - requested="$withval" - ], [ -@@ -665,6 +702,10 @@ - apu_use_db=1 - apu_default_dbm=db4 - ;; -+ db42) -+ apu_use_db=1 -+ apu_default_dbm=db4 -+ ;; - default) - dnl ### use more sophisticated DBMs for the default? - apu_default_dbm="sdbm (default)" -@@ -672,7 +713,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]) -+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42]) - ;; - esac - Index: apache2/files/patch-srclib:apr-util:build:dbm.m4 =================================================================== RCS file: apache2/files/patch-srclib:apr-util:build:dbm.m4 diff -N apache2/files/patch-srclib:apr-util:build:dbm.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ apache2/files/patch-srclib:apr-util:build:dbm.m4 9 Mar 2004 08:34:16 -0000 @@ -0,0 +1,60 @@ +--- srclib/apr-util/build/dbm.m4.orig Tue Mar 9 08:31:21 2004 ++++ srclib/apr-util/build/dbm.m4 Tue Mar 9 08:33:40 2004 +@@ -298,8 +298,8 @@ + fi + APU_CHECK_BERKELEY_DB(1, -1, -1, + "$places", +- "db_185.h", +- "db" ++ "db.h", ++ "c" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=185 +@@ -319,7 +319,7 @@ + fi + APU_CHECK_BERKELEY_DB(2, -1, -1, + "$places", +- "db2/db.h db.h", ++ "db2/db.h", + "db2 db" + ) + if test "$apu_have_db" = "1"; then +@@ -340,8 +340,8 @@ + fi + APU_CHECK_BERKELEY_DB(3, -1, -1, + "$places", +- "db3/db.h db.h", +- "db3 db" ++ "db3/db.h", ++ "db3" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=3 +@@ -362,7 +362,7 @@ + APU_CHECK_BERKELEY_DB("4", "0", "-1", + "$places", + "db4/db.h db.h", +- "db-4.0 db4 db" ++ "db-4.0 db4" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=4 +@@ -383,7 +383,7 @@ + APU_CHECK_BERKELEY_DB("4", "1", "-1", + "$places", + "db4/db.h db.h", +- "db-4.1 db4 db" ++ "db-4.1 db4" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=4 +@@ -404,7 +404,7 @@ + APU_CHECK_BERKELEY_DB("4", "2", "-1", + "$places", + "db4/db.h db.h", +- "db-4.2 db4 db" ++ "db-4.2 db4" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=4