3a44ff7
%define contentdir %{_datadir}/httpd
3a44ff7
%define docroot /var/www
cvsdist 3cbd43b
%define suexec_caller apache
3a44ff7
%define mmn 20120211
b39251e
%define oldmmnisa %{mmn}-%{__isa_name}-%{__isa_bits}
b39251e
%define mmnisa %{mmn}-%{__isa_name}%{__isa_bits}
805286c
%define vstring Fedora
cvsdist f8e1fe3
402cdf6
# Drop automatic provides for module DSOs
402cdf6
%{?filter_setup:
402cdf6
%filter_provides_in %{_libdir}/httpd/modules/.*\.so$
402cdf6
%filter_setup
402cdf6
}
402cdf6
cvsdist 3cbd43b
Summary: Apache HTTP Server
cvsdist 3cbd43b
Name: httpd
3b56408
Version: 2.4.6
b39251e
Release: 8%{?dist}
cvsdist 3cbd43b
URL: http://httpd.apache.org/
f93baaa
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
cvsdist 3cbd43b
Source1: index.html
99146f2
Source2: httpd.logrotate
99146f2
Source3: httpd.sysconf
99146f2
Source4: httpd-ssl-pass-dialog
99146f2
Source5: httpd.tmpfiles
99146f2
Source6: httpd.service
99146f2
Source7: action-graceful.sh
99146f2
Source8: action-configtest.sh
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
cvsdist f8e1fe3
# Documentation
415f76c
Source30: README.confd
aa55b1c
Source31: README.confmod
55e18b4
Source40: htcacheclean.service
55e18b4
Source41: htcacheclean.sysconf
cvsdist 3cbd43b
# build/scripts patches
3a44ff7
Patch1: httpd-2.4.1-apctl.patch
871c952
Patch2: httpd-2.4.3-apxs.patch
3a44ff7
Patch3: httpd-2.4.1-deplibs.patch
871c952
Patch5: httpd-2.4.3-layout.patch
Jan Kaluza a62c50b
Patch6: httpd-2.4.3-apctl-systemd.patch
cvsdist 6356941
# Features/functional changes
a3c2292
Patch23: httpd-2.4.4-export.patch
3a44ff7
Patch24: httpd-2.4.1-corelimit.patch
3a44ff7
Patch25: httpd-2.4.1-selinux.patch
a3c2292
Patch26: httpd-2.4.4-r1337344+.patch
a0dc243
Patch27: httpd-2.4.2-icons.patch
e90db98
Patch28: httpd-2.4.6-r1332643+.patch
Jan Kaluza a0a00e7
Patch29: httpd-2.4.3-mod_systemd.patch
Jan Kaluza 3f84aef
Patch30: httpd-2.4.4-cachehardmax.patch
e90db98
Patch31: httpd-2.4.6-sslmultiproxy.patch
42eaf6a
Patch32: httpd-2.4.6-r1537535.patch
7d53cc9
# Bug fixes
Jan Kaluza 08bb147
Patch51: httpd-2.4.3-sslsninotreq.patch
Jan Kaluza 3d06e82
Patch55: httpd-2.4.4-malformed-host.patch
Jan Kaluza 2bc59c9
Patch56: httpd-2.4.4-mod_unique_id.patch
aa55b1c
Patch57: httpd-2.4.6-r1530793.patch
aa55b1c
Patch58: httpd-2.4.6-r1534321.patch
073d591
License: ASL 2.0
cvsdist 3cbd43b
Group: System Environment/Daemons
47c8208
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
c187a27
BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto
3a44ff7
BuildRequires: zlib-devel, libselinux-devel, lua-devel
e0188e3
BuildRequires: apr-devel >= 1.4.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
Jan Kaluza a0a00e7
BuildRequires: systemd-devel
15de992
Requires: /etc/mime.types, fedora-logos-httpd
06872c8
Obsoletes: httpd-suexec
cvsdist 3cbd43b
Provides: webserver
935b958
Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
b39251e
Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa}
415f76c
Requires: httpd-tools = %{version}-%{release}
ce009f9
Requires(pre): /usr/sbin/useradd
ce009f9
Requires(preun): systemd-units
ce009f9
Requires(postun): systemd-units
ce009f9
Requires(post): systemd-units
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
cvsdist 3cbd43b
Group: Development/Libraries
8499915
Summary: Development interfaces for the Apache HTTP server
cvsdist 6356941
Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
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
cvsdist 3cbd43b
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
cvsdist 3cbd43b
Group: Documentation
935b958
Summary: Documentation for the Apache HTTP server
9f7341d
Requires: httpd = %{version}-%{release}
cvsdist 3cbd43b
Obsoletes: secureweb-manual, apache-manual
39b4bd2
BuildArch: noarch
cvsdist 3cbd43b
cvsdist 3cbd43b
%description manual
cvsdist 3cbd43b
The httpd-manual package contains the complete manual and
cvsdist 3cbd43b
reference guide for the Apache HTTP server. The information can
9f9ccbc
also be found at http://httpd.apache.org/docs/2.2/.
cvsdist 3cbd43b
8499915
%package tools
8499915
Group: System Environment/Daemons
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
cvsdist 3cbd43b
Group: System Environment/Daemons
8499915
Summary: SSL/TLS module for the Apache HTTP Server
jbj b35049d
Epoch: 1
c187a27
BuildRequires: openssl-devel
3383664
Requires(post): openssl, /bin/cat
9c0ce39
Requires(pre): httpd
d546d00
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
cvsdist 6356941
Obsoletes: stronghold-mod_ssl
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
Group: System Environment/Daemons
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
Group: System Environment/Daemons
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
Group: System Environment/Daemons
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 d4ea4ed
%patch1 -p1 -b .apctl
cvsdist 739d054
%patch2 -p1 -b .apxs
96e0b33
%patch3 -p1 -b .deplibs
96e0b33
%patch5 -p1 -b .layout
Jan Kaluza a62c50b
%patch6 -p1 -b .apctlsystemd
96e0b33
96e0b33
%patch23 -p1 -b .export
96e0b33
%patch24 -p1 -b .corelimit
96e0b33
%patch25 -p1 -b .selinux
d3d3699
%patch26 -p1 -b .r1337344+
a0dc243
%patch27 -p1 -b .icons
871c952
%patch28 -p1 -b .r1332643+
Jan Kaluza a0a00e7
%patch29 -p1 -b .systemd
Jan Kaluza 3f84aef
%patch30 -p1 -b .cachehardmax
e90db98
%patch31 -p1 -b .sslmultiproxy
42eaf6a
%patch32 -p1 -b .r1537535
b4edcbb
Jan Kaluza 08bb147
%patch51 -p1 -b .sninotreq
Jan Kaluza 3d06e82
%patch55 -p1 -b .malformedhost
Jan Kaluza 2bc59c9
%patch56 -p1 -b .uniqueid
aa55b1c
%patch57 -p1 -b .r1530793
aa55b1c
%patch58 -p1 -b .r1534321
7d53cc9
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
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
d546d00
: Building with MMN %{mmn}, MMN-ISA %{mmnisa} and vendor string '%{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" \
cvsdist f8e1fe3
	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 \
cvsdist 3cbd43b
 	--prefix=%{_sysconfdir}/httpd \
cvsdist 3cbd43b
 	--exec-prefix=%{_prefix} \
cvsdist 3cbd43b
 	--bindir=%{_bindir} \
cvsdist 3cbd43b
 	--sbindir=%{_sbindir} \
cvsdist 3cbd43b
 	--mandir=%{_mandir} \
cvsdist f8e1fe3
	--libdir=%{_libdir} \
cvsdist 3cbd43b
	--sysconfdir=%{_sysconfdir}/httpd/conf \
cvsdist 3cbd43b
	--includedir=%{_includedir}/httpd \
cvsdist 3cbd43b
	--libexecdir=%{_libdir}/httpd/modules \
cvsdist 3cbd43b
	--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} \
cvsdist 3cbd43b
	--enable-suexec --with-suexec \
d3d3699
        --enable-suexec-capabilities \
cvsdist 3cbd43b
	--with-suexec-caller=%{suexec_caller} \
3a44ff7
	--with-suexec-docroot=%{docroot} \
22bfb45
	--without-suexec-logfile \
22bfb45
        --with-suexec-syslog \
cvsdist 3cbd43b
	--with-suexec-bin=%{_sbindir}/suexec \
cvsdist d48e904
	--with-suexec-uidmin=500 --with-suexec-gidmin=100 \
96e0b33
        --enable-pie \
96e0b33
        --with-pcre \
96e0b33
        --enable-mods-shared=all \
c187a27
	--enable-ssl --with-ssl --disable-distcache \
96e0b33
	--enable-proxy \
8a37bd4
        --enable-cache \
8a37bd4
        --enable-disk-cache \
96e0b33
        --enable-ldap --enable-authnz-ldap \
3a44ff7
        --enable-cgid --enable-cgi \
abfe86f
        --enable-authn-anon --enable-authn-alias \
3a44ff7
        --disable-imagemap  \
3a44ff7
	$*
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}
55e18b4
for s in httpd htcacheclean; do
55e18b4
  install -p -m 644 $RPM_SOURCE_DIR/${s}.service \
55e18b4
                    $RPM_BUILD_ROOT%{_unitdir}/${s}.service
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 \
d70345a
         01-ldap.conf 00-systemd.conf 01-session.conf; do
3a44ff7
  install -m 644 -p $RPM_SOURCE_DIR/$f \
3a44ff7
        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
3a44ff7
done
3a44ff7
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
c540f64
  mv 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
55e18b4
for s in httpd htcacheclean; do
55e18b4
  install -m 644 -p $RPM_SOURCE_DIR/${s}.sysconf \
55e18b4
                    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/${s}
55e18b4
done
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
55e18b4
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \
55e18b4
         $RPM_BUILD_ROOT/run/httpd/htcacheclean
cvsdist 3cbd43b
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
594bef6
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
3a44ff7
cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/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
3a44ff7
mkdir $RPM_BUILD_ROOT%{contentdir}/noindex
12462ec
install -m 644 -p $RPM_SOURCE_DIR/index.html \
3a44ff7
        $RPM_BUILD_ROOT%{contentdir}/noindex/index.html
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
cvsdist 3cbd43b
ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
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 \
99146f2
	$RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog
99146f2
99146f2
# Install action scripts
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 \
cvsdist 3cbd43b
	$RPM_BUILD_ROOT/etc/logrotate.d/httpd
cvsdist 3cbd43b
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
cvsdist 3cbd43b
%pre
cvsdist 3cbd43b
# Add the "apache" user
cvsdist 3cbd43b
/usr/sbin/useradd -c "Apache" -u 48 \
cvsdist 3cbd43b
	-s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || :
cvsdist 3cbd43b
cvsdist 3cbd43b
%post
55e18b4
%systemd_post httpd.service htcacheclean.service
cvsdist 3cbd43b
cvsdist 3cbd43b
%preun
55e18b4
%systemd_preun httpd.service htcacheclean.service
cvsdist 3cbd43b
ce009f9
%postun
2953eae
%systemd_postun
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 || \
55e18b4
  /bin/systemctl try-restart httpd.service htcacheclean.service >/dev/null 2>&1 || :
b2a4380
670541e
%define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
670541e
%define sslkey %{_sysconfdir}/pki/tls/private/localhost.key
06872c8
cvsdist 3cbd43b
%post -n mod_ssl
cvsdist 3cbd43b
umask 077
cvsdist 3cbd43b
ce009f9
if [ -f %{sslkey} -o -f %{sslcert} ]; then
ce009f9
   exit 0
cvsdist 3cbd43b
fi
cvsdist 3cbd43b
ce009f9
%{_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
ce009f9
cvsdist 3cbd43b
FQDN=`hostname`
cvsdist 3cbd43b
if [ "x${FQDN}" = "x" ]; then
cvsdist 3cbd43b
   FQDN=localhost.localdomain
cvsdist 3cbd43b
fi
cvsdist 3cbd43b
670541e
cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
c187a27
         -x509 -days 365 -set_serial $RANDOM -extensions v3_req \
670541e
         -out %{sslcert} 2>/dev/null
cvsdist 3cbd43b
--
cvsdist 3cbd43b
SomeState
cvsdist 3cbd43b
SomeCity
cvsdist 3cbd43b
SomeOrganization
cvsdist 3cbd43b
SomeOrganizationalUnit
cvsdist 3cbd43b
${FQDN}
cvsdist 3cbd43b
root@${FQDN}
cvsdist 3cbd43b
EOF
cvsdist 3cbd43b
cvsdist d48e904
%check
cvsdist d48e904
# Check the built modules are all PIC
cvsdist d48e904
if readelf -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.so | grep TEXTREL; then
cvsdist d48e904
   : modules contain non-relocatable code
cvsdist d48e904
   exit 1
cvsdist d48e904
fi
cvsdist d48e904
cvsdist 3cbd43b
%clean
cvsdist 3cbd43b
rm -rf $RPM_BUILD_ROOT
cvsdist 3cbd43b
cvsdist 3cbd43b
%files
cvsdist 3cbd43b
%defattr(-,root,root)
cvsdist 3cbd43b
cvsdist d01424a
%doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
c540f64
%doc docs/conf/extra/*.conf
cvsdist 3cbd43b
cvsdist 3cbd43b
%dir %{_sysconfdir}/httpd
cvsdist 3cbd43b
%{_sysconfdir}/httpd/modules
cvsdist 3cbd43b
%{_sysconfdir}/httpd/logs
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
cvsdist 3cbd43b
%dir %{_sysconfdir}/httpd/conf.d
cvsdist 3cbd43b
%{_sysconfdir}/httpd/conf.d/README
aa55b1c
%{_sysconfdir}/httpd/conf.modules.d/README
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
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
55e18b4
%config(noreplace) %{_sysconfdir}/sysconfig/ht*
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 3cbd43b
%dir %{contentdir}
cvsdist 3cbd43b
%dir %{contentdir}/icons
cvsdist d5ddf48
%dir %{contentdir}/error
cvsdist d5ddf48
%dir %{contentdir}/error/include
3a44ff7
%dir %{contentdir}/noindex
cvsdist 3cbd43b
%{contentdir}/icons/*
cvsdist d5ddf48
%{contentdir}/error/README
3a44ff7
%{contentdir}/error/*.var
3a44ff7
%{contentdir}/error/include/*.html
3a44ff7
%{contentdir}/noindex/index.html
3a44ff7
871c952
%dir %{docroot}
3a44ff7
%dir %{docroot}/cgi-bin
3a44ff7
%dir %{docroot}/html
cvsdist 3cbd43b
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
cvsdist 3cbd43b
%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
c70a7c1
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd
c70a7c1
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/proxy
cvsdist 3cbd43b
8499915
%{_mandir}/man8/*
cvsdist 3cbd43b
ce0280a
%{_unitdir}/*.service
bd3365e
8499915
%files tools
8499915
%defattr(-,root,root)
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
%defattr(-,root,root)
cvsdist 3cbd43b
%{contentdir}/manual
3a44ff7
%config(noreplace) %{_sysconfdir}/httpd/conf.d/manual.conf
cvsdist 3cbd43b
cvsdist 3cbd43b
%files -n mod_ssl
cvsdist 3cbd43b
%defattr(-,root,root)
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
Jan Kaluza 2673a43
%{_libexecdir}/httpd-ssl-pass-dialog
cvsdist 3cbd43b
415f76c
%files -n mod_proxy_html
415f76c
%defattr(-,root,root)
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
%defattr(-,root,root)
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
%defattr(-,root,root)
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
%defattr(-,root,root)
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
594bef6
%{_sysconfdir}/rpm/macros.httpd
cvsdist 3cbd43b
cvsdist 3cbd43b
%changelog
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
3a44ff7
15553f5
* Mon Feb 13 2012 Joe Orton <jorton@redhat.com> - 2.2.22-2
15553f5
- fix build against PCRE 8.30
15553f5
8e77f79
* Mon Feb 13 2012 Joe Orton <jorton@redhat.com> - 2.2.22-1
8e77f79
- update to 2.2.22
8e77f79
056bf1c
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 2.2.21-8
056bf1c
- Rebuild against PCRE 8.30
056bf1c
Jan Kaluza a942213
* Mon Jan 23 2012 Jan Kaluza <jkaluza@redhat.com> - 2.2.21-7
Jan Kaluza a942213
- fix #783629 - start httpd after named
Jan Kaluza a942213
ce009f9
* Mon Jan 16 2012 Joe Orton <jorton@redhat.com> - 2.2.21-6
ce009f9
- complete conversion to systemd, drop init script (#770311)
ce009f9
- fix comments in /etc/sysconfig/httpd (#771024)
ce009f9
- enable PrivateTmp in service file (#781440)
ce009f9
- set LANG=C in /etc/sysconfig/httpd
ce009f9
ba7fac9
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.21-5
ba7fac9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
ba7fac9
Jan Kaluza 5f89498
* Tue Dec 06 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.21-4
Jan Kaluza 5f89498
- fix #751591 - start httpd after remote-fs
Jan Kaluza 5f89498
Jan Kaluza 7d4330a
* Mon Oct 24 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.21-3
Jan Kaluza 7d4330a
- allow change state of BalancerMember in mod_proxy_balancer web interface
Jan Kaluza 7d4330a
594bef6
* Thu Sep 22 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.2.21-2
594bef6
- Make mmn available as %%{_httpd_mmn}.
fee4dde
- Add .svgz to AddEncoding x-gzip example in httpd.conf.
594bef6
f93baaa
* Tue Sep 13 2011 Joe Orton <jorton@redhat.com> - 2.2.21-1
f93baaa
- update to 2.2.21
f93baaa
e6f446d
* Mon Sep  5 2011 Joe Orton <jorton@redhat.com> - 2.2.20-1
e6f446d
- update to 2.2.20
fc68d49
- fix MPM stub man page generation
e6f446d
Jan Kaluza 2673a43
* Wed Aug 10 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-5
Jan Kaluza 2673a43
- fix #707917 - add httpd-ssl-pass-dialog to ask for SSL password using systemd
Jan Kaluza 2673a43
badeb4a
* Fri Jul 22 2011 Iain Arnell <iarnell@gmail.com> 1:2.2.19-4
badeb4a
- rebuild while rpm-4.9.1 is untagged to remove trailing slash in provided
badeb4a
  directory names
badeb4a
Jan Kaluza a1caf8d
* Wed Jul 20 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-3
Jan Kaluza a1caf8d
- fix #716621 - suexec now works without setuid bit
Jan Kaluza a1caf8d
Jan Kaluza 39b84c6
* Thu Jul 14 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-2
Jan Kaluza 39b84c6
- fix #689091 - backported patch from 2.3 branch to support IPv6 in logresolve
Jan Kaluza 39b84c6
5ac19f6
* Fri Jul  1 2011 Joe Orton <jorton@redhat.com> - 2.2.19-1
5ac19f6
- update to 2.2.19
5ac19f6
- enable dbd, authn_dbd in default config
5ac19f6
df147d5
* Thu Apr 14 2011 Joe Orton <jorton@redhat.com> - 2.2.17-13
df147d5
- fix path expansion in service files
df147d5
bd3365e
* Tue Apr 12 2011 Joe Orton <jorton@redhat.com> - 2.2.17-12
bd3365e
- add systemd service files (#684175, thanks to Jóhann B. Guðmundsson)
bd3365e
718c836
* Wed Mar 23 2011 Joe Orton <jorton@redhat.com> - 2.2.17-11
718c836
- minor updates to httpd.conf
718c836
- drop old patches
718c836
f334064
* Wed Mar  2 2011 Joe Orton <jorton@redhat.com> - 2.2.17-10
f334064
- rebuild
f334064
1c70e18
* Wed Feb 23 2011 Joe Orton <jorton@redhat.com> - 2.2.17-9
d546d00
- use arch-specific mmn
d546d00
f6428e0
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.17-8
f6428e0
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
f6428e0
c187a27
* Mon Jan 31 2011 Joe Orton <jorton@redhat.com> - 2.2.17-7
c187a27
- generate dummy mod_ssl cert with CA:FALSE constraint (#667841)
c187a27
- add man page stubs for httpd.event, httpd.worker
c187a27
- drop distcache support
c187a27
- add STOP_TIMEOUT support to init script
c187a27
0e9583d
* Sat Jan  8 2011 Joe Orton <jorton@redhat.com> - 2.2.17-6
0e9583d
- update default SSLCipherSuite per upstream trunk
0e9583d
9bdb50e
* Wed Jan  5 2011 Joe Orton <jorton@redhat.com> - 2.2.17-5
9bdb50e
- fix requires (#667397)
9bdb50e
ba94879
* Wed Jan  5 2011 Joe Orton <jorton@redhat.com> - 2.2.17-4
ba94879
- de-ghost /var/run/httpd
ba94879
da4346b
* Tue Jan  4 2011 Joe Orton <jorton@redhat.com> - 2.2.17-3
da4346b
- add tmpfiles.d configuration, ghost /var/run/httpd (#656600)
da4346b
38e4a75
* Sat Nov 20 2010 Joe Orton <jorton@redhat.com> - 2.2.17-2
38e4a75
- drop setuid bit, use capabilities for suexec binary
38e4a75
ec012a6
* Wed Oct 27 2010 Joe Orton <jorton@redhat.com> - 2.2.17-1
ec012a6
- update to 2.2.17
ec012a6
e359920
* Fri Sep 10 2010 Joe Orton <jorton@redhat.com> - 2.2.16-2
e359920
- link everything using -z relro and -z now
e359920
57af27d
* Mon Jul 26 2010 Joe Orton <jorton@redhat.com> - 2.2.16-1
57af27d
- update to 2.2.16
57af27d
3383664
* Fri Jul  9 2010 Joe Orton <jorton@redhat.com> - 2.2.15-3
3383664
- default config tweaks:
3383664
 * harden httpd.conf w.r.t. .htaccess restriction (#591293)
3383664
 * load mod_substitute, mod_version by default
3383664
 * drop proxy_ajp.conf, load mod_proxy_ajp in httpd.conf
3383664
 * add commented list of shipped-but-unloaded modules
3383664
 * bump up worker defaults a little
3383664
 * drop KeepAliveTimeout to 5 secs per upstream
3383664
- fix LSB compliance in init script (#522074)
3383664
- bundle NOTICE in -tools
3383664
- use init script in logrotate postrotate to pick up PIDFILE
3383664
- drop some old Obsoletes/Conflicts
3383664
0cb0f7f
* Sun Apr 04 2010 Robert Scheck <robert@fedoraproject.org> - 2.2.15-1
0cb0f7f
- update to 2.2.15 (#572404, #579311)
0cb0f7f