diff options
Diffstat (limited to 'www/apache13-modssl/files')
20 files changed, 0 insertions, 882 deletions
diff --git a/www/apache13-modssl/files/CVE-2010-0010.patch b/www/apache13-modssl/files/CVE-2010-0010.patch deleted file mode 100644 index c9ea4382bcb2..000000000000 --- a/www/apache13-modssl/files/CVE-2010-0010.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN apache_1.3.41/src/main/buff.c src/main/buff.c ---- apache_1.3.41/src/main/buff.c 2006-07-12 10:16:05.000000000 +0200 -+++ src/main/buff.c 2010-01-07 11:28:00.000000000 +0100 -@@ -737,7 +737,7 @@ - { - int i, nrd; - -- if (fb->flags & B_RDERR) -+ if (fb->flags & B_RDERR || nbyte < 0) - return -1; - if (nbyte == 0) - return 0; -@@ -1258,7 +1258,7 @@ - static int csize = 0; - #endif /*CHARSET_EBCDIC*/ - -- if (fb->flags & (B_WRERR | B_EOUT)) -+ if (fb->flags & (B_WRERR | B_EOUT) || nbyte < 0) - return -1; - if (nbyte == 0) - return 0; -diff -urN apache_1.3.41/src/modules/proxy/proxy_util.c src/modules/proxy/proxy_util.c ---- apache_1.3.41/src/modules/proxy/proxy_util.c 2007-10-30 20:17:03.000000000 +0100 -+++ src/modules/proxy/proxy_util.c 2010-01-07 11:28:00.000000000 +0100 -@@ -507,7 +507,7 @@ - - /* read the chunk */ - if (remaining > 0) { -- n = ap_bread(f, buf, MIN((int)buf_size, (int)remaining)); -+ n = ap_bread(f, buf, (int) MIN(buf_size, remaining)); - if (n > -1) { - remaining -= n; - end_of_chunk = (remaining == 0); diff --git a/www/apache13-modssl/files/apache.in b/www/apache13-modssl/files/apache.in deleted file mode 100644 index d971e1d8c573..000000000000 --- a/www/apache13-modssl/files/apache.in +++ /dev/null @@ -1,189 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: apache -# REQUIRE: LOGIN cleanvar -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable apache: -# apache_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable apache -# apache_profiles (str): Set to "" by default. -# Define your profiles here. -# apachelimits_enable (bool):Set to "NO" by default. -# Set it to yes to run `limits $limits_args` -# just before apache starts. -# apache_flags (str): Set to "-DSSL" by default. -# Extra flags passed to start command. -# apachelimits_args (str): Default to "-e -C daemon" -# Arguments of pre-start limits run. -# apache_http_accept_enable (bool): Set to "NO" by default. -# Set to yes to check for accf_http kernel -# module on start up and load if not loaded. -# apache_fib (str): Set an altered default network view for apache - -. /etc/rc.subr - -name="apache" -rcvar=`set_rcvar` - -start_precmd="apache_prestart" -restart_precmd="apache_checkconfig" -reload_precmd="apache_checkconfig" -reload_cmd="apache_graceful" -graceful_cmd="apache_graceful" -configtest_cmd="apache_checkconfig" -command="%%PREFIX%%/sbin/httpd" -_pidprefix="/var/run/httpd" -pidfile="${_pidprefix}.pid" -required_files=%%PREFIX%%/etc/apache/httpd.conf - -[ -z "$apache_enable" ] && apache_enable="NO" -[ -z "$apache_flags" ] && apache_flags="-DSSL" -[ -z "$apachelimits_enable" ] && apachelimits_enable="NO" -[ -z "$apachelimits_args" ] && apachelimits_args="-e -C daemon" -[ -z "$apache_http_accept_enable" ] && apache_http_accept_enable="NO" -[ -z "$apache_fib" ] && apache_fib="NO" - -apache_accf() { - retcode=0 - if checkyesno apache_http_accept_enable - then - /sbin/kldstat -v | grep accf_http >/dev/null 2>&1 - retcode=${?} - if [ ${retcode} -ne 0 ] - then - /sbin/kldload accf_http 2> /dev/null - retcode=${?} - fi - else - apache_flags="${apache_flags} -DNOHTTPACCEPT" - fi - [ ${retcode} -ne 0 ] && echo "Unable to load accf_http module" - return ${retcode} -} - -load_rc_config $name - -if [ -n "$2" ]; then - profile="$2" - if [ "x${apache_profiles}" != "x" ]; then - pidfile="${_pidprefix}.${profile}.pid" - eval apache_configfile="\${apache_${profile}_configfile:-}" - if [ "x${apache_configfile}" = "x" ]; then - echo "You must define a configuration file (apache_${profile}_configfile)" - exit 1 - fi - required_files="${apache_configfile}" - eval apache_enable="\${apache_${profile}_enable:-${apache_enable}}" - eval apache_flags="\${apache_${profile}_flags:-${apache_flags}}" - eval apache_http_accept_enable="\${apache_${profile}_http_accept_enable:-${apache_http_accept_enable}}" - eval apachelimits_enable="\${apachelimits_${profile}_enable:-${apachelimits_enable}}" - eval apachelimits_args="\${apachelimits_${profile}_args:-${apachelimits_args}}" - eval apache_fib="\${apache_${profile}_fib:-${apache_fib}}" - apache_flags="-f ${apache_configfile} -c \"PidFile ${pidfile}\" ${apache_flags}" - else - echo "$0: extra argument ignored" - fi -else - if [ "x${apache_profiles}" != "x" -a "x$1" != "x" ]; then - for profile in ${apache_profiles}; do - eval _enable="\${apache_${profile}_enable}" - case "x${_enable:-${apache_enable}}" in - x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) - continue - ;; - x[Yy][Ee][Ss]) - ;; - *) - if test -z "$_enable"; then - _var=apache_enable - else - _var=apache_"${profile}"_enable - fi - echo "Bad value" \ - "'${_enable:-${apache_enable}}'" \ - "for ${_var}. " \ - "Profile ${profile} skipped." - continue - ;; - esac - echo "===> apache profile: ${profile}" - %%PREFIX%%/etc/rc.d/apache $1 ${profile} - retcode="$?" - if [ "0${retcode}" -ne 0 ]; then - failed="${profile} (${retcode}) ${failed:-}" - else - success="${profile} ${success:-}" - fi - done - exit 0 - fi -fi - -if [ "${1}" != "stop" ] ; then \ - apache_accf || apache_flags="${apache_flags} -DNOHTTPACCEPT" -fi - -apache_requirepidfile() -{ - if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then - echo "${name} not running? (check $pidfile)." - exit 1 - fi -} - -apache_checkconfig() -{ - if test -f %%PREFIX%%/sbin/envvars - then - . %%PREFIX%%/sbin/envvars - fi - - echo "Performing sanity check on apache configuration:" - eval ${command} ${apache_flags} -t -} - -apache_graceful() { - apache_requirepidfile - - echo "Performing a graceful restart" - kill -USR1 "`check_pidfile ${pidfile} ${command}`" -} - -apache_precmd() -{ - apache_checkconfig - - if checkyesno apachelimits_enable - then - eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null - else - return 0 - fi - -} - -apache_checkfib () { - sysctl net.fibs >/dev/null 2>&1 - ret=$? - [ $ret -gt 0 ] && return 0 - if [ "x$apache_fib" != "xNO" ] - then - command="setfib -F ${apache_fib} ${command}" - else - return 0 - fi -} - -apache_prestart() { - apache_checkfib - apache_precmd -} - -extra_commands="reload graceful configtest" -run_rc_command "$1" -# eof diff --git a/www/apache13-modssl/files/logresolve.c.patch b/www/apache13-modssl/files/logresolve.c.patch deleted file mode 100644 index 04aaf2e5526e..000000000000 --- a/www/apache13-modssl/files/logresolve.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN apache_1.3.41/src/support/logresolve.c src/support/logresolve.c ---- apache_1.3.41/src/support/logresolve.c 2006-07-12 10:16:05.000000000 +0200 -+++ src/support/logresolve.c 2008-10-06 16:29:12.000000000 +0200 -@@ -165,7 +165,7 @@ - - hostdata = gethostbyaddr((const char *) &ipnum, sizeof(struct in_addr), - AF_INET); -- if (hostdata == NULL) { -+ if (hostdata == NULL || !hostdata->h_name || !*hostdata->h_name) { - if (h_errno > MAX_ERR) - errors[UNKNOWN_ERR]++; - else diff --git a/www/apache13-modssl/files/mod_accel-Makefile.tmpl.patch b/www/apache13-modssl/files/mod_accel-Makefile.tmpl.patch deleted file mode 100644 index c2d12cdac291..000000000000 --- a/www/apache13-modssl/files/mod_accel-Makefile.tmpl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/modules/accel/Makefile.tmpl.orig Wed Jul 27 23:56:21 2005 -+++ src/modules/accel/Makefile.tmpl Wed Jul 27 23:56:28 2005 -@@ -9,7 +9,7 @@ - - OBJS_PIC=\ - mod_accel.lo accel_cachemgr.lo \ -- accel_backend.o accel_cache.lo accel_gc.lo \ -+ accel_backend.lo accel_cache.lo accel_gc.lo \ - accel_lock.lo accel_http.lo accel_connect.lo accel_util.lo \ - ap_other_child.lo ap_ext_accel.lo - diff --git a/www/apache13-modssl/files/mod_accel-ap_ext_accel.patch b/www/apache13-modssl/files/mod_accel-ap_ext_accel.patch deleted file mode 100644 index 43932fc162aa..000000000000 --- a/www/apache13-modssl/files/mod_accel-ap_ext_accel.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- src/modules/accel/ap_ext_accel.h~ 2009-10-05 22:57:34.000000000 +0400 -+++ src/modules/accel/ap_ext_accel.h 2009-10-05 22:58:10.000000000 +0400 -@@ -8,10 +8,10 @@ - - - API_EXPORT_NONSTD(const char *) ap_set_integer_slot(cmd_parms *cmd, -- char *struct_ptr, int arg); -+ char *struct_ptr, const char * arg); - - API_EXPORT_NONSTD(const char *) ap_set_kilobytes_slot(cmd_parms *cmd, -- char *struct_ptr, int arg); -+ char *struct_ptr, const char * arg); - - #ifdef NO_SETPROCTITLE - #define ap_setproctitle(title) ---- src/modules/accel/ap_ext_accel.c~ 2009-10-05 22:57:33.000000000 +0400 -+++ src/modules/accel/ap_ext_accel.c 2009-10-05 22:58:32.000000000 +0400 -@@ -5,7 +5,7 @@ - #include "ap_ext_accel.h" - - API_EXPORT_NONSTD(const char *) ap_set_integer_slot(cmd_parms *cmd, -- char *struct_ptr, int arg) -+ char *struct_ptr, const char* arg) - { - int offset = (int) (long) cmd->info; - int size = atoi((char *)arg); -@@ -19,7 +19,7 @@ - } - - API_EXPORT_NONSTD(const char *) ap_set_kilobytes_slot(cmd_parms *cmd, -- char *struct_ptr, int arg) -+ char *struct_ptr, const char* arg) - { - int offset = (int) (long) cmd->info; - int size = atoi(arg); - diff --git a/www/apache13-modssl/files/mod_accel-preservehost.patch b/www/apache13-modssl/files/mod_accel-preservehost.patch deleted file mode 100644 index 95298b6c5aa3..000000000000 --- a/www/apache13-modssl/files/mod_accel-preservehost.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- src/modules/accel/mod_accel.c.orig Mon Mar 22 12:25:54 2004 -+++ src/modules/accel/mod_accel.c Mon Mar 22 12:26:30 2004 -@@ -282,6 +282,17 @@ - a->pass->max_wait = a->pass->max_conn; - - a->pass->sum = accel_sum(a->pass->sum_part, a->url, tag); -+ -+ if (max = ap_table_get(r->notes, "rewrite_ph")) { -+ char *prefix, *port; -+ if (!(prefix = strstr(a->url, "://"))) -+ return "Invalid URL prefix"; -+ -+ prefix += 3; -+ -+ a->pass->port = (port = strchr(prefix, ':')) ? atoi(port + 1) : 80; -+ a->pass->preserve_host = 1; -+ } - #endif - } - ---- src/modules/standard/mod_rewrite.c.orig Mon Mar 22 12:25:54 2004 -+++ src/modules/standard/mod_rewrite.c Mon Mar 22 12:26:01 2004 -@@ -947,6 +947,10 @@ - || strcasecmp(key, "MP") == 0 ) { - cfg->max_part = ap_pstrdup(p, val); - } -+ else if ( strcasecmp(key, "preservehost") == 0 -+ || strcasecmp(key, "PH") == 0 ) { -+ cfg->preserve_host = 1; -+ } - #endif - else if ( strcasecmp(key, "passthrough") == 0 - || strcasecmp(key, "PT") == 0 ) { -@@ -2128,6 +2132,9 @@ - ap_psprintf(r->pool, "%d", p->max_wait)); - if (p->max_part) - ap_table_set(r->notes, "rewrite_mp", p->max_part); -+ if (p->preserve_host) -+ ap_table_set(r->notes, "rewrite_ph", -+ ap_psprintf(r->pool, "%d", p->preserve_host)); - #endif - return 1; - } - ---- src/modules/standard/mod_rewrite.h.orig Mon Mar 22 12:25:54 2004 -+++ src/modules/standard/mod_rewrite.h Mon Mar 22 12:26:01 2004 -@@ -298,6 +298,7 @@ - int max_conn; - int max_wait; - char *max_part; -+ unsigned preserve_host:1; - #endif - } rewriterule_entry; - diff --git a/www/apache13-modssl/files/patch-42 b/www/apache13-modssl/files/patch-42 deleted file mode 100644 index 534bb0cc4e69..000000000000 --- a/www/apache13-modssl/files/patch-42 +++ /dev/null @@ -1,137 +0,0 @@ -diff -ur apache_1.3.41/src/CHANGES src/CHANGES ---- apache_1.3.41/src/CHANGES 2008-01-09 15:33:07.000000000 +0100 -+++ src/CHANGES 2010-01-07 11:28:00.000000000 +0100 -@@ -1,3 +1,33 @@ -+Changes with Apache 1.3.42 -+ -+ *) SECURITY: CVE-2010-0010 (cve.mitre.org) -+ mod_proxy: Prevent chunk-size integer overflow on platforms -+ where sizeof(int) < sizeof(long). Reported by Adam Zabrocki. -+ [Colm MacCárthaigh] -+ -+ *) IMPORTANT: This is the final release of Apache httpd 1.3. -+ Apache httpd 1.3 has reached end of life, as of January 2010. -+ No further releases of this software will be made, although critical -+ security updates may be made available as patches from the following -+ website: -+ -+ http://www.apache.org/dist/httpd/patches/ -+ -+ Apache 1.3.x users who wish to avail of security releases, -+ bug-fixes and community support are advised to use Apache 2.2 -+ or higher. -+ -+ Information on upgrading is available from the following website: -+ -+ http://httpd.apache.org/docs/2.2/upgrading.html -+ -+ Thank you to everyone who helped make Apache 1.3.x the most -+ successful, and most used, webserver software on the planet! -+ [Apache httpd group] -+ -+ *) Protect logresolve from mismanaged DNS records that return -+ blank/null hostnames. [Jim Jagielski] -+ - Changes with Apache 1.3.41 - - *) SECURITY: CVE-2007-6388 (cve.mitre.org) -@@ -233,7 +263,7 @@ - - *) Some syntax errors in mod_mime_magic's magic file can result - in a 500 error, which previously was unlogged. Now we log the -- error. [Jeff Trawick] -+ error. PR 8329. [Jeff Trawick] - - *) Linux 2.4+: If Apache is started as root and you code - CoreDumpDirectory, coredumps are enabled via the prctl() syscall. -diff -ur apache_1.3.41/src/Configure src/Configure ---- apache_1.3.41/src/Configure 2008-01-04 15:40:05.000000000 +0100 -+++ src/Configure 2008-01-10 17:22:19.000000000 +0100 -@@ -1936,7 +1936,7 @@ - # select the special subtarget for shared core generation - SUBTARGET=target_shared - # determine additional suffixes for libhttpd.so -- V=1 R=3 P=41 -+ V=1 R=3 P=42 - if [ "x$SHLIB_SUFFIX_DEPTH" = "x0" ]; then - SHLIB_SUFFIX_LIST="" - fi -diff -ur apache_1.3.41/src/ap/ap_snprintf.c src/ap/ap_snprintf.c ---- apache_1.3.41/src/ap/ap_snprintf.c 2006-07-12 10:16:05.000000000 +0200 -+++ src/ap/ap_snprintf.c 2008-05-02 19:31:15.000000000 +0200 -@@ -77,8 +77,8 @@ - #define NUM_BUF_SIZE 512 - - /* -- * cvt.c - IEEE floating point formatting routines for FreeBSD -- * from GNU libc-4.6.27. Modified to be thread safe. -+ * cvt - IEEE floating point formatting routines. -+ * Derived from UNIX V7, Copyright(C) Caldera International Inc. - */ - - /* -diff -ur apache_1.3.41/src/include/httpd.h src/include/httpd.h ---- apache_1.3.41/src/include/httpd.h 2008-01-10 17:20:45.000000000 +0100 -+++ src/include/httpd.h 2010-01-08 12:42:57.000000000 +0100 -@@ -389,7 +389,7 @@ - - #define SERVER_BASEVENDOR "Apache Group" - #define SERVER_BASEPRODUCT "Apache" --#define SERVER_BASEREVISION "1.3.41" -+#define SERVER_BASEREVISION "1.3.42" - #define SERVER_BASEVERSION SERVER_BASEPRODUCT "/" SERVER_BASEREVISION - - #define SERVER_PRODUCT SERVER_BASEPRODUCT -@@ -410,7 +410,7 @@ - * Always increases along the same track as the source branch. - * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '20500007'. - */ --#define APACHE_RELEASE 10341100 -+#define APACHE_RELEASE 10342100 - - #define SERVER_PROTOCOL "HTTP/1.1" - #ifndef SERVER_SUPPORT -diff -ur apache_1.3.41/src/main/buff.c src/main/buff.c ---- apache_1.3.41/src/main/buff.c 2006-07-12 10:16:05.000000000 +0200 -+++ src/main/buff.c 2010-01-07 11:28:00.000000000 +0100 -@@ -737,7 +737,7 @@ - { - int i, nrd; - -- if (fb->flags & B_RDERR) -+ if (fb->flags & B_RDERR || nbyte < 0) - return -1; - if (nbyte == 0) - return 0; -@@ -1258,7 +1258,7 @@ - static int csize = 0; - #endif /*CHARSET_EBCDIC*/ - -- if (fb->flags & (B_WRERR | B_EOUT)) -+ if (fb->flags & (B_WRERR | B_EOUT) || nbyte < 0) - return -1; - if (nbyte == 0) - return 0; -diff -ur apache_1.3.41/src/modules/proxy/proxy_util.c src/modules/proxy/proxy_util.c ---- apache_1.3.41/src/modules/proxy/proxy_util.c 2007-10-30 20:17:03.000000000 +0100 -+++ src/modules/proxy/proxy_util.c 2010-01-07 11:28:00.000000000 +0100 -@@ -507,7 +507,7 @@ - - /* read the chunk */ - if (remaining > 0) { -- n = ap_bread(f, buf, MIN((int)buf_size, (int)remaining)); -+ n = ap_bread(f, buf, (int) MIN(buf_size, remaining)); - if (n > -1) { - remaining -= n; - end_of_chunk = (remaining == 0); -@@ -548,8 +548,8 @@ - n = ap_bread(f, buf, buf_size); - } - else { -- n = ap_bread(f, buf, MIN((int)buf_size, -- (int)(len - total_bytes_rcvd))); -+ n = ap_bread(f, buf, (int) MIN(buf_size, -+ (len - total_bytes_rcvd))); - } - } - diff --git a/www/apache13-modssl/files/patch-Configure b/www/apache13-modssl/files/patch-Configure deleted file mode 100644 index 3fb094b110ac..000000000000 --- a/www/apache13-modssl/files/patch-Configure +++ /dev/null @@ -1,31 +0,0 @@ ---- src/Configure.orig Sun Sep 16 21:36:49 2007 -+++ src/Configure Sun Sep 16 21:36:51 2007 -@@ -457,7 +457,7 @@ - PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'` - OS="FreeBSD $PLATOSVERS" - case "$PLATOSVERS" in -- [23456]*) -+ [2-9]*) - DEF_WANTHSREGEX=no - CFLAGS="$CFLAGS -funsigned-char" - ;; -@@ -968,8 +968,8 @@ - - for uppercase in "tr [a-z] [A-Z]" "tr [:lower:] [:upper:]" "sed y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/" - do -- case `echo Apache | $uppercase` in -- APACHE) break;; -+ case `echo abcdefghijklmnopqrstuvwxyz | $uppercase` in -+ ABCDEFGHIJKLMNOPQRSTUVWXYZ) break;; - esac - done - echo " + using \"$uppercase\" to uppercase" -@@ -1080,7 +1080,7 @@ - ;; - *-freebsd[3-9]*) - LD_SHLIB="gcc" -- CFLAGS_SHLIB="-fpic" -+ CFLAGS_SHLIB="-fPIC" - LDFLAGS_SHLIB="-shared" - LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB - OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` diff --git a/www/apache13-modssl/files/patch-aa b/www/apache13-modssl/files/patch-aa deleted file mode 100644 index 78be57c08eed..000000000000 --- a/www/apache13-modssl/files/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Tue May 21 16:24:59 2002 -+++ configure Wed Jun 19 05:27:31 2002 -@@ -1251,7 +1251,7 @@ - echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" - echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" - echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" -- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" -+ echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log" - echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" - echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf" - echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1349,7 +1349,7 @@ - echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci - echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci - echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci --echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci -+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci - echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci - echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci diff --git a/www/apache13-modssl/files/patch-ab b/www/apache13-modssl/files/patch-ab deleted file mode 100644 index 1fcc20ce0610..000000000000 --- a/www/apache13-modssl/files/patch-ab +++ /dev/null @@ -1,99 +0,0 @@ ---- Makefile.tmpl.orig Sat Jun 22 12:55:54 2002 -+++ Makefile.tmpl Sat Jun 22 12:59:10 2002 -@@ -329,10 +329,10 @@ - $(MKDIR) $(root)$(sysconfdir)/ssl.csr - $(MKDIR) $(root)$(sysconfdir)/ssl.key - $(MKDIR) $(root)$(sysconfdir)/ssl.prm -- $(MKDIR) $(root)$(htdocsdir) -+ $(MKDIR) $(root)$(htdocsdir)-dist - $(MKDIR) $(root)$(manualdir) - $(MKDIR) $(root)$(iconsdir) -- $(MKDIR) $(root)$(cgidir) -+ $(MKDIR) $(root)$(cgidir)-dist - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(includedir)/xml - $(MKDIR) $(root)$(runtimedir) -@@ -533,33 +533,29 @@ - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -- else \ -- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)-dist/"; \ - (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\ -- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ -- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ -- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \ -- fi -- -@if [ -d $(TOP)/htdocs/manual ]; then \ -+ (cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \ -+ find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \ -+ find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ; - echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ - (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ - find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ -- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ -+ find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; -+ if [ ! -d $(root)$(htdocsdir)/ ]; then \ -+ $(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \ - fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ -- else \ - for script in printenv test-cgi; do \ - cat $(TOP)/cgi-bin/$${script} |\ - sed -e 's;^#!/.*perl;#!$(PERL);' \ - > $(TOP)/$(SRC)/.apaci.install.tmp; \ -- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ -- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ -- done; \ -- fi -+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)-dist/$${script}"; \ -+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)-dist/$${script}; \ -+ done; -+ if [ ! -d $(root)$(cgidir)/ ]; then \ -+ $(LN) -sf $(root)$(cgidir)-dist $(root)$(cgidir); \ -+ fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ - (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -607,10 +603,10 @@ - -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ - -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ - -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ -- -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \ -- -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ -- -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ -- -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ -+ -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ -+ -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ -+ -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ -+ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ - -e 's;User nobody;User $(conf_user);' \ -@@ -623,8 +619,8 @@ - -e 's;ServerName new.host.name;ServerName $(conf_servername);' \ - -e 's;VirtualHost _default_:443;VirtualHost _default_:$(conf_port_ssl);' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ -- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \ -- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \ -+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}-dist"; \ -+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}-dist; \ - if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \ -@@ -633,8 +629,8 @@ - fi; \ - done - -@for conf in mime.types magic; do \ -- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \ -- $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \ -+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist"; \ -+ $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist; \ - if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \ - $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \ diff --git a/www/apache13-modssl/files/patch-ac b/www/apache13-modssl/files/patch-ac deleted file mode 100644 index 77973a5fa8e4..000000000000 --- a/www/apache13-modssl/files/patch-ac +++ /dev/null @@ -1,55 +0,0 @@ ---- conf/httpd.conf-dist.orig Thu Feb 7 23:50:37 2002 -+++ conf/httpd.conf-dist Thu Feb 7 23:50:38 2002 -@@ -92,8 +92,8 @@ - # server ignore these files altogether by using "/dev/null" (for Unix) or - # "nul" (for Win32) for the arguments to the directives. - # --#ResourceConfig conf/srm.conf --#AccessConfig conf/access.conf -+ResourceConfig /dev/null -+AccessConfig /dev/null - - # - # Timeout: The number of seconds before receives and sends time out. -@@ -367,7 +367,22 @@ - # directory index. Separate multiple entries with spaces. - # - <IfModule mod_dir.c> -- DirectoryIndex index.html -+ <IfModule mod_php3.c> -+ <IfModule mod_php4.c> -+ DirectoryIndex index.php index.php3 index.html -+ </IfModule> -+ <IfModule !mod_php4.c> -+ DirectoryIndex index.php3 index.html -+ </IfModule> -+ </IfModule> -+ <IfModule !mod_php3.c> -+ <IfModule mod_php4.c> -+ DirectoryIndex index.php index.html -+ </IfModule> -+ <IfModule !mod_php4.c> -+ DirectoryIndex index.html -+ </IfModule> -+ </IfModule> - </IfModule> - - # -@@ -487,7 +502,7 @@ - # define per-<VirtualHost> access logfiles, transactions will be - # logged therein and *not* in this file. - # --CustomLog logs/access_log common -+#CustomLog logs/access_log common - - # - # If you would like to have agent and referer logfiles, uncomment the -@@ -500,7 +515,7 @@ - # If you prefer a single logfile with access, agent, and referer information - # (Combined Logfile Format) you can use the following directive. - # --#CustomLog logs/access_log combined -+CustomLog logs/access_log combined - - # - # Optionally add a line containing the server version and virtual host diff --git a/www/apache13-modssl/files/patch-ad b/www/apache13-modssl/files/patch-ad deleted file mode 100644 index 5deadd438d9a..000000000000 --- a/www/apache13-modssl/files/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ ---- src/support/apachectl.orig Wed Mar 24 10:11:39 1999 -+++ src/support/apachectl Wed Mar 24 10:19:09 1999 -@@ -39,6 +39,8 @@ - # -------------------- -------------------- - # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| - -+eval `limits -e -C daemon` >/dev/null 2>&1 -+ - ERROR=0 - ARGV="$@" - if [ "x$ARGV" = "x" ] ; then -@@ -94,6 +96,7 @@ - fi - if kill $PID ; then - echo "$0 $ARG: httpd stopped" -+ rm -f $PIDFILE - else - echo "$0 $ARG: httpd could not be stopped" - ERROR=4 diff --git a/www/apache13-modssl/files/patch-ae b/www/apache13-modssl/files/patch-ae deleted file mode 100644 index 4ee89df5c8c8..000000000000 --- a/www/apache13-modssl/files/patch-ae +++ /dev/null @@ -1,29 +0,0 @@ ---- src/support/log_server_status.orig Tue Jan 16 02:06:38 2001 -+++ src/support/log_server_status Mon Oct 22 20:44:59 2001 -@@ -70,7 +70,7 @@ - # - require 'sys/socket.ph'; - --$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" -+$wherelog = "/var/log/httpd-status-"; - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server - $request = "/status/?auto"; # Request to send -@@ -96,14 +96,14 @@ - ### Main - - { -- $year=`date +%y`; -+ $year=`LC_TIME=C date +%y`; - chomp($year); - $year += ($year < 70) ? 2000 : 1900; -- $date = $year . `date +%m%d:%H%M%S`; -+ $date = $year . `LC_TIME=C date +%m%d:%H%M%S`; - 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; diff --git a/www/apache13-modssl/files/patch-ah b/www/apache13-modssl/files/patch-ah deleted file mode 100644 index 12be4a63bfa4..000000000000 --- a/www/apache13-modssl/files/patch-ah +++ /dev/null @@ -1,36 +0,0 @@ ---- src/modules/ssl/Makefile.tmpl.orig Mon Jan 1 19:48:52 2001 -+++ src/modules/ssl/Makefile.tmpl Mon Oct 22 20:45:05 2001 -@@ -128,6 +128,11 @@ - ## END-USER AREA - ## - -+# This requires special handling to get the correct versions of include files: -+# ../../include/fnmatch.h instead of /usr/include/fnmatch.h -+# /usr/include/openssl/*.h instead of /usr/local/include/openssl.h -+MY_CFLAGS= $(INCLUDES0) $(SSL_CFLAGS) $(INCLUDES1) $(EXTRA_INCLUDES) $(CFLAGS) -+ - all: lib - - lib: $(LIB) -@@ -144,10 +149,10 @@ - .SUFFIXES: .o .lo - - .c.o: -- $(CC) -c $(INCLUDES) $(CFLAGS) $(SSL_CFLAGS) $(SSL_VERSION) $< -+ $(CC) -c $(MY_CFLAGS) $(SSL_VERSION) $< - - .c.lo: -- $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SSL_CFLAGS) $(SSL_VERSION) $< && mv $*.o $*.lo -+ $(CC) -c $(MY_CFLAGS) $(CFLAGS_SHLIB) $(SSL_VERSION) $< && mv $*.o $*.lo - - clean: - rm -f $(OBJS) $(OBJS_PIC) -@@ -201,7 +206,7 @@ - depend: - cp Makefile.tmpl Makefile.tmpl.bak \ - && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \ -- && gcc -MM $(INCLUDES) $(CFLAGS) $(SSL_CFLAGS) *.c >> Makefile.new \ -+ && gcc -MM $(MY_CFLAGS) *.c >> Makefile.new \ - && sed -e '1,$$s; $(INCDIR)/; $$(INCDIR)/;g' \ - -e '1,$$s; $(OSDIR)/; $$(OSDIR)/;g' \ - -e '1,$$s;^\([a-z0-9_]*\)\.o:;\1.o \1.lo:;g' Makefile.new \ diff --git a/www/apache13-modssl/files/patch-apachectl b/www/apache13-modssl/files/patch-apachectl deleted file mode 100644 index 0eb64d59af3c..000000000000 --- a/www/apache13-modssl/files/patch-apachectl +++ /dev/null @@ -1,45 +0,0 @@ ---- src/support/apachectl.orig Sun Oct 26 20:53:07 2003 -+++ src/support/apachectl Mon Oct 27 22:27:30 2003 -@@ -105,14 +105,14 @@ - restart) - if [ $RUNNING -eq 0 ]; then - echo "$0 $ARG: httpd not running, trying to start" -- if $HTTPD ; then -+ if $HTTPD -DSSL ; then - echo "$0 $ARG: httpd started" - else - echo "$0 $ARG: httpd could not be started" - ERROR=5 - fi - else -- if $HTTPD -t >/dev/null 2>&1; then -+ if $HTTPD -DSSL -t >/dev/null 2>&1; then - if kill -HUP $PID ; then - echo "$0 $ARG: httpd restarted" - else -@@ -129,14 +129,14 @@ - graceful) - if [ $RUNNING -eq 0 ]; then - echo "$0 $ARG: httpd not running, trying to start" -- if $HTTPD ; then -+ if $HTTPD -DSSL ; then - echo "$0 $ARG: httpd started" - else - echo "$0 $ARG: httpd could not be started" - ERROR=5 - fi - else -- if $HTTPD -t >/dev/null 2>&1; then -+ if $HTTPD -DSSL -t >/dev/null 2>&1; then - if kill -USR1 $PID ; then - echo "$0 $ARG: httpd gracefully restarted" - else -@@ -157,7 +157,7 @@ - $LYNX $STATUSURL - ;; - configtest) -- if $HTTPD -t; then -+ if $HTTPD -DSSL -t; then - : - else - ERROR=8 diff --git a/www/apache13-modssl/files/patch-apxs.pl b/www/apache13-modssl/files/patch-apxs.pl deleted file mode 100644 index 9c1596e0cb70..000000000000 --- a/www/apache13-modssl/files/patch-apxs.pl +++ /dev/null @@ -1,15 +0,0 @@ ---- src/support/apxs.pl.orig Mon Nov 29 21:05:12 2004 -+++ src/support/apxs.pl Mon Nov 29 21:05:56 2004 -@@ -604,12 +604,10 @@ - print FP $content; - close(FP); - if ($^O ne "MSWin32") { -- push(@cmds, "cp $cfgbase.conf $cfgbase.conf.bak"); - push(@cmds, "cp $cfgbase.conf.new $cfgbase.conf"); - push(@cmds, "rm $cfgbase.conf.new"); - } else { - $cfgbase =~ s|/|\\|g; -- push(@cmds, "copy \"$cfgbase.conf\" \"$cfgbase.conf.bak\""); - push(@cmds, "copy \"$cfgbase.conf.new\" \"$cfgbase.conf\""); - push(@cmds, "del \"$cfgbase.conf.new\""); - } diff --git a/www/apache13-modssl/files/patch-dbmmanage b/www/apache13-modssl/files/patch-dbmmanage deleted file mode 100644 index dcce57c1ced4..000000000000 --- a/www/apache13-modssl/files/patch-dbmmanage +++ /dev/null @@ -1,11 +0,0 @@ ---- src/support/dbmmanage~ Tue Oct 10 06:23:58 2000 -+++ src/support/dbmmanage Sun Dec 3 00:45:08 2000 -@@ -338,7 +338,7 @@ - } elsif (substr($chkpass, 0, 5) eq '{SHA}') { - need_sha1_crypt; - $crypt_method = "sha1"; -- } elsif (length($chkpass) == 13 && $chkpass ne $testpass) { -+ } elsif ((length($chkpass) == 13 && $chkpass ne $testpass) || ($chkpass =~ m/^\$[0-9]\$/)) { - $crypt_method = "crypt"; - } else { - $crypt_method = "plain"; diff --git a/www/apache13-modssl/files/patch-http_request.c b/www/apache13-modssl/files/patch-http_request.c deleted file mode 100644 index e4642e4f2d27..000000000000 --- a/www/apache13-modssl/files/patch-http_request.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main/http_request.c.bak Wed Apr 28 20:58:42 2004 -+++ src/main/http_request.c Mon Jun 14 17:11:06 2004 -@@ -1056,7 +1056,7 @@ - */ - if ((r->status != HTTP_NOT_MODIFIED) && (r->status != HTTP_NO_CONTENT) - && !ap_status_drops_connection(r->status) -- && r->connection && (r->connection->keepalive > 0)) { -+ && r->connection && (r->connection->keepalive != -1)) { - - (void) ap_discard_request_body(r); - } diff --git a/www/apache13-modssl/files/patch-ssl_util_ssl.c b/www/apache13-modssl/files/patch-ssl_util_ssl.c deleted file mode 100644 index 7114310c6b86..000000000000 --- a/www/apache13-modssl/files/patch-ssl_util_ssl.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/modules/ssl/ssl_util_ssl.c.orig 2006-05-08 09:15:38.000000000 +0200 -+++ src/modules/ssl/ssl_util_ssl.c 2010-04-06 13:36:01.000000000 +0200 -@@ -324,7 +324,7 @@ - { - X509_EXTENSION *ext; - int ext_nid; -- STACK *sk; -+ STACK_OF(SSL_CIPHER) *sk; - BOOL is_sgc; - int idx; - int i; -@@ -333,7 +333,7 @@ - idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1); - if (idx >= 0) { - ext = X509_get_ext(cert, idx); -- if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) { -+ if ((sk = X509V3_EXT_d2i(ext)) != NULL) { - for (i = 0; i < sk_num(sk); i++) { - ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i)); - if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) { diff --git a/www/apache13-modssl/files/rotatelogs.c.patch b/www/apache13-modssl/files/rotatelogs.c.patch deleted file mode 100644 index b2d5c79a92ff..000000000000 --- a/www/apache13-modssl/files/rotatelogs.c.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/support/rotatelogs.c~ Mon Aug 3 11:15:33 1998 -+++ src/support/rotatelogs.c Sun Mar 26 22:42:40 2000 -@@ -11,6 +11,7 @@ - #include <time.h> - #include <errno.h> - #include <fcntl.h> -+#include <unistd.h> - - #define BUFSIZE 65536 - #define ERRMSGSZ 82 -@@ -95,6 +96,8 @@ - } - else { - close(nLogFDprev); -+ unlink(szLogRoot); -+ link(buf2, szLogRoot); - } - nMessCount = 0; - } |