cvsdist 3cbd43b
%define contentdir /var/www
cvsdist 3cbd43b
%define suexec_caller apache
cvsdist d48e904
%define mmn 20020903
cvsdist c4da67d
%define vstring Fedora
cvsdist c4da67d
%define distro Fedora Core
cvsdist f8e1fe3
cvsdist 3cbd43b
Summary: Apache HTTP Server
cvsdist 3cbd43b
Name: httpd
cvsdist c4da67d
Version: 2.0.50
cvsdist 3ba50df
Release: 3
cvsdist 3cbd43b
URL: http://httpd.apache.org/
cvsdist c704917
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
cvsdist 3cbd43b
Source1: index.html
cvsdist 3cbd43b
Source3: httpd.logrotate
cvsdist 3cbd43b
Source4: httpd.init
cvsdist 3cbd43b
Source6: powered_by.gif
cvsdist d48e904
Source7: powered_by_fedora.png
cvsdist 3ebc88d
Source8: powered_by_rh.png
cvsdist 3cbd43b
Source10: httpd.conf
cvsdist 3cbd43b
Source11: ssl.conf
cvsdist d48e904
Source12: welcome.conf
cvsdist 8e188fb
Source14: mod_ssl-Makefile.crt
cvsdist f8e1fe3
Source15: mod_ssl-Makefile.crl
cvsdist f8e1fe3
# Documentation
cvsdist f8e1fe3
Source30: migration.xml
cvsdist f8e1fe3
Source31: migration.css
cvsdist f8e1fe3
Source32: html.xsl
cvsdist f8e1fe3
Source33: README.confd
cvsdist 3cbd43b
# build/scripts patches
cvsdist c704917
Patch1: httpd-2.0.40-apctl.patch
cvsdist 3cbd43b
Patch2: httpd-2.0.36-apxs.patch
cvsdist 6356941
Patch3: httpd-2.0.48-linkmods.patch
cvsdist 0af86b5
Patch4: httpd-2.0.45-deplibs.patch
cvsdist 0af86b5
Patch5: httpd-2.0.47-pie.patch
cvsdist 0af86b5
Patch6: httpd-2.0.45-syspcre.patch
cvsdist 0af86b5
Patch7: httpd-2.0.48-suexeclibs.patch
cvsdist 0af86b5
Patch8: httpd-2.0.48-vpathinc.patch
cvsdist e3cd9fe
# Bug fixes
cvsdist d48e904
Patch20: httpd-2.0.45-encode.patch
cvsdist 0af86b5
Patch21: httpd-2.0.45-davetag.patch
cvsdist 0af86b5
Patch22: httpd-2.0.47-ldapshm.patch
cvsdist 0af86b5
Patch23: httpd-2.0.46-shmcb.patch
cvsdist 0af86b5
Patch24: httpd-2.0.46-sslmutex.patch
cvsdist 0af86b5
Patch25: httpd-2.0.46-md5dig.patch
cvsdist 0af86b5
Patch26: httpd-2.0.48-proxy11.patch
cvsdist 0af86b5
Patch27: httpd-2.0.48-sslpphrase.patch
cvsdist 0af86b5
Patch28: httpd-2.0.48-worker.patch
cvsdist 0af86b5
Patch29: httpd-2.0.48-workerhup.patch
cvsdist 0af86b5
Patch30: httpd-2.0.48-davmisc.patch
cvsdist 0af86b5
Patch32: httpd-2.0.48-vhost.patch
cvsdist 0af86b5
Patch35: httpd-2.0.49-eocbucket.patch
cvsdist 0af86b5
Patch37: httpd-2.0.46-autoindex.patch
cvsdist 6356941
# Features/functional changes
cvsdist 6356941
Patch70: httpd-2.0.48-release.patch
cvsdist 6356941
Patch71: httpd-2.0.40-xfsz.patch
cvsdist 6356941
Patch72: httpd-2.0.40-pod.patch
cvsdist 6356941
Patch73: httpd-2.0.40-noshmht.patch
cvsdist 0af86b5
Patch74: httpd-2.0.45-export.patch
cvsdist 0af86b5
Patch75: httpd-2.0.48-dynlimit.patch
cvsdist 0af86b5
Patch76: httpd-2.0.48-dynamic.patch
cvsdist 0af86b5
Patch77: httpd-2.0.48-sslstatus.patch
cvsdist 0af86b5
Patch78: httpd-2.0.48-corelimit.patch
cvsdist 0af86b5
Patch80: httpd-2.0.48-distcache.patch
cvsdist 0af86b5
Patch81: httpd-2.0.48-debuglog.patch
cvsdist 0af86b5
Patch82: httpd-2.0.48-abench.patch
cvsdist 0af86b5
Patch83: httpd-2.0.48-fdsetsize.patch
cvsdist 0af86b5
Patch84: httpd-2.0.48-sslheader.patch
cvsdist 0af86b5
Patch85: httpd-2.0.48-sslvars2.patch
cvsdist 0af86b5
Patch86: httpd-2.0.48-rewritessl.patch
cvsdist 0af86b5
Patch89: httpd-2.0.49-headerssl.patch
cvsdist 0af86b5
Patch90: httpd-2.0.49-workerstack.patch
cvsdist 3ba50df
Patch91: httpd-2.0.49-suexecmsg.patch
cvsdist 3cbd43b
License: Apache Software License
cvsdist 3cbd43b
Group: System Environment/Daemons
cvsdist 3cbd43b
BuildRoot: %{_tmppath}/%{name}-root
cvsdist 6356941
BuildRequires: db4-devel, expat-devel, findutils, perl, pkgconfig, xmlto >= 0.0.11
cvsdist 0af86b5
BuildRequires: apr-devel >= 0.9.4-15, apr-util-devel, pcre-devel
cvsdist 3cbd43b
Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find
cvsdist 3cbd43b
Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
cvsdist 3cbd43b
Prereq: sh-utils, textutils, /usr/sbin/useradd
cvsdist 3cbd43b
Provides: webserver
cvsdist 6af796e
Provides: httpd-mmn = %{mmn}
cvsdist 6356941
Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache, stronghold-htdocs
cvsdist 6356941
Obsoletes: mod_put, mod_roaming
cvsdist d4ea4ed
Conflicts: pcre < 4.0
cvsdist 3cbd43b
cvsdist 3cbd43b
%description
cvsdist 3cbd43b
Apache is a powerful, full-featured, efficient, and freely-available
cvsdist 3cbd43b
Web server. Apache is also the most popular Web server on the
cvsdist 3cbd43b
Internet.
cvsdist 3cbd43b
cvsdist 3cbd43b
%package devel
cvsdist 3cbd43b
Group: Development/Libraries
cvsdist 3cbd43b
Summary: Development tools for the Apache HTTP server.
cvsdist 6356941
Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
cvsdist d01424a
Requires: apr-devel, apr-util-devel, httpd = %{version}, pcre-devel
cvsdist 3cbd43b
cvsdist 3cbd43b
%description devel
cvsdist 3cbd43b
The httpd-devel package contains the APXS binary and other files
cvsdist 3cbd43b
that you need to build Dynamic Shared Objects (DSOs) for Apache.
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
cvsdist 3cbd43b
Summary: Documentation for the Apache HTTP server.
cvsdist 3cbd43b
Obsoletes: secureweb-manual, apache-manual
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
cvsdist d48e904
also be found at http://httpd.apache.org/docs-2.0/.
cvsdist 3cbd43b
cvsdist 3cbd43b
%package -n mod_ssl
cvsdist 3cbd43b
Group: System Environment/Daemons
cvsdist 3cbd43b
Summary: SSL/TLS module for the Apache HTTP server
cvsdist 3cbd43b
Serial: 1
cvsdist 6356941
BuildRequires: openssl-devel, distcache-devel
cvsdist 3cbd43b
Prereq: openssl, dev, /bin/cat
cvsdist 6356941
Requires: httpd = %{version}-%{release}, make, httpd-mmn = %{mmn}
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
cvsdist d01424a
%package suexec
cvsdist d01424a
Group: System Environment/Daemons
cvsdist d01424a
Summary: suexec binary for the Apache HTTP server
cvsdist d01424a
Requires: httpd = %{version}-%{release}
cvsdist d01424a
cvsdist d01424a
%description suexec
cvsdist d01424a
This package includes the /usr/sbin/suexec binary which can be installed
cvsdist d01424a
to allow the Apache HTTP server to run CGI programs (and any programs
cvsdist d01424a
executed by SSI pages) as a user other than the 'apache' user.
cvsdist d01424a
cvsdist 3cbd43b
%prep
cvsdist 3cbd43b
%setup -q
cvsdist d4ea4ed
%patch1 -p1 -b .apctl
cvsdist 739d054
%patch2 -p1 -b .apxs
cvsdist 6356941
%patch3 -p1 -b .linkmods
cvsdist 0af86b5
%patch4 -p1 -b .deplibs
cvsdist 0af86b5
%patch6 -p1 -b .syspcre
cvsdist 0af86b5
%patch7 -p1 -b .suexeclibs
cvsdist 0af86b5
%patch8 -p1 -b .vpathinc
cvsdist 3cbd43b
cvsdist d48e904
# no -b to prevent droplets in install root
cvsdist d48e904
%patch20 -p1
cvsdist 0af86b5
%patch21 -p1 -b .davetag
cvsdist 0af86b5
%patch22 -p1 -b .ldapshm
cvsdist 0af86b5
%patch23 -p1 -b .shmcb
cvsdist 0af86b5
%patch24 -p1 -b .sslmutex
cvsdist 0af86b5
%patch25 -p1 -b .md5dig
cvsdist 3ba50df
%patch26 -p1 -b .proxy11
cvsdist 0af86b5
%patch27 -p1 -b .sslpphrase
cvsdist 0af86b5
%patch28 -p1 -b .worker
cvsdist 0af86b5
%patch29 -p1 -b .workerhup
cvsdist 0af86b5
%patch30 -p1 -b .davmisc
cvsdist 0af86b5
%patch32 -p1 -b .vhost
cvsdist 0af86b5
%patch35 -p1 -b .eocbucket
cvsdist 0af86b5
%patch37 -p1 -b .autoindex
cvsdist 6356941
cvsdist 6356941
%patch71 -p0 -b .xfsz
cvsdist 0af86b5
%patch72 -p1 -b .pod
cvsdist 6356941
%patch73 -p1 -b .noshmht
cvsdist 0af86b5
%patch74 -p1 -b .export
cvsdist 0af86b5
%patch75 -p1 -b .dynlimit
cvsdist 0af86b5
%patch76 -p1 -b .dynamic
cvsdist 0af86b5
%patch77 -p1 -b .sslstatus
cvsdist 0af86b5
%patch78 -p1 -b .corelimit
cvsdist 0af86b5
%patch80 -p1 -b .distcache
cvsdist 0af86b5
%patch81 -p1 -b .debuglog
cvsdist 0af86b5
%patch82 -p1 -b .abench
cvsdist 0af86b5
%patch83 -p1 -b .fdsetsize
cvsdist 0af86b5
%patch84 -p1 -b .sslheader
cvsdist 0af86b5
%patch85 -p1 -b .sslvars2
cvsdist 0af86b5
%patch86 -p1 -b .rewritessl
cvsdist 0af86b5
%patch89 -p1 -b .headerssl
cvsdist 0af86b5
%patch90 -p1 -b .workerstack
cvsdist 3ba50df
%patch91 -p1 -b .suexecmsg
cvsdist 0af86b5
cvsdist 6356941
# Patch in vendor/release string
cvsdist 3ebc88d
sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
cvsdist 2d6a2e5
cvsdist b895f53
# Touch mod_ssl expression parser sources to prevent regenerating it
cvsdist b895f53
touch modules/ssl/ssl_expr_*.[chyl]
cvsdist b895f53
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
cvsdist f8e1fe3
   : 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
cvsdist 6356941
# Conditionally enable PIE support
cvsdist 6356941
if echo 'static int foo[30000]; int main () { return 0; }' | 
cvsdist 3ebc88d
   gcc -pie -fpie -O2 -xc - -o pietest && 
cvsdist 6356941
   ./pietest; then
cvsdist 0af86b5
%patch5 -p1 -b .pie
cvsdist 6356941
  : PIE support enabled
cvsdist 6356941
else
cvsdist 6356941
  : WARNING: PIE support not enabled
cvsdist 6356941
fi
cvsdist 6356941
cvsdist 3ebc88d
: Building for '%{distro}' with MMN %{mmn} 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
rm -f include/pcreposix.h
cvsdist 436bfeb
cvsdist 3cbd43b
# regenerate configure scripts
cvsdist 436bfeb
autoheader && autoconf || exit 1
cvsdist 3cbd43b
cvsdist 3ebc88d
# Limit size of CHANGES to recent history
cvsdist d4ea4ed
echo '1,/Changes with Apache MPM/wq' | ed CHANGES
cvsdist 3ebc88d
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 d48e904
# update location of migration guide in apachectl
cvsdist d48e904
%{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \
cvsdist d48e904
	support/apachectl.in
cvsdist b8b92c1
cvsdist 3ebc88d
# Build the migration guide
cvsdist 3ebc88d
sed 's/@DISTRO@/%{distro}/' < $RPM_SOURCE_DIR/migration.xml > migration.xml
cvsdist 3ebc88d
xmlto --skip-validation -x $RPM_SOURCE_DIR/html.xsl html-nochunks migration.xml
cvsdist f8e1fe3
cp $RPM_SOURCE_DIR/migration.css . # make %%doc happy
cvsdist f8e1fe3
cvsdist b895f53
CFLAGS=$RPM_OPT_FLAGS
cvsdist b895f53
CPPFLAGS="-DSSL_EXPERIMENTAL_ENGINE"
cvsdist b895f53
if pkg-config openssl; then
cvsdist f8e1fe3
	# configure -C barfs with trailing spaces in CFLAGS
cvsdist b895f53
	CPPFLAGS="$CPPFLAGS `pkg-config --cflags openssl | sed 's/ *$//'`"
cvsdist b895f53
	SSL_LIBS="`pkg-config --libs openssl`"
cvsdist f8e1fe3
fi
cvsdist b895f53
export CFLAGS CPPFLAGS SSL_LIBS
cvsdist f8e1fe3
cvsdist f8e1fe3
function mpmbuild()
cvsdist f8e1fe3
{
cvsdist f8e1fe3
mpm=$1; shift
cvsdist f8e1fe3
mkdir $mpm; pushd $mpm
cvsdist 6356941
../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} \
cvsdist d48e904
        --with-installbuilddir=%{_libdir}/httpd/build \
cvsdist f8e1fe3
	--with-mpm=$mpm \
cvsdist d48e904
        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
cvsdist 3cbd43b
	--enable-suexec --with-suexec \
cvsdist 3cbd43b
	--with-suexec-caller=%{suexec_caller} \
cvsdist 3cbd43b
	--with-suexec-docroot=%{contentdir} \
cvsdist 3cbd43b
	--with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
cvsdist 3cbd43b
	--with-suexec-bin=%{_sbindir}/suexec \
cvsdist d48e904
	--with-suexec-uidmin=500 --with-suexec-gidmin=100 \
cvsdist f8e1fe3
	$*
cvsdist f8e1fe3
cvsdist f8e1fe3
make %{?_smp_mflags}
cvsdist f8e1fe3
popd
cvsdist f8e1fe3
}
cvsdist f8e1fe3
cvsdist f8e1fe3
# Only bother enabling optional modules for main build.
cvsdist f8e1fe3
mpmbuild prefork --enable-mods-shared=all \
cvsdist 6356941
	--enable-ssl --with-ssl --enable-distcache \
cvsdist d48e904
	--enable-deflate \
cvsdist 3cbd43b
	--enable-proxy --enable-proxy-connect \
cvsdist d48e904
	--enable-proxy-http --enable-proxy-ftp \
cvsdist d48e904
        --enable-cache --enable-mem-cache \
cvsdist d48e904
        --enable-file-cache --enable-disk-cache \
cvsdist d48e904
        --enable-ldap --enable-auth-ldap \
cvsdist d48e904
        --enable-logio
cvsdist f8e1fe3
cvsdist f8e1fe3
# To prevent most modules being built statically into httpd.worker, 
cvsdist f8e1fe3
# easiest way seems to be enable them shared.
cvsdist f8e1fe3
mpmbuild worker --enable-mods-shared=all
cvsdist f8e1fe3
cvsdist f8e1fe3
# Verify that the same modules were built into the two httpd binaries
cvsdist f8e1fe3
./prefork/httpd -l | grep -v prefork > prefork.mods
cvsdist f8e1fe3
./worker/httpd -l | grep -v worker > worker.mods
cvsdist f8e1fe3
if ! diff -u prefork.mods worker.mods; then
cvsdist f8e1fe3
  : Different modules built into httpd binaries, will not proceed
cvsdist f8e1fe3
  exit 1
cvsdist f8e1fe3
fi
cvsdist 3cbd43b
cvsdist 3cbd43b
%install
cvsdist 3cbd43b
rm -rf $RPM_BUILD_ROOT
cvsdist 3cbd43b
cvsdist 3cbd43b
# Classify ab and logresolve as section 1 commands, as they are in /usr/bin
cvsdist 3cbd43b
mv docs/man/ab.8 docs/man/ab.1
cvsdist 6356941
mv docs/man/logresolve.8 docs/man/logresolve.1
cvsdist 3cbd43b
cvsdist f8e1fe3
pushd prefork
cvsdist 3cbd43b
make DESTDIR=$RPM_BUILD_ROOT install
cvsdist f8e1fe3
popd
cvsdist f8e1fe3
# install worker binary
cvsdist d48e904
install -m 755 worker/httpd $RPM_BUILD_ROOT%{_sbindir}/httpd.worker
cvsdist 3cbd43b
cvsdist d01424a
# link to system pcreposix.h
cvsdist d01424a
ln -s ../pcre/pcreposix.h $RPM_BUILD_ROOT%{_includedir}/httpd/pcreposix.h
cvsdist d01424a
cvsdist 3cbd43b
# install conf file/directory
cvsdist 3cbd43b
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
cvsdist 3cbd43b
install -m 644 $RPM_SOURCE_DIR/README.confd \
cvsdist 3cbd43b
   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
cvsdist 3cbd43b
install -m 644 $RPM_SOURCE_DIR/ssl.conf \
cvsdist 3cbd43b
   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ssl.conf
cvsdist d48e904
install -m 644 $RPM_SOURCE_DIR/welcome.conf \
cvsdist d48e904
   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/welcome.conf
cvsdist 3cbd43b
cvsdist 3cbd43b
rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
cvsdist 3cbd43b
install -m 644 $RPM_SOURCE_DIR/httpd.conf \
cvsdist 3cbd43b
   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
cvsdist 3cbd43b
cvsdist 3cbd43b
# mod_ssl bits
cvsdist 3cbd43b
for suffix in crl crt csr key prm; do
cvsdist 3cbd43b
   mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/ssl.${suffix}
cvsdist 3cbd43b
done
cvsdist 3cbd43b
cvsdist 8e188fb
# Makefiles for certificate management
cvsdist 8e188fb
for ext in crt crl; do 
cvsdist 8e188fb
  install -m 644 $RPM_SOURCE_DIR/mod_ssl-Makefile.${ext} \
cvsdist 8e188fb
	$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/ssl.${ext}/Makefile.${ext}
cvsdist 8e188fb
done
cvsdist 8e188fb
ln -s ../../../usr/share/ssl/certs/Makefile $RPM_BUILD_ROOT/etc/httpd/conf
cvsdist 8e188fb
cvsdist 3cbd43b
# for holding mod_dav lock database
cvsdist 3cbd43b
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav
cvsdist 3cbd43b
cvsdist f13b38c
# create a prototype session cache
cvsdist f13b38c
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_ssl
cvsdist f13b38c
touch $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_ssl/scache.{dir,pag,sem}
cvsdist f13b38c
cvsdist d48e904
# create cache root
cvsdist d48e904
mkdir $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_proxy
cvsdist d48e904
cvsdist 3cbd43b
# move utilities to /usr/bin
cvsdist 3cbd43b
mv $RPM_BUILD_ROOT%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
cvsdist 3cbd43b
   $RPM_BUILD_ROOT%{_bindir}
cvsdist 3cbd43b
cvsdist d48e904
# move builddir to the right place
cvsdist 3cbd43b
mv $RPM_BUILD_ROOT%{contentdir}/build $RPM_BUILD_ROOT%{_libdir}/httpd/build
cvsdist 2d6a2e5
cvsdist 2d6a2e5
# point to the correct libtool
cvsdist 2d6a2e5
apr_libtool=`apr-config --apr-libtool | sed -e 's|/bin/sh ||'`
cvsdist 2d6a2e5
ln -s ../../../..${apr_libtool} $RPM_BUILD_ROOT%{_libdir}/httpd/build/libtool
cvsdist 0fdee38
cvsdist d48e904
# Install and sanitize config_vars file: relocate the build directory into 
cvsdist d48e904
# libdir; reference correct libtool; fix EXTRA_INCLUDES
cvsdist 0fdee38
sed -e "s|%{contentdir}/build|%{_libdir}/httpd/build|g" \
cvsdist 0fdee38
    -e "/AP_LIBS/d" -e "/abs_srcdir/d" \
cvsdist 2d6a2e5
    -e "/^LIBTOOL/s|/bin/sh /[^ ]*/libtool|/bin/sh ${apr_libtool}|" \
cvsdist 3ebc88d
    -e "/^installbuilddir/s| = .*$| = /etc/httpd/build|" \
cvsdist d48e904
    -e "s|^EXTRA_INCLUDES.*$|EXTRA_INCLUDES = -I\$(includedir) -I\$(APR_INCLUDEDIR) -I%{_includedir}/openssl|g" \
cvsdist f8e1fe3
  < prefork/build/config_vars.mk \
cvsdist 3cbd43b
  > $RPM_BUILD_ROOT%{_libdir}/httpd/build/config_vars.mk
cvsdist 739d054
install -m 644 build/special.mk \
cvsdist 739d054
    $RPM_BUILD_ROOT%{_libdir}/httpd/build/special.mk
cvsdist 3cbd43b
cvsdist 6af796e
# Make the MMN accessible to module packages
cvsdist 6af796e
echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
cvsdist 6af796e
cvsdist 3cbd43b
# docroot
cvsdist 3cbd43b
mkdir $RPM_BUILD_ROOT%{contentdir}/html
cvsdist 3cbd43b
install -m 644 $RPM_SOURCE_DIR/index.html \
cvsdist 3cbd43b
	$RPM_BUILD_ROOT%{contentdir}/error/noindex.html
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
cvsdist 3cbd43b
install -m 644 $RPM_SOURCE_DIR/powered_by.gif \
cvsdist 3cbd43b
	$RPM_BUILD_ROOT%{contentdir}/icons
cvsdist d48e904
install -m 644 $RPM_SOURCE_DIR/powered_by_fedora.png \
cvsdist d48e904
	$RPM_BUILD_ROOT%{contentdir}/icons
cvsdist 3ebc88d
install -m 644 $RPM_SOURCE_DIR/powered_by_rh.png \
cvsdist 3ebc88d
	$RPM_BUILD_ROOT%{contentdir}/icons
cvsdist 3cbd43b
cvsdist 3cbd43b
# logs
cvsdist 3cbd43b
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/logs
cvsdist 3cbd43b
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/httpd
cvsdist 3cbd43b
cvsdist 3cbd43b
# symlinks for /etc/httpd
cvsdist 3cbd43b
ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
cvsdist 3cbd43b
ln -s ../..%{_localstatedir}/run $RPM_BUILD_ROOT/etc/httpd/run
cvsdist 3cbd43b
ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
cvsdist 3cbd43b
ln -s ../..%{_libdir}/httpd/build $RPM_BUILD_ROOT/etc/httpd/build
cvsdist 3cbd43b
cvsdist 3cbd43b
# install SYSV init stuff
cvsdist 3cbd43b
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
cvsdist 3cbd43b
install -m755 $RPM_SOURCE_DIR/httpd.init \
cvsdist 3cbd43b
	$RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
cvsdist 3cbd43b
%{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \
cvsdist 3cbd43b
	$RPM_BUILD_ROOT/etc/rc.d/init.d/httpd	
cvsdist 3cbd43b
cvsdist 3cbd43b
# install log rotation stuff
cvsdist 3cbd43b
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
cvsdist 3cbd43b
install -m644 $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|" \
cvsdist 3cbd43b
    -e "s|/usr/local/apache2/logs/httpd.pid|/var/run/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
cvsdist f8e1fe3
# Remove unpackaged files
cvsdist d48e904
rm -f $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 \
cvsdist f8e1fe3
      $RPM_BUILD_ROOT%{_bindir}/ap?-config \
cvsdist f8e1fe3
      $RPM_BUILD_ROOT%{_sbindir}/{checkgid,dbmmanage,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
cvsdist 6356941
# Make suexec a+rw so it can be stripped.  %%files lists real permissions
cvsdist 6356941
chmod 755 $RPM_BUILD_ROOT%{_sbindir}/suexec
cvsdist 6356941
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 6356941
%triggerpostun -- apache < 2.0, stronghold-apache < 2.0
cvsdist f0ad17e
/sbin/chkconfig --add httpd
cvsdist f0ad17e
cvsdist 6356941
# Prevent removal of index.html on upgrades from 1.3
cvsdist 6356941
%triggerun -- apache < 2.0, stronghold-apache < 2.0
cvsdist 6356941
if [ -r %{contentdir}/index.html -a ! -r %{contentdir}/index.html.rpmold ]; then
cvsdist 6356941
  mv %{contentdir}/index.html %{contentdir}/index.html.rpmold
cvsdist 6356941
fi
cvsdist 6356941
cvsdist 3cbd43b
%post
cvsdist 3cbd43b
# Register the httpd service
cvsdist 3cbd43b
/sbin/chkconfig --add httpd
cvsdist 3cbd43b
cvsdist 3cbd43b
%preun
cvsdist 3cbd43b
if [ $1 = 0 ]; then
cvsdist 3cbd43b
	/sbin/service httpd stop > /dev/null 2>&1
cvsdist 3cbd43b
	/sbin/chkconfig --del httpd
cvsdist 3cbd43b
fi
cvsdist 3cbd43b
cvsdist 3cbd43b
%post -n mod_ssl
cvsdist 3cbd43b
umask 077
cvsdist 3cbd43b
cvsdist 3cbd43b
if [ ! -f %{_sysconfdir}/httpd/conf/ssl.key/server.key ] ; then
cvsdist 3cbd43b
%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/httpd/conf/ssl.key/server.key 2> /dev/null
cvsdist 3cbd43b
fi
cvsdist 3cbd43b
cvsdist 3cbd43b
FQDN=`hostname`
cvsdist 3cbd43b
if [ "x${FQDN}" = "x" ]; then
cvsdist 3cbd43b
   FQDN=localhost.localdomain
cvsdist 3cbd43b
fi
cvsdist 3cbd43b
cvsdist 3cbd43b
if [ ! -f %{_sysconfdir}/httpd/conf/ssl.crt/server.crt ] ; then
cvsdist 3cbd43b
cat << EOF | %{_bindir}/openssl req -new -key %{_sysconfdir}/httpd/conf/ssl.key/server.key -x509 -days 365 -out %{_sysconfdir}/httpd/conf/ssl.crt/server.crt 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
fi
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
cvsdist 3cbd43b
%doc migration.html migration.css
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
cvsdist 3cbd43b
%config(noreplace) %{_sysconfdir}/httpd/conf/*.conf
cvsdist d48e904
%config(noreplace) %{_sysconfdir}/httpd/conf.d/welcome.conf
cvsdist 3cbd43b
%config(noreplace) %{_sysconfdir}/httpd/conf/magic
cvsdist 3cbd43b
cvsdist d48e904
%config(noreplace) %{_sysconfdir}/logrotate.d/httpd
cvsdist 3cbd43b
%config %{_sysconfdir}/rc.d/init.d/httpd
cvsdist 3cbd43b
cvsdist 3cbd43b
%dir %{_sysconfdir}/httpd/conf.d
cvsdist 3cbd43b
%{_sysconfdir}/httpd/conf.d/README
cvsdist 3cbd43b
cvsdist 3cbd43b
%{_bindir}/ab
cvsdist 3cbd43b
%{_bindir}/ht*
cvsdist 3cbd43b
%{_bindir}/logresolve
cvsdist 3cbd43b
%{_sbindir}/httpd
cvsdist f8e1fe3
%{_sbindir}/httpd.worker
cvsdist 3cbd43b
%{_sbindir}/apachectl
cvsdist 3cbd43b
%{_sbindir}/rotatelogs
cvsdist 3cbd43b
cvsdist 3cbd43b
%dir %{_libdir}/httpd
cvsdist 3cbd43b
%dir %{_libdir}/httpd/modules
cvsdist 6356941
%{_libdir}/httpd/modules/mod*.so
cvsdist 6356941
%exclude %{_libdir}/httpd/modules/mod_ssl.so
cvsdist 3cbd43b
cvsdist 3cbd43b
%dir %{contentdir}
cvsdist 3cbd43b
%dir %{contentdir}/cgi-bin
cvsdist 3cbd43b
%dir %{contentdir}/html
cvsdist 3cbd43b
%dir %{contentdir}/icons
cvsdist d5ddf48
%dir %{contentdir}/error
cvsdist d5ddf48
%dir %{contentdir}/error/include
cvsdist 3cbd43b
%{contentdir}/icons/*
cvsdist d5ddf48
%{contentdir}/error/README
cvsdist d5ddf48
%{contentdir}/error/noindex.html
cvsdist d48e904
%config %{contentdir}/error/*.var
cvsdist d48e904
%config %{contentdir}/error/include/*.html
cvsdist 3cbd43b
cvsdist 3cbd43b
%attr(0700,root,root) %dir %{_localstatedir}/log/httpd
cvsdist 3cbd43b
%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
cvsdist d48e904
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/mod_proxy
cvsdist 3cbd43b
cvsdist 6356941
%{_mandir}/man?/*
cvsdist 6356941
%exclude %{_mandir}/man8/apxs.8*
cvsdist d01424a
%exclude %{_mandir}/man8/suexec.8*
cvsdist 3cbd43b
cvsdist 3cbd43b
%files manual
cvsdist 3cbd43b
%defattr(-,root,root)
cvsdist 3cbd43b
%{contentdir}/manual
cvsdist 3cbd43b
cvsdist 3cbd43b
%files -n mod_ssl
cvsdist 3cbd43b
%defattr(-,root,root)
cvsdist 3cbd43b
%{_libdir}/httpd/modules/mod_ssl.so
cvsdist 3cbd43b
%config(noreplace) %{_sysconfdir}/httpd/conf.d/ssl.conf
cvsdist 8e188fb
%attr(0700,root,root) %dir %{_sysconfdir}/httpd/conf/ssl.*
cvsdist 8e188fb
%config %{_sysconfdir}/httpd/conf/Makefile
cvsdist 8e188fb
%config %{_sysconfdir}/httpd/conf/ssl.*/*
cvsdist f13b38c
%attr(0700,apache,root) %dir %{_localstatedir}/cache/mod_ssl
cvsdist f13b38c
%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir
cvsdist f13b38c
%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag
cvsdist f13b38c
%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem
cvsdist 3cbd43b
cvsdist 3cbd43b
%files devel
cvsdist 3cbd43b
%defattr(-,root,root)
cvsdist 3cbd43b
%{_includedir}/httpd
cvsdist 3cbd43b
%{_sysconfdir}/httpd/build
cvsdist 3cbd43b
%{_sbindir}/apxs
cvsdist 3cbd43b
%{_mandir}/man8/apxs.8*
cvsdist 3cbd43b
%dir %{_libdir}/httpd/build
cvsdist 3cbd43b
%{_libdir}/httpd/build/*.mk
cvsdist 0fdee38
%{_libdir}/httpd/build/instdso.sh
cvsdist 6356941
%{_libdir}/httpd/build/libtool
cvsdist 3cbd43b
cvsdist d01424a
%files suexec
cvsdist d01424a
%defattr(-,root,root)
cvsdist d01424a
%attr(4510,root,%{suexec_caller}) %{_sbindir}/suexec
cvsdist d01424a
%{_mandir}/man8/suexec.8*
cvsdist d01424a
cvsdist 3cbd43b
%changelog
cvsdist 3ba50df
* Tue Jun 29 2004 Joe Orton <jorton@redhat.com> 2.0.50-3
cvsdist 3ba50df
- update -proxy11 patch
cvsdist 3ba50df
- explain where suexec went if SuexecUserGroup is used but
cvsdist 3ba50df
  /usr/sbin/suexec is not found
cvsdist 3ba50df
cvsdist c4da67d
* Tue Jun 29 2004 Joe Orton <jorton@redhat.com> 2.0.50-1
cvsdist c4da67d
- update to 2.0.50
cvsdist c4da67d
cvsdist d01424a
* Mon Jun 21 2004 Joe Orton <jorton@redhat.com> 2.0.49-8
cvsdist d01424a
- split out suexec into httpd-suexec package (#77972)
cvsdist d01424a
- link to system pcreposix.h to fix including httpd.h
cvsdist d01424a
cvsdist 436bfeb
* Wed Jun 16 2004 Joe Orton <jorton@redhat.com> 2.0.49-7
cvsdist 436bfeb
- don't install or use bundled pcreposix.h
cvsdist 436bfeb
- bump default MaxClients to 256
cvsdist 436bfeb
- drop default Timeout to 2 minutes
cvsdist 436bfeb
- merge from upstream:
cvsdist 436bfeb
 * add fix for VirtualHost multiple address handling (Jeff Trawick)
cvsdist 436bfeb
cvsdist 436bfeb
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> 2.0.49-6
cvsdist 22faa81
- rebuilt
cvsdist 22faa81
cvsdist 0af86b5
* Thu Jun 10 2004 Joe Orton <jorton@redhat.com> 2.0.49-5
cvsdist 0af86b5
- remove comments about ScoreBoardFile in httpd.conf
cvsdist 0af86b5
- avoid redundant name lookup in pod code
cvsdist 0af86b5
- mod_headers: add %{...}s feature for using SSL variables
cvsdist 0af86b5
- mod_autoindex: don't truncate output on stat() failure (#117959)
cvsdist 0af86b5
- mod_ssl: fix shmcb corruption with small caches (Geoff Thorpe)
cvsdist 0af86b5
- mod_ssl: security fix for overflow in FakeBasicAuth (CVE CAN-2004-0488)
cvsdist 0af86b5
- mod_deflate: fix memory consumption for large responses
cvsdist 0af86b5
- check that suexec is setuid root (André Malo)
cvsdist 0af86b5
- worker: add ThreadStackSize (Jeff Trawick) and ThreadGuardSize directives
cvsdist 0af86b5
cvsdist d4ea4ed
* Thu May  6 2004 Joe Orton <jorton@redhat.com> 2.0.49-4
cvsdist d4ea4ed
- make "noindex" page valid XHTML 1.1 (Pascal Volk, #122020)
cvsdist d4ea4ed
- fix SEGV with no Listen directives (Michael Corcoran)
cvsdist d4ea4ed
- mod_cgi: synch with 2.0 backport proposed upstream
cvsdist d4ea4ed
cvsdist d4ea4ed
* Thu Apr 22 2004 Joe Orton <jorton@redhat.com> 2.0.49-3
cvsdist d4ea4ed
- conflict with older pcre (#121531)
cvsdist d4ea4ed
- include mod_ext_filter
cvsdist d4ea4ed
- mod_cgi: handle concurrent stderr/stdout from script
cvsdist d4ea4ed
cvsdist b895f53
* Fri Mar 26 2004 Joe Orton <jorton@redhat.com> 2.0.49-2
cvsdist b895f53
- mod_ssl: fix session cache memory leak (Madhu Mathihalli)
cvsdist b895f53
- mod_ssl: fix SEGV when trying to shutdown during pool cleanup
cvsdist b895f53
- merge the mod_proxy HTTP/1.1-compliance fixes
cvsdist b895f53
- apply fix for #118020
cvsdist b895f53
cvsdist b895f53
* Thu Mar 18 2004 Joe Orton <jorton@redhat.com> 2.0.49-1
cvsdist b895f53
- update to 2.0.49 (#118798, thanks to Robert Scheck)
cvsdist b895f53
- only link ab and mod_ssl against SSL_LIBS
cvsdist b895f53
- open log files using APR_LARGEFILE where available
cvsdist b895f53
cvsdist b895f53
* Wed Mar 17 2004 Joe Orton <jorton@redhat.com> 2.0.48-18
cvsdist b895f53
- add fix for #118020
cvsdist b895f53
- ssl.conf tweaks: seed SSL PRNG with 256 bytes from /dev/urandom
cvsdist b895f53
cvsdist b895f53
* Mon Mar 15 2004 Joe Orton <jorton@redhat.com> 2.0.48-17
cvsdist b895f53
- use "SSLMutex default" in default ssl.conf
cvsdist b895f53
- limit to 128K XML request bodies in default httpd.conf; fix to 
cvsdist b895f53
  give a 413 error not a 400 if the limit is exceeded
cvsdist b895f53
- mod_rewrite: add %%{SSL:...} and %%{HTTPS} variable lookups
cvsdist b895f53
- mod_dav: propagate executable property across COPY/MOVE
cvsdist b895f53
- mod_dav: give 507 on out-of-space errors in more places
cvsdist b895f53
- mod_ssl: add ssl_is_https optional function
cvsdist b895f53
- mod_ssl: support indexed lookup of DN components
cvsdist b895f53
- mod_ssl: optimised variable lookup
cvsdist b895f53
- mod_ssl: install only minimal mod_ssl.h
cvsdist b895f53
- worker: fix potential hang at restart
cvsdist b895f53
cvsdist d4ea4ed
* Tue Mar  2 2004 Elliot Lee <sopwith@redhat.com> 2.0.48-16.1
cvsdist d4ea4ed
- Rebuilt.
cvsdist 3ebc88d
cvsdist 3ebc88d
* Mon Feb 23 2004 Joe Orton <jorton@redhat.com> 2.0.48-16
cvsdist 3ebc88d
- fix apxs -q installbuilddir
cvsdist 3ebc88d
- really update to ab from HEAD
cvsdist 3ebc88d
- remove check that accept() returns an fd < FD_SETSIZE 
cvsdist 3ebc88d
cvsdist 3ebc88d
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> 2.0.48-15
cvsdist d4ea4ed
- Rebuilt.
cvsdist 3ebc88d
cvsdist 3ebc88d
* Tue Feb  3 2004 Joe Orton <jorton@redhat.com> 2.0.48-14
cvsdist 3ebc88d
- mod_dav: fix 401 on destination and reject unescaped fragment in URI
cvsdist 3ebc88d
- remove redundant ldconfig invocation from mod_ssl %%post
cvsdist 3ebc88d
- remove unnecessary -headusage patch
cvsdist 3ebc88d
cvsdist 3ebc88d
* Fri Jan 30 2004 Joe Orton <jorton@redhat.com> 2.0.48-13
cvsdist 3ebc88d
- allow further customisation of init script (Peter Bieringer, #114619)
cvsdist 3ebc88d
- worker fixes from upstream
cvsdist 3ebc88d
- use basename(filename) in APLOG_MARK to reduce noise levels at 
cvsdist 3ebc88d
  "LogLevel debug"
cvsdist 3ebc88d
cvsdist 3ebc88d
* Wed Jan 28 2004 Joe Orton <jorton@redhat.com> 2.0.48-12
cvsdist 3ebc88d
- mod_ssl: cosmetic tweaks for pass phrase prompting
cvsdist 3ebc88d
- simplify rebranding a little
cvsdist 3ebc88d
cvsdist 3ebc88d
* Tue Jan 27 2004 Joe Orton <jorton@redhat.com> 2.0.48-11
cvsdist 3ebc88d
- trim pre-2.0 history from CHANGES to limit size
cvsdist 3ebc88d
cvsdist 6356941
* Tue Jan 27 2004 Joe Orton <jorton@redhat.com> 2.0.48-10
cvsdist 6356941
- update to ab from HEAD
cvsdist 6356941
- remove dbmmanage man page (part of #114080)
cvsdist 6356941
- mod_ssl: fix streaming nph- CGI scripts over SSL
cvsdist 6356941
- mod_autoindex: fixes from 2.0 branch (André Malo)
cvsdist 6356941
- add NameVirtualHost vs mod_ssl warning to httpd.conf (#114315)
cvsdist 6356941
- mod_proxy: HTTP/1.1-compliance fixes from HEAD
cvsdist 6356941
cvsdist 6356941
* Tue Jan 20 2004 Joe Orton <jorton@redhat.com> 2.0.48-9
cvsdist 6356941
- use a large BSS in the test PIE executable to trigger bugs early
cvsdist 6356941
- tighten check on CPP output in MMN check (#113934)
cvsdist 6356941
cvsdist 6356941
* Mon Jan 19 2004 Joe Orton <jorton@redhat.com> 2.0.48-8
cvsdist 6356941
- add man page fixes
cvsdist 6356941
- mod_include: use parser rewrite+fixes from 2.0 branch (André Malo et al)
cvsdist 6356941
- mod_ssl: add distcache support (Geoff Thorpe)
cvsdist 6356941
- mod_ssl: SSL variable handling fixes for non-SSL connections (various)
cvsdist 6356941
- allow linking modules against specific libraries found during configure
cvsdist 6356941
cvsdist 6356941
* Mon Jan 19 2004 Joe Orton <jorton@redhat.com> 2.0.48-7
cvsdist 6356941
- hack to ensure that /usr/sbin/suexec gets stripped
cvsdist 6356941
- merges from upstream:
cvsdist 6356941
 * fix for CVE CAN-2003-0020 (André Malo)
cvsdist 6356941
 * open log files read-only (Jeff Trawick)
cvsdist 6356941
 * mod_cgi: fix logging of script exec failure messages (Jeff Trawick)
cvsdist 6356941
 * mod_proxy: fix leak in request body handling (Larry Toppi)
cvsdist 6356941
- merges from Taroon:
cvsdist 6356941
 * move away /var/www/html/index.html before upgrade from 1.3 (#70705)
cvsdist 6356941
 * allow upgrade from Stronghold 4.0
cvsdist 6356941
 * migration guide updates 
cvsdist 6356941
 * mod_log_config: fix logging of timezone (upstream #23642)
cvsdist 6356941
 * mod_ssl: restore readable error descriptions in error log
cvsdist 6356941
cvsdist 6356941
* Mon Jan 19 2004 Joe Orton <jorton@redhat.com> 2.0.48-6
cvsdist 6356941
- fix httpd.init issues reported by Behdad Esfahbod
cvsdist 6356941
- add fix for mod_usertrack (#113269)
cvsdist 6356941
- automatically raise RLIMIT_CORE if CoreDumpDirectory is used
cvsdist 6356941
- emit warning at end of %%prep if PIE support is not enabled
cvsdist 6356941
- add symlink to libtool script from build directory (#113720)
cvsdist 6356941
- don't link suexec against the world
cvsdist 6356941
cvsdist 6356941
* Sun Jan 04 2004 Joe Orton <jorton@redhat.com> 2.0.48-5
cvsdist 6356941
- use graceful restart in logrotate
cvsdist 6356941
- bump default MaxRequestsPerChild for prefork to 4000
cvsdist 6356941
- move vendor string for Server header into spec file
cvsdist 6356941
- include mod_status extension hook and use it in mod_ssl to include
cvsdist 6356941
  SSL session cache statistics in server-status output
cvsdist 6356941
cvsdist 6356941
* Thu Dec 18 2003 Joe Orton <jorton@redhat.com> 2.0.48-4
cvsdist 6356941
- rebuild
cvsdist 6356941
cvsdist 6356941
* Sat Dec 13 2003 Jeff Johnson <jbj@jbj.org> 2.0.48-3
cvsdist 6356941
- rebuild against db-4.2.52.
cvsdist 6356941
cvsdist 6356941
* Tue Oct 28 2003 Joe Orton <jorton@redhat.com> 2.0.48-2
cvsdist 6356941
- update to 2.0.48
cvsdist 2d6a2e5
- includes security fix for CVE CAN-2003-0542
cvsdist 6356941
- include mpm*.h to fix mod_fastcgi build (#108080)
cvsdist 6356941
- increase DYNAMIC_MODULE_LIMIT to 128
cvsdist 6356941
- re-enable ap_hack_* export trimming patch
cvsdist 6356941
- only use -export-dynamic when linking httpd, not suexec etc
cvsdist 6356941
- don't load mod_unique_id by default
cvsdist 2d6a2e5
cvsdist d48e904
* Thu Oct 23 2003 Joe Orton <jorton@redhat.com> 2.0.47-10
cvsdist d48e904
- httpd.conf: configure test page in welcome.conf, load suexec, 
cvsdist d48e904
 don't use custom error docs by default, sync with upstream.
cvsdist d48e904
- add "Powered by Fedora" icon (Garrett LeSage)
cvsdist d48e904
- migration guide updates
cvsdist d48e904
- drop mod_cgid
cvsdist d48e904
- enable SSL_EXPERIMENTAL_ENGINE (#106858)
cvsdist d48e904
- drop minimum suexec gid to 100 (#74753, #107083)
cvsdist d48e904
- speed up graceful restarts in prefork (#105725)
cvsdist d48e904
- mod_ssl fixes
cvsdist d48e904
cvsdist d48e904
* Wed Oct 22 2003 Joe Orton <jorton@redhat.com> 2.0.47-9
cvsdist d48e904
- updated index.html (Matt Wilson, #107378)
cvsdist d48e904
- change server version string comment to "(Fedora)"
cvsdist d48e904
cvsdist 6356941
* Mon Oct 13 2003 Jeff Johnson <jbj@jbj.org> 2.0.47-8.1
cvsdist 6356941
- rebuild against db-4.2.42.
cvsdist 6356941
cvsdist d48e904
* Wed Oct  8 2003 Joe Orton <jorton@redhat.com> 2.0.47-8
cvsdist d48e904
- use -fPIE not -fpie to fix s390x (Florian La Roche)
cvsdist d48e904
- include VERSIONING in docdir
cvsdist d48e904
cvsdist d48e904
* Mon Oct  6 2003 Joe Orton <jorton@redhat.com> 2.0.47-7
cvsdist d48e904
- enable PIE support
cvsdist d48e904
- include bug fix for #78019
cvsdist d48e904
cvsdist d48e904
* Mon Sep  8 2003 Joe Orton <jorton@redhat.com> 2.0.47-6
cvsdist d48e904
- update httpd.conf for manual changes (alietss@yahoo.com, #101015)
cvsdist d48e904
- use anonymous shm for LDAP auth cache (#103566)
cvsdist d48e904
cvsdist d48e904
* Sun Sep  7 2003 Joe Orton <jorton@redhat.com> 2.0.47-5
cvsdist d48e904
- include unixd.h again
cvsdist d48e904
- fix EXTRA_INCLUDES
cvsdist d48e904
cvsdist d48e904
* Mon Jul 28 2003 Joe Orton <jorton@redhat.com> 2.0.47-4
cvsdist 739d054
- add mod_include fixes from upstream
cvsdist d48e904
- httpd.conf updates: wording fixes from upstream; load
cvsdist d48e904
  mod_deflate by default, update AddLanguage section (#98455)
cvsdist d48e904
- don't add eNULL cipher in default ssl.conf (#98401)
cvsdist d48e904
- only bind to IPv4 addresses in default config (#98916)
cvsdist 739d054
cvsdist d48e904
* Thu Jul 24 2003 Joe Orton <jorton@redhat.com> 2.0.47-3
cvsdist d48e904
- fix for segfaults in php-snmp init (#97207)
cvsdist 739d054
cvsdist d48e904
* Wed Jul 23 2003 Joe Orton <jorton@redhat.com> 2.0.47-2
cvsdist d48e904
- fix apxs -c again
cvsdist d48e904
cvsdist d48e904
* Mon Jul 14 2003 Joe Orton <jorton@redhat.com> 2.0.47-1
cvsdist d48e904
- update to 2.0.47
cvsdist d48e904
- add mod_logio (#100436)
cvsdist d48e904
- remove Vendor tag
cvsdist d48e904
cvsdist d48e904
* Thu Jul 10 2003 Joe Orton <jorton@redhat.com> 2.0.45-14
cvsdist d48e904
- use libtool script included in apr
cvsdist d48e904
- fix apxs -q LIBTOOL (more #92313)
cvsdist d48e904
cvsdist d48e904
* Tue Jul  8 2003 Joe Orton <jorton@redhat.com> 2.0.45-13
cvsdist d48e904
- use system pcre library
cvsdist d48e904
cvsdist d48e904
* Thu Jul  3 2003 Joe Orton <jorton@redhat.com> 2.0.45-12
cvsdist d48e904
- remove some installed headers
cvsdist d48e904
- fix for use of libtool 1.5
cvsdist d48e904
cvsdist d48e904
* Wed Jun 5 2003 Elliot Lee <sopwith@redhat.com>
cvsdist d4ea4ed
- Rebuilt.
cvsdist 739d054
cvsdist d48e904
* Thu Jun  5 2003 Joe Orton <jorton@redhat.com> 2.0.45-10
cvsdist d48e904
- fix apxs -g (#92313)
cvsdist d48e904
cvsdist d48e904
* Sat May 31 2003 Joe Orton <jorton@redhat.com> 2.0.45-9
cvsdist d48e904
- trim manual sources properly
cvsdist d48e904
- remove ExcludeArch
cvsdist d48e904
cvsdist d48e904
* Thu May 29 2003 Joe Orton <jorton@redhat.com> 2.0.45-8
cvsdist d48e904
- rebuild
cvsdist d48e904
cvsdist d48e904
* Mon May 19 2003 Joe Orton <jorton@redhat.com> 2.0.45-6
cvsdist d48e904
- don't load /usr/sbin/envvars from apxs
cvsdist d48e904
- add fix for mod_dav_fs namespace handling
cvsdist d48e904
- add fix for mod_dav If header etag comparison
cvsdist d48e904
- remove irrelevant warning from mod_proxy
cvsdist d48e904
- don't conflict with thttpd (#91422)
cvsdist d48e904
cvsdist d48e904
* Sun May 18 2003 Joe Orton <jorton@redhat.com> 2.0.45-5
cvsdist d48e904
- don't package any XML sources in httpd-manual
cvsdist d48e904
- fix examples in default httpd.conf for enabling caching
cvsdist d48e904
cvsdist d48e904
* Sun May 18 2003 Joe Orton <jorton@redhat.com> 2.0.45-4
cvsdist d48e904
- change default charset to UTF-8 (#88964)
cvsdist d48e904
cvsdist d48e904
* Thu May 15 2003 Joe Orton <jorton@redhat.com> 2.0.45-3
cvsdist d48e904
- update httpd.conf for changes from default in 2.0.45
cvsdist d48e904
- include conf.d/*.conf after loading standard modules
cvsdist d48e904
- include LDAP and cache modules (#75370, #88277)
cvsdist d48e904
- run buildconf in %%build not %%prep
cvsdist d48e904
cvsdist d48e904
* Tue May 13 2003 Joe Orton <jorton@redhat.com> 2.0.45-2
cvsdist d48e904
- have apxs always use /usr/bin/libtool
cvsdist d48e904
cvsdist d48e904
* Mon May 5 2003 Joe Orton <jorton@redhat.com> 2.0.45-1
cvsdist d48e904
- update to 2.0.45 (#82227)
cvsdist d48e904
- use separate apr, apr-util packages (#74951)
cvsdist d48e904
- mark logrotate file as noreplace (#85654)
cvsdist d48e904
- mark all of /var/www/error as %%config-not-noreplace
cvsdist d48e904
- remove dates from error pages (#86474)
cvsdist d48e904
- don't enable mod_cgid for worker MPM (#88819)
cvsdist d48e904
cvsdist d48e904
* Wed Apr 30 2003 Elliot Lee <sopwith@redhat.com> 2.0.40-22
cvsdist d48e904
- headusage patch to fix build on ppc64 etc.
cvsdist 739d054
cvsdist 739d054
* Tue Apr  1 2003 Joe Orton <jorton@redhat.com> 2.0.40-21.1
cvsdist 739d054
- add security fixes for CAN-2003-0020, CAN-2003-0132, CAN-2003-0083
cvsdist 739d054
- add security fix for file descriptor leaks, #82142
cvsdist 739d054
- add bug fix for #82587
cvsdist 739d054
cvsdist f8e1fe3
* Mon Feb 24 2003 Joe Orton <jorton@redhat.com> 2.0.40-21
cvsdist f8e1fe3
- add security fix for CAN-2003-0020; replace non-printable characters
cvsdist f8e1fe3
  with '!' when printing to error log.
cvsdist f8e1fe3
- disable debuginfo on IA64.
cvsdist f8e1fe3
cvsdist f8e1fe3
* Tue Feb 11 2003 Joe Orton <jorton@redhat.com> 2.0.40-20
cvsdist f8e1fe3
- disable POSIX semaphores to support 2.4.18 kernel (#83324)
cvsdist f8e1fe3
cvsdist f8e1fe3
* Wed Jan 29 2003 Joe Orton <jorton@redhat.com> 2.0.40-19
cvsdist f8e1fe3
- require xmlto 0.0.11 or later
cvsdist f8e1fe3
- fix apr_strerror on glibc2.3
cvsdist f8e1fe3
cvsdist f8e1fe3
* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 2.0.40-18
cvsdist d4ea4ed
- Rebuilt.
cvsdist f8e1fe3
cvsdist f8e1fe3
* Thu Jan 16 2003 Joe Orton <jorton@redhat.com> 2.0.40-17
cvsdist f8e1fe3
- add mod_cgid and httpd binary built with worker MPM (#75496)
cvsdist f8e1fe3
- allow choice of httpd binary in init script
cvsdist f8e1fe3
- pick appropriate CGI module based on loaded MPM in httpd.conf
cvsdist f8e1fe3
- source /etc/sysconfig/httpd in apachectl to get httpd choice
cvsdist f8e1fe3
- make "apachectl status" fail gracefully when links isn't found (#78159)
cvsdist f8e1fe3
cvsdist f8e1fe3
* Mon Jan 13 2003 Joe Orton <jorton@redhat.com> 2.0.40-16
cvsdist f8e1fe3
- rebuild for OpenSSL 0.9.7
cvsdist f8e1fe3
cvsdist f8e1fe3
* Fri Jan  3 2003 Joe Orton <jorton@redhat.com> 2.0.40-15
cvsdist f8e1fe3
- fix possible infinite recursion in config dir processing (#77206)
cvsdist f8e1fe3
- fix memory leaks in request body processing (#79282)
cvsdist f8e1fe3
cvsdist f8e1fe3
* Thu Dec 12 2002 Joe Orton <jorton@redhat.com> 2.0.40-14
cvsdist f8e1fe3
- remove unstable shmht session cache from mod_ssl
cvsdist f8e1fe3
- get SSL libs from pkg-config if available (Nalin Dahyabhai)
cvsdist f8e1fe3
- stop "apxs -a -i" from inserting AddModule into httpd.conf (#78676)
cvsdist f8e1fe3
cvsdist f8e1fe3
* Wed Nov  6 2002 Joe Orton <jorton@redhat.com> 2.0.40-13
cvsdist f8e1fe3
- fix location of installbuilddir in apxs when libdir!=/usr/lib
cvsdist f8e1fe3
cvsdist f8e1fe3
* Wed Nov  6 2002 Joe Orton <jorton@redhat.com> 2.0.40-12
cvsdist f8e1fe3
- pass libdir to configure; clean up config_vars.mk
cvsdist f8e1fe3
- package instdso.sh, fixing apxs -i (#73428)
cvsdist f8e1fe3
- prevent build if upstream MMN differs from mmn macro
cvsdist f8e1fe3
- remove installed but unpackaged files
cvsdist 0fdee38
cvsdist e3cd9fe
* Wed Oct  9 2002 Joe Orton <jorton@redhat.com> 2.0.40-11
cvsdist e3cd9fe
- correct SERVER_NAME encoding in i18n error pages (thanks to Andre Malo)
cvsdist e3cd9fe
cvsdist e3cd9fe
* Wed Oct  9 2002 Joe Orton <jorton@redhat.com> 2.0.40-10
cvsdist e3cd9fe
- fix patch for CAN-2002-0840 to also cover i18n error pages
cvsdist e3cd9fe
cvsdist e3cd9fe
* Wed Oct  2 2002 Joe Orton <jorton@redhat.com> 2.0.40-9
cvsdist e3cd9fe
- security fixes for CAN-2002-0840 and CAN-2002-0843
cvsdist e3cd9fe
- fix for possible mod_dav segfault for certain requests
cvsdist e3cd9fe
cvsdist e3cd9fe
* Tue Sep 24 2002 Gary Benson <gbenson@redhat.com>
cvsdist e3cd9fe
- updates to the migration guide
cvsdist e3cd9fe
cvsdist db63bd3
* Wed Sep  4 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.40-8
cvsdist db63bd3
- link httpd with libssl to avoid library loading/unloading weirdness
cvsdist db63bd3
cvsdist 8e188fb
* Tue Sep  3 2002 Joe Orton <jorton@redhat.com> 2.0.40-7
cvsdist 8e188fb
- add LoadModule lines for proxy modules in httpd.conf (#73349)
cvsdist 8e188fb
- fix permissions of conf/ssl.*/ directories; add Makefiles for
cvsdist db63bd3
  certificate management (#73352)
cvsdist 8e188fb
cvsdist 6af796e
* Mon Sep  2 2002 Joe Orton <jorton@redhat.com> 2.0.40-6
cvsdist 6af796e
- provide "httpd-mmn" to manage module ABI compatibility
cvsdist 6af796e
cvsdist f13b38c
* Sun Sep  1 2002 Joe Orton <jorton@redhat.com> 2.0.40-5
cvsdist f13b38c
- fix SSL session cache (#69699)
cvsdist f13b38c
- revert addition of LDAP support to apr-util
cvsdist f13b38c
cvsdist b8eb6a9
* Mon Aug 26 2002 Joe Orton <jorton@redhat.com> 2.0.40-4
cvsdist b8eb6a9
- set SIGXFSZ disposition to "ignored" (#69520)
cvsdist b8eb6a9
- make dummy connections to the first listener in config (#72692)
cvsdist b8eb6a9
cvsdist d5ddf48
* Mon Aug 26 2002 Joe Orton <jorton@redhat.com> 2.0.40-3
cvsdist d5ddf48
- allow "apachectl configtest" on a 1.3 httpd.conf
cvsdist d5ddf48
- add mod_deflate
cvsdist d5ddf48
- enable LDAP support in apr-util
cvsdist d5ddf48
- don't package everything in /var/www/error as config(noreplace)
cvsdist d5ddf48
cvsdist f0ad17e
* Wed Aug 21 2002 Bill Nottingham <notting@redhat.com> 2.0.40-2
cvsdist f0ad17e
- add trigger (#68657)
cvsdist f0ad17e
cvsdist c704917
* Mon Aug 12 2002 Joe Orton <jorton@redhat.com> 2.0.40-1
cvsdist c704917
- update to 2.0.40
cvsdist c704917
cvsdist c704917
* Wed Jul 24 2002 Joe Orton <jorton@redhat.com> 2.0.36-8
cvsdist c704917
- improve comment on use of UserDir in default config (#66886)
cvsdist c704917
cvsdist 3cbd43b
* Wed Jul 10 2002 Joe Orton <jorton@redhat.com> 2.0.36-7
cvsdist 3cbd43b
- use /sbin/nologin as shell for apache user (#68371)
cvsdist 3cbd43b
- add patch from CVS to fix possible infinite loop when processing
cvsdist 3cbd43b
  internal redirects
cvsdist 3cbd43b
cvsdist 3cbd43b
* Wed Jun 26 2002 Gary Benson <gbenson@redhat.com> 2.0.36-6
cvsdist 3cbd43b
- modify init script to detect 1.3.x httpd.conf's and direct users
cvsdist 3cbd43b
  to the migration guide
cvsdist 3cbd43b
cvsdist 3cbd43b
* Tue Jun 25 2002 Gary Benson <gbenson@redhat.com> 2.0.36-5
cvsdist 3cbd43b
- patch apachectl to detect 1.3.x httpd.conf's and direct users
cvsdist 3cbd43b
  to the migration guide
cvsdist 3cbd43b
- ship the migration guide
cvsdist 3cbd43b
cvsdist 3cbd43b
* Fri Jun 21 2002 Joe Orton <jorton@redhat.com>
cvsdist 3cbd43b
- move /etc/httpd2 back to /etc/httpd
cvsdist 3cbd43b
- add noindex.html page and poweredby logo; tweak default config
cvsdist 3cbd43b
  to load noindex.html if no default "/" page is present.
cvsdist 3cbd43b
- add patch to prevent mutex errors on graceful restart
cvsdist 3cbd43b
cvsdist 3cbd43b
* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 2.0.36-4
cvsdist 3cbd43b
- automated rebuild
cvsdist 3cbd43b
cvsdist 3cbd43b
* Wed Jun 12 2002 Joe Orton <jorton@redhat.com> 2.0.36-3
cvsdist 3cbd43b
- add patch to fix SSL mutex handling
cvsdist 3cbd43b
cvsdist 3cbd43b
* Wed Jun 12 2002 Joe Orton <jorton@redhat.com> 2.0.36-2
cvsdist 3cbd43b
- improved config directory patch
cvsdist 3cbd43b
cvsdist 3cbd43b
* Mon May 20 2002 Joe Orton <jorton@redhat.com>
cvsdist 3cbd43b
- initial build; based heavily on apache.spec and mod_ssl.spec
cvsdist 3cbd43b
- fixes: #65214, #58490, #57376, #61265, #65518, #58177, #57245