diff options
Diffstat (limited to 'www/apache20/files')
27 files changed, 0 insertions, 1559 deletions
diff --git a/www/apache20/files/apache.sh b/www/apache20/files/apache.sh deleted file mode 100644 index fc71c2890619..000000000000 --- a/www/apache20/files/apache.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: apache2 -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable apache2: -# apache2_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable apache2 -# apache2ssl_enable (bool): Set to "NO" by default. -# Set it to "YES" to start apache with SSL -# (if <IfDefined SSL> exists in httpd.conf) -# apache2limits_enable (bool):Set to "NO" by default. -# Set it to yes to run `limits $limits_args` -# just before apache starts. -# apache2_flags (str): Set to "" by default. -# Extra flags passed to start command. -# apache2limits_args (str): Default to "-e -C daemon" -# Arguments of pre-start limits run. -# -. %%RC_SUBR%% - -name="apache2" -rcvar=`set_rcvar` - -start_precmd="apache2_precmd" -restart_precmd="apache2_checkconfig" -reload_precmd="apache2_checkconfig" -command="%%PREFIX%%/sbin/httpd" -pidfile="/var/run/httpd.pid" -required_files=%%PREFIX%%/etc/apache2/httpd.conf - -[ -z "$apache2_enable" ] && apache2_enable="NO" -[ -z "$apache2ssl_enable" ] && apache2ssl_enable="NO" -[ -z "$apache2_flags" ] && apache2_flags="" -[ -z "$apache2limits_enable" ] && apache2limits_enable="NO" -[ -z "$apache2limits_args" ] && apache2limits_args="-e -C daemon" - -load_rc_config $name - -checkyesno apache2ssl_enable && \ - apache2_flags="-DSSL $apache2_flags" - -apache2_checkconfig() -{ - echo "Performing sanity check on apache2 configuration:" - ${command} -t -} - -apache2_precmd() -{ - if test -f %%PREFIX%%/sbin/envvars - then - . %%PREFIX%%/sbin/envvars - fi - if checkyesno apache2limits_enable - then - eval `/usr/bin/limits ${apache2limits_args}` 2>/dev/null - else - return 0 - fi - -} - -sig_reload=SIGUSR1 - -extra_commands="reload" -run_rc_command "$1" diff --git a/www/apache20/files/apache2libs.sh b/www/apache20/files/apache2libs.sh deleted file mode 100644 index 67fe5c302561..000000000000 --- a/www/apache20/files/apache2libs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - /sbin/ldconfig -m %%PREFIX%%/lib/apache2 - ;; - stop) - ;; - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac diff --git a/www/apache20/files/exp-apr-kqueue.patch b/www/apache20/files/exp-apr-kqueue.patch deleted file mode 100644 index 98514717c579..000000000000 --- a/www/apache20/files/exp-apr-kqueue.patch +++ /dev/null @@ -1,524 +0,0 @@ -diff -Nursrclib/apr/configure.in srclib/apr/configure.in ---- srclib/apr/configure.in Thu May 27 21:12:47 2004 -+++ srclib/apr/configure.in Wed Jun 23 16:02:02 2004 -@@ -596,6 +596,25 @@ - - AC_CHECK_FUNCS(poll) - -+# Checks for the FreeBSD KQueue and Linux epoll interfaces: -+AC_CHECK_FUNC(kevent, -+ [AC_DEFINE([HAVE_KQUEUE], 1, [Define if the KQueue interface is supported])]) -+ -+# epoll* may be available in libc but return ENOSYS on a pre-2.6 kernel. -+AC_CACHE_CHECK([for epoll support], [apr_cv_epoll], -+[AC_TRY_RUN([ -+#include <sys/epoll.h> -+#include <unistd.h> -+ -+int main() -+{ -+ return epoll_create(5) == -1; -+}], [apr_cv_epoll=yes], [apr_cv_epoll=no], [apr_cv_epoll=no])]) -+ -+if test "$apr_cv_epoll" = "yes"; then -+ AC_DEFINE([HAVE_EPOLL], 1, [Define if the epoll interface is supported]) -+fi -+ - dnl ----------------------------- Checking for missing POSIX thread functions - AC_CHECK_FUNCS([getpwnam_r getpwuid_r getgrnam_r getgrgid_r]) - -diff -Nursrclib/apr/poll/unix/poll.c srclib/apr/poll/unix/poll.c ---- srclib/apr/poll/unix/poll.c Sat Apr 10 21:29:52 2004 -+++ srclib/apr/poll/unix/poll.c Tue Jul 13 09:43:36 2004 -@@ -25,8 +25,15 @@ - #if HAVE_SYS_POLL_H - #include <sys/poll.h> - #endif --#if HAVE_ALLOCA_H --#include <alloca.h> -+ -+#ifdef HAVE_KQUEUE -+#include <sys/types.h> -+#include <sys/event.h> -+#include <sys/time.h> -+#endif -+ -+#ifdef HAVE_EPOLL -+#include <sys/epoll.h> - #endif - - #ifdef NETWARE -@@ -34,6 +41,63 @@ - #define HAS_PIPES(dt) (dt == APR_POLL_FILE) ? 1 : 0 - #endif - -+#ifdef HAVE_KQUEUE -+static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags) -+{ -+ apr_int16_t rv = 0; -+ -+ if (event & EVFILT_READ) -+ rv |= APR_POLLIN; -+ if (event & EVFILT_WRITE) -+ rv |= APR_POLLOUT; -+ if (flags & EV_ERROR || flags & EV_EOF) -+ rv |= APR_POLLERR; -+ -+ return rv; -+} -+ -+#endif -+ -+#ifdef HAVE_EPOLL -+static apr_int16_t get_epoll_event(apr_int16_t event) -+{ -+ apr_int16_t rv = 0; -+ -+ if (event & APR_POLLIN) -+ rv |= EPOLLIN; -+ if (event & APR_POLLPRI) -+ rv |= EPOLLPRI; -+ if (event & APR_POLLOUT) -+ rv |= EPOLLOUT; -+ if (event & APR_POLLERR) -+ rv |= EPOLLERR; -+ if (event & APR_POLLHUP) -+ rv |= EPOLLHUP; -+ /* APR_POLLNVAL is not handled by epoll. */ -+ -+ return rv; -+} -+ -+static apr_int16_t get_epoll_revent(apr_int16_t event) -+{ -+ apr_int16_t rv = 0; -+ -+ if (event & EPOLLIN) -+ rv |= APR_POLLIN; -+ if (event & EPOLLPRI) -+ rv |= APR_POLLPRI; -+ if (event & EPOLLOUT) -+ rv |= APR_POLLOUT; -+ if (event & EPOLLERR) -+ rv |= APR_POLLERR; -+ if (event & EPOLLHUP) -+ rv |= APR_POLLHUP; -+ /* APR_POLLNVAL is not handled by epoll. */ -+ -+ return rv; -+} -+#endif -+ - #ifdef HAVE_POLL /* We can just use poll to do our socket polling. */ - - static apr_int16_t get_event(apr_int16_t event) -@@ -284,11 +348,19 @@ - - #endif - -- - struct apr_pollset_t { -+ apr_pool_t *pool; -+ - apr_uint32_t nelts; - apr_uint32_t nalloc; --#ifdef HAVE_POLL -+#ifdef HAVE_KQUEUE -+ int kqueue_fd; -+ struct kevent kevent; -+ struct kevent *ke_set; -+#elif defined(HAVE_EPOLL) -+ int epoll_fd; -+ struct epoll_event *pollset; -+#elif defined(HAVE_POLL) - struct pollfd *pollset; - #else - fd_set readset, writeset, exceptset; -@@ -296,18 +368,31 @@ - #endif - apr_pollfd_t *query_set; - apr_pollfd_t *result_set; -- apr_pool_t *pool; -+ - #ifdef NETWARE - int set_type; - #endif - }; - -+#if defined(HAVE_KQUEUE) || defined(HAVE_EPOLL) -+static apr_status_t backend_cleanup(void *p_) -+{ -+ apr_pollset_t *pollset = (apr_pollset_t *)p_; -+#ifdef HAVE_KQUEUE -+ close(pollset->kqueue_fd); -+#elif defined(HAVE_EPOLL) -+ close(pollset->epoll_fd); -+#endif -+ return APR_SUCCESS; -+} -+#endif /* HAVE_KQUEUE || HAVE_EPOLL */ -+ - APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset, - apr_uint32_t size, - apr_pool_t *p, - apr_uint32_t flags) - { --#if !defined(HAVE_POLL) && defined(FD_SETSIZE) -+#if !defined(HAVE_KQUEUE) && !defined(HAVE_EPOLL) && !defined(HAVE_POLL) && defined(FD_SETSIZE) - if (size > FD_SETSIZE) { - *pollset = NULL; - return APR_EINVAL; -@@ -316,7 +401,22 @@ - *pollset = apr_palloc(p, sizeof(**pollset)); - (*pollset)->nelts = 0; - (*pollset)->nalloc = size; --#ifdef HAVE_POLL -+ (*pollset)->pool = p; -+#ifdef HAVE_KQUEUE -+ (*pollset)->ke_set = (struct kevent*)apr_palloc(p, size * sizeof(struct kevent)); -+ memset((*pollset)->ke_set, 0, size * sizeof(struct kevent)); -+ (*pollset)->kqueue_fd = kqueue(); -+ if ((*pollset)->kqueue_fd == -1) { -+ return APR_ENOMEM; -+ } -+ apr_pool_cleanup_register(p, (void*)(*pollset), backend_cleanup, -+ apr_pool_cleanup_null); -+#elif defined(HAVE_EPOLL) -+ (*pollset)->epoll_fd = epoll_create(size); -+ (*pollset)->pollset = apr_palloc(p, size * sizeof(struct epoll_event)); -+ apr_pool_cleanup_register(p, (void*)(*pollset), backend_cleanup, -+ apr_pool_cleanup_null); -+#elif defined(HAVE_POLL) - (*pollset)->pollset = apr_palloc(p, size * sizeof(struct pollfd)); - #else - FD_ZERO(&((*pollset)->readset)); -@@ -329,23 +429,31 @@ - #endif - (*pollset)->query_set = apr_palloc(p, size * sizeof(apr_pollfd_t)); - (*pollset)->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t)); -- (*pollset)->pool = p; -+ - return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_pollset_destroy(apr_pollset_t *pollset) - { -- /* A no-op function for now. If we later implement /dev/poll -- * support, we'll need to close the /dev/poll fd here -- */ -+#if defined(HAVE_KQUEUE) || defined(HAVE_EPOLL) -+ return apr_pool_cleanup_run(pollset->pool, pollset, backend_cleanup); -+#else - return APR_SUCCESS; -+#endif - } - - APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset, - const apr_pollfd_t *descriptor) - { --#ifndef HAVE_POLL -+#ifdef HAVE_KQUEUE - apr_os_sock_t fd; -+#elif defined(HAVE_EPOLL) -+ struct epoll_event ev; -+ int ret = -1; -+#else -+#if !defined(HAVE_POLL) -+ apr_os_sock_t fd; -+#endif - #endif - - if (pollset->nelts == pollset->nalloc) { -@@ -353,7 +461,49 @@ - } - - pollset->query_set[pollset->nelts] = *descriptor; --#ifdef HAVE_POLL -+ -+#ifdef HAVE_KQUEUE -+ if (descriptor->desc_type == APR_POLL_SOCKET) { -+ fd = descriptor->desc.s->socketdes; -+ } -+ else { -+ fd = descriptor->desc.f->filedes; -+ } -+ -+ if (descriptor->reqevents & APR_POLLIN) { -+ EV_SET(&pollset->kevent, fd, EVFILT_READ, EV_ADD, 0, 0, NULL); -+ -+ if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0, -+ NULL) == -1) { -+ return APR_ENOMEM; -+ } -+ } -+ -+ if (descriptor->reqevents & APR_POLLOUT) { -+ EV_SET(&pollset->kevent, fd, EVFILT_WRITE, EV_ADD, 0, 0, NULL); -+ -+ if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0, -+ NULL) == -1) { -+ return APR_ENOMEM; -+ } -+ } -+ -+#elif defined(HAVE_EPOLL) -+ ev.events = get_epoll_event(descriptor->reqevents); -+ if (descriptor->desc_type == APR_POLL_SOCKET) { -+ ev.data.fd = descriptor->desc.s->socketdes; -+ ret = epoll_ctl(pollset->epoll_fd, EPOLL_CTL_ADD, -+ descriptor->desc.s->socketdes, &ev); -+ } -+ else { -+ ev.data.fd = descriptor->desc.f->filedes; -+ ret = epoll_ctl(pollset->epoll_fd, EPOLL_CTL_ADD, -+ descriptor->desc.f->filedes, &ev); -+ } -+ if (0 != ret) { -+ return APR_EBADF; -+ } -+#elif defined(HAVE_POLL) - - if (descriptor->desc_type == APR_POLL_SOCKET) { - pollset->pollset[pollset->nelts].fd = descriptor->desc.s->socketdes; -@@ -422,11 +572,97 @@ - const apr_pollfd_t *descriptor) - { - apr_uint32_t i; --#ifndef HAVE_POLL -+#ifdef HAVE_KQUEUE -+ apr_os_sock_t fd; -+#elif defined(HAVE_EPOLL) -+ struct epoll_event ev; -+ int ret = -1; -+#elif !defined(HAVE_POLL) - apr_os_sock_t fd; - #endif - --#ifdef HAVE_POLL -+#ifdef HAVE_KQUEUE -+ for (i = 0; i < pollset->nelts; i++) { -+ if (descriptor->desc.s == pollset->query_set[i].desc.s) { -+ /* Found an instance of the fd: remove this and any other copies */ -+ apr_uint32_t dst = i; -+ apr_uint32_t old_nelts = pollset->nelts; -+ pollset->nelts--; -+ for (i++; i < old_nelts; i++) { -+ if (descriptor->desc.s == pollset->query_set[i].desc.s) { -+ pollset->nelts--; -+ } -+ else { -+ pollset->query_set[dst] = pollset->query_set[i]; -+ dst++; -+ } -+ } -+ -+ if (descriptor->desc_type == APR_POLL_SOCKET) { -+ fd = descriptor->desc.s->socketdes; -+ } -+ else { -+ fd = descriptor->desc.f->filedes; -+ } -+ -+ if (descriptor->reqevents & APR_POLLIN) { -+ EV_SET(&pollset->kevent, fd, -+ EVFILT_READ, EV_DELETE, 0, 0, NULL); -+ -+ if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0, -+ NULL) == -1) { -+ return APR_EBADF; -+ } -+ } -+ -+ if (descriptor->reqevents & APR_POLLOUT) { -+ EV_SET(&pollset->kevent, fd, -+ EVFILT_WRITE, EV_DELETE, 0, 0, NULL); -+ -+ if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0, -+ NULL) == -1) { -+ return APR_EBADF; -+ } -+ } -+ -+ return APR_SUCCESS; -+ } -+ } -+#elif defined(HAVE_EPOLL) -+ for (i = 0; i < pollset->nelts; i++) { -+ if (descriptor->desc.s == pollset->query_set[i].desc.s) { -+ /* Found an instance of the fd: remove this and any other copies */ -+ apr_uint32_t dst = i; -+ apr_uint32_t old_nelts = pollset->nelts; -+ pollset->nelts--; -+ for (i++; i < old_nelts; i++) { -+ if (descriptor->desc.s == pollset->query_set[i].desc.s) { -+ pollset->nelts--; -+ } -+ else { -+ pollset->query_set[dst] = pollset->query_set[i]; -+ dst++; -+ } -+ } -+ ev.events = get_epoll_event(descriptor->reqevents); -+ if (descriptor->desc_type == APR_POLL_SOCKET) { -+ ev.data.fd = descriptor->desc.s->socketdes; -+ ret = epoll_ctl(pollset->epoll_fd, EPOLL_CTL_DEL, -+ descriptor->desc.s->socketdes, &ev); -+ } -+ else { -+ ev.data.fd = descriptor->desc.f->filedes; -+ ret = epoll_ctl(pollset->epoll_fd, EPOLL_CTL_DEL, -+ descriptor->desc.f->filedes, &ev); -+ } -+ if (ret < 0) { -+ return APR_EBADF; -+ } -+ -+ return APR_SUCCESS; -+ } -+ } -+#elif defined(HAVE_POLL) - for (i = 0; i < pollset->nelts; i++) { - if (descriptor->desc.s == pollset->query_set[i].desc.s) { - /* Found an instance of the fd: remove this and any other copies */ -@@ -487,8 +723,119 @@ - - return APR_NOTFOUND; - } -+#ifdef HAVE_KQUEUE -+APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset, -+ apr_interval_time_t timeout, -+ apr_int32_t *num, -+ const apr_pollfd_t **descriptors) -+{ -+ int rv; -+ apr_uint32_t i, j, r = 0; -+ struct timespec tv, *tvptr; -+ -+ if (timeout < 0) { -+ tvptr = NULL; -+ } -+ else { -+ tv.tv_sec = (long)apr_time_sec(timeout); -+ tv.tv_nsec = (long)apr_time_msec(timeout); -+ tvptr = &tv; -+ } -+ -+ rv = kevent(pollset->kqueue_fd, NULL, 0, pollset->ke_set, pollset->nelts, -+ tvptr); -+ (*num) = rv; -+ if (rv < 0) { -+ return apr_get_netos_error(); -+ } -+ if (rv == 0) { -+ return APR_TIMEUP; -+ } -+ -+ /* TODO: Is there a better way to re-associate our data? */ -+ for (i = 0; i < pollset->nelts; i++) { -+ apr_os_sock_t fd; -+ if (pollset->query_set[i].desc_type == APR_POLL_SOCKET) { -+ fd = pollset->query_set[i].desc.s->socketdes; -+ } -+ else { -+ fd = pollset->query_set[i].desc.f->filedes; -+ } -+ for (j = 0; j < rv; j++) { -+ if (pollset->ke_set[j].ident == fd ) { -+ pollset->result_set[r] = pollset->query_set[i]; -+ pollset->result_set[r].rtnevents = -+ get_kqueue_revent(pollset->ke_set[j].filter, -+ pollset->ke_set[j].flags); -+ r++; -+ } -+ } -+ } -+ -+ (*num) = r; -+ -+ if (descriptors) { -+ *descriptors = pollset->result_set; -+ } -+ -+ return APR_SUCCESS; -+} -+ -+#elif defined(HAVE_EPOLL) - --#ifdef HAVE_POLL -+APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset, -+ apr_interval_time_t timeout, -+ apr_int32_t *num, -+ const apr_pollfd_t **descriptors) -+{ -+ int rv; -+ apr_uint32_t i, j, k; -+ -+ if (timeout > 0) { -+ timeout /= 1000; -+ } -+ -+ rv = epoll_wait(pollset->epoll_fd, pollset->pollset, pollset->nelts, -+ timeout); -+ (*num) = rv; -+ if (rv < 0) { -+ return apr_get_netos_error(); -+ } -+ if (rv == 0) { -+ return APR_TIMEUP; -+ } -+ j = 0; -+ for (i = 0; i < pollset->nelts; i++) { -+ if (pollset->pollset[i].events != 0) { -+ /* TODO: Is there a better way to re-associate our data? */ -+ for (k = 0; k < pollset->nelts; k++) { -+ if (pollset->query_set[k].desc_type == APR_POLL_SOCKET && -+ pollset->query_set[k].desc.s->socketdes == -+ pollset->pollset[i].data.fd) { -+ pollset->result_set[j] = pollset->query_set[k]; -+ pollset->result_set[j].rtnevents = -+ get_epoll_revent(pollset->pollset[i].events); -+ j++; -+ break; -+ } -+ else if (pollset->query_set[k].desc_type == APR_POLL_FILE -+ && pollset->query_set[k].desc.f->filedes == -+ pollset->pollset[i].data.fd) { -+ pollset->result_set[j] = pollset->query_set[k]; -+ pollset->result_set[j].rtnevents = -+ get_epoll_revent(pollset->pollset[i].events); -+ j++; -+ break; -+ } -+ } -+ } -+ } -+ if (descriptors) { -+ *descriptors = pollset->result_set; -+ } -+ return APR_SUCCESS; -+} -+#elif defined(HAVE_POLL) - APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset, - apr_interval_time_t timeout, - apr_int32_t *num, -@@ -517,7 +864,8 @@ - j++; - } - } -- *descriptors = pollset->result_set; -+ if (descriptors) -+ *descriptors = pollset->result_set; - return APR_SUCCESS; - } - -@@ -591,7 +939,8 @@ - } - } - -- *descriptors = pollset->result_set; -+ if (descriptors) -+ *descriptors = pollset->result_set; - return APR_SUCCESS; - } - - diff --git a/www/apache20/files/exp-windowsupdate.patch b/www/apache20/files/exp-windowsupdate.patch deleted file mode 100644 index 3f1306777100..000000000000 --- a/www/apache20/files/exp-windowsupdate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- server/protocol.c.orig Tue Jun 29 08:21:28 2004 -+++ server/protocol.c Tue Jun 29 08:21:50 2004 -@@ -1248,7 +1248,7 @@ - * We can only set a C-L in the response header if we haven't already - * sent any buckets on to the next output filter for this request. - */ -- if (ctx->data_sent == 0 && eos) { -+ if (ctx->data_sent == 0 && eos && !r->header_only) { - ap_set_content_length(r, r->bytes_sent); - } - diff --git a/www/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in deleted file mode 100644 index 41ed1ba3ff41..000000000000 --- a/www/apache20/files/patch-Makefile.in +++ /dev/null @@ -1,152 +0,0 @@ ---- Makefile.in.orig Thu Aug 26 15:01:18 2004 -+++ Makefile.in Fri Dec 17 17:00:02 2004 -@@ -31,15 +31,21 @@ - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \ - fi ; \ -+ if [ ! -d $(DESTDIR)$(EXAMPLESDIR) ]; then \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \ -+ fi ; \ - cd $(top_srcdir)/docs/conf; \ - for i in mime.types magic; do \ - if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ - fi; \ -+ cp -f $$i $$i-dist; \ -+ $(INSTALL_DATA) $$i-dist $(DESTDIR)$(EXAMPLESDIR); \ - done; \ - for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ - cd $$j ; \ - for i in *-std*.conf; do \ -+ [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \ - ( \ - n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ - if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \ -@@ -57,6 +63,9 @@ - if test "x$$j" = "xssl"; then \ - echo "<IfDefine SSL>"; \ - fi; \ -+ if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \ -+ echo -n "#"; \ -+ fi; \ - if test $$j != "^EOL^"; then \ - echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ - fi; \ -@@ -70,23 +79,17 @@ - -e 's#@@Port@@#$(PORT)#g' \ - < $$i; \ - fi \ -- ) > $(DESTDIR)$(sysconfdir)/$$i; \ -- chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \ -+ ) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \ -+ chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \ - file=`echo $$i|sed s/-std//`; \ - if [ "$$file" = "httpd.conf" ]; then \ - file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ - fi; \ - if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ -- $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \ -+ $(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \ - fi; \ - done ; \ -- done ; \ -- if test -f "$(builddir)/envvars-std"; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir); \ -- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ -- fi ; \ -- fi -+ done ; - - install-build: - @echo Installing build system files -@@ -108,45 +111,41 @@ - doxygen $(top_srcdir)/docs/doxygen.conf - - install-htdocs: -- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \ -- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ -- else \ -- echo Installing HTML documents ; \ -- $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ -- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ -- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+.if !defined(NO_WWWDATA) -+ @echo Installing HTML documents -+ @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist -+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist) -+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir) -+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf -+.endif - - install-error: -- -@if [ -d $(DESTDIR)$(errordir) ]; then \ -- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \ -- else \ -- echo Installing error documents ; \ -- $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ -- cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ -- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+.if !defined(NO_ERROR) -+ @echo Installing error documents -+ @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist -+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist -+ -@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf -+ @test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir) -+.endif - - install-icons: -- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \ -- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \ -- else \ -- echo Installing icons ; \ -- $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ -- cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ -- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+.if !defined(NO_ICONS) -+ @echo Installing icons -+ @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist -+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist -+ -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf -+ @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir) -+.endif - - install-cgi: -- -@if [ -d $(DESTDIR)$(cgidir) ];then \ -- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ -- else \ -- echo Installing CGIs ; \ -- $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ -- cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ -- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -- -+.if !defined(NO_CGI) -+ @echo Installing CGIs -+ @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist -+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist -+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf -+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir) -+.endif -+ - install-other: - @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) - @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) -@@ -188,11 +187,13 @@ - @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) - @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 - @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 -- @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) - @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 - @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 -+.if !defined(NOPORTDOCS) -+ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) - @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true -+.endif - - install-suexec: - @if test -f $(builddir)/support/suexec; then \ diff --git a/www/apache20/files/patch-configure.in b/www/apache20/files/patch-configure.in deleted file mode 100644 index 6d77c65b7f07..000000000000 --- a/www/apache20/files/patch-configure.in +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.in.orig Thu Mar 18 08:36:52 2004 -+++ configure.in Fri Jul 2 11:44:25 2004 -@@ -69,7 +69,7 @@ - - if test "$apr_found" = "reconfig"; then - APR_SUBDIR_CONFIG(srclib/apr, -- [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir], -+ [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir], - [--enable-layout=*|\'--enable-layout=*]) - dnl We must be the first to build and the last to be cleaned - AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS" -@@ -96,7 +96,7 @@ - - if test "$apu_found" = "reconfig"; then - APR_SUBDIR_CONFIG(srclib/apr-util, -- [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir], -+ [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir], - [--enable-layout=*|\'--enable-layout=*]) - dnl We must be the last to build and the first to be cleaned - AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util" -@@ -545,8 +545,14 @@ - [Root directory of the Apache install area]) - AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", - [Location of the config file, relative to the Apache root directory]) -+AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log", -+ [Location of error log file]) -+AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status", -+ [Location of ScoreBoard file]) - AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", - [Location of the MIME types config file, relative to the Apache root directory]) -+AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}", -+ [Location of document root]) - AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", - [Location of the source for the current MPM]) - diff --git a/www/apache20/files/patch-docs:conf:httpd-std.conf.in b/www/apache20/files/patch-docs:conf:httpd-std.conf.in deleted file mode 100644 index 7a09e89ea821..000000000000 --- a/www/apache20/files/patch-docs:conf:httpd-std.conf.in +++ /dev/null @@ -1,127 +0,0 @@ ---- docs/conf/httpd-std.conf.in.orig Mon Aug 16 01:43:56 2004 -+++ docs/conf/httpd-std.conf.in Sun Dec 12 12:34:08 2004 -@@ -68,7 +68,7 @@ - # - <IfModule !mpm_netware.c> - <IfModule !perchild.c> --#ScoreBoardFile @rel_logfiledir@/apache_runtime_status -+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status - </IfModule> - </IfModule> - -@@ -265,8 +265,8 @@ - # when the value of (unsigned)Group is above 60000; - # don't use Group #-1 on these systems! - # --User nobody --Group #-1 -+User %%WWWOWN%% -+Group %%WWWGRP%% - </IfModule> - </IfModule> - -@@ -314,10 +314,11 @@ - # - # First, we configure the "default" to be a very restrictive set of - # features. --# -+# - <Directory /> -- Options FollowSymLinks - AllowOverride None -+ Order Deny,Allow -+ Deny from all - </Directory> - - # -@@ -330,7 +331,7 @@ - # - # This should be changed to whatever you set DocumentRoot to. - # --<Directory "@exp_htdocsdir@"> -+<Directory "%%WWWBASEDIR%%"> - - # - # Possible values for the Options directive are "None", "All", -@@ -365,24 +366,29 @@ - # UserDir: The name of the directory that is appended onto a user's home - # directory if a ~user request is received. - # -+<IfModule mod_userdir.c> - UserDir public_html - -+UserDir disabled %%FTPUSERS%% -+ - # - # Control access to UserDir directories. The following is an example - # for a site where these directories are restricted to read-only. - # --#<Directory /home/*/public_html> --# AllowOverride FileInfo AuthConfig Limit Indexes --# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec --# <Limit GET POST OPTIONS PROPFIND> --# Order allow,deny --# Allow from all --# </Limit> --# <LimitExcept GET POST OPTIONS PROPFIND> --# Order deny,allow --# Deny from all --# </LimitExcept> --#</Directory> -+<Directory /home/*/public_html> -+ AllowOverride FileInfo AuthConfig Limit Indexes -+ Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec -+ <Limit GET POST OPTIONS PROPFIND> -+ Order allow,deny -+ Allow from all -+ </Limit> -+ <LimitExcept GET POST OPTIONS PROPFIND> -+ Order deny,allow -+ Deny from all -+ </LimitExcept> -+</Directory> -+ -+</IfModule> - - # - # DirectoryIndex: sets the file that Apache will serve if a directory -@@ -472,7 +478,7 @@ - # logged here. If you *do* define an error logfile for a <VirtualHost> - # container, that host's errors will be logged there and not here. - # --ErrorLog @rel_logfiledir@/error_log -+ErrorLog @rel_logfiledir@/httpd-error.log - - # - # LogLevel: Control the number of messages logged to the error_log. -@@ -500,20 +506,20 @@ - # define per-<VirtualHost> access logfiles, transactions will be - # logged therein and *not* in this file. - # --CustomLog @rel_logfiledir@/access_log common -+#CustomLog @rel_logfiledir@/httpd-access.log common - - # - # If you would like to have agent and referer logfiles, uncomment the - # following directives. - # --#CustomLog @rel_logfiledir@/referer_log referer --#CustomLog @rel_logfiledir@/agent_log agent -+#CustomLog @rel_logfiledir@/httpd-referer.log referer -+#CustomLog @rel_logfiledir@/httpd-agent.log agent - - # - # If you prefer a single logfile with access, agent, and referer information - # (Combined Logfile Format) you can use the following directive. - # --#CustomLog @rel_logfiledir@/access_log combined -+CustomLog @rel_logfiledir@/httpd-access.log combined - - # - # ServerTokens -@@ -1043,3 +1049,5 @@ - # ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log - # CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common - #</VirtualHost> -+ -+Include @rel_sysconfdir@/Includes/*.conf diff --git a/www/apache20/files/patch-docs:conf:ssl-std.conf.in b/www/apache20/files/patch-docs:conf:ssl-std.conf.in deleted file mode 100644 index cf0bbeab218d..000000000000 --- a/www/apache20/files/patch-docs:conf:ssl-std.conf.in +++ /dev/null @@ -1,24 +0,0 @@ -$FreeBSD$ - ---- docs/conf/ssl-std.conf.in.orig Mon Oct 13 16:14:10 2003 -+++ docs/conf/ssl-std.conf.in Mon Oct 13 16:15:17 2003 -@@ -88,8 +88,8 @@ - DocumentRoot "@exp_htdocsdir@" - ServerName www.example.com:443 - ServerAdmin you@example.com --ErrorLog @exp_logfiledir@/error_log --TransferLog @exp_logfiledir@/access_log -+ErrorLog @exp_logfiledir@/httpd-error.log -+TransferLog @exp_logfiledir@/httpd-access.log - - # SSL Engine Switch: - # Enable/Disable SSL for this virtual host. -@@ -240,7 +240,7 @@ - # Per-Server Logging: - # The home of a custom SSL log file. Use this when you want a - # compact non-error SSL logfile on a virtual host basis. --CustomLog @exp_logfiledir@/ssl_request_log \ -+CustomLog @exp_logfiledir@/httpd-ssl_request.log \ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" - - </VirtualHost> diff --git a/www/apache20/files/patch-modules:experimental:util_ldap_cache_mgr.c b/www/apache20/files/patch-modules:experimental:util_ldap_cache_mgr.c deleted file mode 100644 index ca5352107d51..000000000000 --- a/www/apache20/files/patch-modules:experimental:util_ldap_cache_mgr.c +++ /dev/null @@ -1,48 +0,0 @@ ---- modules/experimental/util_ldap_cache_mgr.c Thu Sep 23 18:55:37 2004 -+++ modules/experimental/util_ldap_cache_mgr.c Wed Nov 3 06:17:59 2004 -@@ -173,7 +173,7 @@ - void util_ald_cache_purge(util_ald_cache_t *cache) - { - unsigned long i; -- util_cache_node_t *p, *q; -+ util_cache_node_t *p, *q, **pp; - apr_time_t t; - - if (!cache) -@@ -184,7 +184,8 @@ - cache->numpurges++; - - for (i=0; i < cache->size; ++i) { -- p = cache->nodes[i]; -+ pp = cache->nodes + i; -+ p = *pp; - while (p != NULL) { - if (p->add_time < cache->marktime) { - q = p->next; -@@ -192,11 +193,12 @@ - util_ald_free(cache, p); - cache->numentries--; - cache->npurged++; -- p = q; -+ p = *pp = q; - } - else { -- p = p->next; -- } -+ -+ pp = &(p->next); -+ p = *pp; } - } - } - -@@ -686,7 +688,9 @@ - default: - break; - } -- -+ } -+ else { -+ buf = ""; - } - } - else { diff --git a/www/apache20/files/patch-modules:ssl:mod_ssl.h b/www/apache20/files/patch-modules:ssl:mod_ssl.h deleted file mode 100644 index e916df9d0376..000000000000 --- a/www/apache20/files/patch-modules:ssl:mod_ssl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/ssl/mod_ssl.h.orig Tue Sep 16 01:00:06 2003 -+++ modules/ssl/mod_ssl.h Sat Jan 10 22:08:18 2004 -@@ -123,7 +123,7 @@ - #else /* !HAVE_SSLC (implicit HAVE_OPENSSL) */ - - #include <ssl.h> --#include <err.h> -+#include <openssl/err.h> - #include <x509.h> - #include <pem.h> - #include <crypto.h> diff --git a/www/apache20/files/patch-modules:ssl:ssl_engine_io.c b/www/apache20/files/patch-modules:ssl:ssl_engine_io.c deleted file mode 100644 index 0f2823e10232..000000000000 --- a/www/apache20/files/patch-modules:ssl:ssl_engine_io.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/ssl/ssl_engine_io.c.orig Fri Dec 17 23:14:23 2004 -+++ modules/ssl/ssl_engine_io.c Fri Dec 17 23:15:04 2004 -@@ -153,7 +153,7 @@ - - outctx->rc = ap_pass_brigade(outctx->filter_ctx->pOutputFilter->next, - outctx->bb); -- return (outctx->rc == APR_SUCCESS) ? 1 : -1; -+ return (outctx->rc == APR_SUCCESS && !outctx->c->aborted) ? 1 : -1; - } - - static int bio_filter_create(BIO *bio) diff --git a/www/apache20/files/patch-secfix-CAN-2004-0885 b/www/apache20/files/patch-secfix-CAN-2004-0885 deleted file mode 100644 index f19a7e55c165..000000000000 --- a/www/apache20/files/patch-secfix-CAN-2004-0885 +++ /dev/null @@ -1,56 +0,0 @@ -Index: ssl_engine_init.c -=================================================================== -RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v -retrieving revision 1.128 -retrieving revision 1.129 -diff -d -w -u -r1.128 -r1.129 ---- modules/ssl/ssl_engine_init.c 3 Jun 2004 13:03:08 -0000 1.128 -+++ modules/ssl/ssl_engine_init.c 8 Oct 2004 11:59:32 -0000 1.129 -@@ -443,6 +443,14 @@ - * Configure additional context ingredients - */ - SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE); -+ -+#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION -+ /* -+ * Disallow a session from being resumed during a renegotiation, -+ * so that an acceptable cipher suite can be negotiated. -+ */ -+ SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION); -+#endif - } - - static void ssl_init_ctx_session_cache(server_rec *s, -Index: ssl_engine_kernel.c -=================================================================== -RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v -retrieving revision 1.110 -retrieving revision 1.111 -diff -d -w -u -r1.110 -r1.111 ---- modules/ssl/ssl_engine_kernel.c 18 Aug 2004 11:05:22 -0000 1.110 -+++ modules/ssl/ssl_engine_kernel.c 8 Oct 2004 11:59:33 -0000 1.111 -@@ -733,6 +733,21 @@ - X509_free(peercert); - } - } -+ -+ /* -+ * Also check that SSLCipherSuite has been enforced as expected. -+ */ -+ if (cipher_list) { -+ cipher = SSL_get_current_cipher(ssl); -+ if (sk_SSL_CIPHER_find(cipher_list, cipher) < 0) { -+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, -+ "SSL cipher suite not renegotiated: " -+ "access to %s denied using cipher %s", -+ r->filename, -+ SSL_CIPHER_get_name(cipher)); -+ return HTTP_FORBIDDEN; -+ } -+ } - } - - /* - - - diff --git a/www/apache20/files/patch-secfix-CAN-2004-0942 b/www/apache20/files/patch-secfix-CAN-2004-0942 deleted file mode 100644 index 2f67f7c4013d..000000000000 --- a/www/apache20/files/patch-secfix-CAN-2004-0942 +++ /dev/null @@ -1,104 +0,0 @@ -=================================================================== -RCS file: /home/cvspublic/httpd-2.0/server/protocol.c,v -retrieving revision 1.121.2.21 -retrieving revision 1.121.2.22 -diff -u -r1.121.2.21 -r1.121.2.22 ---- server/protocol.c 2004/09/23 18:18:36 1.121.2.21 -+++ server/protocol.c 2004/11/10 11:32:40 1.121.2.22 -@@ -305,35 +305,13 @@ - } - } - -- /* We now go backwards over any CR (if present) or white spaces. -- * -- * Trim any extra trailing spaces or tabs except for the first -- * space or tab at the beginning of a blank string. This makes -- * it much easier to check field values for exact matches, and -- * saves memory as well. Terminate string at end of line. -- */ -- pos = last_char; -- if (pos > *s && *(pos - 1) == APR_ASCII_CR) { -- --pos; -- } -- -- /* Trim any extra trailing spaces or tabs except for the first -- * space or tab at the beginning of a blank string. This makes -- * it much easier to check field values for exact matches, and -- * saves memory as well. -- */ -- while (pos > ((*s) + 1) -- && (*(pos - 1) == APR_ASCII_BLANK || *(pos - 1) == APR_ASCII_TAB)) { -- --pos; -+ /* Now NUL-terminate the string at the end of the line; -+ * if the last-but-one character is a CR, terminate there */ -+ if (last_char > *s && last_char[-1] == APR_ASCII_CR) { -+ last_char--; - } -- -- /* Since we want to remove the LF from the line, we'll go ahead -- * and set this last character to be the term NULL and reset -- * bytes_handled accordingly. -- */ -- *pos = '\0'; -- last_char = pos; -- bytes_handled = pos - *s; -+ *last_char = '\0'; -+ bytes_handled = last_char - *s; - - /* If we're folding, we have more work to do. - * -@@ -750,7 +728,7 @@ - last_len += len; - folded = 1; - } -- else { -+ else /* not a continuation line */ { - - if (r->server->limit_req_fields - && (++fields_read > r->server->limit_req_fields)) { -@@ -773,29 +751,26 @@ - "</pre>\n", NULL)); - return; - } -+ -+ tmp_field = value - 1; /* last character of field-name */ -+ -+ *value++ = '\0'; /* NUL-terminate at colon */ - -- *value = '\0'; -- tmp_field = value; /* used to trim the whitespace between key -- * token and separator -- */ -- ++value; - while (*value == ' ' || *value == '\t') { - ++value; /* Skip to start of value */ - } - -- /* This check is to avoid any invalid memory reference while -- * traversing backwards in the key. To avoid a case where -- * the header starts with ':' (or with just some white -- * space and the ':') followed by the value -- */ -- if (tmp_field > last_field) { -- --tmp_field; -- while ((tmp_field > last_field) && -- (*tmp_field == ' ' || *tmp_field == '\t')) { -- --tmp_field; /* Removing LWS between key and ':' */ -- } -- ++tmp_field; -- *tmp_field = '\0'; -+ /* Strip LWS after field-name: */ -+ while (tmp_field > last_field -+ && (*tmp_field == ' ' || *tmp_field == '\t')) { -+ *tmp_field-- = '\0'; -+ } -+ -+ /* Strip LWS after field-value: */ -+ tmp_field = last_field + last_len - 1; -+ while (tmp_field > value -+ && (*tmp_field == ' ' || *tmp_field == '\t')) { -+ *tmp_field-- = '\0'; - } - - apr_table_addn(r->headers_in, last_field, value); - diff --git a/www/apache20/files/patch-server:main.c b/www/apache20/files/patch-server:main.c deleted file mode 100644 index d297d4425fdb..000000000000 --- a/www/apache20/files/patch-server:main.c +++ /dev/null @@ -1,36 +0,0 @@ ---- server/main.c.orig Thu Jun 13 04:34:56 2002 -+++ server/main.c Sun Jul 21 08:54:09 2002 -@@ -78,6 +78,11 @@ - #include "ap_mpm.h" - #include "mpm_common.h" - -+#ifdef FREEBSD_THREAD_HACK -+#include <unistd.h> -+AP_DECLARE(int) ap_exists_config_define(const char *name); -+#endif -+ - /* WARNING: Win32 binds http_main.c dynamically to the server. Please place - * extern functions and global data in another appropriate module. - * -@@ -558,6 +563,21 @@ - destroy_and_exit_process(process, 1); - } - -+#ifdef FREEBSD_THREAD_HACK -+ { -+ int r; -+ -+ if (! ap_exists_config_define("NO_DETACH")) { -+ if ((r = fork()) > 0) -+ return 0; -+ if (r == -1) { -+ perror("fork"); -+ return 0; -+ } -+ setsid(); -+ } -+ } -+#endif - ap_process_config_tree(server_conf, ap_conftree, process->pconf, ptemp); - ap_fixup_virtual_hosts(pconf, server_conf); - ap_fini_vhost_config(pconf, server_conf); diff --git a/www/apache20/files/patch-srclib:apr-util:config.layout b/www/apache20/files/patch-srclib:apr-util:config.layout deleted file mode 100644 index 222e91d975bc..000000000000 --- a/www/apache20/files/patch-srclib:apr-util:config.layout +++ /dev/null @@ -1,10 +0,0 @@ ---- srclib/apr-util/config.layout.orig Tue Jan 7 13:13:09 2003 -+++ srclib/apr-util/config.layout Tue Apr 1 18:36:16 2003 -@@ -229,3 +229,7 @@ - infodir: ${exec_prefix}/share/info - libsuffix -${APRUTIL_MAJOR_VERSION} - </Layout> -+ -+<Layout FreeBSD> -+ libsuffix: -+</Layout> diff --git a/www/apache20/files/patch-srclib:apr-util:misc:apr_reslist.c b/www/apache20/files/patch-srclib:apr-util:misc:apr_reslist.c deleted file mode 100644 index d6a9fdbf709f..000000000000 --- a/www/apache20/files/patch-srclib:apr-util:misc:apr_reslist.c +++ /dev/null @@ -1,112 +0,0 @@ ---- srclib/apr-util/misc/apr_reslist.c.orig Fri Feb 13 04:52:43 2004 -+++ srclib/apr-util/misc/apr_reslist.c Mon Mar 15 08:21:26 2004 -@@ -49,6 +49,7 @@ - int smax; /* soft maximum on the total number of resources */ - int hmax; /* hard maximum on the total number of resources */ - apr_interval_time_t ttl; /* TTL when we have too many resources */ -+ apr_interval_time_t timeout; /* Timeout for waiting on resource */ - apr_reslist_constructor constructor; - apr_reslist_destructor destructor; - void *params; /* opaque data passed to constructor and destructor calls */ -@@ -118,12 +119,9 @@ - res = apr_pcalloc(reslist->pool, sizeof(*res)); - - rv = reslist->constructor(&res->opaque, reslist->params, reslist->pool); -- if (rv != APR_SUCCESS) { -- return rv; -- } - - *ret_res = res; -- return APR_SUCCESS; -+ return rv; - } - - /** -@@ -132,14 +130,7 @@ - */ - static apr_status_t destroy_resource(apr_reslist_t *reslist, apr_res_t *res) - { -- apr_status_t rv; -- -- rv = reslist->destructor(res->opaque, reslist->params, reslist->pool); -- if (rv != APR_SUCCESS) { -- return rv; -- } -- -- return APR_SUCCESS; -+ return reslist->destructor(res->opaque, reslist->params, reslist->pool); - } - - static apr_status_t reslist_cleanup(void *data_) -@@ -187,6 +178,7 @@ - /* Create the resource */ - rv = create_resource(reslist, &res); - if (rv != APR_SUCCESS) { -+ free_container(reslist, res); - apr_thread_mutex_unlock(reslist->listlock); - return rv; - } -@@ -313,7 +305,15 @@ - * a new one, or something becomes free. */ - else while (reslist->ntotal >= reslist->hmax - && reslist->nidle <= 0) { -- apr_thread_cond_wait(reslist->avail, reslist->listlock); -+ if (reslist->timeout) { -+ if ((rv = apr_thread_cond_timedwait(reslist->avail, -+ reslist->listlock, reslist->timeout)) != APR_SUCCESS) { -+ apr_thread_mutex_unlock(reslist->listlock); -+ return rv; -+ } -+ } -+ else -+ apr_thread_cond_wait(reslist->avail, reslist->listlock); - } - /* If we popped out of the loop, first try to see if there - * are new resources available for immediate use. */ -@@ -329,17 +329,13 @@ - * a resource to fill the slot and use it. */ - else { - rv = create_resource(reslist, &res); -- -- if (rv != APR_SUCCESS) { -- apr_thread_mutex_unlock(reslist->listlock); -- return rv; -+ if (rv == APR_SUCCESS) { -+ reslist->ntotal++; -+ *resource = res->opaque; - } -- -- reslist->ntotal++; -- *resource = res->opaque; - free_container(reslist, res); - apr_thread_mutex_unlock(reslist->listlock); -- return APR_SUCCESS; -+ return rv; - } - } - -@@ -356,6 +352,23 @@ - apr_thread_mutex_unlock(reslist->listlock); - - return reslist_maint(reslist); -+} -+ -+APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist, -+ apr_interval_time_t timeout) -+{ -+ reslist->timeout = timeout; -+} -+ -+APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist, -+ void *resource) -+{ -+ apr_status_t ret; -+ apr_thread_mutex_lock(reslist->listlock); -+ ret = reslist->destructor(resource, reslist->params, reslist->pool); -+ reslist->ntotal--; -+ apr_thread_mutex_unlock(reslist->listlock); -+ return ret; - } - - #endif /* APR_HAS_THREADS */ - diff --git a/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh b/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh deleted file mode 100644 index 0bbcfa783555..000000000000 --- a/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh +++ /dev/null @@ -1,18 +0,0 @@ ---- srclib/apr-util/xml/expat/buildconf.sh Tue Jun 17 20:51:47 2003 -+++ srclib/apr-util/xml/expat/buildconf.sh Tue Mar 9 07:52:57 2004 -@@ -3,13 +3,13 @@ - # - # Build aclocal.m4 from libtool's libtool.m4 - # --libtoolize=`conftools/PrintPath glibtoolize libtoolize` -+libtoolize=${LIBTOOLIZE} - if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 - fi - ltpath=`dirname $libtoolize` --ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool${LIBTOOL_VERSION}.m4} - echo "Incorporating $ltfile into aclocal.m4 ..." - echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4 - echo "dnl edits here will be lost" >> aclocal.m4 diff --git a/www/apache20/files/patch-srclib:apr-utils:build:dbm.m4 b/www/apache20/files/patch-srclib:apr-utils:build:dbm.m4 deleted file mode 100644 index e13c41e28eeb..000000000000 --- a/www/apache20/files/patch-srclib:apr-utils:build:dbm.m4 +++ /dev/null @@ -1,55 +0,0 @@ ---- srclib/apr-util/build/dbm.m4.orig Sat Mar 20 06:52:01 2004 -+++ srclib/apr-util/build/dbm.m4 Sat Mar 20 06:54:51 2004 -@@ -298,8 +298,8 @@ - fi - APU_CHECK_BERKELEY_DB(1, -1, -1, - "$places", -- "db_185.h", -- "db" -+ "db.h", -+ "c" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=185 -@@ -341,7 +341,7 @@ - APU_CHECK_BERKELEY_DB(3, -1, -1, - "$places", - "db3/db.h db.h", -- "db3 db" -+ "db3" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=3 -@@ -361,8 +361,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "0", "-1", - "$places", -- "db4/db.h db.h", -- "db-4.0 db4 db" -+ "db4/db.h", -+ "db4" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -382,8 +382,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "1", "-1", - "$places", -- "db41/db.h db4/db.h db.h", -- "db-4.1 db4 db" -+ "db41/db.h", -+ "db41" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -403,8 +403,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "2", "-1", - "$places", -- "db42/db.h db4/db.h db.h", -- "db-4.2 db4 db" -+ "db42/db.h", -+ "db-4.2" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 diff --git a/www/apache20/files/patch-srclib:apr:build:buildcheck.sh b/www/apache20/files/patch-srclib:apr:build:buildcheck.sh deleted file mode 100644 index a65902a7731d..000000000000 --- a/www/apache20/files/patch-srclib:apr:build:buildcheck.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- srclib/apr/build/buildcheck.sh Sun Jan 25 16:41:56 2004 -+++ srclib/apr/build/buildcheck.sh Tue Mar 9 07:49:42 2004 -@@ -26,7 +26,7 @@ - # output is multiline from 1.5 onwards - - # Require libtool 1.3.3 or newer --libtool=`build/PrintPath glibtool libtool` -+libtool=${LIBTOOL} - lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` - if test -z "$lt_pversion"; then - echo "buildconf: libtool not found." diff --git a/www/apache20/files/patch-srclib:apr:buildconf b/www/apache20/files/patch-srclib:apr:buildconf deleted file mode 100644 index 484f86afa37b..000000000000 --- a/www/apache20/files/patch-srclib:apr:buildconf +++ /dev/null @@ -1,28 +0,0 @@ ---- srclib/apr/buildconf Tue Jun 17 20:44:25 2003 -+++ srclib/apr/buildconf Tue Mar 9 07:53:27 2004 -@@ -60,7 +60,7 @@ - # - build/buildcheck.sh || exit 1 - --libtoolize=`build/PrintPath glibtoolize libtoolize` -+libtoolize=${LIBTOOLIZE} - if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -@@ -81,14 +81,14 @@ - $libtoolize --copy --automake - - ltpath=`dirname $libtoolize` --ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4} - - if [ ! -f $ltfile ]; then - echo "$ltfile not found" - exit 1 - fi - --echo "buildconf: Using libtool.m4 at ${ltfile}." -+echo "buildconf: Using ${LIBTOOL_VERSION}.m4 at ${ltfile}." - - cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 - diff --git a/www/apache20/files/patch-srclib:apr:config.layout b/www/apache20/files/patch-srclib:apr:config.layout deleted file mode 100644 index 5c52779635fc..000000000000 --- a/www/apache20/files/patch-srclib:apr:config.layout +++ /dev/null @@ -1,10 +0,0 @@ ---- srclib/apr/config.layout.orig Tue Jan 7 13:06:50 2003 -+++ srclib/apr/config.layout Tue Apr 1 18:36:51 2003 -@@ -229,3 +229,7 @@ - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - </Layout> -+ -+<Layout FreeBSD> -+ libsuffix: -+</Layout> diff --git a/www/apache20/files/patch-srclib:apr:threadproc:unix:procsup.c b/www/apache20/files/patch-srclib:apr:threadproc:unix:procsup.c deleted file mode 100644 index 13c663af7bd4..000000000000 --- a/www/apache20/files/patch-srclib:apr:threadproc:unix:procsup.c +++ /dev/null @@ -1,18 +0,0 @@ ---- srclib/apr/threadproc/unix/procsup.c.orig Mon Apr 8 22:08:18 2002 -+++ srclib/apr/threadproc/unix/procsup.c Sun Jul 21 08:45:44 2002 -@@ -59,6 +59,7 @@ - int x; - - chdir("/"); -+#ifndef FREEBSD_THREAD_HACK - #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS) - /* Don't detach for MPE because child processes can't survive the death of - * the parent. */ -@@ -89,6 +90,7 @@ - if (setpgid(0, 0) == -1) { - return errno; - } -+#endif - #endif - - /* close out the standard file descriptors */ diff --git a/www/apache20/files/patch-support:Makefile.in b/www/apache20/files/patch-support:Makefile.in deleted file mode 100644 index 66b6420974ec..000000000000 --- a/www/apache20/files/patch-support:Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- support/Makefile.in.orig Fri Dec 17 17:03:38 2004 -+++ support/Makefile.in Fri Dec 17 17:01:44 2004 -@@ -23,10 +23,7 @@ - fi ; \ - done - @if test -f "$(builddir)/envvars-std"; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir); \ -- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ -- fi ; \ -+ cp -p envvars-std $(DESTDIR)$(sbindir)/envvars; \ - fi - - htpasswd_OBJECTS = htpasswd.lo diff --git a/www/apache20/files/patch-support:apachectl.in b/www/apache20/files/patch-support:apachectl.in deleted file mode 100644 index 7c5c3238e955..000000000000 --- a/www/apache20/files/patch-support:apachectl.in +++ /dev/null @@ -1,11 +0,0 @@ ---- support/apachectl.in.orig Thu Sep 16 09:28:54 2004 -+++ support/apachectl.in Thu Sep 16 09:29:14 2004 -@@ -63,7 +63,7 @@ - ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@" - # -------------------- -------------------- - # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| -- -+eval `limits -e -C daemon` >/dev/null 2>&1 - # Set the maximum number of file descriptors allowed per child process. - if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then - $ULIMIT_MAX_FILES diff --git a/www/apache20/files/patch-support:apxs.in b/www/apache20/files/patch-support:apxs.in deleted file mode 100644 index db8081fa4fc5..000000000000 --- a/www/apache20/files/patch-support:apxs.in +++ /dev/null @@ -1,12 +0,0 @@ ---- support/apxs.in.orig Mon Nov 29 10:24:23 2004 -+++ support/apxs.in Mon Nov 29 10:25:05 2004 -@@ -629,8 +629,7 @@ - if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) { - print FP $content; - close(FP); -- system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " . -- "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . -+ system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . - "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new"); - } else { - notice("unable to open configuration file"); diff --git a/www/apache20/files/patch-support:envvars-std.in b/www/apache20/files/patch-support:envvars-std.in deleted file mode 100644 index 26a094f31394..000000000000 --- a/www/apache20/files/patch-support:envvars-std.in +++ /dev/null @@ -1,13 +0,0 @@ ---- support/envvars-std.in.orig Fri Dec 17 14:39:21 2004 -+++ support/envvars-std.in Fri Dec 17 14:41:06 2004 -@@ -21,3 +21,10 @@ - export @SHLIBPATH_VAR@ - # - @OS_SPECIFIC_VARS@ -+ -+ENVVARS_DIR=%%PREFIX%%/etc/apache2/envvars.d -+ -+for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null) -+do -+ . ${envvars_file} -+done diff --git a/www/apache20/files/patch-support:log_server_status.in b/www/apache20/files/patch-support:log_server_status.in deleted file mode 100644 index 136bafb9ff1a..000000000000 --- a/www/apache20/files/patch-support:log_server_status.in +++ /dev/null @@ -1,20 +0,0 @@ ---- support/log_server_status.in.orig Tue Jun 18 23:21:53 2002 -+++ support/log_server_status.in Tue Jun 18 23:23:08 2002 -@@ -63,7 +63,7 @@ - # - require 'sys/socket.ph'; - --$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" -+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log" - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server - $request = "/status/?auto"; # Request to send -@@ -96,7 +96,7 @@ - chomp($date); - ($day,$time)=split(/:/,$date); - $res=&tcp_connect($server,$port); -- open(OUT,">>$wherelog$day"); -+ open(OUT,">>$wherelog$day.log"); - if ($res) { - print OUT "$time:-1:-1:-1:-1:$res\n"; - exit 1; |