summaryrefslogtreecommitdiff
path: root/devel/apr
diff options
context:
space:
mode:
authoritojun <itojun>2003-05-29 01:02:27 +0000
committeritojun <itojun>2003-05-29 01:02:27 +0000
commit5932e60b6f9670915f8934e245c7c30df476688f (patch)
tree9df0b7f07a819e638dc1f8da54520185fa329d24 /devel/apr
parent3a1088484d9d2d076deda02897f81f06f8391c85 (diff)
downloadpkgsrc-5932e60b6f9670915f8934e245c7c30df476688f.tar.gz
upgrade to apache 2.0.46. fixes two vulnerabilities:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0245 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0189
Diffstat (limited to 'devel/apr')
-rw-r--r--devel/apr/Makefile4
-rw-r--r--devel/apr/PLIST6
-rw-r--r--devel/apr/distinfo7
-rw-r--r--devel/apr/patches/patch-ae22
4 files changed, 8 insertions, 31 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index ee30f63c169..8f734867676 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/05/25 08:55:18 epg Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/29 01:02:27 itojun Exp $
PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION}
CATEGORIES= devel
@@ -6,7 +6,7 @@ CATEGORIES= devel
HOMEPAGE= http://apr.apache.org/
COMMENT= Apache Portable Runtime
-CONFLICTS= apache2<2.0.45
+CONFLICTS= apache2<2.0.46
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
diff --git a/devel/apr/PLIST b/devel/apr/PLIST
index 659d958e21a..af3ddea69dd 100644
--- a/devel/apr/PLIST
+++ b/devel/apr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/29 01:02:27 itojun Exp $
bin/apr-config
bin/apu-config
include/apr-0/apr.h
@@ -68,12 +68,12 @@ lib/libapr-0.a
lib/libapr-0.la
lib/libapr-0.so
lib/libapr-0.so.9
-lib/libapr-0.so.9.3
+lib/libapr-0.so.9.4
lib/libaprutil-0.a
lib/libaprutil-0.la
lib/libaprutil-0.so
lib/libaprutil-0.so.9
-lib/libaprutil-0.so.9.3
+lib/libaprutil-0.so.9.4
libexec/apr/apr_rules.mk
libexec/apr/libtool
@dirrm libexec/apr
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index 877e4e852d6..f2870b4f730 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $
+$NetBSD: distinfo,v 1.2 2003/05/29 01:02:28 itojun Exp $
-SHA1 (httpd-2.0.45.tar.gz) = f722399b0e1986e699bc807518e396b7f0286cca
-Size (httpd-2.0.45.tar.gz) = 5549120 bytes
-SHA1 (patch-ae) = ef9e3f62e772752cfbbe5125fcb6bb9b64bec176
+SHA1 (httpd-2.0.46.tar.gz) = c739c4c296054697e264f7d1ac19f9f1e2d47553
+Size (httpd-2.0.46.tar.gz) = 6031023 bytes
SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056
SHA1 (patch-ao) = 25d44b0028772535da908895444d2bfe56f44120
SHA1 (patch-ap) = 41c36538dcd6d84f3e26ee02e9f1953e715d2c80
diff --git a/devel/apr/patches/patch-ae b/devel/apr/patches/patch-ae
deleted file mode 100644
index 2fb6d34ba04..00000000000
--- a/devel/apr/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $
-
-Index: threadproc/unix/proc.c
-===================================================================
-RCS file: /home/cvspublic/apr/threadproc/unix/proc.c,v
-retrieving revision 1.62
-diff -a -u -r1.62 proc.c
---- threadproc/unix/proc.c 6 Jan 2003 23:44:38 -0000 1.62
-+++ apr/threadproc/unix/proc.c
-@@ -474,7 +474,11 @@
- waitpid_options |= WNOHANG;
- }
-
-- if ((pstatus = waitpid(proc->pid, &exit_int, waitpid_options)) > 0) {
-+ do {
-+ pstatus = waitpid(proc->pid, &exit_int, waitpid_options);
-+ } while (pstatus < 0 && errno == EINTR);
-+
-+ if (pstatus > 0) {
- proc->pid = pstatus;
-
- if (WIFEXITED(exit_int)) {