X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache.spec;h=7fd533007a71f7955d9326cc2e9b7d173196a0e5;hp=d77ef45dc316ebf551425d0ceb17e2e02fe65612;hb=dd12cdc17ebfca3f69718a44ae046263570a1727;hpb=9657db95868f9e026a2a4cdfee2ef8a5ca07e0dd

diff --git a/apache.spec b/apache.spec
index d77ef45..7fd5330 100644
--- a/apache.spec
+++ b/apache.spec
@@ -21,8 +21,8 @@
 # this is internal macro, don't change to %%apache_modules_api
 %define		_apache_modules_api 20120211
 
-%define		openssl_ver	1.0.1e
-%define		apr_ver		1:1.4.6
+%define		openssl_ver	1.0.1f
+%define		apr_ver		1:1.5.0
 
 %include	/usr/lib/rpm/macros.perl
 Summary:	The most widely used Web server on the Internet
@@ -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.6
+Version:	2.4.12
 Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	6c17dafd009ef8ffb5ccc9481d1e6441
+# Source0-md5:	ec8676a7fe62433883868b8341da6734
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -1778,6 +1778,26 @@ modułach serwera HTTP Apache, takich jak odwzorowywanie żądań na
 pliki, generowanie dynamicznych odpowiedzi, kontrola dostępu,
 uwierzytelnianie i autoryzacja.
 
+%package mod_macro
+Summary:       Provides macros within apache runtime configuration files
+Summary(pl.UTF-8):     Makra wewnątrz plików konfiguracyjnych apache
+Group:         Networking/Daemons/HTTP
+URL:           http://httpd.apache.org/docs/2.4/mod/mod_macro.html
+Requires:      %{name}-base = %{version}-%{release}
+Provides:      apache(mod_macro) = %{version}-%{release}
+
+%description mod_macro
+This module provides macros within apache runtime configuration files.
+These macros have parameters. They are expanded when used (parameters
+are substituted by their values given as an argument), and the result
+is processed normally.
+
+%description mod_macro -l pl.UTF-8
+Ten moduł umożliwia tworzenie makr wewnątrz plików konfiguracyjnych
+apache. Makra mogą mieć parametry. Makra są rozwijane w momencie
+użycia (argumenty makra są podstawiane za wartości parametrów) a wynik
+jest parsowany jak normalna konfiguracja.
+
 %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ą
@@ -2768,6 +2788,7 @@ echo "LoadModule log_debug_module       modules/mod_log_debug.so" > $CFG/00_mod_
 echo "LoadModule log_forensic_module	modules/mod_log_forensic.so" > $CFG/00_mod_log_forensic.conf
 echo "LoadModule logio_module	modules/mod_logio.so" > $CFG/00_mod_logio.conf
 echo "LoadModule lua_module	modules/mod_lua.so" > $CFG/00_mod_lua.conf
+echo "LoadModule macro_module  modules/mod_macro.so" > $CFG/00_mod_macro.conf
 echo "LoadModule negotiation_module	modules/mod_negotiation.so" > $CFG/00_mod_negotiation.conf
 echo "LoadModule ratelimit_module       modules/mod_ratelimit.so" > $CFG/00_mod_ratelimit.conf
 echo "LoadModule reflector_module       modules/mod_reflector.so" > $CFG/00_mod_reflector.conf
@@ -3122,6 +3143,7 @@ fi
 %module_scripts mod_log_forensic
 %module_scripts mod_logio
 %module_scripts mod_lua
+%module_scripts mod_macro
 %module_scripts mod_mime
 %module_scripts mod_mime_magic
 %module_scripts mod_negotiation
@@ -3604,6 +3626,11 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_lua.conf
 %attr(755,root,root) %{_libexecdir}/mod_lua.so
 
+%files mod_macro
+%defattr(644,root,root,755)
+%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_mime
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_mime.so