[trafficserver] Update to v3.2.0.

[Jan-Frode Myklebust]

commit d3a6a4b5a1d6adc3c55f8ba517a1653ea0061565
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Sat Jun 23 15:20:50 2012 +0200

    Update to v3.2.0.

 trafficserver-init_scripts.patch |   70 +++++--------------------------------
 trafficserver.spec               |    9 ++++-
 2 files changed, 18 insertions(+), 61 deletions(-)
---
diff --git a/trafficserver-init_scripts.patch b/trafficserver-init_scripts.patch
index 79364d0..92b3b73 100644
--- a/trafficserver-init_scripts.patch
+++ b/trafficserver-init_scripts.patch
@@ -1,5 +1,5 @@
---- trafficserver-3.0.5/rc/trafficserver.in.original	2012-05-07 23:56:06.000000000 +0200
-+++ trafficserver-3.0.5/rc/trafficserver.in	2012-06-10 12:37:14.663406610 +0200
+--- trafficserver-3.2.0/rc/trafficserver.in.orginal	2012-06-23 15:02:25.768405925 +0200
++++ trafficserver-3.2.0/rc/trafficserver.in	2012-06-23 15:07:16.507193268 +0200
 @@ -16,12 +16,21 @@
  # limitations under the License.
  #
@@ -23,63 +23,13 @@
  # Default-Stop:      S 0 1 6
  # Short-Description: Startup/shutdown script for the Apache Traffic Server
  # Description:       Apache Traffic Server is fast, scalable and extensible
-@@ -103,6 +112,7 @@
- TC_PIDFILE=${TC_PIDFILE:-$TS_BASE at exp_runtimedir@/cop.lock}
- TM_PIDFILE=${TM_PIDFILE:-$TS_BASE at exp_runtimedir@/manager.lock}
- TS_PIDFILE=${TS_PIDFILE:-$TS_BASE at exp_runtimedir@/server.lock}
-+LOCKFILE=${LOCKFILE-/var/lock/subsys/trafficserver}
- # number of times to retry check on pid lock file
- PIDFILE_CHECK_RETRIES=${PIDFILE_CHECK_RETRIES:-30}
- # stdout file of executable
-@@ -112,6 +122,7 @@
+@@ -135,6 +144,9 @@
+ # Ubuntu: Read configuration variable file if it is present
+ test -r /etc/default/$NAME && . /etc/default/$NAME
  
- if [ -d /etc/rc.d/init.d ]; then
-   SCRIPTNAME=/etc/rc.d/init.d/$NAME # Fedora
-+  test -r /etc/sysconfig/$NAME && . /etc/sysconfig/$NAME
- elif [ -d /etc/init.d ]; then
-   SCRIPTNAME=/etc/init.d/$NAME # Ubuntu
- elif [ "$DISTRIB_ID" = "Darwin" ]; then
-@@ -157,16 +168,14 @@
- # Fedora:
- #  launches $* in the background
- #  and checks if program creates its own pid lock file
--#  redirects stdout and stderr to files
- #  this function is meant to substitute 'daemon'
- #  because 'daemon' expects $1 to fork itself
- forkdaemon()
- {
-   local i=0
++# RHEL/Fedora: Read configuration variable file if it is present
++test -r /etc/sysconfig/$NAME && . /etc/sysconfig/$NAME
++
+ # Ubuntu: Load the VERBOSE setting and other rcS variables
+ test -f /etc/default/rcS && . /etc/default/rcS
  
--  # launch in background, i.e. fork
--  # and redirect stdout and stderr to files
--  $* >> $STDOUTLOG 2>> $STDERRLOG &
-+  # launch in background, cop will redirect STDIN STDOUT to /dev/null
-+  $* &
- 
-   while (( $i < $PIDFILE_CHECK_RETRIES ))
-   do
-@@ -174,6 +183,7 @@
-     # check for regular file and size greater than 0
-     if [[ -f $TC_PIDFILE ]] && [[ -s $TC_PIDFILE ]]
-     then
-+      touch $LOCKFILE
-       success
-       return 0
-     fi
-@@ -302,6 +312,7 @@
-       action "Stopping ${TC_NAME}:" killproc -p $TC_PIDFILE $TC_DAEMON
-       action "Stopping ${TM_NAME}:" killproc -p $TM_PIDFILE $TM_DAEMON
-       action "Stopping ${TS_NAME}:" killproc -p $TS_PIDFILE $TS_DAEMON
-+      rm -f $LOCKFILE
-     elif [ "$DISTRIB_ID" = "suse" ]; then
-       echo -n "Stopping ${TC_NAME}"
-       killproc -p $TC_PIDFILE $TC_DAEMON
-@@ -410,7 +421,7 @@
-   ;;
-   condrestart)
-     if [ "$DISTRIB_ID" = "fedora" -o "$DISTRIB_ID" = "redhat" ]; then
--      if ! $0 'status'
-+      if $0 'status'
-       then
-         sh $0 'stop'
-         sh $0 'start'
diff --git a/trafficserver.spec b/trafficserver.spec
index a6fb9e4..a3ec170 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -2,7 +2,7 @@
 %define _hardened_build 1
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
-Version:	3.0.5
+Version:	3.2.0
 Release:	1%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
@@ -89,6 +89,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsutil.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsmgmt.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsutil.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/conf_remap.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/header_filter.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/regex_remap.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/stats_over_http.la
 
 # 
 perl -pi -e 's/^CONFIG.*proxy.config.proxy_name STRING.*$/CONFIG proxy.config.proxy_name STRING FIXME.example.com/' \
@@ -184,8 +187,12 @@ header files, and Apache httpd style module build system.
 %attr(0755,root,root) %dir %{_libdir}/trafficserver
 %attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
+%{_docdir}/trafficserver
 
 %changelog
+* Sat Jun 23 2012 Jan-Frode Myklebust <janfrode at tanso.net> - 3.2.0-1
+- Update to v3.2.0
+
 * Sun Jun 10 2012 Jan-Frode Myklebust <janfrode at tanso.net> - 3.0.5-1
 - Remove trafficserver-gcc47.patch since it's fixed upstream, TS-1116.
 - Join trafficserver-condrestart.patch into trafficserver-init_scripts.patch,