[rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7

[Jan-Frode Myklebust <janfrode@tanso.net>]

            A new commit has been pushed.

            Repo   : rpms/trafficserver
            Branch : trafficserver-9.2.14-1
            Commit : f2d816322797611bdf0747d8040095dffe8f99b7
            Author : Jan-Frode Myklebust <janfrode@tanso.net>
            Date   : 2014-01-14T14:13:31+01:00
            Stats  : +114/-47 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/trafficserver/c/f2d816322797611bdf0747d8040095dffe8f99b7?branch=trafficserver-9.2.14-1

            Log:
            Merge branch 'master' into epel7

Conflicts:
	trafficserver.spec

---
diff --git a/.gitignore b/.gitignore
index 8ef557a..1a03ed9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,8 @@
 /trafficserver-3.2.0.tar.bz2
 /trafficserver-3.2.4.tar.bz2
 /trafficserver-3.2.5.tar.bz2
+/trafficserver-4.0.1.tar.bz2
+/trafficserver-4.0.2.tar.bz2
+/trafficserver-4.0.2.tar.bz2.asc
+/trafficserver-4.1.2.tar.bz2
+/trafficserver-4.1.2.tar.bz2.asc

diff --git a/sources b/sources
index cbba7b7..5490a57 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-bc76c68589389a453e4e4967c42636d6  trafficserver-3.2.5.tar.bz2
+cc9a4dfa88fe63f59de106602c06c9c4  trafficserver-4.1.2.tar.bz2
+28797b160da3eba749e422de3ef19b06  trafficserver-4.1.2.tar.bz2.asc

diff --git a/trafficserver-init_scripts.patch b/trafficserver-init_scripts.patch
index 92b3b73..a9a8253 100644
--- a/trafficserver-init_scripts.patch
+++ b/trafficserver-init_scripts.patch
@@ -1,20 +1,6 @@
---- 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.
- #
- # Template from /etc/init.d/skeleton on Ubuntu
-+# trafficserver    Startup/shutdown script for the Apache Traffic Server
-+#
-+# chkconfig: - 90 10
-+# description: TApache Traffic Server is fast, scalable and extensible  \
-+#             HTTP/1.1 compliant caching proxy server.
-+# processname: traffic_cop traffic_manager traffic_server
-+# config: /etc/trafficserver
-+# config: /etc/sysconfig/trafficserver
-+# pidfile: /var/run/trafficserver/cop.pid
- #
- ### BEGIN INIT INFO
+--- trafficserver-4.0.1/rc/trafficserver.in.orginal	2012-06-23 15:02:25.768405925 +0200
++++ trafficserver-4.0.1/rc/trafficserver.in	2012-06-23 15:07:16.507193268 +0200
+@@ -29,7 +29,7 @@
  # Provides:          Traffic Server
  # Required-Start:    $local_fs $remote_fs
  # Required-Stop:     $local_fs $remote_fs
@@ -23,13 +9,4 @@
  # 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
-@@ -135,6 +144,9 @@
- # Ubuntu: Read configuration variable file if it is present
- test -r /etc/default/$NAME && . /etc/default/$NAME
- 
-+# 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
- 
+

diff --git a/trafficserver.keyring b/trafficserver.keyring
new file mode 100644
index 0000000..8c265a0
Binary files /dev/null and b/trafficserver.keyring differ

diff --git a/trafficserver.spec b/trafficserver.spec
index ec02fd4..7ae9866 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -2,19 +2,22 @@
 %define _hardened_build 1
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
-Version:	3.2.5
-Release:	4%{?dist}
+Version:	4.1.2
+Release:	0%{?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
-Source3:	trafficserver.tmpfilesd
+Source1:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2.asc
+Source2:	trafficserver.keyring
+Source3:	trafficserver.sysconf
+Source4:	trafficserver.service
+Source5:	trafficserver.tmpfilesd
 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++
+BuildRequires:	autoconf, automake, libtool, openssl-devel, tcl-devel, expat-devel, boost-devel
+BuildRequires:	pcre-devel, zlib-devel, xz-devel, gcc-c++, gnupg, perl-ExtUtils-MakeMaker
+BuildRequires:	hwloc-devel
 # trafficserver fails to build on ppc and others, TS-1131, see lib/ts/ink_queue.h
 ExclusiveArch:	%{ix86} x86_64 ia64 %{arm}
 Requires: initscripts
@@ -37,6 +40,8 @@ Apache Traffic Server is a fast, scalable and extensible HTTP/1.1 compliant
 caching proxy server.
 
 %prep
+gpgv --homedir /tmp --keyring %{SOURCE2} --status-fd=1 %{SOURCE1} %{SOURCE0} | grep -q '^\[GNUPG:\] GOODSIG'
+
 %setup -q
 
 %patch2 -p1 -b .patch2
@@ -77,13 +82,13 @@ EOF
 rm -rf $RPM_BUILD_ROOT%{_docdir}/trafficserver
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m 644 -p %{SOURCE1} \
+install -m 644 -p %{SOURCE3} \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/trafficserver
 
 %if %{?fedora}0 > 140 || %{?rhel}0 > 60
-install -D -m 0644 -p %{SOURCE2} \
+install -D -m 0644 -p %{SOURCE4} \
    $RPM_BUILD_ROOT/lib/systemd/system/trafficserver.service
-install -D -m 0644 -p %{SOURCE3} \
+install -D -m 0644 -p %{SOURCE5} \
    $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/trafficserver.conf
 %else
 mkdir -p $RPM_BUILD_ROOT/etc/init.d/
@@ -98,10 +103,18 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsutil.a
 # Don't include libtool archives:
 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/libatscpp11api.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
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/cacheurl.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/gzip.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/libloader.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/header_rewrite.la
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/perllocal.pod
+rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/auto/Apache/TS/.packlist
 
 #
 perl -pi -e 's/^CONFIG.*proxy.config.proxy_name STRING.*$/CONFIG proxy.config.proxy_name STRING FIXME.example.com/' \
@@ -119,12 +132,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, ats, ats, -)
 %doc README CHANGES NOTICE README.fedora LICENSE
-%attr(0644, root, root) /usr/share/man/man1/*
-%attr(0755,root,root) /usr/bin/traffic*
+%attr(0644,root,root) %{_mandir}/man1/*
+%attr(0644,root,root) %{_mandir}/man3/*
+%attr(0755,root,root) %{_bindir}/traffic*
+%attr(0755,root,root) %{_bindir}/tspush
 %attr(0755,root,root) %dir %{_libdir}/trafficserver
 %attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
 %attr(0755,root,root) %{_libdir}/trafficserver/*.so.*
 %attr(0755,root,root) %{_libdir}/trafficserver/plugins/*.so
+%attr(0644,root,root) %{_datadir}/perl5/Apache/TS.pm
+%attr(0644,root,root) %{_datadir}/perl5/Apache/TS/*
 %config(noreplace) /etc/trafficserver/*
 %if %{?fedora}0 > 140 || %{?rhel}0 > 60
 %attr(0644, root, root) /lib/systemd/system/trafficserver.service
@@ -190,19 +207,86 @@ header files, and Apache httpd style module build system.
 
 %files devel
 %defattr(-,root,root,-)
-%attr(0755,root,root) /usr/bin/tsxs
-%attr(0755,root,root) %dir /usr/include/ts
-%attr(0644,root,root) /usr/include/ts/*
+%attr(0755,root,root) %{_bindir}/tsxs
+%attr(0755,root,root) %dir %{_includedir}/ts
+%attr(0644,root,root) %{_includedir}/ts/*
 %attr(0755,root,root) %dir %{_libdir}/trafficserver
 %attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
-* Fri Oct 11 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.2.5-4
+* Tue Dec 17 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.1.2-0
+- Bump to final. No change from rc0.
+- What's new: https://cwiki.apache.org/confluence/display/TS/What%27s+new+in+v4.1.x
+
+* Thu Dec 12 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.1.2-rc0
+- Update to 4.1.2-rc0.
+
+* Mon Nov 11 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.0.2-5
+- Buildrequire hwloc-devel, since it supposedly gives tremendous 
+  positive performance impact to use hwlock to optimize scaling and
+  number of threads and alignment for actual hardware we're running on.
+
+* Sun Oct 20 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.0.2-3
+- Rebuild for picking up ECC/ECDHE/EC/ECDSA/elliptic curves
+  which are now enabled in OpenSSL.
+
+* Fri Oct 11 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 4.0.2-3
 - Add BR: systemd for systemd.macros (RHBZ #1018080).
 
+* Thu Oct 10 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.0.2-2
+- Update to 4.0.2, which fixes the following bugs:
+
+    [TS-2144] - traffic_server crashes when clearing cache
+    [TS-2173] - cache total hit/miss stats broken in version 4.0.1
+    [TS-2174] - traffic_shell/traffic_line miss some stats value
+    [TS-2191] - when http_info enabled, the http_sm may be deleted but a event associated it not cancelled.
+    [TS-2207] - Centos5 out of tree perl build fails
+    [TS-2217] - remove the option to turn off body factory - setting it to 0 will result in empty responses
+
+- Automatically verify GPG signature during RPM prep.
+- Build requires boost-devel.
+
+* Tue Sep 3 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.0.1-1
+- Update to 4.0.1.  What's new in v4.0.0:
+  https://cwiki.apache.org/confluence/display/TS/What%27s+new+in+v4.0.0
+
+- Upgrade instructions from earlier versions:
+  https://cwiki.apache.org/confluence/display/TS/Upgrading+to+v4.0
+
+  Important notes:
+
+    proxy.config.remap.use_remap_processor has been removed,
+    use the proxy.config.remap.num_remap_threads instead.
+
+    Default proxy.config.cache.ram_cache.size has been increased by 
+    a magnitude.
+
+    Support for pre v3.2 port configuration directives has been removed.
+
+    The following records.config parameters should be removed:
+
+	CONFIG proxy.config.bandwidth_mgmt.filename STRING ""
+	CONFIG proxy.config.admin.autoconf.wpad_filename STRING ""
+	CONFIG proxy.config.username.cache.enabled INT 0
+	CONFIG proxy.config.username.cache.filename STRING ""
+	CONFIG proxy.config.username.cache.size INT 0
+	CONFIG proxy.config.username.cache.storage_path STRING ""
+	CONFIG proxy.config.username.cache.storage_size INT 0
+	CONFIG proxy.config.http.wuts_enabled INT 0
+	CONFIG proxy.config.http.log_spider_codes INT 0
+	CONFIG proxy.config.http.accept_encoding_filter_enabled INT 0
+	CONFIG proxy.config.http.accept_encoding_filter.filename STRING ""
+	CONFIG proxy.config.net.throttle_enabled INT 0
+	CONFIG proxy.config.net.accept_throttle INT 0
+	CONFIG proxy.config.cluster.num_of_cluster_connections INT 0
+	CONFIG proxy.config.cache.url_hash_method INT 0
+	CONFIG proxy.config.plugin.extensions_dir STRING ""
+	CONFIG proxy.local.http.parent_proxy.disable_connect_tunneling INT 0
+	CONFIG proxy.config.remap.use_remap_processor INT 0
+
 * Sun Aug 25 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 3.2.5-3
-- bz#994224 Use rpm %configure macro, instead of calling configure
+- bz#994224 Use rpm configure macro, instead of calling configure
   directly.
 
 * Fri Aug 9 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 3.2.5-2
@@ -311,7 +395,7 @@ header files, and Apache httpd style module build system.
 - Remove odd version macro.
 - Clean up mixed-use-of-spaces-and-tabs.
 
-* Wed Jun 23 2011 <janfrode@tanso.net> - 3.0.0-4
+* Wed Jun 22 2011 <janfrode@tanso.net> - 3.0.0-4
 - Use dedicated user/group ats/ats.
 - Restart on upgrades.
 
@@ -344,7 +428,7 @@ header files, and Apache httpd style module build system.
 - fix centos5 building
 - drop duplicated patches
 
-* Tue Mar 19 2011 <yonghao@taobao.com> - 2.1.6-2
+* Sat Mar 12 2011 <yonghao@taobao.com> - 2.1.6-2
 - fix gcc 4.6 building
 - split into -devel package for devel libs
 - fix init scripts for rpmlint requirement