[rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'el6' into f16

[rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'el6' into f16

[Jan-Frode Myklebust]

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : 64380116d7dfa68986ceaba1608811c1e80f0b88
Author : Jan-Frode Myklebust <janfrode@tanso.net>
Date   : 2012-03-21T15:16:14+01:00
Stats  : +34/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/64380116d7dfa68986ceaba1608811c1e80f0b88?branch=trafficserver-9.2.14-1

Log:
Merge branch 'el6' into f16

---
diff --git a/trafficserver.spec b/trafficserver.spec
index a1e39eb..169bd7d 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,7 +3,7 @@
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
 Version:	3.0.3
-Release:	1%{?dist}
+Release:	3%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
@@ -13,6 +13,8 @@ URL:		http://trafficserver.apache.org/index.html
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	autoconf, automake, libtool, openssl-devel, tcl-devel, expat-devel
 BuildRequires:	pcre-devel, zlib-devel, xz-devel, gcc-c++
+# trafficserver fails to build on ppc, TS-1131
+ExcludeArch:	ppc ppc64
 
 Patch2:		trafficserver-init_scripts.patch
 Patch7:		trafficserver_make_install.patch
@@ -74,6 +76,14 @@ 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
 
+# 
+perl -pi -e 's/^CONFIG.*proxy.config.proxy_name STRING.*$/CONFIG proxy.config.proxy_name STRING FIXME.example.com/' \
+	$RPM_BUILD_ROOT/etc/trafficserver/records.config
+perl -pi -e 's/^CONFIG.*proxy.config.ssl.server.cert.path.*$/CONFIG proxy.config.ssl.server.cert.path STRING \/etc\/pki\/tls\/certs\//' \
+	$RPM_BUILD_ROOT/etc/trafficserver/records.config
+perl -pi -e 's/^CONFIG.*proxy.config.ssl.server.private_key.path.*$/CONFIG proxy.config.ssl.server.private_key.path STRING \/etc\/pki\/tls\/private\//' \
+	$RPM_BUILD_ROOT/etc/trafficserver/records.config
+
 # The clean section  is only needed for EPEL and Fedora < 13
 # http://fedoraproject.org/wiki/PackagingGuidelines#.25clean
 %clean
@@ -139,6 +149,16 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
+* Sun Mar 18 2012 <janfrode@tanso.net> - 3.0.3-3
+- change default proxy.config.proxy_name to FIXME.example.com instead of the
+  name of the buildhost
+- configure proxy.config.ssl.server.cert.path and
+  proxy.config.ssl.server.private_key.path to point to the standard /etc/pki/
+  locations.
+
+* Tue Mar 13 2012 <janfrode@tanso.net> - 3.0.3-2
+- exclude ppc/ppc64 since build there fails, TS-1131.
+
 * Sat Mar 10 2012 <janfrode@tanso.net> - 3.0.3-1
 - Removed mixed use of spaces and tabs in specfile.
 

diff --git a/trafficserver.service b/trafficserver.service
new file mode 100644
index 0000000..7edf9c8
--- /dev/null
+++ b/trafficserver.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Apache Traffic Server is a fast, scalable and extensible caching proxy server.
+After=syslog.target network.target
+
+[Service]
+Type=simple
+EnvironmentFile=-/etc/sysconfig/trafficserver
+PIDFile=/var/run/trafficserver/cop.pid
+ExecStart=/usr/bin/traffic_cop $TC_DAEMON_ARGS
+ExecReload=/usr/bin/traffic_line -x
+
+[Install]
+WantedBy=multi-user.target