|
|
@@ -1,9 +1,17 @@
|
|
|
%define webroot /var/www/lighttpd
|
|
|
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
+%define owneruser lighttpd
|
|
|
+%define ownergroup lighttpd
|
|
|
+%else
|
|
|
+%define owneruser www-data
|
|
|
+%define ownergroup www-data
|
|
|
+%endif
|
|
|
+
|
|
|
Summary: Lightning fast webserver with light system requirements
|
|
|
Summary(ja): 少ないシステムリソースで動く超高速なウェブサーバ
|
|
|
Name: lighttpd
|
|
|
-Version: 1.4.32
|
|
|
+Version: 1.4.33
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: BSD
|
|
|
Group: System Environment/Daemons
|
|
|
@@ -16,10 +24,18 @@ Source10: index.html
|
|
|
Source11: http://www.lighttpd.net/favicon.ico
|
|
|
Source13: http://www.lighttpd.net/light_button.png
|
|
|
Source14: http://www.lighttpd.net/light_logo.png
|
|
|
+# config file patches
|
|
|
+## for vl7 and later
|
|
|
Patch0: lighttpd-1.4.31-vine.patch
|
|
|
+## for vl6
|
|
|
+Patch1: lighttpd-1.4.31-vine6.patch
|
|
|
+# security patch(es)
|
|
|
+Patch1001: http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
Requires(pre): shadow-utils
|
|
|
+%if %{?_dist_release} != "vl6"
|
|
|
Requires(pre): www-common
|
|
|
+%endif
|
|
|
Requires(post): chkconfig
|
|
|
Requires(preun): chkconfig
|
|
|
Requires(postun): chkconfig
|
|
|
@@ -68,8 +84,12 @@ recompile PHP yourself.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
+%patch1 -p1 -b .vine6
|
|
|
+%else
|
|
|
%patch0 -p1 -b .vine
|
|
|
-
|
|
|
+%endif
|
|
|
+%patch1001 -p1
|
|
|
|
|
|
%build
|
|
|
%configure \
|
|
|
@@ -138,6 +158,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/lighttpd/vhosts.d/
|
|
|
%clean
|
|
|
%{__rm} -rf %{buildroot}
|
|
|
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
+%pre
|
|
|
+/usr/sbin/useradd -s /sbin/nologin -M -r -d %{webroot} \
|
|
|
+ -c "lighttpd web server" lighttpd &>/dev/null || :
|
|
|
+%endif
|
|
|
|
|
|
%post
|
|
|
/sbin/chkconfig --add lighttpd
|
|
|
@@ -175,12 +200,11 @@ fi
|
|
|
%exclude %{_sysconfdir}/lighttpd/conf.d/fastcgi.conf
|
|
|
%exclude %{_sysconfdir}/lighttpd/conf.d/mysql_vhost.conf
|
|
|
%{_mandir}/man8/lighttpd.8*
|
|
|
-%attr(0750, www-data, www-data) %{_var}/log/lighttpd/
|
|
|
+%attr(0750, %{owneruser}, %{ownergroup}) %{_var}/log/lighttpd/
|
|
|
%{webroot}/
|
|
|
|
|
|
%files mod_mysql_vhost
|
|
|
%defattr(-, root, root, 0755)
|
|
|
-%doc doc/mysqlvhost.txt
|
|
|
%dir %{_libdir}/lighttpd/
|
|
|
%{_sysconfdir}/lighttpd/conf.d/mysql_vhost.conf
|
|
|
%{_libdir}/lighttpd/mod_mysql_vhost.so
|
|
|
@@ -194,6 +218,14 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jan 5 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 1.4.33-1
|
|
|
+- update to 1.4.33
|
|
|
+- add CVE-2013-4508 patch (Patch1001)
|
|
|
+- require www-common without vl6
|
|
|
+- drop outdated mod_mysql_vhost document
|
|
|
+ - see upstream #2248: http://redmine.lighttpd.net/issues/2248
|
|
|
+- come back useradd pre script for Vine Linux 6
|
|
|
+
|
|
|
* Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.32-1
|
|
|
- new upstream release
|
|
|
|
iwaim