diff options
Diffstat (limited to 'www/apache13-ssl/files')
-rw-r--r-- | www/apache13-ssl/files/apache.in | 62 | ||||
-rw-r--r-- | www/apache13-ssl/files/extra-patch-noportdocs | 22 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-FixPatch | 18 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-Makefile.tmpl | 118 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-SSLpatch | 17 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-configure | 20 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-fix-build-openssl-0.9.8 | 14 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-httpd.conf-dist | 32 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module | 31 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-src::support::dbmanage | 11 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-src::support::log_server_status | 24 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-src:modules:proxy:proxy_util.c | 13 | ||||
-rw-r--r-- | www/apache13-ssl/files/patch-src:support:apxs.pl | 15 | ||||
-rw-r--r-- | www/apache13-ssl/files/post-patch-conf:httpd.conf-dist | 13 |
14 files changed, 0 insertions, 410 deletions
diff --git a/www/apache13-ssl/files/apache.in b/www/apache13-ssl/files/apache.in deleted file mode 100644 index f688bf2eec93..000000000000 --- a/www/apache13-ssl/files/apache.in +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# renamed from ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp -# - -# PROVIDE: apache -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# 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 -# 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 "" by default. -# Extra flags passed to start command. -# apachelimits_args (str): Default to "-e -C daemon" -# Arguments of pre-start limits run. -# -. /etc/rc.subr - -name="apache" -rcvar=`set_rcvar` - -start_precmd="apache_precmd" -restart_precmd="apache_checkconfig" -reload_precmd="apache_checkconfig" -command="%%PREFIX%%/sbin/httpsd" -pidfile="/var/run/httpsd.pid" -required_files=%%PREFIX%%/etc/apache/httpsd.conf - -load_rc_config $name - -[ -z "$apache_enable" ] && apache_enable="NO" -[ -z "$apachelimits_enable" ] && apachelimits_enable="NO" -[ -z "$apachelimits_args" ] && apachelimits_args="-e -C daemon" - -apache_checkconfig() -{ - echo "Performing sanity check on apache configuration:" - ${command} -t -} - -apache_precmd() -{ - if checkyesno apachelimits_enable - then - eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null - else - return 0 - fi - -} - -sig_reload=SIGUSR1 - -extra_commands="reload" -run_rc_command "$1" diff --git a/www/apache13-ssl/files/extra-patch-noportdocs b/www/apache13-ssl/files/extra-patch-noportdocs deleted file mode 100644 index 629164bedbec..000000000000 --- a/www/apache13-ssl/files/extra-patch-noportdocs +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.tmpl.orig 2008-07-01 01:08:04.000000000 +0000 -+++ Makefile.tmpl 2008-07-01 01:08:17.000000000 +0000 -@@ -228,7 +228,6 @@ - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir)-dist -- $(MKDIR) $(root)$(manualdir) - $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir)-dist - $(MKDIR) $(root)$(includedir) -@@ -422,11 +421,6 @@ - (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 ; - if [ ! -d $(root)$(htdocsdir)/ ]; then \ - $(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \ - fi diff --git a/www/apache13-ssl/files/patch-FixPatch b/www/apache13-ssl/files/patch-FixPatch deleted file mode 100644 index 1c293818bb9a..000000000000 --- a/www/apache13-ssl/files/patch-FixPatch +++ /dev/null @@ -1,18 +0,0 @@ ---- FixPatch.orig Sun May 23 13:34:08 1999 -+++ FixPatch Mon May 31 09:03:49 1999 -@@ -112,13 +112,6 @@ - echo "Your version of patch is out-of-date. You need patch 2.1 or 2.5." - fi - --echo -n "Do you want me to apply the fixed-up Apache-SSL patch for you? [n] " --read ans --echo $ans | grep -i "^[ \t]*y" >/dev/null --if [ $? = 0 ]; then -- patch -p1 <SSLpatch.fixed-up --else -- echo "OK, I won't apply the fixed-up patch. I've left it in SSLpatch.fixed-up"; --fi -+patch -p1 <SSLpatch.fixed-up - - exit - diff --git a/www/apache13-ssl/files/patch-Makefile.tmpl b/www/apache13-ssl/files/patch-Makefile.tmpl deleted file mode 100644 index 9d5d458d913e..000000000000 --- a/www/apache13-ssl/files/patch-Makefile.tmpl +++ /dev/null @@ -1,118 +0,0 @@ ---- Makefile.tmpl.orig Fri Feb 20 23:40:50 2004 -+++ Makefile.tmpl Mon Dec 13 21:59:00 2004 -@@ -226,10 +226,10 @@ - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -- $(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) -@@ -415,33 +415,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 -); \ -@@ -462,7 +458,7 @@ - if [ ".$(TARGET)" = .httpd ]; then \ - target_prefix=""; \ - else \ -- target_prefix="$(TARGET)_"; \ -+ target_prefix="$(TARGET)-"; \ - fi; \ - (echo "##"; \ - echo "## $${target_conf} -- Apache HTTP server configuration file"; \ -@@ -480,10 +476,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}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;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/srm.conf;$(sysconfdir)/srm.conf;' \ - -e 's;conf/access.conf;$(sysconfdir)/access.conf;' \ -@@ -495,21 +491,22 @@ - -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \ - -e 's;ServerName new.host.name;ServerName $(conf_servername);' \ - > $(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; \ -- 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}; \ -+ mkdir -p $(root)$(EXAMPLESDIR) ; \ -+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(EXAMPLESDIR)/$${target_conf}-dist"; \ -+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(EXAMPLESDIR)/$${target_conf}-dist; \ -+ if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \ -+ echo "$(INSTALL_DATA) $(root)$(EXAMPLESDIR)/$${target_conf}-dist $(root)$(sysconfdir)/$${target_conf}"; \ -+ $(INSTALL_DATA) $(root)$(EXAMPLESDIR)/$${target_conf}-dist $(root)$(sysconfdir)/$${target_conf}; \ - else \ - echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${target_conf}]"; \ - 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; \ -+ mkdir -p $(root)$(EXAMPLESDIR) ; \ -+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(EXAMPLESDIR)/$${conf}-dist"; \ -+ $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(EXAMPLESDIR)/$${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}; \ -+ $(INSTALL_DATA) $(root)$(EXAMPLESDIR)/$${conf}-dist $(root)$(sysconfdir)/$${conf}; \ - else \ - echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \ - fi; \ diff --git a/www/apache13-ssl/files/patch-SSLpatch b/www/apache13-ssl/files/patch-SSLpatch deleted file mode 100644 index 188e59f2d112..000000000000 --- a/www/apache13-ssl/files/patch-SSLpatch +++ /dev/null @@ -1,17 +0,0 @@ ---- SSLpatch.orig Sat Jan 14 13:45:38 2006 -+++ SSLpatch Sat Jan 14 13:47:30 2006 -@@ -60,10 +60,10 @@ - +SSL_BASE=/usr - +SSL_INCLUDE= -I$(SSL_BASE)/include - +SSL_CFLAGS= -DAPACHE_SSL --+SSL_LIB_DIR=/usr/lib --+SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto --+SSL_APP_DIR=/usr/bin --+SSL_APP=/usr/bin/openssl -++SSL_LIB_DIR=$(SSL_BASE) -++SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto $(EXTRA_SSL_LIBS) -++SSL_APP_DIR=$(SSL_BASE)/bin -++SSL_APP=$(SSL_APP_DIR)/openssl - + - ################################################################ - # Name of the installed Apache HTTP webserver. diff --git a/www/apache13-ssl/files/patch-configure b/www/apache13-ssl/files/patch-configure deleted file mode 100644 index 78be57c08eed..000000000000 --- a/www/apache13-ssl/files/patch-configure +++ /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-ssl/files/patch-fix-build-openssl-0.9.8 b/www/apache13-ssl/files/patch-fix-build-openssl-0.9.8 deleted file mode 100644 index 154aeab13d5a..000000000000 --- a/www/apache13-ssl/files/patch-fix-build-openssl-0.9.8 +++ /dev/null @@ -1,14 +0,0 @@ ---- src/modules/ssl/apache_ssl.c.orig Sun Oct 2 14:55:10 2005 -+++ src/modules/ssl/apache_ssl.c Sun Oct 2 14:56:47 2005 -@@ -72,6 +72,11 @@ - #include "http_main.h" - - -+#ifndef EVP_F_EVP_DECRYPTFINAL -+#ifdef EVP_F_EVP_DECRYPTFINAL_EX -+#define EVP_F_EVP_DECRYPTFINAL EVP_F_EVP_DECRYPTFINAL_EX -+#endif -+#endif - /* Note that APACHE_SSL_EXPORT_CERTS is defined in buff.h */ - - /* Temp */ diff --git a/www/apache13-ssl/files/patch-httpd.conf-dist b/www/apache13-ssl/files/patch-httpd.conf-dist deleted file mode 100644 index 90ac6002e0c5..000000000000 --- a/www/apache13-ssl/files/patch-httpd.conf-dist +++ /dev/null @@ -1,32 +0,0 @@ ---- conf/httpd.conf-dist.orig Wed Sep 4 06:39:41 2002 -+++ conf/httpd.conf-dist Mon Jan 27 17:29:26 2003 -@@ -943,6 +943,29 @@ - #</IfModule> - # End of proxy directives. - -+# Note that all SSL options can apply to virtual hosts. -+# Disable SSL. Useful in combination with virtual hosts. Note that SSLEnable is -+# now also supported. -+#SSLDisable -+SSLEnable -+ -+# Set the path for the global cache server executable. -+# If this facility gives you trouble, you can disable it by setting -+# CACHE_SESSIONS to FALSE in apache_ssl.c -+SSLCacheServerPath @@ServerRoot@@/sbin/gcache -+ -+# Set the global cache server port number, or path. If it is a path, a Unix -+# domain socket is used. If a number, a TCP socket. -+SSLCacheServerPort logs/gcache_port -+#SSLCacheServerPort 1234 -+ -+# Directory for the cache server to run in (in case of crashes). Optional. -+SSLCacheServerRunDir /usr/tmp -+ -+# Set the session cache timeout, in seconds (set to 15 for testing, use a -+# higher value in real life) -+SSLSessionCacheTimeout 15 -+ - ### Section 3: Virtual Hosts - # - # VirtualHost: If you want to maintain multiple domains/hostnames on your diff --git a/www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module b/www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module deleted file mode 100644 index f4f02e80cbc2..000000000000 --- a/www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module +++ /dev/null @@ -1,31 +0,0 @@ ---- src/modules/standard/mod_auth_db.module.bak Tue Oct 16 13:12:02 2001 -+++ src/modules/standard/mod_auth_db.module Thu Feb 20 12:55:19 2003 -@@ -4,23 +4,23 @@ - DB_LIB='' - if ./helpers/TestCompile func db_create; then - DB_VERSION='Berkeley-DB/3.x' -- elif ./helpers/TestCompile lib db db_create; then -+ elif ./helpers/TestCompile lib dbXXX db_create; then - DB_VERSION='Berkeley-DB/3.x' - DB_LIB='-ldb' - elif ./helpers/TestCompile func db_open; then - DB_VERSION='Berkeley-DB/2.x' -- elif ./helpers/TestCompile lib db db_open; then -+ elif ./helpers/TestCompile lib dbXXX db_open; then - DB_VERSION='Berkeley-DB/2.x' - DB_LIB='-ldb' -- elif ./helpers/TestCompile lib db2 db_open; then -+ elif ./helpers/TestCompile lib db2XXX db_open; then - DB_VERSION='Berkeley-DB/2.x' - DB_LIB='-ldb2' - elif ./helpers/TestCompile func dbopen; then - DB_VERSION='Berkeley-DB/1.x' -- elif ./helpers/TestCompile lib db dbopen; then -+ elif ./helpers/TestCompile lib dbXXX dbopen; then - DB_VERSION='Berkeley-DB/1.x' - DB_LIB='-ldb' -- elif ./helpers/TestCompile lib db1 dbopen; then -+ elif ./helpers/TestCompile lib db1XXX dbopen; then - DB_VERSION='Berkeley-DB/1.x' - DB_LIB='-ldb1' - elif TCADDINCL='#include <db.h>' INCLUDES1="$INCLUDES1 -I/usr/include/db1" TLIB="-ldb1" \ diff --git a/www/apache13-ssl/files/patch-src::support::dbmanage b/www/apache13-ssl/files/patch-src::support::dbmanage deleted file mode 100644 index d92d2f447613..000000000000 --- a/www/apache13-ssl/files/patch-src::support::dbmanage +++ /dev/null @@ -1,11 +0,0 @@ ---- src/support/dbmmanage.bak Thu Mar 14 00:05:37 2002 -+++ src/support/dbmmanage Mon Jun 2 23:05:27 2003 -@@ -338,6 +338,8 @@ - } elsif (substr($chkpass, 0, 5) eq '{SHA}') { - need_sha1_crypt; - $crypt_method = "sha1"; -+ } elsif (substr($chkpass, 0, 3) eq '$1$') { -+ $crypt_method = "crypt"; - } elsif (length($chkpass) == 13 && $chkpass ne $testpass) { - $crypt_method = "crypt"; - } else { diff --git a/www/apache13-ssl/files/patch-src::support::log_server_status b/www/apache13-ssl/files/patch-src::support::log_server_status deleted file mode 100644 index bd792616581e..000000000000 --- a/www/apache13-ssl/files/patch-src::support::log_server_status +++ /dev/null @@ -1,24 +0,0 @@ ---- src/support/log_server_status.orig Mon Jan 15 20:06:38 2001 -+++ src/support/log_server_status Fri Jan 25 08:03:03 2002 -@@ -70,10 +70,10 @@ - # - 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 -+$request = "/server-status/?auto"; # Request to send - - sub tcp_connect - { -@@ -103,7 +103,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; diff --git a/www/apache13-ssl/files/patch-src:modules:proxy:proxy_util.c b/www/apache13-ssl/files/patch-src:modules:proxy:proxy_util.c deleted file mode 100644 index 3265807185ca..000000000000 --- a/www/apache13-ssl/files/patch-src:modules:proxy:proxy_util.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/modules/proxy/proxy_util.c.orig Tue Feb 17 22:52:22 2004 -+++ src/modules/proxy/proxy_util.c Fri Jun 11 10:24:12 2004 -@@ -545,8 +545,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, MIN((size_t)buf_size, -+ (size_t)(len - total_bytes_rcvd))); - } - } - diff --git a/www/apache13-ssl/files/patch-src:support:apxs.pl b/www/apache13-ssl/files/patch-src:support:apxs.pl deleted file mode 100644 index 9c1596e0cb70..000000000000 --- a/www/apache13-ssl/files/patch-src:support: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-ssl/files/post-patch-conf:httpd.conf-dist b/www/apache13-ssl/files/post-patch-conf:httpd.conf-dist deleted file mode 100644 index 864075e30d2d..000000000000 --- a/www/apache13-ssl/files/post-patch-conf:httpd.conf-dist +++ /dev/null @@ -1,13 +0,0 @@ ---- conf/httpd.conf-dist.orig Wed Oct 22 23:09:02 2003 -+++ conf/httpd.conf-dist Wed Oct 22 23:09:14 2003 -@@ -945,8 +945,8 @@ - # Note that all SSL options can apply to virtual hosts. - # Disable SSL. Useful in combination with virtual hosts. Note that SSLEnable is - # now also supported. --#SSLDisable --SSLEnable -+SSLDisable -+#SSLEnable - - # Set the path for the global cache server executable. - # If this facility gives you trouble, you can disable it by setting |