head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.40
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.38
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.36
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.34
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.32
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.30
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.28
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.26
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.24
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.22
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.20
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.18
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.16
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.14
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.12
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.10
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.8
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.6
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.4
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.2
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.3.0.8
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.6
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.4
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.2
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.2.0.6
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.4
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2;
locks; strict;
comment	@# @;


1.4
date	2005.09.26.17.21.21;	author tv;	state dead;
branches;
next	1.3;

1.3
date	2004.09.20.17.19.34;	author adrianp;	state Exp;
branches;
next	1.2;

1.2
date	2003.05.29.01.02.29;	author itojun;	state Exp;
branches;
next	1.1;

1.1
date	2003.04.15.11.49.38;	author martin;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Remove old 2003 patch that is actually no longer used.  apr is its own
package now, and this header file is only directly used by apr itself,
hidden from httpd.  (Clarifies bug 36750 that I have on file with Apache
Bugzilla.)
@
text
@$NetBSD: patch-ar,v 1.3 2004/09/20 17:19:34 adrianp Exp $

--- srclib/apr/include/apr_atomic.h.orig	2004-09-17 11:43:55.000000000 +0100
+++ srclib/apr/include/apr_atomic.h	2004-09-17 11:45:30.000000000 +0100
@@@@ -168,7 +168,7 @@@@
 #define apr_atomic_set(mem, val)     (atomic_set_int(mem, val),mem)
 #define apr_atomic_read(mem)         (*mem)
 
-#elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
+#elif !defined(__NetBSD__) && (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
 
 #define apr_atomic_t apr_uint32_t
 #define apr_atomic_cas(mem,with,cmp) \
@


1.3
log
@- Update apache to 2.0.51
- Remove patch-as and patch-ah as they are now outdated and included in the src

- ok'ed snj@@, wiz@@
- Thanks to epg@@ for final check

This version of Apache is principally a bug fix release. Of particular note
is that 2.0.51 addresses five security vulnerabilities:

An input validation issue in IPv6 literal address parsing which can result
in a negative length parameter being passed to memcpy.
[CAN-2004-0786]

A buffer overflow in configuration file parsing could allow a local user to
gain the privileges of a httpd child if the server can be forced to parse a
carefully crafted .htaccess file.
[CAN-2004-0747]

A segfault in mod_ssl which can be triggered by a malicious remote server,
if proxying to SSL servers has been configured.
[CAN-2004-0751]

A potential infinite loop in mod_ssl which could be triggered given
particular timing of a connection abort.
[CAN-2004-0748]

A segfault in mod_dav_fs which can be remotely triggered by an indirect lock
refresh request.
[CAN-2004-0809]

For further details, see http://www.apache.org/dist/httpd/Announcement2.html
and http://apache.rmplc.co.uk/httpd/CHANGES_2.0.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@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
@
text
@d3 4
a6 4
--- srclib/apr/include/apr_atomic.h.orig	2003-05-03 13:11:07.000000000 +0900
+++ srclib/apr/include/apr_atomic.h	2003-05-29 09:50:00.000000000 +0900
@@@@ -211,7 +211,7 @@@@
 #define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
@


1.1
log
@Not all machines that define __sparc__ run ${SOMEOTHEROS} - fix bogus
#ifdef and make it work on NetBSD/sparc{,64} again.
@
text
@d3 5
a7 5
--- srclib/apr/include/apr_atomic.h.orig	2003-04-15 13:21:18.000000000 +0200
+++ srclib/apr/include/apr_atomic.h	2003-04-15 13:22:01.000000000 +0200
@@@@ -247,7 +247,7 @@@@
 #define apr_atomic_read(mem)        (*(mem))
 #define apr_atomic_init(pool)        APR_SUCCESS
d9 2
a10 2
-#elif (defined(__sparc__) || defined(sparc)) && !APR_FORCE_ATOMIC_GENERIC
+#elif !defined(__NetBSD__) && ((defined(__sparc__) || defined(sparc))) && !APR_FORCE_ATOMIC_GENERIC
d13 1
a13 1
 #define apr_atomic_read(p)  *p
@