diff --git a/boa/boa.mime b/boa/boa.mime
new file mode 100644
index 0000000000..1583cb0d2d
--- /dev/null
+++ b/boa/boa.mime
@@ -0,0 +1,42 @@
+##
+## boa.mime -- Boa MIME Types
+##
+
+# This file controls what Internet media types are sent to the
+# client for given file extension(s). For more information
+# about Internet media types, please read RFC 2045, 2046,
+# 2047, 2048, and 2077. The Internet media type registry is at
+# .
+
+text/plain txt asc
+
+text/css css
+text/html html htm
+
+application/xhtml+xml xhtml xht
+application/xslt+xml xslt
+application/rdf+xml rdf
+application/xml-dtd dtd
+application/xml xml xsl
+
+image/gif gif
+image/ief ief
+image/jpeg jpeg jpg
+image/png png
+image/svg+xml svg
+image/tiff tiff tif
+
+video/mpeg mpeg mpg
+video/quicktime qt mov
+video/x-msvideo avi
+
+application/vnd.ms-excel xls
+application/vnd.ms-powerpoint ppt
+application/msword doc
+text/rtf rtf
+
+application/postscript ps eps
+application/pdf pdf
+
+application/octet-stream bin
+
diff --git a/boa/boa.patch b/boa/boa.patch
index 259f034ea8..4368bafec4 100644
--- a/boa/boa.patch
+++ b/boa/boa.patch
@@ -1,7 +1,22 @@
+Index: src/boa.c
+--- src/boa.c.orig 2004-06-04 04:36:33 +0200
++++ src/boa.c 2005-02-17 17:37:18 +0100
+@@ -55,10 +55,7 @@
+ pid_t pid;
+
+ /* set umask to u+rw, u-x, go-rwx */
+- if (umask(077) < 0) {
+- perror("umask");
+- exit(EXIT_FAILURE);
+- }
++ umask(077);
+
+ /* but first, update timestamp, because log_error_time uses it */
+ (void) time(¤t_time);
Index: src/config.c
---- src/config.c.orig 2003-12-09 05:17:22.000000000 +0100
-+++ src/config.c 2004-03-13 18:42:45.000000000 +0100
-@@ -419,8 +419,11 @@
+--- src/config.c.orig 2004-06-04 04:49:13 +0200
++++ src/config.c 2005-02-17 17:34:28 +0100
+@@ -428,8 +428,11 @@
static void trim(char *s)
{
@@ -14,7 +29,7 @@ Index: src/config.c
while (isspace(*c) && c > s) {
*c = '\0';
--c;
-@@ -454,8 +457,9 @@
+@@ -463,8 +466,9 @@
c = NULL;
} else {
/* one or more args */
@@ -26,3 +41,48 @@ Index: src/config.c
}
p = lookup_keyword(buf);
+Index: src/get.c
+--- src/get.c.orig 2004-06-10 03:55:39 +0200
++++ src/get.c 2005-02-17 17:40:25 +0100
+@@ -625,7 +625,7 @@
+ */
+ snprintf(pathname_with_index, sizeof(pathname_with_index),
+ "%s/dir.%d.%ld", cachedir,
+- (int) statbuf->st_dev, statbuf->st_ino);
++ (int) statbuf->st_dev, (long)statbuf->st_ino);
+ data_fd = open(pathname_with_index, O_RDONLY);
+
+ if (data_fd != -1) { /* index cache */
+Index: src/globals.h
+--- src/globals.h.orig 2004-03-05 04:41:33 +0100
++++ src/globals.h 2005-02-17 17:40:03 +0100
+@@ -279,7 +279,7 @@
+ extern unsigned total_connections;
+ extern unsigned int system_bufsize; /* Default size of SNDBUF given by system */
+
+-extern sigjmp_buf env;
++extern jmp_buf env;
+ extern int handle_sigbus;
+ extern unsigned int cgi_umask;
+
+Index: src/signals.c
+--- src/signals.c.orig 2004-06-04 04:49:13 +0200
++++ src/signals.c 2005-02-17 17:40:48 +0100
+@@ -29,7 +29,7 @@
+ #endif
+ #include /* signal */
+
+-sigjmp_buf env;
++jmp_buf env;
+ int handle_sigbus;
+
+ void sigsegv(int);
+@@ -134,7 +134,7 @@
+ abort();
+ }
+
+-extern sigjmp_buf env;
++extern jmp_buf env;
+ extern int handle_sigbus;
+
+ void sigbus(int dummy)
diff --git a/boa/boa.spec b/boa/boa.spec
index 5e39c8c28d..2fd3957287 100644
--- a/boa/boa.spec
+++ b/boa/boa.spec
@@ -34,12 +34,13 @@ Class: PLUS
Group: Web
License: GPL
Version: 0.94.14rc20
-Release: 20041207
+Release: 20050217
# list of sources
Source0: http://www.boa.org/boa-%{version}.tar.gz
Source1: boa.conf
-Source2: rc.boa
+Source2: boa.mime
+Source3: rc.boa
Patch0: boa.patch
# build information
@@ -103,11 +104,12 @@ AutoReqProv: no
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE boa.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/boa/
%{l_shtool} install -c -m 644 \
- /dev/null $RPM_BUILD_ROOT%{l_prefix}/etc/boa/mime.types
+ %{SOURCE boa.mime} $RPM_BUILD_ROOT%{l_prefix}/etc/boa/mime.types
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.boa} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%config %{l_prefix}/etc/boa/*' \
'%attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/boa'
%files -f files