head 1.8; access; symbols pkgsrc-2014Q1:1.7.0.72 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.70 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.68 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.66 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.64 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.62 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.60 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.58 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.56 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.54 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.52 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.50 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.48 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.46 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.44 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.42 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.40 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.38 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.36 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.34 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.32 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.30 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.28 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.26 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.24 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.22 pkgsrc-2008Q1:1.7.0.20 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.18 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.16 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.14 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.12 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.10 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.8 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.6 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.4 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.2 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.6.0.16 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.14 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.5.0.2 netbsd-1-6-1-base:1.5 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2-base:1.2 buildlink2:1.2.0.2; locks; strict; comment @# @; 1.8 date 2014.06.10.15.22.18; author joerg; state dead; branches; next 1.7; commitid djgMkPoOrhNxnZDx; 1.7 date 2005.10.11.20.10.35; author joerg; state Exp; branches; next 1.6; 1.6 date 2003.05.25.08.58.11; author epg; state dead; branches 1.6.16.1; next 1.5; 1.5 date 2003.01.28.14.21.59; author martti; state Exp; branches; next 1.4; 1.4 date 2002.08.29.14.12.29; author martti; state Exp; branches; next 1.3; 1.3 date 2002.08.25.21.51.57; author jlam; state Exp; branches; next 1.2; 1.2 date 2002.06.18.23.58.08; author itojun; state Exp; branches 1.2.2.1 1.2.8.1; next 1.1; 1.1 date 2002.06.18.02.17.18; author itojun; state Exp; branches; next ; 1.6.16.1 date 2005.10.18.21.21.27; author seb; state Exp; branches; next ; 1.2.2.1 date 2002.06.18.23.58.08; author jlam; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2002.06.23.19.03.33; author jlam; state Exp; branches; next ; 1.2.8.1 date 2002.10.12.17.34.25; author agc; state Exp; branches; next ; desc @@ 1.8 log @Retire Apache 1.3 and 2.0. @ text @$NetBSD: patch-ao,v 1.7 2005/10/11 20:10:35 joerg Exp $ --- modules/ssl/ssl_toolkit_compat.h.orig 2005-10-11 18:24:59.000000000 +0000 +++ modules/ssl/ssl_toolkit_compat.h @@@@ -24,6 +24,12 @@@@ #ifdef OPENSSL_VERSION_NUMBER +#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) +#ifndef PEM_F_DEF_CALLBACK +#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK +#endif +#endif + /* * rsa sslc uses incomplete types for most structures * so we macroize for OpenSSL those which cannot be dereferenced @ 1.7 log @Allow mod_ssl to build with OpenSSL 0.9.8. The patch is from Georg v. Zezschwitz on dev@@httpd.apache.org. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Split some stuff out into a new Makefile.common so that the new deve/apr package can use it. Depend on the new apr package. Approved by jlam@@netbsd.org. @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.5 2003/01/28 14:21:59 martti Exp $ d3 15 a17 11 --- srclib/apr/configure.orig 2003-01-18 17:20:31.000000000 +0200 +++ srclib/apr/configure 2003-01-28 16:13:11.000000000 +0200 @@@@ -24713,7 +24713,7 @@@@ if test "$apr_devrandom" = "yes"; then # /dev/random on OpenBSD doesn't provide random data, so # prefer /dev/arandom, which does; see random(4). - for f in /dev/arandom /dev/random /dev/urandom; do + for f in /dev/arandom /dev/urandom /dev/random; do if test -r $f; then apr_devrandom=$f rand=1 @ 1.6.16.1 log @Pullup ticket 838 - requested by Matthias Scheler sync devel/apr and www/apache2 with HEAD as precautionary/preventive step Revisions pulled up: - devel/apr/Makefile 1.37 - devel/apr/distinfo 1.16 - devel/apr/patches/patch-ao 1.3 - www/apache2/Makefile 1.84 - www/apache2/Makefile.common 1.19 - www/apache2/PLIST 1.31 - www/apache2/distinfo 1.43,1.44 - www/apache2/patches/patch-ac 1.6 - www/apache2/patches/patch-ae removed - www/apache2/patches/patch-af removed - www/apache2/patches/patch-ah removed - www/apache2/patches/patch-aj removed - www/apache2/patches/patch-ao 1.7 Module Name: pkgsrc Committed By: joerg Date: Tue Oct 11 20:10:35 UTC 2005 Modified Files: pkgsrc/www/apache2: distinfo Added Files: pkgsrc/www/apache2/patches: patch-ao Log Message: Allow mod_ssl to build with OpenSSL 0.9.8. The patch is from Georg v. Zezschwitz on dev@@httpd.apache.org. --- Module Name: pkgsrc Committed By: tron Date: Mon Oct 17 10:28:46 UTC 2005 Modified Files: pkgsrc/devel/apr: Makefile distinfo pkgsrc/devel/apr/patches: patch-ao pkgsrc/www/apache2: Makefile Log Message: 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. Bug 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. Bug 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. --- Module Name: pkgsrc Committed By: tron Date: Mon Oct 17 10:37:11 UTC 2005 Modified Files: pkgsrc/www/apache2: Makefile.common PLIST distinfo pkgsrc/www/apache2/patches: patch-ac Removed Files: pkgsrc/www/apache2/patches: patch-ae patch-af patch-ah patch-aj Log Message: Update "apache2" package to version 2.0.55. Changes since version 2.0.54: - worker MPM: Fix a memory leak which can occur after an aborted connection in some limited circumstances. [Greg Ames] - mod_ldap: Fix Bug 36563. Keep track of the number of attributes retrieved from LDAP so that all of the values can be properly cached even if the value is NULL. [Brad Nicholes, Ondrej Sury ] - Added TraceEnable [on|off|extended] per-server directive to alter the behavior of the TRACE method. This addresses a flaw in proxy conformance to RFC 2616 - previously the proxy server would accept a TRACE request body although the RFC prohibited it. The default remains 'TraceEnable on'. [William Rowe] - Add ap_log_cerror() for logging messages associated with particular client connections. [Jeff Trawick] - Correct mod_cgid's argv[0] so that the full path can be delved by the invoked cgi application, to conform to the behavior of mod_cgi. [Pradeep Kumar S ] - mod_include: Fix possible environment variable corruption when using nested includes. Bug 12655. [Joe Orton] - Support the suppress-error-charset setting, as with Apache 1.3.x. Bug 31274. [Jeff Trawick] - EBCDIC: Handle chunked input from client or, with proxy, origin server. [Jeff Trawick] - Fix bad globbing comparison which could result in getting a directory listing when a file was requested. Bug 34512. [sean ] - Fix core dump if mod_auth_ldap's mod_auth_ldap_auth_checker() was called even if mod_auth_ldap_check_user_id() was not (or if it didn't succeed) for non-authoritative cases. [Jim Jagielski] - mod_proxy: Fix over-eager handling of '%' for reverse proxies. Bug 15207. [Jim Jagielski] - mod_ldap: Fix various shared memory cache handling bugs. Bug 34209. [Joe Orton] - Fix a file descriptor leak when starting piped loggers. Bug 33748. [Joe Orton] - mod_ldap: Avoid segfaults when opening connections if using a version of OpenLDAP older than 2.2.21. Bug 34618. [Brad Nicholes] - mod_ssl: Fix build with OpenSSL 0.9.8. Bug 35757. [William Rowe] - proxy HTTP: If a response contains both Transfer-Encoding and a Content-Length, remove the Content-Length and don't reuse the connection, mitigating some HTTP Response Splitting attacks. [Jeff Trawick] - Prevent hangs of child processes when writing to piped loggers at the time of graceful restart. Bug 26467. [Jeff Trawick] - SECURITY: CAN-2005-1268 (cve.mitre.org) mod_ssl: Fix off-by-one overflow whilst printing CRL information at "LogLevel debug" which could be triggered if configured to use a "malicious" CRL. Bug 35081. [Marc Stern ] - mod_userdir: Fix possible memory corruption issue. Bug 34588. [David Leonard ] - worker mpm: don't take down the whole server for a transient thread creation failure. Bug 34514 [Greg Ames] - mod_rewrite: use buffered I/O to improve performance with large RewriteMap txt: files. [Greg Ames] - proxy HTTP: Rework the handling of request bodies to handle chunked input and input filters which modify content length, and avoid spooling arbitrary-sized request bodies in memory. Bug 15859. [Jeff Trawick] Patches supplied by Ben Collver. Addresses PR pkg/31817 by Zafer Aydogan. @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.7 2005/10/11 20:10:35 joerg Exp $ d3 11 a13 15 --- modules/ssl/ssl_toolkit_compat.h.orig 2005-10-11 18:24:59.000000000 +0000 +++ modules/ssl/ssl_toolkit_compat.h @@@@ -24,6 +24,12 @@@@ #ifdef OPENSSL_VERSION_NUMBER +#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) +#ifndef PEM_F_DEF_CALLBACK +#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK +#endif +#endif + /* * rsa sslc uses incomplete types for most structures * so we macroize for OpenSSL those which cannot be dereferenced @ 1.5 log @Updated apache2 to 2.0.44 (patch provided by Eric Gillespie in pkg/20086) * lots of bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.4 2002/08/29 14:12:29 martti Exp $ @ 1.4 log @Updated apache to 2.0.40 * SECURITY: [CAN-2002-0661] Close a very significant security hole that applies only to the Win32, OS2 and Netware platforms. Unix was not affected, Cygwin may be affected. Certain URIs will bypass security and allow users to invoke or access any file depending on the system configuration. Without upgrading, a single .conf change will close the vulnerability. Add the following directive in the global server httpd.conf context before any other Alias or Redirect directives; RedirectMatch 400 "\\\.\." Reported by Auriemma Luigi . [Brad Nicholes] * SECURITY: Close a path-revealing exposure in multiview type map negotiation (such as the default error documents) where the module would report the full path of the typemapped .var file when multiple documents or no documents could be served based on the mime negotiation. Reported by Auriemma Luigi . [CAN-2002-0654] [William Rowe] * SECURITY: Close a path-revealing exposure in cgi/cgid when we fail to invoke a script. The modules would report "couldn't create child process /path-to-script/script.pl" revealing the full path of the script. Reported by Jim Race . [CAN-2002-0654] [Bill Stoddard] * More bug fixes (see the CHANGES file) @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.3 2002/08/25 21:51:57 jlam Exp $ d3 11 a13 17 --- srclib/apr/configure.orig Fri Aug 9 19:47:46 2002 +++ srclib/apr/configure Mon Aug 12 15:02:57 2002 @@@@ -25353,11 +25353,11 @@@@ elif test "$apr_devrandom" != "no"; then if test -r "$apr_devrandom"; then cat >>confdefs.h <<\_ACEOF -#define DEV_RANDOM $apr_devrandom +#define DEV_RANDOM /dev/urandom _ACEOF - echo "$as_me:$LINENO: result: $apr_devrandom" >&5 -echo "${ECHO_T}$apr_devrandom" >&6 + echo "$as_me:$LINENO: result: /dev/urandom" >&5 +echo "${ECHO_T}/dev/urandom" >&6 rand="1" else { { echo "$as_me:$LINENO: error: $apr_devrandom not found or unreadable." >&5 @ 1.3 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.2.2.1 2002/06/23 19:03:33 jlam Exp $ d3 3 a5 5 --with-randomdev=foo does not work. --- srclib/apr/configure- Wed Jun 19 08:23:54 2002 +++ srclib/apr/configure Wed Jun 19 08:34:18 2002 @@@@ -25347,11 +25347,11 @@@@ @ 1.2 log @upgrade to 2.0.39, which should correct chunk encoding security issue. Changes with Apache 2.0.39 *) Fixed a build problem in htpasswd.c on Win32. [Guenter Knauf , Cliff Woolley] Changes with Apache 2.0.38 *) Rewrite htpasswd to use APR. The removes the annoying warning about tmpnam being unsafe. [Ryan Bloom] *) We must set the MIME-type for .shtml files to text/html if we want them to be parsed for SSI tags. Add the config for that to the default config file so that it is easier to enable .shtml parsing. [Dave Dyer ] *) Fixed a problem with 'make install' on ReliantUnix. [Jean-frederic Clere ] *) Make the default_handler catch all requests that aren't served by another handler. This also gets us to return a 404 if a directory is requested, there is no DirectoryIndex, and mod_autoindex isn't loaded. [Justin Erenkrantz] *) Fixed the handling of nested if-statements in shtml files. PR 9866 [Brian Pane] *) Allow 'make install DESTDIR=/path'. This allows packagers to install into a directory different from the one that was configured. This also mirrors the root= feature from 1.3. We cannot use prefix=, because both APR and APR-util resolve their installation paths at configuration time. This means that there is no variable prefix to replace. [Andreas Hasenack ] *) AIX 4.3.2 and above: Define SINGLE_LISTEN_UNSERIALIZED_ACCEPT. These levels of AIX don't have a thundering herd problem with accept(). [Jeff Trawick] *) prefork MPM: Ignore mutex errors during graceful restart. For certain types of mutexes (particularly SysV semaphores), we should expect to occasionally fail to obtain or release the mutex during restart processing. [Jeff Trawick] *) Fix install-bindist.sh so that it finds any perl instead of just early perl 5.x versions. This is consistent with a build/install from source, and it allows the perl scripts installed by a bindist to work on systems with perl 5.6. [Jeff Trawick] *) Fix apxs so that the makefile created by "apxs -g" works on AIX and Tru64 (and probably some other platforms). [Jeff Trawick] *) Allow CGI scripts to return their Content-Length. This also fixes a hang on HEAD requests seen on certain platforms (such as FreeBSD). [Justin Erenkrantz] *) Added log rotation based on file size to the RotateLog support utility. [Brad Nicholes] *) Fix some casting in mod_rewrite which broke random maps. PR 9770 [Allan Edwards, Greg Ames, Jeff Trawick] Changes with Apache 2.0.37 *) allow POST method over SSL when per-directory client cert authentication is used with 'SSLOptions +OptRenegotiate' enabled and a client cert was found in the ssl session cache. *) 'SSLOptions +OptRengotiate' will use client cert in from the ssl session cache when there is no cert chain in the cache. prior to the fix this situation would result in a FORBIDDEN response and error message "Cannot find peer certificate chain" [Doug MacEachern] *) ap_finalize_sub_req_protocol() shouldn't send an EOS bucket if one was already sent. PR 9644 [Jeff Trawick] *) Fix the display of the default name for the mime types config file. PR 9729 [Matthew Brecknell ] *) Fix the working directory *for WinNT/2K/XP services only* to change to the Apache directory (one level above the location of Apache.exe, in the case that Apache.exe resides in bin/.) Solves the case of ServerRoot /foo paths where /foo was not on the same drive as /winnt/system32. [William Rowe] *) Make 2.0's "AcceptMutex" startup message now "completely" match how 1.3 does it. [Jim Jagielski] *) Implement a fixed size memory cache using a priority queue [Ian Holsman] *) Fix apxs to allow "apxs -q installbuilddir" and to allow querying certain other variables from config_vars.mk. PR 9316 [Jeff Trawick] *) Added the "detached" attribute to the cgi_exec_info_t internals so that Win32 and Netware won't create a new window or console for each CGI invoked. PR 8387 [Brad Nicholes, William Rowe] *) Consolidated the command line parameters and attributes that are manipulated by the optional function ap_cgi_build_command() in mod_cgi into a single structure. [Brad Nicholes] *) Get rid of uninitialized value errors with "apxs -q" on certain variables. [Stas Bekman ] *) Fix apxs to allow it to work when the build directory is somewhere besides server-root/build. PR 8453 [Jeff Trawick and a host of others] *) Allow ap_discard_request_body to be called multiple times in the same request. Essentially, ap_http_filter keeps track of whether it has sent an EOS bucket up the stack, if so, it will only ever send an EOS bucket for this request. [Ryan Bloom, Justin Erenkrantz, Greg Stein] *) Remove all special mod_ssl URIs. This also fixes the bug where redirecting (.*) will allow an SSL protected page to be viewed without SSL. [Ryan Bloom] *) Fix the binary build install script so that the build logic created by "apxs -g" will work when the user has a binary build. [Jeff Trawick] *) Allow instdso.sh to work with full paths to the shared module. [Justin Erenkrantz] *) NetWare: Enabled CGI functionality and added mod_cgi as a built in module for NetWare [Brad Nicholes] *) Changed cgi and piped log behavior to accept 65536 characters on Win32 (matching Linux) before deadlocking between outputing client stdin, slurping the output from stdout and then the stderr stream. PR 8179 [William Rowe] *) Fixed Win32 wintty.exe support to assure the window title is valid. Elimiates possible gpfault or garbage title without the -t option. [William Rowe] *) Rewrite mod_cgi, mod_cgid, and mod_proxy input handling to use brigades and input filters. [Justin Erenkrantz] *) Allow ap_http_filter (HTTP_IN) to return EOS when there is no request body. [Justin Erenkrantz] *) NetWare: Piping log entries through RotateLogs using the CustomLogs directive is finally supported now that we have the pipes and spawning functionality working. [Brad Nicholes] *) Detect overflow when reading the hex bytes forming a chunk line. [Aaron Bannert] *) Allow RewriteMap prg:'s to take command-line arguments. PR 8464. [James Tait ] *) Correctly return 413 when an invalid chunk size is given on input. Also modify ap_discard_request_body to not do anything on sub-requests or when the connection will be dropped. [Justin Erenkrantz] *) Fix the TIME_* SSL var lookups to be threadsafe. PR 9469. [Cliff Woolley] *) Ensure that apr_brigade_write() flushes in all of the cases that it should to avoid conditions in some modules that could cause large amounts of data to be buffered. [Cliff Woolley] *) Fix problem where mod_cache/mod_disk_cache was incorrectly stripping the content_type from cached responses. [Bill Stoddard] *) apachectl passes through any httpd options. Note: apachectl should be used in preference to httpd since it ensures that any appropriate environment variables have been set up. [Jeff Trawick] *) Fix the combination of mod_cgid, mod_setuexec, and mod_userdir. PR 7810 [Colm MacCarthaigh ] *) Fix suexec execution of CGI scripts from mod_include. PR 7791, 8291 [Colm MacCarthaigh ] *) Fix segfaults at startup on some platforms when mod_auth_digest, mod_suexec, or mod_ssl were used as DSO's due to the way they were tracking the current init phase since DSO's get completely unloaded and reloaded between phases. PR 9413. [Tsuyoshi Sasamoto , Brad Nicholes] *) Fix mod_include's handling of regular expressions in "