Date: Sun, 8 Feb 2009 21:15:08 +0000 (UTC) From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net> Subject: ports/131512: [patch] unbreak www/mod_jail after jail MFC Message-ID: <20090208211508.BF4C64899B6@storage.int.zabbadoz.net> Resent-Message-ID: <200902082140.n18Le4sU057032@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090208211508.BF4C64899B6>