X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache.spec;h=360d0214617b33173b758f445fc9852ffec488cf;hp=015dec4559ea2d0568a5a93e634d04fa235a2da8;hb=HEAD;hpb=8339c92bd88ce595f53d98d0082a905bb02c688b

diff --git a/apache.spec b/apache.spec
index 015dec4..09bf5b1 100644
--- a/apache.spec
+++ b/apache.spec
@@ -1,15 +1,15 @@
 # TODO:
 # - config examples for mod_*
 # - --with-suexec-uidmin=500 or =1000 ?
-# - check those autn modules inner deps
+# - check those authn modules inner deps
 # - for external packages: don't use any apache module name in dep as they
-#  differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
-# - for mod_auth_* modules require each auth module to require virtual authn so at least *_core
-#  is chosen?
+#   differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
+# - for mod_auth_* modules require each auth module to require virtual authn so at least *_core is chosen?
 # - same for mod_authz
 # - mod_auth_digest and mod_auth_basic R: apache(authn) ?
 # - drop mod_case_filter* or find summary and description for them
 # - FYI: http://wiki.apache.org/httpd/InternalDummyConnection
+# - consider modules: mod_authnz_fcgi, mod_socache_dc (distcache bcond)
 
 # Conditional build:
 %bcond_without	ssl		# build without SSL support
@@ -21,9 +21,9 @@
 # this is internal macro, don't change to %%apache_modules_api
 %define		_apache_modules_api 20120211
 
-%define		openssl_ver	1.0.2
-%define		apr_ver		1:1.6.0
-%define		apr_util_ver	1:1.6.0
+%define		openssl_ver	1.1.1
+%define		apr_ver		1:1.7.0
+%define		apr_util_ver	1:1.6.1
 
 Summary:	The most widely used Web server on the Internet
 Summary(de.UTF-8):	Leading World Wide Web-Server
@@ -34,12 +34,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.49
+Version:	2.4.59
 Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-# Source0-md5:	f294efbeabcf6027fccc7983a6daa55f
+# Source0-md5:	9f77eb01b2fddfb4b32d469af90fb01b
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -96,12 +96,13 @@ BuildRequires:	apr-devel >= %{apr_ver}
 BuildRequires:	apr-util-devel >= %{apr_util_ver}
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	curl-devel
 %{?with_distcache:BuildRequires:	distcache-devel}
-BuildRequires:	jansson-devel >= 0.6.0
+BuildRequires:	jansson-devel
 BuildRequires:	libbrotli-devel >= 0.6.0
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2
-BuildRequires:	lua53-devel >= 5.3
+BuildRequires:	lua54-devel >= 5.4
 %{?with_http2:BuildRequires:	nghttp2-devel >= 1.15.0}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %{?with_ssl:BuildRequires:	openssl-devel >= %{openssl_ver}}
@@ -630,7 +631,6 @@ URL:		http://httpd.apache.org/docs/2.4/mod/mod_authn_core.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_core) = %{version}-%{release}
 Provides:	apache(mod_authn_default) = %{version}-%{release}
-Obsoletes:	apache(mod_authn_alias)
 Obsoletes:	apache-mod_authn_default < %{version}-%{release}
 
 %description mod_authn_core
@@ -1540,7 +1540,7 @@ Summary(pl.UTF-8):	Obsługa HTTP/2 dla serwera HTTP Apache
 Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_http2.html
 Requires:	%{name}-base = %{version}-%{release}
-Requires:	nghttp2 >= 1.15.0
+Requires:	nghttp2-libs >= 1.15.0
 Provides:	apache(mod_http2) = %{version}-%{release}
 
 %description mod_http2
@@ -1862,10 +1862,10 @@ 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. Może używać protokołu ACME do automatyzacji obsługi
-certyfikatów. Certyfikaty będą automatycznie aktywowane dla
-zarządzanych domen i hostów wirtualnych w tych domenach. Będą również
-automatycznie odnawianie przed wygaśnięciem.
+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
@@ -2697,7 +2697,7 @@ if [ "$MODULES_API" != "%_apache_modules_api" ]; then
 	exit 1
 fi
 
-# fix libdir (at least in TLD layout; no need to care about other ones)
+# fix libdir (at least in PLD layout; no need to care about other ones)
 sed -i -e 's,/lib$,/%{_lib},' config.layout
 
 %build
@@ -2915,7 +2915,7 @@ s/^.*\.\(pt-br\)/%%lang(pt_BR) &/
 cd $cur
 
 # htpasswd goes to %{_bindir}
-ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
+ln -sfr $RPM_BUILD_ROOT%{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
 
 mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/apxs
 
@@ -2943,7 +2943,7 @@ rm -rf $RPM_BUILD_ROOT
 %useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http
 
 %pretrans base
-# handle $HTTPD_MPM from sysconfig
+# upgrade to 2.4: handle $HTTPD_MPM from sysconfig
 if [ -f /etc/sysconfig/httpd ]; then
 	MPM=$(grep ^HTTPD_MPM /etc/sysconfig/httpd | sed 's,HTTPD_MPM=,,;s,",,g')
 	if [ -n "$MPM" ]; then
@@ -2973,13 +2973,12 @@ if [ "$1" = "0" ]; then
 	%groupremove http
 fi
 
-%triggerpostun base -- %{name}-base < 2.2.22-2
+%triggerpostun base -- %{name}-base < 2.4.0
 . /etc/sysconfig/httpd
 if [ -z "$HTTPD_CONF" ]; then
 	echo 'HTTPD_CONF="/etc/httpd/apache.conf"' >> /etc/sysconfig/httpd
 fi
 
-%triggerpostun base -- %{name}-base < 2.4.0
 cp -f /etc/httpd/apache.conf{,.rpmsave}
 sed -i -e '
 	/^DefaultType/d
@@ -3195,7 +3194,7 @@ fi
 %dir %{_datadir}/cgi-bin
 %dir %{_datadir}/html
 %dir %{_datadir}/vhosts
-# do not adapter here, %{_datadir} != /usr/share here
+# do not adapter here, %%{_datadir} != /usr/share here
 %{_datadir}/icons
 %attr(755,root,root) %{_libexecdir}/mod_mpm_event.so
 %attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so