From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 8 21:40:05 2009 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 17D5410656D6 for ; Sun, 8 Feb 2009 21:40:05 +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 DD3408FC26 for ; Sun, 8 Feb 2009 21:40:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n18Le4NF057041 for ; Sun, 8 Feb 2009 21:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n18Le4sU057032; Sun, 8 Feb 2009 21:40:04 GMT (envelope-from gnats) Resent-Date: Sun, 8 Feb 2009 21:40:04 GMT Resent-Message-Id: <200902082140.n18Le4sU057032@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, "Bjoern A. Zeeb" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E99DF1065672 for ; Sun, 8 Feb 2009 21:30:25 +0000 (UTC) (envelope-from bz@zabbadoz.net) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id A25EF8FC1D for ; Sun, 8 Feb 2009 21:30:25 +0000 (UTC) (envelope-from bz@zabbadoz.net) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id F14C341C752 for ; Sun, 8 Feb 2009 22:15:11 +0100 (CET) Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id UVuaEczF6a0F for ; Sun, 8 Feb 2009 22:15:11 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id 9719541C751; Sun, 8 Feb 2009 22:15:11 +0100 (CET) Received: from storage.int.zabbadoz.net (storage.int.zabbadoz.net [10.111.66.189]) by mail.int.zabbadoz.net (Postfix) with ESMTP id C65654449BD; Sun, 8 Feb 2009 21:15:08 +0000 (UTC) Received: by storage.int.zabbadoz.net (Postfix, from userid 1060) id BF4C64899B6; Sun, 8 Feb 2009 21:15:08 +0000 (UTC) Message-Id: <20090208211508.BF4C64899B6@storage.int.zabbadoz.net> Date: Sun, 8 Feb 2009 21:15:08 +0000 (UTC) From: "Bjoern A. Zeeb" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: "Bjoern A. Zeeb" Subject: ports/131512: [patch] unbreak www/mod_jail after jail MFC X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Bjoern A. Zeeb" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Feb 2009 21:40:06 -0000 >Number: 131512 >Category: ports >Synopsis: [patch] unbreak www/mod_jail after jail MFC >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Feb 08 21:40:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Bjoern A. Zeeb >Release: FreeBSD 7-STABLE amd64 >Organization: Zabbadoz.NeT >Environment: >Description: The MFC of multi-IPv4/v6/no-IP jails broke the API as it had for the commit to HEAD end of last year. >How-To-Repeat: Build the port on an up-to-date 7 stable and it will fail. >Fix: Index: files/patch-mod_jail.c =================================================================== RCS file: /shared/mirror/FreeBSD/r/pcvs/ports/www/mod_jail/files/patch-mod_jail.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-mod_jail.c --- files/patch-mod_jail.c 8 Jan 2009 13:24:49 -0000 1.1 +++ files/patch-mod_jail.c 8 Feb 2009 17:01:53 -0000 @@ -4,7 +4,7 @@ p_jail_cfg_t cfg = (p_jail_cfg_t) ap_pcalloc(p, sizeof(jail_cfg_t)); cfg->jail_scrlevel = 3; /* good default value */ -+#if __FreeBSD_version < 800056 ++#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103) cfg->jail.version = 0; +#else + cfg->jail.version = JAIL_API_VERSION; @@ -16,7 +16,7 @@ if (!inet_aton(arg, &in)) { return "could not make sense of jail ip address"; } -+#if __FreeBSD_version < 800056 ++#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103) cfg->jail.ip_number = ntohl(in.s_addr); +#else + cfg->jail.ip4s = 1; @@ -30,7 +30,7 @@ return NULL; } cfg->jail_scrlevel = 3; /* good default value */ -+#if __FreeBSD_version < 800056 ++#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103) cfg->jail.version = 0; +#else + cfg->jail.version = JAIL_API_VERSION; @@ -42,7 +42,7 @@ if (!inet_aton(arg, &in)) { return "could not make sense of jail ip address"; } -+#if __FreeBSD_version < 800056 ++#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103) cfg->jail.ip_number = ntohl(in.s_addr); +#else + cfg->jail.ip4s = 1; >Release-Note: >Audit-Trail: >Unformatted: