|
|
3a44ff7 |
%define contentdir %{_datadir}/httpd
|
|
|
3a44ff7 |
%define docroot /var/www
|
|
cvsdist |
3cbd43b |
%define suexec_caller apache
|
|
|
3a44ff7 |
%define mmn 20120211
|
|
|
353758d |
%define mmnisa %{mmn}%{__isa_name}%{__isa_bits}
|
|
|
92ee9cf |
%define vstring %(source /etc/os-release; echo ${REDHAT_SUPPORT_PRODUCT})
|
|
|
c094ba4 |
%if 0%{?fedora} > 26 || 0%{?rhel} > 7
|
|
|
e9d2120 |
%global mpm event
|
|
|
c094ba4 |
%else
|
|
|
c094ba4 |
%global mpm prefork
|
|
|
e9d2120 |
%endif
|
|
cvsdist |
f8e1fe3 |
|
|
cvsdist |
3cbd43b |
Summary: Apache HTTP Server
|
|
cvsdist |
3cbd43b |
Name: httpd
|
|
|
1578b45 |
Version: 2.4.41
|
|
|
f1280d5 |
Release: 5%{?dist}
|
|
|
ddabcff |
URL: https://httpd.apache.org/
|
|
|
ddabcff |
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
|
|
|
99146f2 |
Source2: httpd.logrotate
|
|
|
5860daa |
Source3: instance.conf
|
|
|
99146f2 |
Source4: httpd-ssl-pass-dialog
|
|
|
99146f2 |
Source5: httpd.tmpfiles
|
|
|
99146f2 |
Source6: httpd.service
|
|
|
99146f2 |
Source7: action-graceful.sh
|
|
|
99146f2 |
Source8: action-configtest.sh
|
|
|
7a7c76f |
Source9: server-status.conf
|
|
cvsdist |
3cbd43b |
Source10: httpd.conf
|
|
|
3a44ff7 |
Source11: 00-base.conf
|
|
|
3a44ff7 |
Source12: 00-mpm.conf
|
|
|
3a44ff7 |
Source13: 00-lua.conf
|
|
|
3a44ff7 |
Source14: 01-cgi.conf
|
|
|
3a44ff7 |
Source15: 00-dav.conf
|
|
|
3a44ff7 |
Source16: 00-proxy.conf
|
|
|
3a44ff7 |
Source17: 00-ssl.conf
|
|
|
415f76c |
Source18: 01-ldap.conf
|
|
|
415f76c |
Source19: 00-proxyhtml.conf
|
|
|
415f76c |
Source20: userdir.conf
|
|
|
415f76c |
Source21: ssl.conf
|
|
|
415f76c |
Source22: welcome.conf
|
|
|
dd94df0 |
Source23: manual.conf
|
|
Jan Kaluza |
a0a00e7 |
Source24: 00-systemd.conf
|
|
|
d70345a |
Source25: 01-session.conf
|
|
|
572a5df |
Source26: 10-listen443.conf
|
|
|
572a5df |
Source27: httpd.socket
|
|
|
b46475b |
Source28: 00-optional.conf
|
|
|
415f76c |
Source30: README.confd
|
|
|
aa55b1c |
Source31: README.confmod
|
|
|
bbb988f |
Source32: httpd.service.xml
|
|
|
c72daf6 |
Source33: htcacheclean.service.xml
|
|
|
f7bb212 |
Source34: httpd.conf.xml
|
|
|
55e18b4 |
Source40: htcacheclean.service
|
|
|
55e18b4 |
Source41: htcacheclean.sysconf
|
|
|
180ad32 |
Source42: httpd-init.service
|
|
|
180ad32 |
Source43: httpd-ssl-gencerts
|
|
|
5860daa |
Source44: httpd@.service
|
|
|
80cf417 |
Source45: config.layout
|
|
|
b86b48c |
Source46: apachectl.sh
|
|
cvsdist |
3cbd43b |
# build/scripts patches
|
|
|
9f6ae98 |
Patch2: httpd-2.4.9-apxs.patch
|
|
|
3a44ff7 |
Patch3: httpd-2.4.1-deplibs.patch
|
|
|
94399e0 |
# Needed for socket activation and mod_systemd patch
|
|
|
59afc15 |
Patch19: httpd-2.4.25-detect-systemd.patch
|
|
cvsdist |
6356941 |
# Features/functional changes
|
|
|
67d32a7 |
Patch21: httpd-2.4.39-r1842929+.patch
|
|
|
10963a8 |
Patch23: httpd-2.4.39-export.patch
|
|
|
3a44ff7 |
Patch24: httpd-2.4.1-corelimit.patch
|
|
|
59afc15 |
Patch25: httpd-2.4.25-selinux.patch
|
|
|
a0dc243 |
Patch27: httpd-2.4.2-icons.patch
|
|
|
df56b6f |
Patch29: httpd-2.4.33-systemd.patch
|
|
Jan Kaluza |
3f84aef |
Patch30: httpd-2.4.4-cachehardmax.patch
|
|
|
799dcec |
Patch31: httpd-2.4.33-sslmultiproxy.patch
|
|
|
c2c0377 |
Patch34: httpd-2.4.17-socket-activation.patch
|
|
|
1810bd5 |
Patch36: httpd-2.4.38-r1830819+.patch
|
|
|
369db50 |
Patch38: httpd-2.4.34-sslciphdefault.patch
|
|
|
affd30d |
Patch39: httpd-2.4.37-sslprotdefault.patch
|
|
|
720c6f3 |
Patch40: httpd-2.4.39-r1861269.patch
|
|
|
2ae67b3 |
Patch41: httpd-2.4.37-r1861793+.patch
|
|
|
5b6bedc |
Patch42: httpd-2.4.41-r1828172+.patch
|
|
|
16b03b2 |
|
|
|
7d53cc9 |
# Bug fixes
|
|
|
c58fda3 |
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243
|
|
|
5072c65 |
Patch58: httpd-2.4.34-r1738878.patch
|
|
|
5bf30dc |
Patch60: httpd-2.4.34-enable-sslv3.patch
|
|
|
f1280d5 |
Patch61: httpd-2.4.41-r1865749.patch
|
|
|
ad0d0a1 |
|
|
|
16b03b2 |
# Security fixes
|
|
|
6ebb5a2 |
|
|
|
073d591 |
License: ASL 2.0
|
|
|
bc2b0a9 |
BuildRequires: gcc, autoconf, pkgconfig, findutils, xmlto
|
|
|
bc2b0a9 |
BuildRequires: perl-interpreter, perl-generators, systemd-devel
|
|
|
95a0c95 |
BuildRequires: zlib-devel, libselinux-devel, lua-devel, brotli-devel
|
|
|
8c01244 |
BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.5.0, pcre-devel >= 5.0
|
|
|
fdd0182 |
Requires: /etc/mime.types, system-logos-httpd
|
|
|
06872c8 |
Obsoletes: httpd-suexec
|
|
cvsdist |
3cbd43b |
Provides: webserver
|
|
|
935b958 |
Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
|
|
|
a035f96 |
Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
|
|
|
415f76c |
Requires: httpd-tools = %{version}-%{release}
|
|
|
fa66d3e |
Requires: httpd-filesystem = %{version}-%{release}
|
|
|
dbcbdf8 |
Requires: mod_http2
|
|
|
452da8d |
Requires(pre): httpd-filesystem
|
|
|
ce009f9 |
Requires(preun): systemd-units
|
|
|
ce009f9 |
Requires(postun): systemd-units
|
|
|
ce009f9 |
Requires(post): systemd-units
|
|
|
a2e9cec |
Conflicts: apr < 1.5.0-1
|
|
|
6fd3216 |
Provides: mod_proxy_uwsgi = %{version}-%{release}
|
|
|
71609fa |
Obsoletes: mod_proxy_uwsgi < 2.0.17.1-2
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%description
|
|
|
0f8eb18 |
The Apache HTTP Server is a powerful, efficient, and extensible
|
|
|
0f8eb18 |
web server.
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%package devel
|
|
|
596b5fc |
Summary: Development interfaces for the Apache HTTP Server
|
|
|
c1d7519 |
Requires: apr-devel, apr-util-devel, pkgconfig
|
|
|
9f7341d |
Requires: httpd = %{version}-%{release}
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%description devel
|
|
cvsdist |
3cbd43b |
The httpd-devel package contains the APXS binary and other files
|
|
|
7c0f3e4 |
that you need to build Dynamic Shared Objects (DSOs) for the
|
|
|
7c0f3e4 |
Apache HTTP Server.
|
|
cvsdist |
3cbd43b |
|
|
|
596b5fc |
If you are installing the Apache HTTP Server and you want to be
|
|
cvsdist |
3cbd43b |
able to compile or develop additional modules for Apache, you need
|
|
cvsdist |
3cbd43b |
to install this package.
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%package manual
|
|
|
596b5fc |
Summary: Documentation for the Apache HTTP Server
|
|
|
9f7341d |
Requires: httpd = %{version}-%{release}
|
|
|
39b4bd2 |
BuildArch: noarch
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%description manual
|
|
cvsdist |
3cbd43b |
The httpd-manual package contains the complete manual and
|
|
|
596b5fc |
reference guide for the Apache HTTP Server. The information can
|
|
|
596b5fc |
also be found at https://httpd.apache.org/docs/2.4/.
|
|
cvsdist |
3cbd43b |
|
|
|
fa66d3e |
%package filesystem
|
|
|
596b5fc |
Summary: The basic directory layout for the Apache HTTP Server
|
|
|
fa66d3e |
BuildArch: noarch
|
|
|
5ee418c |
Requires(pre): /usr/sbin/useradd
|
|
|
fa66d3e |
|
|
|
fa66d3e |
%description filesystem
|
|
|
fa66d3e |
The httpd-filesystem package contains the basic directory layout
|
|
|
596b5fc |
for the Apache HTTP Server including the correct permissions
|
|
|
fa66d3e |
for the directories.
|
|
|
fa66d3e |
|
|
|
8499915 |
%package tools
|
|
|
8499915 |
Summary: Tools for use with the Apache HTTP Server
|
|
|
8499915 |
|
|
|
8499915 |
%description tools
|
|
|
8499915 |
The httpd-tools package contains tools which can be used with
|
|
|
8499915 |
the Apache HTTP Server.
|
|
|
8499915 |
|
|
cvsdist |
3cbd43b |
%package -n mod_ssl
|
|
|
8499915 |
Summary: SSL/TLS module for the Apache HTTP Server
|
|
jbj |
b35049d |
Epoch: 1
|
|
|
c187a27 |
BuildRequires: openssl-devel
|
|
|
452da8d |
Requires(pre): httpd-filesystem
|
|
|
d546d00 |
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
|
|
a4638c1 |
Requires: sscg >= 2.2.0, /usr/bin/hostname
|
|
|
793563a |
# Require an OpenSSL which supports PROFILE=SYSTEM
|
|
|
b430bfe |
Conflicts: openssl-libs < 1:1.0.1h-4
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%description -n mod_ssl
|
|
cvsdist |
3cbd43b |
The mod_ssl module provides strong cryptography for the Apache Web
|
|
cvsdist |
3cbd43b |
server via the Secure Sockets Layer (SSL) and Transport Layer
|
|
cvsdist |
3cbd43b |
Security (TLS) protocols.
|
|
cvsdist |
3cbd43b |
|
|
|
415f76c |
%package -n mod_proxy_html
|
|
|
415f76c |
Summary: HTML and XML content filters for the Apache HTTP Server
|
|
|
415f76c |
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
|
|
415f76c |
BuildRequires: libxml2-devel
|
|
|
415f76c |
Epoch: 1
|
|
|
415f76c |
Obsoletes: mod_proxy_html < 1:2.4.1-2
|
|
|
415f76c |
|
|
|
415f76c |
%description -n mod_proxy_html
|
|
|
415f76c |
The mod_proxy_html and mod_xml2enc modules provide filters which can
|
|
|
415f76c |
transform and modify HTML and XML content.
|
|
|
415f76c |
|
|
|
415f76c |
%package -n mod_ldap
|
|
|
415f76c |
Summary: LDAP authentication modules for the Apache HTTP Server
|
|
|
415f76c |
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
|
|
415f76c |
Requires: apr-util-ldap
|
|
|
415f76c |
|
|
|
415f76c |
%description -n mod_ldap
|
|
|
415f76c |
The mod_ldap and mod_authnz_ldap modules add support for LDAP
|
|
|
415f76c |
authentication to the Apache HTTP Server.
|
|
|
415f76c |
|
|
|
d70345a |
%package -n mod_session
|
|
|
d70345a |
Summary: Session interface for the Apache HTTP Server
|
|
|
d70345a |
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
|
|
d70345a |
|
|
|
d70345a |
%description -n mod_session
|
|
|
d70345a |
The mod_session module and associated backends provide an abstract
|
|
|
d70345a |
interface for storing and accessing per-user session data.
|
|
|
d70345a |
|
|
cvsdist |
3cbd43b |
%prep
|
|
cvsdist |
3cbd43b |
%setup -q
|
|
cvsdist |
739d054 |
%patch2 -p1 -b .apxs
|
|
|
96e0b33 |
%patch3 -p1 -b .deplibs
|
|
|
96e0b33 |
|
|
|
94399e0 |
%patch19 -p1 -b .detectsystemd
|
|
|
94399e0 |
|
|
|
920857b |
%patch21 -p1 -b .r1842929+
|
|
|
96e0b33 |
%patch23 -p1 -b .export
|
|
|
96e0b33 |
%patch24 -p1 -b .corelimit
|
|
|
96e0b33 |
%patch25 -p1 -b .selinux
|
|
|
a0dc243 |
%patch27 -p1 -b .icons
|
|
Jan Kaluza |
a0a00e7 |
%patch29 -p1 -b .systemd
|
|
Jan Kaluza |
3f84aef |
%patch30 -p1 -b .cachehardmax
|
|
|
e4c2da6 |
#patch31 -p1 -b .sslmultiproxy
|
|
|
c2c0377 |
%patch34 -p1 -b .socketactivation
|
|
|
a185523 |
%patch36 -p1 -b .r1830819+
|
|
|
369db50 |
%patch38 -p1 -b .sslciphdefault
|
|
|
8643397 |
%patch39 -p1 -b .sslprotdefault
|
|
|
720c6f3 |
%patch40 -p1 -b .r1861269
|
|
|
2ae67b3 |
%patch41 -p1 -b .r1861793+
|
|
|
2993aea |
%patch42 -p1 -b .r1828172+
|
|
|
1d78fa4 |
|
|
|
fd6452a |
%patch58 -p1 -b .r1738878
|
|
|
1f748ac |
%patch60 -p1 -b .enable-sslv3
|
|
|
f1280d5 |
%patch61 -p1 -b .r1865749
|
|
|
6ebb5a2 |
|
|
|
3027873 |
# Patch in the vendor string
|
|
|
3027873 |
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
|
|
cvsdist |
2d6a2e5 |
|
|
|
d3d3699 |
# Prevent use of setcap in "install-suexec-caps" target.
|
|
|
d3d3699 |
sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
|
|
|
d3d3699 |
|
|
|
5860daa |
# Example conf for instances
|
|
|
5860daa |
cp $RPM_SOURCE_DIR/instance.conf .
|
|
|
5860daa |
sed < $RPM_SOURCE_DIR/httpd.conf >> instance.conf '
|
|
|
5860daa |
0,/^ServerRoot/d;
|
|
|
5860daa |
/# Supplemental configuration/,$d
|
|
|
5860daa |
/^ *CustomLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,
|
|
|
5860daa |
/^ *ErrorLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,
|
|
|
5860daa |
'
|
|
|
5860daa |
touch -r $RPM_SOURCE_DIR/instance.conf instance.conf
|
|
|
7a7c76f |
cp -p $RPM_SOURCE_DIR/server-status.conf server-status.conf
|
|
|
5860daa |
|
|
cvsdist |
f8e1fe3 |
# Safety check: prevent build if defined MMN does not equal upstream MMN.
|
|
cvsdist |
3ebc88d |
vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
|
|
cvsdist |
f8e1fe3 |
if test "x${vmmn}" != "x%{mmn}"; then
|
|
|
d546d00 |
: Error: Upstream MMN is now ${vmmn}, packaged MMN is %{mmn}
|
|
cvsdist |
f8e1fe3 |
: Update the mmn macro and rebuild.
|
|
cvsdist |
f8e1fe3 |
exit 1
|
|
cvsdist |
f8e1fe3 |
fi
|
|
cvsdist |
f8e1fe3 |
|
|
|
80cf417 |
# Provide default layout
|
|
|
80cf417 |
cp $RPM_SOURCE_DIR/config.layout .
|
|
|
80cf417 |
|
|
|
36d7a68 |
sed '
|
|
|
36d7a68 |
s,@MPM@,%{mpm},g
|
|
|
36d7a68 |
s,@DOCROOT@,%{docroot},g
|
|
|
36d7a68 |
s,@LOGDIR@,%{_localstatedir}/log/httpd,g
|
|
|
36d7a68 |
' < $RPM_SOURCE_DIR/httpd.conf.xml \
|
|
|
36d7a68 |
> httpd.conf.xml
|
|
|
6d96e6a |
|
|
|
36d7a68 |
xmlto man ./httpd.conf.xml
|
|
|
c72daf6 |
xmlto man $RPM_SOURCE_DIR/htcacheclean.service.xml
|
|
|
36d7a68 |
xmlto man $RPM_SOURCE_DIR/httpd.service.xml
|
|
|
710b63c |
|
|
|
e9d2120 |
: Building with MMN %{mmn}, MMN-ISA %{mmnisa}
|
|
|
e9d2120 |
: Default MPM is %{mpm}, vendor string is '%{vstring}'
|
|
cvsdist |
3ebc88d |
|
|
cvsdist |
739d054 |
%build
|
|
cvsdist |
436bfeb |
# forcibly prevent use of bundled apr, apr-util, pcre
|
|
cvsdist |
436bfeb |
rm -rf srclib/{apr,apr-util,pcre}
|
|
cvsdist |
436bfeb |
|
|
cvsdist |
3cbd43b |
# regenerate configure scripts
|
|
cvsdist |
436bfeb |
autoheader && autoconf || exit 1
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
f8e1fe3 |
# Before configure; fix location of build dir in generated apxs
|
|
cvsdist |
f8e1fe3 |
%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
|
|
|
fc0e844 |
support/apxs.in
|
|
cvsdist |
f8e1fe3 |
|
|
|
e359920 |
export CFLAGS=$RPM_OPT_FLAGS
|
|
|
e359920 |
export LDFLAGS="-Wl,-z,relro,-z,now"
|
|
cvsdist |
f8e1fe3 |
|
|
|
e91269e |
# Hard-code path to links to avoid unnecessary builddep
|
|
|
e91269e |
export LYNX_PATH=/usr/bin/links
|
|
|
e91269e |
|
|
|
bd3365e |
# Build the daemon
|
|
|
3a44ff7 |
./configure \
|
|
|
fc0e844 |
--prefix=%{_sysconfdir}/httpd \
|
|
|
fc0e844 |
--exec-prefix=%{_prefix} \
|
|
|
fc0e844 |
--bindir=%{_bindir} \
|
|
|
fc0e844 |
--sbindir=%{_sbindir} \
|
|
|
fc0e844 |
--mandir=%{_mandir} \
|
|
|
fc0e844 |
--libdir=%{_libdir} \
|
|
|
fc0e844 |
--sysconfdir=%{_sysconfdir}/httpd/conf \
|
|
|
fc0e844 |
--includedir=%{_includedir}/httpd \
|
|
|
fc0e844 |
--libexecdir=%{_libdir}/httpd/modules \
|
|
|
fc0e844 |
--datadir=%{contentdir} \
|
|
|
3a44ff7 |
--enable-layout=Fedora \
|
|
cvsdist |
d48e904 |
--with-installbuilddir=%{_libdir}/httpd/build \
|
|
|
3a44ff7 |
--enable-mpms-shared=all \
|
|
cvsdist |
d48e904 |
--with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
|
|
fc0e844 |
--enable-suexec --with-suexec \
|
|
|
d3d3699 |
--enable-suexec-capabilities \
|
|
|
fc0e844 |
--with-suexec-caller=%{suexec_caller} \
|
|
|
fc0e844 |
--with-suexec-docroot=%{docroot} \
|
|
|
fc0e844 |
--without-suexec-logfile \
|
|
|
22bfb45 |
--with-suexec-syslog \
|
|
|
fc0e844 |
--with-suexec-bin=%{_sbindir}/suexec \
|
|
|
fc0e844 |
--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
|
|
|
95a0c95 |
--with-brotli \
|
|
|
96e0b33 |
--enable-pie \
|
|
|
96e0b33 |
--with-pcre \
|
|
|
96e0b33 |
--enable-mods-shared=all \
|
|
|
fc0e844 |
--enable-ssl --with-ssl --disable-distcache \
|
|
|
fc0e844 |
--enable-proxy --enable-proxy-fdpass \
|
|
|
8a37bd4 |
--enable-cache \
|
|
|
8a37bd4 |
--enable-disk-cache \
|
|
|
96e0b33 |
--enable-ldap --enable-authnz-ldap \
|
|
|
3a44ff7 |
--enable-cgid --enable-cgi \
|
|
|
2993aea |
--enable-cgid-fdpassing \
|
|
|
abfe86f |
--enable-authn-anon --enable-authn-alias \
|
|
|
dbcbdf8 |
--disable-imagemap --disable-file-cache \
|
|
|
dbcbdf8 |
--disable-http2 \
|
|
|
e945a60 |
--disable-md \
|
|
|
fc0e844 |
$*
|
|
|
3a44ff7 |
make %{?_smp_mflags}
|
|
|
c187a27 |
|
|
cvsdist |
3cbd43b |
%install
|
|
cvsdist |
3cbd43b |
rm -rf $RPM_BUILD_ROOT
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
make DESTDIR=$RPM_BUILD_ROOT install
|
|
cvsdist |
3cbd43b |
|
|
|
3a44ff7 |
# Install systemd service files
|
|
|
ce0280a |
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
|
|
|
5860daa |
for s in httpd.service htcacheclean.service httpd.socket \
|
|
|
5860daa |
httpd@.service httpd-init.service; do
|
|
|
572a5df |
install -p -m 644 $RPM_SOURCE_DIR/${s} \
|
|
|
572a5df |
$RPM_BUILD_ROOT%{_unitdir}/${s}
|
|
|
55e18b4 |
done
|
|
|
bd3365e |
|
|
cvsdist |
3cbd43b |
# install conf file/directory
|
|
|
3a44ff7 |
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \
|
|
|
3a44ff7 |
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d
|
|
cvsdist |
3cbd43b |
install -m 644 $RPM_SOURCE_DIR/README.confd \
|
|
cvsdist |
f8aafff |
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
|
|
|
aa55b1c |
install -m 644 $RPM_SOURCE_DIR/README.confmod \
|
|
|
aa55b1c |
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README
|
|
|
3a44ff7 |
for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
|
|
|
415f76c |
00-proxy.conf 00-ssl.conf 01-ldap.conf 00-proxyhtml.conf \
|
|
|
e945a60 |
01-ldap.conf 00-systemd.conf 01-session.conf 00-optional.conf; do
|
|
|
3a44ff7 |
install -m 644 -p $RPM_SOURCE_DIR/$f \
|
|
|
3a44ff7 |
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
|
|
|
3a44ff7 |
done
|
|
|
3a44ff7 |
|
|
|
e9d2120 |
sed -i '/^#LoadModule mpm_%{mpm}_module /s/^#//' \
|
|
|
e9d2120 |
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
|
|
|
ccd2dc5 |
touch -r $RPM_SOURCE_DIR/00-mpm.conf \
|
|
|
e9d2120 |
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
|
|
|
e9d2120 |
|
|
|
15ab7bc |
# install systemd override drop directory
|
|
|
15ab7bc |
# Web application packages can drop snippets into this location if
|
|
|
15ab7bc |
# they need ExecStart[pre|post].
|
|
|
15ab7bc |
mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d
|
|
|
572a5df |
mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d
|
|
|
572a5df |
|
|
|
572a5df |
install -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf \
|
|
|
572a5df |
$RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf
|
|
|
15ab7bc |
|
|
|
dd94df0 |
for f in welcome.conf ssl.conf manual.conf userdir.conf; do
|
|
|
78b00cd |
install -m 644 -p $RPM_SOURCE_DIR/$f \
|
|
|
78b00cd |
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
|
|
cvsdist |
f8aafff |
done
|
|
cvsdist |
3cbd43b |
|
|
|
c540f64 |
# Split-out extra config shipped as default in conf.d:
|
|
|
dd94df0 |
for f in autoindex; do
|
|
|
53f8164 |
install -m 644 docs/conf/extra/httpd-${f}.conf \
|
|
|
c540f64 |
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/${f}.conf
|
|
|
c540f64 |
done
|
|
|
c540f64 |
|
|
|
c540f64 |
# Extra config trimmed:
|
|
|
c540f64 |
rm -v docs/conf/extra/httpd-{ssl,userdir}.conf
|
|
|
c540f64 |
|
|
cvsdist |
3cbd43b |
rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
|
|
|
12462ec |
install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
|
|
cvsdist |
3cbd43b |
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
e9bfb00 |
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
|
|
70c651f |
install -m 644 -p $RPM_SOURCE_DIR/htcacheclean.sysconf \
|
|
|
70c651f |
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean
|
|
cvsdist |
e9bfb00 |
|
|
|
da4346b |
# tmpfiles.d configuration
|
|
|
c128570 |
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
|
|
|
da4346b |
install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
|
|
|
c128570 |
$RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/httpd.conf
|
|
|
da4346b |
|
|
|
55e18b4 |
# Other directories
|
|
|
5586dfd |
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/httpd \
|
|
|
55e18b4 |
$RPM_BUILD_ROOT/run/httpd/htcacheclean
|
|
cvsdist |
3cbd43b |
|
|
|
1fce54b |
# Substitute in defaults which are usually done (badly) by "make install"
|
|
|
1fce54b |
sed -i \
|
|
|
5586dfd |
"/^DavLockDB/d;
|
|
|
1fce54b |
s,@@ServerRoot@@/user.passwd,/etc/httpd/conf/user.passwd,;
|
|
|
1fce54b |
s,@@ServerRoot@@/docs,%{docroot},;
|
|
|
1fce54b |
s,@@ServerRoot@@,%{docroot},;
|
|
|
1fce54b |
s,@@Port@@,80,;" \
|
|
|
1fce54b |
docs/conf/extra/*.conf
|
|
|
1fce54b |
|
|
|
bc95575 |
# Set correct path for httpd binary in apachectl script
|
|
|
7ee1cb5 |
sed 's,@HTTPDBIN@,%{_sbindir}/httpd,g' $RPM_SOURCE_DIR/apachectl.sh \
|
|
|
7ee1cb5 |
> apachectl.sh
|
|
|
bc95575 |
|
|
|
c70a7c1 |
# Create cache directory
|
|
|
c540f64 |
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
|
|
|
c540f64 |
$RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
|
|
|
c540f64 |
$RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/ssl
|
|
cvsdist |
d48e904 |
|
|
cvsdist |
6af796e |
# Make the MMN accessible to module packages
|
|
|
d546d00 |
echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
|
|
|
6228c46 |
mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d
|
|
|
6228c46 |
cat > $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.httpd <
|
|
|
3a44ff7 |
%%_httpd_mmn %{mmnisa}
|
|
|
22a55f7 |
%%_httpd_apxs %%{_bindir}/apxs
|
|
|
22a55f7 |
%%_httpd_modconfdir %%{_sysconfdir}/httpd/conf.modules.d
|
|
|
22a55f7 |
%%_httpd_confdir %%{_sysconfdir}/httpd/conf.d
|
|
|
b2bbac8 |
%%_httpd_contentdir %{contentdir}
|
|
|
22a55f7 |
%%_httpd_moddir %%{_libdir}/httpd/modules
|
|
|
3a44ff7 |
EOF
|
|
cvsdist |
6af796e |
|
|
|
3a44ff7 |
# Handle contentdir
|
|
|
7a7c76f |
mkdir $RPM_BUILD_ROOT%{contentdir}/noindex \
|
|
|
7a7c76f |
$RPM_BUILD_ROOT%{contentdir}/server-status
|
|
|
8c08392 |
ln -s ../../fedora-testpage/index.html \
|
|
|
8c08392 |
$RPM_BUILD_ROOT%{contentdir}/noindex/index.html
|
|
|
7a7c76f |
install -m 644 -p docs/server-status/* \
|
|
|
7a7c76f |
$RPM_BUILD_ROOT%{contentdir}/server-status
|
|
|
3a44ff7 |
rm -rf %{contentdir}/htdocs
|
|
cvsdist |
d48e904 |
|
|
cvsdist |
d48e904 |
# remove manual sources
|
|
cvsdist |
d48e904 |
find $RPM_BUILD_ROOT%{contentdir}/manual \( \
|
|
cvsdist |
d48e904 |
-name \*.xml -o -name \*.xml.* -o -name \*.ent -o -name \*.xsl -o -name \*.dtd \
|
|
cvsdist |
d48e904 |
\) -print0 | xargs -0 rm -f
|
|
cvsdist |
3cbd43b |
|
|
|
2724cce |
# Strip the manual down just to English and replace the typemaps with flat files:
|
|
|
2724cce |
set +x
|
|
|
2724cce |
for f in `find $RPM_BUILD_ROOT%{contentdir}/manual -name \*.html -type f`; do
|
|
|
2724cce |
if test -f ${f}.en; then
|
|
|
2724cce |
cp ${f}.en ${f}
|
|
|
2724cce |
rm ${f}.*
|
|
|
2724cce |
fi
|
|
|
2724cce |
done
|
|
|
2724cce |
set -x
|
|
|
2724cce |
|
|
|
3a44ff7 |
# Clean Document Root
|
|
|
3a44ff7 |
rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html \
|
|
|
3a44ff7 |
$RPM_BUILD_ROOT%{docroot}/cgi-bin/*
|
|
|
3a44ff7 |
|
|
|
78b00cd |
# Symlink for the powered-by-$DISTRO image:
|
|
|
2ef12c9 |
ln -s ../../pixmaps/poweredby.png \
|
|
|
78b00cd |
$RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
# symlinks for /etc/httpd
|
|
|
80cf417 |
rmdir $RPM_BUILD_ROOT/etc/httpd/{state,run}
|
|
cvsdist |
3cbd43b |
ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
|
|
|
3aa63a9 |
ln -s ../..%{_localstatedir}/lib/httpd $RPM_BUILD_ROOT/etc/httpd/state
|
|
|
c128570 |
ln -s /run/httpd $RPM_BUILD_ROOT/etc/httpd/run
|
|
cvsdist |
3cbd43b |
ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
|
|
cvsdist |
3cbd43b |
|
|
Jan Kaluza |
2673a43 |
# install http-ssl-pass-dialog
|
|
|
99146f2 |
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
|
|
Jan Kaluza |
2673a43 |
install -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \
|
|
|
fc0e844 |
$RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog
|
|
|
99146f2 |
|
|
|
180ad32 |
# install http-ssl-gencerts
|
|
|
180ad32 |
install -m755 $RPM_SOURCE_DIR/httpd-ssl-gencerts \
|
|
|
fc0e844 |
$RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts
|
|
|
180ad32 |
|
|
|
b86b48c |
# Install scripts
|
|
|
7ee1cb5 |
install -m 755 apachectl.sh $RPM_BUILD_ROOT%{_sbindir}/apachectl
|
|
|
7ee1cb5 |
touch -r $RPM_SOURCE_DIR/apachectl.sh $RPM_BUILD_ROOT%{_sbindir}/apachectl
|
|
|
99146f2 |
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd
|
|
|
99146f2 |
for f in graceful configtest; do
|
|
|
99146f2 |
install -p -m 755 $RPM_SOURCE_DIR/action-${f}.sh \
|
|
|
99146f2 |
$RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/${f}
|
|
|
99146f2 |
done
|
|
Jan Kaluza |
2673a43 |
|
|
|
9d402ca |
# Install logrotate config
|
|
cvsdist |
3cbd43b |
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
|
|
78b00cd |
install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
|
|
|
fc0e844 |
$RPM_BUILD_ROOT/etc/logrotate.d/httpd
|
|
cvsdist |
3cbd43b |
|
|
|
36d7a68 |
# Install man pages
|
|
|
36d7a68 |
install -d $RPM_BUILD_ROOT%{_mandir}/man8 $RPM_BUILD_ROOT%{_mandir}/man5
|
|
|
6a77761 |
install -m 644 -p httpd.service.8 httpd-init.service.8 httpd.socket.8 \
|
|
|
c72daf6 |
httpd@.service.8 htcacheclean.service.8 \
|
|
|
fce414a |
$RPM_BUILD_ROOT%{_mandir}/man8
|
|
|
36d7a68 |
install -m 644 -p httpd.conf.5 \
|
|
|
36d7a68 |
$RPM_BUILD_ROOT%{_mandir}/man5
|
|
|
710b63c |
|
|
cvsdist |
3cbd43b |
# fix man page paths
|
|
cvsdist |
3cbd43b |
sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \
|
|
cvsdist |
3cbd43b |
-e "s|/usr/local/apache2/conf/mime.types|/etc/mime.types|" \
|
|
cvsdist |
3cbd43b |
-e "s|/usr/local/apache2/conf/magic|/etc/httpd/conf/magic|" \
|
|
cvsdist |
3cbd43b |
-e "s|/usr/local/apache2/logs/error_log|/var/log/httpd/error_log|" \
|
|
cvsdist |
3cbd43b |
-e "s|/usr/local/apache2/logs/access_log|/var/log/httpd/access_log|" \
|
|
|
c128570 |
-e "s|/usr/local/apache2/logs/httpd.pid|/run/httpd/httpd.pid|" \
|
|
cvsdist |
3cbd43b |
-e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \
|
|
cvsdist |
3cbd43b |
> $RPM_BUILD_ROOT%{_mandir}/man8/httpd.8
|
|
cvsdist |
3cbd43b |
|
|
|
48593e5 |
# Make ap_config_layout.h libdir-agnostic
|
|
|
48593e5 |
sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
|
|
|
48593e5 |
$RPM_BUILD_ROOT%{_includedir}/httpd/ap_config_layout.h
|
|
|
48593e5 |
|
|
|
e91269e |
# Fix path to instdso in special.mk
|
|
|
e91269e |
sed -i '/instdso/s,top_srcdir,top_builddir,' \
|
|
|
e91269e |
$RPM_BUILD_ROOT%{_libdir}/httpd/build/special.mk
|
|
|
e91269e |
|
|
cvsdist |
f8e1fe3 |
# Remove unpackaged files
|
|
|
9d402ca |
rm -vf \
|
|
|
9d402ca |
$RPM_BUILD_ROOT%{_libdir}/*.exp \
|
|
cvsdist |
f8e1fe3 |
$RPM_BUILD_ROOT/etc/httpd/conf/mime.types \
|
|
cvsdist |
f8e1fe3 |
$RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.exp \
|
|
cvsdist |
2d6a2e5 |
$RPM_BUILD_ROOT%{_libdir}/httpd/build/config.nice \
|
|
|
2c79341 |
$RPM_BUILD_ROOT%{_bindir}/{ap?-config,dbmmanage} \
|
|
|
2c79341 |
$RPM_BUILD_ROOT%{_sbindir}/{checkgid,envvars*} \
|
|
cvsdist |
f8e1fe3 |
$RPM_BUILD_ROOT%{contentdir}/htdocs/* \
|
|
cvsdist |
6356941 |
$RPM_BUILD_ROOT%{_mandir}/man1/dbmmanage.* \
|
|
cvsdist |
6356941 |
$RPM_BUILD_ROOT%{contentdir}/cgi-bin/*
|
|
cvsdist |
f8e1fe3 |
|
|
|
96e0b33 |
rm -rf $RPM_BUILD_ROOT/etc/httpd/conf/{original,extra}
|
|
|
96e0b33 |
|
|
|
fa66d3e |
%pre filesystem
|
|
|
0f2de0f |
getent group apache >/dev/null || groupadd -g 48 -r apache
|
|
|
0f2de0f |
getent passwd apache >/dev/null || \
|
|
|
0f2de0f |
useradd -r -u 48 -g apache -s /sbin/nologin \
|
|
|
0f2de0f |
-d %{contentdir} -c "Apache" apache
|
|
|
0f2de0f |
exit 0
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%post
|
|
|
572a5df |
%systemd_post httpd.service htcacheclean.service httpd.socket
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%preun
|
|
|
572a5df |
%systemd_preun httpd.service htcacheclean.service httpd.socket
|
|
cvsdist |
3cbd43b |
|
|
|
ce009f9 |
%postun
|
|
|
db62736 |
%systemd_postun httpd.service htcacheclean.service httpd.socket
|
|
|
ce009f9 |
|
|
|
ce009f9 |
# Trigger for conversion from SysV, per guidelines at:
|
|
|
ce009f9 |
# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
|
|
|
ce009f9 |
%triggerun -- httpd < 2.2.21-5
|
|
|
ce009f9 |
# Save the current service runlevel info
|
|
|
ce009f9 |
# User must manually run systemd-sysv-convert --apply httpd
|
|
|
ce009f9 |
# to migrate them to systemd targets
|
|
|
ce009f9 |
/usr/bin/systemd-sysv-convert --save httpd.service >/dev/null 2>&1 ||:
|
|
|
ce009f9 |
|
|
|
ce009f9 |
# Run these because the SysV package being removed won't do them
|
|
|
ce009f9 |
/sbin/chkconfig --del httpd >/dev/null 2>&1 || :
|
|
|
ce009f9 |
|
|
|
b2a4380 |
%posttrans
|
|
|
2953eae |
test -f /etc/sysconfig/httpd-disable-posttrans || \
|
|
|
23fb452 |
/bin/systemctl try-restart --no-block httpd.service htcacheclean.service >/dev/null 2>&1 || :
|
|
|
b2a4380 |
|
|
cvsdist |
d48e904 |
%check
|
|
|
10963a8 |
make -C server exports.o
|
|
|
10963a8 |
nm --defined httpd > exports-actual.list
|
|
|
10963a8 |
set +x
|
|
|
10963a8 |
rv=0
|
|
|
10963a8 |
nm --defined-only server/exports.o | \
|
|
|
10963a8 |
sed -n '/ap_hack_/{s/.* ap_hack_//;/^ap[ru]/d;p;}' | \
|
|
|
10963a8 |
while read sym; do
|
|
|
10963a8 |
if ! grep -q " "$sym\$ exports-actual.list; then
|
|
|
10963a8 |
echo ERROR: Symbol $sym missing in httpd exports
|
|
|
10963a8 |
rv=1
|
|
|
10963a8 |
fi
|
|
|
10963a8 |
done
|
|
|
10963a8 |
if [ $rv -eq 0 ]; then
|
|
|
10963a8 |
echo PASS: Symbol export list verified.
|
|
|
10963a8 |
fi
|
|
cvsdist |
d48e904 |
# Check the built modules are all PIC
|
|
cvsdist |
d48e904 |
if readelf -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.so | grep TEXTREL; then
|
|
|
10963a8 |
echo FAIL: Modules contain non-relocatable code
|
|
|
10963a8 |
rv=1
|
|
|
10963a8 |
else
|
|
|
10963a8 |
echo PASS: No non-relocatable code in module builds
|
|
cvsdist |
d48e904 |
fi
|
|
|
91a2788 |
# Ensure every mod_* that's built is loaded.
|
|
|
91a2788 |
for f in $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.so; do
|
|
|
91a2788 |
m=${f##*/}
|
|
|
91a2788 |
if ! grep -q $m $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/*.conf; then
|
|
|
10963a8 |
echo FAIL: Module $m not configured. Disable it, or load it.
|
|
|
53f8164 |
rv=1
|
|
|
10963a8 |
else
|
|
|
10963a8 |
echo PASS: Module $m is configured and loaded.
|
|
|
53f8164 |
fi
|
|
|
53f8164 |
done
|
|
|
53f8164 |
# Ensure every loaded mod_* is actually built
|
|
|
53f8164 |
mods=`grep -h ^LoadModule $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/*.conf | sed 's,.*modules/,,'`
|
|
|
53f8164 |
for m in $mods; do
|
|
|
53f8164 |
f=$RPM_BUILD_ROOT%{_libdir}/httpd/modules/${m}
|
|
|
53f8164 |
if ! test -x $f; then
|
|
|
10963a8 |
echo FAIL: Module $m is configured but not built.
|
|
|
53f8164 |
rv=1
|
|
|
10963a8 |
else
|
|
|
10963a8 |
echo PASS: Loaded module $m is installed.
|
|
|
91a2788 |
fi
|
|
|
91a2788 |
done
|
|
|
33e6dce |
set -x
|
|
|
53f8164 |
exit $rv
|
|
cvsdist |
d48e904 |
|
|
cvsdist |
3cbd43b |
%files
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
d01424a |
%doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
|
|
|
c540f64 |
%doc docs/conf/extra/*.conf
|
|
|
7a7c76f |
%doc instance.conf server-status.conf
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%{_sysconfdir}/httpd/modules
|
|
cvsdist |
3cbd43b |
%{_sysconfdir}/httpd/logs
|
|
|
c7d07f3 |
%{_sysconfdir}/httpd/state
|
|
cvsdist |
3cbd43b |
%{_sysconfdir}/httpd/run
|
|
cvsdist |
3cbd43b |
%dir %{_sysconfdir}/httpd/conf
|
|
|
a980810 |
%config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf
|
|
cvsdist |
3cbd43b |
%config(noreplace) %{_sysconfdir}/httpd/conf/magic
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
d48e904 |
%config(noreplace) %{_sysconfdir}/logrotate.d/httpd
|
|
cvsdist |
3cbd43b |
|
|
|
c540f64 |
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
|
|
|
c540f64 |
%exclude %{_sysconfdir}/httpd/conf.d/ssl.conf
|
|
|
c540f64 |
%exclude %{_sysconfdir}/httpd/conf.d/manual.conf
|
|
|
3a44ff7 |
|
|
|
3a44ff7 |
%dir %{_sysconfdir}/httpd/conf.modules.d
|
|
|
63d5e3d |
%{_sysconfdir}/httpd/conf.modules.d/README
|
|
|
3a44ff7 |
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/*.conf
|
|
|
3a44ff7 |
%exclude %{_sysconfdir}/httpd/conf.modules.d/00-ssl.conf
|
|
|
415f76c |
%exclude %{_sysconfdir}/httpd/conf.modules.d/00-proxyhtml.conf
|
|
|
415f76c |
%exclude %{_sysconfdir}/httpd/conf.modules.d/01-ldap.conf
|
|
|
cb59f09 |
%exclude %{_sysconfdir}/httpd/conf.modules.d/01-session.conf
|
|
cvsdist |
3cbd43b |
|
|
|
06cde88 |
%config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean
|
|
|
06cde88 |
%ghost %{_sysconfdir}/sysconfig/httpd
|
|
|
c128570 |
%{_prefix}/lib/tmpfiles.d/httpd.conf
|
|
cvsdist |
e9bfb00 |
|
|
|
99146f2 |
%dir %{_libexecdir}/initscripts/legacy-actions/httpd
|
|
|
99146f2 |
%{_libexecdir}/initscripts/legacy-actions/httpd/*
|
|
|
99146f2 |
|
|
|
96e0b33 |
%{_sbindir}/ht*
|
|
|
3a44ff7 |
%{_sbindir}/fcgistarter
|
|
cvsdist |
3cbd43b |
%{_sbindir}/apachectl
|
|
cvsdist |
3cbd43b |
%{_sbindir}/rotatelogs
|
|
|
22bfb45 |
%caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%dir %{_libdir}/httpd
|
|
cvsdist |
3cbd43b |
%dir %{_libdir}/httpd/modules
|
|
cvsdist |
6356941 |
%{_libdir}/httpd/modules/mod*.so
|
|
|
d70345a |
%exclude %{_libdir}/httpd/modules/mod_auth_form.so
|
|
cvsdist |
6356941 |
%exclude %{_libdir}/httpd/modules/mod_ssl.so
|
|
|
415f76c |
%exclude %{_libdir}/httpd/modules/mod_*ldap.so
|
|
|
415f76c |
%exclude %{_libdir}/httpd/modules/mod_proxy_html.so
|
|
|
415f76c |
%exclude %{_libdir}/httpd/modules/mod_xml2enc.so
|
|
|
d70345a |
%exclude %{_libdir}/httpd/modules/mod_session*.so
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
d5ddf48 |
%dir %{contentdir}/error
|
|
cvsdist |
d5ddf48 |
%dir %{contentdir}/error/include
|
|
|
3a44ff7 |
%dir %{contentdir}/noindex
|
|
|
7a7c76f |
%dir %{contentdir}/server-status
|
|
cvsdist |
3cbd43b |
%{contentdir}/icons/*
|
|
cvsdist |
d5ddf48 |
%{contentdir}/error/README
|
|
|
3a44ff7 |
%{contentdir}/error/*.var
|
|
|
3a44ff7 |
%{contentdir}/error/include/*.html
|
|
|
3a44ff7 |
%{contentdir}/noindex/index.html
|
|
|
7a7c76f |
%{contentdir}/server-status/*
|
|
|
3a44ff7 |
|
|
|
c128570 |
%attr(0710,root,apache) %dir /run/httpd
|
|
|
55e18b4 |
%attr(0700,apache,apache) %dir /run/httpd/htcacheclean
|
|
cvsdist |
3cbd43b |
%attr(0700,root,root) %dir %{_localstatedir}/log/httpd
|
|
|
c7d07f3 |
%attr(0700,apache,apache) %dir %{_localstatedir}/lib/httpd
|
|
|
c70a7c1 |
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd
|
|
|
c70a7c1 |
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/proxy
|
|
cvsdist |
3cbd43b |
|
|
|
8499915 |
%{_mandir}/man8/*
|
|
|
36d7a68 |
%{_mandir}/man5/*
|
|
|
6a77761 |
%exclude %{_mandir}/man8/httpd-init.*
|
|
cvsdist |
3cbd43b |
|
|
|
180ad32 |
%{_unitdir}/httpd.service
|
|
|
5860daa |
%{_unitdir}/httpd@.service
|
|
|
180ad32 |
%{_unitdir}/htcacheclean.service
|
|
|
572a5df |
%{_unitdir}/*.socket
|
|
|
bd3365e |
|
|
|
fa66d3e |
%files filesystem
|
|
|
fa66d3e |
%dir %{_sysconfdir}/httpd
|
|
|
fa66d3e |
%dir %{_sysconfdir}/httpd/conf.d
|
|
|
fa66d3e |
%{_sysconfdir}/httpd/conf.d/README
|
|
|
fa66d3e |
%dir %{docroot}
|
|
|
fa66d3e |
%dir %{docroot}/cgi-bin
|
|
|
fa66d3e |
%dir %{docroot}/html
|
|
|
fa66d3e |
%dir %{contentdir}
|
|
|
fa66d3e |
%dir %{contentdir}/icons
|
|
|
e218515 |
%attr(755,root,root) %dir %{_unitdir}/httpd.service.d
|
|
|
e218515 |
%attr(755,root,root) %dir %{_unitdir}/httpd.socket.d
|
|
|
fa66d3e |
|
|
|
8499915 |
%files tools
|
|
|
8499915 |
%{_bindir}/*
|
|
|
8499915 |
%{_mandir}/man1/*
|
|
|
3383664 |
%doc LICENSE NOTICE
|
|
|
3a44ff7 |
%exclude %{_bindir}/apxs
|
|
|
6d8684f |
%exclude %{_mandir}/man1/apxs.1*
|
|
|
8499915 |
|
|
cvsdist |
3cbd43b |
%files manual
|
|
cvsdist |
3cbd43b |
%{contentdir}/manual
|
|
|
3a44ff7 |
%config(noreplace) %{_sysconfdir}/httpd/conf.d/manual.conf
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%files -n mod_ssl
|
|
cvsdist |
3cbd43b |
%{_libdir}/httpd/modules/mod_ssl.so
|
|
|
3a44ff7 |
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/00-ssl.conf
|
|
cvsdist |
3cbd43b |
%config(noreplace) %{_sysconfdir}/httpd/conf.d/ssl.conf
|
|
|
c70a7c1 |
%attr(0700,apache,root) %dir %{_localstatedir}/cache/httpd/ssl
|
|
|
180ad32 |
%{_unitdir}/httpd-init.service
|
|
Jan Kaluza |
2673a43 |
%{_libexecdir}/httpd-ssl-pass-dialog
|
|
|
180ad32 |
%{_libexecdir}/httpd-ssl-gencerts
|
|
|
572a5df |
%{_unitdir}/httpd.socket.d/10-listen443.conf
|
|
|
6a77761 |
%{_mandir}/man8/httpd-init.*
|
|
cvsdist |
3cbd43b |
|
|
|
415f76c |
%files -n mod_proxy_html
|
|
|
415f76c |
%{_libdir}/httpd/modules/mod_proxy_html.so
|
|
|
415f76c |
%{_libdir}/httpd/modules/mod_xml2enc.so
|
|
|
415f76c |
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/00-proxyhtml.conf
|
|
|
415f76c |
|
|
|
415f76c |
%files -n mod_ldap
|
|
|
415f76c |
%{_libdir}/httpd/modules/mod_*ldap.so
|
|
|
415f76c |
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/01-ldap.conf
|
|
|
415f76c |
|
|
|
d70345a |
%files -n mod_session
|
|
|
d70345a |
%{_libdir}/httpd/modules/mod_session*.so
|
|
|
ef6affd |
%{_libdir}/httpd/modules/mod_auth_form.so
|
|
|
d70345a |
%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/01-session.conf
|
|
|
d70345a |
|
|
cvsdist |
3cbd43b |
%files devel
|
|
cvsdist |
3cbd43b |
%{_includedir}/httpd
|
|
|
3a44ff7 |
%{_bindir}/apxs
|
|
|
61679dd |
%{_mandir}/man1/apxs.1*
|
|
cvsdist |
3cbd43b |
%dir %{_libdir}/httpd/build
|
|
cvsdist |
3cbd43b |
%{_libdir}/httpd/build/*.mk
|
|
|
96e0b33 |
%{_libdir}/httpd/build/*.sh
|
|
|
6228c46 |
%{_rpmconfigdir}/macros.d/macros.httpd
|
|
cvsdist |
3cbd43b |
|
|
cvsdist |
3cbd43b |
%changelog
|
|
|
f1280d5 |
* Thu Oct 3 2019 Joe Orton <jorton@redhat.com> - 2.4.41-5
|
|
|
f1280d5 |
- mod_proxy_balancer: fix balancer-manager XSRF check (PR 63688)
|
|
|
f1280d5 |
|
|
|
5b6bedc |
* Wed Oct 2 2019 Joe Orton <jorton@redhat.com> - 2.4.41-4
|
|
|
5b6bedc |
- mod_cgid: possible stdout timeout handling fix (#1757683)
|
|
|
5b6bedc |
|
|
|
a4638c1 |
* Wed Sep 25 2019 Joe Orton <jorton@redhat.com> - 2.4.41-3
|
|
|
a4638c1 |
- mod_ssl: restore dependency on /usr/bin/hostname (#1135118)
|
|
|
a4638c1 |
|
|
|
8c08392 |
* Thu Sep 19 2019 Stephen Gallagher <sgallagh@redhat.com> - 2.4.41-2
|
|
|
8c08392 |
- Use testpage from system-logos-httpd for proper branding
|
|
|
8c08392 |
|
|
|
1578b45 |
* Thu Aug 15 2019 Joe Orton <jorton@redhat.com> - 2.4.41-1
|
|
|
1578b45 |
- update to 2.4.41
|
|
|
1578b45 |
|
|
|
84b529b |
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.39-13
|
|
|
84b529b |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
84b529b |
|
|
|
5586dfd |
* Tue Jul 23 2019 Joe Orton <jorton@redhat.com> - 2.4.39-12
|
|
|
5586dfd |
- drop /var/lib/dav directory, since mod_dav_fs uses statedir
|
|
|
5586dfd |
|
|
|
2993aea |
* Wed Jul 17 2019 Joe Orton <jorton@redhat.com> - 2.4.39-11
|
|
|
2993aea |
- mod_cgid: use fd passing to fix script stderr handling (#1591157)
|
|
|
2993aea |
|
|
|
2ae67b3 |
* Mon Jul 8 2019 Joe Orton <jorton@redhat.com> - 2.4.39-10
|
|
|
2ae67b3 |
- htpasswd: add SHA-256/512 support
|
|
|
7ee1cb5 |
- apachectl: restore -V/-v/-t support (#1727434)
|
|
|
2ae67b3 |
|
|
|
b18b77b |
* Fri Jun 21 2019 Joe Orton <jorton@redhat.com> - 2.4.39-9
|
|
|
b18b77b |
- create instance-specific StateDir in httpd@.service, instance.conf
|
|
|
b18b77b |
|
|
|
10963a8 |
* Thu Jun 20 2019 Joe Orton <jorton@redhat.com> - 2.4.39-8
|
|
|
10963a8 |
- remove superfluous ap_hack_ symbols from httpd binary
|
|
|
10963a8 |
- more verbose %%check section
|
|
|
10963a8 |
|
|
|
16a6314 |
* Thu Jun 13 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-7
|
|
|
e945a60 |
- remove bundled mod_md module
|
|
|
e945a60 |
|
|
|
720c6f3 |
* Thu Jun 13 2019 Joe Orton <jorton@redhat.com> - 2.4.39-6
|
|
|
720c6f3 |
- mod_ssl: fix "httpd -L" (etc) before httpd-init.service runs
|
|
|
720c6f3 |
|
|
|
67d32a7 |
* Wed Jun 12 2019 Joe Orton <jorton@redhat.com> - 2.4.39-5
|
|
|
67d32a7 |
- fixes for StateDir directive (upstream r1857731, r1857731)
|
|
|
67d32a7 |
|
|
|
bc95575 |
* Thu May 02 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-4
|
|
|
bc95575 |
- httpd dependency on initscripts is unspecified (#1705188)
|
|
|
bc95575 |
|
|
|
3aa63a9 |
* Tue Apr 9 2019 Joe Orton <jorton@redhat.com> - 2.4.39-3
|
|
|
3aa63a9 |
- fix statedir symlink to point to /var/lib/httpd (#1697662)
|
|
|
fc24275 |
- mod_reqtimeout: fix default values regression (PR 63325)
|
|
|
3aa63a9 |
|
|
|
c6cd42a |
* Tue Apr 02 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-2
|
|
|
c30e102 |
- update to 2.4.39
|
|
|
c30e102 |
|
|
|
b86b48c |
* Thu Feb 28 2019 Joe Orton <jorton@redhat.com> - 2.4.38-6
|
|
|
b86b48c |
- apachectl: cleanup and replace script wholesale (#1641237)
|
|
|
b86b48c |
* drop "apachectl fullstatus" support
|
|
|
b86b48c |
* run systemctl with --no-pager option
|
|
|
b86b48c |
* implement graceful&graceful-stop by signal directly
|
|
|
b86b48c |
- run "httpd -t" from legacy action script
|
|
|
b86b48c |
|
|
|
9e462af |
* Tue Feb 05 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.38-5
|
|
|
9e462af |
- segmentation fault fix (FIPS)
|
|
|
9e462af |
|
|
|
80cf417 |
* Tue Feb 5 2019 Joe Orton <jorton@redhat.com> - 2.4.38-4
|
|
|
80cf417 |
- use serverroot-relative statedir, rundir by default
|
|
|
80cf417 |
|
|
|
887d8d1 |
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.38-3
|
|
|
887d8d1 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
|
887d8d1 |
|
|
|
584830e |
* Wed Jan 23 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.38-2
|
|
|
1810bd5 |
- new version 2.4.38 (#1668125)
|
|
|
1810bd5 |
|
|
|
ccaa54f |
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 2.4.37-6
|
|
|
ccaa54f |
- Rebuilt for libcrypt.so.2 (#1666033)
|
|
|
ccaa54f |
|
|
|
affd30d |
* Thu Nov 22 2018 Luboš Uhliarik <luhliari@redhat.com> - 2.4.37-5
|
|
|
affd30d |
- Resolves: #1652678 - TLS connection allowed while all protocols are forbidden
|
|
|
affd30d |
|
|
|
36d7a68 |
* Thu Nov 8 2018 Joe Orton <jorton@redhat.com> - 2.4.37-4
|
|
|
36d7a68 |
- add httpd.conf(5) (#1611361)
|
|
|
36d7a68 |
|
|
|
2fa14ed |
* Wed Nov 07 2018 Luboš Uhliarik <luhliari@redhat.com> - 2.4.37-3
|
|
|
2fa14ed |
- Resolves: #1647241 - fix apachectl script
|
|
|
2fa14ed |
|
|
|
920857b |
* Wed Oct 31 2018 Joe Orton <jorton@redhat.com> - 2.4.37-2
|
|
|
920857b |
- add DefaultStateDir/ap_state_dir_relative()
|
|
|
920857b |
- mod_dav_fs: use state dir for default DAVLockDB
|
|
|
920857b |
- mod_md: use state dir for default MDStoreDir
|
|
|
920857b |
|
|
|
e869b8b |
* Wed Oct 31 2018 Joe Orton <jorton@redhat.com> - 2.4.37-1
|
|
|
e869b8b |
- update to 2.4.37
|
|
|
e869b8b |
|
|
|
c72daf6 |
* Wed Oct 31 2018 Joe Orton <jorton@redhat.com> - 2.4.34-11
|
|
|
c72daf6 |
- add htcacheclean.service(8) man page
|
|
|
c72daf6 |
|
|
|
f201a4e |
* Fri Sep 28 2018 Joe Orton <jorton@redhat.com> - 2.4.34-10
|
|
|
f201a4e |
- apachectl: don't read /etc/sysconfig/httpd
|
|
|
f201a4e |
|
|
|
1f748ac |
* Tue Sep 25 2018 Joe Orton <jorton@redhat.com> - 2.4.34-9
|
|
|
1f748ac |
- fix build if OpenSSL built w/o SSLv3 support
|
|
|
1f748ac |
|
|
|
e6f5630 |
* Fri Sep 21 2018 Joe Orton <jorton@redhat.com> - 2.4.34-8
|
|
|
e6f5630 |
- comment-out SSLProtocol, SSLProxyProtocol from ssl.conf in
|
|
|
e6f5630 |
default configuration; now follow OpenSSL system default (#1468322)
|
|
|
e6f5630 |
|
|
|
8643397 |
* Fri Sep 21 2018 Joe Orton <jorton@redhat.com> - 2.4.34-7
|
|
|
8643397 |
- mod_ssl: follow OpenSSL protocol defaults if SSLProtocol
|
|
|
8643397 |
is not configured (Rob Crittenden, #1618371)
|
|
|
8643397 |
|
|
|
5bf30dc |
* Tue Aug 28 2018 Luboš Uhliarik <luhliari@redhat.com> - 2.4.34-6
|
|
|
5bf30dc |
- mod_ssl: enable SSLv3 and change behavior of "SSLProtocol All"
|
|
|
5bf30dc |
configuration (#1624777)
|
|
|
5bf30dc |
|
|
|
b52ebeb |
* Tue Aug 21 2018 Joe Orton <jorton@redhat.com> - 2.4.34-5
|
|
|
b52ebeb |
- mod_ssl: further TLSv1.3 fix (#1619389)
|
|
|
b52ebeb |
|
|
|
2f9bc45 |
* Mon Aug 13 2018 Joe Orton <jorton@redhat.com> - 2.4.34-4
|
|
|
2f9bc45 |
- mod_ssl: backport TLSv1.3 support changes from upstream (#1615059)
|
|
|
2f9bc45 |
|
|
|
e7a848a |
* Fri Jul 20 2018 Joe Orton <jorton@redhat.com> - 2.4.34-3
|
|
|
e7a848a |
- mod_ssl: fix OCSP regression (upstream r1555631)
|
|
|
e7a848a |
|
|
|
71609fa |
* Wed Jul 18 2018 Joe Orton <jorton@redhat.com> - 2.4.34-2
|
|
|
71609fa |
- update Obsoletes for mod_proxy_uswgi (#1599113)
|
|
|
71609fa |
|
|
|
5072c65 |
* Wed Jul 18 2018 Joe Orton <jorton@redhat.com> - 2.4.34-1
|
|
|
5072c65 |
- update to 2.4.34 (#1601160)
|
|
|
5072c65 |
|
|
|
7a7c76f |
* Mon Jul 16 2018 Joe Orton <jorton@redhat.com> - 2.4.33-10
|
|
|
23fb452 |
- don't block on service try-restart in posttrans scriptlet
|
|
|
7a7c76f |
- add Lua-based /server-status example page to docs
|
|
|
6fd3216 |
- obsoletes: and provides: for mod_proxy_uswgi (#1599113)
|
|
|
7a7c76f |
|
|
|
6892095 |
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.33-9
|
|
|
6892095 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
6892095 |
|
|
|
8ab39c8 |
* Fri Jul 6 2018 Joe Orton <jorton@redhat.com> - 2.4.33-8
|
|
|
8ab39c8 |
- add per-request memory leak fix (upstream r1833014)
|
|
|
8ab39c8 |
|
|
|
1d78fa4 |
* Fri Jul 6 2018 Joe Orton <jorton@redhat.com> - 2.4.33-7
|
|
|
1d78fa4 |
- mod_ssl: add PKCS#11 cert/key support (Anderson Sasaki)
|
|
|
1d78fa4 |
|
|
|
3778b45 |
* Tue Jun 12 2018 Joe Orton <jorton@redhat.com> - 2.4.33-6
|
|
|
3778b45 |
- mod_systemd: show bound ports in status and log to journal
|
|
|
3778b45 |
at startup.
|
|
|
3778b45 |
|
|
|
5860daa |
* Thu Apr 19 2018 Joe Orton <jorton@redhat.com> - 2.4.33-5
|
|
|
5860daa |
- add httpd@.service; update httpd.service(8) and add new stub
|
|
|
5860daa |
|
|
|
dbbe3f2 |
* Mon Apr 16 2018 Joe Orton <jorton@redhat.com> - 2.4.33-4
|
|
|
dbbe3f2 |
- mod_md: change hard-coded default MdStoreDir to state/md (#1563846)
|
|
|
dbbe3f2 |
|
|
|
616eacc |
* Thu Apr 12 2018 Joe Orton <jorton@redhat.com> - 2.4.33-3
|
|
|
616eacc |
- mod_ssl: drop implicit 'SSLEngine on' for vhost w/o certs (#1564537)
|
|
|
616eacc |
|
|
|
cb3c26b |
* Fri Mar 30 2018 Adam Williamson <awilliam@redhat.com> - 2.4.33-2
|
|
|
cb3c26b |
- Exclude mod_md config file from main package (#1562413)
|
|
|
cb3c26b |
|
|
|
c7d07f3 |
* Wed Mar 28 2018 Joe Orton <jorton@redhat.com> - 2.4.33-1
|
|
|
c7d07f3 |
- rebase to 2.4.33 (#1560174)
|
|
|
c7d07f3 |
- add mod_md subpackage; load mod_proxy_uwsgi by default
|
|
|
c7d07f3 |
|
|
|
c144c0a |
* Mon Mar 05 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.29-8
|
|
|
c144c0a |
- Rebuilt with brotli 1.0.3
|
|
|
c144c0a |
|
|
|
4af7d39 |
* Mon Feb 26 2018 Joe Orton <jorton@redhat.com> - 2.4.29-7
|
|
|
4af7d39 |
- simplify liblua detection in configure
|
|
|
4af7d39 |
|
|
|
cc87a07 |
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.29-6
|
|
|
cc87a07 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
cc87a07 |
|
|
|
2971e92 |
* Sat Jan 27 2018 Joe Orton <jorton@redhat.com> - 2.4.29-5
|
|
|
2971e92 |
- link mod_lua against -lcrypt (#1538992)
|
|
|
2971e92 |
|
|
|
2820bed |
* Fri Jan 26 2018 Paul Howarth <paul@city-fan.org> - 2.4.29-4
|
|
|
2820bed |
- Rebuild with updated flags to work around compiler issues on i686
|
|
|
2820bed |
(#1538648, #1538693)
|
|
|
2820bed |
|
|
|
b94d820 |
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 2.4.29-3
|
|
|
b94d820 |
- Rebuilt for switch to libxcrypt
|
|
|
b94d820 |
|
|
|
95a0c95 |
* Thu Nov 23 2017 Joe Orton <jorton@redhat.com> - 2.4.29-2
|
|
|
95a0c95 |
- build and load mod_brotli
|
|
|
95a0c95 |
|
|
|
082f353 |
* Wed Oct 25 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.29-1
|
|
|
082f353 |
- new version 2.4.29
|
|
|
082f353 |
|
|
|
596b5fc |
* Tue Oct 10 2017 Joe Orton <jorton@redhat.com> - 2.4.28-3
|
|
|
596b5fc |
- drop obsolete Obsoletes
|
|
|
596b5fc |
- update docs, Summary
|
|
|
596b5fc |
- trim %%changelog
|
|
|
596b5fc |
|
|
|
6ebb5a2 |
* Tue Oct 10 2017 Patrick Uiterwijk <patrick@puiterwijk.org> - 2.4.28-2
|
|
|
6ebb5a2 |
- Backport patch for fixing ticket key usage
|
|
|
6ebb5a2 |
|
|
|
01bcbc5 |
* Fri Oct 06 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.28-1
|
|
|
01bcbc5 |
- new version 2.4.28
|
|
|
01bcbc5 |
|
|
|
6d96e6a |
* Tue Oct 3 2017 Joe Orton <jorton@redhat.com> - 2.4.27-14
|
|
|
6d96e6a |
- add notes on enabling httpd_graceful_shutdown boolean for prefork
|
|
|
6d96e6a |
|
|
|
d31ea66 |
* Fri Sep 22 2017 Joe Orton <jorton@redhat.com> - 2.4.27-13
|
|
|
d31ea66 |
- drop Requires(post) for mod_ssl
|
|
|
d31ea66 |
|
|
|
962c800 |
* Fri Sep 22 2017 Joe Orton <jorton@redhat.com> - 2.4.27-12
|
|
|
962c800 |
- better error handling in httpd-ssl-gencerts (#1494556)
|
|
|
962c800 |
|
|
|
d614e8a |
* Thu Sep 21 2017 Stephen Gallagher <sgallagh@redhat.com> - 2.4.27-11
|
|
|
d614e8a |
- Require sscg 2.2.0 for creating service and CA certificates together
|
|
|
d614e8a |
|
|
Jeroen van Meeuwen (Ergo Project) |
10a8779 |
* Thu Sep 21 2017 Jeroen van Meeuwen <kanarip@fedoraproject.org> - 2.4.27-10
|
|
Jeroen van Meeuwen (Ergo Project) |
10a8779 |
- Address CVE-2017-9798 by applying patch from upstream (#1490344)
|
|
Jeroen van Meeuwen (Ergo Project) |
10a8779 |
|
|
|
6a77761 |
* Thu Sep 21 2017 Joe Orton <jorton@redhat.com> - 2.4.27-9
|
|
|
6a77761 |
- use sscg defaults; append CA cert to generated cert
|
|
|
6a77761 |
- document httpd-init.service in httpd-init.service(8)
|
|
|
6a77761 |
|
|
|
180ad32 |
* Wed Sep 20 2017 Stephen Gallagher <sgallagh@redhat.com> - 2.4.27-8.1
|
|
|
596b5fc |
- Generate SSL certificates on service start, not %%posttrans
|
|
|
180ad32 |
|
|
|
a7a8838 |
* Tue Sep 19 2017 Joe Orton <jorton@redhat.com> - 2.4.27-8
|
|
|
a7a8838 |
- move httpd.service.d, httpd.socket.d dirs to -filesystem
|
|
|
a7a8838 |
|
|
|
b022e3b |
* Wed Sep 13 2017 Joe Orton <jorton@redhat.com> - 2.4.27-7
|
|
|
b022e3b |
- add new content-length filter (upstream PR 61222)
|
|
|
b022e3b |
|
|
|
da66bed |
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.27-6
|
|
|
da66bed |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
|
da66bed |
|
|
|
bd989fa |
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.27-5
|
|
|
bd989fa |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
bd989fa |
|
|
|
adcaa34 |
* Tue Jul 18 2017 Joe Orton <jorton@redhat.com> - 2.4.27-4
|
|
|
adcaa34 |
- update mod_systemd (r1802251)
|
|
|
adcaa34 |
|
|
|
e9d2120 |
* Mon Jul 17 2017 Joe Orton <jorton@redhat.com> - 2.4.27-3
|
|
|
e9d2120 |
- switch to event by default for Fedora 27 and later (#1471708)
|
|
|
e9d2120 |
|
|
|
06cde88 |
* Wed Jul 12 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.27-2
|
|
|
06cde88 |
- Resolves: #1469959 - httpd update cleaned out /etc/sysconfig
|
|
|
06cde88 |
|
|
|
c6fd353 |
* Mon Jul 10 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.27-1
|
|
|
c6fd353 |
- new version 2.4.27
|
|
|
c6fd353 |
|
|
|
1205ddb |
* Fri Jun 30 2017 Joe Orton <jorton@redhat.com> - 2.4.26-2
|
|
|
1205ddb |
- mod_proxy_fcgi: fix further regressions (PR 61202)
|
|
|
1205ddb |
|
|
|
fd6452a |
* Mon Jun 19 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.26-1
|
|
|
fd6452a |
- new version 2.4.26
|
|
|
fd6452a |
|
|
|
fce414a |
* Mon Jun 5 2017 Joe Orton <jorton@redhat.com> - 2.4.25-10
|
|
|
fce414a |
- move unit man pages to section 8, add as Documentation= in units
|
|
|
fce414a |
|
|
|
710b63c |
* Fri May 19 2017 Joe Orton <jorton@redhat.com> - 2.4.25-9
|
|
|
710b63c |
- add httpd.service(5) and httpd.socket(5) man pages
|
|
|
710b63c |
|
|
|
dbcbdf8 |
* Tue May 16 2017 Joe Orton <jorton@redhat.com> - 2.4.25-8
|
|
|
dbcbdf8 |
- require mod_http2, now packaged separately
|
|
|
dbcbdf8 |
|
|
|
c58fda3 |
* Wed Mar 29 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-7
|
|
|
c58fda3 |
- Resolves: #1397243 - Backport Apache Bug 53098 - mod_proxy_ajp:
|
|
|
c58fda3 |
patch to set worker secret passed to tomcat
|
|
|
c58fda3 |
|
|
|
c79ba20 |
* Tue Mar 28 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-6
|
|
|
c79ba20 |
- Resolves: #1434916 - httpd.service: Failed with result timeout
|
|
|
c79ba20 |
|
|
|
59afc15 |
* Fri Mar 24 2017 Joe Orton <jorton@redhat.com> - 2.4.25-5
|
|
|
59afc15 |
- link only httpd, not support/* against -lselinux -lsystemd
|
|
|
59afc15 |
|
|
|
65743a6 |
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.25-4
|
|
|
65743a6 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
|
65743a6 |
|
|
|
33e6dce |
* Thu Jan 12 2017 Joe Orton <jorton@redhat.com> - 2.4.25-3
|
|
|
33e6dce |
- mod_watchdog: restrict thread lifetime (#1410883)
|
|
|
33e6dce |
|
|
|
4e2c612 |
* Thu Dec 22 2016 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-2
|
|
|
4e2c612 |
- Resolves: #1358875 - require nghttp2 >= 1.5.0
|
|
|
4e2c612 |
|
|
|
ad0d0a1 |
* Thu Dec 22 2016 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-1
|
|
|
ad0d0a1 |
- new version 2.4.25
|
|
|
ad0d0a1 |
|
|
|
92e639b |
* Mon Dec 05 2016 Luboš Uhliarik <luhliari@redhat.com> - 2.4.23-7
|
|
|
92e639b |
- Resolves: #1401530 - CVE-2016-8740 httpd: Incomplete handling of
|
|
|
92e639b |
LimitRequestFields directive in mod_http2
|
|
|
92e639b |
|
|
|
0d708eb |
* Mon Nov 14 2016 Joe Orton <jorton@redhat.com> - 2.4.23-6
|
|
|
0d708eb |
- fix build with OpenSSL 1.1 (#1392900)
|
|
|
0d708eb |
- fix typos in ssl.conf (josef randinger, #1379407)
|
|
|
0d708eb |
|
|
|
70c651f |
* Wed Nov 2 2016 Joe Orton <jorton@redhat.com> - 2.4.23-5
|
|
|
70c651f |
- no longer package /etc/sysconfig/httpd
|
|
|
45529bc |
- synch ssl.conf with upstream
|
|
|
70c651f |
|
|
|
4a0435c |
* Mon Jul 18 2016 Joe Orton <jorton@redhat.com> - 2.4.23-4
|
|
|
4a0435c |
- add security fix for CVE-2016-5387
|
|
|
4a0435c |
|
|
|
17ef1b1 |
* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-3
|
|
|
17ef1b1 |
- load mod_watchdog by default (#1353582)
|
|
|
17ef1b1 |
|
|
|
53f8164 |
* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-2
|
|
|
53f8164 |
- restore build of mod_proxy_fdpass (#1325883)
|
|
|
53f8164 |
- improve check tests to catch configured-but-not-built modules
|
|
|
53f8164 |
|
|
|
a67a8d7 |
* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-1
|
|
|
a67a8d7 |
- update to 2.4.23 (#1325883, #1353203)
|
|
|
a67a8d7 |
- load mod_proxy_hcheck
|
|
|
a67a8d7 |
- recommend use of "systemctl edit" in httpd.service
|
|
|
a67a8d7 |
|
|
|
37b8259 |
* Thu Apr 7 2016 Joe Orton <jorton@redhat.com> - 2.4.18-6
|
|
|
37b8259 |
- have "apachectl graceful" start httpd if not running, per man page
|
|
|
37b8259 |
|
|
|
a4ba0cd |
* Wed Apr 6 2016 Joe Orton <jorton@redhat.com> - 2.4.18-5
|
|
|
a4ba0cd |
- use redirects for lang-specific /manual/ URLs
|
|
|
a4ba0cd |
|
|
|
e67ea8a |
* Fri Mar 18 2016 Joe Orton <jorton@redhat.com> - 2.4.18-4
|
|
|
e67ea8a |
- fix welcome page HTML validity (Ville Skyttä)
|
|
|
e67ea8a |
|
|
|
0f2de0f |
* Fri Mar 18 2016 Joe Orton <jorton@redhat.com> - 2.4.18-3
|
|
|
0f2de0f |
- remove httpd pre script (duplicate of httpd-filesystem's)
|
|
|
0f2de0f |
- in httpd-filesystem pre script, create group/user iff non-existent
|
|
|
0f2de0f |
|
|
|
1a66c1a |
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.18-2
|
|
|
1a66c1a |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
|
1a66c1a |
|
|
|
c791d40 |
* Mon Dec 14 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.18-1
|
|
|
c791d40 |
- update to new version 2.4.18
|
|
|
c791d40 |
|
|
|
47b967c |
* Wed Dec 9 2015 Joe Orton <jorton@redhat.com> - 2.4.17-4
|
|
|
47b967c |
- re-enable mod_asis due to popular demand (#1284315)
|
|
|
47b967c |
|
|
|
6abf69b |
* Mon Oct 26 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.17-3
|
|
|
6abf69b |
- fix crash when using -X argument (#1272234)
|
|
|
6abf69b |
|
|
|
c2c0377 |
* Wed Oct 14 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.17-2
|
|
|
c2c0377 |
- rebase socket activation patch to 2.4.17
|
|
|
c2c0377 |
|
|
|
91a2788 |
* Tue Oct 13 2015 Joe Orton <jorton@redhat.com> - 2.4.17-1
|
|
|
91a2788 |
- update to 2.4.17 (#1271224)
|
|
|
91a2788 |
- build, load mod_http2
|
|
|
91a2788 |
- don't build mod_asis, mod_file_cache
|
|
|
91a2788 |
- load mod_cache_socache, mod_proxy_wstunnel by default
|
|
|
91a2788 |
- check every built mod_* is configured
|
|
|
91a2788 |
- synch ssl.conf with upstream; disable SSLv3 by default
|
|
|
91a2788 |
|
|
|
1cdbc45 |
* Wed Jul 15 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.12-4
|
|
|
1cdbc45 |
- update to 2.4.16
|
|
|
1cdbc45 |
|
|
|
db205da |
* Tue Jul 7 2015 Joe Orton <jorton@redhat.com> - 2.4.12-3
|
|
|
db205da |
- mod_ssl: use "localhost" in the dummy SSL cert if len(FQDN) > 59 chars
|
|
|
db205da |
|
|
|
b274835 |
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.12-2
|
|
|
b274835 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
|
b274835 |
|
|
|
16a9524 |
* Fri Mar 27 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.12-1
|
|
|
16a9524 |
- update to 2.4.12
|
|
|
16a9524 |
|
|
|
571518a |
* Tue Mar 24 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-17
|
|
|
571518a |
- fix compilation with lua-5.3
|
|
|
571518a |
|
|
|
07b85b4 |
* Tue Mar 24 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-16
|
|
|
07b85b4 |
- remove filter for auto-provides of httpd modules, it is not needed since F20
|
|
|
07b85b4 |
|
|
|
af9996c |
* Wed Dec 17 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-15
|
|
|
af9996c |
- core: fix bypassing of mod_headers rules via chunked requests (CVE-2013-5704)
|
|
|
af9996c |
- mod_cache: fix NULL pointer dereference on empty Content-Type (CVE-2014-3581)
|
|
|
af9996c |
- mod_proxy_fcgi: fix a potential crash with long headers (CVE-2014-3583)
|
|
|
af9996c |
- mod_lua: fix handling of the Require line when a LuaAuthzProvider is used
|
|
|
af9996c |
in multiple Require directives with different arguments (CVE-2014-8109)
|
|
|
af9996c |
|
|
|
8c01244 |
* Tue Oct 14 2014 Joe Orton <jorton@redhat.com> - 2.4.10-14
|
|
|
8c01244 |
- require apr-util 1.5.x
|
|
|
8c01244 |
|
|
|
5d7dedd |
* Thu Sep 18 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-13
|
|
|
5d7dedd |
- use NoDelay and DeferAcceptSec in httpd.socket
|
|
|
5d7dedd |
|
|
|
46346fa |
* Mon Sep 08 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-12
|
|
|
46346fa |
- increase suexec minimum acceptable uid/gid to 1000 (#1136391)
|
|
|
46346fa |
|
|
|
b430bfe |
* Wed Sep 03 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-11
|
|
|
b430bfe |
- fix hostname requirement and conflict with openssl-libs
|
|
|
b430bfe |
|
|
|
3693038 |
* Mon Sep 01 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-10
|
|
|
3693038 |
- use KillMode=mixed in httpd.service (#1135122)
|
|
|
3693038 |
|
|
|
92ee9cf |
* Fri Aug 29 2014 Joe Orton <jorton@redhat.com> - 2.4.10-9
|
|
|
92ee9cf |
- set vstring based on /etc/os-release (Pat Riehecky, #1114539)
|
|
|
92ee9cf |
|
|
|
452da8d |
* Fri Aug 29 2014 Joe Orton <jorton@redhat.com> - 2.4.10-8
|
|
|
452da8d |
- pull in httpd-filesystem as Requires(pre) (#1128328)
|
|
|
793563a |
- fix cipher selection in default ssl.conf, depend on new OpenSSL (#1134348)
|
|
|
793563a |
- require hostname for mod_ssl post script (#1135118)
|
|
|
452da8d |
|
|
|
94399e0 |
* Fri Aug 22 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-7
|
|
|
94399e0 |
- mod_systemd: updated to the latest version
|
|
|
94399e0 |
- use -lsystemd instead of -lsystemd-daemon (#1125084)
|
|
|
94399e0 |
- fix possible crash in SIGINT handling (#958934)
|
|
|
94399e0 |
|
|
|
4475e3e |
* Thu Aug 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-6
|
|
|
4475e3e |
- mod_ssl: treat "SSLCipherSuite PROFILE=..." as special (#1109119)
|
|
|
4475e3e |
- switch default ssl.conf to use PROFILE=SYSTEM (#1109119)
|
|
|
4475e3e |
|
|
|
f65d1ef |
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.10-5
|
|
|
f65d1ef |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
|
f65d1ef |
|
|
|
5ee418c |
* Fri Aug 15 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-4
|
|
|
5ee418c |
- add /usr/bin/useradd dependency to -filesystem requires
|
|
|
5ee418c |
|
|
|
34169cb |
* Thu Aug 14 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-3
|
|
|
bb13a67 |
- fix creating apache user in pre script (#1128328)
|
|
|
bb13a67 |
|
|
|
b46475b |
* Thu Jul 31 2014 Joe Orton <jorton@redhat.com> - 2.4.10-2
|
|
|
b46475b |
- enable mod_request by default for mod_auth_form
|
|
|
b46475b |
- move disabled-by-default modules from 00-base.conf to 00-optional.conf
|
|
|
b46475b |
|
|
|
94c9674 |
* Mon Jul 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-1
|
|
|
94c9674 |
- update to 2.4.10
|
|
|
1fce54b |
- expand variables in docdir example configs
|
|
|
94c9674 |
|
|
|
572a5df |
* Tue Jul 08 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-8
|
|
|
572a5df |
- add support for systemd socket activation (#1111648)
|
|
|
572a5df |
|
|
|
63d5e3d |
* Mon Jul 07 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-7
|
|
|
63d5e3d |
- remove conf.modules.d from httpd-filesystem subpackage (#1081453)
|
|
|
63d5e3d |
|
|
|
fa66d3e |
* Mon Jul 07 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-6
|
|
|
fa66d3e |
- add httpd-filesystem subpackage (#1081453)
|
|
|
fa66d3e |
|
|
|
c0bdfa4 |
* Fri Jun 20 2014 Joe Orton <jorton@redhat.com> - 2.4.9-5
|
|
|
c0bdfa4 |
- mod_ssl: don't use the default OpenSSL cipher suite in ssl.conf (#1109119)
|
|
|
c0bdfa4 |
|
|
|
2d73447 |
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.9-4
|
|
|
2d73447 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
|
2d73447 |
|
|
|
5b3da1f |
* Fri Mar 28 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-3
|
|
|
5b3da1f |
- add support for SetHandler + proxy (#1078970)
|
|
|
5b3da1f |
|
|
|
6228c46 |
* Thu Mar 27 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-2
|
|
|
6228c46 |
- move macros from /etc/rpm to macros.d (#1074277)
|
|
|
6228c46 |
- remove unused patches
|
|
|
6228c46 |
|
|
|
9f6ae98 |
* Mon Mar 17 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-1
|
|
|
9f6ae98 |
- update to 2.4.9
|
|
|
9f6ae98 |
|
|
|
8efab6a |
* Fri Feb 28 2014 Joe Orton <jorton@redhat.com> - 2.4.7-6
|
|
|
8efab6a |
- use 2048-bit RSA key with SHA-256 signature in dummy certificate
|
|
|
8efab6a |
|
|
|
15ab7bc |
* Fri Feb 28 2014 Stephen Gallagher <sgallagh@redhat.com> 2.4.7-5
|
|
|
15ab7bc |
- Create drop directory for systemd snippets
|
|
|
15ab7bc |
|
|
|
a035f96 |
* Thu Feb 27 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.7-4
|
|
|
a035f96 |
- remove provides of old MMN, because it contained double-dash (#1068851)
|
|
|
a035f96 |
|
|
|
567c7a9 |
* Thu Feb 20 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.7-3
|
|
|
567c7a9 |
- fix graceful restart using legacy actions
|
|
|
567c7a9 |
|
|
|
a2e9cec |
* Thu Dec 12 2013 Joe Orton <jorton@redhat.com> - 2.4.7-2
|
|
|
a2e9cec |
- conflict with pre-1.5.0 APR
|
|
|
a2e9cec |
- fix sslsninotreq patch
|
|
|
a2e9cec |
|
|
|
ed353d0 |
* Wed Nov 27 2013 Joe Orton <jorton@redhat.com> - 2.4.7-1
|
|
|
ed353d0 |
- update to 2.4.7 (#1034071)
|
|
|
ed353d0 |
|
|
|
fdd0182 |
* Fri Nov 22 2013 Joe Orton <jorton@redhat.com> - 2.4.6-10
|
|
|
fdd0182 |
- switch to requiring system-logos-httpd (#1031288)
|
|
|
fdd0182 |
|
|
|
353758d |
* Tue Nov 12 2013 Joe Orton <jorton@redhat.com> - 2.4.6-9
|
|
|
353758d |
- change mmnisa to drop "-" altogether
|
|
|
353758d |
|
|
|
b39251e |
* Tue Nov 12 2013 Joe Orton <jorton@redhat.com> - 2.4.6-8
|
|
|
b39251e |
- drop ambiguous invalid "-" in RHS of httpd-mmn Provide, keeping old Provide
|
|
|
b39251e |
for transition
|
|
|
b39251e |
|
|
|
13efaf1 |
* Fri Nov 1 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-7
|
|
|
51fe77b |
- systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg
|
|
|
51fe77b |
|
|
|
8de85ed |
* Thu Oct 31 2013 Joe Orton <jorton@redhat.com> - 2.4.6-6
|
|
|
42eaf6a |
- mod_ssl: allow SSLEngine to override Listen-based default (r1537535)
|
|
|
42eaf6a |
|
|
|
f735ee1 |
* Thu Oct 24 2013 Jan kaluza <jkaluza@redhat.com> - 2.4.6-5
|
|
|
b3f3046 |
- systemd: send SIGWINCH signal without httpd -k in ExecStop
|
|
|
b3f3046 |
|
|
|
aa55b1c |
* Mon Oct 21 2013 Joe Orton <jorton@redhat.com> - 2.4.6-4
|
|
|
aa55b1c |
- load mod_macro by default (#998452)
|
|
|
aa55b1c |
- add README to conf.modules.d
|
|
|
aa55b1c |
- mod_proxy_http: add possible fix for threading issues (r1534321)
|
|
|
aa55b1c |
- core: add fix for truncated output with CGI scripts (r1530793)
|
|
|
aa55b1c |
|
|
|
15de992 |
* Thu Oct 10 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-3
|
|
|
15de992 |
- require fedora-logos-httpd (#1009162)
|
|
|
15de992 |
|
|
|
0527022 |
* Wed Jul 31 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-2
|
|
|
0527022 |
- revert fix for dumping vhosts twice
|
|
|
0527022 |
|
|
|
e90db98 |
* Mon Jul 22 2013 Joe Orton <jorton@redhat.com> - 2.4.6-1
|
|
|
e90db98 |
- update to 2.4.6
|
|
|
e90db98 |
- mod_ssl: use revised NPN API (r1487772)
|
|
|
e90db98 |
|
|
Jan Kaluza |
2bc59c9 |
* Thu Jul 11 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-12
|
|
Jan Kaluza |
2bc59c9 |
- mod_unique_id: replace use of hostname + pid with PRNG output (#976666)
|
|
Jan Kaluza |
2bc59c9 |
- apxs: mention -p option in manpage
|
|
Jan Kaluza |
2bc59c9 |
|
|
|
0fcd609 |
* Tue Jul 2 2013 Joe Orton <jorton@redhat.com> - 2.4.4-11
|
|
|
0fcd609 |
- add patch for aarch64 (Dennis Gilmore, #925558)
|
|
|
0fcd609 |
|
|
|
6d8684f |
* Mon Jul 1 2013 Joe Orton <jorton@redhat.com> - 2.4.4-10
|
|
|
6d8684f |
- remove duplicate apxs man page from httpd-tools
|
|
|
6d8684f |
|
|
|
2c79341 |
* Mon Jun 17 2013 Joe Orton <jorton@redhat.com> - 2.4.4-9
|
|
|
2c79341 |
- remove zombie dbmmanage script
|
|
|
2c79341 |
|
|
Jan Kaluza |
3d06e82 |
* Fri May 31 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-8
|
|
Jan Kaluza |
3d06e82 |
- return 400 Bad Request on malformed Host header
|
|
Jan Kaluza |
3d06e82 |
|
|
Jan Kaluza |
0b19f7b |
* Fri May 24 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-7
|
|
Jan Kaluza |
0b19f7b |
- ignore /etc/sysconfig/httpd and document systemd way of setting env variables
|
|
Jan Kaluza |
0b19f7b |
in this file
|
|
Jan Kaluza |
0b19f7b |
|
|
Jan Kaluza |
46396bf |
* Mon May 20 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-6
|
|
Jan Kaluza |
46396bf |
- htpasswd/htdbm: fix hash generation bug (#956344)
|
|
Jan Kaluza |
46396bf |
- do not dump vhosts twice in httpd -S output (#928761)
|
|
Jan Kaluza |
46396bf |
- mod_cache: fix potential crash caused by uninitialized variable (#954109)
|
|
Jan Kaluza |
46396bf |
|
|
Jan Kaluza |
9de9bf8 |
* Thu Apr 18 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-5
|
|
Jan Kaluza |
9de9bf8 |
- execute systemctl reload as result of apachectl graceful
|
|
Jan Kaluza |
08bb147 |
- mod_ssl: ignore SNI hints unless required by config
|
|
Jan Kaluza |
3f84aef |
- mod_cache: forward-port CacheMaxExpire "hard" option
|
|
Jan Kaluza |
e3774a7 |
- mod_ssl: fall back on another module's proxy hook if mod_ssl proxy
|
|
Jan Kaluza |
e3774a7 |
is not configured.
|
|
Jan Kaluza |
9de9bf8 |
|
|
Jan Kaluza |
110beb1 |
* Tue Apr 16 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-4
|
|
Jan Kaluza |
110beb1 |
- fix service file to not send SIGTERM after ExecStop (#906321, #912288)
|
|
Jan Kaluza |
110beb1 |
|
|
Jan Kaluza |
f3b6742 |
* Tue Mar 26 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-3
|
|
Jan Kaluza |
f3b6742 |
- protect MIMEMagicFile with IfModule (#893949)
|
|
Jan Kaluza |
f3b6742 |
|
|
|
ef6affd |
* Tue Feb 26 2013 Joe Orton <jorton@redhat.com> - 2.4.4-2
|
|
|
ef6affd |
- really package mod_auth_form in mod_session (#915438)
|
|
|
ef6affd |
|
|
|
a3c2292 |
* Tue Feb 26 2013 Joe Orton <jorton@redhat.com> - 2.4.4-1
|
|
|
a3c2292 |
- update to 2.4.4
|
|
|
cb59f09 |
- fix duplicate ownership of mod_session config (#914901)
|
|
|
a3c2292 |
|
|
|
d70345a |
* Fri Feb 22 2013 Joe Orton <jorton@redhat.com> - 2.4.3-17
|
|
|
d70345a |
- add mod_session subpackage, move mod_auth_form there (#894500)
|
|
|
d70345a |
|
|
|
9a2c5cf |
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.3-16
|
|
|
9a2c5cf |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
|
9a2c5cf |
|
|
|
55e18b4 |
* Tue Jan 8 2013 Joe Orton <jorton@redhat.com> - 2.4.3-15
|
|
|
55e18b4 |
- add systemd service for htcacheclean
|
|
|
55e18b4 |
|
|
|
ce68488 |
* Tue Nov 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-14
|
|
|
ce68488 |
- drop patch for r1344712
|
|
|
ce68488 |
|
|
|
402cdf6 |
* Tue Nov 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-13
|
|
|
402cdf6 |
- filter mod_*.so auto-provides (thanks to rcollet)
|
|
|
402cdf6 |
- pull in syslog logging fix from upstream (r1344712)
|
|
|
402cdf6 |
|
|
|
a9defba |
* Fri Oct 26 2012 Joe Orton <jorton@redhat.com> - 2.4.3-12
|
|
|
a9defba |
- rebuild to pick up new apr-util-ldap
|
|
|
a9defba |
|
|
|
9d51ec6 |
* Tue Oct 23 2012 Joe Orton <jorton@redhat.com> - 2.4.3-11
|
|
|
9d51ec6 |
- rebuild
|
|
|
9d51ec6 |
|
|
|
c6e80d0 |
* Wed Oct 3 2012 Joe Orton <jorton@redhat.com> - 2.4.3-10
|
|
|
c6e80d0 |
- pull upstream patch r1392850 in addition to r1387633
|
|
|
c6e80d0 |
|
|
|
3027873 |
* Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-9
|
|
|
3027873 |
- define PLATFORM in os.h using vendor string
|
|
|
3027873 |
|
|
|
e3b60d7 |
* Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-8
|
|
|
e3b60d7 |
- use systemd script unconditionally (#850149)
|
|
|
e3b60d7 |
|
|
|
2953eae |
* Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-7
|
|
|
2953eae |
- use systemd scriptlets if available (#850149)
|
|
|
2953eae |
- don't run posttrans restart if /etc/sysconfig/httpd-disable-posttrans exists
|
|
|
2953eae |
|
|
Jan Kaluza |
a62c50b |
* Mon Oct 01 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.3-6
|
|
Jan Kaluza |
a62c50b |
- use systemctl from apachectl (#842736)
|
|
Jan Kaluza |
a62c50b |
|
|
|
0fdc382 |
* Wed Sep 19 2012 Joe Orton <jorton@redhat.com> - 2.4.3-5
|
|
|
0fdc382 |
- fix some error log spam with graceful-stop (r1387633)
|
|
|
0fdc382 |
- minor mod_systemd tweaks
|
|
|
0fdc382 |
|
|
|
271938c |
* Thu Sep 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-4
|
|
|
d8220f4 |
- use IncludeOptional for conf.d/*.conf inclusion
|
|
|
d8220f4 |
|
|
Jan Kaluza |
a0a00e7 |
* Fri Sep 07 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.3-3
|
|
Jan Kaluza |
a0a00e7 |
- adding mod_systemd to integrate with systemd better
|
|
Jan Kaluza |
a0a00e7 |
|
|
|
7d53cc9 |
* Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-2
|
|
|
7d53cc9 |
- mod_ssl: add check for proxy keypair match (upstream r1374214)
|
|
|
7d53cc9 |
|
|
|
871c952 |
* Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-1
|
|
|
871c952 |
- update to 2.4.3 (#849883)
|
|
|
871c952 |
- own the docroot (#848121)
|
|
|
871c952 |
|
|
|
8c0c115 |
* Mon Aug 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-23
|
|
|
8c0c115 |
- add mod_proxy fixes from upstream (r1366693, r1365604)
|
|
|
8c0c115 |
|
|
|
3b691f8 |
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-22
|
|
|
3b691f8 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
3b691f8 |
|
|
|
ca4a396 |
* Fri Jul 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-21
|
|
|
ca4a396 |
- drop explicit version requirement on initscripts
|
|
|
ca4a396 |
|
|
|
27e50f5 |
* Thu Jul 5 2012 Joe Orton <jorton@redhat.com> - 2.4.2-20
|
|
|
27e50f5 |
- mod_ext_filter: fix error_log warnings
|
|
|
27e50f5 |
|
|
|
99146f2 |
* Mon Jul 2 2012 Joe Orton <jorton@redhat.com> - 2.4.2-19
|
|
|
99146f2 |
- support "configtest" and "graceful" as initscripts "legacy actions"
|
|
|
99146f2 |
|
|
|
a0dc243 |
* Fri Jun 8 2012 Joe Orton <jorton@redhat.com> - 2.4.2-18
|
|
|
a0dc243 |
- avoid use of "core" GIF for a "core" directory (#168776)
|
|
|
379c858 |
- drop use of "syslog.target" in systemd unit file
|
|
|
a0dc243 |
|
|
|
26a44e9 |
* Thu Jun 7 2012 Joe Orton <jorton@redhat.com> - 2.4.2-17
|
|
|
26a44e9 |
- use _unitdir for systemd unit file
|
|
|
26a44e9 |
- use /run in unit file, ssl.conf
|
|
|
26a44e9 |
|
|
|
7e10e90 |
* Thu Jun 7 2012 Joe Orton <jorton@redhat.com> - 2.4.2-16
|
|
|
7e10e90 |
- mod_ssl: fix NPN patch merge
|
|
|
7e10e90 |
|
|
|
c128570 |
* Wed Jun 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-15
|
|
|
c128570 |
- move tmpfiles.d fragment into /usr/lib per new guidelines
|
|
|
c128570 |
- package /run/httpd not /var/run/httpd
|
|
|
c128570 |
- set runtimedir to /run/httpd likewise
|
|
|
c128570 |
|
|
|
5fac30f |
* Wed Jun 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-14
|
|
|
5fac30f |
- fix htdbm/htpasswd crash on crypt() failure (#818684)
|
|
|
5fac30f |
|
|
|
febac1c |
* Wed Jun 6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-13
|
|
|
febac1c |
- pull fix for NPN patch from upstream (r1345599)
|
|
|
febac1c |
|
|
|
969baf8 |
* Thu May 31 2012 Joe Orton <jorton@redhat.com> - 2.4.2-12
|
|
|
969baf8 |
- update suexec patch to use LOG_AUTHPRIV facility
|
|
|
969baf8 |
|
|
|
8efe5b8 |
* Thu May 24 2012 Joe Orton <jorton@redhat.com> - 2.4.2-11
|
|
|
8efe5b8 |
- really fix autoindex.conf (thanks to remi@)
|
|
|
8efe5b8 |
|
|
|
e4b721f |
* Thu May 24 2012 Joe Orton <jorton@redhat.com> - 2.4.2-10
|
|
|
e4b721f |
- fix autoindex.conf to allow symlink to poweredby.png
|
|
|
e4b721f |
|
|
|
d3d3699 |
* Wed May 23 2012 Joe Orton <jorton@redhat.com> - 2.4.2-9
|
|
|
d3d3699 |
- suexec: use upstream version of patch for capability bit support
|
|
|
d3d3699 |
|
|
|
22bfb45 |
* Wed May 23 2012 Joe Orton <jorton@redhat.com> - 2.4.2-8
|
|
|
22bfb45 |
- suexec: use syslog rather than suexec.log, drop dac_override capability
|
|
|
22bfb45 |
|
|
|
f04e663 |
* Tue May 1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-7
|
|
|
f04e663 |
- mod_ssl: add TLS NPN support (r1332643, #809599)
|
|
|
f04e663 |
|
|
|
e0188e3 |
* Tue May 1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-6
|
|
|
e0188e3 |
- add BR on APR >= 1.4.0
|
|
|
e0188e3 |
|
|
|
f7210bd |
* Fri Apr 27 2012 Joe Orton <jorton@redhat.com> - 2.4.2-5
|
|
|
f7210bd |
- use systemctl from logrotate (#221073)
|
|
|
f7210bd |
|
|
|
c389c41 |
* Fri Apr 27 2012 Joe Orton <jorton@redhat.com> - 2.4.2-4
|
|
|
c389c41 |
- pull from upstream:
|
|
|
c389c41 |
* use TLS close_notify alert for dummy_connection (r1326980+)
|
|
|
c389c41 |
* cleanup symbol exports (r1327036+)
|
|
|
c389c41 |
|
|
|
b4edcbb |
* Fri Apr 20 2012 Joe Orton <jorton@redhat.com> - 2.4.2-3
|
|
|
b4edcbb |
- really fix restart
|
|
|
b4edcbb |
|
|
|
ea6aac8 |
* Fri Apr 20 2012 Joe Orton <jorton@redhat.com> - 2.4.2-2
|
|
|
ea6aac8 |
- tweak default ssl.conf
|
|
|
ea6aac8 |
- fix restart handling (#814645)
|
|
|
ea6aac8 |
- use graceful restart by default
|
|
|
ea6aac8 |
|
|
Jan Kaluza |
b72df69 |
* Wed Apr 18 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.2-1
|
|
Jan Kaluza |
b72df69 |
- update to 2.4.2
|
|
Jan Kaluza |
b72df69 |
|
|
|
22a55f7 |
* Fri Mar 23 2012 Joe Orton <jorton@redhat.com> - 2.4.1-6
|
|
|
22a55f7 |
- fix macros
|
|
|
22a55f7 |
|
|
|
f3bf1da |
* Fri Mar 23 2012 Joe Orton <jorton@redhat.com> - 2.4.1-5
|
|
|
f3bf1da |
- add _httpd_moddir to macros
|
|
|
f3bf1da |
|
|
|
2ef12c9 |
* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-4
|
|
|
2ef12c9 |
- fix symlink for poweredby.png
|
|
|
dd94df0 |
- fix manual.conf
|
|
|
2ef12c9 |
|
|
|
415f76c |
* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-3
|
|
|
415f76c |
- add mod_proxy_html subpackage (w/mod_proxy_html + mod_xml2enc)
|
|
|
415f76c |
- move mod_ldap, mod_authnz_ldap to mod_ldap subpackage
|
|
|
415f76c |
|
|
|
9d402ca |
* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-2
|
|
|
9d402ca |
- clean docroot better
|
|
|
c70a7c1 |
- ship proxy, ssl directories within /var/cache/httpd
|
|
|
9c13a78 |
- default config:
|
|
|
9c13a78 |
* unrestricted access to (only) /var/www
|
|
|
9c13a78 |
* remove (commented) Mutex, MaxRanges, ScriptSock
|
|
|
c540f64 |
* split autoindex config to conf.d/autoindex.conf
|
|
|
c540f64 |
- ship additional example configs in docdir
|
|
|
9d402ca |
|
|
|
3a44ff7 |
* Tue Mar 6 2012 Joe Orton <jorton@redhat.com> - 2.4.1-1
|
|
|
3a44ff7 |
- update to 2.4.1
|
|
|
3a44ff7 |
- adopt upstream default httpd.conf (almost verbatim)
|
|
|
3a44ff7 |
- split all LoadModules to conf.modules.d/*.conf
|
|
|
3a44ff7 |
- include conf.d/*.conf at end of httpd.conf
|
|
|
3a44ff7 |
- trim %%changelog
|