From d2a6e8aee6c3d8174e3394222acaf33587579b6b Mon Sep 17 00:00:00 2001 From: Clement Laforet Date: Fri, 12 Nov 2004 10:40:52 +0000 Subject: [PATCH] - Update to 1.3.33.1.55 --- www/apache13-ssl/Makefile | 2 +- www/apache13-ssl/distinfo | 8 +- .../patch-src:modules:standard:mod_access.c | 118 ------------------ www/apache13-ssl/pkg-plist | 23 ++-- 4 files changed, 18 insertions(+), 133 deletions(-) delete mode 100644 www/apache13-ssl/files/patch-src:modules:standard:mod_access.c diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile index d8961d26f054..c7c1098d4802 100644 --- a/www/apache13-ssl/Makefile +++ b/www/apache13-ssl/Makefile @@ -31,7 +31,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \ ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* -APACHE_VERSION= 1.3.29 +APACHE_VERSION= 1.3.33 APACHE_SSL_VERSION= 1.55 USE_OPENSSL= yes USE_PERL5= yes diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo index ad5844f69e2f..97020446c21e 100644 --- a/www/apache13-ssl/distinfo +++ b/www/apache13-ssl/distinfo @@ -1,4 +1,4 @@ -MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3 -SIZE (apache_1.3.29.tar.gz) = 2435809 -MD5 (apache_1.3.29+ssl_1.55.tar.gz) = cc0466f547dd6c3c52fdc6936f09a657 -SIZE (apache_1.3.29+ssl_1.55.tar.gz) = 58591 +MD5 (apache_1.3.33.tar.gz) = 3dfd2c3778f37a2dfc22b97417a61407 +SIZE (apache_1.3.33.tar.gz) = 2468567 +MD5 (apache_1.3.33+ssl_1.55.tar.gz) = 69a51a7002508f3d77c3c73724263d41 +SIZE (apache_1.3.33+ssl_1.55.tar.gz) = 58556 diff --git a/www/apache13-ssl/files/patch-src:modules:standard:mod_access.c b/www/apache13-ssl/files/patch-src:modules:standard:mod_access.c deleted file mode 100644 index b42c1f213c05..000000000000 --- a/www/apache13-ssl/files/patch-src:modules:standard:mod_access.c +++ /dev/null @@ -1,118 +0,0 @@ -=================================================================== -RCS file: /home/cvspublic/apache-1.3/src/modules/standard/mod_access.c,v -retrieving revision 1.46 -retrieving revision 1.47 -diff -u -r1.46 -r1.47 ---- 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; diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist index 8b475e2dac88..552718e00679 100644 --- a/www/apache13-ssl/pkg-plist +++ b/www/apache13-ssl/pkg-plist @@ -70,6 +70,7 @@ libexec/apache/mod_auth_db.so libexec/apache/mod_cern_meta.so libexec/apache/mod_digest.so libexec/apache/mod_expires.so +libexec/apache/mod_log_forensic.so libexec/apache/mod_headers.so libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so @@ -100,6 +101,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 @@ -119,16 +121,11 @@ 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 -%%PORTDOCS%%%%DOCSDIR%%/FAQ.html %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/bind.html.en %%PORTDOCS%%%%DOCSDIR%%/bind.html.fr %%PORTDOCS%%%%DOCSDIR%%/bind.html.html %%PORTDOCS%%%%DOCSDIR%%/bind.html.ja.jis -%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.en -%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.fr -%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.html -%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.ja.jis %%PORTDOCS%%%%DOCSDIR%%/configuring.html.en %%PORTDOCS%%%%DOCSDIR%%/configuring.html.fr %%PORTDOCS%%%%DOCSDIR%%/configuring.html.html @@ -144,6 +141,7 @@ www/data-dist/index.html.zh-tw.big5 %%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.en %%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.fr %%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.html +%%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.ja.jis %%PORTDOCS%%%%DOCSDIR%%/dso.html %%PORTDOCS%%%%DOCSDIR%%/ebcdic.html %%PORTDOCS%%%%DOCSDIR%%/env.html.en @@ -186,11 +184,14 @@ www/data-dist/index.html.zh-tw.big5 %%PORTDOCS%%%%DOCSDIR%%/install.html.ja.jis %%PORTDOCS%%%%DOCSDIR%%/invoking.html.en %%PORTDOCS%%%%DOCSDIR%%/invoking.html.fr +%%PORTDOCS%%%%DOCSDIR%%/invoking.html.ja.jis %%PORTDOCS%%%%DOCSDIR%%/invoking.html.html %%PORTDOCS%%%%DOCSDIR%%/keepalive.html.en %%PORTDOCS%%%%DOCSDIR%%/keepalive.html.html %%PORTDOCS%%%%DOCSDIR%%/keepalive.html.ja.jis -%%PORTDOCS%%%%DOCSDIR%%/location.html +%%PORTDOCS%%%%DOCSDIR%%/location.html.en +%%PORTDOCS%%%%DOCSDIR%%/location.html.html +%%PORTDOCS%%%%DOCSDIR%%/location.html.ja.jis %%PORTDOCS%%%%DOCSDIR%%/logs.html %%PORTDOCS%%%%DOCSDIR%%/man-template.html %%PORTDOCS%%%%DOCSDIR%%/misc/API.html @@ -259,7 +260,9 @@ www/data-dist/index.html.zh-tw.big5 %%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_db.html %%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_dbm.html %%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_digest.html -%%PORTDOCS%%%%DOCSDIR%%/mod/mod_autoindex.html +%%PORTDOCS%%%%DOCSDIR%%/mod/mod_autoindex.html.en +%%PORTDOCS%%%%DOCSDIR%%/mod/mod_autoindex.html.html +%%PORTDOCS%%%%DOCSDIR%%/mod/mod_autoindex.html.ja.jis %%PORTDOCS%%%%DOCSDIR%%/mod/mod_browser.html %%PORTDOCS%%%%DOCSDIR%%/mod/mod_cern_meta.html %%PORTDOCS%%%%DOCSDIR%%/mod/mod_cgi.html.en @@ -288,6 +291,8 @@ www/data-dist/index.html.zh-tw.big5 %%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_config.html.en %%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_config.html.html %%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_config.html.ja.jis +%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_forensic.html.en +%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_forensic.html.html %%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_referer.html %%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime.html.en %%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime.html.html @@ -331,7 +336,6 @@ www/data-dist/index.html.zh-tw.big5 %%PORTDOCS%%%%DOCSDIR%%/new_features_1_3.html.en %%PORTDOCS%%%%DOCSDIR%%/new_features_1_3.html.html %%PORTDOCS%%%%DOCSDIR%%/new_features_1_3.html.ja.jis -%%PORTDOCS%%%%DOCSDIR%%/new_features_2_0.html %%PORTDOCS%%%%DOCSDIR%%/process-model.html.en %%PORTDOCS%%%%DOCSDIR%%/process-model.html.html %%PORTDOCS%%%%DOCSDIR%%/process-model.html.ja.jis @@ -360,7 +364,6 @@ www/data-dist/index.html.zh-tw.big5 %%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.html %%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.ja.jis %%PORTDOCS%%%%DOCSDIR%%/readme-tpf.html -%%PORTDOCS%%%%DOCSDIR%%/search/manual-index.cgi %%PORTDOCS%%%%DOCSDIR%%/sections.html.en %%PORTDOCS%%%%DOCSDIR%%/sections.html.html %%PORTDOCS%%%%DOCSDIR%%/sections.html.ja.jis @@ -406,6 +409,7 @@ www/data-dist/index.html.zh-tw.big5 %%PORTDOCS%%%%DOCSDIR%%/win_service.html.html %%PORTDOCS%%%%DOCSDIR%%/win_service.html.ja.jis %%PORTDOCS%%%%DOCSDIR%%/windows.html.en +%%PORTDOCS%%%%DOCSDIR%%/windows.html.html %%PORTDOCS%%%%DOCSDIR%%/windows.html.ja.jis www/icons/README www/icons/a.gif @@ -635,7 +639,6 @@ www/icons/world2.png @dirrm %%PORTDOCS%%%%DOCSDIR%%/misc @dirrm %%PORTDOCS%%%%DOCSDIR%%/mod @dirrm %%PORTDOCS%%%%DOCSDIR%%/programs -@dirrm %%PORTDOCS%%%%DOCSDIR%%/search @dirrm %%PORTDOCS%%%%DOCSDIR%%/vhosts @dirrm %%PORTDOCS%%%%DOCSDIR%% @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi