X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=ddeedcecf0c5a8661705d53876aa05e9c433c076;hb=5aee35b9150befa6ad30d3bd38f5ca8aca69bc17;hp=bf09c2d9d2229840733c2e88a1fbd84611de18c4;hpb=57d3db8d410725a96fc59efc18fa4e8e1b5c9e39;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index bf09c2d..ddeedce 100644
--- a/apache.spec
+++ b/apache.spec
@@ -1,4 +1,4 @@
-# # TODO:
+# TODO:
 # - config examples for mod_*
 # - --with-suexec-uidmin=500 or =1000 ?
 # - check those autn modules inner deps
@@ -23,6 +23,7 @@
 
 %define		openssl_ver	1.0.2
 %define		apr_ver		1:1.6.0
+%define		apr_util_ver	1:1.6.0
 
 %include	/usr/lib/rpm/macros.perl
 Summary:	The most widely used Web server on the Internet
@@ -34,12 +35,12 @@ Summary(pt_BR.UTF-8):	Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.4.26
+Version:	2.4.34
 Release:	2
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-# Source0-md5:	d4d47749a44461cb2e6c9d78a22b522b
+# Source0-md5:	818adca52f3be187fe45d6822755be95
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -72,6 +73,7 @@ Source29:	%{name}-example.net.conf
 Source30:	%{name}.tmpfiles
 Source31:	%{name}.service
 Source32:	%{name}-mod_http2.conf
+Source33:	%{name}-mod_md.conf
 Patch0:		%{name}-configdir_skip_backups.patch
 Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
@@ -94,12 +96,14 @@ Patch26:	%{name}-mod_vhost_alias_docroot.patch
 Patch29:	libtool-tag.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	apr-devel >= %{apr_ver}
-BuildRequires:	apr-util-devel >= 1:1.3.10-2
+BuildRequires:	apr-util-devel >= %{apr_util_ver}
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 %{?with_distcache:BuildRequires:	distcache-devel}
+BuildRequires:	libbrotli-devel >= 0.6.0
 BuildRequires:	libtool >= 2:1.5
-BuildRequires:	lua51-devel
+BuildRequires:	libxml2-devel >= 2
+BuildRequires:	lua53-devel >= 5.3
 %{?with_http2:BuildRequires:	nghttp2-devel >= 1.15.0}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %{?with_ssl:BuildRequires:	openssl-devel >= %{openssl_ver}}
@@ -198,6 +202,7 @@ Requires(pre):	/usr/sbin/useradd
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	/sbin/chkconfig
 Requires:	apr >= %{apr_ver}
+Requires:	apr-util >= %{apr_util_ver}
 Requires:	psmisc >= 20.1
 Requires:	rc-scripts >= 0.4.1.23
 Requires:	sed >= 4.0
@@ -322,7 +327,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia modułów rozszerzeń do serw
 Summary(pt_BR.UTF-8):	Arquivos de inclusão do Apache para desenvolvimento de módulos
 Summary(ru.UTF-8):	Средства разработки модулей для веб-сервера Apache
 Group:		Networking/Utilities
-Requires:	apr-util-devel >= 1:1.2
+Requires:	apr-util-devel >= %{apr_util_ver}
 Requires:	libtool
 Obsoletes:	apache-apxs
 Obsoletes:	apache-static
@@ -727,7 +732,7 @@ URL:		http://httpd.apache.org/docs/2.4/mod/mod_authnz_ldap.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authn_core = %{version}-%{release}
 Requires:	%{name}-mod_ldap = %{version}-%{release}
-Requires:	apr-util-ldap
+Requires:	apr-util-ldap >= %{apr_util_ver}
 Provides:	apache(mod_authnz_ldap) = %{version}-%{release}
 # compat
 Provides:	apache(mod_auth_ldap) = %{version}-%{release}
@@ -918,7 +923,7 @@ WWW dla uwierzytelnionych użytkowników.
 
 %package mod_autoindex
 Summary:	Apache module - display index of files
-Summary(pl.UTF-8):	Moduł apache do wyświetlania indeksu plików
+Summary(pl.UTF-8):	Moduł Apache'a do wyświetlania indeksu plików
 Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/en/mod/mod_autoindex.html
 Requires:	%{name}-base = %{version}-%{release}
@@ -932,8 +937,27 @@ index of files.
 %description mod_autoindex -l pl.UTF-8
 Ten pakiet dostarcza moduł autoindex, który generuje indeks plików.
 
+%package mod_brotli
+Summary:	Apache module: compress content via Brotli before it is delivered to the client
+Summary(pl.UTF-8):	Moduł Apache'a kompresujący treść przy użyciu formatu Brotli przed wysłaniem do klienta
+Group:		Networking/Daemons/HTTP
+URL:		http://httpd.apache.org/docs/2.4/mod/mod_brotli.html
+Requires:	%{name}-base = %{version}-%{release}
+Requires:	libbrotli >= 0.6.0
+Provides:	apache(mod_brotli) = %{version}-%{release}
+
+%description mod_brotli
+The mod_brotli module provides the BROTLI_COMPRESS output filter that
+allows output from your server to be compressed using the brotli
+compression format before being sent to the client over the network.
+
+%description mod_brotli -l pl.UTF-8
+Moduł mod_brotli udostępnia filtr wyjściowy BROTLI_COMPRESS,
+pozwalający na kompresowanie wyjścia z serwera przy użyciu formatu
+kompresji brotli przed wysłaniem przez sieć do klienta.
+
 %package mod_bucketeer
-Summary:	buckets manipulation filter
+Summary:	Buckets manipulation filter
 Summary(pl.UTF-8):	Dzielenie kubełków po znalezieniu znaku sterującego
 Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
@@ -1179,7 +1203,7 @@ Summary(pl.UTF-8):	Moduł Apache'a - rozproszone autorstwo i wersjonowanie
 Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/en/mod/mod_dav.html
 Requires:	%{name}-base = %{version}-%{release}
-Requires:	apr-util-dbm-db
+Requires:	apr-util-dbm-db >= %{apr_util_ver}
 Provides:	apache(mod_dav) = %{version}-%{release}
 
 %description mod_dav
@@ -1824,6 +1848,29 @@ Apache'a. Makra mogą mieć parametry. Makra są rozwijane w momencie
 użycia (argumenty makra są podstawiane za wartości parametrów), a
 wynik jest przetwarzany jak normalna konfiguracja.
 
+%package mod_md
+Summary:	Managing certificate provisioning via the ACME protocol
+Summary(pl.UTF-8):	Zarządzanie certyfikatami przez protokół ACME
+Group:		Networking/Daemons/HTTP
+URL:		http://httpd.apache.org/docs/2.4/mod/mod_macro.html
+Requires:	%{name}-base = %{version}-%{release}
+Requires:	apache(mod_watchdog) = %{version}-%{release}
+Provides:	apache(mod_md) = %{version}-%{release}
+
+%description mod_md
+This module manages common properties of domains for one or more
+virtual hosts. Specifically it can use the ACME protocol to automate
+certificate provisioning. These will be configured for managed domains
+and their virtual hosts automatically. This includes renewal of
+certificates before they expire.
+
+%description mod_md -l pl.UTF-8
+Moduł zarządzający właściwościami domen dla jednego lub więcej hostów
+wirtualnych. Konkretnie może używać protokołu ACME do automatyzacji
+instalacji certyfikatów. Certyfikaty będą automatycznie aktywowane dla
+zarządzanych domen i hostów wirtualnych w tych domenach. Instalacji
+oraz odnowień certyfikatów przed wygaśnięciem.
+
 %package mod_mime
 Summary:	Associates the requested filename's extensions with the file's behavior and content
 Summary(pl.UTF-8):	Wiązanie określonych rozszerzeń plików z zachowaniem i zawartością
@@ -2157,7 +2204,7 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_session_crypto.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_session = %{version}-%{release}
-Requires:	apr-util-crypto-openssl
+Requires:	apr-util-crypto-openssl >= %{apr_util_ver}
 Provides:	apache(mod_session_crypto) = %{version}-%{release}
 
 %description mod_session_crypto
@@ -2377,7 +2424,7 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_ssl.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_socache_shmcb = %{version}-%{release}
-Requires:	apr-util-dbm-db
+Requires:	apr-util-dbm-db >= %{apr_util_ver}
 Requires:	openssl >= %{openssl_ver}
 Provides:	apache(mod_ssl) = 1:%{version}-%{release}
 
@@ -2694,36 +2741,47 @@ install -d build; cd build
 	--enable-auth-dbm \
 	--enable-authn-dbd \
 	--enable-authn-alias \
+	%{?with_ldap:--enable-authnz-ldap} \
 	--enable-authz-dbm \
 	--enable-authz-owner \
-	%{?with_ldap:--enable-authnz-ldap} \
 	--enable-auth-digest \
-	--enable-file-cache \
+	%{?with_bucketeer:--enable-bucketeer} \
 	--enable-cache \
 	--enable-disk-cache \
+	--enable-file-cache \
 	--enable-mem-cache \
-	--enable-dbd \
-	%{?with_bucketeer:--enable-bucketeer} \
-	--enable-dumpio \
-	--enable-echo \
+	--enable-cern-meta \
+	--enable-cgi \
+	--enable-cgid \
 	--enable-charset-lite \
+	--enable-dbd \
 	--enable-deflate \
-	%{?with_ldap:--enable-ldap} \
-	--enable-ext-filter \
+	--enable-dumpio \
 	--enable-case-filter \
 	--enable-case-filter-in \
-	--enable-log-forensic \
-	--enable-logio \
-	--enable-lua \
-	--with-z=%{_prefix} \
-	--enable-mime-magic \
-	--enable-cern-meta \
+	--enable-dav \
+	--enable-dav-fs \
+	--enable-dav-lock \
+	--enable-echo \
+	--enable-ext-filter \
 	--enable-expires \
 	--enable-headers \
+	--enable-http \
 	%{__enable_disable http2} \
 	--enable-ident \
-	--enable-usertrack \
-	--enable-unique-id \
+	--enable-imagemap \
+	--enable-info \
+	%{?with_ldap:--enable-ldap} \
+	--enable-log-forensic \
+	--enable-logio \
+	--enable-lua \
+	--enable-mime-magic \
+	--enable-mpms-shared=all \
+%ifarch %{ix86}
+%ifnarch i386 i486
+	--enable-nonportable-atomics=yes \
+%endif
+%endif
 	--enable-proxy \
 	--enable-proxy-connect \
 	--enable-proxy-ftp \
@@ -2732,27 +2790,19 @@ install -d build; cd build
 	--enable-proxy-ajp \
 	--enable-proxy-balancer \
 	--enable-proxy-fdpass \
+	--enable-rewrite \
+	--enable-so \
+	--enable-speling \
 	%{?with_ssl:--enable-ssl %{?with_distcache:--enable-distcache}} \
-	--enable-http \
-	--enable-dav \
-	--enable-info \
 	--enable-suexec \
-	--enable-cgi \
-	--enable-cgid \
-	--enable-dav-fs \
-	--enable-dav-lock \
+	--enable-unique-id \
+	--enable-usertrack \
 	--enable-vhost-alias \
-	--enable-imagemap \
-	--enable-speling \
-	--enable-rewrite \
-	--enable-so \
+	--with-apr=%{_bindir}/apr-1-config \
+	--with-apr-util=%{_bindir}/apu-1-config \
+	--with-lua=/usr \
+	--with-pcre \
 	--with-program-name=httpd \
-	--enable-mpms-shared=all \
-%ifarch %{ix86}
-%ifnarch i386 i486
-	--enable-nonportable-atomics=yes \
-%endif
-%endif
 	--with-suexec-bin=%{_sbindir}/suexec \
 	--with-suexec-caller=http \
 	--with-suexec-docroot=%{_datadir} \
@@ -2760,9 +2810,7 @@ install -d build; cd build
 	--with-suexec-uidmin=500 \
 	--with-suexec-gidmin=500 \
 	--with-suexec-umask=077 \
-	--with-apr=%{_bindir}/apr-1-config \
-	--with-apr-util=%{_bindir}/apu-1-config \
-	--with-pcre
+	--with-z=%{_prefix}
 
 %{__make}
 
@@ -2770,6 +2818,7 @@ install -d build; cd build
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,systemd/system} \
 	$RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \
+	$RPM_BUILD_ROOT%{_var}/lib/httpd/md \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
 	$RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts} \
 	$RPM_BUILD_ROOT%{systemdtmpfilesdir} \
@@ -2786,6 +2835,8 @@ ln -s %{systemdunitdir}/httpd.service $RPM_BUILD_ROOT/etc/systemd/system/httpd.s
 ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
 ln -s %{_localstatedir}/run/httpd $RPM_BUILD_ROOT%{_sysconfdir}/run
 ln -s %{_var}/log/httpd $RPM_BUILD_ROOT%{_sysconfdir}/logs
+ln -s %{_var}/lib/httpd/md $RPM_BUILD_ROOT%{_sysconfdir}/md
+
 # we have own apache.conf
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
@@ -2828,6 +2879,8 @@ cp -a %{SOURCE19} $CFG/30_manual.conf
 cp -a %{SOURCE20} $CFG/16_mod_userdir.conf
 cp -a %{SOURCE21} $CFG/10_mpm.conf
 cp -a %{SOURCE22} $CFG/20_languages.conf
+cp -a %{SOURCE33} $CFG/60_mod_md.conf
+
 cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
 
 cp -p %{SOURCE30} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
@@ -2841,8 +2894,8 @@ LoadModule() {
 for module in access_compat actions alias allowmethods asis auth_basic \
 	auth_digest auth_form authn_anon authn_core authn_dbd authn_dbm \
 	authn_file authn_socache authnz_ldap authz_core authz_dbd \
-	authz_dbm authz_groupfile authz_owner authz_user buffer \
-	%{?with_bucketeer:bucketeer} \
+	authz_dbm authz_groupfile authz_owner authz_user brotli \
+	%{?with_bucketeer:bucketeer} buffer \
 	case_filter_in case_filter cern_meta cgi charset_lite \
 	data dbd dialup dumpio \
 	echo env expires ext_filter \
@@ -2851,7 +2904,7 @@ for module in access_compat actions alias allowmethods asis auth_basic \
 	ident imagemap include \
 	lbmethod_bybusyness lbmethod_byrequests lbmethod_bytraffic \
 	lbmethod_heartbeat ldap log_debug log_forensic logio lua \
-	macro negotiation \
+	macro md negotiation \
 	ratelimit reflector remoteip reqtimeout request rewrite \
 	sed session_cookie session_crypto session_dbd session setenvif \
 	slotmem_plain slotmem_shm socache_dbm socache_memcache \
@@ -3027,6 +3080,7 @@ fi
 %module_scripts mod_authz_owner
 %module_scripts mod_authz_user
 %module_scripts mod_autoindex
+%module_scripts mod_brotli
 %module_scripts mod_bucketeer
 %module_scripts mod_buffer
 %module_scripts mod_cache
@@ -3068,6 +3122,7 @@ fi
 %module_scripts mod_logio
 %module_scripts mod_lua
 %module_scripts mod_macro
+%module_scripts mod_md
 %module_scripts mod_mime
 %module_scripts mod_mime_magic
 %module_scripts mod_negotiation
@@ -3154,6 +3209,7 @@ fi
 %attr(755,root,root) %{_sbindir}/checkgid
 %attr(755,root,root) %{_sbindir}/httpd
 
+%dir %attr(710,root,http) /var/lib/httpd
 %dir %attr(770,root,http) /var/run/httpd
 %dir %attr(770,root,http) /var/cache/httpd
 
@@ -3348,6 +3404,11 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_autoindex.conf
 %attr(755,root,root) %{_libexecdir}/mod_autoindex.so
 
+%files mod_brotli
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_brotli.conf
+%attr(755,root,root) %{_libexecdir}/mod_brotli.so
+
 %if %{with bucketeer}
 %files mod_bucketeer
 %defattr(644,root,root,755)
@@ -3564,6 +3625,13 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_macro.conf
 %attr(755,root,root) %{_libexecdir}/mod_macro.so
 
+%files mod_md
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_md.conf
+%attr(755,root,root) %{_libexecdir}/mod_md.so
+%attr(710,root,http) %dir /var/lib/httpd/md
+%{_sysconfdir}/md
+
 %files mod_mime
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_mime.so
@@ -3596,6 +3664,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_proxy_http.so
 %attr(755,root,root) %{_libexecdir}/mod_proxy_http2.so
 %attr(755,root,root) %{_libexecdir}/mod_proxy_scgi.so
+%attr(755,root,root) %{_libexecdir}/mod_proxy_uwsgi.so
 %attr(755,root,root) %{_libexecdir}/mod_proxy_wstunnel.so
 %attr(755,root,root) %{_libexecdir}/mod_proxy.so
 %{_mandir}/man8/fcgistarter.8*