PR:

Submitted by:
Reviewed by:
Approved by:
Obtained from:
MFC after:
Security:
- Update to 2.2.11
- Always depend on pcre from ports [1]
- Fix plist with LDAP/without apr-util DSO
- source envvars as late as possible [2]

Requested by:           ale
                        Eygene Ryabinkin <rea-fbsd at codelabs dot ru> [2]
PR:                     ports/127418 [2]

6 files changed, 22 insertions, 107 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index bc68af8d4c06..98ad5bae9a0c 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.2.9
-PORTREVISION=	5
+PORTVERSION=	2.2.11
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
@@ -19,7 +18,8 @@ DIST_SUBDIR=	apache22
 MAINTAINER?=	clement@FreeBSD.org
 COMMENT?=	Version 2.2.x of Apache web server with ${WITH_MPM:L} MPM.
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+		pcre.0:${PORTSDIR}/devel/pcre
 
 LATEST_LINK=	apache22
 
@@ -62,7 +62,6 @@ OPTIONS= \
 	PGSQL "Enable PostgreSQL support for apr-dbd" Off \
 	SQLITE "Enable SQLite support for apr-dbd" Off \
 	IPV6 "Enable IPv6 support" On \
-	PCRE_FROM_PORTS "Use devel/pcre instead of bundled one" Off \
 	BDB "Enable BerkeleyDB dbm" Off \
         SVN "Enable Subversion support" Off
 .include "${APACHEDIR}/Makefile.options"
@@ -74,7 +73,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--with-port=${WITH_HTTP_PORT} \
 		--with-expat=${LOCALBASE} \
 		--with-iconv=${LOCALBASE} \
-		--enable-http
+		--enable-http \
+		--with-pcre=${LOCALBASE}
 
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS}" \
@@ -142,16 +142,11 @@ CONFIGURE_ENV+=	USE_BUNDLED_APR=YES
 .endif
 
 # When using apr_mysql_db we _must_ rebuild makefiles
-.if defined(WITH_FULLBUILD) || defined(WITH_MYSQL)
+.if defined(WITH_FULLBUILD)
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 SCRIPTS_ENV+=	FULLBUILD=on
 .endif
 
-.if defined(WITH_PCRE_FROM_PORTS)
-CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-.endif
-
 .if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES)
 USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--with-ldap \
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 89d2a935f84d..e9d832f28930 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache22/httpd-2.2.9.tar.bz2) = 3afa8137dc1999be695a20b62fdf032b
-SHA256 (apache22/httpd-2.2.9.tar.bz2) = d76599fbcf8b3bcff2779f880fb10e4a2bc4af60f64232083c06863e40850b61
-SIZE (apache22/httpd-2.2.9.tar.bz2) = 4943462
+MD5 (apache22/httpd-2.2.11.tar.bz2) = 3e98bcb14a7122c274d62419566431bb
+SHA256 (apache22/httpd-2.2.11.tar.bz2) = 5ce34825c5b84d1808605a22f8d16d44c6f91882a538bb98a3affed8f5dff6fe
+SIZE (apache22/httpd-2.2.11.tar.bz2) = 5230130
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
- 
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 02cd3908ecc6..531c3578fae7 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -144,6 +144,7 @@ include/apache22/mod_dbd.h
 include/apache22/mod_include.h
 include/apache22/mod_log_config.h
 include/apache22/mod_proxy.h
+include/apache22/mod_rewrite.h
 include/apache22/mod_ssl.h
 include/apache22/mod_status.h
 include/apache22/mpm.h
@@ -186,6 +187,10 @@ include/apache22/util_xml.h
 %%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so
 %%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la
 %%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a
+%%APR_PORTS%%%%MOD_LDAP%%lib/apr-util-1/apr_ldap-1.so
+%%APR_PORTS%%%%MOD_LDAP%%lib/apr-util-1/apr_ldap.so
+%%APR_PORTS%%%%MOD_LDAP%%lib/apr-util-1/apr_ldap.la
+%%APR_PORTS%%%%MOD_LDAP%%lib/apr-util-1/apr_ldap.a
 libexec/apache22/httpd.exp
 %%MOD_ACTIONS%%libexec/apache22/mod_actions.so
 %%MOD_ALIAS%%libexec/apache22/mod_alias.so
@@ -550,7 +555,7 @@ www/apache22/icons/world2.png
 @dirrm share/apache22/build
 @dirrm share/apache22
 %%APR_PORTS%%@dirrm include/apr-1
-%%APR_PORTS%%@dirrm lib/apr-util-1
+%%APR_PORTS%%@dirrmtry lib/apr-util-1
 %%APR_PORTS%%@dirrm build-1
 @dirrmtry libexec/apache22
 @dirrmtry include/apache22