diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 2004-10-25 14:19:55 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 2004-10-25 14:19:55 +0000 |
commit | 76c93bb3fb589dc82acdf4454da6cc47dbec3c84 (patch) | |
tree | fd36559da1318ad72b7041ab7d99aba0388522bf /www/apache13 | |
parent | - update cryusldap patch (diff) |
Upgrade to 1.3.32
Notes
Notes:
svn path=/head/; revision=120159
Diffstat (limited to 'www/apache13')
-rw-r--r-- | www/apache13/Makefile | 5 | ||||
-rw-r--r-- | www/apache13/distinfo | 4 | ||||
-rw-r--r-- | www/apache13/files/patch-ae | 11 | ||||
-rw-r--r-- | www/apache13/files/patch-http_request.c | 11 | ||||
-rw-r--r-- | www/apache13/files/patch-proxy_util.c | 13 | ||||
-rw-r--r-- | www/apache13/pkg-plist | 7 |
6 files changed, 17 insertions, 34 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index ecb6fe7025ee..3af00c585433 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -6,14 +6,13 @@ # PORTNAME= apache -PORTVERSION= 1.3.31 -PORTREVISION= 6 +PORTVERSION= 1.3.32 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= apache_${PORTVERSION} #PATCH_SITES= ${MASTER_SITE_APACHE_HTTPD} -#PATCH_SITE_SUBDIR= patches/apply_to_1.3.31/ +#PATCH_SITE_SUBDIR= patches/apply_to_1.3.32/ #PATCHFILES= #PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP} diff --git a/www/apache13/distinfo b/www/apache13/distinfo index 404b8d34cd78..2d12b09ba597 100644 --- a/www/apache13/distinfo +++ b/www/apache13/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.31.tar.gz) = bd548a06ac48dda496b4e613572bb020 -SIZE (apache_1.3.31.tar.gz) = 2467371 +MD5 (apache_1.3.32.tar.gz) = 45164531fb57bfa18af4b9efd0850dd3 +SIZE (apache_1.3.32.tar.gz) = 2472811 diff --git a/www/apache13/files/patch-ae b/www/apache13/files/patch-ae new file mode 100644 index 000000000000..5a34a8b90afc --- /dev/null +++ b/www/apache13/files/patch-ae @@ -0,0 +1,11 @@ +--- src/Configure.bak Thu Sep 16 03:45:17 2004 ++++ src/Configure Mon Oct 25 17:59:48 2004 +@@ -456,7 +456,7 @@ + PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'` + OS="FreeBSD $PLATOSVERS" + case "$PLATOSVERS" in +- [2345]*) ++ [2-9]*) + DEF_WANTHSREGEX=no + CFLAGS="$CFLAGS -funsigned-char" + ;; diff --git a/www/apache13/files/patch-http_request.c b/www/apache13/files/patch-http_request.c deleted file mode 100644 index e4642e4f2d27..000000000000 --- a/www/apache13/files/patch-http_request.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main/http_request.c.bak Wed Apr 28 20:58:42 2004 -+++ src/main/http_request.c Mon Jun 14 17:11:06 2004 -@@ -1056,7 +1056,7 @@ - */ - if ((r->status != HTTP_NOT_MODIFIED) && (r->status != HTTP_NO_CONTENT) - && !ap_status_drops_connection(r->status) -- && r->connection && (r->connection->keepalive > 0)) { -+ && r->connection && (r->connection->keepalive != -1)) { - - (void) ap_discard_request_body(r); - } diff --git a/www/apache13/files/patch-proxy_util.c b/www/apache13/files/patch-proxy_util.c deleted file mode 100644 index 3265807185ca..000000000000 --- a/www/apache13/files/patch-proxy_util.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/modules/proxy/proxy_util.c.orig Tue Feb 17 22:52:22 2004 -+++ src/modules/proxy/proxy_util.c Fri Jun 11 10:24:12 2004 -@@ -545,8 +545,8 @@ - n = ap_bread(f, buf, buf_size); - } - else { -- n = ap_bread(f, buf, MIN((int)buf_size, -- (int)(len - total_bytes_rcvd))); -+ n = ap_bread(f, buf, MIN((size_t)buf_size, -+ (size_t)(len - total_bytes_rcvd))); - } - } - diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index 1780bb42c071..fd6ebc5d779b 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -146,10 +146,6 @@ share/doc/apache/bind.html.en share/doc/apache/bind.html.fr share/doc/apache/bind.html.html share/doc/apache/bind.html.ja.jis -share/doc/apache/cgi_path.html.en -share/doc/apache/cgi_path.html.fr -share/doc/apache/cgi_path.html.html -share/doc/apache/cgi_path.html.ja.jis share/doc/apache/configuring.html.en share/doc/apache/configuring.html.fr share/doc/apache/configuring.html.html @@ -165,6 +161,7 @@ share/doc/apache/cygwin.html share/doc/apache/dns-caveats.html.en share/doc/apache/dns-caveats.html.fr share/doc/apache/dns-caveats.html.html +share/doc/apache/dns-caveats.html.ja.jis share/doc/apache/dso.html share/doc/apache/ebcdic.html share/doc/apache/env.html.en @@ -208,6 +205,7 @@ share/doc/apache/install.html.ja.jis share/doc/apache/invoking.html.en share/doc/apache/invoking.html.fr share/doc/apache/invoking.html.html +share/doc/apache/invoking.html.ja.jis share/doc/apache/keepalive.html.en share/doc/apache/keepalive.html.html share/doc/apache/keepalive.html.ja.jis @@ -358,7 +356,6 @@ share/doc/apache/new_features_1_2.html share/doc/apache/new_features_1_3.html.en share/doc/apache/new_features_1_3.html.html share/doc/apache/new_features_1_3.html.ja.jis -share/doc/apache/new_features_2_0.html share/doc/apache/process-model.html.en share/doc/apache/process-model.html.html share/doc/apache/process-model.html.ja.jis |