[packages/boa.git] / boa-PLD.patch

--- ./src/compat.h.orig	Mon Jul 30 13:44:30 2001
+++ ./src/compat.h	Mon Jul 30 14:16:47 2001
@@ -71,7 +71,7 @@
 
 #ifdef INET6
 #define SOCKADDR sockaddr_storage
-#define S_FAMILY __s_family
+#define S_FAMILY ss_family
 #define SERVER_AF AF_INET6
 #else
 #define SOCKADDR sockaddr_in
--- ./src/defines.h.orig	Mon Jul 30 13:45:47 2001
+++ ./src/defines.h	Mon Jul 30 13:46:46 2001
@@ -27,7 +27,7 @@
 /***** Change this, or use -c on the command line to specify it *****/
 
 #ifndef SERVER_ROOT
-#define SERVER_ROOT "/etc/boa"
+#define SERVER_ROOT "/etc/httpd"
 #endif
 
 /***** Various stuff that you may want to tweak, but probably shouldn't *****/
--- ./src/Makefile.in.orig	Mon Jul 30 13:52:33 2001
+++ ./src/Makefile.in	Mon Jul 30 14:11:26 2001
@@ -14,7 +14,8 @@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-CFLAGS = @CFLAGS@ -I.
+#CFLAGS = @CFLAGS@ -I.
+CFLAGS = @CFLAGS@
 
 # Change these if necessary
 
--- ./boa.conf.orig	Mon Jul 30 13:49:43 2001
+++ ./boa.conf	Mon Jul 30 13:52:00 2001
@@ -45,8 +45,8 @@
 #  User: The name or UID the server should run as.
 # Group: The group name or GID the server should run as.
 
-User nobody
-Group nogroup
+User http
+Group http
 
 # ServerAdmin: The email address where server problems should be sent.
 # Note: this is not currently used, except as an environment variable
@@ -59,7 +59,7 @@
 # Set to /dev/null if you don't want errors logged.
 # If unset, defaults to /dev/stderr
 
-ErrorLog /var/log/boa/error_log
+ErrorLog /var/log/httpd/error_log
 # Please NOTE: Sending the logs to a pipe ('|'), as shown below,
 #  is somewhat experimental and might fail under heavy load.
 # "Usual libc implementations of printf will stall the whole
@@ -71,7 +71,7 @@
 # Comment out or set to /dev/null (less effective) to disable 
 # Access logging.
 
-AccessLog /var/log/boa/access_log
+AccessLog /var/log/httpd/access_log
 # Please NOTE: Sending the logs to a pipe ('|'), as shown below,
 #  is somewhat experimental and might fail under heavy load.
 # "Usual libc implementations of printf will stall the whole
@@ -108,7 +108,7 @@
 # DocumentRoot: The root directory of the HTML documents.
 # Comment out to disable server non user files.
 
-DocumentRoot /var/www
+DocumentRoot /home/httpd/html
 
 # UserDir: The name of the directory which is appended onto a user's home
 # directory if a ~user request is recieved.
@@ -127,7 +127,7 @@
 # DirectoryIndex are commented out, accessing a directory will give
 # an error (though accessing files in the directory are still ok).
 
-DirectoryMaker /usr/lib/boa/boa_indexer
+DirectoryMaker /usr/sbin/boa_indexer
 
 # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
 # has been commented out, the the on-the-fly indexing of Boa can be used
@@ -182,5 +182,5 @@
 # ScriptAlias: Maps a virtual path to a directory for serving scripts
 # Example: ScriptAlias /htbin/ /www/htbin/
 
-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
Commit	Line	Data
8c6f8622 PG	1	--- ./src/compat.h.orig Mon Jul 30 13:44:30 2001
	2	+++ ./src/compat.h Mon Jul 30 14:16:47 2001
	3	@@ -71,7 +71,7 @@
	4
	5	#ifdef INET6
	6	#define SOCKADDR sockaddr_storage
	7	-#define S_FAMILY __s_family
cf6d1e52	8	+#define S_FAMILY ss_family
8c6f8622 PG	9	#define SERVER_AF AF_INET6
	10	#else
	11	#define SOCKADDR sockaddr_in
	12	--- ./src/defines.h.orig Mon Jul 30 13:45:47 2001
	13	+++ ./src/defines.h Mon Jul 30 13:46:46 2001
	14	@@ -27,7 +27,7 @@
	15	/*** Change this, or use -c on the command line to specify it ***/
	16
	17	#ifndef SERVER_ROOT
	18	-#define SERVER_ROOT "/etc/boa"
	19	+#define SERVER_ROOT "/etc/httpd"
	20	#endif
	21
	22	/*** Various stuff that you may want to tweak, but probably shouldn't ***/
8c6f8622 PG	23	--- ./src/Makefile.in.orig Mon Jul 30 13:52:33 2001
	24	+++ ./src/Makefile.in Mon Jul 30 14:11:26 2001
	25	@@ -14,7 +14,8 @@
	26
	27	LDFLAGS = @LDFLAGS@
	28	LIBS = @LIBS@
	29	-CFLAGS = @CFLAGS@ -I.
	30	+#CFLAGS = @CFLAGS@ -I.
	31	+CFLAGS = @CFLAGS@
	32
	33	# Change these if necessary
	34
	35	--- ./boa.conf.orig Mon Jul 30 13:49:43 2001
	36	+++ ./boa.conf Mon Jul 30 13:52:00 2001
1e3d5c08	37	@@ -45,8 +45,8 @@
944accd6 JR	38	# User: The name or UID the server should run as.
	39	# Group: The group name or GID the server should run as.
	40
	41	-User nobody
	42	-Group nogroup
	43	+User http
9f36af75	44	+Group http
944accd6 JR	45
944accd6 JR	46	# ServerAdmin: The email address where server problems should be sent.
1e3d5c08	47	# Note: this is not currently used, except as an environment variable
1e3d5c08	48	@@ -59,7 +59,7 @@
18bbd9d3	49	# Set to /dev/null if you don't want errors logged.
1e3d5c08	50	# If unset, defaults to /dev/stderr
18bbd9d3 JR	51
	52	-ErrorLog /var/log/boa/error_log
	53	+ErrorLog /var/log/httpd/error_log
1e3d5c08	54	# Please NOTE: Sending the logs to a pipe ('\|'), as shown below,
	55	# is somewhat experimental and might fail under heavy load.
	56	# "Usual libc implementations of printf will stall the whole
	57	@@ -71,7 +71,7 @@
18bbd9d3 JR	58	# Comment out or set to /dev/null (less effective) to disable
	59	# Access logging.
	60
	61	-AccessLog /var/log/boa/access_log
	62	+AccessLog /var/log/httpd/access_log
1e3d5c08	63	# Please NOTE: Sending the logs to a pipe ('\|'), as shown below,
	64	# is somewhat experimental and might fail under heavy load.
	65	# "Usual libc implementations of printf will stall the whole
	66	@@ -108,7 +108,7 @@
944accd6	67	# DocumentRoot: The root directory of the HTML documents.
1e3d5c08	68	# Comment out to disable server non user files.
944accd6 JR	69
944accd6 JR	70	-DocumentRoot /var/www
ff223964	71	+DocumentRoot /home/httpd/html
944accd6	72
1e3d5c08	73	# UserDir: The name of the directory which is appended onto a user's home
	74	# directory if a ~user request is recieved.
	75	@@ -127,7 +127,7 @@
	76	# DirectoryIndex are commented out, accessing a directory will give
	77	# an error (though accessing files in the directory are still ok).
944accd6	78
1e3d5c08	79	-DirectoryMaker /usr/lib/boa/boa_indexer
240d4b68	80	+DirectoryMaker /usr/sbin/boa_indexer
944accd6	81
1e3d5c08	82	# DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
	83	# has been commented out, the the on-the-fly indexing of Boa can be used
	84	@@ -182,5 +182,5 @@
944accd6 JR	85	# ScriptAlias: Maps a virtual path to a directory for serving scripts
	86	# Example: ScriptAlias /htbin/ /www/htbin/
	87
	88	-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
f0dafed8	89	+ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
944accd6	90