rpms/boa/devel .cvsignore, 1.3, 1.4 boa-0.94.14rc17-config.patch, 1.1, 1.2 boa.spec, 1.10, 1.11 sources, 1.3, 1.4
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Mon Aug 6 10:48:36 UTC 2007
Author: thias
Update of /cvs/extras/rpms/boa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3804
Modified Files:
.cvsignore boa-0.94.14rc17-config.patch boa.spec sources
Log Message:
Include cgi.c patch to fix env. variable dump (#250950, Jose Pedro Oliveira) and update license field.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 14 Apr 2005 18:59:27 -0000 1.3
+++ .cvsignore 6 Aug 2007 10:48:03 -0000 1.4
@@ -1 +1 @@
-boa-0.94.14rc21.tar.gz
+boa-0.94.14rc21.tar.bz2
boa-0.94.14rc17-config.patch:
Index: boa-0.94.14rc17-config.patch
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/boa-0.94.14rc17-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boa-0.94.14rc17-config.patch 9 Nov 2004 02:43:26 -0000 1.1
+++ boa-0.94.14rc17-config.patch 6 Aug 2007 10:48:03 -0000 1.2
@@ -8,7 +8,7 @@
-User nobody
-Group nogroup
+User boa
-+Group www
++Group boa
# ServerAdmin: The email address where server problems should be sent.
# Note: this is not currently used, except as an environment variable
@@ -24,7 +24,7 @@
# Comment out to disable server non user files.
-DocumentRoot /var/www
-+DocumentRoot /var/www/boa/html
++DocumentRoot /srv/www/boa/html
# UserDir: The name of the directory which is appended onto a user's home
# directory if a ~user request is received.
@@ -49,5 +49,5 @@
# Example: ScriptAlias /htbin/ /www/htbin/
-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-+ScriptAlias /cgi-bin/ /usr/lib/boa/cgi-bin/
++ScriptAlias /cgi-bin/ /srv/www/boa/cgi-bin/
Index: boa.spec
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/boa.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- boa.spec 28 Aug 2006 09:21:03 -0000 1.10
+++ boa.spec 6 Aug 2007 10:48:03 -0000 1.11
@@ -1,24 +1,29 @@
%define rcver rc21
-%define webroot /var/www/boa
+%define webroot /srv/www/boa
Summary: Single-tasking HTTP server
Name: boa
Version: 0.94.14
-Release: 0.5%{?rcver:.%{rcver}}%{?dist}
-URL: http://www.boa.org/
-License: GPL
+Release: 0.7%{?rcver:.%{rcver}}%{?dist}
+License: GPLv2+
Group: System Environment/Daemons
-Source0: http://www.boa.org/%{name}-%{version}%{?rcver}.tar.gz
+URL: http://www.boa.org/
+Source0: http://www.boa.org/boa-%{version}%{?rcver}.tar.bz2
Source1: boa.init
Source2: boa.sysconfig
Source10: index.html
Source11: boa_logo_pasi2.png
Source12: powered_by_fedora.png
-Patch: boa-0.94.14rc17-config.patch
+Patch0: boa-0.94.14rc17-config.patch
+Patch1: boa-0.94.14rc21-cgi.c.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: tetex, texinfo
-%{!?_without_gunzip:Requires: gzip}
+Requires(pre): /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
+Requires: gzip
Requires: /etc/mime.types
+BuildRequires: tetex, texinfo
Provides: webserver
%description
@@ -39,7 +44,8 @@
%prep
%setup -q -n %{name}-%{version}%{?rcver}
-%patch -p1 -b .config
+%patch0 -p1 -b .config
+%patch1 -p1 -b .cgi.c
%build
@@ -49,7 +55,7 @@
%{?_with_poll: --with-poll} \
%{?_without_gunzip: --disable-gunzip} \
%{?_without_sendfile: --disable-sendfile}
-%{__make}
+%{__make} %{?_smp_mflags}
%{__make} -C docs boa.html boa.txt
@@ -68,11 +74,11 @@
%{buildroot}%{_sysconfdir}/logrotate.d/boa
%{__install} -p -m 0755 -D %{SOURCE1} \
%{buildroot}%{_sysconfdir}/rc.d/init.d/boa
-%{__install} -p -m 0755 -D %{SOURCE2} \
+%{__install} -p -m 0644 -D %{SOURCE2} \
%{buildroot}%{_sysconfdir}/sysconfig/boa
-%{__mkdir_p} %{buildroot}/%{webroot}/html
-%{__mkdir_p} %{buildroot}/%{_localstatedir}/log/boa
+%{__mkdir_p} %{buildroot}/%{webroot}/{cgi-bin,html}
+%{__mkdir_p} %{buildroot}/%{_var}/log/boa
# Install the default index.html file
%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
@@ -87,9 +93,8 @@
%pre
-/usr/sbin/groupadd -r www 2>/dev/null || :
-/usr/sbin/useradd -s /bin/false -c "Web server user" \
- -d %{webroot} -M -r -g www boa 2>/dev/null || :
+/usr/sbin/useradd -s /sbin/nologin -M -r -d %{webroot} \
+ -c "boa web server" boa &>/dev/null || :
%post
if [ $1 -eq 1 ]; then
@@ -109,7 +114,7 @@
%files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc COPYING CREDITS README
%doc docs/*.{html,png,txt} examples/
%dir %{_sysconfdir}/boa/
@@ -121,11 +126,24 @@
%{_libdir}/boa/boa_indexer
%{_sbindir}/boa
%{webroot}/
-%dir %{_localstatedir}/log/boa/
+%dir %{_var}/log/boa/
%{_mandir}/man8/*
%changelog
+* Mon Aug 6 2007 Matthias Saou <http://freshrpms.net/> 0.94.14-0.7.rc21
+- Include cgi.c patch to fix env. variable dump (#250950, Jose Pedro Oliveira).
+- Update license field.
+
+* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 0.94.14-0.6.rc21
+- Switch to using .bz2 sources.
+- Add missing scriplet requirements.
+- Switch webroot to /srv/www/boa.
+- Change user creation to create its own "boa" group instead of "www".
+- Update config patch to match updates.
+- Create empty default cgi-bin directory.
+- Fix sysconfig file mode (755 -> 644).
+
* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.94.14-0.5.rc21
- FC6 rebuild, remove gzip build requirement (it's a default).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 14 Apr 2005 18:59:27 -0000 1.3
+++ sources 6 Aug 2007 10:48:03 -0000 1.4
@@ -1 +1 @@
-e24b570bd767a124fcfb40a34d148ba9 boa-0.94.14rc21.tar.gz
+30295a2a1b44125a371994bc21b2b075 boa-0.94.14rc21.tar.bz2
More information about the fedora-extras-commits
mailing list