From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 20 16:40:04 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E547106567A for ; Tue, 20 Jul 2010 16:40:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2F95B8FC16 for ; Tue, 20 Jul 2010 16:40:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6KGe41p081974 for ; Tue, 20 Jul 2010 16:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6KGe4XX081973; Tue, 20 Jul 2010 16:40:04 GMT (envelope-from gnats) Resent-Date: Tue, 20 Jul 2010 16:40:04 GMT Resent-Message-Id: <201007201640.o6KGe4XX081973@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Xavier Beaudouin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1B96106566C for ; Tue, 20 Jul 2010 16:34:49 +0000 (UTC) (envelope-from kiwi@kiwi.oav.net) Received: from kiwi.oav.net (kiwi.oav.net [82.225.248.92]) by mx1.freebsd.org (Postfix) with ESMTP id 000AB8FC0A for ; Tue, 20 Jul 2010 16:34:48 +0000 (UTC) Received: by kiwi.oav.net (Postfix, from userid 1000) id 765791A9864; Tue, 20 Jul 2010 18:18:45 +0200 (CEST) Message-Id: <20100720161845.765791A9864@kiwi.oav.net> Date: Tue, 20 Jul 2010 18:18:45 +0200 (CEST) From: Xavier Beaudouin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/148797: [MAINTAINER] www/ap22-mod_vhs: update to 1.1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2010 16:40:04 -0000 >Number: 148797 >Category: ports >Synopsis: [MAINTAINER] www/ap22-mod_vhs: update to 1.1.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 20 16:40:03 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Xavier Beaudouin >Release: FreeBSD 8.0-RELEASE-p3 i386 >Organization: Association KAZAR / The Caudium Group >Environment: System: FreeBSD proxy.home.oav.net 8.0-RELEASE-p3 FreeBSD 8.0-RELEASE-p3 #0: Wed May 26 05:45:12 UTC 2010 >Description: - Update to 1.1.0 This module now can work without libhome and it is compatible with mod_ldap and mod_dbd. Removed file(s): - files/patch-mod_vhs.c Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- ap22-mod_vhs-1.1.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/mod_vhs.old/Makefile /usr/ports/www/mod_vhs/Makefile --- /usr/ports/www/mod_vhs.old/Makefile 2010-06-09 21:56:50.000000000 +0200 +++ /usr/ports/www/mod_vhs/Makefile 2010-07-20 18:17:02.000000000 +0200 @@ -6,38 +6,67 @@ # PORTNAME= mod_vhs -PORTVERSION= 1.0.32 -PORTREVISION= 2 +PORTVERSION= 1.1.0 CATEGORIES= www MASTER_SITES= ftp://ftp.oav.net/openvisp/${PORTNAME}/ DIST_SUBDIR= apache2 MAINTAINER= kiwi@oav.net -COMMENT= Allows mass virtual hosting using libhome system with Apache 2.0.x - -LIB_DEPENDS+= home:${PORTSDIR}/misc/libhome +COMMENT= Mass virtual hosting using mod_ldap or mod_dbd with Apache 2.2.x MANUAL_PACKAGE_BUILD= lang/php5 is built with www/apache13 by default which conflicts -USE_APACHE= 2.0+ +USE_APACHE= 2.2+ USE_PHP= yes USE_PHP_BUILD= yes WANT_PHP_MOD= yes AP_FAST_BUILD= yes AP_GENPLIST= yes +SRC_FILE= *.c -WRKSRC= ${WRKDIR}/${PORTNAME} +MAKE_JOBS_SAFE= yes AP_INC+= ${LOCALBASE}/include/home \ -I ${LOCALBASE}/include/php \ -I ${LOCALBASE}/include/php/Zend \ -I ${LOCALBASE}/include/php/TSRM \ -I ${LOCALBASE}/include/php/main -AP_LIB+= ${LOCALBASE}/lib -lhome AP_EXTRAS+= -DHAVE_MOD_PHP_SUPPORT -PORTDOCS= ChangeLog AUTHORS README.logs README.wildcards WARNING \ - README.phpopt +PORTDOCS= ChangeLog AUTHORS README README.logs README.mod_suphp WARNING \ + README.phpopt THANKS WARNING WARNING.THREADS README.LDAP + +OPTIONS= LDAP "Enable mod_ldap support" on \ + DBD "Enable mod_dbd support" off \ + ITK "Enable mpm-itk support (needs a specific apache)" off \ + VDEBUG "Enable debug version (very verbose !)" off + +.include + +### mod_vhs options +.if defined(WITH_LDAP) +.if defined(WITHOUT_DBD) +AP_EXTRAS+= -DHAVE_LDAP_SUPPORT +.else +.error You cannot use LDAP and DBD at the same time. +.endif +.endif + +.if defined(WITH_DBD) +.if defined(WITHOUT_LDAP) +AP_EXTRAS+= -DHAVE_MOD_DBD_SUPPORT +.else +.error You cannot use LDAP and DBD at the same time. +.endif +.endif + +.if defined(WITH_ITK) +AP_EXTRAS+= -DHAVE_MPM_ITK_SUPPORT +.endif + +.if defined(WITH_VDEBUG) +AP_EXTRAS+= -DVH_DEBUG +.endif post-install: .if !defined (NOPORTDOCS) diff -ruN --exclude=CVS /usr/ports/www/mod_vhs.old/distinfo /usr/ports/www/mod_vhs/distinfo --- /usr/ports/www/mod_vhs.old/distinfo 2007-04-09 19:58:23.000000000 +0200 +++ /usr/ports/www/mod_vhs/distinfo 2010-07-20 18:06:21.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (apache2/mod_vhs-1.0.32.tar.gz) = bccb58b68639c2ece2d6f0adc1628ec1 -SHA256 (apache2/mod_vhs-1.0.32.tar.gz) = f2c8b72393a06532239965b7a9fdd63dd881ab8fd6f9084ffc1e839b039741a5 -SIZE (apache2/mod_vhs-1.0.32.tar.gz) = 20129 +MD5 (apache2/mod_vhs-1.1.0.tar.gz) = fff68db6e0da6c9986168522a523136c +SHA256 (apache2/mod_vhs-1.1.0.tar.gz) = a5dd6c3943b3c57cad0eb936f47c0df6c128be5dd3708d1efd8242be14469a17 +SIZE (apache2/mod_vhs-1.1.0.tar.gz) = 28967 diff -ruN --exclude=CVS /usr/ports/www/mod_vhs.old/files/patch-mod_vhs.c /usr/ports/www/mod_vhs/files/patch-mod_vhs.c --- /usr/ports/www/mod_vhs.old/files/patch-mod_vhs.c 2010-06-03 07:06:38.000000000 +0200 +++ /usr/ports/www/mod_vhs/files/patch-mod_vhs.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ ---- ./mod_vhs.c.orig 2010-06-03 00:47:05.980134731 -0400 -+++ ./mod_vhs.c 2010-06-03 00:48:23.301960660 -0400 -@@ -216,16 +216,7 @@ - const char *real; - const char *fake; - char *handler; -- --#if APR_MAJOR_VERSION > 0 -- ap_regex_t *regexp; --#else --#ifdef DEBIAN - ap_regex_t *regexp; --#else -- regex_t *regexp; --#endif /* DEBIAN */ --#endif - int redir_status; /* 301, 302, 303, 410, etc... */ - } alias_entry; - -@@ -334,11 +325,7 @@ - /* XX r can NOT be relative to DocumentRoot here... compat bug. */ - - if (use_regex) { --#ifdef DEBIAN - new->regexp = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED); --#else -- new->regexp = ap_pregcomp(cmd->pool, f, REG_EXTENDED); --#endif /* DEBIAN */ - if (new->regexp == NULL) - return "Regular expression could not be compiled."; - new->real = r; -@@ -403,15 +390,7 @@ - vhs_config_rec *serverconf = ap_get_module_config(s->module_config, - &vhs_module); - int status = (int)(long)cmd->info; --#if APR_MAJOR_VERSION > 0 - ap_regex_t *r = NULL; --#else --#ifdef DEBIAN -- ap_regex_t *r = NULL; --#else -- regex_t *r = NULL; --#endif /* DEBIAN */ --#endif - const char *f = arg2; - const char *url = arg3; - -@@ -431,11 +410,7 @@ - } - - if (use_regex) { --#ifdef DEBIAN - r = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED); --#else -- r = ap_pregcomp(cmd->pool, f, REG_EXTENDED); --#endif /* DEBIAN */ - if (r == NULL) - return "Regular expression could not be compiled."; - } -@@ -531,11 +506,7 @@ - int doesc, int *status) - { - alias_entry *entries = (alias_entry *) aliases->elts; --#ifdef DEBIAN - ap_regmatch_t regm [AP_MAX_REG_MATCH]; --#else -- regmatch_t regm [AP_MAX_REG_MATCH]; --#endif /* DEBIAN */ - char *found = NULL; - int i; - diff -ruN --exclude=CVS /usr/ports/www/mod_vhs.old/pkg-descr /usr/ports/www/mod_vhs/pkg-descr --- /usr/ports/www/mod_vhs.old/pkg-descr 2004-07-30 02:27:20.000000000 +0200 +++ /usr/ports/www/mod_vhs/pkg-descr 2010-07-20 14:42:42.000000000 +0200 @@ -1,5 +1,5 @@ mod_vhs is an Apache Web Server module allowing mass virtual hosting without the need for file based configuration. The virtual host paths are translated -using libhome system to get the corrects path at request time. +using mod_ldap or mod_dbd to get the corrects path at request time. WWW: http://www.oav.net/projects/mod_vhs/ --- ap22-mod_vhs-1.1.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: