diff options
| author | sumikawa <sumikawa@FreeBSD.org> | 2001-07-31 05:25:08 +0000 |
|---|---|---|
| committer | sumikawa <sumikawa@FreeBSD.org> | 2001-07-31 05:25:08 +0000 |
| commit | a23c21a3b705862ec013fcc684b5ee047138643d (patch) | |
| tree | c3db1989d593c8fb7f88e07fdc64f7fa4530358a | |
| parent | 6efdd17bfd78a3e7c2992b9376cc9a3c9779298c (diff) | |
| download | FreeBSD-ports-a23c21a3b705862ec013fcc684b5ee047138643d.zip FreeBSD-ports-a23c21a3b705862ec013fcc684b5ee047138643d.tar.gz | |
- Upgrade to 1.3.20.
- IPv6 patch will be maintained at ftp://ftp.piuha.net/pub/misc/
Submitted by: Martti Kuparinen <martti@v6lab.net>
| -rw-r--r-- | www/apache13+ipv6/Makefile | 7 | ||||
| -rw-r--r-- | www/apache13+ipv6/distinfo | 4 | ||||
| -rw-r--r-- | www/apache13+ipv6/files/patch-util.c | 31 |
3 files changed, 5 insertions, 37 deletions
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile index 74b34fb..f44b64f 100644 --- a/www/apache13+ipv6/Makefile +++ b/www/apache13+ipv6/Makefile @@ -6,8 +6,7 @@ # PORTNAME= apache+ipv6 -PORTVERSION= 1.3.19 -PORTREVISION= 4 +PORTVERSION= 1.3.20 CATEGORIES= www ipv6 MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ @@ -26,8 +25,8 @@ MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ ftp://apache.nextpath.com/pub/apache/dist/httpd/ DISTNAME= apache_${PORTVERSION} -PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ -PATCHFILES= apache-1.3.19-v6-20010309a.diff.gz +PATCH_SITES= ftp://ftp.piuha.net/pub/misc/ +PATCHFILES= apache-1.3.20-v6-20010724.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= sumikawa@FreeBSD.org diff --git a/www/apache13+ipv6/distinfo b/www/apache13+ipv6/distinfo index 3ae0d17..b0f09dd 100644 --- a/www/apache13+ipv6/distinfo +++ b/www/apache13+ipv6/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855 -MD5 (apache-1.3.19-v6-20010309a.diff.gz) = fcee30724e14c403ab66e4db92b8ea8f +MD5 (apache_1.3.20.tar.gz) = d58d373b5f528a61a3490daec5e8f91f +MD5 (apache-1.3.20-v6-20010724.diff.gz) = 6da584790611f7ff8b7bcde3a1d634dc diff --git a/www/apache13+ipv6/files/patch-util.c b/www/apache13+ipv6/files/patch-util.c deleted file mode 100644 index 4c5b12a..0000000 --- a/www/apache13+ipv6/files/patch-util.c +++ /dev/null @@ -1,31 +0,0 @@ ---- src/main/util.c.orig Mon Apr 2 13:21:27 2001 -+++ src/main/util.c Mon Apr 2 13:21:28 2001 -@@ -2048,12 +2048,14 @@ - int x; - - if (!strchr(p->h_name, '.')) { -- for (x = 0; p->h_aliases[x]; ++x) { -- if (strchr(p->h_aliases[x], '.') && -- (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name)))) -- return ap_pstrdup(a, p->h_aliases[x]); -- } -- return NULL; -+ if (p->h_aliases) { -+ for (x = 0; p->h_aliases[x]; ++x) { -+ if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') && -+ (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name)))) -+ return ap_pstrdup(a, p->h_aliases[x]); -+ } -+ } -+ return NULL; - } - return ap_pstrdup(a, (void *) p->h_name); - } -@@ -2077,7 +2079,6 @@ - ap_log_error(APLOG_MARK, APLOG_WARNING, NULL, - "%s: gethostname() failed to determine ServerName\n", - ap_server_argv0); -- server_hostname = ap_pstrdup(a, "127.0.0.1"); - } - else - { |
