2012-03-13 09:55:18 +00:00
|
|
|
%define contentdir %{_datadir}/httpd
|
|
|
|
%define docroot /var/www
|
2004-09-09 06:08:44 +00:00
|
|
|
%define suexec_caller apache
|
2012-03-13 09:55:18 +00:00
|
|
|
%define mmn 20120211
|
2013-11-12 12:45:29 +00:00
|
|
|
%define mmnisa %{mmn}%{__isa_name}%{__isa_bits}
|
2014-08-29 15:13:01 +00:00
|
|
|
%define vstring %(source /etc/os-release; echo ${REDHAT_SUPPORT_PRODUCT})
|
2017-09-22 07:06:39 +00:00
|
|
|
%if 0%{?fedora} > 26 || 0%{?rhel} > 7
|
2017-07-17 10:39:57 +00:00
|
|
|
%global mpm event
|
2017-09-22 07:06:39 +00:00
|
|
|
%else
|
|
|
|
%global mpm prefork
|
2017-07-17 10:39:57 +00:00
|
|
|
%endif
|
2004-09-09 06:12:16 +00:00
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
Summary: Apache HTTP Server
|
|
|
|
Name: httpd
|
2018-07-18 10:55:03 +00:00
|
|
|
Version: 2.4.34
|
2018-09-28 07:51:19 +00:00
|
|
|
Release: 10%{?dist}
|
2017-08-04 12:19:55 +00:00
|
|
|
URL: https://httpd.apache.org/
|
|
|
|
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
|
2004-09-09 06:08:44 +00:00
|
|
|
Source1: index.html
|
2012-07-02 10:20:02 +00:00
|
|
|
Source2: httpd.logrotate
|
2018-04-19 16:18:11 +00:00
|
|
|
Source3: instance.conf
|
2012-07-02 10:20:02 +00:00
|
|
|
Source4: httpd-ssl-pass-dialog
|
|
|
|
Source5: httpd.tmpfiles
|
|
|
|
Source6: httpd.service
|
|
|
|
Source7: action-graceful.sh
|
|
|
|
Source8: action-configtest.sh
|
2018-07-16 16:01:34 +00:00
|
|
|
Source9: server-status.conf
|
2004-09-09 06:08:44 +00:00
|
|
|
Source10: httpd.conf
|
2012-03-13 09:55:18 +00:00
|
|
|
Source11: 00-base.conf
|
|
|
|
Source12: 00-mpm.conf
|
|
|
|
Source13: 00-lua.conf
|
|
|
|
Source14: 01-cgi.conf
|
|
|
|
Source15: 00-dav.conf
|
|
|
|
Source16: 00-proxy.conf
|
|
|
|
Source17: 00-ssl.conf
|
2012-03-13 16:33:13 +00:00
|
|
|
Source18: 01-ldap.conf
|
|
|
|
Source19: 00-proxyhtml.conf
|
|
|
|
Source20: userdir.conf
|
|
|
|
Source21: ssl.conf
|
|
|
|
Source22: welcome.conf
|
2012-03-13 16:58:07 +00:00
|
|
|
Source23: manual.conf
|
2012-09-07 09:35:51 +00:00
|
|
|
Source24: 00-systemd.conf
|
2013-02-22 12:59:36 +00:00
|
|
|
Source25: 01-session.conf
|
2014-07-08 13:52:58 +00:00
|
|
|
Source26: 10-listen443.conf
|
|
|
|
Source27: httpd.socket
|
2014-07-31 11:16:47 +00:00
|
|
|
Source28: 00-optional.conf
|
2018-03-28 19:18:58 +00:00
|
|
|
Source29: 01-md.conf
|
2004-09-09 06:12:16 +00:00
|
|
|
# Documentation
|
2012-03-13 16:33:13 +00:00
|
|
|
Source30: README.confd
|
2013-10-21 19:17:46 +00:00
|
|
|
Source31: README.confmod
|
2017-05-19 10:10:34 +00:00
|
|
|
Source32: httpd.service.xml
|
2013-01-08 13:19:12 +00:00
|
|
|
Source40: htcacheclean.service
|
|
|
|
Source41: htcacheclean.sysconf
|
2017-09-20 18:18:24 +00:00
|
|
|
Source42: httpd-init.service
|
|
|
|
Source43: httpd-ssl-gencerts
|
2018-04-19 16:18:11 +00:00
|
|
|
Source44: httpd@.service
|
2004-09-09 06:08:44 +00:00
|
|
|
# build/scripts patches
|
2012-03-13 09:55:18 +00:00
|
|
|
Patch1: httpd-2.4.1-apctl.patch
|
2014-03-18 06:55:27 +00:00
|
|
|
Patch2: httpd-2.4.9-apxs.patch
|
2012-03-13 09:55:18 +00:00
|
|
|
Patch3: httpd-2.4.1-deplibs.patch
|
2018-08-13 13:43:07 +00:00
|
|
|
Patch4: httpd-2.4.34-layfix.patch
|
2018-09-28 07:51:19 +00:00
|
|
|
Patch6: httpd-2.4.34-apctlsystemd.patch
|
2014-08-22 10:11:38 +00:00
|
|
|
# Needed for socket activation and mod_systemd patch
|
2017-03-24 17:05:26 +00:00
|
|
|
Patch19: httpd-2.4.25-detect-systemd.patch
|
2004-09-09 06:16:56 +00:00
|
|
|
# Features/functional changes
|
2018-04-16 07:25:48 +00:00
|
|
|
Patch21: httpd-2.4.33-mddefault.patch
|
2018-03-28 19:18:58 +00:00
|
|
|
Patch23: httpd-2.4.33-export.patch
|
2012-03-13 09:55:18 +00:00
|
|
|
Patch24: httpd-2.4.1-corelimit.patch
|
2017-03-24 17:05:26 +00:00
|
|
|
Patch25: httpd-2.4.25-selinux.patch
|
2013-02-26 09:37:09 +00:00
|
|
|
Patch26: httpd-2.4.4-r1337344+.patch
|
2012-06-08 12:52:50 +00:00
|
|
|
Patch27: httpd-2.4.2-icons.patch
|
2018-06-12 15:08:30 +00:00
|
|
|
Patch29: httpd-2.4.33-systemd.patch
|
2013-04-18 06:22:20 +00:00
|
|
|
Patch30: httpd-2.4.4-cachehardmax.patch
|
2018-04-16 07:44:34 +00:00
|
|
|
Patch31: httpd-2.4.33-sslmultiproxy.patch
|
2015-10-14 08:52:58 +00:00
|
|
|
Patch34: httpd-2.4.17-socket-activation.patch
|
2018-07-06 13:04:07 +00:00
|
|
|
Patch36: httpd-2.4.33-r1830819+.patch
|
2018-08-13 13:43:07 +00:00
|
|
|
Patch37: httpd-2.4.34-r1827912+.patch
|
2018-09-18 12:57:48 +00:00
|
|
|
Patch38: httpd-2.4.34-sslciphdefault.patch
|
2018-09-21 12:07:38 +00:00
|
|
|
Patch39: httpd-2.4.34-sslprotdefault.patch
|
2017-10-25 12:28:47 +00:00
|
|
|
|
2012-08-21 14:57:50 +00:00
|
|
|
# Bug fixes
|
2017-03-30 13:32:35 +00:00
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243
|
2018-07-18 10:55:03 +00:00
|
|
|
Patch58: httpd-2.4.34-r1738878.patch
|
2018-07-20 10:22:10 +00:00
|
|
|
Patch59: httpd-2.4.34-r1555631.patch
|
2018-09-03 09:29:22 +00:00
|
|
|
Patch60: httpd-2.4.34-enable-sslv3.patch
|
2016-12-22 14:40:14 +00:00
|
|
|
|
2017-10-25 12:28:47 +00:00
|
|
|
# Security fixes
|
2017-10-10 11:31:46 +00:00
|
|
|
|
2007-08-21 11:29:20 +00:00
|
|
|
License: ASL 2.0
|
2004-09-09 06:08:44 +00:00
|
|
|
Group: System Environment/Daemons
|
2018-07-16 19:41:32 +00:00
|
|
|
BuildRequires: gcc, autoconf, pkgconfig, findutils, xmlto
|
|
|
|
BuildRequires: perl-interpreter, perl-generators, systemd-devel
|
2017-11-23 11:11:28 +00:00
|
|
|
BuildRequires: zlib-devel, libselinux-devel, lua-devel, brotli-devel
|
2014-10-14 09:53:35 +00:00
|
|
|
BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.5.0, pcre-devel >= 5.0
|
2013-11-22 19:03:44 +00:00
|
|
|
Requires: /etc/mime.types, system-logos-httpd
|
2005-04-25 21:35:08 +00:00
|
|
|
Obsoletes: httpd-suexec
|
2004-09-09 06:08:44 +00:00
|
|
|
Provides: webserver
|
2007-07-25 17:16:39 +00:00
|
|
|
Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
|
2014-02-27 11:03:34 +00:00
|
|
|
Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
|
2012-03-13 16:33:13 +00:00
|
|
|
Requires: httpd-tools = %{version}-%{release}
|
2014-07-07 10:47:52 +00:00
|
|
|
Requires: httpd-filesystem = %{version}-%{release}
|
2017-05-16 09:00:54 +00:00
|
|
|
Requires: mod_http2
|
2014-08-29 13:35:18 +00:00
|
|
|
Requires(pre): httpd-filesystem
|
2012-01-17 13:17:38 +00:00
|
|
|
Requires(preun): systemd-units
|
|
|
|
Requires(postun): systemd-units
|
|
|
|
Requires(post): systemd-units
|
2013-12-12 14:13:38 +00:00
|
|
|
Conflicts: apr < 1.5.0-1
|
2018-07-16 16:11:20 +00:00
|
|
|
Provides: mod_proxy_uwsgi = %{version}-%{release}
|
2018-07-18 19:22:36 +00:00
|
|
|
Obsoletes: mod_proxy_uwsgi < 2.0.17.1-2
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%description
|
2005-09-15 14:17:47 +00:00
|
|
|
The Apache HTTP Server is a powerful, efficient, and extensible
|
|
|
|
web server.
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%package devel
|
|
|
|
Group: Development/Libraries
|
2017-10-10 14:23:11 +00:00
|
|
|
Summary: Development interfaces for the Apache HTTP Server
|
2006-06-07 10:40:34 +00:00
|
|
|
Requires: apr-devel, apr-util-devel, pkgconfig
|
2005-07-28 14:52:09 +00:00
|
|
|
Requires: httpd = %{version}-%{release}
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%description devel
|
|
|
|
The httpd-devel package contains the APXS binary and other files
|
2004-11-18 11:59:52 +00:00
|
|
|
that you need to build Dynamic Shared Objects (DSOs) for the
|
|
|
|
Apache HTTP Server.
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2017-10-10 14:23:11 +00:00
|
|
|
If you are installing the Apache HTTP Server and you want to be
|
2004-09-09 06:08:44 +00:00
|
|
|
able to compile or develop additional modules for Apache, you need
|
|
|
|
to install this package.
|
|
|
|
|
|
|
|
%package manual
|
|
|
|
Group: Documentation
|
2017-10-10 14:23:11 +00:00
|
|
|
Summary: Documentation for the Apache HTTP Server
|
2005-07-28 14:52:09 +00:00
|
|
|
Requires: httpd = %{version}-%{release}
|
2009-06-16 11:47:48 +00:00
|
|
|
BuildArch: noarch
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%description manual
|
|
|
|
The httpd-manual package contains the complete manual and
|
2017-10-10 14:23:11 +00:00
|
|
|
reference guide for the Apache HTTP Server. The information can
|
|
|
|
also be found at https://httpd.apache.org/docs/2.4/.
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2014-07-07 10:47:52 +00:00
|
|
|
%package filesystem
|
|
|
|
Group: System Environment/Daemons
|
2017-10-10 14:23:11 +00:00
|
|
|
Summary: The basic directory layout for the Apache HTTP Server
|
2014-07-07 10:47:52 +00:00
|
|
|
BuildArch: noarch
|
2014-08-15 07:34:45 +00:00
|
|
|
Requires(pre): /usr/sbin/useradd
|
2014-07-07 10:47:52 +00:00
|
|
|
|
|
|
|
%description filesystem
|
|
|
|
The httpd-filesystem package contains the basic directory layout
|
2017-10-10 14:23:11 +00:00
|
|
|
for the Apache HTTP Server including the correct permissions
|
2014-07-07 10:47:52 +00:00
|
|
|
for the directories.
|
|
|
|
|
2007-07-26 12:08:44 +00:00
|
|
|
%package tools
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Summary: Tools for use with the Apache HTTP Server
|
|
|
|
|
|
|
|
%description tools
|
|
|
|
The httpd-tools package contains tools which can be used with
|
|
|
|
the Apache HTTP Server.
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%package -n mod_ssl
|
|
|
|
Group: System Environment/Daemons
|
2007-07-26 12:08:44 +00:00
|
|
|
Summary: SSL/TLS module for the Apache HTTP Server
|
2004-11-13 00:48:42 +00:00
|
|
|
Epoch: 1
|
2011-01-31 10:18:58 +00:00
|
|
|
BuildRequires: openssl-devel
|
2014-08-29 13:35:18 +00:00
|
|
|
Requires(pre): httpd-filesystem
|
2011-02-23 17:04:04 +00:00
|
|
|
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
2017-09-21 18:55:16 +00:00
|
|
|
Requires: sscg >= 2.2.0
|
2014-08-29 13:45:59 +00:00
|
|
|
# Require an OpenSSL which supports PROFILE=SYSTEM
|
2014-09-03 14:17:05 +00:00
|
|
|
Conflicts: openssl-libs < 1:1.0.1h-4
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%description -n mod_ssl
|
|
|
|
The mod_ssl module provides strong cryptography for the Apache Web
|
|
|
|
server via the Secure Sockets Layer (SSL) and Transport Layer
|
|
|
|
Security (TLS) protocols.
|
|
|
|
|
2018-03-28 19:18:58 +00:00
|
|
|
%package -n mod_md
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Summary: Certificate provisioning using ACME for the Apache HTTP Server
|
|
|
|
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
|
|
|
BuildRequires: jansson-devel, libcurl-devel
|
|
|
|
|
|
|
|
%description -n mod_md
|
|
|
|
This module manages common properties of domains for one or more
|
|
|
|
virtual hosts. Specifically it can use the ACME protocol (RFC Draft)
|
|
|
|
to automate certificate provisioning. These will be configured for
|
|
|
|
managed domains and their virtual hosts automatically. This includes
|
|
|
|
renewal of certificates before they expire.
|
|
|
|
|
2012-03-13 16:33:13 +00:00
|
|
|
%package -n mod_proxy_html
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Summary: HTML and XML content filters for the Apache HTTP Server
|
|
|
|
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
|
|
|
BuildRequires: libxml2-devel
|
|
|
|
Epoch: 1
|
|
|
|
Obsoletes: mod_proxy_html < 1:2.4.1-2
|
|
|
|
|
|
|
|
%description -n mod_proxy_html
|
|
|
|
The mod_proxy_html and mod_xml2enc modules provide filters which can
|
|
|
|
transform and modify HTML and XML content.
|
|
|
|
|
|
|
|
%package -n mod_ldap
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Summary: LDAP authentication modules for the Apache HTTP Server
|
|
|
|
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
|
|
|
Requires: apr-util-ldap
|
|
|
|
|
|
|
|
%description -n mod_ldap
|
|
|
|
The mod_ldap and mod_authnz_ldap modules add support for LDAP
|
|
|
|
authentication to the Apache HTTP Server.
|
|
|
|
|
2013-02-22 12:59:36 +00:00
|
|
|
%package -n mod_session
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Summary: Session interface for the Apache HTTP Server
|
|
|
|
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
|
|
|
|
|
|
|
%description -n mod_session
|
|
|
|
The mod_session module and associated backends provide an abstract
|
|
|
|
interface for storing and accessing per-user session data.
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%prep
|
|
|
|
%setup -q
|
2004-09-09 06:19:06 +00:00
|
|
|
%patch1 -p1 -b .apctl
|
2004-09-09 06:12:41 +00:00
|
|
|
%patch2 -p1 -b .apxs
|
2005-12-02 10:43:00 +00:00
|
|
|
%patch3 -p1 -b .deplibs
|
2018-08-13 13:43:07 +00:00
|
|
|
%patch4 -p1 -b .layfix
|
2012-10-01 07:17:09 +00:00
|
|
|
%patch6 -p1 -b .apctlsystemd
|
2005-12-02 10:43:00 +00:00
|
|
|
|
2014-08-22 10:11:38 +00:00
|
|
|
%patch19 -p1 -b .detectsystemd
|
|
|
|
|
2018-04-16 07:25:48 +00:00
|
|
|
%patch21 -p1 -b .mddefault
|
2005-12-02 10:43:00 +00:00
|
|
|
%patch23 -p1 -b .export
|
|
|
|
%patch24 -p1 -b .corelimit
|
|
|
|
%patch25 -p1 -b .selinux
|
2018-07-18 10:55:03 +00:00
|
|
|
#patch26 -p1 -b .r1337344+
|
2012-06-08 12:52:50 +00:00
|
|
|
%patch27 -p1 -b .icons
|
2012-09-07 09:35:51 +00:00
|
|
|
%patch29 -p1 -b .systemd
|
2013-04-18 06:22:20 +00:00
|
|
|
%patch30 -p1 -b .cachehardmax
|
2018-05-01 08:48:48 +00:00
|
|
|
#patch31 -p1 -b .sslmultiproxy
|
2015-10-14 08:52:58 +00:00
|
|
|
%patch34 -p1 -b .socketactivation
|
2018-07-06 13:04:07 +00:00
|
|
|
%patch36 -p1 -b .r1830819+
|
2018-08-13 13:43:07 +00:00
|
|
|
%patch37 -p1 -b .r1827912+
|
2018-09-18 12:57:48 +00:00
|
|
|
%patch38 -p1 -b .sslciphdefault
|
2018-09-21 12:07:38 +00:00
|
|
|
%patch39 -p1 -b .sslprotdefault
|
2018-07-06 13:04:07 +00:00
|
|
|
|
2017-06-19 09:48:36 +00:00
|
|
|
%patch58 -p1 -b .r1738878
|
2018-07-20 10:22:10 +00:00
|
|
|
%patch59 -p1 -b .r1555631
|
2018-09-25 08:43:59 +00:00
|
|
|
%patch60 -p1 -b .enable-sslv3
|
2017-10-10 11:31:46 +00:00
|
|
|
|
2012-10-01 12:23:34 +00:00
|
|
|
# Patch in the vendor string
|
|
|
|
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
|
2004-09-09 06:16:31 +00:00
|
|
|
|
2012-05-23 21:48:18 +00:00
|
|
|
# Prevent use of setcap in "install-suexec-caps" target.
|
|
|
|
sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
|
|
|
|
|
2018-04-19 16:18:11 +00:00
|
|
|
# Example conf for instances
|
|
|
|
cp $RPM_SOURCE_DIR/instance.conf .
|
|
|
|
sed < $RPM_SOURCE_DIR/httpd.conf >> instance.conf '
|
|
|
|
0,/^ServerRoot/d;
|
|
|
|
/# Supplemental configuration/,$d
|
|
|
|
/^ *CustomLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,
|
|
|
|
/^ *ErrorLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,
|
|
|
|
'
|
|
|
|
touch -r $RPM_SOURCE_DIR/instance.conf instance.conf
|
2018-07-16 16:01:34 +00:00
|
|
|
cp -p $RPM_SOURCE_DIR/server-status.conf server-status.conf
|
2018-04-19 16:18:11 +00:00
|
|
|
|
2004-09-09 06:12:16 +00:00
|
|
|
# Safety check: prevent build if defined MMN does not equal upstream MMN.
|
2004-09-09 06:17:21 +00:00
|
|
|
vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
|
2004-09-09 06:12:16 +00:00
|
|
|
if test "x${vmmn}" != "x%{mmn}"; then
|
2011-02-23 17:04:04 +00:00
|
|
|
: Error: Upstream MMN is now ${vmmn}, packaged MMN is %{mmn}
|
2004-09-09 06:12:16 +00:00
|
|
|
: Update the mmn macro and rebuild.
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2017-10-03 08:16:29 +00:00
|
|
|
sed 's/@MPM@/%{mpm}/' < $RPM_SOURCE_DIR/httpd.service.xml \
|
|
|
|
> httpd.service.xml
|
|
|
|
|
|
|
|
xmlto man ./httpd.service.xml
|
2017-05-19 10:04:53 +00:00
|
|
|
|
2017-07-17 10:39:57 +00:00
|
|
|
: Building with MMN %{mmn}, MMN-ISA %{mmnisa}
|
|
|
|
: Default MPM is %{mpm}, vendor string is '%{vstring}'
|
2004-09-09 06:17:21 +00:00
|
|
|
|
2004-09-09 06:12:41 +00:00
|
|
|
%build
|
2004-09-09 06:20:08 +00:00
|
|
|
# forcibly prevent use of bundled apr, apr-util, pcre
|
|
|
|
rm -rf srclib/{apr,apr-util,pcre}
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
# regenerate configure scripts
|
2004-09-09 06:20:08 +00:00
|
|
|
autoheader && autoconf || exit 1
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2004-09-09 06:12:16 +00:00
|
|
|
# Before configure; fix location of build dir in generated apxs
|
|
|
|
%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
|
|
|
|
support/apxs.in
|
|
|
|
|
2010-09-10 08:04:07 +00:00
|
|
|
export CFLAGS=$RPM_OPT_FLAGS
|
|
|
|
export LDFLAGS="-Wl,-z,relro,-z,now"
|
2004-09-09 06:12:16 +00:00
|
|
|
|
2006-12-07 11:29:37 +00:00
|
|
|
# Hard-code path to links to avoid unnecessary builddep
|
|
|
|
export LYNX_PATH=/usr/bin/links
|
|
|
|
|
2011-04-12 14:39:15 +00:00
|
|
|
# Build the daemon
|
2012-03-13 09:55:18 +00:00
|
|
|
./configure \
|
2004-09-09 06:08:44 +00:00
|
|
|
--prefix=%{_sysconfdir}/httpd \
|
|
|
|
--exec-prefix=%{_prefix} \
|
|
|
|
--bindir=%{_bindir} \
|
|
|
|
--sbindir=%{_sbindir} \
|
|
|
|
--mandir=%{_mandir} \
|
2004-09-09 06:12:16 +00:00
|
|
|
--libdir=%{_libdir} \
|
2004-09-09 06:08:44 +00:00
|
|
|
--sysconfdir=%{_sysconfdir}/httpd/conf \
|
|
|
|
--includedir=%{_includedir}/httpd \
|
|
|
|
--libexecdir=%{_libdir}/httpd/modules \
|
|
|
|
--datadir=%{contentdir} \
|
2012-03-13 09:55:18 +00:00
|
|
|
--enable-layout=Fedora \
|
2004-09-09 06:16:14 +00:00
|
|
|
--with-installbuilddir=%{_libdir}/httpd/build \
|
2012-03-13 09:55:18 +00:00
|
|
|
--enable-mpms-shared=all \
|
2004-09-09 06:16:14 +00:00
|
|
|
--with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
2004-09-09 06:08:44 +00:00
|
|
|
--enable-suexec --with-suexec \
|
2012-05-23 21:48:18 +00:00
|
|
|
--enable-suexec-capabilities \
|
2004-09-09 06:08:44 +00:00
|
|
|
--with-suexec-caller=%{suexec_caller} \
|
2012-03-13 09:55:18 +00:00
|
|
|
--with-suexec-docroot=%{docroot} \
|
2012-05-23 16:01:18 +00:00
|
|
|
--without-suexec-logfile \
|
|
|
|
--with-suexec-syslog \
|
2004-09-09 06:08:44 +00:00
|
|
|
--with-suexec-bin=%{_sbindir}/suexec \
|
2014-09-08 12:12:40 +00:00
|
|
|
--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
|
2017-11-23 11:11:28 +00:00
|
|
|
--with-brotli \
|
2005-12-02 10:43:00 +00:00
|
|
|
--enable-pie \
|
|
|
|
--with-pcre \
|
|
|
|
--enable-mods-shared=all \
|
2011-01-31 10:18:58 +00:00
|
|
|
--enable-ssl --with-ssl --disable-distcache \
|
2016-07-07 14:27:42 +00:00
|
|
|
--enable-proxy --enable-proxy-fdpass \
|
2009-03-17 13:09:35 +00:00
|
|
|
--enable-cache \
|
|
|
|
--enable-disk-cache \
|
2005-12-02 10:43:00 +00:00
|
|
|
--enable-ldap --enable-authnz-ldap \
|
2012-03-13 09:55:18 +00:00
|
|
|
--enable-cgid --enable-cgi \
|
2008-01-22 11:13:57 +00:00
|
|
|
--enable-authn-anon --enable-authn-alias \
|
2017-05-16 09:00:54 +00:00
|
|
|
--disable-imagemap --disable-file-cache \
|
|
|
|
--disable-http2 \
|
2012-03-13 09:55:18 +00:00
|
|
|
$*
|
|
|
|
make %{?_smp_mflags}
|
2011-01-31 10:18:58 +00:00
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%install
|
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
make DESTDIR=$RPM_BUILD_ROOT install
|
|
|
|
|
2012-03-13 09:55:18 +00:00
|
|
|
# Install systemd service files
|
2012-06-07 13:03:31 +00:00
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
|
2018-04-19 16:18:11 +00:00
|
|
|
for s in httpd.service htcacheclean.service httpd.socket \
|
|
|
|
httpd@.service httpd-init.service; do
|
2014-07-08 13:52:58 +00:00
|
|
|
install -p -m 644 $RPM_SOURCE_DIR/${s} \
|
|
|
|
$RPM_BUILD_ROOT%{_unitdir}/${s}
|
2013-01-08 13:19:12 +00:00
|
|
|
done
|
2011-04-12 14:39:15 +00:00
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
# install conf file/directory
|
2012-03-13 09:55:18 +00:00
|
|
|
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \
|
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d
|
2004-09-09 06:08:44 +00:00
|
|
|
install -m 644 $RPM_SOURCE_DIR/README.confd \
|
2004-09-09 06:22:22 +00:00
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
|
2013-10-21 19:17:46 +00:00
|
|
|
install -m 644 $RPM_SOURCE_DIR/README.confmod \
|
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README
|
2012-03-13 09:55:18 +00:00
|
|
|
for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
|
2012-03-13 16:33:13 +00:00
|
|
|
00-proxy.conf 00-ssl.conf 01-ldap.conf 00-proxyhtml.conf \
|
2018-03-28 19:18:58 +00:00
|
|
|
01-ldap.conf 00-systemd.conf 01-session.conf 00-optional.conf \
|
|
|
|
01-md.conf; do
|
2012-03-13 09:55:18 +00:00
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/$f \
|
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
|
|
|
|
done
|
|
|
|
|
2017-07-17 10:39:57 +00:00
|
|
|
sed -i '/^#LoadModule mpm_%{mpm}_module /s/^#//' \
|
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
|
2017-09-22 07:03:13 +00:00
|
|
|
touch -r $RPM_SOURCE_DIR/00-mpm.conf \
|
2017-07-17 10:39:57 +00:00
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
|
|
|
|
|
2014-02-28 08:09:14 +00:00
|
|
|
# install systemd override drop directory
|
|
|
|
# Web application packages can drop snippets into this location if
|
|
|
|
# they need ExecStart[pre|post].
|
|
|
|
mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d
|
2014-07-08 13:52:58 +00:00
|
|
|
mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d
|
|
|
|
|
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf \
|
|
|
|
$RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf
|
2014-02-28 08:09:14 +00:00
|
|
|
|
2012-03-13 16:58:07 +00:00
|
|
|
for f in welcome.conf ssl.conf manual.conf userdir.conf; do
|
2007-09-17 19:02:35 +00:00
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/$f \
|
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
|
2004-09-09 06:22:22 +00:00
|
|
|
done
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2012-03-13 16:04:44 +00:00
|
|
|
# Split-out extra config shipped as default in conf.d:
|
2012-03-13 16:58:07 +00:00
|
|
|
for f in autoindex; do
|
2016-07-07 14:27:42 +00:00
|
|
|
install -m 644 docs/conf/extra/httpd-${f}.conf \
|
2012-03-13 16:04:44 +00:00
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/${f}.conf
|
|
|
|
done
|
|
|
|
|
|
|
|
# Extra config trimmed:
|
|
|
|
rm -v docs/conf/extra/httpd-{ssl,userdir}.conf
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
|
2007-09-18 07:48:57 +00:00
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
|
2004-09-09 06:08:44 +00:00
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
|
|
|
|
|
2004-09-09 06:22:47 +00:00
|
|
|
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
2016-11-02 11:32:07 +00:00
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/htcacheclean.sysconf \
|
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean
|
2004-09-09 06:22:47 +00:00
|
|
|
|
2011-01-04 16:02:17 +00:00
|
|
|
# tmpfiles.d configuration
|
2012-06-06 21:05:38 +00:00
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
|
2011-01-04 16:02:17 +00:00
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
|
2012-06-06 21:05:38 +00:00
|
|
|
$RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/httpd.conf
|
2011-01-04 16:02:17 +00:00
|
|
|
|
2013-01-08 13:19:12 +00:00
|
|
|
# Other directories
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \
|
2018-03-28 19:18:58 +00:00
|
|
|
$RPM_BUILD_ROOT%{_localstatedir}/lib/httpd \
|
2013-01-08 13:19:12 +00:00
|
|
|
$RPM_BUILD_ROOT/run/httpd/htcacheclean
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2014-07-21 21:06:14 +00:00
|
|
|
# Substitute in defaults which are usually done (badly) by "make install"
|
|
|
|
sed -i \
|
|
|
|
"s,@@ServerRoot@@/var,%{_localstatedir}/lib/dav,;
|
|
|
|
s,@@ServerRoot@@/user.passwd,/etc/httpd/conf/user.passwd,;
|
|
|
|
s,@@ServerRoot@@/docs,%{docroot},;
|
|
|
|
s,@@ServerRoot@@,%{docroot},;
|
|
|
|
s,@@Port@@,80,;" \
|
|
|
|
docs/conf/extra/*.conf
|
|
|
|
|
2012-03-13 15:43:55 +00:00
|
|
|
# Create cache directory
|
2012-03-13 16:04:44 +00:00
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
|
|
|
|
$RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
|
|
|
|
$RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/ssl
|
2004-09-09 06:16:14 +00:00
|
|
|
|
2004-09-09 06:10:03 +00:00
|
|
|
# Make the MMN accessible to module packages
|
2011-02-23 17:04:04 +00:00
|
|
|
echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
|
2014-03-27 11:39:16 +00:00
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d
|
|
|
|
cat > $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.httpd <<EOF
|
2012-03-13 09:55:18 +00:00
|
|
|
%%_httpd_mmn %{mmnisa}
|
2012-03-23 16:06:35 +00:00
|
|
|
%%_httpd_apxs %%{_bindir}/apxs
|
|
|
|
%%_httpd_modconfdir %%{_sysconfdir}/httpd/conf.modules.d
|
|
|
|
%%_httpd_confdir %%{_sysconfdir}/httpd/conf.d
|
2012-03-13 15:33:02 +00:00
|
|
|
%%_httpd_contentdir %{contentdir}
|
2012-03-23 16:06:35 +00:00
|
|
|
%%_httpd_moddir %%{_libdir}/httpd/modules
|
2012-03-13 09:55:18 +00:00
|
|
|
EOF
|
2004-09-09 06:10:03 +00:00
|
|
|
|
2012-03-13 09:55:18 +00:00
|
|
|
# Handle contentdir
|
2018-07-16 16:01:34 +00:00
|
|
|
mkdir $RPM_BUILD_ROOT%{contentdir}/noindex \
|
|
|
|
$RPM_BUILD_ROOT%{contentdir}/server-status
|
2007-09-18 07:48:57 +00:00
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/index.html \
|
2012-03-13 09:55:18 +00:00
|
|
|
$RPM_BUILD_ROOT%{contentdir}/noindex/index.html
|
2018-07-16 16:01:34 +00:00
|
|
|
install -m 644 -p docs/server-status/* \
|
|
|
|
$RPM_BUILD_ROOT%{contentdir}/server-status
|
2012-03-13 09:55:18 +00:00
|
|
|
rm -rf %{contentdir}/htdocs
|
2004-09-09 06:16:14 +00:00
|
|
|
|
|
|
|
# remove manual sources
|
|
|
|
find $RPM_BUILD_ROOT%{contentdir}/manual \( \
|
|
|
|
-name \*.xml -o -name \*.xml.* -o -name \*.ent -o -name \*.xsl -o -name \*.dtd \
|
|
|
|
\) -print0 | xargs -0 rm -f
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2005-12-07 16:45:38 +00:00
|
|
|
# Strip the manual down just to English and replace the typemaps with flat files:
|
|
|
|
set +x
|
|
|
|
for f in `find $RPM_BUILD_ROOT%{contentdir}/manual -name \*.html -type f`; do
|
|
|
|
if test -f ${f}.en; then
|
|
|
|
cp ${f}.en ${f}
|
|
|
|
rm ${f}.*
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
set -x
|
|
|
|
|
2012-03-13 09:55:18 +00:00
|
|
|
# Clean Document Root
|
|
|
|
rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html \
|
|
|
|
$RPM_BUILD_ROOT%{docroot}/cgi-bin/*
|
|
|
|
|
2007-09-17 19:02:35 +00:00
|
|
|
# Symlink for the powered-by-$DISTRO image:
|
2012-03-13 16:52:36 +00:00
|
|
|
ln -s ../../pixmaps/poweredby.png \
|
2007-09-17 19:02:35 +00:00
|
|
|
$RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
# symlinks for /etc/httpd
|
|
|
|
ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
|
2018-03-28 19:18:58 +00:00
|
|
|
ln -s ../..%{_localstatedir}/lib/httpd $RPM_BUILD_ROOT/etc/httpd/state
|
2012-06-06 21:05:38 +00:00
|
|
|
ln -s /run/httpd $RPM_BUILD_ROOT/etc/httpd/run
|
2004-09-09 06:08:44 +00:00
|
|
|
ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
|
|
|
|
|
2011-08-10 06:04:14 +00:00
|
|
|
# install http-ssl-pass-dialog
|
2012-07-02 10:20:02 +00:00
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
|
2011-08-10 06:04:14 +00:00
|
|
|
install -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \
|
2012-07-02 10:20:02 +00:00
|
|
|
$RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog
|
|
|
|
|
2017-09-20 18:18:24 +00:00
|
|
|
# install http-ssl-gencerts
|
|
|
|
install -m755 $RPM_SOURCE_DIR/httpd-ssl-gencerts \
|
|
|
|
$RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts
|
|
|
|
|
2012-07-02 10:20:02 +00:00
|
|
|
# Install action scripts
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd
|
|
|
|
for f in graceful configtest; do
|
|
|
|
install -p -m 755 $RPM_SOURCE_DIR/action-${f}.sh \
|
|
|
|
$RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/${f}
|
|
|
|
done
|
2011-08-10 06:04:14 +00:00
|
|
|
|
2012-03-13 09:57:51 +00:00
|
|
|
# Install logrotate config
|
2004-09-09 06:08:44 +00:00
|
|
|
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
2007-09-17 19:02:35 +00:00
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
|
2004-09-09 06:08:44 +00:00
|
|
|
$RPM_BUILD_ROOT/etc/logrotate.d/httpd
|
|
|
|
|
2017-05-19 10:04:53 +00:00
|
|
|
# Install systemd service man pages
|
2017-09-21 15:41:20 +00:00
|
|
|
install -m 644 -p httpd.service.8 httpd-init.service.8 httpd.socket.8 \
|
2018-04-19 16:18:11 +00:00
|
|
|
httpd@.service.8 \
|
2017-06-05 15:55:45 +00:00
|
|
|
$RPM_BUILD_ROOT%{_mandir}/man8
|
2017-05-19 10:04:53 +00:00
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
# fix man page paths
|
|
|
|
sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \
|
|
|
|
-e "s|/usr/local/apache2/conf/mime.types|/etc/mime.types|" \
|
|
|
|
-e "s|/usr/local/apache2/conf/magic|/etc/httpd/conf/magic|" \
|
|
|
|
-e "s|/usr/local/apache2/logs/error_log|/var/log/httpd/error_log|" \
|
|
|
|
-e "s|/usr/local/apache2/logs/access_log|/var/log/httpd/access_log|" \
|
2012-06-06 21:05:38 +00:00
|
|
|
-e "s|/usr/local/apache2/logs/httpd.pid|/run/httpd/httpd.pid|" \
|
2004-09-09 06:08:44 +00:00
|
|
|
-e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \
|
|
|
|
> $RPM_BUILD_ROOT%{_mandir}/man8/httpd.8
|
|
|
|
|
2006-06-02 13:57:39 +00:00
|
|
|
# Make ap_config_layout.h libdir-agnostic
|
|
|
|
sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
|
|
|
|
$RPM_BUILD_ROOT%{_includedir}/httpd/ap_config_layout.h
|
|
|
|
|
2006-12-07 11:29:37 +00:00
|
|
|
# Fix path to instdso in special.mk
|
|
|
|
sed -i '/instdso/s,top_srcdir,top_builddir,' \
|
|
|
|
$RPM_BUILD_ROOT%{_libdir}/httpd/build/special.mk
|
|
|
|
|
2004-09-09 06:12:16 +00:00
|
|
|
# Remove unpackaged files
|
2012-03-13 09:57:51 +00:00
|
|
|
rm -vf \
|
|
|
|
$RPM_BUILD_ROOT%{_libdir}/*.exp \
|
2004-09-09 06:12:16 +00:00
|
|
|
$RPM_BUILD_ROOT/etc/httpd/conf/mime.types \
|
|
|
|
$RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.exp \
|
2004-09-09 06:16:31 +00:00
|
|
|
$RPM_BUILD_ROOT%{_libdir}/httpd/build/config.nice \
|
2013-06-17 15:11:50 +00:00
|
|
|
$RPM_BUILD_ROOT%{_bindir}/{ap?-config,dbmmanage} \
|
|
|
|
$RPM_BUILD_ROOT%{_sbindir}/{checkgid,envvars*} \
|
2004-09-09 06:12:16 +00:00
|
|
|
$RPM_BUILD_ROOT%{contentdir}/htdocs/* \
|
2004-09-09 06:16:56 +00:00
|
|
|
$RPM_BUILD_ROOT%{_mandir}/man1/dbmmanage.* \
|
|
|
|
$RPM_BUILD_ROOT%{contentdir}/cgi-bin/*
|
2004-09-09 06:12:16 +00:00
|
|
|
|
2005-12-02 10:43:00 +00:00
|
|
|
rm -rf $RPM_BUILD_ROOT/etc/httpd/conf/{original,extra}
|
|
|
|
|
2014-07-07 10:47:52 +00:00
|
|
|
%pre filesystem
|
2016-03-18 10:18:52 +00:00
|
|
|
getent group apache >/dev/null || groupadd -g 48 -r apache
|
|
|
|
getent passwd apache >/dev/null || \
|
|
|
|
useradd -r -u 48 -g apache -s /sbin/nologin \
|
|
|
|
-d %{contentdir} -c "Apache" apache
|
|
|
|
exit 0
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%post
|
2014-07-08 13:52:58 +00:00
|
|
|
%systemd_post httpd.service htcacheclean.service httpd.socket
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%preun
|
2014-07-08 13:52:58 +00:00
|
|
|
%systemd_preun httpd.service htcacheclean.service httpd.socket
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2012-01-17 13:17:38 +00:00
|
|
|
%postun
|
2012-10-01 09:40:54 +00:00
|
|
|
%systemd_postun
|
2012-01-17 13:17:38 +00:00
|
|
|
|
|
|
|
# Trigger for conversion from SysV, per guidelines at:
|
|
|
|
# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
|
|
|
|
%triggerun -- httpd < 2.2.21-5
|
|
|
|
# Save the current service runlevel info
|
|
|
|
# User must manually run systemd-sysv-convert --apply httpd
|
|
|
|
# to migrate them to systemd targets
|
|
|
|
/usr/bin/systemd-sysv-convert --save httpd.service >/dev/null 2>&1 ||:
|
|
|
|
|
|
|
|
# Run these because the SysV package being removed won't do them
|
|
|
|
/sbin/chkconfig --del httpd >/dev/null 2>&1 || :
|
|
|
|
|
2009-09-08 15:58:46 +00:00
|
|
|
%posttrans
|
2012-10-01 09:40:54 +00:00
|
|
|
test -f /etc/sysconfig/httpd-disable-posttrans || \
|
2018-07-16 16:02:14 +00:00
|
|
|
/bin/systemctl try-restart --no-block httpd.service htcacheclean.service >/dev/null 2>&1 || :
|
2009-09-08 15:58:46 +00:00
|
|
|
|
2004-09-09 06:16:14 +00:00
|
|
|
%check
|
|
|
|
# Check the built modules are all PIC
|
|
|
|
if readelf -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.so | grep TEXTREL; then
|
|
|
|
: modules contain non-relocatable code
|
|
|
|
exit 1
|
|
|
|
fi
|
2016-07-07 14:27:42 +00:00
|
|
|
set +x
|
|
|
|
rv=0
|
2015-10-14 08:06:30 +00:00
|
|
|
# Ensure every mod_* that's built is loaded.
|
|
|
|
for f in $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.so; do
|
|
|
|
m=${f##*/}
|
|
|
|
if ! grep -q $m $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/*.conf; then
|
|
|
|
echo ERROR: Module $m not configured. Disable it, or load it.
|
2016-07-07 14:27:42 +00:00
|
|
|
rv=1
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
# Ensure every loaded mod_* is actually built
|
|
|
|
mods=`grep -h ^LoadModule $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/*.conf | sed 's,.*modules/,,'`
|
|
|
|
for m in $mods; do
|
|
|
|
f=$RPM_BUILD_ROOT%{_libdir}/httpd/modules/${m}
|
|
|
|
if ! test -x $f; then
|
|
|
|
echo ERROR: Module $m is configured but not built.
|
|
|
|
rv=1
|
2015-10-14 08:06:30 +00:00
|
|
|
fi
|
|
|
|
done
|
2017-01-20 20:16:04 +00:00
|
|
|
set -x
|
2016-07-07 14:27:42 +00:00
|
|
|
exit $rv
|
2004-09-09 06:16:14 +00:00
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%files
|
|
|
|
|
2004-09-09 06:20:37 +00:00
|
|
|
%doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
|
2012-03-13 16:04:44 +00:00
|
|
|
%doc docs/conf/extra/*.conf
|
2018-07-16 16:01:34 +00:00
|
|
|
%doc instance.conf server-status.conf
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%{_sysconfdir}/httpd/modules
|
|
|
|
%{_sysconfdir}/httpd/logs
|
2018-03-28 19:18:58 +00:00
|
|
|
%{_sysconfdir}/httpd/state
|
2004-09-09 06:08:44 +00:00
|
|
|
%{_sysconfdir}/httpd/run
|
|
|
|
%dir %{_sysconfdir}/httpd/conf
|
2007-05-09 10:18:59 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf
|
2004-09-09 06:08:44 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf/magic
|
|
|
|
|
2004-09-09 06:16:14 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/httpd
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2012-03-13 16:04:44 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
|
|
|
|
%exclude %{_sysconfdir}/httpd/conf.d/ssl.conf
|
|
|
|
%exclude %{_sysconfdir}/httpd/conf.d/manual.conf
|
2012-03-13 09:55:18 +00:00
|
|
|
|
|
|
|
%dir %{_sysconfdir}/httpd/conf.modules.d
|
2014-07-07 11:16:02 +00:00
|
|
|
%{_sysconfdir}/httpd/conf.modules.d/README
|
2012-03-13 09:55:18 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/*.conf
|
|
|
|
%exclude %{_sysconfdir}/httpd/conf.modules.d/00-ssl.conf
|
2012-03-13 16:33:13 +00:00
|
|
|
%exclude %{_sysconfdir}/httpd/conf.modules.d/00-proxyhtml.conf
|
|
|
|
%exclude %{_sysconfdir}/httpd/conf.modules.d/01-ldap.conf
|
2013-02-26 09:46:28 +00:00
|
|
|
%exclude %{_sysconfdir}/httpd/conf.modules.d/01-session.conf
|
2018-03-31 00:24:23 +00:00
|
|
|
%exclude %{_sysconfdir}/httpd/conf.modules.d/01-md.conf
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2017-07-12 09:42:05 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean
|
|
|
|
%ghost %{_sysconfdir}/sysconfig/httpd
|
2012-06-06 21:05:38 +00:00
|
|
|
%{_prefix}/lib/tmpfiles.d/httpd.conf
|
2004-09-09 06:22:47 +00:00
|
|
|
|
2012-07-02 10:20:02 +00:00
|
|
|
%dir %{_libexecdir}/initscripts/legacy-actions/httpd
|
|
|
|
%{_libexecdir}/initscripts/legacy-actions/httpd/*
|
|
|
|
|
2005-12-02 10:43:00 +00:00
|
|
|
%{_sbindir}/ht*
|
2012-03-13 09:55:18 +00:00
|
|
|
%{_sbindir}/fcgistarter
|
2004-09-09 06:08:44 +00:00
|
|
|
%{_sbindir}/apachectl
|
|
|
|
%{_sbindir}/rotatelogs
|
2012-05-23 16:01:18 +00:00
|
|
|
%caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%dir %{_libdir}/httpd
|
|
|
|
%dir %{_libdir}/httpd/modules
|
2004-09-09 06:16:56 +00:00
|
|
|
%{_libdir}/httpd/modules/mod*.so
|
2013-02-22 12:59:36 +00:00
|
|
|
%exclude %{_libdir}/httpd/modules/mod_auth_form.so
|
2004-09-09 06:16:56 +00:00
|
|
|
%exclude %{_libdir}/httpd/modules/mod_ssl.so
|
2018-03-28 19:18:58 +00:00
|
|
|
%exclude %{_libdir}/httpd/modules/mod_md.so
|
2012-03-13 16:33:13 +00:00
|
|
|
%exclude %{_libdir}/httpd/modules/mod_*ldap.so
|
|
|
|
%exclude %{_libdir}/httpd/modules/mod_proxy_html.so
|
|
|
|
%exclude %{_libdir}/httpd/modules/mod_xml2enc.so
|
2013-02-22 12:59:36 +00:00
|
|
|
%exclude %{_libdir}/httpd/modules/mod_session*.so
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2004-09-09 06:09:30 +00:00
|
|
|
%dir %{contentdir}/error
|
|
|
|
%dir %{contentdir}/error/include
|
2012-03-13 09:55:18 +00:00
|
|
|
%dir %{contentdir}/noindex
|
2018-07-16 16:01:34 +00:00
|
|
|
%dir %{contentdir}/server-status
|
2004-09-09 06:08:44 +00:00
|
|
|
%{contentdir}/icons/*
|
2004-09-09 06:09:30 +00:00
|
|
|
%{contentdir}/error/README
|
2012-03-13 09:55:18 +00:00
|
|
|
%{contentdir}/error/*.var
|
|
|
|
%{contentdir}/error/include/*.html
|
|
|
|
%{contentdir}/noindex/index.html
|
2018-07-16 16:01:34 +00:00
|
|
|
%{contentdir}/server-status/*
|
2012-03-13 09:55:18 +00:00
|
|
|
|
2012-06-06 21:05:38 +00:00
|
|
|
%attr(0710,root,apache) %dir /run/httpd
|
2013-01-08 13:19:12 +00:00
|
|
|
%attr(0700,apache,apache) %dir /run/httpd/htcacheclean
|
2004-09-09 06:08:44 +00:00
|
|
|
%attr(0700,root,root) %dir %{_localstatedir}/log/httpd
|
|
|
|
%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
|
2018-03-28 19:18:58 +00:00
|
|
|
%attr(0700,apache,apache) %dir %{_localstatedir}/lib/httpd
|
2012-03-13 15:43:55 +00:00
|
|
|
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd
|
|
|
|
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/proxy
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2007-07-26 12:08:44 +00:00
|
|
|
%{_mandir}/man8/*
|
2017-09-21 15:41:20 +00:00
|
|
|
%exclude %{_mandir}/man8/httpd-init.*
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2017-09-20 18:18:24 +00:00
|
|
|
%{_unitdir}/httpd.service
|
2018-04-19 16:18:11 +00:00
|
|
|
%{_unitdir}/httpd@.service
|
2017-09-20 18:18:24 +00:00
|
|
|
%{_unitdir}/htcacheclean.service
|
2014-07-08 13:52:58 +00:00
|
|
|
%{_unitdir}/*.socket
|
2011-04-12 14:39:15 +00:00
|
|
|
|
2014-07-07 10:47:52 +00:00
|
|
|
%files filesystem
|
|
|
|
%dir %{_sysconfdir}/httpd
|
|
|
|
%dir %{_sysconfdir}/httpd/conf.d
|
|
|
|
%{_sysconfdir}/httpd/conf.d/README
|
|
|
|
%dir %{docroot}
|
|
|
|
%dir %{docroot}/cgi-bin
|
|
|
|
%dir %{docroot}/html
|
|
|
|
%dir %{contentdir}
|
|
|
|
%dir %{contentdir}/icons
|
2017-09-19 09:08:07 +00:00
|
|
|
%attr(755,root,root) %dir %{_unitdir}/httpd.service.d
|
|
|
|
%attr(755,root,root) %dir %{_unitdir}/httpd.socket.d
|
2014-07-07 10:47:52 +00:00
|
|
|
|
2007-07-26 12:08:44 +00:00
|
|
|
%files tools
|
|
|
|
%{_bindir}/*
|
|
|
|
%{_mandir}/man1/*
|
2010-07-09 13:00:51 +00:00
|
|
|
%doc LICENSE NOTICE
|
2012-03-13 09:55:18 +00:00
|
|
|
%exclude %{_bindir}/apxs
|
2013-07-01 11:47:28 +00:00
|
|
|
%exclude %{_mandir}/man1/apxs.1*
|
2007-07-26 12:08:44 +00:00
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%files manual
|
|
|
|
%{contentdir}/manual
|
2012-03-13 09:55:18 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf.d/manual.conf
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%files -n mod_ssl
|
|
|
|
%{_libdir}/httpd/modules/mod_ssl.so
|
2012-03-13 09:55:18 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/00-ssl.conf
|
2004-09-09 06:08:44 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf.d/ssl.conf
|
2012-03-13 15:43:55 +00:00
|
|
|
%attr(0700,apache,root) %dir %{_localstatedir}/cache/httpd/ssl
|
2017-09-20 18:18:24 +00:00
|
|
|
%{_unitdir}/httpd-init.service
|
2011-08-10 06:04:14 +00:00
|
|
|
%{_libexecdir}/httpd-ssl-pass-dialog
|
2017-09-20 18:18:24 +00:00
|
|
|
%{_libexecdir}/httpd-ssl-gencerts
|
2014-07-08 13:52:58 +00:00
|
|
|
%{_unitdir}/httpd.socket.d/10-listen443.conf
|
2017-09-21 15:41:20 +00:00
|
|
|
%{_mandir}/man8/httpd-init.*
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2012-03-13 16:33:13 +00:00
|
|
|
%files -n mod_proxy_html
|
|
|
|
%{_libdir}/httpd/modules/mod_proxy_html.so
|
|
|
|
%{_libdir}/httpd/modules/mod_xml2enc.so
|
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/00-proxyhtml.conf
|
|
|
|
|
|
|
|
%files -n mod_ldap
|
|
|
|
%{_libdir}/httpd/modules/mod_*ldap.so
|
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/01-ldap.conf
|
|
|
|
|
2013-02-22 12:59:36 +00:00
|
|
|
%files -n mod_session
|
|
|
|
%{_libdir}/httpd/modules/mod_session*.so
|
2013-02-26 10:14:44 +00:00
|
|
|
%{_libdir}/httpd/modules/mod_auth_form.so
|
2013-02-22 12:59:36 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/01-session.conf
|
|
|
|
|
2018-03-28 19:18:58 +00:00
|
|
|
%files -n mod_md
|
|
|
|
%{_libdir}/httpd/modules/mod_md.so
|
|
|
|
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/01-md.conf
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%files devel
|
|
|
|
%{_includedir}/httpd
|
2012-03-13 09:55:18 +00:00
|
|
|
%{_bindir}/apxs
|
2012-02-13 12:52:08 +00:00
|
|
|
%{_mandir}/man1/apxs.1*
|
2004-09-09 06:08:44 +00:00
|
|
|
%dir %{_libdir}/httpd/build
|
|
|
|
%{_libdir}/httpd/build/*.mk
|
2005-12-02 10:43:00 +00:00
|
|
|
%{_libdir}/httpd/build/*.sh
|
2014-03-27 11:39:16 +00:00
|
|
|
%{_rpmconfigdir}/macros.d/macros.httpd
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%changelog
|
2018-09-28 07:51:19 +00:00
|
|
|
* Fri Sep 28 2018 Joe Orton <jorton@redhat.com> - 2.4.34-10
|
|
|
|
- apachectl: don't read /etc/sysconfig/httpd
|
|
|
|
|
2018-09-25 08:43:59 +00:00
|
|
|
* Tue Sep 25 2018 Joe Orton <jorton@redhat.com> - 2.4.34-9
|
|
|
|
- fix build if OpenSSL built w/o SSLv3 support
|
|
|
|
|
2018-09-21 14:22:11 +00:00
|
|
|
* Fri Sep 21 2018 Joe Orton <jorton@redhat.com> - 2.4.34-8
|
|
|
|
- comment-out SSLProtocol, SSLProxyProtocol from ssl.conf in
|
|
|
|
default configuration; now follow OpenSSL system default (#1468322)
|
|
|
|
|
2018-09-21 12:07:38 +00:00
|
|
|
* Fri Sep 21 2018 Joe Orton <jorton@redhat.com> - 2.4.34-7
|
|
|
|
- mod_ssl: follow OpenSSL protocol defaults if SSLProtocol
|
|
|
|
is not configured (Rob Crittenden, #1618371)
|
|
|
|
|
2018-09-03 09:29:22 +00:00
|
|
|
* Tue Aug 28 2018 Luboš Uhliarik <luhliari@redhat.com> - 2.4.34-6
|
|
|
|
- mod_ssl: enable SSLv3 and change behavior of "SSLProtocol All"
|
|
|
|
configuration (#1624777)
|
|
|
|
|
2018-08-21 07:34:34 +00:00
|
|
|
* Tue Aug 21 2018 Joe Orton <jorton@redhat.com> - 2.4.34-5
|
|
|
|
- mod_ssl: further TLSv1.3 fix (#1619389)
|
|
|
|
|
2018-08-13 13:43:07 +00:00
|
|
|
* Mon Aug 13 2018 Joe Orton <jorton@redhat.com> - 2.4.34-4
|
|
|
|
- mod_ssl: backport TLSv1.3 support changes from upstream (#1615059)
|
|
|
|
|
2018-07-20 10:22:10 +00:00
|
|
|
* Fri Jul 20 2018 Joe Orton <jorton@redhat.com> - 2.4.34-3
|
|
|
|
- mod_ssl: fix OCSP regression (upstream r1555631)
|
|
|
|
|
2018-07-18 19:22:36 +00:00
|
|
|
* Wed Jul 18 2018 Joe Orton <jorton@redhat.com> - 2.4.34-2
|
|
|
|
- update Obsoletes for mod_proxy_uswgi (#1599113)
|
|
|
|
|
2018-07-18 10:55:03 +00:00
|
|
|
* Wed Jul 18 2018 Joe Orton <jorton@redhat.com> - 2.4.34-1
|
|
|
|
- update to 2.4.34 (#1601160)
|
|
|
|
|
2018-07-16 16:01:34 +00:00
|
|
|
* Mon Jul 16 2018 Joe Orton <jorton@redhat.com> - 2.4.33-10
|
2018-07-16 16:02:14 +00:00
|
|
|
- don't block on service try-restart in posttrans scriptlet
|
2018-07-16 16:01:34 +00:00
|
|
|
- add Lua-based /server-status example page to docs
|
2018-07-16 16:11:20 +00:00
|
|
|
- obsoletes: and provides: for mod_proxy_uswgi (#1599113)
|
2018-07-16 16:01:34 +00:00
|
|
|
|
2018-07-13 05:07:26 +00:00
|
|
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.33-9
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
|
|
2018-07-06 16:03:22 +00:00
|
|
|
* Fri Jul 6 2018 Joe Orton <jorton@redhat.com> - 2.4.33-8
|
|
|
|
- add per-request memory leak fix (upstream r1833014)
|
|
|
|
|
2018-07-06 13:04:07 +00:00
|
|
|
* Fri Jul 6 2018 Joe Orton <jorton@redhat.com> - 2.4.33-7
|
|
|
|
- mod_ssl: add PKCS#11 cert/key support (Anderson Sasaki)
|
|
|
|
|
2018-06-12 14:31:38 +00:00
|
|
|
* Tue Jun 12 2018 Joe Orton <jorton@redhat.com> - 2.4.33-6
|
|
|
|
- mod_systemd: show bound ports in status and log to journal
|
|
|
|
at startup.
|
|
|
|
|
2018-04-19 16:18:11 +00:00
|
|
|
* Thu Apr 19 2018 Joe Orton <jorton@redhat.com> - 2.4.33-5
|
|
|
|
- add httpd@.service; update httpd.service(8) and add new stub
|
|
|
|
|
2018-04-16 07:25:48 +00:00
|
|
|
* Mon Apr 16 2018 Joe Orton <jorton@redhat.com> - 2.4.33-4
|
|
|
|
- mod_md: change hard-coded default MdStoreDir to state/md (#1563846)
|
|
|
|
|
2018-04-12 07:03:52 +00:00
|
|
|
* Thu Apr 12 2018 Joe Orton <jorton@redhat.com> - 2.4.33-3
|
|
|
|
- mod_ssl: drop implicit 'SSLEngine on' for vhost w/o certs (#1564537)
|
|
|
|
|
2018-03-31 00:24:23 +00:00
|
|
|
* Fri Mar 30 2018 Adam Williamson <awilliam@redhat.com> - 2.4.33-2
|
|
|
|
- Exclude mod_md config file from main package (#1562413)
|
|
|
|
|
2018-03-28 19:18:58 +00:00
|
|
|
* Wed Mar 28 2018 Joe Orton <jorton@redhat.com> - 2.4.33-1
|
|
|
|
- rebase to 2.4.33 (#1560174)
|
|
|
|
- add mod_md subpackage; load mod_proxy_uwsgi by default
|
|
|
|
|
2018-03-05 08:36:51 +00:00
|
|
|
* Mon Mar 05 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.29-8
|
|
|
|
- Rebuilt with brotli 1.0.3
|
|
|
|
|
2018-02-26 12:28:41 +00:00
|
|
|
* Mon Feb 26 2018 Joe Orton <jorton@redhat.com> - 2.4.29-7
|
|
|
|
- simplify liblua detection in configure
|
|
|
|
|
2018-02-07 16:31:52 +00:00
|
|
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.29-6
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
|
|
2018-01-27 08:19:58 +00:00
|
|
|
* Sat Jan 27 2018 Joe Orton <jorton@redhat.com> - 2.4.29-5
|
|
|
|
- link mod_lua against -lcrypt (#1538992)
|
|
|
|
|
2018-01-26 17:23:59 +00:00
|
|
|
* Fri Jan 26 2018 Paul Howarth <paul@city-fan.org> - 2.4.29-4
|
|
|
|
- Rebuild with updated flags to work around compiler issues on i686
|
|
|
|
(#1538648, #1538693)
|
|
|
|
|
2018-01-20 22:06:54 +00:00
|
|
|
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 2.4.29-3
|
|
|
|
- Rebuilt for switch to libxcrypt
|
|
|
|
|
2017-11-23 11:11:28 +00:00
|
|
|
* Thu Nov 23 2017 Joe Orton <jorton@redhat.com> - 2.4.29-2
|
|
|
|
- build and load mod_brotli
|
|
|
|
|
2017-10-25 12:20:19 +00:00
|
|
|
* Wed Oct 25 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.29-1
|
|
|
|
- new version 2.4.29
|
|
|
|
|
2017-10-10 14:23:11 +00:00
|
|
|
* Tue Oct 10 2017 Joe Orton <jorton@redhat.com> - 2.4.28-3
|
|
|
|
- drop obsolete Obsoletes
|
|
|
|
- update docs, Summary
|
|
|
|
- trim %%changelog
|
|
|
|
|
2017-10-10 11:31:46 +00:00
|
|
|
* Tue Oct 10 2017 Patrick Uiterwijk <patrick@puiterwijk.org> - 2.4.28-2
|
|
|
|
- Backport patch for fixing ticket key usage
|
|
|
|
|
2017-10-06 16:14:03 +00:00
|
|
|
* Fri Oct 06 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.28-1
|
|
|
|
- new version 2.4.28
|
|
|
|
|
2017-10-03 08:16:29 +00:00
|
|
|
* Tue Oct 3 2017 Joe Orton <jorton@redhat.com> - 2.4.27-14
|
|
|
|
- add notes on enabling httpd_graceful_shutdown boolean for prefork
|
|
|
|
|
2017-09-22 15:20:54 +00:00
|
|
|
* Fri Sep 22 2017 Joe Orton <jorton@redhat.com> - 2.4.27-13
|
|
|
|
- drop Requires(post) for mod_ssl
|
|
|
|
|
2017-09-22 14:48:42 +00:00
|
|
|
* Fri Sep 22 2017 Joe Orton <jorton@redhat.com> - 2.4.27-12
|
|
|
|
- better error handling in httpd-ssl-gencerts (#1494556)
|
|
|
|
|
2017-09-21 18:55:16 +00:00
|
|
|
* Thu Sep 21 2017 Stephen Gallagher <sgallagh@redhat.com> - 2.4.27-11
|
|
|
|
- Require sscg 2.2.0 for creating service and CA certificates together
|
|
|
|
|
2017-09-21 17:28:15 +00:00
|
|
|
* Thu Sep 21 2017 Jeroen van Meeuwen <kanarip@fedoraproject.org> - 2.4.27-10
|
|
|
|
- Address CVE-2017-9798 by applying patch from upstream (#1490344)
|
|
|
|
|
2017-09-21 15:41:20 +00:00
|
|
|
* Thu Sep 21 2017 Joe Orton <jorton@redhat.com> - 2.4.27-9
|
|
|
|
- use sscg defaults; append CA cert to generated cert
|
|
|
|
- document httpd-init.service in httpd-init.service(8)
|
|
|
|
|
2017-09-20 18:18:24 +00:00
|
|
|
* Wed Sep 20 2017 Stephen Gallagher <sgallagh@redhat.com> - 2.4.27-8.1
|
2017-10-10 14:23:11 +00:00
|
|
|
- Generate SSL certificates on service start, not %%posttrans
|
2017-09-20 18:18:24 +00:00
|
|
|
|
2017-09-19 09:02:32 +00:00
|
|
|
* Tue Sep 19 2017 Joe Orton <jorton@redhat.com> - 2.4.27-8
|
|
|
|
- move httpd.service.d, httpd.socket.d dirs to -filesystem
|
|
|
|
|
2017-09-13 13:21:17 +00:00
|
|
|
* Wed Sep 13 2017 Joe Orton <jorton@redhat.com> - 2.4.27-7
|
|
|
|
- add new content-length filter (upstream PR 61222)
|
|
|
|
|
2017-08-02 23:33:12 +00:00
|
|
|
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.27-6
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
|
|
|
2017-07-26 12:53:42 +00:00
|
|
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.27-5
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
|
|
2017-07-18 08:25:14 +00:00
|
|
|
* Tue Jul 18 2017 Joe Orton <jorton@redhat.com> - 2.4.27-4
|
|
|
|
- update mod_systemd (r1802251)
|
|
|
|
|
2017-07-17 10:39:57 +00:00
|
|
|
* Mon Jul 17 2017 Joe Orton <jorton@redhat.com> - 2.4.27-3
|
|
|
|
- switch to event by default for Fedora 27 and later (#1471708)
|
|
|
|
|
2017-07-12 09:42:05 +00:00
|
|
|
* Wed Jul 12 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.27-2
|
|
|
|
- Resolves: #1469959 - httpd update cleaned out /etc/sysconfig
|
|
|
|
|
2017-07-10 13:25:44 +00:00
|
|
|
* Mon Jul 10 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.27-1
|
|
|
|
- new version 2.4.27
|
|
|
|
|
2017-06-30 16:01:34 +00:00
|
|
|
* Fri Jun 30 2017 Joe Orton <jorton@redhat.com> - 2.4.26-2
|
|
|
|
- mod_proxy_fcgi: fix further regressions (PR 61202)
|
|
|
|
|
2017-06-19 09:48:36 +00:00
|
|
|
* Mon Jun 19 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.26-1
|
|
|
|
- new version 2.4.26
|
|
|
|
|
2017-06-05 15:55:45 +00:00
|
|
|
* Mon Jun 5 2017 Joe Orton <jorton@redhat.com> - 2.4.25-10
|
|
|
|
- move unit man pages to section 8, add as Documentation= in units
|
|
|
|
|
2017-05-19 10:04:53 +00:00
|
|
|
* Fri May 19 2017 Joe Orton <jorton@redhat.com> - 2.4.25-9
|
|
|
|
- add httpd.service(5) and httpd.socket(5) man pages
|
|
|
|
|
2017-05-16 09:00:54 +00:00
|
|
|
* Tue May 16 2017 Joe Orton <jorton@redhat.com> - 2.4.25-8
|
|
|
|
- require mod_http2, now packaged separately
|
|
|
|
|
2017-03-30 13:32:35 +00:00
|
|
|
* Wed Mar 29 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-7
|
|
|
|
- Resolves: #1397243 - Backport Apache Bug 53098 - mod_proxy_ajp:
|
|
|
|
patch to set worker secret passed to tomcat
|
|
|
|
|
2017-03-28 11:11:07 +00:00
|
|
|
* Tue Mar 28 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-6
|
|
|
|
- Resolves: #1434916 - httpd.service: Failed with result timeout
|
|
|
|
|
2017-03-24 17:05:26 +00:00
|
|
|
* Fri Mar 24 2017 Joe Orton <jorton@redhat.com> - 2.4.25-5
|
|
|
|
- link only httpd, not support/* against -lselinux -lsystemd
|
|
|
|
|
2017-02-10 12:45:49 +00:00
|
|
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.25-4
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
|
|
|
2017-01-20 20:16:04 +00:00
|
|
|
* Thu Jan 12 2017 Joe Orton <jorton@redhat.com> - 2.4.25-3
|
|
|
|
- mod_watchdog: restrict thread lifetime (#1410883)
|
|
|
|
|
2016-12-22 15:58:29 +00:00
|
|
|
* Thu Dec 22 2016 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-2
|
|
|
|
- Resolves: #1358875 - require nghttp2 >= 1.5.0
|
|
|
|
|
2016-12-22 14:40:14 +00:00
|
|
|
* Thu Dec 22 2016 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-1
|
|
|
|
- new version 2.4.25
|
|
|
|
|
2016-12-05 16:21:33 +00:00
|
|
|
* Mon Dec 05 2016 Luboš Uhliarik <luhliari@redhat.com> - 2.4.23-7
|
|
|
|
- Resolves: #1401530 - CVE-2016-8740 httpd: Incomplete handling of
|
|
|
|
LimitRequestFields directive in mod_http2
|
|
|
|
|
2016-11-14 10:46:52 +00:00
|
|
|
* Mon Nov 14 2016 Joe Orton <jorton@redhat.com> - 2.4.23-6
|
|
|
|
- fix build with OpenSSL 1.1 (#1392900)
|
|
|
|
- fix typos in ssl.conf (josef randinger, #1379407)
|
|
|
|
|
2016-11-02 11:32:07 +00:00
|
|
|
* Wed Nov 2 2016 Joe Orton <jorton@redhat.com> - 2.4.23-5
|
|
|
|
- no longer package /etc/sysconfig/httpd
|
2016-11-02 11:33:05 +00:00
|
|
|
- synch ssl.conf with upstream
|
2016-11-02 11:32:07 +00:00
|
|
|
|
2016-07-18 15:31:52 +00:00
|
|
|
* Mon Jul 18 2016 Joe Orton <jorton@redhat.com> - 2.4.23-4
|
|
|
|
- add security fix for CVE-2016-5387
|
|
|
|
|
2016-07-07 18:29:00 +00:00
|
|
|
* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-3
|
|
|
|
- load mod_watchdog by default (#1353582)
|
|
|
|
|
2016-07-07 14:27:42 +00:00
|
|
|
* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-2
|
|
|
|
- restore build of mod_proxy_fdpass (#1325883)
|
|
|
|
- improve check tests to catch configured-but-not-built modules
|
|
|
|
|
2016-07-07 12:22:30 +00:00
|
|
|
* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-1
|
|
|
|
- update to 2.4.23 (#1325883, #1353203)
|
|
|
|
- load mod_proxy_hcheck
|
|
|
|
- recommend use of "systemctl edit" in httpd.service
|
|
|
|
|
2016-04-07 13:07:25 +00:00
|
|
|
* Thu Apr 7 2016 Joe Orton <jorton@redhat.com> - 2.4.18-6
|
|
|
|
- have "apachectl graceful" start httpd if not running, per man page
|
|
|
|
|
2016-04-06 10:35:45 +00:00
|
|
|
* Wed Apr 6 2016 Joe Orton <jorton@redhat.com> - 2.4.18-5
|
|
|
|
- use redirects for lang-specific /manual/ URLs
|
|
|
|
|
2016-03-18 13:08:34 +00:00
|
|
|
* Fri Mar 18 2016 Joe Orton <jorton@redhat.com> - 2.4.18-4
|
|
|
|
- fix welcome page HTML validity (Ville Skyttä)
|
|
|
|
|
2016-03-18 10:18:52 +00:00
|
|
|
* Fri Mar 18 2016 Joe Orton <jorton@redhat.com> - 2.4.18-3
|
|
|
|
- remove httpd pre script (duplicate of httpd-filesystem's)
|
|
|
|
- in httpd-filesystem pre script, create group/user iff non-existent
|
|
|
|
|
2016-02-03 23:56:42 +00:00
|
|
|
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.18-2
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
|
|
|
2015-12-14 08:43:41 +00:00
|
|
|
* Mon Dec 14 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.18-1
|
|
|
|
- update to new version 2.4.18
|
|
|
|
|
2015-12-09 16:51:03 +00:00
|
|
|
* Wed Dec 9 2015 Joe Orton <jorton@redhat.com> - 2.4.17-4
|
|
|
|
- re-enable mod_asis due to popular demand (#1284315)
|
|
|
|
|
2015-10-26 07:02:55 +00:00
|
|
|
* Mon Oct 26 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.17-3
|
|
|
|
- fix crash when using -X argument (#1272234)
|
|
|
|
|
2015-10-14 08:52:58 +00:00
|
|
|
* Wed Oct 14 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.17-2
|
|
|
|
- rebase socket activation patch to 2.4.17
|
|
|
|
|
2015-10-14 08:06:30 +00:00
|
|
|
* Tue Oct 13 2015 Joe Orton <jorton@redhat.com> - 2.4.17-1
|
|
|
|
- update to 2.4.17 (#1271224)
|
|
|
|
- build, load mod_http2
|
|
|
|
- don't build mod_asis, mod_file_cache
|
|
|
|
- load mod_cache_socache, mod_proxy_wstunnel by default
|
|
|
|
- check every built mod_* is configured
|
|
|
|
- synch ssl.conf with upstream; disable SSLv3 by default
|
|
|
|
|
2015-07-15 13:29:48 +00:00
|
|
|
* Wed Jul 15 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.12-4
|
|
|
|
- update to 2.4.16
|
|
|
|
|
2015-07-07 08:41:55 +00:00
|
|
|
* Tue Jul 7 2015 Joe Orton <jorton@redhat.com> - 2.4.12-3
|
|
|
|
- mod_ssl: use "localhost" in the dummy SSL cert if len(FQDN) > 59 chars
|
|
|
|
|
2015-06-17 10:36:22 +00:00
|
|
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.12-2
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
|
|
|
2015-03-27 08:33:08 +00:00
|
|
|
* Fri Mar 27 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.12-1
|
|
|
|
- update to 2.4.12
|
|
|
|
|
2015-03-24 09:16:44 +00:00
|
|
|
* Tue Mar 24 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-17
|
|
|
|
- fix compilation with lua-5.3
|
|
|
|
|
2015-03-24 08:41:33 +00:00
|
|
|
* Tue Mar 24 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-16
|
|
|
|
- remove filter for auto-provides of httpd modules, it is not needed since F20
|
|
|
|
|
2014-12-17 08:25:50 +00:00
|
|
|
* Wed Dec 17 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-15
|
|
|
|
- core: fix bypassing of mod_headers rules via chunked requests (CVE-2013-5704)
|
|
|
|
- mod_cache: fix NULL pointer dereference on empty Content-Type (CVE-2014-3581)
|
|
|
|
- mod_proxy_fcgi: fix a potential crash with long headers (CVE-2014-3583)
|
|
|
|
- mod_lua: fix handling of the Require line when a LuaAuthzProvider is used
|
|
|
|
in multiple Require directives with different arguments (CVE-2014-8109)
|
|
|
|
|
2014-10-14 09:53:35 +00:00
|
|
|
* Tue Oct 14 2014 Joe Orton <jorton@redhat.com> - 2.4.10-14
|
|
|
|
- require apr-util 1.5.x
|
|
|
|
|
2014-09-18 06:04:18 +00:00
|
|
|
* Thu Sep 18 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-13
|
|
|
|
- use NoDelay and DeferAcceptSec in httpd.socket
|
|
|
|
|
2014-09-08 12:12:40 +00:00
|
|
|
* Mon Sep 08 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-12
|
|
|
|
- increase suexec minimum acceptable uid/gid to 1000 (#1136391)
|
|
|
|
|
2014-09-03 14:17:05 +00:00
|
|
|
* Wed Sep 03 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-11
|
|
|
|
- fix hostname requirement and conflict with openssl-libs
|
|
|
|
|
2014-09-01 07:32:54 +00:00
|
|
|
* Mon Sep 01 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-10
|
|
|
|
- use KillMode=mixed in httpd.service (#1135122)
|
|
|
|
|
2014-08-29 15:13:01 +00:00
|
|
|
* Fri Aug 29 2014 Joe Orton <jorton@redhat.com> - 2.4.10-9
|
|
|
|
- set vstring based on /etc/os-release (Pat Riehecky, #1114539)
|
|
|
|
|
2014-08-29 13:35:18 +00:00
|
|
|
* Fri Aug 29 2014 Joe Orton <jorton@redhat.com> - 2.4.10-8
|
|
|
|
- pull in httpd-filesystem as Requires(pre) (#1128328)
|
2014-08-29 13:45:59 +00:00
|
|
|
- fix cipher selection in default ssl.conf, depend on new OpenSSL (#1134348)
|
|
|
|
- require hostname for mod_ssl post script (#1135118)
|
2014-08-29 13:35:18 +00:00
|
|
|
|
2014-08-22 10:11:38 +00:00
|
|
|
* Fri Aug 22 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-7
|
|
|
|
- mod_systemd: updated to the latest version
|
|
|
|
- use -lsystemd instead of -lsystemd-daemon (#1125084)
|
|
|
|
- fix possible crash in SIGINT handling (#958934)
|
|
|
|
|
2014-08-21 10:32:44 +00:00
|
|
|
* Thu Aug 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-6
|
|
|
|
- mod_ssl: treat "SSLCipherSuite PROFILE=..." as special (#1109119)
|
|
|
|
- switch default ssl.conf to use PROFILE=SYSTEM (#1109119)
|
|
|
|
|
2014-08-16 20:45:39 +00:00
|
|
|
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.10-5
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
|
|
|
2014-08-15 07:34:45 +00:00
|
|
|
* Fri Aug 15 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-4
|
|
|
|
- add /usr/bin/useradd dependency to -filesystem requires
|
|
|
|
|
2014-08-14 17:45:12 +00:00
|
|
|
* Thu Aug 14 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-3
|
2014-08-14 17:41:29 +00:00
|
|
|
- fix creating apache user in pre script (#1128328)
|
|
|
|
|
2014-07-31 11:16:47 +00:00
|
|
|
* Thu Jul 31 2014 Joe Orton <jorton@redhat.com> - 2.4.10-2
|
|
|
|
- enable mod_request by default for mod_auth_form
|
|
|
|
- move disabled-by-default modules from 00-base.conf to 00-optional.conf
|
|
|
|
|
2014-07-21 21:05:49 +00:00
|
|
|
* Mon Jul 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-1
|
|
|
|
- update to 2.4.10
|
2014-07-21 21:06:14 +00:00
|
|
|
- expand variables in docdir example configs
|
2014-07-21 21:05:49 +00:00
|
|
|
|
2014-07-08 13:52:58 +00:00
|
|
|
* Tue Jul 08 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-8
|
|
|
|
- add support for systemd socket activation (#1111648)
|
|
|
|
|
2014-07-07 11:16:02 +00:00
|
|
|
* Mon Jul 07 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-7
|
|
|
|
- remove conf.modules.d from httpd-filesystem subpackage (#1081453)
|
|
|
|
|
2014-07-07 10:47:52 +00:00
|
|
|
* Mon Jul 07 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-6
|
|
|
|
- add httpd-filesystem subpackage (#1081453)
|
|
|
|
|
2014-06-20 09:54:36 +00:00
|
|
|
* Fri Jun 20 2014 Joe Orton <jorton@redhat.com> - 2.4.9-5
|
|
|
|
- mod_ssl: don't use the default OpenSSL cipher suite in ssl.conf (#1109119)
|
|
|
|
|
2014-06-07 20:31:52 +00:00
|
|
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.9-4
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
|
|
|
2014-03-28 10:35:30 +00:00
|
|
|
* Fri Mar 28 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-3
|
|
|
|
- add support for SetHandler + proxy (#1078970)
|
|
|
|
|
2014-03-27 11:39:16 +00:00
|
|
|
* Thu Mar 27 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-2
|
|
|
|
- move macros from /etc/rpm to macros.d (#1074277)
|
|
|
|
- remove unused patches
|
|
|
|
|
2014-03-18 06:55:27 +00:00
|
|
|
* Mon Mar 17 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-1
|
|
|
|
- update to 2.4.9
|
|
|
|
|
2014-02-28 17:45:18 +00:00
|
|
|
* Fri Feb 28 2014 Joe Orton <jorton@redhat.com> - 2.4.7-6
|
|
|
|
- use 2048-bit RSA key with SHA-256 signature in dummy certificate
|
|
|
|
|
2014-02-28 08:09:14 +00:00
|
|
|
* Fri Feb 28 2014 Stephen Gallagher <sgallagh@redhat.com> 2.4.7-5
|
|
|
|
- Create drop directory for systemd snippets
|
|
|
|
|
2014-02-27 11:03:34 +00:00
|
|
|
* Thu Feb 27 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.7-4
|
|
|
|
- remove provides of old MMN, because it contained double-dash (#1068851)
|
|
|
|
|
2014-02-20 11:19:52 +00:00
|
|
|
* Thu Feb 20 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.7-3
|
|
|
|
- fix graceful restart using legacy actions
|
|
|
|
|
2013-12-12 14:13:38 +00:00
|
|
|
* Thu Dec 12 2013 Joe Orton <jorton@redhat.com> - 2.4.7-2
|
|
|
|
- conflict with pre-1.5.0 APR
|
|
|
|
- fix sslsninotreq patch
|
|
|
|
|
2013-11-27 17:19:09 +00:00
|
|
|
* Wed Nov 27 2013 Joe Orton <jorton@redhat.com> - 2.4.7-1
|
|
|
|
- update to 2.4.7 (#1034071)
|
|
|
|
|
2013-11-22 19:03:44 +00:00
|
|
|
* Fri Nov 22 2013 Joe Orton <jorton@redhat.com> - 2.4.6-10
|
|
|
|
- switch to requiring system-logos-httpd (#1031288)
|
|
|
|
|
2013-11-12 12:45:29 +00:00
|
|
|
* Tue Nov 12 2013 Joe Orton <jorton@redhat.com> - 2.4.6-9
|
|
|
|
- change mmnisa to drop "-" altogether
|
|
|
|
|
2013-11-12 09:54:01 +00:00
|
|
|
* Tue Nov 12 2013 Joe Orton <jorton@redhat.com> - 2.4.6-8
|
|
|
|
- drop ambiguous invalid "-" in RHS of httpd-mmn Provide, keeping old Provide
|
|
|
|
for transition
|
|
|
|
|
2013-11-01 11:44:15 +00:00
|
|
|
* Fri Nov 1 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-7
|
2013-11-01 11:43:40 +00:00
|
|
|
- systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg
|
|
|
|
|
2013-10-31 16:04:17 +00:00
|
|
|
* Thu Oct 31 2013 Joe Orton <jorton@redhat.com> - 2.4.6-6
|
2013-10-31 15:54:58 +00:00
|
|
|
- mod_ssl: allow SSLEngine to override Listen-based default (r1537535)
|
|
|
|
|
2013-10-24 10:30:13 +00:00
|
|
|
* Thu Oct 24 2013 Jan kaluza <jkaluza@redhat.com> - 2.4.6-5
|
2013-10-24 10:26:47 +00:00
|
|
|
- systemd: send SIGWINCH signal without httpd -k in ExecStop
|
|
|
|
|
2013-10-21 19:17:46 +00:00
|
|
|
* Mon Oct 21 2013 Joe Orton <jorton@redhat.com> - 2.4.6-4
|
|
|
|
- load mod_macro by default (#998452)
|
|
|
|
- add README to conf.modules.d
|
|
|
|
- mod_proxy_http: add possible fix for threading issues (r1534321)
|
|
|
|
- core: add fix for truncated output with CGI scripts (r1530793)
|
|
|
|
|
2013-10-10 06:55:13 +00:00
|
|
|
* Thu Oct 10 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-3
|
|
|
|
- require fedora-logos-httpd (#1009162)
|
|
|
|
|
2013-07-31 06:06:52 +00:00
|
|
|
* Wed Jul 31 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-2
|
|
|
|
- revert fix for dumping vhosts twice
|
|
|
|
|
2013-07-22 16:39:21 +00:00
|
|
|
* Mon Jul 22 2013 Joe Orton <jorton@redhat.com> - 2.4.6-1
|
|
|
|
- update to 2.4.6
|
|
|
|
- mod_ssl: use revised NPN API (r1487772)
|
|
|
|
|
2013-07-11 07:25:13 +00:00
|
|
|
* Thu Jul 11 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-12
|
|
|
|
- mod_unique_id: replace use of hostname + pid with PRNG output (#976666)
|
|
|
|
- apxs: mention -p option in manpage
|
|
|
|
|
2013-07-02 15:43:29 +00:00
|
|
|
* Tue Jul 2 2013 Joe Orton <jorton@redhat.com> - 2.4.4-11
|
|
|
|
- add patch for aarch64 (Dennis Gilmore, #925558)
|
|
|
|
|
2013-07-01 11:47:28 +00:00
|
|
|
* Mon Jul 1 2013 Joe Orton <jorton@redhat.com> - 2.4.4-10
|
|
|
|
- remove duplicate apxs man page from httpd-tools
|
|
|
|
|
2013-06-17 15:11:50 +00:00
|
|
|
* Mon Jun 17 2013 Joe Orton <jorton@redhat.com> - 2.4.4-9
|
|
|
|
- remove zombie dbmmanage script
|
|
|
|
|
2013-05-31 10:42:42 +00:00
|
|
|
* Fri May 31 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-8
|
|
|
|
- return 400 Bad Request on malformed Host header
|
|
|
|
|
2013-05-24 08:24:09 +00:00
|
|
|
* Fri May 24 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-7
|
|
|
|
- ignore /etc/sysconfig/httpd and document systemd way of setting env variables
|
|
|
|
in this file
|
|
|
|
|
2013-05-20 07:54:07 +00:00
|
|
|
* Mon May 20 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-6
|
|
|
|
- htpasswd/htdbm: fix hash generation bug (#956344)
|
|
|
|
- do not dump vhosts twice in httpd -S output (#928761)
|
|
|
|
- mod_cache: fix potential crash caused by uninitialized variable (#954109)
|
|
|
|
|
2013-04-18 05:41:11 +00:00
|
|
|
* Thu Apr 18 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-5
|
|
|
|
- execute systemctl reload as result of apachectl graceful
|
2013-04-18 05:50:29 +00:00
|
|
|
- mod_ssl: ignore SNI hints unless required by config
|
2013-04-18 06:22:20 +00:00
|
|
|
- mod_cache: forward-port CacheMaxExpire "hard" option
|
2013-04-18 06:47:04 +00:00
|
|
|
- mod_ssl: fall back on another module's proxy hook if mod_ssl proxy
|
|
|
|
is not configured.
|
2013-04-18 05:41:11 +00:00
|
|
|
|
2013-04-16 12:11:13 +00:00
|
|
|
* Tue Apr 16 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-4
|
|
|
|
- fix service file to not send SIGTERM after ExecStop (#906321, #912288)
|
|
|
|
|
2013-03-27 08:42:23 +00:00
|
|
|
* Tue Mar 26 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-3
|
|
|
|
- protect MIMEMagicFile with IfModule (#893949)
|
|
|
|
|
2013-02-26 10:14:44 +00:00
|
|
|
* Tue Feb 26 2013 Joe Orton <jorton@redhat.com> - 2.4.4-2
|
|
|
|
- really package mod_auth_form in mod_session (#915438)
|
|
|
|
|
2013-02-26 09:37:09 +00:00
|
|
|
* Tue Feb 26 2013 Joe Orton <jorton@redhat.com> - 2.4.4-1
|
|
|
|
- update to 2.4.4
|
2013-02-26 09:46:28 +00:00
|
|
|
- fix duplicate ownership of mod_session config (#914901)
|
2013-02-26 09:37:09 +00:00
|
|
|
|
2013-02-22 12:59:36 +00:00
|
|
|
* Fri Feb 22 2013 Joe Orton <jorton@redhat.com> - 2.4.3-17
|
|
|
|
- add mod_session subpackage, move mod_auth_form there (#894500)
|
|
|
|
|
2013-02-14 01:16:50 +00:00
|
|
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.3-16
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
|
|
|
2013-01-08 13:19:12 +00:00
|
|
|
* Tue Jan 8 2013 Joe Orton <jorton@redhat.com> - 2.4.3-15
|
|
|
|
- add systemd service for htcacheclean
|
|
|
|
|
2012-11-13 16:49:42 +00:00
|
|
|
* Tue Nov 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-14
|
|
|
|
- drop patch for r1344712
|
|
|
|
|
2012-11-13 16:32:01 +00:00
|
|
|
* Tue Nov 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-13
|
|
|
|
- filter mod_*.so auto-provides (thanks to rcollet)
|
|
|
|
- pull in syslog logging fix from upstream (r1344712)
|
|
|
|
|
2012-10-26 14:05:43 +00:00
|
|
|
* Fri Oct 26 2012 Joe Orton <jorton@redhat.com> - 2.4.3-12
|
|
|
|
- rebuild to pick up new apr-util-ldap
|
|
|
|
|
2012-10-23 09:04:37 +00:00
|
|
|
* Tue Oct 23 2012 Joe Orton <jorton@redhat.com> - 2.4.3-11
|
|
|
|
- rebuild
|
|
|
|
|
2012-10-03 12:50:44 +00:00
|
|
|
* Wed Oct 3 2012 Joe Orton <jorton@redhat.com> - 2.4.3-10
|
|
|
|
- pull upstream patch r1392850 in addition to r1387633
|
|
|
|
|
2012-10-01 12:23:34 +00:00
|
|
|
* Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-9
|
|
|
|
- define PLATFORM in os.h using vendor string
|
|
|
|
|
2012-10-01 10:38:56 +00:00
|
|
|
* Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-8
|
|
|
|
- use systemd script unconditionally (#850149)
|
|
|
|
|
2012-10-01 09:40:54 +00:00
|
|
|
* Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-7
|
|
|
|
- use systemd scriptlets if available (#850149)
|
|
|
|
- don't run posttrans restart if /etc/sysconfig/httpd-disable-posttrans exists
|
|
|
|
|
2012-10-01 07:17:09 +00:00
|
|
|
* Mon Oct 01 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.3-6
|
|
|
|
- use systemctl from apachectl (#842736)
|
|
|
|
|
2012-09-19 15:43:29 +00:00
|
|
|
* Wed Sep 19 2012 Joe Orton <jorton@redhat.com> - 2.4.3-5
|
|
|
|
- fix some error log spam with graceful-stop (r1387633)
|
|
|
|
- minor mod_systemd tweaks
|
|
|
|
|
2012-09-13 15:50:50 +00:00
|
|
|
* Thu Sep 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-4
|
2012-09-13 15:49:46 +00:00
|
|
|
- use IncludeOptional for conf.d/*.conf inclusion
|
|
|
|
|
2012-09-07 09:35:51 +00:00
|
|
|
* Fri Sep 07 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.3-3
|
|
|
|
- adding mod_systemd to integrate with systemd better
|
|
|
|
|
2012-08-21 14:57:50 +00:00
|
|
|
* Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-2
|
|
|
|
- mod_ssl: add check for proxy keypair match (upstream r1374214)
|
|
|
|
|
2012-08-21 08:48:14 +00:00
|
|
|
* Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-1
|
|
|
|
- update to 2.4.3 (#849883)
|
|
|
|
- own the docroot (#848121)
|
|
|
|
|
2012-08-06 08:59:05 +00:00
|
|
|
* Mon Aug 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-23
|
|
|
|
- add mod_proxy fixes from upstream (r1366693, r1365604)
|
|
|
|
|
2012-07-19 13:17:00 +00:00
|
|
|
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-22
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
|
|
2012-07-06 18:41:10 +00:00
|
|
|
* Fri Jul 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-21
|
|
|
|
- drop explicit version requirement on initscripts
|
|
|
|
|
2012-07-05 17:11:14 +00:00
|
|
|
* Thu Jul 5 2012 Joe Orton <jorton@redhat.com> - 2.4.2-20
|
|
|
|
- mod_ext_filter: fix error_log warnings
|
|
|
|
|
2012-07-02 10:20:02 +00:00
|
|
|
* Mon Jul 2 2012 Joe Orton <jorton@redhat.com> - 2.4.2-19
|
|
|
|
- support "configtest" and "graceful" as initscripts "legacy actions"
|
|
|
|
|
2012-06-08 12:52:50 +00:00
|
|
|
* Fri Jun 8 2012 Joe Orton <jorton@redhat.com> - 2.4.2-18
|
|
|
|
- avoid use of "core" GIF for a "core" directory (#168776)
|
2012-06-08 12:53:59 +00:00
|
|
|
- drop use of "syslog.target" in systemd unit file
|
2012-06-08 12:52:50 +00:00
|
|
|
|
2012-06-07 13:20:29 +00:00
|
|
|
* Thu Jun 7 2012 Joe Orton <jorton@redhat.com> - 2.4.2-17
|
|
|
|
- use _unitdir for systemd unit file
|
|
|
|
- use /run in unit file, ssl.conf
|
|
|
|
|
2012-06-07 10:09:21 +00:00
|
|
|
* Thu Jun 7 2012 Joe Orton <jorton@redhat.com> - 2.4.2-16
|
|
|
|
- mod_ssl: fix NPN patch merge
|
|
|
|
|
2012-06-06 21:05:38 +00:00
|
|
|
* Wed Jun 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-15
|
|
|
|
- move tmpfiles.d fragment into /usr/lib per new guidelines
|
|
|
|
- package /run/httpd not /var/run/httpd
|
|
|
|
- set runtimedir to /run/httpd likewise
|
|
|
|
|
2012-06-06 14:23:31 +00:00
|
|
|
* Wed Jun 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-14
|
|
|
|
- fix htdbm/htpasswd crash on crypt() failure (#818684)
|
|
|
|
|
2012-06-06 10:09:47 +00:00
|
|
|
* Wed Jun 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-13
|
|
|
|
- pull fix for NPN patch from upstream (r1345599)
|
|
|
|
|
2012-05-31 13:30:39 +00:00
|
|
|
* Thu May 31 2012 Joe Orton <jorton@redhat.com> - 2.4.2-12
|
|
|
|
- update suexec patch to use LOG_AUTHPRIV facility
|
|
|
|
|
2012-05-24 15:31:51 +00:00
|
|
|
* Thu May 24 2012 Joe Orton <jorton@redhat.com> - 2.4.2-11
|
|
|
|
- really fix autoindex.conf (thanks to remi@)
|
|
|
|
|
2012-05-24 10:10:58 +00:00
|
|
|
* Thu May 24 2012 Joe Orton <jorton@redhat.com> - 2.4.2-10
|
|
|
|
- fix autoindex.conf to allow symlink to poweredby.png
|
|
|
|
|
2012-05-23 21:48:18 +00:00
|
|
|
* Wed May 23 2012 Joe Orton <jorton@redhat.com> - 2.4.2-9
|
|
|
|
- suexec: use upstream version of patch for capability bit support
|
|
|
|
|
2012-05-23 16:01:18 +00:00
|
|
|
* Wed May 23 2012 Joe Orton <jorton@redhat.com> - 2.4.2-8
|
|
|
|
- suexec: use syslog rather than suexec.log, drop dac_override capability
|
|
|
|
|
2012-05-01 13:34:55 +00:00
|
|
|
* Tue May 1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-7
|
|
|
|
- mod_ssl: add TLS NPN support (r1332643, #809599)
|
|
|
|
|
2012-05-01 12:34:06 +00:00
|
|
|
* Tue May 1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-6
|
|
|
|
- add BR on APR >= 1.4.0
|
|
|
|
|
2012-04-27 15:56:26 +00:00
|
|
|
* Fri Apr 27 2012 Joe Orton <jorton@redhat.com> - 2.4.2-5
|
|
|
|
- use systemctl from logrotate (#221073)
|
|
|
|
|
2012-04-27 12:41:07 +00:00
|
|
|
* Fri Apr 27 2012 Joe Orton <jorton@redhat.com> - 2.4.2-4
|
|
|
|
- pull from upstream:
|
|
|
|
* use TLS close_notify alert for dummy_connection (r1326980+)
|
|
|
|
* cleanup symbol exports (r1327036+)
|
|
|
|
|
2012-04-20 12:10:10 +00:00
|
|
|
* Fri Apr 20 2012 Joe Orton <jorton@redhat.com> - 2.4.2-3
|
|
|
|
- really fix restart
|
|
|
|
|
2012-04-20 11:38:40 +00:00
|
|
|
* Fri Apr 20 2012 Joe Orton <jorton@redhat.com> - 2.4.2-2
|
|
|
|
- tweak default ssl.conf
|
|
|
|
- fix restart handling (#814645)
|
|
|
|
- use graceful restart by default
|
|
|
|
|
2012-04-18 08:17:45 +00:00
|
|
|
* Wed Apr 18 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.2-1
|
|
|
|
- update to 2.4.2
|
|
|
|
|
2012-03-23 16:06:35 +00:00
|
|
|
* Fri Mar 23 2012 Joe Orton <jorton@redhat.com> - 2.4.1-6
|
|
|
|
- fix macros
|
|
|
|
|
2012-03-23 14:48:06 +00:00
|
|
|
* Fri Mar 23 2012 Joe Orton <jorton@redhat.com> - 2.4.1-5
|
|
|
|
- add _httpd_moddir to macros
|
|
|
|
|
2012-03-13 16:52:36 +00:00
|
|
|
* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-4
|
|
|
|
- fix symlink for poweredby.png
|
2012-03-13 16:58:07 +00:00
|
|
|
- fix manual.conf
|
2012-03-13 16:52:36 +00:00
|
|
|
|
2012-03-13 16:33:13 +00:00
|
|
|
* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-3
|
|
|
|
- add mod_proxy_html subpackage (w/mod_proxy_html + mod_xml2enc)
|
|
|
|
- move mod_ldap, mod_authnz_ldap to mod_ldap subpackage
|
|
|
|
|
2012-03-13 09:57:51 +00:00
|
|
|
* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-2
|
|
|
|
- clean docroot better
|
2012-03-13 15:43:55 +00:00
|
|
|
- ship proxy, ssl directories within /var/cache/httpd
|
2012-03-13 15:45:17 +00:00
|
|
|
- default config:
|
|
|
|
* unrestricted access to (only) /var/www
|
|
|
|
* remove (commented) Mutex, MaxRanges, ScriptSock
|
2012-03-13 16:04:44 +00:00
|
|
|
* split autoindex config to conf.d/autoindex.conf
|
|
|
|
- ship additional example configs in docdir
|
2012-03-13 09:57:51 +00:00
|
|
|
|
2012-03-13 09:55:18 +00:00
|
|
|
* Tue Mar 6 2012 Joe Orton <jorton@redhat.com> - 2.4.1-1
|
|
|
|
- update to 2.4.1
|
|
|
|
- adopt upstream default httpd.conf (almost verbatim)
|
|
|
|
- split all LoadModules to conf.modules.d/*.conf
|
|
|
|
- include conf.d/*.conf at end of httpd.conf
|
|
|
|
- trim %%changelog
|