mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-01 05:45:45 +00:00
- Security update to 2.8.17-1.3.31
- detect fnmatch.h conficts
This commit is contained in:
Dirk Meyer
parent
859f84c75b
commit
dfcad50889
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=109105
@ -22,8 +22,9 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} ${MODSSL_FILE} \
|
||||
${MODACCEL_FILE} ${MODDEFLATE_FILE}
|
||||
|
||||
.if defined(APACHE_WITH_IPV6) || make(makesum) || defined(FETCH_ALL)
|
||||
PATCH_SITES+= ftp://ftp.42.org/pub/orphan/
|
||||
PATCHFILES+= apache-1.3.29modssl-v6-20031204.diff.gz
|
||||
PATCH_SITES+= ftp://ftp.42.org/pub/orphan/ ${MASTER_SITE_LOCAL}
|
||||
PATCH_SITE_SUBDIR= dinoex
|
||||
PATCHFILES+= apache-1.3.31modssl-v6-20040514.diff.gz
|
||||
.endif
|
||||
|
||||
MAINTAINER= dinoex@FreeBSD.org
|
||||
@ -35,8 +36,8 @@ PATCH_DEPENDS= ${BUILD_DEPENDS}
|
||||
CONFLICTS?= apache+ipv6-1.* apache+ssl-1.* apache-1.* apache-2.* \
|
||||
apache_fp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \
|
||||
ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* w3c-httpd-3.*
|
||||
VERSION_APACHE= 1.3.29
|
||||
VERSION_MODSSL= 2.8.16
|
||||
VERSION_APACHE= 1.3.31
|
||||
VERSION_MODSSL= 2.8.17
|
||||
VERSION_MODSNMP= 1.3.14.12
|
||||
VERSION_MODACCEL= 1.0.31
|
||||
VERSION_MODDEFLATE= 1.0.20
|
||||
@ -60,7 +61,14 @@ DATADIR= ${PREFIX}/www
|
||||
DOCSDIR= ${PREFIX}/share/doc/apache
|
||||
DOCUMENT_ROOT= ${DATADIR}/data
|
||||
|
||||
.if !exist(${PREFIX}/etc/rc.d/apache.sh && !defined(WITHOUT_RC_SUBR)
|
||||
.if exists(${LOCALBASE}/include/fnmatch.h)
|
||||
check-depends::
|
||||
@${ECHO_CMD} "Dependency error, please do: pkg_delete " \
|
||||
`pkg_info -W ${LOCALBASE}/include/fnmatch.h`
|
||||
@${FALSE}
|
||||
.endif
|
||||
|
||||
.if !exists(${PREFIX}/etc/rc.d/apache.sh) && !defined(WITHOUT_RC_SUBR)
|
||||
USE_RC_SUBR= yes
|
||||
PLIST_FILES+= etc/rc.d/apache.sh
|
||||
.else
|
||||
@ -169,7 +177,7 @@ PLIST_FILES+= %%DOCSDIR%%/mod/mod_snmp.html \
|
||||
%%DOCSDIR%%/snmp_agt/rfc2594.txt \
|
||||
%%DOCSDIR%%/snmp_agt/apache-scoreboard-mib.txt \
|
||||
%%DOCSDIR%%/snmp_agt/apache-config-mib.txt
|
||||
PLIST_DIRS+= %%DOCSDIR%%/snmp_agt %%DOCSDIR%% www/buckets
|
||||
PLIST_DIRS+= %%DOCSDIR%%/snmp_agt %%DOCSDIR%% www/buckets www
|
||||
.else
|
||||
CONFLICTS+= apache+mod_snmp*-1.*
|
||||
.endif
|
||||
@ -240,8 +248,6 @@ CONFIGURE_ARGS+= --enable-rule=INET6
|
||||
PLIST_SUB+= WITHIPV6=""
|
||||
PLIST_FILES+= include/apache/sa_len.h \
|
||||
include/apache/sockaddr_storage.h
|
||||
.else
|
||||
EXTRA_PATCHES+= ${FILESDIR}/mod_access.c.patch
|
||||
.endif
|
||||
|
||||
CONFIGURE_ENV= CFLAGS='${CFLAGS}' \
|
||||
@ -315,8 +321,6 @@ pre-fetch:
|
||||
@${ECHO_MSG} " [default is no]"
|
||||
@${ECHO_MSG} ""
|
||||
|
||||
post-extract:
|
||||
|
||||
post-extract:
|
||||
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
|
||||
${FILESDIR}/rcng.sh > ${WRKSRC}/rcng.sh
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3
|
||||
SIZE (apache_1.3.29.tar.gz) = 2435809
|
||||
MD5 (mod_ssl-2.8.16-1.3.29.tar.gz) = 4f6c580ffa07d33e8584406132b98e86
|
||||
SIZE (mod_ssl-2.8.16-1.3.29.tar.gz) = 754325
|
||||
MD5 (apache_1.3.31.tar.gz) = bd548a06ac48dda496b4e613572bb020
|
||||
SIZE (apache_1.3.31.tar.gz) = 2467371
|
||||
MD5 (mod_ssl-2.8.17-1.3.31.tar.gz) = 6c3f726b336f497793567591717d2a6b
|
||||
SIZE (mod_ssl-2.8.17-1.3.31.tar.gz) = 754472
|
||||
MD5 (mod_snmp_1.3.14.12.tar.gz) = b0bddbb4e5ff4c6a46d114998f12740a
|
||||
SIZE (mod_snmp_1.3.14.12.tar.gz) = 91462
|
||||
MD5 (mod_accel-1.0.31.tar.gz) = edc31714cc6dc8d24396cb4ddf2ae2f6
|
||||
SIZE (mod_accel-1.0.31.tar.gz) = 85443
|
||||
MD5 (mod_deflate-1.0.20.tar.gz) = 78dcc8f467ea0b216e034c9ac7d674c2
|
||||
SIZE (mod_deflate-1.0.20.tar.gz) = 32383
|
||||
MD5 (apache-1.3.29modssl-v6-20031204.diff.gz) = d84056da5795f7d0ba80df9e8105a94c
|
||||
SIZE (apache-1.3.29modssl-v6-20031204.diff.gz) = 29440
|
||||
MD5 (apache-1.3.31modssl-v6-20040514.diff.gz) = 0bc7cf4ec619c3a5cf41b59ef9b11c04
|
||||
SIZE (apache-1.3.31modssl-v6-20040514.diff.gz) = 29122
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
--- src/modules/standard/mod_access.c 2004/02/20 20:37:40 1.46
|
||||
+++ src/modules/standard/mod_access.c 2004/03/07 21:47:14 1.47
|
||||
@@ -39,8 +39,8 @@
|
||||
union {
|
||||
char *from;
|
||||
struct {
|
||||
- unsigned long net;
|
||||
- unsigned long mask;
|
||||
+ struct in_addr net;
|
||||
+ struct in_addr mask;
|
||||
} ip;
|
||||
} x;
|
||||
enum allowdeny_type type;
|
||||
@@ -124,14 +124,14 @@
|
||||
|
||||
}
|
||||
else if ((s = strchr(where, '/'))) {
|
||||
- unsigned long mask;
|
||||
+ struct in_addr mask;
|
||||
|
||||
a->type = T_IP;
|
||||
/* trample on where, we won't be using it any more */
|
||||
*s++ = '\0';
|
||||
|
||||
if (!is_ip(where)
|
||||
- || (a->x.ip.net = ap_inet_addr(where)) == INADDR_NONE) {
|
||||
+ || (a->x.ip.net.s_addr = ap_inet_addr(where)) == INADDR_NONE) {
|
||||
a->type = T_FAIL;
|
||||
return "syntax error in network portion of network/netmask";
|
||||
}
|
||||
@@ -143,24 +143,26 @@
|
||||
}
|
||||
/* is it in /a.b.c.d form? */
|
||||
if (strchr(s, '.')) {
|
||||
- mask = ap_inet_addr(s);
|
||||
- if (mask == INADDR_NONE) {
|
||||
+ mask.s_addr = ap_inet_addr(s);
|
||||
+ if (mask.s_addr == INADDR_NONE) {
|
||||
a->type = T_FAIL;
|
||||
return "syntax error in mask portion of network/netmask";
|
||||
}
|
||||
}
|
||||
else {
|
||||
+ int i;
|
||||
+
|
||||
/* assume it's in /nnn form */
|
||||
- mask = atoi(s);
|
||||
- if (mask > 32 || mask <= 0) {
|
||||
+ i = atoi(s);
|
||||
+ if (i > 32 || i <= 0) {
|
||||
a->type = T_FAIL;
|
||||
return "invalid mask in network/netmask";
|
||||
}
|
||||
- mask = 0xFFFFFFFFUL << (32 - mask);
|
||||
- mask = htonl(mask);
|
||||
+ mask.s_addr = 0xFFFFFFFFUL << (32 - i);
|
||||
+ mask.s_addr = htonl(mask.s_addr);
|
||||
}
|
||||
a->x.ip.mask = mask;
|
||||
- a->x.ip.net = (a->x.ip.net & mask); /* pjr - This fixes PR 4770 */
|
||||
+ a->x.ip.net.s_addr = (a->x.ip.net.s_addr & mask.s_addr); /* pjr - This fixes PR 4770 */
|
||||
}
|
||||
else if (ap_isdigit(*where) && is_ip(where)) {
|
||||
/* legacy syntax for ip addrs: a.b.c. ==> a.b.c.0/24 for example */
|
||||
@@ -171,8 +173,8 @@
|
||||
a->type = T_IP;
|
||||
/* parse components */
|
||||
s = where;
|
||||
- a->x.ip.net = 0;
|
||||
- a->x.ip.mask = 0;
|
||||
+ a->x.ip.net.s_addr = 0;
|
||||
+ a->x.ip.mask.s_addr = 0;
|
||||
shift = 24;
|
||||
while (*s) {
|
||||
t = s;
|
||||
@@ -191,6 +193,7 @@
|
||||
return "invalid ip address";
|
||||
}
|
||||
if (shift < 0) {
|
||||
+ a->type = T_FAIL;
|
||||
return "invalid ip address, only 4 octets allowed";
|
||||
}
|
||||
octet = atoi(s);
|
||||
@@ -198,13 +201,13 @@
|
||||
a->type = T_FAIL;
|
||||
return "each octet must be between 0 and 255 inclusive";
|
||||
}
|
||||
- a->x.ip.net |= octet << shift;
|
||||
- a->x.ip.mask |= 0xFFUL << shift;
|
||||
+ a->x.ip.net.s_addr |= (unsigned int)octet << shift;
|
||||
+ a->x.ip.mask.s_addr |= 0xFFUL << shift;
|
||||
s = t;
|
||||
shift -= 8;
|
||||
}
|
||||
- a->x.ip.net = ntohl(a->x.ip.net);
|
||||
- a->x.ip.mask = ntohl(a->x.ip.mask);
|
||||
+ a->x.ip.net.s_addr = ntohl(a->x.ip.net.s_addr);
|
||||
+ a->x.ip.mask.s_addr = ntohl(a->x.ip.mask.s_addr);
|
||||
}
|
||||
else {
|
||||
a->type = T_HOST;
|
||||
@@ -272,9 +275,9 @@
|
||||
return 1;
|
||||
|
||||
case T_IP:
|
||||
- if (ap[i].x.ip.net != INADDR_NONE
|
||||
+ if (ap[i].x.ip.net.s_addr != INADDR_NONE
|
||||
&& (r->connection->remote_addr.sin_addr.s_addr
|
||||
- & ap[i].x.ip.mask) == ap[i].x.ip.net) {
|
||||
+ & ap[i].x.ip.mask.s_addr) == ap[i].x.ip.net.s_addr) {
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
@ -109,6 +109,7 @@ libexec/apache/mod_imap.so
|
||||
libexec/apache/mod_include.so
|
||||
libexec/apache/mod_info.so
|
||||
libexec/apache/mod_log_config.so
|
||||
libexec/apache/mod_log_forensic.so
|
||||
libexec/apache/mod_mime.so
|
||||
libexec/apache/mod_mime_magic.so
|
||||
libexec/apache/mod_mmap_static.so
|
||||
@ -139,6 +140,7 @@ www/data-dist/index.html.en
|
||||
www/data-dist/index.html.es
|
||||
www/data-dist/index.html.fr
|
||||
www/data-dist/index.html.he.iso8859-8
|
||||
www/data-dist/index.html.hu
|
||||
www/data-dist/index.html.it
|
||||
www/data-dist/index.html.ja.jis
|
||||
www/data-dist/index.html.kr.iso-kr
|
||||
@ -158,7 +160,6 @@ www/data-dist/index.html.ru.ucs4
|
||||
www/data-dist/index.html.ru.utf8
|
||||
www/data-dist/index.html.se
|
||||
www/data-dist/index.html.zh-tw.big5
|
||||
%%DOCSDIR%%/FAQ.html
|
||||
%%DOCSDIR%%/LICENSE
|
||||
%%DOCSDIR%%/bind.html.en
|
||||
%%DOCSDIR%%/bind.html.fr
|
||||
@ -220,7 +221,9 @@ www/data-dist/index.html.zh-tw.big5
|
||||
%%DOCSDIR%%/keepalive.html.en
|
||||
%%DOCSDIR%%/keepalive.html.html
|
||||
%%DOCSDIR%%/keepalive.html.ja.jis
|
||||
%%DOCSDIR%%/location.html
|
||||
%%DOCSDIR%%/location.html.en
|
||||
%%DOCSDIR%%/location.html.html
|
||||
%%DOCSDIR%%/location.html.ja.jis
|
||||
%%DOCSDIR%%/logs.html
|
||||
%%DOCSDIR%%/man-template.html
|
||||
%%DOCSDIR%%/misc/API.html
|
||||
@ -288,7 +291,9 @@ www/data-dist/index.html.zh-tw.big5
|
||||
%%DOCSDIR%%/mod/mod_auth_db.html
|
||||
%%DOCSDIR%%/mod/mod_auth_dbm.html
|
||||
%%DOCSDIR%%/mod/mod_auth_digest.html
|
||||
%%DOCSDIR%%/mod/mod_autoindex.html
|
||||
%%DOCSDIR%%/mod/mod_autoindex.html.en
|
||||
%%DOCSDIR%%/mod/mod_autoindex.html.html
|
||||
%%DOCSDIR%%/mod/mod_autoindex.html.ja.jis
|
||||
%%DOCSDIR%%/mod/mod_browser.html
|
||||
%%DOCSDIR%%/mod/mod_cern_meta.html
|
||||
%%DOCSDIR%%/mod/mod_cgi.html.en
|
||||
@ -319,6 +324,8 @@ www/data-dist/index.html.zh-tw.big5
|
||||
%%DOCSDIR%%/mod/mod_log_config.html.html
|
||||
%%DOCSDIR%%/mod/mod_log_config.html.ja.jis
|
||||
%%DOCSDIR%%/mod/mod_log_referer.html
|
||||
%%DOCSDIR%%/mod/mod_log_forensic.html.en
|
||||
%%DOCSDIR%%/mod/mod_log_forensic.html.html
|
||||
%%DOCSDIR%%/mod/mod_mime.html.en
|
||||
%%DOCSDIR%%/mod/mod_mime.html.html
|
||||
%%DOCSDIR%%/mod/mod_mime.html.ja.jis
|
||||
@ -441,7 +448,6 @@ www/data-dist/index.html.zh-tw.big5
|
||||
%%DOCSDIR%%/programs/suexec.html.html
|
||||
%%DOCSDIR%%/programs/suexec.html.ja.jis
|
||||
%%DOCSDIR%%/readme-tpf.html
|
||||
%%DOCSDIR%%/search/manual-index.cgi
|
||||
%%DOCSDIR%%/server-wide.html.en
|
||||
%%DOCSDIR%%/server-wide.html.ja.jis
|
||||
%%DOCSDIR%%/sections.html.en
|
||||
@ -483,6 +489,7 @@ www/data-dist/index.html.zh-tw.big5
|
||||
%%DOCSDIR%%/win_service.html.html
|
||||
%%DOCSDIR%%/win_service.html.ja.jis
|
||||
%%DOCSDIR%%/windows.html.en
|
||||
%%DOCSDIR%%/windows.html.html
|
||||
%%DOCSDIR%%/windows.html.ja.jis
|
||||
%%DOCSDIR%%/mod/directive-dict.html.html
|
||||
%%DOCSDIR%%/mod/mod_negotiation.html.html
|
||||
@ -741,7 +748,6 @@ www/icons/world2.png
|
||||
@dirrm include/apache
|
||||
@dirrm libexec/apache
|
||||
@dirrm %%DOCSDIR%%/vhosts
|
||||
@dirrm %%DOCSDIR%%/search
|
||||
@dirrm %%DOCSDIR%%/mod/mod_ssl
|
||||
@dirrm %%DOCSDIR%%/mod
|
||||
@dirrm %%DOCSDIR%%/misc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user