aboutsummaryrefslogtreecommitdiff
path: root/www/apache13-modssl/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache13-modssl/files')
-rw-r--r--www/apache13-modssl/files/FreeBSD.layout19
-rw-r--r--www/apache13-modssl/files/apache.sh4
-rw-r--r--www/apache13-modssl/files/patch-aa22
-rw-r--r--www/apache13-modssl/files/patch-ac46
-rw-r--r--www/apache13-modssl/files/patch-ai65
5 files changed, 154 insertions, 2 deletions
diff --git a/www/apache13-modssl/files/FreeBSD.layout b/www/apache13-modssl/files/FreeBSD.layout
new file mode 100644
index 000000000000..5524e186e9c0
--- /dev/null
+++ b/www/apache13-modssl/files/FreeBSD.layout
@@ -0,0 +1,19 @@
+# FreeBSD layout...
+<Layout FreeBSD>
+ prefix: /usr/local
+ exec_prefix: $prefix
+ bindir: $exec_prefix/bin
+ sbindir: $exec_prefix/sbin
+ libexecdir: $exec_prefix/libexec/apache
+ mandir: $prefix/man
+ sysconfdir: $prefix/etc/apache
+ datadir: $prefix/www
+ iconsdir: $datadir/icons
+ htdocsdir: $datadir/data
+ cgidir: $datadir/cgi-bin
+ includedir: $prefix/include/apache
+ localstatedir: /var
+ runtimedir: $localstatedir/run
+ logfiledir: $localstatedir/log
+ proxycachedir: $datadir/proxy
+</Layout>
diff --git a/www/apache13-modssl/files/apache.sh b/www/apache13-modssl/files/apache.sh
index 619918254852..8e6e38810fa8 100644
--- a/www/apache13-modssl/files/apache.sh
+++ b/www/apache13-modssl/files/apache.sh
@@ -7,10 +7,10 @@ fi
case "$1" in
start)
- [ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'
+ [ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl startssl > /dev/null && echo -n ' apache'
;;
stop)
- [ -r /var/run/httpd.pid ] && ${PREFIX}/apachectl stop > /dev/null && echo -n ' apache'
+ [ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/www/apache13-modssl/files/patch-aa b/www/apache13-modssl/files/patch-aa
index 448bc9bf1589..700446754c32 100644
--- a/www/apache13-modssl/files/patch-aa
+++ b/www/apache13-modssl/files/patch-aa
@@ -9,3 +9,25 @@
fi
##
+@@ -1232,8 +1232,8 @@
+ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+ echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
+ echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
+- echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
+- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
++ echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.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"
+@@ -1330,8 +1330,8 @@
+ 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_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
+-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
++echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.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-ac b/www/apache13-modssl/files/patch-ac
index 77ead0f0b54a..a009e6138b06 100644
--- a/www/apache13-modssl/files/patch-ac
+++ b/www/apache13-modssl/files/patch-ac
@@ -20,6 +20,30 @@
#
# ServerAdmin: Your address, where problems with the server should be
+@@ -354,7 +354,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>
+
+ #
@@ -469,7 +469,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
@@ -38,3 +62,25 @@
#
# Optionally add a line containing the server version and virtual host
+@@ -708,13 +723,17 @@
+ # For example, the PHP 3.x module (not part of the Apache distribution - see
+ # http://www.php.net) will typically use:
+ #
+- #AddType application/x-httpd-php3 .php3
+- #AddType application/x-httpd-php3-source .phps
++ <IfModule mod_php3.c>
++ AddType application/x-httpd-php3 .php3
++ AddType application/x-httpd-php3-source .php3s
++ </IfModule>
+ #
+ # And for PHP 4.x, use:
+ #
+- #AddType application/x-httpd-php .php
+- #AddType application/x-httpd-php-source .phps
++ <IfModule mod_php4.c>
++ AddType application/x-httpd-php .php
++ AddType application/x-httpd-php-source .phps
++ </IfModule>
+
+ AddType application/x-tar .tgz
+
diff --git a/www/apache13-modssl/files/patch-ai b/www/apache13-modssl/files/patch-ai
new file mode 100644
index 000000000000..11517ba25548
--- /dev/null
+++ b/www/apache13-modssl/files/patch-ai
@@ -0,0 +1,65 @@
+--- Makefile.tmpl.orig Thu Oct 19 11:30:46 2000
++++ Makefile.tmpl Thu Oct 19 11:43:48 2000
+@@ -125,2 +125,3 @@
+ proxycachedir = @proxycachedir@
++doc_prefix = $(prefix)/share/doc/apache
+
+@@ -327,5 +328,5 @@
+ $(MKDIR) $(root)$(sysconfdir)/ssl.prm
+- $(MKDIR) $(root)$(htdocsdir)
++ $(MKDIR) $(root)$(doc_prefix)
+ $(MKDIR) $(root)$(iconsdir)
+- $(MKDIR) $(root)$(cgidir)
++ $(MKDIR) $(root)$(cgidir).default
+ $(MKDIR) $(root)$(includedir)
+@@ -528,14 +529,18 @@
+ @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 \
++# -@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)/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
+- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
+- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+- fi
+- -@if [ -f $(root)$(cgidir)/printenv ]; then \
+- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+- else \
++ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
++ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
++ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
++# fi
++ if [ ! -d $(root)$(htdocsdir) ]; then \
++ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
++ fi
++ $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
++# -@if [ -f $(root)$(cgidir)/printenv ]; then \
++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
++# else \
+ for script in printenv test-cgi; do \
+@@ -544,5 +549,8 @@
+ > $(TOP)/$(SRC)/.apaci.install.tmp; \
+- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
++ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
++ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
+ done; \
++# fi
++ if [ ! -d $(root)$(cgidir) ]; then \
++ $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
+ fi
+@@ -594,6 +602,6 @@
+ -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;' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-24 00:31:09 +0000