diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2008-12-31 01:18:23 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2008-12-31 01:18:23 +0800 |
| commit | 5e022fba2aec911c9ce5b82e2948fff039395b2d (patch) | |
| tree | 79237f3e32799141bcc0a0d199a7ea3150269a1e /www | |
| parent | 79f0791485494829f4643b02a2473c33ca1eadf5 (diff) | |
| download | freebsd-ports-gnome-5e022fba2aec911c9ce5b82e2948fff039395b2d.tar.gz freebsd-ports-gnome-5e022fba2aec911c9ce5b82e2948fff039395b2d.tar.zst freebsd-ports-gnome-5e022fba2aec911c9ce5b82e2948fff039395b2d.zip | |
Unbreak on 8-CURRENT after recent jail(8) changes.
Submitted by: Bjoern
Reported by: erwinbot
Diffstat (limited to 'www')
| -rw-r--r-- | www/mod_jail/Makefile | 1 | ||||
| -rw-r--r-- | www/mod_jail/patch-mod_jail.c | 54 |
2 files changed, 55 insertions, 0 deletions
diff --git a/www/mod_jail/Makefile b/www/mod_jail/Makefile index 439f13318e5e..4247f06ecad9 100644 --- a/www/mod_jail/Makefile +++ b/www/mod_jail/Makefile @@ -7,6 +7,7 @@ PORTNAME= mod_jail PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://igorpopov.newmail.ru/ diff --git a/www/mod_jail/patch-mod_jail.c b/www/mod_jail/patch-mod_jail.c new file mode 100644 index 000000000000..bd81ad910cde --- /dev/null +++ b/www/mod_jail/patch-mod_jail.c @@ -0,0 +1,54 @@ +--- ./mod_jail.c.orig 2007-02-15 12:37:06.000000000 +0000 ++++ ./mod_jail.c 2008-12-28 15:39:43.000000000 +0000 +@@ -130,7 +130,11 @@ + 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 + cfg->jail.version = 0; ++#else ++ cfg->jail.version = JAIL_API_VERSION; ++#endif + return (void *)cfg; + } + +@@ -190,7 +194,13 @@ + if (!inet_aton(arg, &in)) { + return "could not make sense of jail ip address"; + } ++#if __FreeBSD_version < 800056 + cfg->jail.ip_number = ntohl(in.s_addr); ++#else ++ cfg->jail.ip4s = 1; ++ cfg->jail.ip4 = ap_pcalloc(cmd->pool, sizeof(struct in_addr)); ++ cfg->jail.ip4[0].s_addr = in.s_addr; ++#endif + + return NULL; + } +@@ -321,7 +331,11 @@ + return NULL; + } + cfg->jail_scrlevel = 3; /* good default value */ ++#if __FreeBSD_version < 800056 + cfg->jail.version = 0; ++#else ++ cfg->jail.version = JAIL_API_VERSION; ++#endif + return (void*)cfg; + } + +@@ -378,7 +392,13 @@ + if (!inet_aton(arg, &in)) { + return "could not make sense of jail ip address"; + } ++#if __FreeBSD_version < 800056 + cfg->jail.ip_number = ntohl(in.s_addr); ++#else ++ cfg->jail.ip4s = 1; ++ cfg->jail.ip4 = ap_pcalloc(cmd->pool, sizeof(struct in_addr)); ++ cfg->jail.ip4[0].s_addr = in.s_addr; ++#endif + + return NULL; + } |