Attachment #4261 for bug #10937

View | Details | Raw Unified | Return to bug 10937
Collapse All | Expand All





MAINTAINER=	hetzels@westbend.net

#PATCH_SITES=    http://www.apache.org/dist/patches/apply_to_${AP_VERS}/
#		http://www.apache.org/dist/patches/apply_to_${AP_VERS}/
#PATCHFILES=

.if defined(PATCH_DEBUG)

PATCH_DIST_ARGS=       -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
.endif

AP_VERS=	1.3.6
APACHE=		${DISTNAME}${EXTRACT_SUFX}
FRONTPAGE=	fp30.bsdi3.tar.Z



CONFIGURE_ENV= OPTIM='${OPTIM}'

MAN1=   dbmmanage.1 htdigest.1 htpasswd.1
MAN8=   ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8

.if defined(SUEXEC)
HTTPD_USER?=www

Lines 1-2 Link Here

(-)apache13-fp/files/md5 (-1 / +1 lines)
1	MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3	1	MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
2	MD5 (fp30.bsdi3.tar.Z) = 344b956cca8f367099d7c33e8c7ba174	2	MD5 (fp30.bsdi3.tar.Z) = 344b956cca8f367099d7c33e8c7ba174




--- Makefile.tmpl.orig	Mon Mar 15 18:38:46 1999
+++ Makefile.tmpl	Sat Apr  3 15:25:47 1999
@@ -113,13 +113,14 @@
 sysconfdir      = @sysconfdir@
 datadir         = @datadir@
 iconsdir        = $(datadir)/icons
-htdocsdir       = $(datadir)/htdocs
+htdocsdir       = $(datadir)/data
 cgidir          = $(datadir)/cgi-bin
 includedir      = @includedir@
 localstatedir   = @localstatedir@
 runtimedir      = @runtimedir@
 logfiledir      = @logfiledir@
 proxycachedir   = @proxycachedir@

 
 libexecdir_relative   = @libexecdir_relative@
 
@@ -134,6 +135,7 @@
 suexec_safepath = @suexec_safepath@
 
 #   some substituted configuration parameters
+conf_user        = @conf_user@
 conf_group       = @conf_group@
 conf_port        = @conf_port@
 conf_serveradmin = @conf_serveradmin@
@@ -249,9 +251,9 @@
 	$(MKDIR) $(root)$(mandir)/man1
 	$(MKDIR) $(root)$(mandir)/man8
 	$(MKDIR) $(root)$(sysconfdir)
-	$(MKDIR) $(root)$(htdocsdir)
+	$(MKDIR) $(root)$(doc_prefix)
 	$(MKDIR) $(root)$(iconsdir)
-	$(MKDIR) $(root)$(cgidir)
+	$(MKDIR) $(root)$(cgidir).default
 	$(MKDIR) $(root)$(includedir)
 	$(MKDIR) $(root)$(runtimedir)
 	$(MKDIR) $(root)$(logfiledir)
@@ -294,9 +296,11 @@
 			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
 			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
 			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \

 		done; \
 		echo "" >>$(SRC)/.apaci.install.conf; \
 		echo "#  Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
@@ -304,6 +308,7 @@
 		echo "#  [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
 		echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
 		egrep "^[ 	]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\

 		sed	-e 's:SharedModule:AddModule:' \
 			-e 's:modules/[^/]*/::' \
 			-e 's:[ 	]lib: mod_:' \
@@ -324,6 +329,7 @@
 	echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \
 	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
 		-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
+		-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib\:$(prefix)/lib;' \
 		< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
 		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \
 	echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8"; \
@@ -379,25 +385,32 @@
 #   icons and distributed CGI scripts.
 install-data:
 	@echo "===> [data: Installing initial data files]"
-	-@if [ -f $(root)$(htdocsdir)/index.html ]; then \
-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-	else \
-		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
+#	-@if [ -f $(root)$(htdocsdir)/index.html ]; then \
+#		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
+#	else \
+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
 		(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 {} \; ; \
+		(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 \
+		$(CP) -rp $(root)$(doc_prefix) $(root)$(htdocsdir); \
 	fi
-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-	else \
+	$(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 \
 			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}; \
+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
 		done; \
+		done;
+#	fi
+	if [ ! -d $(root)$(cgidir) ]; then \
+		$(CP) -rp $(root)$(cgidir).default $(root)$(cgidir); \
 	fi
 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
@@ -431,17 +444,20 @@
 			-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
 			-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
 		 sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
-			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+			-e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
 			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
 			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
 			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
+			-e 's;@@ServerRoot@@/srm.conf;$(sysconfdir)/srm.conf;' \
+			-e 's;@@ServerRoot@@/access.conf;$(sysconfdir)/access.conf;' \
 			-e 's;@@ServerRoot@@;$(prefix);g' \
 			-e 's;httpd.conf;$(TARGET).conf;' \
 			-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;' \

Lines 1-5 Link Here

(-)apache13-fp/patches/patch-ak (-4 / +4 lines)
1	--- src/support/apachectl.orig Fri Jan 1 13:05:32 1999	1	--- src/support/apachectl.orig Tue Feb 9 12:00:34 1999
2	+++ src/support/apachectl Thu Jan 21 20:14:27 1999	2	+++ src/support/apachectl Sat Apr 3 15:40:42 1999
3	@@ -27,6 +27,10 @@	3	@@ -27,6 +27,10 @@
4	# the path to your httpd binary, including options if necessary	4	# the path to your httpd binary, including options if necessary
5	HTTPD='/usr/local/apache/src/httpd'	5	HTTPD='/usr/local/apache/src/httpd'
Lines 24-31 Link Here
24	# check for pidfile	24	# check for pidfile
25	if [ -f $PIDFILE ] ; then	25	if [ -f $PIDFILE ] ; then
26	PID=`cat $PIDFILE`	26	PID=`cat $PIDFILE`
27	- if kill -0 $PID; then	27	- if [ ! "x$PID" = "x" ] && kill -0 $PID; then
28	+ if kill -0 $PID > /dev/null 2>&1; then	28	+ if [ ! "x$PID" = "x" ] && kill -0 $PID > /dev/null 2>&1; then
29	STATUS="httpd (pid $PID) running"	29	STATUS="httpd (pid $PID) running"
30	RUNNING=1	30	RUNNING=1
31	else	31	else




--- src/main/http_request.c.orig	Sun Mar  7 09:05:36 1999
+++ src/main/http_request.c	Sat Apr  3 16:02:26 1999
@@ -187,6 +187,8 @@
 	return OK;
     }
 
+    if (r->execfilename) path = r->execfilename;
+
 #ifdef HAVE_DRIVE_LETTERS
     /* If the directory is x:\, then we don't want to strip
      * the trailing slash since x: is not a valid directory.
@@ -509,6 +511,7 @@
             res = ap_parse_htaccess(&htaccess_conf, r, overrides_here,
                                  ap_pstrdup(r->pool, test_dirname),
                                  sconf->access_name);
+            if (r->execfilename) r->filename = r->execfilename;
             if (res)
                 return res;
 
+             if (r->execfilename) r->filename = r->execfilename;
              if (res)
                  return res;
  




share/doc/apache/manual/new_features_1_3.html
share/doc/apache/manual/process-model.html
share/doc/apache/manual/readme-tpf.html
share/doc/apache/manual/search/manual-index.cgi
share/doc/apache/manual/sections.html
share/doc/apache/manual/sourcereorg.html
share/doc/apache/manual/stopping.html

share/doc/apache/manual/vhosts/host.html
share/doc/apache/manual/vhosts/index.html
share/doc/apache/manual/vhosts/ip-based.html
share/doc/apache/manual/vhosts/mass.html
share/doc/apache/manual/vhosts/name-based.html
share/doc/apache/manual/vhosts/vhosts-in-depth.html
share/doc/apache/manual/vhosts/virtual-host.html

@dirrm share/doc/apache/manual/images
@dirrm share/doc/apache/manual/misc
@dirrm share/doc/apache/manual/mod
@dirrm share/doc/apache/manual/search
@dirrm share/doc/apache/manual/vhosts
@dirrm share/doc/apache/manual
@dirrm share/doc/apache

Return to bug 10937

Lines 30-37 Link Here

(-)apache13-fp/Makefile (-5 / +4 lines)
30		30
31	MAINTAINER= hetzels@westbend.net	31	MAINTAINER= hetzels@westbend.net
32		32
33	#PATCH_SITES= http://www.apache.org/dist//patches/apply_to_${AP_VERS}/ \	33	#PATCH_SITES= http://www.apache.org/dist/patches/apply_to_${AP_VERS}/
34	# http://www.apache.org/dist/patches/apply_to_${AP_VERS}/
35	#PATCHFILES=	34	#PATCHFILES=
36		35
37	.if defined(PATCH_DEBUG)	36	.if defined(PATCH_DEBUG)
Lines 40-46 Link Here
40	PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}	39	PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
41	.endif	40	.endif
42		41
43	AP_VERS= 1.3.4	42	AP_VERS= 1.3.6
44	APACHE= ${DISTNAME}${EXTRACT_SUFX}	43	APACHE= ${DISTNAME}${EXTRACT_SUFX}
45	FRONTPAGE= fp30.bsdi3.tar.Z	44	FRONTPAGE= fp30.bsdi3.tar.Z
46		45
Lines 95-102 Link Here
95		94
96	CONFIGURE_ENV= OPTIM='${OPTIM}'	95	CONFIGURE_ENV= OPTIM='${OPTIM}'
97		96
98	MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1	97	MAN1= dbmmanage.1 htdigest.1 htpasswd.1
99	MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8	98	MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
100		99
101	.if defined(SUEXEC)	100	.if defined(SUEXEC)
102	HTTPD_USER?=www	101	HTTPD_USER?=www

Lines 1-6 Link Here

(-)apache13-fp/patches/patch-ab (-52 / +55 lines)
1	--- Makefile.tmpl.orig Thu Jan 7 05:50:45 1999	1	--- Makefile.tmpl.orig Mon Mar 15 18:38:46 1999
2	+++ Makefile.tmpl Fri Jan 22 22:24:16 1999	2	+++ Makefile.tmpl Sat Apr 3 15:25:47 1999
3	@@ -110,6 +110,7 @@	3	@@ -113,13 +113,14 @@
		4	sysconfdir = @sysconfdir@
		5	datadir = @datadir@
		6	iconsdir = $(datadir)/icons
		7	-htdocsdir = $(datadir)/htdocs
		8	+htdocsdir = $(datadir)/data
		9	cgidir = $(datadir)/cgi-bin
		10	includedir = @includedir@
		11	localstatedir = @localstatedir@
4	runtimedir = @runtimedir@	12	runtimedir = @runtimedir@
5	logfiledir = @logfiledir@	13	logfiledir = @logfiledir@
6	proxycachedir = @proxycachedir@	14	proxycachedir = @proxycachedir@
Lines 8-34 Link Here
8		16
9	libexecdir_relative = @libexecdir_relative@	17	libexecdir_relative = @libexecdir_relative@
10		18
11	@@ -124,6 +125,7 @@	19	@@ -134,6 +135,7 @@
12	suexec_safepath = @suexec_safepath@	20	suexec_safepath = @suexec_safepath@
13		21
14	# some substituted configuration parameters	22	# some substituted configuration parameters
15	+conf_user = @conf_user@	23	+conf_user = @conf_user@
16	conf_group = @conf_group@	24	conf_group = @conf_group@
17	conf_port = @conf_port@	25	conf_port = @conf_port@
18	conf_serveradmin = @conf_serveradmin@	26	conf_serveradmin = @conf_serveradmin@
19	@@ -239,9 +241,9 @@	27	@@ -249,9 +251,9 @@
20	$(MKDIR) $(root)$(mandir)/man1	28	$(MKDIR) $(root)$(mandir)/man1
21	$(MKDIR) $(root)$(mandir)/man8	29	$(MKDIR) $(root)$(mandir)/man8
22	$(MKDIR) $(root)$(sysconfdir)	30	$(MKDIR) $(root)$(sysconfdir)
23	- $(MKDIR) $(root)$(datadir)/htdocs	31	- $(MKDIR) $(root)$(htdocsdir)
24	+ $(MKDIR) $(root)$(doc_prefix)	32	+ $(MKDIR) $(root)$(doc_prefix)
25	$(MKDIR) $(root)$(datadir)/icons	33	$(MKDIR) $(root)$(iconsdir)
26	- $(MKDIR) $(root)$(datadir)/cgi-bin	34	- $(MKDIR) $(root)$(cgidir)
27	+ $(MKDIR) $(root)$(datadir)/cgi-bin.default	35	+ $(MKDIR) $(root)$(cgidir).default
28	$(MKDIR) $(root)$(includedir)	36	$(MKDIR) $(root)$(includedir)
29	$(MKDIR) $(root)$(runtimedir)	37	$(MKDIR) $(root)$(runtimedir)
30	$(MKDIR) $(root)$(logfiledir)	38	$(MKDIR) $(root)$(logfiledir)
31	@@ -278,9 +280,11 @@	39	@@ -294,9 +296,11 @@
32	file=`echo $${mod} \| sed -e 's;^./\([^/]\);\1;'`; \	40	file=`echo $${mod} \| sed -e 's;^./\([^/]\);\1;'`; \
33	echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \	41	echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
34	$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \	42	$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
Lines 43-49 Link Here
43	done; \	51	done; \
44	echo "" >>$(SRC)/.apaci.install.conf; \	52	echo "" >>$(SRC)/.apaci.install.conf; \
45	echo "# Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \	53	echo "# Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
46	@@ -288,6 +292,7 @@	54	@@ -304,6 +308,7 @@
47	echo "# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \	55	echo "# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
48	echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \	56	echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
49	egrep "^[ ]*(Add\|Shared)Module" $(SRC)/Configuration.apaci \|\	57	egrep "^[ ]*(Add\|Shared)Module" $(SRC)/Configuration.apaci \|\
Lines 51-122 Link Here
51	sed -e 's:SharedModule:AddModule:' \	59	sed -e 's:SharedModule:AddModule:' \
52	-e 's:modules/[^/]*/::' \	60	-e 's:modules/[^/]*/::' \
53	-e 's:[ ]lib: mod_:' \	61	-e 's:[ ]lib: mod_:' \
54	@@ -308,6 +313,7 @@	62	@@ -324,6 +329,7 @@
55	echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \	63	echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \
56	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \	64	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
57	-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \	65	-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
58	+ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib\:$(prefix)/lib;' \	66	+ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib\:$(prefix)/lib;' \
59	< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \	67	< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
60	$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \	68	$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \
61	echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/$${apachectl}.1"; \	69	echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8"; \
62	@@ -363,25 +369,32 @@	70	@@ -379,25 +385,32 @@
63	# icons and distributed CGI scripts.	71	# icons and distributed CGI scripts.
64	install-data:	72	install-data:
65	@echo "===> [data: Installing initial data files]"	73	@echo "===> [data: Installing initial data files]"
66	- -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \	74	- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
67	- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \	75	- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
68	- else \	76	- else \
69	- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \	77	- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
70	+# -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \	78	+# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
71	+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \	79	+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
72	+# else \	80	+# else \
73	+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \	81	+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
74	(cd $(TOP)/htdocs/ && $(TAR) -hcf - *) \|\	82	(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) \|\
75	- (cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \	83	- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
76	- find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \	84	- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
77	- find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \	85	- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
78	+ (cd $(root)$(doc_prefix) && $(TAR) -xf -); \	86	+ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
79	+ find $(root)$(doc_prefix) -type d -exec chmod a+rx {} \; ; \	87	+ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
80	+ find $(root)$(doc_prefix) -type f -exec chmod a+r {} \; ; \	88	+ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
81	+# fi	89	+# fi
82	+ if [ ! -d $(root)$(datadir)/data ]; then \	90	+ if [ ! -d $(root)$(htdocsdir) ]; then \
83	+ $(CP) -rp $(root)$(doc_prefix) $(root)$(datadir)/data; \	91	+ $(CP) -rp $(root)$(doc_prefix) $(root)$(htdocsdir); \
84	fi	92	fi
85	- -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \	93	- -@if [ -f $(root)$(cgidir)/printenv ]; then \
86	- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \	94	- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
87	- else \	95	- else \
88	+ $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default	96	+ $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
89	+# -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \	97	+# -@if [ -f $(root)$(cgidir)/printenv ]; then \
90	+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \	98	+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
91	+# else \	99	+# else \
92	for script in printenv test-cgi; do \	100	for script in printenv test-cgi; do \
93	cat $(TOP)/cgi-bin/$${script} \|\	101	cat $(TOP)/cgi-bin/$${script} \|\
94	sed -e 's;^#!/.*perl;#!$(PERL);' \	102	sed -e 's;^#!/.*perl;#!$(PERL);' \
95	> $(TOP)/$(SRC)/.apaci.install.tmp; \	103	> $(TOP)/$(SRC)/.apaci.install.tmp; \
96	- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \	104	- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
97	- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \	105	- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
98	- done; \	106	+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
99	+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \	107	+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
100	+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \	108	done; \
101	+ done;
102	+# fi	109	+# fi
103	+ if [ ! -d $(root)$(datadir)/cgi-bin ]; then \	110	+ if [ ! -d $(root)$(cgidir) ]; then \
104	+ $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \	111	+ $(CP) -rp $(root)$(cgidir).default $(root)$(cgidir); \
105	fi	112	fi
106	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \	113	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
107	(cd $(TOP)/icons/ && $(TAR) -hcf - *) \|\	114	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) \|\
108	@@ -411,20 +424,23 @@	115	@@ -431,17 +444,20 @@
109	echo ""; \	116	-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
110	cat $(TOP)/conf/$${conf}-dist ) \|\	117	-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
111	sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
112	- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
113	+ -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
114	-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
115	-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
116	-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \	118	-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
117	+ -e 's;@@ServerRoot@@/srm.conf;$(sysconfdir)/srm.conf;' \	119	+ -e 's;@@ServerRoot@@/srm.conf;$(sysconfdir)/srm.conf;' \
118	+ -e 's;@@ServerRoot@@/access.conf;$(sysconfdir)/access.conf;' \	120	+ -e 's;@@ServerRoot@@/access.conf;$(sysconfdir)/access.conf;' \
119	-e 's;@@ServerRoot@@;$(prefix);g' \	121	-e 's;@@ServerRoot@@;$(prefix);g' \
		122	-e 's;httpd.conf;$(TARGET).conf;' \
120	-e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \	123	-e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
121	-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \	124	-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
122	-e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \	125	-e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \

Lines 1-23 Link Here

(-)apache13-fp/patches/patch-fi (-23 / +19 lines)
1	*** src/main/http_request.c.orig Tue Oct 6 14:06:09 1998	1	--- src/main/http_request.c.orig Sun Mar 7 09:05:36 1999
2	--- src/main/http_request.c Sat Oct 31 15:49:04 1998	2	+++ src/main/http_request.c Sat Apr 3 16:02:26 1999
3	***************	3	@@ -187,6 +187,8 @@
4	* 187,192 **	4	return OK;
5	--- 187,194 ----	5	}
6	return OK;	6
7	}	7	+ if (r->execfilename) path = r->execfilename;
8		8	+
9	+ if (r->execfilename) path = r->execfilename;	9	#ifdef HAVE_DRIVE_LETTERS
10	+	10	/* If the directory is x:\, then we don't want to strip
11	#ifdef WIN32	11	* the trailing slash since x: is not a valid directory.
12	/* If the path is x:/, then convert it to x:/., coz that's what stat	12	@@ -509,6 +511,7 @@
13	* needs to work properly	13	res = ap_parse_htaccess(&htaccess_conf, r, overrides_here,
14	***************	14	ap_pstrdup(r->pool, test_dirname),
15	* 461,466 **	15	sconf->access_name);
16	--- 463,469 ----	16	+ if (r->execfilename) r->filename = r->execfilename;
17	res = ap_parse_htaccess(&htaccess_conf, r, overrides_here,	17	if (res)
18	ap_pstrdup(r->pool, test_dirname),	18	return res;
19	sconf->access_name);	19
20	+ if (r->execfilename) r->filename = r->execfilename;
21	if (res)
22	return res;
23

Lines 169-174 Link Here

(-)apache13-fp/pkg/PLIST (+3 lines)
169	share/doc/apache/manual/new_features_1_3.html	169	share/doc/apache/manual/new_features_1_3.html
170	share/doc/apache/manual/process-model.html	170	share/doc/apache/manual/process-model.html
171	share/doc/apache/manual/readme-tpf.html	171	share/doc/apache/manual/readme-tpf.html
		172	share/doc/apache/manual/search/manual-index.cgi
172	share/doc/apache/manual/sections.html	173	share/doc/apache/manual/sections.html
173	share/doc/apache/manual/sourcereorg.html	174	share/doc/apache/manual/sourcereorg.html
174	share/doc/apache/manual/stopping.html	175	share/doc/apache/manual/stopping.html
Lines 185-190 Link Here
185	share/doc/apache/manual/vhosts/host.html	186	share/doc/apache/manual/vhosts/host.html
186	share/doc/apache/manual/vhosts/index.html	187	share/doc/apache/manual/vhosts/index.html
187	share/doc/apache/manual/vhosts/ip-based.html	188	share/doc/apache/manual/vhosts/ip-based.html
		189	share/doc/apache/manual/vhosts/mass.html
188	share/doc/apache/manual/vhosts/name-based.html	190	share/doc/apache/manual/vhosts/name-based.html
189	share/doc/apache/manual/vhosts/vhosts-in-depth.html	191	share/doc/apache/manual/vhosts/vhosts-in-depth.html
190	share/doc/apache/manual/vhosts/virtual-host.html	192	share/doc/apache/manual/vhosts/virtual-host.html
Lines 304-309 Link Here
304	@dirrm share/doc/apache/manual/images	306	@dirrm share/doc/apache/manual/images
305	@dirrm share/doc/apache/manual/misc	307	@dirrm share/doc/apache/manual/misc
306	@dirrm share/doc/apache/manual/mod	308	@dirrm share/doc/apache/manual/mod
		309	@dirrm share/doc/apache/manual/search
307	@dirrm share/doc/apache/manual/vhosts	310	@dirrm share/doc/apache/manual/vhosts
308	@dirrm share/doc/apache/manual	311	@dirrm share/doc/apache/manual
309	@dirrm share/doc/apache	312	@dirrm share/doc/apache