# 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
%define _apache_modules_api 20120211
%define openssl_ver 1.1.1
-%define apr_ver 1:1.6.0
-%define apr_util_ver 1:1.6.0
+%define apr_ver 1:1.6.1
+%define apr_util_ver 1:1.6.1
-%include /usr/lib/rpm/macros.perl
Summary: The most widely used Web server on the Internet
Summary(de.UTF-8): Leading World Wide Web-Server
Summary(es.UTF-8): Servidor HTTPD para proveer servicios WWW
Summary(ru.UTF-8): Самый популярный веб-сервер
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
-Version: 2.4.37
-Release: 1
+Version: 2.4.46
+Release: 2
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-# Source0-md5: 6a36e742180ee74bff97b28eee90c3f7
+# Source0-md5: 7d661ea5e736dac5e2761d9f49fe8361
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: %{name}.sysconfig
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: sed >= 4.0
+BuildRequires: systemd-devel
BuildRequires: zlib-devel
Requires: %{name}-errordocs = %{version}-%{release}
Requires: %{name}-mod_alias = %{version}-%{release}
systemie memcached - wysoko wydajnym, ozproszonym systemie pamięci
podręcznej obiektów.
+%package mod_socache_redis
+Summary: Redis based shared object cache provider
+Summary(pl.UTF-8): Moduł zapewniający współdzieloną pamięć podręczną obiektów w oparciu o Redis
+Group: Networking/Daemons/HTTP
+URL: http://httpd.apache.org/docs/2.4/mod/mod_socache_redis.html
+Requires: %{name}-base = %{version}-%{release}
+Provides: apache(mod_socache_redis) = %{version}-%{release}
+
+%description mod_socache_redis
+mod_socache_redis is a shared object cache provider which provides
+for creation and access to a cache backed by the redis
+high-performance, distributed memory object caching system.
+
+%description mod_socache_redis -l pl.UTF-8
+mod_socache_dbm to moduł dostarczający współdzieloną pamięć podręczną
+obiektów, zapewniający tworzenie i dostęp do cache'a zapisywanego w
+systemie redis - wysoko wydajnym, rozproszonym systemie pamięci
+podręcznej obiektów.
+
%package mod_socache_shmcb
Summary: shmcb based shared object cache provider
Summary(pl.UTF-8): Moduł zapewniający współdzieloną pamięć podręczną obiektów w oparciu o shmcb
--enable-speling \
%{?with_ssl:--enable-ssl %{?with_distcache:--enable-distcache}} \
--enable-suexec \
+ --enable-systemd \
--enable-unique-id \
--enable-usertrack \
--enable-vhost-alias \
cp -p %{SOURCE30} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+modules="
+ %{?with_bucketeer:bucketeer}
+ 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
+ brotli
+ buffer
+ case_filter
+ case_filter_in
+ cern_meta
+ cgi
+ charset_lite
+ data
+ dbd
+ dialup
+ dumpio
+ echo
+ env
+ expires
+ ext_filter
+ file_cache
+ filter
+ headers
+ heartbeat
+ heartmonitor
+ ident
+ imagemap
+ include
+ lbmethod_bybusyness
+ lbmethod_byrequests
+ lbmethod_bytraffic
+ lbmethod_heartbeat
+ ldap
+ log_debug
+ log_forensic
+ logio
+ lua
+ macro
+ md
+ negotiation
+ ratelimit
+ reflector
+ remoteip
+ reqtimeout
+ request
+ rewrite
+ sed
+ session
+ session_cookie
+ session_crypto
+ session_dbd
+ setenvif
+ slotmem_plain
+ slotmem_shm
+ socache_dbm
+ socache_memcache
+ socache_redis
+ socache_shmcb
+ speling
+ substitute
+ systemd
+ unique_id
+ usertrack
+ version
+ watchdog
+ xml2enc
+"
+
LoadModule() {
local index=$1 module=$2 conffile
conffile=${3:-$module}
echo "LoadModule ${module}_module modules/mod_$module.so" > $CFG/${index}_mod_${conffile}.conf
}
-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 brotli \
- %{?with_bucketeer:bucketeer} buffer \
- case_filter_in case_filter cern_meta cgi charset_lite \
- data dbd dialup dumpio \
- echo env expires ext_filter \
- file_cache filter \
- headers heartbeat heartmonitor \
- ident imagemap include \
- lbmethod_bybusyness lbmethod_byrequests lbmethod_bytraffic \
- lbmethod_heartbeat ldap log_debug log_forensic logio lua \
- 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 \
- socache_shmcb speling substitute \
- unique_id usertrack version watchdog xml2enc; do
-
+for module in $modules; do
LoadModule 00 $module
done
%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
%module_scripts mod_slotmem_shm
%module_scripts mod_socache_dbm
%module_scripts mod_socache_memcache
+%module_scripts mod_socache_redis
%module_scripts mod_socache_shmcb
%module_scripts mod_speling
%module_scripts mod_ssl
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mpm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_systemd.conf
%attr(640,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/vhosts.d/example.net.conf
%attr(640,root,root) %{_sysconfdir}/magic
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd
%attr(755,root,root) %{_libexecdir}/mod_mpm_event.so
%attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so
%attr(755,root,root) %{_libexecdir}/mod_mpm_worker.so
+%attr(755,root,root) %{_libexecdir}/mod_systemd.so
%attr(755,root,root) %{_libexecdir}/mod_unixd.so
%files doc -f manual.files
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_socache_memcache.conf
%attr(755,root,root) %{_libexecdir}/mod_socache_memcache.so
+%files mod_socache_redis
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_socache_redis.conf
+%attr(755,root,root) %{_libexecdir}/mod_socache_redis.so
+
%files mod_socache_shmcb
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_socache_shmcb.conf