Update to latest, 1.3.31 based, version.
This commit is contained in:
Lev A. Serebryakov
parent
f5a241781e
commit
29684deb82
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=109720
@ -7,7 +7,6 @@
|
||||
|
||||
PORTNAME= apache
|
||||
PORTVERSION= ${APACHE_VERSION}+${RA_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= russian www
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
|
||||
DISTNAME= ${PORTNAME}_${APACHE_VERSION}
|
||||
@ -32,8 +31,8 @@ CONFLICTS= apache+ipv6-* \
|
||||
publicfile-* \
|
||||
ru-apache+mod_ssl-*
|
||||
|
||||
RA_VERSION= 30.19
|
||||
APACHE_VERSION= 1.3.29
|
||||
RA_VERSION= 30.20
|
||||
APACHE_VERSION= 1.3.31
|
||||
|
||||
#
|
||||
# Small hack for alternate processing patchfiles
|
||||
|
||||
@ -1,2 +1,4 @@
|
||||
MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3
|
||||
MD5 (patches_1.3.29rusPL30.19.tar.gz) = 58d4c5305cc80cf76d744a9722958320
|
||||
MD5 (apache_1.3.31.tar.gz) = bd548a06ac48dda496b4e613572bb020
|
||||
SIZE (apache_1.3.31.tar.gz) = 2467371
|
||||
MD5 (patches_1.3.31rusPL30.20.tar.gz) = da983bb4a4e983cba55390afe4569f04
|
||||
SIZE (patches_1.3.31rusPL30.20.tar.gz) = 138924
|
||||
|
||||
@ -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;
|
||||
@ -220,6 +220,7 @@ libexec/apache/mod_digest.so
|
||||
libexec/apache/mod_expires.so
|
||||
libexec/apache/mod_headers.so
|
||||
libexec/apache/mod_info.so
|
||||
libexec/apache/mod_log_forensic.so
|
||||
libexec/apache/mod_mime_magic.so
|
||||
libexec/apache/mod_mmap_static.so
|
||||
libexec/apache/mod_rewrite.so
|
||||
@ -269,6 +270,7 @@ sbin/rotatelogs
|
||||
%%DOCSDIR%%/index.html.es
|
||||
%%DOCSDIR%%/index.html.fr
|
||||
%%DOCSDIR%%/index.html.he.iso8859-8
|
||||
%%DOCSDIR%%/index.html.hu
|
||||
%%DOCSDIR%%/index.html.it
|
||||
%%DOCSDIR%%/index.html.ja.jis
|
||||
%%DOCSDIR%%/index.html.kr.iso-kr
|
||||
@ -289,7 +291,6 @@ sbin/rotatelogs
|
||||
%%DOCSDIR%%/index.html.ru.utf8
|
||||
%%DOCSDIR%%/index.html.se
|
||||
%%DOCSDIR%%/index.html.zh-tw.big5
|
||||
%%DOCSDIR%%/manual/FAQ.html
|
||||
%%DOCSDIR%%/manual/LICENSE
|
||||
%%DOCSDIR%%/manual/bind.html.en
|
||||
%%DOCSDIR%%/manual/bind.html.fr
|
||||
@ -360,7 +361,9 @@ sbin/rotatelogs
|
||||
%%DOCSDIR%%/manual/keepalive.html.en
|
||||
%%DOCSDIR%%/manual/keepalive.html.html
|
||||
%%DOCSDIR%%/manual/keepalive.html.ja.jis
|
||||
%%DOCSDIR%%/manual/location.html
|
||||
%%DOCSDIR%%/manual/location.html.en
|
||||
%%DOCSDIR%%/manual/location.html.html
|
||||
%%DOCSDIR%%/manual/location.html.ja.jis
|
||||
%%DOCSDIR%%/manual/logs.html
|
||||
%%DOCSDIR%%/manual/man-template.html
|
||||
%%DOCSDIR%%/manual/misc/API.html
|
||||
@ -429,7 +432,9 @@ sbin/rotatelogs
|
||||
%%DOCSDIR%%/manual/mod/mod_auth_db.html
|
||||
%%DOCSDIR%%/manual/mod/mod_auth_dbm.html
|
||||
%%DOCSDIR%%/manual/mod/mod_auth_digest.html
|
||||
%%DOCSDIR%%/manual/mod/mod_autoindex.html
|
||||
%%DOCSDIR%%/manual/mod/mod_autoindex.html.en
|
||||
%%DOCSDIR%%/manual/mod/mod_autoindex.html.html
|
||||
%%DOCSDIR%%/manual/mod/mod_autoindex.html.ja.jis
|
||||
%%DOCSDIR%%/manual/mod/mod_browser.html
|
||||
%%DOCSDIR%%/manual/mod/mod_cern_meta.html
|
||||
%%DOCSDIR%%/manual/mod/mod_cgi.html.en
|
||||
@ -458,6 +463,8 @@ sbin/rotatelogs
|
||||
%%DOCSDIR%%/manual/mod/mod_log_config.html.en
|
||||
%%DOCSDIR%%/manual/mod/mod_log_config.html.html
|
||||
%%DOCSDIR%%/manual/mod/mod_log_config.html.ja.jis
|
||||
%%DOCSDIR%%/manual/mod/mod_log_forensic.html.en
|
||||
%%DOCSDIR%%/manual/mod/mod_log_forensic.html.html
|
||||
%%DOCSDIR%%/manual/mod/mod_log_referer.html
|
||||
%%DOCSDIR%%/manual/mod/mod_mime.html.en
|
||||
%%DOCSDIR%%/manual/mod/mod_mime.html.html
|
||||
@ -530,7 +537,6 @@ sbin/rotatelogs
|
||||
%%DOCSDIR%%/manual/programs/suexec.html.html
|
||||
%%DOCSDIR%%/manual/programs/suexec.html.ja.jis
|
||||
%%DOCSDIR%%/manual/readme-tpf.html
|
||||
%%DOCSDIR%%/manual/search/manual-index.cgi
|
||||
%%DOCSDIR%%/manual/sections.html.en
|
||||
%%DOCSDIR%%/manual/sections.html.html
|
||||
%%DOCSDIR%%/manual/sections.html.ja.jis
|
||||
@ -576,6 +582,7 @@ sbin/rotatelogs
|
||||
%%DOCSDIR%%/manual/win_service.html.html
|
||||
%%DOCSDIR%%/manual/win_service.html.ja.jis
|
||||
%%DOCSDIR%%/manual/windows.html.en
|
||||
%%DOCSDIR%%/manual/windows.html.html
|
||||
%%DOCSDIR%%/manual/windows.html.ja.jis
|
||||
www/cgi-bin.default/printenv
|
||||
www/cgi-bin.default/test-cgi
|
||||
@ -816,7 +823,6 @@ www/icons/world2.png
|
||||
@dirrm %%DOCSDIR%%/manual/misc
|
||||
@dirrm %%DOCSDIR%%/manual/mod
|
||||
@dirrm %%DOCSDIR%%/manual/programs
|
||||
@dirrm %%DOCSDIR%%/manual/search
|
||||
@dirrm %%DOCSDIR%%/manual/vhosts
|
||||
@dirrm %%DOCSDIR%%/manual
|
||||
@dirrm %%DOCSDIR%%
|
||||
|
||||
Loading…
Reference in New Issue
Block a user