diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile index 58d0e84fb0ed..9485b93f0740 100644 --- a/www/apache13+ipv6/Makefile +++ b/www/apache13+ipv6/Makefile @@ -6,7 +6,7 @@ # PORTNAME= apache+ipv6 -PORTVERSION= 1.3.17 +PORTVERSION= 1.3.19 PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/ \ @@ -27,7 +27,7 @@ MASTER_SITES= http://www.apache.org/dist/ \ DISTNAME= apache_${PORTVERSION} PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ -PATCHFILES= apache-1.3.17-v6-20010206a.diff.gz +PATCHFILES= apache-1.3.19-v6-20010301a.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= sumikawa@FreeBSD.org diff --git a/www/apache13+ipv6/distinfo b/www/apache13+ipv6/distinfo index b69ac3464e7f..b09f16e95ea3 100644 --- a/www/apache13+ipv6/distinfo +++ b/www/apache13+ipv6/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6 -MD5 (apache-1.3.17-v6-20010206a.diff.gz) = ca39f4d1238ff2a499367c9d2e79b524 +MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855 +MD5 (apache-1.3.19-v6-20010301a.diff.gz) = 09de643e5e9cd07787832c40996c5f29 diff --git a/www/apache13+ipv6/files/patch-rewrite b/www/apache13+ipv6/files/patch-rewrite deleted file mode 100644 index b80dae773567..000000000000 --- a/www/apache13+ipv6/files/patch-rewrite +++ /dev/null @@ -1,25 +0,0 @@ -There's another bug in RewriteMap handling in Apache 1.3.17, which -causes ${} expansions to be completely ignored. This patch fixes it. - -Index: src/modules/standard/mod_rewrite.c -=================================================================== -RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v -retrieving revision 1.169 -retrieving revision 1.170 -diff -u -r1.169 -r1.170 ---- src/modules/standard/mod_rewrite.c 2001/01/18 22:28:34 1.169 -+++ src/modules/standard/mod_rewrite.c 2001/02/01 04:12:26 1.170 -@@ -2287,11 +2287,11 @@ - char *map, *key, *dflt, *result; - char xkey[MAX_STRING_LEN]; - char xdflt[MAX_STRING_LEN]; -- key = find_char_in_brackets(inp, ':', '{', '}'); -+ key = find_char_in_brackets(inp+2, ':', '{', '}'); - if (key == NULL) - goto skip; - map = ap_pstrndup(r->pool, inp+2, key-inp-2); -- dflt = find_char_in_brackets(inp, '|', '{', '}'); -+ dflt = find_char_in_brackets(key+1, '|', '{', '}'); - if (dflt == NULL) { - key = ap_pstrndup(r->pool, key+1, endp-key-1); - dflt = "";