From 2563f528ef0dfaf22f1a22bb71a0779adddfda5f Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 17 Oct 2005 10:28:46 +0000 Subject: Update "apr" package to version 0.9.7. Changes since version 0.9.6: - Fix crash in apr_dir_make_recursive() for relative path when the working directory has been deleted. [Joe Orton] - Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT, returning APR_EBUSY. [Ronen Mizrahi ] - Fix apr_file_read() to catch write failures when flushing pending writes for a buffered file. [Joe Orton] - Fix apr_file_write() infinite loop on write failure for buffered files. [Erik Huelsmann ] - Fix error handling where apr_uid_* and apr_gid_* could segfault or return APR_SUCCESS in failure cases. PR 34053. [Joe Orton, Paul Querna] - Refactor Win32 condition variables code to address bugs 27654, 34336. [Henry Jen , E Holyat ] - Support APR_SO_SNDBUF and APR_SO_RCVBUF on Windows. PR 32177. [Sim , Jeff Trawick] - Fix detection of rwlocks on Mac OS X. [Aaron Bannert] - Fix issue with poll() followed by net I/O yielding EAGAIN on Mac OS 10.4 (Darwin 8). [Wilfredo Sanchez] Update based on patches supplied by Ben Collver. Addresses first part of PR pkg/31817 by Zafer Aydogan. --- devel/apr/Makefile | 3 +-- devel/apr/distinfo | 10 +++++----- devel/apr/patches/patch-ao | 6 +++--- www/apache2/Makefile | 3 +-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 84fe6ae6d6c..68e9c6ad706 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.36 2005/09/21 00:01:01 tv Exp $ +# $NetBSD: Makefile,v 1.37 2005/10/17 10:28:46 tron Exp $ .include "../../www/apache2/Makefile.common" PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION} CATEGORIES= devel -PKGREVISION= 2 HOMEPAGE= http://apr.apache.org/ COMMENT= Apache Portable Runtime diff --git a/devel/apr/distinfo b/devel/apr/distinfo index 8a45b47dbfd..ed286136200 100644 --- a/devel/apr/distinfo +++ b/devel/apr/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.15 2005/09/21 00:01:01 tv Exp $ +$NetBSD: distinfo,v 1.16 2005/10/17 10:28:46 tron Exp $ -SHA1 (httpd-2.0.54.tar.bz2) = 15b4fc3024cceea6562fb03383fd624e84e5e35a -RMD160 (httpd-2.0.54.tar.bz2) = c511cb2fa396ba04caf77bfc6ca03413df48ea08 -Size (httpd-2.0.54.tar.bz2) = 5566979 bytes +SHA1 (httpd-2.0.55.tar.bz2) = ab016aace57f34cb3eae5c9d48f2bcc5759d6c84 +RMD160 (httpd-2.0.55.tar.bz2) = 04749dcf9ea369152eddf9422e49bc0a77a443eb +Size (httpd-2.0.55.tar.bz2) = 4745220 bytes SHA1 (patch-aa) = c84bdb6bcb14bf6bc7ea0d8f13334dd8c3ef2ef9 SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596 -SHA1 (patch-ao) = d04d37445b7e8a50a74caa9bda3e6b10924e8322 +SHA1 (patch-ao) = e35630af53a78fce9aa5347a81cb1bcf8fb3058e SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756 SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3 SHA1 (patch-ar) = defa2be14ec057e1c41151b8cd1edc0ffb219694 diff --git a/devel/apr/patches/patch-ao b/devel/apr/patches/patch-ao index 5cc8d7ef76a..34b61055ca8 100644 --- a/devel/apr/patches/patch-ao +++ b/devel/apr/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.2 2005/04/25 09:13:02 adam Exp $ +$NetBSD: patch-ao,v 1.3 2005/10/17 10:28:46 tron Exp $ ---- apr/configure.orig 2005-04-11 21:04:37.000000000 +0000 +--- apr/configure.orig 2005-10-09 18:34:19.000000000 -0700 +++ apr/configure -@@ -40289,7 +40289,7 @@ fi; +@@ -40851,7 +40851,7 @@ fi; if test "$apr_devrandom" = "yes"; then # /dev/random on OpenBSD doesn't provide random data, so # prefer /dev/arandom, which does; see random(4). diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 2b59f238e63..e71647731ca 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.83 2005/09/28 14:31:09 rillig Exp $ +# $NetBSD: Makefile,v 1.84 2005/10/17 10:28:46 tron Exp $ .include "Makefile.common" PKGNAME= apache-${APACHE_VERSION} CATEGORIES= www -PKGREVISION= 5 HOMEPAGE= http://httpd.apache.org/ COMMENT= Apache HTTP (Web) server, version 2 -- cgit v1.2.3