Attachment #21211 for bug #37211

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

Lines 41-47 Link Here

(-)apache2/Makefile (-2 / +7 lines)
41	LDFLAGS="${LDFLAGS}"	41	LDFLAGS="${LDFLAGS}"
42	SHARED_MODULES= all cgid charset_lite ext_filter case_filter case_filter_in \	42	SHARED_MODULES= all cgid charset_lite ext_filter case_filter case_filter_in \
43	deflate bucketeer	43	deflate bucketeer
44	RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g'	44	RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' -e 's,@@DESTDIR@@,${DESTDIR},g'
		45	MAKE_ENV+= DESTDIR=${DESTDIR}
		46	PLIST_SUB+= DESTDIR=${DESTDIR}
45		47
46	.if defined(NOPORTDOCS)	48	.if defined(NOPORTDOCS)
47	MAKE_ENV+= NOPORTDOCS=YES	49	MAKE_ENV+= NOPORTDOCS=YES
Lines 68-74 Link Here
68	--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \	70	--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
69	--with-suexec-docroot="${PREFIX}/www/data" \	71	--with-suexec-docroot="${PREFIX}/www/data" \
70	--with-suexec-safepath="${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \	72	--with-suexec-safepath="${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
71	--with-suexec-logfile="/var/log/httpd-suexec.log"	73	--with-suexec-logfile="${DESTDIR}/var/log/httpd-suexec.log"
72	PLIST_SUB+= SUEXEC=""	74	PLIST_SUB+= SUEXEC=""
73	.else	75	.else
74	PLIST_SUB+= SUEXEC="@comment "	76	PLIST_SUB+= SUEXEC="@comment "
Lines 112-117 Link Here
112	); done	114	); done
113	@${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;	115	@${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
114	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh	116	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
		117	@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
115	.if ${OSVERSION} >= 500032	118	.if ${OSVERSION} >= 500032
116	.for ltfile in srclib/pcre/ltmain.sh srclib/apr/build/ltmain.sh \	119	.for ltfile in srclib/pcre/ltmain.sh srclib/apr/build/ltmain.sh \
117	srclib/apr-util/xml/expat/conftools/ltmain.sh	120	srclib/apr-util/xml/expat/conftools/ltmain.sh
Lines 128-132 Link Here
128	${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \	131	${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
129	${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \	132	${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
130	fi	133	fi
		134	[ -d ${DESTDIR}/var/log ] \|\| ${MKDIR} ${DESTDIR}/var/log
		135	[ -d ${DESTDIR}/var/run ] \|\| ${MKDIR} ${DESTDIR}/var/run
131		136
132	.include <bsd.port.post.mk>	137	.include <bsd.port.post.mk>

Lines 7-13 Link Here

(-)apache2/files/apache.sh (-1 / +1 lines)
7	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'	7	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
8	;;	8	;;
9	stop)	9	stop)
10	[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'	10	[ -r @@DESTDIR@@/var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
11	;;	11	;;
12	*)	12	*)
13	echo "Usage: `basename $0` {start\|stop}" >&2	13	echo "Usage: `basename $0` {start\|stop}" >&2




<Layout FreeBSD>
  prefix:        /usr/local
  exec_prefix:   ${prefix}
  bindir:        ${exec_prefix}/bin
  sbindir:       ${exec_prefix}/sbin
  libexecdir:    ${exec_prefix}/libexec/apache2
  mandir:        ${prefix}/man
  sysconfdir:    ${prefix}/etc/apache2
  datadir:       ${prefix}/www
  installbuilddir: ${prefix}/share/apache2
  errordir:      ${datadir}/error
  iconsdir:      ${datadir}/icons
  htdocsdir:     ${datadir}/data
  manualdir:     ${prefix}/share/doc/apache2
  cgidir:        ${datadir}/cgi-bin
  includedir:    ${prefix}/include/apache2
  localstatedir: @@DESTDIR@@/var
  runtimedir:    ${localstatedir}/run
  logfiledir:    ${localstatedir}/log
  proxycachedir: ${datadir}/proxy
  infodir:       ${exec_prefix}/share/info
</Layout>




--- Makefile.in.orig	Sat Apr  6 04:36:06 2002
+++ Makefile.in	Thu Apr 18 09:22:29 2002
@@ -33,23 +33,28 @@
 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
 	@cd $(top_srcdir)/docs/conf; \
 	for i in mime.types magic; do \

 		( \
 			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
 			if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
 				sed -e 's#@@ServerRoot@@#$(prefix)#g' \
 					-e 's#@@Port@@#$(PORT)#g' \
+					-e 's#@@DESTDIR@@#$(DESTDIR)#g' \
 					-e '/@@LoadModule@@/d' \
 					< $$i; \
 			else \
 				sed -n -e '/@@LoadModule@@/q' \
 					-e 's#@@ServerRoot@@#$(prefix)#g' \
 					-e 's#@@Port@@#$(PORT)#g' \
+					-e 's#@@DESTDIR@@#$(DESTDIR)#g' \
 					-e 'p' \
 					< $$i; \
 				for j in $(DSO_MODULES) "^EOL^"; do \
@@ -57,7 +62,7 @@
 						echo "<IfDefine SSL>"; \
 					fi; \
 					if test $$j != "^EOL^"; then \

 					fi; \
 					if test "x$$j" = "xssl"; then \
 						echo "</IfDefine>"; \
@@ -106,11 +111,14 @@
 
 install-htdocs:
 	@echo Installing HTML documents

 
 install-error:
 	@echo Installing error documents
@@ -126,9 +134,10 @@
 
 install-cgi:
 	@echo Installing CGIs




--- config.layout.orig	Fri Mar 29 04:04:47 2002
+++ config.layout	Sun Apr  7 06:27:03 2002
@@ -309,3 +309,26 @@
     installbuilddir: ${prefix}/etc/apache2/build
     errordir:      ${datadir}/error
 </Layout>
+
+<Layout FreeBSD>
+    prefix:        /usr/local
+    exec_prefix:   ${prefix}
+    bindir:        ${exec_prefix}/bin
+    sbindir:       ${exec_prefix}/sbin
+    libexecdir:    ${exec_prefix}/libexec/apache2
+    mandir:        ${prefix}/man
+    sysconfdir:    ${prefix}/etc/apache2
+    datadir:       ${prefix}/www
+    installbuilddir: ${prefix}/share/apache2
+    errordir:      ${datadir}/error
+    iconsdir:      ${datadir}/icons
+    htdocsdir:     ${datadir}/data
+    manualdir:     ${prefix}/share/doc/apache2
+    cgidir:        ${datadir}/cgi-bin
+    includedir:    ${prefix}/include/apache2
+    localstatedir: /var
+    runtimedir:    ${localstatedir}/run
+    logfiledir:    ${localstatedir}/log
+    proxycachedir: ${datadir}/proxy
+    infodir:       ${exec_prefix}/share/info
+</Layout>




-#SSLSessionCache        shmht:logs/ssl_scache(512000)
-#SSLSessionCache        shmcb:logs/ssl_scache(512000)
-SSLSessionCache         dbm:logs/ssl_scache
+#SSLSessionCache        shmht:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+#SSLSessionCache        shmcb:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+SSLSessionCache         dbm:@@DESTDIR@@/var/log/httpd-ssl_scache
 SSLSessionCacheTimeout  300
 
 #   Semaphore:
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
-SSLMutex  file:logs/ssl_mutex
+SSLMutex  file:@@DESTDIR@@/var/log/httpd-ssl_mutex
 
 #   Pseudo Random Number Generator (PRNG):
 #   Configure one or more sources to seed the PRNG of the 

 #   Log levels are (ascending order: higher ones include lower ones):
 #   none, error, warn, info, trace, debug.
-SSLLog      logs/ssl_engine_log
+SSLLog      @@DESTDIR@@/var/log/httpd-ssl_engine_log
 SSLLogLevel info
 
 ##

 ServerAdmin you@your.address
-ErrorLog logs/error_log
-TransferLog logs/access_log
+ErrorLog @@DESTDIR@@/var/log/httpd-error.log
+TransferLog @@DESTDIR@@/var/log/httpd-access.log
 
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.

 #   The home of a custom SSL log file. Use this when you want a
 #   compact non-error SSL logfile on a virtual host basis.
-CustomLog logs/ssl_request_log \
+CustomLog @@DESTDIR@@/var/log/httpd-ssl_request.log \
           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
 </VirtualHost>                                  

Lines 5-11 Link Here

(-)apache2/files/patch-support:log_server_status.in (-1 / +1 lines)
5	require 'sys/socket.ph';	5	require 'sys/socket.ph';
6		6
7	-$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312"	7	-$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312"
8	+$wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log"	8	+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log"
9	$server = "localhost"; # Name of server, could be "www.foo.com"	9	$server = "localhost"; # Name of server, could be "www.foo.com"
10	$port = "80"; # Port on server	10	$port = "80"; # Port on server
11	-$request = "/status/?auto"; # Request to send	11	-$request = "/status/?auto"; # Request to send




#!/bin/sh
# $FreeBSD: ports/www/apache2/pkg-deinstall,v 1.4 2001/12/07 23:12:32 ache Exp $
#

if [ "$2" != "POST-DEINSTALL" ]; then
    exit 0
fi

USER=www

if pw usershow "${USER}" 2>/dev/null 1>&2; then
	echo "To delete Apache user permanently, use 'pw userdel ${USER}'"
fi

exit 0

Lines 815-817 Link Here

(-)apache2/pkg-plist (+2 lines)
815	@dirrm lib/apache2	815	@dirrm lib/apache2
816	@dirrm include/apache2	816	@dirrm include/apache2
817	@dirrm etc/apache2	817	@dirrm etc/apache2
		818	@exec [ -d %%DESTDIR%%/var/log ] \|\| mkdir -p %%DESTDIR%%/var/log
		819	@exec [ -d %%DESTDIR%%/var/run ] \|\| mkdir -p %%DESTDIR%%/var/run

Return to bug 37211

Line 0 Link Here

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

Lines 1-6 Link Here

(-)apache2/files/patch-Makefile.in (-5 / +18 lines)
1	--- Makefile.in.orig Sat Apr 6 04:36:06 2002	1	--- Makefile.in.orig Sat Apr 6 04:36:06 2002
2	+++ Makefile.in Sun Apr 7 08:26:45 2002	2	+++ Makefile.in Thu Apr 18 09:22:29 2002
3	@@ -33,12 +33,15 @@	3	@@ -33,23 +33,28 @@
4	@test -d $(sysconfdir) \|\| $(MKINSTALLDIRS) $(sysconfdir)	4	@test -d $(sysconfdir) \|\| $(MKINSTALLDIRS) $(sysconfdir)
5	@cd $(top_srcdir)/docs/conf; \	5	@cd $(top_srcdir)/docs/conf; \
6	for i in mime.types magic; do \	6	for i in mime.types magic; do \
Lines 17-23 Link Here
17	( \	17	( \
18	n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \	18	n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
19	if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \	19	if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
20	@@ -57,7 +60,7 @@	20	sed -e 's#@@ServerRoot@@#$(prefix)#g' \
		21	-e 's#@@Port@@#$(PORT)#g' \
		22	+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
		23	-e '/@@LoadModule@@/d' \
		24	< $$i; \
		25	else \
		26	sed -n -e '/@@LoadModule@@/q' \
		27	-e 's#@@ServerRoot@@#$(prefix)#g' \
		28	-e 's#@@Port@@#$(PORT)#g' \
		29	+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
		30	-e 'p' \
		31	< $$i; \
		32	for j in $(DSO_MODULES) "^EOL^"; do \
		33	@@ -57,7 +62,7 @@
21	echo "<IfDefine SSL>"; \	34	echo "<IfDefine SSL>"; \
22	fi; \	35	fi; \
23	if test $$j != "^EOL^"; then \	36	if test $$j != "^EOL^"; then \
Lines 26-32 Link Here
26	fi; \	39	fi; \
27	if test "x$$j" = "xssl"; then \	40	if test "x$$j" = "xssl"; then \
28	echo "</IfDefine>"; \	41	echo "</IfDefine>"; \
29	@@ -106,11 +109,14 @@	42	@@ -106,11 +111,14 @@
30		43
31	install-htdocs:	44	install-htdocs:
32	@echo Installing HTML documents	45	@echo Installing HTML documents
Lines 44-50 Link Here
44		57
45	install-error:	58	install-error:
46	@echo Installing error documents	59	@echo Installing error documents
47	@@ -126,9 +132,10 @@	60	@@ -126,9 +134,10 @@
48		61
49	install-cgi:	62	install-cgi:
50	@echo Installing CGIs	63	@echo Installing CGIs

Lines 1-29 Link Here

(-)apache2/files/patch-config.layout (-29 lines)
1	--- config.layout.orig Fri Mar 29 04:04:47 2002
2	+++ config.layout Sun Apr 7 06:27:03 2002
3	@@ -309,3 +309,26 @@
4	installbuilddir: ${prefix}/etc/apache2/build
5	errordir: ${datadir}/error
6	</Layout>
7	+
8	+<Layout FreeBSD>
9	+ prefix: /usr/local
10	+ exec_prefix: ${prefix}
11	+ bindir: ${exec_prefix}/bin
12	+ sbindir: ${exec_prefix}/sbin
13	+ libexecdir: ${exec_prefix}/libexec/apache2
14	+ mandir: ${prefix}/man
15	+ sysconfdir: ${prefix}/etc/apache2
16	+ datadir: ${prefix}/www
17	+ installbuilddir: ${prefix}/share/apache2
18	+ errordir: ${datadir}/error
19	+ iconsdir: ${datadir}/icons
20	+ htdocsdir: ${datadir}/data
21	+ manualdir: ${prefix}/share/doc/apache2
22	+ cgidir: ${datadir}/cgi-bin
23	+ includedir: ${prefix}/include/apache2
24	+ localstatedir: /var
25	+ runtimedir: ${localstatedir}/run
26	+ logfiledir: ${localstatedir}/log
27	+ proxycachedir: ${datadir}/proxy
28	+ infodir: ${exec_prefix}/share/info
29	+</Layout>

Lines 7-22 Link Here

(-)apache2/files/patch-docs:conf:ssl-std.conf (-8 / +8 lines)
7	-#SSLSessionCache shmht:logs/ssl_scache(512000)	7	-#SSLSessionCache shmht:logs/ssl_scache(512000)
8	-#SSLSessionCache shmcb:logs/ssl_scache(512000)	8	-#SSLSessionCache shmcb:logs/ssl_scache(512000)
9	-SSLSessionCache dbm:logs/ssl_scache	9	-SSLSessionCache dbm:logs/ssl_scache
10	+#SSLSessionCache shmht:/var/log/httpd-ssl_scache(512000)	10	+#SSLSessionCache shmht:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
11	+#SSLSessionCache shmcb:/var/log/httpd-ssl_scache(512000)	11	+#SSLSessionCache shmcb:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
12	+SSLSessionCache dbm:/var/log/httpd-ssl_scache	12	+SSLSessionCache dbm:@@DESTDIR@@/var/log/httpd-ssl_scache
13	SSLSessionCacheTimeout 300	13	SSLSessionCacheTimeout 300
14		14
15	# Semaphore:	15	# Semaphore:
16	# Configure the path to the mutual exclusion semaphore the	16	# Configure the path to the mutual exclusion semaphore the
17	# SSL engine uses internally for inter-process synchronization.	17	# SSL engine uses internally for inter-process synchronization.
18	-SSLMutex file:logs/ssl_mutex	18	-SSLMutex file:logs/ssl_mutex
19	+SSLMutex file:/var/log/httpd-ssl_mutex	19	+SSLMutex file:@@DESTDIR@@/var/log/httpd-ssl_mutex
20		20
21	# Pseudo Random Number Generator (PRNG):	21	# Pseudo Random Number Generator (PRNG):
22	# Configure one or more sources to seed the PRNG of the	22	# Configure one or more sources to seed the PRNG of the
Lines 25-31 Link Here
25	# Log levels are (ascending order: higher ones include lower ones):	25	# Log levels are (ascending order: higher ones include lower ones):
26	# none, error, warn, info, trace, debug.	26	# none, error, warn, info, trace, debug.
27	-SSLLog logs/ssl_engine_log	27	-SSLLog logs/ssl_engine_log
28	+SSLLog /var/log/httpd-ssl_engine_log	28	+SSLLog @@DESTDIR@@/var/log/httpd-ssl_engine_log
29	SSLLogLevel info	29	SSLLogLevel info
30		30
31	##	31	##
Lines 39-46 Link Here
39	ServerAdmin you@your.address	39	ServerAdmin you@your.address
40	-ErrorLog logs/error_log	40	-ErrorLog logs/error_log
41	-TransferLog logs/access_log	41	-TransferLog logs/access_log
42	+ErrorLog /var/log/httpd-error.log	42	+ErrorLog @@DESTDIR@@/var/log/httpd-error.log
43	+TransferLog /var/log/httpd-access.log	43	+TransferLog @@DESTDIR@@/var/log/httpd-access.log
44		44
45	# SSL Engine Switch:	45	# SSL Engine Switch:
46	# Enable/Disable SSL for this virtual host.	46	# Enable/Disable SSL for this virtual host.
Lines 110-116 Link Here
110	# The home of a custom SSL log file. Use this when you want a	110	# The home of a custom SSL log file. Use this when you want a
111	# compact non-error SSL logfile on a virtual host basis.	111	# compact non-error SSL logfile on a virtual host basis.
112	-CustomLog logs/ssl_request_log \	112	-CustomLog logs/ssl_request_log \
113	+CustomLog /var/log/httpd-ssl_request.log \	113	+CustomLog @@DESTDIR@@/var/log/httpd-ssl_request.log \
114	"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"	114	"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
115		115
116	</VirtualHost>	116	</VirtualHost>

Lines 1-15 Link Here

(-)apache2/pkg-deinstall (-15 lines)
1	#!/bin/sh
2	# $FreeBSD: ports/www/apache2/pkg-deinstall,v 1.4 2001/12/07 23:12:32 ache Exp $
3	#
4
5	if [ "$2" != "POST-DEINSTALL" ]; then
6	exit 0
7	fi
8
9	USER=www
10
11	if pw usershow "${USER}" 2>/dev/null 1>&2; then
12	echo "To delete Apache user permanently, use 'pw userdel ${USER}'"
13	fi
14
15	exit 0