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
|
2011-02-23 17:04:04 +00:00
|
|
|
%define mmnisa %{mmn}-%{__isa_name}-%{__isa_bits}
|
2004-09-14 13:41:57 +00:00
|
|
|
%define vstring Fedora
|
2004-09-09 06:12:16 +00:00
|
|
|
|
2012-11-13 16:32:01 +00:00
|
|
|
# Drop automatic provides for module DSOs
|
|
|
|
%{?filter_setup:
|
|
|
|
%filter_provides_in %{_libdir}/httpd/modules/.*\.so$
|
|
|
|
%filter_setup
|
|
|
|
}
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
Summary: Apache HTTP Server
|
|
|
|
Name: httpd
|
2013-07-22 16:03:38 +00:00
|
|
|
Version: 2.4.6
|
2013-11-01 11:43:40 +00:00
|
|
|
Release: 7%{?dist}
|
2004-09-09 06:08:44 +00:00
|
|
|
URL: http://httpd.apache.org/
|
2011-09-13 11:25:16 +00:00
|
|
|
Source0: http://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
|
|
|
|
Source3: httpd.sysconf
|
|
|
|
Source4: httpd-ssl-pass-dialog
|
|
|
|
Source5: httpd.tmpfiles
|
|
|
|
Source6: httpd.service
|
|
|
|
Source7: action-graceful.sh
|
|
|
|
Source8: action-configtest.sh
|
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
|
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
|
2013-01-08 13:19:12 +00:00
|
|
|
Source40: htcacheclean.service
|
|
|
|
Source41: htcacheclean.sysconf
|
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
|
2012-08-21 08:48:14 +00:00
|
|
|
Patch2: httpd-2.4.3-apxs.patch
|
2012-03-13 09:55:18 +00:00
|
|
|
Patch3: httpd-2.4.1-deplibs.patch
|
2012-08-21 08:48:14 +00:00
|
|
|
Patch5: httpd-2.4.3-layout.patch
|
2012-10-01 07:17:09 +00:00
|
|
|
Patch6: httpd-2.4.3-apctl-systemd.patch
|
2004-09-09 06:16:56 +00:00
|
|
|
# Features/functional changes
|
2013-02-26 09:37:09 +00:00
|
|
|
Patch23: httpd-2.4.4-export.patch
|
2012-03-13 09:55:18 +00:00
|
|
|
Patch24: httpd-2.4.1-corelimit.patch
|
|
|
|
Patch25: httpd-2.4.1-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
|
2013-07-22 16:39:21 +00:00
|
|
|
Patch28: httpd-2.4.6-r1332643+.patch
|
2012-09-07 09:35:51 +00:00
|
|
|
Patch29: httpd-2.4.3-mod_systemd.patch
|
2013-04-18 06:22:20 +00:00
|
|
|
Patch30: httpd-2.4.4-cachehardmax.patch
|
2013-07-22 16:39:21 +00:00
|
|
|
Patch31: httpd-2.4.6-sslmultiproxy.patch
|
2013-10-31 15:54:58 +00:00
|
|
|
Patch32: httpd-2.4.6-r1537535.patch
|
2012-08-21 14:57:50 +00:00
|
|
|
# Bug fixes
|
2013-04-18 05:50:29 +00:00
|
|
|
Patch51: httpd-2.4.3-sslsninotreq.patch
|
2013-05-31 10:42:42 +00:00
|
|
|
Patch55: httpd-2.4.4-malformed-host.patch
|
2013-07-11 07:25:13 +00:00
|
|
|
Patch56: httpd-2.4.4-mod_unique_id.patch
|
2013-10-21 19:17:46 +00:00
|
|
|
Patch57: httpd-2.4.6-r1530793.patch
|
|
|
|
Patch58: httpd-2.4.6-r1534321.patch
|
2007-08-21 11:29:20 +00:00
|
|
|
License: ASL 2.0
|
2004-09-09 06:08:44 +00:00
|
|
|
Group: System Environment/Daemons
|
2007-04-10 16:38:22 +00:00
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
2011-01-31 10:18:58 +00:00
|
|
|
BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto
|
2012-03-13 09:55:18 +00:00
|
|
|
BuildRequires: zlib-devel, libselinux-devel, lua-devel
|
2012-05-01 12:34:06 +00:00
|
|
|
BuildRequires: apr-devel >= 1.4.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
|
2012-09-07 09:35:51 +00:00
|
|
|
BuildRequires: systemd-devel
|
2013-10-10 06:55:13 +00:00
|
|
|
Requires: /etc/mime.types, fedora-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}
|
2011-02-23 17:04:04 +00:00
|
|
|
Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
|
2012-03-13 16:33:13 +00:00
|
|
|
Requires: httpd-tools = %{version}-%{release}
|
2012-01-17 13:17:38 +00:00
|
|
|
Requires(pre): /usr/sbin/useradd
|
|
|
|
Requires(preun): systemd-units
|
|
|
|
Requires(postun): systemd-units
|
|
|
|
Requires(post): systemd-units
|
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
|
2007-07-26 12:08:44 +00:00
|
|
|
Summary: Development interfaces for the Apache HTTP server
|
2004-09-09 06:16:56 +00:00
|
|
|
Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
|
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
|
|
|
|
|
|
|
If you are installing the Apache HTTP server and you want to be
|
|
|
|
able to compile or develop additional modules for Apache, you need
|
|
|
|
to install this package.
|
|
|
|
|
|
|
|
%package manual
|
|
|
|
Group: Documentation
|
2007-07-25 17:16:39 +00:00
|
|
|
Summary: Documentation for the Apache HTTP server
|
2005-07-28 14:52:09 +00:00
|
|
|
Requires: httpd = %{version}-%{release}
|
2004-09-09 06:08:44 +00:00
|
|
|
Obsoletes: secureweb-manual, apache-manual
|
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
|
|
|
|
reference guide for the Apache HTTP server. The information can
|
2005-12-05 17:26:03 +00:00
|
|
|
also be found at http://httpd.apache.org/docs/2.2/.
|
2004-09-09 06:08:44 +00:00
|
|
|
|
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
|
2010-07-09 13:00:51 +00:00
|
|
|
Requires(post): openssl, /bin/cat
|
2009-12-03 14:23:28 +00:00
|
|
|
Requires(pre): httpd
|
2011-02-23 17:04:04 +00:00
|
|
|
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
|
2004-09-09 06:16:56 +00:00
|
|
|
Obsoletes: stronghold-mod_ssl
|
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.
|
|
|
|
|
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
|
|
|
|
%patch5 -p1 -b .layout
|
2012-10-01 07:17:09 +00:00
|
|
|
%patch6 -p1 -b .apctlsystemd
|
2005-12-02 10:43:00 +00:00
|
|
|
|
|
|
|
%patch23 -p1 -b .export
|
|
|
|
%patch24 -p1 -b .corelimit
|
|
|
|
%patch25 -p1 -b .selinux
|
2012-05-23 21:48:18 +00:00
|
|
|
%patch26 -p1 -b .r1337344+
|
2012-06-08 12:52:50 +00:00
|
|
|
%patch27 -p1 -b .icons
|
2012-08-21 08:48:14 +00:00
|
|
|
%patch28 -p1 -b .r1332643+
|
2012-09-07 09:35:51 +00:00
|
|
|
%patch29 -p1 -b .systemd
|
2013-04-18 06:22:20 +00:00
|
|
|
%patch30 -p1 -b .cachehardmax
|
2013-07-22 16:39:21 +00:00
|
|
|
%patch31 -p1 -b .sslmultiproxy
|
2013-10-31 15:54:58 +00:00
|
|
|
%patch32 -p1 -b .r1537535
|
2012-04-20 12:10:10 +00:00
|
|
|
|
2013-04-18 05:50:29 +00:00
|
|
|
%patch51 -p1 -b .sninotreq
|
2013-05-31 10:42:42 +00:00
|
|
|
%patch55 -p1 -b .malformedhost
|
2013-07-11 07:25:13 +00:00
|
|
|
%patch56 -p1 -b .uniqueid
|
2013-10-21 19:17:46 +00:00
|
|
|
%patch57 -p1 -b .r1530793
|
|
|
|
%patch58 -p1 -b .r1534321
|
2012-08-21 14:57:50 +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
|
|
|
|
|
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
|
|
|
|
|
2011-02-23 17:04:04 +00:00
|
|
|
: Building with MMN %{mmn}, MMN-ISA %{mmnisa} and vendor string '%{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 \
|
2004-09-09 06:16:14 +00:00
|
|
|
--with-suexec-uidmin=500 --with-suexec-gidmin=100 \
|
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 \
|
2005-12-02 10:43:00 +00:00
|
|
|
--enable-proxy \
|
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 \
|
2012-03-13 09:55:18 +00:00
|
|
|
--disable-imagemap \
|
|
|
|
$*
|
|
|
|
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}
|
2013-01-08 13:19:12 +00:00
|
|
|
for s in httpd htcacheclean; do
|
|
|
|
install -p -m 644 $RPM_SOURCE_DIR/${s}.service \
|
|
|
|
$RPM_BUILD_ROOT%{_unitdir}/${s}.service
|
|
|
|
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 \
|
2013-02-22 12:59:36 +00:00
|
|
|
01-ldap.conf 00-systemd.conf 01-session.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
|
|
|
|
|
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
|
2012-03-13 16:04:44 +00:00
|
|
|
mv docs/conf/extra/httpd-${f}.conf \
|
|
|
|
$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
|
2013-01-08 13:19:12 +00:00
|
|
|
for s in httpd htcacheclean; do
|
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/${s}.sysconf \
|
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/${s}
|
|
|
|
done
|
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 \
|
|
|
|
$RPM_BUILD_ROOT/run/httpd/htcacheclean
|
2004-09-09 06:08:44 +00:00
|
|
|
|
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
|
2011-09-22 15:20:19 +00:00
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
|
2012-03-13 09:55:18 +00:00
|
|
|
cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.httpd <<EOF
|
|
|
|
%%_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
|
|
|
|
mkdir $RPM_BUILD_ROOT%{contentdir}/noindex
|
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
|
|
|
|
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
|
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
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
# 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}
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%pre
|
|
|
|
# Add the "apache" user
|
|
|
|
/usr/sbin/useradd -c "Apache" -u 48 \
|
|
|
|
-s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || :
|
|
|
|
|
|
|
|
%post
|
2013-01-08 13:19:12 +00:00
|
|
|
%systemd_post httpd.service htcacheclean.service
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%preun
|
2013-01-08 13:19:12 +00:00
|
|
|
%systemd_preun httpd.service htcacheclean.service
|
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 || \
|
2013-01-08 13:19:12 +00:00
|
|
|
/bin/systemctl try-restart httpd.service htcacheclean.service >/dev/null 2>&1 || :
|
2009-09-08 15:58:46 +00:00
|
|
|
|
2005-04-26 08:25:34 +00:00
|
|
|
%define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
|
|
|
|
%define sslkey %{_sysconfdir}/pki/tls/private/localhost.key
|
2005-04-25 21:35:08 +00:00
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%post -n mod_ssl
|
|
|
|
umask 077
|
|
|
|
|
2012-01-17 13:17:38 +00:00
|
|
|
if [ -f %{sslkey} -o -f %{sslcert} ]; then
|
|
|
|
exit 0
|
2004-09-09 06:08:44 +00:00
|
|
|
fi
|
|
|
|
|
2012-01-17 13:17:38 +00:00
|
|
|
%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{sslkey} 2> /dev/null
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
FQDN=`hostname`
|
|
|
|
if [ "x${FQDN}" = "x" ]; then
|
|
|
|
FQDN=localhost.localdomain
|
|
|
|
fi
|
|
|
|
|
2005-04-26 08:25:34 +00:00
|
|
|
cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
|
2011-01-31 10:18:58 +00:00
|
|
|
-x509 -days 365 -set_serial $RANDOM -extensions v3_req \
|
2005-04-26 08:25:34 +00:00
|
|
|
-out %{sslcert} 2>/dev/null
|
2004-09-09 06:08:44 +00:00
|
|
|
--
|
|
|
|
SomeState
|
|
|
|
SomeCity
|
|
|
|
SomeOrganization
|
|
|
|
SomeOrganizationalUnit
|
|
|
|
${FQDN}
|
|
|
|
root@${FQDN}
|
|
|
|
EOF
|
|
|
|
|
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
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%clean
|
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
%files
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
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
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%dir %{_sysconfdir}/httpd
|
|
|
|
%{_sysconfdir}/httpd/modules
|
|
|
|
%{_sysconfdir}/httpd/logs
|
|
|
|
%{_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
|
|
|
|
|
|
|
%dir %{_sysconfdir}/httpd/conf.d
|
|
|
|
%{_sysconfdir}/httpd/conf.d/README
|
2013-10-21 19:17:46 +00:00
|
|
|
%{_sysconfdir}/httpd/conf.modules.d/README
|
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
|
|
|
|
%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
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2013-01-08 13:19:12 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/ht*
|
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
|
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
|
|
|
|
|
|
|
%dir %{contentdir}
|
|
|
|
%dir %{contentdir}/icons
|
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
|
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
|
|
|
|
|
2012-08-21 08:48:14 +00:00
|
|
|
%dir %{docroot}
|
2012-03-13 09:55:18 +00:00
|
|
|
%dir %{docroot}/cgi-bin
|
|
|
|
%dir %{docroot}/html
|
2004-09-09 06:08:44 +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
|
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/*
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2012-06-07 13:03:31 +00:00
|
|
|
%{_unitdir}/*.service
|
2011-04-12 14:39:15 +00:00
|
|
|
|
2007-07-26 12:08:44 +00:00
|
|
|
%files tools
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%{_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
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%{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
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%{_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
|
2011-08-10 06:04:14 +00:00
|
|
|
%{_libexecdir}/httpd-ssl-pass-dialog
|
2004-09-09 06:08:44 +00:00
|
|
|
|
2012-03-13 16:33:13 +00:00
|
|
|
%files -n mod_proxy_html
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%{_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
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%{_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
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%{_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
|
|
|
|
|
2004-09-09 06:08:44 +00:00
|
|
|
%files devel
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%{_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
|
2011-09-22 15:20:19 +00:00
|
|
|
%{_sysconfdir}/rpm/macros.httpd
|
2004-09-09 06:08:44 +00:00
|
|
|
|
|
|
|
%changelog
|
2013-11-01 11:43:40 +00:00
|
|
|
* Fir Nov 1 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-7
|
|
|
|
- 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
|
|
|
|
|
2012-02-13 12:02:00 +00:00
|
|
|
* Mon Feb 13 2012 Joe Orton <jorton@redhat.com> - 2.2.22-2
|
|
|
|
- fix build against PCRE 8.30
|
|
|
|
|
2012-02-13 10:48:10 +00:00
|
|
|
* Mon Feb 13 2012 Joe Orton <jorton@redhat.com> - 2.2.22-1
|
|
|
|
- update to 2.2.22
|
|
|
|
|
2012-02-10 13:45:17 +00:00
|
|
|
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 2.2.21-8
|
|
|
|
- Rebuild against PCRE 8.30
|
|
|
|
|
2012-01-23 11:46:55 +00:00
|
|
|
* Mon Jan 23 2012 Jan Kaluza <jkaluza@redhat.com> - 2.2.21-7
|
|
|
|
- fix #783629 - start httpd after named
|
|
|
|
|
2012-01-17 13:17:38 +00:00
|
|
|
* Mon Jan 16 2012 Joe Orton <jorton@redhat.com> - 2.2.21-6
|
|
|
|
- complete conversion to systemd, drop init script (#770311)
|
|
|
|
- fix comments in /etc/sysconfig/httpd (#771024)
|
|
|
|
- enable PrivateTmp in service file (#781440)
|
|
|
|
- set LANG=C in /etc/sysconfig/httpd
|
|
|
|
|
2012-01-13 05:01:58 +00:00
|
|
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.21-5
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
|
|
|
2011-12-06 07:48:34 +00:00
|
|
|
* Tue Dec 06 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.21-4
|
|
|
|
- fix #751591 - start httpd after remote-fs
|
|
|
|
|
2011-10-24 11:28:07 +00:00
|
|
|
* Mon Oct 24 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.21-3
|
|
|
|
- allow change state of BalancerMember in mod_proxy_balancer web interface
|
|
|
|
|
2011-09-22 15:20:19 +00:00
|
|
|
* Thu Sep 22 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.2.21-2
|
|
|
|
- Make mmn available as %%{_httpd_mmn}.
|
2011-09-22 15:22:59 +00:00
|
|
|
- Add .svgz to AddEncoding x-gzip example in httpd.conf.
|
2011-09-22 15:20:19 +00:00
|
|
|
|
2011-09-13 11:25:16 +00:00
|
|
|
* Tue Sep 13 2011 Joe Orton <jorton@redhat.com> - 2.2.21-1
|
|
|
|
- update to 2.2.21
|
|
|
|
|
2011-09-05 07:59:44 +00:00
|
|
|
* Mon Sep 5 2011 Joe Orton <jorton@redhat.com> - 2.2.20-1
|
|
|
|
- update to 2.2.20
|
2011-09-05 08:46:06 +00:00
|
|
|
- fix MPM stub man page generation
|
2011-09-05 07:59:44 +00:00
|
|
|
|
2011-08-10 06:04:14 +00:00
|
|
|
* Wed Aug 10 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-5
|
|
|
|
- fix #707917 - add httpd-ssl-pass-dialog to ask for SSL password using systemd
|
|
|
|
|
2011-07-22 02:59:01 +00:00
|
|
|
* Fri Jul 22 2011 Iain Arnell <iarnell@gmail.com> 1:2.2.19-4
|
|
|
|
- rebuild while rpm-4.9.1 is untagged to remove trailing slash in provided
|
|
|
|
directory names
|
|
|
|
|
2011-07-20 06:53:17 +00:00
|
|
|
* Wed Jul 20 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-3
|
|
|
|
- fix #716621 - suexec now works without setuid bit
|
|
|
|
|
2011-07-14 09:14:26 +00:00
|
|
|
* Thu Jul 14 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-2
|
|
|
|
- fix #689091 - backported patch from 2.3 branch to support IPv6 in logresolve
|
|
|
|
|
2011-07-14 08:01:57 +00:00
|
|
|
* Fri Jul 1 2011 Joe Orton <jorton@redhat.com> - 2.2.19-1
|
|
|
|
- update to 2.2.19
|
|
|
|
- enable dbd, authn_dbd in default config
|
|
|
|
|
2011-04-14 15:44:53 +00:00
|
|
|
* Thu Apr 14 2011 Joe Orton <jorton@redhat.com> - 2.2.17-13
|
|
|
|
- fix path expansion in service files
|
|
|
|
|
2011-04-12 14:39:15 +00:00
|
|
|
* Tue Apr 12 2011 Joe Orton <jorton@redhat.com> - 2.2.17-12
|
|
|
|
- add systemd service files (#684175, thanks to Jóhann B. Guðmundsson)
|
|
|
|
|
2011-04-06 12:50:49 +00:00
|
|
|
* Wed Mar 23 2011 Joe Orton <jorton@redhat.com> - 2.2.17-11
|
|
|
|
- minor updates to httpd.conf
|
|
|
|
- drop old patches
|
|
|
|
|
2011-03-02 17:19:48 +00:00
|
|
|
* Wed Mar 2 2011 Joe Orton <jorton@redhat.com> - 2.2.17-10
|
|
|
|
- rebuild
|
|
|
|
|
2011-02-23 17:06:04 +00:00
|
|
|
* Wed Feb 23 2011 Joe Orton <jorton@redhat.com> - 2.2.17-9
|
2011-02-23 17:04:04 +00:00
|
|
|
- use arch-specific mmn
|
|
|
|
|
2011-02-09 09:34:45 +00:00
|
|
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.17-8
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
|
|
|
2011-01-31 10:18:58 +00:00
|
|
|
* Mon Jan 31 2011 Joe Orton <jorton@redhat.com> - 2.2.17-7
|
|
|
|
- generate dummy mod_ssl cert with CA:FALSE constraint (#667841)
|
|
|
|
- add man page stubs for httpd.event, httpd.worker
|
|
|
|
- drop distcache support
|
|
|
|
- add STOP_TIMEOUT support to init script
|
|
|
|
|
2011-01-08 08:41:29 +00:00
|
|
|
* Sat Jan 8 2011 Joe Orton <jorton@redhat.com> - 2.2.17-6
|
|
|
|
- update default SSLCipherSuite per upstream trunk
|
|
|
|
|
2011-01-05 14:35:44 +00:00
|
|
|
* Wed Jan 5 2011 Joe Orton <jorton@redhat.com> - 2.2.17-5
|
|
|
|
- fix requires (#667397)
|
|
|
|
|
2011-01-05 11:23:52 +00:00
|
|
|
* Wed Jan 5 2011 Joe Orton <jorton@redhat.com> - 2.2.17-4
|
|
|
|
- de-ghost /var/run/httpd
|
|
|
|
|
2011-01-04 16:02:17 +00:00
|
|
|
* Tue Jan 4 2011 Joe Orton <jorton@redhat.com> - 2.2.17-3
|
|
|
|
- add tmpfiles.d configuration, ghost /var/run/httpd (#656600)
|
|
|
|
|
2010-11-20 15:09:16 +00:00
|
|
|
* Sat Nov 20 2010 Joe Orton <jorton@redhat.com> - 2.2.17-2
|
|
|
|
- drop setuid bit, use capabilities for suexec binary
|
|
|
|
|
2010-10-27 09:24:09 +00:00
|
|
|
* Wed Oct 27 2010 Joe Orton <jorton@redhat.com> - 2.2.17-1
|
|
|
|
- update to 2.2.17
|
|
|
|
|
2010-09-10 08:04:07 +00:00
|
|
|
* Fri Sep 10 2010 Joe Orton <jorton@redhat.com> - 2.2.16-2
|
|
|
|
- link everything using -z relro and -z now
|
|
|
|
|
2010-07-26 09:08:41 +00:00
|
|
|
* Mon Jul 26 2010 Joe Orton <jorton@redhat.com> - 2.2.16-1
|
|
|
|
- update to 2.2.16
|
|
|
|
|
2010-07-09 13:00:51 +00:00
|
|
|
* Fri Jul 9 2010 Joe Orton <jorton@redhat.com> - 2.2.15-3
|
|
|
|
- default config tweaks:
|
|
|
|
* harden httpd.conf w.r.t. .htaccess restriction (#591293)
|
|
|
|
* load mod_substitute, mod_version by default
|
|
|
|
* drop proxy_ajp.conf, load mod_proxy_ajp in httpd.conf
|
|
|
|
* add commented list of shipped-but-unloaded modules
|
|
|
|
* bump up worker defaults a little
|
|
|
|
* drop KeepAliveTimeout to 5 secs per upstream
|
|
|
|
- fix LSB compliance in init script (#522074)
|
|
|
|
- bundle NOTICE in -tools
|
|
|
|
- use init script in logrotate postrotate to pick up PIDFILE
|
|
|
|
- drop some old Obsoletes/Conflicts
|
|
|
|
|
2010-04-04 17:10:44 +00:00
|
|
|
* Sun Apr 04 2010 Robert Scheck <robert@fedoraproject.org> - 2.2.15-1
|
|
|
|
- update to 2.2.15 (#572404, #579311)
|
|
|
|
|