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

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

[Jan-Frode Myklebust]

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : a85de1ea748769a5375adb1d6756d7255d7b08a8
Author : Jan-Frode Myklebust <janfrode@tanso.net>
Date   : 2012-03-22T15:25:41+01:00
Stats  : +72/-6 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/a85de1ea748769a5375adb1d6756d7255d7b08a8?branch=trafficserver-9.2.14-1

Log:
Merge branch 'el6'

---
diff --git a/trafficserver.service b/trafficserver.service
index 7edf9c8..2e6a554 100644
--- a/trafficserver.service
+++ b/trafficserver.service
@@ -5,7 +5,6 @@ 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
 

diff --git a/trafficserver.spec b/trafficserver.spec
index a1e39eb..8b0ed80 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,16 +3,28 @@
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
 Version:	3.0.3
-Release:	1%{?dist}
+Release:	6%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
 Source1:	trafficserver.sysconf
+Source2:	trafficserver.service
 URL:		http://trafficserver.apache.org/index.html
 # BuildRoot is only needed for EPEL5:
 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
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+Requires: systemd
+Requires(postun): systemd
+%else
+Requires: initscripts
+Requires(post): chkconfig
+Requires(preun): chkconfig initscripts
+Requires(postun): initscripts
+%endif
 
 Patch2:		trafficserver-init_scripts.patch
 Patch7:		trafficserver_make_install.patch
@@ -57,13 +69,19 @@ The man-pages for enable, disable and exit was renamed to ts-enable,
 ts-disable and ts-exit to avoid conflicts with other man-pages.
 EOF
 
-mkdir -p $RPM_BUILD_ROOT/etc/init.d/
-mv $RPM_BUILD_ROOT/usr/bin/trafficserver $RPM_BUILD_ROOT/etc/init.d
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m 644 -p %{SOURCE1} \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/trafficserver
 
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+install -D -m 644 -p %{SOURCE2} \
+   $RPM_BUILD_ROOT/lib/systemd/system/trafficserver.service
+%else
+mkdir -p $RPM_BUILD_ROOT/etc/init.d/
+mv $RPM_BUILD_ROOT/usr/bin/trafficserver $RPM_BUILD_ROOT/etc/init.d
+%endif
+
 # Remove static libs (needs to go to separate -static subpackage if we
 # want these:
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsmgmt.a
@@ -74,6 +92,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
@@ -89,7 +115,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{_libdir}/trafficserver/*.so.*
 %attr(0755,root,root) %{_libdir}/trafficserver/plugins/*.so
 %config(noreplace) /etc/trafficserver/*
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+%attr(0644, root, root) /lib/systemd/system/trafficserver.service
+%else
 %attr(0755, root, root) /etc/init.d/trafficserver
+%endif
 %attr(0755, ats, ats) %dir /etc/trafficserver
 %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/sysconfig/trafficserver
 %dir /var/log/trafficserver
@@ -99,7 +129,11 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 if [ $1 -eq 1 ] ; then
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%else
   /sbin/chkconfig --add %{name}
+%endif
 fi
 
 %pre
@@ -110,14 +144,28 @@ useradd -r -u 176 -g ats -d / -s /sbin/nologin \
 
 %preun
 if [ $1 -eq 0 ] ; then
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+  /bin/systemctl disable trafficserver.service >/dev/null 2>&1 || :
+  /bin/systemctl stop trafficserver.service >/dev/null 2>&1 || :
+%else
   /sbin/service %{name} stop > /dev/null 2>&1
   /sbin/chkconfig --del %{name}
+%endif
 fi
 
 %postun
 /sbin/ldconfig
+
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%endif
+
 if [ $1 -eq 1 ] ; then
-   /sbin/service trafficserver condrestart &>/dev/null || :
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+  /bin/systemctl try-restart trafficserver.service >/dev/null 2>&1 || :
+%else
+  /sbin/service trafficserver condrestart &>/dev/null || :
+%endif
 fi
 
 
@@ -139,6 +187,24 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
+* Thu Mar 22 2012 <janfrode@tanso.net> - 3.0.3-6
+- Remove pidfile from systemd service file. This is a type=simple
+  service, so pidfile shouldn't be needed.
+
+* Wed Mar 21 2012 <janfrode@tanso.net> - 3.0.3-5
+- Add systemd support.
+- Drop init.d-script on systemd-systems.
+
+* 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/.gitignore b/.gitignore
index 5c8a093..56d5a66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /trafficserver-3.0.3.tar.bz2
+/trafficserver-3.0.4.tar.bz2

diff --git a/sources b/sources
index 7a11b4c..fa36a97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4af9392a847f3fde39a3c6cd33e78f50  trafficserver-3.0.3.tar.bz2
+90e259fb09cb7439c6908f1f5344c40f  trafficserver-3.0.4.tar.bz2