Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished.

Former-commit-id: fbb694b48e [formerly b831809423f9aa6e1da5678f2653fa52d928c132] Former-commit-id: ea8bf623cf
2012-05-10 09:24:56 -05:00 · 2012-05-10 09:24:56 -05:00 · 38f61f4a73
commit 38f61f4a73
parent c3ec79ef6c
10 changed files with 2245 additions and 33 deletions
--- a/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.init
+++ b/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.init
@ -0,0 +1,126 @@
+#!/bin/bash
+#
+# httpd        Startup script for the Apache HTTP Server used by Openfire
+#
+# chkconfig: - 85 15
+# description: Apache is a World Wide Web server.  It is used to serve \
+#	       HTML files and CGI.
+# processname: httpd
+# config: /etc/httpd/conf/httpd.conf
+# config: /etc/sysconfig/httpd
+# pidfile: /var/run/httpd.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/httpd ]; then
+        . /etc/sysconfig/httpd
+fi
+
+# Start httpd in the C locale by default.
+HTTPD_LANG=${HTTPD_LANG-"C"}
+
+# This will prevent initlog from swallowing up a pass-phrase prompt if
+# mod_ssl needs a pass-phrase from the user.
+INITLOG_ARGS=""
+
+# Set HTTPD=/usr/sbin/httpd.worker in /etc/sysconfig/httpd to use a server
+# with the thread-based "worker" MPM; BE WARNED that some modules may not
+# work correctly with a thread-based MPM; notably PHP will refuse to start.
+
+# Path to the apachectl script, server binary, and short-form for messages.
+apachectl=/awips2/httpd_openfire/usr/sbin/apachectl
+httpd=${HTTPD-/awips2/httpd_openfire/usr/sbin/httpd}
+prog=httpd
+pidfile=${PIDFILE-/awips2/httpd_openfire/var/run/httpd.pid}
+lockfile=${LOCKFILE-/awips2/httpd_openfire/var/lock/subsys/httpd}
+RETVAL=0
+
+# check for 1.3 configuration
+check13 () {
+	CONFFILE=/awips2/httpd_openfire/etc/httpd/conf/httpd.conf
+	GONE="(ServerType|BindAddress|Port|AddModule|ClearModuleList|"
+	GONE="${GONE}AgentLog|RefererLog|RefererIgnore|FancyIndexing|"
+	GONE="${GONE}AccessConfig|ResourceConfig)"
+	if LANG=C grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then
+		echo
+		echo 1>&2 " Apache 1.3 configuration directives found"
+		echo 1>&2 " please read @docdir@/migration.html"
+		failure "Apache 1.3 config directives test"
+		echo
+		exit 1
+	fi
+}
+
+# The semantics of these two functions differ from the way apachectl does
+# things -- attempting to start while running is a failure, and shutdown
+# when not running is also a failure.  So we just do it the way init scripts
+# are expected to behave here.
+start() {
+        echo -n $"Starting $prog: "
+        check13 || exit 1
+        LANG=$HTTPD_LANG daemon $httpd $OPTIONS
+        RETVAL=$?
+        echo
+        [ $RETVAL = 0 ] && touch ${lockfile}
+        return $RETVAL
+}
+
+# When stopping httpd a delay of >10 second is required before SIGKILLing the
+# httpd parent; this gives enough time for the httpd parent to SIGKILL any
+# errant children.
+stop() {
+	echo -n $"Stopping $prog: "
+	killproc -d 10 $httpd
+	RETVAL=$?
+	echo
+	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+reload() {
+    echo -n $"Reloading $prog: "
+    if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then
+        RETVAL=$?
+        echo $"not reloading due to configuration syntax error"
+        failure $"not reloading $httpd due to configuration syntax error"
+    else
+        killproc $httpd -HUP
+        RETVAL=$?
+    fi
+    echo
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  status)
+        status $httpd
+	RETVAL=$?
+	;;
+  restart)
+	stop
+	start
+	;;
+  condrestart)
+	if [ -f ${pidfile} ] ; then
+		stop
+		start
+	fi
+	;;
+  reload)
+        reload
+	;;
+  graceful|help|configtest|fullstatus)
+	$apachectl $@
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status|fullstatus|graceful|help|configtest}"
+	exit 1
+esac
+
+exit $RETVAL
--- a/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.logrotate
+++ b/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.logrotate
@ -0,0 +1,8 @@
+/awips2/httpd_openfire/var/log/httpd/*log {
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+        /sbin/service httpd-pypies reload > /dev/null 2>/dev/null || true
+    endscript
+}
--- a/rpms/awips2.core/Installer.httpd-collaboration/component.spec
+++ b/rpms/awips2.core/Installer.httpd-collaboration/component.spec
@ -0,0 +1,875 @@
+%define contentdir /var/www
+%define suexec_caller apache
+%define mmn 20051115
+%define vstring CentOS
+%define distro CentOS
+
+Summary: Collaboration Apache HTTP Server
+Name: awips2-httpd-collaboration
+Version: 2.2.3
+# This Is Officially Release: 22%{?dist}
+Release: 28%{?dist}
+URL: http://httpd.apache.org/
+Prefix: /awips2/httpd_collaboration
+Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
+Source1: centos_index.html
+Source5: httpd.sysconf
+Source8: centos_powered_by_rh.png
+Source10: httpd.conf
+Source11: ssl.conf
+Source12: welcome.conf
+Source13: manual.conf
+Source14: proxy_ajp.conf
+# Documentation
+Source30: migration.xml
+Source31: migration.css
+Source32: html.xsl
+Source33: README.confd
+# build/scripts patches
+Patch1: httpd-2.1.10-apctl.patch
+Patch2: httpd-2.1.10-apxs.patch
+Patch3: httpd-2.0.45-deplibs.patch
+Patch4: httpd-2.1.10-disablemods.patch
+Patch5: httpd-2.1.10-layout.patch
+Patch6: httpd-2.2.2-ac260.patch
+# Features/functional changes
+Patch20: httpd-2.0.48-release.patch
+Patch21: httpd-2.0.40-xfsz.patch
+Patch22: httpd-2.1.10-pod.patch
+Patch23: httpd-2.0.45-export.patch
+Patch24: httpd-2.0.48-corelimit.patch
+Patch25: httpd-2.0.54-selinux.patch
+Patch26: httpd-2.2.3-proxysessid.patch
+Patch27: httpd-2.2.3-proxypmatch.patch
+Patch28: httpd-2.2.3-nbchunk.patch
+# Bug fixes
+Patch50: httpd-2.0.45-encode.patch
+Patch54: httpd-2.2.0-authnoprov.patch
+Patch55: httpd-2.2.3-proxyopt.patch
+Patch56: httpd-2.2.3-proxyoride.patch
+Patch57: httpd-2.0.52-logresline.patch
+Patch58: httpd-2.2.3-ldappool.patch
+Patch59: httpd-2.2.3-ssldynlock.patch
+Patch60: httpd-2.0.52-escaperrs.patch
+Patch61: httpd-2.2.3-eventdlock.patch
+Patch62: httpd-2.2.3-hdrsedit.patch
+Patch63: httpd-2.2.3-dummyreq.patch
+# Security Fixes
+Patch100: httpd-2.2.3-CVE-2006-5752.patch
+Patch101: httpd-2.2.3-CVE-2007-1863.patch
+Patch102: httpd-2.2.3-CVE-2007-3304.patch
+Patch103: httpd-2.2.3-CVE-2007-3847.patch
+Patch104: httpd-2.2.3-CVE-2007-5000.patch
+Patch105: httpd-2.2.3-CVE-2007-4465.patch
+Patch106: httpd-2.2.3-CVE-2007-6421.patch
+Patch107: httpd-2.2.3-CVE-2007-6422.patch
+Patch108: httpd-2.2.3-CVE-2007-6388.patch
+Patch109: httpd-2.2.3-prftpcset.patch
+Patch110: httpd-2.2.3-CVE-2007-3304-update.patch
+Patch111: httpd-2.2.3-CVE-2008-2939.patch
+# Rebases
+Patch200: httpd-2.2.3-proxy229.patch
+Patch201: httpd-2.2.3-cache229.patch
+License: Apache Software License
+Group: AWIPSII
+BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: autoconf, perl, pkgconfig, xmlto >= 0.0.11, findutils
+BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
+BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0, 
+Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find
+Requires: initscripts >= 8.36
+Obsoletes: httpd-suexec
+Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
+Prereq: sh-utils, textutils, /usr/sbin/useradd
+Provides: webserver
+Provides: httpd-mmn = %{mmn}
+Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache, stronghold-htdocs
+Obsoletes: mod_put, mod_roaming, mod_jk
+Conflicts: pcre < 4.0
+
+%description
+The Apache HTTP Server is a powerful, efficient, and extensible
+web server.
+
+%package devel
+Group: AWIPSII
+Summary: Development tools for the Apache HTTP server.
+Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
+Requires: apr-devel, apr-util-devel, pkgconfig
+Requires: httpd = %{version}-%{release}
+
+%description devel
+The httpd-devel package contains the APXS binary and other files
+that you need to build Dynamic Shared Objects (DSOs) for the
+Apache HTTP Server.
+
+If you are installing the Apache HTTP server and you want to be
+able to compile or develop additional modules for Apache, you need
+to install this package.
+
+%package manual
+Group: AWIPSII
+Summary: Documentation for the Apache HTTP server.
+Requires: httpd = %{version}-%{release}
+Obsoletes: secureweb-manual, apache-manual
+
+%description manual
+The httpd-manual package contains the complete manual and
+reference guide for the Apache HTTP server. The information can
+also be found at http://httpd.apache.org/docs/2.2/.
+
+%package -n mod_ssl
+Group: AWIPSII
+Summary: SSL/TLS module for the Apache HTTP server
+Epoch: 1
+BuildRequires: openssl-devel, distcache-devel
+Requires(post): openssl >= 0.9.7f-4, /bin/cat
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
+Obsoletes: stronghold-mod_ssl
+
+%description -n mod_ssl
+The mod_ssl module provides strong cryptography for the Apache Web
+server via the Secure Sockets Layer (SSL) and Transport Layer
+Security (TLS) protocols.
+
+%prep
+%setup -q -n httpd-2.2.3
+%patch1 -p1 -b .apctl
+%patch2 -p1 -b .apxs
+%patch3 -p1 -b .deplibs
+%patch4 -p1 -b .disablemods
+%patch5 -p1 -b .layout
+%patch6 -p1 -b .ac260
+
+%patch21 -p0 -b .xfsz
+%patch22 -p1 -b .pod
+%patch23 -p1 -b .export
+%patch24 -p1 -b .corelimit
+%patch25 -p1 -b .selinux
+%patch26 -p1 -b .proxysessid
+%patch27 -p1 -b .proxypmatch
+%patch28 -p1 -b .nbchunk
+
+# no -b to prevent droplets in install root
+%patch50 -p1
+%patch54 -p1 -b .authnoprov
+%patch55 -p1 -b .proxyopt
+%patch56 -p1 -b .proxyoride
+%patch57 -p1 -b .logresline
+%patch58 -p1 -b .ldappool
+%patch59 -p1 -b .ssldynlock
+%patch60 -p1 -b .escaperrs
+%patch61 -p1 -b .eventdlock
+%patch62 -p1 -b .hdrsedit
+%patch63 -p1 -b .dummyreq
+
+%patch100 -p1 -b .cve5752
+%patch101 -p1 -b .cve1853
+%patch102 -p1 -b .cve3304
+%patch103 -p1 -b .cve3847
+%patch104 -p1 -b .cve5000
+%patch105 -p1 -b .cve4465
+%patch106 -p1 -b .cve6421
+%patch107 -p1 -b .cve6422
+%patch108 -p1 -b .cve6388
+%patch109 -p1 -b .prftpcset
+%patch110 -p1 -b .cve3304-update
+%patch111 -p1 -b .cve2939
+
+# Rebases -- any changes to proxy/cache modules must come later:
+%patch200 -p1 -b .proxy229
+%patch201 -p1 -b .cache229
+
+# Patch in vendor/release string
+sed "s/@VENDOR@/%{vstring}/;s/@RELEASE@/%{release}/" < %{PATCH20} | patch -p1 -b -z .release
+
+# Safety check: prevent build if defined MMN does not equal upstream MMN.
+vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
+if test "x${vmmn}" != "x%{mmn}"; then
+   : Error: Upstream MMN is now ${vmmn}, packaged MMN is %{mmn}.
+   : Update the mmn macro and rebuild.
+   exit 1
+fi
+
+: Building for '%{distro}' with MMN %{mmn} and vendor string '%{vstring}'
+
+%build
+# forcibly prevent use of bundled apr, apr-util, pcre
+rm -rf srclib/{apr,apr-util,pcre}
+
+# regenerate configure scripts
+autoheader && autoconf || exit 1
+
+# Limit size of CHANGES to recent history
+echo '1,/Changes with Apache MPM/wq' | ed CHANGES
+
+# Before configure; fix location of build dir in generated apxs
+%{__perl} -pi -e "s:\@exp_installbuilddir\@:/awips2/httpd_collaboration%{_libdir}/httpd/build:g" \
+	support/apxs.in
+# update location of migration guide in apachectl
+%{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \
+	support/apachectl.in
+
+# Build the migration guide
+sed 's/@DISTRO@/%{distro}/' < $RPM_SOURCE_DIR/migration.xml > migration.xml
+xmlto -x $RPM_SOURCE_DIR/html.xsl html-nochunks migration.xml
+cp $RPM_SOURCE_DIR/migration.css . # make %%doc happy
+
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+SH_LDFLAGS="-Wl,-z,relro"
+export CFLAGS SH_LDFLAGS
+
+# Hard-code path to links to avoid unnecessary builddep
+export LYNX_PATH=/usr/bin/links
+
+function mpmbuild()
+{
+mpm=$1; shift
+mkdir $mpm; pushd $mpm
+../configure \
+ 	--prefix=/awips2/httpd_collaboration%{_sysconfdir}/httpd \
+ 	--exec-prefix=/awips2/httpd_collaboration%{_prefix} \
+ 	--bindir=/awips2/httpd_collaboration%{_bindir} \
+ 	--sbindir=/awips2/httpd_collaboration%{_sbindir} \
+ 	--mandir=/awips2/httpd_collaboration/%{_mandir} \
+	--libdir=/awips2/httpd_collaboration%{_libdir} \
+	--sysconfdir=/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf \
+	--includedir=/awips2/httpd_collaboration%{_includedir}/httpd \
+	--libexecdir=/awips2/httpd_collaboration%{_libdir}/httpd/modules \
+	--datadir=/awips2/httpd_collaboration%{contentdir} \
+        --with-installbuilddir=/awips2/httpd_collaboration%{_libdir}/httpd/build \
+	--with-mpm=$mpm \
+        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
+	--enable-suexec --with-suexec \
+	--with-suexec-caller=%{suexec_caller} \
+	--with-suexec-docroot=/awips2/httpd_collaboration%{contentdir} \
+	--with-suexec-logfile=/awips2/httpd_collaboration%{_localstatedir}/log/httpd/suexec.log \
+	--with-suexec-bin=/awips2/httpd_collaboration%{_sbindir}/suexec \
+	--with-suexec-uidmin=500 --with-suexec-gidmin=100 \
+        --enable-pie \
+        --with-pcre \
+	$*
+
+make %{?_smp_mflags}
+popd
+}
+
+# Build everything and the kitchen sink with the prefork build
+mpmbuild prefork \
+        --enable-mods-shared=all \
+	--enable-ssl --with-ssl --enable-distcache \
+	--enable-proxy \
+        --enable-cache --enable-mem-cache \
+        --enable-file-cache --enable-disk-cache \
+        --enable-ldap --enable-authnz-ldap \
+        --enable-cgid \
+        --enable-authn-anon --enable-authn-alias
+
+# For the other MPMs, just build httpd and no optional modules
+mpmbuild worker --enable-modules=none
+mpmbuild event --enable-modules=none
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# Classify ab and logresolve as section 1 commands, as they are in /usr/bin
+mv docs/man/ab.8 docs/man/ab.1
+mv docs/man/logresolve.8 docs/man/logresolve.1
+
+pushd prefork
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
+
+# install alternative MPMs
+install -m 755 worker/httpd $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sbindir}/httpd.worker
+install -m 755 event/httpd $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sbindir}/httpd.event
+
+# install conf file/directory
+mkdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d
+install -m 644 $RPM_SOURCE_DIR/README.confd \
+    $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/README
+for f in ssl.conf welcome.conf manual.conf proxy_ajp.conf; do
+  install -m 644 $RPM_SOURCE_DIR/$f $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/$f
+done
+
+rm $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf/*.conf
+install -m 644 $RPM_SOURCE_DIR/httpd.conf \
+   $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf/httpd.conf
+
+mkdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/sysconfig
+install -m 644 $RPM_SOURCE_DIR/httpd.sysconf \
+   $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/sysconfig/httpd
+
+# for holding mod_dav lock database
+mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/lib/dav
+
+# create a prototype session cache
+mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/cache/mod_ssl
+touch $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/cache/mod_ssl/scache.{dir,pag,sem}
+
+# create cache root
+mkdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/cache/mod_proxy
+
+# move utilities to /usr/bin
+mv $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
+   $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_bindir}
+
+# Make the MMN accessible to module packages
+echo %{mmn} > $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_includedir}/httpd/.mmn
+
+# docroot
+mkdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/html
+install -m 644 $RPM_SOURCE_DIR/centos_index.html \
+	$RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/error/noindex.html
+
+# remove manual sources
+find $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/manual \( \
+    -name \*.xml -o -name \*.xml.* -o -name \*.ent -o -name \*.xsl -o -name \*.dtd \
+    \) -print0 | xargs -0 rm -f
+
+# added for branding
+install -m 644 %{SOURCE8} \
+        $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/icons/powered_by_rh.png
+
+# Strip the manual down just to English and replace the typemaps with flat files:
+set +x
+for f in `find $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/manual -name \*.html -type f`; do
+   if test -f ${f}.en; then
+      cp ${f}.en ${f}
+      rm ${f}.*
+   fi
+done
+set -x
+
+# logs
+rmdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/logs
+mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/log/httpd
+
+# run
+mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration/var/run
+
+mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration/var/lock/subsys/
+
+# symlinks for /etc/httpd
+ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/logs
+ln -s ../..%{_localstatedir}/run $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/run
+ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/modules
+
+# install service script.
+mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
+rpm_core_dir="%{_baseline_workspace}/Installer.rpm/awips2.core"
+collaboration_project_dir="${rpm_core_dir}/Installer.httpd-collaboration"
+install -m755 ${collaboration_project_dir}/configuration/etc/init.d/httpd-collaboration \
+    ${RPM_BUILD_ROOT}/etc/init.d
+
+# install log rotation stuff
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+install -m644 ${collaboration_project_dir}/SOURCES/httpd-collaboration.logrotate \
+	$RPM_BUILD_ROOT/etc/logrotate.d/httpd-collaboration
+
+# fix man page paths
+sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \
+    -e "s|/usr/local/apache2/conf/mime.types|/etc/mime.types|" \
+    -e "s|/usr/local/apache2/conf/magic|/etc/httpd/conf/magic|" \
+    -e "s|/usr/local/apache2/logs/error_log|/var/log/httpd/error_log|" \
+    -e "s|/usr/local/apache2/logs/access_log|/var/log/httpd/access_log|" \
+    -e "s|/usr/local/apache2/logs/httpd.pid|/var/run/httpd.pid|" \
+    -e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \
+  > $RPM_BUILD_ROOT/awips2/httpd_collaboration/%{_mandir}/man8/httpd.8
+
+# Make ap_config_layout.h libdir-agnostic
+sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
+    $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_includedir}/httpd/ap_config_layout.h
+
+# Fix path to instdso in special.mk
+sed -i '/instdso/s,top_srcdir,top_builddir,' \
+    $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/httpd/build/special.mk
+
+# Remove unpackaged files
+rm -f $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/*.exp \
+      $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/conf/mime.types \
+      $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/httpd/modules/*.exp \
+      $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/httpd/build/config.nice \
+      $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_bindir}/ap?-config \
+      $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sbindir}/{checkgid,dbmmanage,envvars*} \
+      $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/htdocs/* \
+      $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_mandir}/man1/dbmmanage.* \
+      $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/cgi-bin/*
+
+rm -rf $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/conf/{original,extra}
+
+# Make suexec a+rw so it can be stripped.  %%files lists real permissions
+chmod 755 $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sbindir}/suexec
+
+# Install the collaboration configuration.
+rpm_core_dir="%{_baseline_workspace}/Installer.rpm/awips2.core"
+collaboration_project_dir="${rpm_core_dir}/Installer.httpd-collaboration"
+install -m644 ${collaboration_project_dir}/configuration/apache/collaboration.conf \
+    ${RPM_BUILD_ROOT}/awips2/httpd_collaboration/etc/httpd/conf.d
+
+# Install & Override the httpd configuration.
+install -m644 ${collaboration_project_dir}/configuration/conf/httpd.conf \
+    ${RPM_BUILD_ROOT}/awips2/httpd_collaboration/etc/httpd/conf
+    
+# create the dav directory
+mkdir -p ${RPM_BUILD_ROOT}/awips2/httpd_collaboration/dav
+if [ $? -ne 0 ]; then
+   exit 1
+fi    
+
+# create the session_data directory.
+mkdir -p ${RPM_BUILD_ROOT}/awips2/httpd_collaboration/var/www/html/session_data
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+%pre
+# Add the "apache" user
+/usr/sbin/useradd -c "Apache" -u 48 \
+	-s /sbin/nologin -r -d /awips2/httpd_collaboration%{contentdir} apache 2> /dev/null || :
+
+%triggerpostun -- apache < 2.0, stronghold-apache < 2.0
+/sbin/chkconfig --add httpd-collaboration
+
+# Prevent removal of index.html on upgrades from 1.3
+%triggerun -- apache < 2.0, stronghold-apache < 2.0
+if [ -r /awips2/httpd_collaboration%{contentdir}/index.html -a ! -r /awips2/httpd_collaboration%{contentdir}/index.html.rpmold ]; then
+  mv /awips2/httpd_collaboration%{contentdir}/index.html /awips2/httpd_collaboration%{contentdir}/index.html.rpmold
+fi
+
+%post
+# Register the httpd service
+/sbin/chkconfig --add httpd-collaboration
+
+%preun
+# this is not compatible with our environment. attempting to shutdown
+# httpd-collaboration causes 'yum groupremove' to abort and leaves us with
+# an incomplete version of httpd-collaboration that cannot be un-installed.
+#if [ $1 = 0 ]; then
+#	/sbin/service httpd-collaboration stop > /dev/null 2>&1
+#	/sbin/chkconfig --del httpd-collaboration
+#fi
+
+%define sslcert /awips2/httpd_collaboration%{_sysconfdir}/pki/tls/certs/localhost.crt
+%define sslkey /awips2/httpd_collaboration%{_sysconfdir}/pki/tls/private/localhost.key
+
+%post -n mod_ssl
+umask 077
+
+if [ ! -f %{sslkey} ] ; then
+/awips2/httpd_collaboration%{_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
+fi
+
+FQDN=`hostname`
+if [ "x${FQDN}" = "x" ]; then
+   FQDN=localhost.localdomain
+fi
+
+if [ ! -f %{sslcert} ] ; then
+cat << EOF | /awips2/httpd_collaboration%{_bindir}/openssl req -new -key %{sslkey} \
+         -x509 -days 365 -set_serial $RANDOM \
+         -out %{sslcert} 2>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+fi
+
+%check
+# Check the built modules are all PIC
+if readelf -d $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/httpd/modules/*.so | grep TEXTREL; then
+   : modules contain non-relocatable code
+   exit 1
+fi
+
+# Verify that the same modules were built into the httpd binaries
+./prefork/httpd -l | grep -v prefork > prefork.mods
+for mpm in worker; do
+  ./${mpm}/httpd -l | grep -v ${mpm} > ${mpm}.mods
+  if ! diff -u prefork.mods ${mpm}.mods; then
+    : Different modules built into httpd binaries, will not proceed
+    exit 1
+  fi
+done
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,awips,fxalpha)
+
+%doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
+%doc migration.html migration.css
+
+%dir /awips2/httpd_collaboration
+%dir /awips2/httpd_collaboration/etc
+%dir /awips2/httpd_collaboration/etc/sysconfig
+%dir /awips2/httpd_collaboration/usr
+%dir /awips2/httpd_collaboration/usr/bin
+%dir /awips2/httpd_collaboration/usr/lib
+%dir /awips2/httpd_collaboration/usr/sbin
+/awips2/httpd_collaboration/usr/share
+%dir /awips2/httpd_collaboration/var
+%dir /awips2/httpd_collaboration/var/cache
+%dir /awips2/httpd_collaboration/var/lib
+%dir /awips2/httpd_collaboration/var/lock
+%dir /awips2/httpd_collaboration/var/log
+%dir /awips2/httpd_collaboration%{_sysconfdir}/httpd
+%dir /awips2/httpd_collaboration/var/run
+%dir /awips2/httpd_collaboration/var/lock/subsys/
+/awips2/httpd_collaboration%{_sysconfdir}/httpd/modules
+/awips2/httpd_collaboration%{_sysconfdir}/httpd/logs
+/awips2/httpd_collaboration%{_sysconfdir}/httpd/run
+%dir /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf
+%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf/httpd.conf
+%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/collaboration.conf
+%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/welcome.conf
+%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/proxy_ajp.conf
+%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf/magic
+
+%config(noreplace) %{_sysconfdir}/logrotate.d/httpd-collaboration
+%config(noreplace) %{_sysconfdir}/init.d/httpd-collaboration
+
+%dir /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d
+/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/README
+
+%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/sysconfig/httpd
+
+/awips2/httpd_collaboration%{_bindir}/*
+/awips2/httpd_collaboration%{_sbindir}/ht*
+/awips2/httpd_collaboration%{_sbindir}/apachectl
+/awips2/httpd_collaboration%{_sbindir}/rotatelogs
+%attr(4510,awips,fxalpha) /awips2/httpd_collaboration%{_sbindir}/suexec
+
+%dir /awips2/httpd_collaboration%{_libdir}/httpd
+%dir /awips2/httpd_collaboration%{_libdir}/httpd/modules
+/awips2/httpd_collaboration%{_libdir}/httpd/modules/mod*.so
+%exclude /awips2/httpd_collaboration%{_libdir}/httpd/modules/mod_ssl.so
+
+%dir /awips2/httpd_collaboration%{contentdir}
+%dir /awips2/httpd_collaboration%{contentdir}/cgi-bin
+%dir /awips2/httpd_collaboration%{contentdir}/html
+%dir /awips2/httpd_collaboration%{contentdir}/icons
+%dir /awips2/httpd_collaboration%{contentdir}/error
+%dir /awips2/httpd_collaboration%{contentdir}/error/include
+/awips2/httpd_collaboration%{contentdir}/icons/*
+/awips2/httpd_collaboration%{contentdir}/error/README
+/awips2/httpd_collaboration%{contentdir}/error/noindex.html
+%config /awips2/httpd_collaboration%{contentdir}/error/*.var
+%config /awips2/httpd_collaboration%{contentdir}/error/include/*.html
+
+%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/log/httpd
+%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/lib/dav
+%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/cache/mod_proxy
+
+/awips2/httpd_collaboration/%{_mandir}/man?/*
+%exclude /awips2/httpd_collaboration/%{_mandir}/man8/apxs.8*
+
+%defattr(777,awips,fxalpha,777)
+%dir /awips2/httpd_collaboration/var/www/html/session_data
+
+%defattr(-,awips,fxalpha,755)
+%dir /awips2/httpd_collaboration/dav
+
+%files manual
+%defattr(-,root,root)
+/awips2/httpd_collaboration%{contentdir}/manual
+%config /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/manual.conf
+
+%files -n mod_ssl
+%defattr(-,root,root)
+/awips2/httpd_collaboration%{_libdir}/httpd/modules/mod_ssl.so
+%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/ssl.conf
+%attr(0700,apache,root) %dir /awips2/httpd_collaboration%{_localstatedir}/cache/mod_ssl
+%attr(0600,apache,root) %ghost /awips2/httpd_collaboration%{_localstatedir}/cache/mod_ssl/scache.dir
+%attr(0600,apache,root) %ghost /awips2/httpd_collaboration%{_localstatedir}/cache/mod_ssl/scache.pag
+%attr(0600,apache,root) %ghost /awips2/httpd_collaboration%{_localstatedir}/cache/mod_ssl/scache.sem
+
+%files devel
+%defattr(-,root,root)
+/awips2/httpd_collaboration%{_includedir}/httpd
+/awips2/httpd_collaboration%{_sbindir}/apxs
+/awips2/httpd_collaboration/%{_mandir}/man8/apxs.8*
+%dir /awips2/httpd_collaboration%{_libdir}/httpd/build
+/awips2/httpd_collaboration%{_libdir}/httpd/build/*.mk
+/awips2/httpd_collaboration%{_libdir}/httpd/build/*.sh
+
+%changelog
+* Thu Jan 22 2009 Karanbir Singh <kbsingh@centos.org> 2.2.3-22.el5.centos
+- Roll in CentOS branding changes
+
+* Wed Nov 12 2008 Joe Orton <jorton@redhat.com> 2.2.3-22.el5
+- add security fixes for CVE-2008-2939 (#468841)
+- note that the mod_proxy 2.2.9 rebase fixed CVE-2008-2634
+
+* Tue Oct 21 2008 Joe Orton <jorton@redhat.com> 2.2.3-21.el5
+- avoid strict-aliasing warnings (#462877)
+
+* Tue Oct 21 2008 Joe Orton <jorton@redhat.com> 2.2.3-20.el5
+- mod_proxy: scoreboard access fix (#252024)
+
+* Thu Sep 18 2008 Joe Orton <jorton@redhat.com> 2.2.3-19.el5
+- mod_proxy: various backport fixes (#252024)
+
+* Thu Sep 18 2008 Joe Orton <jorton@redhat.com> 2.2.3-17.el5
+- fix mod_proxy symbol use
+
+* Mon Sep 15 2008 Joe Orton <jorton@redhat.com> 2.2.3-16.el5
+- mod_proxy*, mod_cache*: rebase to 2.2.9 (#252024, #249534,
+  #439842)
+- backport changes to make chunk filter non-blocking (#454098)
+
+* Fri Sep 12 2008 Joe Orton <jorton@redhat.com> 2.2.3-15.el5
+- mod_ldap: fix memory lifetime issues (#440259)
+- mod_ssl: configure OpenSSL dynamic lock callbacks (#462044)
+- escape the Request-Method in canned error responses (#445888)
+- build the event MPM and fix a deadlock therein (#444643)
+- mod_headers: support "RequestHeader edit" (#428253)
+- use "OPTIONS *" rather than "GET /" in dummy connection (#367981)
+
+* Thu Aug 14 2008 Joe Orton <jorton@redhat.com> 2.2.3-14.el5
+- mod_proxy: add ProxyPassMatch support (#449159)
+
+* Mon Jul 21 2008 Joe Orton <jorton@redhat.com> 2.2.3-13.el5
+- mod_proxy_balancer: allow alternative string to match for
+  stickysession parameter (#439218)
+- fix dist tag in Release (#440615)
+
+* Fri Jan 11 2008 Joe Orton <jorton@redhat.com> 2.2.3-12.el5_1.3
+- further update to backport for CVE-2007-6421 (#427240)
+
+* Fri Jan 11 2008 Joe Orton <jorton@redhat.com> 2.2.3-12.el5_1.2
+- updated backport for CVE-2007-6421 (#427240)
+
+* Mon Jan  7 2008 Joe Orton <jorton@redhat.com> 2.2.3-11.el5_1.1
+- add security fixes for CVE-2007-6388, CVE-2007-6421
+  and CVE-2007-6422 (#427240)
+- add security fix for CVE-2007-4465, CVE-2007-5000 (#421631)
+- add security fix for mod_proxy_ftp UTF-7 XSS (#427745)
+
+* Mon Aug  6 2007 Joe Orton <jorton@redhat.com> 2.2.3-11.el5
+- mark httpd.conf config(noreplace) (#247881)
+
+* Fri Aug  3 2007 Joe Orton <jorton@redhat.com> 2.2.3-10.el5
+- add security fix for CVE-2007-3847 (#250761)
+
+* Wed Aug  1 2007 Joe Orton <jorton@redhat.com> 2.2.3-9.el5
+- load mod_version by default (#247881)
+
+* Tue Jun 26 2007 Joe Orton <jorton@redhat.com> 2.2.3-8.el5
+- add 'ServerTokens Full-Release' config option (#240857)
+- use init script in logrotate postrotate (#241680)
+- fix mod_proxy option inheritance (#245719)
+- fix ProxyErrorOverride to only affect 4xx, 5xx responses (#240024)
+- bump logresolve line buffer length to 10K (#245763)
+- add security fixes for CVE-2007-1863, CVE-2007-3304,
+  and CVE-2006-5752 (#244666)
+
+* Wed Nov 29 2006 Joe Orton <jorton@redhat.com> 2.2.3-6.el5
+- fix path to instdso.sh in special.mk (#217677)
+- fix detection of links in "apachectl fullstatus"
+
+* Tue Sep 19 2006 Joe Orton <jorton@redhat.com> 2.2.3-5.el5
+- rebuild
+
+* Fri Aug 11 2006 Joe Orton <jorton@redhat.com> 2.2.3-3.el5
+- use RHEL branding
+
+* Thu Aug  3 2006 Joe Orton <jorton@redhat.com> 2.2.3-3
+- init: use killproc() delay to avoid race killing parent
+
+* Fri Jul 28 2006 Joe Orton <jorton@redhat.com> 2.2.3-2
+- update to 2.2.3
+- trim %%changelog to >=2.0.52
+
+* Thu Jul 20 2006 Joe Orton <jorton@redhat.com> 2.2.2-8
+- fix segfault on dummy connection failure at graceful restart (#199429)
+
+* Wed Jul 19 2006 Joe Orton <jorton@redhat.com> 2.2.2-7
+- fix "apxs -g"-generated Makefile
+- fix buildconf with autoconf 2.60
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.2.2-5.1
+- rebuild
+
+* Wed Jun  7 2006 Joe Orton <jorton@redhat.com> 2.2.2-5
+- require pkgconfig for -devel (#194152)
+- fixes for installed support makefiles (special.mk et al)
+- BR autoconf
+
+* Fri Jun  2 2006 Joe Orton <jorton@redhat.com> 2.2.2-4
+- make -devel package multilib-safe (#192686)
+
+* Thu May 11 2006 Joe Orton <jorton@redhat.com> 2.2.2-3
+- build DSOs using -z relro linker flag
+
+* Wed May  3 2006 Joe Orton <jorton@redhat.com> 2.2.2-2
+- update to 2.2.2
+
+* Thu Apr  6 2006 Joe Orton <jorton@redhat.com> 2.2.0-6
+- rebuild to pick up apr-util LDAP interface fix (#188073)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - (none):2.2.0-5.1.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - (none):2.2.0-5.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Feb  6 2006 Joe Orton <jorton@redhat.com> 2.2.0-5.1
+- mod_auth_basic/mod_authn_file: if no provider is configured,
+  and AuthUserFile is not configured, decline to handle authn
+  silently rather than failing noisily.
+
+* Fri Feb  3 2006 Joe Orton <jorton@redhat.com> 2.2.0-5
+- mod_ssl: add security fix for CVE-2005-3357 (#177914)
+- mod_imagemap: add security fix for CVE-2005-3352 (#177913)
+- add fix for AP_INIT_* designated initializers with C++ compilers
+- httpd.conf: enable HTMLTable in default IndexOptions
+- httpd.conf: add more "redirect-carefully" matches for DAV clients
+
+* Thu Jan  5 2006 Joe Orton <jorton@redhat.com> 2.2.0-4
+- mod_proxy_ajp: fix Cookie handling (Mladen Turk, r358769)
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Wed Dec  7 2005 Joe Orton <jorton@redhat.com> 2.2.0-3
+- strip manual to just English content
+
+* Mon Dec  5 2005 Joe Orton <jorton@redhat.com> 2.2.0-2
+- don't strip C-L from HEAD responses (Greg Ames, #110552)
+- load mod_proxy_balancer by default
+- add proxy_ajp.conf to load/configure mod_proxy_ajp
+- Obsolete mod_jk
+- update docs URLs in httpd.conf/ssl.conf
+
+* Fri Dec  2 2005 Joe Orton <jorton@redhat.com> 2.2.0-1
+- update to 2.2.0
+
+* Wed Nov 30 2005 Joe Orton <jorton@redhat.com> 2.1.10-2
+- enable mod_authn_alias, mod_authn_anon
+- update default httpd.conf
+
+* Fri Nov 25 2005 Joe Orton <jorton@redhat.com> 2.1.10-1
+- update to 2.1.10
+- require apr >= 1.2.0, apr-util >= 1.2.0
+
+* Wed Nov  9 2005 Tomas Mraz <tmraz@redhat.com> 2.0.54-16
+- rebuilt against new openssl
+
+* Thu Nov  3 2005 Joe Orton <jorton@redhat.com> 2.0.54-15
+- log notice giving SELinux context at startup if enabled
+- drop SSLv2 and restrict default cipher suite in default
+ SSL configuration
+
+* Thu Oct 20 2005 Joe Orton <jorton@redhat.com> 2.0.54-14
+- mod_ssl: add security fix for SSLVerifyClient (CVE-2005-2700)
+- add security fix for byterange filter DoS (CVE-2005-2728)
+- add security fix for C-L vs T-E handling (CVE-2005-2088)
+- mod_ssl: add security fix for CRL overflow (CVE-2005-1268)
+- mod_ldap/mod_auth_ldap: add fixes from 2.0.x branch (upstream #34209 etc)
+- add fix for dummy connection handling (#167425)
+- mod_auth_digest: fix hostinfo comparison in CONNECT requests
+- mod_include: fix variable corruption in nested includes (upstream #12655)
+- mod_ssl: add fix for handling non-blocking reads
+- mod_ssl: fix to enable output buffering (upstream #35279)
+- mod_ssl: buffer request bodies for per-location renegotiation (upstream #12355)
+
+* Sat Aug 13 2005 Joe Orton <jorton@redhat.com> 2.0.54-13
+- don't load by default: mod_cern_meta, mod_asis
+- do load by default: mod_ext_filter (#165893)
+
+* Thu Jul 28 2005 Joe Orton <jorton@redhat.com> 2.0.54-12
+- drop broken epoch deps
+
+* Thu Jun 30 2005 Joe Orton <jorton@redhat.com> 2.0.54-11
+- mod_dav_fs: fix uninitialized variable (#162144)
+- add epoch to dependencies as appropriate
+- mod_ssl: drop dependencies on dev, make
+- mod_ssl: mark post script dependencies as such
+
+* Mon May 23 2005 Joe Orton <jorton@redhat.com> 2.0.54-10
+- remove broken symlink (Robert Scheck, #158404)
+
+* Wed May 18 2005 Joe Orton <jorton@redhat.com> 2.0.54-9
+- add piped logger fixes (w/Jeff Trawick)
+
+* Mon May  9 2005 Joe Orton <jorton@redhat.com> 2.0.54-8
+- drop old "powered by Red Hat" logos
+
+* Wed May  4 2005 Joe Orton <jorton@redhat.com> 2.0.54-7
+- mod_userdir: fix memory allocation issue (upstream #34588)
+- mod_ldap: fix memory corruption issue (Brad Nicholes, upstream #34618)
+
+* Tue Apr 26 2005 Joe Orton <jorton@redhat.com> 2.0.54-6
+- fix key/cert locations in post script
+
+* Mon Apr 25 2005 Joe Orton <jorton@redhat.com> 2.0.54-5
+- create default dummy cert in /etc/pki/tls
+- use a pseudo-random serial number on the dummy cert
+- change default ssl.conf to point at /etc/pki/tls
+- merge back -suexec subpackage; SELinux policy can now be
+  used to persistently disable suexec (#155716)
+- drop /etc/httpd/conf/ssl.* directories and Makefiles
+- unconditionally enable PIE support
+- mod_ssl: fix for picking up -shutdown options (upstream #34452)
+
+* Mon Apr 18 2005 Joe Orton <jorton@redhat.com> 2.0.54-4
+- replace PreReq with Requires(pre) 
+
+* Mon Apr 18 2005 Joe Orton <jorton@redhat.com> 2.0.54-3
+- update to 2.0.54
+
+* Tue Mar 29 2005 Joe Orton <jorton@redhat.com> 2.0.53-6
+- update default httpd.conf:
+ * clarify the comments on AddDefaultCharset usage (#135821)
+ * remove all the AddCharset default extensions
+ * don't load mod_imap by default
+ * synch with upstream 2.0.53 httpd-std.conf
+- mod_ssl: set user from SSLUserName in access hook (upstream #31418)
+- htdigest: fix permissions of created files (upstream #33765)
+- remove htsslpass
+
+* Wed Mar  2 2005 Joe Orton <jorton@redhat.com> 2.0.53-5
+- apachectl: restore use of $OPTIONS again
+
+* Wed Feb  9 2005 Joe Orton <jorton@redhat.com> 2.0.53-4
+- update to 2.0.53
+- move prefork/worker modules comparison to %%check
+
+* Mon Feb  7 2005 Joe Orton <jorton@redhat.com> 2.0.52-7
+- fix cosmetic issues in "service httpd reload"
+- move User/Group higher in httpd.conf (#146793)
+- load mod_logio by default in httpd.conf
+- apachectl: update for correct libselinux tools locations
+
+* Tue Nov 16 2004 Joe Orton <jorton@redhat.com> 2.0.52-6
+- add security fix for CVE CAN-2004-0942 (memory consumption DoS)
+- SELinux: run httpd -t under runcon in configtest (Steven Smalley)
+- fix SSLSessionCache comment for distcache in ssl.conf
+- restart using SIGHUP not SIGUSR1 after logrotate
+- add ap_save_brigade fix (upstream #31247)
+- mod_ssl: fix possible segfault in auth hook (upstream #31848)
+- add htsslpass(1) and configure as default SSLPassPhraseDialog (#128677)
+- apachectl: restore use of $OPTIONS
+- apachectl, httpd.init: refuse to restart if $HTTPD -t fails
+- apachectl: run $HTTPD -t in user SELinux context for configtest
+- update for pcre-5.0 header locations
+
+* Sat Nov 13 2004 Jeff Johnson <jbj@redhat.com> 2.0.52-5
+- rebuild against db-4.3.21 aware apr-util.
+
+* Thu Nov 11 2004 Jeff Johnson <jbj@jbj.org> 2.0.52-4
+- rebuild against db-4.3-21.
+
+* Thu Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-3
+- add dummy connection address fixes from HEAD
+- mod_ssl: add security fix for CAN-2004-0885
+
+* Tue Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-2
+- update to 2.0.52
+
--- a/rpms/awips2.core/Installer.httpd-collaboration/configuration/apache/collaboration.conf
+++ b/rpms/awips2.core/Installer.httpd-collaboration/configuration/apache/collaboration.conf
@ -0,0 +1,3 @@
+<Location /session_data>
+	Dav On
+</Location>
--- a/rpms/awips2.core/Installer.httpd-collaboration/configuration/conf/httpd.conf
+++ b/rpms/awips2.core/Installer.httpd-collaboration/configuration/conf/httpd.conf
@ -0,0 +1,991 @@
+#
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.2/> for detailed information.
+# In particular, see
+# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# The configuration directives are grouped into three basic sections:
+#  1. Directives that control the operation of the Apache server process as a
+#     whole (the 'global environment').
+#  2. Directives that define the parameters of the 'main' or 'default' server,
+#     which responds to requests that aren't handled by a virtual host.
+#     These directives also provide default values for the settings
+#     of all virtual hosts.
+#  3. Settings for virtual hosts, which allow Web requests to be sent to
+#     different IP addresses or hostnames and have them handled by the
+#     same Apache server process.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
+# with ServerRoot set to "/etc/httpd" will be interpreted by the
+# server as "/etc/httpd/logs/foo.log".
+#
+
+### Section 1: Global Environment
+#
+# The directives in this section affect the overall operation of Apache,
+# such as the number of concurrent requests it can handle or where it
+# can find its configuration files.
+#
+
+#
+# Don't give away too much information about all the subcomponents
+# we are running.  Comment out this line if you don't mind remote sites
+# finding out what major optional modules you are running
+ServerTokens OS
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the LockFile documentation
+# (available at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+ServerRoot "/awips2/httpd_collaboration/etc/httpd"
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+#
+PidFile run/httpd.pid
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 120
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 50
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 15
+
+##
+## Server-Pool Size Regulation (MPM specific)
+## 
+
+# prefork MPM
+# StartServers: number of server processes to start
+# MinSpareServers: minimum number of server processes which are kept spare
+# MaxSpareServers: maximum number of server processes which are kept spare
+# ServerLimit: maximum value for MaxClients for the lifetime of the server
+# MaxClients: maximum number of server processes allowed to start
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule prefork.c>
+StartServers       8
+MinSpareServers    5
+MaxSpareServers   20
+ServerLimit      256
+MaxClients       256
+MaxRequestsPerChild  50
+</IfModule>
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule worker.c>
+StartServers         2
+MaxClients         150
+MinSpareThreads     25
+MaxSpareThreads     75 
+ThreadsPerChild     25
+MaxRequestsPerChild  0
+</IfModule>
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, in addition to the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule auth_digest_module modules/mod_auth_digest.so
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authn_alias_module modules/mod_authn_alias.so
+LoadModule authn_anon_module modules/mod_authn_anon.so
+LoadModule authn_dbm_module modules/mod_authn_dbm.so
+LoadModule authn_default_module modules/mod_authn_default.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule authz_owner_module modules/mod_authz_owner.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_dbm_module modules/mod_authz_dbm.so
+LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule ldap_module modules/mod_ldap.so
+LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
+LoadModule include_module modules/mod_include.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule logio_module modules/mod_logio.so
+LoadModule env_module modules/mod_env.so
+LoadModule ext_filter_module modules/mod_ext_filter.so
+LoadModule mime_magic_module modules/mod_mime_magic.so
+LoadModule expires_module modules/mod_expires.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule usertrack_module modules/mod_usertrack.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule info_module modules/mod_info.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule actions_module modules/mod_actions.so
+LoadModule speling_module modules/mod_speling.so
+LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule proxy_connect_module modules/mod_proxy_connect.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule suexec_module modules/mod_suexec.so
+LoadModule disk_cache_module modules/mod_disk_cache.so
+LoadModule file_cache_module modules/mod_file_cache.so
+LoadModule mem_cache_module modules/mod_mem_cache.so
+LoadModule cgi_module modules/mod_cgi.so
+LoadModule version_module modules/mod_version.so
+
+#
+# The following modules are not loaded by default:
+#
+#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule asis_module modules/mod_asis.so
+
+#
+# Load config files from the config directory "/etc/httpd/conf.d".
+#
+Include conf.d/*.conf
+
+#
+# ExtendedStatus controls whether Apache will generate "full" status
+# information (ExtendedStatus On) or just basic information (ExtendedStatus
+# Off) when the "server-status" handler is called. The default is Off.
+#
+#ExtendedStatus On
+
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+#  . On SCO (ODT 3) use "User nouser" and "Group nogroup".
+#  . On HPUX you may not be able to use shared memory as nobody, and the
+#    suggested workaround is to create a user www and use that user.
+#  NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET)
+#  when the value of (unsigned)Group is above 60000; 
+#  don't use Group #-1 on these systems!
+#
+User awips
+Group awips
+
+### Section 2: 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin root@localhost
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If this is not set to valid DNS name for your host, server-generated
+# redirections will not work.  See also the UseCanonicalName directive.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+# You will have to access it by its address anyway, and this will make 
+# redirections work in a sensible way.
+#
+#ServerName www.example.com:80
+
+#
+# UseCanonicalName: Determines how Apache constructs self-referencing 
+# URLs and the SERVER_NAME and SERVER_PORT variables.
+# When set "Off", Apache will use the Hostname and Port supplied
+# by the client.  When set "On", Apache will use the value of the
+# ServerName directive.
+#
+UseCanonicalName Off
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/awips2/httpd_collaboration/var/www/html"
+
+#
+# Each directory to which Apache has access can be configured with respect
+# to which services and features are allowed and/or disabled in that
+# directory (and its subdirectories). 
+#
+# First, we configure the "default" to be a very restrictive set of 
+# features.  
+#
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# This should be changed to whatever you set DocumentRoot to.
+#
+<Directory "/awips2/httpd_collaboration/var/www/html">
+
+#
+# Possible values for the Options directive are "None", "All",
+# or any combination of:
+#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+#
+# Note that "MultiViews" must be named *explicitly* --- "Options All"
+# doesn't give it to you.
+#
+# The Options directive is both complicated and important.  Please see
+# http://httpd.apache.org/docs/2.2/mod/core.html#options
+# for more information.
+#
+    Options Indexes FollowSymLinks
+
+#
+# AllowOverride controls what directives may be placed in .htaccess files.
+# It can be "All", "None", or any combination of the keywords:
+#   Options FileInfo AuthConfig Limit
+#
+    AllowOverride None
+
+#
+# Controls who can get stuff from this server.
+#
+    Order allow,deny
+    Allow from all
+
+</Directory>
+
+#
+# UserDir: The name of the directory that is appended onto a user's home
+# directory if a ~user request is received.
+#
+# The path to the end user account 'public_html' directory must be
+# accessible to the webserver userid.  This usually means that ~userid
+# must have permissions of 711, ~userid/public_html must have permissions
+# of 755, and documents contained therein must be world-readable.
+# Otherwise, the client will only receive a "403 Forbidden" message.
+#
+# See also: http://httpd.apache.org/docs/misc/FAQ.html#forbidden
+#
+<IfModule mod_userdir.c>
+    #
+    # UserDir is disabled by default since it can confirm the presence
+    # of a username on the system (depending on home directory
+    # permissions).
+    #
+    UserDir disable
+
+    #
+    # To enable requests to /~user/ to serve the user's public_html
+    # directory, remove the "UserDir disable" line above, and uncomment
+    # the following line instead:
+    # 
+    #UserDir public_html
+
+</IfModule>
+
+#
+# Control access to UserDir directories.  The following is an example
+# for a site where these directories are restricted to read-only.
+#
+#<Directory /home/*/public_html>
+#    AllowOverride FileInfo AuthConfig Limit
+#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+#    <Limit GET POST OPTIONS>
+#        Order allow,deny
+#        Allow from all
+#    </Limit>
+#    <LimitExcept GET POST OPTIONS>
+#        Order deny,allow
+#        Deny from all
+#    </LimitExcept>
+#</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+# The index.html.var file (a type-map) is used to deliver content-
+# negotiated documents.  The MultiViews Option can be used for the 
+# same purpose, but it is much slower.
+#
+DirectoryIndex index.html index.html.var
+
+#
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ~ "^\.ht">
+    Order allow,deny
+    Deny from all
+</Files>
+
+#
+# TypesConfig describes where the mime.types file (or equivalent) is
+# to be found.
+#
+TypesConfig /etc/mime.types
+
+#
+# DefaultType is the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+<IfModule mod_mime_magic.c>
+#   MIMEMagicFile /usr/share/magic.mime
+    MIMEMagicFile conf/magic
+</IfModule>
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+#
+# EnableMMAP: Control whether memory-mapping is used to deliver
+# files (assuming that the underlying OS supports it).
+# The default is on; turn this off if you serve from NFS-mounted 
+# filesystems.  On some systems, turning it off (regardless of
+# filesystem) can improve performance; for details, please see
+# http://httpd.apache.org/docs/2.2/mod/core.html#enablemmap
+#
+#EnableMMAP off
+
+#
+# EnableSendfile: Control whether the sendfile kernel support is 
+# used to deliver files (assuming that the OS supports it). 
+# The default is on; turn this off if you serve from NFS-mounted 
+# filesystems.  Please see
+# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
+#
+#EnableSendfile off
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog logs/error_log
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
+#
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+# "combinedio" includes actual counts of actual bytes received (%I) and sent (%O); this
+# requires the mod_logio module to be loaded.
+#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+
+#
+# The location and format of the access logfile (Common Logfile Format).
+# If you do not define any access logfiles within a <VirtualHost>
+# container, they will be logged here.  Contrariwise, if you *do*
+# define per-<VirtualHost> access logfiles, transactions will be
+# logged therein and *not* in this file.
+#
+#CustomLog logs/access_log common
+
+#
+# If you would like to have separate agent and referer logfiles, uncomment
+# the following directives.
+#
+#CustomLog logs/referer_log referer
+#CustomLog logs/agent_log agent
+
+#
+# For a single logfile with access, agent, and referer information
+# (Combined Logfile Format), use the following directive:
+#
+CustomLog logs/access_log combined
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory
+# listings, mod_status and mod_info output etc., but not CGI generated
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+ServerSignature On
+
+#
+# Aliases: Add here as many aliases as you need (with no limit). The format is 
+# Alias fakename realname
+#
+# Note that if you include a trailing / on fakename then the server will
+# require it to be present in the URL.  So "/icons" isn't aliased in this
+# example, only "/icons/".  If the fakename is slash-terminated, then the 
+# realname must also be slash terminated, and if the fakename omits the 
+# trailing slash, the realname must also omit it.
+#
+# We include the /icons/ alias for FancyIndexed directory listings.  If you
+# do not use FancyIndexing, you may comment this out.
+#
+Alias /icons/ "/awips2/httpd_collaboration/var/www/icons/"
+
+<Directory "/awips2/httpd_collaboration/var/www/icons">
+    Options Indexes MultiViews
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# WebDAV module configuration section.
+# 
+<IfModule mod_dav_fs.c>
+    # Location of the WebDAV lock database.
+    DAVLockDB /awips2/httpd_collaboration/dav/lockdb
+</IfModule>
+
+#
+# ScriptAlias: This controls which directories contain server scripts.
+# ScriptAliases are essentially the same as Aliases, except that
+# documents in the realname directory are treated as applications and
+# run by the server when requested rather than as documents sent to the client.
+# The same rules about trailing "/" apply to ScriptAlias directives as to
+# Alias.
+#
+ScriptAlias /cgi-bin/ "/awips2/httpd_collaboration/var/www/cgi-bin/"
+
+#
+# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/awips2/httpd_collaboration/var/www/cgi-bin">
+    AllowOverride None
+    Options None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# Redirect allows you to tell clients about documents which used to exist in
+# your server's namespace, but do not anymore. This allows you to tell the
+# clients where to look for the relocated document.
+# Example:
+# Redirect permanent /foo http://www.example.com/bar
+
+#
+# Directives controlling the display of server-generated directory listings.
+#
+
+#
+# IndexOptions: Controls the appearance of server-generated directory
+# listings.
+#
+IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable
+
+#
+# AddIcon* directives tell the server which icon to show for different
+# files or filename extensions.  These are only displayed for
+# FancyIndexed directories.
+#
+AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
+
+AddIconByType (TXT,/icons/text.gif) text/*
+AddIconByType (IMG,/icons/image2.gif) image/*
+AddIconByType (SND,/icons/sound2.gif) audio/*
+AddIconByType (VID,/icons/movie.gif) video/*
+
+AddIcon /icons/binary.gif .bin .exe
+AddIcon /icons/binhex.gif .hqx
+AddIcon /icons/tar.gif .tar
+AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
+AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
+AddIcon /icons/a.gif .ps .ai .eps
+AddIcon /icons/layout.gif .html .shtml .htm .pdf
+AddIcon /icons/text.gif .txt
+AddIcon /icons/c.gif .c
+AddIcon /icons/p.gif .pl .py
+AddIcon /icons/f.gif .for
+AddIcon /icons/dvi.gif .dvi
+AddIcon /icons/uuencoded.gif .uu
+AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
+AddIcon /icons/tex.gif .tex
+AddIcon /icons/bomb.gif core
+
+AddIcon /icons/back.gif ..
+AddIcon /icons/hand.right.gif README
+AddIcon /icons/folder.gif ^^DIRECTORY^^
+AddIcon /icons/blank.gif ^^BLANKICON^^
+
+#
+# DefaultIcon is which icon to show for files which do not have an icon
+# explicitly set.
+#
+DefaultIcon /icons/unknown.gif
+
+#
+# AddDescription allows you to place a short description after a file in
+# server-generated indexes.  These are only displayed for FancyIndexed
+# directories.
+# Format: AddDescription "description" filename
+#
+#AddDescription "GZIP compressed document" .gz
+#AddDescription "tar archive" .tar
+#AddDescription "GZIP compressed tar archive" .tgz
+
+#
+# ReadmeName is the name of the README file the server will look for by
+# default, and append to directory listings.
+#
+# HeaderName is the name of a file which should be prepended to
+# directory indexes. 
+ReadmeName README.html
+HeaderName HEADER.html
+
+#
+# IndexIgnore is a set of filenames which directory indexing should ignore
+# and not include in the listing.  Shell-style wildcarding is permitted.
+#
+IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
+
+#
+# DefaultLanguage and AddLanguage allows you to specify the language of 
+# a document. You can then use content negotiation to give a browser a 
+# file in a language the user can understand.
+#
+# Specify a default language. This means that all data
+# going out without a specific language tag (see below) will 
+# be marked with this one. You probably do NOT want to set
+# this unless you are sure it is correct for all cases.
+#
+# * It is generally better to not mark a page as 
+# * being a certain language than marking it with the wrong
+# * language!
+#
+# DefaultLanguage nl
+#
+# Note 1: The suffix does not have to be the same as the language
+# keyword --- those with documents in Polish (whose net-standard
+# language code is pl) may wish to use "AddLanguage pl .po" to
+# avoid the ambiguity with the common suffix for perl scripts.
+#
+# Note 2: The example entries below illustrate that in some cases 
+# the two character 'Language' abbreviation is not identical to 
+# the two character 'Country' code for its country,
+# E.g. 'Danmark/dk' versus 'Danish/da'.
+#
+# Note 3: In the case of 'ltz' we violate the RFC by using a three char
+# specifier. There is 'work in progress' to fix this and get
+# the reference data for rfc1766 cleaned up.
+#
+# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
+# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de)
+# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja)
+# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
+# Norwegian (no) - Polish (pl) - Portugese (pt)
+# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
+# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW)
+#
+AddLanguage ca .ca
+AddLanguage cs .cz .cs
+AddLanguage da .dk
+AddLanguage de .de
+AddLanguage el .el
+AddLanguage en .en
+AddLanguage eo .eo
+AddLanguage es .es
+AddLanguage et .et
+AddLanguage fr .fr
+AddLanguage he .he
+AddLanguage hr .hr
+AddLanguage it .it
+AddLanguage ja .ja
+AddLanguage ko .ko
+AddLanguage ltz .ltz
+AddLanguage nl .nl
+AddLanguage nn .nn
+AddLanguage no .no
+AddLanguage pl .po
+AddLanguage pt .pt
+AddLanguage pt-BR .pt-br
+AddLanguage ru .ru
+AddLanguage sv .sv
+AddLanguage zh-CN .zh-cn
+AddLanguage zh-TW .zh-tw
+
+#
+# LanguagePriority allows you to give precedence to some languages
+# in case of a tie during content negotiation.
+#
+# Just list the languages in decreasing order of preference. We have
+# more or less alphabetized them here. You probably want to change this.
+#
+LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+
+#
+# ForceLanguagePriority allows you to serve a result page rather than
+# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
+# [in case no accepted languages matched the available variants]
+#
+ForceLanguagePriority Prefer Fallback
+
+#
+# Specify a default charset for all content served; this enables
+# interpretation of all content as UTF-8 by default.  To use the 
+# default browser choice (ISO-8859-1), or to allow the META tags
+# in HTML content to override this choice, comment out this
+# directive:
+#
+AddDefaultCharset UTF-8
+
+#
+# AddType allows you to add to or override the MIME configuration
+# file mime.types for specific file types.
+#
+#AddType application/x-tar .tgz
+
+#
+# AddEncoding allows you to have certain browsers uncompress
+# information on the fly. Note: Not all browsers support this.
+# Despite the name similarity, the following Add* directives have nothing
+# to do with the FancyIndexing customization directives above.
+#
+#AddEncoding x-compress .Z
+#AddEncoding x-gzip .gz .tgz
+
+# If the AddEncoding directives above are commented-out, then you
+# probably should define those extensions to indicate media types:
+#
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+#
+# AddHandler allows you to map certain file extensions to "handlers":
+# actions unrelated to filetype. These can be either built into the server
+# or added with the Action directive (see below)
+#
+# To use CGI scripts outside of ScriptAliased directories:
+# (You will also need to add "ExecCGI" to the "Options" directive.)
+#
+#AddHandler cgi-script .cgi
+
+#
+# For files that include their own HTTP headers:
+#
+#AddHandler send-as-is asis
+
+#
+# For type maps (negotiated resources):
+# (This is enabled by default to allow the Apache "It Worked" page
+#  to be distributed in multiple languages.)
+#
+AddHandler type-map var
+
+#
+# Filters allow you to process content before it is sent to the client.
+#
+# To parse .shtml files for server-side includes (SSI):
+# (You will also need to add "Includes" to the "Options" directive.)
+#
+AddType text/html .shtml
+AddOutputFilter INCLUDES .shtml
+
+#
+# Action lets you define media types that will execute a script whenever
+# a matching file is called. This eliminates the need for repeated URL
+# pathnames for oft-used CGI file processors.
+# Format: Action media/type /cgi-script/location
+# Format: Action handler-name /cgi-script/location
+#
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# Putting this all together, we can internationalize error responses.
+#
+# We use Alias to redirect any /error/HTTP_<error>.html.var response to
+# our collection of by-error message multi-language collections.  We use 
+# includes to substitute the appropriate text.
+#
+# You can modify the messages' appearance without changing any of the
+# default HTTP_<error>.html.var files by adding the line:
+#
+#   Alias /error/include/ "/your/include/path/"
+#
+# which allows you to create your own set of files by starting with the
+# /var/www/error/include/ files and
+# copying them to /your/include/path/, even on a per-VirtualHost basis.
+#
+
+Alias /error/ "/awips2/httpd_collaboration/var/www/error/"
+
+<IfModule mod_negotiation.c>
+<IfModule mod_include.c>
+    <Directory "/awips2/httpd_collaboration/var/www/error">
+        AllowOverride None
+        Options IncludesNoExec
+        AddOutputFilter Includes html
+        AddHandler type-map var
+        Order allow,deny
+        Allow from all
+        LanguagePriority en es de fr
+        ForceLanguagePriority Prefer Fallback
+    </Directory>
+
+#    ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+#    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+#    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+#    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+#    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+#    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+#    ErrorDocument 410 /error/HTTP_GONE.html.var
+#    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+#    ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+#    ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+#    ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+#    ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+#    ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+#    ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+#    ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+#    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+#    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+
+</IfModule>
+</IfModule>
+
+#
+# The following directives modify normal HTTP response behavior to
+# handle known problems with browser implementations.
+#
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0
+
+#
+# The following directive disables redirects on non-GET requests for
+# a directory that does not include the trailing slash.  This fixes a 
+# problem with Microsoft WebFolders which does not appropriately handle 
+# redirects for folders with DAV methods.
+# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
+#
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "MS FrontPage" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
+BrowserMatch "^gnome-vfs/1.0" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
+BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+
+#
+# Allow server status reports generated by mod_status,
+# with the URL of http://servername/server-status
+# Change the ".example.com" to match your domain to enable.
+#
+#<Location /server-status>
+#    SetHandler server-status
+#    Order deny,allow
+#    Deny from all
+#    Allow from .example.com
+#</Location>
+
+#
+# Allow remote server configuration reports, with the URL of
+#  http://servername/server-info (requires that mod_info.c be loaded).
+# Change the ".example.com" to match your domain to enable.
+#
+#<Location /server-info>
+#    SetHandler server-info
+#    Order deny,allow
+#    Deny from all
+#    Allow from .example.com
+#</Location>
+
+#
+# Proxy Server directives. Uncomment the following lines to
+# enable the proxy server:
+#
+#<IfModule mod_proxy.c>
+#ProxyRequests On
+#
+#<Proxy *>
+#    Order deny,allow
+#    Deny from all
+#    Allow from .example.com
+#</Proxy>
+
+#
+# Enable/disable the handling of HTTP/1.1 "Via:" headers.
+# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
+# Set to one of: Off | On | Full | Block
+#
+#ProxyVia On
+
+#
+# To enable a cache of proxied content, uncomment the following lines.
+# See http://httpd.apache.org/docs/2.2/mod/mod_cache.html for more details.
+#
+#<IfModule mod_disk_cache.c>
+#   CacheEnable disk /
+#   CacheRoot "/var/cache/mod_proxy"
+#</IfModule>
+#
+
+#</IfModule>
+# End of proxy directives.
+
+### Section 3: Virtual Hosts
+#
+# VirtualHost: If you want to maintain multiple domains/hostnames on your
+# machine you can setup VirtualHost containers for them. Most configurations
+# use only name-based virtual hosts so the server doesn't need to worry about
+# IP addresses. This is indicated by the asterisks in the directives below.
+#
+# Please see the documentation at 
+# <URL:http://httpd.apache.org/docs/2.2/vhosts/>
+# for further details before you try to setup virtual hosts.
+#
+# You may use the command line option '-S' to verify your virtual host
+# configuration.
+
+#
+# Use name-based virtual hosting.
+#
+#NameVirtualHost *:80
+#
+# NOTE: NameVirtualHost cannot be used without a port specifier 
+# (e.g. :80) if mod_ssl is being used, due to the nature of the
+# SSL protocol.
+#
+
+#
+# VirtualHost example:
+# Almost any Apache directive may go into a VirtualHost container.
+# The first VirtualHost section is used for requests without a known
+# server name.
+#
+#<VirtualHost *:80>
+#    ServerAdmin webmaster@dummy-host.example.com
+#    DocumentRoot /www/docs/dummy-host.example.com
+#    ServerName dummy-host.example.com
+#    ErrorLog logs/dummy-host.example.com-error_log
+#    CustomLog logs/dummy-host.example.com-access_log common
+#</VirtualHost>
--- a/rpms/awips2.core/Installer.httpd-collaboration/configuration/etc/init.d/httpd-collaboration
+++ b/rpms/awips2.core/Installer.httpd-collaboration/configuration/etc/init.d/httpd-collaboration
@ -0,0 +1,141 @@
+#!/bin/bash
+#
+# httpd        Startup script for the Apache HTTP Server used by Collaboration
+#
+# chkconfig: - 85 15
+# description: Apache is a World Wide Web server.  It is used to serve \
+#	       HTML files and CGI.
+# processname: httpd
+# config: /etc/httpd/conf/httpd.conf
+# config: /etc/sysconfig/httpd
+# pidfile: /var/run/httpd.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/httpd ]; then
+        . /etc/sysconfig/httpd
+fi
+
+# Start httpd in the C locale by default.
+HTTPD_LANG=${HTTPD_LANG-"C"}
+
+# This will prevent initlog from swallowing up a pass-phrase prompt if
+# mod_ssl needs a pass-phrase from the user.
+INITLOG_ARGS=""
+
+# Set HTTPD=/usr/sbin/httpd.worker in /etc/sysconfig/httpd to use a server
+# with the thread-based "worker" MPM; BE WARNED that some modules may not
+# work correctly with a thread-based MPM; notably PHP will refuse to start.
+
+HTTPD_COLLABORATION_INSTALL="/awips2/httpd_collaboration"
+
+# Path to the apachectl script, server binary, and short-form for messages.
+apachectl=${HTTPD_COLLABORATION_INSTALL}/usr/sbin/apachectl
+httpd=${HTTPD-${HTTPD_COLLABORATION_INSTALL}/usr/sbin/httpd}
+prog=httpd
+pidfile=${PIDFILE-${HTTPD_COLLABORATION_INSTALL}/var/run/httpd.pid}
+lockfile=${LOCKFILE-${HTTPD_COLLABORATION_INSTALL}/var/lock/subsys/httpd}
+RETVAL=0
+PYTHON_INSTALL="/awips2/python"
+
+# Add to LD_LIBRARY_PATH, if necessary.
+PYTHON_LIB_DIR="${PYTHON_INSTALL}/lib"
+
+# Determine if LD_LIBRARY_PATH needs to be updated.
+echo $LD_LIBRARY_PATH | grep "${PYTHON_LIB_DIR}" > /dev/null 2>&1
+RC="$?"
+if [ ! "${RC}" = "0" ]; then
+   export LD_LIBRARY_PATH=${PYTHON_LIB_DIR}:$LD_LIBRARY_PATH
+fi
+
+# check for 1.3 configuration
+check13 () {
+	CONFFILE=${HTTPD_COLLABORATION_INSTALL}/etc/httpd/conf/httpd.conf
+	GONE="(ServerType|BindAddress|Port|AddModule|ClearModuleList|"
+	GONE="${GONE}AgentLog|RefererLog|RefererIgnore|FancyIndexing|"
+	GONE="${GONE}AccessConfig|ResourceConfig)"
+	if LANG=C grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then
+		echo
+		echo 1>&2 " Apache 1.3 configuration directives found"
+		echo 1>&2 " please read /usr/share/doc/awips2-collaboration-2.2.3/migration.html"
+		failure "Apache 1.3 config directives test"
+		echo
+		exit 1
+	fi
+}
+
+# The semantics of these two functions differ from the way apachectl does
+# things -- attempting to start while running is a failure, and shutdown
+# when not running is also a failure.  So we just do it the way init scripts
+# are expected to behave here.
+start() {		
+        echo -n $"Starting $prog: "
+        check13 || exit 1
+        LANG=$HTTPD_LANG daemon $httpd $OPTIONS -f \
+           ${HTTPD_COLLABORATION_INSTALL}/etc/httpd/conf/httpd.conf
+        RETVAL=$?
+        echo
+        [ $RETVAL = 0 ] && touch ${lockfile}
+        return $RETVAL
+}
+
+# When stopping httpd a delay of >10 second is required before SIGKILLing the
+# httpd parent; this gives enough time for the httpd parent to SIGKILL any
+# errant children.
+stop() {
+	echo -n $"Stopping $prog: "
+	killproc -d 10 $httpd
+	RETVAL=$?
+	echo
+	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+    echo
+}
+reload() {
+    echo -n $"Reloading $prog: "
+    if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then
+        RETVAL=$?
+        echo $"not reloading due to configuration syntax error"
+        failure $"not reloading $httpd due to configuration syntax error"
+    else
+        killproc $httpd -HUP
+        RETVAL=$?
+    fi
+    echo
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  status)
+        status $httpd
+	RETVAL=$?
+	;;
+  restart)
+	stop
+	start
+	;;
+  condrestart)
+	if [ -f ${pidfile} ] ; then
+		stop
+		start
+	fi
+	;;
+  reload)
+        reload
+	;;
+  graceful|help|configtest|fullstatus)
+	$apachectl $@
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status|fullstatus|graceful|help|configtest}"
+	exit 1
+esac
+
+exit $RETVAL
--- a/rpms/awips2.core/Installer.httpd-pypies/component.spec
+++ b/rpms/awips2.core/Installer.httpd-pypies/component.spec
@ -8,13 +8,11 @@ Summary: Pypies Apache HTTP Server
 Name: awips2-httpd-pypies
 Version: 2.2.3
 # This Is Officially Release: 22%{?dist}
-Release: 27%{?dist}
+Release: 28%{?dist}
 URL: http://httpd.apache.org/
 Prefix: /awips2/httpd_pypies
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: centos_index.html
-Source3: httpd-pypies.logrotate
-Source4: httpd-pypies.init
 Source5: httpd.sysconf
 Source8: centos_powered_by_rh.png
 Source10: httpd.conf
@ -80,6 +78,7 @@ BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
 BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0, 
 Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find
 Requires: initscripts >= 8.36
+Requires: awips2-tools
 Obsoletes: httpd-suexec
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
 Prereq: sh-utils, textutils, /usr/sbin/useradd
@ -359,12 +358,14 @@ ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/awips2/httpd_pypies/etc/http

 # install service script.
 mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
-install -m755 ${PROJECT_DIR}/configuration/etc/init.d/httpd-pypies \
+rpm_core_dir="%{_baseline_workspace}/Installer.rpm/awips2.core"
+pypies_project_dir="${rpm_core_dir}/Installer.httpd-pypies"
+install -m755 ${pypies_project_dir}/configuration/etc/init.d/httpd-pypies \
    ${RPM_BUILD_ROOT}/etc/init.d

 # install log rotation stuff
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m644 $RPM_SOURCE_DIR/httpd-pypies.logrotate \
+install -m644 ${pypies_project_dir}/SOURCES/httpd-pypies.logrotate \
 	$RPM_BUILD_ROOT/etc/logrotate.d/httpd-pypies

 # fix man page paths
@ -402,18 +403,20 @@ rm -rf $RPM_BUILD_ROOT/awips2/httpd_pypies/etc/httpd/conf/{original,extra}
 chmod 755 $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sbindir}/suexec

 # Install the module required by pypies.
-install -m755 ${PROJECT_DIR}/configuration/apache/mod_wsgi.so \
+rpm_core_dir="%{_baseline_workspace}/Installer.rpm/awips2.core"
+pypies_project_dir="${rpm_core_dir}/Installer.httpd-pypies"
+install -m755 ${pypies_project_dir}/configuration/apache/mod_wsgi.so \
    ${RPM_BUILD_ROOT}/awips2/httpd_pypies/etc/httpd/modules

 # Install the pypies configuration.
-install -m644 ${PROJECT_DIR}/configuration/apache/pypies.conf \
+install -m644 ${pypies_project_dir}/configuration/apache/pypies.conf \
    ${RPM_BUILD_ROOT}/awips2/httpd_pypies/etc/httpd/conf.d
 mkdir -p ${RPM_BUILD_ROOT}/awips2/httpd_pypies/var/www/wsgi
-install -m644 ${PROJECT_DIR}/configuration/apache/pypies.wsgi \
+install -m644 ${pypies_project_dir}/configuration/apache/pypies.wsgi \
    ${RPM_BUILD_ROOT}/awips2/httpd_pypies/var/www/wsgi

 # Install & Override the httpd configuration.
-install -m644 ${PROJECT_DIR}/configuration/conf/httpd.conf \
+install -m644 ${pypies_project_dir}/configuration/conf/httpd.conf \
    ${RPM_BUILD_ROOT}/awips2/httpd_pypies/etc/httpd/conf

 %pre
--- a/rpms/awips2.core/Installer.xmpp/component.spec
+++ b/rpms/awips2.core/Installer.xmpp/component.spec
@ -24,6 +24,8 @@ Vendor: Raytheon
 Packager: Bryan Kowal

 AutoReq: no
+requires: awips2-java
+requires: awips2-httpd-collaboration
 provides: awips2-%{_xmpp_server}

 %description
--- a/rpms/awips2.core/deploy.builder/httpd.SOURCES/httpd-2.2.3-SOURCES.tar
+++ b/rpms/awips2.core/deploy.builder/httpd.SOURCES/httpd-2.2.3-SOURCES.tar
--- a/rpms/build/release/attempt32BitBuild.sh
+++ b/rpms/build/release/attempt32BitBuild.sh
@ -1,11 +1,11 @@
 #!/bin/bash

 # TODO - Check Number Of Arguments.
-WORKSPACE=${1}
-SHARE_DIR=${2}
+export WORKSPACE=${1}
+export SHARE_DIR=${2}
 # This is where we will copy the rpms to once they are
 # successfully built.
-REPO_DEST=${3}
+export REPO_DEST=${3}

 # Determine if we are 32-bit?
 CHECK_ARCH=`uname -i`
@ -30,30 +30,57 @@ echo "INFO: Starting The 32-Bit Build."
 export BUILDROOT_DIR=/tmp/awips-component

 # Build awips2-httpd-pypies
-PYPIES_PROJECT_DIR="Installer.rpm/awips2.core/Installer.httpd-pypies"
-HTTPD_PYPIES_RPM="awips2-httpd-pypies-2.2.3-*.i386.rpm"
-# We Need The Source RPM.
-PYPIES_SRC_RPM="${SHARE_DIR}/packages/httpd-pypies/src/awips2-httpd-pypies-2.2.3-22.src.rpm"
+PYPIES_PROJECT_DIR="${WORKSPACE}/Installer.rpm/awips2.core/Installer.httpd-pypies"
+COLLABORATION_PROJECT_DIR="${WORKSPACE}/Installer.rpm/awips2.core/Installer.httpd-collaboration"

-# Ensure That The Source RPM Exists.
-if [ ! -f ${PYPIES_SRC_RPM} ]; then
-   echo "ERROR: Unable to locate the httpd-pypies source rpm."
-   echo "Unable To Continue ... Terminating."
+httpd_version="2.2.3"
+HTTPD_PYPIES_pattern="awips2-httpd-pypies-${httpd_version}-*.i386.rpm"
+HTTPD_COLLABORATION_pattern="awips2-httpd-collaboration-${httpd_version}-*.i386.rpm"
+
+# Create a temporary repository destination for the httpd rpms.
+if [ -d ${REPO_DEST}/httpd-temp ]; then
+   rm -rf ${REPO_DEST}/httpd-temp
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+fi
+mkdir -p ${REPO_DEST}/httpd-temp/BUILD
+if [ $? -ne 0 ]; then
   exit 1
 fi
-# If the source rpm does exist install it.
-rpm -ivh ${PYPIES_SRC_RPM}
-RC=$?
-if [ ${RC} -ne 0 ]; then
-   echo "ERROR: Installation of the httpd-pypies src rpm Failed."
-   echo "Unable To Continue ... Terminating."
+mkdir -p ${REPO_DEST}/httpd-temp/RPMS
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mkdir -p ${REPO_DEST}/httpd-temp/SOURCES
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mkdir -p ${REPO_DEST}/httpd-temp/SPECS
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mkdir -p ${REPO_DEST}/httpd-temp/SRPMS
+if [ $? -ne 0 ]; then
   exit 1
 fi

-# Prepare to build the rpm.
-export PROJECT_DIR="${WORKSPACE}/Installer.rpm/awips2.core/Installer.httpd-pypies"
+# Unpack the httpd source.
+httpd_src="${WORKSPACE}/Installer.rpm/awips2.core/deploy.builder/httpd.SOURCES"
+httpd_src_tar="${httpd_src}/httpd-2.2.3-SOURCES.tar"
+tar -xvf ${httpd_src_tar} -C ${REPO_DEST}/httpd-temp/SOURCES
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+echo "Building ... awips2-httpd-pypies"
 # Build awips2-httpd-pypies
-rpmbuild -ba --target=i386 --buildroot ${BUILDROOT_DIR} ${PROJECT_DIR}/component.spec
+rpmbuild -ba --target=i386 \
+   --define '_topdir %(echo ${REPO_DEST}/httpd-temp)' \
+   --define '_build_root %(echo ${BUILDROOT_DIR})' \
+   --define '_baseline_workspace %(echo ${WORKSPACE})' \
+   --buildroot ${BUILDROOT_DIR} \
+   ${PYPIES_PROJECT_DIR}/component.spec
 RC=$?
 if [ ${RC} -ne 0 ]; then
   echo "ERROR: Build of awips2-httpd-pypies Failed."
@ -61,6 +88,42 @@ if [ ${RC} -ne 0 ]; then
   exit 1
 fi

+echo "Building ... awips2-httpd-collaboration"
+# Build awips2-httpd-collaboration
+rpmbuild -ba --target=i386 \
+   --define '_topdir %(echo ${REPO_DEST}/httpd-temp)' \
+   --define '_build_root %(echo ${BUILDROOT_DIR})' \
+   --define '_baseline_workspace %(echo ${WORKSPACE})' \
+   --buildroot ${BUILDROOT_DIR} \
+   ${COLLABORATION_PROJECT_DIR}/component.spec
+RC=$?
+if [ ${RC} -ne 0 ]; then
+   echo "ERROR: Build of awips2-httpd-collaboration Failed."
+   echo "Unable To Continue ... Terminating."
+   exit 1
+fi
+
+# Copy the httpd rpms to the specified destination directory.
+if [ ! -d ${REPO_DEST}/RPMS/i386 ]; then
+   mkdir -p ${REPO_DEST}/RPMS/i386
+fi
+cp -v ${REPO_DEST}/httpd-temp/RPMS/i386/${HTTPD_PYPIES_pattern} \
+   ${REPO_DEST}/RPMS/i386
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+cp -v ${REPO_DEST}/httpd-temp/RPMS/i386/${HTTPD_COLLABORATION_pattern} \
+   ${REPO_DEST}/RPMS/i386
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+# Remove the temporary repository destination.
+rm -rf ${REPO_DEST}/httpd-temp
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
 # ----------------------------------------------------------------------------------------------- #

 # Prepare to build the rpm.
@ -115,7 +178,7 @@ fi
 # ----------------------------------------------------------------------------------------------- #

 # Copy the rpms that we just built to the specified destination.
-cp -v ${RPM_DEST_DIR}/${HTTPD_PYPIES_RPM} ${REPO_DEST} 
-cp -v ${RPM_DEST_DIR}/${LDM_RPM} ${REPO_DEST}
-cp -v ${RPM_DEST_DIR}/${PYGTK_RPM} ${REPO_DEST}
-cp -v ${RPM_DEST_DIR}/${PYCAIRO_RPM} ${REPO_DEST}
+cp -v ${RPM_DEST_DIR}/${HTTPD_PYPIES_RPM} ${REPO_DEST}/RPMS/i386 
+cp -v ${RPM_DEST_DIR}/${LDM_RPM} ${REPO_DEST}/RPMS/i386
+cp -v ${RPM_DEST_DIR}/${PYGTK_RPM} ${REPO_DEST}/RPMS/i386
+cp -v ${RPM_DEST_DIR}/${PYCAIRO_RPM} ${REPO_DEST}/RPMS/i386