From 0c0ebad8d777e4edc2d7a9788081eed29f3fc69e Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 20 Mar 2018 09:36:05 +0000 Subject: [PATCH] - merged 2.4.32 from PLD, updated PL desc for mod_md --- apache.spec | 45 ++++++++++++++++++++++++++++++++++++++++++--- libtool-tag.patch | 6 +++--- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/apache.spec b/apache.spec index 093f1f6..ba7aa60 100644 --- a/apache.spec +++ b/apache.spec @@ -35,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.29 +Version: 2.4.32 Release: 1 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 -# Source0-md5: 0c599404ef6b69eee95bcd9fcd094407 +# Source0-md5: 9ef4914905a90faee64a0955b621d7f8 Source1: %{name}.init Source2: %{name}.logrotate Source3: %{name}.sysconfig @@ -71,6 +71,7 @@ Source27: %{name}-mod_mime_magic.conf Source28: %{name}-mod_cache.conf Source29: %{name}-example.net.conf Source32: %{name}-mod_http2.conf +Source33: %{name}-mod_md.conf Patch0: %{name}-configdir_skip_backups.patch Patch1: %{name}-layout.patch Patch2: %{name}-suexec.patch @@ -1843,6 +1844,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. 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. + %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ą @@ -2773,6 +2797,7 @@ install -d build; cd build rm -rf $RPM_BUILD_ROOT 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%{_var}/lib/httpd/md \ $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \ $RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts} @@ -2785,6 +2810,8 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ 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 @@ -2827,6 +2854,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 LoadModule() { @@ -2848,7 +2877,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 \ @@ -3059,6 +3088,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 @@ -3138,6 +3168,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 @@ -3549,6 +3580,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 @@ -3581,6 +3619,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* diff --git a/libtool-tag.patch b/libtool-tag.patch index ff8fcb0..f53fe0c 100644 --- a/libtool-tag.patch +++ b/libtool-tag.patch @@ -38,14 +38,14 @@ +++ httpd-2.4.16/support/Makefile.in 2015-09-11 16:16:16.075587666 +0300 @@ -62,10 +62,10 @@ ab_OBJECTS = ab.lo - ab_LDADD = $(PROGRAM_LDADD) $(MATH_LIBS) + ab_LDADD = $(PROGRAM_LDADD) $(MATH_LIBS) $(ab_LIBS) ab.lo: ab.c - $(LIBTOOL) --mode=compile $(CC) $(ab_CFLAGS) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(ab_CFLAGS) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ $(ALL_INCLUDES) $(PICFLAGS) $(LTCFLAGS) -c $< && touch $@ ab: $(ab_OBJECTS) -- $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(ab_LDFLAGS) $(PILDFLAGS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(ab_LDFLAGS) $(PILDFLAGS) \ +- $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(PILDFLAGS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(PILDFLAGS) \ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD) checkgid_OBJECTS = checkgid.lo -- 2.44.0