-
# TODO:
-# - provide or autogenerate self signed cert in post, so after installing
+# - don't use lighttpd-angel in systemd. systemd does the respawn/recovery logic itself
+# - 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
+# - TLS library options
+# - mod_openssl (existing)
+# - mod_mbedtls (experimental)
+# - mod_wolfssl (experimental)
+# - mod_gnutls (experimental)
+# - mod_nss (experimental)
#
# 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, mod_authn_dbi
%bcond_without ssl # ssl support
-%bcond_without mysql # mysql support in mod_mysql_vhost
-%bcond_without geoip # GeoIP support
+%bcond_without mysql # mysql support in mod_vhostdb_mysql
+%bcond_without pgsql # PgSQL, enables mod_vhostdb_pgsql
+%bcond_without bzip2 # Enable bzip2 support for mod_deflate
+%bcond_without brotli # Enable brotli support for mod_deflate
+%bcond_without maxminddb # MaxMind GeoIP2 module
%bcond_with krb5 # krb5 support (does not work with heimdal)
-%bcond_without ldap # ldap support in mod_auth
-%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_without mod_trigger_b4_dl # mod_trigger_b4_dl
+%bcond_without ldap # ldap support in mod_auth, mod_vhostdb_ldap
+%bcond_without lua # LUA support (needs LUA >= 5.1)
+%bcond_with gamin # gamin for reducing number of stat() calls. must be enabled in config: server.stat-cache-engine = "fam"
%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.
%define webdav_progs 1
%endif
-# if(WITH_PCRE AND (WITH_MEMCACHED OR WITH_GDBM))
-%if %{without memcached} && %{without 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.43
-Release: 0.4
+Version: 1.4.66
+Release: 1
License: BSD
Group: Networking/Daemons/HTTP
-Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
-# Source0-md5: 95eda531c27b161ef8fa2b9bf4948caf
+Source0: https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
+# Source0-md5: 78b43d1dc36e1cf34d4003bc5e97a964
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
Source13: branch.sh
Source14: TODO
Source16: %{name}.tmpfiles
-Source17: %{name}.service
-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
-Source139: %{name}-mod_uploadprogress.conf
-Source140: %{name}-mod_geoip.conf
+Source100: mod_access.conf
+Source101: mod_accesslog.conf
+Source102: mod_alias.conf
+Source103: mod_auth.conf
+Source104: mod_cgi.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
+
+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
+
+Source127: mod_userdir.conf
+Source128: mod_usertrack.conf
+Source129: mod_webdav.conf
+Source130: php-spawned.conf
+Source131: php-external.conf
+Source132: ssl.conf
+
+Source134: mod_magnet.conf
+Source135: mod_extforward.conf
+Source136: mod_h264_streaming.conf
+Source137: mod_cgi_php.conf
+Source139: mod_uploadprogress.conf
+
+Source141: mod_authn_ldap.conf
+Source142: mod_openssl.conf
+Source143: mod_vhostdb.conf
+Source144: mod_wstunnel.conf
+
+Source146: mod_sockproxy.conf
+Source147: mod_maxminddb.conf
# use branch.sh script to create branch.diff
#Patch100: %{name}-branch.diff
## Patch100-md5: 7bd09235304c8bcb16f34d49d480c0fb
-Patch0: %{name}-use_bin_sh.patch
Patch1: %{name}-mod_evasive-status_code.patch
Patch2: %{name}-mod_h264_streaming.patch
Patch3: %{name}-branding.patch
-Patch6: test-port-setup.patch
-Patch7: env-documentroot.patch
-URL: http://www.lighttpd.net/
-%{?with_geoip:BuildRequires: GeoIP-devel}
+Patch4: systemd.patch
+URL: https://www.lighttpd.net/
%{?with_xattr:BuildRequires: attr-devel}
BuildRequires: autoconf >= 2.57
+%{?with_maxminddb:BuildRequires: libmaxminddb-devel}
%if "%{pld_release}" != "ac"
BuildRequires: automake >= 1:1.11.2
%else
BuildRequires: automake
%endif
-BuildRequires: bzip2-devel
+%{?with_bzip2:BuildRequires: bzip2-devel}
BuildRequires: fcgi-devel
%{?with_gamin:BuildRequires: gamin-devel}
-%{?with_gdbm:BuildRequires: gdbm-devel}
+%{?with_storage_gdbm:BuildRequires: gdbm-devel}
%{?with_krb5:BuildRequires: krb5-devel}
-%{?with_memcache:BuildRequires: libmemcache-devel}
+%{?with_brotli:BuildRequires: libbrotli-devel}
+%{?with_dbi:BuildRequires: libdbi-devel}
+%{?with_storage_memcached:BuildRequires: libmemcached-devel}
BuildRequires: libtool
BuildRequires: libuuid-devel
%{?with_webdav_props:BuildRequires: libxml2-devel}
%{?with_mysql:BuildRequires: mysql-devel}
%{?with_ldap:BuildRequires: openldap-devel}
%{?with_ssl:BuildRequires: openssl-devel}
-BuildRequires: pcre-devel
+BuildRequires: pcre2-8-devel
BuildRequires: pkgconfig
+%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.647
%{?with_webdav_props:BuildRequires: sqlite3-devel}
Modul alias służy do określania specjalnego drzewa (document-roota)
dla podanego podzbioru URL-i.
+%package mod_ajp13
+Summary: Apache JServ Protocol version 1.3 (AJP13) gateway
+Group: Networking/Daemons/HTTP
+URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModAJP13
+Requires: %{name} = %{version}-%{release}
+
+%description mod_ajp13
+lighttpd mod_ajp13 is a gateway implementing Apache JServ Protocol
+version 1.3 (AJP13).
+
%package mod_auth
Summary: lighttpd module for authentication support
Summary(pl.UTF-8): Moduł lighttpd do obsługi uwierzytelniania
URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAuth
Requires: %{name} = %{version}-%{release}
Requires: %{name}-mod_authn_file = %{version}-%{release}
-# TODO: ldap and mysql should be optional
-# https://github.com/lighttpd/lighttpd1.4/blob/lighttpd-1.4.42/src/configfile.c#L426-L428
-Requires: %{name}-mod_authn_ldap = %{version}-%{release}
-%if %{with mysql}
-Requires: %{name}-mod_authn_mysql = %{version}-%{release}
+%if %{with ldap}
+Suggests: %{name}-mod_authn_ldap = %{version}-%{release}
%endif
Provides: webserver(auth)
lighttpd obsługuje obie metody uwierzytelniania opisane w RFC 2617:
basic i digest.
+%package mod_authn_dbi
+Summary: lighttpd authn_dbi module
+Group: Networking/Daemons/HTTP
+URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModAuth
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-auth = %{version}-%{release}
+
+%description mod_authn_dbi
+lighttpd authn_dbi module.
+
%package mod_authn_file
Summary: lighttpd authn_file module
Group: Networking/Daemons/HTTP
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-auth = %{version}-%{release}
%description mod_authn_file
lighttpd authn_file module.
Summary: lighttpd authn_gssapi module
Group: Networking/Daemons/HTTP
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-auth = %{version}-%{release}
%description mod_authn_gssapi
lighttpd authn_gssapi module.
Summary: lighttpd authn_ldap module
Group: Networking/Daemons/HTTP
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-auth = %{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
Programy CGI pozwalają rozszerzać funkcjonalność serwera w bardzo
prosty i naturalny sposób.
-%package mod_cml
-Summary: lighttpd module for Cache Meta Language
-Summary(pl.UTF-8): Moduł Cache Meta Language
-Group: Networking/Daemons/HTTP
-URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModCML
-Requires: %{name} = %{version}-%{release}
-
-%description mod_cml
-CML is a Meta language to describe the dependencies of a page at one
-side and building a page from its fragments on the other side using
-LUA.
-
-%description mod_cml -l pl.UTF-8
-CML to metajęzyk służący z jednej strony do opisu zależności strony i
-z drugiej strony do budowania strony z fragmentów przy użyciu LUA.
-
%package mod_compress
Summary: lighttpd module for output compression
Summary(pl.UTF-8): Moduł lighttpd do kompresji wyjścia
The server negotiates automatically which compression method is used.
Supported are gzip, deflate, bzip.
+mod_compress is DEPRECATED; use mod_deflate. mod_compress has been
+subsumed by mod_deflate.
+
+Note: mod_compress config options may be removed in a future release.
+
%description mod_compress -l pl.UTF-8
Kompresja wyjścia zmniejsza obciążenie sieci i może poprawić całkowitą
przepustowość serwera WWW.
Summary: lighttpd module for output compression using deflate method
Summary(pl.UTF-8): Moduł lighttpd do kompresji wyjścia metodą deflate
Group: Networking/Daemons/HTTP
-URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Mod_Deflate
+URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModDeflate
Requires: %{name} = %{version}-%{release}
+Obsoletes: lighttpd-mod_compress < 1.4.56
+
+%define _deflate_encodings deflate gzip %{?with_bzip2:bzip2} %{?with_brotli:brotli}
+%define deflate_encodings %(echo %_deflate_encodings | sed -e 's/ /, /g')
%description mod_deflate
-mod_deflate can compress any output from lighttpd static or dynamic.
-It doesn't support caching compressed output like mod_compress.
+mod_deflate enables output compression of responses
+(Content-Encoding).
+
+Output compression reduces the network load and can improve the
+overall throughput of the webserver. All major http-clients support
+compression by announcing it in the Accept-Encoding header. This is
+used to negotiate the most suitable compression method.
+
+This module supports %{deflate_encodings} encodings.
+
+deflate (RFC1950, RFC1951) and gzip (RFC1952) depend on zlib while
+bzip2 depends on libbzip2. bzip2 is only supported by lynx and some
+other console text-browsers. brotli (RFC7932) is supported in most
+popular browsers.
+
+Since lighttpd 1.4.56, mod_deflate subsumes and replaces mod_compress.
+mod_deflate can compress static and dynamic responses, while
+mod_compress could compress only static files.
%description mod_deflate -l pl.UTF-8
mod_deflate potrafi kompresować statyczne i dynamiczne wyjście z
komunikacji z zewnętrznymi programami obsługującymi procesy, takimi
jak Perl, PHP czy własne aplikacje.
-%package mod_flv_streaming
-Summary: lighttpd module for flv streaming
-Summary(pl.UTF-8): Moduł lighttpd do streamingu flv
-Group: Networking/Daemons/HTTP
-URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModFLVStreaming
-Requires: %{name} = %{version}-%{release}
-
-%description mod_flv_streaming
-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
%description mod_magnet -l pl.UTF-8
mod_magnet to moduł sterujący obsługą żądań w lighty.
-%package mod_mysql_vhost
-Summary: lighttpd module for MySQL based vhosting
-Summary(pl.UTF-8): Moduł lighttpd obsługujący vhosty oparte na MySQL-u
+%package mod_maxminddb
+Summary: lighttpd module
Group: Networking/Daemons/HTTP
-URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModMySQLVhost
+#URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModGeoip
Requires: %{name} = %{version}-%{release}
-Conflicts: %{name}-mod_simple_vhost
-%description mod_mysql_vhost
-This module provides virtual hosts (vhosts) based on a MySQL table.
+%description mod_maxminddb
-%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
%description mod_simple_vhost -l pl.UTF-8
Moduł lighttpd do prostych hostów wirtualnych.
+%package mod_sockproxy
+Summary: Transparent socket proxy
+Group: Networking/Daemons/HTTP
+URL: https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModSockProxy
+Requires: %{name} = %{version}-%{release}
+
+%description mod_sockproxy
+mod_sockproxy is a transparent socket proxy. For a given $SERVER["socket"]
+config, connections will be forwarded to backend(s) without any
+interpretation of the protocol.
+
%package mod_ssi
Summary: lighttpd module for server-side includes
Summary(pl.UTF-8): Moduł lighttpd do SSI (server-side includes)
%description mod_status -l pl.UTF-8
mod_status wyświetla stan i konfigurację serwera.
-%package mod_trigger_b4_dl
-Summary: Trigger before Download
-Summary(pl.UTF-8): Wyzwalacz przed ściąganiem
-Group: Networking/Daemons/HTTP
-URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModTriggerBeforeDownload
-Requires: %{name} = %{version}-%{release}
-
-%description mod_trigger_b4_dl
-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
%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
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
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
%prep
%setup -q
#%patch100 -p1
-%patch0 -p1
#%patch1 -p1 UPDATE (and submit upstream!) if you need this
%{?with_h264_streaming:%patch2 -p1}
%patch3 -p1
-%patch6 -p1
-#%patch7 -p1 probably fixed upstream
+%patch4 -p1
rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
%endif
%build
-ver=$(awk '/AC_INIT/{a=$2;gsub(/[\[\],]/, "", a); print a}' configure.ac)
+ver=$(awk -F ',' '/AC_INIT/{a=$2;gsub(/[\[\],]/, "", a); print a}' configure.ac)
if [ "$ver" != "%{version}" ]; then
: configure.ac specifies wrong version
exit 1
fi
+%{__aclocal} -I m4 -I scripts/m4
%{__libtoolize}
-%{__aclocal} -I scripts/m4
-%{__autoheader}
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure \
- --libdir=%{pkglibdir} \
%{!?with_ipv6:--disable-ipv6} \
%{!?with_largefile:--disable-lfs} \
- %{?with_valgrind:--with-valgrind} \
- %{?with_xattr:--with-attr} \
+ %{?with_brotli:--with-brotli} \
+ %{?with_bzip2:--with-bzip2} \
+ %{?with_dbi:--with-dbi} \
+ %{?with_gamin:--with-gamin} \
%{?with_krb5:--with-krb5} \
- %{?with_geoip:--with-geoip} \
- %{?with_mysql:--with-mysql} \
%{?with_ldap:--with-ldap} \
- %{?with_ssl:--with-openssl} \
%{?with_lua:--with-lua=lua51} \
- %{?with_memcache:--with-memcache} \
- %{?with_webdav_props:--with-webdav-props} \
+ %{?with_maxminddb:--with-maxminddb} \
+ %{?with_mysql:--with-mysql} \
+ %{?with_pgsql:--with-pgsql} \
+ %{?with_ssl:--with-openssl} \
+ %{?with_valgrind:--with-valgrind} \
%{?with_webdav_locks:--with-webdav-locks} \
- %{?with_gamin:--with-gamin} \
- %{?with_gdbm:--with-gdbm}
+ %{?with_webdav_props:--with-webdav-props} \
+ %{?with_xattr:--with-attr} \
+ --libdir=%{pkglibdir}
# -j1 as src/mod_ssi_exprparser.h regeneration deps are broken
%{__make} -j1
%install
rm -rf $RPM_BUILD_ROOT
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 \
+ $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 \
- $RPM_BUILD_ROOT/var/cache/lighttpd/mod_compress \
$RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
%{__make} install \
cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+cp -p doc/systemd/lighttpd.service $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
rm -f $RPM_BUILD_ROOT%{pkglibdir}/*.la
cp -p %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_auth.conf
cp -p %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cgi.conf
cp -p %{SOURCE137} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cgi_php.conf
-cp -p %{SOURCE105} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cml.conf
+
cp -p %{SOURCE107} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_deflate.conf
cp -p %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_dirlisting.conf
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
+%if %{with maxminddb}
+cp -p %{SOURCE147} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_maxminddb.conf
+%endif
+%if %{with ldap}
+cp -p %{SOURCE141} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_authn_ldap.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
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
-%if %{with mysql}
-cp -p %{SOURCE133} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_mysql_vhost.conf
-%endif
+cp -p %{SOURCE144} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_wstunnel.conf
+cp -p %{SOURCE146} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_sockproxy.conf
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
-cp -p %{SOURCE106} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/60_mod_compress.conf
-
cp -p %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_accesslog.conf
cp -p %{SOURCE135} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/91_mod_extforward.conf
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
touch $RPM_BUILD_ROOT/var/log/%{name}/{access,error,breakage}.log
%module_scripts mod_access
%module_scripts mod_accesslog
+%module_scripts mod_ajp13
%module_scripts mod_alias
%module_scripts mod_auth
+%module_scripts mod_authn_dbi
%module_scripts mod_authn_file
-%module_scripts mod_authn_mysql
%module_scripts mod_authn_gssapi
%module_scripts mod_authn_ldap
%module_scripts mod_cgi
-%module_scripts mod_cml
-%module_scripts mod_compress
%module_scripts mod_deflate
%module_scripts mod_dirlisting
%module_scripts mod_evasive
%module_scripts mod_expire
%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_maxminddb
+%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
%module_scripts mod_simple_vhost
+%module_scripts mod_sockproxy
%module_scripts mod_ssi
%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}
%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
# rrdtool database is stored there
%dir %attr(771,root,lighttpd) /var/lib/lighttpd
-# mod_compress can put cached files there
-%dir /var/cache/lighttpd
-
%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(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_alias.conf
%attr(755,root,root) %{pkglibdir}/mod_alias.so
+%files mod_ajp13
+%defattr(644,root,root,755)
+%attr(755,root,root) %{pkglibdir}/mod_ajp13.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) %{pkglibdir}/mod_auth.so
+%if %{with dbi}
+%files mod_authn_dbi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{pkglibdir}/mod_authn_dbi.so
+%endif
+
%files mod_authn_file
%defattr(644,root,root,755)
%attr(755,root,root) %{pkglibdir}/mod_authn_file.so
%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
-
-%if %{with mysql}
-%files mod_authn_mysql
-%defattr(644,root,root,755)
-%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_php.conf
-%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) %{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) %{pkglibdir}/mod_compress.so
-%dir %attr(775,root,lighttpd) /var/cache/lighttpd/mod_compress
-
%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(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_fastcgi.conf
%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) %{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_magnet.conf
%attr(755,root,root) %{pkglibdir}/mod_magnet.so
-%if %{with mysql}
-%files mod_mysql_vhost
+%if %{with maxminddb}
+%files mod_maxminddb
%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) %{pkglibdir}/mod_mysql_vhost.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_maxminddb.conf
+%attr(755,root,root) %{pkglibdir}/mod_maxminddb.so
%endif
%files mod_proxy
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_proxy.conf
%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(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_simple_vhost.conf
%attr(755,root,root) %{pkglibdir}/mod_simple_vhost.so
+%files mod_sockproxy
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_sockproxy.conf
+%attr(755,root,root) %{pkglibdir}/mod_sockproxy.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(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_status.conf
%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) %{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(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_usertrack.conf
%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) %{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)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/php-spawned.conf