1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

- Update to 0.5.1

- Pet Portlint

PR:		155580
Submitted by:	Ethan Fouts <freebsd.ports@efplace.com>
This commit is contained in:
Martin Wilke 2011-03-17 15:47:11 +00:00
parent 6952350f77
commit b64ae76c93
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=271126
4 changed files with 24 additions and 66 deletions

View File

@ -6,21 +6,21 @@
#
PORTNAME= mod_jail
PORTVERSION= 0.4
PORTREVISION= 2
PORTVERSION= 0.5.1
CATEGORIES= www
MASTER_SITES= http://igorpopov.newmail.ru/
MASTER_SITES= http://mod-jail.googlecode.com/files/
MAINTAINER= apache@FreeBSD.org
COMMENT= Apache 1.3.x/2.0.xx module to enable an easy alternative to mod_chroot
MAKE_JOBS_SAFE= yes
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/mod_jail
WRKSRC= ${WRKDIR}/mod_jail-0.5.1
USE_APACHE= 1.3+
AP_FAST_BUILD= YES
AP_GENPLIST= YES
NOPORTDOCS= YES
PORTDOCS= changelog.html documentation.html download.html \
index.html

View File

@ -1,3 +1,2 @@
MD5 (mod_jail-0.4.tar.gz) = 188fb307e67428b05292dd73b9d6db2e
SHA256 (mod_jail-0.4.tar.gz) = 85291f40c0d5d19a8ac68196c679969c2617858d46839a6400a735e2b4a873eb
SIZE (mod_jail-0.4.tar.gz) = 14624
SHA256 (mod_jail-0.5.1.tar.gz) = 752822e2a512a7cf2d374cd4e7a0675c744248094b0392cc20fde969828cdd58
SIZE (mod_jail-0.5.1.tar.gz) = 12000

View File

@ -1,54 +1,11 @@
--- ./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 >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103)
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";
--- mod_jail.c.orig 2009-09-24 02:05:27.000000000 -0700
+++ mod_jail.c 2010-10-20 15:16:31.000000000 -0700
@@ -391,7 +391,7 @@
if (p_addr == NULL) {
return NULL;
}
+#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103)
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 >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103)
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 >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103)
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;
}
- addr->s_addr = htonl(INADDR_LOOPBACK);
+ p_addr->s_addr = htonl(INADDR_LOOPBACK);
cfg->jail = (struct jail) {
.version = JAIL_API_VERSION,
.path = NULL,

View File

@ -1,6 +1,8 @@
mod_jail is Apache 1.3.xx/2.0.xx module, that makes running Apache in a secure jail
prison easy, so it is intended to run on FreeBSD only. It is similar to
mod_chroot, but uses FreeBSD's specific system call - jail. Also mod_jail make
it possible to change securelevel into jail prison.
mod_jail is Apache 1.3.xx/2.0.xx/2.2.xx module, that makes running Apache
in a secure jail prison easy, so it is intended to run on FreeBSD only.
It is similar to mod_chroot, but uses FreeBSD's specific system call -
jail. Also mod_jail make it possible to change securelevel into jail
prison.
WWW: http://igorpopov.newmail.ru/mod_jail/
WWW: http://code.google.com/p/mod-jail/
ORIG WWW: http://igorpopov.newmail.ru/mod_jail/