X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=lighttpd.spec;h=32e92224a933218235a4fdb6fa2abb2ea758e6a8;hb=420ab14c6050de1c3d05487f267b261239dff3f5;hp=aa7e2bca083cf905b13d8eecb05456f6900ed38a;hpb=f95d1da1dd40247bf351a619b32e208a4a9f589f;p=packages%2Flighttpd.git diff --git a/lighttpd.spec b/lighttpd.spec index aa7e2bc..32e9222 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -1,126 +1,140 @@ - # TODO: -# - provide or autogenerate self signed cert in post, so after installing +# - provide or autogenerated self signed cert in post, so after installing # lighttpd-ssl server will still work # - patch with mod_websocket: https://github.com/Juniper/lighttpd-for-juise +# - lighttpd-mod_fd_transfer: https://redmine.lighttpd.net/boards/3/topics/4992 +# - add db specific mod_vhostdb_* sub-packages +# - package mod_sockproxy +# https://github.com/lighttpd/lighttpd1.4/commit/c4d743bb4d0cc045d41322169a4e36a151e247f1 # # Conditional build: %bcond_with tests # build with tests %bcond_without xattr # support of extended attributes %bcond_without ipv6 # IPv4-only version (doesn't require IPv6 in kernel) %bcond_without largefile # largefile support (see notes above) +%bcond_without dbi # libdbi, enables mod_vhostdb_dbi %bcond_without ssl # ssl support -%bcond_without mysql # mysql support in mod_mysql_vhost -%bcond_without ldap # ldap support in mod_auth +%bcond_without mysql # mysql support in mod_mysql_vhost, mod_vhostdb_mysql +%bcond_without pgsql # PgSQL, enables mod_vhostdb_pgsql +%bcond_without geoip # GeoIP support +%bcond_with krb5 # krb5 support (does not work with heimdal) +%bcond_without ldap # ldap support in mod_auth, mod_vhostdb_ldap %bcond_without lua # LUA support in mod_cml (needs LUA >= 5.1) -%bcond_with memcache # memcached support in mod_cml / mod_trigger_b4_dl -%bcond_with gamin # gamin for reducing number of stat() calls. - # NOTE: must be enabled in config: server.stat-cache-engine = "fam" -%bcond_with gdbm # gdbm in mod_trigger_b4_dl +%bcond_with gamin # gamin for reducing number of stat() calls. must be enabled in config: server.stat-cache-engine = "fam" +%bcond_without mod_trigger_b4_dl # mod_trigger_b4_dl %bcond_with webdav_props # properties in mod_webdav (includes extra sqlite3/libxml deps) %bcond_with webdav_locks # webdav locks with extra efsprogs deps %bcond_with valgrind # compile code with valgrind support. -%bcond_with deflate # build deflate module (needs patch update with current svn) +%bcond_with h264_streaming # build h264_streaming module +%bcond_without storage_memcached # memcached storage for mod_trigger_b4_dl/mod_cml +%bcond_without storage_gdbm # gdbm storage for mod_trigger_b4_dl %if %{with webdav_locks} %define webdav_progs 1 %endif +# if(WITH_PCRE AND (WITH_MEMCACHED OR WITH_GDBM)) +%if %{without storage_memcached} && %{without storage_gdbm} +%undefine with_mod_trigger_b4_dl +%endif + Summary: Fast and light HTTP server Summary(pl.UTF-8): Szybki i lekki serwer HTTP Name: lighttpd -Version: 1.4.35 -Release: 6 +Version: 1.4.50 +Release: 2 License: BSD Group: Networking/Daemons/HTTP -Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2 -# Source0-md5: f7a88130ee9984b421ad8aa80629750a +Source0: https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz +# Source0-md5: 0547831efda8492648b7f0c652865dfd Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.user Source4: %{name}.logrotate Source5: %{name}.sysconfig Source6: %{name}-mime.types.sh -Source7: http://glen.alkohol.ee/pld/lighty/favicon.ico +Source7: https://glen.alkohol.ee/pld/lighty/favicon.ico # Source7-md5: 00fcac5b861a54f5eb147a589504d480 Source8: light_button.png # Source8-md5: 3e1008ee1d3d6d390cf81fe3072b4f50 Source9: light_logo.png # Source9-md5: cbb7f0676e51ee2e26cf004df293fc62 -Source10: pld_button.png -# Source10-md5: 185afa921e81bd726b9f0f9f0909dc6e -Source11: %{name}-pld.html +Source11: %{name}-tld.html Source12: %{name}.monitrc Source13: branch.sh -Source14: TODO -Source100: %{name}-mod_access.conf -Source101: %{name}-mod_accesslog.conf -Source102: %{name}-mod_alias.conf -Source103: %{name}-mod_auth.conf -Source104: %{name}-mod_cgi.conf -Source105: %{name}-mod_cml.conf -Source106: %{name}-mod_compress.conf -Source107: %{name}-mod_deflate.conf -Source108: %{name}-mod_dirlisting.conf -Source109: %{name}-mod_evasive.conf -Source110: %{name}-mod_evhost.conf -Source111: %{name}-mod_expire.conf -Source112: %{name}-mod_fastcgi.conf -Source113: %{name}-mod_flv_streaming.conf -Source114: %{name}-mod_indexfile.conf -Source115: %{name}-mod_proxy.conf -Source116: %{name}-mod_redirect.conf -Source117: %{name}-mod_rewrite.conf -Source118: %{name}-mod_rrdtool.conf -Source119: %{name}-mod_scgi.conf -Source120: %{name}-mod_secdownload.conf -Source121: %{name}-mod_setenv.conf -Source122: %{name}-mod_simple_vhost.conf -Source123: %{name}-mod_ssi.conf -Source124: %{name}-mod_staticfile.conf -Source125: %{name}-mod_status.conf -Source126: %{name}-mod_trigger_b4_dl.conf -Source127: %{name}-mod_userdir.conf -Source128: %{name}-mod_usertrack.conf -Source129: %{name}-mod_webdav.conf -Source130: %{name}-php-spawned.conf -Source131: %{name}-php-external.conf -Source132: %{name}-ssl.conf -Source133: %{name}-mod_mysql_vhost.conf -Source134: %{name}-mod_magnet.conf -Source135: %{name}-mod_extforward.conf -Source136: %{name}-mod_h264_streaming.conf -Source137: %{name}-mod_cgi_php.conf -Source138: %{name}-mod_compress.tmpwatch +Source100: mod_access.conf +Source101: mod_accesslog.conf +Source102: mod_alias.conf +Source103: mod_auth.conf +Source104: mod_cgi.conf +Source105: mod_cml.conf +Source106: mod_compress.conf +Source107: mod_deflate.conf +Source108: mod_dirlisting.conf +Source109: mod_evasive.conf +Source110: mod_evhost.conf +Source111: mod_expire.conf +Source112: mod_fastcgi.conf +Source113: mod_flv_streaming.conf +Source114: mod_indexfile.conf +Source115: mod_proxy.conf +Source116: mod_redirect.conf +Source117: mod_rewrite.conf +Source118: mod_rrdtool.conf +Source119: mod_scgi.conf +Source120: mod_secdownload.conf +Source121: mod_setenv.conf +Source122: mod_simple_vhost.conf +Source123: mod_ssi.conf +Source124: mod_staticfile.conf +Source125: mod_status.conf +Source126: mod_trigger_b4_dl.conf +Source127: mod_userdir.conf +Source128: mod_usertrack.conf +Source129: mod_webdav.conf +Source130: php-spawned.conf +Source131: php-external.conf +Source132: ssl.conf +Source133: mod_mysql_vhost.conf +Source134: mod_magnet.conf +Source135: mod_extforward.conf +Source136: mod_h264_streaming.conf +Source137: mod_cgi_php.conf +Source138: mod_compress.tmpwatch +Source139: mod_uploadprogress.conf +Source140: mod_geoip.conf +Source141: mod_authn_ldap.conf +Source142: mod_openssl.conf +Source143: mod_vhostdb.conf +Source144: mod_wstunnel.conf +Source145: mod_authn_mysql.conf +# use branch.sh script to create branch.diff #Patch100: %{name}-branch.diff -Patch0: %{name}-use_bin_sh.patch +## Patch100-md5: 7bd09235304c8bcb16f34d49d480c0fb Patch1: %{name}-mod_evasive-status_code.patch Patch2: %{name}-mod_h264_streaming.patch Patch3: %{name}-branding.patch -Patch5: %{name}-mod_deflate.patch Patch6: test-port-setup.patch Patch7: env-documentroot.patch -#Patch: %{name}-modinit-before-fork.patch -#Patch: %{name}-errorlog-before-fork.patch -URL: http://www.lighttpd.net/ +URL: https://www.lighttpd.net/ +%{?with_geoip:BuildRequires: GeoIP-devel} %{?with_xattr:BuildRequires: attr-devel} BuildRequires: autoconf >= 2.57 -%if "%{pld_release}" != "ac" BuildRequires: automake >= 1:1.11.2 -%else -BuildRequires: automake -%endif BuildRequires: bzip2-devel BuildRequires: fcgi-devel %{?with_gamin:BuildRequires: gamin-devel} -%{?with_gdbm:BuildRequires: gdbm-devel} -%{?with_memcache:BuildRequires: libmemcache-devel} +%{?with_storage_gdbm:BuildRequires: gdbm-devel} +%{?with_krb5:BuildRequires: krb5-devel} +%{?with_dbi:BuildRequires: libdbi-devel} +%{?with_storage_memcached:BuildRequires: libmemcached-devel} BuildRequires: libtool BuildRequires: libuuid-devel %{?with_webdav_props:BuildRequires: libxml2-devel} %{?with_lua:BuildRequires: lua51-devel} BuildRequires: mailcap >= 2.1.14-4.4 %{?with_mysql:BuildRequires: mysql-devel} +%{?with_pgsql:BuildRequires: postgresql-devel} %{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel} BuildRequires: pcre-devel @@ -128,8 +142,10 @@ BuildRequires: pkgconfig BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.647 %{?with_webdav_props:BuildRequires: sqlite3-devel} +BuildRequires: tar >= 1:1.22 %{?with_valgrind:BuildRequires: valgrind} BuildRequires: which +BuildRequires: xz BuildRequires: zlib-devel Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel @@ -157,7 +173,7 @@ Conflicts: logrotate < 3.7-4 Conflicts: rpm < 4.4.2-0.2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _libdir %{_prefix}/%{_lib}/%{name} +%define pkglibdir %{_libdir}/%{name} %define _lighttpddir /home/services/%{name} %define _sysconfdir /etc/%{name} @@ -231,6 +247,13 @@ Summary(pl.UTF-8): Moduł lighttpd do obsługi uwierzytelniania Group: Networking/Daemons/HTTP URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAuth Requires: %{name} = %{version}-%{release} +Requires: %{name}-mod_authn_file = %{version}-%{release} +%if %{with ldap} +Suggests: %{name}-mod_authn_ldap = %{version}-%{release} +%endif +%if %{with mysql} +Suggests: %{name}-mod_authn_mysql = %{version}-%{release} +%endif Provides: webserver(auth) %description mod_auth @@ -241,6 +264,38 @@ basic and digest. lighttpd obsługuje obie metody uwierzytelniania opisane w RFC 2617: basic i digest. +%package mod_authn_file +Summary: lighttpd authn_file module +Group: Networking/Daemons/HTTP +Requires: %{name} = %{version}-%{release} + +%description mod_authn_file +lighttpd authn_file module. + +%package mod_authn_gssapi +Summary: lighttpd authn_gssapi module +Group: Networking/Daemons/HTTP +Requires: %{name} = %{version}-%{release} + +%description mod_authn_gssapi +lighttpd authn_gssapi module. + +%package mod_authn_ldap +Summary: lighttpd authn_ldap module +Group: Networking/Daemons/HTTP +Requires: %{name} = %{version}-%{release} + +%description mod_authn_ldap +lighttpd authn_ldap module. + +%package mod_authn_mysql +Summary: lighttpd authn_mysql module +Group: Networking/Daemons/HTTP +Requires: %{name} = %{version}-%{release} + +%description mod_authn_mysql +lighttpd authn_mysql module. + %package mod_cgi Summary: lighttpd module for CGI handling Summary(pl.UTF-8): Moduł lighttpd do obsługi CGI @@ -446,6 +501,20 @@ lighttpd module for flv streaming. %description mod_flv_streaming -l pl.UTF-8 Moduł lighttpd do streamingu flv. +%package mod_geoip +Summary: lighttpd module for IP Based Geographic Lookups +Group: Networking/Daemons/HTTP +URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModGeoip +Requires: %{name} = %{version}-%{release} + +%description mod_geoip +mod_geoip is a module for fast ip/location lookups. It uses MaxMind +GeoIP / GeoCity databases. + +If the ip was found in the database the module sets the appropriate +environment variables to the request, thus making other modules/fcgi +be informed. + %package mod_h264_streaming Summary: lighttpd module for h264 streaming Summary(pl.UTF-8): Moduł lighttpd do emisji strumieni h264 @@ -501,6 +570,15 @@ This module provides virtual hosts (vhosts) based on a MySQL table. %description mod_mysql_vhost -l pl.UTF-8 Ten moduł udostępnia wirtualne hosty (vhosty) oparte na tabeli MySQL. +%package mod_openssl +Summary: TLS/SSL for lighttpd +Group: Networking/Daemons/HTTP +URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_SSL +Requires: %{name} = %{version}-%{release} + +%description mod_openssl +TLS/SSL for lighttpd. + %package mod_proxy Summary: lighttpd module for proxying requests Summary(pl.UTF-8): Moduł lighttpd do przekazywania żądań @@ -699,6 +777,15 @@ Another anti hot-linking module. %description mod_trigger_b4_dl -l pl.UTF-8 Jeszcze jeden moduł blokujący bezpośrednie linkowanie. +%package mod_uploadprogress +Summary: lighttpd module for upload progress +Group: Networking/Daemons/HTTP +URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModUploadProgress +Requires: %{name} = %{version}-%{release} + +%description mod_uploadprogress +This module can be used to track the progress of a current upload. + %package mod_userdir Summary: lighttpd module for user homedirs Summary(pl.UTF-8): Moduł lighttpd obsługujący katalogi domowe użytkowników @@ -727,6 +814,15 @@ lighttpd usertrack module. %description mod_usertrack -l pl.UTF-8 Moduł usertrack dla lighttpd. +%package mod_vhostdb +Summary: Virtual host database to provide vhost docroot +Group: Networking/Daemons/HTTP +URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModVhostDB +Requires: %{name} = %{version}-%{release} + +%description mod_vhostdb +Virtual host database to provide vhost docroot. + %package mod_webdav Summary: WebDAV module for lighttpd Summary(pl.UTF-8): Moduł WebDAV dla libghttpd @@ -767,6 +863,18 @@ oraz zwykłe GET, POST, HEAD z HTTP/1.1. Jak na razie montowanie zasobu webdav pod Windows XP działa i podstawowe testy lakmusowe przechodzą. +%package mod_wstunnel +Summary: WebSocket tunnel endpoint +Group: Networking/Daemons/HTTP +URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModWSTunnel +Requires: %{name} = %{version}-%{release} + +%description mod_wstunnel +WebSocket tunnel endpoint. This module terminates the websocket tunnel +from a client. This module then passes data (without websocket frames) +to a backend and encodes responses from backend in websocket frames +before sending responses to client. + %package php-spawned Summary: PHP support via FastCGI, spawned by lighttpd Summary(pl.UTF-8): Obsługa PHP przez FastCGI, uruchamiane przez lighttpd @@ -805,6 +913,7 @@ Summary(pl.UTF-8): Obsługa SSLv2 i SSLv3 dla lighttpd Group: Networking/Daemons/HTTP URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:SSL Requires: %{name} = %{version}-%{release} +Requires: %{name}-mod_openssl = %{version}-%{release} Suggests: ca-certificates %description ssl @@ -828,25 +937,17 @@ Plik monitrc do monitorowania serwera www lighttpd. %prep %setup -q -#%patch100 -p0 -#%patch4 -p0 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +#%patch100 -p1 +#%patch1 -p1 UPDATE (and submit upstream!) if you need this +%{?with_h264_streaming:%patch2 -p1} %patch3 -p1 -%{?with_deflate:%patch5 -p1} %patch6 -p1 -%patch7 -p0 +#%patch7 -p1 probably fixed upstream rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead # build mime.types.conf sh %{SOURCE6} /etc/mime.types -cp -p %{SOURCE14} PLD-TODO - -%if "%{pld_release}" == "ac" -%{__sed} -i -e 's/ serial_tests//' configure.ac -%endif %build ver=$(awk '/AC_INIT/{a=$2;gsub(/[\[\],]/, "", a); print a}' configure.ac) @@ -855,25 +956,31 @@ if [ "$ver" != "%{version}" ]; then exit 1 fi +%{__aclocal} -I m4 -I scripts/m4 %{__libtoolize} -%{__aclocal} %{__autoconf} +%{__autoheader} %{__automake} %configure \ + --libdir=%{pkglibdir} \ %{!?with_ipv6:--disable-ipv6} \ %{!?with_largefile:--disable-lfs} \ %{?with_valgrind:--with-valgrind} \ %{?with_xattr:--with-attr} \ + %{?with_dbi:--with-dbi} \ + %{?with_krb5:--with-krb5} \ + %{?with_geoip:--with-geoip} \ %{?with_mysql:--with-mysql} \ %{?with_ldap:--with-ldap} \ %{?with_ssl:--with-openssl} \ + %{?with_pgsql:--with-pgsql} \ %{?with_lua:--with-lua=lua51} \ - %{?with_memcache:--with-memcache} \ + %{?with_storage_memcached:--with-memcached} \ %{?with_webdav_props:--with-webdav-props} \ %{?with_webdav_locks:--with-webdav-locks} \ %{?with_gamin:--with-gamin} \ - %{?with_gdbm:--with-gdbm} + %{?with_storage_gdbm:--with-gdbm} # -j1 as src/mod_ssi_exprparser.h regeneration deps are broken %{__make} -j1 @@ -885,8 +992,8 @@ export LIGHTTPD_TEST_PORT=$((2048 + RANDOM % 10)) %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,init,monit}} \ - $RPM_BUILD_ROOT%{_sysconfdir}/{conf,vhosts,webapps}.d \ +install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,monit}} \ + $RPM_BUILD_ROOT%{_sysconfdir}/{{conf,vhosts,webapps}.d,ssl} \ $RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \ $RPM_BUILD_ROOT%{_datadir}/lighttpd/errordocs \ $RPM_BUILD_ROOT/var/lib/lighttpd \ @@ -901,11 +1008,10 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/%{name} cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{pkglibdir}/*.la # Install lighttpd images cp -p %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_lighttpddir}/html -cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_lighttpddir}/html/pld_button.png cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_lighttpddir}/html/index.html # NOTE: the order of the modules is somewhat important as the modules are @@ -930,8 +1036,20 @@ cp -p %{SOURCE109} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evasive.conf cp -p %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evhost.conf cp -p %{SOURCE112} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_fastcgi.conf cp -p %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf +%if %{with geoip} +cp -p %{SOURCE140} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_geoip.conf +%endif +%if %{with ldap} +cp -p %{SOURCE141} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_authn_ldap.conf +%endif +%if %{with ldap} +cp -p %{SOURCE145} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_authn_mysql.conf +%endif +%if %{with h264_streaming} cp -p %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_h264_streaming.conf +%endif cp -p %{SOURCE114} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_indexfile.conf +cp -p %{SOURCE142} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_openssl.conf cp -p %{SOURCE115} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy.conf cp -p %{SOURCE118} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_rrdtool.conf cp -p %{SOURCE119} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_scgi.conf @@ -941,11 +1059,18 @@ cp -p %{SOURCE122} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_simple_vhost.conf cp -p %{SOURCE123} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_ssi.conf cp -p %{SOURCE124} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_staticfile.conf cp -p %{SOURCE125} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_status.conf +%if %{with mod_trigger_b4_dl} cp -p %{SOURCE126} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_trigger_b4_dl.conf +%endif +cp -p %{SOURCE139} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_uploadprogress.conf cp -p %{SOURCE127} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_userdir.conf cp -p %{SOURCE128} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_usertrack.conf +cp -p %{SOURCE143} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_vhostdb.conf cp -p %{SOURCE129} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_webdav.conf +cp -p %{SOURCE144} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_wstunnel.conf +%if %{with mysql} cp -p %{SOURCE133} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_mysql_vhost.conf +%endif cp -p %{SOURCE134} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_magnet.conf cp -p %{SOURCE111} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_expire.conf @@ -964,15 +1089,6 @@ touch $RPM_BUILD_ROOT/var/lib/lighttpd/lighttpd.rrd install -d $RPM_BUILD_ROOT/etc/tmpwatch cp -p %{SOURCE138} $RPM_BUILD_ROOT/etc/tmpwatch/lighttpd-mod_compress.conf -%if %{without mysql} -# avoid packaging dummy module -%{__rm} $RPM_BUILD_ROOT%{_libdir}/mod_mysql_vhost.so -%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf -%endif -%if %{without deflate} -%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_deflate.conf -%endif - touch $RPM_BUILD_ROOT/var/log/%{name}/{access,error,breakage}.log %clean @@ -1043,6 +1159,10 @@ fi %module_scripts mod_accesslog %module_scripts mod_alias %module_scripts mod_auth +%module_scripts mod_authn_file +%module_scripts mod_authn_gssapi +%module_scripts mod_authn_ldap +%module_scripts mod_authn_mysql %module_scripts mod_cgi %module_scripts mod_cml %module_scripts mod_compress @@ -1054,25 +1174,15 @@ fi %module_scripts mod_extforward %module_scripts mod_fastcgi %module_scripts mod_flv_streaming +%module_scripts mod_geoip %module_scripts mod_h264_streaming %module_scripts mod_indexfile %module_scripts mod_magnet %module_scripts mod_mysql_vhost +%module_scripts mod_openssl %module_scripts mod_proxy %module_scripts mod_redirect %module_scripts mod_rewrite - -%post mod_rrdtool -if [ ! -f /var/lib/lighttpd/lighttpd.rrd ]; then - touch /var/lib/lighttpd/lighttpd.rrd - chown lighttpd:stats /var/lib/lighttpd/lighttpd.rrd - chmod 640 /var/lib/lighttpd/lighttpd.rrd -fi -%module_post - -%postun mod_rrdtool -%module_postun - %module_scripts mod_scgi %module_scripts mod_secdownload %module_scripts mod_setenv @@ -1081,13 +1191,28 @@ fi %module_scripts mod_staticfile %module_scripts mod_status %module_scripts mod_trigger_b4_dl +%module_scripts mod_uploadprogress %module_scripts mod_userdir %module_scripts mod_usertrack +%module_scripts mod_vhostdb %module_scripts mod_webdav +%module_scripts mod_wstunnel %module_scripts php-spawned %module_scripts php-external +%post mod_rrdtool +if [ ! -f /var/lib/lighttpd/lighttpd.rrd ]; then + touch /var/lib/lighttpd/lighttpd.rrd + chown lighttpd:stats /var/lib/lighttpd/lighttpd.rrd + chmod 640 /var/lib/lighttpd/lighttpd.rrd +fi +%module_post + +%postun mod_rrdtool +%module_postun + + %triggerpostun -- %{name} < 1.4.18-10.1 if [ -f /etc/lighttpd/conf.d/50_mod_extforward.conf.rpmsave ]; then cp -f /etc/lighttpd/conf.d/91_mod_extforward.conf{,.rpmnew} @@ -1096,11 +1221,12 @@ fi %files %defattr(644,root,root,755) -%doc NEWS README PLD-TODO +%doc NEWS README %dir %attr(751,root,lighttpd) %{_sysconfdir} %dir %attr(750,root,root) %{_sysconfdir}/conf.d %dir %attr(750,root,root) %{_sysconfdir}/vhosts.d %dir %attr(750,root,root) %{_sysconfdir}/webapps.d +%dir %attr(700,root,root) %{_sysconfdir}/ssl %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.types.conf %attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user @@ -1116,8 +1242,9 @@ fi %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/* %attr(755,root,root) %{_sbindir}/lighttpd %attr(755,root,root) %{_sbindir}/lighttpd-angel -%dir %{_libdir} +%dir %{pkglibdir} %{_mandir}/man8/lighttpd.8* +%{_mandir}/man8/lighttpd-angel.8* %dir %{_lighttpddir} %dir %{_lighttpddir}/cgi-bin %dir %{_lighttpddir}/html @@ -1137,27 +1264,51 @@ fi %files mod_access %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_access.conf -%attr(755,root,root) %{_libdir}/mod_access.so +%attr(755,root,root) %{pkglibdir}/mod_access.so %files mod_accesslog %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_accesslog.conf -%attr(755,root,root) %{_libdir}/mod_accesslog.so +%attr(755,root,root) %{pkglibdir}/mod_accesslog.so %files mod_alias %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_alias.conf -%attr(755,root,root) %{_libdir}/mod_alias.so +%attr(755,root,root) %{pkglibdir}/mod_alias.so %files mod_auth %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_auth.conf -%attr(755,root,root) %{_libdir}/mod_auth.so +%attr(755,root,root) %{pkglibdir}/mod_auth.so + +%files mod_authn_file +%defattr(644,root,root,755) +%attr(755,root,root) %{pkglibdir}/mod_authn_file.so + +%if %{with krb5} +%files mod_authn_gssapi +%defattr(644,root,root,755) +%attr(755,root,root) %{pkglibdir}/mod_authn_gssapi.so +%endif + +%if %{with ldap} +%files mod_authn_ldap +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_authn_ldap.conf +%attr(755,root,root) %{pkglibdir}/mod_authn_ldap.so +%endif + +%if %{with mysql} +%files mod_authn_mysql +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_authn_mysql.conf +%attr(755,root,root) %{pkglibdir}/mod_authn_mysql.so +%endif %files mod_cgi %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_cgi.conf -%attr(755,root,root) %{_libdir}/mod_cgi.so +%attr(755,root,root) %{pkglibdir}/mod_cgi.so %files mod_cgi_php %defattr(644,root,root,755) @@ -1166,154 +1317,196 @@ fi %files mod_cml %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_cml.conf -%attr(755,root,root) %{_libdir}/mod_cml.so +%attr(755,root,root) %{pkglibdir}/mod_cml.so %files mod_compress %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/tmpwatch/lighttpd-mod_compress.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_compress.conf -%attr(755,root,root) %{_libdir}/mod_compress.so +%attr(755,root,root) %{pkglibdir}/mod_compress.so %dir %attr(775,root,lighttpd) /var/cache/lighttpd/mod_compress -%if %{with deflate} %files mod_deflate %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_deflate.conf -%attr(755,root,root) %{_libdir}/mod_deflate.so -%endif +%attr(755,root,root) %{pkglibdir}/mod_deflate.so %files mod_dirlisting %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_dirlisting.conf -%attr(755,root,root) %{_libdir}/mod_dirlisting.so +%attr(755,root,root) %{pkglibdir}/mod_dirlisting.so %files mod_evasive %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_evasive.conf -%attr(755,root,root) %{_libdir}/mod_evasive.so +%attr(755,root,root) %{pkglibdir}/mod_evasive.so %files mod_evhost %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_evhost.conf -%attr(755,root,root) %{_libdir}/mod_evhost.so +%attr(755,root,root) %{pkglibdir}/mod_evhost.so %files mod_expire %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_expire.conf -%attr(755,root,root) %{_libdir}/mod_expire.so +%attr(755,root,root) %{pkglibdir}/mod_expire.so %files mod_extforward %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_extforward.conf -%attr(755,root,root) %{_libdir}/mod_extforward.so +%attr(755,root,root) %{pkglibdir}/mod_extforward.so %files mod_fastcgi %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_fastcgi.conf -%attr(755,root,root) %{_libdir}/mod_fastcgi.so +%attr(755,root,root) %{pkglibdir}/mod_fastcgi.so %files mod_flv_streaming %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_flv_streaming.conf -%attr(755,root,root) %{_libdir}/mod_flv_streaming.so +%attr(755,root,root) %{pkglibdir}/mod_flv_streaming.so +%if %{with geoip} +%files mod_geoip +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_geoip.conf +%attr(755,root,root) %{pkglibdir}/mod_geoip.so +%endif + +%if %{with h264_streaming} %files mod_h264_streaming %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_h264_streaming.conf -%attr(755,root,root) %{_libdir}/mod_h264_streaming.so +%attr(755,root,root) %{pkglibdir}/mod_h264_streaming.so +%endif %files mod_indexfile %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_indexfile.conf -%attr(755,root,root) %{_libdir}/mod_indexfile.so +%attr(755,root,root) %{pkglibdir}/mod_indexfile.so %files mod_magnet %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_magnet.conf -%attr(755,root,root) %{_libdir}/mod_magnet.so +%attr(755,root,root) %{pkglibdir}/mod_magnet.so %if %{with mysql} %files mod_mysql_vhost %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_mysql_vhost.conf -%attr(755,root,root) %{_libdir}/mod_mysql_vhost.so +%attr(755,root,root) %{pkglibdir}/mod_mysql_vhost.so %endif %files mod_proxy %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_proxy.conf -%attr(755,root,root) %{_libdir}/mod_proxy.so +%attr(755,root,root) %{pkglibdir}/mod_proxy.so + +%files mod_openssl +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_openssl.conf +%attr(755,root,root) %{pkglibdir}/mod_openssl.so %files mod_redirect %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_redirect.conf -%attr(755,root,root) %{_libdir}/mod_redirect.so +%attr(755,root,root) %{pkglibdir}/mod_redirect.so %files mod_rewrite %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_rewrite.conf -%attr(755,root,root) %{_libdir}/mod_rewrite.so +%attr(755,root,root) %{pkglibdir}/mod_rewrite.so %files mod_rrdtool %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_rrdtool.conf -%attr(755,root,root) %{_libdir}/mod_rrdtool.so +%attr(755,root,root) %{pkglibdir}/mod_rrdtool.so %attr(640,lighttpd,stats) %ghost /var/lib/lighttpd/lighttpd.rrd %files mod_scgi %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_scgi.conf -%attr(755,root,root) %{_libdir}/mod_scgi.so +%attr(755,root,root) %{pkglibdir}/mod_scgi.so %files mod_secdownload %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_secdownload.conf -%attr(755,root,root) %{_libdir}/mod_secdownload.so +%attr(755,root,root) %{pkglibdir}/mod_secdownload.so %files mod_setenv %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_setenv.conf -%attr(755,root,root) %{_libdir}/mod_setenv.so +%attr(755,root,root) %{pkglibdir}/mod_setenv.so %files mod_simple_vhost %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_simple_vhost.conf -%attr(755,root,root) %{_libdir}/mod_simple_vhost.so +%attr(755,root,root) %{pkglibdir}/mod_simple_vhost.so %files mod_ssi %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_ssi.conf -%attr(755,root,root) %{_libdir}/mod_ssi.so +%attr(755,root,root) %{pkglibdir}/mod_ssi.so %files mod_staticfile %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_staticfile.conf -%attr(755,root,root) %{_libdir}/mod_staticfile.so +%attr(755,root,root) %{pkglibdir}/mod_staticfile.so %files mod_status %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_status.conf -%attr(755,root,root) %{_libdir}/mod_status.so +%attr(755,root,root) %{pkglibdir}/mod_status.so +%if %{with mod_trigger_b4_dl} %files mod_trigger_b4_dl %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_trigger_b4_dl.conf -%attr(755,root,root) %{_libdir}/mod_trigger_b4_dl.so +%attr(755,root,root) %{pkglibdir}/mod_trigger_b4_dl.so +%endif + +%files mod_uploadprogress +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_uploadprogress.conf +%attr(755,root,root) %{pkglibdir}/mod_uploadprogress.so %files mod_userdir %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_userdir.conf -%attr(755,root,root) %{_libdir}/mod_userdir.so +%attr(755,root,root) %{pkglibdir}/mod_userdir.so %files mod_usertrack %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_usertrack.conf -%attr(755,root,root) %{_libdir}/mod_usertrack.so +%attr(755,root,root) %{pkglibdir}/mod_usertrack.so + +%files mod_vhostdb +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_vhostdb.conf +%attr(755,root,root) %{pkglibdir}/mod_vhostdb.so +# TODO: subpackages +%if %{with dbi} +%attr(755,root,root) %{pkglibdir}/mod_vhostdb_dbi.so +%endif +%if %{with ldap} +%attr(755,root,root) %{pkglibdir}/mod_vhostdb_ldap.so +%endif +%if %{with mysql} +%attr(755,root,root) %{pkglibdir}/mod_vhostdb_mysql.so +%endif +%if %{with pgsql} +%attr(755,root,root) %{pkglibdir}/mod_vhostdb_pgsql.so +%endif %files mod_webdav %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_webdav.conf -%attr(755,root,root) %{_libdir}/mod_webdav.so +%attr(755,root,root) %{pkglibdir}/mod_webdav.so + +%files mod_wstunnel +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_wstunnel.conf +%attr(755,root,root) %{pkglibdir}/mod_wstunnel.so %files php-spawned %defattr(644,root,root,755)