Attachment #22823 for bug #39496

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





PORTNAME=	apache
PKGNAMESUFFIX=	_fp
PORTVERSION=	1.3.26
PORTREVISION=	0
CATEGORIES=	www
MASTER_SITES=	http://www.apache.org/dist/httpd/ \
		http://www.freebsd.org/gifs/ \


MAINTAINER=	hetzels@westbend.net

FORBIDDEN=	"Vulnerable to denial-of-service.  See" \
		"http://httpd.apache.org/info/security_bulletin_20020617.txt"

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


		  --prefix=${PREFIX} \
		  --server-gid=nogroup \
		  --with-perl=${PERL} \
		  --with-layout=FreeBSD \
		  --manualdir=${DOCSDIR}/manual \
		  --server-uid=${HTTPD_USER} \
		  --server-gid=${HTTPD_GROUP} \
		  --without-confadjust \

Lines 1-3 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (apache_1.3.23.tar.gz) = 4499443fa1d604243467afe64522abac	1	MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
2	MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62	2	MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
3	MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6	3	MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6




share/doc/apache/index.html.it
share/doc/apache/index.html.ja.jis
share/doc/apache/index.html.kr.iso-kr
share/doc/apache/index.html.lb.utf8
share/doc/apache/index.html.nl
share/doc/apache/index.html.nn
share/doc/apache/index.html.no

share/doc/apache/index.html.ru.ucs4
share/doc/apache/index.html.ru.utf8
share/doc/apache/index.html.se
share/doc/apache/index.html.zh
share/doc/apache/manual/LICENSE
share/doc/apache/manual/bind.html.en
share/doc/apache/manual/bind.html.fr
share/doc/apache/manual/bind.html.html
share/doc/apache/manual/bind.html.ja.jis
share/doc/apache/manual/cgi_path.html.en
share/doc/apache/manual/cgi_path.html.fr
share/doc/apache/manual/cgi_path.html.html
share/doc/apache/manual/cgi_path.html.ja.jis
share/doc/apache/manual/configuring.html.en
share/doc/apache/manual/configuring.html.fr
share/doc/apache/manual/configuring.html.html

share/doc/apache/manual/mod/index-bytype.html.en
share/doc/apache/manual/mod/index-bytype.html.fr
share/doc/apache/manual/mod/index-bytype.html.html
share/doc/apache/manual/mod/index-bytype.html.ja.jis
share/doc/apache/manual/mod/index.html.en
share/doc/apache/manual/mod/index.html.fr
share/doc/apache/manual/mod/index.html.html
share/doc/apache/manual/mod/index.html.ja.jis
share/doc/apache/manual/mod/mod_access.html.en
share/doc/apache/manual/mod/mod_access.html.html
share/doc/apache/manual/mod/mod_access.html.ja.jis
share/doc/apache/manual/mod/mod_actions.html.en
share/doc/apache/manual/mod/mod_actions.html.html
share/doc/apache/manual/mod/mod_actions.html.ja.jis
share/doc/apache/manual/mod/mod_alias.html
share/doc/apache/manual/mod/mod_asis.html.en
share/doc/apache/manual/mod/mod_asis.html.html
share/doc/apache/manual/mod/mod_asis.html.ja.jis
share/doc/apache/manual/mod/mod_auth.html
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html

share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
share/doc/apache/manual/mod/mod_cgi.html.en
share/doc/apache/manual/mod/mod_cgi.html.html
share/doc/apache/manual/mod/mod_cgi.html.ja.jis
share/doc/apache/manual/mod/mod_cookies.html
share/doc/apache/manual/mod/mod_digest.html
share/doc/apache/manual/mod/mod_dir.html.en

share/doc/apache/manual/mod/mod_headers.html
share/doc/apache/manual/mod/mod_imap.html
share/doc/apache/manual/mod/mod_include.html
share/doc/apache/manual/mod/mod_info.html.en
share/doc/apache/manual/mod/mod_info.html.html
share/doc/apache/manual/mod/mod_info.html.ja.jis
share/doc/apache/manual/mod/mod_isapi.html
share/doc/apache/manual/mod/mod_log_agent.html
share/doc/apache/manual/mod/mod_log_common.html

share/doc/apache/manual/mod/mod_setenvif.html.en
share/doc/apache/manual/mod/mod_setenvif.html.html
share/doc/apache/manual/mod/mod_setenvif.html.ja.jis
share/doc/apache/manual/mod/mod_so.html.en
share/doc/apache/manual/mod/mod_so.html.html
share/doc/apache/manual/mod/mod_so.html.ja.jis
share/doc/apache/manual/mod/mod_speling.html.en
share/doc/apache/manual/mod/mod_speling.html.html
share/doc/apache/manual/mod/mod_speling.html.ja.jis
share/doc/apache/manual/mod/mod_status.html
share/doc/apache/manual/mod/mod_unique_id.html.en
share/doc/apache/manual/mod/mod_unique_id.html.html
share/doc/apache/manual/mod/mod_unique_id.html.ja.jis
share/doc/apache/manual/mod/mod_userdir.html.en
share/doc/apache/manual/mod/mod_userdir.html.html
share/doc/apache/manual/mod/mod_userdir.html.ja.jis
share/doc/apache/manual/mod/mod_usertrack.html
share/doc/apache/manual/mod/mod_vhost_alias.html
share/doc/apache/manual/mod/module-dict.html.en

share/doc/apache/manual/new_features_1_3.html.html
share/doc/apache/manual/new_features_1_3.html.ja.jis
share/doc/apache/manual/new_features_2_0.html
share/doc/apache/manual/process-model.html.en
share/doc/apache/manual/process-model.html.html
share/doc/apache/manual/process-model.html.ja.jis
share/doc/apache/manual/programs/ab.html
share/doc/apache/manual/programs/apachectl.html.en
share/doc/apache/manual/programs/apachectl.html.html
share/doc/apache/manual/programs/apachectl.html.ja.jis
share/doc/apache/manual/programs/apxs.html
share/doc/apache/manual/programs/dbmmanage.html
share/doc/apache/manual/programs/footer.html
share/doc/apache/manual/programs/header.html
share/doc/apache/manual/programs/htdigest.html
share/doc/apache/manual/programs/htpasswd.html.en
share/doc/apache/manual/programs/htpasswd.html.html
share/doc/apache/manual/programs/htpasswd.html.ja.jis
share/doc/apache/manual/programs/httpd.html.en
share/doc/apache/manual/programs/httpd.html.html
share/doc/apache/manual/programs/httpd.html.ja.jis
share/doc/apache/manual/programs/index.html.en
share/doc/apache/manual/programs/index.html.html
share/doc/apache/manual/programs/index.html.ja.jis
share/doc/apache/manual/programs/logresolve.html
share/doc/apache/manual/programs/other.html
share/doc/apache/manual/programs/rotatelogs.html
share/doc/apache/manual/programs/suexec.html.en
share/doc/apache/manual/programs/suexec.html.html
share/doc/apache/manual/programs/suexec.html.ja.jis
share/doc/apache/manual/readme-tpf.html
share/doc/apache/manual/search/manual-index.cgi
share/doc/apache/manual/sections.html.en
share/doc/apache/manual/sections.html.html
share/doc/apache/manual/sections.html.ja.jis
share/doc/apache/manual/server-wide.html.en
share/doc/apache/manual/server-wide.html.fr
share/doc/apache/manual/server-wide.html.html

share/doc/apache/manual/vhosts/details.html
share/doc/apache/manual/vhosts/details_1_2.html
share/doc/apache/manual/vhosts/examples.html
share/doc/apache/manual/vhosts/fd-limits.html.en
share/doc/apache/manual/vhosts/fd-limits.html.html
share/doc/apache/manual/vhosts/fd-limits.html.ja.jis
share/doc/apache/manual/vhosts/footer.html
share/doc/apache/manual/vhosts/header.html
share/doc/apache/manual/vhosts/host.html

share/doc/apache/manual/vhosts/name-based.html.ja.jis
share/doc/apache/manual/vhosts/vhosts-in-depth.html
share/doc/apache/manual/vhosts/virtual-host.html
share/doc/apache/manual/win_compiling.html.en
share/doc/apache/manual/win_compiling.html.html
share/doc/apache/manual/win_compiling.html.ja.jis
share/doc/apache/manual/win_service.html.en
share/doc/apache/manual/win_service.html.html
share/doc/apache/manual/win_service.html.ja.jis
share/doc/apache/manual/windows.html.en
share/doc/apache/manual/windows.html.ja.jis
www/cgi-bin.default/printenv
www/cgi-bin.default/test-cgi
www/icons/README

www/icons/continued.png
www/icons/dir.gif
www/icons/dir.png
www/icons/diskimg.gif
www/icons/diskimg.png
www/icons/down.gif
www/icons/down.png
www/icons/dvi.gif




#   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
    manualdir:     $prefix/share/doc/apache/manual
    cgidir:        $datadir/cgi-bin
    includedir:    $prefix/include/apache
    localstatedir: /var
    runtimedir:    $localstatedir/run
    logfiledir:    $localstatedir/log
    proxycachedir: $datadir/proxy
</Layout>




--- configure.orig	Tue May 21 07:24:59 2002
+++ configure	Tue Jun 18 23:39:04 2002
@@ -1169,7 +1169,8 @@
     conf_port="80"
 fi

 fi
  
 ##
@@ -1251,7 +1255,7 @@
     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"
@@ -1349,7 +1353,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_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




--- Makefile.tmpl.orig	Wed Nov 28 09:02:12 2001
+++ Makefile.tmpl	Tue Feb 12 23:07:11 2002
@@ -127,6 +127,7 @@
 runtimedir      = @runtimedir@
 logfiledir      = @logfiledir@

 			-e 's;conf/magic;$(sysconfdir)/magic;' \
 			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
 			-e 's;User nobody;User $(conf_user);' \
@@ -539,13 +558,14 @@
 			> $(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; \

 	-@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; \
-		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
-			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
-			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
-		else \
-			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
-		fi; \
 	done
+#		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
+#			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
+#			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
+#		else \
+#			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
+#		fi; \
+#	done
 	@echo "<=== [config]"
 


Return to bug 39496

Lines 7-13 Link Here

(-)Makefile (-5 / +4 lines)
7		7
8	PORTNAME= apache	8	PORTNAME= apache
9	PKGNAMESUFFIX= _fp	9	PKGNAMESUFFIX= _fp
10	PORTVERSION= 1.3.23	10	PORTVERSION= 1.3.26
		11	PORTREVISION= 0
11	CATEGORIES= www	12	CATEGORIES= www
12	MASTER_SITES= http://www.apache.org/dist/httpd/ \	13	MASTER_SITES= http://www.apache.org/dist/httpd/ \
13	http://www.freebsd.org/gifs/ \	14	http://www.freebsd.org/gifs/ \
Lines 31-39 Link Here
31		32
32	MAINTAINER= hetzels@westbend.net	33	MAINTAINER= hetzels@westbend.net
33		34
34	FORBIDDEN= "Vulnerable to denial-of-service. See" \
35	"http://httpd.apache.org/info/security_bulletin_20020617.txt"
36
37	#PATCH_SITES= http://www.apache.org/dist/patches/apply_to_${PORTVERSION}/	35	#PATCH_SITES= http://www.apache.org/dist/patches/apply_to_${PORTVERSION}/
38	#PATCHFILES=	36	#PATCHFILES=
39		37
Lines 71-77 Link Here
71	--prefix=${PREFIX} \	69	--prefix=${PREFIX} \
72	--server-gid=nogroup \	70	--server-gid=nogroup \
73	--with-perl=${PERL} \	71	--with-perl=${PERL} \
74	--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \	72	--with-layout=FreeBSD \
		73	--manualdir=${DOCSDIR}/manual \
75	--server-uid=${HTTPD_USER} \	74	--server-uid=${HTTPD_USER} \
76	--server-gid=${HTTPD_GROUP} \	75	--server-gid=${HTTPD_GROUP} \
77	--without-confadjust \	76	--without-confadjust \

Lines 117-123 Link Here

(-)pkg-plist (-20 / +60 lines)
117	share/doc/apache/index.html.it	117	share/doc/apache/index.html.it
118	share/doc/apache/index.html.ja.jis	118	share/doc/apache/index.html.ja.jis
119	share/doc/apache/index.html.kr.iso-kr	119	share/doc/apache/index.html.kr.iso-kr
120	share/doc/apache/index.html.lu	120	share/doc/apache/index.html.lb.utf8
121	share/doc/apache/index.html.nl	121	share/doc/apache/index.html.nl
122	share/doc/apache/index.html.nn	122	share/doc/apache/index.html.nn
123	share/doc/apache/index.html.no	123	share/doc/apache/index.html.no
Lines 132-145 Link Here
132	share/doc/apache/index.html.ru.ucs4	132	share/doc/apache/index.html.ru.ucs4
133	share/doc/apache/index.html.ru.utf8	133	share/doc/apache/index.html.ru.utf8
134	share/doc/apache/index.html.se	134	share/doc/apache/index.html.se
135	share/doc/apache/index.html.zh.Big5	135	share/doc/apache/index.html.zh
136	share/doc/apache/manual/LICENSE	136	share/doc/apache/manual/LICENSE
137	share/doc/apache/manual/bind.html.en	137	share/doc/apache/manual/bind.html.en
138	share/doc/apache/manual/bind.html.fr	138	share/doc/apache/manual/bind.html.fr
139	share/doc/apache/manual/bind.html.html	139	share/doc/apache/manual/bind.html.html
		140	share/doc/apache/manual/bind.html.ja.jis
140	share/doc/apache/manual/cgi_path.html.en	141	share/doc/apache/manual/cgi_path.html.en
141	share/doc/apache/manual/cgi_path.html.fr	142	share/doc/apache/manual/cgi_path.html.fr
142	share/doc/apache/manual/cgi_path.html.html	143	share/doc/apache/manual/cgi_path.html.html
		144	share/doc/apache/manual/cgi_path.html.ja.jis
143	share/doc/apache/manual/configuring.html.en	145	share/doc/apache/manual/configuring.html.en
144	share/doc/apache/manual/configuring.html.fr	146	share/doc/apache/manual/configuring.html.fr
145	share/doc/apache/manual/configuring.html.html	147	share/doc/apache/manual/configuring.html.html
Lines 245-258 Link Here
245	share/doc/apache/manual/mod/index-bytype.html.en	247	share/doc/apache/manual/mod/index-bytype.html.en
246	share/doc/apache/manual/mod/index-bytype.html.fr	248	share/doc/apache/manual/mod/index-bytype.html.fr
247	share/doc/apache/manual/mod/index-bytype.html.html	249	share/doc/apache/manual/mod/index-bytype.html.html
		250	share/doc/apache/manual/mod/index-bytype.html.ja.jis
248	share/doc/apache/manual/mod/index.html.en	251	share/doc/apache/manual/mod/index.html.en
249	share/doc/apache/manual/mod/index.html.fr	252	share/doc/apache/manual/mod/index.html.fr
250	share/doc/apache/manual/mod/index.html.html	253	share/doc/apache/manual/mod/index.html.html
251	share/doc/apache/manual/mod/index.html.ja.jis	254	share/doc/apache/manual/mod/index.html.ja.jis
252	share/doc/apache/manual/mod/mod_access.html	255	share/doc/apache/manual/mod/mod_access.html.en
253	share/doc/apache/manual/mod/mod_actions.html	256	share/doc/apache/manual/mod/mod_access.html.html
		257	share/doc/apache/manual/mod/mod_access.html.ja.jis
		258	share/doc/apache/manual/mod/mod_actions.html.en
		259	share/doc/apache/manual/mod/mod_actions.html.html
		260	share/doc/apache/manual/mod/mod_actions.html.ja.jis
254	share/doc/apache/manual/mod/mod_alias.html	261	share/doc/apache/manual/mod/mod_alias.html
255	share/doc/apache/manual/mod/mod_asis.html	262	share/doc/apache/manual/mod/mod_asis.html.en
		263	share/doc/apache/manual/mod/mod_asis.html.html
		264	share/doc/apache/manual/mod/mod_asis.html.ja.jis
256	share/doc/apache/manual/mod/mod_auth.html	265	share/doc/apache/manual/mod/mod_auth.html
257	share/doc/apache/manual/mod/mod_auth_anon.html	266	share/doc/apache/manual/mod/mod_auth_anon.html
258	share/doc/apache/manual/mod/mod_auth_db.html	267	share/doc/apache/manual/mod/mod_auth_db.html
Lines 261-267 Link Here
261	share/doc/apache/manual/mod/mod_autoindex.html	270	share/doc/apache/manual/mod/mod_autoindex.html
262	share/doc/apache/manual/mod/mod_browser.html	271	share/doc/apache/manual/mod/mod_browser.html
263	share/doc/apache/manual/mod/mod_cern_meta.html	272	share/doc/apache/manual/mod/mod_cern_meta.html
264	share/doc/apache/manual/mod/mod_cgi.html	273	share/doc/apache/manual/mod/mod_cgi.html.en
		274	share/doc/apache/manual/mod/mod_cgi.html.html
		275	share/doc/apache/manual/mod/mod_cgi.html.ja.jis
265	share/doc/apache/manual/mod/mod_cookies.html	276	share/doc/apache/manual/mod/mod_cookies.html
266	share/doc/apache/manual/mod/mod_digest.html	277	share/doc/apache/manual/mod/mod_digest.html
267	share/doc/apache/manual/mod/mod_dir.html.en	278	share/doc/apache/manual/mod/mod_dir.html.en
Lines 276-282 Link Here
276	share/doc/apache/manual/mod/mod_headers.html	287	share/doc/apache/manual/mod/mod_headers.html
277	share/doc/apache/manual/mod/mod_imap.html	288	share/doc/apache/manual/mod/mod_imap.html
278	share/doc/apache/manual/mod/mod_include.html	289	share/doc/apache/manual/mod/mod_include.html
279	share/doc/apache/manual/mod/mod_info.html	290	share/doc/apache/manual/mod/mod_info.html.en
		291	share/doc/apache/manual/mod/mod_info.html.html
		292	share/doc/apache/manual/mod/mod_info.html.ja.jis
280	share/doc/apache/manual/mod/mod_isapi.html	293	share/doc/apache/manual/mod/mod_isapi.html
281	share/doc/apache/manual/mod/mod_log_agent.html	294	share/doc/apache/manual/mod/mod_log_agent.html
282	share/doc/apache/manual/mod/mod_log_common.html	295	share/doc/apache/manual/mod/mod_log_common.html
Lines 295-305 Link Here
295	share/doc/apache/manual/mod/mod_setenvif.html.en	308	share/doc/apache/manual/mod/mod_setenvif.html.en
296	share/doc/apache/manual/mod/mod_setenvif.html.html	309	share/doc/apache/manual/mod/mod_setenvif.html.html
297	share/doc/apache/manual/mod/mod_setenvif.html.ja.jis	310	share/doc/apache/manual/mod/mod_setenvif.html.ja.jis
298	share/doc/apache/manual/mod/mod_so.html	311	share/doc/apache/manual/mod/mod_so.html.en
299	share/doc/apache/manual/mod/mod_speling.html	312	share/doc/apache/manual/mod/mod_so.html.html
		313	share/doc/apache/manual/mod/mod_so.html.ja.jis
		314	share/doc/apache/manual/mod/mod_speling.html.en
		315	share/doc/apache/manual/mod/mod_speling.html.html
		316	share/doc/apache/manual/mod/mod_speling.html.ja.jis
300	share/doc/apache/manual/mod/mod_status.html	317	share/doc/apache/manual/mod/mod_status.html
301	share/doc/apache/manual/mod/mod_unique_id.html	318	share/doc/apache/manual/mod/mod_unique_id.html.en
302	share/doc/apache/manual/mod/mod_userdir.html	319	share/doc/apache/manual/mod/mod_unique_id.html.html
		320	share/doc/apache/manual/mod/mod_unique_id.html.ja.jis
		321	share/doc/apache/manual/mod/mod_userdir.html.en
		322	share/doc/apache/manual/mod/mod_userdir.html.html
		323	share/doc/apache/manual/mod/mod_userdir.html.ja.jis
303	share/doc/apache/manual/mod/mod_usertrack.html	324	share/doc/apache/manual/mod/mod_usertrack.html
304	share/doc/apache/manual/mod/mod_vhost_alias.html	325	share/doc/apache/manual/mod/mod_vhost_alias.html
305	share/doc/apache/manual/mod/module-dict.html.en	326	share/doc/apache/manual/mod/module-dict.html.en
Lines 315-340 Link Here
315	share/doc/apache/manual/new_features_1_3.html.html	336	share/doc/apache/manual/new_features_1_3.html.html
316	share/doc/apache/manual/new_features_1_3.html.ja.jis	337	share/doc/apache/manual/new_features_1_3.html.ja.jis
317	share/doc/apache/manual/new_features_2_0.html	338	share/doc/apache/manual/new_features_2_0.html
318	share/doc/apache/manual/process-model.html	339	share/doc/apache/manual/process-model.html.en
		340	share/doc/apache/manual/process-model.html.html
		341	share/doc/apache/manual/process-model.html.ja.jis
319	share/doc/apache/manual/programs/ab.html	342	share/doc/apache/manual/programs/ab.html
320	share/doc/apache/manual/programs/apachectl.html	343	share/doc/apache/manual/programs/apachectl.html.en
		344	share/doc/apache/manual/programs/apachectl.html.html
		345	share/doc/apache/manual/programs/apachectl.html.ja.jis
321	share/doc/apache/manual/programs/apxs.html	346	share/doc/apache/manual/programs/apxs.html
322	share/doc/apache/manual/programs/dbmmanage.html	347	share/doc/apache/manual/programs/dbmmanage.html
323	share/doc/apache/manual/programs/footer.html	348	share/doc/apache/manual/programs/footer.html
324	share/doc/apache/manual/programs/header.html	349	share/doc/apache/manual/programs/header.html
325	share/doc/apache/manual/programs/htdigest.html	350	share/doc/apache/manual/programs/htdigest.html
326	share/doc/apache/manual/programs/htpasswd.html	351	share/doc/apache/manual/programs/htpasswd.html.en
327	share/doc/apache/manual/programs/httpd.html	352	share/doc/apache/manual/programs/htpasswd.html.html
		353	share/doc/apache/manual/programs/htpasswd.html.ja.jis
		354	share/doc/apache/manual/programs/httpd.html.en
		355	share/doc/apache/manual/programs/httpd.html.html
		356	share/doc/apache/manual/programs/httpd.html.ja.jis
328	share/doc/apache/manual/programs/index.html.en	357	share/doc/apache/manual/programs/index.html.en
329	share/doc/apache/manual/programs/index.html.html	358	share/doc/apache/manual/programs/index.html.html
330	share/doc/apache/manual/programs/index.html.ja.jis	359	share/doc/apache/manual/programs/index.html.ja.jis
331	share/doc/apache/manual/programs/logresolve.html	360	share/doc/apache/manual/programs/logresolve.html
332	share/doc/apache/manual/programs/other.html	361	share/doc/apache/manual/programs/other.html
333	share/doc/apache/manual/programs/rotatelogs.html	362	share/doc/apache/manual/programs/rotatelogs.html
334	share/doc/apache/manual/programs/suexec.html	363	share/doc/apache/manual/programs/suexec.html.en
		364	share/doc/apache/manual/programs/suexec.html.html
		365	share/doc/apache/manual/programs/suexec.html.ja.jis
335	share/doc/apache/manual/readme-tpf.html	366	share/doc/apache/manual/readme-tpf.html
336	share/doc/apache/manual/search/manual-index.cgi	367	share/doc/apache/manual/search/manual-index.cgi
337	share/doc/apache/manual/sections.html	368	share/doc/apache/manual/sections.html.en
		369	share/doc/apache/manual/sections.html.html
		370	share/doc/apache/manual/sections.html.ja.jis
338	share/doc/apache/manual/server-wide.html.en	371	share/doc/apache/manual/server-wide.html.en
339	share/doc/apache/manual/server-wide.html.fr	372	share/doc/apache/manual/server-wide.html.fr
340	share/doc/apache/manual/server-wide.html.html	373	share/doc/apache/manual/server-wide.html.html
Lines 354-360 Link Here
354	share/doc/apache/manual/vhosts/details.html	387	share/doc/apache/manual/vhosts/details.html
355	share/doc/apache/manual/vhosts/details_1_2.html	388	share/doc/apache/manual/vhosts/details_1_2.html
356	share/doc/apache/manual/vhosts/examples.html	389	share/doc/apache/manual/vhosts/examples.html
357	share/doc/apache/manual/vhosts/fd-limits.html	390	share/doc/apache/manual/vhosts/fd-limits.html.en
		391	share/doc/apache/manual/vhosts/fd-limits.html.html
		392	share/doc/apache/manual/vhosts/fd-limits.html.ja.jis
358	share/doc/apache/manual/vhosts/footer.html	393	share/doc/apache/manual/vhosts/footer.html
359	share/doc/apache/manual/vhosts/header.html	394	share/doc/apache/manual/vhosts/header.html
360	share/doc/apache/manual/vhosts/host.html	395	share/doc/apache/manual/vhosts/host.html
Lines 368-378 Link Here
368	share/doc/apache/manual/vhosts/name-based.html.ja.jis	403	share/doc/apache/manual/vhosts/name-based.html.ja.jis
369	share/doc/apache/manual/vhosts/vhosts-in-depth.html	404	share/doc/apache/manual/vhosts/vhosts-in-depth.html
370	share/doc/apache/manual/vhosts/virtual-host.html	405	share/doc/apache/manual/vhosts/virtual-host.html
371	share/doc/apache/manual/win_compiling.html	406	share/doc/apache/manual/win_compiling.html.en
		407	share/doc/apache/manual/win_compiling.html.html
		408	share/doc/apache/manual/win_compiling.html.ja.jis
372	share/doc/apache/manual/win_service.html.en	409	share/doc/apache/manual/win_service.html.en
373	share/doc/apache/manual/win_service.html.html	410	share/doc/apache/manual/win_service.html.html
374	share/doc/apache/manual/win_service.html.ja.jis	411	share/doc/apache/manual/win_service.html.ja.jis
375	share/doc/apache/manual/windows.html	412	share/doc/apache/manual/windows.html.en
		413	share/doc/apache/manual/windows.html.ja.jis
376	www/cgi-bin.default/printenv	414	www/cgi-bin.default/printenv
377	www/cgi-bin.default/test-cgi	415	www/cgi-bin.default/test-cgi
378	www/icons/README	416	www/icons/README
Lines 418-423 Link Here
418	www/icons/continued.png	456	www/icons/continued.png
419	www/icons/dir.gif	457	www/icons/dir.gif
420	www/icons/dir.png	458	www/icons/dir.png
		459	www/icons/diskimg.gif
		460	www/icons/diskimg.png
421	www/icons/down.gif	461	www/icons/down.gif
422	www/icons/down.png	462	www/icons/down.png
423	www/icons/dvi.gif	463	www/icons/dvi.gif

Removed Link Here

(-)files/FreeBSD.layout (-20 lines)
1	# FreeBSD layout...
2	<Layout FreeBSD>
3	prefix: /usr/local
4	exec_prefix: $prefix
5	bindir: $exec_prefix/bin
6	sbindir: $exec_prefix/sbin
7	libexecdir: $exec_prefix/libexec/apache
8	mandir: $prefix/man
9	sysconfdir: $prefix/etc/apache
10	datadir: $prefix/www
11	iconsdir: $datadir/icons
12	htdocsdir: $datadir/data
13	manualdir: $prefix/share/doc/apache/manual
14	cgidir: $datadir/cgi-bin
15	includedir: $prefix/include/apache
16	localstatedir: /var
17	runtimedir: $localstatedir/run
18	logfiledir: $localstatedir/log
19	proxycachedir: $datadir/proxy
20	</Layout>

Lines 1-5 Link Here

(-)files/patch-aa (-8 / +4 lines)
1	--- configure.orig Thu Sep 27 13:12:03 2001	1	--- configure.orig Tue May 21 07:24:59 2002
2	+++ configure Fri Jan 25 14:32:58 2002	2	+++ configure Tue Jun 18 23:39:04 2002
3	@@ -1169,7 +1169,8 @@	3	@@ -1169,7 +1169,8 @@
4	conf_port="80"	4	conf_port="80"
5	fi	5	fi
Lines 22-45 Link Here
22	fi	22	fi
23		23
24	##	24	##
25	@@ -1251,8 +1255,8 @@	25	@@ -1251,7 +1255,7 @@
26	echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"	26	echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
27	echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"	27	echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
28	echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"	28	echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
29	- echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
30	- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"	29	- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
31	+ echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
32	+ echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"	30	+ echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
33	echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"	31	echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
34	echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"	32	echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
35	echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"	33	echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
36	@@ -1350,8 +1354,8 @@	34	@@ -1349,7 +1353,7 @@
37	echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci	35	echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
38	echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci	36	echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
39	echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci	37	echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
40	-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
41	-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci	38	-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
42	+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
43	+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci	39	+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
44	echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci	40	echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
45	echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci	41	echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci

Lines 1-5 Link Here

(-)files/patch-ab (-19 / +2 lines)
1	--- Makefile.tmpl.orig Wed Nov 28 09:02:12 2001	1	--- Makefile.tmpl.orig Wed Nov 28 09:02:12 2001
2	+++ Makefile.tmpl Fri Jan 25 14:48:40 2002	2	+++ Makefile.tmpl Tue Feb 12 23:07:11 2002
3	@@ -127,6 +127,7 @@	3	@@ -127,6 +127,7 @@
4	runtimedir = @runtimedir@	4	runtimedir = @runtimedir@
5	logfiledir = @logfiledir@	5	logfiledir = @logfiledir@
Lines 139-145 Link Here
139	-e 's;conf/magic;$(sysconfdir)/magic;' \	139	-e 's;conf/magic;$(sysconfdir)/magic;' \
140	-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \	140	-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
141	-e 's;User nobody;User $(conf_user);' \	141	-e 's;User nobody;User $(conf_user);' \
142	@@ -539,23 +558,25 @@	142	@@ -539,13 +558,14 @@
143	> $(TOP)/$(SRC)/.apaci.install.tmp && \	143	> $(TOP)/$(SRC)/.apaci.install.tmp && \
144	echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \	144	echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
145	$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \	145	$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
Lines 160-179 Link Here
160	-@for conf in mime.types magic; do \	160	-@for conf in mime.types magic; do \
161	echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \	161	echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
162	$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \	162	$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
163	- if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
164	- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
165	- $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
166	- else \
167	- echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
168	- fi; \
169	done
170	+# if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
171	+# echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
172	+# $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
173	+# else \
174	+# echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
175	+# fi; \
176	+# done
177	@echo "<=== [config]"
178
179