X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache.spec;h=4a8fed86e51b832a74e0a0aa6b45db3bb50ab06e;hp=9faf190511a52e6e9d69e24183b7d2e3c761f928;hb=83e8de637d8e026b5ac82ae4cc76e92009a85f98;hpb=f2f9f2cc1a964f82a3fdfbe7f040e5d6793cfcb7 diff --git a/apache.spec b/apache.spec index 9faf190..4a8fed8 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 @@ -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.4 -Release: 7 +Version: 2.4.12 +Release: 2 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz -# Source0-md5: a2fed766e67c9681e0d9b86768f08286 +# Source0-md5: ec8676a7fe62433883868b8341da6734 Source1: %{name}.init Source2: %{name}.logrotate Source3: %{name}.sysconfig @@ -69,8 +69,6 @@ Source26: %{name}-mod_log_config.conf Source27: %{name}-mod_mime_magic.conf Source28: %{name}-mod_cache.conf Source29: %{name}-example.net.conf -Source30: %{name}.tmpfiles -Source31: %{name}.service Patch0: %{name}-configdir_skip_backups.patch Patch1: %{name}-layout.patch Patch2: %{name}-suexec.patch @@ -187,13 +185,11 @@ Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Requires(post,preun,postun): systemd-units >= 38 Requires: /sbin/chkconfig Requires: apr >= %{apr_ver} Requires: psmisc >= 20.1 Requires: rc-scripts >= 0.4.1.23 Requires: sed >= 4.0 -Requires: systemd-units >= 38 Provides: apache(modules-api) = %{_apache_modules_api} Provides: group(http) Provides: user(http) @@ -1778,6 +1774,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ą @@ -2649,12 +2665,10 @@ install -d build; cd build %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,systemd/system} \ +install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ $RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \ $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \ - $RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts} \ - $RPM_BUILD_ROOT%{systemdtmpfilesdir} \ - $RPM_BUILD_ROOT%{systemdunitdir} + $RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts} %{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT @@ -2662,8 +2676,6 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,systemd/system # clean "ccache" prefix. confuses other build systems (like php) %{__sed} -i -re '/^(CC|CPP|CXX)/ s/ccache //' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/config_vars.mk -install %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/httpd.service -ln -s %{systemdunitdir}/httpd.service $RPM_BUILD_ROOT/etc/systemd/system/httpd.service 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 @@ -2711,8 +2723,6 @@ cp -a %{SOURCE21} $CFG/10_mpm.conf cp -a %{SOURCE22} $CFG/20_languages.conf cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf -install %{SOURCE30} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf - echo "LoadModule access_compat_module modules/mod_access_compat.so" > $CFG/00_mod_access_compat.conf echo "LoadModule actions_module modules/mod_actions.so" > $CFG/00_mod_actions.conf echo "LoadModule alias_module modules/mod_alias.so" > $CFG/00_mod_alias.conf @@ -2768,6 +2778,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 @@ -2873,21 +2884,18 @@ exit 0 /sbin/chkconfig --add httpd umask 137 touch /var/log/httpd/{access,error,agent,referer}_log -%systemd_post httpd.service %preun base if [ "$1" = "0" ]; then %service httpd stop /sbin/chkconfig --del httpd fi -%systemd_preun httpd.service %postun base if [ "$1" = "0" ]; then %userremove http %groupremove http fi -%systemd_reload %triggerpostun base -- %{name} < 2.0.50-6.9 %banner %{name}-2.0.50-6 << EOF @@ -2992,7 +3000,6 @@ EOF if [ -z "$HTTPD_CONF" ]; then echo 'HTTPD_CONF="/etc/httpd/apache.conf"' >> /etc/sysconfig/httpd fi -%systemd_trigger httpd.service %triggerpostun base -- %{name} < 2.4.0 cp -f /etc/httpd/apache.conf{,.rpmsave} @@ -3035,20 +3042,17 @@ mv -f /var/lock/subsys/httpd{.disabled,} 2>/dev/null # restart webserver at the end of transaction %service httpd restart -%systemd_service_restart httpd.service # macro called at module post scriptlet %define module_post \ if [ "$1" = "1" ]; then \ %service -q httpd restart \ - %systemd_service_restart httpd.service \ fi # macro called at module postun scriptlet %define module_postun \ if [ "$1" = "0" ]; then \ %service -q httpd restart \ - %systemd_service_restart httpd.service \ fi # it's sooo annoying to write them @@ -3122,6 +3126,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 @@ -3156,25 +3161,21 @@ fi %post cgi_test if [ "$1" = "1" ]; then %service -q httpd reload - %systemd_service_reload httpd.service fi %postun cgi_test if [ "$1" = "0" ]; then %service -q httpd reload - %systemd_service_reload httpd.service fi %post errordocs if [ "$1" = "1" ]; then %service -q httpd reload - %systemd_service_reload httpd.service fi %postun errordocs if [ "$1" = "0" ]; then %service -q httpd reload - %systemd_service_reload httpd.service fi %files @@ -3209,10 +3210,6 @@ fi %dir %attr(770,root,http) /var/run/httpd %dir %attr(770,root,http) /var/cache/httpd -%{systemdtmpfilesdir}/%{name}.conf -%{systemdunitdir}/httpd.service -%config(noreplace) %verify(not md5 mtime size) /etc/systemd/system/httpd.service - %{_mandir}/man8/httpd.8* %attr(2751,root,logs) %dir /var/log/httpd @@ -3418,6 +3415,7 @@ fi %attr(755,root,root) %{_sbindir}/htcacheclean %attr(755,root,root) %{_libexecdir}/mod_cache.so %attr(755,root,root) %{_libexecdir}/mod_cache_disk.so +%attr(755,root,root) %{_libexecdir}/mod_cache_socache.so %{_mandir}/man8/htcacheclean.8* %files mod_case_filter @@ -3603,6 +3601,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 @@ -3633,6 +3636,7 @@ fi %attr(755,root,root) %{_libexecdir}/mod_proxy_html.so %attr(755,root,root) %{_libexecdir}/mod_proxy_http.so %attr(755,root,root) %{_libexecdir}/mod_proxy_scgi.so +%attr(755,root,root) %{_libexecdir}/mod_proxy_wstunnel.so %attr(755,root,root) %{_libexecdir}/mod_proxy.so %{_mandir}/man8/fcgistarter.8*